diff --git a/.bandit b/.bandit
deleted file mode 100644
index dc28620f..00000000
--- a/.bandit
+++ /dev/null
@@ -1,3 +0,0 @@
-[bandit]
-skips: B110,B404,B408,B603,B607,B322
-targets: .
diff --git a/.editorconfig b/.editorconfig
deleted file mode 100644
index 43412092..00000000
--- a/.editorconfig
+++ /dev/null
@@ -1,15 +0,0 @@
-root = true
-
-[*]
-charset = utf-8
-end_of_line = lf
-insert_final_newline = true
-trim_trailing_whitespace = true
-
-[**.py]
-indent_style = space
-indent_size = 4
-
-[.gitlab-ci.yml]
-indent_style = space
-indent_size = 2
diff --git a/.gitignore b/.gitignore
index ce3a0e9a..223807b5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,14 +4,13 @@
 *.box
 TAGS
 .idea
-.ropeproject/
 
 # files generated by build
-/build/
-/dist/
+build/
+dist/
 env/
 ENV/
-/fdroidserver.egg-info/
+fdroidserver.egg-info/
 pylint.parseable
 /.testfiles/
 README.rst
@@ -19,7 +18,6 @@ README.rst
 
 # editor tmp files
 .*.swp
-.ropeproject/
 
 # files generated by tests
 tmp/
@@ -27,6 +25,7 @@ tmp/
 /tests/repo/status
 
 # files used in manual testing
+/config.py
 /config.yml
 /tmp/
 /logs/
@@ -41,25 +40,14 @@ makebuildserver.config.py
 /tests/OBBMainPatchCurrent.apk
 /tests/OBBMainTwoVersions.apk
 /tests/archive/categories.txt
-/tests/archive/diff/[1-9]*.json
-/tests/archive/entry.jar
-/tests/archive/entry.json
 /tests/archive/icons*
+/tests/archive/index.jar
+/tests/archive/index_unsigned.jar
+/tests/archive/index.xml
 /tests/archive/index-v1.jar
 /tests/archive/index-v1.json
-/tests/archive/index-v2.json
-/tests/archive/index.css
-/tests/archive/index.html
-/tests/archive/index.jar
-/tests/archive/index.png
-/tests/archive/index.xml
-/tests/archive/index_unsigned.jar
 /tests/metadata/org.videolan.vlc/en-US/icon*.png
-/tests/repo/diff/[1-9]*.json
-/tests/repo/index.css
-/tests/repo/index.html
 /tests/repo/index.jar
-/tests/repo/index.png
 /tests/repo/index_unsigned.jar
 /tests/repo/index-v1.jar
 /tests/repo/info.guardianproject.urzip/
@@ -74,6 +62,3 @@ makebuildserver.config.py
 
 # generated by gettext
 locale/*/LC_MESSAGES/fdroidserver.mo
-
-# sphinx
-public/
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 65510c45..52aafa2e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,52 +1,18 @@
----
-
-# Use merge request pipelines when a merge request is open for the branch.
-# Use branch pipelines when a merge request is not open for the branch.
-# https://docs.gitlab.com/ci/yaml/workflow/#switch-between-branch-pipelines-and-merge-request-pipelines
-workflow:
-  rules:
-    - if: $CI_PIPELINE_SOURCE == 'merge_request_event'
-    - if: $CI_COMMIT_BRANCH && $CI_OPEN_MERGE_REQUESTS
-      when: never
-    - if: $CI_COMMIT_BRANCH
-
-
-stages:
-  - lint
-  - test  # default for jobs that do not specify stage:
-  - deploy
-
 
 variables:
   pip: pip3 --timeout 100 --retries 10
-  # speed up git checkout phase
+# speed up git checkout phase
   GIT_DEPTH: 1
 
 
-# Run the whole test suite in an environment that is like the
-# buildserver guest VM.  This installs python3-babel because that is
-# only used by the test suite, and not needed in the buildserver.
-#
-# Some extra packages are required for this test run that are not
-# provided by the buildserver since they are not needed there:
-# * python3-babel for compiling localization files
-# * gnupg-agent for the full signing setup
-# * python3-clint for fancy progress bars for users
-# * python3-pycountry for linting config/mirrors.yml
-buildserver run-tests:
-  image: registry.gitlab.com/fdroid/fdroidserver:buildserver
+test:
+  image: registry.gitlab.com/fdroid/ci-images-base
   script:
-    - apt-get update
-    - apt-get install gnupg-agent python3-babel python3-biplist python3-clint python3-pycountry
-    - ./tests/run-tests
-    # make sure that translations do not cause stacktraces
-    - cd $CI_PROJECT_DIR/locale
-    - for locale in *; do
-          test -d $locale || continue;
-          for cmd in `sed -n 's/.*("\(.*\)", *_.*/\1/p' $CI_PROJECT_DIR/fdroid`; do
-              LANGUAGE=$locale $CI_PROJECT_DIR/fdroid $cmd --help > /dev/null;
-          done
-      done
+    - $pip install -e .[test]
+    # the `fdroid build` test in tests/run-tests needs android-23
+    - echo y | $ANDROID_HOME/tools/bin/sdkmanager "platforms;android-23"
+    - cd tests
+    - ./complete-ci-tests
 
 # Test that the parsing of the .yml metadata format didn't change from last
 # released version. This uses the commit ID of the release tags,
@@ -56,18 +22,17 @@ buildserver run-tests:
 # The COMMIT_ID should be bumped after each release, so that the list
 # of sed hacks needed does not continuously grow.
 metadata_v0:
-  image: registry.gitlab.com/fdroid/fdroidserver:buildserver
+  image: registry.gitlab.com/fdroid/ci-images-base
   variables:
     GIT_DEPTH: 1000
-    RELEASE_COMMIT_ID: 50aa35772b058e76b950c01e16019c072c191b73  # after switching to `git rev-parse`
+    RELEASE_COMMIT_ID: 37f37ebd88e79ebe93239b72ed5503d5bde13f4b  # 2.0a~
   script:
     - git fetch https://gitlab.com/fdroid/fdroidserver.git $RELEASE_COMMIT_ID
     - cd tests
-    - export GITCOMMIT=$(git rev-parse HEAD)
+    - export GITCOMMIT=`git describe`
     - git checkout $RELEASE_COMMIT_ID
     - cd ..
     - git clone --depth 1 https://gitlab.com/fdroid/fdroiddata.git
-    - rm -f fdroiddata/config.yml  # ignore config for this test
     - cd fdroiddata
     - ../tests/dump_internal_metadata_format.py
     - cd ..
@@ -76,9 +41,8 @@ metadata_v0:
     - cd fdroiddata
     - ../tests/dump_internal_metadata_format.py
     - sed -i
-          -e '/ArchivePolicy:/d'
-          -e '/FlattrID:/d'
-          -e '/RequiresRoot:/d'
+          -e '/Liberapay:/d'
+          -e '/OpenCollective/d'
           metadata/dump_*/*.yaml
     - diff -uw metadata/dump_*
 
@@ -90,330 +54,132 @@ metadata_v0:
     - echo Etc/UTC > /etc/timezone
     - echo 'APT::Install-Recommends "0";'
            'APT::Install-Suggests "0";'
+           'APT::Acquire::Retries "20";'
            'APT::Get::Assume-Yes "true";'
-           'Acquire::Retries "20";'
            'Dpkg::Use-Pty "0";'
            'quiet "1";'
         >> /etc/apt/apt.conf.d/99gitlab
-    # Ubuntu and other distros often lack https:// support
-    - grep Debian /etc/issue.net
-        && { find /etc/apt/sources.list* -type f | xargs sed -i s,http:,https:, ; }
-    # The official Debian docker images ship without ca-certificates,
-    # TLS certificates cannot be verified until that is installed. The
-    # following code turns off TLS verification, and enables HTTPS, so
-    # at least unverified TLS is used for apt-get instead of plain
-    # HTTP.  Once ca-certificates is installed, the CA verification is
-    # enabled by removing this config.  This set up makes the initial
-    # `apt-get update` and `apt-get install` look the same as verified
-    # TLS to the network observer and hides the metadata.
-    - echo 'Acquire::https::Verify-Peer "false";' > /etc/apt/apt.conf.d/99nocacertificates
     - apt-get update
-    - apt-get install ca-certificates
-    - rm /etc/apt/apt.conf.d/99nocacertificates
     - apt-get dist-upgrade
 
-# For jobs that only need to run when there are changes to Python files.
-.python-rules-changes: &python-rules-changes
-  rules:
-    - changes:
-        - .gitlab-ci.yml
-        - fdroid
-        - makebuildserver
-        - setup.py
-        - fdroidserver/*.py
-        - tests/*.py
-
-
-# Since F-Droid uses Debian as its default platform, from production
-# servers to CI to contributor machines, it is important to know when
-# changes in Debian break our stuff.  This tests against the latest
-# dependencies as they are included in Debian.
 debian_testing:
   image: debian:testing
   <<: *apt-template
-  rules:
-    - if: $CI_COMMIT_BRANCH == "master" && $CI_PROJECT_PATH == "fdroid/fdroidserver"
+  only:
+    - master@fdroid/fdroidserver
   script:
     - apt-get install
         aapt
         androguard
         apksigner
-        dexdump
         fdroidserver
         git
         gnupg
-        ipfs-cid
-        python3-biplist
         python3-defusedxml
-        python3-libcloud
-        python3-pycountry
         python3-setuptools
-        sdkmanager
+        zipalign
     - python3 -c 'import fdroidserver'
     - python3 -c 'import androguard'
-    - python3 -c 'import sdkmanager'
     - cd tests
     - ./run-tests
 
-
 # Test using latest LTS set up with the PPA, including Recommends.
+# bionic's apksigner, which comes from Recommends:, requires binfmt
+# support in the kernel.
 ubuntu_lts_ppa:
   image: ubuntu:latest
   <<: *apt-template
-  rules:
-    - if: $CI_COMMIT_BRANCH == "master" && $CI_PROJECT_PATH == "fdroid/fdroidserver"
+  only:
+    - master@fdroid/fdroidserver
   script:
     - export ANDROID_HOME=/usr/lib/android-sdk
     - apt-get install gnupg
-    - while ! apt-key adv --keyserver keyserver.ubuntu.com --recv-key 9AAC253193B65D4DF1D0A13EEC4632C79C5E0151; do sleep 15; done
-    - export RELEASE=$(sed -n 's,^Suites\x3a \([a-z]*\).*,\1,p' /etc/apt/sources.list.d/*.sources | head -1)
+    - while ! apt-key adv --keyserver hkp://pool.sks-keyservers.net --recv-key 9AAC253193B65D4DF1D0A13EEC4632C79C5E0151; do sleep 15; done
+    - export RELEASE=`sed -n 's,^deb [^ ][^ ]* \([a-z]*\).*,\1,p' /etc/apt/sources.list | head -1`
     - echo "deb http://ppa.launchpad.net/fdroid/fdroidserver/ubuntu $RELEASE main" >> /etc/apt/sources.list
     - apt-get update
     - apt-get dist-upgrade
-    - apt-get install --install-recommends
-        dexdump
-        fdroidserver
-        git
-        python3-biplist
-        python3-pycountry
-        python3-setuptools
-        sdkmanager
-
-    # Test things work with a default branch other than 'master'
-    - git config --global init.defaultBranch thisisnotmasterormain
-
+    - mount | grep binfmt_misc || mount -t binfmt_misc binfmt_misc /proc/sys/fs/binfmt_misc
+    - apt-get install --install-recommends binfmt-support fdroidserver git python3-defusedxml python3-setuptools
+    - ls -l /proc/sys/fs/binfmt_misc || true
+    - test -e /proc/sys/fs/binfmt_misc/jarwrapper || apt -qy purge apksigner
     - cd tests
     - ./run-tests
 
-
-# Test to see how rclone works with S3
-test_deploy_to_s3_with_rclone:
-  image: debian:bookworm-slim
-  <<: *apt-template
-  tags:
-    - saas-linux-small-amd64  # the shared runners are known to support Docker.
-  services:
-    - name: docker:dind
-      command: ["--tls=false"]
-  variables:
-    DOCKER_HOST: "tcp://docker:2375"
-    DOCKER_DRIVER: overlay2
-    DOCKER_TLS_CERTDIR: ""
-  before_script:
-    # ensure minio is up before executing tests
-    - apt-get update
-    - apt-get install -y
-        androguard
-        apksigner
-        curl
-        docker.io
-        git
-        python3-venv
-        rclone
-    # This job requires working docker but will silently fail if docker is not available
-    - docker info
-    - python3 -m venv --system-site-packages test-venv
-    - . test-venv/bin/activate
-    - pip install testcontainers[minio]
-    - pip install .
-  script:
-    - python3 -m unittest -k test_update_remote_storage_with_rclone --verbose
-  rules:
-    - changes:
-        - .gitlab-ci.yml
-        - fdroidserver/deploy.py
-        - tests/test_deploy.py
-        - tests/test_integration.py
-
-
-# Test using Ubuntu/jammy LTS (supported til April, 2027) with depends
-# from pypi and sdkmanager.  The venv is used to isolate the dist
-# tarball generation environment from the clean install environment.
-ubuntu_jammy_pip:
-  image: ubuntu:jammy
+# Test using Xenial LTS with all depends from pypi.  The venv is used
+# to isolate the dist tarball generation environment from the clean
+# install environment.  Xenial's pip is too old to install all the
+# dependencies, so this has to uppgrade pip and setuptools in order to
+# run the install.
+ubuntu_xenial_pip:
+  image: ubuntu:xenial
   <<: *apt-template
   script:
-    - apt-get install git default-jdk-headless python3-pip python3-venv rsync
-
+    - apt-get install git default-jdk-headless python3-pip python3-venv rsync zipalign libarchive13
+    - rm -rf env
+    - pyvenv env
+    - . env/bin/activate
+    - $pip install --upgrade babel pip setuptools
     # setup venv to act as release build machine
-    - python3 -m venv sdist-env
+    - python -m venv sdist-env
     - . sdist-env/bin/activate
-    - ./setup.py sdist
+    - ./setup.py compile_catalog sdist
     - deactivate
-    - tar tzf dist/fdroidserver-*.tar.gz
-
+    - tar tzf dist/fdroidserver-*.tar.gz | grep locale/de/LC_MESSAGES/fdroidserver.mo
     # back to bare machine to act as user's install machine
-    - export ANDROID_HOME=/opt/android-sdk
-    - $pip install sdkmanager
-    - sdkmanager 'build-tools;35.0.0'
-
-    # Install extras_require.optional from setup.py
-    - $pip install biplist pycountry
-
+    - $pip install --upgrade pip setuptools
     - $pip install dist/fdroidserver-*.tar.gz
-    - tar xzf dist/fdroidserver-*.tar.gz
-    - cd fdroidserver-*
-    - export PATH=$PATH:$ANDROID_HOME/build-tools/35.0.0
-    - fdroid=`which fdroid` ./tests/run-tests
+    - test -e /usr/share/locale/de/LC_MESSAGES/fdroidserver.mo
+    - ./tests/run-tests
 
-    # check localization was properly installed
-    - LANGUAGE='de' fdroid --help | grep 'Gültige Befehle sind'
+# test install process on a bleeding edge distro with pip
+arch_pip_install:
+  image: archlinux/base
+  only:
+    - master@fdroid/fdroidserver
+  script:
+    - pacman --sync --sysupgrade --refresh --noconfirm git grep python-pip python-virtualenv tar
+    - pip install -e .
+    - fdroid
+    - fdroid readmeta
+    - fdroid update --help
 
-
-# Run all the various linters and static analysis tools.
-hooks/pre-commit:
-  stage: lint
-  image: debian:bookworm-slim
+lint_format_safety_bandit_checks:
+  image: alpine:3.10 # cannot upgrade until bandit supports Python 3.8
   variables:
     LANG: C.UTF-8
   script:
-    - apt-get update
-    - apt-get -y install --no-install-recommends
-          bash
-          ca-certificates
-          dash
-          gcc
-          git
-          make
-          pycodestyle
-          pyflakes3
-          python3-dev
-          python3-git
-          python3-nose
-          python3-pip
-          python3-yaml
-    - ./hooks/pre-commit
-
-bandit:
-  image: debian:bookworm-slim
-  <<: *python-rules-changes
-  <<: *apt-template
-  script:
-    - apt-get install python3-pip
-    - $pip install --break-system-packages bandit
-    - bandit -r -ii --ini .bandit
-
-pylint:
-  stage: lint
-  image: debian:bookworm-slim
-  <<: *python-rules-changes
-  <<: *apt-template
-  script:
-    - apt-get install pylint python3-pip
-    - $pip install --break-system-packages pylint-gitlab
-    - pylint --output-format=colorized,pylint_gitlab.GitlabCodeClimateReporter:pylint-report.json
+    - apk add --no-cache bash build-base dash ca-certificates gcc python3 python3-dev
+    - python3 -m ensurepip
+    - $pip install Babel 'bandit<1.6.0' pycodestyle pyflakes pylint safety
+    - export EXITVALUE=0
+    - function set_error() { export EXITVALUE=1; printf "\x1b[31mERROR `history|tail -2|head -1|cut -b 6-500`\x1b[0m\n"; }
+    - ./hooks/pre-commit || set_error
+    - ./tests/test-gradlew-fdroid || set_error
+    - bandit
+        -ii
+        -s B110,B322,B404,B408,B410,B603,B607
+        -r $CI_PROJECT_DIR fdroid
+        || set_error
+    - safety check --full-report || set_error
+    - pylint --rcfile=.pylint-rcfile --output-format=colorized --reports=n
             fdroid
             makebuildserver
             setup.py
             fdroidserver/*.py
             tests/*.py
-  artifacts:
-    reports:
-      codequality: pylint-report.json
-    when: always
-
-
-shellcheck:
-  stage: lint
-  image: debian:bookworm-slim
-  rules:
-    - changes:
-        - .gitlab-ci.yml
-        - hooks/install-hooks.sh
-        - hooks/pre-commit
-        - tests/run-tests
-  <<: *apt-template
-  script:
-    - apt-get install shellcheck
-    # TODO GitLab Code Quality report https://github.com/koalaman/shellcheck/issues/3155
-    - shellcheck --exclude SC2046,SC2090 --severity=warning --color
-        hooks/install-hooks.sh
-        hooks/pre-commit
-        tests/run-tests
-
-# Check all the dependencies in Debian to mirror production.  CVEs are
-# generally fixed in the latest versions in pip/pypi.org, so it isn't
-# so important to scan that kind of install in CI.
-# https://docs.safetycli.com/safety-docs/installation/gitlab
-safety:
-  image: debian:bookworm-slim
-  rules:
-    - if: $SAFETY_API_KEY
-      changes:
-        - .gitlab-ci.yml
-        - .safety-policy.yml
-        - pyproject.toml
-        - setup.py
-  <<: *apt-template
-  variables:
-    LANG: C.UTF-8
-  script:
-    - apt-get install
-        fdroidserver
-        python3-biplist
-        python3-pip
-        python3-pycountry
-    - $pip install --break-system-packages .
-
-    - $pip install --break-system-packages safety
-    - python3 -m safety --key "$SAFETY_API_KEY" --stage cicd scan
-
-
-# TODO tests/*/*/*.yaml are not covered
-yamllint:
-  stage: lint
-  image: debian:bookworm-slim
-  rules:
-    - changes:
-        - .gitlab-ci.yml
-        - .safety-policy.yml
-        - .yamllint
-        - tests/*.yml
-        - tests/*/*.yml
-        - tests/*/*/.*.yml
-  <<: *apt-template
-  variables:
-    LANG: C.UTF-8
-  script:
-    - apt-get install yamllint
-    - yamllint
-        .gitlab-ci.yml
-        .safety-policy.yml
-        .yamllint
-        tests/*.yml
-        tests/*/*.yml
-        tests/*/*/.*.yml
-
-
-locales:
-  stage: lint
-  image: debian:bookworm-slim
-  variables:
-    LANG: C.UTF-8
-  script:
-    - apt-get update
-    - apt-get -y install --no-install-recommends
-          gettext
-          make
-          python3-babel
-    - export EXITVALUE=0
-    - function set_error() { export EXITVALUE=1; printf "\x1b[31mERROR `history|tail -2|head -1|cut -b 6-500`\x1b[0m\n"; }
+            tests/*.TestCase
+        || set_error
+    - apk add --no-cache gettext make
     - make -C locale compile || set_error
     - rm -f locale/*/*/*.mo
-    - pybabel compile --domain=fdroidserver --directory locale 2>&1 | { grep -F "error:" && exit 1; } || true
+    - pybabel compile --domain=fdroidserver --directory locale 2>&1 | (grep -F "error:" && exit 1) || true
     - exit $EXITVALUE
 
-
-black:
-  stage: lint
-  image: debian:bookworm-slim
-  <<: *apt-template
-  script:
-    - apt-get install black
-    - black --check --diff --color $CI_PROJECT_DIR
-
 fedora_latest:
-  image: fedora:39  # support ends on 2024-11-12
+  image: fedora:latest
+  only:
+    - master@fdroid/fdroidserver
   script:
     # tricks to hopefully make runs more reliable
     - echo "timeout=600" >> /etc/dnf/dnf.conf
@@ -426,429 +192,102 @@ fedora_latest:
                      findutils
                      git
                      gnupg
-                     java-17-openjdk-devel
-                     openssl
+                     java-1.8.0-openjdk-devel
                      python3
                      python3-babel
                      python3-matplotlib
                      python3-pip
-                     python3-pycountry
                      rsync
+                     unzip
+                     wget
                      which
-    - $pip install sdkmanager
-    - ./setup.py sdist
+    - ./setup.py compile_catalog sdist
     - useradd -m -c "test account" --password "fakepassword"  testuser
     - su testuser --login --command "cd `pwd`; $pip install --user dist/fdroidserver-*.tar.gz"
     - test -e ~testuser/.local/share/locale/de/LC_MESSAGES/fdroidserver.mo
+    - wget --no-verbose -O tools.zip https://dl.google.com/android/repository/tools_r25.2.5-linux.zip
+    - unzip -q tools.zip
+    - rm tools.zip
     - export BUILD_TOOLS_VERSION=`sed -n "s,^MINIMUM_APKSIGNER_BUILD_TOOLS_VERSION\s*=\s*['\"]\(.*\)[['\"],\1,p" fdroidserver/common.py`
+    - export JAVA_HOME=/etc/alternatives/jre
     - export ANDROID_HOME=`pwd`/android-sdk
+    - mkdir $ANDROID_HOME
+    - mv tools $ANDROID_HOME/
     - mkdir -p $ANDROID_HOME/licenses/
     - printf "\n8933bad161af4178b1185d1a37fbf41ea5269c55\nd56f5187479451eabf01fb78af6dfcb131a6481e\n24333f8a63b6825ea9c5514f83c2829b004d1fee" > $ANDROID_HOME/licenses/android-sdk-license
     - printf "\n84831b9409646a918e30573bab4c9c91346d8abd" > $ANDROID_HOME/licenses/android-sdk-preview-license
     - printf "\n79120722343a6f314e0719f863036c702b0e6b2a\n84831b9409646a918e30573bab4c9c91346d8abd" > $ANDROID_HOME/licenses/android-sdk-preview-license-old
     - mkdir ~/.android
     - touch ~/.android/repositories.cfg
-    - sdkmanager "platform-tools" "build-tools;$BUILD_TOOLS_VERSION"
+    - echo y | $ANDROID_HOME/tools/bin/sdkmanager "platform-tools"
+    - echo y | $ANDROID_HOME/tools/bin/sdkmanager "build-tools;$BUILD_TOOLS_VERSION"
     - chown -R testuser .
     - cd tests
     - su testuser --login --command
-        "cd `pwd`; export CI=$CI ANDROID_HOME=$ANDROID_HOME; fdroid=~testuser/.local/bin/fdroid ./run-tests"
-
-
-macOS:
-  tags:
-    - saas-macos-medium-m1
-  rules:
-    - if: $CI_COMMIT_BRANCH == "master" && $CI_PROJECT_PATH == "fdroid/fdroidserver"
-  script:
-    - export HOMEBREW_CURL_RETRIES=10
-    - brew update > /dev/null
-    - brew upgrade
-    - brew install fdroidserver
-
-    # Android SDK and Java JDK
-    - brew install --cask android-commandlinetools temurin  # temurin is a JDK
-
-    # test suite dependencies
-    - brew install bash coreutils gnu-sed
-    # TODO port tests/run-tests to POSIX and gsed, it has a couple GNU-isms like du --bytes
-    - export PATH="$(brew --prefix fdroidserver)/libexec/bin:$(brew --prefix coreutils)/libexec/gnubin:$PATH"
-
-    - brew autoremove
-    - brew info fdroidserver
-
-    - export BUILD_TOOLS_VERSION=`gsed -n "s,^MINIMUM_APKSIGNER_BUILD_TOOLS_VERSION\s*=\s*['\"]\(.*\)[['\"],\1,p" fdroidserver/common.py`
-    - export ANDROID_HOME="$(brew --prefix)/share/android-commandlinetools"
-    - mkdir -p "$ANDROID_HOME/licenses"
-    - echo -e "\n8933bad161af4178b1185d1a37fbf41ea5269c55" > "$ANDROID_HOME/licenses/android-sdk-license"
-    - echo -e "\nd56f5187479451eabf01fb78af6dfcb131a6481e" >> "$ANDROID_HOME/licenses/android-sdk-license"
-    - echo -e "\n24333f8a63b6825ea9c5514f83c2829b004d1fee" >> "$ANDROID_HOME/licenses/android-sdk-license"
-    - $(brew --prefix)/bin/sdkmanager "build-tools;$BUILD_TOOLS_VERSION"
-
-    - echo "macOS sticks with bash 3.x because of licenses, so avoid new bash syntax"
-    - /bin/bash --version
-    - /bin/bash -n tests/run-tests
-
-    # test fdroidserver from git with current package's dependencies
-    - fdroid="$(brew --prefix fdroidserver)/libexec/bin/python3 $PWD/fdroid" ./tests/run-tests
-
+        "cd `pwd`; export ANDROID_HOME=$ANDROID_HOME; fdroid=~testuser/.local/bin/fdroid ./run-tests"
 
 gradle:
-  image: debian:trixie-slim
-  <<: *apt-template
-  rules:
-    - changes:
-        - .gitlab-ci.yml
-        - makebuildserver
+  image: alpine:3.7
+  variables:
+    LANG: C.UTF-8
   script:
-    - apt-get install
-          ca-certificates
-          git
-          python3-colorama
-          python3-packaging
-          python3-requests
+    - apk add --no-cache ca-certificates git python3
+    # if this is a merge request fork, then only check if makebuildserver changed
+    - if [ "$CI_PROJECT_NAMESPACE" != "fdroid" ]; then
+        git fetch https://gitlab.com/fdroid/fdroidserver.git;
+        for f in `git diff --name-only --diff-filter=d FETCH_HEAD...HEAD`; do
+           test "$f" == "makebuildserver" && export CHANGED="yes";
+        done;
+        test -z "$CHANGED" && exit;
+      fi
+    - python3 -m ensurepip
+    - $pip install beautifulsoup4 requests
     - ./tests/gradle-release-checksums.py
 
-
-# Run an actual build in a simple, faked version of the buildserver guest VM.
 fdroid build:
-  image: registry.gitlab.com/fdroid/fdroidserver:buildserver
-  rules:
-    - changes:
-        - .gitlab-ci.yml
-        - fdroidserver/build.py
-        - fdroidserver/common.py
-        - fdroidserver/exception.py
-        - fdroidserver/metadata.py
-        - fdroidserver/net.py
-        - fdroidserver/scanner.py
-        - fdroidserver/vmtools.py
-        # for the docker: job which depends on this one
-        - makebuildserver
-        - buildserver/*
+  image: registry.gitlab.com/fdroid/ci-images-client
+  only:
+    refs:
+      - branches
+      - pipelines
+    changes:
+      - .gitlab-ci.yml
+      - buildserver/provision-apt-get-install
+      - fdroidserver/build.py
+      - fdroidserver/common.py
+      - fdroidserver/exception.py
+      - fdroidserver/metadata.py
+      - fdroidserver/net.py
+      - fdroidserver/scanner.py
+      - fdroidserver/vmtools.py
   cache:
     key: "$CI_JOB_NAME"
     paths:
       - .gradle
   script:
-    - apt-get update
+    - bash buildserver/provision-apt-get-install http://deb.debian.org/debian
     - apt-get dist-upgrade
-    - apt-get clean
-
-    - test -n "$fdroidserver" || source /etc/profile.d/bsenv.sh
-
-    - ln -fsv "$CI_PROJECT_DIR" "$fdroidserver"
-
-    # TODO remove sdkmanager install once it is included in the buildserver image
-    - apt-get install sdkmanager
-    - rm -rf "$ANDROID_HOME/tools"  # TODO remove once sdkmanager can upgrade installed packages
-    - sdkmanager "tools" "platform-tools" "build-tools;31.0.0"
-
-    - git ls-remote https://gitlab.com/fdroid/fdroiddata.git master
-    - git clone --depth 1 https://gitlab.com/fdroid/fdroiddata.git
-    - cd fdroiddata
-    - for d in build logs repo tmp unsigned $home_vagrant/.android; do
-          test -d $d || mkdir $d;
-          chown -R vagrant $d;
-      done
-
-    - export GRADLE_USER_HOME=$home_vagrant/.gradle
-    - export fdroid="sudo --preserve-env --user vagrant
-          env PATH=$fdroidserver:$PATH
-          env PYTHONPATH=$fdroidserver:$fdroidserver/examples
-          env PYTHONUNBUFFERED=true
-          env TERM=$TERM
-          env HOME=$home_vagrant
-          fdroid"
-
-    - git -C $home_vagrant/gradlew-fdroid pull
-
-    - chown -R vagrant $home_vagrant
-    - chown -R vagrant $fdroidserver/.git
-    - chown vagrant $fdroidserver/
-    - chown -R vagrant .git
-    - chown vagrant .
-
-    # try user build
-    - $fdroid build --verbose --latest org.fdroid.fdroid.privileged
-
-    # try on-server build
-    - $fdroid build --verbose --on-server --no-tarball --latest org.fdroid.fdroid
-
-    # each `fdroid build --on-server` run expects sudo, then uninstalls it
-    - if dpkg --list sudo; then echo "sudo should not be still there"; exit 1; fi
-    - 'if [ ! -f repo/status/running.json ]; then echo "ERROR: running.json does not exist!"; exit 1; fi'
-    - 'if [ ! -f repo/status/build.json ]; then echo "ERROR: build.json does not exist!"; exit 1; fi'
-
-
-# test the plugin API and specifically the fetchsrclibs plugin, which
-# is used by the `fdroid build` job.  This uses a fixed commit from
-# fdroiddata because that one is known to work, and this is a CI job,
-# so it should be isolated from the normal churn of fdroiddata.
-plugin_fetchsrclibs:
-  image: debian:bookworm-slim
-  <<: *apt-template
-  rules:
-    - changes:
-        - .gitlab-ci.yml
-        - examples/fdroid_fetchsrclibs.py
-        - fdroidserver/__main__.py
-  script:
-    - apt-get install
-        curl
-        git
-        python3-cffi
-        python3-matplotlib
-        python3-nacl
-        python3-paramiko
-        python3-pil
-        python3-pip
-        python3-pycparser
-        python3-venv
-    - python3 -m venv --system-site-packages env
+    - apt-get install -t stretch-backports
+         python3-asn1crypto
+         python3-pip
+         python3-ruamel.yaml
+         python3-setuptools
+         python3-venv
+    - apt-get purge fdroidserver
+    - pyvenv env --system-site-packages
     - . env/bin/activate
+    - $pip install -e .
     - export PATH="$CI_PROJECT_DIR:$PATH"
-    - export PYTHONPATH="$CI_PROJECT_DIR/examples"
-    # workaround https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1003252
-    - export SETUPTOOLS_USE_DISTUTILS=stdlib
-    - $pip install -e .
-    - fdroid | grep fetchsrclibs
+    - export PYTHONPATH=$CI_PROJECT_DIR
+    - export PYTHONUNBUFFERED=true
 
-    - mkdir fdroiddata
-    - commitid=b9e9a077d720c86ff6fff4dbb341254cc4370b1a
-    - curl https://gitlab.com/fdroid/fdroiddata/-/archive/${commitid}/fdroiddata-${commitid}.tar.gz
-          | tar -xz --directory=fdroiddata --strip-components=1
+    - git clone https://gitlab.com/fdroid/fdroiddata.git --depth 1
     - cd fdroiddata
-    - fdroid fetchsrclibs freemap.opentrail:4 --verbose
-    - test -d build/freemap.opentrail/.git
-    - test -d build/srclib/andromaps/.git
-    - test -d build/srclib/freemaplib/.git
-    - test -d build/srclib/freemaplibProj/.git
-    - test -d build/srclib/JCoord/.git
-    - test -d build/srclib/javaproj/.git
+    - test -d build || mkdir build
 
-
-# test a full update and deploy cycle to gitlab.com
-servergitmirrors:
-  image: debian:bookworm-slim
-  <<: *apt-template
-  rules:
-    - if: $CI_COMMIT_BRANCH == "master" && $CI_PROJECT_PATH == "fdroid/fdroidserver"
-  script:
-    - apt-get install
-        default-jdk-headless
-        git
-        openssh-client
-        openssl
-        python3-cffi
-        python3-cryptography
-        python3-matplotlib
-        python3-nacl
-        python3-pil
-        python3-pip
-        python3-pycparser
-        python3-setuptools
-        python3-venv
-        rsync
-        wget
-    - apt-get install apksigner
-    - python3 -m venv --system-site-packages env
-    - . env/bin/activate
-    - export PYTHONPATH=`pwd`
-    - export SETUPTOOLS_USE_DISTUTILS=stdlib  # https://github.com/pypa/setuptools/issues/2956
-    - $pip install -e .
-    - mkdir /root/.ssh/
-    - ./tests/key-tricks.py
-    - ssh-keyscan gitlab.com >> /root/.ssh/known_hosts
-    - test -d /tmp/fdroid/repo || mkdir -p /tmp/fdroid/repo
-    - cp tests/config.yml tests/keystore.jks /tmp/fdroid/
-    - cp tests/repo/com.politedroid_6.apk /tmp/fdroid/repo/
-    - cd /tmp/fdroid
-    - touch fdroid-icon.png
-    - printf "\nservergitmirrors\x3a 'git@gitlab.com:fdroid/ci-test-servergitmirrors-repo.git'\n" >> config.yml
-    - $PYTHONPATH/fdroid update --verbose --create-metadata
-    - $PYTHONPATH/fdroid deploy --verbose
-    - export DLURL=`grep -Eo 'https://gitlab.com/fdroid/ci-test-servergitmirrors-repo[^"]+' repo/index-v1.json`
-    - echo $DLURL
-    - wget $DLURL/index-v1.jar
-    - diff repo/index-v1.jar index-v1.jar
-
-Build documentation:
-  image: debian:bookworm-slim
-  <<: *python-rules-changes
-  <<: *apt-template
-  script:
-    - apt-get install make python3-sphinx python3-numpydoc python3-pydata-sphinx-theme pydocstyle fdroidserver
-    - apt purge fdroidserver
-    # ignore vendored files
-    - pydocstyle --verbose --match='(?!apksigcopier|looseversion|setup|test_).*\.py' fdroidserver
-    - cd docs
-    - sphinx-apidoc -o ./source ../fdroidserver -M -e
-    - PYTHONPATH=.. sphinx-autogen -o generated source/*.rst
-    - PYTHONPATH=.. make html
-  artifacts:
-    paths:
-      - docs/build/html/
-
-
-# this job will only run in branches called "windows" until the Windows port is complete
-Windows:
-  tags:
-    - windows
-  rules:
-    - if: $CI_COMMIT_BRANCH == "windows"
-  script:
-    - Import-Module "$env:ChocolateyInstall\helpers\chocolateyProfile.psm1"
-    - choco install --no-progress -y git --force --params "/GitAndUnixToolsOnPath"
-    - choco install --no-progress -y python3 --version=3.10
-    - choco install --no-progress -y jdk8
-    - choco install --no-progress -y rsync
-    - refreshenv
-    - python -m pip install --upgrade babel pip setuptools
-    - python -m pip install -e .
-
-    - $files = @(Get-ChildItem tests\test_*.py)
-    - foreach ($f in $files) {
-          write-output $f;
-          python -m unittest $f;
-          if( $LASTEXITCODE -eq 0 ) {
-              write-output "SUCCESS $f";
-          } else {
-              write-output "ERROR $f failed";
-          }
-      }
-
-    # these are the tests that must pass
-    - python -m unittest -k
-        checkupdates
-        exception
-        import_subcommand
-        test_lint
-        test_metadata
-        test_rewritemeta
-        test_vcs
-        tests.test_init
-        tests.test_main
-  after_script:
-    - Copy-Item C:\ProgramData\chocolatey\logs\chocolatey.log
-  artifacts:
-    when: always
-    paths:
-      - "*.log"
-  allow_failure:
-    exit_codes: 1
-
-
-pages:
-  image: alpine:latest
-  stage: deploy
-  script:
-    - cp docs/build/html public -r  # GL Pages needs the files in a directory named "public"
-  artifacts:
-    paths:
-      - public
-  needs:
-    - job: "Build documentation"
-      optional: true
-  rules:
-    - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH'  # only publish pages on default (master) branch
-
-
-# This job pushes the official CI docker image based on the master
-# branch, so in fdroid/fdroidserver, it should only run on the master
-# branch.  Otherwise, tags or other branches will overwrite the docker
-# image which is supposed to be what is in master.
-docker:
-  dependencies:
-    - fdroid build
-  rules:
-    - if: $CI_COMMIT_BRANCH == "master" && $CI_PROJECT_PATH == "fdroid/fdroidserver"
-      changes:
-        - .gitlab-ci.yml
-        - makebuildserver
-        - buildserver/*
-  image: docker:dind
-  services:
-    - docker:dind
-  variables:
-    RELEASE_IMAGE: $CI_REGISTRY_IMAGE:buildserver
-  script:
-    # git ref names can contain many chars that are not allowed in docker tags
-    - export TEST_IMAGE=$CI_REGISTRY_IMAGE:$(printf $CI_COMMIT_REF_NAME | sed 's,[^a-zA-Z0-9_.-],_,g')
-    - cd buildserver
-    - docker build -t $TEST_IMAGE --build-arg GIT_REV_PARSE_HEAD=$(git rev-parse HEAD) .
-    - docker tag $TEST_IMAGE $RELEASE_IMAGE
-    - docker tag $TEST_IMAGE ${RELEASE_IMAGE}-bookworm
-    - echo $CI_JOB_TOKEN | docker login -u gitlab-ci-token --password-stdin registry.gitlab.com
-    # This avoids filling up gitlab.com free tier accounts with unused docker images.
-    - if test -z "$FDROID_PUSH_DOCKER_IMAGE"; then
-          echo "Skipping docker push to save quota on your gitlab namespace.";
-          echo "If you want to enable the push, set FDROID_PUSH_DOCKER_IMAGE in";
-          echo "https://gitlab.com/$CI_PROJECT_NAMESPACE/fdroidserver/-/settings/ci_cd#js-cicd-variables-settings";
-          exit 0;
-      fi
-    - docker push $RELEASE_IMAGE
-    - docker push $RELEASE_IMAGE-bookworm
-
-
-# PUBLISH is the signing server.  It has a very minimal manual setup.
-PUBLISH:
-  image: debian:bookworm-backports
-  <<: *python-rules-changes
-  script:
-    - apt-get update
-    - apt-get -qy upgrade
-    - apt-get -qy install --no-install-recommends -t bookworm-backports
-        androguard
-        apksigner
-        curl
-        default-jdk-headless
-        git
-        gpg
-        gpg-agent
-        python3-asn1crypto
-        python3-defusedxml
-        python3-git
-        python3-ruamel.yaml
-        python3-yaml
-        rsync
-
-    # Run only relevant parts of the test suite, other parts will fail
-    # because of this minimal base setup.
-    - python3 -m unittest
-        tests/test_gpgsign.py
-        tests/test_metadata.py
-        tests/test_publish.py
-        tests/test_signatures.py
-        tests/test_signindex.py
-
-    - cd tests
-    - mkdir archive
-    - mkdir unsigned
-    - cp urzip-release-unsigned.apk unsigned/info.guardianproject.urzip_100.apk
-    - grep '^key.*pass' config.yml | sed 's,\x3a ,=,' > $CI_PROJECT_DIR/variables
-    - sed -Ei 's,^(key.*pass|keystore)\x3a.*,\1\x3a {env\x3a \1},' config.yml
-    - printf '\ngpghome\x3a {env\x3a gpghome}\n' >> config.yml
-    - |
-      tee --append $CI_PROJECT_DIR/variables <<EOF
-          gpghome=$CI_PROJECT_DIR/tests/gnupghome
-          keystore=$CI_PROJECT_DIR/tests/keystore.jks
-          serverwebroot=/tmp
-          export gpghome keypass keystorepass keystore serverwebroot
-      EOF
-    - source $CI_PROJECT_DIR/variables
-    # silence warnings
-    - chmod 0600 config.yml config/*.yml config/*/*.yml
-    - chmod 0700 $gpghome
-
-    - export PATH=$CI_PROJECT_DIR:$PATH
-
-    # run signpkg.sh
-    - fdroid publish --verbose
-    - fdroid gpgsign --verbose
-    - rsync --progress repo/* $serverwebroot/
-
-    # run signindex.sh
-    - fdroid gpgsign --verbose
-    - fdroid signindex --verbose
-    - rsync --stats repo/* $serverwebroot/
+    - export GRADLE_USER_HOME=$CI_PROJECT_DIR/.gradle
+    # try a user build first
+    - fdroid build --verbose --latest org.fdroid.fdroid.privileged
+    # each `fdroid build --on-server` run expects sudo, then uninstalls it
+    - apt-get install sudo
+    - fdroid build --verbose --on-server --no-tarball --latest org.fdroid.fdroid
diff --git a/.mailmap b/.mailmap
deleted file mode 100644
index da5642c9..00000000
--- a/.mailmap
+++ /dev/null
@@ -1,2 +0,0 @@
-Gregor Düster <git@gdstr.eu> FestplattenSchnitzel <festplatte.schnitzel@posteo.de>
-Hans-Christoph Steiner <hans@eds.org> <hans@guardianproject.info>
diff --git a/.pylint-rcfile b/.pylint-rcfile
new file mode 100644
index 00000000..4685d7f4
--- /dev/null
+++ b/.pylint-rcfile
@@ -0,0 +1,45 @@
+[MASTER]
+
+# Use multiple processes to speed up Pylint.
+jobs=4
+
+# Allow loading of arbitrary C extensions. Extensions are imported into the
+# active Python interpreter and may run arbitrary code.
+unsafe-load-any-extension=no
+
+
+[MESSAGES CONTROL]
+
+# Only show warnings with the listed confidence levels. Leave empty to show
+# all. Valid levels: HIGH, INFERENCE, INFERENCE_FAILURE, UNDEFINED
+confidence=HIGH,INFERENCE
+
+# Disable the message, report, category or checker with the given id(s). You
+# can either give multiple identifiers separated by comma (,) or put this
+# option multiple times (only on the command line, not in the configuration
+# file where it should appear only once).You can also use "--disable=all" to
+# disable everything first and then reenable specific checks. For example, if
+# you want to run only the similarities checker, you can use "--disable=all
+# --enable=similarities". If you want to run only the classes checker, but have
+# no Warning level messages displayed, use"--disable=all --enable=classes
+# --disable=W"
+disable=invalid-name,missing-docstring,no-member
+
+
+[MISCELLANEOUS]
+
+# List of note tags to take in consideration, separated by a comma.
+notes=FIXME,XXX,TODO
+
+
+[BASIC]
+
+# Good variable names which should always be accepted, separated by a comma
+good-names=i,j,k,ex,Run,_,e,f,fp
+
+
+[ELIF]
+
+# Maximum number of nested blocks for function / method body
+max-nested-blocks=5
+
diff --git a/.safety-policy.yml b/.safety-policy.yml
deleted file mode 100644
index ea44e7e6..00000000
--- a/.safety-policy.yml
+++ /dev/null
@@ -1,55 +0,0 @@
----
-
-version: '3.0'
-
-scanning-settings:
-  max-depth: 6
-  exclude:
-
-report:
-  dependency-vulnerabilities:
-    enabled: true
-    auto-ignore-in-report:
-      vulnerabilities:
-        52495:
-          reason: setuptools comes from Debian
-          expires: '2025-01-31'
-        60350:
-          reason: GitPython comes from Debian https://security-tracker.debian.org/tracker/CVE-2023-40267
-          expires: '2025-01-31'
-        60789:
-          reason: GitPython comes from Debian https://security-tracker.debian.org/tracker/CVE-2023-40590
-          expires: '2025-01-31'
-        60841:
-          reason: GitPython comes from Debian https://security-tracker.debian.org/tracker/CVE-2023-41040
-          expires: '2025-01-31'
-        62044:
-          reason: "F-Droid doesn't fetch pip dependencies directly from hg/mercurial repositories: https://data.safetycli.com/v/62044/f17/"
-          expires: '2025-01-31'
-        63687:
-          reason: Only affects Windows https://security-tracker.debian.org/tracker/CVE-2024-22190
-          expires: '2026-01-31'
-        67599:
-          reason: Only affects pip when using --extra-index-url, which is never the case in fdroidserver CI.
-          expires: '2026-05-31'
-        70612:
-          reason: jinja2 is not used by fdroidserver, nor any dependencies I could find via debtree and pipdeptree.
-          expires: '2026-05-31'
-        72132:
-          reason: We get these packages from Debian, zipp is not used in production, and its only a DoS.
-          expires: '2026-08-31'
-        72236:
-          reason: setuptools is not used in production to download or install packages, they come from Debian.
-          expires: '2026-08-31'
-
-fail-scan-with-exit-code:
-  dependency-vulnerabilities:
-    enabled: true
-    fail-on-any-of:
-      cvss-severity:
-        - critical
-        - high
-        - medium
-
-security-updates:
-  dependency-vulnerabilities:
diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 00000000..a012541b
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,91 @@
+
+# Use the Android base system since it provides the SDK, etc.
+language: java
+
+matrix:
+  include:
+    - os: osx
+      osx_image: xcode12
+      env: ANDROID_SDK_ROOT=/usr/local/share/android-sdk
+      env: ANDROID_HOME=/usr/local/share/android-sdk
+    - os: osx
+      osx_image: xcode10.3
+      env: ANDROID_SDK_ROOT=/usr/local/share/android-sdk
+      env: ANDROID_HOME=/usr/local/share/android-sdk
+
+android:
+  components:
+    - android-23  # required for `fdroid build` test
+    - build-tools-28.0.3  # required for `fdroid build` test
+  licenses:
+    - 'android-sdk-preview-.+'
+    - 'android-sdk-license-.+'
+
+# * ensure java8 is installed since Android SDK doesn't work with Java9
+# * Java needs to be at least 1.8.0_131 to have MD5 properly disabled
+#   https://blogs.oracle.com/java-platform-group/oracle-jre-will-no-longer-trust-md5-signed-code-by-default
+#   https://opsech.io/posts/2017/Jun/09/openjdk-april-2017-security-update-131-8u131-and-md5-signed-jars.html
+# * mercurial is unused and requires Python 2.x
+install:
+  - export HOMEBREW_CURL_RETRIES=10
+  - brew update > /dev/null
+  - if [ "`sw_vers -productVersion | sed 's,10\.\([0-9]*\).*,\1,'`" -ge 14 ]; then
+        python3 --version;
+    elif [ "`sw_vers -productVersion | sed 's,10\.\([0-9]*\).*,\1,'`" -gt 10 ]; then
+        brew uninstall mercurial --force;
+        brew upgrade python;
+    else
+        brew install python3;
+    fi
+  - brew install dash bash gnu-sed gradle jenv
+  - export PATH="/usr/local/opt/gnu-sed/libexec/gnubin:$PATH"
+  - brew uninstall java --force || true
+  - brew cask uninstall java --force || true
+  - brew tap adoptopenjdk/openjdk
+  - travis_retry brew cask install adoptopenjdk8
+  - travis_retry brew cask install android-sdk
+
+  - export AAPT_VERSION=`sed -n "s,^MINIMUM_APKSIGNER_BUILD_TOOLS_VERSION\s*=\s*['\"]\(.*\)[['\"],\1,p" fdroidserver/common.py`
+  - mkdir -p "$ANDROID_HOME/licenses"
+  - echo -e "\n8933bad161af4178b1185d1a37fbf41ea5269c55" > "$ANDROID_HOME/licenses/android-sdk-license"
+  - echo -e "\nd56f5187479451eabf01fb78af6dfcb131a6481e" >> "$ANDROID_HOME/licenses/android-sdk-license"
+  - echo -e "\n24333f8a63b6825ea9c5514f83c2829b004d1fee" >> "$ANDROID_HOME/licenses/android-sdk-license"
+  - echo -e "\n84831b9409646a918e30573bab4c9c91346d8abd" > "$ANDROID_HOME/licenses/android-sdk-preview-license"
+  - echo y | travis_retry $ANDROID_HOME/tools/bin/sdkmanager "platform-tools" > /dev/null
+  - echo y | travis_retry $ANDROID_HOME/tools/bin/sdkmanager "build-tools;$AAPT_VERSION" > /dev/null
+  - echo y | travis_retry $ANDROID_HOME/tools/bin/sdkmanager "platforms;android-23" > /dev/null
+
+  - travis_retry sudo pip3 install --progress-bar off babel
+  - travis_retry sudo pip3 install --quiet --progress-bar off --editable .
+  - sudo rm -rf fdroidserver.egg-info
+
+  - ls -l /System/Library/Java/JavaVirtualMachines || true
+  - ls -l /Library/Java/JavaVirtualMachines || true
+  - for f in /Library/Java/JavaVirtualMachines/*.jdk; do jenv add $f; done
+  - echo $PATH
+  - echo $JAVA_HOME
+  - jenv versions
+  - /usr/libexec/java_home
+  - java -version
+  - which java
+  - javac -version
+  - which javac
+  - jarsigner -help
+  - which jarsigner
+  - keytool -help
+  - which keytool
+  - sudo rm -rf /Library/Java/JavaVirtualMachines/jdk1.8.0_1*.jdk || true
+
+# The OSX tests seem to run slower, they often timeout.  So only run
+# the test suite with the installed version of fdroid.
+#
+# macOS sticks with bash 3.x because of licenses, so avoid use new bash syntax
+script:
+  - /bin/bash --version
+  - /bin/bash -n gradlew-fdroid tests/run-tests
+
+  - ./tests/run-tests
+
+after_failure:
+  - cd $TRAVIS_BUILD_DIR
+  - ls -lR | curl -F 'clbin=<-' https://clbin.com
diff --git a/.vscode/extensions.json b/.vscode/extensions.json
deleted file mode 100644
index f0fec078..00000000
--- a/.vscode/extensions.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "recommendations": [
-        "ms-python.python",
-    ]
-}
diff --git a/.vscode/settings.json b/.vscode/settings.json
deleted file mode 100644
index da31cd7f..00000000
--- a/.vscode/settings.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-    "python.formatting.blackArgs": [
-        "--config=pyproject.toml"
-    ],
-    "python.formatting.provider": "black",
-    "python.linting.banditEnabled": true,
-    "python.linting.banditArgs": [
-        "-ii",
-        "--ini=.bandit",
-    ],
-    "python.linting.enabled": true,
-    "python.linting.mypyArgs": [
-        "--config-file=mypy.ini"
-    ],
-    "python.linting.mypyEnabled": true,
-    "python.linting.flake8Enabled": true,
-    "python.linting.pylintArgs": [
-        "--rcfile=.pylint-rcfile"
-    ],
-    "python.linting.pylintEnabled": true,
-}
diff --git a/.well-known/funding-manifest-urls b/.well-known/funding-manifest-urls
deleted file mode 100644
index 9935b4d4..00000000
--- a/.well-known/funding-manifest-urls
+++ /dev/null
@@ -1 +0,0 @@
-https://f-droid.org/funding.json
diff --git a/.yamllint b/.yamllint
deleted file mode 100644
index 067a389e..00000000
--- a/.yamllint
+++ /dev/null
@@ -1,7 +0,0 @@
----
-
-extends: default
-rules:
-  document-start: disable
-  line-length: disable
-  truthy: disable
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6b61a8f2..3c4f69a7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,375 +4,20 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 
-## [2.5.0] - NEXT
-
-### Removed
-
-* deploy: `awsaccesskeyid:` and `awssecretkey:` config items removed, use the
-  standard env vars: `AWS_ACCESS_KEY_ID` and `AWS_SECRET_ACCESS_KEY`.
-
-## [2.4.2] - 2025-06-24
-
-### Fixed
-
-* nightly: fix bug that clones nightly repo to wrong location
-  https://gitlab.com/fdroid/fdroidserver/-/merge_requests/1672
-* Sync translations for all supported languages: es pl ru
-
-## [2.4.1] - 2025-06-23
-
+## [Unreleased]
 ### Added
-
-* build: Clearer error messages when working with Git.
-* verify: generate <appid>.json files that list all reports
-  https://gitlab.com/fdroid/fdroidserver/-/merge_requests/1632
-
-### Fixed
-
-* deploy: use master branch when working complete git-mirror repo
-  https://gitlab.com/fdroid/fdroidserver/-/merge_requests/1666
-* update: use ctime/mtime to control _strip_and_copy_image runs
-  https://gitlab.com/fdroid/fdroidserver/-/merge_requests/1665
-* update: If categories.yml only has icon:, then add name:
-  https://gitlab.com/fdroid/fdroidserver/-/merge_requests/1659
-* update: fix handling of Triple-T 1.0.0 graphics
-  https://gitlab.com/fdroid/fdroidserver/-/merge_requests/1652
-* update: never execute any VCS e.g. git
-  https://gitlab.com/fdroid/fdroidserver/-/merge_requests/1630
-* config: lazyload environment variables in config.yml
-  https://gitlab.com/fdroid/fdroidserver/-/merge_requests/1645
-* config: make localized name/description/icon optional
-  https://gitlab.com/fdroid/fdroidserver/-/merge_requests/1649
-* lint: add repo_key_sha256 to list of valid config keys
-  https://gitlab.com/fdroid/fdroidserver/-/merge_requests/1643
-* build: calculate all combinations of gradle flavors
-  https://gitlab.com/fdroid/fdroidserver/-/merge_requests/1638
-* build: set SOURCE_DATE_EPOCH from app's git otherwise fdroiddata metadata file
-  https://gitlab.com/fdroid/fdroidserver/-/merge_requests/1653
-* Sync translations for all supported languages: ca cs de fr ga ja pl pt pt_BR
-  pt_PT ru sq tr uk zh_Hans
-
-### Removed
-
-## [2.4.0] - 2025-03-25
-
-### Added
-
-* lint: support the base _config.yml_.
-  https://gitlab.com/fdroid/fdroidserver/-/merge_requests/1606
-
-### Fixed
-
-* Expand {env: foo} config syntax to be allowed any place a string is.
-  https://gitlab.com/fdroid/fdroidserver/-/merge_requests/1610
-* Only show "unsafe permissions on config.yml" when secrets are present.
-* Standardized config files on ruamel.yaml with a YAML 1.2 data format.
-  https://gitlab.com/fdroid/fdroidserver/-/merge_requests/1611
-* Brought back error when a package has multiple package types (e.g. xapk and
-  apk).  https://gitlab.com/fdroid/fdroidserver/-/merge_requests/1602
-* Reworked test suite to be entirely based on Python unittest (thanks @mindston).
-  https://gitlab.com/fdroid/fdroidserver/-/merge_requests/1587
-* publish/signindex/gpgsign no longer load the _qrcode_ and _requests_ modules,
-  and can operate without them installed.
-* scanner: add bun.lock as lock file of package.json
-  https://gitlab.com/fdroid/fdroidserver/-/merge_requests/1615
-* index: fail if user sets mirrors:isPrimary wrong
-  https://gitlab.com/fdroid/fdroidserver/-/merge_requests/1617
-  https://gitlab.com/fdroid/fdroidserver/-/issues/1125
-* Sync translations for all supported languages: bo ca cs de es fr ga hu it ja
-  ko nb_NO pl pt pt_BR pt_PT ro ru sq sr sw tr uk zh_Hans zh_Hant
-
-### Removed
-
-* checkupdates: remove auto_author: config, it is no longer used.
-* Purge support for the long-deprecated _config.py_ config file.
-  https://gitlab.com/fdroid/fdroidserver/-/merge_requests/1607
-
-
-## [2.3.5] - 2025-01-20
-
-### Fixed
-
-* Fix issue where APKs with v1-only signatures and targetSdkVersion < 30 could
-  be maliciously crafted to bypass AllowedAPKSigningKeys
-  https://gitlab.com/fdroid/fdroidserver/-/merge_requests/1588
-* Ignore apksigner v33.x, it has bugs verifying APKs with v3/v3.1 sigs.
-  https://gitlab.com/fdroid/fdroidserver/-/merge_requests/1593
-* Sync translations for: ca cs de es fr ga ja pt_BR pt_PT ru sq sr uk zh_Hans
-
-## [2.3.4] - 2024-12-12
-
-### Fixed
-
-* Fix localhost network tests on systems with IPv6.
-* lint: only error out on missing extlib on versions not archived.
-
-## [2.3.3] - 2024-12-11
-
-### Added
-
-* verify: `--clean-up-verified` to delete files used when verifying an APK if
-  the verification was successful.
-
-### Fixed
-
-* Support Python 3.13 in the full test suite.
-* Sync translations for: ca de fr ja pl ro ru sr ta
-* update: only generate _index.png_ when making _index.html_, allowing the repo
-  operator to set a different repo icon, e.g. not the QR Code.
-
-## [2.3.2] - 2024-11-26
-
-### Fixed
-
-* install: fix downloading from GitHub Releases and Maven Central.
-* Sync translations for: ca fa fr pt ru sr ta zh_Hant
-
-## [2.3.1] - 2024-11-25
-
-### Fixed
-
-* Sync all translations for: cs de es fr ga pt_BR ru sq zh_Hans.
-* Drop use of deprecated imghdr library to support Python 3.13.
-* Install biplist and pycountry by default on macOS.
-* Fixed running test suite out of dist tarball.
-
-## [2.3.0] - 2024-11-21
-
-### Added
-
-* YAML 1.2 as native format for all _.yml_ files, including metadata and config.
-* install: will now fetch _F-Droid.apk_ and install it via `adb`.
-  https://gitlab.com/fdroid/fdroidserver/-/merge_requests/1546
-* scanner: scan APK Signing Block for known block types like Google Play
-  Signature aka "Frosting".
-  https://gitlab.com/fdroid/fdroidserver/-/merge_requests/1555
-* Support Rclone for deploying to many different cloud services.
-* deploy: support deploying to GitHub Releases.
-  https://gitlab.com/fdroid/fdroidserver/-/merge_requests/1471
-* scanner: support libs.versions.toml
-  https://gitlab.com/fdroid/fdroidserver/-/merge_requests/1526
-* Consider subdir for triple-t metadata discovery in Flutter apps.
-  https://gitlab.com/fdroid/fdroidserver/-/merge_requests/1541
-* deploy: added `index_only:` mode for mirroring the index to small hosting
-  locations. https://gitlab.com/fdroid/fdroidserver/-/merge_requests/1420
-* Support publishing repos in AltStore format.
-  https://gitlab.com/fdroid/fdroidserver/-/merge_requests/1465
-* Support indexing iOS IPA app files.
-  https://gitlab.com/fdroid/fdroidserver/-/merge_requests/1413
-* deploy: _config/mirrors.yml_ file with support for adding per-mirror metadata,
-  like `countryCode:`.
-* Repo's categories are now set in the config files.
-* lint: check syntax of config files.
-* publish: `--error-on-failed` to exit when signing/verifying fails.
-* scanner: `--refresh` and `refresh_config:` to control triggering a refresh of
-  the rule sets.
-* Terminal output colorization and `--color` argument to control it.
-* New languages: Catalan (ca), Irish (ga), Japanese (ja), Serbian (sr), and
-  Swahili (sw).
-* Support donation links from `community_bridge`, `buy_me_a_coffee`.
-
-### Fixed
-
-* Use last modified time and file size for caching data about scanned APKs
-  instead of SHA-256 checksum.
-  https://gitlab.com/fdroid/fdroidserver/-/merge_requests/1542
-* `repo_web_base_url:` config for generating per-app URLs for viewing in
-  browsers.  https://gitlab.com/fdroid/fdroidserver/-/merge_requests/1178
-* `fdroid scanner` flags WebAssembly binary _.wasm_ files.
-  https://gitlab.com/fdroid/fdroidserver/-/merge_requests/1562
-* Test suite as standard Python `unittest` setup (thanks @ghost.adh).
-* scanner: error on dependency files without lock file.
-  https://gitlab.com/fdroid/fdroidserver/-/merge_requests/1504
-* nightly: finding APKs in the wrong directory. (thanks @WrenIX)
-  https://gitlab.com/fdroid/fdroidserver/-/merge_requests/1512
-* `AllowedAPKSigningKeys` works with all single-signer APK signatures.
-  https://gitlab.com/fdroid/fdroidserver/-/merge_requests/1466
-* Sync all translations for: cs de it ko pl pt pt_BR pt_PT ro ru sq tr uk
-  zh_Hans zh_Hant.
-* Support Androguard 4.x.
-* Support Python 3.12.
-
-### Removed
-
-* Drop all uses of _stats/known_apks.txt_ and the `update_stats:` config key.
-  https://gitlab.com/fdroid/fdroidserver/-/merge_requests/1547
-* The `maven:` field is now always a string, with `yes` as a legacy special
-  value.  It is no longer treated like a boolean in any case.
-* scanner: jcenter is no longer an allowed Maven repo.
-* build: `--reset-server` removed (thanks @gotmi1k).
-
-## [2.2.2] - 2024-04-24
-
-### Added
-
-* Include sdkmanager as dep in setup.py for Homebrew package.
-  https://github.com/Homebrew/homebrew-core/pull/164510
-
-## [2.2.1] - 2023-03-09
-
-### Added
-
-* `download_repo_index_v2()` and `download_repo_index_v2()` API functions
-  https://gitlab.com/fdroid/fdroidserver/-/merge_requests/1323
-
-### Fixed
-
-* Fix OpenJDK detection on different CPU architectures
-  https://gitlab.com/fdroid/fdroidserver/-/merge_requests/1315
-
-### Removed
-
-* Purge all references to `zipalign`, that is delegated to other things
-  https://gitlab.com/fdroid/fdroidserver/-/merge_requests/1316
-* Remove obsolete, unused `buildozer` build type
-  https://gitlab.com/fdroid/fdroidserver/-/merge_requests/1322
-
-## [2.2.0] - 2023-02-20
-
-### Added
-* Support index-v2 format, localizable Anti-Features, Categories
-* New entry point for repos, entry.jar, signed with modern algorithms
-* New config/ subdirectory for localizable configuration
-* Script entries in metadata files (init, prebuild, build, etc) now handled as
-  lists so they now support using && or ; in the script, and behave like
-  .gitlab-ci.yml and other CI YAML.
-* GPG signatures for index-v1.json and index-v2.json
-* Use default.txt as fallback changelog when inserting fastlane metadata
-* scanner: F-Droid signatures now maintained in fdroid/suss
-* scanner: maintain signature sources in config.yml, including Exodus Privacy
-* scanner: use dexdump for class names
-* scanner: directly scan APK files when given a path
-* scanner: recursively scan APKs for DEX and ZIP using file magic
-* signindex: validate index files before signing
-* update: set ArchivePolicy based on VercodeOperation/signature
-* Include IPFS CIDv1 in index-v2.json for hosting repos on IPFS
-* Per-repo beta channel configuration
-* Add Czech translation
-
-### Fixed
-
-* apksigner v30 or higher now required for verifying and signing APKs
-* 3.9 as minimum supported Python version
-* Lots of translation updates
-* Better pip packaging
-* nightly: big overhaul for reliable operation on all Debian/Ubuntu versions
-* Improved logging, fewer confusing verbose messages
-* scanner: fix detection of binary files without extension
-* import: more reliable operation, including Flutter apps
-* Support Java 20 and up
-
-### Removed
-* Remove obsolete `fdroid stats` command
-
-## [2.1.1] - 2022-09-06
-
-* gradlew-fdroid: Include latest versions and checksums
-* nightly: update Raw URLs to fix breakage and avoid redirects
-* signindex: gpg-sign index-v1.json and deploy it
-* update: fix --use-date-from-apk when used with files (#1012)
-
-## [2.1] - 2022-02-22
-
-For a more complete overview, see the [2.1
-milestone](https://gitlab.com/fdroid/fdroidserver/-/milestones/11)
-
-## [2.0.5] - 2022-09-06
-
-### Fixed
-
-* gradlew-fdroid: Include latest versions and checksums
-* nightly: add support for GitHub Actions
-* nightly: update Raw URLs to fix breakage and avoid redirects
-* update: fix --use-date-from-apk when used with files (#1012)
-* Fix GitLab CI
-
-## [2.0.4] - 2022-06-29
-
-### Fixed
-
-* deploy: ensure progress is instantiated before trying to use it
-* signindex: gpg-sign index-v1.json and deploy it
-  [1080](https://gitlab.com/fdroid/fdroidserver/-/merge_requests/1080)
-  [1124](https://gitlab.com/fdroid/fdroidserver/-/merge_requests/1124)
-
-## [2.0.3] - 2021-07-01
-
-### Fixed
-
-* Support AutoUpdateMode: Version without pattern
-  [931](https://gitlab.com/fdroid/fdroidserver/-/merge_requests/931)
-
-## [2.0.2] - 2021-06-01
-
-### Fixed
-
-* fix "ruamel round_trip_dump will be removed"
-  [932](https://gitlab.com/fdroid/fdroidserver/-/merge_requests/932)
-
-## [2.0.1] - 2021-03-09
-
-### Fixed
-
-* metadata: stop setting up source repo when running lint/rewritemeta
-* scanner: show error if scan_binary fails to run apkanalyzer
-* common: properly parse version from NDK's source.properties
-* update: stop extracting and storing XML icons, they're useless
-* index: raise error rather than crash on bad repo file
-* update: handle large, corrupt, or inaccessible fastlane/triple-t files
-* Update SPDX License List
-* checkupdates: set User-Agent to make gitlab.com happy
-* Run push_binary_transparency only once
-
-## [2.0] - 2021-01-31
-
-For a more complete overview, see the [2.0
-milestone](https://gitlab.com/fdroid/fdroidserver/-/milestones/10)
-
-### Added
-* `fdroid update` inserts donation links based on upstream's _FUNDING.yml_
-  ([!754](https://gitlab.com/fdroid/fdroidserver/merge_requests/754))
-* Stable, public API for most useful functions
-  ([!798](https://gitlab.com/fdroid/fdroidserver/merge_requests/798))
-* Load with any YAML lib and use with the API, no more custom parser needed
-  ([!826](https://gitlab.com/fdroid/fdroidserver/merge_requests/826))
-  ([!838](https://gitlab.com/fdroid/fdroidserver/merge_requests/838))
-* _config.yml_ for a safe, easy, standard configuration format
+* makebuildserver: added ndk r20
   ([!663](https://gitlab.com/fdroid/fdroidserver/merge_requests/663))
-* Config options can be set from environment variables using this syntax:
-  `keystorepass: {env: keystorepass}`
+* added support for gradle 5.5.1
+  ([!656](https://gitlab.com/fdroid/fdroidserver/merge_requests/656))
+* add SHA256 to filename of repo graphics
   ([!669](https://gitlab.com/fdroid/fdroidserver/merge_requests/669))
-* Add SHA256 to filename of repo graphics
-  ([!669](https://gitlab.com/fdroid/fdroidserver/merge_requests/669))
-* Support for srclibs metadata in YAML format
+* support for srclibs metadata in YAML format
   ([!700](https://gitlab.com/fdroid/fdroidserver/merge_requests/700))
-* Check srclibs and app-metadata files with yamllint
+* check srclibs and app-metadata files with yamllint
   ([!721](https://gitlab.com/fdroid/fdroidserver/merge_requests/721))
-* Added plugin system for adding subcommands to `fdroid`
-  ([!709](https://gitlab.com/fdroid/fdroidserver/merge_requests/709))
-* `fdroid update`, `fdroid publish`, and `fdroid signindex` now work
-  with SmartCard HSMs, specifically the NitroKey HSM
-  ([!779](https://gitlab.com/fdroid/fdroidserver/merge_requests/779))
-  ([!782](https://gitlab.com/fdroid/fdroidserver/merge_requests/782))
-* `fdroid update` support for Triple-T Gradle Play Publisher v2.x
-  ([!683](https://gitlab.com/fdroid/fdroidserver/merge_requests/683))
-* Translated into: bo de es fr hu it ko nb_NO pl pt pt_BR pt_PT ru sq tr uk
-  zh_Hans zh_Hant
 
 ### Fixed
-* Smoother process for signing APKs with `apksigner`
-  ([!736](https://gitlab.com/fdroid/fdroidserver/merge_requests/736))
-  ([!821](https://gitlab.com/fdroid/fdroidserver/merge_requests/821))
-* `apksigner` is used by default on new repos
-* All parts except _build_ and _publish_ work without the Android SDK
-  ([!821](https://gitlab.com/fdroid/fdroidserver/merge_requests/821))
-* Description: is now passed to clients unchanged, no HTML conversion
-  ([!828](https://gitlab.com/fdroid/fdroidserver/merge_requests/828))
-* Lots of improvements for scanning for proprietary code and trackers
-  ([!748](https://gitlab.com/fdroid/fdroidserver/merge_requests/748))
-  ([!REPLACE](https://gitlab.com/fdroid/fdroidserver/merge_requests/REPLACE))
-  ([!844](https://gitlab.com/fdroid/fdroidserver/merge_requests/844))
-* `fdroid mirror` now generates complete, working local mirror repos
 * fix build-logs dissapearing when deploying
   ([!685](https://gitlab.com/fdroid/fdroidserver/merge_requests/685))
 * do not crash when system encoding can not be retrieved
@@ -388,31 +33,11 @@ milestone](https://gitlab.com/fdroid/fdroidserver/-/milestones/10)
   ([!651](https://gitlab.com/fdroid/fdroidserver/merge_requests/651))
 * `fdroid init` generates PKCS12 keystores, drop Java < 8 support
   ([!801](https://gitlab.com/fdroid/fdroidserver/-/merge_requests/801))
-* Parse Version Codes specified in hex
-  ([!692](https://gitlab.com/fdroid/fdroidserver/-/merge_requests/692))
-* Major refactoring on core parts of code to be more Pythonic
-  ([!756](https://gitlab.com/fdroid/fdroidserver/-/merge_requests/756))
-* `fdroid init` now works when installed with pip
 
 ### Removed
-* Removed all support for _.txt_ and _.json_ metadata
+* removed support for txt and json metadata
   ([!772](https://gitlab.com/fdroid/fdroidserver/-/merge_requests/772))
-* dropped support for Debian 8 _jessie_ and 9 _stretch_
-* dropped support for Ubuntu releases older than bionic 18.04
-* dropped `fdroid server update` and `fdroid server init`,
-  use `fdroid deploy`
-* `fdroid dscanner` was removed.
-  ([!711](https://gitlab.com/fdroid/fdroidserver/-/merge_requests/711))
 * `make_current_version_link` is now off by default
-* Dropped `force_build_tools` config option
-  ([!797](https://gitlab.com/fdroid/fdroidserver/-/merge_requests/797))
-* Dropped `accepted_formats` config option, there is only _.yml_ now
-  ([!818](https://gitlab.com/fdroid/fdroidserver/-/merge_requests/818))
-* `Provides:` was removed as a metadata field
-  ([!654](https://gitlab.com/fdroid/fdroidserver/-/merge_requests/654))
-* Remove unused `latestapps.dat`
-  ([!794](https://gitlab.com/fdroid/fdroidserver/-/merge_requests/794))
-
 
 ## [1.1.4] - 2019-08-15
 ### Fixed
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
deleted file mode 100644
index 226c0854..00000000
--- a/CONTRIBUTING.md
+++ /dev/null
@@ -1,66 +0,0 @@
-There are many ways to contribute, you can find out all the ways on our
-[Contribute](https://f-droid.org/contribute/) page. Find out how to get
-involved, including as a translator, data analyst, tester, helping others, and
-much more!
-
-## Contributing Code
-
-We want more contributors and want different points of view represented. Some
-parts of the code make contributing quick and easy. Other parts make it
-difficult and slow, so we ask that contributors have patience.
-
-To submit a patch, please open a merge request on GitLab. If you are thinking of
-making a large contribution, open an issue or merge request before starting
-work, to get comments from the community. Someone may be already working on the
-same thing, or there may be reasons why that feature isn't implemented. Once
-there is agreement, then the work might need to proceed asynchronously with the
-core team towards the solution.
-
-To make it easier to review and accept your merge request, please follow these
-guidelines:
-
-* When at all possible, include tests. These can either be added to an existing
-  test, or completely new. Practicing test-driven development will make it
-  easiest to get merged. That usually means starting your work by writing tests.
-
-* See [help-wanted](https://gitlab.com/fdroid/fdroidserver/-/issues/?sort=updated_desc&state=opened&label_name%5B%5D=help-wanted)
-  tags for things that maintainers have marked as things they want to see
-  merged.
-
-* The amount of technical debt varies widely in this code base. There are some
-  parts where the code is nicely isolated with good test coverage. There are
-  other parts that are tangled and complicated, full of technical debt, and
-  difficult to test.
-
-* The general approach is to treat the tangled and complicated parts as an
-  external API (albeit a bad one). That means it needs to stay unchanged as much
-  as possible. Changes to those parts of the code will trigger a migration,
-  which can require a lot of time and coordination. When there is time for large
-  development efforts, we refactor the code to get rid of those areas of
-  technical debt.
-
-* We use [_black_](https://black.readthedocs.io/) code format, run `black .` to
-  format the code. Whenever editing code in any file, the new code should be
-  formatted as _black_. Some files are not yet fully in _black_ format (see
-  _pyproject.toml_), our goal is to opportunistically convert the code whenever
-  possible. As of the time of this writing, forcing the code format on all files
-  would be too disruptive.  The officially supported _black_ version is the one
-  in Debian/stable.
-
-* Many of the tests run very fast and can be run interactively in isolation.
-  Some of the essential test cases run slowly because they do things like
-  signing files and generating signing keys.
-
-* Some parts of the code are difficult to test, and currently require a
-  relatively complete production setup in order to effectively test them. That
-  is mostly the code around building packages, managing the disposable VM, and
-  scheduling build jobs to run.
-
-* For user visible changes (API changes, behaviour changes, etc.), consider
-  adding a note in _CHANGELOG.md_. This could be a summarizing description of
-  the change, and could explain the grander details. Have a look through
-  existing entries for inspiration. Please note that this is NOT simply a copy
-  of git-log one-liners. Also note that security fixes get an entry in
-  _CHANGELOG.md_. This file helps users get more in-depth information of what
-  comes with a specific release without having to sift through the higher noise
-  ratio in git-log.
diff --git a/MANIFEST.in b/MANIFEST.in
index 93307ace..064d220e 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -9,48 +9,35 @@ include buildserver/Vagrantfile
 include CHANGELOG.md
 include completion/bash-completion
 include examples/config.yml
-include examples/fdroid_exportkeystore.py
-include examples/fdroid_export_keystore_to_nitrokey.py
-include examples/fdroid_extract_repo_pubkey.py
-include examples/fdroid_fetchsrclibs.py
-include examples/fdroid_nitrokeyimport.py
+include examples/fdroid-icon.png
+include examples/makebuildserver.config.py
 include examples/opensc-fdroid.cfg
 include examples/public-read-only-s3-bucket-policy.json
 include examples/template.yml
-include examples/Vagrantfile.yaml
+include fdroid
 include gradlew-fdroid
 include LICENSE
-include locale/ba/LC_MESSAGES/fdroidserver.po
-include locale/bo/LC_MESSAGES/fdroidserver.po
-include locale/ca/LC_MESSAGES/fdroidserver.po
-include locale/cs/LC_MESSAGES/fdroidserver.po
-include locale/de/LC_MESSAGES/fdroidserver.po
-include locale/es/LC_MESSAGES/fdroidserver.po
-include locale/fr/LC_MESSAGES/fdroidserver.po
-include locale/ga/LC_MESSAGES/fdroidserver.po
-include locale/hu/LC_MESSAGES/fdroidserver.po
-include locale/it/LC_MESSAGES/fdroidserver.po
-include locale/ja/LC_MESSAGES/fdroidserver.po
-include locale/ko/LC_MESSAGES/fdroidserver.po
-include locale/nb_NO/LC_MESSAGES/fdroidserver.po
-include locale/pl/LC_MESSAGES/fdroidserver.po
-include locale/pt/LC_MESSAGES/fdroidserver.po
-include locale/pt_BR/LC_MESSAGES/fdroidserver.po
-include locale/pt_PT/LC_MESSAGES/fdroidserver.po
-include locale/ro/LC_MESSAGES/fdroidserver.po
-include locale/ru/LC_MESSAGES/fdroidserver.po
-include locale/sq/LC_MESSAGES/fdroidserver.po
-include locale/sr/LC_MESSAGES/fdroidserver.po
-include locale/sw/LC_MESSAGES/fdroidserver.po
-include locale/tr/LC_MESSAGES/fdroidserver.po
-include locale/uk/LC_MESSAGES/fdroidserver.po
-include locale/zh_Hans/LC_MESSAGES/fdroidserver.po
-include locale/zh_Hant/LC_MESSAGES/fdroidserver.po
+include locale/bo/LC_MESSAGES/fdroidserver.mo
+include locale/de/LC_MESSAGES/fdroidserver.mo
+include locale/es/LC_MESSAGES/fdroidserver.mo
+include locale/fr/LC_MESSAGES/fdroidserver.mo
+include locale/hu/LC_MESSAGES/fdroidserver.mo
+include locale/it/LC_MESSAGES/fdroidserver.mo
+include locale/ko/LC_MESSAGES/fdroidserver.mo
+include locale/nb_NO/LC_MESSAGES/fdroidserver.mo
+include locale/pl/LC_MESSAGES/fdroidserver.mo
+include locale/pt_BR/LC_MESSAGES/fdroidserver.mo
+include locale/pt_PT/LC_MESSAGES/fdroidserver.mo
+include locale/ru/LC_MESSAGES/fdroidserver.mo
+include locale/tr/LC_MESSAGES/fdroidserver.mo
+include locale/uk/LC_MESSAGES/fdroidserver.mo
+include locale/zh_Hans/LC_MESSAGES/fdroidserver.mo
+include locale/zh_Hant/LC_MESSAGES/fdroidserver.mo
 include makebuildserver
 include README.md
-include tests/aosp_testkey_debug.keystore
-include tests/apk.embedded_1.apk
+include tests/androguard_test.py
 include tests/bad-unicode-*.apk
+include tests/build.TestCase
 include tests/build-tools/17.0.0/aapt-output-com.moez.QKSMS_182.txt
 include tests/build-tools/17.0.0/aapt-output-com.politedroid_3.txt
 include tests/build-tools/17.0.0/aapt-output-com.politedroid_4.txt
@@ -60,10 +47,10 @@ include tests/build-tools/17.0.0/aapt-output-duplicate.permisssions_9999999.txt
 include tests/build-tools/17.0.0/aapt-output-info.guardianproject.urzip_100.txt
 include tests/build-tools/17.0.0/aapt-output-info.zwanenburg.caffeinetile_4.txt
 include tests/build-tools/17.0.0/aapt-output-obb.main.oldversion_1444412523.txt
+include tests/build-tools/17.0.0/aapt-output-obb.mainpatch.current_1619.txt
 include tests/build-tools/17.0.0/aapt-output-obb.main.twoversions_1101613.txt
 include tests/build-tools/17.0.0/aapt-output-obb.main.twoversions_1101615.txt
 include tests/build-tools/17.0.0/aapt-output-obb.main.twoversions_1101617.txt
-include tests/build-tools/17.0.0/aapt-output-obb.mainpatch.current_1619.txt
 include tests/build-tools/17.0.0/aapt-output-org.droidtr.keyboard_34.txt
 include tests/build-tools/17.0.0/aapt-output-souch.smsbypass_9.txt
 include tests/build-tools/18.1.1/aapt-output-com.moez.QKSMS_182.txt
@@ -75,10 +62,10 @@ include tests/build-tools/18.1.1/aapt-output-duplicate.permisssions_9999999.txt
 include tests/build-tools/18.1.1/aapt-output-info.guardianproject.urzip_100.txt
 include tests/build-tools/18.1.1/aapt-output-info.zwanenburg.caffeinetile_4.txt
 include tests/build-tools/18.1.1/aapt-output-obb.main.oldversion_1444412523.txt
+include tests/build-tools/18.1.1/aapt-output-obb.mainpatch.current_1619.txt
 include tests/build-tools/18.1.1/aapt-output-obb.main.twoversions_1101613.txt
 include tests/build-tools/18.1.1/aapt-output-obb.main.twoversions_1101615.txt
 include tests/build-tools/18.1.1/aapt-output-obb.main.twoversions_1101617.txt
-include tests/build-tools/18.1.1/aapt-output-obb.mainpatch.current_1619.txt
 include tests/build-tools/18.1.1/aapt-output-org.droidtr.keyboard_34.txt
 include tests/build-tools/18.1.1/aapt-output-souch.smsbypass_9.txt
 include tests/build-tools/19.0.0/aapt-output-com.moez.QKSMS_182.txt
@@ -90,10 +77,10 @@ include tests/build-tools/19.0.0/aapt-output-duplicate.permisssions_9999999.txt
 include tests/build-tools/19.0.0/aapt-output-info.guardianproject.urzip_100.txt
 include tests/build-tools/19.0.0/aapt-output-info.zwanenburg.caffeinetile_4.txt
 include tests/build-tools/19.0.0/aapt-output-obb.main.oldversion_1444412523.txt
+include tests/build-tools/19.0.0/aapt-output-obb.mainpatch.current_1619.txt
 include tests/build-tools/19.0.0/aapt-output-obb.main.twoversions_1101613.txt
 include tests/build-tools/19.0.0/aapt-output-obb.main.twoversions_1101615.txt
 include tests/build-tools/19.0.0/aapt-output-obb.main.twoversions_1101617.txt
-include tests/build-tools/19.0.0/aapt-output-obb.mainpatch.current_1619.txt
 include tests/build-tools/19.0.0/aapt-output-org.droidtr.keyboard_34.txt
 include tests/build-tools/19.0.0/aapt-output-souch.smsbypass_9.txt
 include tests/build-tools/19.1.0/aapt-output-com.moez.QKSMS_182.txt
@@ -105,10 +92,10 @@ include tests/build-tools/19.1.0/aapt-output-duplicate.permisssions_9999999.txt
 include tests/build-tools/19.1.0/aapt-output-info.guardianproject.urzip_100.txt
 include tests/build-tools/19.1.0/aapt-output-info.zwanenburg.caffeinetile_4.txt
 include tests/build-tools/19.1.0/aapt-output-obb.main.oldversion_1444412523.txt
+include tests/build-tools/19.1.0/aapt-output-obb.mainpatch.current_1619.txt
 include tests/build-tools/19.1.0/aapt-output-obb.main.twoversions_1101613.txt
 include tests/build-tools/19.1.0/aapt-output-obb.main.twoversions_1101615.txt
 include tests/build-tools/19.1.0/aapt-output-obb.main.twoversions_1101617.txt
-include tests/build-tools/19.1.0/aapt-output-obb.mainpatch.current_1619.txt
 include tests/build-tools/19.1.0/aapt-output-org.droidtr.keyboard_34.txt
 include tests/build-tools/19.1.0/aapt-output-souch.smsbypass_9.txt
 include tests/build-tools/20.0.0/aapt-output-com.moez.QKSMS_182.txt
@@ -120,10 +107,10 @@ include tests/build-tools/20.0.0/aapt-output-duplicate.permisssions_9999999.txt
 include tests/build-tools/20.0.0/aapt-output-info.guardianproject.urzip_100.txt
 include tests/build-tools/20.0.0/aapt-output-info.zwanenburg.caffeinetile_4.txt
 include tests/build-tools/20.0.0/aapt-output-obb.main.oldversion_1444412523.txt
+include tests/build-tools/20.0.0/aapt-output-obb.mainpatch.current_1619.txt
 include tests/build-tools/20.0.0/aapt-output-obb.main.twoversions_1101613.txt
 include tests/build-tools/20.0.0/aapt-output-obb.main.twoversions_1101615.txt
 include tests/build-tools/20.0.0/aapt-output-obb.main.twoversions_1101617.txt
-include tests/build-tools/20.0.0/aapt-output-obb.mainpatch.current_1619.txt
 include tests/build-tools/20.0.0/aapt-output-org.droidtr.keyboard_34.txt
 include tests/build-tools/20.0.0/aapt-output-souch.smsbypass_9.txt
 include tests/build-tools/21.1.1/aapt-output-com.moez.QKSMS_182.txt
@@ -135,10 +122,10 @@ include tests/build-tools/21.1.1/aapt-output-duplicate.permisssions_9999999.txt
 include tests/build-tools/21.1.1/aapt-output-info.guardianproject.urzip_100.txt
 include tests/build-tools/21.1.1/aapt-output-info.zwanenburg.caffeinetile_4.txt
 include tests/build-tools/21.1.1/aapt-output-obb.main.oldversion_1444412523.txt
+include tests/build-tools/21.1.1/aapt-output-obb.mainpatch.current_1619.txt
 include tests/build-tools/21.1.1/aapt-output-obb.main.twoversions_1101613.txt
 include tests/build-tools/21.1.1/aapt-output-obb.main.twoversions_1101615.txt
 include tests/build-tools/21.1.1/aapt-output-obb.main.twoversions_1101617.txt
-include tests/build-tools/21.1.1/aapt-output-obb.mainpatch.current_1619.txt
 include tests/build-tools/21.1.1/aapt-output-org.droidtr.keyboard_34.txt
 include tests/build-tools/21.1.1/aapt-output-souch.smsbypass_9.txt
 include tests/build-tools/21.1.2/aapt-output-com.moez.QKSMS_182.txt
@@ -150,10 +137,10 @@ include tests/build-tools/21.1.2/aapt-output-duplicate.permisssions_9999999.txt
 include tests/build-tools/21.1.2/aapt-output-info.guardianproject.urzip_100.txt
 include tests/build-tools/21.1.2/aapt-output-info.zwanenburg.caffeinetile_4.txt
 include tests/build-tools/21.1.2/aapt-output-obb.main.oldversion_1444412523.txt
+include tests/build-tools/21.1.2/aapt-output-obb.mainpatch.current_1619.txt
 include tests/build-tools/21.1.2/aapt-output-obb.main.twoversions_1101613.txt
 include tests/build-tools/21.1.2/aapt-output-obb.main.twoversions_1101615.txt
 include tests/build-tools/21.1.2/aapt-output-obb.main.twoversions_1101617.txt
-include tests/build-tools/21.1.2/aapt-output-obb.mainpatch.current_1619.txt
 include tests/build-tools/21.1.2/aapt-output-org.droidtr.keyboard_34.txt
 include tests/build-tools/21.1.2/aapt-output-souch.smsbypass_9.txt
 include tests/build-tools/22.0.0/aapt-output-com.moez.QKSMS_182.txt
@@ -165,10 +152,10 @@ include tests/build-tools/22.0.0/aapt-output-duplicate.permisssions_9999999.txt
 include tests/build-tools/22.0.0/aapt-output-info.guardianproject.urzip_100.txt
 include tests/build-tools/22.0.0/aapt-output-info.zwanenburg.caffeinetile_4.txt
 include tests/build-tools/22.0.0/aapt-output-obb.main.oldversion_1444412523.txt
+include tests/build-tools/22.0.0/aapt-output-obb.mainpatch.current_1619.txt
 include tests/build-tools/22.0.0/aapt-output-obb.main.twoversions_1101613.txt
 include tests/build-tools/22.0.0/aapt-output-obb.main.twoversions_1101615.txt
 include tests/build-tools/22.0.0/aapt-output-obb.main.twoversions_1101617.txt
-include tests/build-tools/22.0.0/aapt-output-obb.mainpatch.current_1619.txt
 include tests/build-tools/22.0.0/aapt-output-org.droidtr.keyboard_34.txt
 include tests/build-tools/22.0.0/aapt-output-souch.smsbypass_9.txt
 include tests/build-tools/22.0.1/aapt-output-com.moez.QKSMS_182.txt
@@ -180,10 +167,10 @@ include tests/build-tools/22.0.1/aapt-output-duplicate.permisssions_9999999.txt
 include tests/build-tools/22.0.1/aapt-output-info.guardianproject.urzip_100.txt
 include tests/build-tools/22.0.1/aapt-output-info.zwanenburg.caffeinetile_4.txt
 include tests/build-tools/22.0.1/aapt-output-obb.main.oldversion_1444412523.txt
+include tests/build-tools/22.0.1/aapt-output-obb.mainpatch.current_1619.txt
 include tests/build-tools/22.0.1/aapt-output-obb.main.twoversions_1101613.txt
 include tests/build-tools/22.0.1/aapt-output-obb.main.twoversions_1101615.txt
 include tests/build-tools/22.0.1/aapt-output-obb.main.twoversions_1101617.txt
-include tests/build-tools/22.0.1/aapt-output-obb.mainpatch.current_1619.txt
 include tests/build-tools/22.0.1/aapt-output-org.droidtr.keyboard_34.txt
 include tests/build-tools/22.0.1/aapt-output-souch.smsbypass_9.txt
 include tests/build-tools/23.0.0/aapt-output-com.moez.QKSMS_182.txt
@@ -195,10 +182,10 @@ include tests/build-tools/23.0.0/aapt-output-duplicate.permisssions_9999999.txt
 include tests/build-tools/23.0.0/aapt-output-info.guardianproject.urzip_100.txt
 include tests/build-tools/23.0.0/aapt-output-info.zwanenburg.caffeinetile_4.txt
 include tests/build-tools/23.0.0/aapt-output-obb.main.oldversion_1444412523.txt
+include tests/build-tools/23.0.0/aapt-output-obb.mainpatch.current_1619.txt
 include tests/build-tools/23.0.0/aapt-output-obb.main.twoversions_1101613.txt
 include tests/build-tools/23.0.0/aapt-output-obb.main.twoversions_1101615.txt
 include tests/build-tools/23.0.0/aapt-output-obb.main.twoversions_1101617.txt
-include tests/build-tools/23.0.0/aapt-output-obb.mainpatch.current_1619.txt
 include tests/build-tools/23.0.0/aapt-output-org.droidtr.keyboard_34.txt
 include tests/build-tools/23.0.0/aapt-output-souch.smsbypass_9.txt
 include tests/build-tools/23.0.1/aapt-output-com.moez.QKSMS_182.txt
@@ -210,10 +197,10 @@ include tests/build-tools/23.0.1/aapt-output-duplicate.permisssions_9999999.txt
 include tests/build-tools/23.0.1/aapt-output-info.guardianproject.urzip_100.txt
 include tests/build-tools/23.0.1/aapt-output-info.zwanenburg.caffeinetile_4.txt
 include tests/build-tools/23.0.1/aapt-output-obb.main.oldversion_1444412523.txt
+include tests/build-tools/23.0.1/aapt-output-obb.mainpatch.current_1619.txt
 include tests/build-tools/23.0.1/aapt-output-obb.main.twoversions_1101613.txt
 include tests/build-tools/23.0.1/aapt-output-obb.main.twoversions_1101615.txt
 include tests/build-tools/23.0.1/aapt-output-obb.main.twoversions_1101617.txt
-include tests/build-tools/23.0.1/aapt-output-obb.mainpatch.current_1619.txt
 include tests/build-tools/23.0.1/aapt-output-org.droidtr.keyboard_34.txt
 include tests/build-tools/23.0.1/aapt-output-souch.smsbypass_9.txt
 include tests/build-tools/23.0.2/aapt-output-com.moez.QKSMS_182.txt
@@ -225,10 +212,10 @@ include tests/build-tools/23.0.2/aapt-output-duplicate.permisssions_9999999.txt
 include tests/build-tools/23.0.2/aapt-output-info.guardianproject.urzip_100.txt
 include tests/build-tools/23.0.2/aapt-output-info.zwanenburg.caffeinetile_4.txt
 include tests/build-tools/23.0.2/aapt-output-obb.main.oldversion_1444412523.txt
+include tests/build-tools/23.0.2/aapt-output-obb.mainpatch.current_1619.txt
 include tests/build-tools/23.0.2/aapt-output-obb.main.twoversions_1101613.txt
 include tests/build-tools/23.0.2/aapt-output-obb.main.twoversions_1101615.txt
 include tests/build-tools/23.0.2/aapt-output-obb.main.twoversions_1101617.txt
-include tests/build-tools/23.0.2/aapt-output-obb.mainpatch.current_1619.txt
 include tests/build-tools/23.0.2/aapt-output-org.droidtr.keyboard_34.txt
 include tests/build-tools/23.0.2/aapt-output-souch.smsbypass_9.txt
 include tests/build-tools/23.0.3/aapt-output-com.moez.QKSMS_182.txt
@@ -240,10 +227,10 @@ include tests/build-tools/23.0.3/aapt-output-duplicate.permisssions_9999999.txt
 include tests/build-tools/23.0.3/aapt-output-info.guardianproject.urzip_100.txt
 include tests/build-tools/23.0.3/aapt-output-info.zwanenburg.caffeinetile_4.txt
 include tests/build-tools/23.0.3/aapt-output-obb.main.oldversion_1444412523.txt
+include tests/build-tools/23.0.3/aapt-output-obb.mainpatch.current_1619.txt
 include tests/build-tools/23.0.3/aapt-output-obb.main.twoversions_1101613.txt
 include tests/build-tools/23.0.3/aapt-output-obb.main.twoversions_1101615.txt
 include tests/build-tools/23.0.3/aapt-output-obb.main.twoversions_1101617.txt
-include tests/build-tools/23.0.3/aapt-output-obb.mainpatch.current_1619.txt
 include tests/build-tools/23.0.3/aapt-output-org.droidtr.keyboard_34.txt
 include tests/build-tools/23.0.3/aapt-output-souch.smsbypass_9.txt
 include tests/build-tools/24.0.0/aapt-output-com.moez.QKSMS_182.txt
@@ -255,10 +242,10 @@ include tests/build-tools/24.0.0/aapt-output-duplicate.permisssions_9999999.txt
 include tests/build-tools/24.0.0/aapt-output-info.guardianproject.urzip_100.txt
 include tests/build-tools/24.0.0/aapt-output-info.zwanenburg.caffeinetile_4.txt
 include tests/build-tools/24.0.0/aapt-output-obb.main.oldversion_1444412523.txt
+include tests/build-tools/24.0.0/aapt-output-obb.mainpatch.current_1619.txt
 include tests/build-tools/24.0.0/aapt-output-obb.main.twoversions_1101613.txt
 include tests/build-tools/24.0.0/aapt-output-obb.main.twoversions_1101615.txt
 include tests/build-tools/24.0.0/aapt-output-obb.main.twoversions_1101617.txt
-include tests/build-tools/24.0.0/aapt-output-obb.mainpatch.current_1619.txt
 include tests/build-tools/24.0.0/aapt-output-org.droidtr.keyboard_34.txt
 include tests/build-tools/24.0.0/aapt-output-souch.smsbypass_9.txt
 include tests/build-tools/24.0.1/aapt-output-com.moez.QKSMS_182.txt
@@ -270,10 +257,10 @@ include tests/build-tools/24.0.1/aapt-output-duplicate.permisssions_9999999.txt
 include tests/build-tools/24.0.1/aapt-output-info.guardianproject.urzip_100.txt
 include tests/build-tools/24.0.1/aapt-output-info.zwanenburg.caffeinetile_4.txt
 include tests/build-tools/24.0.1/aapt-output-obb.main.oldversion_1444412523.txt
+include tests/build-tools/24.0.1/aapt-output-obb.mainpatch.current_1619.txt
 include tests/build-tools/24.0.1/aapt-output-obb.main.twoversions_1101613.txt
 include tests/build-tools/24.0.1/aapt-output-obb.main.twoversions_1101615.txt
 include tests/build-tools/24.0.1/aapt-output-obb.main.twoversions_1101617.txt
-include tests/build-tools/24.0.1/aapt-output-obb.mainpatch.current_1619.txt
 include tests/build-tools/24.0.1/aapt-output-org.droidtr.keyboard_34.txt
 include tests/build-tools/24.0.1/aapt-output-souch.smsbypass_9.txt
 include tests/build-tools/24.0.2/aapt-output-com.moez.QKSMS_182.txt
@@ -285,10 +272,10 @@ include tests/build-tools/24.0.2/aapt-output-duplicate.permisssions_9999999.txt
 include tests/build-tools/24.0.2/aapt-output-info.guardianproject.urzip_100.txt
 include tests/build-tools/24.0.2/aapt-output-info.zwanenburg.caffeinetile_4.txt
 include tests/build-tools/24.0.2/aapt-output-obb.main.oldversion_1444412523.txt
+include tests/build-tools/24.0.2/aapt-output-obb.mainpatch.current_1619.txt
 include tests/build-tools/24.0.2/aapt-output-obb.main.twoversions_1101613.txt
 include tests/build-tools/24.0.2/aapt-output-obb.main.twoversions_1101615.txt
 include tests/build-tools/24.0.2/aapt-output-obb.main.twoversions_1101617.txt
-include tests/build-tools/24.0.2/aapt-output-obb.mainpatch.current_1619.txt
 include tests/build-tools/24.0.2/aapt-output-org.droidtr.keyboard_34.txt
 include tests/build-tools/24.0.2/aapt-output-souch.smsbypass_9.txt
 include tests/build-tools/24.0.3/aapt-output-com.moez.QKSMS_182.txt
@@ -300,10 +287,10 @@ include tests/build-tools/24.0.3/aapt-output-duplicate.permisssions_9999999.txt
 include tests/build-tools/24.0.3/aapt-output-info.guardianproject.urzip_100.txt
 include tests/build-tools/24.0.3/aapt-output-info.zwanenburg.caffeinetile_4.txt
 include tests/build-tools/24.0.3/aapt-output-obb.main.oldversion_1444412523.txt
+include tests/build-tools/24.0.3/aapt-output-obb.mainpatch.current_1619.txt
 include tests/build-tools/24.0.3/aapt-output-obb.main.twoversions_1101613.txt
 include tests/build-tools/24.0.3/aapt-output-obb.main.twoversions_1101615.txt
 include tests/build-tools/24.0.3/aapt-output-obb.main.twoversions_1101617.txt
-include tests/build-tools/24.0.3/aapt-output-obb.mainpatch.current_1619.txt
 include tests/build-tools/24.0.3/aapt-output-org.droidtr.keyboard_34.txt
 include tests/build-tools/24.0.3/aapt-output-souch.smsbypass_9.txt
 include tests/build-tools/25.0.0/aapt-output-com.moez.QKSMS_182.txt
@@ -315,10 +302,10 @@ include tests/build-tools/25.0.0/aapt-output-duplicate.permisssions_9999999.txt
 include tests/build-tools/25.0.0/aapt-output-info.guardianproject.urzip_100.txt
 include tests/build-tools/25.0.0/aapt-output-info.zwanenburg.caffeinetile_4.txt
 include tests/build-tools/25.0.0/aapt-output-obb.main.oldversion_1444412523.txt
+include tests/build-tools/25.0.0/aapt-output-obb.mainpatch.current_1619.txt
 include tests/build-tools/25.0.0/aapt-output-obb.main.twoversions_1101613.txt
 include tests/build-tools/25.0.0/aapt-output-obb.main.twoversions_1101615.txt
 include tests/build-tools/25.0.0/aapt-output-obb.main.twoversions_1101617.txt
-include tests/build-tools/25.0.0/aapt-output-obb.mainpatch.current_1619.txt
 include tests/build-tools/25.0.0/aapt-output-org.droidtr.keyboard_34.txt
 include tests/build-tools/25.0.0/aapt-output-souch.smsbypass_9.txt
 include tests/build-tools/25.0.1/aapt-output-com.moez.QKSMS_182.txt
@@ -330,10 +317,10 @@ include tests/build-tools/25.0.1/aapt-output-duplicate.permisssions_9999999.txt
 include tests/build-tools/25.0.1/aapt-output-info.guardianproject.urzip_100.txt
 include tests/build-tools/25.0.1/aapt-output-info.zwanenburg.caffeinetile_4.txt
 include tests/build-tools/25.0.1/aapt-output-obb.main.oldversion_1444412523.txt
+include tests/build-tools/25.0.1/aapt-output-obb.mainpatch.current_1619.txt
 include tests/build-tools/25.0.1/aapt-output-obb.main.twoversions_1101613.txt
 include tests/build-tools/25.0.1/aapt-output-obb.main.twoversions_1101615.txt
 include tests/build-tools/25.0.1/aapt-output-obb.main.twoversions_1101617.txt
-include tests/build-tools/25.0.1/aapt-output-obb.mainpatch.current_1619.txt
 include tests/build-tools/25.0.1/aapt-output-org.droidtr.keyboard_34.txt
 include tests/build-tools/25.0.1/aapt-output-souch.smsbypass_9.txt
 include tests/build-tools/25.0.2/aapt-output-com.moez.QKSMS_182.txt
@@ -345,10 +332,10 @@ include tests/build-tools/25.0.2/aapt-output-duplicate.permisssions_9999999.txt
 include tests/build-tools/25.0.2/aapt-output-info.guardianproject.urzip_100.txt
 include tests/build-tools/25.0.2/aapt-output-info.zwanenburg.caffeinetile_4.txt
 include tests/build-tools/25.0.2/aapt-output-obb.main.oldversion_1444412523.txt
+include tests/build-tools/25.0.2/aapt-output-obb.mainpatch.current_1619.txt
 include tests/build-tools/25.0.2/aapt-output-obb.main.twoversions_1101613.txt
 include tests/build-tools/25.0.2/aapt-output-obb.main.twoversions_1101615.txt
 include tests/build-tools/25.0.2/aapt-output-obb.main.twoversions_1101617.txt
-include tests/build-tools/25.0.2/aapt-output-obb.mainpatch.current_1619.txt
 include tests/build-tools/25.0.2/aapt-output-org.droidtr.keyboard_34.txt
 include tests/build-tools/25.0.2/aapt-output-souch.smsbypass_9.txt
 include tests/build-tools/25.0.3/aapt-output-com.moez.QKSMS_182.txt
@@ -360,10 +347,10 @@ include tests/build-tools/25.0.3/aapt-output-duplicate.permisssions_9999999.txt
 include tests/build-tools/25.0.3/aapt-output-info.guardianproject.urzip_100.txt
 include tests/build-tools/25.0.3/aapt-output-info.zwanenburg.caffeinetile_4.txt
 include tests/build-tools/25.0.3/aapt-output-obb.main.oldversion_1444412523.txt
+include tests/build-tools/25.0.3/aapt-output-obb.mainpatch.current_1619.txt
 include tests/build-tools/25.0.3/aapt-output-obb.main.twoversions_1101613.txt
 include tests/build-tools/25.0.3/aapt-output-obb.main.twoversions_1101615.txt
 include tests/build-tools/25.0.3/aapt-output-obb.main.twoversions_1101617.txt
-include tests/build-tools/25.0.3/aapt-output-obb.mainpatch.current_1619.txt
 include tests/build-tools/25.0.3/aapt-output-org.droidtr.keyboard_34.txt
 include tests/build-tools/25.0.3/aapt-output-souch.smsbypass_9.txt
 include tests/build-tools/26.0.0/aapt-output-com.moez.QKSMS_182.txt
@@ -375,10 +362,10 @@ include tests/build-tools/26.0.0/aapt-output-duplicate.permisssions_9999999.txt
 include tests/build-tools/26.0.0/aapt-output-info.guardianproject.urzip_100.txt
 include tests/build-tools/26.0.0/aapt-output-info.zwanenburg.caffeinetile_4.txt
 include tests/build-tools/26.0.0/aapt-output-obb.main.oldversion_1444412523.txt
+include tests/build-tools/26.0.0/aapt-output-obb.mainpatch.current_1619.txt
 include tests/build-tools/26.0.0/aapt-output-obb.main.twoversions_1101613.txt
 include tests/build-tools/26.0.0/aapt-output-obb.main.twoversions_1101615.txt
 include tests/build-tools/26.0.0/aapt-output-obb.main.twoversions_1101617.txt
-include tests/build-tools/26.0.0/aapt-output-obb.mainpatch.current_1619.txt
 include tests/build-tools/26.0.0/aapt-output-org.droidtr.keyboard_34.txt
 include tests/build-tools/26.0.0/aapt-output-souch.smsbypass_9.txt
 include tests/build-tools/26.0.1/aapt-output-com.moez.QKSMS_182.txt
@@ -390,10 +377,10 @@ include tests/build-tools/26.0.1/aapt-output-duplicate.permisssions_9999999.txt
 include tests/build-tools/26.0.1/aapt-output-info.guardianproject.urzip_100.txt
 include tests/build-tools/26.0.1/aapt-output-info.zwanenburg.caffeinetile_4.txt
 include tests/build-tools/26.0.1/aapt-output-obb.main.oldversion_1444412523.txt
+include tests/build-tools/26.0.1/aapt-output-obb.mainpatch.current_1619.txt
 include tests/build-tools/26.0.1/aapt-output-obb.main.twoversions_1101613.txt
 include tests/build-tools/26.0.1/aapt-output-obb.main.twoversions_1101615.txt
 include tests/build-tools/26.0.1/aapt-output-obb.main.twoversions_1101617.txt
-include tests/build-tools/26.0.1/aapt-output-obb.mainpatch.current_1619.txt
 include tests/build-tools/26.0.1/aapt-output-org.droidtr.keyboard_34.txt
 include tests/build-tools/26.0.1/aapt-output-souch.smsbypass_9.txt
 include tests/build-tools/26.0.2/aapt-output-com.moez.QKSMS_182.txt
@@ -405,10 +392,10 @@ include tests/build-tools/26.0.2/aapt-output-duplicate.permisssions_9999999.txt
 include tests/build-tools/26.0.2/aapt-output-info.guardianproject.urzip_100.txt
 include tests/build-tools/26.0.2/aapt-output-info.zwanenburg.caffeinetile_4.txt
 include tests/build-tools/26.0.2/aapt-output-obb.main.oldversion_1444412523.txt
+include tests/build-tools/26.0.2/aapt-output-obb.mainpatch.current_1619.txt
 include tests/build-tools/26.0.2/aapt-output-obb.main.twoversions_1101613.txt
 include tests/build-tools/26.0.2/aapt-output-obb.main.twoversions_1101615.txt
 include tests/build-tools/26.0.2/aapt-output-obb.main.twoversions_1101617.txt
-include tests/build-tools/26.0.2/aapt-output-obb.mainpatch.current_1619.txt
 include tests/build-tools/26.0.2/aapt-output-org.droidtr.keyboard_34.txt
 include tests/build-tools/26.0.2/aapt-output-souch.smsbypass_9.txt
 include tests/build-tools/26.0.3/aapt-output-com.moez.QKSMS_182.txt
@@ -420,10 +407,10 @@ include tests/build-tools/26.0.3/aapt-output-duplicate.permisssions_9999999.txt
 include tests/build-tools/26.0.3/aapt-output-info.guardianproject.urzip_100.txt
 include tests/build-tools/26.0.3/aapt-output-info.zwanenburg.caffeinetile_4.txt
 include tests/build-tools/26.0.3/aapt-output-obb.main.oldversion_1444412523.txt
+include tests/build-tools/26.0.3/aapt-output-obb.mainpatch.current_1619.txt
 include tests/build-tools/26.0.3/aapt-output-obb.main.twoversions_1101613.txt
 include tests/build-tools/26.0.3/aapt-output-obb.main.twoversions_1101615.txt
 include tests/build-tools/26.0.3/aapt-output-obb.main.twoversions_1101617.txt
-include tests/build-tools/26.0.3/aapt-output-obb.mainpatch.current_1619.txt
 include tests/build-tools/26.0.3/aapt-output-org.droidtr.keyboard_34.txt
 include tests/build-tools/26.0.3/aapt-output-souch.smsbypass_9.txt
 include tests/build-tools/27.0.0/aapt-output-com.moez.QKSMS_182.txt
@@ -435,10 +422,10 @@ include tests/build-tools/27.0.0/aapt-output-duplicate.permisssions_9999999.txt
 include tests/build-tools/27.0.0/aapt-output-info.guardianproject.urzip_100.txt
 include tests/build-tools/27.0.0/aapt-output-info.zwanenburg.caffeinetile_4.txt
 include tests/build-tools/27.0.0/aapt-output-obb.main.oldversion_1444412523.txt
+include tests/build-tools/27.0.0/aapt-output-obb.mainpatch.current_1619.txt
 include tests/build-tools/27.0.0/aapt-output-obb.main.twoversions_1101613.txt
 include tests/build-tools/27.0.0/aapt-output-obb.main.twoversions_1101615.txt
 include tests/build-tools/27.0.0/aapt-output-obb.main.twoversions_1101617.txt
-include tests/build-tools/27.0.0/aapt-output-obb.mainpatch.current_1619.txt
 include tests/build-tools/27.0.0/aapt-output-org.droidtr.keyboard_34.txt
 include tests/build-tools/27.0.0/aapt-output-souch.smsbypass_9.txt
 include tests/build-tools/27.0.1/aapt-output-com.moez.QKSMS_182.txt
@@ -450,10 +437,10 @@ include tests/build-tools/27.0.1/aapt-output-duplicate.permisssions_9999999.txt
 include tests/build-tools/27.0.1/aapt-output-info.guardianproject.urzip_100.txt
 include tests/build-tools/27.0.1/aapt-output-info.zwanenburg.caffeinetile_4.txt
 include tests/build-tools/27.0.1/aapt-output-obb.main.oldversion_1444412523.txt
+include tests/build-tools/27.0.1/aapt-output-obb.mainpatch.current_1619.txt
 include tests/build-tools/27.0.1/aapt-output-obb.main.twoversions_1101613.txt
 include tests/build-tools/27.0.1/aapt-output-obb.main.twoversions_1101615.txt
 include tests/build-tools/27.0.1/aapt-output-obb.main.twoversions_1101617.txt
-include tests/build-tools/27.0.1/aapt-output-obb.mainpatch.current_1619.txt
 include tests/build-tools/27.0.1/aapt-output-org.droidtr.keyboard_34.txt
 include tests/build-tools/27.0.1/aapt-output-souch.smsbypass_9.txt
 include tests/build-tools/27.0.2/aapt-output-com.moez.QKSMS_182.txt
@@ -465,10 +452,10 @@ include tests/build-tools/27.0.2/aapt-output-duplicate.permisssions_9999999.txt
 include tests/build-tools/27.0.2/aapt-output-info.guardianproject.urzip_100.txt
 include tests/build-tools/27.0.2/aapt-output-info.zwanenburg.caffeinetile_4.txt
 include tests/build-tools/27.0.2/aapt-output-obb.main.oldversion_1444412523.txt
+include tests/build-tools/27.0.2/aapt-output-obb.mainpatch.current_1619.txt
 include tests/build-tools/27.0.2/aapt-output-obb.main.twoversions_1101613.txt
 include tests/build-tools/27.0.2/aapt-output-obb.main.twoversions_1101615.txt
 include tests/build-tools/27.0.2/aapt-output-obb.main.twoversions_1101617.txt
-include tests/build-tools/27.0.2/aapt-output-obb.mainpatch.current_1619.txt
 include tests/build-tools/27.0.2/aapt-output-org.droidtr.keyboard_34.txt
 include tests/build-tools/27.0.2/aapt-output-souch.smsbypass_9.txt
 include tests/build-tools/27.0.3/aapt-output-com.moez.QKSMS_182.txt
@@ -480,10 +467,10 @@ include tests/build-tools/27.0.3/aapt-output-duplicate.permisssions_9999999.txt
 include tests/build-tools/27.0.3/aapt-output-info.guardianproject.urzip_100.txt
 include tests/build-tools/27.0.3/aapt-output-info.zwanenburg.caffeinetile_4.txt
 include tests/build-tools/27.0.3/aapt-output-obb.main.oldversion_1444412523.txt
+include tests/build-tools/27.0.3/aapt-output-obb.mainpatch.current_1619.txt
 include tests/build-tools/27.0.3/aapt-output-obb.main.twoversions_1101613.txt
 include tests/build-tools/27.0.3/aapt-output-obb.main.twoversions_1101615.txt
 include tests/build-tools/27.0.3/aapt-output-obb.main.twoversions_1101617.txt
-include tests/build-tools/27.0.3/aapt-output-obb.mainpatch.current_1619.txt
 include tests/build-tools/27.0.3/aapt-output-org.droidtr.keyboard_34.txt
 include tests/build-tools/27.0.3/aapt-output-souch.smsbypass_9.txt
 include tests/build-tools/28.0.0/aapt-output-com.moez.QKSMS_182.txt
@@ -495,10 +482,10 @@ include tests/build-tools/28.0.0/aapt-output-duplicate.permisssions_9999999.txt
 include tests/build-tools/28.0.0/aapt-output-info.guardianproject.urzip_100.txt
 include tests/build-tools/28.0.0/aapt-output-info.zwanenburg.caffeinetile_4.txt
 include tests/build-tools/28.0.0/aapt-output-obb.main.oldversion_1444412523.txt
+include tests/build-tools/28.0.0/aapt-output-obb.mainpatch.current_1619.txt
 include tests/build-tools/28.0.0/aapt-output-obb.main.twoversions_1101613.txt
 include tests/build-tools/28.0.0/aapt-output-obb.main.twoversions_1101615.txt
 include tests/build-tools/28.0.0/aapt-output-obb.main.twoversions_1101617.txt
-include tests/build-tools/28.0.0/aapt-output-obb.mainpatch.current_1619.txt
 include tests/build-tools/28.0.0/aapt-output-org.droidtr.keyboard_34.txt
 include tests/build-tools/28.0.0/aapt-output-souch.smsbypass_9.txt
 include tests/build-tools/28.0.1/aapt-output-com.moez.QKSMS_182.txt
@@ -510,10 +497,10 @@ include tests/build-tools/28.0.1/aapt-output-duplicate.permisssions_9999999.txt
 include tests/build-tools/28.0.1/aapt-output-info.guardianproject.urzip_100.txt
 include tests/build-tools/28.0.1/aapt-output-info.zwanenburg.caffeinetile_4.txt
 include tests/build-tools/28.0.1/aapt-output-obb.main.oldversion_1444412523.txt
+include tests/build-tools/28.0.1/aapt-output-obb.mainpatch.current_1619.txt
 include tests/build-tools/28.0.1/aapt-output-obb.main.twoversions_1101613.txt
 include tests/build-tools/28.0.1/aapt-output-obb.main.twoversions_1101615.txt
 include tests/build-tools/28.0.1/aapt-output-obb.main.twoversions_1101617.txt
-include tests/build-tools/28.0.1/aapt-output-obb.mainpatch.current_1619.txt
 include tests/build-tools/28.0.1/aapt-output-org.droidtr.keyboard_34.txt
 include tests/build-tools/28.0.1/aapt-output-souch.smsbypass_9.txt
 include tests/build-tools/28.0.2/aapt-output-com.politedroid_3.txt
@@ -524,10 +511,10 @@ include tests/build-tools/28.0.2/aapt-output-duplicate.permisssions_9999999.txt
 include tests/build-tools/28.0.2/aapt-output-info.guardianproject.urzip_100.txt
 include tests/build-tools/28.0.2/aapt-output-info.zwanenburg.caffeinetile_4.txt
 include tests/build-tools/28.0.2/aapt-output-obb.main.oldversion_1444412523.txt
+include tests/build-tools/28.0.2/aapt-output-obb.mainpatch.current_1619.txt
 include tests/build-tools/28.0.2/aapt-output-obb.main.twoversions_1101613.txt
 include tests/build-tools/28.0.2/aapt-output-obb.main.twoversions_1101615.txt
 include tests/build-tools/28.0.2/aapt-output-obb.main.twoversions_1101617.txt
-include tests/build-tools/28.0.2/aapt-output-obb.mainpatch.current_1619.txt
 include tests/build-tools/28.0.2/aapt-output-org.droidtr.keyboard_34.txt
 include tests/build-tools/28.0.2/aapt-output-souch.smsbypass_9.txt
 include tests/build-tools/28.0.3/aapt-output-com.example.test.helloworld_1.txt
@@ -540,119 +527,85 @@ include tests/build-tools/28.0.3/aapt-output-info.guardianproject.urzip_100.txt
 include tests/build-tools/28.0.3/aapt-output-info.zwanenburg.caffeinetile_4.txt
 include tests/build-tools/28.0.3/aapt-output-no.min.target.sdk_987.txt
 include tests/build-tools/28.0.3/aapt-output-obb.main.oldversion_1444412523.txt
+include tests/build-tools/28.0.3/aapt-output-obb.mainpatch.current_1619.txt
 include tests/build-tools/28.0.3/aapt-output-obb.main.twoversions_1101613.txt
 include tests/build-tools/28.0.3/aapt-output-obb.main.twoversions_1101615.txt
 include tests/build-tools/28.0.3/aapt-output-obb.main.twoversions_1101617.txt
-include tests/build-tools/28.0.3/aapt-output-obb.mainpatch.current_1619.txt
 include tests/build-tools/28.0.3/aapt-output-souch.smsbypass_9.txt
 include tests/build-tools/generate.sh
 include tests/check-fdroid-apk
-include tests/com.fake.IpaApp_1000000000001.ipa
-include tests/config.yml
-include tests/config/antiFeatures.yml
-include tests/config/categories.yml
-include tests/config/de/antiFeatures.yml
-include tests/config/fa/antiFeatures.yml
-include tests/config/ic_antifeature_ads.xml
-include tests/config/ic_antifeature_disabledalgorithm.xml
-include tests/config/ic_antifeature_knownvuln.xml
-include tests/config/ic_antifeature_nonfreeadd.xml
-include tests/config/ic_antifeature_nonfreeassets.xml
-include tests/config/ic_antifeature_nonfreedep.xml
-include tests/config/ic_antifeature_nonfreenet.xml
-include tests/config/ic_antifeature_nosourcesince.xml
-include tests/config/ic_antifeature_nsfw.xml
-include tests/config/ic_antifeature_tracking.xml
-include tests/config/ic_antifeature_upstreamnonfree.xml
-include tests/config/ro/antiFeatures.yml
-include tests/config/zh-rCN/antiFeatures.yml
-include tests/corrupt-featureGraphic.png
+include tests/common.TestCase
+include tests/complete-ci-tests
+include tests/config.py
+include tests/deploy.TestCase
+include tests/description-parsing.py
 include tests/dummy-keystore.jks
 include tests/dump_internal_metadata_format.py
+include tests/exception.TestCase
 include tests/extra/manual-vmtools-test.py
 include tests/funding-usernames.yaml
-include tests/get_android_tools_versions/android-ndk-r10e/RELEASE.TXT
-include tests/get_android_tools_versions/android-sdk/ndk-bundle/package.xml
-include tests/get_android_tools_versions/android-sdk/ndk-bundle/source.properties
-include tests/get_android_tools_versions/android-sdk/ndk/11.2.2725575/source.properties
-include tests/get_android_tools_versions/android-sdk/ndk/17.2.4988734/source.properties
-include tests/get_android_tools_versions/android-sdk/ndk/21.3.6528147/source.properties
-include tests/get_android_tools_versions/android-sdk/patcher/v4/source.properties
-include tests/get_android_tools_versions/android-sdk/platforms/android-30/source.properties
-include tests/get_android_tools_versions/android-sdk/skiaparser/1/source.properties
-include tests/get_android_tools_versions/android-sdk/tools/source.properties
+include tests/getsig/getsig.java
+include tests/getsig/make.sh
+include tests/getsig/run.sh
 include tests/gnupghome/pubring.gpg
 include tests/gnupghome/random_seed
 include tests/gnupghome/secring.gpg
 include tests/gnupghome/trustdb.gpg
 include tests/gradle-maven-blocks.yaml
-include tests/gradle-release-checksums.py
+include tests/import_proxy.py
+include tests/import.TestCase
+include tests/index.TestCase
+include tests/install.TestCase
 include tests/IsMD5Disabled.java
-include tests/issue-1128-min-sdk-30-poc.apk
-include tests/issue-1128-poc1.apk
-include tests/issue-1128-poc2.apk
-include tests/issue-1128-poc3a.apk
-include tests/issue-1128-poc3b.apk
 include tests/janus.apk
-include tests/key-tricks.py
 include tests/keystore.jks
-include tests/metadata-rewrite-yml/app.with.special.build.params.yml
-include tests/metadata-rewrite-yml/fake.ota.update.yml
-include tests/metadata-rewrite-yml/org.fdroid.fdroid.yml
+include tests/lint.TestCase
 include tests/metadata/apk/info.guardianproject.urzip.yaml
 include tests/metadata/apk/org.dyndns.fules.ck.yaml
 include tests/metadata/app.with.special.build.params.yml
-include tests/metadata/app.with.special.build.params/en-US/antifeatures/50_Ads.txt
-include tests/metadata/app.with.special.build.params/en-US/antifeatures/50_Tracking.txt
-include tests/metadata/app.with.special.build.params/en-US/antifeatures/Ads.txt
-include tests/metadata/app.with.special.build.params/en-US/antifeatures/NoSourceSince.txt
-include tests/metadata/app.with.special.build.params/zh-CN/antifeatures/49_Tracking.txt
-include tests/metadata/app.with.special.build.params/zh-CN/antifeatures/50_Ads.txt
 include tests/metadata/com.politedroid.yml
-include tests/metadata/dump/app.with.special.build.params.yaml
 include tests/metadata/dump/com.politedroid.yaml
 include tests/metadata/dump/org.adaway.yaml
 include tests/metadata/dump/org.smssecure.smssecure.yaml
 include tests/metadata/dump/org.videolan.vlc.yaml
 include tests/metadata/duplicate.permisssions.yml
 include tests/metadata/fake.ota.update.yml
-include tests/metadata/info.guardianproject.checkey.yml
 include tests/metadata/info.guardianproject.checkey/en-US/description.txt
-include tests/metadata/info.guardianproject.checkey/en-US/name.txt
 include tests/metadata/info.guardianproject.checkey/en-US/phoneScreenshots/checkey-phone.png
 include tests/metadata/info.guardianproject.checkey/en-US/phoneScreenshots/checkey.png
 include tests/metadata/info.guardianproject.checkey/en-US/summary.txt
-include tests/metadata/info.guardianproject.checkey/ja-JP/name.txt
-include tests/metadata/info.guardianproject.urzip.yml
+include tests/metadata/info.guardianproject.checkey.yml
 include tests/metadata/info.guardianproject.urzip/en-US/changelogs/100.txt
-include tests/metadata/info.guardianproject.urzip/en-US/changelogs/default.txt
 include tests/metadata/info.guardianproject.urzip/en-US/full_description.txt
 include tests/metadata/info.guardianproject.urzip/en-US/images/featureGraphic.png
 include tests/metadata/info.guardianproject.urzip/en-US/images/icon.png
 include tests/metadata/info.guardianproject.urzip/en-US/short_description.txt
 include tests/metadata/info.guardianproject.urzip/en-US/title.txt
 include tests/metadata/info.guardianproject.urzip/en-US/video.txt
+include tests/metadata/info.guardianproject.urzip.yml
 include tests/metadata/info.zwanenburg.caffeinetile.yml
 include tests/metadata/no.min.target.sdk.yml
 include tests/metadata/obb.main.oldversion.yml
-include tests/metadata/obb.main.twoversions.yml
 include tests/metadata/obb.mainpatch.current.yml
+include tests/metadata/obb.main.twoversions.yml
 include tests/metadata/org.adaway.yml
 include tests/metadata/org.fdroid.ci.test.app.yml
 include tests/metadata/org.fdroid.fdroid.yml
-include tests/metadata/org.maxsdkversion.yml
-include tests/metadata/org.smssecure.smssecure.yml
 include tests/metadata/org.smssecure.smssecure/signatures/134/28969C09.RSA
 include tests/metadata/org.smssecure.smssecure/signatures/134/28969C09.SF
 include tests/metadata/org.smssecure.smssecure/signatures/134/MANIFEST.MF
 include tests/metadata/org.smssecure.smssecure/signatures/135/28969C09.RSA
 include tests/metadata/org.smssecure.smssecure/signatures/135/28969C09.SF
 include tests/metadata/org.smssecure.smssecure/signatures/135/MANIFEST.MF
+include tests/metadata/org.smssecure.smssecure.yml
 include tests/metadata/org.videolan.vlc.yml
 include tests/metadata/raw.template.yml
+include tests/metadata-rewrite-yml/app.with.special.build.params.yml
+include tests/metadata-rewrite-yml/fake.ota.update.yml
+include tests/metadata-rewrite-yml/org.fdroid.fdroid.yml
 include tests/metadata/souch.smsbypass.yml
+include tests/metadata.TestCase
 include tests/minimal_targetsdk_30_unsigned.apk
-include tests/Norway_bouvet_europe_2.obf.zip
 include tests/no_targetsdk_minsdk1_unsigned.apk
 include tests/no_targetsdk_minsdk30_unsigned.apk
 include tests/openssl-version-check-test.py
@@ -661,17 +614,16 @@ include tests/org.bitbucket.tickytacky.mirrormirror_2.apk
 include tests/org.bitbucket.tickytacky.mirrormirror_3.apk
 include tests/org.bitbucket.tickytacky.mirrormirror_4.apk
 include tests/org.dyndns.fules.ck_20.apk
-include tests/org.sajeg.fallingblocks_3.apk
+include tests/publish.TestCase
+include tests/repo/categories.txt
 include tests/repo/com.example.test.helloworld_1.apk
 include tests/repo/com.politedroid_3.apk
 include tests/repo/com.politedroid_4.apk
 include tests/repo/com.politedroid_5.apk
 include tests/repo/com.politedroid_6.apk
 include tests/repo/duplicate.permisssions_9999999.apk
-include tests/repo/entry.json
 include tests/repo/fake.ota.update_1234.zip
 include tests/repo/index-v1.json
-include tests/repo/index-v2.json
 include tests/repo/index.xml
 include tests/repo/info.zwanenburg.caffeinetile_4.apk
 include tests/repo/main.1101613.obb.main.twoversions.obb
@@ -680,17 +632,16 @@ include tests/repo/main.1434483388.obb.main.oldversion.obb
 include tests/repo/main.1619.obb.mainpatch.current.obb
 include tests/repo/no.min.target.sdk_987.apk
 include tests/repo/obb.main.oldversion_1444412523.apk
-include tests/repo/obb.main.twoversions_1101613.apk
-include tests/repo/obb.main.twoversions_1101615.apk
-include tests/repo/obb.main.twoversions_1101617.apk
-include tests/repo/obb.main.twoversions_1101617_src.tar.gz
+include tests/repo/obb.mainpatch.current_1619_another-release-key.apk
+include tests/repo/obb.mainpatch.current_1619.apk
 include tests/repo/obb.mainpatch.current/en-US/featureGraphic.png
 include tests/repo/obb.mainpatch.current/en-US/icon.png
 include tests/repo/obb.mainpatch.current/en-US/phoneScreenshots/screenshot-main.png
 include tests/repo/obb.mainpatch.current/en-US/sevenInchScreenshots/screenshot-tablet-main.png
-include tests/repo/obb.mainpatch.current_1619.apk
-include tests/repo/obb.mainpatch.current_1619_another-release-key.apk
-include tests/repo/org.maxsdkversion_4.apk
+include tests/repo/obb.main.twoversions_1101613.apk
+include tests/repo/obb.main.twoversions_1101615.apk
+include tests/repo/obb.main.twoversions_1101617.apk
+include tests/repo/obb.main.twoversions_1101617_src.tar.gz
 include tests/repo/org.videolan.vlc/en-US/icon.png
 include tests/repo/org.videolan.vlc/en-US/phoneScreenshots/screenshot10.png
 include tests/repo/org.videolan.vlc/en-US/phoneScreenshots/screenshot12.png
@@ -702,16 +653,16 @@ include tests/repo/org.videolan.vlc/en-US/phoneScreenshots/screenshot4.png
 include tests/repo/org.videolan.vlc/en-US/phoneScreenshots/screenshot7.png
 include tests/repo/org.videolan.vlc/en-US/phoneScreenshots/screenshot9.png
 include tests/repo/org.videolan.vlc/en-US/sevenInchScreenshots/screenshot0.png
-include tests/repo/org.videolan.vlc/en-US/sevenInchScreenshots/screenshot1.png
 include tests/repo/org.videolan.vlc/en-US/sevenInchScreenshots/screenshot11.png
 include tests/repo/org.videolan.vlc/en-US/sevenInchScreenshots/screenshot13.png
 include tests/repo/org.videolan.vlc/en-US/sevenInchScreenshots/screenshot14.png
 include tests/repo/org.videolan.vlc/en-US/sevenInchScreenshots/screenshot16.png
 include tests/repo/org.videolan.vlc/en-US/sevenInchScreenshots/screenshot17.png
 include tests/repo/org.videolan.vlc/en-US/sevenInchScreenshots/screenshot19.png
-include tests/repo/org.videolan.vlc/en-US/sevenInchScreenshots/screenshot2.png
+include tests/repo/org.videolan.vlc/en-US/sevenInchScreenshots/screenshot1.png
 include tests/repo/org.videolan.vlc/en-US/sevenInchScreenshots/screenshot21.png
 include tests/repo/org.videolan.vlc/en-US/sevenInchScreenshots/screenshot23.png
+include tests/repo/org.videolan.vlc/en-US/sevenInchScreenshots/screenshot2.png
 include tests/repo/org.videolan.vlc/en-US/sevenInchScreenshots/screenshot3.png
 include tests/repo/org.videolan.vlc/en-US/sevenInchScreenshots/screenshot5.png
 include tests/repo/org.videolan.vlc/en-US/sevenInchScreenshots/screenshot6.png
@@ -721,24 +672,13 @@ include tests/repo/souch.smsbypass_9.apk
 include tests/repo/urzip-*.apk
 include tests/repo/v1.v2.sig_1020.apk
 include tests/run-tests
-include tests/SANAPPSI.RSA
-include tests/SANAPPSI.SF
-include tests/shared_test_code.py
-include tests/signindex/guardianproject-v1.jar
+include tests/scanner.TestCase
+include tests/signatures.TestCase
 include tests/signindex/guardianproject.jar
+include tests/signindex/guardianproject-v1.jar
 include tests/signindex/testy.jar
 include tests/signindex/unsigned.jar
 include tests/source-files/at.bitfire.davdroid/build.gradle
-include tests/source-files/catalog.test/app/build.gradle
-include tests/source-files/catalog.test/build.gradle.kts
-include tests/source-files/catalog.test/buildSrc/build.gradle.kts
-include tests/source-files/catalog.test/buildSrc/settings.gradle.kts
-include tests/source-files/catalog.test/buildSrc2/build.gradle.kts
-include tests/source-files/catalog.test/buildSrc2/settings.gradle.kts
-include tests/source-files/catalog.test/core/build.gradle
-include tests/source-files/catalog.test/gradle/libs.versions.toml
-include tests/source-files/catalog.test/libs.versions.toml
-include tests/source-files/catalog.test/settings.gradle.kts
 include tests/source-files/cn.wildfirechat.chat/avenginekit/build.gradle
 include tests/source-files/cn.wildfirechat.chat/build.gradle
 include tests/source-files/cn.wildfirechat.chat/chat/build.gradle
@@ -754,12 +694,6 @@ include tests/source-files/com.anpmech.launcher/app/build.gradle
 include tests/source-files/com.anpmech.launcher/app/src/main/AndroidManifest.xml
 include tests/source-files/com.anpmech.launcher/build.gradle
 include tests/source-files/com.anpmech.launcher/settings.gradle
-include tests/source-files/com.github.jameshnsears.quoteunquote/build.gradle
-include tests/source-files/com.github.shadowsocks/core/build.gradle.kts
-include tests/source-files/com.github.shadowsocks/mobile/build.gradle.kts
-include tests/source-files/com.infomaniak.mail/Core/gradle/core.versions.toml
-include tests/source-files/com.infomaniak.mail/gradle/libs.versions.toml
-include tests/source-files/com.infomaniak.mail/settings.gradle
 include tests/source-files/com.integreight.onesheeld/build.gradle
 include tests/source-files/com.integreight.onesheeld/gradle/wrapper/gradle-wrapper.properties
 include tests/source-files/com.integreight.onesheeld/localeapi/build.gradle
@@ -773,69 +707,37 @@ include tests/source-files/com.integreight.onesheeld/pullToRefreshlibrary/src/ma
 include tests/source-files/com.integreight.onesheeld/quickReturnHeader/build.gradle
 include tests/source-files/com.integreight.onesheeld/quickReturnHeader/src/main/AndroidManifest.xml
 include tests/source-files/com.integreight.onesheeld/settings.gradle
-include tests/source-files/com.jens.automation2/app/build.gradle
-include tests/source-files/com.jens.automation2/build.gradle
 include tests/source-files/com.kunzisoft.testcase/build.gradle
-include tests/source-files/com.lolo.io.onelist/app/build.gradle.kts
-include tests/source-files/com.lolo.io.onelist/build.gradle.kts
-include tests/source-files/com.lolo.io.onelist/gradle/libs.versions.toml
-include tests/source-files/com.lolo.io.onelist/gradle/wrapper/gradle-wrapper.properties
-include tests/source-files/com.lolo.io.onelist/settings.gradle
+include tests/source-files/com.nextcloud.client/build.gradle
 include tests/source-files/com.nextcloud.client.dev/src/generic/fastlane/metadata/android/en-US/full_description.txt
 include tests/source-files/com.nextcloud.client.dev/src/generic/fastlane/metadata/android/en-US/short_description.txt
 include tests/source-files/com.nextcloud.client.dev/src/generic/fastlane/metadata/android/en-US/title.txt
 include tests/source-files/com.nextcloud.client.dev/src/versionDev/fastlane/metadata/android/en-US/full_description.txt
 include tests/source-files/com.nextcloud.client.dev/src/versionDev/fastlane/metadata/android/en-US/short_description.txt
 include tests/source-files/com.nextcloud.client.dev/src/versionDev/fastlane/metadata/android/en-US/title.txt
-include tests/source-files/com.nextcloud.client/build.gradle
 include tests/source-files/com.nextcloud.client/src/generic/fastlane/metadata/android/en-US/full_description.txt
 include tests/source-files/com.nextcloud.client/src/generic/fastlane/metadata/android/en-US/short_description.txt
 include tests/source-files/com.nextcloud.client/src/generic/fastlane/metadata/android/en-US/title.txt
 include tests/source-files/com.nextcloud.client/src/versionDev/fastlane/metadata/android/en-US/full_description.txt
 include tests/source-files/com.nextcloud.client/src/versionDev/fastlane/metadata/android/en-US/short_description.txt
 include tests/source-files/com.nextcloud.client/src/versionDev/fastlane/metadata/android/en-US/title.txt
-include tests/source-files/com.seafile.seadroid2/app/build.gradle
-include tests/source-files/com.ubergeek42.WeechatAndroid/app/build.gradle.kts
-include tests/source-files/com.ubergeek42.WeechatAndroid/app/src/main/res/values/strings.xml
-include tests/source-files/de.varengold.activeTAN/build.gradle
-include tests/source-files/dev.patrickgold.florisboard/app/build.gradle.kts
 include tests/source-files/eu.siacs.conversations/build.gradle
 include tests/source-files/eu.siacs.conversations/metadata/en-US/name.txt
 include tests/source-files/fdroid/fdroidclient/AndroidManifest.xml
 include tests/source-files/fdroid/fdroidclient/build.gradle
-include tests/source-files/firebase-allowlisted/app/build.gradle
-include tests/source-files/firebase-allowlisted/build.gradle
 include tests/source-files/firebase-suspect/app/build.gradle
 include tests/source-files/firebase-suspect/build.gradle
-include tests/source-files/flavor.test/build.gradle
-include tests/source-files/info.guardianproject.ripple/build.gradle
-include tests/source-files/lockfile.test/flutter/.dart_tool/flutter_gen/pubspec.yaml
-include tests/source-files/lockfile.test/flutter/pubspec.lock
-include tests/source-files/lockfile.test/flutter/pubspec.yaml
-include tests/source-files/lockfile.test/javascript/package.json
-include tests/source-files/lockfile.test/javascript/yarn.lock
-include tests/source-files/lockfile.test/rust/subdir/Cargo.lock
-include tests/source-files/lockfile.test/rust/subdir/Cargo.toml
-include tests/source-files/lockfile.test/rust/subdir/subdir/subdir/Cargo.toml
-include tests/source-files/lockfile.test/rust/subdir2/Cargo.toml
+include tests/source-files/firebase-whitelisted/app/build.gradle
+include tests/source-files/firebase-whitelisted/build.gradle
 include tests/source-files/open-keychain/open-keychain/build.gradle
 include tests/source-files/open-keychain/open-keychain/OpenKeychain/build.gradle
 include tests/source-files/org.mozilla.rocket/app/build.gradle
-include tests/source-files/org.noise_planet.noisecapture/app/build.gradle
-include tests/source-files/org.noise_planet.noisecapture/settings.gradle
-include tests/source-files/org.noise_planet.noisecapture/sosfilter/build.gradle
-include tests/source-files/org.piepmeyer.gauguin/build.gradle.kts
-include tests/source-files/org.piepmeyer.gauguin/libs.versions.toml
-include tests/source-files/org.piepmeyer.gauguin/settings.gradle.kts
 include tests/source-files/org.tasks/app/build.gradle.kts
 include tests/source-files/org.tasks/build.gradle
 include tests/source-files/org.tasks/build.gradle.kts
 include tests/source-files/org.tasks/buildSrc/build.gradle.kts
 include tests/source-files/org.tasks/settings.gradle.kts
 include tests/source-files/osmandapp/osmand/build.gradle
-include tests/source-files/osmandapp/osmand/gradle/wrapper/gradle-wrapper.properties
-include tests/source-files/OtakuWorld/build.gradle
-include tests/source-files/realm/react-native/android/build.gradle
 include tests/source-files/se.manyver/android/app/build.gradle
 include tests/source-files/se.manyver/android/build.gradle
 include tests/source-files/se.manyver/android/gradle.properties
@@ -849,36 +751,12 @@ include tests/source-files/ut.ewh.audiometrytest/app/build.gradle
 include tests/source-files/ut.ewh.audiometrytest/app/src/main/AndroidManifest.xml
 include tests/source-files/ut.ewh.audiometrytest/build.gradle
 include tests/source-files/ut.ewh.audiometrytest/settings.gradle
-include tests/source-files/yuriykulikov/AlarmClock/gradle/wrapper/gradle-wrapper.properties
 include tests/source-files/Zillode/syncthing-silk/build.gradle
 include tests/SpeedoMeterApp.main_1.apk
-include tests/test_build.py
-include tests/test_checkupdates.py
-include tests/test_common.py
-include tests/test_deploy.py
-include tests/test_exception.py
-include tests/test_gradlew-fdroid
-include tests/test_import_subcommand.py
-include tests/test_index.py
-include tests/test_init.py
-include tests/test_install.py
-include tests/test_lint.py
-include tests/test_main.py
-include tests/test_metadata.py
-include tests/test_nightly.py
-include tests/test_publish.py
-include tests/test_rewritemeta.py
-include tests/test_scanner.py
-include tests/test_signatures.py
-include tests/test_signindex.py
-include tests/test_update.py
-include tests/test_vcs.py
-include tests/triple-t-1-graphics/build/de.wivewa.dialer/app/src/main/play/en-US/listing/featureGraphic/play_store_feature_graphic.png
-include tests/triple-t-1-graphics/build/de.wivewa.dialer/app/src/main/play/en-US/listing/icon/icon.png
-include tests/triple-t-1-graphics/build/de.wivewa.dialer/app/src/main/play/en-US/listing/phoneScreenshots/1.png
-include tests/triple-t-1-graphics/metadata/de.wivewa.dialer.yml
-include tests/triple-t-2/build/org.piwigo.android/app/.gitignore
+include tests/stats/known_apks.txt
+include tests/testcommon.py
 include tests/triple-t-2/build/org.piwigo.android/app/build.gradle
+include tests/triple-t-2/build/org.piwigo.android/app/.gitignore
 include tests/triple-t-2/build/org.piwigo.android/app/src/debug/res/values/constants.xml
 include tests/triple-t-2/build/org.piwigo.android/app/src/debug/res/values/strings.xml
 include tests/triple-t-2/build/org.piwigo.android/app/src/main/java/org/piwigo/PiwigoApplication.java
@@ -912,34 +790,17 @@ include tests/triple-t-2/build/org.piwigo.android/app/src/main/play/release-note
 include tests/triple-t-2/build/org.piwigo.android/build.gradle
 include tests/triple-t-2/build/org.piwigo.android/settings.gradle
 include tests/triple-t-2/metadata/org.piwigo.android.yml
-include tests/triple-t-anysoftkeyboard/build/com.anysoftkeyboard.languagepack.dutch/addons/languages/dutch/apk/src/main/play/listings/en-US/title.txt
-include tests/triple-t-anysoftkeyboard/build/com.anysoftkeyboard.languagepack.dutch/ime/app/src/main/play/listings/en-US/title.txt
-include tests/triple-t-anysoftkeyboard/build/com.anysoftkeyboard.languagepack.dutch/settings.gradle
-include tests/triple-t-anysoftkeyboard/build/com.menny.android.anysoftkeyboard/addons/languages/dutch/apk/src/main/play/listings/en-US/title.txt
-include tests/triple-t-anysoftkeyboard/build/com.menny.android.anysoftkeyboard/ime/app/src/main/play/listings/en-US/title.txt
-include tests/triple-t-anysoftkeyboard/build/com.menny.android.anysoftkeyboard/settings.gradle
-include tests/triple-t-anysoftkeyboard/metadata/com.anysoftkeyboard.languagepack.dutch.yml
-include tests/triple-t-anysoftkeyboard/metadata/com.menny.android.anysoftkeyboard.yml
-include tests/triple-t-flutter/build/fr.emersion.goguma/android/app/src/main/play/contact-website.txt
-include tests/triple-t-flutter/build/fr.emersion.goguma/android/app/src/main/play/listings/en-US/full-description.txt
-include tests/triple-t-flutter/build/fr.emersion.goguma/android/app/src/main/play/listings/en-US/short-description.txt
-include tests/triple-t-flutter/build/fr.emersion.goguma/android/app/src/main/play/listings/en-US/title.txt
-include tests/triple-t-flutter/metadata/fr.emersion.goguma.yml
-include tests/triple-t-multiple/build/ch.admin.bag.covidcertificate.verifier/settings.gradle
-include tests/triple-t-multiple/build/ch.admin.bag.covidcertificate.verifier/verifier/src/main/play/listings/en-US/title.txt
-include tests/triple-t-multiple/build/ch.admin.bag.covidcertificate.verifier/wallet/src/main/play/listings/en-US/title.txt
-include tests/triple-t-multiple/build/ch.admin.bag.covidcertificate.wallet/settings.gradle
-include tests/triple-t-multiple/build/ch.admin.bag.covidcertificate.wallet/verifier/src/main/play/listings/en-US/title.txt
-include tests/triple-t-multiple/build/ch.admin.bag.covidcertificate.wallet/wallet/src/main/play/listings/en-US/title.txt
-include tests/triple-t-multiple/metadata/ch.admin.bag.covidcertificate.verifier.yml
-include tests/triple-t-multiple/metadata/ch.admin.bag.covidcertificate.wallet.yml
+include tests/update.TestCase
+include tests/urzip.apk
 include tests/urzip-badcert.apk
 include tests/urzip-badsig.apk
-include tests/urzip-release-unsigned.apk
 include tests/urzip-release.apk
-include tests/urzip.apk
+include tests/urzip-release-unsigned.apk
 include tests/v2.only.sig_2.apk
 include tests/valid-package-names/random-package-names
 include tests/valid-package-names/RandomPackageNames.java
 include tests/valid-package-names/test.py
-include tests/__init__.py
+include tests/Norway_bouvet_europe_2.obf.zip
+include tests/xref/metadata/aarddict.android.yml
+include tests/xref/metadata/org.coolreader.yml
+include tests/xref/metadata/org.geometerplus.zlibrary.ui.android.yml
diff --git a/README.md b/README.md
index 41f725cb..dac49d72 100644
--- a/README.md
+++ b/README.md
@@ -1,116 +1,88 @@
-<div align="center">
+<a name="build-status"></a>
+
+| CI Builds                |  fdroidserver | buildserver | fdroid build --all | publishing tools |
+|--------------------------|:-------------:|:-----------:|:------------------:|:----------------:|
+| GNU/Linux                | [![fdroidserver status on GNU/Linux](https://gitlab.com/fdroid/fdroidserver/badges/master/build.svg)](https://gitlab.com/fdroid/fdroidserver/builds) | [![buildserver status](https://jenkins.debian.net/job/reproducible_setup_fdroid_build_environment/badge/icon)](https://jenkins.debian.net/job/reproducible_setup_fdroid_build_environment) | [![fdroid build all status](https://jenkins.debian.net/job/reproducible_fdroid_build_apps/badge/icon)](https://jenkins.debian.net/job/reproducible_fdroid_build_apps/) | [![fdroid test status](https://jenkins.debian.net/job/reproducible_fdroid_test/badge/icon)](https://jenkins.debian.net/job/reproducible_fdroid_test/) |
+| macOS                    | [![fdroidserver status on macOS](https://travis-ci.org/f-droid/fdroidserver.svg?branch=master)](https://travis-ci.org/f-droid/fdroidserver) | | | |
 
-<p><img src="https://gitlab.com/fdroid/artwork/-/raw/master/fdroid-logo-2015/fdroid-logo.svg" width="200"></p>
 
 # F-Droid Server
-### Tools for maintaining an F-Droid repository system.
 
-</div>
+Server for [F-Droid](https://f-droid.org), the Free Software repository system
+for Android.
 
----
+The F-Droid server tools provide various scripts and tools that are
+used to maintain the main
+[F-Droid application repository](https://f-droid.org/packages).  You
+can use these same tools to create your own additional or alternative
+repository for publishing, or to assist in creating, testing and
+submitting metadata to the main repository.
 
-## What is F-Droid Server?
-
-_fdroidserver_ is a suite of tools to publish and work with collections of
-Android apps (APK files) and other kinds of packages.  It is used to maintain
-the [f-droid.org application repository](https://f-droid.org/packages).  These
-same tools can be used to create additional or alternative repositories for
-publishing, or to assist in creating, testing and submitting metadata to the
-f-droid.org repository, also known as
-[_fdroiddata_](https://gitlab.com/fdroid/fdroiddata).
-
-For documentation, please see <https://f-droid.org/docs>.
-
-In the beginning, _fdroidserver_ was the complete server-side setup that ran
-f-droid.org.  Since then, the website and other parts have been split out into
-their own projects.  The name for this suite of tooling has stayed
-_fdroidserver_ even though it no longer contains any proper server component.
+For documentation, please see <https://f-droid.org/docs/>, or you can
+find the source for the documentation in
+[fdroid/fdroid-website](https://gitlab.com/fdroid/fdroid-website).
 
 
-## Installing
+### What is F-Droid?
 
-There are many ways to install _fdroidserver_, including using a range of
-package managers.  All of the options are documented on the website:
+F-Droid is an installable catalogue of FOSS (Free and Open Source Software)
+applications for the Android platform. The client makes it easy to browse,
+install, and keep track of updates on your device.
+
+
+### Installing
+
+There are many ways to install _fdroidserver_, they are documented on
+the website:
 https://f-droid.org/docs/Installing_the_Server_and_Repo_Tools
 
-
-## Releases
-
-The production setup of _fdroidserver_ for f-droid.org is run directly from the
-_master_ branch.  This is put into production on an schedule (currently weekly).
-So development and testing happens in the branches. We track branches using
-merge requests.  Therefore, there are many WIP and long-lived merge requests.
-
-There are also stable releases of _fdroidserver_.  This is mostly intended for
-running custom repositories, where the build process is separate.  It can also
-be useful as a simple way to get started contributing packages to _fdroiddata_,
-since the stable releases are available in package managers.
+All sorts of other documentation lives there as well.
 
 
-## Tests
+### Tests
 
-To run the full test suite:
-
-    tests/run-tests
-
-To run the tests for individual Python modules, see the `tests/test_*.py` files, e.g.:
-
-    python -m unittest tests/test_metadata.py
-
-It is also possible to run individual tests:
-
-    python -m unittest tests.test_metadata.MetadataTest.test_rewrite_yaml_special_build_params
-
-There is a growing test suite that has good coverage on a number of key parts of
-this code base.  It does not yet cover all the code, and there are some parts
-where the technical debt makes it difficult to write unit tests.  New tests
-should be standard Python _unittest_ test cases.  Whenever possible, the old
-tests written in _bash_ in _tests/run-tests_ should be ported to Python.
-
-This test suite has built over time a bit haphazardly, so it is not as clean,
-organized, or complete as it could be.  We welcome contributions.  The goal is
-to move towards standard Python testing patterns and to expand the unit test
-coverage.  Before rearchitecting any parts of it, be sure to [contact
-us](https://f-droid.org/about) to discuss the changes beforehand.
+There are many components to all of the tests for the components in
+this git repo.  The most commonly used parts of well tested, while
+some parts still lack tests.  This test suite has built over time a
+bit haphazardly, so it is not as clean, organized, or complete as it
+could be.  We welcome contributions.  Before rearchitecting any parts
+of it, be sure to [contact us](https://f-droid.org/about) to discuss
+the changes beforehand.
 
 
-### Additional tests for different linux distributions
+#### `fdroid` commands
 
-These tests are also run on various configurations through GitLab CI. This is
-only enabled for `master@fdroid/fdroidserver` because it takes longer to
+The test suite for all of the `fdroid` commands is in the _tests/_
+subdir.  _.gitlab-ci.yml_ and _.travis.yml_ run this test suite on
+various configurations.
+
+* _tests/complete-ci-tests_ runs _pylint_ and all tests on two
+  different pyvenvs
+* _tests/run-tests_ runs the whole test suite
+* _tests/*.TestCase_ are individual unit tests for all of the `fdroid`
+  commands, which can be run separately, e.g. `./update.TestCase`.
+
+
+#### Additional tests for different linux distributions
+
+These tests are also run on various distributions through GitLab CI. This is
+only enabled for `master@fdroid/fdroidserver` because it'll take longer to
 complete than the regular CI tests.  Most of the time you won't need to worry
-about them, but sometimes it might make sense to also run them for your merge
-request. In that case you need to remove [these lines from .gitlab-ci.yml](https://gitlab.com/fdroid/fdroidserver/-/blob/0124b9dde99f9cab19c034cbc7d8cc6005a99b48/.gitlab-ci.yml#L90-91)
+about them but sometimes it might make sense to also run them for your merge
+request. In that case you need to remove [these lines from
+.gitlab-ci.yml](https://gitlab.com/fdroid/fdroidserver/blob/master/.gitlab-ci.yml#L34-35)
 and push this to a new branch of your fork.
 
 Alternatively [run them
 locally](https://docs.gitlab.com/runner/commands/README.html#gitlab-runner-exec)
 like this: `gitlab-runner exec docker ubuntu_lts`
 
+#### buildserver
 
-## Documentation
-
-The API documentation based on the docstrings gets automatically
-published [here](https://fdroid.gitlab.io/fdroidserver) on every commit
-on the `master` branch.
-
-It can be built locally via
-
-```bash
-pip install -e .[docs]
-cd docs
-sphinx-apidoc -o ./source ../fdroidserver -M -e
-sphinx-autogen -o generated source/*.rst
-make html
-```
-
-To additionally lint the code call
-```bash
-pydocstyle fdroidserver --count
-```
-
-When writing docstrings you should follow the
-[numpy style guide](https://numpydoc.readthedocs.io/en/latest/format.html).
+The tests for the whole build server setup are entirely separate
+because they require at least 200GB of disk space, and 8GB of
+RAM. These test scripts are in the root of the project, all starting
+with _jenkins-_ since they are run on https://jenkins.debian.net.
 
 
 ## Translation
@@ -118,16 +90,4 @@ When writing docstrings you should follow the
 Everything can be translated.  See
 [Translation and Localization](https://f-droid.org/docs/Translation_and_Localization)
 for more info.
-
-<div align="center">
-
-[![](https://hosted.weblate.org/widgets/f-droid/-/287x66-white.png)](https://hosted.weblate.org/engage/f-droid)
-
-<details>
-<summary>View translation status for all languages.</summary>
-
-[![](https://hosted.weblate.org/widgets/f-droid/-/fdroidserver/multi-auto.svg)](https://hosted.weblate.org/engage/f-droid/?utm_source=widget)
-
-</details>
-
-</div>
+[![translation status](https://hosted.weblate.org/widgets/f-droid/-/fdroidserver/multi-auto.svg)](https://hosted.weblate.org/engage/f-droid/?utm_source=widget)
diff --git a/buildserver/Dockerfile b/buildserver/Dockerfile
deleted file mode 100644
index 27ada3f8..00000000
--- a/buildserver/Dockerfile
+++ /dev/null
@@ -1,74 +0,0 @@
-
-FROM debian:bookworm
-
-ENV LANG=C.UTF-8 \
-    DEBIAN_FRONTEND=noninteractive
-
-RUN echo Etc/UTC > /etc/timezone \
-	&& echo 'Acquire::Retries "20";' \
-		'APT::Get::Assume-Yes "true";' \
-		'APT::Install-Recommends "0";' \
-		'APT::Install-Suggests "0";' \
-		'Dpkg::Use-Pty "0";' \
-		'quiet "1";' \
-        >> /etc/apt/apt.conf.d/99gitlab
-
-# provision-apt-proxy was deliberately omitted, its not relevant in Docker
-COPY 	provision-android-ndk \
-	provision-android-sdk \
-	provision-apt-get-install \
-	provision-buildserverid \
-	provision-gradle \
-	setup-env-vars \
-	/opt/buildserver/
-
-ARG GIT_REV_PARSE_HEAD=unspecified
-LABEL org.opencontainers.image.revision=$GIT_REV_PARSE_HEAD
-
-# setup 'vagrant' user for compatibility
-RUN useradd --create-home -s /bin/bash vagrant && echo -n 'vagrant:vagrant' | chpasswd
-
-# The provision scripts must be run in the same order as in Vagrantfile
-# - vagrant needs openssh-client iproute2 ssh sudo
-# - ansible needs python3
-#
-# Debian Docker images will soon default to HTTPS for apt sources, so force it.
-# https://github.com/debuerreotype/docker-debian-artifacts/issues/15
-#
-# Ensure fdroidserver's dependencies are marked manual before purging
-# unneeded packages, otherwise, all its dependencies get purged.
-#
-# The official Debian docker images ship without ca-certificates, so
-# TLS certificates cannot be verified until that is installed. The
-# following code temporarily turns off TLS verification, and enables
-# HTTPS, so at least unverified TLS is used for apt-get instead of
-# plain HTTP.  Once ca-certificates is installed, the CA verification
-# is enabled by removing the newly created config file.  This set up
-# makes the initial `apt-get update` and `apt-get install` look the
-# same as verified TLS to the network observer and hides the metadata.
-RUN printf "path-exclude=/usr/share/locale/*\npath-exclude=/usr/share/man/*\npath-exclude=/usr/share/doc/*\npath-include=/usr/share/doc/*/copyright\n" >/etc/dpkg/dpkg.cfg.d/01_nodoc \
-	&& mkdir -p /usr/share/man/man1 \
-	&& echo 'Acquire::https::Verify-Peer "false";' > /etc/apt/apt.conf.d/99nocacertificates \
-	&& find /etc/apt/sources.list* -type f -exec sed -i s,http:,https:, {} \; \
-	&& apt-get update \
-	&& apt-get install ca-certificates \
-	&& rm /etc/apt/apt.conf.d/99nocacertificates \
-	&& apt-get upgrade \
-	&& apt-get dist-upgrade \
-	&& apt-get install openssh-client iproute2 python3 openssh-server sudo \
-	&& bash /opt/buildserver/setup-env-vars /opt/android-sdk \
-	&& . /etc/profile.d/bsenv.sh \
-	&& bash /opt/buildserver/provision-apt-get-install https://deb.debian.org/debian \
-	&& bash /opt/buildserver/provision-android-sdk "tools;25.2.5" \
-	&& bash /opt/buildserver/provision-android-ndk /opt/android-sdk/ndk \
-	&& bash /opt/buildserver/provision-gradle \
-	&& bash /opt/buildserver/provision-buildserverid $GIT_REV_PARSE_HEAD \
-	&& rm -rf /vagrant/cache \
-	&& apt-get autoremove --purge \
-	&& apt-get clean \
-	&& rm -rf /var/lib/apt/lists/*
-
-# Vagrant sudo setup for compatibility
-RUN echo 'vagrant ALL = NOPASSWD: ALL' > /etc/sudoers.d/vagrant \
-	&& chmod 440 /etc/sudoers.d/vagrant \
-	&& sed -i -e 's/Defaults.*requiretty/#&/' /etc/sudoers
diff --git a/buildserver/Vagrantfile b/buildserver/Vagrantfile
index 61e3459a..392d3df6 100644
--- a/buildserver/Vagrantfile
+++ b/buildserver/Vagrantfile
@@ -1,41 +1,24 @@
+
 require 'yaml'
 require 'pathname'
-require 'fileutils'
-
-configfile = {
-  'boot_timeout' => 600,
-  'cachedir' => File.join(ENV['HOME'], '.cache', 'fdroidserver'),
-  'cpus' => 1,
-  'debian_mirror' => 'https://deb.debian.org/debian/',
-  'hwvirtex' => 'on',
-  'memory' => 2048,
-  'vm_provider' => 'virtualbox',
-}
 
 srvpath = Pathname.new(File.dirname(__FILE__)).realpath
-configpath = File.join(srvpath, "/Vagrantfile.yaml")
-if File.exist? configpath
-  c = YAML.load_file(configpath)
-  if c and not c.empty?
-    c.each do |k,v|
-      configfile[k] = v
-    end
-  end
-else
-  puts "Copying example file to #{configpath}"
-  FileUtils.cp('../examples/Vagrantfile.yaml', configpath)
-end
+configfile = YAML.load_file(File.join(srvpath, "/Vagrantfile.yaml"))
 
 Vagrant.configure("2") do |config|
 
-  if Vagrant.has_plugin?("vagrant-cachier")
+  # these two caching methods conflict, so only use one at a time
+  if Vagrant.has_plugin?("vagrant-cachier") and not configfile.has_key? "aptcachedir"
     config.cache.scope = :box
     config.cache.auto_detect = false
     config.cache.enable :apt
     config.cache.enable :chef
   end
 
-  config.vm.box = "debian/bookworm64"
+  config.vm.box = configfile['basebox']
+  if configfile.has_key? "basebox_version"
+    config.vm.box_version = configfile['basebox_version']
+  end
 
   if not configfile.has_key? "vm_provider" or configfile["vm_provider"] == "virtualbox"
     # default to VirtualBox if not set
@@ -53,8 +36,6 @@ Vagrant.configure("2") do |config|
       libvirt.uri = "qemu:///system"
       libvirt.cpus = configfile["cpus"]
       libvirt.memory = configfile["memory"]
-      # Debian Vagrant image is only 20G, so allocate more
-      libvirt.machine_virtual_size = 1024
       if configfile.has_key? "libvirt_disk_bus"
         libvirt.disk_bus = configfile["libvirt_disk_bus"]
       end
@@ -67,8 +48,7 @@ Vagrant.configure("2") do |config|
     else
       synced_folder_type = '9p'
     end
-    config.vm.synced_folder './', '/vagrant', type: synced_folder_type,
-                            SharedFoldersEnableSymlinksCreate: false
+    config.vm.synced_folder './', '/vagrant', type: synced_folder_type
   else
     abort("No supported VM Provider found, set vm_provider in Vagrantfile.yaml!")
   end
@@ -80,30 +60,30 @@ Vagrant.configure("2") do |config|
       args: [configfile["aptproxy"]]
   end
 
-  config.vm.synced_folder configfile["cachedir"], '/vagrant/cache',
-                          create: true, type: synced_folder_type
-
+  # buildserver/ is shared to the VM's /vagrant by default so the old
+  # default does not need a custom mount
+  if configfile["cachedir"] != "buildserver/cache"
+    config.vm.synced_folder configfile["cachedir"], '/vagrant/cache',
+      create: true, type: synced_folder_type
+  end
   # Make sure dir exists to mount to, since buildserver/ is
   # automatically mounted as /vagrant in the guest VM. This is more
   # necessary with 9p synced folders
-  Dir.mkdir('cache') unless File.exist?('cache')
+  Dir.mkdir('cache') unless File.exists?('cache')
 
-  # Root partition needs to be resized to the new allocated space
-  config.vm.provision "shell", inline: <<-SHELL
-    growpart -v -u auto /dev/vda 1
-    resize2fs /dev/vda1
-  SHELL
+  # cache .deb packages on the host via a mount trick
+  if configfile.has_key? "aptcachedir"
+    config.vm.synced_folder configfile["aptcachedir"], "/var/cache/apt/archives",
+      owner: 'root', group: 'root', create: true
+  end
 
-  config.vm.provision "shell", name: "setup-env-vars", path: "setup-env-vars",
-    args: ["/opt/android-sdk"]
-  config.vm.provision "shell", name: "apt-get-install", path: "provision-apt-get-install",
+  config.vm.provision "shell", path: "setup-env-vars",
+    args: ["/home/vagrant/android-sdk"]
+  config.vm.provision "shell", path: "provision-apt-get-install",
     args: [configfile['debian_mirror']]
-  config.vm.provision "shell", name: "android-sdk", path: "provision-android-sdk"
-  config.vm.provision "shell", name: "android-ndk", path: "provision-android-ndk",
-    args: ["/opt/android-sdk/ndk"]
-  config.vm.provision "shell", name: "gradle", path: "provision-gradle"
-  config.vm.provision "shell", name: "disable-analytics", path: "provision-disable-analytics"
-  config.vm.provision "shell", name: "buildserverid", path: "provision-buildserverid",
-    args: [`git rev-parse HEAD`]
+  config.vm.provision "shell", path: "provision-android-sdk"
+  config.vm.provision "shell", path: "provision-android-ndk",
+    args: ["/home/vagrant/android-ndk"]
+  config.vm.provision "shell", path: "provision-gradle"
 
 end
diff --git a/buildserver/config.buildserver.yml b/buildserver/config.buildserver.yml
index 944535c5..b94fc601 100644
--- a/buildserver/config.buildserver.yml
+++ b/buildserver/config.buildserver.yml
@@ -1,2 +1,19 @@
-sdk_path: /opt/android-sdk
+sdk_path: /home/vagrant/android-sdk
+ndk_paths:
+  r10e: /home/vagrant/android-ndk/r10e
+  r11c: /home/vagrant/android-ndk/r11c
+  r12b: /home/vagrant/android-ndk/r12b
+  r13b: /home/vagrant/android-ndk/r13b
+  r14b: /home/vagrant/android-ndk/r14b
+  r15c: /home/vagrant/android-ndk/r15c
+  r16b: /home/vagrant/android-ndk/r16b
+  r17c: /home/vagrant/android-ndk/r17c
+  r18b: /home/vagrant/android-ndk/r18b
+  r19c: /home/vagrant/android-ndk/r19c
+  r20b: /home/vagrant/android-ndk/r20b
+  r21d: /home/vagrant/android-ndk/r21d
+
+java_paths:
+  8: /usr/lib/jvm/java-8-openjdk-amd64
+
 gradle_version_dir: /opt/gradle/versions
diff --git a/buildserver/provision-android-ndk b/buildserver/provision-android-ndk
index 63f5eee7..c241bab3 100644
--- a/buildserver/provision-android-ndk
+++ b/buildserver/provision-android-ndk
@@ -1,30 +1,26 @@
 #!/bin/bash
 #
-# $1 is the root dir to install the NDKs into
-# $2 and after are the NDK releases to install
 
 echo $0
 set -e
 set -x
 
 NDK_BASE=$1
-shift
 
 test -e $NDK_BASE || mkdir -p $NDK_BASE
 cd $NDK_BASE
 
-for version in $@; do
+if [ ! -e $NDK_BASE/r10e ]; then
+    7zr x /vagrant/cache/android-ndk-r10e-linux-x86_64.bin > /dev/null
+    mv android-ndk-r10e r10e
+fi
+
+for version in r11c r12b r13b r14b r15c r16b r17c r18b r19c r20b r21d; do
     if [ ! -e ${NDK_BASE}/${version} ]; then
-        unzip /vagrant/cache/android-ndk-${version}-linux*.zip > /dev/null
-        mv android-ndk-${version} \
-	   `sed -En 's,^Pkg.Revision *= *(.+),\1,p' android-ndk-${version}/source.properties`
+        unzip /vagrant/cache/android-ndk-${version}-linux-x86_64.zip > /dev/null
+        mv android-ndk-${version} ${version}
     fi
 done
 
-# allow gradle/etc to install missing NDK versions
-chgrp vagrant $NDK_BASE
-chmod g+w $NDK_BASE
-
-# ensure all users can read and execute the NDK
 chmod -R a+rX $NDK_BASE/
-find $NDK_BASE/ -type f -executable -exec chmod a+x -- {} +
+find $NDK_BASE/ -type f -executable -print0 | xargs -0 chmod a+x
diff --git a/buildserver/provision-android-sdk b/buildserver/provision-android-sdk
index 19002a47..d0e73d8a 100644
--- a/buildserver/provision-android-sdk
+++ b/buildserver/provision-android-sdk
@@ -1,4 +1,5 @@
 #!/bin/bash
+#
 
 echo $0
 set -e
@@ -9,6 +10,19 @@ if [ -z $ANDROID_HOME ]; then
     exit 1
 fi
 
+# TODO remove the rm, this should work with an existing ANDROID_HOME
+if [ ! -x $ANDROID_HOME/tools/android ]; then
+    rm -rf $ANDROID_HOME
+    mkdir ${ANDROID_HOME}
+    mkdir ${ANDROID_HOME}/temp
+    mkdir ${ANDROID_HOME}/platforms
+    mkdir ${ANDROID_HOME}/build-tools
+    cd $ANDROID_HOME
+
+    tools=`ls -1 /vagrant/cache/tools_*.zip | sort -n | tail -1`
+    unzip -qq $tools
+fi
+
 # disable the repositories of proprietary stuff
 disabled="
 @version@=1
@@ -26,96 +40,59 @@ for line in $disabled; do
     echo $line >> ${HOME}/.android/sites-settings.cfg
 done
 
-# Include old makebuildserver cache that is a Vagrant synced_folder
-# for sdkmanager to use.
-cachedir=$HOME/.cache/sdkmanager
-mkdir -p $cachedir
-pushd $cachedir
-for f in /vagrant/cache/*.zip; do
-    test -e $f && ln -s $f
+
+cd /vagrant/cache
+
+# make links for `android update sdk` to use and delete
+blacklist="build-tools_r17-linux.zip
+           build-tools_r18.0.1-linux.zip
+           build-tools_r18.1-linux.zip
+           build-tools_r18.1.1-linux.zip
+           build-tools_r19-linux.zip
+           build-tools_r19.0.1-linux.zip
+           build-tools_r19.0.2-linux.zip
+           build-tools_r19.0.3-linux.zip
+           build-tools_r21-linux.zip
+           build-tools_r21.0.1-linux.zip
+           build-tools_r21.0.2-linux.zip
+           build-tools_r21.1-linux.zip
+           build-tools_r21.1.1-linux.zip
+           build-tools_r22-linux.zip
+           build-tools_r23-linux.zip
+           android-1.5_r04-linux.zip
+           android-1.6_r03-linux.zip
+           android-2.0_r01-linux.zip
+           android-2.0.1_r01-linux.zip"
+latestm2=`ls -1 android_m2repository*.zip | sort -n | tail -1`
+for f in $latestm2 android-[0-9]*.zip platform-[0-9]*.zip build-tools_r*-linux.zip; do
+    rm -f ${ANDROID_HOME}/temp/$f
+    if [[ $blacklist != *$f* ]]; then
+        ln -s /vagrant/cache/$f ${ANDROID_HOME}/temp/
+    fi
 done
-popd
 
-# TODO do not preinstall 'tools' or 'platform-tools' at all, app builds don't need them
-packages="
-  tools;25.2.5
-  platform-tools
-  build-tools;19.1.0
-  build-tools;20.0.0
-  build-tools;21.1.2
-  build-tools;22.0.1
-  build-tools;23.0.1
-  build-tools;23.0.2
-  build-tools;23.0.3
-  build-tools;24.0.0
-  build-tools;24.0.1
-  build-tools;24.0.2
-  build-tools;24.0.3
-  build-tools;25.0.0
-  build-tools;25.0.1
-  build-tools;25.0.2
-  build-tools;25.0.3
-  build-tools;26.0.0
-  build-tools;26.0.1
-  build-tools;26.0.2
-  build-tools;26.0.3
-  build-tools;27.0.0
-  build-tools;27.0.1
-  build-tools;27.0.2
-  build-tools;27.0.3
-  build-tools;28.0.0
-  build-tools;28.0.1
-  build-tools;28.0.2
-  build-tools;28.0.3
-  build-tools;29.0.2
-  build-tools;29.0.3
-  build-tools;30.0.0
-  build-tools;30.0.1
-  build-tools;30.0.2
-  build-tools;30.0.3
-  build-tools;31.0.0
-  build-tools;32.0.0
-  build-tools;33.0.0
-  platforms;android-10
-  platforms;android-11
-  platforms;android-12
-  platforms;android-13
-  platforms;android-14
-  platforms;android-15
-  platforms;android-16
-  platforms;android-17
-  platforms;android-18
-  platforms;android-19
-  platforms;android-20
-  platforms;android-21
-  platforms;android-22
-  platforms;android-23
-  platforms;android-24
-  platforms;android-25
-  platforms;android-26
-  platforms;android-27
-  platforms;android-28
-  platforms;android-29
-  platforms;android-30
-  platforms;android-31
-  platforms;android-32
-  platforms;android-33
-"
+# install all cached platforms
+cached=""
+for f in `ls -1 android-[0-9]*.zip platform-[0-9]*.zip`; do
+    sdk=`unzip -c $f "*/build.prop" | sed -n 's,^ro.build.version.sdk=,,p'`
+    cached=,android-${sdk}${cached}
+done
 
-if [ $# -gt 0 ]; then
-    echo found args
-    packages=$@
-fi
+# install all cached build-tools
+for f in `ls -1 build-tools*.zip`; do
+    ver=`unzip -c $f "*/source.properties" | sed -n 's,^Pkg.Revision=,,p'`
+    if [[ $ver == 24.0.0 ]] && [[ $f =~ .*r24\.0\.1.* ]]; then
+        # 24.0.1 has the wrong revision in the zip
+        ver=24.0.1
+    fi
+    cached=,build-tools-${ver}${cached}
+done
 
-# temporary test of whether this script ran. It will change once
-# 'tools' is no longer installed by default.
-if [ ! -x $ANDROID_HOME/tools/bin/sdkmanager ]; then
-    mkdir -p ${ANDROID_HOME}/
-    sdkmanager $packages
-fi
+${ANDROID_HOME}/tools/android update sdk --no-ui --all \
+    --filter platform-tools,extra-android-m2repository${cached} <<EOH
+y
 
-# this hacked cache should not end up in the Vagrant box or Docker image
-rm -rf $cachedir
+EOH
 
 mkdir -p $ANDROID_HOME/licenses/
 
@@ -140,19 +117,17 @@ cat <<EOF > $ANDROID_HOME/licenses/android-sdk-preview-license-old
 84831b9409646a918e30573bab4c9c91346d8abd
 EOF
 
-cat <<EOF > $ANDROID_HOME/licenses/intel-android-extra-license
+echo y | $ANDROID_HOME/tools/bin/sdkmanager "extras;m2repository;com;android;support;constraint;constraint-layout;1.0.1"
+echo y | $ANDROID_HOME/tools/bin/sdkmanager "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.1"
+echo y | $ANDROID_HOME/tools/bin/sdkmanager "extras;m2repository;com;android;support;constraint;constraint-layout;1.0.2"
+echo y | $ANDROID_HOME/tools/bin/sdkmanager "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.2"
 
-d975f751698a77b662f1254ddbeed3901e976f5a
-EOF
-
-chmod a+X $(dirname $ANDROID_HOME/)
 chmod -R a+rX $ANDROID_HOME/
 chgrp vagrant $ANDROID_HOME
 chmod g+w $ANDROID_HOME
 find $ANDROID_HOME/ -type f -executable -print0 | xargs -0 chmod a+x
 
 # allow gradle to install newer build-tools and platforms
-mkdir -p $ANDROID_HOME/{build-tools,platforms}
 chgrp vagrant $ANDROID_HOME/{build-tools,platforms}
 chmod g+w $ANDROID_HOME/{build-tools,platforms}
 
@@ -160,8 +135,3 @@ chmod g+w $ANDROID_HOME/{build-tools,platforms}
 test -d $ANDROID_HOME/extras/m2repository || mkdir -p $ANDROID_HOME/extras/m2repository
 find $ANDROID_HOME/extras/m2repository -type d | xargs chgrp vagrant
 find $ANDROID_HOME/extras/m2repository -type d | xargs chmod g+w
-
-# allow gradle/sdkmanager to install extras;android;m2repository
-test -d $ANDROID_HOME/extras/android || mkdir -p $ANDROID_HOME/extras/android
-find $ANDROID_HOME/extras/android -type d | xargs chgrp vagrant
-find $ANDROID_HOME/extras/android -type d | xargs chmod g+w
diff --git a/buildserver/provision-apt-get-install b/buildserver/provision-apt-get-install
index ca39c47b..7619a314 100644
--- a/buildserver/provision-apt-get-install
+++ b/buildserver/provision-apt-get-install
@@ -10,7 +10,7 @@ export DEBIAN_FRONTEND=noninteractive
 printf 'APT::Install-Recommends "0";\nAPT::Install-Suggests "0";\n' \
        > /etc/apt/apt.conf.d/99no-install-recommends
 
-printf 'Acquire::Retries "20";\n' \
+printf 'APT::Acquire::Retries "20";\n' \
        > /etc/apt/apt.conf.d/99acquire-retries
 
 cat <<EOF > /etc/apt/apt.conf.d/99no-auto-updates
@@ -27,113 +27,115 @@ Dpkg::Use-Pty "0";
 quiet "1";
 EOF
 
-cat <<EOF > /etc/apt/apt.conf.d/99confdef
-Dpkg::Options { "--force-confdef"; };
-EOF
-
-echo "man-db man-db/auto-update boolean false" | debconf-set-selections
-
 if echo $debian_mirror | grep '^https' 2>&1 > /dev/null; then
     apt-get update || apt-get update
-    apt-get install ca-certificates
+    apt-get install apt-transport-https ca-certificates
 fi
 
 cat << EOF > /etc/apt/sources.list
-deb ${debian_mirror} bookworm main
-deb https://security.debian.org/debian-security bookworm-security main
-deb ${debian_mirror} bookworm-updates main
+deb ${debian_mirror} stretch main
+deb http://security.debian.org/debian-security stretch/updates main
+deb ${debian_mirror} stretch-updates main
 EOF
-echo "deb ${debian_mirror} bookworm-backports main" > /etc/apt/sources.list.d/backports.list
+echo "deb ${debian_mirror} stretch-backports main" > /etc/apt/sources.list.d/stretch-backports.list
+echo "deb ${debian_mirror} stretch-backports-sloppy main" > /etc/apt/sources.list.d/stretch-backports-sloppy.list
+echo "deb ${debian_mirror} testing main"           > /etc/apt/sources.list.d/testing.list
+printf "Package: *\nPin: release o=Debian,a=testing\nPin-Priority: -300\n" > /etc/apt/preferences.d/debian-testing
+
+dpkg --add-architecture i386
 
 apt-get update || apt-get update
-
-# purge things that might come from the base box, but we don't want
-# https://salsa.debian.org/cloud-team/debian-vagrant-images/-/tree/master/config_space/package_config
-# cat config_space/package_config/* | sort -u | grep -v '[A-Z#]'
-
-purge="
- apt-listchanges
- apt-utils
- bash-completion
- bind9-*
- bsdextrautils
- bzip2
- chrony
- cloud-utils
- cron
- cron-daemon-common
- dbus
- debconf-i18n
- debian-faq
- dmidecode
- doc-debian
- fdisk
- file
- groff-base
- inetutils-telnet
- krb5-locales
- less
- locales
- logrotate
- lsof
- manpages
- nano
- ncurses-term
- netcat-traditional
- pciutils
- reportbug
- rsyslog
- tasksel
- traceroute
- unattended-upgrades
- usrmerge
- vim-*
- wamerican
- wget
- whiptail
- xz-utils
-"
-# clean up files packages to be purged, then purge the packages
-rm -rf /var/run/dbus /var/log/unattended-upgrades
-apt-get purge $purge
-
 apt-get upgrade --download-only
 apt-get upgrade
 
-# again after upgrade in case of keyring changes
-apt-get update || apt-get update
-
 packages="
- androguard/bookworm-backports
- apksigner
- default-jdk-headless
- default-jre-headless
+ androguard/stretch-backports
+ ant
+ asn1c
+ ant-contrib
+ autoconf
+ autoconf2.13
+ automake
+ automake1.11
+ autopoint
+ bison
+ bzr
+ ca-certificates-java
+ cmake
  curl
- dexdump
- fdroidserver
+ disorderfs
+ expect
+ faketime
+ flex
+ gettext
+ gettext-base
+ git-core
  git-svn
- gnupg
+ gperf
+ gpg/stretch-backports-sloppy
+ gpgconf/stretch-backports-sloppy
+ libassuan0/stretch-backports
+ libgpg-error0/stretch-backports
+ javacc
+ libarchive-zip-perl
+ libexpat1-dev
+ libgcc1:i386
+ libglib2.0-dev
+ liblzma-dev
+ libncurses5:i386
+ librsvg2-bin
+ libsaxonb-java
+ libssl-dev
+ libstdc++6:i386
+ libtool
+ libtool-bin
+ make
+ maven
  mercurial
- patch
- python3-magic
- python3-packaging
+ nasm
+ openjdk-8-jre-headless
+ openjdk-8-jdk-headless
+ optipng
+ p7zip
+ pkg-config
+ python-gnupg
+ python-lxml
+ python-magic
+ python-pip
+ python-setuptools
+ python3-asn1crypto/stretch-backports
+ python3-defusedxml
+ python3-git
+ python3-gitdb
+ python3-gnupg
+ python3-pip
+ python3-pyasn1
+ python3-pyasn1-modules
+ python3-requests
+ python3-setuptools
+ python3-smmap
+ python3-yaml
+ python3-ruamel.yaml
+ python3-pil
+ python3-paramiko
+ quilt
  rsync
- sdkmanager/bookworm-backports
+ scons
+ sqlite3
+ subversion
  sudo
+ swig
  unzip
+ xsltproc
+ yasm
+ zip
+ zlib1g:i386
 "
-
 apt-get install $packages --download-only
 apt-get install $packages
 
-# fdroidserver comes from git, it was installed just for dependencies
-apt-mark manual `apt-cache depends fdroidserver | sed -nE 's,^[| ]*Depends: ([a-z0-9 -]+),\1,p'`
-apt-get purge fdroidserver
-
-# clean up things that will become outdated anyway
-apt-get autoremove --purge
-apt-get clean
-rm -rf /var/lib/apt/lists/*
-
 highestjava=`update-java-alternatives --list | sort -n | tail -1 | cut -d ' ' -f 1`
 update-java-alternatives --set $highestjava
+
+# configure headless openjdk to work without gtk accessability dependencies
+sed -i -e 's@\(assistive_technologies=org.GNOME.Accessibility.AtkWrapper\)@#\1@' /etc/java-8-openjdk/accessibility.properties
diff --git a/buildserver/provision-buildserverid b/buildserver/provision-buildserverid
deleted file mode 100644
index f5010c39..00000000
--- a/buildserver/provision-buildserverid
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/bash -e
-
-test -n "$1"
-
-echo "Writing buildserver ID ...ID is $1"
-set -x
-echo "$1" > /home/vagrant/buildserverid
-# sync data before we halt() the machine, we had an empty buildserverid otherwise
-sync
diff --git a/buildserver/provision-disable-analytics b/buildserver/provision-disable-analytics
deleted file mode 100644
index e1ec62b7..00000000
--- a/buildserver/provision-disable-analytics
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/bash
-
-set -ex
-
-# Flutter
-# https://github.com/flutter/flutter/issues/73657
-flutter_conf=/home/vagrant/.flutter
-cat <<EOF > $flutter_conf
-{
-  "enabled": false
-}
-EOF
-chown -R vagrant:vagrant $flutter_conf
-chmod -R 0644 $flutter_conf
-
diff --git a/buildserver/provision-gradle b/buildserver/provision-gradle
index a282a4c5..ce8aefa1 100644
--- a/buildserver/provision-gradle
+++ b/buildserver/provision-gradle
@@ -10,29 +10,21 @@ vergte() {
 
 test -e /opt/gradle/versions || mkdir -p /opt/gradle/versions
 cd /opt/gradle/versions
-
-glob="/vagrant/cache/gradle-*.zip"
-if compgen -G $glob; then # test if glob matches anything
-    f=$(ls -1 --sort=version --group-directories-first $glob | tail -1)
+for f in /vagrant/cache/gradle-*.zip; do
     ver=`echo $f | sed 's,.*gradle-\([0-9][0-9.]*\).*\.zip,\1,'`
     # only use versions greater or equal 2.2.1
     if vergte $ver 2.2.1 && [ ! -d /opt/gradle/versions/${ver} ]; then
         unzip -qq $f
         mv gradle-${ver} /opt/gradle/versions/${ver}
     fi
-fi
+done
 
 chmod -R a+rX /opt/gradle
 
 test -e /opt/gradle/bin || mkdir -p /opt/gradle/bin
-git clone --depth 1 https://gitlab.com/fdroid/gradlew-fdroid.git /home/vagrant/gradlew-fdroid/
-chmod 0755 /home/vagrant/gradlew-fdroid/gradlew-fdroid
-chmod -R u+rwX,a+rX,go-w /home/vagrant/gradlew-fdroid/
-ln -fs /home/vagrant/gradlew-fdroid/gradlew-fdroid /opt/gradle/bin/gradle
-ln -fs /home/vagrant/gradlew-fdroid/gradlew-fdroid /usr/local/bin/
-
-chown -h vagrant:vagrant /opt/gradle/bin/gradle
-chown vagrant:vagrant /opt/gradle/versions
+ln -fs /home/vagrant/fdroidserver/gradlew-fdroid /opt/gradle/bin/gradle
+chown -h vagrant.vagrant /opt/gradle/bin/gradle
+chown vagrant.vagrant /opt/gradle/versions
 chmod 0755 /opt/gradle/versions
 
 GRADLE_HOME=/home/vagrant/.gradle
@@ -49,5 +41,5 @@ systemProp.org.gradle.internal.http.connectionTimeout=600000
 systemProp.org.gradle.internal.http.socketTimeout=600000
 EOF
 
-chown -R vagrant:vagrant $GRADLE_HOME/
+chown -R vagrant.vagrant $GRADLE_HOME/
 chmod -R a+rX $GRADLE_HOME/
diff --git a/buildserver/setup-env-vars b/buildserver/setup-env-vars
index 1c3599e9..19259266 100644
--- a/buildserver/setup-env-vars
+++ b/buildserver/setup-env-vars
@@ -12,16 +12,9 @@ echo "# generated on "`date` > $bsenv
 echo export ANDROID_HOME=$1 >> $bsenv
 echo 'export PATH=$PATH:${ANDROID_HOME}/tools:${ANDROID_HOME}/platform-tools:/opt/gradle/bin' >> $bsenv
 echo "export DEBIAN_FRONTEND=noninteractive" >> $bsenv
-echo 'export home_vagrant=/home/vagrant' >> $bsenv
-echo 'export fdroidserver=$home_vagrant/fdroidserver' >> $bsenv
-echo 'export LC_ALL=C.UTF-8' >> $bsenv
 
 chmod 0644 $bsenv
 
 # make sure that SSH never hangs at a password or key prompt
-mkdir -p /etc/ssh/ssh_config.d/
-cat << EOF >> /etc/ssh/ssh_config.d/fdroid
-Host *
-    StrictHostKeyChecking yes
-    BatchMode yes
-EOF
+printf '    StrictHostKeyChecking yes' >> /etc/ssh/ssh_config
+printf '    BatchMode yes' >> /etc/ssh/config
diff --git a/completion/bash-completion b/completion/bash-completion
index 57fcfd12..751e5b24 100644
--- a/completion/bash-completion
+++ b/completion/bash-completion
@@ -83,7 +83,7 @@ __complete_options() {
 __complete_build() {
 	opts="-v -q -l -s -t -f -a"
 
-	lopts="--verbose --quiet --latest --stop --test --server --skip-scan --scan-binary --no-tarball --force --all --no-refresh"
+	lopts="--verbose --quiet --latest --stop --test --server --reset-server --skip-scan --scan-binary --no-tarball --force --all --no-refresh"
 	case "${prev}" in
 		:)
 			__vercode
@@ -109,8 +109,8 @@ __complete_gpgsign() {
 }
 
 __complete_install() {
-	opts="-v -q -a -p -n -y"
-	lopts="--verbose --quiet --all --color --no-color --privacy-mode --no-privacy-mode --no --yes"
+	opts="-v -q"
+	lopts="--verbose --quiet --all"
 	case "${cur}" in
 		-*)
 			__complete_options
@@ -155,7 +155,7 @@ __complete_publish() {
 
 __complete_checkupdates() {
 	opts="-v -q"
-	lopts="--verbose --quiet --auto --autoonly --commit --allow-dirty"
+	lopts="--verbose --quiet --auto --autoonly --commit --gplay --allow-dirty"
 	case "${cur}" in
 		-*)
 			__complete_options
@@ -251,7 +251,7 @@ __complete_btlog() {
 
 __complete_mirror() {
 	opts="-v"
-	lopts="--all --archive --build-logs --color --no-color --pgp-signatures --src-tarballs --output-dir"
+	lopts="--all --archive --build-logs --pgp-signatures --src-tarballs --output-dir"
 	__complete_options
 }
 
@@ -261,6 +261,12 @@ __complete_nightly() {
 	__complete_options
 }
 
+__complete_stats() {
+	opts="-v -q -d"
+	lopts="--verbose --quiet --download"
+	__complete_options
+}
+
 __complete_deploy() {
 	opts="-i -v -q"
 	lopts="--identity-file --local-copy-dir --sync-from-local-copy-dir
@@ -270,14 +276,12 @@ __complete_deploy() {
 
 __complete_signatures() {
 	opts="-v -q"
-	lopts="--verbose --color --no-color --no-check-https"
+	lopts="--verbose --no-check-https"
 	case "${cur}" in
 		-*)
 			__complete_options
 			return 0;;
 	esac
-        _filedir 'apk'
-        return 0
 }
 
 __complete_signindex() {
@@ -289,7 +293,7 @@ __complete_signindex() {
 __complete_init() {
 	opts="-v -q -d"
 	lopts="--verbose --quiet --distinguished-name --keystore
- --repo-keyalias --android-home --no-prompt --color --no-color"
+ --repo-keyalias --android-home --no-prompt"
 	__complete_options
 }
 
@@ -298,6 +302,7 @@ btlog \
 build \
 checkupdates \
 deploy \
+dscanner \
 gpgsign \
 import \
 init \
@@ -311,6 +316,7 @@ rewritemeta \
 scanner \
 signatures \
 signindex \
+stats \
 update \
 verify \
 "
diff --git a/docs/Makefile b/docs/Makefile
deleted file mode 100644
index d0c3cbf1..00000000
--- a/docs/Makefile
+++ /dev/null
@@ -1,20 +0,0 @@
-# Minimal makefile for Sphinx documentation
-#
-
-# You can set these variables from the command line, and also
-# from the environment for the first two.
-SPHINXOPTS    ?=
-SPHINXBUILD   ?= sphinx-build
-SOURCEDIR     = source
-BUILDDIR      = build
-
-# Put it first so that "make" without argument is like "make help".
-help:
-	@$(SPHINXBUILD) -M help "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
-
-.PHONY: help Makefile
-
-# Catch-all target: route all unknown targets to Sphinx using the new
-# "make mode" option.  $(O) is meant as a shortcut for $(SPHINXOPTS).
-%: Makefile
-	@$(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
diff --git a/docs/make.bat b/docs/make.bat
deleted file mode 100644
index 6247f7e2..00000000
--- a/docs/make.bat
+++ /dev/null
@@ -1,35 +0,0 @@
-@ECHO OFF
-
-pushd %~dp0
-
-REM Command file for Sphinx documentation
-
-if "%SPHINXBUILD%" == "" (
-	set SPHINXBUILD=sphinx-build
-)
-set SOURCEDIR=source
-set BUILDDIR=build
-
-if "%1" == "" goto help
-
-%SPHINXBUILD% >NUL 2>NUL
-if errorlevel 9009 (
-	echo.
-	echo.The 'sphinx-build' command was not found. Make sure you have Sphinx
-	echo.installed, then set the SPHINXBUILD environment variable to point
-	echo.to the full path of the 'sphinx-build' executable. Alternatively you
-	echo.may add the Sphinx directory to PATH.
-	echo.
-	echo.If you don't have Sphinx installed, grab it from
-	echo.http://sphinx-doc.org/
-	exit /b 1
-)
-
-%SPHINXBUILD% -M %1 %SOURCEDIR% %BUILDDIR% %SPHINXOPTS% %O%
-goto end
-
-:help
-%SPHINXBUILD% -M help %SOURCEDIR% %BUILDDIR% %SPHINXOPTS% %O%
-
-:end
-popd
diff --git a/docs/source/conf.py b/docs/source/conf.py
deleted file mode 100644
index c20542de..00000000
--- a/docs/source/conf.py
+++ /dev/null
@@ -1,78 +0,0 @@
-# Configuration file for the Sphinx documentation builder.
-#
-# This file only contains a selection of the most common options. For a full
-# list see the documentation:
-# https://www.sphinx-doc.org/en/master/usage/configuration.html
-
-# -- Path setup --------------------------------------------------------------
-
-# If extensions (or modules to document with autodoc) are in another directory,
-# add these directories to sys.path here. If the directory is relative to the
-# documentation root, use os.path.abspath to make it absolute, like shown here.
-#
-import os
-import sys
-
-sys.path.insert(0, os.path.abspath('../../fdroidserver'))
-
-# -- Project information -----------------------------------------------------
-
-project = 'fdroidserver'
-copyright = '2021, The F-Droid Project'
-author = 'The F-Droid Project'
-
-
-# -- General configuration ---------------------------------------------------
-
-# Add any Sphinx extension module names here, as strings. They can be
-# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
-# ones.
-extensions = [
-    'numpydoc',
-    'sphinx.ext.autodoc',
-    'sphinx.ext.autosummary',
-    "sphinx.ext.intersphinx",
-]
-
-# Add any paths that contain templates here, relative to this directory.
-templates_path = ['_templates']
-
-# List of patterns, relative to source directory, that match files and
-# directories to ignore when looking for source files.
-# This pattern also affects html_static_path and html_extra_path.
-exclude_patterns = []
-
-
-# -- Options for HTML output -------------------------------------------------
-
-# The theme to use for HTML and HTML Help pages.  See the documentation for
-# a list of builtin themes.
-#
-html_theme = "pydata_sphinx_theme"
-
-html_theme_options = {
-    "gitlab_url": "https://gitlab.com/fdroid/fdroidserver",
-    "show_prev_next": False,
-    "navbar_end": ["search-field.html", "navbar-icon-links.html"],
-}
-
-# Add any paths that contain custom static files (such as style sheets) here,
-# relative to this directory. They are copied after the builtin static files,
-# so a file named "default.css" will overwrite the builtin "default.css".
-html_static_path = ['_static']
-
-html_sidebars = {
-    "**": [],
-}
-
-#html_sidebars = {
-#   '**': ['globaltoc.html', 'sourcelink.html', 'searchbox.html'],
-#   'using/windows': ['windowssidebar.html', 'searchbox.html'],
-#}
-
-html_split_index = True
-#numpydoc_validation_checks = {"all"}
-
-intersphinx_mapping = {
-    "python": ("https://docs.python.org/3/", None),
-}
diff --git a/docs/source/index.rst b/docs/source/index.rst
deleted file mode 100644
index fcd4dfe3..00000000
--- a/docs/source/index.rst
+++ /dev/null
@@ -1,20 +0,0 @@
-.. fdroidserver documentation master file, created by
-   sphinx-quickstart on Mon May  3 10:06:52 2021.
-   You can adapt this file completely to your liking, but it should at least
-   contain the root `toctree` directive.
-
-Welcome to fdroidserver's documentation!
-========================================
-
-.. toctree::
-   :maxdepth: 2
-   :caption: Contents:
- 
-These pages contain the autogenerated module docu based on the current `sources <https://gitlab.com/fdroid/fdroidserver/-/tree/master/fdroidserver>`_.
-
-Indices and tables
-==================
-
-
-* Under :ref:`modindex` the different fdroidserver modules are listed. 
-* In :ref:`genindex` you'll find all methods sorted alphabetically.
diff --git a/examples/Vagrantfile.yaml b/examples/Vagrantfile.yaml
deleted file mode 100644
index 276f0179..00000000
--- a/examples/Vagrantfile.yaml
+++ /dev/null
@@ -1,54 +0,0 @@
----
-
-# You may want to alter these before running ./makebuildserver
-
-# In the process of setting up the build server, many gigs of files
-# are downloaded (Android SDK components, gradle, etc).  These are
-# cached so that they are not redownloaded each time. By default,
-# these are stored in ~/.cache/fdroidserver
-#
-# cachedir: buildserver/cache
-
-# To specify which Debian mirror the build server VM should use, by
-# default it uses http.debian.net, which auto-detects which is the
-# best mirror to use.
-#
-# debian_mirror: https://debian.osuosl.org/debian/
-
-# The amount of RAM the build server will have (default: 2048)
-# memory: 3584
-
-# The number of CPUs the build server will have
-# cpus: 1
-
-# Debian package proxy server - if you have one
-# aptproxy: http://192.168.0.19:8000
-
-# If this is running on an older machine or on a virtualized system,
-# it can run a lot slower. If the provisioning fails with a warning
-# about the timeout, extend the timeout here. (default: 600 seconds)
-#
-# boot_timeout: 1200
-
-# By default, this whole process uses VirtualBox as the provider, but
-# QEMU+KVM is also supported via the libvirt plugin to vagrant. If
-# this is run within a KVM guest, then libvirt's QEMU+KVM will be used
-# automatically.  It can also be manually enabled by uncommenting
-# below:
-#
-# vm_provider: libvirt
-
-# By default libvirt uses 'virtio' for both network and disk drivers.
-# Some systems (eg. nesting VMware ESXi) do not support virtio. As a
-# workaround for such rare cases, this setting allows to configure
-# KVM/libvirt to emulate hardware rather than using virtio.
-#
-# libvirt_disk_bus: sata
-# libvirt_nic_model_type: rtl8139
-
-# Sometimes, it is not possible to use the 9p synced folder type with
-# libvirt, like if running a KVM buildserver instance inside of a
-# VMware ESXi guest.  In that case, using NFS or another method is
-# required.
-#
-# synced_folder_type: nfs
diff --git a/examples/config.yml b/examples/config.yml
index ae4e7008..e022e389 100644
--- a/examples/config.yml
+++ b/examples/config.yml
@@ -5,20 +5,23 @@
 # Custom path to the Android SDK, defaults to $ANDROID_HOME
 # sdk_path: $ANDROID_HOME
 
-# Paths to installed versions of the Android NDK.  This will be
-# automatically filled out from well known sources like
-# $ANDROID_HOME/ndk-bundle and $ANDROID_HOME/ndk/*.  If a required
-# version is missing in the buildserver VM, it will be automatically
-# downloaded and installed into the standard $ANDROID_HOME/ndk/
-# directory.  Manually setting it here will override the auto-detected
-# values.  The keys can either be the "release" (e.g. r21e) or the
-# "revision" (e.g. 21.4.7075529).
-#
+# Custom paths to various versions of the Android NDK, defaults to 'r12b' set
+# to $ANDROID_NDK. Most users will have the latest at $ANDROID_NDK, which is
+# used by default. If a version is missing or assigned to None, it is assumed
+# not installed.
 # ndk_paths:
-#   r10e: $ANDROID_HOME/android-ndk-r10e
-#   r17: ""
-#   21.4.7075529: ~/Android/Ndk
-#   r22b: null
+#   r10e: None
+#   r11c: None
+#   r12b: $ANDROID_NDK
+#   r13b: None
+#   r14b: None
+#   r15c: None
+#   r16b: None
+#   r17c: None
+#   r18b: None
+#   r19c: None
+#   r20b: None
+#   r21d: None
 
 # Directory to store downloaded tools in (i.e. gradle versions)
 # By default, these are stored in ~/.cache/fdroidserver
@@ -48,46 +51,25 @@
 # The same policy is applied to the archive repo, if there is one.
 # repo_maxage: 0
 
-# Canonical URL of the repositoy, needs to end in /repo. Is is used to identity
-# the repo in the client, as well.
-# repo_url: https://MyFirstFDroidRepo.org/fdroid/repo
-#
-# Base URL for per-package pages on the website of this repo,
-# i.e. https://f-droid.org/packages/<appid>/ This should be accessible
-# with a browser. Setting it to null or not setting this disables the
-# feature.
-# repo_web_base_url: https://MyFirstFDroidRepo.org/packages/
-#
-# repo_name: My First F-Droid Repo Demo
-# repo_description: >-
-#   This is a repository of apps to be used with F-Droid. Applications
-#   in this repository are either official binaries built by the
-#   original application developers, or are binaries built from source
-#   by the admin of f-droid.org using the tools on
-#   https://gitlab.com/fdroid.
+repo_url: https://MyFirstFDroidRepo.org/fdroid/repo
+repo_name: My First F-Droid Repo Demo
+repo_icon: fdroid-icon.png
+repo_description: >-
+  This is a repository of apps to be used with F-Droid. Applications in this
+  repository are either official binaries built by the original application
+  developers, or are binaries built from source by the admin of f-droid.org
+  using the tools on https://gitlab.com/u/fdroid.
 
 # As above, but for the archive repo.
-#
-# archive_url: https://f-droid.org/archive
-# archive_web_base_url:
-# archive_name: My First F-Droid Archive Demo
-# archive_description: >-
-#   The repository of older versions of packages from the main demo repository.
-
 # archive_older sets the number of versions kept in the main repo, with all
 # older ones going to the archive. Set it to 0, and there will be no archive
 # repository, and no need to define the other archive_ values.
-#
-# archive_older: 3
-
-# The repo's icon defaults to a file called 'icon.png' in the 'icons'
-# folder for each section, e.g. repo/icons/icon.png and
-# archive/icons/icon.png.  To use a different filename for the icons,
-# set the filename here.  You must still copy it into place in
-# repo/icons/ and/or archive/icons/.
-#
-# repo_icon: myicon.png
-# archive_icon: myicon.png
+archive_older: 3
+archive_url: https://f-droid.org/archive
+archive_name: My First F-Droid Archive Demo
+archive_icon: fdroid-icon.png
+archive_description: >-
+  The repository of older versions of packages from the main demo repository.
 
 # This allows a specific kind of insecure APK to be included in the
 # 'repo' section.  Since April 2017, APK signatures that use MD5 are
@@ -117,7 +99,7 @@
 # Optionally, override home directory for gpg
 # gpghome: /home/fdroid/somewhere/else/.gnupg
 
-# The ID of a GPG key for making detached signatures for APKs. Optional.
+# The ID of a GPG key for making detached signatures for apks. Optional.
 # gpgkey: 1DBA2E89
 
 # The key (from the keystore defined below) to be used for signing the
@@ -186,12 +168,6 @@
 # serverwebroot:
 #   - foo.com:/usr/share/nginx/www/fdroid
 #   - bar.info:/var/www/fdroid
-#
-# There is a special mode to only deploy the index file:
-#
-# serverwebroot:
-#   - url: 'me@b.az:/srv/fdroid'
-#     index_only: true
 
 
 # When running fdroid processes on a remote server, it is possible to
@@ -206,49 +182,14 @@
 # deploy_process_logs: true
 
 # The full URL to a git remote repository. You can include
-# multiple servers to mirror to by adding strings to a YAML list or map.
+# multiple servers to mirror to by wrapping the whole thing in {} or [], and
+# including the servergitmirrors strings in a comma-separated list.
 # Servers listed here will also be automatically inserted in the mirrors list.
 #
 # servergitmirrors: https://github.com/user/repo
 # servergitmirrors:
 #   - https://github.com/user/repo
 #   - https://gitlab.com/user/repo
-#
-# servergitmirrors:
-#   - url: https://github.com/user/repo
-#   - url: https://gitlab.com/user/repo
-#     index_only: true
-
-
-# These settings allow using `fdroid deploy` for publishing APK files from
-# your repository to GitHub Releases. (You should also run `fdroid update`
-# every time before deploying to GitHub releases to update index files.) Here's
-# an example for this deployment automation:
-# https://github.com/f-droid/fdroidclient/releases/
-#
-# Currently, versions which are assigned to a release channel (e.g. alpha or
-# beta releases) are ignored.
-#
-# In the example below, tokens are read from environment variables. Putting
-# tokens directly into the config file is also supported but discouraged. It is
-# highly recommended to use a "Fine-grained personal access token", which is
-# restricted to the minimum required permissions, which are:
-#  * Metadata - read
-#  * Contents - read/write
-# (https://github.com/settings/personal-access-tokens/new)
-#
-# github_token: {env: GITHUB_TOKEN}
-# github_releases:
-#   - projectUrl: https://github.com/f-droid/fdroidclient
-#     packageNames:
-#       - org.fdroid.basic
-#       - org.fdroid.fdroid
-#     release_notes_prepend: |
-#       Re-post of official F-Droid App release from https://f-droid.org
-#   - projectUrl: https://github.com/example/app
-#     packageNames: com.example.app
-#     token: {env: GITHUB_TOKEN_EXAMPLE}
-
 
 # Most git hosting services have hard size limits for each git repo.
 # `fdroid deploy` will delete the git history when the git mirror repo
@@ -269,18 +210,6 @@
 # mirrors:
 #   - https://foo.bar/fdroid
 #   - http://foobarfoobarfoobar.onion/fdroid
-#
-# Or additional metadata can also be included by adding key/value pairs:
-#
-# mirrors:
-#   - url: https://foo.bar/fdroid
-#     countryCode: BA
-#   - url: http://foobarfoobarfoobar.onion/fdroid
-#
-# The list of mirrors can also be maintained in config/mirrors.yml, a
-# standalone YAML file in the optional configuration directory.  In
-# that case, mirrors: should be removed from this file (config.yml).
-
 
 # optionally specify which identity file to use when using rsync or git over SSH
 #
@@ -305,33 +234,19 @@
 #
 # sync_from_local_copy_dir: true
 
-# To deploy to an AWS S3 "bucket" in the US East region, set the
-# bucket name in the config, then set the environment variables
-# AWS_ACCESS_KEY_ID and AWS_SECRET_ACCESS_KEY using the values from
-# the AWS Management Console. See
-# https://rclone.org/s3/#authentication
+
+# To upload the repo to an Amazon S3 bucket using `fdroid server
+# update`.  Warning, this deletes and recreates the whole fdroid/
+# directory each time. This prefers s3cmd, but can also use
+# apache-libcloud.  To customize how s3cmd interacts with the cloud
+# provider, create a 's3cfg' file next to this file (config.yml), and
+# those settings will be used instead of any 'aws' variable below.
+# Secrets can be fetched from environment variables to ensure that
+# they are not leaked as part of this file.
 #
-# awsbucket: myawsfdroidbucket
-
-
-# For extended options for syncing to cloud drive and object store
-# services, `fdroid deploy' wraps Rclone. Rclone is a full featured
-# sync tool for a huge variety of cloud services. Set up your services
-# using `rclone config`, then specify each config name to deploy the
-# awsbucket: to.  Using rclone_config: overrides the default AWS S3 US
-# East setup, and will only sync to the services actually specified.
-#
-# awsbucket: myawsfdroidbucket
-# rclone_config:
-#   - aws-sample-config
-#   - rclone-supported-service-config
-
-
-# By default Rclone uses the user's default configuration file at
-# ~/.config/rclone/rclone.conf To specify a custom configuration file,
-# please add the full path to the configuration file as below.
-#
-# path_to_custom_rclone_config: /home/mycomputer/somedir/example.conf
+# awsbucket: myawsfdroid
+# awsaccesskeyid: SEE0CHAITHEIMAUR2USA
+# awssecretkey: {env: awssecretkey}
 
 
 # If you want to force 'fdroid server' to use a non-standard serverwebroot.
@@ -342,12 +257,12 @@
 # nonstandardwebroot: false
 
 
-# If you want to upload the release APK file to androidobservatory.org
+# If you want to upload the release apk file to androidobservatory.org
 #
 # androidobservatory: false
 
 
-# If you want to upload the release APK file to virustotal.com
+# If you want to upload the release apk file to virustotal.com
 # You have to enter your profile apikey to enable the upload.
 #
 # virustotal_apikey: 9872987234982734
@@ -357,6 +272,13 @@
 # virustotal_apikey: {env: virustotal_apikey}
 
 
+# The build logs can be posted to a mediawiki instance, like on f-droid.org.
+# wiki_protocol: http
+# wiki_server: server
+# wiki_path: /wiki/
+# wiki_user: login
+# wiki_password: 1234
+
 # Keep a log of all generated index files in a git repo to provide a
 # "binary transparency" log for anyone to check the history of the
 # binaries that are published.  This is in the form of a "git remote",
@@ -364,6 +286,27 @@
 # configured to allow push access (e.g. ssh key, username/password, etc)
 # binary_transparency_remote: git@gitlab.com:fdroid/binary-transparency-log.git
 
+# Only set this to true when running a repository where you want to generate
+# stats, and only then on the master build servers, not a development
+# machine. If you want to keep the "added" and "last updated" dates for each
+# app and APK in your repo, then you should enable this.
+# update_stats: true
+
+# When used with stats, this is a list of IP addresses that are ignored for
+# calculation purposes.
+# stats_ignore: []
+
+# Server stats logs are retrieved from. Required when update_stats is True.
+# stats_server: example.com
+
+# User stats logs are retrieved from. Required when update_stats is True.
+# stats_user: bob
+
+# Use the following to push stats to a Carbon instance:
+# stats_to_carbon: false
+# carbon_host: 0.0.0.0
+# carbon_port: 2003
+
 # Set this to true to always use a build server. This saves specifying the
 # --server option on dedicated secure build server hosts.
 # build_server_always: true
@@ -403,31 +346,9 @@
 # generating our default list.  (https://pypi.org/project/spdx-license-list)
 #
 # You can override our default list of allowed licenes by setting this option.
-# Just supply a custom list of licene names you would like to allow. To disable
-# checking licenses by the linter, assign an empty value to lint_licenses.
+# Just supply a custom list of licene names you would like to allow. Setting
+# this to `None` disables this lint check.
 #
 # lint_licenses:
 #   - Custom-License-A
 #   - Another-License
-
-# `fdroid scanner` can scan for signatures from various sources. By default
-# it's configured to only use F-Droids official SUSS collection. We have
-# support for these special collections:
-#  * 'exodus' - official exodus-privacy.org signatures
-#  * 'etip' - exodus privacy investigation platfrom community contributed
-#           signatures
-#  * 'suss' - official F-Droid: Suspicious or Unwanted Software Signatures
-# You can also configure scanner to use custom collections of signatures here.
-# They have to follow the format specified in the SUSS readme.
-# (https://gitlab.com/fdroid/fdroid-suss/#cache-file-data-format)
-#
-# scanner_signature_sources:
-#   - suss
-#   - exodus
-#   - https://example.com/signatures.json
-
-# The scanner can use signature sources from the internet. These are
-# cached locally.  To force them to be refreshed from the network on
-# every run, set this to true:
-#
-# refresh_scanner: true
diff --git a/examples/fdroid-icon.png b/examples/fdroid-icon.png
new file mode 100644
index 00000000..0c0d4173
Binary files /dev/null and b/examples/fdroid-icon.png differ
diff --git a/examples/fdroid_clean_repos.py b/examples/fdroid_clean_repos.py
deleted file mode 100644
index 6b19cacc..00000000
--- a/examples/fdroid_clean_repos.py
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/usr/bin/env python3
-#
-# an fdroid plugin for resetting app VCSs to the latest version for the metadata
-
-import argparse
-import logging
-
-from fdroidserver import _, common, metadata
-from fdroidserver.exception import VCSException
-
-fdroid_summary = 'reset app VCSs to the latest version'
-
-
-def main():
-    parser = argparse.ArgumentParser(
-        usage="%(prog)s [options] [APPID[:VERCODE] [APPID[:VERCODE] ...]]"
-    )
-    common.setup_global_opts(parser)
-    parser.add_argument(
-        "appid",
-        nargs='*',
-        help=_("applicationId with optional versionCode in the form APPID[:VERCODE]"),
-    )
-    metadata.add_metadata_arguments(parser)
-    options = common.parse_args(parser)
-    apps = common.read_app_args(
-        options.appid, allow_version_codes=True, sort_by_time=True
-    )
-    common.read_config()
-
-    for appid, app in apps.items():
-        if "Builds" in app and len(app["Builds"]) > 0:
-            build = app.get('Builds')[-1]
-            logging.info(_("Cleaning up '{appid}' VCS").format(appid=appid))
-            try:
-                vcs, build_dir = common.setup_vcs(app)
-                vcs.gotorevision(build.commit)
-                if build.submodules:
-                    vcs.initsubmodules()
-
-            except VCSException:
-                pass
-
-
-if __name__ == "__main__":
-    main()
diff --git a/examples/fdroid_export_keystore_to_nitrokey.py b/examples/fdroid_export_keystore_to_nitrokey.py
deleted file mode 100644
index 6e920a78..00000000
--- a/examples/fdroid_export_keystore_to_nitrokey.py
+++ /dev/null
@@ -1,62 +0,0 @@
-#!/usr/bin/env python3
-#
-# an fdroid plugin for exporting a repo's keystore in standard PEM format
-
-import os
-from argparse import ArgumentParser
-
-from fdroidserver import common
-from fdroidserver.common import FDroidPopen
-from fdroidserver.exception import BuildException
-
-fdroid_summary = "export the repo's keystore file to a NitroKey HSM"
-
-
-def run(cmd, error):
-    envs = {'LC_ALL': 'C.UTF-8',
-            'PIN': config['smartcard_pin'],
-            'FDROID_KEY_STORE_PASS': config['keystorepass'],
-            'FDROID_KEY_PASS': config['keypass']}
-    p = FDroidPopen(cmd, envs=envs)
-    if p.returncode != 0:
-        raise BuildException(error, p.output)
-
-
-def main():
-    global config
-    parser = ArgumentParser()
-    common.setup_global_opts(parser)
-    common.parse_args(parser)
-    config = common.read_config()
-    destkeystore = config['keystore'].replace('.jks', '.p12').replace('/', '_')
-    exportkeystore = config['keystore'].replace('.jks', '.pem').replace('/', '_')
-    if os.path.exists(destkeystore) or os.path.exists(exportkeystore):
-        raise BuildException('%s exists!' % exportkeystore)
-    run([config['keytool'], '-importkeystore',
-         '-srckeystore', config['keystore'],
-         '-srcalias', config['repo_keyalias'],
-         '-srcstorepass:env', 'FDROID_KEY_STORE_PASS',
-         '-srckeypass:env', 'FDROID_KEY_PASS',
-         '-destkeystore', destkeystore,
-         '-deststorepass:env', 'FDROID_KEY_STORE_PASS',
-         '-deststoretype', 'PKCS12'],
-        'Failed to convert to PKCS12!')
-#    run(['openssl', 'pkcs12', '-in', destkeystore,
-#         '-passin', 'env:FDROID_KEY_STORE_PASS', '-nokeys',
-#         '-out', exportkeystore,
-#         '-passout', 'env:FDROID_KEY_STORE_PASS'],
-#        'Failed to convert to PEM!')
-    run(['pkcs15-init', '--delete-objects', 'privkey,pubkey',
-         '--id', '3', '--store-private-key', destkeystore,
-         '--format', 'pkcs12', '--auth-id', '3',
-         '--verify-pin', '--pin', 'env:PIN'],
-        '')
-    run(['pkcs15-init', '--delete-objects', 'privkey,pubkey',
-         '--id', '2', '--store-private-key', destkeystore,
-         '--format', 'pkcs12', '--auth-id', '3',
-         '--verify-pin', '--pin', 'env:PIN'],
-        '')
-
-
-if __name__ == "__main__":
-    main()
diff --git a/examples/fdroid_exportkeystore.py b/examples/fdroid_exportkeystore.py
deleted file mode 100644
index f2a16980..00000000
--- a/examples/fdroid_exportkeystore.py
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/usr/bin/env python3
-#
-# an fdroid plugin for exporting a repo's keystore in standard PEM format
-
-import os
-from argparse import ArgumentParser
-
-from fdroidserver import common
-from fdroidserver.common import FDroidPopen
-from fdroidserver.exception import BuildException
-
-fdroid_summary = 'export the keystore in standard PEM format'
-
-
-def main():
-    parser = ArgumentParser()
-    common.setup_global_opts(parser)
-    common.parse_args(parser)
-    config = common.read_config()
-    env_vars = {'LC_ALL': 'C.UTF-8',
-                'FDROID_KEY_STORE_PASS': config['keystorepass'],
-                'FDROID_KEY_PASS': config['keypass']}
-    destkeystore = config['keystore'].replace('.jks', '.p12').replace('/', '_')
-    exportkeystore = config['keystore'].replace('.jks', '.pem').replace('/', '_')
-    if os.path.exists(destkeystore) or os.path.exists(exportkeystore):
-        raise BuildException('%s exists!' % exportkeystore)
-    p = FDroidPopen([config['keytool'], '-importkeystore',
-                     '-srckeystore', config['keystore'],
-                     '-srcalias', config['repo_keyalias'],
-                     '-srcstorepass:env', 'FDROID_KEY_STORE_PASS',
-                     '-srckeypass:env', 'FDROID_KEY_PASS',
-                     '-destkeystore', destkeystore,
-                     '-deststoretype', 'PKCS12',
-                     '-deststorepass:env', 'FDROID_KEY_STORE_PASS',
-                     '-destkeypass:env', 'FDROID_KEY_PASS'],
-                    envs=env_vars)
-    if p.returncode != 0:
-        raise BuildException("Failed to convert to PKCS12!", p.output)
-    p = FDroidPopen(['openssl', 'pkcs12', '-in', destkeystore,
-                     '-passin', 'env:FDROID_KEY_STORE_PASS', '-nokeys',
-                     '-out', exportkeystore,
-                     '-passout', 'env:FDROID_KEY_STORE_PASS'],
-                    envs=env_vars)
-    if p.returncode != 0:
-        raise BuildException("Failed to convert to PEM!", p.output)
-
-
-if __name__ == "__main__":
-    main()
diff --git a/examples/fdroid_extract_repo_pubkey.py b/examples/fdroid_extract_repo_pubkey.py
deleted file mode 100644
index cb5a895c..00000000
--- a/examples/fdroid_extract_repo_pubkey.py
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/usr/bin/env python3
-#
-# an fdroid plugin print the repo_pubkey from a repo's keystore
-#
-
-from argparse import ArgumentParser
-
-from fdroidserver import common, index
-
-fdroid_summary = 'export the keystore in standard PEM format'
-
-
-def main():
-    parser = ArgumentParser()
-    common.setup_global_opts(parser)
-    common.parse_args(parser)
-    common.read_config()
-    pubkey, repo_pubkey_fingerprint = index.extract_pubkey()
-    print('repo_pubkey = "%s"' % pubkey.decode())
-
-
-if __name__ == "__main__":
-    main()
diff --git a/examples/fdroid_fetchsrclibs.py b/examples/fdroid_fetchsrclibs.py
deleted file mode 100644
index aba6f7fa..00000000
--- a/examples/fdroid_fetchsrclibs.py
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/usr/bin/env python3
-#
-# an fdroid plugin for setting up srclibs
-#
-# The 'fdroid build' gitlab-ci job uses --on-server, which does not
-# set up the srclibs.  This plugin does the missing setup.
-
-import argparse
-import os
-import pprint
-
-from fdroidserver import _, common, metadata
-
-fdroid_summary = 'prepare the srclibs for `fdroid build --on-server`'
-
-
-def main():
-    parser = argparse.ArgumentParser(usage="%(prog)s [options] [APPID[:VERCODE] [APPID[:VERCODE] ...]]")
-    common.setup_global_opts(parser)
-    parser.add_argument("appid", nargs='*', help=_("applicationId with optional versionCode in the form APPID[:VERCODE]"))
-    metadata.add_metadata_arguments(parser)
-    options = common.parse_args(parser)
-    apps = common.read_app_args(options.appid, allow_version_codes=True, sort_by_time=True)
-    common.read_config()
-    srclib_dir = os.path.join('build', 'srclib')
-    os.makedirs(srclib_dir, exist_ok=True)
-    srclibpaths = []
-    for appid, app in apps.items():
-        vcs, _ignored = common.setup_vcs(app)
-        for build in app.get('Builds', []):
-            vcs.gotorevision(build.commit, refresh=False)
-            if build.submodules:
-                vcs.initsubmodules()
-            else:
-                vcs.deinitsubmodules()
-            for lib in build.srclibs:
-                srclibpaths.append(common.getsrclib(lib, srclib_dir, prepare=False, build=build))
-    print('Set up srclibs:')
-    pprint.pprint(srclibpaths)
-
-
-if __name__ == "__main__":
-    main()
diff --git a/examples/fdroid_nitrokeyimport.py b/examples/fdroid_nitrokeyimport.py
deleted file mode 100644
index d17a6186..00000000
--- a/examples/fdroid_nitrokeyimport.py
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/usr/bin/env python3
-
-from argparse import ArgumentParser
-
-from fdroidserver import common
-from fdroidserver.common import FDroidPopen
-from fdroidserver.exception import BuildException
-
-fdroid_summary = 'import the local keystore into a SmartCard HSM'
-
-
-def main():
-    parser = ArgumentParser()
-    common.setup_global_opts(parser)
-    common.parse_args(parser)
-    config = common.read_config()
-    env_vars = {
-        'LC_ALL': 'C.UTF-8',
-        'FDROID_KEY_STORE_PASS': config['keystorepass'],
-        'FDROID_KEY_PASS': config['keypass'],
-        'SMARTCARD_PIN': str(config['smartcard_pin']),
-    }
-    p = FDroidPopen([config['keytool'], '-importkeystore',
-                     '-srcalias', config['repo_keyalias'],
-                     '-srckeystore', config['keystore'],
-                     '-srcstorepass:env', 'FDROID_KEY_STORE_PASS',
-                     '-srckeypass:env', 'FDROID_KEY_PASS',
-                     '-destalias', config['repo_keyalias'],
-                     '-destkeystore', 'NONE',
-                     '-deststoretype', 'PKCS11',
-                     '-providerName', 'SunPKCS11-OpenSC',
-                     '-providerClass', 'sun.security.pkcs11.SunPKCS11',
-                     '-providerArg', 'opensc-fdroid.cfg',
-                     '-deststorepass:env', 'SMARTCARD_PIN',
-                     '-J-Djava.security.debug=sunpkcs11'],
-                    envs=env_vars)
-    if p.returncode != 0:
-        raise BuildException("Failed to import into HSM!", p.output)
-
-
-if __name__ == "__main__":
-    main()
diff --git a/examples/makebuildserver.config.py b/examples/makebuildserver.config.py
new file mode 100644
index 00000000..cb47f95f
--- /dev/null
+++ b/examples/makebuildserver.config.py
@@ -0,0 +1,94 @@
+#!/usr/bin/env python3
+#
+# You may want to alter these before running ./makebuildserver
+
+# Name of the Vagrant basebox to use, by default it will be downloaded
+# from Vagrant Cloud.  For release builds setup, generate the basebox
+# locally using https://gitlab.com/fdroid/basebox, add it to Vagrant,
+# then set this to the local basebox name.
+# This defaults to "fdroid/basebox-stretch64" which will download a
+# prebuilt basebox from https://app.vagrantup.com/fdroid.
+#
+# (If you change this value you have to supply the `--clean` option on
+#  your next `makebuildserver` run.)
+#
+# basebox = "basebox-stretch64"
+
+# This allows you to pin your basebox to a specific versions. It defaults
+# the most recent basebox version which can be aumotaically verifyed by
+# `makebuildserver`.
+# Please note that vagrant does not support versioning of locally added
+# boxes, so we can't support that either.
+#
+# (If you change this value you have to supply the `--clean` option on
+#  your next `makebuildserver` run.)
+#
+# basebox_version = "0.1"
+
+# In the process of setting up the build server, many gigs of files
+# are downloaded (Android SDK components, gradle, etc).  These are
+# cached so that they are not redownloaded each time. By default,
+# these are stored in ~/.cache/fdroidserver
+#
+# cachedir = 'buildserver/cache'
+
+# A big part of creating a new instance is downloading packages from Debian.
+# This setups up a folder in ~/.cache/fdroidserver to cache the downloaded
+# packages when rebuilding the build server from scratch.  This requires
+# that virtualbox-guest-utils is installed.
+#
+# apt_package_cache = True
+
+# The buildserver can use some local caches to speed up builds,
+# especially when the internet connection is slow and/or expensive.
+# If enabled, the buildserver setup will look for standard caches in
+# your HOME dir and copy them to the buildserver VM. Be aware: this
+# will reduce the isolation of the buildserver from your host machine,
+# so the buildserver will provide an environment only as trustworthy
+# as the host machine's environment.
+#
+# copy_caches_from_host = True
+
+# To specify which Debian mirror the build server VM should use, by
+# default it uses http.debian.net, which auto-detects which is the
+# best mirror to use.
+#
+# debian_mirror = 'http://ftp.uk.debian.org/debian/'
+
+# The amount of RAM the build server will have (default: 2048)
+# memory = 3584
+
+# The number of CPUs the build server will have
+# cpus = 1
+
+# Debian package proxy server - if you have one
+# aptproxy = "http://192.168.0.19:8000"
+
+# If this is running on an older machine or on a virtualized system,
+# it can run a lot slower. If the provisioning fails with a warning
+# about the timeout, extend the timeout here. (default: 600 seconds)
+#
+# boot_timeout = 1200
+
+# By default, this whole process uses VirtualBox as the provider, but
+# QEMU+KVM is also supported via the libvirt plugin to vagrant. If
+# this is run within a KVM guest, then libvirt's QEMU+KVM will be used
+# automatically.  It can also be manually enabled by uncommenting
+# below:
+#
+# vm_provider = 'libvirt'
+
+# By default libvirt uses 'virtio' for both network and disk drivers.
+# Some systems (eg. nesting VMware ESXi) do not support virtio. As a
+# workaround for such rare cases, this setting allows to configure
+# KVM/libvirt to emulate hardware rather than using virtio.
+#
+# libvirt_disk_bus = 'sata'
+# libvirt_nic_model_type = 'rtl8139'
+
+# Sometimes, it is not possible to use the 9p synced folder type with
+# libvirt, like if running a KVM buildserver instance inside of a
+# VMware ESXi guest.  In that case, using NFS or another method is
+# required.
+#
+# synced_folder_type = 'nfs'
diff --git a/examples/mirror-to-mirror.sh b/examples/mirror-to-mirror.sh
new file mode 100644
index 00000000..ecb4c10e
--- /dev/null
+++ b/examples/mirror-to-mirror.sh
@@ -0,0 +1,28 @@
+#!/bin/bash
+#
+# This script syncs the entire repo to the primary mirrors.  It is
+# meant to run in a cronjob quite frequently, as often as there are
+# files to send.
+#
+# This script expects the receiving side to have the following
+# preceeding the ssh key entry in ~/.ssh/authorized_keys:
+#   command="rsync --server -logDtpre.iLsfx --log-format=X --delete --delay-updates . /path/to/htdocs/fdroid/",no-port-forwarding,no-X11-forwarding,no-agent-forwarding,no-pty
+#
+set -e
+(
+flock -n 200
+set -e
+cd /home/fdroid
+for section in repo archive; do
+    echo "Started $section at `date`:"
+    for host in fdroid@mirror.f-droid.org fdroid@ftp-push.lysator.liu.se; do
+        set -x
+        # be super careful with the trailing slashes here! if one is wrong, it'll delete the entire section!
+        rsync --archive --delay-updates --progress --delete \
+              /home/fdroid/public_html/${section} \
+              ${host}:/srv/fdroid-mirror.at.or.at/htdocs/fdroid/ &
+        set +x
+    done
+    wait
+done
+) 200>/var/lock/root_fdroidmirrortomirror
diff --git a/fdroidserver/__init__.py b/fdroidserver/__init__.py
index fdf64421..1e1cd42f 100644
--- a/fdroidserver/__init__.py
+++ b/fdroidserver/__init__.py
@@ -1,23 +1,20 @@
+
 import gettext
 import glob
 import os
 import sys
 
+
 # support running straight from git and standard installs
 rootpaths = [
     os.path.realpath(os.path.join(os.path.dirname(__file__), '..')),
-    os.path.realpath(
-        os.path.join(os.path.dirname(__file__), '..', '..', '..', '..', 'share')
-    ),
+    os.path.realpath(os.path.join(os.path.dirname(__file__), '..', '..', '..', '..', 'share')),
     os.path.join(sys.prefix, 'share'),
 ]
 
 localedir = None
 for rootpath in rootpaths:
-    found_mo = glob.glob(
-        os.path.join(rootpath, 'locale', '*', 'LC_MESSAGES', 'fdroidserver.mo')
-    )
-    if len(found_mo) > 0:
+    if len(glob.glob(os.path.join(rootpath, 'locale', '*', 'LC_MESSAGES', 'fdroidserver.mo'))) > 0:
         localedir = os.path.join(rootpath, 'locale')
         break
 
@@ -26,53 +23,34 @@ gettext.textdomain('fdroidserver')
 _ = gettext.gettext
 
 
-from fdroidserver.exception import (
-    FDroidException,
-    MetaDataException,
-    VerificationException,  # NOQA: E402
-)
-
+from fdroidserver.exception import (FDroidException,
+                                    MetaDataException,
+                                    VerificationException)  # NOQA: E402
 FDroidException  # NOQA: B101
 MetaDataException  # NOQA: B101
 VerificationException  # NOQA: B101
 
-from fdroidserver.common import genkeystore as generate_keystore  # NOQA: E402
-from fdroidserver.common import verify_apk_signature
-
+from fdroidserver.common import (verify_apk_signature,
+                                 genkeystore as generate_keystore)  # NOQA: E402
 verify_apk_signature  # NOQA: B101
 generate_keystore  # NOQA: B101
-from fdroidserver.index import (
-    download_repo_index,
-    download_repo_index_v1,
-    download_repo_index_v2,
-    get_mirror_service_urls,
-)
-from fdroidserver.index import make as make_index  # NOQA: E402
-
+from fdroidserver.index import (download_repo_index,
+                                get_mirror_service_urls,
+                                make as make_index)  # NOQA: E402
 download_repo_index  # NOQA: B101
-download_repo_index_v1  # NOQA: B101
-download_repo_index_v2  # NOQA: B101
 get_mirror_service_urls  # NOQA: B101
 make_index  # NOQA: B101
-from fdroidserver.update import (
-    process_apk,
-    process_apks,
-    scan_apk,
-    scan_repo_files,  # NOQA: E402
-)
-
+from fdroidserver.update import (process_apk,
+                                 process_apks,
+                                 scan_apk,
+                                 scan_repo_files)  # NOQA: E402
 process_apk  # NOQA: B101
 process_apks  # NOQA: B101
 scan_apk  # NOQA: B101
 scan_repo_files  # NOQA: B101
-from fdroidserver.deploy import (
-    update_awsbucket,
-    update_servergitmirrors,
-    update_serverwebroot,  # NOQA: E402
-    update_serverwebroots,
-)
-
+from fdroidserver.deploy import (update_awsbucket,
+                                 update_servergitmirrors,
+                                 update_serverwebroot)  # NOQA: E402
 update_awsbucket  # NOQA: B101
 update_servergitmirrors  # NOQA: B101
-update_serverwebroots  # NOQA: B101
 update_serverwebroot  # NOQA: B101
diff --git a/fdroidserver/__main__.py b/fdroidserver/__main__.py
index 71c39b2c..d90a4316 100755
--- a/fdroidserver/__main__.py
+++ b/fdroidserver/__main__.py
@@ -18,20 +18,19 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-import importlib.metadata
-import logging
-import os
-import pkgutil
 import re
 import sys
-from argparse import ArgumentError
-from collections import OrderedDict
-
-import git
+import os
+import locale
+import pkgutil
+import logging
 
 import fdroidserver.common
 import fdroidserver.metadata
 from fdroidserver import _
+from argparse import ArgumentError
+from collections import OrderedDict
+
 
 COMMANDS = OrderedDict([
     ("build", _("Build a package from source")),
@@ -42,12 +41,13 @@ COMMANDS = OrderedDict([
     ("deploy", _("Interact with the repo HTTP server")),
     ("verify", _("Verify the integrity of downloaded packages")),
     ("checkupdates", _("Check for updates to applications")),
-    ("import", _("Extract application metadata from a source repository")),
+    ("import", _("Add a new application from its source code")),
     ("install", _("Install built packages on devices")),
     ("readmeta", _("Read all the metadata files and exit")),
     ("rewritemeta", _("Rewrite all the metadata files")),
     ("lint", _("Warn about possible metadata errors")),
     ("scanner", _("Scan the source code of a package")),
+    ("stats", _("Update the stats of the repo")),
     ("signindex", _("Sign indexes created using update --nosign")),
     ("btlog", _("Update the binary transparency log for a URL")),
     ("signatures", _("Extract signatures from APKs")),
@@ -70,13 +70,9 @@ def print_help(available_plugins=None):
 
 
 def preparse_plugin(module_name, module_dir):
-    """No summary.
-
-    Simple regex based parsing for plugin scripts.
-
-    So we don't have to import them when we just need the summary,
-    but not plan on executing this particular plugin.
-    """
+    """simple regex based parsing for plugin scripts,
+       so we don't have to import them when we just need the summary,
+       but not plan on executing this particular plugin."""
     if '.' in module_name:
         raise ValueError("No '.' allowed in fdroid plugin modules: '{}'"
                          .format(module_name))
@@ -136,7 +132,7 @@ def main():
         sys.exit(0)
 
     command = sys.argv[1]
-    if command not in COMMANDS and command not in available_plugins:
+    if command not in COMMANDS and command not in available_plugins.keys():
         if command in ('-h', '--help'):
             print_help(available_plugins=available_plugins)
             sys.exit(0)
@@ -144,21 +140,32 @@ def main():
             print(_("""ERROR: The "server" subcommand has been removed, use "deploy"!"""))
             sys.exit(1)
         elif command == '--version':
-            try:
-                print(importlib.metadata.version("fdroidserver"))
-                sys.exit(0)
-            except importlib.metadata.PackageNotFoundError:
-                pass
-            try:
-                print(
-                    git.repo.Repo(
-                        os.path.dirname(os.path.dirname(__file__))
-                    ).git.describe(always=True, tags=True)
-                )
-                sys.exit(0)
-            except git.exc.InvalidGitRepositoryError:
-                print(_('No version information could be found.'))
-                sys.exit(1)
+            output = _('no version info found!')
+            cmddir = os.path.realpath(os.path.dirname(os.path.dirname(__file__)))
+            moduledir = os.path.realpath(os.path.dirname(fdroidserver.common.__file__) + '/..')
+            if cmddir == moduledir:
+                # running from git
+                os.chdir(cmddir)
+                if os.path.isdir('.git'):
+                    import subprocess
+                    try:
+                        output = subprocess.check_output(['git', 'describe'],
+                                                         stderr=subprocess.STDOUT,
+                                                         universal_newlines=True)
+                    except subprocess.CalledProcessError:
+                        output = 'git commit ' + subprocess.check_output(['git', 'rev-parse', 'HEAD'],
+                                                                         universal_newlines=True)
+                elif os.path.exists('setup.py'):
+                    import re
+                    m = re.search(r'''.*[\s,\(]+version\s*=\s*["']([0-9a-z.]+)["'].*''',
+                                  open('setup.py').read(), flags=re.MULTILINE)
+                    if m:
+                        output = m.group(1) + '\n'
+            else:
+                from pkg_resources import get_distribution
+                output = get_distribution('fdroidserver').version + '\n'
+            print(output)
+            sys.exit(0)
         else:
             print(_("Command '%s' not recognised.\n" % command))
             print_help(available_plugins=available_plugins)
@@ -182,18 +189,16 @@ def main():
                            "can not be specified at the same time."))
         sys.exit(1)
 
-    # Trick argparse into displaying the right usage when --help is used.
+    # Trick optparse into displaying the right usage when --help is used.
     sys.argv[0] += ' ' + command
 
     del sys.argv[1]
     if command in COMMANDS.keys():
-        # import is named import_subcommand internally b/c import is reserved by Python
-        command = 'import_subcommand' if command == 'import' else command
         mod = __import__('fdroidserver.' + command, None, None, [command])
     else:
         mod = __import__(available_plugins[command]['name'], None, None, [command])
 
-    system_encoding = sys.getdefaultencoding()
+    system_langcode, system_encoding = locale.getdefaultlocale()
     if system_encoding is None or system_encoding.lower() not in ('utf-8', 'utf8'):
         logging.warning(_("Encoding is set to '{enc}' fdroid might run "
                           "into encoding issues. Please set it to 'UTF-8' "
diff --git a/fdroidserver/_yaml.py b/fdroidserver/_yaml.py
deleted file mode 100644
index 260f67c0..00000000
--- a/fdroidserver/_yaml.py
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright (C) 2025, Hans-Christoph Steiner <hans@eds.org>
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-"""Standard YAML parsing and dumping.
-
-YAML 1.2 is the preferred format for all data files.  When loading
-F-Droid formats like config.yml and <Application ID>.yml, YAML 1.2 is
-forced, and older YAML constructs should be considered an error.
-
-It is OK to load and dump files in other YAML versions if they are
-externally defined formats, like FUNDING.yml.  In those cases, these
-common instances might not be appropriate to use.
-
-There is a separate instance for dumping based on the "round trip" aka
-"rt" mode.  The "rt" mode maintains order while the "safe" mode sorts
-the output.  Also, yaml.version is not forced in the dumper because that
-makes it write out a "%YAML 1.2" header.  F-Droid's formats are
-explicitly defined as YAML 1.2 and meant to be human-editable.  So that
-header gets in the way.
-
-"""
-
-import ruamel.yaml
-
-yaml = ruamel.yaml.YAML(typ='safe')
-yaml.version = (1, 2)
-
-yaml_dumper = ruamel.yaml.YAML(typ='rt')
-
-
-def config_dump(config, fp=None):
-    """Dump config data in YAML 1.2 format without headers.
-
-    This outputs YAML in a string that is suitable for use in regexps
-    and string replacements, as well as complete files.  It is therefore
-    explicitly set up to avoid writing out headers and footers.
-
-    This is modeled after PyYAML's yaml.dump(), which can dump to a file
-    or return a string.
-
-    https://yaml.dev/doc/ruamel.yaml/example/#Output_of_%60dump()%60_as_a_string
-
-    """
-    dumper = ruamel.yaml.YAML(typ='rt')
-    dumper.default_flow_style = False
-    dumper.explicit_start = False
-    dumper.explicit_end = False
-    if fp is None:
-        with ruamel.yaml.compat.StringIO() as fp:
-            dumper.dump(config, fp)
-            return fp.getvalue()
-    dumper.dump(config, fp)
diff --git a/fdroidserver/apksigcopier.py b/fdroidserver/apksigcopier.py
deleted file mode 100644
index f36de2eb..00000000
--- a/fdroidserver/apksigcopier.py
+++ /dev/null
@@ -1,1019 +0,0 @@
-#!/usr/bin/python3
-# encoding: utf-8
-# SPDX-FileCopyrightText: 2023 FC Stegerman <flx@obfusk.net>
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-# --                                                            ; {{{1
-#
-# File        : apksigcopier
-# Maintainer  : FC Stegerman <flx@obfusk.net>
-# Date        : 2023-02-08
-#
-# Copyright   : Copyright (C) 2023  FC Stegerman
-# Version     : v1.1.1
-# License     : GPLv3+
-#
-# --                                                            ; }}}1
-
-"""
-Copy/extract/patch android apk signatures & compare apks.
-
-apksigcopier is a tool for copying android APK signatures from a signed APK to
-an unsigned one (in order to verify reproducible builds).
-
-It can also be used to compare two APKs with different signatures; this requires
-apksigner.
-
-
-CLI
-===
-
-$ apksigcopier extract [OPTIONS] SIGNED_APK OUTPUT_DIR
-$ apksigcopier patch [OPTIONS] METADATA_DIR UNSIGNED_APK OUTPUT_APK
-$ apksigcopier copy [OPTIONS] SIGNED_APK UNSIGNED_APK OUTPUT_APK
-$ apksigcopier compare [OPTIONS] FIRST_APK SECOND_APK
-
-The following environment variables can be set to 1, yes, or true to
-override the default behaviour:
-
-* set APKSIGCOPIER_EXCLUDE_ALL_META=1 to exclude all metadata files
-* set APKSIGCOPIER_COPY_EXTRA_BYTES=1 to copy extra bytes after data (e.g. a v2 sig)
-* set APKSIGCOPIER_SKIP_REALIGNMENT=1 to skip realignment of ZIP entries
-
-
-API
-===
-
->> from apksigcopier import do_extract, do_patch, do_copy, do_compare
->> do_extract(signed_apk, output_dir, v1_only=NO)
->> do_patch(metadata_dir, unsigned_apk, output_apk, v1_only=NO)
->> do_copy(signed_apk, unsigned_apk, output_apk, v1_only=NO)
->> do_compare(first_apk, second_apk, unsigned=False)
-
-You can use False, None, and True instead of NO, AUTO, and YES respectively.
-
-The following global variables (which default to False), can be set to
-override the default behaviour:
-
-* set exclude_all_meta=True to exclude all metadata files
-* set copy_extra_bytes=True to copy extra bytes after data (e.g. a v2 sig)
-* set skip_realignment=True to skip realignment of ZIP entries
-"""
-
-import glob
-import json
-import os
-import re
-import struct
-import sys
-import zipfile
-import zlib
-from collections import namedtuple
-from typing import (
-    Any,
-    BinaryIO,
-    Callable,
-    Dict,
-    Iterable,
-    Iterator,
-    Optional,
-    Tuple,
-    Union,
-)
-
-__version__ = "1.1.1"
-NAME = "apksigcopier"
-
-if sys.version_info >= (3, 8):
-    from typing import Literal
-    NoAutoYes = Literal["no", "auto", "yes"]
-else:
-    NoAutoYes = str
-
-DateTime = Tuple[int, int, int, int, int, int]
-NoAutoYesBoolNone = Union[NoAutoYes, bool, None]
-ZipInfoDataPairs = Iterable[Tuple[zipfile.ZipInfo, bytes]]
-
-SIGBLOCK, SIGOFFSET = "APKSigningBlock", "APKSigningBlockOffset"
-NOAUTOYES: Tuple[NoAutoYes, NoAutoYes, NoAutoYes] = ("no", "auto", "yes")
-NO, AUTO, YES = NOAUTOYES
-APK_META = re.compile(r"^META-INF/([0-9A-Za-z_-]+\.(SF|RSA|DSA|EC)|MANIFEST\.MF)$")
-META_EXT: Tuple[str, ...] = ("SF", "RSA|DSA|EC", "MF")
-COPY_EXCLUDE: Tuple[str, ...] = ("META-INF/MANIFEST.MF",)
-DATETIMEZERO: DateTime = (1980, 0, 0, 0, 0, 0)
-
-################################################################################
-#
-# NB: these values are all from apksigner (the first element of each tuple, same
-# as APKZipInfo) or signflinger/zipflinger, except for external_attr w/ 0664
-# permissions and flag_bits 0x08, added for completeness.
-#
-# NB: zipflinger changed from 0666 to 0644 in commit 895ba5fba6ab84617dd67e38f456a8f96aa37ff0
-#
-# https://android.googlesource.com/platform/tools/apksig
-#   src/main/java/com/android/apksig/internal/zip/{CentralDirectoryRecord,LocalFileRecord,ZipUtils}.java
-# https://android.googlesource.com/platform/tools/base
-#   signflinger/src/com/android/signflinger/SignedApk.java
-#   zipflinger/src/com/android/zipflinger/{CentralDirectoryRecord,LocalFileHeader,Source}.java
-#
-################################################################################
-
-VALID_ZIP_META = dict(
-    compresslevel=(9, 1),               # best compression, best speed
-    create_system=(0, 3),               # fat, unx
-    create_version=(20, 0),             # 2.0, 0.0
-    external_attr=(0,                   # N/A
-                   0o100644 << 16,      # regular file rw-r--r--
-                   0o100664 << 16,      # regular file rw-rw-r--
-                   0o100666 << 16),     # regular file rw-rw-rw-
-    extract_version=(20, 0),            # 2.0, 0.0
-    flag_bits=(0x800, 0, 0x08, 0x808),  # 0x800 = utf8, 0x08 = data_descriptor
-)
-
-ZipData = namedtuple("ZipData", ("cd_offset", "eocd_offset", "cd_and_eocd"))
-
-exclude_all_meta = False    # exclude all metadata files in copy_apk()
-copy_extra_bytes = False    # copy extra bytes after data in copy_apk()
-skip_realignment = False    # skip realignment of ZIP entries in copy_apk()
-
-
-class APKSigCopierError(Exception):
-    """Base class for errors."""
-
-
-class APKSigningBlockError(APKSigCopierError):
-    """Something wrong with the APK Signing Block."""
-
-
-class NoAPKSigningBlock(APKSigningBlockError):
-    """APK Signing Block Missing."""
-
-
-class ZipError(APKSigCopierError):
-    """Something wrong with ZIP file."""
-
-
-# FIXME: is there a better alternative?
-class ReproducibleZipInfo(zipfile.ZipInfo):
-    """Reproducible ZipInfo hack."""
-
-    _override: Dict[str, Any] = {}
-
-    def __init__(self, zinfo: zipfile.ZipInfo, **override: Any) -> None:
-        # pylint: disable=W0231
-        if override:
-            self._override = {**self._override, **override}
-        for k in self.__slots__:
-            if hasattr(zinfo, k):
-                setattr(self, k, getattr(zinfo, k))
-
-    def __getattribute__(self, name: str) -> Any:
-        if name != "_override":
-            try:
-                return self._override[name]
-            except KeyError:
-                pass
-        return object.__getattribute__(self, name)
-
-
-# See VALID_ZIP_META
-class APKZipInfo(ReproducibleZipInfo):
-    """Reproducible ZipInfo for APK files."""
-
-    COMPRESSLEVEL = 9
-
-    _override = dict(
-        compress_type=8,
-        create_system=0,
-        create_version=20,
-        date_time=DATETIMEZERO,
-        external_attr=0,
-        extract_version=20,
-        flag_bits=0x800,
-    )
-
-
-def noautoyes(value: NoAutoYesBoolNone) -> NoAutoYes:
-    """
-    Turn False into NO, None into AUTO, and True into YES.
-
-    >>> from apksigcopier import noautoyes, NO, AUTO, YES
-    >>> noautoyes(False) == NO == noautoyes(NO)
-    True
-    >>> noautoyes(None) == AUTO == noautoyes(AUTO)
-    True
-    >>> noautoyes(True) == YES == noautoyes(YES)
-    True
-
-    """
-    if isinstance(value, str):
-        if value not in NOAUTOYES:
-            raise ValueError("expected NO, AUTO, or YES")
-        return value
-    try:
-        return {False: NO, None: AUTO, True: YES}[value]
-    except KeyError:
-        raise ValueError("expected False, None, or True")   # pylint: disable=W0707
-
-
-def is_meta(filename: str) -> bool:
-    """
-    Check whether filename is a JAR metadata file.
-
-    Returns whether filename is a v1 (JAR) signature file (.SF), signature block
-    file (.RSA, .DSA, or .EC), or manifest (MANIFEST.MF).
-
-    See https://docs.oracle.com/javase/tutorial/deployment/jar/intro.html
-
-    >>> from apksigcopier import is_meta
-    >>> is_meta("classes.dex")
-    False
-    >>> is_meta("META-INF/CERT.SF")
-    True
-    >>> is_meta("META-INF/CERT.RSA")
-    True
-    >>> is_meta("META-INF/MANIFEST.MF")
-    True
-    >>> is_meta("META-INF/OOPS")
-    False
-
-    """
-    return APK_META.fullmatch(filename) is not None
-
-
-def exclude_from_copying(filename: str) -> bool:
-    """
-    Check whether to exclude a file during copy_apk().
-
-    Excludes filenames in COPY_EXCLUDE (i.e. MANIFEST.MF) by default; when
-    exclude_all_meta is set to True instead, excludes all metadata files as
-    matched by is_meta().
-
-    Directories are always excluded.
-
-    >>> import apksigcopier
-    >>> from apksigcopier import exclude_from_copying
-    >>> exclude_from_copying("classes.dex")
-    False
-    >>> exclude_from_copying("foo/")
-    True
-    >>> exclude_from_copying("META-INF/")
-    True
-    >>> exclude_from_copying("META-INF/MANIFEST.MF")
-    True
-    >>> exclude_from_copying("META-INF/CERT.SF")
-    False
-    >>> exclude_from_copying("META-INF/OOPS")
-    False
-
-    >>> apksigcopier.exclude_all_meta = True
-    >>> exclude_from_copying("classes.dex")
-    False
-    >>> exclude_from_copying("META-INF/")
-    True
-    >>> exclude_from_copying("META-INF/MANIFEST.MF")
-    True
-    >>> exclude_from_copying("META-INF/CERT.SF")
-    True
-    >>> exclude_from_copying("META-INF/OOPS")
-    False
-
-    """
-    return exclude_meta(filename) if exclude_all_meta else exclude_default(filename)
-
-
-def exclude_default(filename: str) -> bool:
-    """
-    Like exclude_from_copying().
-
-    Excludes directories and filenames in COPY_EXCLUDE (i.e. MANIFEST.MF).
-    """
-    return is_directory(filename) or filename in COPY_EXCLUDE
-
-
-def exclude_meta(filename: str) -> bool:
-    """Like exclude_from_copying(); excludes directories and all metadata files."""
-    return is_directory(filename) or is_meta(filename)
-
-
-def is_directory(filename: str) -> bool:
-    """ZIP entries with filenames that end with a '/' are directories."""
-    return filename.endswith("/")
-
-
-################################################################################
-#
-# There is usually a 132-byte virtual entry at the start of an APK signed with a
-# v1 signature by signflinger/zipflinger; almost certainly this is a default
-# manifest ZIP entry created at initialisation, deleted (from the CD but not
-# from the file) during v1 signing, and eventually replaced by a virtual entry.
-#
-#   >>> (30 + len("META-INF/MANIFEST.MF") +
-#   ...       len("Manifest-Version: 1.0\r\n"
-#   ...           "Created-By: Android Gradle 7.1.3\r\n"
-#   ...           "Built-By: Signflinger\r\n\r\n"))
-#   132
-#
-# NB: they could be a different size, depending on Created-By and Built-By.
-#
-# FIXME: could virtual entries occur elsewhere as well?
-#
-# https://android.googlesource.com/platform/tools/base
-#   signflinger/src/com/android/signflinger/SignedApk.java
-#   zipflinger/src/com/android/zipflinger/{LocalFileHeader,ZipArchive}.java
-#
-################################################################################
-
-def zipflinger_virtual_entry(size: int) -> bytes:
-    """Create zipflinger virtual entry."""
-    if size < 30:
-        raise ValueError("Minimum size for virtual entries is 30 bytes")
-    return (
-        # header            extract_version     flag_bits
-        b"\x50\x4b\x03\x04" b"\x00\x00"         b"\x00\x00"
-        # compress_type     (1981,1,1,1,1,2)    crc32
-        b"\x00\x00"         b"\x21\x08\x21\x02" b"\x00\x00\x00\x00"
-        # compress_size     file_size           filename length
-        b"\x00\x00\x00\x00" b"\x00\x00\x00\x00" b"\x00\x00"
-    ) + int.to_bytes(size - 30, 2, "little") + b"\x00" * (size - 30)
-
-
-def detect_zfe(apkfile: str) -> Optional[int]:
-    """
-    Detect zipflinger virtual entry.
-
-    Returns the size of the virtual entry if found, None otherwise.
-
-    Raises ZipError if the size is less than 30 or greater than 4096, or the
-    data isn't all zeroes.
-    """
-    with open(apkfile, "rb") as fh:
-        zfe_start = zipflinger_virtual_entry(30)[:28]   # w/o len(extra)
-        if fh.read(28) == zfe_start:
-            zfe_size = 30 + int.from_bytes(fh.read(2), "little")
-            if not (30 <= zfe_size <= 4096):
-                raise ZipError("Unsupported virtual entry size")
-            if not fh.read(zfe_size - 30) == b"\x00" * (zfe_size - 30):
-                raise ZipError("Unsupported virtual entry data")
-            return zfe_size
-    return None
-
-
-################################################################################
-#
-# https://en.wikipedia.org/wiki/ZIP_(file_format)
-# https://source.android.com/docs/security/features/apksigning/v2#apk-signing-block-format
-#
-# =================================
-# | Contents of ZIP entries       |
-# =================================
-# | APK Signing Block             |
-# | ----------------------------- |
-# | | size (w/o this) uint64 LE | |
-# | | ...                       | |
-# | | size (again)    uint64 LE | |
-# | | "APK Sig Block 42" (16B)  | |
-# | ----------------------------- |
-# =================================
-# | ZIP Central Directory         |
-# =================================
-# | ZIP End of Central Directory  |
-# | ----------------------------- |
-# | | 0x06054b50 ( 4B)          | |
-# | | ...        (12B)          | |
-# | | CD Offset  ( 4B)          | |
-# | | ...                       | |
-# | ----------------------------- |
-# =================================
-#
-################################################################################
-
-
-# FIXME: makes certain assumptions and doesn't handle all valid ZIP files!
-# FIXME: support zip64?
-# FIXME: handle utf8 filenames w/o utf8 flag (as produced by zipflinger)?
-# https://android.googlesource.com/platform/tools/apksig
-#   src/main/java/com/android/apksig/ApkSigner.java
-def copy_apk(unsigned_apk: str, output_apk: str, *,
-             copy_extra: Optional[bool] = None,
-             exclude: Optional[Callable[[str], bool]] = None,
-             realign: Optional[bool] = None,
-             zfe_size: Optional[int] = None) -> DateTime:
-    """
-    Copy APK like apksigner would, excluding files matched by exclude_from_copying().
-
-    Adds a zipflinger virtual entry of zfe_size bytes if one is not already
-    present and zfe_size is not None.
-
-    Returns max date_time.
-
-    The following global variables (which default to False), can be set to
-    override the default behaviour:
-
-    * set exclude_all_meta=True to exclude all metadata files
-    * set copy_extra_bytes=True to copy extra bytes after data (e.g. a v2 sig)
-    * set skip_realignment=True to skip realignment of ZIP entries
-
-    The default behaviour can also be changed using the keyword-only arguments
-    exclude, copy_extra, and realign; these take precedence over the global
-    variables when not None.  NB: exclude is a callable, not a bool; realign is
-    the inverse of skip_realignment.
-
-    >>> import apksigcopier, os, zipfile
-    >>> apk = "test/apks/apks/golden-aligned-in.apk"
-    >>> with zipfile.ZipFile(apk, "r") as zf:
-    ...     infos_in = zf.infolist()
-    >>> with tempfile.TemporaryDirectory() as tmpdir:
-    ...     out = os.path.join(tmpdir, "out.apk")
-    ...     apksigcopier.copy_apk(apk, out)
-    ...     with zipfile.ZipFile(out, "r") as zf:
-    ...         infos_out = zf.infolist()
-    (2017, 5, 15, 11, 28, 40)
-    >>> for i in infos_in:
-    ...     print(i.filename)
-    META-INF/
-    META-INF/MANIFEST.MF
-    AndroidManifest.xml
-    classes.dex
-    temp.txt
-    lib/armeabi/fake.so
-    resources.arsc
-    temp2.txt
-    >>> for i in infos_out:
-    ...     print(i.filename)
-    AndroidManifest.xml
-    classes.dex
-    temp.txt
-    lib/armeabi/fake.so
-    resources.arsc
-    temp2.txt
-    >>> infos_in[2]
-    <ZipInfo filename='AndroidManifest.xml' compress_type=deflate file_size=1672 compress_size=630>
-    >>> infos_out[0]
-    <ZipInfo filename='AndroidManifest.xml' compress_type=deflate file_size=1672 compress_size=630>
-    >>> repr(infos_in[2:]) == repr(infos_out)
-    True
-
-    """
-    if copy_extra is None:
-        copy_extra = copy_extra_bytes
-    if exclude is None:
-        exclude = exclude_from_copying
-    if realign is None:
-        realign = not skip_realignment
-    with zipfile.ZipFile(unsigned_apk, "r") as zf:
-        infos = zf.infolist()
-    zdata = zip_data(unsigned_apk)
-    offsets = {}
-    with open(unsigned_apk, "rb") as fhi, open(output_apk, "w+b") as fho:
-        if zfe_size:
-            zfe = zipflinger_virtual_entry(zfe_size)
-            if fhi.read(zfe_size) != zfe:
-                fho.write(zfe)
-            fhi.seek(0)
-        for info in sorted(infos, key=lambda info: info.header_offset):
-            off_i = fhi.tell()
-            if info.header_offset > off_i:
-                # copy extra bytes
-                fho.write(fhi.read(info.header_offset - off_i))
-            hdr = fhi.read(30)
-            if hdr[:4] != b"\x50\x4b\x03\x04":
-                raise ZipError("Expected local file header signature")
-            n, m = struct.unpack("<HH", hdr[26:30])
-            hdr += fhi.read(n + m)
-            skip = exclude(info.filename)
-            if skip:
-                fhi.seek(info.compress_size, os.SEEK_CUR)
-            else:
-                if info.filename in offsets:
-                    raise ZipError(f"Duplicate ZIP entry: {info.filename!r}")
-                offsets[info.filename] = off_o = fho.tell()
-                if realign and info.compress_type == 0 and off_o != info.header_offset:
-                    hdr = _realign_zip_entry(info, hdr, n, m, off_o,
-                                             pad_like_apksigner=not zfe_size)
-                fho.write(hdr)
-                _copy_bytes(fhi, fho, info.compress_size)
-            if info.flag_bits & 0x08:
-                data_descriptor = fhi.read(12)
-                if data_descriptor[:4] == b"\x50\x4b\x07\x08":
-                    data_descriptor += fhi.read(4)
-                if not skip:
-                    fho.write(data_descriptor)
-        extra_bytes = zdata.cd_offset - fhi.tell()
-        if copy_extra:
-            _copy_bytes(fhi, fho, extra_bytes)
-        else:
-            fhi.seek(extra_bytes, os.SEEK_CUR)
-        cd_offset = fho.tell()
-        for info in infos:
-            hdr = fhi.read(46)
-            if hdr[:4] != b"\x50\x4b\x01\x02":
-                raise ZipError("Expected central directory file header signature")
-            n, m, k = struct.unpack("<HHH", hdr[28:34])
-            hdr += fhi.read(n + m + k)
-            if not exclude(info.filename):
-                off = int.to_bytes(offsets[info.filename], 4, "little")
-                hdr = hdr[:42] + off + hdr[46:]
-                fho.write(hdr)
-        eocd_offset = fho.tell()
-        fho.write(zdata.cd_and_eocd[zdata.eocd_offset - zdata.cd_offset:])
-        fho.seek(eocd_offset + 8)
-        fho.write(struct.pack("<HHLL", len(offsets), len(offsets),
-                              eocd_offset - cd_offset, cd_offset))
-    return max(info.date_time for info in infos if info.filename in offsets)
-
-
-# NB: doesn't sync local & CD headers!
-def _realign_zip_entry(info: zipfile.ZipInfo, hdr: bytes, n: int, m: int,
-                       off_o: int, pad_like_apksigner: bool = True) -> bytes:
-    align = 4096 if info.filename.endswith(".so") else 4
-    old_off = 30 + n + m + info.header_offset
-    new_off = 30 + n + m + off_o
-    old_xtr = hdr[30 + n:30 + n + m]
-    new_xtr = b""
-    while len(old_xtr) >= 4:
-        hdr_id, size = struct.unpack("<HH", old_xtr[:4])
-        if size > len(old_xtr) - 4:
-            break
-        if not (hdr_id == 0 and size == 0):
-            if hdr_id == 0xd935:
-                if size >= 2:
-                    align = int.from_bytes(old_xtr[4:6], "little")
-            else:
-                new_xtr += old_xtr[:size + 4]
-        old_xtr = old_xtr[size + 4:]
-    if old_off % align == 0 and new_off % align != 0:
-        if pad_like_apksigner:
-            pad = (align - (new_off - m + len(new_xtr) + 6) % align) % align
-            xtr = new_xtr + struct.pack("<HHH", 0xd935, 2 + pad, align) + pad * b"\x00"
-        else:
-            pad = (align - (new_off - m + len(new_xtr)) % align) % align
-            xtr = new_xtr + pad * b"\x00"
-        m_b = int.to_bytes(len(xtr), 2, "little")
-        hdr = hdr[:28] + m_b + hdr[30:30 + n] + xtr
-    return hdr
-
-
-def _copy_bytes(fhi: BinaryIO, fho: BinaryIO, size: int, blocksize: int = 4096) -> None:
-    while size > 0:
-        data = fhi.read(min(size, blocksize))
-        if not data:
-            break
-        size -= len(data)
-        fho.write(data)
-    if size != 0:
-        raise ZipError("Unexpected EOF")
-
-
-def extract_meta(signed_apk: str) -> Iterator[Tuple[zipfile.ZipInfo, bytes]]:
-    """
-    Extract v1 signature metadata files from signed APK.
-
-    Yields (ZipInfo, data) pairs.
-
-    >>> from apksigcopier import extract_meta
-    >>> apk = "test/apks/apks/golden-aligned-v1v2v3-out.apk"
-    >>> meta = tuple(extract_meta(apk))
-    >>> [ x.filename for x, _ in meta ]
-    ['META-INF/RSA-2048.SF', 'META-INF/RSA-2048.RSA', 'META-INF/MANIFEST.MF']
-    >>> for line in meta[0][1].splitlines()[:4]:
-    ...     print(line.decode())
-    Signature-Version: 1.0
-    Created-By: 1.0 (Android)
-    SHA-256-Digest-Manifest: hz7AxDJU9Namxoou/kc4Z2GVRS9anCGI+M52tbCsXT0=
-    X-Android-APK-Signed: 2, 3
-    >>> for line in meta[2][1].splitlines()[:2]:
-    ...     print(line.decode())
-    Manifest-Version: 1.0
-    Created-By: 1.8.0_45-internal (Oracle Corporation)
-
-    """
-    with zipfile.ZipFile(signed_apk, "r") as zf_sig:
-        for info in zf_sig.infolist():
-            if is_meta(info.filename):
-                yield info, zf_sig.read(info.filename)
-
-
-def extract_differences(signed_apk: str, extracted_meta: ZipInfoDataPairs) \
-        -> Optional[Dict[str, Any]]:
-    """
-    Extract ZIP metadata differences from signed APK.
-
-    >>> import apksigcopier as asc, pprint
-    >>> apk = "test/apks/apks/debuggable-boolean.apk"
-    >>> meta = tuple(asc.extract_meta(apk))
-    >>> [ x.filename for x, _ in meta ]
-    ['META-INF/CERT.SF', 'META-INF/CERT.RSA', 'META-INF/MANIFEST.MF']
-    >>> diff = asc.extract_differences(apk, meta)
-    >>> pprint.pprint(diff)
-    {'files': {'META-INF/CERT.RSA': {'flag_bits': 2056},
-               'META-INF/CERT.SF': {'flag_bits': 2056},
-               'META-INF/MANIFEST.MF': {'flag_bits': 2056}}}
-
-    >>> meta[2][0].extract_version = 42
-    >>> try:
-    ...     asc.extract_differences(apk, meta)
-    ... except asc.ZipError as e:
-    ...     print(e)
-    Unsupported extract_version
-
-    >>> asc.validate_differences(diff) is None
-    True
-    >>> diff["files"]["META-INF/OOPS"] = {}
-    >>> asc.validate_differences(diff)
-    ".files key 'META-INF/OOPS' is not a metadata file"
-    >>> del diff["files"]["META-INF/OOPS"]
-    >>> diff["files"]["META-INF/CERT.RSA"]["compresslevel"] = 42
-    >>> asc.validate_differences(diff)
-    ".files['META-INF/CERT.RSA'].compresslevel has an unexpected value"
-    >>> diff["oops"] = 42
-    >>> asc.validate_differences(diff)
-    'contains unknown key(s)'
-
-    """
-    differences: Dict[str, Any] = {}
-    files = {}
-    for info, data in extracted_meta:
-        diffs = {}
-        for k in VALID_ZIP_META:
-            if k != "compresslevel":
-                v = getattr(info, k)
-                if v != APKZipInfo._override[k]:
-                    if v not in VALID_ZIP_META[k]:
-                        raise ZipError(f"Unsupported {k}")
-                    diffs[k] = v
-        level = _get_compresslevel(signed_apk, info, data)
-        if level != APKZipInfo.COMPRESSLEVEL:
-            diffs["compresslevel"] = level
-        if diffs:
-            files[info.filename] = diffs
-    if files:
-        differences["files"] = files
-    zfe_size = detect_zfe(signed_apk)
-    if zfe_size:
-        differences["zipflinger_virtual_entry"] = zfe_size
-    return differences or None
-
-
-def validate_differences(differences: Dict[str, Any]) -> Optional[str]:
-    """
-    Validate differences dict.
-
-    Returns None if valid, error otherwise.
-    """
-    if set(differences) - {"files", "zipflinger_virtual_entry"}:
-        return "contains unknown key(s)"
-    if "zipflinger_virtual_entry" in differences:
-        if type(differences["zipflinger_virtual_entry"]) is not int:
-            return ".zipflinger_virtual_entry is not an int"
-        if not (30 <= differences["zipflinger_virtual_entry"] <= 4096):
-            return ".zipflinger_virtual_entry is < 30 or > 4096"
-    if "files" in differences:
-        if not isinstance(differences["files"], dict):
-            return ".files is not a dict"
-        for name, info in differences["files"].items():
-            if not is_meta(name):
-                return f".files key {name!r} is not a metadata file"
-            if not isinstance(info, dict):
-                return f".files[{name!r}] is not a dict"
-            if set(info) - set(VALID_ZIP_META):
-                return f".files[{name!r}] contains unknown key(s)"
-            for k, v in info.items():
-                if v not in VALID_ZIP_META[k]:
-                    return f".files[{name!r}].{k} has an unexpected value"
-    return None
-
-
-def _get_compresslevel(apkfile: str, info: zipfile.ZipInfo, data: bytes) -> int:
-    if info.compress_type != 8:
-        raise ZipError("Unsupported compress_type")
-    crc = _get_compressed_crc(apkfile, info)
-    for level in VALID_ZIP_META["compresslevel"]:
-        comp = zlib.compressobj(level, 8, -15)
-        if zlib.crc32(comp.compress(data) + comp.flush()) == crc:
-            return level
-    raise ZipError("Unsupported compresslevel")
-
-
-def _get_compressed_crc(apkfile: str, info: zipfile.ZipInfo) -> int:
-    with open(apkfile, "rb") as fh:
-        fh.seek(info.header_offset)
-        hdr = fh.read(30)
-        if hdr[:4] != b"\x50\x4b\x03\x04":
-            raise ZipError("Expected local file header signature")
-        n, m = struct.unpack("<HH", hdr[26:30])
-        fh.seek(n + m, os.SEEK_CUR)
-        return zlib.crc32(fh.read(info.compress_size))
-
-
-def patch_meta(extracted_meta: ZipInfoDataPairs, output_apk: str,
-               date_time: DateTime = DATETIMEZERO, *,
-               differences: Optional[Dict[str, Any]] = None) -> None:
-    """
-    Add v1 signature metadata to APK (removes v2 sig block, if any).
-
-    >>> import apksigcopier as asc
-    >>> unsigned_apk = "test/apks/apks/golden-aligned-in.apk"
-    >>> signed_apk = "test/apks/apks/golden-aligned-v1v2v3-out.apk"
-    >>> meta = tuple(asc.extract_meta(signed_apk))
-    >>> [ x.filename for x, _ in meta ]
-    ['META-INF/RSA-2048.SF', 'META-INF/RSA-2048.RSA', 'META-INF/MANIFEST.MF']
-    >>> with zipfile.ZipFile(unsigned_apk, "r") as zf:
-    ...     infos_in = zf.infolist()
-    >>> with tempfile.TemporaryDirectory() as tmpdir:
-    ...     out = os.path.join(tmpdir, "out.apk")
-    ...     asc.copy_apk(unsigned_apk, out)
-    ...     asc.patch_meta(meta, out)
-    ...     with zipfile.ZipFile(out, "r") as zf:
-    ...         infos_out = zf.infolist()
-    (2017, 5, 15, 11, 28, 40)
-    >>> for i in infos_in:
-    ...     print(i.filename)
-    META-INF/
-    META-INF/MANIFEST.MF
-    AndroidManifest.xml
-    classes.dex
-    temp.txt
-    lib/armeabi/fake.so
-    resources.arsc
-    temp2.txt
-    >>> for i in infos_out:
-    ...     print(i.filename)
-    AndroidManifest.xml
-    classes.dex
-    temp.txt
-    lib/armeabi/fake.so
-    resources.arsc
-    temp2.txt
-    META-INF/RSA-2048.SF
-    META-INF/RSA-2048.RSA
-    META-INF/MANIFEST.MF
-
-    """
-    with zipfile.ZipFile(output_apk, "r") as zf_out:
-        for info in zf_out.infolist():
-            if is_meta(info.filename):
-                raise ZipError("Unexpected metadata")
-    with zipfile.ZipFile(output_apk, "a") as zf_out:
-        for info, data in extracted_meta:
-            if differences and "files" in differences:
-                more = differences["files"].get(info.filename, {}).copy()
-            else:
-                more = {}
-            level = more.pop("compresslevel", APKZipInfo.COMPRESSLEVEL)
-            zinfo = APKZipInfo(info, date_time=date_time, **more)
-            zf_out.writestr(zinfo, data, compresslevel=level)
-
-
-def extract_v2_sig(apkfile: str, expected: bool = True) -> Optional[Tuple[int, bytes]]:
-    """
-    Extract APK Signing Block and offset from APK.
-
-    When successful, returns (sb_offset, sig_block); otherwise raises
-    NoAPKSigningBlock when expected is True, else returns None.
-
-    >>> import apksigcopier as asc
-    >>> apk = "test/apks/apks/golden-aligned-v1v2v3-out.apk"
-    >>> sb_offset, sig_block = asc.extract_v2_sig(apk)
-    >>> sb_offset
-    8192
-    >>> len(sig_block)
-    4096
-
-    >>> apk = "test/apks/apks/golden-aligned-in.apk"
-    >>> try:
-    ...     asc.extract_v2_sig(apk)
-    ... except asc.NoAPKSigningBlock as e:
-    ...     print(e)
-    No APK Signing Block
-
-    """
-    cd_offset = zip_data(apkfile).cd_offset
-    with open(apkfile, "rb") as fh:
-        fh.seek(cd_offset - 16)
-        if fh.read(16) != b"APK Sig Block 42":
-            if expected:
-                raise NoAPKSigningBlock("No APK Signing Block")
-            return None
-        fh.seek(-24, os.SEEK_CUR)
-        sb_size2 = int.from_bytes(fh.read(8), "little")
-        fh.seek(-sb_size2 + 8, os.SEEK_CUR)
-        sb_size1 = int.from_bytes(fh.read(8), "little")
-        if sb_size1 != sb_size2:
-            raise APKSigningBlockError("APK Signing Block sizes not equal")
-        fh.seek(-8, os.SEEK_CUR)
-        sb_offset = fh.tell()
-        sig_block = fh.read(sb_size2 + 8)
-    return sb_offset, sig_block
-
-
-# FIXME: OSError for APKs < 1024 bytes [wontfix]
-def zip_data(apkfile: str, count: int = 1024) -> ZipData:
-    """
-    Extract central directory, EOCD, and offsets from ZIP.
-
-    Returns ZipData.
-
-    >>> import apksigcopier
-    >>> apk = "test/apks/apks/golden-aligned-v1v2v3-out.apk"
-    >>> data = apksigcopier.zip_data(apk)
-    >>> data.cd_offset, data.eocd_offset
-    (12288, 12843)
-    >>> len(data.cd_and_eocd)
-    577
-
-    """
-    with open(apkfile, "rb") as fh:
-        fh.seek(-count, os.SEEK_END)
-        data = fh.read()
-        pos = data.rfind(b"\x50\x4b\x05\x06")
-        if pos == -1:
-            raise ZipError("Expected end of central directory record (EOCD)")
-        fh.seek(pos - len(data), os.SEEK_CUR)
-        eocd_offset = fh.tell()
-        fh.seek(16, os.SEEK_CUR)
-        cd_offset = int.from_bytes(fh.read(4), "little")
-        fh.seek(cd_offset)
-        cd_and_eocd = fh.read()
-    return ZipData(cd_offset, eocd_offset, cd_and_eocd)
-
-
-# FIXME: can we determine signed_sb_offset?
-def patch_v2_sig(extracted_v2_sig: Tuple[int, bytes], output_apk: str) -> None:
-    """
-    Implant extracted v2/v3 signature into APK.
-
-    >>> import apksigcopier as asc
-    >>> unsigned_apk = "test/apks/apks/golden-aligned-in.apk"
-    >>> signed_apk = "test/apks/apks/golden-aligned-v1v2v3-out.apk"
-    >>> meta = tuple(asc.extract_meta(signed_apk))
-    >>> v2_sig = asc.extract_v2_sig(signed_apk)
-    >>> with tempfile.TemporaryDirectory() as tmpdir:
-    ...     out = os.path.join(tmpdir, "out.apk")
-    ...     date_time = asc.copy_apk(unsigned_apk, out)
-    ...     asc.patch_meta(meta, out, date_time=date_time)
-    ...     asc.extract_v2_sig(out, expected=False) is None
-    ...     asc.patch_v2_sig(v2_sig, out)
-    ...     asc.extract_v2_sig(out) == v2_sig
-    ...     with open(signed_apk, "rb") as a, open(out, "rb") as b:
-    ...         a.read() == b.read()
-    True
-    True
-    True
-
-    """
-    signed_sb_offset, signed_sb = extracted_v2_sig
-    data_out = zip_data(output_apk)
-    if signed_sb_offset < data_out.cd_offset:
-        raise APKSigningBlockError("APK Signing Block offset < central directory offset")
-    padding = b"\x00" * (signed_sb_offset - data_out.cd_offset)
-    offset = len(signed_sb) + len(padding)
-    with open(output_apk, "r+b") as fh:
-        fh.seek(data_out.cd_offset)
-        fh.write(padding)
-        fh.write(signed_sb)
-        fh.write(data_out.cd_and_eocd)
-        fh.seek(data_out.eocd_offset + offset + 16)
-        fh.write(int.to_bytes(data_out.cd_offset + offset, 4, "little"))
-
-
-def patch_apk(extracted_meta: ZipInfoDataPairs, extracted_v2_sig: Optional[Tuple[int, bytes]],
-              unsigned_apk: str, output_apk: str, *,
-              differences: Optional[Dict[str, Any]] = None,
-              exclude: Optional[Callable[[str], bool]] = None) -> None:
-    """Patch extracted_meta + extracted_v2_sig (if not None) onto unsigned_apk and save as output_apk."""
-    if differences and "zipflinger_virtual_entry" in differences:
-        zfe_size = differences["zipflinger_virtual_entry"]
-    else:
-        zfe_size = None
-    date_time = copy_apk(unsigned_apk, output_apk, exclude=exclude, zfe_size=zfe_size)
-    patch_meta(extracted_meta, output_apk, date_time=date_time, differences=differences)
-    if extracted_v2_sig is not None:
-        patch_v2_sig(extracted_v2_sig, output_apk)
-
-
-# FIXME: support multiple signers?
-def do_extract(signed_apk: str, output_dir: str, v1_only: NoAutoYesBoolNone = NO,
-               *, ignore_differences: bool = False) -> None:
-    """
-    Extract signatures from signed_apk and save in output_dir.
-
-    The v1_only parameter controls whether the absence of a v1 signature is
-    considered an error or not:
-    * use v1_only=NO (or v1_only=False) to only accept (v1+)v2/v3 signatures;
-    * use v1_only=AUTO (or v1_only=None) to automatically detect v2/v3 signatures;
-    * use v1_only=YES (or v1_only=True) to ignore any v2/v3 signatures.
-    """
-    v1_only = noautoyes(v1_only)
-    extracted_meta = tuple(extract_meta(signed_apk))
-    if len(extracted_meta) not in (len(META_EXT), 0):
-        raise APKSigCopierError("Unexpected or missing metadata files in signed_apk")
-    for info, data in extracted_meta:
-        name = os.path.basename(info.filename)
-        with open(os.path.join(output_dir, name), "wb") as fh:
-            fh.write(data)
-    if v1_only == YES:
-        if not extracted_meta:
-            raise APKSigCopierError("Expected v1 signature")
-        return
-    expected = v1_only == NO
-    extracted_v2_sig = extract_v2_sig(signed_apk, expected=expected)
-    if extracted_v2_sig is None:
-        if not extracted_meta:
-            raise APKSigCopierError("Expected v1 and/or v2/v3 signature, found neither")
-        return
-    signed_sb_offset, signed_sb = extracted_v2_sig
-    with open(os.path.join(output_dir, SIGOFFSET), "w") as fh:
-        fh.write(str(signed_sb_offset) + "\n")
-    with open(os.path.join(output_dir, SIGBLOCK), "wb") as fh:
-        fh.write(signed_sb)
-    if not ignore_differences:
-        differences = extract_differences(signed_apk, extracted_meta)
-        if differences:
-            with open(os.path.join(output_dir, "differences.json"), "w") as fh:
-                json.dump(differences, fh, sort_keys=True, indent=2)
-                fh.write("\n")
-
-
-# FIXME: support multiple signers?
-def do_patch(metadata_dir: str, unsigned_apk: str, output_apk: str,
-             v1_only: NoAutoYesBoolNone = NO, *,
-             exclude: Optional[Callable[[str], bool]] = None,
-             ignore_differences: bool = False) -> None:
-    """
-    Patch signatures from metadata_dir onto unsigned_apk and save as output_apk.
-
-    The v1_only parameter controls whether the absence of a v1 signature is
-    considered an error or not:
-    * use v1_only=NO (or v1_only=False) to only accept (v1+)v2/v3 signatures;
-    * use v1_only=AUTO (or v1_only=None) to automatically detect v2/v3 signatures;
-    * use v1_only=YES (or v1_only=True) to ignore any v2/v3 signatures.
-    """
-    v1_only = noautoyes(v1_only)
-    extracted_meta = []
-    differences = None
-    for pat in META_EXT:
-        files = [fn for ext in pat.split("|") for fn in
-                 glob.glob(os.path.join(metadata_dir, "*." + ext))]
-        if len(files) != 1:
-            continue
-        info = zipfile.ZipInfo("META-INF/" + os.path.basename(files[0]))
-        with open(files[0], "rb") as fh:
-            extracted_meta.append((info, fh.read()))
-    if len(extracted_meta) not in (len(META_EXT), 0):
-        raise APKSigCopierError("Unexpected or missing files in metadata_dir")
-    if v1_only == YES:
-        extracted_v2_sig = None
-    else:
-        sigoffset_file = os.path.join(metadata_dir, SIGOFFSET)
-        sigblock_file = os.path.join(metadata_dir, SIGBLOCK)
-        if v1_only == AUTO and not os.path.exists(sigblock_file):
-            extracted_v2_sig = None
-        else:
-            with open(sigoffset_file, "r") as fh:
-                signed_sb_offset = int(fh.read())
-            with open(sigblock_file, "rb") as fh:
-                signed_sb = fh.read()
-            extracted_v2_sig = signed_sb_offset, signed_sb
-            differences_file = os.path.join(metadata_dir, "differences.json")
-            if not ignore_differences and os.path.exists(differences_file):
-                with open(differences_file, "r") as fh:
-                    try:
-                        differences = json.load(fh)
-                    except json.JSONDecodeError as e:
-                        raise APKSigCopierError(f"Invalid differences.json: {e}")   # pylint: disable=W0707
-                    error = validate_differences(differences)
-                    if error:
-                        raise APKSigCopierError(f"Invalid differences.json: {error}")
-    if not extracted_meta and extracted_v2_sig is None:
-        raise APKSigCopierError("Expected v1 and/or v2/v3 signature, found neither")
-    patch_apk(extracted_meta, extracted_v2_sig, unsigned_apk, output_apk,
-              differences=differences, exclude=exclude)
-
-
-def do_copy(signed_apk: str, unsigned_apk: str, output_apk: str,
-            v1_only: NoAutoYesBoolNone = NO, *,
-            exclude: Optional[Callable[[str], bool]] = None,
-            ignore_differences: bool = False) -> None:
-    """
-    Copy signatures from signed_apk onto unsigned_apk and save as output_apk.
-
-    The v1_only parameter controls whether the absence of a v1 signature is
-    considered an error or not:
-    * use v1_only=NO (or v1_only=False) to only accept (v1+)v2/v3 signatures;
-    * use v1_only=AUTO (or v1_only=None) to automatically detect v2/v3 signatures;
-    * use v1_only=YES (or v1_only=True) to ignore any v2/v3 signatures.
-    """
-    v1_only = noautoyes(v1_only)
-    extracted_meta = tuple(extract_meta(signed_apk))
-    differences = None
-    if v1_only == YES:
-        extracted_v2_sig = None
-    else:
-        extracted_v2_sig = extract_v2_sig(signed_apk, expected=v1_only == NO)
-        if extracted_v2_sig is not None and not ignore_differences:
-            differences = extract_differences(signed_apk, extracted_meta)
-    patch_apk(extracted_meta, extracted_v2_sig, unsigned_apk, output_apk,
-              differences=differences, exclude=exclude)
-
-# vim: set tw=80 sw=4 sts=4 et fdm=marker :
diff --git a/fdroidserver/asynchronousfilereader/__init__.py b/fdroidserver/asynchronousfilereader/__init__.py
index 7ba02b69..e8aa35e5 100644
--- a/fdroidserver/asynchronousfilereader/__init__.py
+++ b/fdroidserver/asynchronousfilereader/__init__.py
@@ -1,8 +1,9 @@
-"""Simple thread based asynchronous file reader for Python.
-
+"""
 AsynchronousFileReader
 ======================
 
+Simple thread based asynchronous file reader for Python.
+
 see https://github.com/soxofaan/asynchronousfilereader
 
 MIT License
@@ -12,7 +13,6 @@ Copyright (c) 2014 Stefaan Lippens
 __version__ = '0.2.1'
 
 import threading
-
 try:
     # Python 2
     from Queue import Queue
@@ -22,9 +22,10 @@ except ImportError:
 
 
 class AsynchronousFileReader(threading.Thread):
-    """Helper class to implement asynchronous reading of a file in a separate thread.
-
-    Pushes read lines on a queue to be consumed in another thread.
+    """
+    Helper class to implement asynchronous reading of a file
+    in a separate thread. Pushes read lines on a queue to
+    be consumed in another thread.
     """
 
     def __init__(self, fd, queue=None, autostart=True):
@@ -39,7 +40,9 @@ class AsynchronousFileReader(threading.Thread):
             self.start()
 
     def run(self):
-        """Read lines and put them on the queue (the body of the tread)."""
+        """
+        The body of the tread: read lines and put them on the queue.
+        """
         while True:
             line = self._fd.readline()
             if not line:
@@ -47,10 +50,15 @@ class AsynchronousFileReader(threading.Thread):
             self.queue.put(line)
 
     def eof(self):
-        """Check whether there is no more content to expect."""
+        """
+        Check whether there is no more content to expect.
+        """
         return not self.is_alive() and self.queue.empty()
 
     def readlines(self):
-        """Get currently available lines."""
+        """
+        Get currently available lines.
+        """
         while not self.queue.empty():
             yield self.queue.get()
+
diff --git a/fdroidserver/btlog.py b/fdroidserver/btlog.py
index 7ca3ddbf..f1e83c90 100755
--- a/fdroidserver/btlog.py
+++ b/fdroidserver/btlog.py
@@ -1,5 +1,4 @@
 #!/usr/bin/env python3
-"""Update the binary transparency log for a URL."""
 #
 # btlog.py - part of the FDroid server tools
 # Copyright (C) 2017, Hans-Christoph Steiner <hans@eds.org>
@@ -27,64 +26,51 @@
 # client app so its not easy for the server to distinguish this from
 # the F-Droid client.
 
+
 import collections
+import defusedxml.minidom
+import git
 import glob
+import os
 import json
 import logging
-import os
+import requests
 import shutil
 import tempfile
 import zipfile
 from argparse import ArgumentParser
-from typing import Optional
 
-import defusedxml.minidom
-import git
-import requests
-
-from . import _, common, deploy
+from . import _
+from . import common
+from . import deploy
 from .exception import FDroidException
 
 
-def make_binary_transparency_log(
-    repodirs: collections.abc.Iterable,
-    btrepo: str = 'binary_transparency',
-    url: Optional[str] = None,
-    commit_title: str = 'fdroid update',
-):
-    """Log the indexes in a standalone git repo to serve as a "binary transparency" log.
+options = None
 
-    Parameters
-    ----------
-    repodirs
-        The directories of the F-Droid repository to generate the binary
-        transparency log for.
-    btrepo
-        The path to the Git repository of the binary transparency log.
-    url
-        The URL of the F-Droid repository to generate the binary transparency
-        log for.
-    commit_title
-        The commit title for commits in the binary transparency log Git
-        repository.
 
-    Notes
-    -----
-    Also see https://www.eff.org/deeplinks/2014/02/open-letter-to-tech-companies .
-    """
+def make_binary_transparency_log(repodirs, btrepo='binary_transparency',
+                                 url=None,
+                                 commit_title='fdroid update'):
+    '''Log the indexes in a standalone git repo to serve as a "binary
+    transparency" log.
+
+    see: https://www.eff.org/deeplinks/2014/02/open-letter-to-tech-companies
+
+    '''
+
     logging.info('Committing indexes to ' + btrepo)
     if os.path.exists(os.path.join(btrepo, '.git')):
         gitrepo = git.Repo(btrepo)
     else:
         if not os.path.exists(btrepo):
             os.mkdir(btrepo)
-        gitrepo = git.Repo.init(btrepo, initial_branch=deploy.GIT_BRANCH)
+        gitrepo = git.Repo.init(btrepo)
 
         if not url:
             url = common.config['repo_url'].rstrip('/')
         with open(os.path.join(btrepo, 'README.md'), 'w') as fp:
-            fp.write(
-                """
+            fp.write("""
 # Binary Transparency Log for %s
 
 This is a log of the signed app index metadata.  This is stored in a
@@ -94,17 +80,15 @@ F-Droid repository was a publicly released file.
 
 For more info on this idea:
 * https://wiki.mozilla.org/Security/Binary_Transparency
-"""
-                % url[: url.rindex('/')]  # strip '/repo'
-            )
-        gitrepo.index.add(['README.md'])
+""" % url[:url.rindex('/')])  # strip '/repo'
+        gitrepo.index.add(['README.md', ])
         gitrepo.index.commit('add README')
 
     for repodir in repodirs:
         cpdir = os.path.join(btrepo, repodir)
         if not os.path.exists(cpdir):
             os.mkdir(cpdir)
-        for f in ('index.xml', 'index-v1.json', 'index-v2.json', 'entry.json'):
+        for f in ('index.xml', 'index-v1.json'):
             repof = os.path.join(repodir, f)
             if not os.path.exists(repof):
                 continue
@@ -119,8 +103,8 @@ For more info on this idea:
                     output = json.load(fp, object_pairs_hook=collections.OrderedDict)
                 with open(dest, 'w') as fp:
                     json.dump(output, fp, indent=2)
-            gitrepo.index.add([repof])
-        for f in ('index.jar', 'index-v1.jar', 'entry.jar'):
+            gitrepo.index.add([repof, ])
+        for f in ('index.jar', 'index-v1.jar'):
             repof = os.path.join(repodir, f)
             if not os.path.exists(repof):
                 continue
@@ -132,7 +116,7 @@ For more info on this idea:
                     jarout.writestr(info, jarin.read(info.filename))
             jarout.close()
             jarin.close()
-            gitrepo.index.add([repof])
+            gitrepo.index.add([repof, ])
 
         output_files = []
         for root, dirs, files in os.walk(repodir):
@@ -153,45 +137,27 @@ For more info on this idea:
         fslogfile = os.path.join(cpdir, 'filesystemlog.json')
         with open(fslogfile, 'w') as fp:
             json.dump(output, fp, indent=2)
-        gitrepo.index.add([os.path.join(repodir, 'filesystemlog.json')])
+        gitrepo.index.add([os.path.join(repodir, 'filesystemlog.json'), ])
 
         for f in glob.glob(os.path.join(cpdir, '*.HTTP-headers.json')):
-            gitrepo.index.add([os.path.join(repodir, os.path.basename(f))])
+            gitrepo.index.add([os.path.join(repodir, os.path.basename(f)), ])
 
     gitrepo.index.commit(commit_title)
 
 
 def main():
-    """Generate or update a binary transparency log for a F-Droid repository.
+    global options
 
-    The behaviour of this function is influenced by the configuration file as
-    well as command line parameters.
-
-    Raises
-    ------
-    :exc:`~fdroidserver.exception.FDroidException`
-        If the specified or default Git repository does not exist.
-
-    """
     parser = ArgumentParser()
     common.setup_global_opts(parser)
-    parser.add_argument(
-        "--git-repo",
-        default=os.path.join(os.getcwd(), 'binary_transparency'),
-        help=_("Path to the git repo to use as the log"),
-    )
-    parser.add_argument(
-        "-u",
-        "--url",
-        default='https://f-droid.org',
-        help=_("The base URL for the repo to log (default: https://f-droid.org)"),
-    )
-    parser.add_argument(
-        "--git-remote",
-        default=None,
-        help=_("Push the log to this git remote repository"),
-    )
-    options = common.parse_args(parser)
+    parser.add_argument("--git-repo",
+                        default=os.path.join(os.getcwd(), 'binary_transparency'),
+                        help=_("Path to the git repo to use as the log"))
+    parser.add_argument("-u", "--url", default='https://f-droid.org',
+                        help=_("The base URL for the repo to log (default: https://f-droid.org)"))
+    parser.add_argument("--git-remote", default=None,
+                        help=_("Push the log to this git remote repository"))
+    options = parser.parse_args()
 
     if options.verbose:
         logging.getLogger("requests").setLevel(logging.INFO)
@@ -202,8 +168,7 @@ def main():
 
     if not os.path.exists(options.git_repo):
         raise FDroidException(
-            '"%s" does not exist! Create it, or use --git-repo' % options.git_repo
-        )
+            '"%s" does not exist! Create it, or use --git-repo' % options.git_repo)
 
     session = requests.Session()
 
@@ -216,20 +181,14 @@ def main():
         os.makedirs(tempdir, exist_ok=True)
         gitrepodir = os.path.join(options.git_repo, repodir)
         os.makedirs(gitrepodir, exist_ok=True)
-        for f in (
-            'entry.jar',
-            'entry.json',
-            'index-v1.jar',
-            'index-v1.json',
-            'index-v2.json',
-            'index.jar',
-            'index.xml',
-        ):
+        for f in ('index.jar', 'index.xml', 'index-v1.jar', 'index-v1.json'):
             dlfile = os.path.join(tempdir, f)
             dlurl = options.url + '/' + repodir + '/' + f
             http_headers_file = os.path.join(gitrepodir, f + '.HTTP-headers.json')
 
-            headers = {'User-Agent': 'F-Droid 0.102.3'}
+            headers = {
+                'User-Agent': 'F-Droid 0.102.3'
+            }
             etag = None
             if os.path.exists(http_headers_file):
                 with open(http_headers_file) as fp:
@@ -237,9 +196,7 @@ def main():
 
             r = session.head(dlurl, headers=headers, allow_redirects=False)
             if r.status_code != 200:
-                logging.debug(
-                    'HTTP Response (%d), did not download %s' % (r.status_code, dlurl)
-                )
+                logging.debug('HTTP Response (' + str(r.status_code) + '), did not download ' + dlurl)
                 continue
             if etag and etag == r.headers.get('ETag'):
                 logging.debug('ETag matches, did not download ' + dlurl)
@@ -260,9 +217,7 @@ def main():
 
     if new_files:
         os.chdir(tempdirbase)
-        make_binary_transparency_log(
-            repodirs, options.git_repo, options.url, 'fdroid btlog'
-        )
+        make_binary_transparency_log(repodirs, options.git_repo, options.url, 'fdroid btlog')
     if options.git_remote:
         deploy.push_binary_transparency(options.git_repo, options.git_remote)
     shutil.rmtree(tempdirbase, ignore_errors=True)
diff --git a/fdroidserver/build.py b/fdroidserver/build.py
index 2e716c10..a4fe326b 100644
--- a/fdroidserver/build.py
+++ b/fdroidserver/build.py
@@ -1,5 +1,4 @@
 #!/usr/bin/env python3
-"""Build a package from source."""
 #
 # build.py - part of the FDroid server tools
 # Copyright (C) 2010-2014, Ciaran Gultnieks, ciaran@ciarang.com
@@ -18,70 +17,53 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-import argparse
-import glob
-import logging
 import os
+import shutil
+import glob
+import subprocess
 import posixpath
 import re
-import shutil
-import subprocess
+import resource
+import sys
 import tarfile
-import tempfile
 import threading
-import time
 import traceback
-from gettext import ngettext
-from pathlib import Path
-
+import time
 import requests
+import tempfile
+import argparse
+from configparser import ConfigParser
+import logging
+from gettext import ngettext
 
-from . import _, common, metadata, net, scanner, vmtools
+from . import _
+from . import common
+from . import net
+from . import metadata
+from . import scanner
+from . import vmtools
 from .common import FDroidPopen
-from .exception import BuildException, FDroidException, VCSException
+from .exception import FDroidException, BuildException, VCSException
 
 try:
     import paramiko
 except ImportError:
     pass
 
-buildserverid = None
-ssh_channel = None
-
 
 # Note that 'force' here also implies test mode.
 def build_server(app, build, vcs, build_dir, output_dir, log_dir, force):
     """Do a build on the builder vm.
 
-    Parameters
-    ----------
-    app
-        The metadata of the app to build.
-    build
-        The build of the app to build.
-    vcs
-        The version control system controller object of the app.
-    build_dir
-        The local source-code checkout directory of the app.
-    output_dir
-        The target folder for the build result.
-    log_dir
-        The directory in the VM where the build logs are getting stored.
-    force
-        Don't refresh the already cloned repository and make the build stop on
-        exceptions.
-
-    Raises
-    ------
-    :exc:`~fdroidserver.exception.BuildException`
-        If Paramiko is not installed, a srclib directory or srclib metadata
-        file is unexpectedly missing, the build process in the VM failed or
-        output files of the build process are missing.
-    :exc:`~fdroidserver.exception.FDroidException`
-        If the Buildserver ID could not be obtained or copying a directory to
-        the server failed.
+    :param app: app metadata dict
+    :param build:
+    :param vcs: version control system controller object
+    :param build_dir: local source-code checkout of app
+    :param output_dir: target folder for the build result
+    :param force:
     """
-    global buildserverid, ssh_channel
+
+    global buildserverid
 
     try:
         paramiko
@@ -101,6 +83,7 @@ def build_server(app, build, vcs, build_dir, output_dir, log_dir, force):
                 buildserverid = subprocess.check_output(['vagrant', 'ssh', '-c',
                                                          'cat /home/vagrant/buildserverid'],
                                                         cwd='builder').strip().decode()
+                status_output['buildserverid'] = buildserverid
                 logging.debug(_('Fetched buildserverid from VM: {buildserverid}')
                               .format(buildserverid=buildserverid))
             except Exception as e:
@@ -113,7 +96,7 @@ def build_server(app, build, vcs, build_dir, output_dir, log_dir, force):
         # Open SSH connection...
         logging.info("Connecting to virtual machine...")
         sshs = paramiko.SSHClient()
-        sshs.set_missing_host_key_policy(paramiko.AutoAddPolicy())  # nosec B507 only connects to local VM
+        sshs.set_missing_host_key_policy(paramiko.AutoAddPolicy())
         sshs.connect(sshinfo['hostname'], username=sshinfo['user'],
                      port=sshinfo['port'], timeout=300,
                      look_for_keys=False, key_filename=sshinfo['idfile'])
@@ -127,9 +110,9 @@ def build_server(app, build, vcs, build_dir, output_dir, log_dir, force):
         # Put all the necessary files in place...
         ftp.chdir(homedir)
 
+        # Helper to copy the contents of a directory to the server...
         def send_dir(path):
-            """Copy the contents of a directory to the server."""
-            logging.debug("rsyncing %s to %s" % (path, ftp.getcwd()))
+            logging.debug("rsyncing " + path + " to " + ftp.getcwd())
             # TODO this should move to `vagrant rsync` from >= v1.5
             try:
                 subprocess.check_output(['rsync', '--recursive', '--perms', '--links', '--quiet', '--rsh='
@@ -144,14 +127,16 @@ def build_server(app, build, vcs, build_dir, output_dir, log_dir, force):
                                          sshinfo['user'] + "@" + sshinfo['hostname'] + ":" + ftp.getcwd()],
                                         stderr=subprocess.STDOUT)
             except subprocess.CalledProcessError as e:
-                raise FDroidException(str(e), e.output.decode()) from e
+                raise FDroidException(str(e), e.output.decode())
 
         logging.info("Preparing server for build...")
         serverpath = os.path.abspath(os.path.dirname(__file__))
         ftp.mkdir('fdroidserver')
         ftp.chdir('fdroidserver')
         ftp.put(os.path.join(serverpath, '..', 'fdroid'), 'fdroid')
+        ftp.put(os.path.join(serverpath, '..', 'gradlew-fdroid'), 'gradlew-fdroid')
         ftp.chmod('fdroid', 0o755)  # nosec B103 permissions are appropriate
+        ftp.chmod('gradlew-fdroid', 0o755)  # nosec B103 permissions are appropriate
         send_dir(os.path.join(serverpath))
         ftp.chdir(homedir)
 
@@ -234,55 +219,51 @@ def build_server(app, build, vcs, build_dir, output_dir, log_dir, force):
 
         # Execute the build script...
         logging.info("Starting build...")
-        ssh_channel = sshs.get_transport().open_session()
-        ssh_channel.get_pty()
+        chan = sshs.get_transport().open_session()
+        chan.get_pty()
         cmdline = posixpath.join(homedir, 'fdroidserver', 'fdroid')
         cmdline += ' build --on-server'
         if force:
             cmdline += ' --force --test'
         if options.verbose:
             cmdline += ' --verbose'
-        if options.refresh_scanner or config.get('refresh_scanner'):
-            cmdline += ' --refresh-scanner'
         if options.skipscan:
             cmdline += ' --skip-scan'
         if options.notarball:
             cmdline += ' --no-tarball'
-        if (options.scan_binary or config.get('scan_binary')) and not options.skipscan:
-            cmdline += ' --scan-binary'
         cmdline += " %s:%s" % (app.id, build.versionCode)
-        ssh_channel.exec_command('bash --login -c "' + cmdline + '"')  # nosec B601 inputs are sanitized
+        chan.exec_command('bash --login -c "' + cmdline + '"')  # nosec B601 inputs are sanitized
 
         # Fetch build process output ...
         try:
-            cmd_stdout = ssh_channel.makefile('rb', 1024)
+            cmd_stdout = chan.makefile('rb', 1024)
             output = bytes()
-            output += common.get_android_tools_version_log().encode()
-            while not ssh_channel.exit_status_ready():
+            output += common.get_android_tools_version_log(build.ndk_path()).encode()
+            while not chan.exit_status_ready():
                 line = cmd_stdout.readline()
                 if line:
                     if options.verbose:
-                        logging.debug("buildserver > " + str(line, 'utf-8', 'replace').rstrip())
+                        logging.debug("buildserver > " + str(line, 'utf-8').rstrip())
                     output += line
                 else:
                     time.sleep(0.05)
             for line in cmd_stdout.readlines():
                 if options.verbose:
-                    logging.debug("buildserver > " + str(line, 'utf-8', 'replace').rstrip())
+                    logging.debug("buildserver > " + str(line, 'utf-8').rstrip())
                 output += line
         finally:
             cmd_stdout.close()
 
         # Check build process exit status ...
         logging.info("...getting exit status")
-        returncode = ssh_channel.recv_exit_status()
+        returncode = chan.recv_exit_status()
         if returncode != 0:
             if timeout_event.is_set():
                 message = "Timeout exceeded! Build VM force-stopped for {0}:{1}"
             else:
                 message = "Build.py failed on server for {0}:{1}"
             raise BuildException(message.format(app.id, build.versionName),
-                                 str(output, 'utf-8', 'replace'))
+                                 None if options.verbose else str(output, 'utf-8'))
 
         # Retreive logs...
         toolsversion_log = common.get_toolsversion_logname(app, build)
@@ -300,15 +281,15 @@ def build_server(app, build, vcs, build_dir, output_dir, log_dir, force):
         else:
             ftp.chdir(posixpath.join(homedir, 'unsigned'))
         apkfile = common.get_release_filename(app, build)
-        tarball = common.get_src_tarball_name(app.id, build.versionCode)
+        tarball = common.getsrcname(app, build)
         try:
             ftp.get(apkfile, os.path.join(output_dir, apkfile))
             if not options.notarball:
                 ftp.get(tarball, os.path.join(output_dir, tarball))
-        except Exception as exc:
+        except Exception:
             raise BuildException(
                 "Build failed for {0}:{1} - missing output files".format(
-                    app.id, build.versionName), str(output, 'utf-8', 'replace')) from exc
+                    app.id, build.versionName), None if options.verbose else str(output, 'utf-8'))
         ftp.close()
 
     finally:
@@ -326,15 +307,6 @@ def build_server(app, build, vcs, build_dir, output_dir, log_dir, force):
 
 
 def force_gradle_build_tools(build_dir, build_tools):
-    """Manipulate build tools version used in top level gradle file.
-
-    Parameters
-    ----------
-    build_dir
-        The directory to start looking for gradle files.
-    build_tools
-        The build tools version that should be forced to use.
-    """
     for root, dirs, files in os.walk(build_dir):
         for filename in files:
             if not filename.endswith('.gradle'):
@@ -349,7 +321,7 @@ def force_gradle_build_tools(build_dir, build_tools):
 
 
 def transform_first_char(string, method):
-    """Use method() on the first character of string."""
+    """Uses method() on the first character of string."""
     if len(string) == 0:
         return string
     if len(string) == 1:
@@ -357,36 +329,16 @@ def transform_first_char(string, method):
     return method(string[0]) + string[1:]
 
 
+def add_failed_builds_entry(failed_builds, appid, build, entry):
+    failed_builds.append([appid, int(build.versionCode), str(entry)])
+
+
 def get_metadata_from_apk(app, build, apkfile):
-    """Get the required metadata from the built APK.
+    """get the required metadata from the built APK
 
-    VersionName is allowed to be a blank string, i.e. ''
-
-    Parameters
-    ----------
-    app
-        The app metadata used to build the APK.
-    build
-        The build that resulted in the APK.
-    apkfile
-        The path of the APK file.
-
-    Returns
-    -------
-    versionCode
-        The versionCode from the APK or from the metadata is build.novcheck is
-        set.
-    versionName
-        The versionName from the APK or from the metadata is build.novcheck is
-        set.
-
-    Raises
-    ------
-    :exc:`~fdroidserver.exception.BuildException`
-        If native code should have been built but was not packaged, no version
-        information or no package ID could be found or there is a mismatch
-        between the package ID in the metadata and the one found in the APK.
+    versionName is allowed to be a blank string, i.e. ''
     """
+
     appid, versionCode, versionName = common.get_apk_id(apkfile)
     native_code = common.get_native_code(apkfile)
 
@@ -406,74 +358,22 @@ def get_metadata_from_apk(app, build, apkfile):
 
 
 def build_local(app, build, vcs, build_dir, output_dir, log_dir, srclib_dir, extlib_dir, tmp_dir, force, onserver, refresh):
-    """Do a build locally.
-
-    Parameters
-    ----------
-    app
-        The metadata of the app to build.
-    build
-        The build of the app to build.
-    vcs
-        The version control system controller object of the app.
-    build_dir
-        The local source-code checkout directory of the app.
-    output_dir
-        The target folder for the build result.
-    log_dir
-        The directory in the VM where the build logs are getting stored.
-    srclib_dir
-        The path to the srclibs directory, usually 'build/srclib'.
-    extlib_dir
-        The path to the extlibs directory, usually 'build/extlib'.
-    tmp_dir
-        The temporary directory for building the source tarball.
-    force
-        Don't refresh the already cloned repository and make the build stop on
-        exceptions.
-    onserver
-        Assume the build is happening inside the VM.
-    refresh
-        Enable fetching the latest refs from the VCS remote.
-
-    Raises
-    ------
-    :exc:`~fdroidserver.exception.BuildException`
-        If running a `sudo` command failed, locking the root account failed,
-        `sudo` couldn't be removed, cleaning the build environment failed,
-        skipping the scanning has been requested but `scandelete` is present,
-        errors occurred during scanning, running the `build` commands from the
-        metadata failed, building native code failed, building with the
-        specified build method failed, no output could be found with build
-        method `maven`, more or less than one APK were found with build method
-        `gradle`, less or more than one APKs match the `output` glob specified
-        in the metadata, running a `postbuild` command specified in the
-        metadata failed, the built APK is debuggable, the unsigned APK is not
-        at the expected location, the APK does not contain the expected
-        `versionName` and `versionCode` or undesired package names have been
-        found in the APK.
-    :exc:`~fdroidserver.exception.FDroidException`
-        If no Android NDK version could be found and the build isn't run in a
-        builder VM, the selected Android NDK is not a directory.
-    """
+    """Do a build locally."""
     ndk_path = build.ndk_path()
     if build.ndk or (build.buildjni and build.buildjni != ['no']):
         if not ndk_path:
-            logging.warning("Android NDK version '%s' could not be found!" % build.ndk)
-            logging.warning("Configured versions:")
+            logging.critical("Android NDK version '%s' could not be found!" % build.ndk or 'r12b')
+            logging.critical("Configured versions:")
             for k, v in config['ndk_paths'].items():
                 if k.endswith("_orig"):
                     continue
-                logging.warning("  %s: %s" % (k, v))
-            if onserver:
-                common.auto_install_ndk(build)
-            else:
-                raise FDroidException()
+                logging.critical("  %s: %s" % (k, v))
+            raise FDroidException()
         elif not os.path.isdir(ndk_path):
             logging.critical("Android NDK '%s' is not a directory!" % ndk_path)
             raise FDroidException()
 
-    common.set_FDroidPopen_env(app, build)
+    common.set_FDroidPopen_env(build)
 
     # create ..._toolsversion.log when running in builder vm
     if onserver:
@@ -482,7 +382,7 @@ def build_local(app, build, vcs, build_dir, output_dir, log_dir, srclib_dir, ext
             logging.info("Running 'sudo' commands in %s" % os.getcwd())
 
             p = FDroidPopen(['sudo', 'DEBIAN_FRONTEND=noninteractive',
-                             'bash', '-e', '-u', '-o', 'pipefail', '-x', '-c', '; '.join(build.sudo)])
+                             'bash', '-x', '-c', build.sudo])
             if p.returncode != 0:
                 raise BuildException("Error running sudo command for %s:%s" %
                                      (app.id, build.versionName), p.output)
@@ -500,7 +400,7 @@ def build_local(app, build, vcs, build_dir, output_dir, log_dir, srclib_dir, ext
         log_path = os.path.join(log_dir,
                                 common.get_toolsversion_logname(app, build))
         with open(log_path, 'w') as f:
-            f.write(common.get_android_tools_version_log())
+            f.write(common.get_android_tools_version_log(build.ndk_path()))
     else:
         if build.sudo:
             logging.warning('%s:%s runs this on the buildserver with sudo:\n\t%s\nThese commands were skipped because fdroid build is not running on a dedicated build server.'
@@ -535,13 +435,13 @@ def build_local(app, build, vcs, build_dir, output_dir, log_dir, srclib_dir, ext
         if build.preassemble:
             gradletasks += build.preassemble
 
-        flavors = build.gradle
-        if flavors == ['yes']:
-            flavors = []
+        flavours = build.gradle
+        if flavours == ['yes']:
+            flavours = []
 
-        flavors_cmd = ''.join([transform_first_char(flav, str.upper) for flav in flavors])
+        flavours_cmd = ''.join([transform_first_char(flav, str.upper) for flav in flavours])
 
-        gradletasks += ['assemble' + flavors_cmd + 'Release']
+        gradletasks += ['assemble' + flavours_cmd + 'Release']
 
         cmd = [config['gradle']]
         if build.gradleprops:
@@ -550,6 +450,9 @@ def build_local(app, build, vcs, build_dir, output_dir, log_dir, srclib_dir, ext
         cmd += ['clean']
         p = FDroidPopen(cmd, cwd=root_dir, envs={"GRADLE_VERSION_DIR": config['gradle_version_dir'], "CACHEDIR": config['cachedir']})
 
+    elif bmethod == 'buildozer':
+        pass
+
     elif bmethod == 'ant':
         logging.info("Cleaning Ant project...")
         p = FDroidPopen(['ant', 'clean'], cwd=root_dir)
@@ -613,7 +516,7 @@ def build_local(app, build, vcs, build_dir, output_dir, log_dir, srclib_dir, ext
     if not options.notarball:
         # Build the source tarball right before we build the release...
         logging.info("Creating source tarball...")
-        tarname = common.get_src_tarball_name(app.id, build.versionCode)
+        tarname = common.getsrcname(app, build)
         tarball = tarfile.open(os.path.join(tmp_dir, tarname), "w:gz")
 
         def tarexc(t):
@@ -624,13 +527,13 @@ def build_local(app, build, vcs, build_dir, output_dir, log_dir, srclib_dir, ext
     # Run a build command if one is required...
     if build.build:
         logging.info("Running 'build' commands in %s" % root_dir)
-        cmd = common.replace_config_vars("; ".join(build.build), build)
+        cmd = common.replace_config_vars(build.build, build)
 
         # Substitute source library paths into commands...
         for name, number, libpath in srclibpaths:
             cmd = cmd.replace('$$' + name + '$$', os.path.join(os.getcwd(), libpath))
 
-        p = FDroidPopen(['bash', '-e', '-u', '-o', 'pipefail', '-x', '-c', cmd], cwd=root_dir)
+        p = FDroidPopen(['bash', '-x', '-c', cmd], cwd=root_dir)
 
         if p.returncode != 0:
             raise BuildException("Error running build command for %s:%s" %
@@ -692,6 +595,73 @@ def build_local(app, build, vcs, build_dir, output_dir, log_dir, srclib_dir, ext
 
         bindir = os.path.join(root_dir, 'target')
 
+    elif bmethod == 'buildozer':
+        logging.info("Building Kivy project using buildozer...")
+
+        # parse buildozer.spez
+        spec = os.path.join(root_dir, 'buildozer.spec')
+        if not os.path.exists(spec):
+            raise BuildException("Expected to find buildozer-compatible spec at {0}"
+                                 .format(spec))
+        defaults = {'orientation': 'landscape', 'icon': '',
+                    'permissions': '', 'android.api': "19"}
+        bconfig = ConfigParser(defaults, allow_no_value=True)
+        bconfig.read(spec)
+
+        # update spec with sdk and ndk locations to prevent buildozer from
+        # downloading.
+        loc_ndk = common.env['ANDROID_NDK']
+        loc_sdk = common.env['ANDROID_SDK']
+        if loc_ndk == '$ANDROID_NDK':
+            loc_ndk = loc_sdk + '/ndk-bundle'
+
+        bc_ndk = None
+        bc_sdk = None
+        try:
+            bc_ndk = bconfig.get('app', 'android.sdk_path')
+        except Exception:
+            pass
+        try:
+            bc_sdk = bconfig.get('app', 'android.ndk_path')
+        except Exception:
+            pass
+
+        if bc_sdk is None:
+            bconfig.set('app', 'android.sdk_path', loc_sdk)
+        if bc_ndk is None:
+            bconfig.set('app', 'android.ndk_path', loc_ndk)
+
+        fspec = open(spec, 'w')
+        bconfig.write(fspec)
+        fspec.close()
+
+        logging.info("sdk_path = %s" % loc_sdk)
+        logging.info("ndk_path = %s" % loc_ndk)
+
+        p = None
+        # execute buildozer
+        cmd = ['buildozer', 'android', 'release']
+        try:
+            p = FDroidPopen(cmd, cwd=root_dir)
+        except Exception:
+            pass
+
+        # buidozer not installed ? clone repo and run
+        if (p is None or p.returncode != 0):
+            cmd = ['git', 'clone', 'https://github.com/kivy/buildozer.git']
+            p = subprocess.Popen(cmd, cwd=root_dir, shell=False)
+            p.wait()
+            if p.returncode != 0:
+                raise BuildException("Distribute build failed")
+
+            cmd = ['python', 'buildozer/buildozer/scripts/client.py', 'android', 'release']
+            p = FDroidPopen(cmd, cwd=root_dir)
+
+        # expected to fail.
+        # Signing will fail if not set by environnment vars (cf. p4a docs).
+        # But the unsigned apk will be ok.
+        p.returncode = 0
+
     elif bmethod == 'gradle':
         logging.info("Building Gradle project...")
 
@@ -714,16 +684,9 @@ def build_local(app, build, vcs, build_dir, output_dir, log_dir, srclib_dir, ext
 
         bindir = os.path.join(root_dir, 'bin')
 
-    if os.path.isdir(os.path.join(build_dir, '.git')):
-        commit_id = str(common.get_head_commit_id(build_dir))
-    else:
-        commit_id = build.commit
-
     if p is not None and p.returncode != 0:
-        raise BuildException("Build failed for %s:%s@%s" % (app.id, build.versionName, commit_id),
-                             p.output)
-    logging.info("Successfully built version {versionName} of {appid} from {commit_id}"
-                 .format(versionName=build.versionName, appid=app.id, commit_id=commit_id))
+        raise BuildException("Build failed for %s:%s" % (app.id, build.versionName), p.output)
+    logging.info("Successfully built version " + build.versionName + ' of ' + app.id)
 
     omethod = build.output_method()
     if omethod == 'maven':
@@ -747,6 +710,26 @@ def build_local(app, build, vcs, build_dir, output_dir, log_dir, srclib_dir, ext
         src = m.group(1)
         src = os.path.join(bindir, src) + '.apk'
 
+    elif omethod == 'buildozer':
+        src = None
+        for apks_dir in [
+                os.path.join(root_dir, '.buildozer', 'android', 'platform', 'build', 'dists', bconfig.get('app', 'title'), 'bin'),
+                ]:
+            for apkglob in ['*-release-unsigned.apk', '*-unsigned.apk', '*.apk']:
+                apks = glob.glob(os.path.join(apks_dir, apkglob))
+
+                if len(apks) > 1:
+                    raise BuildException('More than one resulting apks found in %s' % apks_dir,
+                                         '\n'.join(apks))
+                if len(apks) == 1:
+                    src = apks[0]
+                    break
+            if src is not None:
+                break
+
+        if src is None:
+            raise BuildException('Failed to find any output apks')
+
     elif omethod == 'gradle':
         src = None
         apk_dirs = [
@@ -757,11 +740,11 @@ def build_local(app, build, vcs, build_dir, output_dir, log_dir, srclib_dir, ext
             # really old path
             os.path.join(root_dir, 'build', 'apk'),
             ]
-        # If we build with gradle flavors with gradle plugin >= 3.0 the APK will be in
-        # a subdirectory corresponding to the flavor command used, but with different
+        # If we build with gradle flavours with gradle plugin >= 3.0 the apk will be in
+        # a subdirectory corresponding to the flavour command used, but with different
         # capitalization.
-        if flavors_cmd:
-            apk_dirs.append(os.path.join(root_dir, 'build', 'outputs', 'apk', transform_first_char(flavors_cmd, str.lower), 'release'))
+        if flavours_cmd:
+            apk_dirs.append(os.path.join(root_dir, 'build', 'outputs', 'apk', transform_first_char(flavours_cmd, str.lower), 'release'))
         for apks_dir in apk_dirs:
             for apkglob in ['*-release-unsigned.apk', '*-unsigned.apk', '*.apk']:
                 apks = glob.glob(os.path.join(apks_dir, apkglob))
@@ -794,55 +777,31 @@ def build_local(app, build, vcs, build_dir, output_dir, log_dir, srclib_dir, ext
             raise BuildException('No apks match %s' % globpath)
         src = os.path.normpath(apks[0])
 
-    # Run a postbuild command if one is required...
-    if build.postbuild:
-        logging.info(f"Running 'postbuild' commands in {root_dir}")
-        cmd = common.replace_config_vars("; ".join(build.postbuild), build)
-
-        # Substitute source library paths into commands...
-        for name, number, libpath in srclibpaths:
-            cmd = cmd.replace(f"$${name}$$", str(Path.cwd() / libpath))
-
-        cmd = cmd.replace('$$OUT$$', str(Path(src).resolve()))
-
-        p = FDroidPopen(['bash', '-e', '-u', '-o', 'pipefail', '-x', '-c', cmd], cwd=root_dir)
-
-        if p.returncode != 0:
-            raise BuildException("Error running postbuild command for "
-                                 f"{app.id}:{build.versionName}", p.output)
-
     # Make sure it's not debuggable...
-    if common.is_debuggable_or_testOnly(src):
-        raise BuildException(
-            "%s: debuggable or testOnly set in AndroidManifest.xml" % src
-        )
+    if common.is_apk_and_debuggable(src):
+        raise BuildException("APK is debuggable")
 
     # By way of a sanity check, make sure the version and version
-    # code in our new APK match what we expect...
+    # code in our new apk match what we expect...
     logging.debug("Checking " + src)
     if not os.path.exists(src):
-        raise BuildException("Unsigned APK is not at expected location of " + src)
+        raise BuildException("Unsigned apk is not at expected location of " + src)
 
     if common.get_file_extension(src) == 'apk':
         vercode, version = get_metadata_from_apk(app, build, src)
         if version != build.versionName or vercode != build.versionCode:
             raise BuildException(("Unexpected version/version code in output;"
-                                  " APK: '%s' / '%d', "
-                                  " Expected: '%s' / '%d'")
-                                 % (version, vercode, build.versionName,
-                                    build.versionCode))
+                                  " APK: '%s' / '%s', "
+                                  " Expected: '%s' / '%s'")
+                                 % (version, str(vercode), build.versionName,
+                                    str(build.versionCode)))
         if (options.scan_binary or config.get('scan_binary')) and not options.skipscan:
             if scanner.scan_binary(src):
-                raise BuildException("Found blocklisted packages in final apk!")
+                raise BuildException("Found blacklisted packages in final apk!")
 
-    # Copy the unsigned APK to our destination directory for further
+    # Copy the unsigned apk to our destination directory for further
     # processing (by publish.py)...
-    dest = os.path.join(
-        output_dir,
-        common.get_release_filename(
-            app, build, common.get_file_extension(src)
-        )
-    )
+    dest = os.path.join(output_dir, common.get_release_filename(app, build))
     shutil.copyfile(src, dest)
 
     # Move the source tarball into the output directory...
@@ -854,53 +813,23 @@ def build_local(app, build, vcs, build_dir, output_dir, log_dir, srclib_dir, ext
 def trybuild(app, build, build_dir, output_dir, log_dir, also_check_dir,
              srclib_dir, extlib_dir, tmp_dir, repo_dir, vcs, test,
              server, force, onserver, refresh):
-    """Build a particular version of an application, if it needs building.
-
-    Parameters
-    ----------
-    app
-        The metadata of the app to build.
-    build
-        The build of the app to build.
-    build_dir
-        The local source-code checkout directory of the app.
-    output_dir
-        The directory where the build output will go.  Usually this is the
-        'unsigned' directory.
-    log_dir
-        The directory in the VM where the build logs are getting stored.
-    also_check_dir
-        An additional location for checking if the build is necessary (usually
-        the archive repo).
-    srclib_dir
-        The path to the srclibs directory, usually 'build/srclib'.
-    extlib_dir
-        The path to the extlibs directory, usually 'build/extlib'.
-    tmp_dir
-        The temporary directory for building the source tarball of the app to
-        build.
-    repo_dir
-        The repo directory - used for checking if the build is necessary.
-    vcs
-        The version control system controller object of the app to build.
-    test
-        True if building in test mode, in which case the build will always
-        happen, even if the output already exists.  In test mode, the output
-        directory should be a temporary location, not any of the real ones.
-    server
-        Use buildserver VM for building.
-    force
-        Build app regardless of disabled state or scanner errors.
-    onserver
-        Assume the build is happening inside the VM.
-    refresh
-        Enable fetching the latest refs from the VCS remote.
-
-    Returns
-    -------
-    status
-        True if the build was done, False if it wasn't necessary.
     """
+    Build a particular version of an application, if it needs building.
+
+    :param output_dir: The directory where the build output will go. Usually
+       this is the 'unsigned' directory.
+    :param repo_dir: The repo directory - used for checking if the build is
+       necessary.
+    :param also_check_dir: An additional location for checking if the build
+       is necessary (usually the archive repo)
+    :param test: True if building in test mode, in which case the build will
+       always happen, even if the output already exists. In test mode, the
+       output directory should be a temporary location, not any of the real
+       ones.
+
+    :returns: True if the build was done, False if it wasn't necessary.
+    """
+
     dest_file = common.get_release_filename(app, build)
 
     dest = os.path.join(output_dir, dest_file)
@@ -926,10 +855,6 @@ def trybuild(app, build, build_dir, output_dir, log_dir, also_check_dir,
         # grabbing the source now.
         vcs.gotorevision(build.commit, refresh)
 
-        # Initialise submodules if required
-        if build.submodules:
-            vcs.initsubmodules()
-
         build_server(app, build, vcs, build_dir, output_dir, log_dir, force)
     else:
         build_local(app, build, vcs, build_dir, output_dir, log_dir, srclib_dir, extlib_dir, tmp_dir, force, onserver, refresh)
@@ -937,40 +862,16 @@ def trybuild(app, build, build_dir, output_dir, log_dir, also_check_dir,
 
 
 def force_halt_build(timeout):
-    """Halt the currently running Vagrant VM, to be called from a Timer.
-
-    Parameters
-    ----------
-    timeout
-        The timeout in seconds.
-    """
+    """Halt the currently running Vagrant VM, to be called from a Timer"""
     logging.error(_('Force halting build after {0} sec timeout!').format(timeout))
     timeout_event.set()
-    if ssh_channel:
-        ssh_channel.close()
     vm = vmtools.get_build_vm('builder')
-    vm.destroy()
-
-
-def keep_when_not_allowed():
-    """Control if APKs signed by keys not in AllowedAPKSigningKeys are removed."""
-    return (
-        (options is not None and options.keep_when_not_allowed)
-        or (config is not None and config.get('keep_when_not_allowed'))
-        or common.default_config['keep_when_not_allowed']
-    )
+    vm.halt()
 
 
 def parse_commandline():
-    """Parse the command line.
+    """Parse the command line. Returns options, parser."""
 
-    Returns
-    -------
-    options
-        The resulting options parsed from the command line arguments.
-    parser
-        The argument parser.
-    """
     parser = argparse.ArgumentParser(usage="%(prog)s [options] [APPID[:VERCODE] [APPID[:VERCODE] ...]]")
     common.setup_global_opts(parser)
     parser.add_argument("appid", nargs='*', help=_("application ID with optional versionCode in the form APPID[:VERCODE]"))
@@ -982,6 +883,8 @@ def parse_commandline():
                         help=_("Test mode - put output in the tmp directory only, and always build, even if the output already exists."))
     parser.add_argument("--server", action="store_true", default=False,
                         help=_("Use build server"))
+    parser.add_argument("--reset-server", action="store_true", default=False,
+                        help=_("Reset and create a brand new build server, even if the existing one appears to be ok."))
     # this option is internal API for telling fdroid that
     # it's running inside a buildserver vm.
     parser.add_argument("--on-server", dest="onserver", action="store_true", default=False,
@@ -994,18 +897,14 @@ def parse_commandline():
                         help=_("Don't create a source tarball, useful when testing a build"))
     parser.add_argument("--no-refresh", dest="refresh", action="store_false", default=True,
                         help=_("Don't refresh the repository, useful when testing a build with no internet connection"))
-    parser.add_argument("-r", "--refresh-scanner", dest="refresh_scanner", action="store_true", default=False,
-                        help=_("Refresh and cache scanner rules and signatures from the network"))
     parser.add_argument("-f", "--force", action="store_true", default=False,
                         help=_("Force build of disabled apps, and carries on regardless of scan problems. Only allowed in test mode."))
     parser.add_argument("-a", "--all", action="store_true", default=False,
                         help=_("Build all applications available"))
-    parser.add_argument("--keep-when-not-allowed", default=False, action="store_true",
-                        help=argparse.SUPPRESS)
     parser.add_argument("-w", "--wiki", default=False, action="store_true",
-                        help=argparse.SUPPRESS)
+                        help=_("Update the wiki"))
     metadata.add_metadata_arguments(parser)
-    options = common.parse_args(parser)
+    options = parser.parse_args()
     metadata.warnings_action = options.W
 
     # Force --stop with --on-server to get correct exit code
@@ -1020,6 +919,7 @@ def parse_commandline():
 
 options = None
 config = None
+buildserverid = None
 fdroidserverid = None
 start_timestamp = time.gmtime()
 status_output = None
@@ -1027,22 +927,7 @@ timeout_event = threading.Event()
 
 
 def main():
-    """Build a package from source.
 
-    The behaviour of this function is influenced by the configuration file as
-    well as command line parameters.
-
-    Raises
-    ------
-    :exc:`~fdroidserver.exception.FDroidException`
-        If more than one local metadata file has been found, no app metadata
-        has been found, there are no apps to process, downloading binaries for
-        checking the reproducibility of a built binary failed, the built binary
-        is different from supplied reference binary, the reference binary is
-        signed with a different signing key than expected, a VCS error occured
-        while building an app or a different error occured while building an
-        app.
-    """
     global options, config, buildserverid, fdroidserverid
 
     options, parser = parse_commandline()
@@ -1067,10 +952,18 @@ def main():
         if not options.appid and not options.all:
             parser.error("option %s: If you really want to build all the apps, use --all" % "all")
 
-    config = common.read_config()
+    config = common.read_config(options)
 
     if config['build_server_always']:
         options.server = True
+    if options.reset_server and not options.server:
+        parser.error("option %s: Using --reset-server without --server makes no sense" % "reset-server")
+
+    if options.onserver or not options.server:
+        for d in ['build-tools', 'platform-tools', 'tools']:
+            if not os.path.isdir(os.path.join(config['sdk_path'], d)):
+                raise FDroidException(_("Android SDK '{path}' does not have '{dirname}' installed!")
+                                      .format(path=config['sdk_path'], dirname=d))
 
     log_dir = 'logs'
     if not os.path.isdir(log_dir):
@@ -1110,57 +1003,58 @@ def main():
     srclib_dir = os.path.join(build_dir, 'srclib')
     extlib_dir = os.path.join(build_dir, 'extlib')
 
-    apps = common.read_app_args(options.appid, allow_version_codes=True, sort_by_time=True)
+    # Read all app and srclib metadata
+    pkgs = common.read_pkg_args(options.appid, True)
+    allapps = metadata.read_metadata(pkgs, options.refresh, sort_by_time=True)
+    apps = common.read_app_args(options.appid, allapps, True)
 
     for appid, app in list(apps.items()):
-        if (app.get('Disabled') and not options.force) or not app.get('RepoType') or not app.get('Builds', []):
+        if (app.Disabled and not options.force) or not app.RepoType or not app.builds:
             del apps[appid]
 
     if not apps:
         raise FDroidException("No apps to process.")
 
     # make sure enough open files are allowed to process everything
-    try:
-        import resource  # not available on Windows
-
-        soft, hard = resource.getrlimit(resource.RLIMIT_NOFILE)
-        if len(apps) > soft:
-            try:
-                soft = len(apps) * 2
-                if soft > hard:
-                    soft = hard
-                resource.setrlimit(resource.RLIMIT_NOFILE, (soft, hard))
-                logging.debug(_('Set open file limit to {integer}')
-                              .format(integer=soft))
-            except (OSError, ValueError) as e:
-                logging.warning(_('Setting open file limit failed: ') + str(e))
-    except ImportError:
-        pass
+    soft, hard = resource.getrlimit(resource.RLIMIT_NOFILE)
+    if len(apps) > soft:
+        try:
+            soft = len(apps) * 2
+            if soft > hard:
+                soft = hard
+            resource.setrlimit(resource.RLIMIT_NOFILE, (soft, hard))
+            logging.debug(_('Set open file limit to {integer}')
+                          .format(integer=soft))
+        except (OSError, ValueError) as e:
+            logging.warning(_('Setting open file limit failed: ') + str(e))
 
     if options.latest:
         for app in apps.values():
-            for build in reversed(app.get('Builds', [])):
+            for build in reversed(app.builds):
                 if build.disable and not options.force:
                     continue
-                app['Builds'] = [build]
+                app.builds = [build]
                 break
 
-    if not options.onserver:
-        common.write_running_status_json(status_output)
+    if options.wiki:
+        import mwclient
+        site = mwclient.Site((config['wiki_protocol'], config['wiki_server']),
+                             path=config['wiki_path'])
+        site.login(config['wiki_user'], config['wiki_password'])
 
     # Build applications...
     failed_builds = []
-    build_succeeded_ids = []
+    build_succeeded = []
     status_output['failedBuilds'] = failed_builds
-    status_output['successfulBuildIds'] = build_succeeded_ids
-    # Only build for 72 hours, then stop gracefully.
-    endtime = time.time() + 72 * 60 * 60
+    status_output['successfulBuilds'] = build_succeeded
+    # Only build for 36 hours, then stop gracefully.
+    endtime = time.time() + 36 * 60 * 60
     max_build_time_reached = False
     for appid, app in apps.items():
 
         first = True
 
-        for build in app.get('Builds', []):
+        for build in app.builds:
             if time.time() > endtime:
                 max_build_time_reached = True
                 break
@@ -1169,7 +1063,7 @@ def main():
             if build.timeout is None:
                 timeout = 7200
             else:
-                timeout = build.timeout
+                timeout = int(build.timeout)
             if options.server and timeout > 0:
                 logging.debug(_('Setting {0} sec timeout for this build').format(timeout))
                 timer = threading.Timer(timeout, force_halt_build, [timeout])
@@ -1178,7 +1072,12 @@ def main():
             else:
                 timer = None
 
+            wikilog = None
+            build_starttime = common.get_wiki_timestamp()
             tools_version_log = ''
+            if not options.onserver:
+                tools_version_log = common.get_android_tools_version_log(build.ndk_path())
+                common.write_running_status_json(status_output)
             try:
 
                 # For the first build of a particular app, we need to set up
@@ -1188,7 +1087,8 @@ def main():
                     vcs, build_dir = common.setup_vcs(app)
                     first = False
 
-                logging.debug("Checking %s:%s" % (appid, build.versionCode))
+                logging.info("Using %s" % vcs.clientversion())
+                logging.debug("Checking " + build.versionName)
                 if trybuild(app, build, build_dir, output_dir, log_dir,
                             also_check_dir, srclib_dir, extlib_dir,
                             tmp_dir, repo_dir, vcs, options.test,
@@ -1201,9 +1101,9 @@ def main():
                             tools_version_log = ''.join(f.readlines())
                         os.remove(toolslog)
 
-                    if url := build.binary or app.Binaries:
+                    if app.Binaries is not None:
                         # This is an app where we build from source, and
-                        # verify the APK contents against a developer's
+                        # verify the apk contents against a developer's
                         # binary. We get that binary now, and save it
                         # alongside our built one in the 'unsigend'
                         # directory.
@@ -1213,10 +1113,11 @@ def main():
                                          "developer supplied reference "
                                          "binaries: '{path}'"
                                          .format(path=binaries_dir))
+                        url = app.Binaries
                         url = url.replace('%v', build.versionName)
                         url = url.replace('%c', str(build.versionCode))
                         logging.info("...retrieving " + url)
-                        of = re.sub(r'\.apk$', '.binary.apk', common.get_release_filename(app, build))
+                        of = re.sub(r'.apk$', '.binary.apk', common.get_release_filename(app, build))
                         of = os.path.join(binaries_dir, of)
                         try:
                             net.download_file(url, local_filename=of)
@@ -1236,12 +1137,8 @@ def main():
                             compare_result = \
                                 common.verify_apks(of, unsigned_apk, tmpdir)
                             if compare_result:
-                                if options.test:
-                                    logging.warning(_('Keeping failed build "{apkfilename}"')
-                                                    .format(apkfilename=unsigned_apk))
-                                else:
-                                    logging.debug('removing %s', unsigned_apk)
-                                    os.remove(unsigned_apk)
+                                logging.debug('removing %s', unsigned_apk)
+                                os.remove(unsigned_apk)
                                 logging.debug('removing %s', of)
                                 os.remove(of)
                                 compare_result = compare_result.split('\n')
@@ -1262,86 +1159,66 @@ def main():
                                              'supplied reference binary '
                                              'successfully')
 
-                            used_key = common.apk_signer_fingerprint(of)
-                            expected_keys = app['AllowedAPKSigningKeys']
-                            if used_key is None:
-                                logging.warn(_('reference binary missing '
-                                               'signature'))
-                            elif len(expected_keys) == 0:
-                                logging.warn(_('AllowedAPKSigningKeys missing '
-                                               'but reference binary supplied'))
-                            elif used_key not in expected_keys:
-                                if options.test or keep_when_not_allowed():
-                                    logging.warning(_('Keeping failed build "{apkfilename}"')
-                                                    .format(apkfilename=unsigned_apk))
-                                else:
-                                    logging.debug('removing %s', unsigned_apk)
-                                    os.remove(unsigned_apk)
-                                logging.debug('removing %s', of)
-                                os.remove(of)
-                                raise FDroidException('supplied reference '
-                                                      'binary signed with '
-                                                      '{signer} instead of '
-                                                      'with {expected}'.
-                                                      format(signer=used_key,
-                                                             expected=expected_keys))
-                            else:
-                                logging.info(_('supplied reference binary has '
-                                               'allowed signer {signer}').
-                                             format(signer=used_key))
-
-                    build_succeeded_ids.append([app['id'], build.versionCode])
-
-                    if not options.onserver:
-                        common.write_running_status_json(status_output)
+                    build_succeeded.append(app)
+                    wikilog = "Build succeeded"
 
             except VCSException as vcse:
                 reason = str(vcse).split('\n', 1)[0] if options.verbose else str(vcse)
                 logging.error("VCS error while building app %s: %s" % (
                     appid, reason))
                 if options.stop:
-                    logging.debug("Error encountered, stopping by user request.")
+                    logging.debug("Error encoutered, stopping by user request.")
                     common.force_exit(1)
-                failed_builds.append((appid, build.versionCode))
-                common.deploy_build_log_with_rsync(
-                    appid, build.versionCode, "".join(traceback.format_exc())
-                )
-                if not options.onserver:
-                    common.write_running_status_json(status_output)
-
+                add_failed_builds_entry(failed_builds, appid, build, vcse)
+                wikilog = str(vcse)
             except FDroidException as e:
-                tstamp = time.strftime("%Y-%m-%d %H:%M:%SZ", time.gmtime())
                 with open(os.path.join(log_dir, appid + '.log'), 'a+') as f:
                     f.write('\n\n============================================================\n')
                     f.write('versionCode: %s\nversionName: %s\ncommit: %s\n' %
                             (build.versionCode, build.versionName, build.commit))
                     f.write('Build completed at '
-                            + tstamp + '\n')
+                            + common.get_wiki_timestamp() + '\n')
                     f.write('\n' + tools_version_log + '\n')
                     f.write(str(e))
                 logging.error("Could not build app %s: %s" % (appid, e))
                 if options.stop:
-                    logging.debug("Error encountered, stopping by user request.")
+                    logging.debug("Error encoutered, stopping by user request.")
                     common.force_exit(1)
-                failed_builds.append((appid, build.versionCode))
-                common.deploy_build_log_with_rsync(
-                    appid, build.versionCode, "".join(traceback.format_exc())
-                )
-                if not options.onserver:
-                    common.write_running_status_json(status_output)
-
-            except Exception:
+                add_failed_builds_entry(failed_builds, appid, build, e)
+                wikilog = e.get_wikitext()
+            except Exception as e:
                 logging.error("Could not build app %s due to unknown error: %s" % (
                     appid, traceback.format_exc()))
                 if options.stop:
-                    logging.debug("Error encountered, stopping by user request.")
+                    logging.debug("Error encoutered, stopping by user request.")
                     common.force_exit(1)
-                failed_builds.append((appid, build.versionCode))
-                common.deploy_build_log_with_rsync(
-                    appid, build.versionCode, "".join(traceback.format_exc())
-                )
-                if not options.onserver:
-                    common.write_running_status_json(status_output)
+                add_failed_builds_entry(failed_builds, appid, build, e)
+                wikilog = str(e)
+
+            if options.wiki and wikilog:
+                try:
+                    # Write a page with the last build log for this version code
+                    lastbuildpage = appid + '/lastbuild_' + build.versionCode
+                    newpage = site.Pages[lastbuildpage]
+                    with open(os.path.join('tmp', 'fdroidserverid')) as fp:
+                        fdroidserverid = fp.read().rstrip()
+                    txt = "* build session started at " + common.get_wiki_timestamp(start_timestamp) + '\n' \
+                          + "* this build started at " + build_starttime + '\n' \
+                          + "* this build completed at " + common.get_wiki_timestamp() + '\n' \
+                          + common.get_git_describe_link() \
+                          + '* fdroidserverid: [https://gitlab.com/fdroid/fdroidserver/commit/' \
+                          + fdroidserverid + ' ' + fdroidserverid + ']\n\n'
+                    if buildserverid:
+                        txt += '* buildserverid: [https://gitlab.com/fdroid/fdroidserver/commit/' \
+                               + buildserverid + ' ' + buildserverid + ']\n\n'
+                    txt += tools_version_log + '\n\n'
+                    txt += '== Build Log ==\n\n' + wikilog
+                    newpage.save(txt, summary='Build log')
+                    # Redirect from /lastbuild to the most recent build log
+                    newpage = site.Pages[appid + '/lastbuild']
+                    newpage.save('#REDIRECT [[' + lastbuildpage + ']]', summary='Update redirect')
+                except Exception as e:
+                    logging.error("Error while attempting to publish build log: %s" % e)
 
             if timer:
                 timer.cancel()  # kill the watchdog timer
@@ -1351,44 +1228,60 @@ def main():
             logging.info("Stopping after global build timeout...")
             break
 
-    for app in build_succeeded_ids:
-        logging.info("success: %s" % app[0])
+    for app in build_succeeded:
+        logging.info("success: %s" % (app.id))
 
     if not options.verbose:
         for fb in failed_builds:
-            logging.info('Build for app {}:{} failed'.format(*fb))
+            logging.info('Build for app {}:{} failed:\n{}'.format(*fb))
 
     logging.info(_("Finished"))
-    if len(build_succeeded_ids) > 0:
+    if len(build_succeeded) > 0:
         logging.info(ngettext("{} build succeeded",
-                              "{} builds succeeded", len(build_succeeded_ids)).format(len(build_succeeded_ids)))
+                              "{} builds succeeded", len(build_succeeded)).format(len(build_succeeded)))
     if len(failed_builds) > 0:
         logging.info(ngettext("{} build failed",
                               "{} builds failed", len(failed_builds)).format(len(failed_builds)))
 
-    if options.server:
+    if options.wiki:
+        wiki_page_path = 'build_' + time.strftime('%s', start_timestamp)
+        newpage = site.Pages[wiki_page_path]
+        txt = ''
+        txt += "* command line: <code>%s</code>\n" % ' '.join(sys.argv)
+        txt += "* started at %s\n" % common.get_wiki_timestamp(start_timestamp)
+        txt += "* completed at %s\n" % common.get_wiki_timestamp()
+        if buildserverid:
+            txt += ('* buildserverid: [https://gitlab.com/fdroid/fdroidserver/commit/{id} {id}]\n'
+                    .format(id=buildserverid))
+        if fdroidserverid:
+            txt += ('* fdroidserverid: [https://gitlab.com/fdroid/fdroidserver/commit/{id} {id}]\n'
+                    .format(id=fdroidserverid))
         if os.cpu_count():
-            status_output['hostOsCpuCount'] = os.cpu_count()
+            txt += "* host processors: %d\n" % os.cpu_count()
         if os.path.isfile('/proc/meminfo') and os.access('/proc/meminfo', os.R_OK):
             with open('/proc/meminfo') as fp:
                 for line in fp:
                     m = re.search(r'MemTotal:\s*([0-9].*)', line)
                     if m:
-                        status_output['hostProcMeminfoMemTotal'] = m.group(1)
+                        txt += "* host RAM: %s\n" % m.group(1)
                         break
-        buildserver_config = 'builder/Vagrantfile'
+        fdroid_path = os.path.realpath(os.path.join(os.path.dirname(__file__), '..'))
+        buildserver_config = os.path.join(fdroid_path, 'makebuildserver.config.py')
         if os.path.isfile(buildserver_config) and os.access(buildserver_config, os.R_OK):
             with open(buildserver_config) as configfile:
                 for line in configfile:
                     m = re.search(r'cpus\s*=\s*([0-9].*)', line)
                     if m:
-                        status_output['guestVagrantVmCpus'] = m.group(1)
+                        txt += "* guest processors: %s\n" % m.group(1)
                     m = re.search(r'memory\s*=\s*([0-9].*)', line)
                     if m:
-                        status_output['guestVagrantVmMemory'] = m.group(1)
-
-    if buildserverid:
-        status_output['buildserver'] = {'commitId': buildserverid}
+                        txt += "* guest RAM: %s MB\n" % m.group(1)
+        txt += "* successful builds: %d\n" % len(build_succeeded)
+        txt += "* failed builds: %d\n" % len(failed_builds)
+        txt += "\n\n"
+        newpage.save(txt, summary='Run log')
+        newpage = site.Pages['build']
+        newpage.save('#REDIRECT [[' + wiki_page_path + ']]', summary='Update redirect')
 
     if not options.onserver:
         common.write_status_json(status_output)
diff --git a/fdroidserver/checkupdates.py b/fdroidserver/checkupdates.py
index e7945910..604f4e1a 100644
--- a/fdroidserver/checkupdates.py
+++ b/fdroidserver/checkupdates.py
@@ -1,5 +1,4 @@
 #!/usr/bin/env python3
-"""Check for updates to applications."""
 #
 # checkupdates.py - part of the FDroid server tools
 # Copyright (C) 2010-2015, Ciaran Gultnieks, ciaran@ciarang.com
@@ -18,341 +17,307 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-import configparser
-import copy
-import logging
 import os
 import re
+import urllib.request
+import urllib.error
+import time
 import subprocess
 import sys
-import time
-import traceback
-import urllib.error
-import urllib.parse
-import urllib.request
 from argparse import ArgumentParser
-from pathlib import Path
-from typing import Optional
+import traceback
+import html
+from distutils.version import LooseVersion
+import logging
+import copy
+import urllib.parse
 
-import git
-
-from . import _, common, metadata, net
-from .exception import (
-    FDroidException,
-    MetaDataException,
-    NoSubmodulesException,
-    VCSException,
-)
-
-# https://gitlab.com/fdroid/checkupdates-runner/-/blob/1861899262a62a4ed08fa24e5449c0368dfb7617/.gitlab-ci.yml#L36
-BOT_EMAIL = 'fdroidci@bubu1.eu'
+from . import _
+from . import common
+from . import metadata
+from .exception import VCSException, NoSubmodulesException, FDroidException, MetaDataException
 
 
-def check_http(app: metadata.App) -> tuple[Optional[str], Optional[int]]:
-    """Check for a new version by looking at a document retrieved via HTTP.
+# Check for a new version by looking at a document retrieved via HTTP.
+# The app's Update Check Data field is used to provide the information
+# required.
+def check_http(app):
 
-    The app's UpdateCheckData field is used to provide the information
-    required.
+    ignoreversions = app.UpdateCheckIgnore
+    ignoresearch = re.compile(ignoreversions).search if ignoreversions else None
 
-    Parameters
-    ----------
-    app
-        The App instance to check for updates for.
+    try:
 
-    Returns
-    -------
-    version
-        The found versionName or None if the versionName should be ignored
-        according to UpdateCheckIgnore.
-    vercode
-        The found versionCode or None if the versionCode should be ignored
-        according to UpdateCheckIgnore.
+        if not app.UpdateCheckData:
+            raise FDroidException('Missing Update Check Data')
 
-    Raises
-    ------
-    :exc:`~fdroidserver.exception.FDroidException`
-        If UpdateCheckData is missing or is an invalid URL or if there is no
-        match for the provided versionName or versionCode regex.
-    """
-    if not app.UpdateCheckData:
-        raise FDroidException('Missing Update Check Data')
-
-    urlcode, codeex, urlver, verex = app.UpdateCheckData.split('|')
-    parsed = urllib.parse.urlparse(urlcode)
-    if not parsed.netloc or not parsed.scheme or parsed.scheme != 'https':
-        raise FDroidException(_('UpdateCheckData has invalid URL: {url}').format(url=urlcode))
-    if urlver != '.':
-        parsed = urllib.parse.urlparse(urlver)
+        urlcode, codeex, urlver, verex = app.UpdateCheckData.split('|')
+        parsed = urllib.parse.urlparse(urlcode)
         if not parsed.netloc or not parsed.scheme or parsed.scheme != 'https':
-            raise FDroidException(_('UpdateCheckData has invalid URL: {url}').format(url=urlver))
+            raise FDroidException(_('UpdateCheckData has invalid URL: {url}').format(url=urlcode))
+        if urlver != '.':
+            parsed = urllib.parse.urlparse(urlver)
+            if not parsed.netloc or not parsed.scheme or parsed.scheme != 'https':
+                raise FDroidException(_('UpdateCheckData has invalid URL: {url}').format(url=urlcode))
 
-    logging.debug("...requesting {0}".format(urlcode))
-    req = urllib.request.Request(urlcode, None, headers=net.HEADERS)
-    resp = urllib.request.urlopen(req, None, 20)  # nosec B310 scheme is filtered above
-    page = resp.read().decode('utf-8')
+        vercode = None
+        if len(urlcode) > 0:
+            logging.debug("...requesting {0}".format(urlcode))
+            req = urllib.request.Request(urlcode, None)
+            resp = urllib.request.urlopen(req, None, 20)  # nosec B310 scheme is filtered above
+            page = resp.read().decode('utf-8')
 
-    m = re.search(codeex, page)
-    if not m:
-        raise FDroidException("No RE match for versionCode")
-    vercode = common.version_code_string_to_int(m.group(1).strip())
+            m = re.search(codeex, page)
+            if not m:
+                raise FDroidException("No RE match for version code")
+            vercode = m.group(1).strip()
 
-    if urlver != '.':
-        logging.debug("...requesting {0}".format(urlver))
-        req = urllib.request.Request(urlver, None)
-        resp = urllib.request.urlopen(req, None, 20)  # nosec B310 scheme is filtered above
-        page = resp.read().decode('utf-8')
+        version = "??"
+        if len(urlver) > 0:
+            if urlver != '.':
+                logging.debug("...requesting {0}".format(urlver))
+                req = urllib.request.Request(urlver, None)
+                resp = urllib.request.urlopen(req, None, 20)  # nosec B310 scheme is filtered above
+                page = resp.read().decode('utf-8')
 
-    m = re.search(verex, page)
-    if not m:
-        raise FDroidException("No RE match for version")
-    version = m.group(1)
+            m = re.search(verex, page)
+            if not m:
+                raise FDroidException("No RE match for version")
+            version = m.group(1)
 
-    if app.UpdateCheckIgnore and re.search(app.UpdateCheckIgnore, version):
-        logging.info("Version {version} for {appid} is ignored".format(version=version, appid=app.id))
-        return (None, None)
-
-    return (version, vercode)
+        if ignoresearch and version:
+            if not ignoresearch(version):
+                return (version, vercode)
+            else:
+                return (None, ("Version {version} is ignored").format(version=version))
+        else:
+            return (version, vercode)
+    except FDroidException:
+        msg = "Could not complete http check for app {0} due to unknown error: {1}".format(app.id, traceback.format_exc())
+        return (None, msg)
 
 
-def check_tags(app: metadata.App, pattern: str) -> tuple[str, int, str]:
-    """Check for a new version by looking at the tags in the source repo.
+# Check for a new version by looking at the tags in the source repo.
+# Whether this can be used reliably or not depends on
+# the development procedures used by the project's developers. Use it with
+# caution, because it's inappropriate for many projects.
+# Returns (None, "a message") if this didn't work, or (version, vercode, tag) for
+# the details of the current version.
+def check_tags(app, pattern):
 
-    Whether this can be used reliably or not depends on
-    the development procedures used by the project's developers. Use it with
-    caution, because it's inappropriate for many projects.
+    try:
 
-    Parameters
-    ----------
-    app
-        The App instance to check for updates for.
-    pattern
-        The pattern a tag needs to match to be considered.
+        if app.RepoType == 'srclib':
+            build_dir = os.path.join('build', 'srclib', app.Repo)
+            repotype = common.getsrclibvcs(app.Repo)
+        else:
+            build_dir = os.path.join('build', app.id)
+            repotype = app.RepoType
 
-    Returns
-    -------
-    versionName
-        The highest found versionName.
-    versionCode
-        The highest found versionCode.
-    ref
-        The Git reference, commit hash or tag name, of the highest found
-        versionName, versionCode.
+        if repotype not in ('git', 'git-svn', 'hg', 'bzr'):
+            return (None, 'Tags update mode only works for git, hg, bzr and git-svn repositories currently', None)
 
-    Raises
-    ------
-    :exc:`~fdroidserver.exception.MetaDataException`
-        If this function is not suitable for the RepoType of the app or
-        information is missing to perform this type of check.
-    :exc:`~fdroidserver.exception.FDroidException`
-        If no matching tags or no information whatsoever could be found.
-    """
-    if app.RepoType == 'srclib':
-        build_dir = Path('build/srclib') / app.Repo
-        repotype = common.getsrclibvcs(app.Repo)
-    else:
-        build_dir = Path('build') / app.id
-        repotype = app.RepoType
+        if repotype == 'git-svn' and ';' not in app.Repo:
+            return (None, 'Tags update mode used in git-svn, but the repo was not set up with tags', None)
 
-    if repotype not in ('git', 'git-svn', 'hg', 'bzr'):
-        raise MetaDataException(_('Tags update mode only works for git, hg, bzr and git-svn repositories currently'))
+        # Set up vcs interface and make sure we have the latest code...
+        vcs = common.getvcs(app.RepoType, app.Repo, build_dir)
 
-    if repotype == 'git-svn' and ';' not in app.Repo:
-        raise MetaDataException(_('Tags update mode used in git-svn, but the repo was not set up with tags'))
+        vcs.gotorevision(None)
 
-    # Set up vcs interface and make sure we have the latest code...
-    vcs = common.getvcs(app.RepoType, app.Repo, build_dir)
+        last_build = app.get_last_build()
 
-    vcs.gotorevision(None)
-
-    last_build = get_last_build_from_app(app)
-
-    try_init_submodules(app, last_build, vcs)
-
-    htag = None
-    hver = None
-    hcode = 0
-
-    tags = []
-    if repotype == 'git':
-        tags = vcs.latesttags()
-    else:
-        tags = vcs.gettags()
-    if not tags:
-        raise FDroidException(_('No tags found'))
-
-    logging.debug("All tags: " + ','.join(tags))
-    if pattern:
-        pat = re.compile(pattern)
-        tags = [tag for tag in tags if pat.match(tag)]
-        if not tags:
-            raise FDroidException(_('No matching tags found'))
-        logging.debug("Matching tags: " + ','.join(tags))
-
-    if len(tags) > 5 and repotype == 'git':
-        tags = tags[:5]
-        logging.debug("Latest tags: " + ','.join(tags))
-
-    for tag in tags:
-        logging.debug("Check tag: '{0}'".format(tag))
-        vcs.gotorevision(tag)
         try_init_submodules(app, last_build, vcs)
 
-        if app.UpdateCheckData:
-            filecode, codeex, filever, verex = app.UpdateCheckData.split('|')
+        hpak = None
+        htag = None
+        hver = None
+        hcode = "0"
 
-            if filecode:
-                filecode = build_dir / filecode
-                if not filecode.is_file():
-                    logging.debug("UpdateCheckData file {0} not found in tag {1}".format(filecode, tag))
-                    continue
-                filecontent = filecode.read_text()
-            else:
-                filecontent = tag
-
-            vercode = tag
-            if codeex:
-                m = re.search(codeex, filecontent)
-                if not m:
-                    logging.debug(f"UpdateCheckData regex {codeex} for versionCode"
-                                  f" has no match in tag {tag}")
-                    continue
-
-                vercode = m.group(1).strip()
-
-            if filever:
-                if filever != '.':
-                    filever = build_dir / filever
-                    if filever.is_file():
-                        filecontent = filever.read_text()
-                    else:
-                        logging.debug("UpdateCheckData file {0} not found in tag {1}".format(filever, tag))
-            else:
-                filecontent = tag
-
-            version = tag
-            if verex:
-                m = re.search(verex, filecontent)
-                if not m:
-                    logging.debug(f"UpdateCheckData regex {verex} for versionName"
-                                  f" has no match in tag {tag}")
-                    continue
-
-                version = m.group(1)
-
-            logging.debug("UpdateCheckData found version {0} ({1})"
-                          .format(version, vercode))
-            vercode = common.version_code_string_to_int(vercode)
-            if vercode > hcode:
-                htag = tag
-                hcode = vercode
-                hver = version
+        tags = []
+        if repotype == 'git':
+            tags = vcs.latesttags()
         else:
+            tags = vcs.gettags()
+        if not tags:
+            return (None, "No tags found", None)
+
+        logging.debug("All tags: " + ','.join(tags))
+        if pattern:
+            pat = re.compile(pattern)
+            tags = [tag for tag in tags if pat.match(tag)]
+            if not tags:
+                return (None, "No matching tags found", None)
+            logging.debug("Matching tags: " + ','.join(tags))
+
+        if len(tags) > 5 and repotype == 'git':
+            tags = tags[:5]
+            logging.debug("Latest tags: " + ','.join(tags))
+
+        for tag in tags:
+            logging.debug("Check tag: '{0}'".format(tag))
+            vcs.gotorevision(tag)
+
             for subdir in possible_subdirs(app):
-                root_dir = build_dir / subdir
+                if subdir == '.':
+                    root_dir = build_dir
+                else:
+                    root_dir = os.path.join(build_dir, subdir)
                 paths = common.manifest_paths(root_dir, last_build.gradle)
-                version, vercode, _package = common.parse_androidmanifests(paths, app)
-                if version in ('Unknown', 'Ignore'):
-                    version = tag
+                version, vercode, package = common.parse_androidmanifests(paths, app)
                 if vercode:
                     logging.debug("Manifest exists in subdir '{0}'. Found version {1} ({2})"
                                   .format(subdir, version, vercode))
-                    if vercode > hcode:
+                    i_vercode = common.version_code_string_to_int(vercode)
+                    if i_vercode > common.version_code_string_to_int(hcode):
+                        hpak = package
                         htag = tag
-                        hcode = vercode
+                        hcode = str(i_vercode)
                         hver = version
 
-    if hver:
-        if htag != tags[0]:
-            logging.warning(
-                "{appid}: latest tag {tag} does not contain highest version {version}".format(
-                    appid=app.id, tag=tags[0], version=hver
-                )
-            )
-        try:
-            commit = vcs.getref(htag)
-            if commit:
-                return (hver, hcode, commit)
-        except VCSException:
-            pass
-        return (hver, hcode, htag)
-    raise FDroidException(_("Couldn't find any version information"))
+        if not hpak:
+            return (None, "Couldn't find package ID", None)
+        if hver:
+            return (hver, hcode, htag)
+        return (None, "Couldn't find any version information", None)
+
+    except VCSException as vcse:
+        msg = "VCS error while scanning app {0}: {1}".format(app.id, vcse)
+        return (None, msg, None)
+    except Exception:
+        msg = "Could not scan app {0} due to unknown error: {1}".format(app.id, traceback.format_exc())
+        return (None, msg, None)
 
 
-def check_repomanifest(app: metadata.App, branch: Optional[str] = None) -> tuple[str, int]:
-    """Check for a new version by looking at the AndroidManifest.xml at the HEAD of the source repo.
+# Check for a new version by looking at the AndroidManifest.xml at the HEAD
+# of the source repo. Whether this can be used reliably or not depends on
+# the development procedures used by the project's developers. Use it with
+# caution, because it's inappropriate for many projects.
+# Returns (None, "a message") if this didn't work, or (version, vercode) for
+# the details of the current version.
+def check_repomanifest(app, branch=None):
 
-    Whether this can be used reliably or not depends on
-    the development procedures used by the project's developers. Use it with
-    caution, because it's inappropriate for many projects.
+    try:
 
-    Parameters
-    ----------
-    app
-        The App instance to check for updates for.
-    branch
-        The VCS branch where to search for versionCode, versionName.
+        if app.RepoType == 'srclib':
+            build_dir = os.path.join('build', 'srclib', app.Repo)
+            repotype = common.getsrclibvcs(app.Repo)
+        else:
+            build_dir = os.path.join('build', app.id)
+            repotype = app.RepoType
 
-    Returns
-    -------
-    versionName
-        The highest found versionName.
-    versionCode
-        The highest found versionCode.
+        # Set up vcs interface and make sure we have the latest code...
+        vcs = common.getvcs(app.RepoType, app.Repo, build_dir)
 
-    Raises
-    ------
-    :exc:`~fdroidserver.exception.FDroidException`
-        If no package id or no version information could be found.
-    """
-    if app.RepoType == 'srclib':
-        build_dir = Path('build/srclib') / app.Repo
-        repotype = common.getsrclibvcs(app.Repo)
-    else:
-        build_dir = Path('build') / app.id
-        repotype = app.RepoType
+        if repotype == 'git':
+            if branch:
+                branch = 'origin/' + branch
+            vcs.gotorevision(branch)
+        elif repotype == 'git-svn':
+            vcs.gotorevision(branch)
+        elif repotype == 'hg':
+            vcs.gotorevision(branch)
+        elif repotype == 'bzr':
+            vcs.gotorevision(None)
 
-    # Set up vcs interface and make sure we have the latest code...
-    vcs = common.getvcs(app.RepoType, app.Repo, build_dir)
+        last_build = metadata.Build()
+        if len(app.builds) > 0:
+            last_build = app.builds[-1]
+
+        try_init_submodules(app, last_build, vcs)
+
+        hpak = None
+        hver = None
+        hcode = "0"
+        for subdir in possible_subdirs(app):
+            if subdir == '.':
+                root_dir = build_dir
+            else:
+                root_dir = os.path.join(build_dir, subdir)
+            paths = common.manifest_paths(root_dir, last_build.gradle)
+            version, vercode, package = common.parse_androidmanifests(paths, app)
+            if vercode:
+                logging.debug("Manifest exists in subdir '{0}'. Found version {1} ({2})"
+                              .format(subdir, version, vercode))
+                if int(vercode) > int(hcode):
+                    hpak = package
+                    hcode = str(int(vercode))
+                    hver = version
+
+        if not hpak:
+            return (None, "Couldn't find package ID")
+        if hver:
+            return (hver, hcode)
+        return (None, "Couldn't find any version information")
+
+    except VCSException as vcse:
+        msg = "VCS error while scanning app {0}: {1}".format(app.id, vcse)
+        return (None, msg)
+    except Exception:
+        msg = "Could not scan app {0} due to unknown error: {1}".format(app.id, traceback.format_exc())
+        return (None, msg)
+
+
+def check_repotrunk(app):
+
+    try:
+        if app.RepoType == 'srclib':
+            build_dir = os.path.join('build', 'srclib', app.Repo)
+            repotype = common.getsrclibvcs(app.Repo)
+        else:
+            build_dir = os.path.join('build', app.id)
+            repotype = app.RepoType
+
+        if repotype not in ('git-svn', ):
+            return (None, 'RepoTrunk update mode only makes sense in git-svn repositories')
+
+        # Set up vcs interface and make sure we have the latest code...
+        vcs = common.getvcs(app.RepoType, app.Repo, build_dir)
 
-    if repotype == 'git':
-        if branch:
-            branch = 'origin/' + branch
-        vcs.gotorevision(branch)
-    elif repotype == 'git-svn':
-        vcs.gotorevision(branch)
-    elif repotype == 'hg':
-        vcs.gotorevision(branch)
-    elif repotype == 'bzr':
         vcs.gotorevision(None)
 
-    last_build = get_last_build_from_app(app)
-    try_init_submodules(app, last_build, vcs)
-
-    hpak = None
-    hver = None
-    hcode = 0
-    for subdir in possible_subdirs(app):
-        root_dir = build_dir / subdir
-        paths = common.manifest_paths(root_dir, last_build.gradle)
-        version, vercode, package = common.parse_androidmanifests(paths, app)
-        if vercode:
-            logging.debug("Manifest exists in subdir '{0}'. Found version {1} ({2})"
-                          .format(subdir, version, vercode))
-            if vercode > hcode:
-                hpak = package
-                hcode = vercode
-                hver = version
-
-    if not hpak:
-        raise FDroidException(_("Couldn't find package ID"))
-    if hver:
-        return (hver, hcode)
-    raise FDroidException(_("Couldn't find any version information"))
+        ref = vcs.getref()
+        return (ref, ref)
+    except VCSException as vcse:
+        msg = "VCS error while scanning app {0}: {1}".format(app.id, vcse)
+        return (None, msg)
+    except Exception:
+        msg = "Could not scan app {0} due to unknown error: {1}".format(app.id, traceback.format_exc())
+        return (None, msg)
 
 
-def try_init_submodules(app: metadata.App, last_build: metadata.Build, vcs: common.vcs):
-    """Try to init submodules if the last build entry uses them.
+# Check for a new version by looking at the Google Play Store.
+# Returns (None, "a message") if this didn't work, or (version, None) for
+# the details of the current version.
+def check_gplay(app):
+    time.sleep(15)
+    url = 'https://play.google.com/store/apps/details?id=' + app.id
+    headers = {'User-Agent': 'Mozilla/5.0 (X11; Linux i686; rv:18.0) Gecko/20100101 Firefox/18.0'}
+    req = urllib.request.Request(url, None, headers)
+    try:
+        resp = urllib.request.urlopen(req, None, 20)  # nosec B310 URL base is hardcoded above
+        page = resp.read().decode()
+    except urllib.error.HTTPError as e:
+        return (None, str(e.code))
+    except Exception as e:
+        return (None, 'Failed:' + str(e))
 
+    version = None
+
+    m = re.search('itemprop="softwareVersion">[ ]*([^<]+)[ ]*</div>', page)
+    if m:
+        version = html.unescape(m.group(1))
+
+    if version == 'Varies with device':
+        return (None, 'Device-variable version, cannot use this method')
+
+    if not version:
+        return (None, "Couldn't find version")
+    return (version.strip(), None)
+
+
+def try_init_submodules(app, last_build, vcs):
+    """Try to init submodules if the last build entry used them.
     They might have been removed from the app's repo in the meantime,
     so if we can't find any submodules we continue with the updates check.
     If there is any other error in initializing them then we stop the check.
@@ -361,101 +326,60 @@ def try_init_submodules(app: metadata.App, last_build: metadata.Build, vcs: comm
         try:
             vcs.initsubmodules()
         except NoSubmodulesException:
-            logging.info("No submodules present for {}".format(_getappname(app)))
-        except VCSException:
-            logging.info("submodule broken for {}".format(_getappname(app)))
+            logging.info("No submodules present for {}".format(app.Name))
 
 
-def dirs_with_manifest(startdir: str):
-    """Find directories containing a manifest file.
-
-    Yield all directories under startdir that contain any of the manifest
-    files, and thus are probably an Android project.
-
-    Parameters
-    ----------
-    startdir
-        Directory to be walked down for search
-
-    Yields
-    ------
-    path : :class:`pathlib.Path` or None
-        A directory that contains a manifest file of an Android project, None if
-        no directory could be found
-    """
+# Return all directories under startdir that contain any of the manifest
+# files, and thus are probably an Android project.
+def dirs_with_manifest(startdir):
     for root, dirs, files in os.walk(startdir):
-        dirs.sort()
         if any(m in files for m in [
                 'AndroidManifest.xml', 'pom.xml', 'build.gradle', 'build.gradle.kts']):
-            yield Path(root)
+            yield root
 
 
-def possible_subdirs(app: metadata.App):
-    """Try to find a new subdir starting from the root build_dir.
+# Tries to find a new subdir starting from the root build_dir. Returns said
+# subdir relative to the build dir if found, None otherwise.
+def possible_subdirs(app):
 
-    Yields said subdir relative to the build dir if found, None otherwise.
-
-    Parameters
-    ----------
-    app
-        The app to check for subdirs
-
-    Yields
-    ------
-    subdir : :class:`pathlib.Path` or None
-        A possible subdir, None if no subdir could be found
-    """
     if app.RepoType == 'srclib':
-        build_dir = Path('build/srclib') / app.Repo
+        build_dir = os.path.join('build', 'srclib', app.Repo)
     else:
-        build_dir = Path('build') / app.id
+        build_dir = os.path.join('build', app.id)
 
-    last_build = get_last_build_from_app(app)
+    last_build = app.get_last_build()
 
     for d in dirs_with_manifest(build_dir):
         m_paths = common.manifest_paths(d, last_build.gradle)
         package = common.parse_androidmanifests(m_paths, app)[2]
-        if package is not None or app.UpdateCheckName == "Ignore":
-            subdir = d.relative_to(build_dir)
+        if package is not None:
+            subdir = os.path.relpath(d, build_dir)
             logging.debug("Adding possible subdir %s" % subdir)
             yield subdir
 
 
-def _getappname(app: metadata.App) -> str:
-    return common.get_app_display_name(app)
+def _getappname(app):
+    if app.Name:
+        return app.Name
+    if app.AutoName:
+        return app.AutoName
+    return app.id
 
 
-def _getcvname(app: metadata.App) -> str:
+def _getcvname(app):
     return '%s (%s)' % (app.CurrentVersion, app.CurrentVersionCode)
 
 
-def fetch_autoname(app: metadata.App, tag: str) -> Optional[str]:
-    """Fetch AutoName.
+def fetch_autoname(app, tag):
 
-    Get the to be displayed name of an app from the source code and adjust the
-    App instance in case it is different name has been found.
-
-    Parameters
-    ----------
-    app
-        The App instance to get the AutoName for.
-    tag
-        Tag to fetch AutoName at.
-
-    Returns
-    -------
-    commitmsg
-        Commit message about the name change.  None in case checking for the
-        name is disabled, a VCSException occured or no name could be found.
-    """
     if not app.RepoType or app.UpdateCheckMode in ('None', 'Static') \
        or app.UpdateCheckName == "Ignore":
         return None
 
     if app.RepoType == 'srclib':
-        build_dir = Path('build/srclib') / app.Repo
+        build_dir = os.path.join('build', 'srclib', app.Repo)
     else:
-        build_dir = Path('build') / app.id
+        build_dir = os.path.join('build', app.id)
 
     try:
         vcs = common.getvcs(app.RepoType, app.Repo, build_dir)
@@ -463,12 +387,15 @@ def fetch_autoname(app: metadata.App, tag: str) -> Optional[str]:
     except VCSException:
         return None
 
-    last_build = get_last_build_from_app(app)
+    last_build = app.get_last_build()
 
-    logging.debug("...fetch auto name from " + str(build_dir))
+    logging.debug("...fetch auto name from " + build_dir)
     new_name = None
     for subdir in possible_subdirs(app):
-        root_dir = build_dir / subdir
+        if subdir == '.':
+            root_dir = build_dir
+        else:
+            root_dir = os.path.join(build_dir, subdir)
         new_name = common.fetch_real_name(root_dir, last_build.gradle)
         if new_name is not None:
             break
@@ -485,103 +412,74 @@ def fetch_autoname(app: metadata.App, tag: str) -> Optional[str]:
     return commitmsg
 
 
-def operate_vercode(operation: str, vercode: int) -> int:
-    """Calculate a new versionCode from a mathematical operation.
+def checkupdates_app(app):
 
-    Parameters
-    ----------
-    operation
-        The operation to execute to get the new versionCode.
-    vercode
-        The versionCode for replacing "%c" in the operation.
-
-    Returns
-    -------
-    vercode
-        The new versionCode obtained by executing the operation.
-
-    Raises
-    ------
-    :exc:`~fdroidserver.exception.MetaDataException`
-        If the operation is invalid.
-    """
-    if not common.VERCODE_OPERATION_RE.match(operation):
-        raise MetaDataException(_('Invalid VercodeOperation: {field}')
-                                .format(field=operation))
-    oldvercode = vercode
-    op = operation.replace("%c", str(oldvercode))
-    vercode = common.calculate_math_string(op)
-    logging.debug("Applied vercode operation: %d -> %d" % (oldvercode, vercode))
-    return vercode
-
-
-def checkupdates_app(app: metadata.App, auto: bool, commit: bool = False) -> None:
-    """Check for new versions and updated name of a single app.
-
-    Also write back changes to the metadata file and create a Git commit if
-    requested.
-
-    Parameters
-    ----------
-    app
-        The app to check for updates for.
-
-    Raises
-    ------
-    :exc:`~fdroidserver.exception.MetaDataException`
-        If the app has an invalid UpdateCheckMode or AutoUpdateMode.
-    :exc:`~fdroidserver.exception.FDroidException`
-        If no version information could be found, the current version is newer
-        than the found version, auto-update was requested but an app has no
-        CurrentVersionCode or (Git) commiting the changes failed.
-    """
     # If a change is made, commitmsg should be set to a description of it.
-    # Only if this is set, changes will be written back to the metadata.
+    # Only if this is set will changes be written back to the metadata.
     commitmsg = None
 
     tag = None
+    msg = None
+    vercode = None
+    noverok = False
     mode = app.UpdateCheckMode
     if mode.startswith('Tags'):
         pattern = mode[5:] if len(mode) > 4 else None
         (version, vercode, tag) = check_tags(app, pattern)
+        if version == 'Unknown':
+            version = tag
+        msg = vercode
     elif mode == 'RepoManifest':
         (version, vercode) = check_repomanifest(app)
+        msg = vercode
     elif mode.startswith('RepoManifest/'):
         tag = mode[13:]
         (version, vercode) = check_repomanifest(app, tag)
+        msg = vercode
+    elif mode == 'RepoTrunk':
+        (version, vercode) = check_repotrunk(app)
+        msg = vercode
     elif mode == 'HTTP':
         (version, vercode) = check_http(app)
+        msg = vercode
     elif mode in ('None', 'Static'):
-        logging.debug('Checking disabled')
-        return
+        version = None
+        msg = 'Checking disabled'
+        noverok = True
     else:
-        raise MetaDataException(_('Invalid UpdateCheckMode: {mode}').format(mode=mode))
+        version = None
+        msg = 'Invalid update check method'
 
-    if not version or not vercode:
-        raise FDroidException(_('no version information found'))
+    if version and vercode and app.VercodeOperation:
+        if not common.VERCODE_OPERATION_RE.match(app.VercodeOperation):
+            raise MetaDataException(_('Invalid VercodeOperation: {field}')
+                                    .format(field=app.VercodeOperation))
+        oldvercode = str(int(vercode))
+        op = app.VercodeOperation.replace("%c", oldvercode)
+        vercode = str(common.calculate_math_string(op))
+        logging.debug("Applied vercode operation: %s -> %s" % (oldvercode, vercode))
 
-    if app.VercodeOperation:
-        vercodes = sorted([
-            operate_vercode(operation, vercode) for operation in app.VercodeOperation
-        ])
-    else:
-        vercodes = [vercode]
+    if version and any(version.startswith(s) for s in [
+            '${',  # Gradle variable names
+            '@string/',  # Strings we could not resolve
+            ]):
+        version = "Unknown"
 
     updating = False
-    if vercodes[-1] == app.CurrentVersionCode:
-        logging.debug("...up to date")
-    elif vercodes[-1] > app.CurrentVersionCode:
-        logging.debug("...updating - old vercode={0}, new vercode={1}".format(
-            app.CurrentVersionCode, vercodes[-1]))
-        app.CurrentVersion = version
-        app.CurrentVersionCode = vercodes[-1]
-        updating = True
+    if version is None:
+        logmsg = "...{0} : {1}".format(app.id, msg)
+        if noverok:
+            logging.info(logmsg)
+        else:
+            logging.warning(logmsg)
+    elif vercode == app.CurrentVersionCode:
+        logging.info("...up to date")
     else:
-        raise FDroidException(
-            _('current version is newer: old vercode={old}, new vercode={new}').format(
-                old=app.CurrentVersionCode, new=vercodes[-1]
-            )
-        )
+        logging.debug("...updating - old vercode={0}, new vercode={1}".format(
+            app.CurrentVersionCode, vercode))
+        app.CurrentVersion = version
+        app.CurrentVersionCode = str(int(vercode))
+        updating = True
 
     commitmsg = fetch_autoname(app, tag)
 
@@ -591,285 +489,63 @@ def checkupdates_app(app: metadata.App, auto: bool, commit: bool = False) -> Non
         logging.info('...updating to version %s' % ver)
         commitmsg = 'Update CurrentVersion of %s to %s' % (name, ver)
 
-    if auto:
+    if options.auto:
         mode = app.AutoUpdateMode
         if not app.CurrentVersionCode:
-            raise MetaDataException(
-                _("Can't auto-update app with no CurrentVersionCode")
-            )
+            logging.warning("Can't auto-update app with no CurrentVersionCode: " + app.id)
         elif mode in ('None', 'Static'):
             pass
-        elif mode.startswith('Version'):
+        elif mode.startswith('Version '):
             pattern = mode[8:]
             suffix = ''
             if pattern.startswith('+'):
                 try:
                     suffix, pattern = pattern[1:].split(' ', 1)
-                except ValueError as exc:
-                    raise MetaDataException("Invalid AutoUpdateMode: " + mode) from exc
+                except ValueError:
+                    raise MetaDataException("Invalid AutoUpdateMode: " + mode)
 
             gotcur = False
             latest = None
-            builds = app.get('Builds', [])
-
-            if builds:
-                latest = builds[-1]
-                if latest.versionCode == app.CurrentVersionCode:
+            for build in app.builds:
+                if int(build.versionCode) >= int(app.CurrentVersionCode):
                     gotcur = True
-                elif latest.versionCode > app.CurrentVersionCode:
-                    raise FDroidException(
-                        _(
-                            'latest build recipe is newer: '
-                            'old vercode={old}, new vercode={new}'
-                        ).format(old=latest.versionCode, new=app.CurrentVersionCode)
-                    )
+                if not latest or int(build.versionCode) > int(latest.versionCode):
+                    latest = build
+
+            if int(latest.versionCode) > int(app.CurrentVersionCode):
+                logging.info("Refusing to auto update, since the latest build is newer")
 
             if not gotcur:
-                newbuilds = copy.deepcopy(builds[-len(vercodes):])
-
-                # These are either built-in or invalid in newer system versions
-                bookworm_blocklist = [
-                    'apt-get install -y openjdk-11-jdk',
-                    'apt-get install openjdk-11-jdk-headless',
-                    'apt-get install -y openjdk-11-jdk-headless',
-                    'apt-get install -t stretch-backports openjdk-11-jdk-headless openjdk-11-jre-headless',
-                    'apt-get install -y -t stretch-backports openjdk-11-jdk-headless openjdk-11-jre-headless',
-                    'apt-get install -y openjdk-17-jdk',
-                    'apt-get install openjdk-17-jdk-headless',
-                    'apt-get install -y openjdk-17-jdk-headless',
-                    'update-alternatives --auto java',
-                    'update-java-alternatives -a',
-                ]
-
-                for build in newbuilds:
-                    if "sudo" in build:
-                        if any("openjdk-11" in line for line in build["sudo"]) or any("openjdk-17" in line for line in build["sudo"]):
-                            build["sudo"] = [line for line in build["sudo"] if line not in bookworm_blocklist]
-                        if build["sudo"] == ['apt-get update']:
-                            build["sudo"] = ''
-
-                for b, v in zip(newbuilds, vercodes):
-                    b.disable = False
-                    b.versionCode = v
-                    b.versionName = app.CurrentVersion + suffix.replace(
-                        '%c', str(v)
-                    )
-                    logging.info("...auto-generating build for " + b.versionName)
-                    if tag:
-                        b.commit = tag
-                    else:
-                        commit = pattern.replace('%v', app.CurrentVersion)
-                        commit = commit.replace('%c', str(v))
-                        b.commit = commit
-
-                app['Builds'].extend(newbuilds)
-
+                newbuild = copy.deepcopy(latest)
+                newbuild.disable = False
+                newbuild.versionCode = app.CurrentVersionCode
+                newbuild.versionName = app.CurrentVersion + suffix.replace('%c', newbuild.versionCode)
+                logging.info("...auto-generating build for " + newbuild.versionName)
+                commit = pattern.replace('%v', app.CurrentVersion)
+                commit = commit.replace('%c', newbuild.versionCode)
+                newbuild.commit = commit
+                app.builds.append(newbuild)
                 name = _getappname(app)
                 ver = _getcvname(app)
                 commitmsg = "Update %s to %s" % (name, ver)
         else:
-            raise MetaDataException(
-                _('Invalid AutoUpdateMode: {mode}').format(mode=mode)
-            )
+            logging.warning('Invalid auto update mode "' + mode + '" on ' + app.id)
 
     if commitmsg:
         metadata.write_metadata(app.metadatapath, app)
-        if commit:
+        if options.commit:
             logging.info("Commiting update for " + app.metadatapath)
             gitcmd = ["git", "commit", "-m", commitmsg]
+            if 'auto_author' in config:
+                gitcmd.extend(['--author', config['auto_author']])
             gitcmd.extend(["--", app.metadatapath])
             if subprocess.call(gitcmd) != 0:
                 raise FDroidException("Git commit failed")
 
 
-def get_last_build_from_app(app: metadata.App) -> metadata.Build:
-    """Get the last build entry of an app."""
-    if app.get('Builds'):
-        return app['Builds'][-1]
-    else:
-        return metadata.Build()
+def status_update_json(processed, failed):
+    """Output a JSON file with metadata about this run"""
 
-
-def get_upstream_main_branch(git_repo):
-    refs = list()
-    for ref in git_repo.remotes.upstream.refs:
-        if ref.name != 'upstream/HEAD':
-            refs.append(ref.name)
-    if len(refs) == 1:
-        return refs[0]
-    for name in ('upstream/main', 'upstream/master'):
-        if name in refs:
-            return name
-    try:
-        with git_repo.config_reader() as reader:
-            return 'upstream/%s' % reader.get_value('init', 'defaultBranch')
-    except configparser.NoSectionError:
-        return 'upstream/main'
-
-
-def checkout_appid_branch(appid):
-    """Prepare the working branch named after the appid.
-
-    This sets up everything for checkupdates_app() to run and add
-    commits.  If there is an existing branch named after the appid,
-    and it has commits from users other than the checkupdates-bot,
-    then this will return False.  Otherwise, it returns True.
-
-    The checkupdates-runner must set the committer email address in
-    the git config.  Then any commit with a committer or author that
-    does not match that will be considered to have human edits.  That
-    email address is currently set in:
-    https://gitlab.com/fdroid/checkupdates-runner/-/blob/1861899262a62a4ed08fa24e5449c0368dfb7617/.gitlab-ci.yml#L36
-
-    """
-    logging.debug(f'Creating merge request branch for {appid}')
-    git_repo = git.Repo.init('.')
-    upstream_main = get_upstream_main_branch(git_repo)
-    for remote in git_repo.remotes:
-        remote.fetch()
-    try:
-        git_repo.remotes.origin.fetch(f'{appid}:refs/remotes/origin/{appid}')
-    except Exception as e:
-        logging.debug('"%s" branch not found on origin remote:\n\t%s', appid, e)
-    if appid in git_repo.remotes.origin.refs:
-        start_point = f"origin/{appid}"
-        for commit in git_repo.iter_commits(
-            f'{upstream_main}...{start_point}', right_only=True
-        ):
-            if commit.committer.email != BOT_EMAIL or commit.author.email != BOT_EMAIL:
-                return False
-    else:
-        start_point = upstream_main
-    git_repo.git.checkout('-B', appid, start_point)
-    git_repo.git.rebase(upstream_main, strategy_option='ours', kill_after_timeout=120)
-    return True
-
-
-def get_changes_versus_ref(git_repo, ref, f):
-    changes = []
-    for m in re.findall(
-        r"^[+-].*", git_repo.git.diff(f"{ref}", '--', f), flags=re.MULTILINE
-    ):
-        if not re.match(r"^(\+\+\+|---) ", m):
-            changes.append(m)
-    return changes
-
-
-def push_commits(branch_name='checkupdates'):
-    """Make git branch then push commits as merge request.
-
-    The appid is parsed from the actual file that was changed so that
-    only the right branch is ever updated.
-
-    This uses the appid as the standard branch name so that there is
-    only ever one open merge request per-app.  If multiple apps are
-    included in the branch, then 'checkupdates' is used as branch
-    name.  This is to support the old way operating, e.g. in batches.
-
-    This uses GitLab "Push Options" to create a merge request. Git
-    Push Options are config data that can be sent via `git push
-    --push-option=... origin foo`.
-
-    References
-    ----------
-    * https://docs.gitlab.com/ee/user/project/push_options.html
-
-    """
-    if branch_name != "checkupdates":
-        if callable(getattr(git.SymbolicReference, "_check_ref_name_valid", None)):
-            git.SymbolicReference._check_ref_name_valid(branch_name)
-
-    git_repo = git.Repo.init('.')
-    upstream_main = get_upstream_main_branch(git_repo)
-    files = set()
-    for commit in git_repo.iter_commits(f'{upstream_main}...HEAD', right_only=True):
-        files.update(commit.stats.files.keys())
-
-    files = list(files)
-    if len(files) == 1:
-        m = re.match(r'metadata/(\S+)\.yml', files[0])
-        if m:
-            branch_name = m.group(1)  # appid
-    if not files:
-        return
-
-    # https://git-scm.com/docs/git-check-ref-format Git refname can't end with .lock
-    if branch_name.endswith(".lock"):
-        branch_name = f"{branch_name}_"
-
-    remote = git_repo.remotes.origin
-    if branch_name in remote.refs:
-        if not get_changes_versus_ref(git_repo, f'origin/{branch_name}', files[0]):
-            return
-
-    git_repo.create_head(branch_name, force=True)
-    push_options = [
-        'merge_request.create',
-        'merge_request.remove_source_branch',
-        'merge_request.title=bot: ' + git_repo.branches[branch_name].commit.summary,
-        'merge_request.description='
-        + '~%s checkupdates-bot run %s' % (branch_name, os.getenv('CI_JOB_URL')),
-    ]
-
-    # mark as draft if there are only changes to CurrentVersion:
-    current_version_only = True
-    for m in get_changes_versus_ref(git_repo, upstream_main, files[0]):
-        if not re.match(r"^[-+]CurrentVersion", m):
-            current_version_only = False
-            break
-    if current_version_only:
-        push_options.append('merge_request.draft')
-
-    progress = git.RemoteProgress()
-
-    pushinfos = remote.push(
-        f"HEAD:refs/heads/{branch_name}",
-        progress=progress,
-        force=True,
-        set_upstream=True,
-        push_option=push_options,
-    )
-
-    for pushinfo in pushinfos:
-        logging.info(pushinfo.summary)
-        # Show potentially useful messages from git remote
-        if progress:
-            for line in progress.other_lines:
-                logging.info(line)
-        if pushinfo.flags & (
-            git.remote.PushInfo.ERROR
-            | git.remote.PushInfo.REJECTED
-            | git.remote.PushInfo.REMOTE_FAILURE
-            | git.remote.PushInfo.REMOTE_REJECTED
-        ):
-            raise FDroidException(
-                f'{remote.url} push failed: {pushinfo.flags} {pushinfo.summary}'
-            )
-        else:
-            logging.info(remote.url + ': ' + pushinfo.summary)
-
-
-def prune_empty_appid_branches(git_repo=None, main_branch='main'):
-    """Remove empty branches from checkupdates-bot git remote."""
-    if git_repo is None:
-        git_repo = git.Repo.init('.')
-    upstream_main = get_upstream_main_branch(git_repo)
-    main_branch = upstream_main.split('/')[1]
-
-    remote = git_repo.remotes.origin
-    remote.update(prune=True)
-    merged_branches = git_repo.git().branch(remotes=True, merged=upstream_main).split()
-    for remote_branch in merged_branches:
-        if not remote_branch or '/' not in remote_branch:
-            continue
-        if remote_branch.split('/')[1] not in (main_branch, 'HEAD'):
-            for ref in git_repo.remotes.origin.refs:
-                if remote_branch == ref.name:
-                    remote.push(':%s' % ref.remote_head, force=True)  # rm remote branch
-
-
-def status_update_json(processed: list, failed: dict) -> None:
-    """Output a JSON file with metadata about this run."""
     logging.debug(_('Outputting JSON'))
     output = common.setup_status_output(start_timestamp)
     if processed:
@@ -879,17 +555,46 @@ def status_update_json(processed: list, failed: dict) -> None:
     common.write_status_json(output)
 
 
+def update_wiki(gplaylog, locallog):
+    if config.get('wiki_server') and config.get('wiki_path'):
+        try:
+            import mwclient
+            site = mwclient.Site((config['wiki_protocol'], config['wiki_server']),
+                                 path=config['wiki_path'])
+            site.login(config['wiki_user'], config['wiki_password'])
+
+            # Write a page with the last build log for this version code
+            wiki_page_path = 'checkupdates_' + time.strftime('%s', start_timestamp)
+            newpage = site.Pages[wiki_page_path]
+            txt = ''
+            txt += "* command line: <code>" + ' '.join(sys.argv) + "</code>\n"
+            txt += common.get_git_describe_link()
+            txt += "* started at " + common.get_wiki_timestamp(start_timestamp) + '\n'
+            txt += "* completed at " + common.get_wiki_timestamp() + '\n'
+            txt += "\n\n"
+            txt += common.get_android_tools_version_log()
+            txt += "\n\n"
+            if gplaylog:
+                txt += '== --gplay check ==\n\n'
+                txt += gplaylog
+            if locallog:
+                txt += '== local source check ==\n\n'
+                txt += locallog
+            newpage.save(txt, summary='Run log')
+            newpage = site.Pages['checkupdates']
+            newpage.save('#REDIRECT [[' + wiki_page_path + ']]', summary='Update redirect')
+        except Exception as e:
+            logging.error(_('Error while attempting to publish log: %s') % e)
+
+
 config = None
+options = None
 start_timestamp = time.gmtime()
 
 
 def main():
-    """Check for updates for one or more apps.
 
-    The behaviour of this function is influenced by the configuration file as
-    well as command line parameters.
-    """
-    global config
+    global config, options
 
     # Parse command line...
     parser = ArgumentParser()
@@ -901,15 +606,15 @@ def main():
                         help=_("Only process apps with auto-updates"))
     parser.add_argument("--commit", action="store_true", default=False,
                         help=_("Commit changes"))
-    parser.add_argument("--merge-request", action="store_true", default=False,
-                        help=_("Commit changes, push, then make a merge request"))
     parser.add_argument("--allow-dirty", action="store_true", default=False,
                         help=_("Run on git repo that has uncommitted changes"))
+    parser.add_argument("--gplay", action="store_true", default=False,
+                        help=_("Only print differences with the Play Store"))
     metadata.add_metadata_arguments(parser)
-    options = common.parse_args(parser)
+    options = parser.parse_args()
     metadata.warnings_action = options.W
 
-    config = common.read_config()
+    config = common.read_config(options)
 
     if not options.allow_dirty:
         status = subprocess.check_output(['git', 'status', '--porcelain'])
@@ -917,15 +622,42 @@ def main():
             logging.error(_('Build metadata git repo has uncommited changes!'))
             sys.exit(1)
 
-    if options.merge_request and not (options.appid and len(options.appid) == 1):
-        logging.error(_('--merge-request only runs on a single appid!'))
-        sys.exit(1)
+    # Get all apps...
+    allapps = metadata.read_metadata()
 
-    apps = common.read_app_args(options.appid)
+    apps = common.read_app_args(options.appid, allapps, False)
 
+    gplaylog = ''
+    if options.gplay:
+        for appid, app in apps.items():
+            gplaylog += '* ' + appid + '\n'
+            version, reason = check_gplay(app)
+            if version is None:
+                if reason == '404':
+                    logging.info("{0} is not in the Play Store".format(_getappname(app)))
+                else:
+                    logging.info("{0} encountered a problem: {1}".format(_getappname(app), reason))
+            if version is not None:
+                stored = app.CurrentVersion
+                if not stored:
+                    logging.info("{0} has no Current Version but has version {1} on the Play Store"
+                                 .format(_getappname(app), version))
+                elif LooseVersion(stored) < LooseVersion(version):
+                    logging.info("{0} has version {1} on the Play Store, which is bigger than {2}"
+                                 .format(_getappname(app), version, stored))
+                else:
+                    if stored != version:
+                        logging.info("{0} has version {1} on the Play Store, which differs from {2}"
+                                     .format(_getappname(app), version, stored))
+                    else:
+                        logging.info("{0} has the same version {1} on the Play Store"
+                                     .format(_getappname(app), version))
+        update_wiki(gplaylog, None)
+        return
+
+    locallog = ''
     processed = []
     failed = dict()
-    exit_code = 0
     for appid, app in apps.items():
 
         if options.autoonly and app.AutoUpdateMode in ('None', 'Static'):
@@ -934,33 +666,20 @@ def main():
 
         msg = _("Processing {appid}").format(appid=appid)
         logging.info(msg)
+        locallog += '* ' + msg + '\n'
 
         try:
-            if options.merge_request:
-                if not checkout_appid_branch(appid):
-                    msg = _("...checkupdate failed for {appid} : {error}").format(
-                        appid=appid,
-                        error='Open merge request with human edits, skipped.',
-                    )
-                    logging.warning(msg)
-                    failed[appid] = msg
-                    continue
-
-            checkupdates_app(app, options.auto, options.commit or options.merge_request)
+            checkupdates_app(app)
             processed.append(appid)
         except Exception as e:
             msg = _("...checkupdate failed for {appid} : {error}").format(appid=appid, error=e)
             logging.error(msg)
-            logging.debug(traceback.format_exc())
+            locallog += msg + '\n'
             failed[appid] = str(e)
-            exit_code = 1
-
-    if options.appid and options.merge_request:
-        push_commits()
-        prune_empty_appid_branches()
 
+    update_wiki(None, locallog)
     status_update_json(processed, failed)
-    sys.exit(exit_code)
+    logging.info(_("Finished"))
 
 
 if __name__ == "__main__":
diff --git a/fdroidserver/common.py b/fdroidserver/common.py
index 127976c3..a9f14c23 100644
--- a/fdroidserver/common.py
+++ b/fdroidserver/common.py
@@ -1,16 +1,8 @@
 #!/usr/bin/env python3
 #
 # common.py - part of the FDroid server tools
-#
-# Copyright (C) 2010-2016, Ciaran Gultnieks, ciaran@ciarang.com
-# Copyright (C) 2013-2017, Daniel Martí <mvdan@mvdan.cc>
-# Copyright (C) 2013-2021, Hans-Christoph Steiner <hans@eds.org>
-# Copyright (C) 2017-2018, Torsten Grote <t@grobox.de>
-# Copyright (C) 2017, tobiasKaminsky <tobias@kaminsky.me>
-# Copyright (C) 2017-2021, Michael Pöhn <michael.poehn@fsfe.org>
-# Copyright (C) 2017,2021, mimi89999 <michel@lebihan.pl>
-# Copyright (C) 2019-2021, Jochen Sprickerhof <git@jochen.sprickerhof.de>
-# Copyright (C) 2021, Felix C. Stegerman <flx@obfusk.net>
+# Copyright (C) 2010-13, Ciaran Gultnieks, ciaran@ciarang.com
+# Copyright (C) 2013-2014 Daniel Martí <mvdan@mvdan.cc>
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by
@@ -25,106 +17,70 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+# common.py is imported by all modules, so do not import third-party
+# libraries here as they will become a requirement for all commands.
 
-"""Collection of functions shared by subcommands.
-
-This is basically the "shared library" for all the fdroid subcommands.
-The contains core functionality and a number of utility functions.
-This is imported by all modules, so do not import third-party
-libraries here as they will become a requirement for all commands.
-
-Config
-------
-
-Parsing and using the configuration settings from config.yml is
-handled here. The data format is YAML 1.2. The config has its own
-supported data types:
-
-* Boolean (e.g. deploy_process_logs:)
-* Integer (e.g. archive_older:, repo_maxage:)
-* String-only (e.g. repo_name:, sdk_path:)
-* Multi-String (string, list of strings, or list of dicts with
-  strings, e.g. serverwebroot:, mirrors:)
-
-String-only fields can also use a special value {env: varname}, which
-is a dict with a single key 'env' and a value that is the name of the
-environment variable to include.
-
-"""
-
-import ast
-import base64
-import copy
-import difflib
-import filecmp
-import glob
-import gzip
-import hashlib
+import git
 import io
-import itertools
-import json
-import logging
-import operator
 import os
+import sys
 import re
+import ast
+import gzip
 import shutil
-import socket
+import glob
 import stat
 import subprocess
-import sys
-import tempfile
 import time
+import operator
+import logging
+import hashlib
+import socket
+import base64
+import urllib.parse
+import urllib.request
+import yaml
 import zipfile
-from argparse import BooleanOptionalAction
-from base64 import urlsafe_b64encode
+import tempfile
+import json
+
+# TODO change to only import defusedxml once its installed everywhere
+try:
+    import defusedxml.ElementTree as XMLElementTree
+except ImportError:
+    import xml.etree.ElementTree as XMLElementTree  # nosec this is a fallback only
+
 from binascii import hexlify
 from datetime import datetime, timedelta, timezone
-from pathlib import Path
+from distutils.version import LooseVersion
 from queue import Queue
-from typing import List
-from urllib.parse import urlparse, urlsplit, urlunparse
 from zipfile import ZipFile
 
-import defusedxml.ElementTree as XMLElementTree
-import git
-from asn1crypto import cms
+from pyasn1.codec.der import decoder, encoder
+from pyasn1_modules import rfc2315
+from pyasn1.error import PyAsn1Error
 
 import fdroidserver.metadata
+import fdroidserver.lint
 from fdroidserver import _
-from fdroidserver._yaml import config_dump, yaml
-from fdroidserver.exception import (
-    BuildException,
-    FDroidException,
-    MetaDataException,
-    NoSubmodulesException,
-    VCSException,
-    VerificationException,
-)
-
-from . import apksigcopier, common
+from fdroidserver.exception import FDroidException, VCSException, NoSubmodulesException,\
+    BuildException, VerificationException, MetaDataException
 from .asynchronousfilereader import AsynchronousFileReader
-from .looseversion import LooseVersion
 
 # The path to this fdroidserver distribution
 FDROID_PATH = os.path.realpath(os.path.join(os.path.dirname(__file__), '..'))
 
-# There needs to be a default, and this is the most common for software.
-DEFAULT_LOCALE = 'en-US'
-
 # this is the build-tools version, aapt has a separate version that
 # has to be manually set in test_aapt_version()
 MINIMUM_AAPT_BUILD_TOOLS_VERSION = '26.0.0'
-# 33.0.x has a bug that verifies APKs it shouldn't https://gitlab.com/fdroid/fdroidserver/-/issues/1253
-# 31.0.0 is the first version to support --v4-signing-enabled.
-# we only require 30.0.0 for now as that's the version in buster-backports, see also signindex.py
 # 26.0.2 is the first version recognizing md5 based signatures as valid again
 # (as does android, so we want that)
-MINIMUM_APKSIGNER_BUILD_TOOLS_VERSION = '30.0.0'
+MINIMUM_APKSIGNER_BUILD_TOOLS_VERSION = '26.0.2'
 
 VERCODE_OPERATION_RE = re.compile(r'^([ 0-9/*+-]|%c)+$')
 
 # A signature block file with a .DSA, .RSA, or .EC extension
-SIGNATURE_BLOCK_FILE_REGEX = re.compile(r'\AMETA-INF/.*\.(DSA|EC|RSA)\Z', re.DOTALL)
+SIGNATURE_BLOCK_FILE_REGEX = re.compile(r'^META-INF/.*\.(DSA|EC|RSA)$')
 APK_NAME_REGEX = re.compile(r'^([a-zA-Z][\w.]*)_(-?[0-9]+)_?([0-9a-f]{7})?\.apk')
 APK_ID_TRIPLET_REGEX = re.compile(r"^package: name='(\w[^']*)' versionCode='([^']+)' versionName='([^']*)'")
 STANDARD_FILE_NAME_REGEX = re.compile(r'^(\w[\w.]*)_(-?[0-9]+)\.\w+')
@@ -134,68 +90,48 @@ VALID_APPLICATION_ID_REGEX = re.compile(r'''(?:^[a-z_]+(?:\d*[a-zA-Z_]*)*)(?:\.[
                                         re.IGNORECASE)
 ANDROID_PLUGIN_REGEX = re.compile(r'''\s*(:?apply plugin:|id)\(?\s*['"](android|com\.android\.application)['"]\s*\)?''')
 
+SETTINGS_GRADLE_REGEX = re.compile(r'settings\.gradle(?:\.kts)?')
+GRADLE_SUBPROJECT_REGEX = re.compile(r'''['"]:([^'"]+)['"]''')
+
 MAX_VERSION_CODE = 0x7fffffff  # Java's Integer.MAX_VALUE (2147483647)
 
 XMLNS_ANDROID = '{http://schemas.android.com/apk/res/android}'
 
-# https://docs.gitlab.com/ee/user/gitlab_com/#gitlab-pages
-GITLAB_COM_PAGES_MAX_SIZE = 1000000000
-
-# the names used for things that are configured per-repo
-ANTIFEATURES_CONFIG_NAME = 'antiFeatures'
-CATEGORIES_CONFIG_NAME = 'categories'
-CONFIG_CONFIG_NAME = 'config'
-MIRRORS_CONFIG_NAME = 'mirrors'
-RELEASECHANNELS_CONFIG_NAME = "releaseChannels"
-CONFIG_NAMES = (
-    ANTIFEATURES_CONFIG_NAME,
-    CATEGORIES_CONFIG_NAME,
-    CONFIG_CONFIG_NAME,
-    MIRRORS_CONFIG_NAME,
-    RELEASECHANNELS_CONFIG_NAME,
-)
-
-CONFIG_FILE = 'config.yml'
-
 config = None
 options = None
 env = None
 orig_path = None
 
 
-def get_default_cachedir():
-    """Get a cachedir, using platformdirs for cross-platform, but works without.
-
-    Once platformdirs is installed everywhere, this function can be
-    removed.
-
-    """
-    appname = __name__.split('.')[0]
-    try:
-        import platformdirs
-
-        return platformdirs.user_cache_dir(appname, 'F-Droid')
-    except ImportError:
-        return str(Path.home() / '.cache' / appname)
-
-
-# All paths in the config must be strings, never pathlib.Path instances
 default_config = {
     'sdk_path': "$ANDROID_HOME",
-    'ndk_paths': {},
-    'cachedir': get_default_cachedir(),
+    'ndk_paths': {
+        'r10e': None,
+        'r11c': None,
+        'r12b': "$ANDROID_NDK",
+        'r13b': None,
+        'r14b': None,
+        'r15c': None,
+        'r16b': None,
+    },
+    'cachedir': os.path.join(os.getenv('HOME'), '.cache', 'fdroidserver'),
     'java_paths': None,
     'scan_binary': False,
     'ant': "ant",
     'mvn3': "mvn",
-    'gradle': shutil.which('gradlew-fdroid'),
+    'gradle': os.path.join(FDROID_PATH, 'gradlew-fdroid'),
+    'gradle_version_dir': os.path.join(os.path.join(os.getenv('HOME'), '.cache', 'fdroidserver'), 'gradle'),
     'sync_from_local_copy_dir': False,
     'allow_disabled_algorithms': False,
-    'keep_when_not_allowed': False,
     'per_app_repos': False,
     'make_current_version_link': False,
     'current_version_name_source': 'Name',
     'deploy_process_logs': False,
+    'update_stats': False,
+    'stats_ignore': [],
+    'stats_server': None,
+    'stats_user': None,
+    'stats_to_carbon': False,
     'repo_maxage': 0,
     'build_server_always': False,
     'keystore': 'keystore.p12',
@@ -210,129 +146,33 @@ default_config = {
     },
     'keyaliases': {},
     'repo_url': "https://MyFirstFDroidRepo.org/fdroid/repo",
-    'repo_name': "My First F-Droid Repo Demo",
-    'repo_icon': "icon.png",
-    'repo_description': _("""This is a repository of apps to be used with F-Droid. Applications in this repository are either official binaries built by the original application developers, or are binaries built from source by the admin of f-droid.org using the tools on https://gitlab.com/fdroid."""),  # type: ignore
-    'archive_name': 'My First F-Droid Archive Demo',
-    'archive_description': _('These are the apps that have been archived from the main repo.'),  # type: ignore
+    'repo_name': "My First FDroid Repo Demo",
+    'repo_icon': "fdroid-icon.png",
+    'repo_description': _('''
+        This is a repository of apps to be used with FDroid. Applications in this
+        repository are either official binaries built by the original application
+        developers, or are binaries built from source by f-droid.org using the
+        tools on https://gitlab.com/fdroid.
+        '''),
+    'archive_description': _('These are the apps that have been archived from the main repo.'),
     'archive_older': 0,
+    'lint_licenses': fdroidserver.lint.APPROVED_LICENSES,
     'git_mirror_size_limit': 10000000000,
-    'scanner_signature_sources': ['suss'],
 }
 
 
-def get_options():
-    """Return options as set up by parse_args().
-
-    This provides an easy way to get the global instance without
-    having to think about very confusing import and submodule
-    visibility.  The code should be probably refactored so it does not
-    need this.  If each individual option value was always passed to
-    functions as args, for example.
-
-    https://docs.python.org/3/reference/import.html#submodules
-
-    """
-    return fdroidserver.common.options
-
-
-def parse_args(parser):
-    """Call parser.parse_args(), store result in module-level variable and return it.
-
-    This is needed to set up the copy of the options instance in the
-    fdroidserver.common module.  A subcommand only needs to call this
-    if it uses functions from fdroidserver.common that expect the
-    "options" variable to be initialized.
-
-    """
-    fdroidserver.common.options = parser.parse_args()
-    return fdroidserver.common.options
-
-
 def setup_global_opts(parser):
     try:  # the buildserver VM might not have PIL installed
         from PIL import PngImagePlugin
-
         logger = logging.getLogger(PngImagePlugin.__name__)
         logger.setLevel(logging.INFO)  # tame the "STREAM" debug messages
     except ImportError:
         pass
 
-    parser.add_argument(
-        "-v",
-        "--verbose",
-        action="store_true",
-        default=False,
-        help=_("Spew out even more information than normal"),
-    )
-    parser.add_argument(
-        "-q",
-        "--quiet",
-        action="store_true",
-        default=False,
-        help=_("Restrict output to warnings and errors"),
-    )
-    parser.add_argument(
-        "--color",
-        action=BooleanOptionalAction,
-        default=None,
-        help=_("Color the log output"),
-    )
-
-
-class ColorFormatter(logging.Formatter):
-
-    def __init__(self, msg):
-        logging.Formatter.__init__(self, msg)
-
-        bright_black = "\x1b[90;20m"
-        yellow = "\x1b[33;20m"
-        red = "\x1b[31;20m"
-        bold_red = "\x1b[31;1m"
-        reset = "\x1b[0m"
-
-        self.FORMATS = {
-            logging.DEBUG: bright_black + msg + reset,
-            logging.INFO: reset + msg + reset,  # use default color
-            logging.WARNING: yellow + msg + reset,
-            logging.ERROR: red + msg + reset,
-            logging.CRITICAL: bold_red + msg + reset
-        }
-
-    def format(self, record):
-        log_fmt = self.FORMATS.get(record.levelno)
-        formatter = logging.Formatter(log_fmt)
-        return formatter.format(record)
-
-
-def set_console_logging(verbose=False, color=False):
-    """Globally set logging to output nicely to the console."""
-
-    class _StdOutFilter(logging.Filter):
-        def filter(self, record):
-            return record.levelno < logging.ERROR
-
-    if verbose:
-        level = logging.DEBUG
-    else:
-        level = logging.ERROR
-
-    if color or (color is None and sys.stdout.isatty()):
-        formatter = ColorFormatter
-    else:
-        formatter = logging.Formatter
-
-    stdout_handler = logging.StreamHandler(sys.stdout)
-    stdout_handler.addFilter(_StdOutFilter())
-    stdout_handler.setFormatter(formatter('%(message)s'))
-
-    stderr_handler = logging.StreamHandler(sys.stderr)
-    stderr_handler.setLevel(logging.ERROR)
-    stderr_handler.setFormatter(formatter(_('ERROR: %(message)s')))
-
-    logging.basicConfig(
-        force=True, level=level, handlers=[stdout_handler, stderr_handler]
-    )
+    parser.add_argument("-v", "--verbose", action="store_true", default=False,
+                        help=_("Spew out even more information than normal"))
+    parser.add_argument("-q", "--quiet", action="store_true", default=False,
+                        help=_("Restrict output to warnings and errors"))
 
 
 def _add_java_paths_to_config(pathlist, thisconfig):
@@ -351,18 +191,18 @@ def _add_java_paths_to_config(pathlist, thisconfig):
         j = os.path.basename(d)
         # the last one found will be the canonical one, so order appropriately
         for regex in [
-                r'^1\.([126-9][0-9]?)\.0\.jdk$',  # OSX
-                r'^jdk1\.([126-9][0-9]?)\.0_[0-9]+.jdk$',  # OSX and Oracle tarball
-                r'^jdk1\.([126-9][0-9]?)\.0_[0-9]+$',  # Oracle Windows
-                r'^jdk([126-9][0-9]?)-openjdk$',  # Arch
-                r'^java-([126-9][0-9]?)-openjdk$',  # Arch
-                r'^java-([126-9][0-9]?)-jdk$',  # Arch (oracle)
-                r'^java-1\.([126-9][0-9]?)\.0-.*$',  # RedHat
-                r'^java-([126-9][0-9]?)-oracle$',  # Debian WebUpd8
-                r'^jdk-([126-9][0-9]?)-oracle-.*$',  # Debian make-jpkg
-                r'^java-([126-9][0-9]?)-openjdk-.*$',  # Debian
-                r'^oracle-jdk-bin-1\.([126-9][0-9]?).*$',  # Gentoo (oracle)
-                r'^icedtea-bin-([126-9][0-9]?).*$',  # Gentoo (openjdk)
+                r'^1\.([16-9][0-9]?)\.0\.jdk$',  # OSX
+                r'^jdk1\.([16-9][0-9]?)\.0_[0-9]+.jdk$',  # OSX and Oracle tarball
+                r'^jdk1\.([16-9][0-9]?)\.0_[0-9]+$',  # Oracle Windows
+                r'^jdk([16-9][0-9]?)-openjdk$',  # Arch
+                r'^java-([16-9][0-9]?)-openjdk$',  # Arch
+                r'^java-([16-9][0-9]?)-jdk$',  # Arch (oracle)
+                r'^java-1\.([16-9][0-9]?)\.0-.*$',  # RedHat
+                r'^java-([16-9][0-9]?)-oracle$',  # Debian WebUpd8
+                r'^jdk-([16-9][0-9]?)-oracle-.*$',  # Debian make-jpkg
+                r'^java-([16-9][0-9]?)-openjdk-[^c][^o][^m].*$',  # Debian
+                r'^oracle-jdk-bin-1\.([17-9][0-9]?).*$',  # Gentoo (oracle)
+                r'^icedtea-bin-([17-9][0-9]?).*$',  # Gentoo (openjdk)
                 ]:
             m = re.match(regex, j)
             if not m:
@@ -373,24 +213,13 @@ def _add_java_paths_to_config(pathlist, thisconfig):
 
 
 def fill_config_defaults(thisconfig):
-    """Fill in the global config dict with relevant defaults.
-
-    For config values that have a path that can be expanded, e.g. an
-    env var or a ~/, this will store the original value using "_orig"
-    appended to the key name so that if the config gets written out,
-    it will preserve the original, unexpanded string.
-
-    """
     for k, v in default_config.items():
         if k not in thisconfig:
-            if isinstance(v, dict) or isinstance(v, list):
-                thisconfig[k] = v.copy()
-            else:
-                thisconfig[k] = v
+            thisconfig[k] = v
 
     # Expand paths (~users and $vars)
     def expand_path(path):
-        if not path or not isinstance(path, str):
+        if path is None:
             return None
         orig = path
         path = os.path.expanduser(path)
@@ -399,7 +228,7 @@ def fill_config_defaults(thisconfig):
             return None
         return path
 
-    for k in ['sdk_path', 'ant', 'mvn3', 'gradle', 'keystore']:
+    for k in ['sdk_path', 'ant', 'mvn3', 'gradle', 'keystore', 'repo_icon']:
         v = thisconfig[k]
         exp = expand_path(v)
         if exp is not None:
@@ -410,20 +239,19 @@ def fill_config_defaults(thisconfig):
     if thisconfig['java_paths'] is None:
         thisconfig['java_paths'] = dict()
         pathlist = []
-        pathlist += glob.glob('/usr/lib/jvm/j*[126-9]*')
-        pathlist += glob.glob('/usr/java/jdk1.[126-9]*')
-        pathlist += glob.glob('/System/Library/Java/JavaVirtualMachines/1.[126-9][0-9]?.0.jdk')
+        pathlist += glob.glob('/usr/lib/jvm/j*[16-9]*')
+        pathlist += glob.glob('/usr/java/jdk1.[16-9]*')
+        pathlist += glob.glob('/System/Library/Java/JavaVirtualMachines/1.[16-9][0-9]?.0.jdk')
         pathlist += glob.glob('/Library/Java/JavaVirtualMachines/*jdk*[0-9]*')
         pathlist += glob.glob('/opt/oracle-jdk-*1.[0-9]*')
         pathlist += glob.glob('/opt/icedtea-*[0-9]*')
         if os.getenv('JAVA_HOME') is not None:
             pathlist.append(os.getenv('JAVA_HOME'))
         if os.getenv('PROGRAMFILES') is not None:
-            pathlist += glob.glob(os.path.join(os.getenv('PROGRAMFILES'), 'Java', 'jdk1.[126-9][0-9]?.*'))
+            pathlist += glob.glob(os.path.join(os.getenv('PROGRAMFILES'), 'Java', 'jdk1.[16-9][0-9]?.*'))
         _add_java_paths_to_config(pathlist, thisconfig)
 
-    for java_version in range(29, 6, -1):
-        java_version = str(java_version)
+    for java_version in ('14', '13', '12', '11', '10', '9', '8', '7'):
         if java_version not in thisconfig['java_paths']:
             continue
         java_home = thisconfig['java_paths'][java_version]
@@ -438,17 +266,6 @@ def fill_config_defaults(thisconfig):
     if 'keytool' not in thisconfig and shutil.which('keytool'):
         thisconfig['keytool'] = shutil.which('keytool')
 
-    # enable apksigner by default so v2/v3 APK signatures validate
-    find_apksigner(thisconfig)
-    if not thisconfig.get('apksigner'):
-        logging.warning(_('apksigner not found! Cannot sign or verify modern APKs'))
-
-    if 'ipfs_cid' not in thisconfig and shutil.which('ipfs_cid'):
-        thisconfig['ipfs_cid'] = shutil.which('ipfs_cid')
-    cmd = sys.argv[1] if len(sys.argv) >= 2 else ''
-    if cmd == 'update' and not thisconfig.get('ipfs_cid'):
-        logging.debug(_("ipfs_cid not found, skipping CIDv1 generation"))
-
     for k in ['ndk_paths', 'java_paths']:
         d = thisconfig[k]
         for k2 in d.copy():
@@ -458,70 +275,6 @@ def fill_config_defaults(thisconfig):
                 thisconfig[k][k2] = exp
                 thisconfig[k][k2 + '_orig'] = v
 
-    ndk_paths = thisconfig.get('ndk_paths', {})
-
-    ndk_bundle = os.path.join(thisconfig['sdk_path'], 'ndk-bundle')
-    if os.path.exists(ndk_bundle):
-        version = get_ndk_version(ndk_bundle)
-        if version not in ndk_paths:
-            ndk_paths[version] = ndk_bundle
-
-    ndk_dir = os.path.join(thisconfig['sdk_path'], 'ndk')
-    if os.path.exists(ndk_dir):
-        for ndk in glob.glob(os.path.join(ndk_dir, '*')):
-            version = get_ndk_version(ndk)
-            if version not in ndk_paths:
-                ndk_paths[version] = ndk
-
-    if 'cachedir_scanner' not in thisconfig:
-        thisconfig['cachedir_scanner'] = str(Path(thisconfig['cachedir']) / 'scanner')
-    if 'gradle_version_dir' not in thisconfig:
-        thisconfig['gradle_version_dir'] = str(Path(thisconfig['cachedir']) / 'gradle')
-
-
-def get_config():
-    """Get the initalized, singleton config instance.
-
-    config and options are intertwined in read_config(), so they have
-    to be here too.  In the current ugly state of things, there are
-    multiple potential instances of config and options in use:
-
-    * global
-    * module-level in the subcommand module (e.g. fdroidserver/build.py)
-    * module-level in fdroidserver.common
-
-    There are some insane parts of the code that are probably
-    referring to multiple instances of these at different points.
-    This can be super confusing and maddening.
-
-    The current intermediate refactoring step is to move all
-    subcommands to always get/set config and options via this function
-    so that there is no longer a distinction between the global and
-    module-level instances.  Then there can be only one module-level
-    instance in fdroidserver.common.
-
-    """
-    global config
-
-    if config is not None:
-        return config
-
-    read_config()
-
-    # make sure these values are available in common.py even if they didn't
-    # declare global in a scope
-    common.config = config
-
-    return config
-
-
-def get_cachedir():
-    cachedir = config and config.get('cachedir')
-    if cachedir and os.path.exists(cachedir):
-        return Path(cachedir)
-    else:
-        return Path(tempfile.mkdtemp())
-
 
 def regsub_file(pattern, repl, path):
     with open(path, 'rb') as f:
@@ -531,126 +284,58 @@ def regsub_file(pattern, repl, path):
         f.write(text)
 
 
-def config_type_check(path, data):
-    if Path(path).name == 'mirrors.yml':
-        expected_type = list
-    else:
-        expected_type = dict
-    if expected_type == dict:
-        if not isinstance(data, dict):
-            msg = _('{path} is not "key: value" dict, but a {datatype}!')
-            raise TypeError(msg.format(path=path, datatype=type(data).__name__))
-    elif not isinstance(data, expected_type):
-        msg = _('{path} is not {expected_type}, but a {datatype}!')
-        raise TypeError(
-            msg.format(
-                path=path,
-                expected_type=expected_type.__name__,
-                datatype=type(data).__name__,
-            )
-        )
+def read_config(opts):
+    """Read the repository config
 
-
-class _Config(dict):
-    def __init__(self, default={}):
-        super(_Config, self).__init__(default)
-        self.loaded = {}
-
-    def lazyget(self, key):
-        if key not in self.loaded:
-            value = super(_Config, self).__getitem__(key)
-
-            if key == 'serverwebroot':
-                roots = parse_list_of_dicts(value)
-                rootlist = []
-                for d in roots:
-                    # since this is used with rsync, where trailing slashes have
-                    # meaning, ensure there is always a trailing slash
-                    rootstr = d.get('url')
-                    if not rootstr:
-                        logging.error('serverwebroot: has blank value!')
-                        continue
-                    if rootstr[-1] != '/':
-                        rootstr += '/'
-                    d['url'] = rootstr.replace('//', '/')
-                    rootlist.append(d)
-                self.loaded[key] = rootlist
-
-            elif key == 'servergitmirrors':
-                self.loaded[key] = parse_list_of_dicts(value)
-
-            elif isinstance(value, dict) and 'env' in value and len(value) == 1:
-                var = value['env']
-                if var in os.environ:
-                    self.loaded[key] = os.getenv(var)
-                else:
-                    logging.error(
-                        _(
-                            'Environment variable {var} from {configname} is not set!'
-                        ).format(var=value['env'], configname=key)
-                    )
-                    self.loaded[key] = None
-            else:
-                self.loaded[key] = value
-
-        return self.loaded[key]
-
-    def __getitem__(self, key):
-        return self.lazyget(key)
-
-    def get(self, key, default=None, /):
-        try:
-            return self.lazyget(key)
-        except KeyError:
-            return default
-
-
-def read_config():
-    """Read the repository config.
-
-    The config is read from config.yml, which is in the current
+    The config is read from config_file, which is in the current
     directory when any of the repo management commands are used. If
     there is a local metadata file in the git repo, then the config is
     not required, just use defaults.
 
     config.yml is the preferred form because no code is executed when
-    reading it.  config.py is deprecated and no longer supported.
-
-    config.yml requires ASCII or UTF-8 encoding because this code does
-    not auto-detect the file's encoding.  That is left up to the YAML
-    library.  YAML allows ASCII, UTF-8, UTF-16, and UTF-32 encodings.
-    Since it is a good idea to manage config.yml (WITHOUT PASSWORDS!)
-    in git, it makes sense to use a globally standard encoding.
+    reading it.  config.py is deprecated and supported for backwards
+    compatibility.
 
     """
-    global config
+    global config, options
 
     if config is not None:
         return config
 
+    options = opts
+
     config = {}
-
-    if os.path.exists(CONFIG_FILE):
-        logging.debug(_("Reading '{config_file}'").format(config_file=CONFIG_FILE))
-        with open(CONFIG_FILE, encoding='utf-8') as fp:
-            config = yaml.load(fp)
-        if not config:
-            config = {}
-        config_type_check(CONFIG_FILE, config)
-
+    config_file = 'config.yml'
     old_config_file = 'config.py'
-    if os.path.exists(old_config_file):
-        logging.warning(
-            _("""Ignoring deprecated {oldfile}, use {newfile}!""").format(
-                oldfile=old_config_file, newfile=CONFIG_FILE
-            )
-        )
+
+    if os.path.exists(config_file) and os.path.exists(old_config_file):
+        logging.error(_("""Conflicting config files! Using {newfile}, ignoring {oldfile}!""")
+                      .format(oldfile=old_config_file, newfile=config_file))
+
+    if os.path.exists(config_file):
+        logging.debug(_("Reading '{config_file}'").format(config_file=config_file))
+        with open(config_file) as fp:
+            config = yaml.safe_load(fp)
+    elif os.path.exists(old_config_file):
+        logging.warning(_("""{oldfile} is deprecated, use {newfile}""")
+                        .format(oldfile=old_config_file, newfile=config_file))
+        with io.open(old_config_file, "rb") as fp:
+            code = compile(fp.read(), old_config_file, 'exec')
+            exec(code, None, config)  # nosec TODO automatically migrate
+    else:
+        logging.warning(_("No config.yml found, using defaults."))
+
+    for k in ('mirrors', 'install_list', 'uninstall_list', 'serverwebroot', 'servergitroot'):
+        if k in config:
+            if not type(config[k]) in (str, list, tuple):
+                logging.warning(
+                    _("'{field}' will be in random order! Use () or [] brackets if order is important!")
+                    .format(field=k))
 
     # smartcardoptions must be a list since its command line args for Popen
     smartcardoptions = config.get('smartcardoptions')
     if isinstance(smartcardoptions, str):
-        sco_items = re.sub(r'\s+', r' ', config['smartcardoptions']).split(' ')
-        config['smartcardoptions'] = [i.strip() for i in sco_items if i]
+        config['smartcardoptions'] = re.sub(r'\s+', r' ', config['smartcardoptions']).split(' ')
     elif not smartcardoptions and 'keystore' in config and config['keystore'] == 'NONE':
         # keystore='NONE' means use smartcard, these are required defaults
         config['smartcardoptions'] = ['-storetype', 'PKCS11', '-providerName',
@@ -658,20 +343,46 @@ def read_config():
                                       'sun.security.pkcs11.SunPKCS11',
                                       '-providerArg', 'opensc-fdroid.cfg']
 
+    if any(k in config for k in ["keystore", "keystorepass", "keypass"]):
+        if os.path.exists(config_file):
+            f = config_file
+        elif os.path.exists(old_config_file):
+            f = old_config_file
+        st = os.stat(f)
+        if st.st_mode & stat.S_IRWXG or st.st_mode & stat.S_IRWXO:
+            logging.warning(_("unsafe permissions on '{config_file}' (should be 0600)!")
+                            .format(config_file=f))
+
     fill_config_defaults(config)
 
+    if 'serverwebroot' in config:
+        if isinstance(config['serverwebroot'], str):
+            roots = [config['serverwebroot']]
+        elif all(isinstance(item, str) for item in config['serverwebroot']):
+            roots = config['serverwebroot']
+        else:
+            raise TypeError(_('only accepts strings, lists, and tuples'))
+        rootlist = []
+        for rootstr in roots:
+            # since this is used with rsync, where trailing slashes have
+            # meaning, ensure there is always a trailing slash
+            if rootstr[-1] != '/':
+                rootstr += '/'
+            rootlist.append(rootstr.replace('//', '/'))
+        config['serverwebroot'] = rootlist
+
     if 'servergitmirrors' in config:
+        if isinstance(config['servergitmirrors'], str):
+            roots = [config['servergitmirrors']]
+        elif all(isinstance(item, str) for item in config['servergitmirrors']):
+            roots = config['servergitmirrors']
+        else:
+            raise TypeError(_('only accepts strings, lists, and tuples'))
+        config['servergitmirrors'] = roots
+
         limit = config['git_mirror_size_limit']
         config['git_mirror_size_limit'] = parse_human_readable_size(limit)
 
-    if 'repo_url' in config:
-        if not config['repo_url'].endswith('/repo'):
-            raise FDroidException(_('repo_url needs to end with /repo'))
-
-    if 'archive_url' in config:
-        if not config['archive_url'].endswith('/archive'):
-            raise FDroidException(_('archive_url needs to end with /archive'))
-
     confignames_to_delete = set()
     for configname, dictvalue in config.items():
         if configname == 'java_paths':
@@ -683,163 +394,25 @@ def read_config():
             continue
         elif isinstance(dictvalue, dict):
             for k, v in dictvalue.items():
-                if k != 'env':
+                if k == 'env':
+                    env = os.getenv(v)
+                    if env:
+                        config[configname] = env
+                    else:
+                        confignames_to_delete.add(configname)
+                        logging.error(_('Environment variable {var} from {configname} is not set!')
+                                      .format(var=k, configname=configname))
+                else:
                     confignames_to_delete.add(configname)
                     logging.error(_('Unknown entry {key} in {configname}')
                                   .format(key=k, configname=configname))
 
     for configname in confignames_to_delete:
-        del config[configname]
+        del(config[configname])
 
-    if any(k in config and config.get(k) for k in ["keystorepass", "keypass"]):
-        st = os.stat(CONFIG_FILE)
-        if st.st_mode & stat.S_IRWXG or st.st_mode & stat.S_IRWXO:
-            logging.warning(
-                _("unsafe permissions on '{config_file}' (should be 0600)!").format(
-                    config_file=CONFIG_FILE
-                )
-            )
-
-    config = _Config(config)
     return config
 
 
-def expand_env_dict(s):
-    """Expand env var dict to a string value.
-
-    {env: varName} syntax can be used to replace any string value in the
-    config with the value of an environment variable "varName".  This
-    allows for secrets management when commiting the config file to a
-    public git repo.
-
-    """
-    if not s or type(s) not in (str, dict):
-        return
-    if isinstance(s, dict):
-        if 'env' not in s or len(s) > 1:
-            raise TypeError(_('Only accepts a single key "env"'))
-        var = s['env']
-        s = os.getenv(var)
-        if not s:
-            logging.error(
-                _('Environment variable {{env: {var}}} is not set!').format(var=var)
-            )
-            return
-    return os.path.expanduser(s)
-
-
-def parse_list_of_dicts(l_of_d):
-    """Parse config data structure that is a list of dicts of strings.
-
-    The value can be specified as a string, list of strings, or list of dictionary maps
-    where the values are strings.
-
-    """
-    if isinstance(l_of_d, str):
-        return [{"url": expand_env_dict(l_of_d)}]
-    if isinstance(l_of_d, dict):
-        return [{"url": expand_env_dict(l_of_d)}]
-    if all(isinstance(item, str) for item in l_of_d):
-        return [{'url': expand_env_dict(i)} for i in l_of_d]
-    if all(isinstance(item, dict) for item in l_of_d):
-        for item in l_of_d:
-            item['url'] = expand_env_dict(item['url'])
-        return l_of_d
-    raise TypeError(_('only accepts strings, lists, and tuples'))
-
-
-def get_mirrors(url, filename=None):
-    """Get list of dict entries for mirrors, appending filename if provided."""
-    # TODO use cached index if it exists
-    if isinstance(url, str):
-        url = urlsplit(url)
-
-    if url.netloc == 'f-droid.org':
-        mirrors = FDROIDORG_MIRRORS
-    else:
-        mirrors = parse_list_of_dicts(url.geturl())
-
-    if filename:
-        return append_filename_to_mirrors(filename, mirrors)
-    else:
-        return mirrors
-
-
-def append_filename_to_mirrors(filename, mirrors):
-    """Append the filename to all "url" entries in the mirrors dict."""
-    appended = copy.deepcopy(mirrors)
-    for mirror in appended:
-        parsed = urlparse(mirror['url'])
-        mirror['url'] = urlunparse(
-            parsed._replace(path=os.path.join(parsed.path, filename))
-        )
-    return appended
-
-
-def file_entry(filename, hash_value=None):
-    meta = {}
-    meta["name"] = "/" + Path(filename).as_posix().split("/", 1)[1]
-    meta["sha256"] = hash_value or sha256sum(filename)
-    meta["size"] = os.stat(filename).st_size
-    return meta
-
-
-def load_localized_config(name, repodir):
-    """Load localized config files and put them into internal dict format.
-
-    This will maintain the order as came from the data files, e.g
-    YAML.  The locale comes from unsorted paths on the filesystem, so
-    that is separately sorted.
-
-    """
-    ret = dict()
-    found_config_file = False
-    for f in Path().glob("config/**/{name}.yml".format(name=name)):
-        found_config_file = True
-        locale = f.parts[1]
-        if len(f.parts) == 2:
-            locale = DEFAULT_LOCALE
-        with open(f, encoding="utf-8") as fp:
-            elem = yaml.load(fp)
-            if not isinstance(elem, dict):
-                msg = _('{path} is not "key: value" dict, but a {datatype}!')
-                raise TypeError(msg.format(path=f, datatype=type(elem).__name__))
-            for afname, field_dict in elem.items():
-                if afname not in ret:
-                    ret[afname] = dict()
-                for key, value in field_dict.items():
-                    if key not in ret[afname]:
-                        ret[afname][key] = dict()
-                    if key == "icon":
-                        icons_dir = os.path.join(repodir, 'icons')
-                        if not os.path.exists(icons_dir):
-                            os.makedirs(icons_dir, exist_ok=True)
-                        src = os.path.join("config", value)
-                        dest = os.path.join(icons_dir, os.path.basename(src))
-                        if not os.path.exists(dest) or not filecmp.cmp(src, dest):
-                            shutil.copy2(src, dest)
-                        ret[afname][key][locale] = file_entry(
-                            os.path.join(icons_dir, value)
-                        )
-                    else:
-                        ret[afname][key][locale] = value
-
-    if not found_config_file:
-        for f in Path().glob("config/*.yml"):
-            if f.stem not in CONFIG_NAMES:
-                msg = _('{path} is not a standard config file!').format(path=f)
-                m = difflib.get_close_matches(f.stem, CONFIG_NAMES, 1)
-                if m:
-                    msg += ' '
-                    msg += _('Did you mean config/{name}.yml?').format(name=m[0])
-                logging.error(msg)
-
-    for elem in ret.values():
-        for afname in elem:
-            elem[afname] = {locale: v for locale, v in sorted(elem[afname].items())}
-    return ret
-
-
 def parse_human_readable_size(size):
     units = {
         'b': 1,
@@ -848,26 +421,20 @@ def parse_human_readable_size(size):
     }
     try:
         return int(float(size))
-    except (ValueError, TypeError) as exc:
+    except (ValueError, TypeError):
         if type(size) != str:
             raise ValueError(_('Could not parse size "{size}", wrong type "{type}"')
-                             .format(size=size, type=type(size))) from exc
+                             .format(size=size, type=type(size)))
         s = size.lower().replace(' ', '')
-        m = re.match(r'^(?P<value>[0-9][0-9.]*) *(?P<unit>' + r'|'.join(units.keys()) + r')$', s)
+        m = re.match(r'^(?P<value>[0-9][0-9.]+) *(?P<unit>' + r'|'.join(units.keys()) + r')$', s)
         if not m:
-            raise ValueError(_('Not a valid size definition: "{}"').format(size)) from exc
+            raise ValueError(_('Not a valid size definition: "{}"').format(size))
         return int(float(m.group("value")) * units[m.group("unit")])
 
 
-def get_dir_size(path_or_str):
-    """Get the total size of all files in the given directory."""
-    if isinstance(path_or_str, str):
-        path_or_str = Path(path_or_str)
-    return sum(f.stat().st_size for f in path_or_str.glob('**/*') if f.is_file())
-
-
 def assert_config_keystore(config):
     """Check weather keystore is configured correctly and raise exception if not."""
+
     nosigningkey = False
     if 'repo_keyalias' not in config:
         nosigningkey = True
@@ -893,60 +460,39 @@ def assert_config_keystore(config):
                               + "you can create one using: fdroid update --create-key")
 
 
-def find_apksigner(config):
-    """Search for the best version apksigner and adds it to the config.
-
+def find_apksigner():
+    """
     Returns the best version of apksigner following this algorithm:
-
     * use config['apksigner'] if set
     * try to find apksigner in path
     * find apksigner in build-tools starting from newest installed
       going down to MINIMUM_APKSIGNER_BUILD_TOOLS_VERSION
-
-    Returns
-    -------
-    str
-        path to apksigner or None if no version is found
-
+    :return: path to apksigner or None if no version is found
     """
-    command = 'apksigner'
-    if command in config:
-        return
-
-    tmp = find_command(command)
-    if tmp is not None:
-        config[command] = tmp
-        return
-
-    build_tools_path = os.path.join(config.get('sdk_path', ''), 'build-tools')
+    if set_command_in_config('apksigner'):
+        return config['apksigner']
+    build_tools_path = os.path.join(config['sdk_path'], 'build-tools')
     if not os.path.isdir(build_tools_path):
-        return
+        return None
     for f in sorted(os.listdir(build_tools_path), reverse=True):
         if not os.path.isdir(os.path.join(build_tools_path, f)):
             continue
         try:
-            version = LooseVersion(f)
-            if version >= LooseVersion('33') and version < LooseVersion('34'):
-                logging.warning(
-                    _('apksigner in build-tools;{version} passes APKs with invalid v3 signatures, ignoring.').format(
-                        version=version
-                    )
-                )
-                continue
-            if version < LooseVersion(MINIMUM_APKSIGNER_BUILD_TOOLS_VERSION):
-                logging.debug("Local Android SDK only has outdated apksigner versions")
-                return
+            if LooseVersion(f) < LooseVersion(MINIMUM_APKSIGNER_BUILD_TOOLS_VERSION):
+                return None
         except TypeError:
             continue
         if os.path.exists(os.path.join(build_tools_path, f, 'apksigner')):
             apksigner = os.path.join(build_tools_path, f, 'apksigner')
             logging.info("Using %s " % apksigner)
+            # memoize result
             config['apksigner'] = apksigner
-            return
+            return config['apksigner']
 
 
 def find_sdk_tools_cmd(cmd):
-    """Find a working path to a tool from the Android SDK."""
+    '''find a working path to a tool from the Android SDK'''
+
     tooldirs = []
     if config is not None and 'sdk_path' in config and os.path.exists(config['sdk_path']):
         # try to find a working path to this command, in all the recent possible paths
@@ -962,26 +508,20 @@ def find_sdk_tools_cmd(cmd):
         sdk_platform_tools = os.path.join(config['sdk_path'], 'platform-tools')
         if os.path.exists(sdk_platform_tools):
             tooldirs.append(sdk_platform_tools)
-    sdk_build_tools = glob.glob(os.path.join(config['sdk_path'], 'build-tools', '*.*'))
-    if sdk_build_tools:
-        tooldirs.append(sorted(sdk_build_tools)[-1])  # use most recent version
-    if os.path.exists('/usr/bin'):
-        tooldirs.append('/usr/bin')
+    tooldirs.append('/usr/bin')
     for d in tooldirs:
         path = os.path.join(d, cmd)
-        if not os.path.isfile(path):
-            path += '.exe'
         if os.path.isfile(path):
             if cmd == 'aapt':
                 test_aapt_version(path)
             return path
     # did not find the command, exit with error message
     test_sdk_exists(config)  # ignore result so None is never returned
-    raise FDroidException(_("Android SDK tool {cmd} not found!").format(cmd=cmd))
+    raise FDroidException(_("Android SDK tool {cmd} found!").format(cmd=cmd))
 
 
 def test_aapt_version(aapt):
-    """Check whether the version of aapt is new enough."""
+    '''Check whether the version of aapt is new enough'''
     output = subprocess.check_output([aapt, 'version'], universal_newlines=True)
     if output is None or output == '':
         logging.error(_("'{path}' failed to execute!").format(path=aapt))
@@ -1007,16 +547,13 @@ def test_aapt_version(aapt):
 
 def test_sdk_exists(thisconfig):
     if 'sdk_path' not in thisconfig:
-        # check the 'apksigner' value in the config to see if its new enough
-        f = thisconfig.get('apksigner', '')
-        if os.path.isfile(f):
-            sdk_path = os.path.dirname(os.path.dirname(os.path.dirname(f)))
-            tmpconfig = {'sdk_path': sdk_path}
-            find_apksigner(tmpconfig)
-            if os.path.exists(tmpconfig.get('apksigner', '')):
-                return True
-        logging.error(_("'sdk_path' not set in config.yml!"))
-        return False
+        # TODO convert this to apksigner once it is required
+        if 'aapt' in thisconfig and os.path.isfile(thisconfig['aapt']):
+            test_aapt_version(thisconfig['aapt'])
+            return True
+        else:
+            logging.error(_("'sdk_path' not set in config.yml!"))
+            return False
     if thisconfig['sdk_path'] == default_config['sdk_path']:
         logging.error(_('No Android SDK found!'))
         logging.error(_('You can use ANDROID_HOME to set the path to your SDK, i.e.:'))
@@ -1030,50 +567,36 @@ def test_sdk_exists(thisconfig):
         logging.critical(_("Android SDK path '{path}' is not a directory!")
                          .format(path=thisconfig['sdk_path']))
         return False
-    find_apksigner(thisconfig)
-    if not os.path.exists(thisconfig.get('apksigner', '')):
-        return False
     return True
 
 
 def get_local_metadata_files():
-    """Get any metadata files local to an app's source repo.
+    '''get any metadata files local to an app's source repo
 
     This tries to ignore anything that does not count as app metdata,
     including emacs cruft ending in ~
 
-    """
+    '''
     return glob.glob('.fdroid.[a-jl-z]*[a-rt-z]')
 
 
-def read_pkg_args(appid_versionCode_pairs, allow_version_codes=False):
-    """No summary.
-
-    Parameters
-    ----------
-    appids
-        arguments in the form of multiple appid:[versionCode] strings
-
-    Returns
-    -------
-    a dictionary with the set of vercodes specified for each package
+def read_pkg_args(appid_versionCode_pairs, allow_vercodes=False):
+    """
+    :param appids: arguments in the form of multiple appid:[vc] strings
+    :returns: a dictionary with the set of vercodes specified for each package
     """
     vercodes = {}
     if not appid_versionCode_pairs:
         return vercodes
 
-    error = False
-    apk_regex = re.compile(r'_(\d+)\.apk$')
     for p in appid_versionCode_pairs:
-        # Convert the apk name to a appid:versioncode pair
-        p = apk_regex.sub(r':\1', p)
-        if allow_version_codes and ':' in p:
+        if allow_vercodes and ':' in p:
             package, vercode = p.split(':')
             try:
-                vercode = version_code_string_to_int(vercode)
-            except ValueError as e:
-                logging.error('"%s": %s' % (p, str(e)))
-                error = True
+                i_vercode = int(vercode, 0)
+            except ValueError:
+                i_vercode = int(vercode)
+            vercode = str(i_vercode)
         else:
             package, vercode = p, None
         if package not in vercodes:
@@ -1082,52 +605,20 @@ def read_pkg_args(appid_versionCode_pairs, allow_version_codes=False):
         elif vercode and vercode not in vercodes[package]:
             vercodes[package] += [vercode] if vercode else []
 
-    if error:
-        raise FDroidException(_("Found invalid versionCodes for some apps"))
-
     return vercodes
 
 
-def get_metadata_files(vercodes):
-    """
-    Build a list of metadata files and raise an exception for invalid appids.
-
-    Parameters
-    ----------
-    vercodes
-        versionCodes as returned by read_pkg_args()
-
-    Returns
-    -------
-    List
-        a list of corresponding metadata/*.yml files
-    """
-    found_invalid = False
-    metadatafiles = []
-    for appid in vercodes.keys():
-        f = Path('metadata') / ('%s.yml' % appid)
-        if f.exists():
-            metadatafiles.append(f)
-        else:
-            found_invalid = True
-            logging.critical(_("No such package: %s") % appid)
-    if found_invalid:
-        raise FDroidException(_("Found invalid appids in arguments"))
-    return metadatafiles
-
-
-def read_app_args(appid_versionCode_pairs, allow_version_codes=False, sort_by_time=False):
-    """Build a list of App instances for processing.
+def read_app_args(appid_versionCode_pairs, allapps, allow_vercodes=False):
+    """Build a list of App instances for processing
 
     On top of what read_pkg_args does, this returns the whole app
     metadata, but limiting the builds list to the builds matching the
-    appid_versionCode_pairs and vercodes specified.  If no
-    appid_versionCode_pairs are specified, then all App and Build instances are
-    returned.
+    appid_versionCode_pairs and vercodes specified.  If no appid_versionCode_pairs are specified, then
+    all App and Build instances are returned.
 
     """
-    vercodes = read_pkg_args(appid_versionCode_pairs, allow_version_codes)
-    allapps = fdroidserver.metadata.read_metadata(vercodes, sort_by_time)
+
+    vercodes = read_pkg_args(appid_versionCode_pairs, allow_vercodes)
 
     if not vercodes:
         return allapps
@@ -1137,6 +628,11 @@ def read_app_args(appid_versionCode_pairs, allow_version_codes=False, sort_by_ti
         if appid in vercodes:
             apps[appid] = app
 
+    if len(apps) != len(vercodes):
+        for p in vercodes:
+            if p not in allapps:
+                logging.critical(_("No such package: %s") % p)
+        raise FDroidException(_("Found invalid appids in arguments"))
     if not apps:
         raise FDroidException(_("No packages specified"))
 
@@ -1145,10 +641,10 @@ def read_app_args(appid_versionCode_pairs, allow_version_codes=False, sort_by_ti
         vc = vercodes[appid]
         if not vc:
             continue
-        app['Builds'] = [b for b in app.get('Builds', []) if b.versionCode in vc]
-        if len(app.get('Builds', [])) != len(vercodes[appid]):
+        app.builds = [b for b in app.builds if b.versionCode in vc]
+        if len(app.builds) != len(vercodes[appid]):
             error = True
-            allvcs = [b.versionCode for b in app.get('Builds', [])]
+            allvcs = [b.versionCode for b in app.builds]
             for v in vercodes[appid]:
                 if v not in allvcs:
                     logging.critical(_("No such versionCode {versionCode} for app {appid}")
@@ -1161,7 +657,7 @@ def read_app_args(appid_versionCode_pairs, allow_version_codes=False, sort_by_ti
 
 
 def get_extension(filename):
-    """Get name and extension of filename, with extension always lower case."""
+    """get name and extension of filename, with extension always lower case"""
     base, ext = os.path.splitext(filename)
     if not ext:
         return base, ''
@@ -1175,9 +671,9 @@ def publishednameinfo(filename):
     filename = os.path.basename(filename)
     m = publish_name_regex.match(filename)
     try:
-        result = (m.group(1), int(m.group(2)))
-    except AttributeError as exc:
-        raise FDroidException(_("Invalid name for published file: %s") % filename) from exc
+        result = (m.group(1), m.group(2))
+    except AttributeError:
+        raise FDroidException(_("Invalid name for published file: %s") % filename)
     return result
 
 
@@ -1186,15 +682,13 @@ apk_release_filename_with_sigfp = re.compile(r'(?P<appid>[a-zA-Z0-9_\.]+)_(?P<ve
 
 
 def apk_parse_release_filename(apkname):
-    """Parse the name of an APK file according the F-Droids APK naming scheme.
+    """Parses the name of an APK file according the F-Droids APK naming
+    scheme and returns the tokens.
 
     WARNING: Returned values don't necessarily represent the APKs actual
     properties, the are just paresed from the file name.
 
-    Returns
-    -------
-    Tuple
-        A triplet containing (appid, versionCode, signer), where appid
+    :returns: A triplet containing (appid, versionCode, signer), where appid
         should be the package name, versionCode should be the integer
         represion of the APKs version and signer should be the first 7 hex
         digists of the sha256 signing key fingerprint which was used to sign
@@ -1202,65 +696,35 @@ def apk_parse_release_filename(apkname):
     """
     m = apk_release_filename_with_sigfp.match(apkname)
     if m:
-        return m.group('appid'), int(m.group('vercode')), m.group('sigfp')
+        return m.group('appid'), m.group('vercode'), m.group('sigfp')
     m = apk_release_filename.match(apkname)
     if m:
-        return m.group('appid'), int(m.group('vercode')), None
+        return m.group('appid'), m.group('vercode'), None
     return None, None, None
 
 
-def get_output_extension(build):
+def get_release_filename(app, build):
     if build.output:
-        return get_file_extension(replace_build_vars(build.output, build))
-    return 'apk'
-
-
-def get_release_apk_filename(appid, versionCode):
-    return f"{appid}_{versionCode}.apk"
-
-
-def get_release_filename(app, build, extension=None):
-    if extension:
-        return "%s_%s.%s" % (app.id, build.versionCode, extension)
-    if build.output and get_file_extension(build.output):
         return "%s_%s.%s" % (app.id, build.versionCode, get_file_extension(build.output))
     else:
-        return get_release_apk_filename(app.id, build.versionCode)
+        return "%s_%s.apk" % (app.id, build.versionCode)
 
 
 def get_toolsversion_logname(app, build):
     return "%s_%s_toolsversion.log" % (app.id, build.versionCode)
 
 
-def get_src_tarball_name(appid, versionCode):
-    return f"{appid}_{versionCode}_src.tar.gz"
-
-
-def get_source_date_epoch(build_dir):
-    """Return timestamp suitable for the SOURCE_DATE_EPOCH variable.
-
-    https://reproducible-builds.org/docs/source-date-epoch/
-
-    """
-    try:
-        return git.repo.Repo(build_dir).git.log(n=1, pretty='%ct')
-    except Exception as e:
-        logging.warning('%s: %s', e.__class__.__name__, build_dir)
-        build_dir = Path(build_dir)
-        appid = build_dir.name
-        data_dir = build_dir.parent.parent
-        metadata_file = f'metadata/{appid}.yml'
-        if (data_dir / '.git').exists() and (data_dir / metadata_file).exists():
-            repo = git.repo.Repo(data_dir)
-            return repo.git.log('-n1', '--pretty=%ct', '--', metadata_file)
+def getsrcname(app, build):
+    return "%s_%s_src.tar.gz" % (app.id, build.versionCode)
 
 
 def get_build_dir(app):
-    """Get the dir that this app will be built in."""
-    if app.RepoType == 'srclib':
-        return Path('build/srclib') / app.Repo
+    '''get the dir that this app will be built in'''
 
-    return Path('build') / app.id
+    if app.RepoType == 'srclib':
+        return os.path.join('build', 'srclib', app.Repo)
+
+    return os.path.join('build', app.id)
 
 
 class Encoder(json.JSONEncoder):
@@ -1270,21 +734,8 @@ class Encoder(json.JSONEncoder):
         return super().default(obj)
 
 
-def epoch_millis_now():
-    """Get the current time in epoch milliseconds.
-
-    This is the format returned by Java's System.currentTimeMillis().
-
-    Parameters
-    ----------
-    millis
-      Java-style integer time since UNIX epoch in milliseconds
-    """
-    return int(datetime.now(timezone.utc).timestamp() * 1000)
-
-
 def setup_status_output(start_timestamp):
-    """Create the common output dictionary for public status updates."""
+    """Create the common output dictionary for public status updates"""
     output = {
         'commandLine': sys.argv,
         'startTimestamp': int(time.mktime(start_timestamp) * 1000),
@@ -1295,8 +746,6 @@ def setup_status_output(start_timestamp):
         output['fdroiddata'] = {
             'commitId': get_head_commit_id(git_repo),
             'isDirty': git_repo.is_dirty(),
-            'modifiedFiles': git_repo.git().ls_files(modified=True).split(),
-            'untrackedFiles': git_repo.untracked_files,
         }
     fdroidserver_dir = os.path.dirname(sys.argv[0])
     if os.path.isdir(os.path.join(fdroidserver_dir, '.git')):
@@ -1304,13 +753,7 @@ def setup_status_output(start_timestamp):
         output['fdroidserver'] = {
             'commitId': get_head_commit_id(git_repo),
             'isDirty': git_repo.is_dirty(),
-            'modifiedFiles': git_repo.git().ls_files(modified=True).split(),
-            'untrackedFiles': git_repo.untracked_files,
         }
-    etc_issue_net = '/etc/issue.net'
-    if os.path.exists(etc_issue_net):
-        with open(etc_issue_net) as fp:
-            output[etc_issue_net] = fp.read(100).strip()
     write_running_status_json(output)
     return output
 
@@ -1320,53 +763,32 @@ def write_running_status_json(output):
 
 
 def write_status_json(output, pretty=False, name=None):
-    """Write status out as JSON, and rsync it to the repo server."""
+    """Write status out as JSON, and rsync it to the repo server"""
     status_dir = os.path.join('repo', 'status')
     if not os.path.exists(status_dir):
         os.makedirs(status_dir)
     if not name:
-        output['endTimestamp'] = epoch_millis_now()
-        names = ['running', sys.argv[0].split()[1]]  # fdroid subcommand
-    else:
-        names = [name]
-
-    for fname in names:
-        path = os.path.join(status_dir, fname + '.json')
-        with open(path, "w", encoding="utf-8") as fp:
-            if pretty:
-                json.dump(output, fp, sort_keys=True, cls=Encoder, indent=2)
-            else:
-                json.dump(output, fp, sort_keys=True, cls=Encoder, separators=(',', ':'))
-        rsync_status_file_to_repo(path, repo_subdir='status')
-
-
-def get_head_commit_id(git_repo_dir):
-    """Get git commit ID for HEAD as a str.
-
-    This only reads files, so it should be safe to use on untrusted
-    repos.  It was created to avoid running the git executable, no
-    matter what. It uses a tiny subset of the git.Repo class to avoid
-    setting up the git executable.
-
-    """
-    try:
-        if type(git_repo_dir) is git.Repo:
-            d = git_repo_dir.git_dir
+        output['endTimestamp'] = int(datetime.now(timezone.utc).timestamp() * 1000)
+        name = sys.argv[0].split()[1]  # fdroid subcommand
+    path = os.path.join(status_dir, name + '.json')
+    with open(path, 'w') as fp:
+        if pretty:
+            json.dump(output, fp, sort_keys=True, cls=Encoder, indent=2)
         else:
-            d = os.path.join(git_repo_dir, '.git')
-        repo = type(
-            'Repo',
-            (object,),
-            {'common_dir': d, 'git_dir': d, 're_hexsha_only': git.Repo.re_hexsha_only},
-        )()
-        return git.refs.symbolic.SymbolicReference.dereference_recursive(repo, 'HEAD')
-    except (FileNotFoundError, ValueError) as e:
-        msg = _("Cannot read {path}: {error}").format(path=os.getcwd(), error=str(e))
-        logging.debug(msg)
+            json.dump(output, fp, sort_keys=True, cls=Encoder, separators=(',', ':'))
+    rsync_status_file_to_repo(path, repo_subdir='status')
+
+
+def get_head_commit_id(git_repo):
+    """Get git commit ID for HEAD as a str
+
+    repo.head.commit.binsha is a bytearray stored in a str
+    """
+    return hexlify(bytearray(git_repo.head.commit.binsha)).decode()
 
 
 def setup_vcs(app):
-    """Checkout code from VCS and return instance of vcs and the build dir."""
+    '''checkout code from VCS and return instance of vcs and the build dir'''
     build_dir = get_build_dir(app)
 
     # Set up vcs interface and make sure we have the latest code...
@@ -1382,14 +804,8 @@ def setup_vcs(app):
 
 
 def getvcs(vcstype, remote, local):
-    """Return a vcs instance based on the arguments.
-
-    remote and local can be either a string or a pathlib.Path
-
-    """
     if vcstype == 'git':
         return vcs_git(remote, local)
-    logging.warning(_("RepoType {type} is deprecated, please switch to git.").format(type=vcstype))
     if vcstype == 'git-svn':
         return vcs_gitsvn(remote, local)
     if vcstype == 'hg':
@@ -1397,7 +813,7 @@ def getvcs(vcstype, remote, local):
     if vcstype == 'bzr':
         return vcs_bzr(remote, local)
     if vcstype == 'srclib':
-        if str(local) != os.path.join('build', 'srclib', str(remote)):
+        if local != os.path.join('build', 'srclib', remote):
             raise VCSException("Error: srclib paths are hard-coded!")
         return getsrclib(remote, os.path.join('build', 'srclib'), raw=True)
     if vcstype == 'svn':
@@ -1432,9 +848,6 @@ class vcs:
         self.refreshed = False
         self.srclib = None
 
-    def _gettags(self):
-        raise NotImplementedError
-
     def repotype(self):
         return None
 
@@ -1446,9 +859,7 @@ class vcs:
         return None
 
     def gotorevision(self, rev, refresh=True):
-        """Take the local repository to a clean version of the given revision.
-
-        Take the local repository to a clean version of the given
+        """Take the local repository to a clean version of the given
         revision, which is specificed in the VCS's native
         format. Beforehand, the repository can be dirty, or even
         non-existent. If the repository does already exist locally, it
@@ -1457,6 +868,7 @@ class vcs:
         you are cloning a clean copy of the repo - otherwise it must
         specify a valid revision.
         """
+
         if self.clone_failed:
             raise VCSException(_("Downloading the repository already failed once, not trying again."))
 
@@ -1505,9 +917,7 @@ class vcs:
             raise exc
 
     def gotorevisionx(self, rev):  # pylint: disable=unused-argument
-        """No summary.
-
-        Derived classes need to implement this.
+        """Derived classes need to implement this.
 
         It's called once basic checking has been performed.
         """
@@ -1517,10 +927,6 @@ class vcs:
     def initsubmodules(self):
         raise VCSException('Submodules not supported for this vcs type')
 
-    # Deinitialise and update submodules
-    def deinitsubmodules(self):
-        pass
-
     # Get a list of all known tags
     def gettags(self):
         if not self._gettags:
@@ -1532,15 +938,15 @@ class vcs:
         return rtags
 
     def latesttags(self):
-        """Get a list of all the known tags, sorted from newest to oldest."""
+        """Get a list of all the known tags, sorted from newest to oldest"""
         raise VCSException('latesttags not supported for this vcs type')
 
-    def getref(self, revname=None):
-        """Get current commit reference (hash, revision, etc)."""
+    def getref(self):
+        """Get current commit reference (hash, revision, etc)"""
         raise VCSException('getref not supported for this vcs type')
 
     def getsrclib(self):
-        """Return the srclib (name, path) used in setting up the current revision, or None."""
+        """Returns the srclib (name, path) used in setting up the current revision, or None."""
         return self.srclib
 
 
@@ -1553,7 +959,7 @@ class vcs_git(vcs):
         return ['git', '--version']
 
     def git(self, args, envs=dict(), cwd=None, output=True):
-        """Prevent git fetch/clone/submodule from hanging at the username/password prompt.
+        '''Prevent git fetch/clone/submodule from hanging at the username/password prompt
 
         While fetch/pull/clone respect the command line option flags,
         it seems that submodule commands do not.  They do seem to
@@ -1562,7 +968,7 @@ class vcs_git(vcs):
         sticks.
 
         Also, because of CVE-2017-1000117, block all SSH URLs.
-        """
+        '''
         #
         # supported in git >= 2.3
         git_config = [
@@ -1570,7 +976,7 @@ class vcs_git(vcs):
             '-c', 'core.sshCommand=/bin/false',
             '-c', 'url.https://.insteadOf=ssh://',
         ]
-        for domain in ('bitbucket.org', 'github.com', 'gitlab.com', 'codeberg.org'):
+        for domain in ('bitbucket.org', 'github.com', 'gitlab.com'):
             git_config.append('-c')
             git_config.append('url.https://u:p@' + domain + '/.insteadOf=git@' + domain + ':')
             git_config.append('-c')
@@ -1587,28 +993,22 @@ class vcs_git(vcs):
                            envs=envs, cwd=cwd, output=output)
 
     def checkrepo(self):
-        """No summary.
-
-        If the local directory exists, but is somehow not a git repository,
+        """If the local directory exists, but is somehow not a git repository,
         git will traverse up the directory tree until it finds one
         that is (i.e.  fdroidserver) and then we'll proceed to destroy
         it!  This is called as a safety check.
 
         """
-        cmd = ['git', 'rev-parse', '--show-toplevel']
-        p = FDroidPopen(cmd, cwd=self.local, output=False)
+
+        p = FDroidPopen(['git', 'rev-parse', '--show-toplevel'], cwd=self.local, output=False)
         result = p.output.rstrip()
-        if p.returncode > 0:
-            raise VCSException(
-                f"`{' '.join(cmd)}` failed, (in '{os.path.abspath(self.local)}') {result}"
-            )
-        if Path(result) != Path(self.local).resolve():
-            raise VCSException(f"Repository mismatch ('{self.local}' != '{result}')")
+        if not result.endswith(self.local):
+            raise VCSException('Repository mismatch')
 
     def gotorevisionx(self, rev):
         if not os.path.exists(self.local):
             # Brand new checkout
-            p = self.git(['clone', '--', self.remote, str(self.local)])
+            p = self.git(['clone', '--', self.remote, self.local])
             if p.returncode != 0:
                 self.clone_failed = True
                 raise VCSException("Git clone failed", p.output)
@@ -1618,23 +1018,17 @@ class vcs_git(vcs):
             # Discard any working tree changes
             p = FDroidPopen(['git', 'submodule', 'foreach', '--recursive',
                              'git', 'reset', '--hard'], cwd=self.local, output=False)
-            if p.returncode != 0:
-                logging.debug("Git submodule reset failed (ignored) {output}".format(output=p.output))
-            p = FDroidPopen(['git', 'reset', '--hard'], cwd=self.local, output=False)
             if p.returncode != 0:
                 raise VCSException(_("Git reset failed"), p.output)
             # Remove untracked files now, in case they're tracked in the target
             # revision (it happens!)
             p = FDroidPopen(['git', 'submodule', 'foreach', '--recursive',
                              'git', 'clean', '-dffx'], cwd=self.local, output=False)
-            if p.returncode != 0:
-                logging.debug("Git submodule cleanup failed (ignored) {output}".format(output=p.output))
-            p = FDroidPopen(['git', 'clean', '-dffx'], cwd=self.local, output=False)
             if p.returncode != 0:
                 raise VCSException(_("Git clean failed"), p.output)
             if not self.refreshed:
                 # Get latest commits and tags from remote
-                p = self.git(['fetch', '--prune', '--prune-tags', '--force', 'origin'], cwd=self.local)
+                p = self.git(['fetch', 'origin'], cwd=self.local)
                 if p.returncode != 0:
                     raise VCSException(_("Git fetch failed"), p.output)
                 p = self.git(['fetch', '--prune', '--tags', '--force', 'origin'], output=False, cwd=self.local)
@@ -1687,33 +1081,23 @@ class vcs_git(vcs):
         if p.returncode != 0:
             raise VCSException(_("Git submodule update failed"), p.output)
 
-    def deinitsubmodules(self):
-        self.checkrepo()
-        p = FDroidPopen(['git', 'submodule', 'deinit', '--all', '--force'], cwd=self.local, output=False)
-        if p.returncode != 0:
-            raise VCSException(_("Git submodule deinit failed"), p.output)
-
     def _gettags(self):
         self.checkrepo()
         p = FDroidPopen(['git', 'tag'], cwd=self.local, output=False)
         return p.output.splitlines()
 
-    def latesttags(self):
-        """Return a list of latest tags."""
-        self.checkrepo()
-        return [tag.name for tag in sorted(
-            git.Repo(self.local).tags,
-            key=lambda t: t.commit.committed_date,
-            reverse=True
-        )]
+    tag_format = re.compile(r'tag: ([^),]*)')
 
-    def getref(self, revname='HEAD'):
+    def latesttags(self):
         self.checkrepo()
-        repo = git.Repo(self.local)
-        try:
-            return repo.commit(revname).hexsha
-        except git.BadName:
-            return None
+        p = FDroidPopen(['git', 'log', '--tags',
+                         '--simplify-by-decoration', '--pretty=format:%d'],
+                        cwd=self.local, output=False)
+        tags = []
+        for line in p.output.splitlines():
+            for tag in self.tag_format.findall(line):
+                tags.append(tag)
+        return tags
 
 
 class vcs_gitsvn(vcs):
@@ -1725,9 +1109,7 @@ class vcs_gitsvn(vcs):
         return ['git', 'svn', '--version']
 
     def checkrepo(self):
-        """No summary.
-
-        If the local directory exists, but is somehow not a git repository,
+        """If the local directory exists, but is somehow not a git repository,
         git will traverse up the directory tree until it finds one that
         is (i.e.  fdroidserver) and then we'll proceed to destory it!
         This is called as a safety check.
@@ -1735,11 +1117,11 @@ class vcs_gitsvn(vcs):
         """
         p = FDroidPopen(['git', 'rev-parse', '--show-toplevel'], cwd=self.local, output=False)
         result = p.output.rstrip()
-        if Path(result) != Path(self.local).resolve():
+        if not result.endswith(self.local):
             raise VCSException('Repository mismatch')
 
     def git(self, args, envs=dict(), cwd=None, output=True):
-        """Prevent git fetch/clone/submodule from hanging at the username/password prompt.
+        '''Prevent git fetch/clone/submodule from hanging at the username/password prompt
 
         AskPass is set to /bin/true to let the process try to connect
         without a username/password.
@@ -1748,7 +1130,7 @@ class vcs_gitsvn(vcs):
         (supported in git >= 2.3).  This protects against
         CVE-2017-1000117.
 
-        """
+        '''
         git_config = [
             '-c', 'core.askpass=/bin/true',
             '-c', 'core.sshCommand=/bin/false',
@@ -1787,16 +1169,16 @@ class vcs_gitsvn(vcs):
             # git-svn sucks at certificate validation, this throws useful errors:
             try:
                 import requests
-                r = requests.head(remote, timeout=300)
+                r = requests.head(remote)
                 r.raise_for_status()
             except Exception as e:
-                raise VCSException('SVN certificate pre-validation failed: ' + str(e)) from e
+                raise VCSException('SVN certificate pre-validation failed: ' + str(e))
             location = r.headers.get('location')
             if location and not location.startswith('https://'):
                 raise VCSException(_('Invalid redirect to non-HTTPS: {before} -> {after} ')
                                    .format(before=remote, after=location))
 
-            gitsvn_args.extend(['--', remote, str(self.local)])
+            gitsvn_args.extend(['--', remote, self.local])
             p = self.git(gitsvn_args)
             if p.returncode != 0:
                 self.clone_failed = True
@@ -1878,9 +1260,9 @@ class vcs_gitsvn(vcs):
             if os.path.isdir(d):
                 return os.listdir(d)
 
-    def getref(self, revname='HEAD'):
+    def getref(self):
         self.checkrepo()
-        p = FDroidPopen(['git', 'svn', 'find-rev', revname], cwd=self.local, output=False)
+        p = FDroidPopen(['git', 'svn', 'find-rev', 'HEAD'], cwd=self.local, output=False)
         if p.returncode != 0:
             return None
         return p.output.strip()
@@ -1896,17 +1278,17 @@ class vcs_hg(vcs):
 
     def gotorevisionx(self, rev):
         if not os.path.exists(self.local):
-            p = FDroidPopen(['hg', 'clone', '--ssh', '/bin/false', '--', self.remote, str(self.local)],
+            p = FDroidPopen(['hg', 'clone', '--ssh', '/bin/false', '--', self.remote, self.local],
                             output=False)
             if p.returncode != 0:
                 self.clone_failed = True
                 raise VCSException("Hg clone failed", p.output)
         else:
-            p = FDroidPopen(['hg', 'status', '-uiS'], cwd=self.local, output=False)
+            p = FDroidPopen(['hg', 'status', '-uS'], cwd=self.local, output=False)
             if p.returncode != 0:
                 raise VCSException("Hg status failed", p.output)
             for line in p.output.splitlines():
-                if not line.startswith('? ') and not line.startswith('I '):
+                if not line.startswith('? '):
                     raise VCSException("Unexpected output from hg status -uS: " + line)
                 FDroidPopen(['rm', '-rf', '--', line[2:]], cwd=self.local, output=False)
             if not self.refreshed:
@@ -1921,6 +1303,16 @@ class vcs_hg(vcs):
         p = FDroidPopen(['hg', 'update', '-C', '--', rev], cwd=self.local, output=False)
         if p.returncode != 0:
             raise VCSException("Hg checkout of '%s' failed" % rev, p.output)
+        p = FDroidPopen(['hg', 'purge', '--all'], cwd=self.local, output=False)
+        # Also delete untracked files, we have to enable purge extension for that:
+        if "'purge' is provided by the following extension" in p.output:
+            with open(os.path.join(self.local, '.hg', 'hgrc'), "a") as myfile:
+                myfile.write("\n[extensions]\nhgext.purge=\n")
+            p = FDroidPopen(['hg', 'purge', '--all'], cwd=self.local, output=False)
+            if p.returncode != 0:
+                raise VCSException("HG purge failed", p.output)
+        elif p.returncode != 0:
+            raise VCSException("HG purge failed", p.output)
 
     def _gettags(self):
         p = FDroidPopen(['hg', 'tags', '-q'], cwd=self.local, output=False)
@@ -1936,7 +1328,7 @@ class vcs_bzr(vcs):
         return ['bzr', '--version']
 
     def bzr(self, args, envs=dict(), cwd=None, output=True):
-        """Prevent bzr from ever using SSH to avoid security vulns."""
+        '''Prevent bzr from ever using SSH to avoid security vulns'''
         envs.update({
             'BZR_SSH': 'false',
         })
@@ -1944,7 +1336,7 @@ class vcs_bzr(vcs):
 
     def gotorevisionx(self, rev):
         if not os.path.exists(self.local):
-            p = self.bzr(['branch', self.remote, str(self.local)], output=False)
+            p = self.bzr(['branch', self.remote, self.local], output=False)
             if p.returncode != 0:
                 self.clone_failed = True
                 raise VCSException("Bzr branch failed", p.output)
@@ -1980,11 +1372,7 @@ def unescape_string(string):
 
 def retrieve_string(app_dir, string, xmlfiles=None):
 
-    if string.startswith('@string/'):
-        name = string[len('@string/'):]
-    elif string.startswith('${'):
-        return ''  # Gradle variable
-    else:
+    if not string.startswith('@string/'):
         return unescape_string(string)
 
     if xmlfiles is None:
@@ -1997,20 +1385,18 @@ def retrieve_string(app_dir, string, xmlfiles=None):
                 if os.path.basename(root) == 'values':
                     xmlfiles += [os.path.join(root, x) for x in files if x.endswith('.xml')]
 
+    name = string[len('@string/'):]
+
     def element_content(element):
         if element.text is None:
             return ""
         s = XMLElementTree.tostring(element, encoding='utf-8', method='text')
         return s.decode('utf-8').strip()
 
-    for path in sorted(xmlfiles):
+    for path in xmlfiles:
         if not os.path.isfile(path):
             continue
-        try:
-            xml = parse_xml(path)
-        except (XMLElementTree.ParseError, ValueError):
-            logging.warning(_("Problem with xml at '{path}'").format(path=path))
-            continue
+        xml = parse_xml(path)
         element = xml.find('string[@name="' + name + '"]')
         if element is not None:
             content = element_content(element)
@@ -2023,36 +1409,33 @@ def retrieve_string_singleline(app_dir, string, xmlfiles=None):
     return retrieve_string(app_dir, string, xmlfiles).replace('\n', ' ').strip()
 
 
-def manifest_paths(app_dir, flavors):
-    """Return list of existing files that will be used to find the highest vercode."""
-    possible_manifests = \
-        [Path(app_dir) / 'AndroidManifest.xml',
-         Path(app_dir) / 'src/main/AndroidManifest.xml',
-         Path(app_dir) / 'src/AndroidManifest.xml',
-         Path(app_dir) / 'build.gradle',
-         Path(app_dir) / 'build-extras.gradle',
-         Path(app_dir) / 'build.gradle.kts']
+def manifest_paths(app_dir, flavours):
+    '''Return list of existing files that will be used to find the highest vercode'''
 
-    for flavor in flavors:
-        if flavor == 'yes':
+    possible_manifests = \
+        [os.path.join(app_dir, 'AndroidManifest.xml'),
+         os.path.join(app_dir, 'src', 'main', 'AndroidManifest.xml'),
+         os.path.join(app_dir, 'src', 'AndroidManifest.xml'),
+         os.path.join(app_dir, 'build.gradle'),
+         os.path.join(app_dir, 'build-extras.gradle'),
+         os.path.join(app_dir, 'build.gradle.kts')]
+
+    for flavour in flavours:
+        if flavour == 'yes':
             continue
         possible_manifests.append(
-            Path(app_dir) / 'src' / flavor / 'AndroidManifest.xml')
+            os.path.join(app_dir, 'src', flavour, 'AndroidManifest.xml'))
 
-    return [path for path in possible_manifests if path.is_file()]
+    return [path for path in possible_manifests if os.path.isfile(path)]
 
 
-def fetch_real_name(app_dir, flavors):
-    """Retrieve the package name. Returns the name, or None if not found."""
-    for path in manifest_paths(app_dir, flavors):
-        if not path.suffix == '.xml' or not path.is_file():
-            continue
-        logging.debug("fetch_real_name: Checking manifest at %s" % path)
-        try:
-            xml = parse_xml(path)
-        except (XMLElementTree.ParseError, ValueError):
-            logging.warning(_("Problem with xml at '{path}'").format(path=path))
+def fetch_real_name(app_dir, flavours):
+    '''Retrieve the package name. Returns the name, or None if not found.'''
+    for path in manifest_paths(app_dir, flavours):
+        if not path.endswith('.xml') or not os.path.isfile(path):
             continue
+        logging.debug("fetch_real_name: Checking manifest at " + path)
+        xml = parse_xml(path)
         app = xml.find('application')
         if app is None:
             continue
@@ -2105,10 +1488,10 @@ def remove_debuggable_flags(root_dir):
                         os.path.join(root, 'AndroidManifest.xml'))
 
 
-vcsearch_g = re.compile(r'''\b[Vv]ersionCode\s*=?\s*["'(]*([0-9][0-9_]*)["')]*''').search
-vnsearch_g = re.compile(r'''\b[Vv]ersionName\s*=?\s*\(?(["'])((?:(?=(\\?))\3.)*?)\1''').search
+vcsearch_g = re.compile(r'''\b[Vv]ersionCode\s*=?\s*["']*([0-9_]+)["']*''').search
+vnsearch_g = re.compile(r'''\b[Vv]ersionName\s*=?\s*(["'])((?:(?=(\\?))\3.)*?)\1''').search
 vnssearch_g = re.compile(r'''\b[Vv]ersionNameSuffix\s*=?\s*(["'])((?:(?=(\\?))\3.)*?)\1''').search
-psearch_g = re.compile(r'''\b(packageName|applicationId|namespace)\s*=*\s*["']([^"']+)["']''').search
+psearch_g = re.compile(r'''\b(packageName|applicationId)\s*=*\s*["']([^"']+)["']''').search
 fsearch_g = re.compile(r'''\b(applicationIdSuffix)\s*=*\s*["']([^"']+)["']''').search
 
 
@@ -2122,15 +1505,12 @@ def app_matches_packagename(app, package):
 
 
 def parse_androidmanifests(paths, app):
-    """Extract some information from the AndroidManifest.xml at the given path.
-
+    """
+    Extract some information from the AndroidManifest.xml at the given path.
     Returns (version, vercode, package), any or all of which might be None.
     All values returned are strings.
-
-    Android Studio recommends "you use UTF-8 encoding whenever possible", so
-    this code assumes the files use UTF-8.
-    https://sites.google.com/a/android.com/tools/knownissues/encoding
     """
+
     ignoreversions = app.UpdateCheckIgnore
     ignoresearch = re.compile(ignoreversions).search if ignoreversions else None
 
@@ -2141,20 +1521,9 @@ def parse_androidmanifests(paths, app):
     max_vercode = None
     max_package = None
 
-    def vnsearch(line):
-        matches = vnsearch_g(line)
-        if matches and not any(
-            matches.group(2).startswith(s)
-            for s in [
-                '${',  # Gradle variable names
-                '@string/',  # Strings we could not resolve
-            ]
-        ):
-            return matches.group(2)
-        return None
-
     for path in paths:
-        if not path.is_file():
+
+        if not os.path.isfile(path):
             continue
 
         logging.debug(_("Parsing manifest at '{path}'").format(path=path))
@@ -2162,17 +1531,17 @@ def parse_androidmanifests(paths, app):
         vercode = None
         package = None
 
-        flavors = None
+        flavour = None
         temp_app_id = None
         temp_version_name = None
-        if len(app.get('Builds', [])) > 0 and 'gradle' in app['Builds'][-1] and app['Builds'][-1].gradle:
-            flavors = app['Builds'][-1].gradle
+        if app.builds and 'gradle' in app.builds[-1] and app.builds[-1].gradle:
+            flavour = app.builds[-1].gradle[-1]
 
-        if path.suffix == '.gradle' or path.name.endswith('.gradle.kts'):
-            with open(path, 'r', encoding='utf-8') as f:
+        if path.endswith('.gradle') or path.endswith('.gradle.kts'):
+            with open(path, 'r') as f:
                 android_plugin_file = False
-                inside_flavor_group = 0
-                inside_required_flavor = 0
+                inside_flavour_group = 0
+                inside_required_flavour = 0
                 for line in f:
                     if gradle_comment.match(line):
                         continue
@@ -2183,12 +1552,12 @@ def parse_androidmanifests(paths, app):
                             temp_app_id = matches.group(2)
 
                     if "versionName" in line and not temp_version_name:
-                        matches = vnsearch(line)
+                        matches = vnsearch_g(line)
                         if matches:
-                            temp_version_name = matches
+                            temp_version_name = matches.group(2)
 
-                    if inside_flavor_group > 0:
-                        if inside_required_flavor > 1:
+                    if inside_flavour_group > 0:
+                        if inside_required_flavour > 0:
                             matches = psearch_g(line)
                             if matches:
                                 s = matches.group(2)
@@ -2203,12 +1572,11 @@ def parse_androidmanifests(paths, app):
                                     if app_matches_packagename(app, temp_app_id):
                                         package = temp_app_id
 
-                            matches = vnsearch(line)
+                            matches = vnsearch_g(line)
                             if matches:
-                                version = matches
-
+                                version = matches.group(2)
                             else:
-                                # If build.gradle contains applicationNameSuffix add it to the end of versionName
+                                # If build.gradle contains applicationNameSuffix add it to the end of version name
                                 matches = vnssearch_g(line)
                                 if matches and temp_version_name:
                                     name_suffix = matches.group(2)
@@ -2216,31 +1584,23 @@ def parse_androidmanifests(paths, app):
 
                             matches = vcsearch_g(line)
                             if matches:
-                                vercode = version_code_string_to_int(matches.group(1))
+                                vercode = matches.group(1)
 
-                        if inside_required_flavor > 0:
                             if '{' in line:
-                                inside_required_flavor += 1
+                                inside_required_flavour += 1
                             if '}' in line:
-                                inside_required_flavor -= 1
-                                if inside_required_flavor == 1:
-                                    inside_required_flavor -= 1
-                        elif flavors:
-                            for flavor in flavors:
-                                if re.match(r'.*[\'"\s]{flavor}[\'"\s].*\{{.*'.format(flavor=flavor), line):
-                                    inside_required_flavor = 2
-                                    break
-                                if re.match(r'.*[\'"\s]{flavor}[\'"\s].*'.format(flavor=flavor), line):
-                                    inside_required_flavor = 1
-                                    break
+                                inside_required_flavour -= 1
+                        else:
+                            if flavour and (flavour in line):
+                                inside_required_flavour = 1
 
                         if '{' in line:
-                            inside_flavor_group += 1
+                            inside_flavour_group += 1
                         if '}' in line:
-                            inside_flavor_group -= 1
+                            inside_flavour_group -= 1
                     else:
                         if "productFlavors" in line:
-                            inside_flavor_group = 1
+                            inside_flavour_group = 1
                         if not package:
                             matches = psearch_g(line)
                             if matches:
@@ -2248,13 +1608,13 @@ def parse_androidmanifests(paths, app):
                                 if app_matches_packagename(app, s):
                                     package = s
                         if not version:
-                            matches = vnsearch(line)
+                            matches = vnsearch_g(line)
                             if matches:
-                                version = matches
+                                version = matches.group(2)
                         if not vercode:
                             matches = vcsearch_g(line)
                             if matches:
-                                vercode = version_code_string_to_int(matches.group(1))
+                                vercode = matches.group(1)
                     if not android_plugin_file and ANDROID_PLUGIN_REGEX.match(line):
                         android_plugin_file = True
             if android_plugin_file:
@@ -2269,20 +1629,20 @@ def parse_androidmanifests(paths, app):
         else:
             try:
                 xml = parse_xml(path)
-            except (XMLElementTree.ParseError, ValueError):
+                if "package" in xml.attrib:
+                    s = xml.attrib["package"]
+                    if app_matches_packagename(app, s):
+                        package = s
+                if XMLNS_ANDROID + "versionName" in xml.attrib:
+                    version = xml.attrib[XMLNS_ANDROID + "versionName"]
+                    base_dir = os.path.dirname(path)
+                    version = retrieve_string_singleline(base_dir, version)
+                if XMLNS_ANDROID + "versionCode" in xml.attrib:
+                    a = xml.attrib[XMLNS_ANDROID + "versionCode"]
+                    if string_is_integer(a):
+                        vercode = a
+            except Exception:
                 logging.warning(_("Problem with xml at '{path}'").format(path=path))
-                continue
-            if "package" in xml.attrib:
-                s = xml.attrib["package"]
-                if app_matches_packagename(app, s):
-                    package = s
-            if XMLNS_ANDROID + "versionName" in xml.attrib:
-                version = xml.attrib[XMLNS_ANDROID + "versionName"]
-                base_dir = os.path.dirname(path)
-                version = retrieve_string_singleline(base_dir, version)
-            if XMLNS_ANDROID + "versionCode" in xml.attrib:
-                vercode = version_code_string_to_int(
-                    xml.attrib[XMLNS_ANDROID + "versionCode"])
 
         # Remember package name, may be defined separately from version+vercode
         if package is None:
@@ -2291,8 +1651,8 @@ def parse_androidmanifests(paths, app):
         logging.debug("..got package={0}, version={1}, vercode={2}"
                       .format(package, version, vercode))
 
-        # Always grab the package name and versionName in case they are not
-        # together with the highest versionCode
+        # Always grab the package name and version name in case they are not
+        # together with the highest version code
         if max_package is None and package is not None:
             max_package = package
         if max_version is None and version is not None:
@@ -2324,7 +1684,7 @@ def parse_androidmanifests(paths, app):
 
 
 def is_valid_package_name(name):
-    """Check whether name is a valid fdroid package name.
+    """Check whether name is a valid fdroid package name
 
     APKs and manually defined package names must use a valid Java
     Package Name.  Automatically generated package names for non-APK
@@ -2336,7 +1696,7 @@ def is_valid_package_name(name):
 
 
 def is_strict_application_id(name):
-    """Check whether name is a valid Android Application ID.
+    """Check whether name is a valid Android Application ID
 
     The Android ApplicationID is basically a Java Package Name, but
     with more restrictive naming rules:
@@ -2345,8 +1705,6 @@ def is_strict_application_id(name):
     * Each segment must start with a letter.
     * All characters must be alphanumeric or an underscore [a-zA-Z0-9_].
 
-    References
-    ----------
     https://developer.android.com/studio/build/application-id
 
     """
@@ -2354,6 +1712,156 @@ def is_strict_application_id(name):
         and '.' in name
 
 
+def get_all_gradle_and_manifests(build_dir):
+    paths = []
+    for root, dirs, files in os.walk(build_dir):
+        for f in sorted(files):
+            if f == 'AndroidManifest.xml' \
+               or f.endswith('.gradle') or f.endswith('.gradle.kts'):
+                full = os.path.join(root, f)
+                paths.append(full)
+    return paths
+
+
+def get_gradle_subdir(build_dir, paths):
+    """get the subdir where the gradle build is based"""
+    first_gradle_dir = None
+    for path in paths:
+        if not first_gradle_dir:
+            first_gradle_dir = os.path.relpath(os.path.dirname(path), build_dir)
+        if os.path.exists(path) and SETTINGS_GRADLE_REGEX.match(os.path.basename(path)):
+            with open(path) as fp:
+                for m in GRADLE_SUBPROJECT_REGEX.finditer(fp.read()):
+                    for f in glob.glob(os.path.join(os.path.dirname(path), m.group(1), 'build.gradle*')):
+                        with open(f) as fp:
+                            while True:
+                                line = fp.readline()
+                                if not line:
+                                    break
+                                if ANDROID_PLUGIN_REGEX.match(line):
+                                    return os.path.relpath(os.path.dirname(f), build_dir)
+    if first_gradle_dir and first_gradle_dir != '.':
+        return first_gradle_dir
+
+    return ''
+
+
+def getrepofrompage(url):
+    """Get the repo type and address from the given web page.
+
+    The page is scanned in a rather naive manner for 'git clone xxxx',
+    'hg clone xxxx', etc, and when one of these is found it's assumed
+    that's the information we want.  Returns repotype, address, or
+    None, reason
+
+    """
+    if not url.startswith('http'):
+        return (None, _('{url} does not start with "http"!'.format(url=url)))
+    req = urllib.request.urlopen(url)  # nosec B310 non-http URLs are filtered out
+    if req.getcode() != 200:
+        return (None, 'Unable to get ' + url + ' - return code ' + str(req.getcode()))
+    page = req.read().decode(req.headers.get_content_charset())
+
+    # Works for BitBucket
+    m = re.search('data-fetch-url="(.*)"', page)
+    if m is not None:
+        repo = m.group(1)
+
+        if repo.endswith('.git'):
+            return ('git', repo)
+
+        return ('hg', repo)
+
+    # Works for BitBucket (obsolete)
+    index = page.find('hg clone')
+    if index != -1:
+        repotype = 'hg'
+        repo = page[index + 9:]
+        index = repo.find('<')
+        if index == -1:
+            return (None, _("Error while getting repo address"))
+        repo = repo[:index]
+        repo = repo.split('"')[0]
+        return (repotype, repo)
+
+    # Works for BitBucket (obsolete)
+    index = page.find('git clone')
+    if index != -1:
+        repotype = 'git'
+        repo = page[index + 10:]
+        index = repo.find('<')
+        if index == -1:
+            return (None, _("Error while getting repo address"))
+        repo = repo[:index]
+        repo = repo.split('"')[0]
+        return (repotype, repo)
+
+    return (None, _("No information found.") + page)
+
+
+def get_app_from_url(url):
+    """Guess basic app metadata from the URL.
+
+    The URL must include a network hostname, unless it is an lp:,
+    file:, or git/ssh URL.  This throws ValueError on bad URLs to
+    match urlparse().
+
+    """
+
+    parsed = urllib.parse.urlparse(url)
+    invalid_url = False
+    if not parsed.scheme or not parsed.path:
+        invalid_url = True
+
+    app = fdroidserver.metadata.App()
+    app.Repo = url
+    if url.startswith('git://') or url.startswith('git@'):
+        app.RepoType = 'git'
+    elif parsed.netloc == 'github.com':
+        app.RepoType = 'git'
+        app.SourceCode = url
+        app.IssueTracker = url + '/issues'
+    elif parsed.netloc == 'gitlab.com' or parsed.netloc == 'framagit.org':
+        # git can be fussy with gitlab URLs unless they end in .git
+        if url.endswith('.git'):
+            url = url[:-4]
+        app.Repo = url + '.git'
+        app.RepoType = 'git'
+        app.SourceCode = url
+        app.IssueTracker = url + '/issues'
+    elif parsed.netloc == 'notabug.org':
+        if url.endswith('.git'):
+            url = url[:-4]
+        app.Repo = url + '.git'
+        app.RepoType = 'git'
+        app.SourceCode = url
+        app.IssueTracker = url + '/issues'
+    elif parsed.netloc == 'bitbucket.org':
+        if url.endswith('/'):
+            url = url[:-1]
+        app.SourceCode = url + '/src'
+        app.IssueTracker = url + '/issues'
+        # Figure out the repo type and adddress...
+        app.RepoType, app.Repo = getrepofrompage(url)
+    elif parsed.netloc == 'codeberg.org':
+        app.RepoType = 'git'
+        app.SourceCode = url
+        app.IssueTracker = url + '/issues'
+    elif url.startswith('https://') and url.endswith('.git'):
+        app.RepoType = 'git'
+
+    if not parsed.netloc and parsed.scheme in ('git', 'http', 'https', 'ssh'):
+        invalid_url = True
+
+    if invalid_url:
+        raise ValueError(_('"{url}" is not a valid URL!'.format(url=url)))
+
+    if not app.RepoType:
+        raise FDroidException("Unable to determine vcs type. " + app.Repo)
+
+    return app
+
+
 def parse_srclib_spec(spec):
 
     if type(spec) != str:
@@ -2361,15 +1869,15 @@ def parse_srclib_spec(spec):
                                   "(not a string): '{}'")
                                 .format(spec))
 
-    tokens = spec.split('@', 1)
-    if not tokens[0]:
-        raise MetaDataException(
-            _("could not parse srclib spec (no name specified): '{}'").format(spec)
-        )
-    if len(tokens) < 2 or not tokens[1]:
-        raise MetaDataException(
-            _("could not parse srclib spec (no ref specified): '{}'").format(spec)
-        )
+    tokens = spec.split('@')
+    if len(tokens) > 2:
+        raise MetaDataException(_("could not parse srclib spec "
+                                  "(too many '@' signs): '{}'")
+                                .format(spec))
+    elif len(tokens) < 2:
+        raise MetaDataException(_("could not parse srclib spec "
+                                  "(no ref specified): '{}'")
+                                .format(spec))
 
     name = tokens[0]
     ref = tokens[1]
@@ -2389,23 +1897,22 @@ def getsrclib(spec, srclib_dir, basepath=False,
               build=None):
     """Get the specified source library.
 
-    Return the path to it. Normally this is the path to be used when
+    Returns the path to it. Normally this is the path to be used when
     referencing it, which may be a subdirectory of the actual project. If
     you want the base directory of the project, pass 'basepath=True'.
 
-    spec and srclib_dir are both strings, not pathlib.Path.
     """
     number = None
     subdir = None
-    if not isinstance(spec, str):
-        spec = str(spec)
-    if not isinstance(srclib_dir, str):
-        spec = str(srclib_dir)
     if raw:
         name = spec
         ref = None
     else:
-        name, ref, number, subdir = parse_srclib_spec(spec)
+        name, ref = spec.split('@')
+        if ':' in name:
+            number, name = name.split(':', 1)
+        if '/' in name:
+            name, subdir = name.split('/', 1)
 
     if name not in fdroidserver.metadata.srclibs:
         raise VCSException('srclib ' + name + ' not found.')
@@ -2442,9 +1949,9 @@ def getsrclib(spec, srclib_dir, basepath=False,
     if prepare:
 
         if srclib["Prepare"]:
-            cmd = replace_config_vars("; ".join(srclib["Prepare"]), build)
+            cmd = replace_config_vars(srclib["Prepare"], build)
 
-            p = FDroidPopen(['bash', '-e', '-u', '-o', 'pipefail', '-x', '-c', '--', cmd], cwd=libdir)
+            p = FDroidPopen(['bash', '-x', '-c', '--', cmd], cwd=libdir)
             if p.returncode != 0:
                 raise BuildException("Error running prepare command for srclib %s"
                                      % name, p.output)
@@ -2459,31 +1966,21 @@ gradle_version_regex = re.compile(r"[^/]*'com\.android\.tools\.build:gradle:([^\
 
 
 def prepare_source(vcs, app, build, build_dir, srclib_dir, extlib_dir, onserver=False, refresh=True):
-    """Prepare the source code for a particular build.
+    """ Prepare the source code for a particular build
 
-    Parameters
-    ----------
-    vcs
-        the appropriate vcs object for the application
-    app
-        the application details from the metadata
-    build
-        the build details from the metadata
-    build_dir
-        the path to the build directory, usually 'build/app.id'
-    srclib_dir
-        the path to the source libraries directory, usually 'build/srclib'
-    extlib_dir
-        the path to the external libraries directory, usually 'build/extlib'
+    :param vcs: the appropriate vcs object for the application
+    :param app: the application details from the metadata
+    :param build: the build details from the metadata
+    :param build_dir: the path to the build directory, usually 'build/app.id'
+    :param srclib_dir: the path to the source libraries directory, usually 'build/srclib'
+    :param extlib_dir: the path to the external libraries directory, usually 'build/extlib'
 
-    Returns
-    -------
-    root
-        is the root directory, which may be the same as 'build_dir' or may
-        be a subdirectory of it.
-    srclibpaths
-        is information on the srclibs being used
+    Returns the (root, srclibpaths) where:
+    :param root: is the root directory, which may be the same as 'build_dir' or may
+                 be a subdirectory of it.
+    :param srclibpaths: is information on the srclibs being used
     """
+
     # Optionally, the actual app source can be in a subdirectory
     if build.subdir:
         root_dir = os.path.join(build_dir, build.subdir)
@@ -2498,8 +1995,6 @@ def prepare_source(vcs, app, build, build_dir, srclib_dir, extlib_dir, onserver=
     if build.submodules:
         logging.info(_("Initialising submodules"))
         vcs.initsubmodules()
-    else:
-        vcs.deinitsubmodules()
 
     # Check that a subdir (if we're using one) exists. This has to happen
     # after the checkout, since it might not exist elsewhere
@@ -2508,10 +2003,10 @@ def prepare_source(vcs, app, build, build_dir, srclib_dir, extlib_dir, onserver=
 
     # Run an init command if one is required
     if build.init:
-        cmd = replace_config_vars("; ".join(build.init), build)
+        cmd = replace_config_vars(build.init, build)
         logging.info("Running 'init' commands in %s" % root_dir)
 
-        p = FDroidPopen(['bash', '-e', '-u', '-o', 'pipefail', '-x', '-c', '--', cmd], cwd=root_dir)
+        p = FDroidPopen(['bash', '-x', '-c', '--', cmd], cwd=root_dir)
         if p.returncode != 0:
             raise BuildException("Error running init command for %s:%s" %
                                  (app.id, build.versionName), p.output)
@@ -2584,9 +2079,9 @@ def prepare_source(vcs, app, build, build_dir, srclib_dir, extlib_dir, onserver=
         with open(path, 'w', encoding='iso-8859-1') as f:
             f.write(props)
 
-    flavors = []
+    flavours = []
     if build.build_method() == 'gradle':
-        flavors = build.gradle
+        flavours = build.gradle
 
         if build.target:
             n = build.target.split('-')[1]
@@ -2596,8 +2091,6 @@ def prepare_source(vcs, app, build, build_dir, srclib_dir, extlib_dir, onserver=
                 gradlefile = build_gradle
             elif os.path.exists(build_gradle_kts):
                 gradlefile = build_gradle_kts
-            else:
-                raise BuildException("No gradle file found")
             regsub_file(r'compileSdkVersion[ =]+[0-9]+',
                         r'compileSdkVersion %s' % n,
                         gradlefile)
@@ -2605,31 +2098,31 @@ def prepare_source(vcs, app, build, build_dir, srclib_dir, extlib_dir, onserver=
     # Remove forced debuggable flags
     remove_debuggable_flags(root_dir)
 
-    # Insert versionCode and number into the manifest if necessary
+    # Insert version code and number into the manifest if necessary
     if build.forceversion:
-        logging.info("Changing the versionName")
-        for path in manifest_paths(root_dir, flavors):
+        logging.info("Changing the version name")
+        for path in manifest_paths(root_dir, flavours):
             if not os.path.isfile(path):
                 continue
-            if path.suffix == '.xml':
+            if path.endswith('.xml'):
                 regsub_file(r'android:versionName="[^"]*"',
                             r'android:versionName="%s"' % build.versionName,
                             path)
-            elif path.suffix == '.gradle':
+            elif path.endswith('.gradle'):
                 regsub_file(r"""(\s*)versionName[\s'"=]+.*""",
                             r"""\1versionName '%s'""" % build.versionName,
                             path)
 
     if build.forcevercode:
-        logging.info("Changing the versionCode")
-        for path in manifest_paths(root_dir, flavors):
-            if not path.is_file():
+        logging.info("Changing the version code")
+        for path in manifest_paths(root_dir, flavours):
+            if not os.path.isfile(path):
                 continue
-            if path.suffix == '.xml':
+            if path.endswith('.xml'):
                 regsub_file(r'android:versionCode="[^"]*"',
                             r'android:versionCode="%s"' % build.versionCode,
                             path)
-            elif path.suffix == '.gradle':
+            elif path.endswith('.gradle'):
                 regsub_file(r'versionCode[ =]+[0-9]+',
                             r'versionCode %s' % build.versionCode,
                             path)
@@ -2677,13 +2170,13 @@ def prepare_source(vcs, app, build, build_dir, srclib_dir, extlib_dir, onserver=
     if build.prebuild:
         logging.info("Running 'prebuild' commands in %s" % root_dir)
 
-        cmd = replace_config_vars("; ".join(build.prebuild), build)
+        cmd = replace_config_vars(build.prebuild, build)
 
         # Substitute source library paths into prebuild commands
         for name, number, libpath in srclibpaths:
             cmd = cmd.replace('$$' + name + '$$', os.path.join(os.getcwd(), libpath))
 
-        p = FDroidPopen(['bash', '-e', '-u', '-o', 'pipefail', '-x', '-c', '--', cmd], cwd=root_dir)
+        p = FDroidPopen(['bash', '-x', '-c', '--', cmd], cwd=root_dir)
         if p.returncode != 0:
             raise BuildException("Error running prebuild command for %s:%s" %
                                  (app.id, build.versionName), p.output)
@@ -2724,27 +2217,21 @@ def prepare_source(vcs, app, build, build_dir, srclib_dir, extlib_dir, onserver=
 
 
 def getpaths_map(build_dir, globpaths):
-    """Extend via globbing the paths from a field and return them as a map from original path to resulting paths."""
+    """Extend via globbing the paths from a field and return them as a map from original path to resulting paths"""
     paths = dict()
-    not_found_paths = []
     for p in globpaths:
         p = p.strip()
         full_path = os.path.join(build_dir, p)
         full_path = os.path.normpath(full_path)
-        paths[p] = [r[len(str(build_dir)) + 1:] for r in glob.glob(full_path)]
+        paths[p] = [r[len(build_dir) + 1:] for r in glob.glob(full_path)]
         if not paths[p]:
-            not_found_paths.append(p)
-    return paths, not_found_paths
+            raise FDroidException("glob path '%s' did not match any files/dirs" % p)
+    return paths
 
 
 def getpaths(build_dir, globpaths):
-    """Extend via globbing the paths from a field and return them as a set."""
-    paths_map, not_found_paths = getpaths_map(build_dir, globpaths)
-    if not_found_paths:
-        raise FDroidException(
-            "Some glob paths did not match any files/dirs:\n"
-            + "\n".join(not_found_paths)
-        )
+    """Extend via globbing the paths from a field and return them as a set"""
+    paths_map = getpaths_map(build_dir, globpaths)
     paths = set()
     for k, v in paths_map.items():
         for p in v:
@@ -2757,7 +2244,7 @@ def natural_key(s):
 
 
 def check_system_clock(dt_obj, path):
-    """Check if system clock is updated based on provided date.
+    """Check if system clock is updated based on provided date
 
     If an APK has files newer than the system time, suggest updating
     the system clock.  This is useful for offline systems, used for
@@ -2774,105 +2261,136 @@ def check_system_clock(dt_obj, path):
 
 
 class KnownApks:
-    """Permanent store of existing APKs with the date they were added.
+    """permanent store of existing APKs with the date they were added
 
     This is currently the only way to permanently store the "updated"
     date of APKs.
     """
 
     def __init__(self):
-        """Load filename/date info about previously seen APKs.
+        '''Load filename/date info about previously seen APKs
 
         Since the appid and date strings both will never have spaces,
         this is parsed as a list from the end to allow the filename to
         have any combo of spaces.
-        """
+        '''
+
+        self.path = os.path.join('stats', 'known_apks.txt')
         self.apks = {}
-        for part in ('repo', 'archive'):
-            path = os.path.join(part, 'index-v2.json')
-            if os.path.isfile(path):
-                with open(path, 'r', encoding='utf-8') as f:
-                    index = json.load(f)
-                    for appid, data in index["packages"].items():
-                        for version in data["versions"].values():
-                            filename = version["file"]["name"][1:]
-                            date = datetime.fromtimestamp(version["added"] // 1000, tz=timezone.utc)
-                            self.apks[filename] = date
+        if os.path.isfile(self.path):
+            with open(self.path, 'r') as f:
+                for line in f:
+                    t = line.rstrip().split(' ')
+                    if len(t) == 2:
+                        self.apks[t[0]] = (t[1], None)
+                    else:
+                        appid = t[-2]
+                        date = datetime.strptime(t[-1], '%Y-%m-%d')
+                        filename = line[0:line.rfind(appid) - 1]
+                        self.apks[filename] = (appid, date)
+                        check_system_clock(date, self.path)
+        self.changed = False
 
-    def recordapk(self, apkName, default_date=None):
-        """
-        Record an APK (if it's new, otherwise does nothing).
+    def writeifchanged(self):
+        if not self.changed:
+            return
 
-        Returns
-        -------
-        datetime
-          the date it was added as a datetime instance.
-        """
+        if not os.path.exists('stats'):
+            os.mkdir('stats')
+
+        lst = []
+        for apk, app in self.apks.items():
+            appid, added = app
+            line = apk + ' ' + appid
+            if added:
+                line += ' ' + added.strftime('%Y-%m-%d')
+            lst.append(line)
+
+        with open(self.path, 'w') as f:
+            for line in sorted(lst, key=natural_key):
+                f.write(line + '\n')
+
+    def recordapk(self, apkName, app, default_date=None):
+        '''
+        Record an apk (if it's new, otherwise does nothing)
+        Returns the date it was added as a datetime instance
+        '''
         if apkName not in self.apks:
             if default_date is None:
-                default_date = datetime.now(timezone.utc)
-            self.apks[apkName] = default_date
-        return self.apks[apkName]
+                default_date = datetime.utcnow()
+            self.apks[apkName] = (app, default_date)
+            self.changed = True
+        _ignored, added = self.apks[apkName]
+        return added
+
+    def getapp(self, apkname):
+        """Look up information - given the 'apkname', returns (app id, date added/None).
+
+        Or returns None for an unknown apk.
+        """
+        if apkname in self.apks:
+            return self.apks[apkname]
+        return None
+
+    def getlatest(self, num):
+        """Get the most recent 'num' apps added to the repo, as a list of package ids with the most recent first"""
+        apps = {}
+        for apk, app in self.apks.items():
+            appid, added = app
+            if added:
+                if appid in apps:
+                    if apps[appid] > added:
+                        apps[appid] = added
+                else:
+                    apps[appid] = added
+        sortedapps = sorted(apps.items(), key=operator.itemgetter(1))[-num:]
+        lst = [app for app, _ignored in sortedapps]
+        lst.reverse()
+        return lst
 
 
 def get_file_extension(filename):
-    """Get the normalized file extension, can be blank string but never None."""
+    """get the normalized file extension, can be blank string but never None"""
     if isinstance(filename, bytes):
         filename = filename.decode('utf-8')
     return os.path.splitext(filename)[1].lower()[1:]
 
 
-def _androguard_logging_level(level=logging.ERROR):
-    """Tames androguard's default debug output.
+def use_androguard():
+    """Report if androguard is available, and config its debug logging"""
 
-    There should be no debug output when the functions are being used
-    via the API.  Otherwise, the output is controlled by the --verbose
-    flag.
-
-    To get coverage across the full range of androguard >= 3.3.5, this
-    includes all known logger names that are relevant.  So some of
-    these names might not be present in the version of androguard
-    currently in use.
-
-    """
-    if options and options.verbose:
-        level = logging.WARNING
-
-    for name in (
-        'androguard.apk',
-        'androguard.axml',
-        'androguard.core.api_specific_resources',
-        'androguard.core.apk',
-        'androguard.core.axml',
-    ):
-        logging.getLogger(name).setLevel(level)
-
-    # some parts of androguard 4.x use loguru instead of logging
     try:
-        from loguru import logger
-        logger.remove()
+        import androguard
+        if use_androguard.show_path:
+            logging.debug(_('Using androguard from "{path}"').format(path=androguard.__file__))
+            use_androguard.show_path = False
+        if options and options.verbose:
+            logging.getLogger("androguard.axml").setLevel(logging.INFO)
+        return True
     except ImportError:
-        pass
+        return False
 
 
-def get_androguard_APK(apkfile, skip_analysis=False):
+use_androguard.show_path = True
+
+
+def _get_androguard_APK(apkfile):
     try:
-        # these were moved in androguard 4.0
-        from androguard.core.apk import APK
-    except ImportError:
         from androguard.core.bytecodes.apk import APK
-    _androguard_logging_level()
+    except ImportError:
+        raise FDroidException("androguard library is not installed")
 
-    return APK(apkfile, skip_analysis=skip_analysis)
+    return APK(apkfile)
 
 
 def ensure_final_value(packageName, arsc, value):
-    """Ensure incoming value is always the value, not the resid.
+    """Ensure incoming value is always the value, not the resid
 
     androguard will sometimes return the Android "resId" aka
     Resource ID instead of the actual value.  This checks whether
     the value is actually a resId, then performs the Android
     Resource lookup as needed.
+
     """
     if value:
         returnValue = value
@@ -2887,29 +2405,16 @@ def ensure_final_value(packageName, arsc, value):
     return ''
 
 
-def is_debuggable_or_testOnly(apkfile):
-    """Return True if the given file is an APK and is debuggable or testOnly.
+def is_apk_and_debuggable(apkfile):
+    """Returns True if the given file is an APK and is debuggable
 
-    These two settings should never be enabled in release builds. This
-    parses <application android:debuggable="" android:testOnly="">
-    from the APK and nothing else to run fast, since it is run on
-    every APK as part of update.
+    Parse only <application android:debuggable=""> from the APK.
 
-    Parameters
-    ----------
-    apkfile
-        full path to the APK to check
+    :param apkfile: full path to the apk to check"""
 
-    """
     if get_file_extension(apkfile) != 'apk':
         return False
-    try:
-        # these were moved in androguard 4.0
-        from androguard.core.axml import START_TAG, AXMLParser, format_value
-    except ImportError:
-        from androguard.core.bytecodes.axml import START_TAG, AXMLParser, format_value
-    _androguard_logging_level()
-
+    from androguard.core.bytecodes.axml import AXMLParser, format_value, START_TAG
     with ZipFile(apkfile) as apk:
         with apk.open('AndroidManifest.xml') as manifest:
             axml = AXMLParser(manifest.read())
@@ -2918,7 +2423,7 @@ def is_debuggable_or_testOnly(apkfile):
                 if _type == START_TAG and axml.getName() == 'application':
                     for i in range(0, axml.getAttributeCount()):
                         name = axml.getAttributeName(i)
-                        if name in ('debuggable', 'testOnly'):
+                        if name == 'debuggable':
                             _type = axml.getAttributeValueType(i)
                             _data = axml.getAttributeValueData(i)
                             value = format_value(_type, _data, lambda _: axml.getAttributeValue(i))
@@ -2938,30 +2443,20 @@ def get_apk_id(apkfile):
     APK, aapt still can.  So aapt is also used as the final fallback
     method.
 
-    Parameters
-    ----------
-    apkfile
-        path to an APK file.
-
-    Returns
-    -------
-    appid
-    versionCode
-    versionName
+    :param apkfile: path to an APK file.
+    :returns: triplet (appid, version code, version name)
 
     """
     try:
         return get_apk_id_androguard(apkfile)
     except zipfile.BadZipFile as e:
-        if config and 'aapt' in config:
-            logging.error(apkfile + ': ' + str(e))
+        logging.error(apkfile + ': ' + str(e))
+        if 'aapt' in config:
             return get_apk_id_aapt(apkfile)
-        else:
-            raise e
 
 
 def get_apk_id_androguard(apkfile):
-    """Read (appid, versionCode, versionName) from an APK.
+    """Read (appid, versionCode, versionName) from an APK
 
     This first tries to do quick binary XML parsing to just get the
     values that are needed.  It will fallback to full androguard
@@ -2969,34 +2464,12 @@ def get_apk_id_androguard(apkfile):
     versionName is set to a Android String Resource (e.g. an integer
     hex value that starts with @).
 
-    This function is part of androguard as get_apkid(), so this
-    vendored and modified to return versionCode as an integer.
-
     """
     if not os.path.exists(apkfile):
         raise FDroidException(_("Reading packageName/versionCode/versionName failed, APK invalid: '{apkfilename}'")
                               .format(apkfilename=apkfile))
 
-    try:
-        # these were moved in androguard 4.0
-        from androguard.core.axml import (
-            END_DOCUMENT,
-            END_TAG,
-            START_TAG,
-            TEXT,
-            AXMLParser,
-            format_value,
-        )
-    except ImportError:
-        from androguard.core.bytecodes.axml import (
-            END_DOCUMENT,
-            END_TAG,
-            START_TAG,
-            TEXT,
-            AXMLParser,
-            format_value,
-        )
-    _androguard_logging_level()
+    from androguard.core.bytecodes.axml import AXMLParser, format_value, START_TAG, END_TAG, TEXT, END_DOCUMENT
 
     appid = None
     versionCode = None
@@ -3018,20 +2491,20 @@ def get_apk_id_androguard(apkfile):
                             appid = value
                         elif versionCode is None and name == 'versionCode':
                             if value.startswith('0x'):
-                                versionCode = int(value, 16)
+                                versionCode = str(int(value, 16))
                             else:
-                                versionCode = int(value)
+                                versionCode = value
                         elif versionName is None and name == 'versionName':
                             versionName = value
 
                     if axml.getName() == 'manifest':
                         break
-                elif _type in (END_TAG, TEXT, END_DOCUMENT):
+                elif _type == END_TAG or _type == TEXT or _type == END_DOCUMENT:
                     raise RuntimeError('{path}: <manifest> must be the first element in AndroidManifest.xml'
                                        .format(path=apkfile))
 
     if not versionName or versionName[0] == '@':
-        a = get_androguard_APK(apkfile)
+        a = _get_androguard_APK(apkfile)
         versionName = ensure_final_value(a.package, a.get_android_resources(), a.get_androidversion_name())
     if not versionName:
         versionName = ''  # versionName is expected to always be a str
@@ -3040,22 +2513,17 @@ def get_apk_id_androguard(apkfile):
 
 
 def get_apk_id_aapt(apkfile):
-    """Read (appid, versionCode, versionName) from an APK."""
     p = SdkToolsPopen(['aapt', 'dump', 'badging', apkfile], output=False)
     m = APK_ID_TRIPLET_REGEX.match(p.output[0:p.output.index('\n')])
     if m:
-        return m.group(1), int(m.group(2)), m.group(3)
-    raise FDroidException(_(
-        "Reading packageName/versionCode/versionName failed,"
-        "APK invalid: '{apkfilename}'"
-    ).format(apkfilename=apkfile))
+        return m.group(1), m.group(2), m.group(3)
+    raise FDroidException(_("Reading packageName/versionCode/versionName failed, APK invalid: '{apkfilename}'")
+                          .format(apkfilename=apkfile))
 
 
 def get_native_code(apkfile):
-    """Aapt checks if there are architecture folders under the lib/ folder.
-
-    We are simulating the same behaviour.
-    """
+    """aapt checks if there are architecture folders under the lib/ folder
+    so we are simulating the same behaviour"""
     arch_re = re.compile("^lib/(.*)/.*$")
     archset = set()
     with ZipFile(apkfile) as apk:
@@ -3067,9 +2535,9 @@ def get_native_code(apkfile):
 
 
 class PopenResult:
-    def __init__(self, returncode=None, output=None):
-        self.returncode = returncode
-        self.output = output
+    def __init__(self):
+        self.returncode = None
+        self.output = None
 
 
 def SdkToolsPopen(commands, cwd=None, output=True):
@@ -3089,19 +2557,12 @@ def FDroidPopenBytes(commands, cwd=None, envs=None, output=True, stderr_to_stdou
     """
     Run a command and capture the possibly huge output as bytes.
 
-    Parameters
-    ----------
-    commands
-        command and argument list like in subprocess.Popen
-    cwd
-        optionally specifies a working directory
-    envs
-        a optional dictionary of environment variables and their values
-
-    Returns
-    -------
-    A PopenResult.
+    :param commands: command and argument list like in subprocess.Popen
+    :param cwd: optionally specifies a working directory
+    :param envs: a optional dictionary of environment variables and their values
+    :returns: A PopenResult.
     """
+
     global env
     if env is None:
         set_FDroidPopen_env()
@@ -3124,7 +2585,7 @@ def FDroidPopenBytes(commands, cwd=None, envs=None, output=True, stderr_to_stdou
                              stderr=stderr_param)
     except OSError as e:
         raise BuildException("OSError while trying to execute "
-                             + ' '.join(commands) + ': ' + str(e)) from e
+                             + ' '.join(commands) + ': ' + str(e))
 
     # TODO are these AsynchronousFileReader threads always exiting?
     if not stderr_to_stdout and options.verbose:
@@ -3147,7 +2608,7 @@ def FDroidPopenBytes(commands, cwd=None, envs=None, output=True, stderr_to_stdou
     while not stdout_reader.eof():
         while not stdout_queue.empty():
             line = stdout_queue.get()
-            if output and options and options.verbose:
+            if output and options.verbose:
                 # Output directly to console
                 sys.stderr.buffer.write(line)
                 sys.stderr.flush()
@@ -3171,18 +2632,10 @@ def FDroidPopen(commands, cwd=None, envs=None, output=True, stderr_to_stdout=Tru
     """
     Run a command and capture the possibly huge output as a str.
 
-    Parameters
-    ----------
-    commands
-        command and argument list like in subprocess.Popen
-    cwd
-        optionally specifies a working directory
-    envs
-        a optional dictionary of environment variables and their values
-
-    Returns
-    -------
-    A PopenResult.
+    :param commands: command and argument list like in subprocess.Popen
+    :param cwd: optionally specifies a working directory
+    :param envs: a optional dictionary of environment variables and their values
+    :returns: A PopenResult.
     """
     result = FDroidPopenBytes(commands, cwd, envs, output, stderr_to_stdout)
     result.output = result.output.decode('utf-8', 'ignore')
@@ -3271,28 +2724,23 @@ def remove_signing_keys(build_dir):
                     logging.info("Cleaned %s of keysigning configs at %s" % (propfile, path))
 
 
-def set_FDroidPopen_env(app=None, build=None):
-    """Set up the environment variables for the build environment.
+def set_FDroidPopen_env(build=None):
+    '''
+    set up the environment variables for the build environment
 
     There is only a weak standard, the variables used by gradle, so also set
     up the most commonly used environment variables for SDK and NDK.  Also, if
     there is no locale set, this will set the locale (e.g. LANG) to en_US.UTF-8.
-
-    If an App instance is provided, then the SOURCE_DATE_EPOCH
-    environment variable will be set based on that app's source repo.
-
-    """
+    '''
     global env, orig_path
 
     if env is None:
         env = os.environ
         orig_path = env['PATH']
-        if config:
-            if config.get('sdk_path'):
-                for n in ['ANDROID_HOME', 'ANDROID_SDK', 'ANDROID_SDK_ROOT']:
-                    env[n] = config['sdk_path']
-            for k, v in config.get('java_paths', {}).items():
-                env['JAVA%s_HOME' % k] = v
+        for n in ['ANDROID_HOME', 'ANDROID_SDK']:
+            env[n] = config['sdk_path']
+        for k, v in config['java_paths'].items():
+            env['JAVA%s_HOME' % k] = v
 
     missinglocale = True
     for k, v in env.items():
@@ -3303,12 +2751,10 @@ def set_FDroidPopen_env(app=None, build=None):
     if missinglocale:
         env['LANG'] = 'en_US.UTF-8'
 
-    if app:
-        env['SOURCE_DATE_EPOCH'] = get_source_date_epoch(get_build_dir(app))
     if build is not None:
         path = build.ndk_path()
         paths = orig_path.split(os.pathsep)
-        if path and path not in paths:
+        if path not in paths:
             paths = [path] + paths
             env['PATH'] = os.pathsep.join(paths)
         for n in ['ANDROID_NDK', 'NDK', 'ANDROID_NDK_HOME']:
@@ -3325,6 +2771,7 @@ def replace_build_vars(cmd, build):
 def replace_config_vars(cmd, build):
     cmd = cmd.replace('$$SDK$$', config['sdk_path'])
     cmd = cmd.replace('$$NDK$$', build.ndk_path())
+    cmd = cmd.replace('$$MVN3$$', config['mvn3'])
     if build is not None:
         cmd = replace_build_vars(cmd, build)
     return cmd
@@ -3362,170 +2809,99 @@ def signer_fingerprint_short(cert_encoded):
     Extracts the first 7 hexadecimal digits of sha256 signing-key fingerprint
     for a given pkcs7 signature.
 
-    Parameters
-    ----------
-    cert_encoded
-        Contents of an APK signing certificate.
-
-    Returns
-    -------
-    shortened signing-key fingerprint.
+    :param cert_encoded: Contents of an APK signing certificate.
+    :returns: shortened signing-key fingerprint.
     """
     return signer_fingerprint(cert_encoded)[:7]
 
 
 def signer_fingerprint(cert_encoded):
-    """Return SHA-256 signer fingerprint for PKCS#7 DER-encoded signature.
+    """Obtain sha256 signing-key fingerprint for pkcs7 DER certificate.
 
-    Parameters
-    ----------
-    Contents of an APK signature.
-
-    Returns
-    -------
-    Standard SHA-256 signer fingerprint.
+    Extracts hexadecimal sha256 signing-key fingerprint string
+    for a given pkcs7 signature.
 
+    :param: Contents of an APK signature.
+    :returns: shortened signature fingerprint.
     """
     return hashlib.sha256(cert_encoded).hexdigest()
 
 
 def get_first_signer_certificate(apkpath):
-    """Get the first signing certificate from the APK, DER-encoded.
-
-    JAR and APK Signatures allow for multiple signers, though it is
-    rarely used, and this is poorly documented.  So this method only
-    fetches the first certificate, and errors out if there are more.
-
-    Starting with targetSdkVersion 30, APK v2 Signatures are required.
-    https://developer.android.com/about/versions/11/behavior-changes-11#minimum-signature-scheme
-
-    When a APK v2+ signature is present, the JAR signature is not
-    verified.  The verifier parses the signers from the v2+ signature
-    and does not seem to look at the JAR signature.
-    https://source.android.com/docs/security/features/apksigning/v2#apk-signature-scheme-v2-block
-    https://android.googlesource.com/platform/tools/apksig/+/refs/tags/android-13.0.0_r3/src/main/java/com/android/apksig/ApkVerifier.java#270
-
-    apksigner checks that the signers from all the APK signatures match:
-    https://android.googlesource.com/platform/tools/apksig/+/refs/tags/android-13.0.0_r3/src/main/java/com/android/apksig/ApkVerifier.java#383
-
-    apksigner verifies each signer's signature block file
-    .(RSA|DSA|EC) against the corresponding signature file .SF
-    https://android.googlesource.com/platform/tools/apksig/+/refs/tags/android-13.0.0_r3/src/main/java/com/android/apksig/internal/apk/v1/V1SchemeVerifier.java#280
-
-    NoOverwriteDict is a workaround for:
-    https://github.com/androguard/androguard/issues/1030
-
-    Lots more discusion here:
-    https://gitlab.com/fdroid/fdroidserver/-/issues/1128
-
-    """
-
-    class NoOverwriteDict(dict):
-        def __setitem__(self, k, v):
-            if k not in self:
-                super().__setitem__(k, v)
-
+    """Get the first signing certificate from the APK,  DER-encoded"""
+    certs = None
     cert_encoded = None
-    found_certs = []
-    apkobject = get_androguard_APK(apkpath)
-    apkobject._v2_blocks = NoOverwriteDict()
-    certs_v3 = apkobject.get_certificates_der_v3()
-    if certs_v3:
-        cert_v3 = certs_v3[0]
-        found_certs.append(cert_v3)
-        if not cert_encoded:
-            logging.debug(_('Using APK Signature v3'))
-            cert_encoded = cert_v3
+    with zipfile.ZipFile(apkpath, 'r') as apk:
+        cert_files = [n for n in apk.namelist() if SIGNATURE_BLOCK_FILE_REGEX.match(n)]
+        if len(cert_files) > 1:
+            logging.error(_("Found multiple JAR Signature Block Files in {path}").format(path=apkpath))
+            return None
+        elif len(cert_files) == 1:
+            cert_encoded = get_certificate(apk.read(cert_files[0]))
 
-    certs_v2 = apkobject.get_certificates_der_v2()
-    if certs_v2:
-        cert_v2 = certs_v2[0]
-        found_certs.append(cert_v2)
-        if not cert_encoded:
+    if not cert_encoded and use_androguard():
+        apkobject = _get_androguard_APK(apkpath)
+        certs = apkobject.get_certificates_der_v2()
+        if len(certs) > 0:
             logging.debug(_('Using APK Signature v2'))
-            cert_encoded = cert_v2
-
-    if get_min_sdk_version(apkobject) < 24 or (
-        not (certs_v3 or certs_v2) and get_effective_target_sdk_version(apkobject) < 30
-    ):
-        with zipfile.ZipFile(apkpath, 'r') as apk:
-            cert_files = [
-                n for n in apk.namelist() if SIGNATURE_BLOCK_FILE_REGEX.match(n)
-            ]
-            if len(cert_files) > 1:
-                logging.error(
-                    _("Found multiple JAR Signature Block Files in {path}").format(
-                        path=apkpath
-                    )
-                )
-                return
-            elif len(cert_files) == 1:
-                signature_block_file = cert_files[0]
-                signature_file = (
-                    cert_files[0][: signature_block_file.rindex('.')] + '.SF'
-                )
-                cert_v1 = get_certificate(
-                    apk.read(signature_block_file),
-                    apk.read(signature_file),
-                )
-                found_certs.append(cert_v1)
-                if not cert_encoded:
-                    logging.debug(_('Using JAR Signature'))
-                    cert_encoded = cert_v1
+            cert_encoded = certs[0]
+        if not cert_encoded:
+            certs = apkobject.get_certificates_der_v3()
+            if len(certs) > 0:
+                logging.debug(_('Using APK Signature v3'))
+                cert_encoded = certs[0]
 
     if not cert_encoded:
         logging.error(_("No signing certificates found in {path}").format(path=apkpath))
-        return
-
-    if not all(cert == found_certs[0] for cert in found_certs):
-        logging.error(
-            _("APK signatures have different certificates in {path}:").format(
-                path=apkpath
-            )
-        )
-        return
-
+        return None
     return cert_encoded
 
 
 def apk_signer_fingerprint(apk_path):
-    """Get SHA-256 fingerprint string for the first signer from given APK.
+    """Obtain sha256 signing-key fingerprint for APK.
 
-    Parameters
-    ----------
-    apk_path
-        path to APK
-
-    Returns
-    -------
-    Standard SHA-256 signer fingerprint
+    Extracts hexadecimal sha256 signing-key fingerprint string
+    for a given APK.
 
+    :param apk_path: path to APK
+    :returns: signature fingerprint
     """
+
     cert_encoded = get_first_signer_certificate(apk_path)
     if not cert_encoded:
         return None
     return signer_fingerprint(cert_encoded)
 
 
+def apk_signer_fingerprint_short(apk_path):
+    """Obtain shortened sha256 signing-key fingerprint for APK.
+
+    Extracts the first 7 hexadecimal digits of sha256 signing-key fingerprint
+    for a given pkcs7 APK.
+
+    :param apk_path: path to APK
+    :returns: shortened signing-key fingerprint
+    """
+    return apk_signer_fingerprint(apk_path)[:7]
+
+
 def metadata_get_sigdir(appid, vercode=None):
-    """Get signature directory for app."""
+    """Get signature directory for app"""
     if vercode:
-        return os.path.join('metadata', appid, 'signatures', str(vercode))
+        return os.path.join('metadata', appid, 'signatures', vercode)
     else:
         return os.path.join('metadata', appid, 'signatures')
 
 
 def metadata_find_developer_signature(appid, vercode=None):
-    """Try to find the developer signature for given appid.
+    """Tires to find the developer signature for given appid.
 
     This picks the first signature file found in metadata an returns its
     signature.
 
-    Returns
-    -------
-    sha256 signing key fingerprint of the developer signing key.
-    None in case no signature can not be found.
-    """
+    :returns: sha256 signing key fingerprint of the developer signing key.
+        None in case no signature can not be found."""
+
     # fetch list of dirs for all versions of signatures
     appversigdirs = []
     if vercode:
@@ -3540,75 +2916,45 @@ def metadata_find_developer_signature(appid, vercode=None):
                     appversigdirs.append(appversigdir)
 
     for sigdir in appversigdirs:
-        signature_block_files = (
-            glob.glob(os.path.join(sigdir, '*.DSA'))
-            + glob.glob(os.path.join(sigdir, '*.EC'))
-            + glob.glob(os.path.join(sigdir, '*.RSA'))
-        )
-        if len(signature_block_files) > 1:
+        sigs = glob.glob(os.path.join(sigdir, '*.DSA')) + \
+            glob.glob(os.path.join(sigdir, '*.EC')) + \
+            glob.glob(os.path.join(sigdir, '*.RSA'))
+        if len(sigs) > 1:
             raise FDroidException('ambiguous signatures, please make sure there is only one signature in \'{}\'. (The signature has to be the App maintainers signature for version of the APK.)'.format(sigdir))
-        for signature_block_file in signature_block_files:
-            with open(signature_block_file, 'rb') as f:
+        for sig in sigs:
+            with open(sig, 'rb') as f:
                 return signer_fingerprint(get_certificate(f.read()))
     return None
 
 
 def metadata_find_signing_files(appid, vercode):
-    """Get a list of signed manifests and signatures.
+    """Gets a list of singed manifests and signatures.
 
-    Parameters
-    ----------
-    appid
-        app id string
-    vercode
-        app versionCode
-
-    Returns
-    -------
-    List
-        of 4-tuples for each signing key with following paths:
-        (signature_file, signature_block_file, manifest, v2_files), where v2_files
-        is either a (apk_signing_block_offset_file, apk_signing_block_file) pair or None
-
-    References
-    ----------
-    * https://docs.oracle.com/javase/tutorial/deployment/jar/intro.html
-    * https://source.android.com/security/apksigning/v2
-    * https://source.android.com/security/apksigning/v3
+    :param appid: app id string
+    :param vercode: app version code
+    :returns: a list of triplets for each signing key with following paths:
+        (signature_file, singed_file, manifest_file)
     """
     ret = []
     sigdir = metadata_get_sigdir(appid, vercode)
-    signature_block_files = (
-        glob.glob(os.path.join(sigdir, '*.DSA'))
-        + glob.glob(os.path.join(sigdir, '*.EC'))
-        + glob.glob(os.path.join(sigdir, '*.RSA'))
-    )
-    signature_block_pat = re.compile(r'(\.DSA|\.EC|\.RSA)$')
-    apk_signing_block = os.path.join(sigdir, "APKSigningBlock")
-    apk_signing_block_offset = os.path.join(sigdir, "APKSigningBlockOffset")
-    if os.path.isfile(apk_signing_block) and os.path.isfile(apk_signing_block_offset):
-        v2_files = apk_signing_block, apk_signing_block_offset
-    else:
-        v2_files = None
-    for signature_block_file in signature_block_files:
-        signature_file = signature_block_pat.sub('.SF', signature_block_file)
-        if os.path.isfile(signature_file):
-            manifest = os.path.join(sigdir, 'MANIFEST.MF')
-            if os.path.isfile(manifest):
-                ret.append((signature_block_file, signature_file, manifest, v2_files))
+    sigs = glob.glob(os.path.join(sigdir, '*.DSA')) + \
+        glob.glob(os.path.join(sigdir, '*.EC')) + \
+        glob.glob(os.path.join(sigdir, '*.RSA'))
+    extre = re.compile(r'(\.DSA|\.EC|\.RSA)$')
+    for sig in sigs:
+        sf = extre.sub('.SF', sig)
+        if os.path.isfile(sf):
+            mf = os.path.join(sigdir, 'MANIFEST.MF')
+            if os.path.isfile(mf):
+                ret.append((sig, sf, mf))
     return ret
 
 
 def metadata_find_developer_signing_files(appid, vercode):
     """Get developer signature files for specified app from metadata.
 
-    Returns
-    -------
-    List
-        of 4-tuples for each signing key with following paths:
-        (signature_file, signature_block_file, manifest, v2_files), where v2_files
-        is either a (apk_signing_block_offset_file, apk_signing_block_file) pair or None
-
+    :returns: A triplet of paths for signing files from metadata:
+        (signature_file, singed_file, manifest_file)
     """
     allsigningfiles = metadata_find_signing_files(appid, vercode)
     if allsigningfiles and len(allsigningfiles) == 1:
@@ -3617,47 +2963,12 @@ def metadata_find_developer_signing_files(appid, vercode):
         return None
 
 
-class ClonedZipInfo(zipfile.ZipInfo):
-    """Hack to allow fully cloning ZipInfo instances.
-
-    The zipfile library has some bugs that prevent it from fully
-    cloning ZipInfo entries.  https://bugs.python.org/issue43547
-
-    """
-
-    def __init__(self, zinfo):
-        super().__init__()
-        self.original = zinfo
-        for k in self.__slots__:
-            try:
-                setattr(self, k, getattr(zinfo, k))
-            except AttributeError:
-                pass
-
-    def __getattribute__(self, name):
-        if name in ("date_time", "external_attr", "flag_bits"):
-            return getattr(self.original, name)
-        return object.__getattribute__(self, name)
-
-
-def apk_has_v1_signatures(apkfile):
-    """Test whether an APK has v1 signature files."""
-    with ZipFile(apkfile, 'r') as apk:
-        for info in apk.infolist():
-            if APK_SIGNATURE_FILES.match(info.filename):
-                return True
-    return False
-
-
 def apk_strip_v1_signatures(signed_apk, strip_manifest=False):
-    """Remove signatures from APK.
+    """Removes signatures from APK.
 
-    Parameters
-    ----------
-    signed_apk
-        path to APK file.
-    strip_manifest
-        when set to True also the manifest file will be removed from the APK.
+    :param signed_apk: path to apk file.
+    :param strip_manifest: when set to True also the manifest file will
+        be removed from the APK.
     """
     with tempfile.TemporaryDirectory() as tmpdir:
         tmp_apk = os.path.join(tmpdir, 'tmp.apk')
@@ -3669,70 +2980,75 @@ def apk_strip_v1_signatures(signed_apk, strip_manifest=False):
                         if strip_manifest:
                             if info.filename != 'META-INF/MANIFEST.MF':
                                 buf = in_apk.read(info.filename)
-                                out_apk.writestr(ClonedZipInfo(info), buf)
+                                out_apk.writestr(info, buf)
                         else:
                             buf = in_apk.read(info.filename)
-                            out_apk.writestr(ClonedZipInfo(info), buf)
+                            out_apk.writestr(info, buf)
 
 
-def apk_implant_signatures(apkpath, outpath, manifest):
-    """Implant a signature from metadata into an APK.
+def _zipalign(unsigned_apk, aligned_apk):
+    """run 'zipalign' using standard flags used by Gradle Android Plugin
+
+    -p was added in build-tools-23.0.0
+
+    https://developer.android.com/studio/publish/app-signing#sign-manually
+    """
+    p = SdkToolsPopen(['zipalign', '-v', '-p', '4', unsigned_apk, aligned_apk])
+    if p.returncode != 0:
+        raise BuildException("Failed to align application")
+
+
+def apk_implant_signatures(apkpath, signaturefile, signedfile, manifest):
+    """Implats a signature from metadata into an APK.
 
     Note: this changes there supplied APK in place. So copy it if you
     need the original to be preserved.
 
-    Parameters
-    ----------
-    apkpath
-        location of the unsigned apk
-    outpath
-        location of the output apk
-
-    References
-    ----------
-    * https://docs.oracle.com/javase/tutorial/deployment/jar/intro.html
-    * https://source.android.com/security/apksigning/v2
-    * https://source.android.com/security/apksigning/v3
-
+    :param apkpath: location of the apk
     """
-    sigdir = os.path.dirname(manifest)  # FIXME
-    apksigcopier.do_patch(sigdir, apkpath, outpath, v1_only=None,
-                          exclude=apksigcopier.exclude_meta)
+    # get list of available signature files in metadata
+    with tempfile.TemporaryDirectory() as tmpdir:
+        apkwithnewsig = os.path.join(tmpdir, 'newsig.apk')
+        with ZipFile(apkpath, 'r') as in_apk:
+            with ZipFile(apkwithnewsig, 'w') as out_apk:
+                for sig_file in [signaturefile, signedfile, manifest]:
+                    with open(sig_file, 'rb') as fp:
+                        buf = fp.read()
+                    info = zipfile.ZipInfo('META-INF/' + os.path.basename(sig_file))
+                    info.compress_type = zipfile.ZIP_DEFLATED
+                    info.create_system = 0  # "Windows" aka "FAT", what Android SDK uses
+                    out_apk.writestr(info, buf)
+                for info in in_apk.infolist():
+                    if not APK_SIGNATURE_FILES.match(info.filename):
+                        if info.filename != 'META-INF/MANIFEST.MF':
+                            buf = in_apk.read(info.filename)
+                            out_apk.writestr(info, buf)
+        os.remove(apkpath)
+        _zipalign(apkwithnewsig, apkpath)
 
 
-def apk_extract_signatures(apkpath, outdir):
-    """Extract a signature files from APK and puts them into target directory.
-
-    Parameters
-    ----------
-    apkpath
-        location of the apk
-    outdir
-        older where the extracted signature files will be stored
-
-    References
-    ----------
-    * https://docs.oracle.com/javase/tutorial/deployment/jar/intro.html
-    * https://source.android.com/security/apksigning/v2
-    * https://source.android.com/security/apksigning/v3
+def apk_extract_signatures(apkpath, outdir, manifest=True):
+    """Extracts a signature files from APK and puts them into target directory.
 
+    :param apkpath: location of the apk
+    :param outdir: folder where the extracted signature files will be stored
+    :param manifest: (optionally) disable extracting manifest file
     """
-    apksigcopier.do_extract(apkpath, outdir, v1_only=None)
+    with ZipFile(apkpath, 'r') as in_apk:
+        for f in in_apk.infolist():
+            if APK_SIGNATURE_FILES.match(f.filename) or \
+                    (manifest and f.filename == 'META-INF/MANIFEST.MF'):
+                newpath = os.path.join(outdir, os.path.basename(f.filename))
+                with open(newpath, 'wb') as out_file:
+                    out_file.write(in_apk.read(f.filename))
 
 
 def get_min_sdk_version(apk):
-    """Wrap the androguard function to always return an integer.
-
-    Fall back to 1 if we can't get a valid minsdk version.
-
-    Parameters
-    ----------
-    apk
-        androguard APK object
-
-    Returns
-    -------
-    minSdkVersion: int
+    """
+    This wraps the androguard function to always return and int and fall back to 1
+    if we can't get a valid minsdk version
+    :param apk: androguard apk object
+    :return: minsdk as int
     """
     try:
         return int(apk.get_min_sdk_version())
@@ -3740,185 +3056,208 @@ def get_min_sdk_version(apk):
         return 1
 
 
-def get_effective_target_sdk_version(apk):
-    """Wrap the androguard function to always return an integer.
-
-    Parameters
-    ----------
-    apk
-        androguard APK object
-
-    Returns
-    -------
-    targetSdkVersion: int
-    """
-    try:
-        return int(apk.get_effective_target_sdk_version())
-    except TypeError:
-        return get_min_sdk_version(apk)
-
-
-def get_apksigner_smartcardoptions(smartcardoptions):
-    if '-providerName' in smartcardoptions.copy():
-        pos = smartcardoptions.index('-providerName')
-        # remove -providerName and it's argument
-        del smartcardoptions[pos]
-        del smartcardoptions[pos]
-    replacements = {'-storetype': '--ks-type',
-                    '-providerClass': '--provider-class',
-                    '-providerArg': '--provider-arg'}
-    return [replacements.get(n, n) for n in smartcardoptions]
-
-
 def sign_apk(unsigned_path, signed_path, keyalias):
-    """Sign an unsigned APK, then save to a new file, deleting the unsigned.
+    """Sign and zipalign an unsigned APK, then save to a new file, deleting the unsigned
 
-    NONE is a Java keyword used to configure smartcards as the
-    keystore.  Otherwise, the keystore is a local file.
-    https://docs.oracle.com/javase/7/docs/technotes/guides/security/p11guide.html#KeyToolJarSigner
+    Use apksigner for making v2 and v3 signature for apks with targetSDK >=30 as
+    otherwise they won't be installable on Android 11/R.
 
-    When using smartcards, apksigner does not use the same options has
-    Java/keytool/jarsigner (-providerName, -providerClass,
-    -providerArg, -storetype).  apksigner documents the options as
-    --ks-provider-class and --ks-provider-arg.  Those seem to be
-    accepted but fail when actually making a signature with weird
-    internal exceptions. We use the options that actually work.  From:
-    https://geoffreymetais.github.io/code/key-signing/#scripting
+    Otherwise use jarsigner for v1 only signatures until we have apksig v2/v3
+    signature transplantig support.
+
+    When using jarsigner we need to manually select the hash algorithm,
+    apksigner does this automatically. Apksigner also does the zipalign for us.
+
+    SHA-256 support was added in android-18 (4.3), before then, the only options were MD5
+    and SHA1. This aims to use SHA-256 when the APK does not target
+    older Android versions, and is therefore safe to do so.
+
+    https://issuetracker.google.com/issues/36956587
+    https://android-review.googlesource.com/c/platform/libcore/+/44491
 
     """
-    if config['keystore'] == 'NONE':
-        signing_args = get_apksigner_smartcardoptions(config['smartcardoptions'])
+    apk = _get_androguard_APK(unsigned_path)
+    if apk.get_effective_target_sdk_version() >= 30:
+        if config['keystore'] == 'NONE':
+            # NOTE: apksigner doesn't like -providerName/--provider-name at all, don't use that.
+            #       apksigner documents the options as --ks-provider-class and --ks-provider-arg
+            #       those seem to be accepted but fail when actually making a signature with
+            #       weird internal exceptions. Those options actually work.
+            #       From: https://geoffreymetais.github.io/code/key-signing/#scripting
+            apksigner_smartcardoptions = config['smartcardoptions'].copy()
+            if '-providerName' in apksigner_smartcardoptions:
+                pos = config['smartcardoptions'].index('-providerName')
+                # remove -providerName and it's argument
+                del apksigner_smartcardoptions[pos]
+                del apksigner_smartcardoptions[pos]
+            replacements = {'-storetype': '--ks-type',
+                            '-providerClass': '--provider-class',
+                            '-providerArg': '--provider-arg'}
+            signing_args = [replacements.get(n, n) for n in apksigner_smartcardoptions]
+        else:
+            signing_args = ['--key-pass', 'env:FDROID_KEY_PASS']
+        if not find_apksigner():
+            raise BuildException(_("apksigner not found, it's required for signing!"))
+        cmd = [find_apksigner(), 'sign',
+               '--ks', config['keystore'],
+               '--ks-pass', 'env:FDROID_KEY_STORE_PASS']
+        cmd += signing_args
+        cmd += ['--ks-key-alias', keyalias,
+                '--in', unsigned_path,
+                '--out', signed_path]
+        p = FDroidPopen(cmd, envs={
+            'FDROID_KEY_STORE_PASS': config['keystorepass'],
+            'FDROID_KEY_PASS': config.get('keypass', "")})
+        if p.returncode != 0:
+            raise BuildException(_("Failed to sign application"), p.output)
+        os.remove(unsigned_path)
     else:
-        signing_args = ['--key-pass', 'env:FDROID_KEY_PASS']
-    apksigner = config.get('apksigner', '')
-    if not shutil.which(apksigner):
-        raise BuildException(_("apksigner not found, it's required for signing!"))
-    cmd = [apksigner, 'sign',
-           '--ks', config['keystore'],
-           '--ks-pass', 'env:FDROID_KEY_STORE_PASS']
-    cmd += signing_args
-    cmd += ['--ks-key-alias', keyalias,
-            '--in', unsigned_path,
-            '--out', signed_path]
-    p = FDroidPopen(cmd, envs={
-        'FDROID_KEY_STORE_PASS': config['keystorepass'],
-        'FDROID_KEY_PASS': config.get('keypass', "")})
-    if p.returncode != 0:
-        if os.path.exists(signed_path):
-            os.remove(signed_path)
-        raise BuildException(_("Failed to sign application"), p.output)
-    os.remove(unsigned_path)
+
+        if get_min_sdk_version(apk) < 18:
+            signature_algorithm = ['-sigalg', 'SHA1withRSA', '-digestalg', 'SHA1']
+        else:
+            signature_algorithm = ['-sigalg', 'SHA256withRSA', '-digestalg', 'SHA-256']
+        if config['keystore'] == 'NONE':
+            signing_args = config['smartcardoptions']
+        else:
+            signing_args = ['-keypass:env', 'FDROID_KEY_PASS']
+
+        cmd = [config['jarsigner'], '-keystore', config['keystore'],
+               '-storepass:env', 'FDROID_KEY_STORE_PASS']
+        cmd += signing_args
+        cmd += signature_algorithm
+        cmd += [unsigned_path, keyalias]
+        p = FDroidPopen(cmd, envs={
+            'FDROID_KEY_STORE_PASS': config['keystorepass'],
+            'FDROID_KEY_PASS': config.get('keypass', "")})
+        if p.returncode != 0:
+            raise BuildException(_("Failed to sign application"), p.output)
+
+        _zipalign(unsigned_path, signed_path)
+        os.remove(unsigned_path)
 
 
-def verify_apks(
-    signed_apk, unsigned_apk, tmp_dir, v1_only=None, clean_up_verified=False
-):
-    """Verify that two apks are the same.
+def verify_apks(signed_apk, unsigned_apk, tmp_dir):
+    """Verify that two apks are the same
 
     One of the inputs is signed, the other is unsigned. The signature metadata
-    is transferred from the signed to the unsigned apk, and then apksigner is
-    used to verify that the signature from the signed APK is also valid for
+    is transferred from the signed to the unsigned apk, and then jarsigner is
+    used to verify that the signature from the signed apk is also valid for
     the unsigned one.  If the APK given as unsigned actually does have a
     signature, it will be stripped out and ignored.
 
-    Parameters
-    ----------
-    signed_apk
-        Path to a signed APK file
-    unsigned_apk
-        Path to an unsigned APK file expected to match it
-    tmp_dir
-        Path to directory for temporary files
-    v1_only
-        True for v1-only signatures, False for v1 and v2 signatures,
-        or None for autodetection
-    clean_up_verified
-        Remove any files created here if the verification succeeded.
-
-    Returns
-    -------
-    None if the verification is successful, otherwise a string describing what went wrong.
+    :param signed_apk: Path to a signed apk file
+    :param unsigned_apk: Path to an unsigned apk file expected to match it
+    :param tmp_dir: Path to directory for temporary files
+    :returns: None if the verification is successful, otherwise a string
+              describing what went wrong.
     """
-    if not verify_apk_signature(signed_apk):
-        logging.info('...NOT verified - {0}'.format(signed_apk))
-        return 'verification of signed APK failed'
 
     if not os.path.isfile(signed_apk):
         return 'can not verify: file does not exists: {}'.format(signed_apk)
+
     if not os.path.isfile(unsigned_apk):
         return 'can not verify: file does not exists: {}'.format(unsigned_apk)
 
-    tmp_apk = os.path.join(tmp_dir, 'sigcp_' + os.path.basename(unsigned_apk))
+    with ZipFile(signed_apk, 'r') as signed:
+        meta_inf_files = ['META-INF/MANIFEST.MF']
+        for f in signed.namelist():
+            if APK_SIGNATURE_FILES.match(f):
+                meta_inf_files.append(f)
+        if len(meta_inf_files) < 3:
+            return "Signature files missing from {0}".format(signed_apk)
 
+        tmp_apk = os.path.join(tmp_dir, 'sigcp_' + os.path.basename(unsigned_apk))
+        with ZipFile(unsigned_apk, 'r') as unsigned:
+            # only read the signature from the signed APK, everything else from unsigned
+            with ZipFile(tmp_apk, 'w') as tmp:
+                for filename in meta_inf_files:
+                    tmp.writestr(signed.getinfo(filename), signed.read(filename))
+                for info in unsigned.infolist():
+                    if info.filename in meta_inf_files:
+                        logging.warning('Ignoring %s from %s', info.filename, unsigned_apk)
+                        continue
+                    if info.filename in tmp.namelist():
+                        return "duplicate filename found: " + info.filename
+                    tmp.writestr(info, unsigned.read(info.filename))
+
+    # Use jarsigner to verify the v1 signature on the reproduced APK, as
+    # apksigner will reject the reproduced APK if the original also had a v2
+    # signature
     try:
-        apksigcopier.do_copy(signed_apk, unsigned_apk, tmp_apk, v1_only=v1_only,
-                             exclude=apksigcopier.exclude_meta)
-    except apksigcopier.APKSigCopierError as e:
-        logging.info('...NOT verified - {0}'.format(tmp_apk))
-        error = 'signature copying failed: {}'.format(str(e))
-        result = compare_apks(signed_apk, unsigned_apk, tmp_dir,
-                              os.path.dirname(unsigned_apk))
-        if result is not None:
-            error += '\nComparing reference APK to unsigned APK...\n' + result
-        return error
+        verify_jar_signature(tmp_apk)
+        verified = True
+    except Exception:
+        verified = False
 
-    if not verify_apk_signature(tmp_apk):
-        logging.info('...NOT verified - {0}'.format(tmp_apk))
-        error = 'verification of APK with copied signature failed'
-        result = compare_apks(signed_apk, tmp_apk, tmp_dir,
-                              os.path.dirname(unsigned_apk))
-        if result is not None:
-            error += '\nComparing reference APK to APK with copied signature...\n' + result
-        return error
-    if clean_up_verified and os.path.exists(tmp_apk):
-        logging.info(f"...cleaned up {tmp_apk} after successful verification")
-        os.remove(tmp_apk)
+    if not verified:
+        logging.info("...NOT verified - {0}".format(tmp_apk))
+        return compare_apks(signed_apk, tmp_apk, tmp_dir,
+                            os.path.dirname(unsigned_apk))
 
-    logging.info('...successfully verified')
+    logging.info("...successfully verified")
     return None
 
 
 def verify_jar_signature(jar):
-    """Verify the signature of a given JAR file.
+    """Verifies the signature of a given JAR file.
 
     jarsigner is very shitty: unsigned JARs pass as "verified"! So
     this has to turn on -strict then check for result 4, since this
     does not expect the signature to be from a CA-signed certificate.
 
-    Raises
-    ------
-    VerificationException
-        If the JAR's signature could not be verified.
+    :raises: VerificationException() if the JAR's signature could not be verified
 
     """
+
     error = _('JAR signature failed to verify: {path}').format(path=jar)
     try:
-        output = subprocess.check_output(
-            [config['jarsigner'], '-strict', '-verify', jar], stderr=subprocess.STDOUT
-        )
+        output = subprocess.check_output([config['jarsigner'], '-strict', '-verify', jar],
+                                         stderr=subprocess.STDOUT)
         raise VerificationException(error + '\n' + output.decode('utf-8'))
     except subprocess.CalledProcessError as e:
         if e.returncode == 4:
             logging.debug(_('JAR signature verified: {path}').format(path=jar))
         else:
-            raise VerificationException(error + '\n' + e.output.decode('utf-8')) from e
+            raise VerificationException(error + '\n' + e.output.decode('utf-8'))
 
 
-def verify_deprecated_jar_signature(jar):
-    """Verify the signature of a given JAR file, allowing deprecated algorithms.
+def verify_apk_signature(apk, min_sdk_version=None):
+    """verify the signature on an APK
 
-    index.jar (v0) and index-v1.jar are both signed by MD5/SHA1 by
-    definition, so this method provides a way to verify those.  Also,
-    apksigner has different deprecation rules than jarsigner, so this
-    is our current hack to try to represent the apksigner rules when
-    executing jarsigner.
+    Try to use apksigner whenever possible since jarsigner is very
+    shitty: unsigned APKs pass as "verified"!  Warning, this does
+    not work on JARs with apksigner >= 0.7 (build-tools 26.0.1)
 
-    jarsigner is very shitty: unsigned JARs pass as "verified"! So
-    this has to turn on -strict then check for result 4, since this
-    does not expect the signature to be from a CA-signed certificate.
+    :returns: boolean whether the APK was verified
+    """
+    if set_command_in_config('apksigner'):
+        args = [config['apksigner'], 'verify']
+        if min_sdk_version:
+            args += ['--min-sdk-version=' + min_sdk_version]
+        if options.verbose:
+            args += ['--verbose']
+        try:
+            output = subprocess.check_output(args + [apk])
+            if options.verbose:
+                logging.debug(apk + ': ' + output.decode('utf-8'))
+            return True
+        except subprocess.CalledProcessError as e:
+            logging.error('\n' + apk + ': ' + e.output.decode('utf-8'))
+    else:
+        if not config.get('jarsigner_warning_displayed'):
+            config['jarsigner_warning_displayed'] = True
+            logging.warning(_("Using Java's jarsigner, not recommended for verifying APKs! Use apksigner"))
+        try:
+            verify_jar_signature(apk)
+            return True
+        except Exception as e:
+            logging.error(e)
+    return False
 
-    Also used to verify the signature on an archived APK, supporting deprecated
-    algorithms.
+
+def verify_old_apk_signature(apk):
+    """verify the signature on an archived APK, supporting deprecated algorithms
 
     F-Droid aims to keep every single binary that it ever published.  Therefore,
     it needs to be able to verify APK signatures that include deprecated/removed
@@ -3931,68 +3270,37 @@ def verify_deprecated_jar_signature(jar):
     file permissions while in use.  That should prevent a bad actor
     from changing the settings during operation.
 
-    Raises
-    ------
-    VerificationException
-        If the JAR's signature could not be verified.
+    :returns: boolean whether the APK was verified
 
     """
-    error = _('JAR signature failed to verify: {path}').format(path=jar)
-    with tempfile.TemporaryDirectory() as tmpdir:
-        java_security = os.path.join(tmpdir, 'java.security')
-        with open(java_security, 'w') as fp:
-            fp.write('jdk.jar.disabledAlgorithms=MD2, RSA keySize < 1024')
-        os.chmod(java_security, 0o400)
 
-        try:
-            cmd = [
-                config['jarsigner'],
-                '-J-Djava.security.properties=' + java_security,
-                '-strict', '-verify', jar
-            ]
-            output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)
-            raise VerificationException(error + '\n' + output.decode('utf-8'))
-        except subprocess.CalledProcessError as e:
-            if e.returncode == 4:
-                logging.debug(_('JAR signature verified: {path}').format(path=jar))
-            else:
-                raise VerificationException(error + '\n' + e.output.decode('utf-8')) from e
+    _java_security = os.path.join(os.getcwd(), '.java.security')
+    if os.path.exists(_java_security):
+        os.remove(_java_security)
+    with open(_java_security, 'w') as fp:
+        fp.write('jdk.jar.disabledAlgorithms=MD2, RSA keySize < 1024')
+    os.chmod(_java_security, 0o400)
 
-
-def verify_apk_signature(apk, min_sdk_version=None):
-    """Verify the signature on an APK.
-
-    Try to use apksigner whenever possible since jarsigner is very
-    shitty: unsigned APKs pass as "verified"!  Warning, this does
-    not work on JARs with apksigner >= 0.7 (build-tools 26.0.1)
-
-    Returns
-    -------
-    Boolean
-        whether the APK was verified
-    """
-    if set_command_in_config('apksigner'):
-        args = [config['apksigner'], 'verify']
-        if min_sdk_version:
-            args += ['--min-sdk-version=' + min_sdk_version]
-        if options and options.verbose:
-            args += ['--verbose']
-        try:
-            output = subprocess.check_output(args + [apk])
-            if options and options.verbose:
-                logging.debug(apk + ': ' + output.decode('utf-8'))
+    try:
+        cmd = [
+            config['jarsigner'],
+            '-J-Djava.security.properties=' + _java_security,
+            '-strict', '-verify', apk
+        ]
+        output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)
+    except subprocess.CalledProcessError as e:
+        if e.returncode != 4:
+            output = e.output
+        else:
+            logging.debug(_('JAR signature verified: {path}').format(path=apk))
             return True
-        except subprocess.CalledProcessError as e:
-            logging.error('\n' + apk + ': ' + e.output.decode('utf-8'))
-    else:
-        if not config.get('jarsigner_warning_displayed'):
-            config['jarsigner_warning_displayed'] = True
-            logging.warning(_("Using Java's jarsigner, not recommended for verifying APKs! Use apksigner"))
-        try:
-            verify_deprecated_jar_signature(apk)
-            return True
-        except Exception as e:
-            logging.error(e)
+    finally:
+        if os.path.exists(_java_security):
+            os.chmod(_java_security, 0o600)
+            os.remove(_java_security)
+
+    logging.error(_('Old APK signature failed to verify: {path}').format(path=apk)
+                  + '\n' + output.decode('utf-8'))
     return False
 
 
@@ -4000,14 +3308,13 @@ apk_badchars = re.compile('''[/ :;'"]''')
 
 
 def compare_apks(apk1, apk2, tmp_dir, log_dir=None):
-    """Compare two apks.
+    """Compare two apks
 
-    Returns
-    -------
-    None if the APK content is the same (apart from the signing key),
+    Returns None if the apk content is the same (apart from the signing key),
     otherwise a string describing what's different, or what went wrong when
     trying to do the comparison.
     """
+
     if not log_dir:
         log_dir = tmp_dir
 
@@ -4022,7 +3329,7 @@ def compare_apks(apk1, apk2, tmp_dir, log_dir=None):
                             '--max-report-size', '12345678', '--max-diff-block-lines', '128',
                             '--html', htmlfile, '--text', textfile,
                             absapk1, absapk2]) != 0:
-            return "Failed to run diffoscope " + apk1
+            return("Failed to run diffoscope " + apk1)
 
     apk1dir = os.path.join(tmp_dir, apk_badchars.sub('_', apk1[0:-4]))  # trim .apk
     apk2dir = os.path.join(tmp_dir, apk_badchars.sub('_', apk2[0:-4]))  # trim .apk
@@ -4039,21 +3346,19 @@ def compare_apks(apk1, apk2, tmp_dir, log_dir=None):
         f.extractall(path=os.path.join(apk2dir, 'content'))
 
     if set_command_in_config('apktool'):
-        if subprocess.call(
-            [config['apktool'], 'd', absapk1, '--output', 'apktool'], cwd=apk1dir
-        ):
-            return "Failed to run apktool " + apk1
-        if subprocess.call(
-            [config['apktool'], 'd', absapk2, '--output', 'apktool'], cwd=apk2dir
-        ):
-            return "Failed to run apktool " + apk2
+        if subprocess.call([config['apktool'], 'd', absapk1, '--output', 'apktool'],
+                           cwd=apk1dir) != 0:
+            return("Failed to run apktool " + apk1)
+        if subprocess.call([config['apktool'], 'd', absapk2, '--output', 'apktool'],
+                           cwd=apk2dir) != 0:
+            return("Failed to run apktool " + apk2)
 
     p = FDroidPopen(['diff', '-r', apk1dir, apk2dir], output=False)
     lines = p.output.splitlines()
     if len(lines) != 1 or 'META-INF' not in lines[0]:
         if set_command_in_config('meld'):
             p = FDroidPopen([config['meld'], apk1dir, apk2dir], output=False)
-        return "Unexpected diff output:\n" + p.output.replace("\r", "^M")
+        return("Unexpected diff output:\n" + p.output)
 
     # since everything verifies, delete the comparison to keep cruft down
     shutil.rmtree(apk1dir)
@@ -4064,12 +3369,11 @@ def compare_apks(apk1, apk2, tmp_dir, log_dir=None):
 
 
 def set_command_in_config(command):
-    """Try to find specified command in the path, if it hasn't been manually set in config.yml.
-
-    If found, it is added to the config
+    '''Try to find specified command in the path, if it hasn't been
+    manually set in config.py.  If found, it is added to the config
     dict.  The return value says whether the command is available.
 
-    """
+    '''
     if command in config:
         return True
     else:
@@ -4081,7 +3385,8 @@ def set_command_in_config(command):
 
 
 def find_command(command):
-    """Find the full path of a command, or None if it can't be found in the PATH."""
+    '''find the full path of a command, or None if it can't be found in the PATH'''
+
     def is_exe(fpath):
         return os.path.isfile(fpath) and os.access(fpath, os.X_OK)
 
@@ -4100,7 +3405,7 @@ def find_command(command):
 
 
 def genpassword():
-    """Generate a random password for when generating keys."""
+    '''generate a random password for when generating keys'''
     h = hashlib.sha256()
     h.update(os.urandom(16))  # salt
     h.update(socket.getfqdn().encode('utf-8'))
@@ -4109,15 +3414,9 @@ def genpassword():
 
 
 def genkeystore(localconfig):
-    """Generate a new key with password provided in localconfig and add it to new keystore.
-
-    Parameters
-    ----------
-    localconfig
-
-    Returns
-    -------
-    hexed public key, public key fingerprint
+    """
+    Generate a new key with password provided in :param localconfig and add it to new keystore
+    :return: hexed public key, public key fingerprint
     """
     logging.info('Generating a new key in "' + localconfig['keystore'] + '"...')
     keystoredir = os.path.dirname(localconfig['keystore'])
@@ -4172,238 +3471,131 @@ def genkeystore(localconfig):
 
 
 def get_cert_fingerprint(pubkey):
-    """Generate a certificate fingerprint the same way keytool does it (but with slightly different formatting)."""
+    """
+    Generate a certificate fingerprint the same way keytool does it
+    (but with slightly different formatting)
+    """
     digest = hashlib.sha256(pubkey).digest()
     ret = [' '.join("%02X" % b for b in bytearray(digest))]
     return " ".join(ret)
 
 
-def get_certificate(signature_block_file, signature_file=None):
-    """Extract a single DER certificate from JAR Signature's "Signature Block File".
+def get_certificate(signature_block_file):
+    """Extracts a DER certificate from JAR Signature's "Signature Block File".
 
-    If there is more than one signer certificate, this exits with an
-    error, unless the signature_file is provided.  If that is set, it
-    will return the certificate that matches the Signature File, for
-    example, if there is a certificate chain, like TLS does.  In the
-    fdroidserver use cases, there should always be a single signer.
-    But rarely, some APKs include certificate chains.
+    :param signature_block_file: file bytes (as string) representing the
+    certificate, as read directly out of the APK/ZIP
 
-    This could be replaced by androguard's APK.get_certificate_der()
-    provided the cert chain fix was merged there.  Maybe in 4.1.2?
-    https://github.com/androguard/androguard/pull/1038
-
-    https://docs.oracle.com/en/java/javase/21/docs/specs/man/jarsigner.html#the-signed-jar-file
-
-    Parameters
-    ----------
-    signature_block_file
-        Bytes representing the PKCS#7 signer certificate and
-        signature, as read directly out of the JAR/APK, e.g. CERT.RSA.
-
-    signature_file
-        Bytes representing the manifest signed by the Signature Block
-        File, e.g. CERT.SF.  If this is not given, the assumption is
-        there will be only a single certificate in
-        signature_block_file, otherwise it is an error.
-
-    Returns
-    -------
-    A binary representation of the certificate's public key,
+    :return: A binary representation of the certificate's public key,
     or None in case of error
 
     """
-    pkcs7obj = cms.ContentInfo.load(signature_block_file)
-    certificates = pkcs7obj['content']['certificates']
-    if len(certificates) == 1:
-        return certificates[0].chosen.dump()
-    elif not signature_file:
-        logging.error(_('Found multiple Signer Certificates!'))
-        return
-    certificate = get_jar_signer_certificate(pkcs7obj, signature_file)
-    if certificate:
-        return certificate.chosen.dump()
+    content = decoder.decode(signature_block_file, asn1Spec=rfc2315.ContentInfo())[0]
+    if content.getComponentByName('contentType') != rfc2315.signedData:
+        return None
+    content = decoder.decode(content.getComponentByName('content'),
+                             asn1Spec=rfc2315.SignedData())[0]
+    try:
+        certificates = content.getComponentByName('certificates')
+        cert = certificates[0].getComponentByName('certificate')
+    except PyAsn1Error:
+        logging.error("Certificates not found.")
+        return None
+    return encoder.encode(cert)
 
 
-def _find_matching_certificate(signer_info, certificate):
-    """Find the certificates that matches signer_info using issuer and serial number.
-
-    https://android.googlesource.com/platform/tools/apksig/+/refs/tags/android-13.0.0_r3/src/main/java/com/android/apksig/internal/apk/v1/V1SchemeVerifier.java#590
-    https://android.googlesource.com/platform/tools/apksig/+/refs/tags/android-13.0.0_r3/src/main/java/com/android/apksig/internal/x509/Certificate.java#55
+def load_stats_fdroid_signing_key_fingerprints():
+    """Load list of signing-key fingerprints stored by fdroid publish from file.
 
+    :returns: list of dictionanryies containing the singing-key fingerprints.
     """
-    certificate_serial = certificate.chosen['tbs_certificate']['serial_number']
-    expected_issuer_serial = signer_info['sid'].chosen
-    return (
-        expected_issuer_serial['issuer'] == certificate.chosen.issuer
-        and expected_issuer_serial['serial_number'] == certificate_serial
-    )
-
-
-def get_jar_signer_certificate(pkcs7obj: cms.ContentInfo, signature_file: bytes):
-    """Return the one certificate in a chain that actually signed the manifest.
-
-    PKCS#7-signed data can include certificate chains for use cases
-    where an Certificate Authority (CA) is used.  Android does not
-    validate the certificate chain on APK signatures, so neither does
-    this.
-    https://android.googlesource.com/platform/tools/apksig/+/refs/tags/android-13.0.0_r3/src/main/java/com/android/apksig/internal/apk/v1/V1SchemeVerifier.java#512
-
-    Some useful fodder for understanding all this:
-    https://docs.oracle.com/javase/tutorial/deployment/jar/intro.html
-    https://technotes.shemyak.com/posts/jar-signature-block-file-format/
-    https://docs.oracle.com/en/java/javase/21/docs/specs/man/jarsigner.html#the-signed-jar-file
-    https://qistoph.blogspot.com/2012/01/manual-verify-pkcs7-signed-data-with.html
-
-    """
-    import oscrypto.asymmetric
-    import oscrypto.errors
-
-    # Android attempts to verify all SignerInfos and then picks the first verified SignerInfo.
-    first_verified_signer_info = None
-    first_verified_signer_info_signing_certificate = None
-    for signer_info in pkcs7obj['content']['signer_infos']:
-        signature = signer_info['signature'].contents
-        digest_algorithm = signer_info["digest_algorithm"]["algorithm"].native
-        public_key = None
-        for certificate in pkcs7obj['content']['certificates']:
-            if _find_matching_certificate(signer_info, certificate):
-                public_key = oscrypto.asymmetric.load_public_key(certificate.chosen.public_key)
-                break
-        if public_key is None:
-            logging.info('No certificate found that matches signer info!')
-            continue
-
-        signature_algo = signer_info['signature_algorithm'].signature_algo
-        if signature_algo == 'rsassa_pkcs1v15':
-            # ASN.1 - 1.2.840.113549.1.1.1
-            verify_func = oscrypto.asymmetric.rsa_pkcs1v15_verify
-        elif signature_algo == 'rsassa_pss':
-            # ASN.1 - 1.2.840.113549.1.1.10
-            verify_func = oscrypto.asymmetric.rsa_pss_verify
-        elif signature_algo == 'dsa':
-            # ASN.1 - 1.2.840.10040.4.1
-            verify_func = oscrypto.asymmetric.dsa_verify
-        elif signature_algo == 'ecdsa':
-            # ASN.1 - 1.2.840.10045.4
-            verify_func = oscrypto.asymmetric.ecdsa_verify
-        else:
-            logging.error(
-                'Unknown signature algorithm %s:\n  %s\n  %s'
-                % (
-                    signature_algo,
-                    hexlify(certificate.chosen.sha256).decode(),
-                    certificate.chosen.subject.human_friendly,
-                ),
-            )
-            return
-
-        try:
-            verify_func(public_key, signature, signature_file, digest_algorithm)
-            if not first_verified_signer_info:
-                first_verified_signer_info = signer_info
-                first_verified_signer_info_signing_certificate = certificate
-
-        except oscrypto.errors.SignatureError as e:
-            logging.error(
-                '"%s", skipping:\n  %s\n  %s' % (
-                    e,
-                    hexlify(certificate.chosen.sha256).decode(),
-                    certificate.chosen.subject.human_friendly),
-            )
-
-    if first_verified_signer_info_signing_certificate:
-        return first_verified_signer_info_signing_certificate
-
-
-def load_publish_signer_fingerprints():
-    """Load signing-key fingerprints stored in file generated by fdroid publish.
-
-    Returns
-    -------
-    dict
-        containing the signing-key fingerprints.
-    """
-    jar_file = os.path.join('repo', 'signer-index.jar')
+    jar_file = os.path.join('stats', 'publishsigkeys.jar')
     if not os.path.isfile(jar_file):
         return {}
-    try:
-        verify_deprecated_jar_signature(jar_file)
-    except VerificationException as e:
+    cmd = [config['jarsigner'], '-strict', '-verify', jar_file]
+    p = FDroidPopen(cmd, output=False)
+    if p.returncode != 4:
         raise FDroidException("Signature validation of '{}' failed! "
-                              "Please run publish again to rebuild this file.".format(jar_file)) from e
+                              "Please run publish again to rebuild this file.".format(jar_file))
 
     jar_sigkey = apk_signer_fingerprint(jar_file)
     repo_key_sig = config.get('repo_key_sha256')
     if repo_key_sig:
         if jar_sigkey != repo_key_sig:
-            raise FDroidException("Signature key fingerprint of file '{}' does not match repo_key_sha256 in config.yml (found fingerprint: '{}')".format(jar_file, jar_sigkey))
+            raise FDroidException("Signature key fingerprint of file '{}' does not match repo_key_sha256 in config.py (found fingerprint: '{}')".format(jar_file, jar_sigkey))
     else:
-        logging.warning("repo_key_sha256 not in config.yml, setting it to the signature key fingerprint of '{}'".format(jar_file))
+        logging.warning("repo_key_sha256 not in config.py, setting it to the signature key fingerprint of '{}'".format(jar_file))
         config['repo_key_sha256'] = jar_sigkey
         write_to_config(config, 'repo_key_sha256')
 
     with zipfile.ZipFile(jar_file, 'r') as f:
-        return json.loads(str(f.read('signer-index.json'), 'utf-8'))
+        return json.loads(str(f.read('publishsigkeys.json'), 'utf-8'))
 
 
-def write_config_file(config):
-    """Write the provided string to config.yml with the right path and encoding."""
-    Path(CONFIG_FILE).write_text(config, encoding='utf-8')
-
-
-def write_to_config(thisconfig, key, value=None):
-    """Write a key/value to the local config.yml.
-
-    The config.yml is defined as YAML 1.2 in UTF-8 encoding on all
-    platforms.
+def write_to_config(thisconfig, key, value=None, config_file=None):
+    '''write a key/value to the local config.yml or config.py
 
     NOTE: only supports writing string variables.
 
-    Parameters
-    ----------
-    thisconfig
-        config dictionary
-    key
-        variable name in config to be overwritten/added
-    value
-        optional value to be written, instead of fetched
+    :param thisconfig: config dictionary
+    :param key: variable name in config to be overwritten/added
+    :param value: optional value to be written, instead of fetched
         from 'thisconfig' dictionary.
-
-    """
+    '''
     if value is None:
         origkey = key + '_orig'
         value = thisconfig[origkey] if origkey in thisconfig else thisconfig[key]
+    if config_file:
+        cfg = config_file
+    elif os.path.exists('config.py') and not os.path.exists('config.yml'):
+        cfg = 'config.py'
+    else:
+        cfg = 'config.yml'
 
     # load config file, create one if it doesn't exist
-    if not os.path.exists(CONFIG_FILE):
-        write_config_file('')
-        logging.info(_("Creating empty {config_file}").format(config_file=CONFIG_FILE))
-    with open(CONFIG_FILE) as fp:
-        lines = fp.readlines()
+    if not os.path.exists(cfg):
+        open(cfg, 'a').close()
+        logging.info("Creating empty " + cfg)
+    with open(cfg, 'r') as f:
+        lines = f.readlines()
 
     # make sure the file ends with a carraige return
     if len(lines) > 0:
         if not lines[-1].endswith('\n'):
             lines[-1] += '\n'
 
-    pattern = re.compile(r'^[\s#]*' + key + r':.*\n')
-    repl = config_dump({key: value})
+    # regex for finding and replacing python string variable
+    # definitions/initializations
+    if cfg.endswith('.py'):
+        pattern = re.compile(r'^[\s#]*' + key + r'\s*=\s*"[^"]*"')
+        repl = key + ' = "' + value + '"'
+        pattern2 = re.compile(r'^[\s#]*' + key + r"\s*=\s*'[^']*'")
+        repl2 = key + " = '" + value + "'"
+    else:
+        # assume .yml as default
+        pattern = re.compile(r'^[\s#]*' + key + r':.*')
+        repl = yaml.dump({key: value}, default_flow_style=False)
+        pattern2 = pattern
+        repl2 = repl
 
     # If we replaced this line once, we make sure won't be a
     # second instance of this line for this key in the document.
     didRepl = False
     # edit config file
-    with open(CONFIG_FILE, 'w', encoding='utf-8') as f:
+    with open(cfg, 'w') as f:
         for line in lines:
-            if pattern.match(line):
+            if pattern.match(line) or pattern2.match(line):
                 if not didRepl:
                     line = pattern.sub(repl, line)
+                    line = pattern2.sub(repl2, line)
                     f.write(line)
                     didRepl = True
             else:
                 f.write(line)
         if not didRepl:
+            f.write('\n')
             f.write(repl)
+            f.write('\n')
 
 
 def parse_xml(path):
@@ -4423,44 +3615,22 @@ def string_is_integer(string):
 
 
 def version_code_string_to_int(vercode):
-    """Convert an versionCode string of any base into an int."""
-    # TODO: Python 3.6 allows underscores in numeric literals
-    vercode = vercode.replace('_', '')
+    """Convert an version code string of any base into an int"""
     try:
         return int(vercode, 0)
     except ValueError:
         return int(vercode)
 
 
-def get_app_display_name(app):
-    """Get a human readable name for the app for logging and sorting.
-
-    When trying to find a localized name, this first tries en-US since
-    that his the historical language used for sorting.
-
-    """
-    if app.get('Name'):
-        return app['Name']
-    if app.get('localized'):
-        localized = app['localized'].get(DEFAULT_LOCALE)
-        if not localized:
-            for v in app['localized'].values():
-                localized = v
-                break
-        if localized.get('name'):
-            return localized['name']
-    return app.get('AutoName') or app['id']
-
-
-def local_rsync(options, from_paths: List[str], todir: str):
-    """Rsync method for local to local copying of things.
+def local_rsync(options, fromdir, todir):
+    '''Rsync method for local to local copying of things
 
     This is an rsync wrapper with all the settings for safe use within
     the various fdroidserver use cases. This uses stricter rsync
     checking on all files since people using offline mode are already
     prioritizing security above ease and speed.
 
-    """
+    '''
     rsyncargs = ['rsync', '--recursive', '--safe-links', '--times', '--perms',
                  '--one-file-system', '--delete', '--chmod=Da+rx,Fa-x,a+r,u+w']
     if not options.no_checksum:
@@ -4469,25 +3639,21 @@ def local_rsync(options, from_paths: List[str], todir: str):
         rsyncargs += ['--verbose']
     if options.quiet:
         rsyncargs += ['--quiet']
-    logging.debug(' '.join(rsyncargs + from_paths + [todir]))
-    if subprocess.call(rsyncargs + from_paths + [todir]) != 0:
+    logging.debug(' '.join(rsyncargs + [fromdir, todir]))
+    if subprocess.call(rsyncargs + [fromdir, todir]) != 0:
         raise FDroidException()
 
 
 def deploy_build_log_with_rsync(appid, vercode, log_content):
     """Upload build log of one individual app build to an fdroid repository.
 
-    Parameters
-    ----------
-    appid
-        package name for dientifying to which app this log belongs.
-    vercode
-        version of the app to which this build belongs.
-    log_content
-        Content of the log which is about to be posted.
-        Should be either a string or bytes. (bytes will
-        be decoded as 'utf-8')
+    :param appid: package name for dientifying to which app this log belongs.
+    :param vercode: version of the app to which this build belongs.
+    :param log_content: Content of the log which is about to be posted.
+                        Should be either a string or bytes. (bytes will
+                        be decoded as 'utf-8')
     """
+
     if not log_content:
         logging.warning(_('skip deploying full build logs: log content is empty'))
         return
@@ -4509,13 +3675,13 @@ def deploy_build_log_with_rsync(appid, vercode, log_content):
 
 
 def rsync_status_file_to_repo(path, repo_subdir=None):
-    """Copy a build log or status JSON to the repo using rsync."""
+    """Copy a build log or status JSON to the repo using rsync"""
+
     if not config.get('deploy_process_logs', False):
         logging.debug(_('skip deploying full build logs: not enabled in config'))
         return
 
-    for d in config.get('serverwebroot', []):
-        webroot = d['url']
+    for webroot in config.get('serverwebroot', []):
         cmd = ['rsync',
                '--archive',
                '--delete-after',
@@ -4544,7 +3710,8 @@ def rsync_status_file_to_repo(path, repo_subdir=None):
 
 
 def get_per_app_repos():
-    """Per-app repos are dirs named with the packageName of a single app."""
+    '''per-app repos are dirs named with the packageName of a single app'''
+
     # Android packageNames are Java packages, they may contain uppercase or
     # lowercase letters ('A' through 'Z'), numbers, and underscores
     # ('_'). However, individual package name parts may only start with
@@ -4565,54 +3732,28 @@ def get_per_app_repos():
     return repos
 
 
-# list of index files that are never gpg-signed
-NO_GPG_INDEX_FILES = [
-    "entry.jar",
-    "index-v1.jar",
-    "index.css",
-    "index.html",
-    "index.jar",
-    "index.png",
-    "index.xml",
-    "signer-index.jar",
-]
-
-# list of index files that are signed by gpgsign.py to make a .asc file
-GPG_INDEX_FILES = [
-    "altstore-index.json",
-    "entry.json",
-    "index-v1.json",
-    "index-v2.json",
-    "signer-index.json",
-]
-
-
-INDEX_FILES = sorted(
-    NO_GPG_INDEX_FILES + GPG_INDEX_FILES + [i + '.asc' for i in GPG_INDEX_FILES]
-)
-
-
-def is_repo_file(filename, for_gpg_signing=False):
-    """Whether the file in a repo is a build product to be delivered to users."""
+def is_repo_file(filename):
+    '''Whether the file in a repo is a build product to be delivered to users'''
     if isinstance(filename, str):
         filename = filename.encode('utf-8', errors="surrogateescape")
-    ignore_files = [i.encode() for i in NO_GPG_INDEX_FILES]
-    ignore_files.append(b'index_unsigned.jar')
-    if not for_gpg_signing:
-        ignore_files += [i.encode() for i in GPG_INDEX_FILES]
-
-    return (
-        os.path.isfile(filename)
-        and not filename.endswith(b'.asc')
-        and not filename.endswith(b'.sig')
-        and not filename.endswith(b'.idsig')
-        and not filename.endswith(b'.log.gz')
-        and os.path.basename(filename) not in ignore_files
-    )
+    return os.path.isfile(filename) \
+        and not filename.endswith(b'.asc') \
+        and not filename.endswith(b'.sig') \
+        and not filename.endswith(b'.idsig') \
+        and not filename.endswith(b'.log.gz') \
+        and os.path.basename(filename) not in [
+            b'index.jar',
+            b'index_unsigned.jar',
+            b'index.xml',
+            b'index.html',
+            b'index-v1.jar',
+            b'index-v1.json',
+            b'categories.txt',
+        ]
 
 
 def get_examples_dir():
-    """Return the dir where the fdroidserver example files are available."""
+    '''Return the dir where the fdroidserver example files are available'''
     examplesdir = None
     tmp = os.path.dirname(sys.argv[0])
     if os.path.basename(tmp) == 'bin':
@@ -4634,46 +3775,74 @@ def get_examples_dir():
     return examplesdir
 
 
-def get_android_tools_versions():
-    """Get a list of the versions of all installed Android SDK/NDK components."""
+def get_wiki_timestamp(timestamp=None):
+    """Return current time in the standard format for posting to the wiki"""
+
+    if timestamp is None:
+        timestamp = time.gmtime()
+    return time.strftime("%Y-%m-%d %H:%M:%SZ", timestamp)
+
+
+def get_android_tools_versions(ndk_path=None):
+    '''get a list of the versions of all installed Android SDK/NDK components'''
+
     global config
     sdk_path = config['sdk_path']
     if sdk_path[-1] != '/':
         sdk_path += '/'
-    components = set()
-    for ndk_path in config.get('ndk_paths', {}).values():
-        version = get_ndk_version(ndk_path)
-        components.add((os.path.relpath(ndk_path, sdk_path), str(version)))
+    components = []
+    if ndk_path:
+        ndk_release_txt = os.path.join(ndk_path, 'RELEASE.TXT')
+        if os.path.isfile(ndk_release_txt):
+            with open(ndk_release_txt, 'r') as fp:
+                components.append((os.path.basename(ndk_path), fp.read()[:-1]))
 
-    pattern = re.compile(r'^Pkg.Revision *= *(.+)', re.MULTILINE)
+    pattern = re.compile('^Pkg.Revision=(.+)', re.MULTILINE)
     for root, dirs, files in os.walk(sdk_path):
         if 'source.properties' in files:
             source_properties = os.path.join(root, 'source.properties')
             with open(source_properties, 'r') as fp:
                 m = pattern.search(fp.read())
                 if m:
-                    components.add((os.path.relpath(root, sdk_path), m.group(1)))
+                    components.append((root[len(sdk_path):], m.group(1)))
 
-    return sorted(components)
+    return components
 
 
-def get_android_tools_version_log():
-    """Get a list of the versions of all installed Android SDK/NDK components."""
+def get_android_tools_version_log(ndk_path=None):
+    '''get a list of the versions of all installed Android SDK/NDK components'''
     log = '== Installed Android Tools ==\n\n'
-    components = get_android_tools_versions()
+    components = get_android_tools_versions(ndk_path)
     for name, version in sorted(components):
         log += '* ' + name + ' (' + version + ')\n'
 
     return log
 
 
+def get_git_describe_link():
+    """Get a link to the current fdroiddata commit, to post to the wiki
+
+    """
+    try:
+        output = subprocess.check_output(['git', 'describe', '--always', '--dirty', '--abbrev=0'],
+                                         universal_newlines=True).strip()
+    except subprocess.CalledProcessError:
+        pass
+    if output:
+        commit = output.replace('-dirty', '')
+        return ('* fdroiddata: [https://gitlab.com/fdroid/fdroiddata/commit/{commit} {id}]\n'
+                .format(commit=commit, id=output))
+    else:
+        logging.error(_("'{path}' failed to execute!").format(path='git describe'))
+        return ''
+
+
 def calculate_math_string(expr):
     ops = {
         ast.Add: operator.add,
         ast.Mult: operator.mul,
         ast.Sub: operator.sub,
         ast.USub: operator.neg,
-        ast.Pow: operator.pow,
     }
 
     def execute_ast(node):
@@ -4691,14 +3860,14 @@ def calculate_math_string(expr):
         if '#' in expr:
             raise SyntaxError('no comments allowed')
         return execute_ast(ast.parse(expr, mode='eval').body)
-    except SyntaxError as exc:
+    except SyntaxError:
         raise SyntaxError("could not parse expression '{expr}', "
                           "only basic math operations are allowed (+, -, *)"
-                          .format(expr=expr)) from exc
+                          .format(expr=expr))
 
 
 def force_exit(exitvalue=0):
-    """Force exit when thread operations could block the exit.
+    """force exit when thread operations could block the exit
 
     The build command has to use some threading stuff to handle the
     timeout and locks.  This seems to prevent the command from
@@ -4717,7 +3886,7 @@ YAML_LINT_CONFIG = {'extends': 'default',
 
 
 def run_yamllint(path, indent=0):
-    path = Path(path)
+
     try:
         import yamllint.config
         import yamllint.linter
@@ -4725,235 +3894,8 @@ def run_yamllint(path, indent=0):
         return ''
 
     result = []
-    with path.open('r', encoding='utf-8') as f:
+    with open(path, 'r', encoding='utf-8') as f:
         problems = yamllint.linter.run(f, yamllint.config.YamlLintConfig(json.dumps(YAML_LINT_CONFIG)))
     for problem in problems:
-        result.append(' ' * indent + str(path) + ':' + str(problem.line) + ': ' + problem.message)
+        result.append(' ' * indent + path + ':' + str(problem.line) + ': ' + problem.message)
     return '\n'.join(result)
-
-
-def calculate_IPFS_cid(filename):
-    """Calculate the IPFS CID of a file and add it to the index.
-
-    uses ipfs_cid package at https://packages.debian.org/sid/ipfs-cid
-    Returns CIDv1 of a file as per IPFS recommendation
-    """
-    cmd = config and config.get('ipfs_cid')
-    if not cmd:
-        return
-    file_cid = subprocess.run([cmd, filename], capture_output=True)
-
-    if file_cid.returncode == 0:
-        cid_output = file_cid.stdout.decode()
-        cid_output_dict = json.loads(cid_output)
-        return cid_output_dict['CIDv1']
-
-
-def sha256sum(filename):
-    """Calculate the sha256 of the given file."""
-    sha = hashlib.sha256()
-    with open(filename, 'rb') as f:
-        while True:
-            t = f.read(16384)
-            if len(t) == 0:
-                break
-            sha.update(t)
-    return sha.hexdigest()
-
-
-def sha256base64(filename):
-    """Calculate the sha256 of the given file as URL-safe base64."""
-    hasher = hashlib.sha256()
-    with open(filename, 'rb') as f:
-        while True:
-            t = f.read(16384)
-            if len(t) == 0:
-                break
-            hasher.update(t)
-    return urlsafe_b64encode(hasher.digest()).decode()
-
-
-def get_ndk_version(ndk_path):
-    """Get the version info from the metadata in the NDK package.
-
-    Since r11, the info is nice and easy to find in
-    sources.properties.  Before, there was a kludgey format in
-    RELEASE.txt.  This is only needed for r10e.
-
-    """
-    source_properties = os.path.join(ndk_path, 'source.properties')
-    release_txt = os.path.join(ndk_path, 'RELEASE.TXT')
-    if os.path.exists(source_properties):
-        with open(source_properties) as fp:
-            m = re.search(r'^Pkg.Revision *= *(.+)', fp.read(), flags=re.MULTILINE)
-            if m:
-                return m.group(1)
-    elif os.path.exists(release_txt):
-        with open(release_txt) as fp:
-            return fp.read().split('-')[0]
-
-
-def auto_install_ndk(build):
-    """Auto-install the NDK in the build, this assumes its in a buildserver guest VM.
-
-    Download, verify, and install the NDK version as specified via the
-    "ndk:" field in the build entry.  As it uncompresses the zipball,
-    this forces the permissions to work for all users, since this
-    might uncompress as root and then be used from a different user.
-
-    This needs to be able to install multiple versions of the NDK,
-    since this is also used in CI builds, where multiple `fdroid build
-    --onserver` calls can run in a single session.  The production
-    buildserver is reset between every build.
-
-    The default ANDROID_SDK_ROOT base dir of /opt/android-sdk is hard-coded in
-    buildserver/Vagrantfile.  The $ANDROID_HOME/ndk subdir is where Android
-    Studio will install the NDK into versioned subdirs.
-    https://developer.android.com/studio/projects/configure-agp-ndk#agp_version_41
-
-    Also, r10e and older cannot be handled via this mechanism because
-    they are packaged differently.
-
-    """
-    import sdkmanager
-
-    global config
-    if build.get('disable'):
-        return
-    ndk = build.get('ndk')
-    if not ndk:
-        return
-    if isinstance(ndk, str):
-        sdkmanager.build_package_list(use_net=True)
-        _install_ndk(ndk)
-    elif isinstance(ndk, list):
-        sdkmanager.build_package_list(use_net=True)
-        for n in ndk:
-            _install_ndk(n)
-    else:
-        raise BuildException(_('Invalid ndk: entry in build: "{ndk}"')
-                             .format(ndk=str(ndk)))
-
-
-def _install_ndk(ndk):
-    """Install specified NDK if it is not already installed.
-
-    Parameters
-    ----------
-    ndk
-        The NDK version to install, either in "release" form (r21e) or
-        "revision" form (21.4.7075529).
-    """
-    import sdkmanager
-
-    sdk_path = config['sdk_path']
-    sdkmanager.install(f'ndk;{ndk}', sdk_path)
-    for found in glob.glob(f'{sdk_path}/ndk/*'):
-        version = get_ndk_version(found)
-        if 'ndk_paths' not in config:
-            config['ndk_paths'] = dict()
-        config['ndk_paths'][ndk] = found
-        config['ndk_paths'][version] = found
-        logging.info(
-            _('Set NDK {release} ({version}) up').format(release=ndk, version=version)
-        )
-
-
-def calculate_archive_policy(app, default):
-    """Calculate the archive policy from the metadata and default config."""
-    if app.get('ArchivePolicy') is not None:
-        archive_policy = app['ArchivePolicy']
-    else:
-        archive_policy = default
-        if app.get('VercodeOperation'):
-            archive_policy *= len(app['VercodeOperation'])
-    builds = [build for build in app.Builds if not build.disable]
-    if app.Builds and archive_policy > len(builds):
-        archive_policy = len(builds)
-    return archive_policy
-
-
-def calculate_gradle_flavor_combination(flavors):
-    """Calculate all combinations of gradle flavors."""
-    combination_lists = itertools.product(*[[flavor, ''] for flavor in flavors])
-    combinations = [
-        re.sub(
-            r' +\w',
-            lambda pat: pat.group(0)[-1].upper(),
-            ' '.join(combination_list).strip(),
-        )
-        for combination_list in combination_lists
-    ]
-    return combinations
-
-
-FDROIDORG_MIRRORS = [
-    {
-        'isPrimary': True,
-        'url': 'https://f-droid.org/repo',
-        'dnsA': ['65.21.79.229', '136.243.44.143'],
-        'dnsAAAA': ['2a01:4f8:212:c98::2', '2a01:4f9:3b:546d::2'],
-        'worksWithoutSNI': True,
-    },
-    {
-        'url': 'http://fdroidorg6cooksyluodepej4erfctzk7rrjpjbbr6wx24jh3lqyfwyd.onion/fdroid/repo'
-    },
-    {
-        'url': 'http://dotsrccccbidkzg7oc7oj4ugxrlfbt64qebyunxbrgqhxiwj3nl6vcad.onion/fdroid/repo'
-    },
-    {
-        'url': 'http://ftpfaudev4triw2vxiwzf4334e3mynz7osqgtozhbc77fixncqzbyoyd.onion/fdroid/repo'
-    },
-    {
-        'url': 'http://lysator7eknrfl47rlyxvgeamrv7ucefgrrlhk7rouv3sna25asetwid.onion/pub/fdroid/repo'
-    },
-    {
-        'url': 'http://mirror.ossplanetnyou5xifr6liw5vhzwc2g2fmmlohza25wwgnnaw65ytfsad.onion/fdroid/repo'
-    },
-    {'url': 'https://fdroid.tetaneutral.net/fdroid/repo', 'countryCode': 'FR'},
-    {
-        'url': 'https://ftp.agdsn.de/fdroid/repo',
-        'countryCode': 'DE',
-        "dnsA": ["141.30.235.39"],
-        "dnsAAAA": ["2a13:dd85:b00:12::1"],
-        "worksWithoutSNI": True,
-    },
-    {
-        'url': 'https://ftp.fau.de/fdroid/repo',
-        'countryCode': 'DE',
-        "dnsA": ["131.188.12.211"],
-        "dnsAAAA": ["2001:638:a000:1021:21::1"],
-        "worksWithoutSNI": True,
-    },
-    {'url': 'https://ftp.gwdg.de/pub/android/fdroid/repo', 'countryCode': 'DE'},
-    {
-        'url': 'https://ftp.lysator.liu.se/pub/fdroid/repo',
-        'countryCode': 'SE',
-        "dnsA": ["130.236.254.251", "130.236.254.253"],
-        "dnsAAAA": ["2001:6b0:17:f0a0::fb", "2001:6b0:17:f0a0::fd"],
-        "worksWithoutSNI": True,
-    },
-    {'url': 'https://mirror.cyberbits.eu/fdroid/repo', 'countryCode': 'FR'},
-    {
-        'url': 'https://mirror.fcix.net/fdroid/repo',
-        'countryCode': 'US',
-        "dnsA": ["23.152.160.16"],
-        "dnsAAAA": ["2620:13b:0:1000::16"],
-        "worksWithoutSNI": True,
-    },
-    {'url': 'https://mirror.kumi.systems/fdroid/repo', 'countryCode': 'AT'},
-    {'url': 'https://mirror.level66.network/fdroid/repo', 'countryCode': 'DE'},
-    {'url': 'https://mirror.ossplanet.net/fdroid/repo', 'countryCode': 'TW'},
-    {'url': 'https://mirrors.dotsrc.org/fdroid/repo', 'countryCode': 'DK'},
-    {'url': 'https://opencolo.mm.fcix.net/fdroid/repo', 'countryCode': 'US'},
-    {
-        'url': 'https://plug-mirror.rcac.purdue.edu/fdroid/repo',
-        'countryCode': 'US',
-        "dnsA": ["128.211.151.252"],
-        "dnsAAAA": ["2001:18e8:804:35::1337"],
-        "worksWithoutSNI": True,
-    },
-]
-FDROIDORG_FINGERPRINT = (
-    '43238D512C1E5EB2D6569F4A3AFBF5523418B82E0A3ED1552770ABB9A9C9CCAB'
-)
diff --git a/fdroidserver/deploy.py b/fdroidserver/deploy.py
index f1dcce21..87dfce8b 100644
--- a/fdroidserver/deploy.py
+++ b/fdroidserver/deploy.py
@@ -16,366 +16,284 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-import configparser
-import glob
-import json
-import logging
-import os
-import pathlib
-import re
-import shutil
-import subprocess
 import sys
+import glob
+import hashlib
+import json
+import os
+import re
+import subprocess
 import time
 import urllib
 from argparse import ArgumentParser
-from typing import Dict, List
+import logging
+import shutil
 
-import git
-import yaml
-from git import Repo
-
-import fdroidserver.github
-
-from . import _, common, index
+from . import _
+from . import common
+from . import index
+from . import update
 from .exception import FDroidException
 
 config = None
+options = None
 start_timestamp = time.gmtime()
 
-GIT_BRANCH = 'master'
-
 BINARY_TRANSPARENCY_DIR = 'binary_transparency'
 
+AUTO_S3CFG = '.fdroid-deploy-s3cfg'
+USER_S3CFG = 's3cfg'
 REMOTE_HOSTNAME_REGEX = re.compile(r'\W*\w+\W+(\w+).*')
 
-EMBEDDED_RCLONE_CONF = 'rclone.conf'
 
+def update_awsbucket(repo_section):
+    '''
+    Upload the contents of the directory `repo_section` (including
+    subdirectories) to the AWS S3 "bucket". The contents of that subdir of the
+    bucket will first be deleted.
 
-def _get_index_file_paths(base_dir):
-    """Return the list of files to be synced last, since they finalize the deploy.
+    Requires AWS credentials set in config.yml: awsaccesskeyid, awssecretkey
+    '''
 
-    The process of pushing all the new packages to the various
-    services can take a while.  So the index files should be updated
-    last.  That ensures that the package files are available when the
-    client learns about them from the new index files.
+    logging.debug('Syncing "' + repo_section + '" to Amazon S3 bucket "'
+                  + config['awsbucket'] + '"')
 
-    signer-index.* are only published in the repo/ section.
-
-    """
-    return [
-        os.path.join(base_dir, filename)
-        for filename in common.INDEX_FILES
-        if not (filename.startswith('signer-index.') and base_dir.endswith('archive'))
-    ]
-
-
-def _get_index_excludes(base_dir):
-    indexes = _get_index_file_paths(base_dir)
-    index_excludes = []
-    for f in indexes:
-        index_excludes.append('--exclude')
-        index_excludes.append(f)
-    return index_excludes
-
-
-def _get_index_includes(base_dir):
-    indexes = _get_index_file_paths(base_dir)
-    index_includes = []
-    for f in indexes:
-        index_includes.append('--include')
-        index_includes.append(f)
-    return index_includes
-
-
-def _remove_missing_files(files: List[str]) -> List[str]:
-    """Remove files that are missing from the file system."""
-    existing = []
-    for f in files:
-        if os.path.exists(f):
-            existing.append(f)
-    return existing
-
-
-def _generate_rclone_include_pattern(files):
-    """Generate a pattern for rclone's --include flag (https://rclone.org/filtering/)."""
-    return "{" + ",".join(sorted(set(files))) + "}"
-
-
-def update_awsbucket(repo_section, is_index_only=False, verbose=False, quiet=False):
-    """Sync the directory `repo_section` (including subdirectories) to AWS S3 US East.
-
-    This is a shim function for public API compatibility.
-
-    Requires AWS credentials set as environment variables:
-    https://rclone.org/s3/#authentication
-
-    """
-    update_remote_storage_with_rclone(repo_section, is_index_only, verbose, quiet)
-
-
-def update_remote_storage_with_rclone(
-    repo_section,
-    awsbucket,
-    is_index_only=False,
-    verbose=False,
-    quiet=False,
-    checksum=False,
-):
-    """Sync the directory `repo_section` (including subdirectories) to configed cloud services.
-
-    Rclone sync can send the files to any supported remote storage
-    service once without numerous polling.  If remote storage is S3 e.g
-    AWS S3, Wasabi, Filebase, etc, then path will be
-    bucket_name/fdroid/repo where bucket_name will be an S3 bucket. If
-    remote storage is storage drive/sftp e.g google drive, rsync.net the
-    new path will be bucket_name/fdroid/repo where bucket_name will be a
-    folder
-
-    See https://rclone.org/docs/#config-config-file
-
-    rclone filtering works differently than rsync.  For example,
-    "--include" implies "--exclude **" at the end of an rclone internal
-    filter list.
-
-    If rclone.conf is in the root of the repo, then it will be preferred
-    over the rclone default config paths.
-
-    """
-    logging.debug(_('Using rclone to sync to "{name}"').format(name=awsbucket))
-
-    rclone_config = config.get('rclone_config', [])
-    if rclone_config and isinstance(rclone_config, str):
-        rclone_config = [rclone_config]
-
-    path = config.get('path_to_custom_rclone_config')
-    if path:
-        if not os.path.exists(path):
-            logging.error(
-                _('path_to_custom_rclone_config: "{path}" does not exist!').format(
-                    path=path
-                )
-            )
-            sys.exit(1)
-        configfilename = path
-    elif os.path.exists(EMBEDDED_RCLONE_CONF):
-        path = EMBEDDED_RCLONE_CONF  # in this case, only for display
-        configfilename = EMBEDDED_RCLONE_CONF
-        if not rclone_config:
-            raise FDroidException(_("'rclone_config' must be set in config.yml!"))
+    if common.set_command_in_config('s3cmd'):
+        update_awsbucket_s3cmd(repo_section)
     else:
-        configfilename = None
-        output = subprocess.check_output(['rclone', 'config', 'file'], text=True)
-        default_config_path = output.split('\n')[-2]
-        if os.path.exists(default_config_path):
-            path = default_config_path
-    if path:
-        logging.info(_('Using "{path}" for rclone config.').format(path=path))
+        update_awsbucket_libcloud(repo_section)
+
+
+def update_awsbucket_s3cmd(repo_section):
+    '''upload using the CLI tool s3cmd, which provides rsync-like sync
+
+    The upload is done in multiple passes to reduce the chance of
+    interfering with an existing client-server interaction.  In the
+    first pass, only new files are uploaded.  In the second pass,
+    changed files are uploaded, overwriting what is on the server.  On
+    the third/last pass, the indexes are uploaded, and any removed
+    files are deleted from the server.  The last pass is the only pass
+    to use a full MD5 checksum of all files to detect changes.
+    '''
+
+    logging.debug(_('Using s3cmd to sync with: {url}')
+                  .format(url=config['awsbucket']))
+
+    if os.path.exists(USER_S3CFG):
+        logging.info(_('Using "{path}" for configuring s3cmd.').format(path=USER_S3CFG))
+        configfilename = USER_S3CFG
+    else:
+        fd = os.open(AUTO_S3CFG, os.O_CREAT | os.O_TRUNC | os.O_WRONLY, 0o600)
+        logging.debug(_('Creating "{path}" for configuring s3cmd.').format(path=AUTO_S3CFG))
+        os.write(fd, '[default]\n'.encode('utf-8'))
+        os.write(fd, ('access_key = ' + config['awsaccesskeyid'] + '\n').encode('utf-8'))
+        os.write(fd, ('secret_key = ' + config['awssecretkey'] + '\n').encode('utf-8'))
+        os.close(fd)
+        configfilename = AUTO_S3CFG
+
+    s3bucketurl = 's3://' + config['awsbucket']
+    s3cmd = [config['s3cmd'], '--config=' + configfilename]
+    if subprocess.call(s3cmd + ['info', s3bucketurl]) != 0:
+        logging.warning(_('Creating new S3 bucket: {url}')
+                        .format(url=s3bucketurl))
+        if subprocess.call(s3cmd + ['mb', s3bucketurl]) != 0:
+            logging.error(_('Failed to create S3 bucket: {url}')
+                          .format(url=s3bucketurl))
+            raise FDroidException()
+
+    s3cmd_sync = s3cmd + ['sync', '--acl-public']
+    if options.verbose:
+        s3cmd_sync += ['--verbose']
+    if options.quiet:
+        s3cmd_sync += ['--quiet']
+    indexxml = os.path.join(repo_section, 'index.xml')
+    indexjar = os.path.join(repo_section, 'index.jar')
+    indexv1jar = os.path.join(repo_section, 'index-v1.jar')
+
+    s3url = s3bucketurl + '/fdroid/'
+    logging.debug('s3cmd sync new files in ' + repo_section + ' to ' + s3url)
+    logging.debug(_('Running first pass with MD5 checking disabled'))
+    if subprocess.call(s3cmd_sync
+                       + ['--no-check-md5', '--skip-existing',
+                          '--exclude', indexxml,
+                          '--exclude', indexjar,
+                          '--exclude', indexv1jar,
+                          repo_section, s3url]) != 0:
+        raise FDroidException()
+    logging.debug('s3cmd sync all files in ' + repo_section + ' to ' + s3url)
+    if subprocess.call(s3cmd_sync
+                       + ['--no-check-md5',
+                          '--exclude', indexxml,
+                          '--exclude', indexjar,
+                          '--exclude', indexv1jar,
+                          repo_section, s3url]) != 0:
+        raise FDroidException()
+
+    logging.debug(_('s3cmd sync indexes {path} to {url} and delete')
+                  .format(path=repo_section, url=s3url))
+    s3cmd_sync.append('--delete-removed')
+    s3cmd_sync.append('--delete-after')
+    if options.no_checksum:
+        s3cmd_sync.append('--no-check-md5')
+    else:
+        s3cmd_sync.append('--check-md5')
+    if subprocess.call(s3cmd_sync + [repo_section, s3url]) != 0:
+        raise FDroidException()
+
+
+def update_awsbucket_libcloud(repo_section):
+    '''
+    Upload the contents of the directory `repo_section` (including
+    subdirectories) to the AWS S3 "bucket". The contents of that subdir of the
+    bucket will first be deleted.
+
+    Requires AWS credentials set in config.py: awsaccesskeyid, awssecretkey
+    '''
+
+    logging.debug(_('using Apache libcloud to sync with {url}')
+                  .format(url=config['awsbucket']))
+
+    import libcloud.security
+    libcloud.security.VERIFY_SSL_CERT = True
+    from libcloud.storage.types import Provider, ContainerDoesNotExistError
+    from libcloud.storage.providers import get_driver
+
+    if not config.get('awsaccesskeyid') or not config.get('awssecretkey'):
+        raise FDroidException(
+            _('To use awsbucket, awssecretkey and awsaccesskeyid must also be set in config.yml!'))
+    awsbucket = config['awsbucket']
+
+    if os.path.exists(USER_S3CFG):
+        raise FDroidException(_('"{path}" exists but s3cmd is not installed!')
+                              .format(path=USER_S3CFG))
+
+    cls = get_driver(Provider.S3)
+    driver = cls(config['awsaccesskeyid'], config['awssecretkey'])
+    try:
+        container = driver.get_container(container_name=awsbucket)
+    except ContainerDoesNotExistError:
+        container = driver.create_container(container_name=awsbucket)
+        logging.info(_('Created new container "{name}"')
+                     .format(name=container.name))
 
     upload_dir = 'fdroid/' + repo_section
+    objs = dict()
+    for obj in container.list_objects():
+        if obj.name.startswith(upload_dir + '/'):
+            objs[obj.name] = obj
 
-    if not rclone_config:
-        env = os.environ
-        # Check both canonical and backup names, but only tell user about canonical.
-        if not env.get("AWS_SECRET_ACCESS_KEY") and not env.get("AWS_SECRET_KEY"):
-            raise FDroidException(
-                _(
-                    """"AWS_SECRET_ACCESS_KEY" must be set as an environmental variable!"""
-                )
-            )
-        if not env.get("AWS_ACCESS_KEY_ID") and not env.get('AWS_ACCESS_KEY'):
-            raise FDroidException(
-                _(""""AWS_ACCESS_KEY_ID" must be set as an environmental variable!""")
-            )
+    for root, dirs, files in os.walk(os.path.join(os.getcwd(), repo_section)):
+        for name in files:
+            upload = False
+            file_to_upload = os.path.join(root, name)
+            object_name = 'fdroid/' + os.path.relpath(file_to_upload, os.getcwd())
+            if object_name not in objs:
+                upload = True
+            else:
+                obj = objs.pop(object_name)
+                if obj.size != os.path.getsize(file_to_upload):
+                    upload = True
+                else:
+                    # if the sizes match, then compare by MD5
+                    md5 = hashlib.md5()  # nosec AWS uses MD5
+                    with open(file_to_upload, 'rb') as f:
+                        while True:
+                            data = f.read(8192)
+                            if not data:
+                                break
+                            md5.update(data)
+                    if obj.hash != md5.hexdigest():
+                        s3url = 's3://' + awsbucket + '/' + obj.name
+                        logging.info(' deleting ' + s3url)
+                        if not driver.delete_object(obj):
+                            logging.warning('Could not delete ' + s3url)
+                        upload = True
 
-        default_remote = "AWS-S3-US-East-1"
-        env_rclone_config = configparser.ConfigParser()
-        env_rclone_config.add_section(default_remote)
-        env_rclone_config.set(
-            default_remote,
-            '; = This file is auto-generated by fdroid deploy, do not edit!',
-            '',
-        )
-        env_rclone_config.set(default_remote, "type", "s3")
-        env_rclone_config.set(default_remote, "provider", "AWS")
-        env_rclone_config.set(default_remote, "region", "us-east-1")
-        env_rclone_config.set(default_remote, "env_auth", "true")
-
-        configfilename = ".fdroid-deploy-rclone.conf"
-        with open(configfilename, "w", encoding="utf-8") as autoconfigfile:
-            env_rclone_config.write(autoconfigfile)
-        rclone_config = [default_remote]
-
-    rclone_sync_command = ['rclone', 'sync', '--delete-after']
-    if configfilename:
-        rclone_sync_command += ['--config', configfilename]
-
-    if checksum:
-        rclone_sync_command.append('--checksum')
-
-    if verbose:
-        rclone_sync_command += ['--verbose']
-    elif quiet:
-        rclone_sync_command += ['--quiet']
-
-    # TODO copying update_serverwebroot rsync algo
-    for remote_config in rclone_config:
-        complete_remote_path = f'{remote_config}:{awsbucket}/{upload_dir}'
-        logging.info(f'rclone sync to {complete_remote_path}')
-        if is_index_only:
-            index_only_files = common.INDEX_FILES + ['diff/*.*']
-            include_pattern = _generate_rclone_include_pattern(index_only_files)
-            cmd = rclone_sync_command + [
-                '--include',
-                include_pattern,
-                '--delete-excluded',
-                repo_section,
-                complete_remote_path,
-            ]
-            logging.info(cmd)
-            if subprocess.call(cmd) != 0:
-                raise FDroidException()
+            if upload:
+                logging.debug(' uploading "' + file_to_upload + '"...')
+                extra = {'acl': 'public-read'}
+                if file_to_upload.endswith('.sig'):
+                    extra['content_type'] = 'application/pgp-signature'
+                elif file_to_upload.endswith('.asc'):
+                    extra['content_type'] = 'application/pgp-signature'
+                logging.info(' uploading ' + os.path.relpath(file_to_upload)
+                             + ' to s3://' + awsbucket + '/' + object_name)
+                with open(file_to_upload, 'rb') as iterator:
+                    obj = driver.upload_object_via_stream(iterator=iterator,
+                                                          container=container,
+                                                          object_name=object_name,
+                                                          extra=extra)
+    # delete the remnants in the bucket, they do not exist locally
+    while objs:
+        object_name, obj = objs.popitem()
+        s3url = 's3://' + awsbucket + '/' + object_name
+        if object_name.startswith(upload_dir):
+            logging.warning(' deleting ' + s3url)
+            driver.delete_object(obj)
         else:
-            cmd = (
-                rclone_sync_command
-                + _get_index_excludes(repo_section)
-                + [
-                    repo_section,
-                    complete_remote_path,
-                ]
-            )
-            if subprocess.call(cmd) != 0:
-                raise FDroidException()
-            cmd = rclone_sync_command + [
-                repo_section,
-                complete_remote_path,
-            ]
-            if subprocess.call(cmd) != 0:
-                raise FDroidException()
+            logging.info(' skipping ' + s3url)
 
 
 def update_serverwebroot(serverwebroot, repo_section):
-    """Deploy the index files to the serverwebroot using rsync.
-
-    Upload the first time without the index files and delay the
-    deletion as much as possible.  That keeps the repo functional
-    while this update is running.  Then once it is complete, rerun the
-    command again to upload the index files.  Always using the same
-    target with rsync allows for very strict settings on the receiving
-    server, you can literally specify the one rsync command that is
-    allowed to run in ~/.ssh/authorized_keys.  (serverwebroot is
-    guaranteed to have a trailing slash in common.py)
-
-    It is possible to optionally use a checksum comparison for
-    accurate comparisons on different filesystems, for example, FAT
-    has a low resolution timestamp
-
-    """
-    try:
-        subprocess.run(['rsync', '--version'], capture_output=True, check=True)
-    except Exception as e:
-        raise FDroidException(
-            _('rsync is missing or broken: {error}').format(error=e)
-        ) from e
+    # use a checksum comparison for accurate comparisons on different
+    # filesystems, for example, FAT has a low resolution timestamp
     rsyncargs = ['rsync', '--archive', '--delete-after', '--safe-links']
-    options = common.get_options()
-    if not options or not options.no_checksum:
+    if not options.no_checksum:
         rsyncargs.append('--checksum')
-    if options and options.verbose:
+    if options.verbose:
         rsyncargs += ['--verbose']
-    if options and options.quiet:
+    if options.quiet:
         rsyncargs += ['--quiet']
-    if options and options.identity_file:
-        rsyncargs += [
-            '-e',
-            'ssh -oBatchMode=yes -oIdentitiesOnly=yes -i ' + options.identity_file,
-        ]
-    elif config and config.get('identity_file'):
-        rsyncargs += [
-            '-e',
-            'ssh -oBatchMode=yes -oIdentitiesOnly=yes -i ' + config['identity_file'],
-        ]
-    url = serverwebroot['url']
-    is_index_only = serverwebroot.get('index_only', False)
-    logging.info('rsyncing ' + repo_section + ' to ' + url)
-    if is_index_only:
-        files_to_upload = _get_index_file_paths(repo_section)
-        files_to_upload = _remove_missing_files(files_to_upload)
-
-        rsyncargs += files_to_upload
-        rsyncargs += [f'{url}/{repo_section}/']
-        logging.info(rsyncargs)
-        if subprocess.call(rsyncargs) != 0:
-            raise FDroidException()
-    else:
-        excludes = _get_index_excludes(repo_section)
-        if subprocess.call(rsyncargs + excludes + [repo_section, url]) != 0:
-            raise FDroidException()
-        if subprocess.call(rsyncargs + [repo_section, url]) != 0:
-            raise FDroidException()
-        # upload "current version" symlinks if requested
-        if (
-            config
-            and config.get('make_current_version_link')
-            and repo_section == 'repo'
-        ):
-            links_to_upload = []
-            for f in (
-                glob.glob('*.apk') + glob.glob('*.apk.asc') + glob.glob('*.apk.sig')
-            ):
-                if os.path.islink(f):
-                    links_to_upload.append(f)
-            if len(links_to_upload) > 0:
-                if subprocess.call(rsyncargs + links_to_upload + [url]) != 0:
-                    raise FDroidException()
-
-
-def update_serverwebroots(serverwebroots, repo_section, standardwebroot=True):
-    for d in serverwebroots:
-        # this supports both an ssh host:path and just a path
-        serverwebroot = d['url']
-        s = serverwebroot.rstrip('/').split(':')
-        if len(s) == 1:
-            fdroiddir = s[0]
-        elif len(s) == 2:
-            host, fdroiddir = s
-        else:
-            logging.error(_('Malformed serverwebroot line:') + ' ' + serverwebroot)
-            sys.exit(1)
-        repobase = os.path.basename(fdroiddir)
-        if standardwebroot and repobase != 'fdroid':
-            logging.error(
-                _(
-                    'serverwebroot: path does not end with "fdroid", perhaps you meant one of these:'
-                )
-                + '\n\t'
-                + serverwebroot.rstrip('/')
-                + '/fdroid\n\t'
-                + serverwebroot.rstrip('/').rstrip(repobase)
-                + 'fdroid'
-            )
-            sys.exit(1)
-        update_serverwebroot(d, repo_section)
+    if options.identity_file is not None:
+        rsyncargs += ['-e', 'ssh -oBatchMode=yes -oIdentitiesOnly=yes -i ' + options.identity_file]
+    elif 'identity_file' in config:
+        rsyncargs += ['-e', 'ssh -oBatchMode=yes -oIdentitiesOnly=yes -i ' + config['identity_file']]
+    indexxml = os.path.join(repo_section, 'index.xml')
+    indexjar = os.path.join(repo_section, 'index.jar')
+    indexv1jar = os.path.join(repo_section, 'index-v1.jar')
+    # Upload the first time without the index files and delay the deletion as
+    # much as possible, that keeps the repo functional while this update is
+    # running.  Then once it is complete, rerun the command again to upload
+    # the index files.  Always using the same target with rsync allows for
+    # very strict settings on the receiving server, you can literally specify
+    # the one rsync command that is allowed to run in ~/.ssh/authorized_keys.
+    # (serverwebroot is guaranteed to have a trailing slash in common.py)
+    logging.info('rsyncing ' + repo_section + ' to ' + serverwebroot)
+    if subprocess.call(rsyncargs
+                       + ['--exclude', indexxml,
+                          '--exclude', indexjar,
+                          '--exclude', indexv1jar,
+                          repo_section, serverwebroot]) != 0:
+        raise FDroidException()
+    if subprocess.call(rsyncargs + [repo_section, serverwebroot]) != 0:
+        raise FDroidException()
+    # upload "current version" symlinks if requested
+    if config['make_current_version_link'] and repo_section == 'repo':
+        links_to_upload = []
+        for f in glob.glob('*.apk') \
+                + glob.glob('*.apk.asc') + glob.glob('*.apk.sig'):
+            if os.path.islink(f):
+                links_to_upload.append(f)
+        if len(links_to_upload) > 0:
+            if subprocess.call(rsyncargs + links_to_upload + [serverwebroot]) != 0:
+                raise FDroidException()
 
 
 def sync_from_localcopy(repo_section, local_copy_dir):
-    """Sync the repo from "local copy dir" filesystem to this box.
+    '''Syncs the repo from "local copy dir" filesystem to this box
 
     In setups that use offline signing, this is the last step that
     syncs the repo from the "local copy dir" e.g. a thumb drive to the
     repo on the local filesystem.  That local repo is then used to
     push to all the servers that are configured.
 
-    """
+    '''
     logging.info('Syncing from local_copy_dir to this repo.')
-
     # trailing slashes have a meaning in rsync which is not needed here, so
     # make sure both paths have exactly one trailing slash
-    common.local_rsync(
-        common.get_options(),
-        [os.path.join(local_copy_dir, repo_section).rstrip('/') + '/'],
-        repo_section.rstrip('/') + '/',
-    )
+    common.local_rsync(options,
+                       os.path.join(local_copy_dir, repo_section).rstrip('/') + '/',
+                       repo_section.rstrip('/') + '/')
 
     offline_copy = os.path.join(local_copy_dir, BINARY_TRANSPARENCY_DIR)
     if os.path.exists(os.path.join(offline_copy, '.git')):
@@ -384,15 +302,15 @@ def sync_from_localcopy(repo_section, local_copy_dir):
 
 
 def update_localcopy(repo_section, local_copy_dir):
-    """Copy data from offline to the "local copy dir" filesystem.
+    '''copy data from offline to the "local copy dir" filesystem
 
     This updates the copy of this repo used to shuttle data from an
     offline signing machine to the online machine, e.g. on a thumb
     drive.
 
-    """
+    '''
     # local_copy_dir is guaranteed to have a trailing slash in main() below
-    common.local_rsync(common.get_options(), [repo_section], local_copy_dir)
+    common.local_rsync(options, repo_section, local_copy_dir)
 
     offline_copy = os.path.join(os.getcwd(), BINARY_TRANSPARENCY_DIR)
     if os.path.isdir(os.path.join(offline_copy, '.git')):
@@ -401,7 +319,7 @@ def update_localcopy(repo_section, local_copy_dir):
 
 
 def _get_size(start_path='.'):
-    """Get size of all files in a dir https://stackoverflow.com/a/1392549."""
+    '''get size of all files in a dir https://stackoverflow.com/a/1392549'''
     total_size = 0
     for root, dirs, files in os.walk(start_path):
         for f in files:
@@ -411,7 +329,7 @@ def _get_size(start_path='.'):
 
 
 def update_servergitmirrors(servergitmirrors, repo_section):
-    """Update repo mirrors stored in git repos.
+    '''update repo mirrors stored in git repos
 
     This is a hack to use public git repos as F-Droid repos.  It
     recreates the git repo from scratch each time, so that there is no
@@ -421,31 +339,19 @@ def update_servergitmirrors(servergitmirrors, repo_section):
     For history, there is the archive section, and there is the binary
     transparency log.
 
-    This will attempt to use the existing remote branch so that it does
-    not have to push all of the files in the repo each time.  Old setups
-    or runs of `fdroid nightly` might use the "master" branch.  For the
-    "index only" mode, it will recreate the branch from scratch each
-    time since usually all the files are changed.  In any case, the
-    index files are small compared to the full repo.
-
-    """
+    '''
+    import git
     from clint.textui import progress
-
-    if config.get('local_copy_dir') and not config.get('sync_from_local_copy_dir'):
-        logging.debug(
-            _('Offline machine, skipping git mirror generation until `fdroid deploy`')
-        )
+    if config.get('local_copy_dir') \
+       and not config.get('sync_from_local_copy_dir'):
+        logging.debug(_('Offline machine, skipping git mirror generation until `fdroid deploy`'))
         return
 
-    options = common.get_options()
-    workspace_dir = pathlib.Path(os.getcwd())
-
     # right now we support only 'repo' git-mirroring
     if repo_section == 'repo':
-        git_mirror_path = workspace_dir / 'git-mirror'
+        git_mirror_path = 'git-mirror'
         dotgit = os.path.join(git_mirror_path, '.git')
-        git_fdroiddir = os.path.join(git_mirror_path, 'fdroid')
-        git_repodir = os.path.join(git_fdroiddir, repo_section)
+        git_repodir = os.path.join(git_mirror_path, 'fdroid', repo_section)
         if not os.path.isdir(git_repodir):
             os.makedirs(git_repodir)
         # github/gitlab use bare git repos, so only count the .git folder
@@ -454,21 +360,20 @@ def update_servergitmirrors(servergitmirrors, repo_section):
         dotgit_size = _get_size(dotgit)
         dotgit_over_limit = dotgit_size > config['git_mirror_size_limit']
         if os.path.isdir(dotgit) and dotgit_over_limit:
-            logging.warning(
-                _(
-                    'Deleting git-mirror history, repo is too big ({size} max {limit})'
-                ).format(size=dotgit_size, limit=config['git_mirror_size_limit'])
-            )
+            logging.warning(_('Deleting git-mirror history, repo is too big ({size} max {limit})')
+                            .format(size=dotgit_size, limit=config['git_mirror_size_limit']))
             shutil.rmtree(dotgit)
         if options.no_keep_git_mirror_archive and dotgit_over_limit:
-            logging.warning(
-                _('Deleting archive, repo is too big ({size} max {limit})').format(
-                    size=dotgit_size, limit=config['git_mirror_size_limit']
-                )
-            )
+            logging.warning(_('Deleting archive, repo is too big ({size} max {limit})')
+                            .format(size=dotgit_size, limit=config['git_mirror_size_limit']))
             archive_path = os.path.join(git_mirror_path, 'fdroid', 'archive')
             shutil.rmtree(archive_path, ignore_errors=True)
 
+        # rsync is very particular about trailing slashes
+        common.local_rsync(options,
+                           repo_section.rstrip('/') + '/',
+                           git_repodir.rstrip('/') + '/')
+
         # use custom SSH command if identity_file specified
         ssh_cmd = 'ssh -oBatchMode=yes'
         if options.identity_file is not None:
@@ -476,174 +381,85 @@ def update_servergitmirrors(servergitmirrors, repo_section):
         elif 'identity_file' in config:
             ssh_cmd += ' -oIdentitiesOnly=yes -i "%s"' % config['identity_file']
 
+        repo = git.Repo.init(git_mirror_path)
+
+        enabled_remotes = []
+        for remote_url in servergitmirrors:
+            name = REMOTE_HOSTNAME_REGEX.sub(r'\1', remote_url)
+            enabled_remotes.append(name)
+            r = git.remote.Remote(repo, name)
+            if r in repo.remotes:
+                r = repo.remote(name)
+                if 'set_url' in dir(r):  # force remote URL if using GitPython 2.x
+                    r.set_url(remote_url)
+            else:
+                repo.create_remote(name, remote_url)
+            logging.info('Mirroring to: ' + remote_url)
+
+        # sadly index.add don't allow the --all parameter
+        logging.debug('Adding all files to git mirror')
+        repo.git.add(all=True)
+        logging.debug('Committing all files into git mirror')
+        repo.index.commit("fdroidserver git-mirror")
+
         if options.verbose:
-            progressbar = progress.Bar()
+            bar = progress.Bar()
 
             class MyProgressPrinter(git.RemoteProgress):
                 def update(self, op_code, current, maximum=None, message=None):
                     if isinstance(maximum, float):
-                        progressbar.show(current, maximum)
-
+                        bar.show(current, maximum)
             progress = MyProgressPrinter()
         else:
             progress = None
 
-        repo = git.Repo.init(git_mirror_path, initial_branch=GIT_BRANCH)
+        # push for every remote. This will overwrite the git history
+        for remote in repo.remotes:
+            if remote.name not in enabled_remotes:
+                repo.delete_remote(remote)
+                continue
+            if remote.name == 'gitlab':
+                logging.debug('Writing .gitlab-ci.yml to deploy to GitLab Pages')
+                with open(os.path.join(git_mirror_path, ".gitlab-ci.yml"), "wt") as out_file:
+                    out_file.write("""pages:
+  script:
+   - mkdir .public
+   - cp -r * .public/
+   - mv .public public
+  artifacts:
+    paths:
+    - public
+""")
 
-        enabled_remotes = []
-        for d in servergitmirrors:
-            is_index_only = d.get('index_only', False)
+                repo.git.add(all=True)
+                repo.index.commit("fdroidserver git-mirror: Deploy to GitLab Pages")
 
-            # Use a separate branch for the index only mode as it needs a different set of files to commit
-            if is_index_only:
-                local_branch_name = 'index_only'
-            else:
-                local_branch_name = GIT_BRANCH
-            if local_branch_name in repo.heads:
-                repo.git.switch(local_branch_name)
-            else:
-                repo.git.switch('--orphan', local_branch_name)
+            logging.debug(_('Pushing to {url}').format(url=remote.url))
+            with repo.git.custom_environment(GIT_SSH_COMMAND=ssh_cmd):
+                pushinfos = remote.push('master', force=True, set_upstream=True, progress=progress)
+                for pushinfo in pushinfos:
+                    if pushinfo.flags & (git.remote.PushInfo.ERROR
+                                         | git.remote.PushInfo.REJECTED
+                                         | git.remote.PushInfo.REMOTE_FAILURE
+                                         | git.remote.PushInfo.REMOTE_REJECTED):
+                        # Show potentially useful messages from git remote
+                        for line in progress.other_lines:
+                            if line.startswith('remote:'):
+                                logging.debug(line)
+                        raise FDroidException(remote.url + ' push failed: ' + str(pushinfo.flags)
+                                              + ' ' + pushinfo.summary)
+                    else:
+                        logging.debug(remote.url + ': ' + pushinfo.summary)
 
-            # trailing slashes have a meaning in rsync which is not needed here, so
-            # make sure both paths have exactly one trailing slash
-            if is_index_only:
-                files_to_sync = _get_index_file_paths(str(workspace_dir / repo_section))
-                files_to_sync = _remove_missing_files(files_to_sync)
-            else:
-                files_to_sync = [str(workspace_dir / repo_section).rstrip('/') + '/']
-            common.local_rsync(
-                common.get_options(), files_to_sync, git_repodir.rstrip('/') + '/'
-            )
-
-            upload_to_servergitmirror(
-                mirror_config=d,
-                local_repo=repo,
-                enabled_remotes=enabled_remotes,
-                repo_section=repo_section,
-                is_index_only=is_index_only,
-                fdroid_dir=git_fdroiddir,
-                git_mirror_path=str(git_mirror_path),
-                ssh_cmd=ssh_cmd,
-                progress=progress,
-            )
         if progress:
-            progressbar.done()
-
-
-def upload_to_servergitmirror(
-    mirror_config: Dict[str, str],
-    local_repo: Repo,
-    enabled_remotes: List[str],
-    repo_section: str,
-    is_index_only: bool,
-    fdroid_dir: str,
-    git_mirror_path: str,
-    ssh_cmd: str,
-    progress: git.RemoteProgress,
-) -> None:
-    remote_branch_name = GIT_BRANCH
-    local_branch_name = local_repo.active_branch.name
-
-    remote_url = mirror_config['url']
-    name = REMOTE_HOSTNAME_REGEX.sub(r'\1', remote_url)
-    enabled_remotes.append(name)
-    r = git.remote.Remote(local_repo, name)
-    if r in local_repo.remotes:
-        r = local_repo.remote(name)
-        if 'set_url' in dir(r):  # force remote URL if using GitPython 2.x
-            r.set_url(remote_url)
-    else:
-        local_repo.create_remote(name, remote_url)
-    logging.info('Mirroring to: ' + remote_url)
-
-    if is_index_only:
-        files_to_upload = _get_index_file_paths(
-            os.path.join(local_repo.working_tree_dir, 'fdroid', repo_section)
-        )
-        files_to_upload = _remove_missing_files(files_to_upload)
-        local_repo.index.add(files_to_upload)
-    else:
-        # sadly index.add don't allow the --all parameter
-        logging.debug('Adding all files to git mirror')
-        local_repo.git.add(all=True)
-
-    logging.debug('Committing files into git mirror')
-    local_repo.index.commit("fdroidserver git-mirror")
-
-    # only deploy to GitLab Artifacts if too big for GitLab Pages
-    if (
-        is_index_only
-        or common.get_dir_size(fdroid_dir) <= common.GITLAB_COM_PAGES_MAX_SIZE
-    ):
-        gitlab_ci_job_name = 'pages'
-    else:
-        gitlab_ci_job_name = 'GitLab Artifacts'
-        logging.warning(
-            _('Skipping GitLab Pages mirror because the repo is too large (>%.2fGB)!')
-            % (common.GITLAB_COM_PAGES_MAX_SIZE / 1000000000)
-        )
-
-    # push. This will overwrite the git history
-    remote = local_repo.remote(name)
-    if remote.name == 'gitlab':
-        logging.debug('Writing .gitlab-ci.yml to deploy to GitLab Pages')
-        with open(os.path.join(git_mirror_path, ".gitlab-ci.yml"), "wt") as fp:
-            yaml.dump(
-                {
-                    gitlab_ci_job_name: {
-                        'script': [
-                            'mkdir .public',
-                            'cp -r * .public/',
-                            'mv .public public',
-                        ],
-                        'artifacts': {'paths': ['public']},
-                        'variables': {'GIT_DEPTH': 1},
-                    }
-                },
-                fp,
-                default_flow_style=False,
-            )
-
-        local_repo.index.add(['.gitlab-ci.yml'])
-        local_repo.index.commit("fdroidserver git-mirror: Deploy to GitLab Pages")
-
-    logging.debug(_('Pushing to {url}').format(url=remote.url))
-    with local_repo.git.custom_environment(GIT_SSH_COMMAND=ssh_cmd):
-        pushinfos = remote.push(
-            f"{local_branch_name}:{remote_branch_name}",
-            force=True,
-            set_upstream=True,
-            progress=progress,
-        )
-        for pushinfo in pushinfos:
-            if pushinfo.flags & (
-                git.remote.PushInfo.ERROR
-                | git.remote.PushInfo.REJECTED
-                | git.remote.PushInfo.REMOTE_FAILURE
-                | git.remote.PushInfo.REMOTE_REJECTED
-            ):
-                # Show potentially useful messages from git remote
-                if progress:
-                    for line in progress.other_lines:
-                        if line.startswith('remote:'):
-                            logging.debug(line)
-                raise FDroidException(
-                    remote.url
-                    + ' push failed: '
-                    + str(pushinfo.flags)
-                    + ' '
-                    + pushinfo.summary
-                )
-            else:
-                logging.debug(remote.url + ': ' + pushinfo.summary)
+            bar.done()
 
 
 def upload_to_android_observatory(repo_section):
     import requests
-
     requests  # stop unused import warning
 
-    if common.get_options().verbose:
+    if options.verbose:
         logging.getLogger("requests").setLevel(logging.INFO)
         logging.getLogger("urllib3").setLevel(logging.INFO)
     else:
@@ -658,17 +474,13 @@ def upload_to_android_observatory(repo_section):
 def upload_apk_to_android_observatory(path):
     # depend on requests and lxml only if users enable AO
     import requests
+    from . import net
     from lxml.html import fromstring
 
-    from . import net
-
     apkfilename = os.path.basename(path)
-    r = requests.post(
-        'https://androidobservatory.org/',
-        data={'q': common.sha256sum(path), 'searchby': 'hash'},
-        headers=net.HEADERS,
-        timeout=300,
-    )
+    r = requests.post('https://androidobservatory.org/',
+                      data={'q': update.sha256sum(path), 'searchby': 'hash'},
+                      headers=net.HEADERS)
     if r.status_code == 200:
         # from now on XPath will be used to retrieve the message in the HTML
         # androidobservatory doesn't have a nice API to talk with
@@ -685,30 +497,22 @@ def upload_apk_to_android_observatory(path):
 
         page = 'https://androidobservatory.org'
         if href:
-            message = _('Found {apkfilename} at {url}').format(
-                apkfilename=apkfilename, url=(page + href)
-            )
+            message = (_('Found {apkfilename} at {url}')
+                       .format(apkfilename=apkfilename, url=(page + href)))
             logging.debug(message)
             return
 
     # upload the file with a post request
-    logging.info(
-        _('Uploading {apkfilename} to androidobservatory.org').format(
-            apkfilename=apkfilename
-        )
-    )
-    r = requests.post(
-        'https://androidobservatory.org/upload',
-        files={'apk': (apkfilename, open(path, 'rb'))},
-        headers=net.HEADERS,
-        allow_redirects=False,
-        timeout=300,
-    )
+    logging.info(_('Uploading {apkfilename} to androidobservatory.org')
+                 .format(apkfilename=apkfilename))
+    r = requests.post('https://androidobservatory.org/upload',
+                      files={'apk': (apkfilename, open(path, 'rb'))},
+                      headers=net.HEADERS,
+                      allow_redirects=False)
 
 
 def upload_to_virustotal(repo_section, virustotal_apikey):
     import requests
-
     requests  # stop unused import warning
 
     if repo_section == 'repo':
@@ -719,47 +523,44 @@ def upload_to_virustotal(repo_section, virustotal_apikey):
             with open(os.path.join(repo_section, 'index-v1.json')) as fp:
                 data = json.load(fp)
         else:
-            local_jar = os.path.join(repo_section, 'index-v1.jar')
-            data, _ignored, _ignored = index.get_index_from_jar(local_jar)
+            data, _ignored, _ignored = index.get_index_from_jar(os.path.join(repo_section, 'index-v1.jar'))
 
         for packageName, packages in data['packages'].items():
             for package in packages:
                 upload_apk_to_virustotal(virustotal_apikey, **package)
 
 
-def upload_apk_to_virustotal(
-    virustotal_apikey, packageName, apkName, hash, versionCode, **kwargs
-):
+def upload_apk_to_virustotal(virustotal_apikey, packageName, apkName, hash,
+                             versionCode, **kwargs):
     import requests
 
     logging.getLogger("urllib3").setLevel(logging.WARNING)
     logging.getLogger("requests").setLevel(logging.WARNING)
 
-    outputfilename = os.path.join(
-        'virustotal', packageName + '_' + str(versionCode) + '_' + hash + '.json'
-    )
+    outputfilename = os.path.join('virustotal',
+                                  packageName + '_' + str(versionCode)
+                                  + '_' + hash + '.json')
     if os.path.exists(outputfilename):
         logging.debug(apkName + ' results are in ' + outputfilename)
         return outputfilename
     repofilename = os.path.join('repo', apkName)
     logging.info('Checking if ' + repofilename + ' is on virustotal')
 
-    headers = {"User-Agent": "F-Droid"}
+    headers = {
+        "User-Agent": "F-Droid"
+    }
     if 'headers' in kwargs:
         for k, v in kwargs['headers'].items():
             headers[k] = v
 
-    apikey = {
+    data = {
         'apikey': virustotal_apikey,
         'resource': hash,
     }
     needs_file_upload = False
     while True:
-        report_url = (
-            'https://www.virustotal.com/vtapi/v2/file/report?'
-            + urllib.parse.urlencode(apikey)
-        )
-        r = requests.get(report_url, headers=headers, timeout=300)
+        r = requests.get('https://www.virustotal.com/vtapi/v2/file/report?'
+                         + urllib.parse.urlencode(data), headers=headers)
         if r.status_code == 200:
             response = r.json()
             if response['response_code'] == 0:
@@ -774,14 +575,11 @@ def upload_apk_to_virustotal(
                     json.dump(response, fp, indent=2, sort_keys=True)
 
             if response.get('positives', 0) > 0:
-                logging.warning(
-                    _('{path} has been flagged by virustotal {count} times:').format(
-                        path=repofilename, count=response['positives']
-                    ),
-                    +'\n\t' + response['permalink'],
-                )
+                logging.warning(repofilename + ' has been flagged by virustotal '
+                                + str(response['positives']) + ' times:'
+                                + '\n\t' + response['permalink'])
             break
-        if r.status_code == 204:
+        elif r.status_code == 204:
             logging.warning(_('virustotal.com is rate limiting, waiting to retry...'))
             time.sleep(30)  # wait for public API rate limiting
 
@@ -791,48 +589,32 @@ def upload_apk_to_virustotal(
         size = os.path.getsize(repofilename)
         if size > 200000000:
             # VirusTotal API 200MB hard limit
-            logging.error(
-                _('{path} more than 200MB, manually upload: {url}').format(
-                    path=repofilename, url=manual_url
-                )
-            )
+            logging.error(_('{path} more than 200MB, manually upload: {url}')
+                          .format(path=repofilename, url=manual_url))
         elif size > 32000000:
             # VirusTotal API requires fetching a URL to upload bigger files
-            query_url = (
-                'https://www.virustotal.com/vtapi/v2/file/scan/upload_url?'
-                + urllib.parse.urlencode(apikey)
-            )
-            r = requests.get(query_url, headers=headers, timeout=300)
+            r = requests.get('https://www.virustotal.com/vtapi/v2/file/scan/upload_url?'
+                             + urllib.parse.urlencode(data), headers=headers)
             if r.status_code == 200:
                 upload_url = r.json().get('upload_url')
             elif r.status_code == 403:
-                logging.error(
-                    _(
-                        'VirusTotal API key cannot upload files larger than 32MB, '
-                        + 'use {url} to upload {path}.'
-                    ).format(path=repofilename, url=manual_url)
-                )
+                logging.error(_('VirusTotal API key cannot upload files larger than 32MB, '
+                                + 'use {url} to upload {path}.')
+                              .format(path=repofilename, url=manual_url))
             else:
                 r.raise_for_status()
         else:
             upload_url = 'https://www.virustotal.com/vtapi/v2/file/scan'
 
     if upload_url:
-        logging.info(
-            _('Uploading {apkfilename} to virustotal').format(apkfilename=repofilename)
-        )
-        r = requests.post(
-            upload_url,
-            data=apikey,
-            headers=headers,
-            files={'file': (apkName, open(repofilename, 'rb'))},
-            timeout=300,
-        )
-        logging.debug(
-            _('If this upload fails, try manually uploading to {url}').format(
-                url=manual_url
-            )
-        )
+        logging.info(_('Uploading {apkfilename} to virustotal')
+                     .format(apkfilename=repofilename))
+        files = {
+            'file': (apkName, open(repofilename, 'rb'))
+        }
+        r = requests.post(upload_url, data=data, headers=headers, files=files)
+        logging.debug(_('If this upload fails, try manually uploading to {url}')
+                      .format(url=manual_url))
         r.raise_for_status()
         response = r.json()
         logging.info(response['verbose_msg'] + " " + response['permalink'])
@@ -841,7 +623,7 @@ def upload_apk_to_virustotal(
 
 
 def push_binary_transparency(git_repo_path, git_remote):
-    """Push the binary transparency git repo to the specifed remote.
+    '''push the binary transparency git repo to the specifed remote.
 
     If the remote is a local directory, make sure it exists, and is a
     git repo.  This is used to move this git repo from an offline
@@ -854,15 +636,18 @@ def push_binary_transparency(git_repo_path, git_remote):
     case, git_remote is a dir on the local file system, e.g. a thumb
     drive.
 
-    """
-    logging.info(_('Pushing binary transparency log to {url}').format(url=git_remote))
+    '''
+    import git
+
+    logging.info(_('Pushing binary transparency log to {url}')
+                 .format(url=git_remote))
 
     if os.path.isdir(os.path.dirname(git_remote)):
         # from offline machine to thumbdrive
         remote_path = os.path.abspath(git_repo_path)
         if not os.path.isdir(os.path.join(git_remote, '.git')):
             os.makedirs(git_remote, exist_ok=True)
-            thumbdriverepo = git.Repo.init(git_remote, initial_branch=GIT_BRANCH)
+            thumbdriverepo = git.Repo.init(git_remote)
             local = thumbdriverepo.create_remote('local', remote_path)
         else:
             thumbdriverepo = git.Repo(git_remote)
@@ -873,7 +658,7 @@ def push_binary_transparency(git_repo_path, git_remote):
                     local.set_url(remote_path)
             else:
                 local = thumbdriverepo.create_remote('local', remote_path)
-        local.pull(GIT_BRANCH)
+        local.pull('master')
     else:
         # from online machine to remote on a server on the internet
         gitrepo = git.Repo(git_repo_path)
@@ -884,186 +669,70 @@ def push_binary_transparency(git_repo_path, git_remote):
                 origin.set_url(git_remote)
         else:
             origin = gitrepo.create_remote('origin', git_remote)
-        for _i in range(3):
-            try:
-                origin.push(GIT_BRANCH)
-            except git.GitCommandError as e:
-                logging.error(e)
-                continue
-            break
-        else:
-            raise FDroidException(_("Pushing to remote server failed!"))
+        origin.push('master')
 
 
-def find_release_infos(index_v2_path, repo_dir, package_names):
-    """Find files, texts, etc. for uploading to a release page in index-v2.json.
+def update_wiki():
+    try:
+        import mwclient
+        site = mwclient.Site((config['wiki_protocol'], config['wiki_server']),
+                             path=config['wiki_path'])
+        site.login(config['wiki_user'], config['wiki_password'])
 
-    This function parses index-v2.json for file-paths elegible for deployment
-    to release pages. (e.g. GitHub releases) It also groups these files by
-    packageName and versionName. e.g. to get a list of files for all specific
-    release of fdroid client you may call:
-
-    find_binary_release_infos()['org.fdroid.fdroid']['0.19.2']
-
-    All paths in the returned data-structure are of type pathlib.Path.
-    """
-    release_infos = {}
-    with open(index_v2_path, 'r') as f:
-        idx = json.load(f)
-        for package_name in package_names:
-            package = idx.get('packages', {}).get(package_name, {})
-            for version in package.get('versions', {}).values():
-                if package_name not in release_infos:
-                    release_infos[package_name] = {}
-                version_name = version['manifest']['versionName']
-                version_path = repo_dir / version['file']['name'].lstrip("/")
-                files = [version_path]
-                asc_path = pathlib.Path(str(version_path) + '.asc')
-                if asc_path.is_file():
-                    files.append(asc_path)
-                sig_path = pathlib.Path(str(version_path) + '.sig')
-                if sig_path.is_file():
-                    files.append(sig_path)
-                release_infos[package_name][version_name] = {
-                    'files': files,
-                    'whatsNew': version.get('whatsNew', {}).get("en-US"),
-                    'hasReleaseChannels': len(version.get('releaseChannels', [])) > 0,
-                }
-    return release_infos
-
-
-def upload_to_github_releases(repo_section, gh_config, global_gh_token):
-    repo_dir = pathlib.Path(repo_section)
-    index_v2_path = repo_dir / 'index-v2.json'
-    if not index_v2_path.is_file():
-        logging.warning(
-            _(
-                "Error deploying 'github_releases', {} not present. (You might "
-                "need to run `fdroid update` first.)"
-            ).format(index_v2_path)
-        )
-        return
-
-    package_names = []
-    for repo_conf in gh_config:
-        for package_name in repo_conf.get('packageNames', []):
-            package_names.append(package_name)
-
-    release_infos = fdroidserver.deploy.find_release_infos(
-        index_v2_path, repo_dir, package_names
-    )
-
-    for repo_conf in gh_config:
-        upload_to_github_releases_repo(repo_conf, release_infos, global_gh_token)
-
-
-def upload_to_github_releases_repo(repo_conf, release_infos, global_gh_token):
-    projectUrl = repo_conf.get("projectUrl")
-    if not projectUrl:
-        logging.warning(
-            _(
-                "One of the 'github_releases' config items is missing the "
-                "'projectUrl' value. skipping ..."
-            )
-        )
-        return
-    token = repo_conf.get("token") or global_gh_token
-    if not token:
-        logging.warning(
-            _(
-                "One of the 'github_releases' config items is missing the "
-                "'token' value. skipping ..."
-            )
-        )
-        return
-    conf_package_names = repo_conf.get("packageNames", [])
-    if type(conf_package_names) == str:
-        conf_package_names = [conf_package_names]
-    if not conf_package_names:
-        logging.warning(
-            _(
-                "One of the 'github_releases' config items is missing the "
-                "'packageNames' value. skipping ..."
-            )
-        )
-        return
-
-    # lookup all versionNames (git tags) for all packages available in the
-    # local fdroid repo
-    all_local_versions = set()
-    for package_name in conf_package_names:
-        for version in release_infos.get(package_name, {}).keys():
-            all_local_versions.add(version)
-
-    gh = fdroidserver.github.GithubApi(token, projectUrl)
-    unreleased_tags = gh.list_unreleased_tags()
-
-    for version in all_local_versions:
-        if version in unreleased_tags:
-            # Making sure we're not uploading this version when releaseChannels
-            # is set. (releaseChannels usually mean it's e.g. an alpha or beta
-            # version)
-            if (
-                not release_infos.get(conf_package_names[0], {})
-                .get(version, {})
-                .get('hasReleaseChannels')
-            ):
-                # collect files associated with this github release
-                files = []
-                for package in conf_package_names:
-                    files.extend(
-                        release_infos.get(package, {}).get(version, {}).get('files', [])
-                    )
-                # always use the whatsNew text from the first app listed in
-                # config.yml github_releases.packageNames
-                text = (
-                    release_infos.get(conf_package_names[0], {})
-                    .get(version, {})
-                    .get('whatsNew')
-                    or ''
-                )
-                if 'release_notes_prepend' in repo_conf:
-                    text = repo_conf['release_notes_prepend'] + "\n\n" + text
-                # create new release on github and upload all associated files
-                gh.create_release(version, files, text)
+        # Write a page with the last build log for this version code
+        wiki_page_path = 'deploy_' + time.strftime('%s', start_timestamp)
+        newpage = site.Pages[wiki_page_path]
+        txt = ''
+        txt += "* command line: <code>" + ' '.join(sys.argv) + "</code>\n"
+        txt += "* started at " + common.get_wiki_timestamp(start_timestamp) + '\n'
+        txt += "* completed at " + common.get_wiki_timestamp() + '\n'
+        txt += "\n\n"
+        newpage.save(txt, summary='Run log')
+        newpage = site.Pages['deploy']
+        newpage.save('#REDIRECT [[' + wiki_page_path + ']]', summary='Update redirect')
+    except Exception as e:
+        logging.error(_('Error while attempting to publish log: %s') % e)
 
 
 def main():
-    global config
+    global config, options
 
     parser = ArgumentParser()
     common.setup_global_opts(parser)
-    parser.add_argument(
-        "-i",
-        "--identity-file",
-        default=None,
-        help=_("Specify an identity file to provide to SSH for rsyncing"),
-    )
-    parser.add_argument(
-        "--local-copy-dir",
-        default=None,
-        help=_("Specify a local folder to sync the repo to"),
-    )
-    parser.add_argument(
-        "--no-checksum",
-        action="store_true",
-        default=False,
-        help=_("Don't use rsync checksums"),
-    )
-    parser.add_argument(
-        "--no-keep-git-mirror-archive",
-        action="store_true",
-        default=False,
-        help=_("If a git mirror gets to big, allow the archive to be deleted"),
-    )
-    options = common.parse_args(parser)
-    config = common.read_config()
+    parser.add_argument("-i", "--identity-file", default=None,
+                        help=_("Specify an identity file to provide to SSH for rsyncing"))
+    parser.add_argument("--local-copy-dir", default=None,
+                        help=_("Specify a local folder to sync the repo to"))
+    parser.add_argument("--no-checksum", action="store_true", default=False,
+                        help=_("Don't use rsync checksums"))
+    parser.add_argument("--no-keep-git-mirror-archive", action="store_true", default=False,
+                        help=_("If a git mirror gets to big, allow the archive to be deleted"))
+    options = parser.parse_args()
+    config = common.read_config(options)
 
     if config.get('nonstandardwebroot') is True:
         standardwebroot = False
     else:
         standardwebroot = True
 
+    for serverwebroot in config.get('serverwebroot', []):
+        # this supports both an ssh host:path and just a path
+        s = serverwebroot.rstrip('/').split(':')
+        if len(s) == 1:
+            fdroiddir = s[0]
+        elif len(s) == 2:
+            host, fdroiddir = s
+        else:
+            logging.error(_('Malformed serverwebroot line:') + ' ' + serverwebroot)
+            sys.exit(1)
+        repobase = os.path.basename(fdroiddir)
+        if standardwebroot and repobase != 'fdroid':
+            logging.error('serverwebroot path does not end with "fdroid", '
+                          + 'perhaps you meant one of these:\n\t'
+                          + serverwebroot.rstrip('/') + '/fdroid\n\t'
+                          + serverwebroot.rstrip('/').rstrip(repobase) + 'fdroid')
+            sys.exit(1)
+
     if options.local_copy_dir is not None:
         local_copy_dir = options.local_copy_dir
     elif config.get('local_copy_dir'):
@@ -1076,23 +745,17 @@ def main():
             logging.error(_('local_copy_dir must be directory, not a file!'))
             sys.exit(1)
         if not os.path.exists(os.path.dirname(fdroiddir)):
-            logging.error(
-                _('The root dir for local_copy_dir "{path}" does not exist!').format(
-                    path=os.path.dirname(fdroiddir)
-                )
-            )
+            logging.error(_('The root dir for local_copy_dir "{path}" does not exist!')
+                          .format(path=os.path.dirname(fdroiddir)))
             sys.exit(1)
         if not os.path.isabs(fdroiddir):
             logging.error(_('local_copy_dir must be an absolute path!'))
             sys.exit(1)
         repobase = os.path.basename(fdroiddir)
         if standardwebroot and repobase != 'fdroid':
-            logging.error(
-                _(
-                    'local_copy_dir does not end with "fdroid", '
-                    + 'perhaps you meant: "{path}"'
-                ).format(path=fdroiddir + '/fdroid')
-            )
+            logging.error(_('local_copy_dir does not end with "fdroid", '
+                            + 'perhaps you meant: "{path}"')
+                          .format(path=fdroiddir + '/fdroid'))
             sys.exit(1)
         if local_copy_dir[-1] != '/':
             local_copy_dir += '/'
@@ -1100,22 +763,16 @@ def main():
         if not os.path.exists(fdroiddir):
             os.mkdir(fdroiddir)
 
-    if (
-        not config.get('awsbucket')
-        and not config.get('serverwebroot')
-        and not config.get('servergitmirrors')
-        and not config.get('androidobservatory')
-        and not config.get('binary_transparency_remote')
-        and not config.get('virustotal_apikey')
-        and not config.get('github_releases')
-        and local_copy_dir is None
-    ):
-        logging.warning(
-            _('No option set! Edit your config.yml to set at least one of these:')
-            + '\nserverwebroot, servergitmirrors, local_copy_dir, awsbucket, '
-            + 'virustotal_apikey, androidobservatory, github_releases '
-            + 'or binary_transparency_remote'
-        )
+    if not config.get('awsbucket') \
+            and not config.get('serverwebroot') \
+            and not config.get('servergitmirrors') \
+            and not config.get('androidobservatory') \
+            and not config.get('binary_transparency_remote') \
+            and not config.get('virustotal_apikey') \
+            and local_copy_dir is None:
+        logging.warning(_('No option set! Edit your config.py to set at least one of these:')
+                        + '\nserverwebroot, servergitmirrors, local_copy_dir, awsbucket, '
+                        + 'virustotal_apikey, androidobservatory, or binary_transparency_remote')
         sys.exit(1)
 
     repo_sections = ['repo']
@@ -1126,48 +783,32 @@ def main():
     if config['per_app_repos']:
         repo_sections += common.get_per_app_repos()
 
-    if os.path.isdir('unsigned') or (
-        local_copy_dir is not None
-        and os.path.isdir(os.path.join(local_copy_dir, 'unsigned'))
-    ):
-        repo_sections.append('unsigned')
-
     for repo_section in repo_sections:
         if local_copy_dir is not None:
             if config['sync_from_local_copy_dir']:
                 sync_from_localcopy(repo_section, local_copy_dir)
             else:
                 update_localcopy(repo_section, local_copy_dir)
-        if config.get('serverwebroot'):
-            update_serverwebroots(
-                config['serverwebroot'], repo_section, standardwebroot
-            )
-        if config.get('servergitmirrors'):
+        for serverwebroot in config.get('serverwebroot', []):
+            update_serverwebroot(serverwebroot, repo_section)
+        if config.get('servergitmirrors', []):
             # update_servergitmirrors will take care of multiple mirrors so don't need a foreach
-            update_servergitmirrors(config['servergitmirrors'], repo_section)
+            servergitmirrors = config.get('servergitmirrors', [])
+            update_servergitmirrors(servergitmirrors, repo_section)
         if config.get('awsbucket'):
-            awsbucket = config['awsbucket']
-            index_only = config.get('awsbucket_index_only')
-            update_remote_storage_with_rclone(
-                repo_section,
-                awsbucket,
-                index_only,
-                options.verbose,
-                options.quiet,
-                not options.no_checksum,
-            )
+            update_awsbucket(repo_section)
         if config.get('androidobservatory'):
             upload_to_android_observatory(repo_section)
         if config.get('virustotal_apikey'):
             upload_to_virustotal(repo_section, config.get('virustotal_apikey'))
-        if config.get('github_releases'):
-            upload_to_github_releases(
-                repo_section, config.get('github_releases'), config.get('github_token')
-            )
 
-    binary_transparency_remote = config.get('binary_transparency_remote')
-    if binary_transparency_remote:
-        push_binary_transparency(BINARY_TRANSPARENCY_DIR, binary_transparency_remote)
+        binary_transparency_remote = config.get('binary_transparency_remote')
+        if binary_transparency_remote:
+            push_binary_transparency(BINARY_TRANSPARENCY_DIR,
+                                     binary_transparency_remote)
+
+    if config.get('wiki_server') and config.get('wiki_path'):
+        update_wiki()
 
     common.write_status_json(common.setup_status_output(start_timestamp))
     sys.exit(0)
diff --git a/fdroidserver/exception.py b/fdroidserver/exception.py
index 682ccef7..f9f876ce 100644
--- a/fdroidserver/exception.py
+++ b/fdroidserver/exception.py
@@ -1,6 +1,6 @@
 class FDroidException(Exception):
+
     def __init__(self, value=None, detail=None):
-        super().__init__()
         self.value = value
         self.detail = detail
 
@@ -9,22 +9,26 @@ class FDroidException(Exception):
             return self.detail
         return '[...]\n' + self.detail[-16000:]
 
+    def get_wikitext(self):
+        ret = repr(self.value) + "\n"
+        if self.detail:
+            ret += "=detail=\n"
+            ret += "<pre>\n" + self.shortened_detail() + "</pre>\n"
+        return ret
+
     def __str__(self):
         if self.value is None:
             ret = __name__
         else:
             ret = str(self.value)
         if self.detail:
-            ret += (
-                "\n==== detail begin ====\n%s\n==== detail end ===="
-                % ''.join(self.detail).strip()
-            )
+            ret += "\n==== detail begin ====\n%s\n==== detail end ====" % ''.join(self.detail).strip()
         return ret
 
 
 class MetaDataException(Exception):
+
     def __init__(self, value):
-        super().__init__()
         self.value = value
 
     def __str__(self):
@@ -35,10 +39,6 @@ class VCSException(FDroidException):
     pass
 
 
-class NoVersionCodeException(FDroidException):
-    pass
-
-
 class NoSubmodulesException(VCSException):
     pass
 
@@ -49,10 +49,3 @@ class BuildException(FDroidException):
 
 class VerificationException(FDroidException):
     pass
-
-
-class ConfigurationException(FDroidException):
-    def __init__(self, value=None, detail=None):
-        super().__init__()
-        self.value = value
-        self.detail = detail
diff --git a/fdroidserver/github.py b/fdroidserver/github.py
deleted file mode 100644
index 34a3ee53..00000000
--- a/fdroidserver/github.py
+++ /dev/null
@@ -1,178 +0,0 @@
-#!/usr/bin/env python3
-#
-# github.py - part of the FDroid server tools
-# Copyright (C) 2024, Michael Pöhn, michael@poehn.at
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-import json
-import pathlib
-import urllib.parse
-import urllib.request
-
-
-class GithubApi:
-    """Wrapper for some select calls to GitHub Json/REST API.
-
-    This class wraps some calls to api.github.com. This is not intended to be a
-    general API wrapper. Instead it's purpose is to return pre-filtered and
-    transformed data that's playing well with other fdroidserver functions.
-
-    With the GitHub API, the token is optional, but it has pretty
-    severe rate limiting.
-
-    """
-
-    def __init__(self, api_token, repo_path):
-        self._api_token = api_token
-        if repo_path.startswith("https://github.com/"):
-            self._repo_path = repo_path[19:]
-        else:
-            self._repo_path = repo_path
-
-    def _req(self, url, data=None):
-        h = {
-            "Accept": "application/vnd.github+json",
-            "X-GitHub-Api-Version": "2022-11-28",
-        }
-        if self._api_token:
-            h["Authorization"] = f"Bearer {self._api_token}"
-        return urllib.request.Request(
-            url,
-            headers=h,
-            data=data,
-        )
-
-    def list_released_tags(self):
-        """List of all tags that are associated with a release for this repo on GitHub."""
-        names = []
-        req = self._req(f"https://api.github.com/repos/{self._repo_path}/releases")
-        with urllib.request.urlopen(req) as resp:  # nosec CWE-22 disable bandit warning
-            releases = json.load(resp)
-            for release in releases:
-                names.append(release['tag_name'])
-        return names
-
-    def list_unreleased_tags(self):
-        all_tags = self.list_all_tags()
-        released_tags = self.list_released_tags()
-        return [x for x in all_tags if x not in released_tags]
-
-    def get_latest_apk(self):
-        req = self._req(
-            f"https://api.github.com/repos/{self._repo_path}/releases/latest"
-        )
-        with urllib.request.urlopen(req) as resp:  # nosec CWE-22 disable bandit warning
-            assets = json.load(resp)['assets']
-            for asset in assets:
-                url = asset.get('browser_download_url')
-                if url and url.endswith('.apk'):
-                    return url
-
-    def tag_exists(self, tag):
-        """
-        Check if git tag is present on github.
-
-        https://docs.github.com/en/rest/git/refs?apiVersion=2022-11-28#list-matching-references--fine-grained-access-tokens
-        """
-        req = self._req(
-            f"https://api.github.com/repos/{self._repo_path}/git/matching-refs/tags/{tag}"
-        )
-        with urllib.request.urlopen(req) as resp:  # nosec CWE-22 disable bandit warning
-            rd = json.load(resp)
-            return len(rd) == 1 and rd[0].get("ref", False) == f"refs/tags/{tag}"
-        return False
-
-    def list_all_tags(self):
-        """Get list of all tags for this repo on GitHub."""
-        tags = []
-        req = self._req(
-            f"https://api.github.com/repos/{self._repo_path}/git/matching-refs/tags/"
-        )
-        with urllib.request.urlopen(req) as resp:  # nosec CWE-22 disable bandit warning
-            refs = json.load(resp)
-            for ref in refs:
-                r = ref.get('ref', '')
-                if r.startswith('refs/tags/'):
-                    tags.append(r[10:])
-        return tags
-
-    def create_release(self, tag, files, body=''):
-        """
-        Create a new release on github.
-
-        also see: https://docs.github.com/en/rest/releases/releases?apiVersion=2022-11-28#create-a-release
-
-        :returns: True if release was created, False if release already exists
-        :raises: urllib exceptions in case of network or api errors, also
-                 raises an exception when the tag doesn't exists.
-        """
-        # Querying github to create a new release for a non-existent tag, will
-        # also create that tag on github. So we need an additional check to
-        # prevent this behavior.
-        if not self.tag_exists(tag):
-            raise Exception(
-                f"can't create github release for {self._repo_path} {tag}, tag doesn't exists"
-            )
-        # create the relase on github
-        req = self._req(
-            f"https://api.github.com/repos/{self._repo_path}/releases",
-            data=json.dumps(
-                {
-                    "tag_name": tag,
-                    "body": body,
-                }
-            ).encode("utf-8"),
-        )
-        try:
-            with urllib.request.urlopen(  # nosec CWE-22 disable bandit warning
-                req
-            ) as resp:
-                release_id = json.load(resp)['id']
-        except urllib.error.HTTPError as e:
-            if e.status == 422:
-                codes = [x['code'] for x in json.load(e).get('errors', [])]
-                if "already_exists" in codes:
-                    return False
-            raise e
-
-        # attach / upload all files for the relase
-        for file in files:
-            self._create_release_asset(release_id, file)
-
-        return True
-
-    def _create_release_asset(self, release_id, file):
-        """
-        Attach a file to a release on GitHub.
-
-        This uploads a file to github relases, it will be attached to the supplied release
-
-        also see: https://docs.github.com/en/rest/releases/assets?apiVersion=2022-11-28#upload-a-release-asset
-        """
-        file = pathlib.Path(file)
-        with open(file, 'rb') as f:
-            req = urllib.request.Request(
-                f"https://uploads.github.com/repos/{self._repo_path}/releases/{release_id}/assets?name={file.name}",
-                headers={
-                    "Accept": "application/vnd.github+json",
-                    "Authorization": f"Bearer {self._api_token}",
-                    "X-GitHub-Api-Version": "2022-11-28",
-                    "Content-Type": "application/octet-stream",
-                },
-                data=f.read(),
-            )
-            with urllib.request.urlopen(req):  # nosec CWE-22 disable bandit warning
-                return True
-            return False
diff --git a/fdroidserver/gpgsign.py b/fdroidserver/gpgsign.py
index 4341cb36..86258b63 100644
--- a/fdroidserver/gpgsign.py
+++ b/fdroidserver/gpgsign.py
@@ -16,22 +16,25 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-import glob
-import logging
 import os
-import time
+import glob
 from argparse import ArgumentParser
+import logging
+import time
 
-from . import _, common
+from . import _
+from . import common
 from .common import FDroidPopen
 from .exception import FDroidException
 
 config = None
+options = None
 start_timestamp = time.gmtime()
 
 
 def status_update_json(signed):
-    """Output a JSON file with metadata about this run."""
+    """Output a JSON file with metadata about this run"""
+
     logging.debug(_('Outputting JSON'))
     output = common.setup_status_output(start_timestamp)
     if signed:
@@ -40,14 +43,15 @@ def status_update_json(signed):
 
 
 def main():
-    global config
+
+    global config, options
 
     # Parse command line...
     parser = ArgumentParser()
     common.setup_global_opts(parser)
-    common.parse_args(parser)
+    options = parser.parse_args()
 
-    config = common.read_config()
+    config = common.read_config(options)
 
     repodirs = ['repo']
     if config['archive_older'] != 0:
@@ -56,20 +60,22 @@ def main():
     signed = []
     for output_dir in repodirs:
         if not os.path.isdir(output_dir):
-            raise FDroidException(
-                _("Missing output directory") + " '" + output_dir + "'"
-            )
+            raise FDroidException(_("Missing output directory") + " '" + output_dir + "'")
 
         # Process any apks that are waiting to be signed...
         for f in sorted(glob.glob(os.path.join(output_dir, '*.*'))):
-            if not common.is_repo_file(f, for_gpg_signing=True):
+            if common.get_file_extension(f) == 'asc':
+                continue
+            if not common.is_repo_file(f):
                 continue
             filename = os.path.basename(f)
             sigfilename = filename + ".asc"
             sigpath = os.path.join(output_dir, sigfilename)
 
             if not os.path.exists(sigpath):
-                gpgargs = ['gpg', '-a', '--output', sigpath, '--detach-sig']
+                gpgargs = ['gpg', '-a',
+                           '--output', sigpath,
+                           '--detach-sig']
                 if 'gpghome' in config:
                     gpgargs.extend(['--homedir', config['gpghome']])
                 if 'gpgkey' in config:
diff --git a/fdroidserver/import.py b/fdroidserver/import.py
new file mode 100644
index 00000000..48af3b9c
--- /dev/null
+++ b/fdroidserver/import.py
@@ -0,0 +1,265 @@
+#!/usr/bin/env python3
+#
+# import.py - part of the FDroid server tools
+# Copyright (C) 2010-13, Ciaran Gultnieks, ciaran@ciarang.com
+# Copyright (C) 2013-2014 Daniel Martí <mvdan@mvdan.cc>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+import configparser
+import git
+import json
+import os
+import shutil
+import sys
+import yaml
+from argparse import ArgumentParser
+import logging
+
+try:
+    from yaml import CSafeLoader as SafeLoader
+except ImportError:
+    from yaml import SafeLoader
+
+from . import _
+from . import common
+from . import metadata
+from .exception import FDroidException
+
+
+config = None
+options = None
+
+
+# WARNING!  This cannot be imported as a Python module, so reuseable functions need to go into common.py!
+
+def clone_to_tmp_dir(app):
+    tmp_dir = 'tmp'
+    if not os.path.isdir(tmp_dir):
+        logging.info(_("Creating temporary directory"))
+        os.makedirs(tmp_dir)
+
+    tmp_dir = os.path.join(tmp_dir, 'importer')
+    if os.path.exists(tmp_dir):
+        shutil.rmtree(tmp_dir)
+    vcs = common.getvcs(app.RepoType, app.Repo, tmp_dir)
+    vcs.gotorevision(options.rev)
+
+    return tmp_dir
+
+
+def check_for_kivy_buildozer(tmp_importer_dir, app, build):
+    versionCode = None
+    buildozer_spec = os.path.join(tmp_importer_dir, 'buildozer.spec')
+    if os.path.exists(buildozer_spec):
+        config = configparser.ConfigParser()
+        config.read(buildozer_spec)
+        import pprint
+        pprint.pprint(sorted(config['app'].keys()))
+        app.id = config['app'].get('package.domain')
+        print(app.id)
+        app.AutoName = config['app'].get('package.name', app.AutoName)
+        app.License = config['app'].get('license', app.License)
+        app.Description = config['app'].get('description', app.Description)
+        build.versionName = config['app'].get('version')
+        build.output = 'bin/%s-$$VERSION$$-release-unsigned.apk' % app.AutoName
+        build.ndk = 'r17c'
+        build.srclibs = [
+            'buildozer@586152c',
+            'python-for-android@ccb0f8e1',
+        ]
+        build.sudo = [
+            'apt-get update',
+            'apt-get install -y build-essential libffi-dev libltdl-dev',
+        ]
+        build.prebuild = [
+            'sed -iE "/^[# ]*android\\.(ant|ndk|sdk)_path[ =]/d" buildozer.spec',
+            'sed -iE "/^[# ]*android.accept_sdk_license[ =]+.*/d" buildozer.spec',
+            'sed -iE "/^[# ]*android.skip_update[ =]+.*/d" buildozer.spec',
+            'sed -iE "/^[# ]*p4a.source_dir[ =]+.*/d" buildozer.spec',
+            'sed -i "s,\\[app\\],[app]\\n\\nandroid.sdk_path = $$SDK$$\\nandroid.ndk_path = $$NDK$$\\np4a.source_dir = $$python-for-android$$\\nandroid.accept_sdk_license = False\\nandroid.skip_update = True\\nandroid.ant_path = /usr/bin/ant\\n," buildozer.spec',
+            'pip3 install --user --upgrade $$buildozer$$ Cython==0.28.6',
+        ]
+        build.build = [
+            'PATH="$HOME/.local/bin:$PATH" buildozer android release',
+        ]
+    return build.get('versionName'), versionCode, app.get('id')
+
+
+def main():
+
+    global config, options
+
+    # Parse command line...
+    parser = ArgumentParser()
+    common.setup_global_opts(parser)
+    parser.add_argument("-u", "--url", default=None,
+                        help=_("Project URL to import from."))
+    parser.add_argument("-s", "--subdir", default=None,
+                        help=_("Path to main Android project subdirectory, if not in root."))
+    parser.add_argument("-c", "--categories", default=None,
+                        help=_("Comma separated list of categories."))
+    parser.add_argument("-l", "--license", default=None,
+                        help=_("Overall license of the project."))
+    parser.add_argument("--omit-disable", action="store_true", default=False,
+                        help=_("Do not add 'disable:' to the generated build entries"))
+    parser.add_argument("--rev", default=None,
+                        help=_("Allows a different revision (or git branch) to be specified for the initial import"))
+    metadata.add_metadata_arguments(parser)
+    options = parser.parse_args()
+    metadata.warnings_action = options.W
+
+    config = common.read_config(options)
+
+    apps = metadata.read_metadata()
+    app = None
+
+    tmp_importer_dir = None
+
+    local_metadata_files = common.get_local_metadata_files()
+    if local_metadata_files != []:
+        raise FDroidException(_("This repo already has local metadata: %s") % local_metadata_files[0])
+
+    build = metadata.Build()
+    if options.url is None and os.path.isdir('.git'):
+        app = metadata.App()
+        app.AutoName = os.path.basename(os.getcwd())
+        app.RepoType = 'git'
+
+        if os.path.exists('build.gradle') or os.path.exists('build.gradle.kts'):
+            build.gradle = ['yes']
+
+        git_repo = git.repo.Repo(os.getcwd())
+        for remote in git.Remote.iter_items(git_repo):
+            if remote.name == 'origin':
+                url = git_repo.remotes.origin.url
+                if url.startswith('https://git'):  # github, gitlab
+                    app.SourceCode = url.rstrip('.git')
+                app.Repo = url
+                break
+        write_local_file = True
+    elif options.url:
+        app = common.get_app_from_url(options.url)
+        tmp_importer_dir = clone_to_tmp_dir(app)
+        git_repo = git.repo.Repo(tmp_importer_dir)
+        if not options.omit_disable:
+            build.disable = 'Generated by import.py - check/set version fields and commit id'
+        write_local_file = False
+    else:
+        raise FDroidException("Specify project url.")
+
+    app.UpdateCheckMode = 'Tags'
+    build.commit = common.get_head_commit_id(git_repo)
+
+    versionName, versionCode, appid = check_for_kivy_buildozer(tmp_importer_dir, app, build)
+
+    # Extract some information...
+    paths = common.get_all_gradle_and_manifests(tmp_importer_dir)
+    subdir = common.get_gradle_subdir(tmp_importer_dir, paths)
+    if paths:
+        versionName, versionCode, appid = common.parse_androidmanifests(paths, app)
+        if not appid:
+            raise FDroidException(_("Couldn't find Application ID"))
+        if not versionName:
+            logging.warning(_('Could not find latest version name'))
+        if not versionCode:
+            logging.warning(_('Could not find latest version code'))
+    elif not appid:
+        raise FDroidException(_("No gradle project could be found. Specify --subdir?"))
+
+    # Make sure it's actually new...
+    if appid in apps:
+        raise FDroidException(_('Package "{appid}" already exists').format(appid=appid))
+
+    # Create a build line...
+    build.versionName = versionName or 'Unknown'
+    build.versionCode = versionCode or '0'  # TODO heinous but this is still a str
+    if options.subdir:
+        build.subdir = options.subdir
+        build.gradle = ['yes']
+    elif subdir:
+        build.subdir = subdir
+        build.gradle = ['yes']
+
+    if options.license:
+        app.License = options.license
+    if options.categories:
+        app.Categories = options.categories.split(',')
+    if os.path.exists(os.path.join(subdir, 'jni')):
+        build.buildjni = ['yes']
+    if os.path.exists(os.path.join(subdir, 'build.gradle')) \
+       or os.path.exists(os.path.join(subdir, 'build.gradle')):
+        build.gradle = ['yes']
+
+    package_json = os.path.join(tmp_importer_dir, 'package.json')  # react-native
+    pubspec_yaml = os.path.join(tmp_importer_dir, 'pubspec.yaml')  # flutter
+    if os.path.exists(package_json):
+        build.sudo = ['apt-get update || apt-get update', 'apt-get install -t stretch-backports npm', 'npm install -g react-native-cli']
+        build.init = ['npm install']
+        with open(package_json) as fp:
+            data = json.load(fp)
+        app.AutoName = data.get('name', app.AutoName)
+        app.License = data.get('license', app.License)
+        app.Description = data.get('description', app.Description)
+        app.WebSite = data.get('homepage', app.WebSite)
+        app_json = os.path.join(tmp_importer_dir, 'app.json')
+        if os.path.exists(app_json):
+            with open(app_json) as fp:
+                data = json.load(fp)
+            app.AutoName = data.get('name', app.AutoName)
+    if os.path.exists(pubspec_yaml):
+        with open(pubspec_yaml) as fp:
+            data = yaml.load(fp, Loader=SafeLoader)
+        app.AutoName = data.get('name', app.AutoName)
+        app.License = data.get('license', app.License)
+        app.Description = data.get('description', app.Description)
+        build.srclibs = ['flutter@stable']
+        build.output = 'build/app/outputs/apk/release/app-release.apk'
+        build.build = [
+            '$$flutter$$/bin/flutter config --no-analytics',
+            '$$flutter$$/bin/flutter packages pub get',
+            '$$flutter$$/bin/flutter build apk',
+        ]
+
+    git_modules = os.path.join(tmp_importer_dir, '.gitmodules')
+    if os.path.exists(git_modules):
+        build.submodules = True
+
+    metadata.post_metadata_parse(app)
+
+    app.builds.append(build)
+
+    if write_local_file:
+        metadata.write_metadata('.fdroid.yml', app)
+    else:
+        # Keep the repo directory to save bandwidth...
+        if not os.path.exists('build'):
+            os.mkdir('build')
+        build_dir = os.path.join('build', appid)
+        if os.path.exists(build_dir):
+            logging.warning(_('{path} already exists, ignoring import results!')
+                            .format(path=build_dir))
+            sys.exit(1)
+        elif tmp_importer_dir is not None:
+            shutil.move(tmp_importer_dir, build_dir)
+        with open('build/.fdroidvcs-' + appid, 'w') as f:
+            f.write(app.RepoType + ' ' + app.Repo)
+
+        metadatapath = os.path.join('metadata', appid + '.yml')
+        metadata.write_metadata(metadatapath, app)
+        logging.info("Wrote " + metadatapath)
+
+
+if __name__ == "__main__":
+    main()
diff --git a/fdroidserver/import_subcommand.py b/fdroidserver/import_subcommand.py
deleted file mode 100644
index 017ebe54..00000000
--- a/fdroidserver/import_subcommand.py
+++ /dev/null
@@ -1,470 +0,0 @@
-#!/usr/bin/env python3
-"""Extract application metadata from a source repository."""
-#
-# import_subcommand.py - part of the FDroid server tools
-# Copyright (C) 2010-13, Ciaran Gultnieks, ciaran@ciarang.com
-# Copyright (C) 2013-2014 Daniel Martí <mvdan@mvdan.cc>
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-import json
-import logging
-import os
-import re
-import shutil
-import stat
-import sys
-import urllib
-from argparse import ArgumentParser
-from pathlib import Path
-from typing import Optional
-
-import git
-import yaml
-
-try:
-    from yaml import CSafeLoader as SafeLoader
-except ImportError:
-    from yaml import SafeLoader
-
-from . import _, common, metadata
-from .exception import FDroidException
-
-config = None
-
-SETTINGS_GRADLE_REGEX = re.compile(r'settings\.gradle(?:\.kts)?')
-GRADLE_SUBPROJECT_REGEX = re.compile(r'''['"]:?([^'"]+)['"]''')
-APPLICATION_ID_REGEX = re.compile(r'''\s*applicationId\s=?\s?['"].*['"]''')
-
-
-def get_all_gradle_and_manifests(build_dir):
-    paths = []
-    for root, dirs, files in os.walk(build_dir):
-        for f in sorted(files):
-            if f == 'AndroidManifest.xml' or f.endswith(('.gradle', '.gradle.kts')):
-                full = Path(root) / f
-                paths.append(full)
-    return paths
-
-
-def get_gradle_subdir(build_dir, paths):
-    """Get the subdir where the gradle build is based."""
-    first_gradle_dir = None
-    for path in paths:
-        if not first_gradle_dir:
-            first_gradle_dir = path.parent.relative_to(build_dir)
-        if path.exists() and SETTINGS_GRADLE_REGEX.match(path.name):
-            for m in GRADLE_SUBPROJECT_REGEX.finditer(path.read_text(encoding='utf-8')):
-                for f in (path.parent / m.group(1)).glob('build.gradle*'):
-                    with f.open(encoding='utf-8') as fp:
-                        for line in fp:
-                            if common.ANDROID_PLUGIN_REGEX.match(
-                                line
-                            ) or APPLICATION_ID_REGEX.match(line):
-                                return f.parent.relative_to(build_dir)
-    if first_gradle_dir and first_gradle_dir != Path('.'):
-        return first_gradle_dir
-
-
-def handle_retree_error_on_windows(function, path, excinfo):
-    """Python can't remove a readonly file on Windows so chmod first."""
-    if function in (os.unlink, os.rmdir, os.remove) and excinfo[0] == PermissionError:
-        os.chmod(path, stat.S_IWRITE)
-        function(path)
-
-
-def clone_to_tmp_dir(app: metadata.App, rev=None) -> Path:
-    """Clone the source repository of an app to a temporary directory for further processing.
-
-    Parameters
-    ----------
-    app
-        The App instance to clone the source of.
-
-    Returns
-    -------
-    tmp_dir
-        The (temporary) directory the apps source has been cloned into.
-
-    """
-    tmp_dir = Path('tmp')
-    tmp_dir.mkdir(exist_ok=True)
-
-    tmp_dir = tmp_dir / 'importer'
-
-    if tmp_dir.exists():
-        shutil.rmtree(str(tmp_dir), onerror=handle_retree_error_on_windows)
-    vcs = common.getvcs(app.RepoType, app.Repo, tmp_dir)
-    vcs.gotorevision(rev)
-
-    return tmp_dir
-
-
-def getrepofrompage(url: str) -> tuple[Optional[str], str]:
-    """Get the repo type and address from the given web page.
-
-    The page is scanned in a rather naive manner for 'git clone xxxx',
-    'hg clone xxxx', etc, and when one of these is found it's assumed
-    that's the information we want.  Returns repotype, address, or
-    None, reason
-
-    Parameters
-    ----------
-    url
-        The url to look for repository information at.
-
-    Returns
-    -------
-    repotype_or_none
-        The found repository type or None if an error occured.
-    address_or_reason
-        The address to the found repository or the reason if an error occured.
-
-    """
-    if not url.startswith('http'):
-        return (None, _('{url} does not start with "http"!'.format(url=url)))
-    req = urllib.request.urlopen(url)  # nosec B310 non-http URLs are filtered out
-    if req.getcode() != 200:
-        return (None, 'Unable to get ' + url + ' - return code ' + str(req.getcode()))
-    page = req.read().decode(req.headers.get_content_charset())
-
-    # Works for BitBucket
-    m = re.search('data-fetch-url="(.*)"', page)
-    if m is not None:
-        repo = m.group(1)
-
-        if repo.endswith('.git'):
-            return ('git', repo)
-
-        return ('hg', repo)
-
-    # Works for BitBucket (obsolete)
-    index = page.find('hg clone')
-    if index != -1:
-        repotype = 'hg'
-        repo = page[index + 9 :]
-        index = repo.find('<')
-        if index == -1:
-            return (None, _("Error while getting repo address"))
-        repo = repo[:index]
-        repo = repo.split('"')[0]
-        return (repotype, repo)
-
-    # Works for BitBucket (obsolete)
-    index = page.find('git clone')
-    if index != -1:
-        repotype = 'git'
-        repo = page[index + 10 :]
-        index = repo.find('<')
-        if index == -1:
-            return (None, _("Error while getting repo address"))
-        repo = repo[:index]
-        repo = repo.split('"')[0]
-        return (repotype, repo)
-
-    return (None, _("No information found.") + page)
-
-
-def get_app_from_url(url: str) -> metadata.App:
-    """Guess basic app metadata from the URL.
-
-    The URL must include a network hostname, unless it is an lp:,
-    file:, or git/ssh URL.  This throws ValueError on bad URLs to
-    match urlparse().
-
-    Parameters
-    ----------
-    url
-        The URL to look to look for app metadata at.
-
-    Returns
-    -------
-    app
-        App instance with the found metadata.
-
-    Raises
-    ------
-    :exc:`~fdroidserver.exception.FDroidException`
-        If the VCS type could not be determined.
-    :exc:`ValueError`
-        If the URL is invalid.
-
-    """
-    parsed = urllib.parse.urlparse(url)
-    invalid_url = False
-    if not parsed.scheme or not parsed.path:
-        invalid_url = True
-
-    app = metadata.App()
-    app.Repo = url
-    if url.startswith('git://') or url.startswith('git@'):
-        app.RepoType = 'git'
-    elif parsed.netloc == 'github.com':
-        app.RepoType = 'git'
-        app.SourceCode = url
-        app.IssueTracker = url + '/issues'
-    elif parsed.netloc in ('gitlab.com', 'framagit.org'):
-        # git can be fussy with gitlab URLs unless they end in .git
-        if url.endswith('.git'):
-            url = url[:-4]
-        app.Repo = url + '.git'
-        app.RepoType = 'git'
-        app.SourceCode = url
-        app.IssueTracker = url + '/issues'
-    elif parsed.netloc == 'notabug.org':
-        if url.endswith('.git'):
-            url = url[:-4]
-        app.Repo = url + '.git'
-        app.RepoType = 'git'
-        app.SourceCode = url
-        app.IssueTracker = url + '/issues'
-    elif parsed.netloc == 'bitbucket.org':
-        if url.endswith('/'):
-            url = url[:-1]
-        app.SourceCode = url + '/src'
-        app.IssueTracker = url + '/issues'
-        # Figure out the repo type and adddress...
-        app.RepoType, app.Repo = getrepofrompage(url)
-    elif parsed.netloc == 'codeberg.org':
-        app.RepoType = 'git'
-        app.SourceCode = url
-        app.IssueTracker = url + '/issues'
-    elif url.startswith('https://') and url.endswith('.git'):
-        app.RepoType = 'git'
-
-    if not parsed.netloc and parsed.scheme in ('git', 'http', 'https', 'ssh'):
-        invalid_url = True
-
-    if invalid_url:
-        raise ValueError(_('"{url}" is not a valid URL!'.format(url=url)))
-
-    if not app.RepoType:
-        raise FDroidException("Unable to determine vcs type. " + app.Repo)
-
-    return app
-
-
-def main():
-    """Extract app metadata and write it to a file.
-
-    The behaviour of this function is influenced by the configuration file as
-    well as command line parameters.
-
-    Raises
-    ------
-    :exc:`~fdroidserver.exception.FDroidException`
-        If the repository already has local metadata, no URL is specified and
-        the current directory is not a Git repository, no application ID could
-        be found, no Gradle project could be found or there is already metadata
-        for the found application ID.
-
-    """
-    global config
-
-    # Parse command line...
-    parser = ArgumentParser()
-    common.setup_global_opts(parser)
-    parser.add_argument("-u", "--url", help=_("Project URL to import from."))
-    parser.add_argument(
-        "-s",
-        "--subdir",
-        help=_("Path to main Android project subdirectory, if not in root."),
-    )
-    parser.add_argument(
-        "-c",
-        "--categories",
-        help=_("Comma separated list of categories."),
-    )
-    parser.add_argument("-l", "--license", help=_("Overall license of the project."))
-    parser.add_argument(
-        "--omit-disable",
-        action="store_true",
-        help=_("Do not add 'disable:' to the generated build entries"),
-    )
-    parser.add_argument(
-        "--rev",
-        help=_(
-            "Allows a different revision (or git branch) to be specified for the initial import"
-        ),
-    )
-    metadata.add_metadata_arguments(parser)
-    options = common.parse_args(parser)
-    metadata.warnings_action = options.W
-
-    config = common.read_config()
-
-    apps = metadata.read_metadata()
-    app = None
-
-    tmp_importer_dir = None
-
-    local_metadata_files = common.get_local_metadata_files()
-    if local_metadata_files:
-        raise FDroidException(
-            _("This repo already has local metadata: %s") % local_metadata_files[0]
-        )
-
-    build = metadata.Build()
-    app = metadata.App()
-    if options.url is None and Path('.git').is_dir():
-        app.RepoType = 'git'
-        tmp_importer_dir = Path.cwd()
-        git_repo = git.Repo(tmp_importer_dir)
-        for remote in git.Remote.iter_items(git_repo):
-            if remote.name == 'origin':
-                url = git_repo.remotes.origin.url
-                app = get_app_from_url(url)
-                break
-        write_local_file = True
-    elif options.url:
-        app = get_app_from_url(options.url)
-        tmp_importer_dir = clone_to_tmp_dir(app, options.rev)
-        git_repo = git.Repo(tmp_importer_dir)
-
-        if not options.omit_disable:
-            build.disable = (
-                'Generated by `fdroid import` - check version fields and commitid'
-            )
-        write_local_file = False
-    else:
-        raise FDroidException("Specify project url.")
-
-    app.AutoUpdateMode = 'Version'
-    app.UpdateCheckMode = 'Tags'
-    build.commit = common.get_head_commit_id(tmp_importer_dir)
-
-    # Extract some information...
-    paths = get_all_gradle_and_manifests(tmp_importer_dir)
-    gradle_subdir = get_gradle_subdir(tmp_importer_dir, paths)
-    if paths:
-        versionName, versionCode, appid = common.parse_androidmanifests(paths, app)
-        if not appid:
-            raise FDroidException(_("Couldn't find Application ID"))
-        if not versionName:
-            logging.warning(_('Could not find latest versionName'))
-        if not versionCode:
-            logging.warning(_('Could not find latest versionCode'))
-    else:
-        raise FDroidException(_("No gradle project could be found. Specify --subdir?"))
-
-    # Make sure it's actually new...
-    if appid in apps:
-        raise FDroidException(_('Package "{appid}" already exists').format(appid=appid))
-
-    # Create a build line...
-    build.versionName = versionName or 'Unknown'
-    app.CurrentVersion = build.versionName
-    build.versionCode = versionCode or 0
-    app.CurrentVersionCode = build.versionCode
-    if options.subdir:
-        build.subdir = options.subdir
-    elif gradle_subdir:
-        build.subdir = gradle_subdir.as_posix()
-    # subdir might be None
-    subdir = Path(tmp_importer_dir / build.subdir) if build.subdir else tmp_importer_dir
-
-    if options.license:
-        app.License = options.license
-    if options.categories:
-        app.Categories = options.categories.split(',')
-    if (subdir / 'jni').exists():
-        build.buildjni = ['yes']
-    if (subdir / 'build.gradle').exists() or (subdir / 'build.gradle.kts').exists():
-        build.gradle = ['yes']
-
-    app.AutoName = common.fetch_real_name(subdir, build.gradle)
-
-    package_json = tmp_importer_dir / 'package.json'  # react-native
-    pubspec_yaml = tmp_importer_dir / 'pubspec.yaml'  # flutter
-    if package_json.exists():
-        build.sudo = [
-            'sysctl fs.inotify.max_user_watches=524288 || true',
-            'apt-get update',
-            'apt-get install -y npm',
-        ]
-        build.init = ['npm install --build-from-source']
-        with package_json.open() as fp:
-            data = json.load(fp)
-        app.AutoName = app.AutoName or data.get('name')
-        app.License = data.get('license', app.License)
-        app.Description = data.get('description', app.Description)
-        app.WebSite = data.get('homepage', app.WebSite)
-        app_json = tmp_importer_dir / 'app.json'
-        build.scanignore = ['android/build.gradle']
-        build.scandelete = ['node_modules']
-        if app_json.exists():
-            with app_json.open() as fp:
-                data = json.load(fp)
-            app.AutoName = app.AutoName or data.get('name')
-    if pubspec_yaml.exists():
-        with pubspec_yaml.open() as fp:
-            data = yaml.load(fp, Loader=SafeLoader)
-        app.AutoName = app.AutoName or data.get('name')
-        app.License = data.get('license', app.License)
-        app.Description = data.get('description', app.Description)
-        app.UpdateCheckData = 'pubspec.yaml|version:\\s.+\\+(\\d+)|.|version:\\s(.+)\\+'
-        build.srclibs = ['flutter@stable']
-        build.output = 'build/app/outputs/flutter-apk/app-release.apk'
-        build.subdir = None
-        build.gradle = None
-        build.prebuild = [
-            'export PUB_CACHE=$(pwd)/.pub-cache',
-            '$$flutter$$/bin/flutter config --no-analytics',
-            '$$flutter$$/bin/flutter packages pub get',
-        ]
-        build.scandelete = [
-            '.pub-cache',
-        ]
-        build.build = [
-            'export PUB_CACHE=$(pwd)/.pub-cache',
-            '$$flutter$$/bin/flutter build apk',
-        ]
-
-    git_modules = tmp_importer_dir / '.gitmodules'
-    if git_modules.exists():
-        build.submodules = True
-
-    metadata.post_parse_yaml_metadata(app)
-
-    app['Builds'].append(build)
-
-    if write_local_file:
-        metadata.write_metadata(Path('.fdroid.yml'), app)
-    else:
-        # Keep the repo directory to save bandwidth...
-        Path('build').mkdir(exist_ok=True)
-        build_dir = Path('build') / appid
-        if build_dir.exists():
-            logging.warning(
-                _('{path} already exists, ignoring import results!').format(
-                    path=build_dir
-                )
-            )
-            sys.exit(1)
-        elif tmp_importer_dir:
-            # For Windows: Close the repo or a git.exe instance holds handles to repo
-            try:
-                git_repo.close()
-            except AttributeError:  # Debian/stretch's version does not have close()
-                pass
-            shutil.move(tmp_importer_dir, build_dir)
-        Path('build/.fdroidvcs-' + appid).write_text(app.RepoType + ' ' + app.Repo)
-
-        metadatapath = Path('metadata') / (appid + '.yml')
-        metadata.write_metadata(metadatapath, app)
-        logging.info("Wrote " + str(metadatapath))
-
-
-if __name__ == "__main__":
-    main()
diff --git a/fdroidserver/index.py b/fdroidserver/index.py
index b63729e4..e707824d 100644
--- a/fdroidserver/index.py
+++ b/fdroidserver/index.py
@@ -20,81 +20,54 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-"""Process the index files.
-
-This module is loaded by all fdroid subcommands since it is loaded in
-fdroidserver/__init__.py.  Any narrowly used dependencies should be
-imported where they are used to limit dependencies for subcommands
-like publish/signindex/gpgsign.  This eliminates the need to have
-these installed on the signing server.
-
-"""
-
-import calendar
 import collections
-import hashlib
 import json
 import logging
 import os
 import re
 import shutil
-import sys
 import tempfile
 import urllib.parse
 import zipfile
+import calendar
 from binascii import hexlify, unhexlify
 from datetime import datetime, timezone
-from pathlib import Path
 from xml.dom.minidom import Document
 
-from fdroidserver._yaml import yaml
-from fdroidserver.common import (
-    ANTIFEATURES_CONFIG_NAME,
-    CATEGORIES_CONFIG_NAME,
-    CONFIG_CONFIG_NAME,
-    DEFAULT_LOCALE,
-    MIRRORS_CONFIG_NAME,
-    RELEASECHANNELS_CONFIG_NAME,
-    FDroidPopen,
-    FDroidPopenBytes,
-    load_publish_signer_fingerprints,
-)
+from . import _
+from . import common
+from . import metadata
+from . import net
+from . import signindex
+from fdroidserver.common import FDroidPopen, FDroidPopenBytes, load_stats_fdroid_signing_key_fingerprints
 from fdroidserver.exception import FDroidException, VerificationException
 
-from . import _, common, metadata, signindex
-
 
 def make(apps, apks, repodir, archive):
     """Generate the repo index files.
 
     This requires properly initialized options and config objects.
 
-    Parameters
-    ----------
-    apps
-      OrderedDict of apps to go into the index, each app should have
-      at least one associated apk
-    apks
-      list of apks to go into the index
-    repodir
-      the repo directory
-    archive
-      True if this is the archive repo, False if it's the
-      main one.
+    :param apps: OrderedDict of apps to go into the index, each app should have
+                 at least one associated apk
+    :param apks: list of apks to go into the index
+    :param repodir: the repo directory
+    :param archive: True if this is the archive repo, False if it's the
+                    main one.
     """
     from fdroidserver.update import METADATA_VERSION
 
-    if not hasattr(common.options, 'nosign') or not common.options.nosign:
+    if not common.options.nosign:
         common.assert_config_keystore(common.config)
 
     # Historically the index has been sorted by App Name, so we enforce this ordering here
-    sortedids = sorted(apps, key=lambda appid: common.get_app_display_name(apps[appid]).upper())
+    sortedids = sorted(apps, key=lambda appid: apps[appid]['Name'].upper())
     sortedapps = collections.OrderedDict()
     for appid in sortedids:
         sortedapps[appid] = apps[appid]
 
     repodict = collections.OrderedDict()
-    repodict['timestamp'] = datetime.now(timezone.utc)
+    repodict['timestamp'] = datetime.utcnow().replace(tzinfo=timezone.utc)
     repodict['version'] = METADATA_VERSION
 
     if common.config['repo_maxage'] != 0:
@@ -102,23 +75,36 @@ def make(apps, apks, repodir, archive):
 
     if archive:
         repodict['name'] = common.config['archive_name']
-        repodict['icon'] = common.config.get('archive_icon', common.default_config['repo_icon'])
+        repodict['icon'] = os.path.basename(common.config['archive_icon'])
+        repodict['address'] = common.config['archive_url']
         repodict['description'] = common.config['archive_description']
-        archive_url = common.config.get('archive_url', common.config['repo_url'][:-4] + 'archive')
-        repodict['address'] = archive_url
-        if 'archive_web_base_url' in common.config:
-            repodict["webBaseUrl"] = common.config['archive_web_base_url']
-        repo_section = os.path.basename(urllib.parse.urlparse(archive_url).path)
+        urlbasepath = os.path.basename(urllib.parse.urlparse(common.config['archive_url']).path)
     else:
         repodict['name'] = common.config['repo_name']
-        repodict['icon'] = common.config.get('repo_icon', common.default_config['repo_icon'])
+        repodict['icon'] = os.path.basename(common.config['repo_icon'])
         repodict['address'] = common.config['repo_url']
-        if 'repo_web_base_url' in common.config:
-            repodict["webBaseUrl"] = common.config['repo_web_base_url']
         repodict['description'] = common.config['repo_description']
-        repo_section = os.path.basename(urllib.parse.urlparse(common.config['repo_url']).path)
+        urlbasepath = os.path.basename(urllib.parse.urlparse(common.config['repo_url']).path)
 
-    add_mirrors_to_repodict(repo_section, repodict)
+    mirrorcheckfailed = False
+    mirrors = []
+    for mirror in common.config.get('mirrors', []):
+        base = os.path.basename(urllib.parse.urlparse(mirror).path.rstrip('/'))
+        if common.config.get('nonstandardwebroot') is not True and base != 'fdroid':
+            logging.error(_("mirror '%s' does not end with 'fdroid'!") % mirror)
+            mirrorcheckfailed = True
+        # must end with / or urljoin strips a whole path segment
+        if mirror.endswith('/'):
+            mirrors.append(urllib.parse.urljoin(mirror, urlbasepath))
+        else:
+            mirrors.append(urllib.parse.urljoin(mirror + '/', urlbasepath))
+    for mirror in common.config.get('servergitmirrors', []):
+        for url in get_mirror_service_urls(mirror):
+            mirrors.append(url + '/' + repodir)
+    if mirrorcheckfailed:
+        raise FDroidException(_("Malformed repository mirrors."))
+    if mirrors:
+        repodict['mirrors'] = mirrors
 
     requestsdict = collections.OrderedDict()
     for command in ('install', 'uninstall'):
@@ -133,599 +119,15 @@ def make(apps, apks, repodir, archive):
                 raise TypeError(_('only accepts strings, lists, and tuples'))
         requestsdict[command] = packageNames
 
-    signer_fingerprints = load_publish_signer_fingerprints()
+    fdroid_signing_key_fingerprints = load_stats_fdroid_signing_key_fingerprints()
 
-    make_v0(sortedapps, apks, repodir, repodict, requestsdict, signer_fingerprints)
-    make_v1(sortedapps, apks, repodir, repodict, requestsdict, signer_fingerprints)
-    make_v2(
-        sortedapps, apks, repodir, repodict, requestsdict, signer_fingerprints, archive
-    )
-    make_website(sortedapps, repodir, repodict)
-    make_altstore(
-        sortedapps,
-        apks,
-        common.config,
-        repodir,
-        pretty=common.options.pretty,
-    )
+    make_v0(sortedapps, apks, repodir, repodict, requestsdict,
+            fdroid_signing_key_fingerprints)
+    make_v1(sortedapps, apks, repodir, repodict, requestsdict,
+            fdroid_signing_key_fingerprints)
 
 
-def _should_file_be_generated(path, magic_string):
-    if os.path.exists(path):
-        with open(path) as f:
-            # if the magic_string is not in the first line the file should be overwritten
-            if magic_string not in f.readline():
-                return False
-    return True
-
-
-def make_website(apps, repodir, repodict):
-    # do not change this string, as it will break updates for files with older versions of this string
-    autogenerate_comment = "auto-generated - fdroid index updates will overwrite this file"
-
-    if not os.path.exists(repodir):
-        os.makedirs(repodir)
-
-    html_name = 'index.html'
-    html_file = os.path.join(repodir, html_name)
-
-    if _should_file_be_generated(html_file, autogenerate_comment):
-        import qrcode
-
-        _ignored, repo_pubkey_fingerprint = extract_pubkey()
-        repo_pubkey_fingerprint_stripped = repo_pubkey_fingerprint.replace(" ", "")
-        link = repodict["address"]
-        link_fingerprinted = '{link}?fingerprint={fingerprint}'.format(
-            link=link, fingerprint=repo_pubkey_fingerprint_stripped
-        )
-        qrcode.make(link_fingerprinted).save(os.path.join(repodir, "index.png"))
-        with open(html_file, 'w') as f:
-            name = repodict["name"]
-            description = repodict["description"]
-            icon = repodict["icon"]
-            f.write("""<!-- {autogenerate_comment} -->
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-  <head>
-    <meta content="text/html; charset=utf-8" http-equiv="Content-Type">
-    <meta content="width=device-width; initial-scale=1.0; minimum-scale=0.5; maximum-scale=2.0; user-scalable=1;" name="viewport">
-    <title>
-   {name}
-    </title>
-    <base href="index.html">
-    <link href="index.css" rel="stylesheet" type="text/css">
-    <link href="icons/{icon}" rel="icon" type="image/png">
-    <link href="icons/{icon}" rel="shortcut icon" type="image/png">
-    <meta content="{name}" property="og:site_name">
-    <meta content="{name}" property="og:title">
-    <meta content property="og:determiner">
-    <meta content="{description}" property="og:description">
-    <meta content="index,nofollow" name="robots">
-  </head>
-  <body>
-    <h2>
-      {name}
-    </h2>
-    <div id="intro">
-      <p style="margin-bottom:.2em;">
-        <span style="float:right;width:100px;margin-left:.5em;">
-          <a href="index.png" title="QR: test">
-            <img alt="QR: test" src="index.png" width="100">
-          </a>
-        </span>
-        {description}
-        <br>
-        <br>
-        Currently it serves
-        <kbd>
-          {number_of_apps}
-        </kbd>
-        apps. To add it to your F-Droid app, scan the QR code (click it to enlarge) or use this link:
-      </p>
-      <p class="center" style="margin-top:.5em">
-        <a href="https://fdroid.link/#{link_fingerprinted}">
-          <code style="color:#000000;font-weight:bold;">
-            {link}
-          </code>
-        </a>
-      </p>
-      <p>
-        If you would like to manually verify the fingerprint (SHA-256) of the repository signing key, here it is:
-        <br>
-        <blockcode style="color:#000000;font-weight:bold;">
-          {fingerprint}
-        </blockcode>
-      </p>
-    </div>
-  </body>
-</html>
-""".format(autogenerate_comment=autogenerate_comment,
-                    description=description,
-                    fingerprint=repo_pubkey_fingerprint,
-                    icon=icon,
-                    link=link,
-                    link_fingerprinted=link_fingerprinted,
-                    name=name,
-                    number_of_apps=str(len(apps))))
-
-    css_file = os.path.join(repodir, "index.css")
-    if _should_file_be_generated(css_file, autogenerate_comment):
-        with open(css_file, "w") as f:
-            # this auto generated comment was not included via .format(), as python seems to have problems with css files in combination with .format()
-            f.write("""/* auto-generated - fdroid index updates will overwrite this file */
-BODY {
-  font-family         : Arial, Helvetica, Sans-Serif;
-  color               : #0000ee;
-  background-color    : #ffffff;
-}
-p {
-  text-align          : justify;
-}
-p.center {
-  text-align          : center;
-}
-TD {
-  font-family         : Arial, Helvetica, Sans-Serif;
-  color               : #0000ee;
-}
-body,td {
-  font-size           : 14px;
-}
-TH {
-  font-family         : Arial, Helvetica, Sans-Serif;
-  color               : #0000ee;
-  background-color    : #F5EAD4;
-}
-a:link {
-  color               : #bb0000;
-}
-a:visited {
-  color               : #ff0000;
-}
-.zitat {
-  margin-left         : 1cm;
-  margin-right        : 1cm;
-  font-style          : italic;
-}
-#intro {
-  border-spacing      : 1em;
-  border              : 1px solid gray;
-  border-radius       : 0.5em;
-  box-shadow          : 10px 10px 5px #888;
-  margin              : 1.5em;
-  font-size           : .9em;
-  width               : 600px;
-  max-width           : 90%;
-  display             : table;
-  margin-left         : auto;
-  margin-right        : auto;
-  font-size           : .8em;
-  color               : #555555;
-}
-#intro > p {
-  margin-top          : 0;
-}
-#intro p:last-child {
-  margin-bottom       : 0;
-}
-.last {
-  border-bottom       : 1px solid black;
-  padding-bottom      : .5em;
-  text-align          : center;
-}
-table {
-  border-collapse     : collapse;
-}
-h2 {
-  text-align          : center;
-}
-.perms {
-  font-family         : monospace;
-  font-size           : .8em;
-}
-.repoapplist {
-  display             : table;
-  border-collapse     : collapse;
-  margin-left         : auto;
-  margin-right        : auto;
-  width               : 600px;
-  max-width           : 90%;
-}
-.approw, appdetailrow {
-  display             : table-row;
-}
-.appdetailrow {
-  display             : flex;
-  padding             : .5em;
-}
-.appiconbig, .appdetailblock, .appdetailcell {
-  display             : table-cell
-}
-.appiconbig {
-  vertical-align      : middle;
-  text-align          : center;
-}
-.appdetailinner {
-  width               : 100%;
-}
-.applinkcell {
-  text-align          : center;
-  float               : right;
-  width               : 100%;
-  margin-bottom       : .1em;
-}
-.paddedlink {
-  margin              : 1em;
-}
-.approw {
-  border-spacing      : 1em;
-  border              : 1px solid gray;
-  border-radius       : 0.5em;
-  padding             : 0.5em;
-  margin              : 1.5em;
-}
-.appdetailinner .appdetailrow:first-child {
-  background-color    : #d5d5d5;
-}
-.appdetailinner .appdetailrow:first-child .appdetailcell {
-  min-width           : 33%;
-  flex                : 1 33%;
-  text-align          : center;
-}
-.appdetailinner .appdetailrow:first-child .appdetailcell:first-child {
-  text-align          : left;
-}
-.appdetailinner .appdetailrow:first-child .appdetailcell:last-child {
-  float               : none;
-  text-align          : right;
-}
-.minor-details {
-  font-size           : .8em;
-  color               : #555555;
-}
-.boldname {
-  font-weight         : bold;
-}
-#appcount {
-  text-align          : center;
-  margin-bottom       : .5em;
-}
-kbd {
-  padding             : 0.1em 0.6em;
-  border              : 1px solid #CCC;
-  background-color    : #F7F7F7;
-  color               : #333;
-  box-shadow          : 0px 1px 0px rgba(0, 0, 0, 0.2), 0px 0px 0px 2px #FFF inset;
-  border-radius       : 3px;
-  display             : inline-block;
-  margin              : 0px 0.1em;
-  text-shadow         : 0px 1px 0px #FFF;
-  white-space         : nowrap;
-}
-div.filterline, div.repoline {
-  display             : table;
-  margin-left         : auto;
-  margin-right        : auto;
-  margin-bottom       : 1em;
-  vertical-align      : middle;
-  display             : table;
-  font-size           : .8em;
-}
-.filterline form {
-  display             : table-row;
-}
-.filterline .filtercell {
-  display             : table-cell;
-  vertical-align      : middle;
-}
-fieldset {
-  float               : left;
-}
-fieldset select, fieldset input, #reposelect select, #reposelect input {
-  font-size           : .9em;
-}
-.pager {
-  display             : table;
-  margin-left         : auto;
-  margin-right        : auto;
-  width               : 600px;
-  max-width           : 90%;
-  padding-top         : .6em;
-}
-/* should correspond to .repoapplist */
-.pagerrow {
-  display             : table-row;
-}
-.pagercell {
-  display             : table-cell;
-}
-.pagercell.left {
-  text-align          : left;
-  padding-right       : 1em;
-}
-.pagercell.middle {
-  text-align          : center;
-  font-size           : .9em;
-  color               : #555;
-}
-.pagercell.right {
-  text-align          : right;
-  padding-left        : 1em;
-}
-.anti {
-  color               : peru;
-}
-.antibold {
-  color               : crimson;
-}
-#footer {
-  text-align          : center;
-  margin-top          : 1em;
-  font-size           : 11px;
-  color               : #555;
-}
-#footer img {
-  vertical-align      : middle;
-}
-@media (max-width: 600px) {
-  .repoapplist {
-    display             : block;
-  }
-  .appdetailinner, .appdetailrow {
-    display             : block;
-  }
-  .appdetailcell {
-    display             : block;
-    float               : left;
-    line-height         : 1.5em;
-  }
-}""")
-
-
-def dict_diff(source, target):
-    if not isinstance(target, dict) or not isinstance(source, dict):
-        return target
-
-    result = {key: None for key in source if key not in target}
-
-    for key, value in target.items():
-        if key not in source:
-            result[key] = value
-        elif value != source[key]:
-            result[key] = dict_diff(source[key], value)
-
-    return result
-
-
-def convert_datetime(obj):
-    if isinstance(obj, datetime):
-        # Java prefers milliseconds
-        # we also need to account for time zone/daylight saving time
-        return int(calendar.timegm(obj.timetuple()) * 1000)
-    return obj
-
-
-def package_metadata(app, repodir):
-    meta = {}
-    for element in (
-        "added",
-        # "binaries",
-        "Categories",
-        "Changelog",
-        "IssueTracker",
-        "lastUpdated",
-        "License",
-        "SourceCode",
-        "Translation",
-        "WebSite",
-        "featureGraphic",
-        "promoGraphic",
-        "tvBanner",
-        "screenshots",
-        "AuthorEmail",
-        "AuthorName",
-        "AuthorPhone",
-        "AuthorWebSite",
-        "Bitcoin",
-        "Liberapay",
-        "Litecoin",
-        "OpenCollective",
-    ):
-        if element in app and app[element]:
-            element_new = element[:1].lower() + element[1:]
-            meta[element_new] = convert_datetime(app[element])
-
-    for element in (
-        "Name",
-        "Summary",
-        "Description",
-        "video",
-    ):
-        element_new = element[:1].lower() + element[1:]
-        if element in app and app[element]:
-            meta[element_new] = {DEFAULT_LOCALE: convert_datetime(app[element])}
-        elif "localized" in app:
-            localized = {k: v[element_new] for k, v in app["localized"].items() if element_new in v}
-            if localized:
-                meta[element_new] = localized
-
-    if "name" not in meta and app["AutoName"]:
-        meta["name"] = {DEFAULT_LOCALE: app["AutoName"]}
-
-    # fdroidserver/metadata.py App default
-    if meta["license"] == "Unknown":
-        del meta["license"]
-
-    if app["Donate"]:
-        meta["donate"] = [app["Donate"]]
-
-    # TODO handle different resolutions
-    if app.get("icon"):
-        icon_path = os.path.join(repodir, "icons", app["icon"])
-        meta["icon"] = {DEFAULT_LOCALE: common.file_entry(icon_path)}
-
-    if "iconv2" in app:
-        meta["icon"] = app["iconv2"]
-
-    return meta
-
-
-def convert_version(version, app, repodir):
-    """Convert the internal representation of Builds: into index-v2 versions.
-
-    The diff algorithm of index-v2 uses null/None to mean a field to
-    be removed, so this function handles any Nones that are in the
-    metadata file.
-
-    """
-    ver = {}
-    if "added" in version:
-        ver["added"] = convert_datetime(version["added"])
-    else:
-        ver["added"] = 0
-
-    ver["file"] = {
-        "name": "/{}".format(version["apkName"]),
-        version["hashType"]: version["hash"],
-        "size": version["size"],
-    }
-
-    ipfsCIDv1 = version.get("ipfsCIDv1")
-    if ipfsCIDv1:
-        ver["file"]["ipfsCIDv1"] = ipfsCIDv1
-
-    if "srcname" in version:
-        ver["src"] = common.file_entry(
-            os.path.join(repodir, version["srcname"]),
-            version["srcnameSha256"],
-        )
-
-    if "obbMainFile" in version:
-        ver["obbMainFile"] = common.file_entry(
-            os.path.join(repodir, version["obbMainFile"]),
-            version["obbMainFileSha256"],
-        )
-
-    if "obbPatchFile" in version:
-        ver["obbPatchFile"] = common.file_entry(
-            os.path.join(repodir, version["obbPatchFile"]),
-            version["obbPatchFileSha256"],
-        )
-
-    ver["manifest"] = manifest = {}
-
-    for element in (
-        "nativecode",
-        "versionName",
-        "maxSdkVersion",
-    ):
-        if element in version:
-            manifest[element] = version[element]
-
-    if "versionCode" in version:
-        manifest["versionCode"] = version["versionCode"]
-
-    if "features" in version and version["features"]:
-        manifest["features"] = features = []
-        for feature in version["features"]:
-            # TODO get version from manifest, default (0) is omitted
-            # features.append({"name": feature, "version": 1})
-            features.append({"name": feature})
-
-    if "minSdkVersion" in version:
-        manifest["usesSdk"] = {}
-        manifest["usesSdk"]["minSdkVersion"] = version["minSdkVersion"]
-        if "targetSdkVersion" in version:
-            manifest["usesSdk"]["targetSdkVersion"] = version["targetSdkVersion"]
-        else:
-            # https://developer.android.com/guide/topics/manifest/uses-sdk-element.html#target
-            manifest["usesSdk"]["targetSdkVersion"] = manifest["usesSdk"]["minSdkVersion"]
-
-    if "signer" in version:
-        manifest["signer"] = {"sha256": [version["signer"]]}
-
-    for element in ("uses-permission", "uses-permission-sdk-23"):
-        en = element.replace("uses-permission", "usesPermission").replace("-sdk-23", "Sdk23")
-        if element in version and version[element]:
-            manifest[en] = []
-            for perm in version[element]:
-                if perm[1]:
-                    manifest[en].append({"name": perm[0], "maxSdkVersion": perm[1]})
-                else:
-                    manifest[en].append({"name": perm[0]})
-
-    # index-v2 has only per-version antifeatures, not per package.
-    antiFeatures = app.get('AntiFeatures', {}).copy()
-    for name, descdict in version.get('antiFeatures', dict()).items():
-        antiFeatures[name] = descdict
-    if antiFeatures:
-        ver['antiFeatures'] = {
-            k: dict(sorted(antiFeatures[k].items())) for k in sorted(antiFeatures)
-        }
-
-    if "versionCode" in version:
-        if version["versionCode"] > app["CurrentVersionCode"]:
-            ver[RELEASECHANNELS_CONFIG_NAME] = ["Beta"]
-
-    builds = app.get("Builds", [])
-
-    if len(builds) > 0 and version["versionCode"] == builds[-1]["versionCode"]:
-        if "localized" in app:
-            localized = {k: v["whatsNew"] for k, v in app["localized"].items() if "whatsNew" in v}
-            if localized:
-                ver["whatsNew"] = localized
-
-    for build in builds:
-        if build['versionCode'] == version['versionCode'] and "whatsNew" in build:
-            ver["whatsNew"] = build["whatsNew"]
-            break
-
-    return ver
-
-
-def v2_repo(repodict, repodir, archive):
-    repo = {}
-
-    repo["name"] = {DEFAULT_LOCALE: repodict["name"]}
-    repo["description"] = {DEFAULT_LOCALE: repodict["description"]}
-    repo["icon"] = {
-        DEFAULT_LOCALE: common.file_entry("%s/icons/%s" % (repodir, repodict["icon"]))
-    }
-
-    config = common.load_localized_config(CONFIG_CONFIG_NAME, repodir)
-    if config:
-        localized_config = config["archive" if archive else "repo"]
-        if "name" in localized_config:
-            repo["name"] = localized_config["name"]
-        if "description" in localized_config:
-            repo["description"] = localized_config["description"]
-        if "icon" in localized_config:
-            repo["icon"] = localized_config["icon"]
-
-    repo["address"] = repodict["address"]
-    if "mirrors" in repodict:
-        repo["mirrors"] = repodict["mirrors"]
-    if "webBaseUrl" in repodict:
-        repo["webBaseUrl"] = repodict["webBaseUrl"]
-
-    repo["timestamp"] = repodict["timestamp"]
-
-    antiFeatures = common.load_localized_config(ANTIFEATURES_CONFIG_NAME, repodir)
-    if antiFeatures:
-        repo[ANTIFEATURES_CONFIG_NAME] = antiFeatures
-
-    categories = common.load_localized_config(CATEGORIES_CONFIG_NAME, repodir)
-    if categories:
-        repo[CATEGORIES_CONFIG_NAME] = categories
-
-    releaseChannels = common.load_localized_config(RELEASECHANNELS_CONFIG_NAME, repodir)
-    if releaseChannels:
-        repo[RELEASECHANNELS_CONFIG_NAME] = releaseChannels
-
-    return repo
-
-
-def make_v2(apps, packages, repodir, repodict, requestsdict, signer_fingerprints, archive):
+def make_v1(apps, packages, repodir, repodict, requestsdict, fdroid_signing_key_fingerprints):
 
     def _index_encoder_default(obj):
         if isinstance(obj, set):
@@ -742,176 +144,25 @@ def make_v2(apps, packages, repodir, repodict, requestsdict, signer_fingerprints
         raise TypeError(repr(obj) + " is not JSON serializable")
 
     output = collections.OrderedDict()
-    output["repo"] = v2_repo(repodict, repodir, archive)
-    if requestsdict and (requestsdict["install"] or requestsdict["uninstall"]):
-        output["repo"]["requests"] = requestsdict
-
-    # establish sort order of the index
-    sort_package_versions(packages, signer_fingerprints)
-
-    output_packages = collections.OrderedDict()
-    output['packages'] = output_packages
-    categories_used_by_apps = set()
-    for package in packages:
-        packageName = package['packageName']
-        if packageName not in apps:
-            logging.info(_('Ignoring package without metadata: ') + package['apkName'])
-            continue
-        if not package.get('versionName'):
-            app = apps[packageName]
-            for build in app.get('Builds', []):
-                if build['versionCode'] == package['versionCode']:
-                    versionName = build.get('versionName')
-                    logging.info(_('Overriding blank versionName in {apkfilename} from metadata: {version}')
-                                 .format(apkfilename=package['apkName'], version=versionName))
-                    package['versionName'] = versionName
-                    break
-        if packageName in output_packages:
-            packagelist = output_packages[packageName]
-        else:
-            packagelist = {}
-            output_packages[packageName] = packagelist
-            app = apps[packageName]
-            categories_used_by_apps.update(app.get('Categories', []))
-            packagelist["metadata"] = package_metadata(app, repodir)
-            if "signer" in package:
-                packagelist["metadata"]["preferredSigner"] = package["signer"]
-
-            packagelist["versions"] = {}
-
-        packagelist["versions"][package["hash"]] = convert_version(package, apps[packageName], repodir)
-
-    if categories_used_by_apps and not output['repo'].get(CATEGORIES_CONFIG_NAME):
-        output['repo'][CATEGORIES_CONFIG_NAME] = dict()
-    # include definitions for "auto-defined" categories, e.g. just used in app metadata
-    for category in sorted(categories_used_by_apps):
-        if category not in output['repo'][CATEGORIES_CONFIG_NAME]:
-            output['repo'][CATEGORIES_CONFIG_NAME][category] = dict()
-        if 'name' not in output['repo'][CATEGORIES_CONFIG_NAME][category]:
-            output['repo'][CATEGORIES_CONFIG_NAME][category]['name'] = {DEFAULT_LOCALE: category}
-    # do not include defined categories if no apps use them
-    for category in list(output['repo'].get(CATEGORIES_CONFIG_NAME, list())):
-        if category not in categories_used_by_apps:
-            del output['repo'][CATEGORIES_CONFIG_NAME][category]
-            msg = _('Category "{category}" defined but not used for any apps!')
-            logging.warning(msg.format(category=category))
-
-    entry = {}
-    entry["timestamp"] = repodict["timestamp"]
-
-    entry["version"] = repodict["version"]
-    if "maxage" in repodict:
-        entry["maxAge"] = repodict["maxage"]
-
-    json_name = 'index-v2.json'
-    index_file = os.path.join(repodir, json_name)
-    with open(index_file, "w", encoding="utf-8") as fp:
-        if common.options.pretty:
-            json.dump(output, fp, default=_index_encoder_default, indent=2, ensure_ascii=False)
-        else:
-            json.dump(output, fp, default=_index_encoder_default, ensure_ascii=False)
-
-    json_name = "tmp/{}_{}.json".format(repodir, convert_datetime(repodict["timestamp"]))
-    with open(json_name, "w", encoding="utf-8") as fp:
-        if common.options.pretty:
-            json.dump(output, fp, default=_index_encoder_default, indent=2, ensure_ascii=False)
-        else:
-            json.dump(output, fp, default=_index_encoder_default, ensure_ascii=False)
-
-    entry["index"] = common.file_entry(index_file)
-    entry["index"]["numPackages"] = len(output.get("packages", []))
-
-    indexes = sorted(Path().glob("tmp/{}*.json".format(repodir)), key=lambda x: x.name)
-    indexes.pop()  # remove current index
-    # remove older indexes
-    while len(indexes) > 10:
-        indexes.pop(0).unlink()
-
-    indexes = [json.loads(Path(fn).read_text(encoding="utf-8")) for fn in indexes]
-
-    for diff in Path().glob("{}/diff/*.json".format(repodir)):
-        diff.unlink()
-
-    entry["diffs"] = {}
-    for old in indexes:
-        diff_name = str(old["repo"]["timestamp"]) + ".json"
-        diff_file = os.path.join(repodir, "diff", diff_name)
-        diff = dict_diff(old, output)
-        if not os.path.exists(os.path.join(repodir, "diff")):
-            os.makedirs(os.path.join(repodir, "diff"))
-        with open(diff_file, "w", encoding="utf-8") as fp:
-            if common.options.pretty:
-                json.dump(diff, fp, default=_index_encoder_default, indent=2, ensure_ascii=False)
-            else:
-                json.dump(diff, fp, default=_index_encoder_default, ensure_ascii=False)
-
-        entry["diffs"][old["repo"]["timestamp"]] = common.file_entry(diff_file)
-        entry["diffs"][old["repo"]["timestamp"]]["numPackages"] = len(diff.get("packages", []))
-
-    json_name = "entry.json"
-    index_file = os.path.join(repodir, json_name)
-    with open(index_file, "w", encoding="utf-8") as fp:
-        if common.options.pretty:
-            json.dump(entry, fp, default=_index_encoder_default, indent=2, ensure_ascii=False)
-        else:
-            json.dump(entry, fp, default=_index_encoder_default, ensure_ascii=False)
-
-    if common.options.nosign:
-        _copy_to_local_copy_dir(repodir, index_file)
-        logging.debug(_('index-v2 must have a signature, use `fdroid signindex` to create it!'))
-    else:
-        signindex.config = common.config
-        signindex.sign_index(repodir, json_name)
-
-
-def make_v1(apps, packages, repodir, repodict, requestsdict, signer_fingerprints):
-
-    def _index_encoder_default(obj):
-        if isinstance(obj, set):
-            return sorted(list(obj))
-        if isinstance(obj, datetime):
-            # Java prefers milliseconds
-            # we also need to account for time zone/daylight saving time
-            return int(calendar.timegm(obj.timetuple()) * 1000)
-        if isinstance(obj, dict):
-            d = collections.OrderedDict()
-            for key in sorted(obj.keys()):
-                d[key] = obj[key]
-            return d
-        raise TypeError(repr(obj) + " is not JSON serializable")
-
-    output = collections.OrderedDict()
-    output['repo'] = repodict.copy()
+    output['repo'] = repodict
     output['requests'] = requestsdict
 
-    # index-v1 only supports a list of URL strings for additional mirrors
-    mirrors = []
-    for mirror in repodict.get('mirrors', []):
-        url = mirror['url']
-        if url != repodict['address']:
-            mirrors.append(mirror['url'])
-    if mirrors:
-        output['repo']['mirrors'] = mirrors
-
     # establish sort order of the index
-    sort_package_versions(packages, signer_fingerprints)
+    v1_sort_packages(packages, fdroid_signing_key_fingerprints)
 
     appslist = []
     output['apps'] = appslist
-    for packageName, app_dict in apps.items():
+    for packageName, appdict in apps.items():
         d = collections.OrderedDict()
         appslist.append(d)
-        for k, v in sorted(app_dict.items()):
+        for k, v in sorted(appdict.items()):
             if not v:
                 continue
-            if k in ('Builds', 'metadatapath',
-                     'ArchivePolicy', 'AutoName', 'AutoUpdateMode', 'MaintainerNotes',
+            if k in ('builds', 'comments', 'metadatapath',
+                     'ArchivePolicy', 'AutoUpdateMode', 'MaintainerNotes',
                      'Provides', 'Repo', 'RepoType', 'RequiresRoot',
                      'UpdateCheckData', 'UpdateCheckIgnore', 'UpdateCheckMode',
-                     'UpdateCheckName', 'NoSourceSince', 'VercodeOperation',
-                     'summary', 'description', 'promoGraphic', 'screenshots', 'whatsNew',
-                     'featureGraphic', 'iconv2', 'tvBanner',
-                     ):
+                     'UpdateCheckName', 'NoSourceSince', 'VercodeOperation'):
                 continue
 
             # name things after the App class fields in fdroidclient
@@ -919,27 +170,26 @@ def make_v1(apps, packages, repodir, repodict, requestsdict, signer_fingerprints
                 k = 'packageName'
             elif k == 'CurrentVersionCode':  # TODO make SuggestedVersionCode the canonical name
                 k = 'suggestedVersionCode'
-                v = str(v)
             elif k == 'CurrentVersion':  # TODO make SuggestedVersionName the canonical name
                 k = 'suggestedVersionName'
+            elif k == 'AutoName':
+                if 'Name' not in apps[packageName]:
+                    d['name'] = v
+                continue
             else:
                 k = k[:1].lower() + k[1:]
             d[k] = v
 
-    # establish sort order in lists, sets, and localized dicts
-    for app_dict in output['apps']:
-        localized = app_dict.get('localized')
+    # establish sort order in localized dicts
+    for app in output['apps']:
+        localized = app.get('localized')
         if localized:
             lordered = collections.OrderedDict()
             for lkey, lvalue in sorted(localized.items()):
                 lordered[lkey] = collections.OrderedDict()
                 for ikey, iname in sorted(lvalue.items()):
                     lordered[lkey][ikey] = iname
-            app_dict['localized'] = lordered
-        # v1 uses a list of keys for Anti-Features
-        antiFeatures = app_dict.get('antiFeatures', dict()).keys()
-        if antiFeatures:
-            app_dict['antiFeatures'] = sorted(set(antiFeatures))
+            app['localized'] = lordered
 
     output_packages = collections.OrderedDict()
     output['packages'] = output_packages
@@ -950,8 +200,9 @@ def make_v1(apps, packages, repodir, repodict, requestsdict, signer_fingerprints
             continue
         if not package.get('versionName'):
             app = apps[packageName]
-            for build in app.get('Builds', []):
-                if build['versionCode'] == package['versionCode']:
+            versionCodeStr = str(package['versionCode'])  # TODO build.versionCode should be int!
+            for build in app['builds']:
+                if build['versionCode'] == versionCodeStr:
                     versionName = build.get('versionName')
                     logging.info(_('Overriding blank versionName in {apkfilename} from metadata: {version}')
                                  .format(apkfilename=package['apkName'], version=versionName))
@@ -967,10 +218,7 @@ def make_v1(apps, packages, repodir, repodict, requestsdict, signer_fingerprints
         for k, v in sorted(package.items()):
             if not v:
                 continue
-            if k in ('icon', 'icons', 'icons_src', 'ipfsCIDv1', 'name', 'srcnameSha256'):
-                continue
-            if k == 'antiFeatures':
-                d[k] = sorted(v.keys())
+            if k in ('icon', 'icons', 'icons_src', 'name', ):
                 continue
             d[k] = v
 
@@ -983,37 +231,21 @@ def make_v1(apps, packages, repodir, repodict, requestsdict, signer_fingerprints
             json.dump(output, fp, default=_index_encoder_default)
 
     if common.options.nosign:
-        _copy_to_local_copy_dir(repodir, index_file)
         logging.debug(_('index-v1 must have a signature, use `fdroid signindex` to create it!'))
     else:
         signindex.config = common.config
-        signindex.sign_index(repodir, json_name)
+        signindex.sign_index_v1(repodir, json_name)
 
 
-def _copy_to_local_copy_dir(repodir, f):
-    local_copy_dir = common.config.get('local_copy_dir', '')
-    if os.path.exists(local_copy_dir):
-        destdir = os.path.join(local_copy_dir, repodir)
-        if not os.path.exists(destdir):
-            os.mkdir(destdir)
-        shutil.copy2(f, destdir, follow_symlinks=False)
-    elif local_copy_dir:
-        raise FDroidException(_('"local_copy_dir" {path} does not exist!')
-                              .format(path=local_copy_dir))
-
-
-def sort_package_versions(packages, signer_fingerprints):
-    """Sort to ensure a deterministic order for package versions in the index file.
-
-    This sort-order also expresses
+def v1_sort_packages(packages, fdroid_signing_key_fingerprints):
+    """Sorts the supplied list to ensure a deterministic sort order for
+    package entries in the index file. This sort-order also expresses
     installation preference to the clients.
     (First in this list = first to install)
 
-    Parameters
-    ----------
-    packages
-      list of packages which need to be sorted before but into index file.
+    :param packages: list of packages which need to be sorted before but into index file.
     """
+
     GROUP_DEV_SIGNED = 1
     GROUP_FDROID_SIGNED = 2
     GROUP_OTHER_SIGNED = 3
@@ -1021,28 +253,31 @@ def sort_package_versions(packages, signer_fingerprints):
     def v1_sort_keys(package):
         packageName = package.get('packageName', None)
 
-        signer = package.get('signer', None)
+        sig = package.get('signer', None)
 
-        dev_signer = common.metadata_find_developer_signature(packageName)
+        dev_sig = common.metadata_find_developer_signature(packageName)
         group = GROUP_OTHER_SIGNED
-        if dev_signer and dev_signer == signer:
+        if dev_sig and dev_sig == sig:
             group = GROUP_DEV_SIGNED
         else:
-            fdroid_signer = signer_fingerprints.get(packageName, {}).get('signer')
-            if fdroid_signer and fdroid_signer == signer:
+            fdroidsig = fdroid_signing_key_fingerprints.get(packageName, {}).get('signer')
+            if fdroidsig and fdroidsig == sig:
                 group = GROUP_FDROID_SIGNED
 
         versionCode = None
         if package.get('versionCode', None):
-            versionCode = -package['versionCode']
+            versionCode = -int(package['versionCode'])
 
-        return packageName, group, signer, versionCode
+        return(packageName, group, sig, versionCode)
 
     packages.sort(key=v1_sort_keys)
 
 
-def make_v0(apps, apks, repodir, repodict, requestsdict, signer_fingerprints):
-    """Aka index.jar aka index.xml."""
+def make_v0(apps, apks, repodir, repodict, requestsdict, fdroid_signing_key_fingerprints):
+    """
+    aka index.jar aka index.xml
+    """
+
     doc = Document()
 
     def addElement(name, value, doc, parent):
@@ -1062,7 +297,7 @@ def make_v0(apps, apks, repodir, repodict, requestsdict, signer_fingerprints):
         addElement(name, value, doc, parent)
 
     def addElementCheckLocalized(name, app, key, doc, parent, default=''):
-        """Fill in field from metadata or localized block.
+        """Fill in field from metadata or localized block
 
         For name/summary/description, they can come only from the app source,
         or from a dir in fdroiddata.  They can be entirely missing from the
@@ -1073,12 +308,13 @@ def make_v0(apps, apks, repodir, repodict, requestsdict, signer_fingerprints):
         alpha- sort order.
 
         """
+
         el = doc.createElement(name)
         value = app.get(key)
         lkey = key[:1].lower() + key[1:]
         localized = app.get('localized')
         if not value and localized:
-            for lang in [DEFAULT_LOCALE] + [x for x in localized.keys()]:
+            for lang in ['en-US'] + [x for x in localized.keys()]:
                 if not lang.startswith('en'):
                     continue
                 if lang in localized:
@@ -1090,8 +326,6 @@ def make_v0(apps, apks, repodir, repodict, requestsdict, signer_fingerprints):
             value = localized[lang].get(lkey)
         if not value:
             value = default
-        if not value and name == 'name' and app.get('AutoName'):
-            value = app['AutoName']
         el.appendChild(doc.createTextNode(value))
         parent.appendChild(el)
 
@@ -1099,7 +333,7 @@ def make_v0(apps, apks, repodir, repodict, requestsdict, signer_fingerprints):
     doc.appendChild(root)
 
     repoel = doc.createElement("repo")
-    repoel.setAttribute("icon", repodict['icon'])
+    repoel.setAttribute("icon", os.path.basename(repodict['icon']))
     if 'maxage' in repodict:
         repoel.setAttribute("maxage", str(repodict['maxage']))
     repoel.setAttribute("name", repodict['name'])
@@ -1110,11 +344,8 @@ def make_v0(apps, apks, repodir, repodict, requestsdict, signer_fingerprints):
     repoel.setAttribute("version", str(repodict['version']))
 
     addElement('description', repodict['description'], doc, repoel)
-    # index v0 only supports a list of URL strings for additional mirrors
     for mirror in repodict.get('mirrors', []):
-        url = mirror['url']
-        if url != repodict['address']:
-            addElement('mirror', url, doc, repoel)
+        addElement('mirror', mirror, doc, repoel)
 
     root.appendChild(repoel)
 
@@ -1124,27 +355,24 @@ def make_v0(apps, apks, repodir, repodict, requestsdict, signer_fingerprints):
             root.appendChild(element)
             element.setAttribute('packageName', packageName)
 
-    for appid, app_dict in apps.items():
-        app = metadata.App(app_dict)
+    for appid, appdict in apps.items():
+        app = metadata.App(appdict)
 
-        if app.get('Disabled') is not None:
+        if app.Disabled is not None:
             continue
 
         # Get a list of the apks for this app...
         apklist = []
-        name_from_apk = None
         apksbyversion = collections.defaultdict(lambda: [])
         for apk in apks:
             if apk.get('versionCode') and apk.get('packageName') == appid:
                 apksbyversion[apk['versionCode']].append(apk)
-                if name_from_apk is None:
-                    name_from_apk = apk.get('name')
         for versionCode, apksforver in apksbyversion.items():
-            fdroid_signer = signer_fingerprints.get(appid, {}).get('signer')
+            fdroidsig = fdroid_signing_key_fingerprints.get(appid, {}).get('signer')
             fdroid_signed_apk = None
             name_match_apk = None
             for x in apksforver:
-                if fdroid_signer and x.get('signer', None) == fdroid_signer:
+                if fdroidsig and x.get('signer', None) == fdroidsig:
                     fdroid_signed_apk = x
                 if common.apk_release_filename.match(x.get('apkName', '')):
                     name_match_apk = x
@@ -1170,7 +398,7 @@ def make_v0(apps, apks, repodir, repodict, requestsdict, signer_fingerprints):
         if app.lastUpdated:
             addElement('lastupdated', app.lastUpdated.strftime('%Y-%m-%d'), doc, apel)
 
-        addElementCheckLocalized('name', app, 'Name', doc, apel, name_from_apk)
+        addElementCheckLocalized('name', app, 'Name', doc, apel)
         addElementCheckLocalized('summary', app, 'Summary', doc, apel)
 
         if app.icon:
@@ -1195,13 +423,15 @@ def make_v0(apps, apks, repodir, repodict, requestsdict, signer_fingerprints):
         addElementNonEmpty('donate', app.Donate, doc, apel)
         addElementNonEmpty('bitcoin', app.Bitcoin, doc, apel)
         addElementNonEmpty('litecoin', app.Litecoin, doc, apel)
+        addElementNonEmpty('flattr', app.FlattrID, doc, apel)
+        addElementNonEmpty('liberapay', app.LiberapayID, doc, apel)
         addElementNonEmpty('openCollective', app.OpenCollective, doc, apel)
 
         # These elements actually refer to the current version (i.e. which
         # one is recommended. They are historically mis-named, and need
         # changing, but stay like this for now to support existing clients.
         addElement('marketversion', app.CurrentVersion, doc, apel)
-        addElement('marketvercode', str(app.CurrentVersionCode), doc, apel)
+        addElement('marketvercode', app.CurrentVersionCode, doc, apel)
 
         if app.Provides:
             pv = app.Provides.split(',')
@@ -1209,16 +439,14 @@ def make_v0(apps, apks, repodir, repodict, requestsdict, signer_fingerprints):
         if app.RequiresRoot:
             addElement('requirements', 'root', doc, apel)
 
-        # Sort the APK list into version order, just so the web site
+        # Sort the apk list into version order, just so the web site
         # doesn't have to do any work by default...
         apklist = sorted(apklist, key=lambda apk: apk['versionCode'], reverse=True)
 
-        antiFeatures = list(app.AntiFeatures)
         if 'antiFeatures' in apklist[0]:
-            antiFeatures.extend(apklist[0]['antiFeatures'])
-        if antiFeatures:
-            afout = sorted(set(antiFeatures))
-            addElementNonEmpty('antifeatures', ','.join(afout), doc, apel)
+            app.AntiFeatures.extend(apklist[0]['antiFeatures'])
+        if app.AntiFeatures:
+            addElementNonEmpty('antifeatures', ','.join(app.AntiFeatures), doc, apel)
 
         # Check for duplicates - they will make the client unhappy...
         for i in range(len(apklist) - 1):
@@ -1238,21 +466,19 @@ def make_v0(apps, apks, repodir, repodict, requestsdict, signer_fingerprints):
         for apk in apklist:
             file_extension = common.get_file_extension(apk['apkName'])
             # find the APK for the "Current Version"
-            if current_version_code < app.CurrentVersionCode:
-                current_version_file = apk['apkName']
             if current_version_code < apk['versionCode']:
                 current_version_code = apk['versionCode']
+            if current_version_code < int(app.CurrentVersionCode):
+                current_version_file = apk['apkName']
 
             apkel = doc.createElement("package")
             apel.appendChild(apkel)
 
             versionName = apk.get('versionName')
             if not versionName:
-                for build in app.get('Builds', []):
-                    if (
-                        build['versionCode'] == apk['versionCode']
-                        and 'versionName' in build
-                    ):
+                versionCodeStr = str(apk['versionCode'])  # TODO build.versionCode should be int!
+                for build in app.builds:
+                    if build['versionCode'] == versionCodeStr and 'versionName' in build:
                         versionName = build['versionName']
                         break
             if versionName:
@@ -1317,12 +543,7 @@ def make_v0(apps, apks, repodir, repodict, requestsdict, signer_fingerprints):
                 and common.config['make_current_version_link'] \
                 and repodir == 'repo':  # only create these
             namefield = common.config['current_version_name_source']
-            name = app.get(namefield)
-            if not name and namefield == 'Name':
-                name = app.get('localized', {}).get(DEFAULT_LOCALE, {}).get('name')
-            if not name:
-                name = app.id
-            sanitized_name = re.sub(b'''[ '"&%?+=/]''', b'', str(name).encode('utf-8'))
+            sanitized_name = re.sub(b'''[ '"&%?+=/]''', b'', app.get(namefield).encode('utf-8'))
             apklinkname = sanitized_name + os.path.splitext(current_version_file)[1].encode('utf-8')
             current_version_path = os.path.join(repodir, current_version_file).encode('utf-8', 'surrogateescape')
             if os.path.islink(apklinkname):
@@ -1337,29 +558,6 @@ def make_v0(apps, apks, repodir, repodict, requestsdict, signer_fingerprints):
                         os.remove(siglinkname)
                     os.symlink(sigfile_path, siglinkname)
 
-    if sys.version_info.minor >= 13:
-        # Python 3.13 changed minidom so it no longer converts " to an XML entity.
-        # https://github.com/python/cpython/commit/154477be722ae5c4e18d22d0860e284006b09c4f
-        # This just puts back the previous implementation, with black code format.
-        import inspect
-        import xml.dom.minidom
-
-        def _write_data(writer, text, attr):  # pylint: disable=unused-argument
-            if text:
-                text = (
-                    text.replace('&', '&amp;')
-                    .replace('<', '&lt;')
-                    .replace('"', '&quot;')
-                    .replace('>', '&gt;')
-                )
-            writer.write(text)
-
-        argnames = tuple(inspect.signature(xml.dom.minidom._write_data).parameters)
-        if argnames == ('writer', 'text', 'attr'):
-            xml.dom.minidom._write_data = _write_data
-        else:
-            logging.warning('Failed to monkey patch minidom for index.xml support!')
-
     if common.options.pretty:
         output = doc.toprettyxml(encoding='utf-8')
     else:
@@ -1386,13 +584,12 @@ def make_v0(apps, apks, repodir, repodict, requestsdict, signer_fingerprints):
         # Sign the index...
         signed = os.path.join(repodir, 'index.jar')
         if common.options.nosign:
-            _copy_to_local_copy_dir(repodir, os.path.join(repodir, jar_output))
             # Remove old signed index if not signing
             if os.path.exists(signed):
                 os.remove(signed)
         else:
             signindex.config = common.config
-            signindex.sign_jar(signed, use_old_algs=True)
+            signindex.sign_jar(signed)
 
     # Copy the repo icon into the repo directory...
     icon_dir = os.path.join(repodir, 'icons')
@@ -1401,19 +598,12 @@ def make_v0(apps, apks, repodir, repodict, requestsdict, signer_fingerprints):
     if os.path.exists(repo_icon):
         shutil.copyfile(common.config['repo_icon'], iconfilename)
     else:
-        logging.warning(_('repo_icon "repo/icons/%s" does not exist, generating placeholder.')
+        logging.warning(_('repo_icon %s does not exist, generating placeholder.')
                         % repo_icon)
         os.makedirs(os.path.dirname(iconfilename), exist_ok=True)
         try:
             import qrcode
-
             qrcode.make(common.config['repo_url']).save(iconfilename)
-        except ModuleNotFoundError as e:
-            raise ModuleNotFoundError(
-                _(
-                    'The "qrcode" Python package is not installed (e.g. apt-get install python3-qrcode)!'
-                )
-            ) from e
         except Exception:
             exampleicon = os.path.join(common.get_examples_dir(),
                                        common.default_config['repo_icon'])
@@ -1421,16 +611,13 @@ def make_v0(apps, apks, repodir, repodict, requestsdict, signer_fingerprints):
 
 
 def extract_pubkey():
-    """Extract and return the repository's public key from the keystore.
-
-    Returns
-    -------
-    public key in hex
-    repository fingerprint
+    """
+    Extracts and returns the repository's public key from the keystore.
+    :return: public key in hex, repository fingerprint
     """
     if 'repo_pubkey' in common.config:
         pubkey = unhexlify(common.config['repo_pubkey'])
-    elif 'keystorepass' in common.config:
+    else:
         env_vars = {'LC_ALL': 'C.UTF-8',
                     'FDROID_KEY_STORE_PASS': common.config['keystorepass']}
         p = FDroidPopenBytes([common.config['keytool'], '-exportcert',
@@ -1445,142 +632,23 @@ def extract_pubkey():
                 msg += ' Is your crypto smartcard plugged in?'
             raise FDroidException(msg)
         pubkey = p.output
-    else:
-        raise FDroidException(_('Neither "repo_pubkey" nor "keystorepass" set in config.yml'))
-
     repo_pubkey_fingerprint = common.get_cert_fingerprint(pubkey)
     return hexlify(pubkey), repo_pubkey_fingerprint
 
 
-def add_mirrors_to_repodict(repo_section, repodict):
-    """Convert config into final dict of mirror metadata for the repo.
-
-    Internally and in index-v2, mirrors is a list of dicts, but it can
-    be specified in the config as a string or list of strings.  Also,
-    index v0 and v1 use a list of URL strings as the data structure.
-
-    The first entry is traditionally the primary mirror and canonical
-    URL.  'mirrors' should not be present in the index if there is
-    only the canonical URL, and no other mirrors.
-
-    The metadata items for each mirror entry are sorted by key to
-    ensure minimum diffs in the index files.
-
-    """
-    mirrors_config = common.config.get('mirrors', [])
-    if type(mirrors_config) not in (list, tuple):
-        mirrors_config = [mirrors_config]
-
-    mirrors_yml = Path(f'config/{MIRRORS_CONFIG_NAME}.yml')
-    if mirrors_yml.exists():
-        if mirrors_config:
-            raise FDroidException(
-                _('mirrors set twice, in config.yml and {path}!').format(
-                    path=mirrors_yml
-                )
-            )
-        with mirrors_yml.open() as fp:
-            mirrors_config = yaml.load(fp)
-        if not isinstance(mirrors_config, list):
-            msg = _('{path} is not list, but a {datatype}!')
-            raise TypeError(
-                msg.format(path=mirrors_yml, datatype=type(mirrors_config).__name__)
-            )
-
-    if type(mirrors_config) not in (list, tuple, set):
-        msg = 'In config.yml, mirrors: is not list, but a {datatype}!'
-        raise TypeError(msg.format(datatype=type(mirrors_config).__name__))
-
-    mirrorcheckfailed = False
-    mirrors = []
-    urls = set()
-    for mirror in mirrors_config:
-        if isinstance(mirror, str):
-            mirror = {'url': mirror}
-        elif not isinstance(mirror, dict):
-            logging.error(
-                _('Bad entry type "{mirrortype}" in mirrors config: {mirror}').format(
-                    mirrortype=type(mirror), mirror=mirror
-                )
-            )
-            mirrorcheckfailed = True
-            continue
-        config_url = mirror['url']
-        base = os.path.basename(urllib.parse.urlparse(config_url).path.rstrip('/'))
-        if common.config.get('nonstandardwebroot') is not True and base != 'fdroid':
-            logging.error(_("mirror '%s' does not end with 'fdroid'!") % config_url)
-            mirrorcheckfailed = True
-        # must end with / or urljoin strips a whole path segment
-        if config_url.endswith('/'):
-            mirror['url'] = urllib.parse.urljoin(config_url, repo_section)
-        else:
-            mirror['url'] = urllib.parse.urljoin(config_url + '/', repo_section)
-        mirrors.append(mirror)
-        if mirror['url'] in urls:
-            mirrorcheckfailed = True
-            logging.error(
-                _('Duplicate entry "%s" in mirrors config!') % mirror['url']
-            )
-        urls.add(mirror['url'])
-    for mirror in common.config.get('servergitmirrors', []):
-        for url in get_mirror_service_urls(mirror):
-            mirrors.append({'url': url + '/' + repo_section})
-    if mirrorcheckfailed:
-        raise FDroidException(_("Malformed repository mirrors."))
-
-    if not mirrors:
-        return
-
-    repodict['mirrors'] = []
-    canonical_url = repodict['address']
-    found_primary = False
-    errors = 0
-    for mirror in mirrors:
-        if canonical_url == mirror['url']:
-            found_primary = True
-            mirror['isPrimary'] = True
-            sortedmirror = dict()
-            for k in sorted(mirror.keys()):
-                sortedmirror[k] = mirror[k]
-            repodict['mirrors'].insert(0, sortedmirror)
-        elif mirror.get('isPrimary'):
-            errors += 1
-            logging.error(
-                _('Mirror config for {url} contains "isPrimary" key!').format(
-                    url=mirror['url']
-                )
-            )
-        else:
-            repodict['mirrors'].append(mirror)
-
-    if errors:
-        raise FDroidException(_('"isPrimary" key should not be added to mirrors!'))
-
-    if repodict['mirrors'] and not found_primary:
-        repodict['mirrors'].insert(0, {'isPrimary': True, 'url': repodict['address']})
-
-
-def get_mirror_service_urls(mirror):
-    """Get direct URLs from git service for use by fdroidclient.
+def get_mirror_service_urls(url):
+    '''Get direct URLs from git service for use by fdroidclient
 
     Via 'servergitmirrors', fdroidserver can create and push a mirror
-    to certain well known git services like GitLab or GitHub.  This
+    to certain well known git services like gitlab or github.  This
     will always use the 'master' branch since that is the default
     branch in git. The files are then accessible via alternate URLs,
     where they are served in their raw format via a CDN rather than
     from git.
+    '''
 
-    Both of the GitLab URLs will work with F-Droid, but only the
-    GitLab Pages will work in the browser This is because the "raw"
-    URLs are not served with the correct mime types, so any index.html
-    which is put in the repo will not be rendered. Putting an
-    index.html file in the repo root is a common way for to make
-    information about the repo available to end user.
-
-    """
-    url = mirror['url']
     if url.startswith('git@'):
-        url = re.sub(r'^git@([^:]+):(.+)', r'https://\1/\2', url)
+        url = re.sub(r'^git@(.*):(.*)', r'https://\1/\2', url)
 
     segments = url.split("/")
 
@@ -1600,78 +668,36 @@ def get_mirror_service_urls(mirror):
         segments.extend([branch, folder])
         urls.append('/'.join(segments))
     elif hostname == "gitlab.com":
-        git_mirror_path = os.path.join('git-mirror', folder)
-        if (
-            mirror.get('index_only')
-            or common.get_dir_size(git_mirror_path) <= common.GITLAB_COM_PAGES_MAX_SIZE
-        ):
-            # Gitlab-like Pages segments "https://user.gitlab.io/repo/folder"
-            gitlab_pages = ["https:", "", user + ".gitlab.io", repo, folder]
-            urls.append('/'.join(gitlab_pages))
-        else:
-            logging.warning(
-                _(
-                    'Skipping GitLab Pages mirror because the repo is too large (>%.2fGB)!'
-                )
-                % (common.GITLAB_COM_PAGES_MAX_SIZE / 1000000000)
-            )
-        # GitLab Raw "https://gitlab.com/user/repo/-/raw/branch/folder"
-        gitlab_raw = segments + ['-', 'raw', branch, folder]
+        # Both these Gitlab URLs will work with F-Droid, but only the first will work in the browser
+        # This is because the `raw` URLs are not served with the correct mime types, so any
+        # index.html which is put in the repo will not be rendered. Putting an index.html file in
+        # the repo root is a common way for to make information about the repo available to end user.
+
+        # Gitlab-like Pages segments "https://user.gitlab.io/repo/folder"
+        gitlab_pages = ["https:", "", user + ".gitlab.io", repo, folder]
+        urls.append('/'.join(gitlab_pages))
+        # Gitlab Raw "https://gitlab.com/user/repo/raw/branch/folder"
+        gitlab_raw = segments + ['raw', branch, folder]
         urls.append('/'.join(gitlab_raw))
-        # GitLab Artifacts "https://user.gitlab.io/-/repo/-/jobs/job_id/artifacts/public/folder"
-        job_id = os.getenv('CI_JOB_ID')
-        try:
-            int(job_id)
-            gitlab_artifacts = [
-                "https:",
-                "",
-                user + ".gitlab.io",
-                '-',
-                repo,
-                '-',
-                'jobs',
-                job_id,
-                'artifacts',
-                'public',
-                folder,
-            ]
-            urls.append('/'.join(gitlab_artifacts))
-        except (TypeError, ValueError):
-            pass  # no Job ID to use, ignore
+        return urls
 
     return urls
 
 
 def download_repo_index(url_str, etag=None, verify_fingerprint=True, timeout=600):
-    """Download and verifies index v1 file, then returns its data.
-
-    Use the versioned functions to be sure you are getting the
-    expected data format.
-
-    """
-    return download_repo_index_v1(url_str, etag, verify_fingerprint, timeout)
-
-
-def download_repo_index_v1(url_str, etag=None, verify_fingerprint=True, timeout=600):
-    """Download and verifies index v1 file, then returns its data.
+    """Downloads and verifies index file, then returns its data.
 
     Downloads the repository index from the given :param url_str and
     verifies the repository's fingerprint if :param verify_fingerprint
     is not False.
 
-    Raises
-    ------
-    VerificationException() if the repository could not be verified
+    :raises: VerificationException() if the repository could not be verified
 
-    Returns
-    -------
-    A tuple consisting of:
-        - The index in JSON v1 format or None if the index did not change
+    :return: A tuple consisting of:
+        - The index in JSON format or None if the index did not change
         - The new eTag as returned by the HTTP request
 
     """
-    from . import net
-
     url = urllib.parse.urlsplit(url_str)
 
     fingerprint = None
@@ -1681,12 +707,7 @@ def download_repo_index_v1(url_str, etag=None, verify_fingerprint=True, timeout=
             raise VerificationException(_("No fingerprint in URL."))
         fingerprint = query['fingerprint'][0]
 
-    if url.path.endswith('/index-v1.jar'):
-        path = url.path[:-13].rstrip('/')
-    else:
-        path = url.path.rstrip('/')
-
-    url = urllib.parse.SplitResult(url.scheme, url.netloc, path + '/index-v1.jar', '', '')
+    url = urllib.parse.SplitResult(url.scheme, url.netloc, url.path + '/index-v1.jar', '', '')
     download, new_etag = net.http_get(url.geturl(), etag, timeout)
 
     if download is None:
@@ -1695,127 +716,38 @@ def download_repo_index_v1(url_str, etag=None, verify_fingerprint=True, timeout=
     with tempfile.NamedTemporaryFile() as fp:
         fp.write(download)
         fp.flush()
-        index, public_key, public_key_fingerprint = get_index_from_jar(
-            fp.name, fingerprint, allow_deprecated=True
-        )
+        index, public_key, public_key_fingerprint = get_index_from_jar(fp.name, fingerprint)
         index["repo"]["pubkey"] = hexlify(public_key).decode()
         index["repo"]["fingerprint"] = public_key_fingerprint
         index["apps"] = [metadata.App(app) for app in index["apps"]]
         return index, new_etag
 
 
-def download_repo_index_v2(url_str, etag=None, verify_fingerprint=True, timeout=None):
-    """Download and verifies index v2 file, then returns its data.
-
-    Downloads the repository index from the given :param url_str and
-    verifies the repository's fingerprint if :param verify_fingerprint
-    is not False.  In order to verify the data, the fingerprint must
-    be provided as part of the URL.
-
-    Raises
-    ------
-    VerificationException() if the repository could not be verified
-
-    Returns
-    -------
-    A tuple consisting of:
-        - The index in JSON v2 format or None if the index did not change
-        - The new eTag as returned by the HTTP request
+def get_index_from_jar(jarfile, fingerprint=None):
+    """Returns the data, public key, and fingerprint from index-v1.jar
 
+    :raises: VerificationException() if the repository could not be verified
     """
-    from . import net
 
-    etag  # etag is unused but needs to be there to keep the same API as the earlier functions.
-
-    url = urllib.parse.urlsplit(url_str)
-
-    if timeout is not None:
-        logging.warning('"timeout" argument of download_repo_index_v2() is deprecated!')
-
-    fingerprint = None
-    if verify_fingerprint:
-        query = urllib.parse.parse_qs(url.query)
-        if 'fingerprint' not in query:
-            raise VerificationException(_("No fingerprint in URL."))
-        fingerprint = query['fingerprint'][0]
-
-    if url.path.endswith('/entry.jar') or url.path.endswith('/index-v2.json'):
-        path = url.path.rsplit('/', 1)[0]
-    else:
-        path = url.path.rstrip('/')
-    url = urllib.parse.SplitResult(url.scheme, url.netloc, path, '', '')
-
-    mirrors = common.get_mirrors(url, 'entry.jar')
-    f = net.download_using_mirrors(mirrors)
-    entry, public_key, fingerprint = get_index_from_jar(f, fingerprint)
-
-    sha256 = entry['index']['sha256']
-    mirrors = common.get_mirrors(url, entry['index']['name'][1:])
-    f = net.download_using_mirrors(mirrors)
-    with open(f, 'rb') as fp:
-        index = fp.read()
-    if sha256 != hashlib.sha256(index).hexdigest():
-        raise VerificationException(
-            _("SHA-256 of {url} does not match entry!").format(url=url)
-        )
-    return json.loads(index), None
-
-
-def get_index_from_jar(jarfile, fingerprint=None, allow_deprecated=False):
-    """Return the data, public key and fingerprint from an index JAR with one JSON file.
-
-    The F-Droid index files always contain a single data file and a
-    JAR Signature.  Since index-v1, the data file is always JSON.
-    That single data file is named the same as the JAR file.
-
-    Parameters
-    ----------
-    fingerprint is the SHA-256 fingerprint of signing key. Only
-      hex digits count, all other chars will can be discarded.
-
-    Raises
-    ------
-    VerificationException() if the repository could not be verified
-
-    """
     logging.debug(_('Verifying index signature:'))
-
-    if allow_deprecated:
-        common.verify_deprecated_jar_signature(jarfile)
-    else:
-        common.verify_jar_signature(jarfile)
-
+    common.verify_jar_signature(jarfile)
     with zipfile.ZipFile(jarfile) as jar:
         public_key, public_key_fingerprint = get_public_key_from_jar(jar)
         if fingerprint is not None:
-            fingerprint = re.sub(r'[^0-9A-F]', r'', fingerprint.upper())
-            if fingerprint != public_key_fingerprint:
-                raise VerificationException(
-                    _("The repository's fingerprint does not match.")
-                )
-        for f in jar.namelist():
-            if not f.startswith('META-INF/'):
-                jsonfile = f
-                break
-        data = json.loads(jar.read(jsonfile))
+            if fingerprint.upper() != public_key_fingerprint:
+                raise VerificationException(_("The repository's fingerprint does not match."))
+        data = json.loads(jar.read('index-v1.json').decode())
         return data, public_key, public_key_fingerprint
 
 
 def get_public_key_from_jar(jar):
-    """Get the public key and its fingerprint from a JAR file.
+    """
+    Get the public key and its fingerprint from a JAR file.
 
-    Raises
-    ------
-    VerificationException() if the JAR was not signed exactly once
+    :raises: VerificationException() if the JAR was not signed exactly once
 
-    Parameters
-    ----------
-    jar
-      a zipfile.ZipFile object
-
-    Returns
-    -------
-    the public key from the jar and its fingerprint
+    :param jar: a zipfile.ZipFile object
+    :return: the public key from the jar and its fingerprint
     """
     # extract certificate from jar
     certs = [n for n in jar.namelist() if common.SIGNATURE_BLOCK_FILE_REGEX.match(n)]
@@ -1829,100 +761,3 @@ def get_public_key_from_jar(jar):
     public_key_fingerprint = common.get_cert_fingerprint(public_key).replace(' ', '')
 
     return public_key, public_key_fingerprint
-
-
-def make_altstore(apps, apks, config, repodir, pretty=False):
-    """Assemble altstore-index.json for iOS (.ipa) apps.
-
-    builds index files based on:
-    https://faq.altstore.io/distribute-your-apps/make-a-source
-    https://faq.altstore.io/distribute-your-apps/updating-apps
-    """
-    if not any(Path(repodir).glob('*.ipa')):
-        # no IPA files present in repo, nothing to do here, exiting early
-        return
-
-    indent = 2 if pretty else None
-    # for now alt-store support is english only
-    for lang in ['en']:
-
-        # prepare minimal altstore index
-        idx = {
-            'name': config['repo_name'],
-            "apps": [],
-            "news": [],
-        }
-
-        # add optional values if available
-        # idx["subtitle"] F-Droid doesn't have a corresponding value
-        if config.get("repo_description"):
-            idx['description'] = config['repo_description']
-        if (Path(repodir) / 'icons' / config['repo_icon']).exists():
-            idx['iconURL'] = f"{config['repo_url']}/icons/{config['repo_icon']}"
-        # idx["headerURL"] F-Droid doesn't have a corresponding value
-        # idx["website"] F-Droid doesn't have a corresponding value
-        # idx["patreonURL"] F-Droid doesn't have a corresponding value
-        # idx["tintColor"] F-Droid doesn't have a corresponding value
-        # idx["featuredApps"] = [] maybe mappable to F-Droids what's new?
-
-        # assemble "apps"
-        for packageName, app in apps.items():
-            app_name = app.get("Name") or app.get("AutoName")
-            icon_url = "{}{}".format(
-                config['repo_url'],
-                app.get('iconv2', {}).get(DEFAULT_LOCALE, {}).get('name', ''),
-            )
-            screenshot_urls = [
-                "{}{}".format(config["repo_url"], s["name"])
-                for s in app.get("screenshots", {})
-                .get("phone", {})
-                .get(DEFAULT_LOCALE, {})
-            ]
-
-            a = {
-                "name": app_name,
-                'bundleIdentifier': packageName,
-                'developerName': app.get("AuthorName") or f"{app_name} team",
-                'iconURL': icon_url,
-                "localizedDescription": "",
-                'appPermissions': {
-                    "entitlements": set(),
-                    "privacy": {},
-                },
-                'versions': [],
-            }
-
-            if app.get('summary'):
-                a['subtitle'] = app['summary']
-            # a["tintColor"] F-Droid doesn't have a corresponding value
-            # a["category"] F-Droid doesn't have a corresponding value
-            # a['patreon'] F-Droid doesn't have a corresponding value
-            a["screenshots"] = screenshot_urls
-
-            # populate 'versions'
-            for apk in apks:
-                last4 = apk.get('apkName', '').lower()[-4:]
-                if apk['packageName'] == packageName and last4 == '.ipa':
-                    v = {
-                        "version": apk["versionName"],
-                        "date": apk["added"].isoformat(),
-                        "downloadURL": f"{config['repo_url']}/{apk['apkName']}",
-                        "size": apk['size'],
-                    }
-
-                    # v['localizedDescription'] maybe what's new text?
-                    v["minOSVersion"] = apk["ipa_MinimumOSVersion"]
-                    v["maxOSVersion"] = apk["ipa_DTPlatformVersion"]
-
-                    # writing this spot here has the effect that always the
-                    # permissions of the latest processed permissions list used
-                    a['appPermissions']['privacy'] = apk['ipa_permissions']
-                    a['appPermissions']['entitlements'] = list(apk['ipa_entitlements'])
-
-                    a['versions'].append(v)
-
-            if len(a['versions']) > 0:
-                idx['apps'].append(a)
-
-        with open(Path(repodir) / 'altstore-index.json', "w", encoding="utf-8") as f:
-            json.dump(idx, f, indent=indent)
diff --git a/fdroidserver/init.py b/fdroidserver/init.py
index 39b18c1a..53eac796 100644
--- a/fdroidserver/init.py
+++ b/fdroidserver/init.py
@@ -19,70 +19,54 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import glob
-import logging
 import os
 import re
 import shutil
 import socket
 import sys
 from argparse import ArgumentParser
+import logging
 
-from . import _, common
+from . import _
+from . import common
 from .exception import FDroidException
 
 config = {}
+options = None
 
 
 def disable_in_config(key, value):
-    """Write a key/value to the local config.yml, then comment it out."""
+    '''write a key/value to the local config.yml, then comment it out'''
     import yaml
-
-    with open(common.CONFIG_FILE) as fp:
-        data = fp.read()
+    with open('config.yml') as f:
+        data = f.read()
     pattern = r'\n[\s#]*' + key + r':.*'
     repl = '\n#' + yaml.dump({key: value}, default_flow_style=False)
     data = re.sub(pattern, repl, data)
-    with open(common.CONFIG_FILE, 'w') as fp:
-        fp.writelines(data)
+    with open('config.yml', 'w') as f:
+        f.writelines(data)
 
 
 def main():
-    global config
+
+    global options, config
 
     # Parse command line...
     parser = ArgumentParser()
     common.setup_global_opts(parser)
-    parser.add_argument(
-        "-d",
-        "--distinguished-name",
-        default=None,
-        help=_("X.509 'Distinguished Name' used when generating keys"),
-    )
-    parser.add_argument(
-        "--keystore",
-        default=None,
-        help=_("Path to the keystore for the repo signing key"),
-    )
-    parser.add_argument(
-        "--repo-keyalias",
-        default=None,
-        help=_("Alias of the repo signing key in the keystore"),
-    )
-    parser.add_argument(
-        "--android-home",
-        default=None,
-        help=_("Path to the Android SDK (sometimes set in ANDROID_HOME)"),
-    )
-    parser.add_argument(
-        "--no-prompt",
-        action="store_true",
-        default=False,
-        help=_("Do not prompt for Android SDK path, just fail"),
-    )
-    options = common.parse_args(parser)
-
-    common.set_console_logging(options.verbose, options.color)
+    parser.add_argument("-d", "--distinguished-name", default=None,
+                        help=_("X.509 'Distinguished Name' used when generating keys"))
+    parser.add_argument("--keystore", default=None,
+                        help=_("Path to the keystore for the repo signing key"))
+    parser.add_argument("--repo-keyalias", default=None,
+                        help=_("Alias of the repo signing key in the keystore"))
+    parser.add_argument("--android-home", default=None,
+                        help=_("Path to the Android SDK (sometimes set in ANDROID_HOME)"))
+    parser.add_argument("--no-prompt", action="store_true", default=False,
+                        help=_("Do not prompt for Android SDK path, just fail"))
+    options = parser.parse_args()
 
+    aapt = None
     fdroiddir = os.getcwd()
     test_config = dict()
     examplesdir = common.get_examples_dir()
@@ -97,10 +81,9 @@ def main():
         # exist, prompt the user using platform-specific default
         # and if the user leaves it blank, ignore and move on.
         default_sdk_path = ''
-        if sys.platform in ('win32', 'cygwin'):
-            p = os.path.join(
-                os.getenv('USERPROFILE'), 'AppData', 'Local', 'Android', 'android-sdk'
-            )
+        if sys.platform == 'win32' or sys.platform == 'cygwin':
+            p = os.path.join(os.getenv('USERPROFILE'),
+                             'AppData', 'Local', 'Android', 'android-sdk')
         elif sys.platform == 'darwin':
             # on OSX, Homebrew is common and has an easy path to detect
             p = '/usr/local/opt/android-sdk'
@@ -114,13 +97,10 @@ def main():
             test_config['sdk_path'] = default_sdk_path
 
         if not common.test_sdk_exists(test_config):
-            del test_config['sdk_path']
+            del(test_config['sdk_path'])
             while not options.no_prompt:
                 try:
-                    s = input(
-                        _('Enter the path to the Android SDK (%s) here:\n> ')
-                        % default_sdk_path
-                    )
+                    s = input(_('Enter the path to the Android SDK (%s) here:\n> ') % default_sdk_path)
                 except KeyboardInterrupt:
                     print('')
                     sys.exit(1)
@@ -133,28 +113,16 @@ def main():
                 default_sdk_path = ''
 
     if test_config.get('sdk_path') and not common.test_sdk_exists(test_config):
-        raise FDroidException(
-            _("Android SDK not found at {path}!").format(path=test_config['sdk_path'])
-        )
+        raise FDroidException(_("Android SDK not found at {path}!")
+                              .format(path=test_config['sdk_path']))
 
-    if not os.path.exists(common.CONFIG_FILE):
+    if not os.path.exists('config.yml') and not os.path.exists('config.py'):
         # 'metadata' and 'tmp' are created in fdroid
         if not os.path.exists('repo'):
             os.mkdir('repo')
-        example_config_yml = os.path.join(examplesdir, common.CONFIG_FILE)
-        if os.path.exists(example_config_yml):
-            shutil.copyfile(example_config_yml, common.CONFIG_FILE)
-        else:
-            from pkg_resources import get_distribution
-
-            versionstr = get_distribution('fdroidserver').version
-            if not versionstr:
-                versionstr = 'master'
-            with open(common.CONFIG_FILE, 'w') as fp:
-                fp.write('# see https://gitlab.com/fdroid/fdroidserver/blob/')
-                fp.write(versionstr)
-                fp.write(f'/examples/{common.CONFIG_FILE}\n')
-        os.chmod(common.CONFIG_FILE, 0o0600)
+        shutil.copy(os.path.join(examplesdir, 'fdroid-icon.png'), fdroiddir)
+        shutil.copyfile(os.path.join(examplesdir, 'config.yml'), 'config.yml')
+        os.chmod('config.yml', 0o0600)
         # If android_home is None, test_config['sdk_path'] will be used and
         # "$ANDROID_HOME" may be used if the env var is set up correctly.
         # If android_home is not None, the path given from the command line
@@ -162,14 +130,16 @@ def main():
         if 'sdk_path' in test_config:
             common.write_to_config(test_config, 'sdk_path', options.android_home)
     else:
-        logging.warning(
-            'Looks like this is already an F-Droid repo, cowardly refusing to overwrite it...'
-        )
+        logging.warning('Looks like this is already an F-Droid repo, cowardly refusing to overwrite it...')
         logging.info('Try running `fdroid init` in an empty directory.')
         raise FDroidException('Repository already exists.')
 
     # now that we have a local config.yml, read configuration...
-    config = common.read_config()
+    config = common.read_config(options)
+
+    # enable apksigner by default so v2/v3 APK signatures validate
+    if common.find_apksigner() is not None:
+        test_config['apksigner'] = common.find_apksigner()
 
     # the NDK is optional and there may be multiple versions of it, so it's
     # left for the user to configure
@@ -188,9 +158,8 @@ def main():
         else:
             keystore = os.path.abspath(options.keystore)
             if not os.path.exists(keystore):
-                logging.info(
-                    '"' + keystore + '" does not exist, creating a new keystore there.'
-                )
+                logging.info('"' + keystore
+                             + '" does not exist, creating a new keystore there.')
     common.write_to_config(test_config, 'keystore', keystore)
     repo_keyalias = None
     keydname = None
@@ -201,19 +170,12 @@ def main():
         keydname = options.distinguished_name
         common.write_to_config(test_config, 'keydname', keydname)
     if keystore == 'NONE':  # we're using a smartcard
-        common.write_to_config(
-            test_config, 'repo_keyalias', '1'
-        )  # seems to be the default
+        common.write_to_config(test_config, 'repo_keyalias', '1')  # seems to be the default
         disable_in_config('keypass', 'never used with smartcard')
-        common.write_to_config(
-            test_config,
-            'smartcardoptions',
-            (
-                '-storetype PKCS11 '
-                + '-providerClass sun.security.pkcs11.SunPKCS11 '
-                + '-providerArg opensc-fdroid.cfg'
-            ),
-        )
+        common.write_to_config(test_config, 'smartcardoptions',
+                               ('-storetype PKCS11 '
+                                + '-providerClass sun.security.pkcs11.SunPKCS11 '
+                                + '-providerArg opensc-fdroid.cfg'))
         # find opensc-pkcs11.so
         if not os.path.exists('opensc-fdroid.cfg'):
             if os.path.exists('/usr/lib/opensc-pkcs11.so'):
@@ -221,49 +183,35 @@ def main():
             elif os.path.exists('/usr/lib64/opensc-pkcs11.so'):
                 opensc_so = '/usr/lib64/opensc-pkcs11.so'
             else:
-                files = glob.glob(
-                    '/usr/lib/' + os.uname()[4] + '-*-gnu/opensc-pkcs11.so'
-                )
+                files = glob.glob('/usr/lib/' + os.uname()[4] + '-*-gnu/opensc-pkcs11.so')
                 if len(files) > 0:
                     opensc_so = files[0]
                 else:
                     opensc_so = '/usr/lib/opensc-pkcs11.so'
-                    logging.warning(
-                        'No OpenSC PKCS#11 module found, '
-                        + 'install OpenSC then edit "opensc-fdroid.cfg"!'
-                    )
+                    logging.warning('No OpenSC PKCS#11 module found, '
+                                    + 'install OpenSC then edit "opensc-fdroid.cfg"!')
             with open('opensc-fdroid.cfg', 'w') as f:
                 f.write('name = OpenSC\nlibrary = ')
                 f.write(opensc_so)
                 f.write('\n')
-        logging.info(
-            "Repo setup using a smartcard HSM. Please edit keystorepass and repo_keyalias in config.yml."
-        )
-        logging.info(
-            "If you want to generate a new repo signing key in the HSM you can do that with 'fdroid update "
-            "--create-key'."
-        )
+        logging.info("Repo setup using a smartcard HSM. Please edit keystorepass and repo_keyalias in config.yml.")
+        logging.info("If you want to generate a new repo signing key in the HSM you can do that with 'fdroid update "
+                     "--create-key'.")
     elif os.path.exists(keystore):
         to_set = ['keystorepass', 'keypass', 'repo_keyalias', 'keydname']
         if repo_keyalias:
             to_set.remove('repo_keyalias')
         if keydname:
             to_set.remove('keydname')
-        logging.warning(
-            '\n'
-            + _('Using existing keystore "{path}"').format(path=keystore)
-            + '\n'
-            + _('Now set these in config.yml:')
-            + ' '
-            + ', '.join(to_set)
-            + '\n'
-        )
+        logging.warning('\n' + _('Using existing keystore "{path}"').format(path=keystore)
+                        + '\n' + _('Now set these in config.yml:') + ' '
+                        + ', '.join(to_set) + '\n')
     else:
         password = common.genpassword()
         c = dict(test_config)
         c['keystorepass'] = password
         c['keypass'] = password
-        c['repo_keyalias'] = repo_keyalias or socket.getfqdn()
+        c['repo_keyalias'] = socket.getfqdn()
         c['keydname'] = 'CN=' + c['repo_keyalias'] + ', OU=F-Droid'
         common.write_to_config(test_config, 'keystorepass', password)
         common.write_to_config(test_config, 'keypass', password)
@@ -274,25 +222,17 @@ def main():
     msg = '\n'
     msg += _('Built repo based in "%s" with this config:') % fdroiddir
     msg += '\n\n  Android SDK:\t\t\t' + config['sdk_path']
+    if aapt:
+        msg += '\n  Android SDK Build Tools:\t' + os.path.dirname(aapt)
+    msg += '\n  Android NDK r12b (optional):\t$ANDROID_NDK'
     msg += '\n  ' + _('Keystore for signing key:\t') + keystore
     if repo_keyalias is not None:
         msg += '\n  Alias for key in store:\t' + repo_keyalias
-    msg += '\n\n'
-    msg += (
-        _(
-            """To complete the setup, add your APKs to "%s"
+    msg += '\n\n' + '''To complete the setup, add your APKs to "%s"
 then run "fdroid update -c; fdroid update".  You might also want to edit
 "config.yml" to set the URL, repo name, and more.  You should also set up
 a signing key (a temporary one might have been automatically generated).
 
 For more info: https://f-droid.org/docs/Setup_an_F-Droid_App_Repo
-and https://f-droid.org/docs/Signing_Process"""
-        )
-        % os.path.join(fdroiddir, 'repo')
-    )
-    if not options.quiet:
-        # normally, INFO is only shown with --verbose, but show this unless --quiet
-        logger = logging.getLogger()
-        logger.setLevel(logging.INFO)
-        logger.info(msg)
-    logging.shutdown()
+and https://f-droid.org/docs/Signing_Process''' % os.path.join(fdroiddir, 'repo')
+    logging.info(msg)
diff --git a/fdroidserver/install.py b/fdroidserver/install.py
index 8c1dc948..0e50c27b 100644
--- a/fdroidserver/install.py
+++ b/fdroidserver/install.py
@@ -17,372 +17,62 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-import glob
-import locale
-import logging
-import os
 import sys
-import termios
-import tty
-from argparse import ArgumentParser, BooleanOptionalAction
-from pathlib import Path
-from urllib.parse import urlencode, urlparse, urlunparse
+import os
+import glob
+from argparse import ArgumentParser
+import logging
 
-import defusedxml.ElementTree as XMLElementTree
-
-from . import _, common, github, index, net
+from . import _
+from . import common
+from .common import SdkToolsPopen
 from .exception import FDroidException
 
-DEFAULT_IPFS_GATEWAYS = ("https://gateway.ipfs.io/ipfs/",)
-MAVEN_CENTRAL_MIRRORS = [
-    {
-        "url": "https://repo1.maven.org/maven2/",
-        "dnsA": ["199.232.16.209"],
-        "worksWithoutSNI": True,
-    },
-    {
-        "url": "https://repo.maven.apache.org/maven2/",
-        "dnsA": ["199.232.16.215"],
-        "worksWithoutSNI": True,
-    },
-    {
-        "url": "https://maven-central-asia.storage-download.googleapis.com/maven2/",
-    },
-    {
-        "url": "https://maven-central-eu.storage-download.googleapis.com/maven2/",
-    },
-    {
-        "url": "https://maven-central.storage-download.googleapis.com/maven2/",
-    },
-]
-
-
-# pylint: disable=unused-argument
-def download_apk(appid='org.fdroid.fdroid', privacy_mode=False):
-    """Download an APK from F-Droid via the first mirror that works."""
-    url = urlunparse(
-        urlparse(common.FDROIDORG_MIRRORS[0]['url'])._replace(
-            query=urlencode({'fingerprint': common.FDROIDORG_FINGERPRINT})
-        )
-    )
-
-    data, _ignored = index.download_repo_index_v2(url)
-    app = data.get('packages', dict()).get(appid)
-    preferred_version = None
-    for version in app['versions'].values():
-        if not preferred_version:
-            # if all else fails, use the first one
-            preferred_version = version
-        if not version.get('releaseChannels'):
-            # prefer APK in default release channel
-            preferred_version = version
-            break
-
-    mirrors = common.append_filename_to_mirrors(
-        preferred_version['file']['name'][1:], common.FDROIDORG_MIRRORS
-    )
-    ipfsCIDv1 = preferred_version['file'].get('ipfsCIDv1')
-    if ipfsCIDv1:
-        for gateway in DEFAULT_IPFS_GATEWAYS:
-            mirrors.append({'url': os.path.join(gateway, ipfsCIDv1)})
-    f = net.download_using_mirrors(mirrors)
-    if f and os.path.exists(f):
-        versionCode = preferred_version['manifest']['versionCode']
-        f = Path(f)
-        return str(f.rename(f.with_stem(f'{appid}_{versionCode}')).resolve())
-
-
-def download_fdroid_apk(privacy_mode=False):  # pylint: disable=unused-argument
-    """Directly download the current F-Droid APK and verify it.
-
-    This downloads the "download button" link, which is the version
-    that is best tested for new installs.
-
-    """
-    mirror = common.FDROIDORG_MIRRORS[0]
-    mirror['url'] = urlunparse(urlparse(mirror['url'])._replace(path='F-Droid.apk'))
-    return net.download_using_mirrors([mirror])
-
-
-def download_fdroid_apk_from_github(privacy_mode=False):
-    """Download F-Droid.apk from F-Droid's GitHub Releases."""
-    if common.config and not privacy_mode:
-        token = common.config.get('github_token')
-    else:
-        token = None
-    gh = github.GithubApi(token, 'https://github.com/f-droid/fdroidclient')
-    latest_apk = gh.get_latest_apk()
-    filename = os.path.basename(latest_apk)
-    return net.download_file(latest_apk, os.path.join(common.get_cachedir(), filename))
-
-
-def download_fdroid_apk_from_ipns(privacy_mode=False):
-    """Download the F-Droid APK from an IPNS repo."""
-    cid = 'k51qzi5uqu5dl4hbcksbdmplanu9n4hivnqsupqe6vzve1pdbeh418ssptldd3'
-    mirrors = [
-        {"url": f"https://ipfs.io/ipns/{cid}/F-Droid.apk"},
-    ]
-    if not privacy_mode:
-        mirrors.append({"url": f"https://{cid}.ipns.dweb.link/F-Droid.apk"})
-    return net.download_using_mirrors(mirrors)
-
-
-def download_fdroid_apk_from_maven(privacy_mode=False):
-    """Download F-Droid.apk from Maven Central and official mirrors."""
-    path = 'org/fdroid/fdroid/F-Droid'
-    if privacy_mode:
-        mirrors = MAVEN_CENTRAL_MIRRORS[:2]  # skip the Google servers
-    else:
-        mirrors = MAVEN_CENTRAL_MIRRORS
-    metadata = net.download_using_mirrors(
-        common.append_filename_to_mirrors(
-            os.path.join(path, 'maven-metadata.xml'), mirrors
-        )
-    )
-    version = XMLElementTree.parse(metadata).getroot().findall('*.//latest')[0].text
-    mirrors = common.append_filename_to_mirrors(
-        os.path.join(path, version, f'F-Droid-{version}.apk'), mirrors
-    )
-    return net.download_using_mirrors(mirrors)
-
-
-def install_fdroid_apk(privacy_mode=False):
-    """Download and install F-Droid.apk using all tricks we can muster.
-
-    By default, this first tries to fetch the official install APK
-    which is offered when someone clicks the "download" button on
-    https://f-droid.org/.  Then it will try all the mirrors and
-    methods until it gets something successful, or runs out of
-    options.
-
-    There is privacy_mode which tries to download from mirrors first,
-    so that this downloads from a mirror that has many different kinds
-    of files available, thereby breaking the clear link to F-Droid.
-
-    Returns
-    -------
-    None for success or the error message.
-
-    """
-    country_code = locale.getlocale()[0].split('_')[-1]
-    if privacy_mode is None and country_code in ('CN', 'HK', 'IR', 'TM'):
-        logging.warning(
-            _('Privacy mode was enabled based on your locale ({country_code}).').format(
-                country_code=country_code
-            )
-        )
-        privacy_mode = True
-
-    if privacy_mode or not (common.config and common.config.get('jarsigner')):
-        download_methods = [
-            download_fdroid_apk_from_maven,
-            download_fdroid_apk_from_ipns,
-            download_fdroid_apk_from_github,
-        ]
-    else:
-        download_methods = [
-            download_apk,
-            download_fdroid_apk_from_maven,
-            download_fdroid_apk_from_github,
-            download_fdroid_apk_from_ipns,
-            download_fdroid_apk,
-        ]
-    for method in download_methods:
-        try:
-            f = method(privacy_mode=privacy_mode)
-            break
-        except Exception as e:
-            logging.info(e)
-    else:
-        return _('F-Droid.apk could not be downloaded from any known source!')
-
-    fingerprint = common.apk_signer_fingerprint(f)
-    if fingerprint.upper() != common.FDROIDORG_FINGERPRINT:
-        return _('{path} has the wrong fingerprint ({fingerprint})!').format(
-            path=f, fingerprint=fingerprint
-        )
-    install_apk(f)
-
-
-def install_apk(f):
-    if common.config and common.config.get('apksigner'):
-        # TODO this should always verify, but that requires APK sig verification in Python #94
-        logging.info(_('Verifying package {path} with apksigner.').format(path=f))
-        common.verify_apk_signature(f)
-    if common.config and common.config.get('adb'):
-        if devices():
-            install_apks_to_devices([f])
-            os.remove(f)
-        else:
-            os.remove(f)
-            return _('No devices found for `adb install`! Please plug one in.')
+options = None
+config = None
 
 
 def devices():
-    """Get the list of device serials for use with adb commands."""
-    p = common.SdkToolsPopen(['adb', "devices"])
+    p = SdkToolsPopen(['adb', "devices"])
     if p.returncode != 0:
         raise FDroidException("An error occured when finding devices: %s" % p.output)
-    serials = list()
-    for line in p.output.splitlines():
-        columns = line.strip().split("\t", maxsplit=1)
-        if len(columns) == 2:
-            serial, status = columns
-            if status == 'device':
-                serials.append(serial)
-            else:
-                d = {'serial': serial, 'status': status}
-                logging.warning(_('adb reports {serial} is "{status}"!'.format(**d)))
-    return serials
-
-
-def install_apks_to_devices(apks):
-    """Install the list of APKs to all Android devices reported by `adb devices`."""
-    for apk in apks:
-        # Get device list each time to avoid device not found errors
-        devs = devices()
-        if not devs:
-            raise FDroidException(_("No attached devices found"))
-        logging.info(_("Installing %s...") % apk)
-        for dev in devs:
-            logging.info(
-                _("Installing '{apkfilename}' on {dev}...").format(
-                    apkfilename=apk, dev=dev
-                )
-            )
-            p = common.SdkToolsPopen(['adb', "-s", dev, "install", apk])
-            fail = ""
-            for line in p.output.splitlines():
-                if line.startswith("Failure"):
-                    fail = line[9:-1]
-            if not fail:
-                continue
-
-            if fail == "INSTALL_FAILED_ALREADY_EXISTS":
-                logging.warning(
-                    _('"{apkfilename}" is already installed on {dev}.').format(
-                        apkfilename=apk, dev=dev
-                    )
-                )
-            else:
-                raise FDroidException(
-                    _("Failed to install '{apkfilename}' on {dev}: {error}").format(
-                        apkfilename=apk, dev=dev, error=fail
-                    )
-                )
-
-
-def read_char():
-    """Read input from the terminal prompt one char at a time."""
-    fd = sys.stdin.fileno()
-    old_settings = termios.tcgetattr(fd)
-    try:
-        tty.setraw(fd)
-        ch = sys.stdin.read(1)
-    finally:
-        termios.tcsetattr(fd, termios.TCSADRAIN, old_settings)
-    return ch
-
-
-def strtobool(val):
-    """Convert a localized string representation of truth to True or False."""
-    return val.lower() in ('', 'y', 'yes', _('yes'), _('true'))  # '' is pressing Enter
-
-
-def prompt_user(yes, msg):
-    """Prompt user for yes/no, supporting Enter and Esc as accepted answers."""
-    run_install = yes
-    if yes is None and sys.stdout.isatty():
-        print(msg, end=' ', flush=True)
-        answer = ''
-        while True:
-            in_char = read_char()
-            if in_char == '\r':  # Enter key
-                break
-            if not in_char.isprintable():
-                sys.exit(1)
-            print(in_char, end='', flush=True)
-            answer += in_char
-        run_install = strtobool(answer)
-        print()
-    return run_install
+    lines = [line for line in p.output.splitlines() if not line.startswith('* ')]
+    if len(lines) < 3:
+        return []
+    lines = lines[1:-1]
+    return [line.split()[0] for line in lines]
 
 
 def main():
-    parser = ArgumentParser(
-        usage="%(prog)s [options] [APPID[:VERCODE] [APPID[:VERCODE] ...]]"
-    )
+
+    global options, config
+
+    # Parse command line...
+    parser = ArgumentParser(usage="%(prog)s [options] [APPID[:VERCODE] [APPID[:VERCODE] ...]]")
     common.setup_global_opts(parser)
-    parser.add_argument(
-        "appid",
-        nargs='*',
-        help=_("application ID with optional versionCode in the form APPID[:VERCODE]"),
-    )
-    parser.add_argument(
-        "-a",
-        "--all",
-        action="store_true",
-        default=False,
-        help=_("Install all signed applications available"),
-    )
-    parser.add_argument(
-        "-p",
-        "--privacy-mode",
-        action=BooleanOptionalAction,
-        default=None,
-        help=_("Download F-Droid.apk using mirrors that leak less to the network"),
-    )
-    parser.add_argument(
-        "-y",
-        "--yes",
-        action="store_true",
-        default=None,
-        help=_("Automatic yes to all prompts."),
-    )
-    parser.add_argument(
-        "-n",
-        "--no",
-        action="store_false",
-        dest='yes',
-        help=_("Automatic no to all prompts."),
-    )
-    options = common.parse_args(parser)
-
-    common.set_console_logging(options.verbose, options.color)
-    logging.captureWarnings(True)  # for SNIMissingWarning
-
-    common.get_config()
+    parser.add_argument("appid", nargs='*', help=_("application ID with optional versionCode in the form APPID[:VERCODE]"))
+    parser.add_argument("-a", "--all", action="store_true", default=False,
+                        help=_("Install all signed applications available"))
+    options = parser.parse_args()
 
     if not options.appid and not options.all:
-        run_install = prompt_user(
-            options.yes,
-            _('Would you like to download and install F-Droid.apk via adb? (YES/no)'),
-        )
-        if run_install:
-            sys.exit(install_fdroid_apk(options.privacy_mode))
-        sys.exit(1)
+        parser.error(_("option %s: If you really want to install all the signed apps, use --all") % "all")
+
+    config = common.read_config(options)
 
     output_dir = 'repo'
-    if (options.appid or options.all) and not os.path.isdir(output_dir):
-        logging.error(_("No signed output directory - nothing to do"))
-        run_install = prompt_user(
-            options.yes,
-            _('Would you like to download the app(s) from f-droid.org? (YES/no)'),
-        )
-        if run_install:
-            for appid in options.appid:
-                f = download_apk(appid)
-                install_apk(f)
-            sys.exit(install_fdroid_apk(options.privacy_mode))
-        sys.exit(1)
+    if not os.path.isdir(output_dir):
+        logging.info(_("No signed output directory - nothing to do"))
+        sys.exit(0)
 
     if options.appid:
+
         vercodes = common.read_pkg_args(options.appid, True)
-        common.get_metadata_files(vercodes)  # only check appids
         apks = {appid: None for appid in vercodes}
 
-        # Get the signed APK with the highest vercode
+        # Get the signed apk with the highest vercode
         for apkfile in sorted(glob.glob(os.path.join(output_dir, '*.apk'))):
+
             try:
                 appid, vercode = common.publishednameinfo(apkfile)
             except FDroidException:
@@ -395,15 +85,35 @@ def main():
 
         for appid, apk in apks.items():
             if not apk:
-                raise FDroidException(_("No signed APK available for %s") % appid)
-        install_apks_to_devices(apks.values())
+                raise FDroidException(_("No signed apk available for %s") % appid)
 
-    elif options.all:
-        apks = {
-            common.publishednameinfo(apkfile)[0]: apkfile
-            for apkfile in sorted(glob.glob(os.path.join(output_dir, '*.apk')))
-        }
-        install_apks_to_devices(apks.values())
+    else:
+
+        apks = {common.publishednameinfo(apkfile)[0]: apkfile for apkfile in
+                sorted(glob.glob(os.path.join(output_dir, '*.apk')))}
+
+    for appid, apk in apks.items():
+        # Get device list each time to avoid device not found errors
+        devs = devices()
+        if not devs:
+            raise FDroidException(_("No attached devices found"))
+        logging.info(_("Installing %s...") % apk)
+        for dev in devs:
+            logging.info(_("Installing '{apkfilename}' on {dev}...").format(apkfilename=apk, dev=dev))
+            p = SdkToolsPopen(['adb', "-s", dev, "install", apk])
+            fail = ""
+            for line in p.output.splitlines():
+                if line.startswith("Failure"):
+                    fail = line[9:-1]
+            if not fail:
+                continue
+
+            if fail == "INSTALL_FAILED_ALREADY_EXISTS":
+                logging.warning(_('"{apkfilename}" is already installed on {dev}.')
+                                .format(apkfilename=apk, dev=dev))
+            else:
+                raise FDroidException(_("Failed to install '{apkfilename}' on {dev}: {error}")
+                                      .format(apkfilename=apk, dev=dev, error=fail))
 
     logging.info('\n' + _('Finished'))
 
diff --git a/fdroidserver/lint.py b/fdroidserver/lint.py
index 99b1a392..b5acc9ad 100644
--- a/fdroidserver/lint.py
+++ b/fdroidserver/lint.py
@@ -16,28 +16,25 @@
 # You should have received a copy of the GNU Affero General Public Licen
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-import difflib
-import platform
+from argparse import ArgumentParser
+import glob
+import os
 import re
 import sys
 import urllib.parse
-from argparse import ArgumentParser
-from pathlib import Path
 
-from fdroidserver._yaml import yaml
-
-from . import _, common, metadata, rewritemeta
+from . import _
+from . import common
+from . import metadata
+from . import rewritemeta
 
 config = None
+options = None
 
 
 def enforce_https(domain):
-    return (
-        re.compile(
-            r'^http://([^/]*\.)?' + re.escape(domain) + r'(/.*)?', re.IGNORECASE
-        ),
-        domain + " URLs should always use https://",
-    )
+    return (re.compile(r'^http://([^/]*\.)?' + re.escape(domain) + r'(/.*)?', re.IGNORECASE),
+            domain + " URLs should always use https://")
 
 
 https_enforcings = [
@@ -62,10 +59,8 @@ https_enforcings = [
 
 
 def forbid_shortener(domain):
-    return (
-        re.compile(r'https?://[^/]*' + re.escape(domain) + r'/.*'),
-        _("URL shorteners should not be used"),
-    )
+    return (re.compile(r'https?://[^/]*' + re.escape(domain) + r'/.*'),
+            _("URL shorteners should not be used"))
 
 
 http_url_shorteners = [
@@ -124,200 +119,70 @@ http_url_shorteners = [
     forbid_shortener('➡.ws'),
 ]
 
-http_checks = (
-    https_enforcings
-    + http_url_shorteners
-    + [
-        (
-            re.compile(r'^(?!https?://)[^/]+'),
-            _("URL must start with https:// or http://"),
-        ),
-        (
-            re.compile(r'^https://(github|gitlab)\.com(/[^/]+){2,3}\.git'),
-            _("Appending .git is not necessary"),
-        ),
-        (
-            re.compile(
-                r'^https://[^/]*(github|gitlab|bitbucket|rawgit|githubusercontent)\.[a-zA-Z]+/([^/]+/){2,3}(master|main)/'
-            ),
-            _(
-                "Use /HEAD instead of /master or /main to point at a file in the default branch"
-            ),
-        ),
-    ]
-)
+http_checks = https_enforcings + http_url_shorteners + [
+    (re.compile(r'^(?!https?://)[^/]+'),
+     _("URL must start with https:// or http://")),
+    (re.compile(r'^https://(github|gitlab)\.com(/[^/]+){2,3}\.git'),
+     _("Appending .git is not necessary")),
+    (re.compile(r'^https://[^/]*(github|gitlab|bitbucket|rawgit|githubusercontent)\.[a-zA-Z]+/([^/]+/){2,3}master/'),
+     _("Use /HEAD instead of /master to point at a file in the default branch")),
+]
 
 regex_checks = {
     'WebSite': http_checks,
     'SourceCode': http_checks,
     'Repo': https_enforcings,
     'UpdateCheckMode': https_enforcings,
-    'IssueTracker': http_checks
-    + [
-        (re.compile(r'.*github\.com/[^/]+/[^/]+/*$'), _("/issues is missing")),
-        (re.compile(r'.*gitlab\.com/[^/]+/[^/]+/*$'), _("/issues is missing")),
+    'IssueTracker': http_checks + [
+        (re.compile(r'.*github\.com/[^/]+/[^/]+/*$'),
+         _("/issues is missing")),
+        (re.compile(r'.*gitlab\.com/[^/]+/[^/]+/*$'),
+         _("/issues is missing")),
     ],
-    'Donate': http_checks
-    + [
-        (
-            re.compile(r'.*liberapay\.com'),
-            _("Liberapay donation methods belong in the Liberapay: field"),
-        ),
-        (
-            re.compile(r'.*opencollective\.com'),
-            _("OpenCollective donation methods belong in the OpenCollective: field"),
-        ),
+    'Donate': http_checks + [
+        (re.compile(r'.*flattr\.com'),
+         _("Flattr donation methods belong in the FlattrID: field")),
+        (re.compile(r'.*liberapay\.com'),
+         _("Liberapay donation methods belong in the Liberapay: field")),
+        (re.compile(r'.*opencollective\.com'),
+         _("OpenCollective donation methods belong in the OpenCollective: field")),
     ],
     'Changelog': http_checks,
     'Author Name': [
-        (re.compile(r'^\s'), _("Unnecessary leading space")),
-        (re.compile(r'.*\s$'), _("Unnecessary trailing space")),
+        (re.compile(r'^\s'),
+         _("Unnecessary leading space")),
+        (re.compile(r'.*\s$'),
+         _("Unnecessary trailing space")),
     ],
     'Summary': [
-        (
-            re.compile(r'.*\b(free software|open source)\b.*', re.IGNORECASE),
-            _("No need to specify that the app is Free Software"),
-        ),
-        (
-            re.compile(
-                r'.*((your|for).*android|android.*(app|device|client|port|version))',
-                re.IGNORECASE,
-            ),
-            _("No need to specify that the app is for Android"),
-        ),
-        (re.compile(r'.*[a-z0-9][.!?]( |$)'), _("Punctuation should be avoided")),
-        (re.compile(r'^\s'), _("Unnecessary leading space")),
-        (re.compile(r'.*\s$'), _("Unnecessary trailing space")),
+        (re.compile(r'.*\b(free software|open source)\b.*', re.IGNORECASE),
+         _("No need to specify that the app is Free Software")),
+        (re.compile(r'.*((your|for).*android|android.*(app|device|client|port|version))', re.IGNORECASE),
+         _("No need to specify that the app is for Android")),
+        (re.compile(r'.*[a-z0-9][.!?]( |$)'),
+         _("Punctuation should be avoided")),
+        (re.compile(r'^\s'),
+         _("Unnecessary leading space")),
+        (re.compile(r'.*\s$'),
+         _("Unnecessary trailing space")),
     ],
-    'Description': https_enforcings
-    + http_url_shorteners
-    + [
-        (re.compile(r'\s*[*#][^ .]'), _("Invalid bulleted list")),
-        (
-            re.compile(r'https://f-droid.org/[a-z][a-z](_[A-Za-z]{2,4})?/'),
-            _("Locale included in f-droid.org URL"),
-        ),
-        (re.compile(r'^\s'), _("Unnecessary leading space")),
-        (re.compile(r'.*\s$'), _("Unnecessary trailing space")),
-        (
-            re.compile(
-                r'.*<(applet|base|body|button|embed|form|head|html|iframe|img|input|link|object|picture|script|source|style|svg|video).*',
-                re.IGNORECASE,
-            ),
-            _("Forbidden HTML tags"),
-        ),
-        (
-            re.compile(r""".*\s+src=["']javascript:.*"""),
-            _("Javascript in HTML src attributes"),
-        ),
+    'Description': https_enforcings + http_url_shorteners + [
+        (re.compile(r'\s*[*#][^ .]'),
+         _("Invalid bulleted list")),
+        (re.compile(r'https://f-droid.org/[a-z][a-z](_[A-Za-z]{2,4})?/'),
+         _("Locale included in f-droid.org URL")),
+        (re.compile(r'^\s'),
+         _("Unnecessary leading space")),
+        (re.compile(r'.*\s$'),
+         _("Unnecessary trailing space")),
+        (re.compile(r'.*<(applet|base|body|button|embed|form|head|html|iframe|img|input|link|object|picture|script|source|style|svg|video).*', re.IGNORECASE),
+         _("Forbidden HTML tags")),
+        (re.compile(r'''.*\s+src=["']javascript:.*'''),
+         _("Javascript in HTML src attributes")),
     ],
 }
 
-# config keys that are currently ignored by lint, but could be supported.
-ignore_config_keys = (
-    'github_releases',
-    'java_paths',
-)
-
-bool_keys = (
-    'allow_disabled_algorithms',
-    'androidobservatory',
-    'build_server_always',
-    'deploy_process_logs',
-    'keep_when_not_allowed',
-    'make_current_version_link',
-    'nonstandardwebroot',
-    'per_app_repos',
-    'refresh_scanner',
-    'scan_binary',
-    'sync_from_local_copy_dir',
-)
-
-check_config_keys = (
-    'ant',
-    'apk_signing_key_block_list',
-    'archive',
-    'archive_description',
-    'archive_icon',
-    'archive_name',
-    'archive_older',
-    'archive_url',
-    'archive_web_base_url',
-    'awsbucket',
-    'awsbucket_index_only',
-    'binary_transparency_remote',
-    'cachedir',
-    'char_limits',
-    'current_version_name_source',
-    'git_mirror_size_limit',
-    'github_token',
-    'gpghome',
-    'gpgkey',
-    'gradle',
-    'identity_file',
-    'install_list',
-    'java_paths',
-    'keyaliases',
-    'keydname',
-    'keypass',
-    'keystore',
-    'keystorepass',
-    'lint_licenses',
-    'local_copy_dir',
-    'mirrors',
-    'mvn3',
-    'ndk_paths',
-    'path_to_custom_rclone_config',
-    'rclone_config',
-    'repo',
-    'repo_description',
-    'repo_icon',
-    'repo_key_sha256',
-    'repo_keyalias',
-    'repo_maxage',
-    'repo_name',
-    'repo_pubkey',
-    'repo_url',
-    'repo_web_base_url',
-    'scanner_signature_sources',
-    'sdk_path',
-    'servergitmirrors',
-    'serverwebroot',
-    'smartcardoptions',
-    'sync_from_local_copy_dir',
-    'uninstall_list',
-    'virustotal_apikey',
-)
-
-locale_pattern = re.compile(r"[a-z]{2,3}(-([A-Z][a-zA-Z]+|\d+|[a-z]+))*")
-
-versioncode_check_pattern = re.compile(r"(\\d|\[(0-9|\\d)_?(a-fA-F)?])[+]")
-
-ANTIFEATURES_KEYS = None
-ANTIFEATURES_PATTERN = None
-CATEGORIES_KEYS = list()
-
-
-def load_antiFeatures_config():
-    """Lazy loading, since it might read a lot of files."""
-    global ANTIFEATURES_KEYS, ANTIFEATURES_PATTERN
-    k = common.ANTIFEATURES_CONFIG_NAME
-    if not ANTIFEATURES_KEYS or k not in common.config:
-        common.config[k] = common.load_localized_config(k, 'repo')
-        ANTIFEATURES_KEYS = sorted(common.config[k].keys())
-        ANTIFEATURES_PATTERN = ','.join(ANTIFEATURES_KEYS)
-
-
-def load_categories_config():
-    """Lazy loading, since it might read a lot of files."""
-    global CATEGORIES_KEYS
-    k = common.CATEGORIES_CONFIG_NAME
-    if not CATEGORIES_KEYS:
-        if config and k in config:
-            CATEGORIES_KEYS = config[k]
-        else:
-            config[k] = common.load_localized_config(k, 'repo')
-            CATEGORIES_KEYS = list(config[k].keys())
+locale_pattern = re.compile(r'^[a-z]{2,3}(-[A-Z][A-Z])?$')
 
 
 def check_regexes(app):
@@ -341,17 +206,18 @@ def get_lastbuild(builds):
     lastbuild = None
     for build in builds:
         if not build.disable:
-            vercode = build.versionCode
+            vercode = int(build.versionCode)
             if lowest_vercode == -1 or vercode < lowest_vercode:
                 lowest_vercode = vercode
-        if not lastbuild or build.versionCode > lastbuild.versionCode:
+        if not lastbuild or int(build.versionCode) > int(lastbuild.versionCode):
             lastbuild = build
     return lastbuild
 
 
-def check_update_check_data_url(app):  # noqa: D403
-    """UpdateCheckData must have a valid HTTPS URL to protect checkupdates runs."""
-    if app.UpdateCheckData and app.UpdateCheckMode == 'HTTP':
+def check_update_check_data_url(app):
+    """UpdateCheckData must have a valid HTTPS URL to protect checkupdates runs
+    """
+    if app.UpdateCheckData:
         urlcode, codeex, urlver, verex = app.UpdateCheckData.split('|')
         for url in (urlcode, urlver):
             if url != '.':
@@ -362,58 +228,34 @@ def check_update_check_data_url(app):  # noqa: D403
                     yield _('UpdateCheckData must use HTTPS URL: {url}').format(url=url)
 
 
-def check_update_check_data_int(app):  # noqa: D403
-    """UpdateCheckData regex must match integers."""
-    if app.UpdateCheckData:
-        urlcode, codeex, urlver, verex = app.UpdateCheckData.split('|')
-        # codeex can be empty as well
-        if codeex and not versioncode_check_pattern.search(codeex):
-            yield _(
-                f'UpdateCheckData must match the versionCode as integer (\\d or [0-9]): {codeex}'
-            )
-
-
 def check_vercode_operation(app):
-    if not app.VercodeOperation:
-        return
-    invalid_ops = []
-    for op in app.VercodeOperation:
-        if not common.VERCODE_OPERATION_RE.match(op):
-            invalid_ops += op
-    if invalid_ops:
-        yield _('Invalid VercodeOperation: {invalid_ops}').format(
-            invalid_ops=invalid_ops
-        )
+    if app.VercodeOperation and not common.VERCODE_OPERATION_RE.match(app.VercodeOperation):
+        yield _('Invalid VercodeOperation: {field}').format(field=app.VercodeOperation)
 
 
 def check_ucm_tags(app):
-    lastbuild = get_lastbuild(app.get('Builds', []))
-    if (
-        lastbuild is not None
-        and lastbuild.commit
-        and app.UpdateCheckMode == 'RepoManifest'
-        and not lastbuild.commit.startswith('unknown')
-        and lastbuild.versionCode == app.CurrentVersionCode
-        and not lastbuild.forcevercode
-        and any(s in lastbuild.commit for s in '.,_-/')
-    ):
-        yield _(
-            "Last used commit '{commit}' looks like a tag, but UpdateCheckMode is '{ucm}'"
-        ).format(commit=lastbuild.commit, ucm=app.UpdateCheckMode)
+    lastbuild = get_lastbuild(app.builds)
+    if (lastbuild is not None
+            and lastbuild.commit
+            and app.UpdateCheckMode == 'RepoManifest'
+            and not lastbuild.commit.startswith('unknown')
+            and lastbuild.versionCode == app.CurrentVersionCode
+            and not lastbuild.forcevercode
+            and any(s in lastbuild.commit for s in '.,_-/')):
+        yield _("Last used commit '{commit}' looks like a tag, but UpdateCheckMode is '{ucm}'")\
+            .format(commit=lastbuild.commit, ucm=app.UpdateCheckMode)
 
 
 def check_char_limits(app):
     limits = config['char_limits']
 
     if len(app.Summary) > limits['summary']:
-        yield _("Summary of length {length} is over the {limit} char limit").format(
-            length=len(app.Summary), limit=limits['summary']
-        )
+        yield _("Summary of length {length} is over the {limit} char limit")\
+            .format(length=len(app.Summary), limit=limits['summary'])
 
     if len(app.Description) > limits['description']:
-        yield _("Description of length {length} is over the {limit} char limit").format(
-            length=len(app.Description), limit=limits['description']
-        )
+        yield _("Description of length {length} is over the {limit} char limit")\
+            .format(length=len(app.Description), limit=limits['description'])
 
 
 def check_old_links(app):
@@ -430,9 +272,8 @@ def check_old_links(app):
         for f in ['WebSite', 'SourceCode', 'IssueTracker', 'Changelog']:
             v = app.get(f)
             if any(s in v for s in old_sites):
-                yield _("App is in '{repo}' but has a link to {url}").format(
-                    repo=app.Repo, url=v
-                )
+                yield _("App is in '{repo}' but has a link to {url}")\
+                    .format(repo=app.Repo, url=v)
 
 
 def check_useless_fields(app):
@@ -445,10 +286,8 @@ filling_ucms = re.compile(r'^(Tags.*|RepoManifest.*)')
 
 def check_checkupdates_ran(app):
     if filling_ucms.match(app.UpdateCheckMode):
-        if not app.AutoName and not app.CurrentVersion and app.CurrentVersionCode == 0:
-            yield _(
-                "UpdateCheckMode is set but it looks like checkupdates hasn't been run yet."
-            )
+        if not app.AutoName and not app.CurrentVersion and app.CurrentVersionCode == '0':
+            yield _("UpdateCheckMode is set but it looks like checkupdates hasn't been run yet")
 
 
 def check_empty_fields(app):
@@ -456,14 +295,37 @@ def check_empty_fields(app):
         yield _("Categories are not set")
 
 
+all_categories = set([
+    "Connectivity",
+    "Development",
+    "Games",
+    "Graphics",
+    "Internet",
+    "Money",
+    "Multimedia",
+    "Navigation",
+    "Phone & SMS",
+    "Reading",
+    "Science & Education",
+    "Security",
+    "Sports & Health",
+    "System",
+    "Theming",
+    "Time",
+    "Writing",
+])
+
+
 def check_categories(app):
-    """App uses 'Categories' key and parsed config uses 'categories' key."""
     for categ in app.Categories:
-        if categ not in CATEGORIES_KEYS:
+        if categ not in all_categories:
             yield _("Categories '%s' is not valid" % categ)
 
 
 def check_duplicates(app):
+    if app.Name and app.Name == app.AutoName:
+        yield _("Name '%s' is just the auto name - remove it") % app.Name
+
     links_seen = set()
     for f in ['Source Code', 'Web Site', 'Issue Tracker', 'Changelog']:
         v = app.get(f)
@@ -475,7 +337,7 @@ def check_duplicates(app):
         else:
             links_seen.add(v)
 
-    name = common.get_app_display_name(app)
+    name = app.Name or app.AutoName
     if app.Summary and name:
         if app.Summary.lower() == name.lower():
             yield _("Summary '%s' is just the app's name") % app.Summary
@@ -505,281 +367,189 @@ def check_mediawiki_links(app):
                 yield _("URL {url} in Description: {error}").format(url=url, error=r)
 
 
+def check_bulleted_lists(app):
+    validchars = ['*', '#']
+    lchar = ''
+    lcount = 0
+    for line in app.Description.splitlines():
+        if len(line) < 1:
+            lcount = 0
+            continue
+
+        if line[0] == lchar and line[1] == ' ':
+            lcount += 1
+            if lcount > 2 and lchar not in validchars:
+                yield _("Description has a list (%s) but it isn't bulleted (*) nor numbered (#)") % lchar
+                break
+        else:
+            lchar = line[0]
+            lcount = 1
+
+
 def check_builds(app):
     supported_flags = set(metadata.build_flags)
     # needed for YAML and JSON
-    for build in app.get('Builds', []):
+    for build in app.builds:
         if build.disable:
             if build.disable.startswith('Generated by import.py'):
-                yield _(
-                    "Build generated by `fdroid import` - remove disable line once ready"
-                )
+                yield _("Build generated by `fdroid import` - remove disable line once ready")
             continue
-        for s in ['master', 'main', 'origin', 'HEAD', 'default', 'trunk']:
+        for s in ['master', 'origin', 'HEAD', 'default', 'trunk']:
             if build.commit and build.commit.startswith(s):
-                yield _(
-                    "Branch '{branch}' used as commit in build '{versionName}'"
-                ).format(branch=s, versionName=build.versionName)
+                yield _("Branch '{branch}' used as commit in build '{versionName}'")\
+                    .format(branch=s, versionName=build.versionName)
             for srclib in build.srclibs:
                 if '@' in srclib:
                     ref = srclib.split('@')[1].split('/')[0]
                     if ref.startswith(s):
-                        yield _(
-                            "Branch '{branch}' used as commit in srclib '{srclib}'"
-                        ).format(branch=s, srclib=srclib)
+                        yield _("Branch '{branch}' used as commit in srclib '{srclib}'")\
+                            .format(branch=s, srclib=srclib)
                 else:
-                    yield (
-                        _('srclibs missing name and/or @')
-                        + ' (srclibs: '
-                        + srclib
-                        + ')'
-                    )
+                    yield _('srclibs missing name and/or @') + ' (srclibs: ' + srclib + ')'
         for key in build.keys():
             if key not in supported_flags:
                 yield _('%s is not an accepted build field') % key
 
 
 def check_files_dir(app):
-    dir_path = Path('metadata') / app.id
-    if not dir_path.is_dir():
+    dir_path = os.path.join('metadata', app.id)
+    if not os.path.isdir(dir_path):
         return
     files = set()
-    for path in dir_path.iterdir():
-        name = path.name
-        if not (
-            path.is_file() or name == 'signatures' or locale_pattern.fullmatch(name)
-        ):
+    for name in os.listdir(dir_path):
+        path = os.path.join(dir_path, name)
+        if not (os.path.isfile(path) or name == 'signatures' or locale_pattern.match(name)):
             yield _("Found non-file at %s") % path
             continue
         files.add(name)
 
-    used = {
-        'signatures',
-    }
-    for build in app.get('Builds', []):
+    used = {'signatures', }
+    for build in app.builds:
         for fname in build.patch:
             if fname not in files:
-                yield _("Unknown file '{filename}' in build '{versionName}'").format(
-                    filename=fname, versionName=build.versionName
-                )
+                yield _("Unknown file '{filename}' in build '{versionName}'")\
+                    .format(filename=fname, versionName=build.versionName)
             else:
                 used.add(fname)
 
     for name in files.difference(used):
-        if locale_pattern.fullmatch(name):
+        if locale_pattern.match(name):
             continue
-        yield _("Unused file at %s") % (dir_path / name)
+        yield _("Unused file at %s") % os.path.join(dir_path, name)
 
 
 def check_format(app):
-    if common.options.format and not rewritemeta.proper_format(app):
+    if options.format and not rewritemeta.proper_format(app):
         yield _("Run rewritemeta to fix formatting")
 
 
 def check_license_tag(app):
-    """Ensure all license tags contain only valid/approved values.
-
-    It is possible to disable license checking by setting a null or empty value,
-    e.g. `lint_licenses: ` or `lint_licenses: []`
-
-    """
-    if 'lint_licenses' in config:
-        lint_licenses = config['lint_licenses']
-        if lint_licenses is None:
-            return
-    else:
-        lint_licenses = APPROVED_LICENSES
-    if app.License not in lint_licenses:
-        if lint_licenses == APPROVED_LICENSES:
-            yield _(
-                'Unexpected license tag "{}"! Only use FSF or OSI '
-                'approved tags from https://spdx.org/license-list'
-            ).format(app.License)
+    '''Ensure all license tags contain only valid/approved values'''
+    if config['lint_licenses'] is None:
+        return
+    if app.License not in config['lint_licenses']:
+        if config['lint_licenses'] == APPROVED_LICENSES:
+            yield _('Unexpected license tag "{}"! Only use FSF or OSI '
+                    'approved tags from https://spdx.org/license-list') \
+                .format(app.License)
         else:
-            yield _(
-                'Unexpected license tag "{}"! Only use license tags '
-                'configured in your config file'
-            ).format(app.License)
+            yield _('Unexpected license tag "{}"! Only use license tags '
+                    'configured in your config file').format(app.License)
 
 
 def check_extlib_dir(apps):
-    dir_path = Path('build/extlib')
-    extlib_files = set()
-    for path in dir_path.glob('**/*'):
-        if path.is_file():
-            extlib_files.add(path.relative_to(dir_path))
+    dir_path = os.path.join('build', 'extlib')
+    unused_extlib_files = set()
+    for root, dirs, files in os.walk(dir_path):
+        for name in files:
+            unused_extlib_files.add(os.path.join(root, name)[len(dir_path) + 1:])
 
     used = set()
     for app in apps:
-        if app.Disabled:
-            continue
-        archive_policy = common.calculate_archive_policy(
-            app, common.config['archive_older']
-        )
-        builds = [build for build in app.Builds if not build.disable]
-
-        for i in range(len(builds)):
-            build = builds[i]
+        for build in app.builds:
             for path in build.extlibs:
-                path = Path(path)
-                if path not in extlib_files:
-                    # Don't show error on archived versions
-                    if i >= len(builds) - archive_policy:
-                        yield _(
-                            "{appid}: Unknown extlib {path} in build '{versionName}'"
-                        ).format(appid=app.id, path=path, versionName=build.versionName)
+                if path not in unused_extlib_files:
+                    yield _("{appid}: Unknown extlib {path} in build '{versionName}'")\
+                        .format(appid=app.id, path=path, versionName=build.versionName)
                 else:
                     used.add(path)
 
-    for path in extlib_files.difference(used):
-        if path.name not in [
-            '.gitignore',
-            'source.txt',
-            'origin.txt',
-            'md5.txt',
-            'LICENSE',
-            'LICENSE.txt',
-            'COPYING',
-            'COPYING.txt',
-            'NOTICE',
-            'NOTICE.txt',
-        ]:
-            yield _("Unused extlib at %s") % (dir_path / path)
+    for path in unused_extlib_files.difference(used):
+        if any(path.endswith(s) for s in [
+                '.gitignore',
+                'source.txt', 'origin.txt', 'md5.txt',
+                'LICENSE', 'LICENSE.txt',
+                'COPYING', 'COPYING.txt',
+                'NOTICE', 'NOTICE.txt',
+                ]):
+            continue
+        yield _("Unused extlib at %s") % os.path.join(dir_path, path)
 
 
 def check_app_field_types(app):
-    """Check the fields have valid data types."""
+    """Check the fields have valid data types"""
+
     for field in app.keys():
         v = app.get(field)
         t = metadata.fieldtype(field)
         if v is None:
             continue
-        elif field == 'Builds':
+        elif field == 'builds':
             if not isinstance(v, list):
-                yield (
-                    _(
-                        "{appid}: {field} must be a '{type}', but it is a '{fieldtype}'!"
-                    ).format(
-                        appid=app.id,
-                        field=field,
-                        type='list',
-                        fieldtype=v.__class__.__name__,
-                    )
-                )
+                yield(_("{appid}: {field} must be a '{type}', but it is a '{fieldtype}'!")
+                      .format(appid=app.id, field=field,
+                              type='list', fieldtype=v.__class__.__name__))
         elif t == metadata.TYPE_LIST and not isinstance(v, list):
-            yield (
-                _(
-                    "{appid}: {field} must be a '{type}', but it is a '{fieldtype}!'"
-                ).format(
-                    appid=app.id,
-                    field=field,
-                    type='list',
-                    fieldtype=v.__class__.__name__,
-                )
-            )
-        elif t == metadata.TYPE_STRING and type(v) not in (str, bool, dict):
-            yield (
-                _(
-                    "{appid}: {field} must be a '{type}', but it is a '{fieldtype}'!"
-                ).format(
-                    appid=app.id,
-                    field=field,
-                    type='str',
-                    fieldtype=v.__class__.__name__,
-                )
-            )
-        elif t == metadata.TYPE_STRINGMAP and not isinstance(v, dict):
-            yield (
-                _(
-                    "{appid}: {field} must be a '{type}', but it is a '{fieldtype}'!"
-                ).format(
-                    appid=app.id,
-                    field=field,
-                    type='dict',
-                    fieldtype=v.__class__.__name__,
-                )
-            )
-        elif t == metadata.TYPE_INT and not isinstance(v, int):
-            yield (
-                _(
-                    "{appid}: {field} must be a '{type}', but it is a '{fieldtype}'!"
-                ).format(
-                    appid=app.id,
-                    field=field,
-                    type='int',
-                    fieldtype=v.__class__.__name__,
-                )
-            )
-
-
-def check_antiFeatures(app):
-    """Check the Anti-Features keys match those declared in the config."""
-    pattern = ANTIFEATURES_PATTERN
-    msg = _("'{value}' is not a valid {field} in {appid}. Regex pattern: {pattern}")
-
-    field = 'AntiFeatures'  # App entries use capitalized CamelCase
-    for value in app.get(field, []):
-        if value not in ANTIFEATURES_KEYS:
-            yield msg.format(value=value, field=field, appid=app.id, pattern=pattern)
-
-    field = 'antifeatures'  # Build entries use all lowercase
-    for build in app.get('Builds', []):
-        build_antiFeatures = build.get(field, [])
-        for value in build_antiFeatures:
-            if value not in ANTIFEATURES_KEYS:
-                yield msg.format(
-                    value=value, field=field, appid=app.id, pattern=pattern
-                )
+            yield(_("{appid}: {field} must be a '{type}', but it is a '{fieldtype}!'")
+                  .format(appid=app.id, field=field,
+                          type='list', fieldtype=v.__class__.__name__))
+        elif t == metadata.TYPE_STRING and not type(v) in (str, bool, dict):
+            yield(_("{appid}: {field} must be a '{type}', but it is a '{fieldtype}'!")
+                  .format(appid=app.id, field=field,
+                          type='str', fieldtype=v.__class__.__name__))
 
 
 def check_for_unsupported_metadata_files(basedir=""):
-    """Check whether any non-metadata files are in metadata/."""
-    basedir = Path(basedir)
+    """Checks whether any non-metadata files are in metadata/"""
+
     global config
 
-    if not (basedir / 'metadata').exists():
-        return False
     return_value = False
-    for f in (basedir / 'metadata').iterdir():
-        if f.is_dir():
-            if not Path(str(f) + '.yml').exists():
+    for f in glob.glob(basedir + 'metadata/*') + glob.glob(basedir + 'metadata/.*'):
+        if os.path.isdir(f):
+            if not os.path.exists(f + '.yml'):
                 print(_('"%s/" has no matching metadata file!') % f)
                 return_value = True
-        elif f.suffix == '.yml':
-            packageName = f.stem
+        elif f.endswith('.yml'):
+            packageName = os.path.splitext(os.path.basename(f))[0]
             if not common.is_valid_package_name(packageName):
-                print(
-                    '"'
-                    + packageName
-                    + '" is an invalid package name!\n'
-                    + 'https://developer.android.com/studio/build/application-id'
-                )
+                print('"' + packageName + '" is an invalid package name!\n'
+                      + 'https://developer.android.com/studio/build/application-id')
                 return_value = True
         else:
-            print(
-                _(
-                    '"{path}" is not a supported file format (use: metadata/*.yml)'
-                ).format(path=f.relative_to(basedir))
-            )
+            print(_('"{path}" is not a supported file format (use: metadata/*.yml)')
+                  .format(path=f.replace(basedir, '')))
             return_value = True
 
     return return_value
 
 
 def check_current_version_code(app):
-    """Check that the CurrentVersionCode is currently available."""
-    if app.get('ArchivePolicy') == 0:
+    """Check that the CurrentVersionCode is currently available"""
+
+    archive_policy = app.get('ArchivePolicy')
+    if archive_policy and archive_policy.split()[0] == "0":
         return
     cv = app.get('CurrentVersionCode')
-    if cv is not None and cv == 0:
+    if cv is not None and int(cv) == 0:
         return
 
-    builds = app.get('Builds')
+    builds = app.get('builds')
     active_builds = 0
     min_versionCode = None
     if builds:
         for build in builds:
-            vc = build['versionCode']
+            vc = int(build['versionCode'])
             if min_versionCode is None or min_versionCode > vc:
                 min_versionCode = vc
             if not build.get('disable'):
@@ -788,232 +558,38 @@ def check_current_version_code(app):
                 break
     if active_builds == 0:
         return  # all builds are disabled
-    if cv is not None and cv < min_versionCode:
-        yield (
-            _(
-                'CurrentVersionCode {cv} is less than oldest build entry {versionCode}'
-            ).format(cv=cv, versionCode=min_versionCode)
-        )
-
-
-def check_updates_expected(app):
-    """Check if update checking makes sense."""
-    if (app.get('NoSourceSince') or app.get('ArchivePolicy') == 0) and not all(
-        app.get(key, 'None') == 'None' for key in ('AutoUpdateMode', 'UpdateCheckMode')
-    ):
-        yield _(
-            'App has NoSourceSince or ArchivePolicy "0 versions" or 0 but AutoUpdateMode or UpdateCheckMode are not None'
-        )
-
-
-def check_updates_ucm_http_aum_pattern(app):  # noqa: D403
-    """AutoUpdateMode with UpdateCheckMode: HTTP must have a pattern."""
-    if app.UpdateCheckMode == "HTTP" and app.AutoUpdateMode == "Version":
-        yield _("AutoUpdateMode with UpdateCheckMode: HTTP must have a pattern.")
-
-
-def check_certificate_pinned_binaries(app):
-    keys = app.get('AllowedAPKSigningKeys')
-    known_keys = common.config.get('apk_signing_key_block_list', [])
-    if keys:
-        if known_keys:
-            for key in keys:
-                if key in known_keys:
-                    yield _('Known debug key is used in AllowedAPKSigningKeys: ') + key
-        return
-    if app.get('Binaries') is not None:
-        yield _(
-            'App has Binaries but does not have corresponding AllowedAPKSigningKeys to pin certificate.'
-        )
-        return
-    builds = app.get('Builds')
-    if builds is None:
-        return
-    for build in builds:
-        if build.get('binary') is not None:
-            yield _(
-                'App version has binary but does not have corresponding AllowedAPKSigningKeys to pin certificate.'
-            )
-            return
-
-
-def lint_config(arg):
-    path = Path(arg)
-    passed = True
-
-    mirrors_name = f'{common.MIRRORS_CONFIG_NAME}.yml'
-    config_name = f'{common.CONFIG_CONFIG_NAME}.yml'
-    categories_name = f'{common.CATEGORIES_CONFIG_NAME}.yml'
-    antifeatures_name = f'{common.ANTIFEATURES_CONFIG_NAME}.yml'
-
-    yamllintresult = common.run_yamllint(path)
-    if yamllintresult:
-        print(yamllintresult)
-        passed = False
-
-    with path.open() as fp:
-        data = yaml.load(fp)
-    common.config_type_check(arg, data)
-
-    if path.name == mirrors_name:
-        import pycountry
-
-        valid_country_codes = [c.alpha_2 for c in pycountry.countries]
-        for mirror in data:
-            code = mirror.get('countryCode')
-            if code and code not in valid_country_codes:
-                passed = False
-                msg = _(
-                    '{path}: "{code}" is not a valid ISO_3166-1 alpha-2 country code!'
-                ).format(path=str(path), code=code)
-                if code.upper() in valid_country_codes:
-                    m = [code.upper()]
-                else:
-                    m = difflib.get_close_matches(
-                        code.upper(), valid_country_codes, 2, 0.5
-                    )
-                if m:
-                    msg += ' '
-                    msg += _('Did you mean {code}?').format(code=', '.join(sorted(m)))
-                print(msg)
-    elif path.name == config_name and path.parent.name != 'config':
-        valid_keys = set(tuple(common.default_config) + bool_keys + check_config_keys)
-        for key in ignore_config_keys:
-            if key in valid_keys:
-                valid_keys.remove(key)
-        for key in data:
-            if key not in valid_keys:
-                passed = False
-                msg = _("ERROR: {key} not a valid key!").format(key=key)
-                m = difflib.get_close_matches(key.lower(), valid_keys, 2, 0.5)
-                if m:
-                    msg += ' '
-                    msg += _('Did you mean {code}?').format(code=', '.join(sorted(m)))
-                print(msg)
-                continue
-
-            if key in bool_keys:
-                t = bool
-            else:
-                t = type(common.default_config.get(key, ""))
-
-            show_error = False
-            if t is str:
-                if type(data[key]) not in (str, list, dict):
-                    passed = False
-                    show_error = True
-            elif type(data[key]) != t:
-                passed = False
-                show_error = True
-            if show_error:
-                print(
-                    _("ERROR: {key}'s value should be of type {t}!").format(
-                        key=key, t=t.__name__
-                    )
-                )
-    elif path.name in (config_name, categories_name, antifeatures_name):
-        for key in data:
-            if path.name == config_name and key not in ('archive', 'repo'):
-                passed = False
-                print(
-                    _('ERROR: {key} in {path} is not "archive" or "repo"!').format(
-                        key=key, path=path
-                    )
-                )
-            allowed_keys = ['name']
-            if path.name in [config_name, antifeatures_name]:
-                allowed_keys.append('description')
-            # only for source strings currently
-            if path.parent.name == 'config':
-                allowed_keys.append('icon')
-            for subkey in data[key]:
-                if subkey not in allowed_keys:
-                    passed = False
-                    print(
-                        _(
-                            'ERROR: {key}:{subkey} in {path} is not in allowed keys: {allowed_keys}!'
-                        ).format(
-                            key=key,
-                            subkey=subkey,
-                            path=path,
-                            allowed_keys=', '.join(allowed_keys),
-                        )
-                    )
-
-    return passed
+    if cv is not None and int(cv) < min_versionCode:
+        yield(_('CurrentVersionCode {cv} is less than oldest build entry {versionCode}')
+              .format(cv=cv, versionCode=min_versionCode))
 
 
 def main():
-    global config
+
+    global config, options
 
     # Parse command line...
     parser = ArgumentParser()
     common.setup_global_opts(parser)
-    parser.add_argument(
-        "-f",
-        "--format",
-        action="store_true",
-        default=False,
-        help=_("Also warn about formatting issues, like rewritemeta -l"),
-    )
-    parser.add_argument(
-        '--force-yamllint',
-        action="store_true",
-        default=False,
-        help=_(
-            "When linting the entire repository yamllint is disabled by default. "
-            "This option forces yamllint regardless."
-        ),
-    )
-    parser.add_argument(
-        "appid", nargs='*', help=_("application ID of file to operate on")
-    )
+    parser.add_argument("-f", "--format", action="store_true", default=False,
+                        help=_("Also warn about formatting issues, like rewritemeta -l"))
+    parser.add_argument('--force-yamllint', action="store_true", default=False,
+                        help=_("When linting the entire repository yamllint is disabled by default. "
+                               "This option forces yamllint regardless."))
+    parser.add_argument("appid", nargs='*', help=_("application ID of file to operate on"))
     metadata.add_metadata_arguments(parser)
-    options = common.parse_args(parser)
+    options = parser.parse_args()
     metadata.warnings_action = options.W
 
-    config = common.read_config()
-    load_antiFeatures_config()
-    load_categories_config()
+    config = common.read_config(options)
 
-    if options.force_yamllint:
-        import yamllint  # throw error if it is not installed
-
-        yamllint  # make pyflakes ignore this
-
-    paths = list()
-    for arg in options.appid:
-        if (
-            arg == common.CONFIG_FILE
-            or Path(arg).parent.name == 'config'
-            or Path(arg).parent.parent.name == 'config'  # localized
-        ):
-            paths.append(arg)
-
-    failed = 0
-    if paths:
-        for path in paths:
-            options.appid.remove(path)
-            if not lint_config(path):
-                failed += 1
-        # an empty list of appids means check all apps, avoid that if files were given
-        if not options.appid:
-            sys.exit(failed)
-
-    if not lint_metadata(options):
-        failed += 1
-
-    if failed:
-        sys.exit(failed)
-
-
-def lint_metadata(options):
-    apps = common.read_app_args(options.appid)
+    # Get all apps...
+    allapps = metadata.read_metadata(options.appid)
+    apps = common.read_app_args(options.appid, allapps, False)
 
     anywarns = check_for_unsupported_metadata_files()
 
     apps_check_funcs = []
-    if not options.appid:
+    if len(options.appid) == 0:
         # otherwise it finds tons of unused extlibs
         apps_check_funcs.append(check_extlib_dir)
     for check_func in apps_check_funcs:
@@ -1025,41 +601,37 @@ def lint_metadata(options):
         if app.Disabled:
             continue
 
+        if options.force_yamllint:
+            import yamllint  # throw error if it is not installed
+            yamllint  # make pyflakes ignore this
+
         # only run yamllint when linting individual apps.
-        if options.appid or options.force_yamllint:
+        if len(options.appid) > 0 or options.force_yamllint:
+
             # run yamllint on app metadata
-            ymlpath = Path('metadata') / (appid + '.yml')
-            if ymlpath.is_file():
+            ymlpath = os.path.join('metadata', appid + '.yml')
+            if os.path.isfile(ymlpath):
                 yamllintresult = common.run_yamllint(ymlpath)
-                if yamllintresult:
+                if yamllintresult != '':
                     print(yamllintresult)
 
             # run yamllint on srclib metadata
             srclibs = set()
-            for build in app.get('Builds', []):
+            for build in app.builds:
                 for srclib in build.srclibs:
-                    name, _ref, _number, _subdir = common.parse_srclib_spec(srclib)
-                    srclibs.add(name + '.yml')
+                    srclibs.add(srclib)
             for srclib in srclibs:
-                srclibpath = Path('srclibs') / srclib
-                if srclibpath.is_file():
-                    if platform.system() == 'Windows':
-                        # Handle symlink on Windows
-                        symlink = srclibpath.read_text()
-                        if symlink in srclibs:
-                            continue
-                        elif (srclibpath.parent / symlink).is_file():
-                            srclibpath = srclibpath.parent / symlink
+                name, ref, number, subdir = common.parse_srclib_spec(srclib)
+                srclibpath = os.path.join('srclibs', name + '.yml')
+                if os.path.isfile(srclibpath):
                     yamllintresult = common.run_yamllint(srclibpath)
-                    if yamllintresult:
+                    if yamllintresult != '':
                         print(yamllintresult)
 
         app_check_funcs = [
             check_app_field_types,
-            check_antiFeatures,
             check_regexes,
             check_update_check_data_url,
-            check_update_check_data_int,
             check_vercode_operation,
             check_ucm_tags,
             check_char_limits,
@@ -1070,14 +642,12 @@ def lint_metadata(options):
             check_categories,
             check_duplicates,
             check_mediawiki_links,
+            check_bulleted_lists,
             check_builds,
             check_files_dir,
             check_format,
             check_license_tag,
             check_current_version_code,
-            check_updates_expected,
-            check_updates_ucm_http_aum_pattern,
-            check_certificate_pinned_binaries,
         ]
 
         for check_func in app_check_funcs:
@@ -1085,7 +655,8 @@ def lint_metadata(options):
                 anywarns = True
                 print("%s: %s" % (appid, warn))
 
-    return not anywarns
+    if anywarns:
+        sys.exit(1)
 
 
 # A compiled, public domain list of official SPDX license tags.  generated
@@ -1114,8 +685,9 @@ APPROVED_LICENSES = [
     'Artistic-1.0-Perl',
     'Artistic-1.0-cl8',
     'Artistic-2.0',
-    'BSD-1-Clause',
+    'Beerware',
     'BSD-2-Clause',
+    'BSD-2-Clause-FreeBSD',
     'BSD-2-Clause-Patent',
     'BSD-3-Clause',
     'BSD-3-Clause-Clear',
@@ -1123,8 +695,6 @@ APPROVED_LICENSES = [
     'BSD-4-Clause',
     'BSL-1.0',
     'BitTorrent-1.1',
-    'CAL-1.0',
-    'CAL-1.0-Combined-Work-Exception',
     'CATOSL-1.1',
     'CC-BY-4.0',
     'CC-BY-SA-4.0',
@@ -1187,6 +757,7 @@ APPROVED_LICENSES = [
     'LiLiQ-Rplus-1.1',
     'MIT',
     'MIT-0',
+    'MIT-CMU',
     'MPL-1.0',
     'MPL-1.1',
     'MPL-2.0',
@@ -1195,7 +766,6 @@ APPROVED_LICENSES = [
     'MS-RL',
     'MirOS',
     'Motosoto',
-    'MulanPSL-2.0',
     'Multics',
     'NASA-1.3',
     'NCSA',
@@ -1211,12 +781,9 @@ APPROVED_LICENSES = [
     'ODbL-1.0',
     'OFL-1.0',
     'OFL-1.1',
-    'OFL-1.1-RFN',
-    'OFL-1.1-no-RFN',
     'OGTSL',
     'OLDAP-2.3',
     'OLDAP-2.7',
-    'OLDAP-2.8',
     'OSET-PL-2.1',
     'OSL-1.0',
     'OSL-1.1',
@@ -1240,9 +807,7 @@ APPROVED_LICENSES = [
     'SPL-1.0',
     'SimPL-2.0',
     'Sleepycat',
-    'UCL-1.0',
     'UPL-1.0',
-    'Unicode-DFS-2016',
     'Unlicense',
     'VSL-1.0',
     'Vim',
@@ -1252,6 +817,7 @@ APPROVED_LICENSES = [
     'X11',
     'XFree86-1.1',
     'Xnet',
+    'XSkat',
     'YPL-1.1',
     'ZPL-2.0',
     'ZPL-2.1',
diff --git a/fdroidserver/looseversion.py b/fdroidserver/looseversion.py
deleted file mode 100644
index c2a32213..00000000
--- a/fdroidserver/looseversion.py
+++ /dev/null
@@ -1,300 +0,0 @@
-# PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2
-# --------------------------------------------
-#
-# 1. This LICENSE AGREEMENT is between the Python Software Foundation
-# ("PSF"), and the Individual or Organization ("Licensee") accessing and
-# otherwise using this software ("Python") in source or binary form and
-# its associated documentation.
-#
-# 2. Subject to the terms and conditions of this License Agreement, PSF hereby
-# grants Licensee a nonexclusive, royalty-free, world-wide license to reproduce,
-# analyze, test, perform and/or display publicly, prepare derivative works,
-# distribute, and otherwise use Python alone or in any derivative version,
-# provided, however, that PSF's License Agreement and PSF's notice of copyright,
-# i.e., "Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
-# 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022 Python Software Foundation;
-# All Rights Reserved" are retained in Python alone or in any derivative version
-# prepared by Licensee.
-#
-# 3. In the event Licensee prepares a derivative work that is based on
-# or incorporates Python or any part thereof, and wants to make
-# the derivative work available to others as provided herein, then
-# Licensee hereby agrees to include in any such work a brief summary of
-# the changes made to Python.
-#
-# 4. PSF is making Python available to Licensee on an "AS IS"
-# basis.  PSF MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR
-# IMPLIED.  BY WAY OF EXAMPLE, BUT NOT LIMITATION, PSF MAKES NO AND
-# DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS
-# FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF PYTHON WILL NOT
-# INFRINGE ANY THIRD PARTY RIGHTS.
-#
-# 5. PSF SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON
-# FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS
-# A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON,
-# OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.
-#
-# 6. This License Agreement will automatically terminate upon a material
-# breach of its terms and conditions.
-#
-# 7. Nothing in this License Agreement shall be deemed to create any
-# relationship of agency, partnership, or joint venture between PSF and
-# Licensee.  This License Agreement does not grant permission to use PSF
-# trademarks or trade name in a trademark sense to endorse or promote
-# products or services of Licensee, or any third party.
-#
-# 8. By copying, installing or otherwise using Python, Licensee
-# agrees to be bound by the terms and conditions of this License
-# Agreement.
-#
-# SPDX-License-Identifier: Python-2.0
-#
-# downloaded from:
-# https://github.com/effigies/looseversion/blob/e1a5a176a92dc6825deda4205c1be6d05e9ed352/src/looseversion/__init__.py
-
-"""Provides classes to represent module version numbers (one class for
-each style of version numbering).  There are currently two such classes
-implemented: StrictVersion and LooseVersion.
-
-Every version number class implements the following interface:
-  * the 'parse' method takes a string and parses it to some internal
-    representation; if the string is an invalid version number,
-    'parse' raises a ValueError exception
-  * the class constructor takes an optional string argument which,
-    if supplied, is passed to 'parse'
-  * __str__ reconstructs the string that was passed to 'parse' (or
-    an equivalent string -- ie. one that will generate an equivalent
-    version number instance)
-  * __repr__ generates Python code to recreate the version number instance
-  * _cmp compares the current instance with either another instance
-    of the same class or a string (which will be parsed to an instance
-    of the same class, thus must follow the same rules)
-"""
-import re
-import sys
-
-__license__ = "Python License 2.0"
-
-# The rules according to Greg Stein:
-# 1) a version number has 1 or more numbers separated by a period or by
-#    sequences of letters. If only periods, then these are compared
-#    left-to-right to determine an ordering.
-# 2) sequences of letters are part of the tuple for comparison and are
-#    compared lexicographically
-# 3) recognize the numeric components may have leading zeroes
-#
-# The LooseVersion class below implements these rules: a version number
-# string is split up into a tuple of integer and string components, and
-# comparison is a simple tuple comparison.  This means that version
-# numbers behave in a predictable and obvious way, but a way that might
-# not necessarily be how people *want* version numbers to behave.  There
-# wouldn't be a problem if people could stick to purely numeric version
-# numbers: just split on period and compare the numbers as tuples.
-# However, people insist on putting letters into their version numbers;
-# the most common purpose seems to be:
-#   - indicating a "pre-release" version
-#     ('alpha', 'beta', 'a', 'b', 'pre', 'p')
-#   - indicating a post-release patch ('p', 'pl', 'patch')
-# but of course this can't cover all version number schemes, and there's
-# no way to know what a programmer means without asking him.
-#
-# The problem is what to do with letters (and other non-numeric
-# characters) in a version number.  The current implementation does the
-# obvious and predictable thing: keep them as strings and compare
-# lexically within a tuple comparison.  This has the desired effect if
-# an appended letter sequence implies something "post-release":
-# eg. "0.99" < "0.99pl14" < "1.0", and "5.001" < "5.001m" < "5.002".
-#
-# However, if letters in a version number imply a pre-release version,
-# the "obvious" thing isn't correct.  Eg. you would expect that
-# "1.5.1" < "1.5.2a2" < "1.5.2", but under the tuple/lexical comparison
-# implemented here, this just isn't so.
-#
-# Two possible solutions come to mind.  The first is to tie the
-# comparison algorithm to a particular set of semantic rules, as has
-# been done in the StrictVersion class above.  This works great as long
-# as everyone can go along with bondage and discipline.  Hopefully a
-# (large) subset of Python module programmers will agree that the
-# particular flavor of bondage and discipline provided by StrictVersion
-# provides enough benefit to be worth using, and will submit their
-# version numbering scheme to its domination.  The free-thinking
-# anarchists in the lot will never give in, though, and something needs
-# to be done to accommodate them.
-#
-# Perhaps a "moderately strict" version class could be implemented that
-# lets almost anything slide (syntactically), and makes some heuristic
-# assumptions about non-digits in version number strings.  This could
-# sink into special-case-hell, though; if I was as talented and
-# idiosyncratic as Larry Wall, I'd go ahead and implement a class that
-# somehow knows that "1.2.1" < "1.2.2a2" < "1.2.2" < "1.2.2pl3", and is
-# just as happy dealing with things like "2g6" and "1.13++".  I don't
-# think I'm smart enough to do it right though.
-#
-# In any case, I've coded the test suite for this module (see
-# ../test/test_version.py) specifically to fail on things like comparing
-# "1.2a2" and "1.2".  That's not because the *code* is doing anything
-# wrong, it's because the simple, obvious design doesn't match my
-# complicated, hairy expectations for real-world version numbers.  It
-# would be a snap to fix the test suite to say, "Yep, LooseVersion does
-# the Right Thing" (ie. the code matches the conception).  But I'd rather
-# have a conception that matches common notions about version numbers.
-
-
-if sys.version_info >= (3,):
-
-    class _Py2Int(int):
-        """Integer object that compares < any string"""
-
-        def __gt__(self, other):
-            if isinstance(other, str):
-                return False
-            return super().__gt__(other)
-
-        def __lt__(self, other):
-            if isinstance(other, str):
-                return True
-            return super().__lt__(other)
-
-else:
-    _Py2Int = int
-
-
-class LooseVersion(object):
-    """Version numbering for anarchists and software realists.
-    Implements the standard interface for version number classes as
-    described above.  A version number consists of a series of numbers,
-    separated by either periods or strings of letters.  When comparing
-    version numbers, the numeric components will be compared
-    numerically, and the alphabetic components lexically.  The following
-    are all valid version numbers, in no particular order:
-
-        1.5.1
-        1.5.2b2
-        161
-        3.10a
-        8.02
-        3.4j
-        1996.07.12
-        3.2.pl0
-        3.1.1.6
-        2g6
-        11g
-        0.960923
-        2.2beta29
-        1.13++
-        5.5.kw
-        2.0b1pl0
-
-    In fact, there is no such thing as an invalid version number under
-    this scheme; the rules for comparison are simple and predictable,
-    but may not always give the results you want (for some definition
-    of "want").
-    """
-
-    component_re = re.compile(r"(\d+ | [a-z]+ | \.)", re.VERBOSE)
-
-    def __init__(self, vstring=None):
-        if vstring:
-            self.parse(vstring)
-
-    def __eq__(self, other):
-        c = self._cmp(other)
-        if c is NotImplemented:
-            return NotImplemented
-        return c == 0
-
-    def __lt__(self, other):
-        c = self._cmp(other)
-        if c is NotImplemented:
-            return NotImplemented
-        return c < 0
-
-    def __le__(self, other):
-        c = self._cmp(other)
-        if c is NotImplemented:
-            return NotImplemented
-        return c <= 0
-
-    def __gt__(self, other):
-        c = self._cmp(other)
-        if c is NotImplemented:
-            return NotImplemented
-        return c > 0
-
-    def __ge__(self, other):
-        c = self._cmp(other)
-        if c is NotImplemented:
-            return NotImplemented
-        return c >= 0
-
-    def parse(self, vstring):
-        # I've given up on thinking I can reconstruct the version string
-        # from the parsed tuple -- so I just store the string here for
-        # use by __str__
-        self.vstring = vstring
-        components = [x for x in self.component_re.split(vstring) if x and x != "."]
-        for i, obj in enumerate(components):
-            try:
-                components[i] = int(obj)
-            except ValueError:
-                pass
-
-        self.version = components
-
-    def __str__(self):
-        return self.vstring
-
-    def __repr__(self):
-        return "LooseVersion ('%s')" % str(self)
-
-    def _cmp(self, other):
-        other = self._coerce(other)
-        if other is NotImplemented:
-            return NotImplemented
-
-        if self.version == other.version:
-            return 0
-        if self.version < other.version:
-            return -1
-        if self.version > other.version:
-            return 1
-        return NotImplemented
-
-    @classmethod
-    def _coerce(cls, other):
-        if isinstance(other, cls):
-            return other
-        elif isinstance(other, str):
-            return cls(other)
-        elif "distutils" in sys.modules:
-            # Using this check to avoid importing distutils and suppressing the warning
-            try:
-                from distutils.version import LooseVersion as deprecated
-            except ImportError:
-                return NotImplemented
-            if isinstance(other, deprecated):
-                return cls(str(other))
-        return NotImplemented
-
-
-class LooseVersion2(LooseVersion):
-    """LooseVersion variant that restores Python 2 semantics
-
-    In Python 2, comparing LooseVersions where paired components could be string
-    and int always resulted in the string being "greater". In Python 3, this produced
-    a TypeError.
-    """
-
-    def parse(self, vstring):
-        # I've given up on thinking I can reconstruct the version string
-        # from the parsed tuple -- so I just store the string here for
-        # use by __str__
-        self.vstring = vstring
-        components = [x for x in self.component_re.split(vstring) if x and x != "."]
-        for i, obj in enumerate(components):
-            try:
-                components[i] = _Py2Int(obj)
-            except ValueError:
-                pass
-
-        self.version = components
diff --git a/fdroidserver/metadata.py b/fdroidserver/metadata.py
index 0d9195be..b4b0ab26 100644
--- a/fdroidserver/metadata.py
+++ b/fdroidserver/metadata.py
@@ -18,19 +18,21 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-import logging
-import math
 import os
-import platform
 import re
+import glob
+import logging
+import yaml
+try:
+    from yaml import CSafeLoader as SafeLoader
+except ImportError:
+    from yaml import SafeLoader
+import importlib
 from collections import OrderedDict
-from pathlib import Path
 
-import ruamel.yaml
-
-from . import _, common
-from ._yaml import yaml
-from .exception import MetaDataException
+import fdroidserver.common
+from fdroidserver import _
+from fdroidserver.exception import MetaDataException, FDroidException
 
 srclibs = None
 warnings_action = None
@@ -41,7 +43,7 @@ VALID_USERNAME_REGEX = re.compile(r'^[a-z\d](?:[a-z\d/._-]){0,38}$', re.IGNORECA
 
 
 def _warn_or_exception(value, cause=None):
-    """Output warning or Exception depending on -W."""
+    '''output warning or Exception depending on -W'''
     if warnings_action == 'ignore':
         pass
     elif warnings_action == 'error':
@@ -67,7 +69,9 @@ yaml_app_field_order = [
     'Translation',
     'Changelog',
     'Donate',
+    'FlattrID',
     'Liberapay',
+    'LiberapayID',
     'OpenCollective',
     'Bitcoin',
     'Litecoin',
@@ -85,8 +89,6 @@ yaml_app_field_order = [
     '\n',
     'Builds',
     '\n',
-    'AllowedAPKSigningKeys',
-    '\n',
     'MaintainerNotes',
     '\n',
     'ArchivePolicy',
@@ -107,6 +109,7 @@ yaml_app_fields = [x for x in yaml_app_field_order if x != '\n']
 
 
 class App(dict):
+
     def __init__(self, copydict=None):
         if copydict:
             super().__init__(copydict)
@@ -114,7 +117,7 @@ class App(dict):
         super().__init__()
 
         self.Disabled = None
-        self.AntiFeatures = dict()
+        self.AntiFeatures = []
         self.Provides = None
         self.Categories = []
         self.License = 'Unknown'
@@ -127,7 +130,9 @@ class App(dict):
         self.Translation = ''
         self.Changelog = ''
         self.Donate = None
+        self.FlattrID = None
         self.Liberapay = None
+        self.LiberapayID = None
         self.OpenCollective = None
         self.Bitcoin = None
         self.Litecoin = None
@@ -139,13 +144,12 @@ class App(dict):
         self.RepoType = ''
         self.Repo = ''
         self.Binaries = None
-        self.AllowedAPKSigningKeys = []
         self.MaintainerNotes = ''
         self.ArchivePolicy = None
         self.AutoUpdateMode = 'None'
         self.UpdateCheckMode = 'None'
         self.UpdateCheckIgnore = None
-        self.VercodeOperation = []
+        self.VercodeOperation = None
         self.UpdateCheckName = None
         self.UpdateCheckData = None
         self.CurrentVersion = ''
@@ -154,7 +158,8 @@ class App(dict):
 
         self.id = None
         self.metadatapath = None
-        self.Builds = []
+        self.builds = []
+        self.comments = {}
         self.added = None
         self.lastUpdated = None
 
@@ -173,7 +178,15 @@ class App(dict):
         else:
             raise AttributeError("No such attribute: " + name)
 
+    def get_last_build(self):
+        if len(self.builds) > 0:
+            return self.builds[-1]
+        else:
+            return Build()
 
+
+TYPE_UNKNOWN = 0
+TYPE_OBSOLETE = 1
 TYPE_STRING = 2
 TYPE_BOOL = 3
 TYPE_LIST = 4
@@ -181,19 +194,15 @@ TYPE_SCRIPT = 5
 TYPE_MULTILINE = 6
 TYPE_BUILD = 7
 TYPE_INT = 8
-TYPE_STRINGMAP = 9
 
 fieldtypes = {
     'Description': TYPE_MULTILINE,
     'MaintainerNotes': TYPE_MULTILINE,
     'Categories': TYPE_LIST,
-    'AntiFeatures': TYPE_STRINGMAP,
-    'RequiresRoot': TYPE_BOOL,
-    'AllowedAPKSigningKeys': TYPE_LIST,
-    'Builds': TYPE_BUILD,
-    'VercodeOperation': TYPE_LIST,
-    'CurrentVersionCode': TYPE_INT,
-    'ArchivePolicy': TYPE_INT,
+    'AntiFeatures': TYPE_LIST,
+    'Build': TYPE_BUILD,
+    'BuildVersion': TYPE_OBSOLETE,
+    'UseBuilt': TYPE_OBSOLETE,
 }
 
 
@@ -218,8 +227,8 @@ build_flags = [
     'patch',
     'gradle',
     'maven',
+    'buildozer',
     'output',
-    'binary',
     'srclibs',
     'oldsdkloc',
     'encoding',
@@ -238,13 +247,13 @@ build_flags = [
     'preassemble',
     'gradleprops',
     'antcommands',
-    'postbuild',
     'novcheck',
     'antifeatures',
 ]
 
 
 class Build(dict):
+
     def __init__(self, copydict=None):
         super().__init__()
         self.disable = ''
@@ -256,9 +265,9 @@ class Build(dict):
         self.init = ''
         self.patch = []
         self.gradle = []
-        self.maven = None
+        self.maven = False
+        self.buildozer = False
         self.output = None
-        self.binary = None
         self.srclibs = []
         self.oldsdkloc = False
         self.encoding = None
@@ -277,9 +286,8 @@ class Build(dict):
         self.preassemble = []
         self.gradleprops = []
         self.antcommands = []
-        self.postbuild = ''
         self.novcheck = False
-        self.antifeatures = dict()
+        self.antifeatures = []
         if copydict:
             super().__init__(copydict)
             return
@@ -299,12 +307,8 @@ class Build(dict):
         else:
             raise AttributeError("No such attribute: " + name)
 
-    @classmethod
-    def to_yaml(cls, representer, node):
-        return representer.represent_dict(node)
-
     def build_method(self):
-        for f in ['maven', 'gradle']:
+        for f in ['maven', 'gradle', 'buildozer']:
             if self.get(f):
                 return f
         if self.output:
@@ -315,25 +319,19 @@ class Build(dict):
     def output_method(self):
         if self.output:
             return 'raw'
-        for f in ['maven', 'gradle']:
+        for f in ['maven', 'gradle', 'buildozer']:
             if self.get(f):
                 return f
         return 'ant'
 
-    def ndk_path(self) -> str:
-        """Return the path string of the first configured NDK or an empty string."""
-        ndk = self.ndk
-        if isinstance(ndk, list):
-            ndk = self.ndk[0]
-        path = common.config['ndk_paths'].get(ndk)
-        if path and not isinstance(path, str):
-            raise TypeError('NDK path is not string')
-        if path:
-            return path
-        for vsn, path in common.config['ndk_paths'].items():
-            if not vsn.endswith("_orig") and path and os.path.basename(path) == ndk:
-                return path
-        return ''
+    def ndk_path(self):
+        version = self.ndk
+        if not version:
+            version = 'r12b'  # falls back to latest
+        paths = fdroidserver.common.config['ndk_paths']
+        if version not in paths:
+            return ''
+        return paths[version]
 
 
 flagtypes = {
@@ -354,13 +352,12 @@ flagtypes = {
     'init': TYPE_SCRIPT,
     'prebuild': TYPE_SCRIPT,
     'build': TYPE_SCRIPT,
-    'postbuild': TYPE_SCRIPT,
     'submodules': TYPE_BOOL,
     'oldsdkloc': TYPE_BOOL,
     'forceversion': TYPE_BOOL,
     'forcevercode': TYPE_BOOL,
     'novcheck': TYPE_BOOL,
-    'antifeatures': TYPE_STRINGMAP,
+    'antifeatures': TYPE_LIST,
     'timeout': TYPE_INT,
 }
 
@@ -371,8 +368,9 @@ def flagtype(name):
     return TYPE_STRING
 
 
-class FieldValidator:
-    """Designate App metadata field types and checks that it matches.
+class FieldValidator():
+    """
+    Designates App metadata field types and checks that it matches
 
     'name'     - The long name of the field type
     'matching' - List of possible values or regex expression
@@ -395,21 +393,24 @@ class FieldValidator:
             values = [v]
         for v in values:
             if not self.compiled.match(v):
-                _warn_or_exception(
-                    _(
-                        "'{value}' is not a valid {field} in {appid}. Regex pattern: {pattern}"
-                    ).format(
-                        value=v, field=self.name, appid=appid, pattern=self.matching
-                    )
-                )
+                _warn_or_exception(_("'{value}' is not a valid {field} in {appid}. Regex pattern: {pattern}")
+                                   .format(value=v, field=self.name, appid=appid, pattern=self.matching))
 
 
 # Generic value types
 valuetypes = {
+    FieldValidator("Flattr ID",
+                   r'^[0-9a-z]+$',
+                   ['FlattrID']),
+
     FieldValidator("Liberapay",
                    VALID_USERNAME_REGEX,
                    ['Liberapay']),
 
+    FieldValidator("Liberapay ID",
+                   r'^[0-9]+$',
+                   ['LiberapayID']),
+
     FieldValidator("Open Collective",
                    VALID_USERNAME_REGEX,
                    ['OpenCollective']),
@@ -427,7 +428,7 @@ valuetypes = {
                    ["Bitcoin"]),
 
     FieldValidator("Litecoin address",
-                   r'^([LM3][a-km-zA-HJ-NP-Z1-9]{26,33}|ltc1[a-z0-9]{39})$',
+                   r'^[LM3][a-km-zA-HJ-NP-Z1-9]{26,33}$',
                    ["Litecoin"]),
 
     FieldValidator("Repo Type",
@@ -438,16 +439,20 @@ valuetypes = {
                    r'^http[s]?://',
                    ["Binaries"]),
 
-    FieldValidator("AllowedAPKSigningKeys",
-                   r'^[a-fA-F0-9]{64}$',
-                   ["AllowedAPKSigningKeys"]),
+    FieldValidator("Archive Policy",
+                   r'^[0-9]+ versions$',
+                   ["ArchivePolicy"]),
+
+    FieldValidator("Anti-Feature",
+                   r'^(Ads|Tracking|NonFreeNet|NonFreeDep|NonFreeAdd|UpstreamNonFree|NonFreeAssets|KnownVuln|ApplicationDebuggable|NoSourceSince)$',
+                   ["AntiFeatures"]),
 
     FieldValidator("Auto Update Mode",
-                   r"^(Version.*|None)$",
+                   r"^(Version .+|None)$",
                    ["AutoUpdateMode"]),
 
     FieldValidator("Update Check Mode",
-                   r"^(Tags|Tags .+|RepoManifest|RepoManifest/.+|HTTP|Static|None)$",
+                   r"^(Tags|Tags .+|RepoManifest|RepoManifest/.+|RepoTrunk|HTTP|Static|None)$",
                    ["UpdateCheckMode"])
 }
 
@@ -460,45 +465,38 @@ def check_metadata(app):
 
 
 def parse_yaml_srclib(metadatapath):
-    thisinfo = {'RepoType': '', 'Repo': '', 'Subdir': None, 'Prepare': None}
 
-    if not metadatapath.exists():
-        _warn_or_exception(
-            _("Invalid scrlib metadata: '{file}' does not exist").format(
-                file=metadatapath
-            )
-        )
+    thisinfo = {'RepoType': '',
+                'Repo': '',
+                'Subdir': None,
+                'Prepare': None}
+
+    if not os.path.exists(metadatapath):
+        _warn_or_exception(_("Invalid scrlib metadata: '{file}' "
+                             "does not exist"
+                             .format(file=metadatapath)))
         return thisinfo
 
-    with metadatapath.open("r", encoding="utf-8") as f:
+    with open(metadatapath, "r", encoding="utf-8") as f:
         try:
-            data = yaml.load(f)
+            data = yaml.load(f, Loader=SafeLoader)
             if type(data) is not dict:
-                if platform.system() == 'Windows':
-                    # Handle symlink on Windows
-                    symlink = metadatapath.parent / metadatapath.read_text(encoding='utf-8')
-                    if symlink.is_file():
-                        with symlink.open("r", encoding="utf-8") as s:
-                            data = yaml.load(s)
-            if type(data) is not dict:
-                raise ruamel.yaml.YAMLError(
-                    _('{file} is blank or corrupt!').format(file=metadatapath)
-                )
-        except ruamel.yaml.YAMLError as e:
+                raise yaml.error.YAMLError(_('{file} is blank or corrupt!')
+                                           .format(file=metadatapath))
+        except yaml.error.YAMLError as e:
             _warn_or_exception(_("Invalid srclib metadata: could not "
                                  "parse '{file}'")
                                .format(file=metadatapath) + '\n'
-                               + common.run_yamllint(metadatapath, indent=4),
+                               + fdroidserver.common.run_yamllint(metadatapath,
+                                                                  indent=4),
                                cause=e)
             return thisinfo
 
-    for key in data:
-        if key not in thisinfo:
-            _warn_or_exception(
-                _("Invalid srclib metadata: unknown key '{key}' in '{file}'").format(
-                    key=key, file=metadatapath
-                )
-            )
+    for key in data.keys():
+        if key not in thisinfo.keys():
+            _warn_or_exception(_("Invalid srclib metadata: unknown key "
+                                 "'{key}' in '{file}'")
+                               .format(key=key, file=metadatapath))
             return thisinfo
         else:
             if key == 'Subdir':
@@ -508,11 +506,8 @@ def parse_yaml_srclib(metadatapath):
                     thisinfo[key] = data[key]
                 elif data[key] is None:
                     thisinfo[key] = ['']
-            elif key == 'Prepare' or flagtype(key) == TYPE_SCRIPT:
-                if isinstance(data[key], list):
-                    thisinfo[key] = data[key]
-                else:
-                    thisinfo[key] = [data[key]] if data[key] else []
+            elif key == 'Prepare' and isinstance(data[key], list):
+                thisinfo[key] = ' && '.join(data[key])
             else:
                 thisinfo[key] = str(data[key] or '')
 
@@ -537,24 +532,27 @@ def read_srclibs():
 
     srclibs = {}
 
-    srclibs_dir = Path('srclibs')
-    srclibs_dir.mkdir(exist_ok=True)
+    srcdir = 'srclibs'
+    if not os.path.exists(srcdir):
+        os.makedirs(srcdir)
 
-    for metadatapath in sorted(srclibs_dir.glob('*.yml')):
-        srclibs[metadatapath.stem] = parse_yaml_srclib(metadatapath)
+    for metadatapath in sorted(glob.glob(os.path.join(srcdir, '*.yml'))):
+        srclibname = os.path.basename(metadatapath[:-4])
+        srclibs[srclibname] = parse_yaml_srclib(metadatapath)
 
 
-def read_metadata(appid_to_vercode={}, sort_by_time=False):
-    """Return a list of App instances sorted newest first.
+def read_metadata(appids={}, refresh=True, sort_by_time=False):
+    """Return a list of App instances sorted newest first
 
     This reads all of the metadata files in a 'data' repository, then
     builds a list of App instances from those files.  The list is
     sorted based on creation time, newest first.  Most of the time,
     the newer files are the most interesting.
 
-    appid_to_vercode is a dict with appids a keys and versionCodes as values.
+    appids is a dict with appids a keys and versionCodes as values.
 
     """
+
     # Always read the srclibs before the apps, since they can use a srlib as
     # their source repository.
     read_srclibs()
@@ -562,17 +560,28 @@ def read_metadata(appid_to_vercode={}, sort_by_time=False):
     apps = OrderedDict()
 
     for basedir in ('metadata', 'tmp'):
-        Path(basedir).mkdir(exist_ok=True)
+        if not os.path.exists(basedir):
+            os.makedirs(basedir)
 
-    if appid_to_vercode:
-        metadatafiles = common.get_metadata_files(appid_to_vercode)
+    if appids:
+        vercodes = fdroidserver.common.read_pkg_args(appids)
+        found_invalid = False
+        metadatafiles = []
+        for appid in vercodes.keys():
+            f = os.path.join('metadata', '%s.yml' % appid)
+            if os.path.exists(f):
+                metadatafiles.append(f)
+            else:
+                found_invalid = True
+                logging.critical(_("No such package: %s") % appid)
+        if found_invalid:
+            raise FDroidException(_("Found invalid appids in arguments"))
     else:
-        metadatafiles = list(Path('metadata').glob('*.yml')) + list(
-            Path('.').glob('.fdroid.yml')
-        )
+        metadatafiles = (glob.glob(os.path.join('metadata', '*.yml'))
+                         + glob.glob('.fdroid.yml'))
 
     if sort_by_time:
-        entries = ((path.stat().st_mtime, path) for path in metadatafiles)
+        entries = ((os.stat(path).st_mtime, path) for path in metadatafiles)
         metadatafiles = []
         for _ignored, path in sorted(entries, reverse=True):
             metadatafiles.append(path)
@@ -581,704 +590,403 @@ def read_metadata(appid_to_vercode={}, sort_by_time=False):
         metadatafiles = sorted(metadatafiles)
 
     for metadatapath in metadatafiles:
-        appid = metadatapath.stem
-        if appid != '.fdroid' and not common.is_valid_package_name(appid):
-            _warn_or_exception(
-                _("{appid} from {path} is not a valid Java Package Name!").format(
-                    appid=appid, path=metadatapath
-                )
-            )
+        appid, _ignored = fdroidserver.common.get_extension(os.path.basename(metadatapath))
+        if appid != '.fdroid' and not fdroidserver.common.is_valid_package_name(appid):
+            _warn_or_exception(_("{appid} from {path} is not a valid Java Package Name!")
+                               .format(appid=appid, path=metadatapath))
         if appid in apps:
-            _warn_or_exception(
-                _("Found multiple metadata files for {appid}").format(appid=appid)
-            )
-        app = parse_metadata(metadatapath)
+            _warn_or_exception(_("Found multiple metadata files for {appid}")
+                               .format(appid=appid))
+        app = parse_metadata(metadatapath, appid in appids, refresh)
         check_metadata(app)
         apps[app.id] = app
 
     return apps
 
 
-def parse_metadata(metadatapath):
-    """Parse metadata file, also checking the source repo for .fdroid.yml.
+# Port legacy ';' separators
+list_sep = re.compile(r'[,;]')
 
-    This function finds the relevant files, gets them parsed, converts
-    dicts into App and Build instances, and combines the results into
-    a single App instance.
 
-    If this is a metadata file from fdroiddata, it will first load the
-    source repo type and URL from fdroiddata, then read .fdroid.yml if
-    it exists, then include the rest of the metadata as specified in
-    fdroiddata, so that fdroiddata has precedence over the metadata in
-    the source code.
+def split_list_values(s):
+    res = []
+    for v in re.split(list_sep, s):
+        if not v:
+            continue
+        v = v.strip()
+        if not v:
+            continue
+        res.append(v)
+    return res
 
-    .fdroid.yml is embedded in the app's source repo, so it is
-    "user-generated".  That means that it can have weird things in it
-    that need to be removed so they don't break the overall process,
-    e.g. if the upstream developer includes some broken field, it can
-    be overridden in the metadata file.
 
-    Parameters
-    ----------
-    metadatapath
-      The file path to read. The "Application ID" aka "Package Name"
-      for the application comes from this filename.
+def sorted_builds(builds):
+    return sorted(builds, key=lambda build: int(build.versionCode))
 
-    Raises
-    ------
-    FDroidException when there are syntax errors.
 
-    Returns
-    -------
-    Returns a dictionary containing all the details of the
-    application. There are two major kinds of information in the
-    dictionary. Keys beginning with capital letters correspond
-    directory to identically named keys in the metadata file.  Keys
-    beginning with lower case letters are generated in one way or
-    another, and are not found verbatim in the metadata.
+esc_newlines = re.compile(r'\\( |\n)')
+
+
+def post_metadata_parse(app):
+    # TODO keep native types, convert only for .txt metadata
+    for k, v in app.items():
+        if type(v) in (float, int):
+            app[k] = str(v)
+
+    if 'Builds' in app:
+        app['builds'] = app.pop('Builds')
+
+    if 'flavours' in app and app['flavours'] == [True]:
+        app['flavours'] = 'yes'
+
+    for field, fieldtype in fieldtypes.items():
+        if fieldtype != TYPE_LIST:
+            continue
+        value = app.get(field)
+        if isinstance(value, str):
+            app[field] = [value, ]
+        elif value is not None:
+            app[field] = [str(i) for i in value]
+
+    def _yaml_bool_unmapable(v):
+        return v in (True, False, [True], [False])
+
+    def _yaml_bool_unmap(v):
+        if v is True:
+            return 'yes'
+        elif v is False:
+            return 'no'
+        elif v == [True]:
+            return ['yes']
+        elif v == [False]:
+            return ['no']
+
+    _bool_allowed = ('maven', 'buildozer')
+
+    builds = []
+    if 'builds' in app:
+        for build in app['builds']:
+            if not isinstance(build, Build):
+                build = Build(build)
+            for k, v in build.items():
+                if not (v is None):
+                    if flagtype(k) == TYPE_LIST:
+                        if _yaml_bool_unmapable(v):
+                            build[k] = _yaml_bool_unmap(v)
+
+                        if isinstance(v, str):
+                            build[k] = [v]
+                        elif isinstance(v, bool):
+                            if v:
+                                build[k] = ['yes']
+                            else:
+                                build[k] = []
+                    elif flagtype(k) is TYPE_INT:
+                        build[k] = str(v)
+                    elif flagtype(k) is TYPE_STRING:
+                        if isinstance(v, bool) and k in _bool_allowed:
+                            build[k] = v
+                        else:
+                            if _yaml_bool_unmapable(v):
+                                build[k] = _yaml_bool_unmap(v)
+                            else:
+                                build[k] = str(v)
+            builds.append(build)
+
+    app.builds = sorted_builds(builds)
+
+
+# Parse metadata for a single application.
+#
+#  'metadatapath' - the filename to read. The "Application ID" aka
+#               "Package Name" for the application comes from this
+#               filename. Pass None to get a blank entry.
+#
+# Returns a dictionary containing all the details of the application. There are
+# two major kinds of information in the dictionary. Keys beginning with capital
+# letters correspond directory to identically named keys in the metadata file.
+# Keys beginning with lower case letters are generated in one way or another,
+# and are not found verbatim in the metadata.
+#
+# Known keys not originating from the metadata are:
+#
+#  'builds'           - a list of dictionaries containing build information
+#                       for each defined build
+#  'comments'         - a list of comments from the metadata file. Each is
+#                       a list of the form [field, comment] where field is
+#                       the name of the field it preceded in the metadata
+#                       file. Where field is None, the comment goes at the
+#                       end of the file. Alternatively, 'build:version' is
+#                       for a comment before a particular build version.
+#  'descriptionlines' - original lines of description as formatted in the
+#                       metadata file.
+#
+
+
+bool_true = re.compile(r'([Yy]es|[Tt]rue)')
+bool_false = re.compile(r'([Nn]o|[Ff]alse)')
+
+
+def _decode_bool(s):
+    if bool_true.match(s):
+        return True
+    if bool_false.match(s):
+        return False
+    _warn_or_exception(_("Invalid boolean '%s'") % s)
+
+
+def parse_metadata(metadatapath, check_vcs=False, refresh=True):
+    '''parse metadata file, optionally checking the git repo for metadata first'''
 
-    """
-    metadatapath = Path(metadatapath)
     app = App()
-    app.metadatapath = metadatapath.as_posix()
-    if metadatapath.suffix == '.yml':
-        with metadatapath.open('r', encoding='utf-8') as mf:
-            app.update(parse_yaml_metadata(mf))
+    app.metadatapath = metadatapath
+    name, _ignored = fdroidserver.common.get_extension(os.path.basename(metadatapath))
+    if name == '.fdroid':
+        check_vcs = False
     else:
-        _warn_or_exception(
-            _('Unknown metadata format: {path} (use: *.yml)').format(path=metadatapath)
-        )
+        app.id = name
 
-    if metadatapath.stem != '.fdroid':
-        app.id = metadatapath.stem
-        parse_localized_antifeatures(app)
+    if metadatapath.endswith('.yml'):
+        with open(metadatapath, 'r') as mf:
+            parse_yaml_metadata(mf, app)
+    else:
+        _warn_or_exception(_('Unknown metadata format: {path} (use: *.yml)')
+                           .format(path=metadatapath))
 
-    if metadatapath.name != '.fdroid.yml' and app.Repo:
-        build_dir = common.get_build_dir(app)
-        metadata_in_repo = build_dir / '.fdroid.yml'
-        if metadata_in_repo.is_file():
-            commit_id = common.get_head_commit_id(build_dir)
-            if commit_id is not None:
-                logging.debug(
-                    _('Including metadata from %s@%s') % (metadata_in_repo, commit_id)
-                )
-            else:
-                logging.debug(
-                    _('Including metadata from {path}').format(path=metadata_in_repo)
-                )
+    if check_vcs and app.Repo:
+        build_dir = fdroidserver.common.get_build_dir(app)
+        metadata_in_repo = os.path.join(build_dir, '.fdroid.yml')
+        if not os.path.isfile(metadata_in_repo):
+            vcs, build_dir = fdroidserver.common.setup_vcs(app)
+            if isinstance(vcs, fdroidserver.common.vcs_git):
+                vcs.gotorevision('HEAD', refresh)  # HEAD since we can't know where else to go
+        if os.path.isfile(metadata_in_repo):
+            logging.debug('Including metadata from ' + metadata_in_repo)
+            # do not include fields already provided by main metadata file
             app_in_repo = parse_metadata(metadata_in_repo)
             for k, v in app_in_repo.items():
                 if k not in app:
                     app[k] = v
 
-    builds = []
-    for build in app.get('Builds', []):
-        builds.append(Build(build))
-    if builds:
-        app['Builds'] = builds
+    post_metadata_parse(app)
 
-    # if only .fdroid.yml was found, then this finds the appid
     if not app.id:
-        if app.get('Builds'):
-            build = app['Builds'][-1]
+        if app.builds:
+            build = app.builds[-1]
             if build.subdir:
-                root_dir = Path(build.subdir)
+                root_dir = build.subdir
             else:
-                root_dir = Path('.')
-            paths = common.manifest_paths(root_dir, build.gradle)
-            _ignored, _ignored, app.id = common.parse_androidmanifests(paths, app)
+                root_dir = '.'
+            paths = fdroidserver.common.manifest_paths(root_dir, build.gradle)
+            _ignored, _ignored, app.id = fdroidserver.common.parse_androidmanifests(paths, app)
 
     return app
 
 
-def parse_yaml_metadata(mf):
-    """Parse the .yml file and post-process it.
-
-    This function handles parsing a metadata YAML file and converting
-    all the various data types into a consistent internal
-    representation.  The results are meant to update an existing App
-    instance or used as a plain dict.
-
-    Clean metadata .yml files can be used directly, but in order to
-    make a better user experience for people editing .yml files, there
-    is post processing.  That makes the parsing perform something like
-    Strict YAML.
-
-    """
+def parse_yaml_metadata(mf, app):
     try:
-        yamldata = common.yaml.load(mf)
-    except ruamel.yaml.YAMLError as e:
-        _warn_or_exception(
-            _("could not parse '{path}'").format(path=mf.name)
-            + '\n'
-            + common.run_yamllint(mf.name, indent=4),
-            cause=e,
-        )
-
-    if yamldata is None or yamldata == '':
-        yamldata = dict()
-    if not isinstance(yamldata, dict):
-        _warn_or_exception(
-            _("'{path}' has invalid format, it should be a dictionary!").format(
-                path=mf.name
-            )
-        )
-        logging.error(_('Using blank dictionary instead of contents of {path}!').format(
-            path=mf.name)
-        )
-        yamldata = dict()
+        yamldata = yaml.load(mf, Loader=SafeLoader)
+    except yaml.YAMLError as e:
+        _warn_or_exception(_("could not parse '{path}'")
+                           .format(path=mf.name) + '\n'
+                           + fdroidserver.common.run_yamllint(mf.name,
+                                                              indent=4),
+                           cause=e)
 
     deprecated_in_yaml = ['Provides']
 
-    for field in tuple(yamldata.keys()):
-        if field not in yaml_app_fields + deprecated_in_yaml:
-            msg = _("Unrecognised app field '{fieldname}' in '{path}'").format(
-                fieldname=field, path=mf.name
-            )
-            if Path(mf.name).name == '.fdroid.yml':
-                logging.error(msg)
-                del yamldata[field]
-            else:
-                _warn_or_exception(msg)
+    if yamldata:
+        for field in yamldata:
+            if field not in yaml_app_fields:
+                if field not in deprecated_in_yaml:
+                    _warn_or_exception(_("Unrecognised app field "
+                                         "'{fieldname}' in '{path}'")
+                                       .format(fieldname=field,
+                                               path=mf.name))
 
-    for deprecated_field in deprecated_in_yaml:
-        if deprecated_field in yamldata:
-            del yamldata[deprecated_field]
-            logging.warning(
-                _(
-                    "Ignoring '{field}' in '{metapath}' "
-                    "metadata because it is deprecated."
-                ).format(field=deprecated_field, metapath=mf.name)
-            )
+        for deprecated_field in deprecated_in_yaml:
+            if deprecated_field in yamldata:
+                logging.warning(_("Ignoring '{field}' in '{metapath}' "
+                                  "metadata because it is deprecated.")
+                                .format(field=deprecated_field,
+                                        metapath=mf.name))
+                del(yamldata[deprecated_field])
 
-    msg = _("Unrecognised build flag '{build_flag}' in '{path}'")
-    for build in yamldata.get('Builds', []):
-        for build_flag in build:
-            if build_flag not in build_flags:
-                _warn_or_exception(msg.format(build_flag=build_flag, path=mf.name))
-
-    post_parse_yaml_metadata(yamldata)
-    return yamldata
-
-
-def parse_localized_antifeatures(app):
-    """Read in localized Anti-Features files from the filesystem.
-
-    To support easy integration with Weblate and other translation
-    systems, there is a special type of metadata that can be
-    maintained in a Fastlane-style directory layout, where each field
-    is represented by a text file on directories that specified which
-    app it belongs to, which locale, etc.  This function reads those
-    in and puts them into the internal dict, to be merged with any
-    related data that came from the metadata.yml file.
-
-    This needs to be run after parse_yaml_metadata() since that
-    normalizes the data structure.  Also, these values are lower
-    priority than what comes from the metadata file. So this should
-    not overwrite anything parse_yaml_metadata() puts into the App
-    instance.
-
-    metadata/<Application ID>/<locale>/antifeatures/<Version Code>_<Anti-Feature>.txt
-    metadata/<Application ID>/<locale>/antifeatures/<Anti-Feature>.txt
-
-    └── metadata/
-        └── <Application ID>/
-            ├── en-US/
-            │   └── antifeatures/
-            │       ├── 123_Ads.txt       -> "includes ad lib"
-            │       ├── 123_Tracking.txt  -> "standard suspects"
-            │       └── NoSourceSince.txt -> "it vanished"
-            │
-            └── zh-CN/
-                └── antifeatures/
-                    └── 123_Ads.txt       -> "包括广告库"
-
-    Gets parsed into the metadata data structure:
-
-    AntiFeatures:
-      NoSourceSince:
-        en-US: it vanished
-    Builds:
-      - versionCode: 123
-        antifeatures:
-          Ads:
-            en-US: includes ad lib
-            zh-CN: 包括广告库
-          Tracking:
-            en-US: standard suspects
-
-    """
-    app_dir = Path('metadata', app['id'])
-    if not app_dir.is_dir():
-        return
-    af_dup_msg = _('Duplicate Anti-Feature declaration at {path} was ignored!')
-
-    if app.get('AntiFeatures'):
-        app_has_AntiFeatures = True
-    else:
-        app_has_AntiFeatures = False
-
-    has_versionCode = re.compile(r'^-?[0-9]+_.*')
-    has_antifeatures_from_app = set()
-    for build in app.get('Builds', []):
-        antifeatures = build.get('antifeatures')
-        if antifeatures:
-            has_antifeatures_from_app.add(build['versionCode'])
-
-    for f in sorted(app_dir.glob('*/antifeatures/*.txt')):
-        path = f.as_posix()
-        left = path.index('/', 9)  # 9 is length of "metadata/"
-        right = path.index('/', left + 1)
-        locale = path[left + 1 : right]
-        description = f.read_text()
-        if has_versionCode.match(f.stem):
-            i = f.stem.index('_')
-            versionCode = int(f.stem[:i])
-            antifeature = f.stem[i + 1 :]
-            if versionCode in has_antifeatures_from_app:
-                logging.error(af_dup_msg.format(path=f))
-                continue
-            if 'Builds' not in app:
-                app['Builds'] = []
-            found = False
-            for build in app['Builds']:
-                # loop though builds again, there might be duplicate versionCodes
-                if versionCode == build['versionCode']:
-                    found = True
-                    if 'antifeatures' not in build:
-                        build['antifeatures'] = dict()
-                    if antifeature not in build['antifeatures']:
-                        build['antifeatures'][antifeature] = dict()
-                    build['antifeatures'][antifeature][locale] = description
-            if not found:
-                app['Builds'].append(
-                    {
-                        'versionCode': versionCode,
-                        'antifeatures': {
-                            antifeature: {locale: description},
-                        },
-                    }
-                )
-        elif app_has_AntiFeatures:
-            logging.error(af_dup_msg.format(path=f))
-            continue
-        else:
-            if 'AntiFeatures' not in app:
-                app['AntiFeatures'] = dict()
-            if f.stem not in app['AntiFeatures']:
-                app['AntiFeatures'][f.stem] = dict()
-            app['AntiFeatures'][f.stem][locale] = f.read_text()
-
-
-def _normalize_type_int(k, v):
-    """Normalize anything that can be reliably converted to an integer."""
-    if isinstance(v, int) and not isinstance(v, bool):
-        return v
-    if v is None:
-        return None
-    if isinstance(v, str):
-        try:
-            return int(v)
-        except ValueError:
-            pass
-    msg = _('{build_flag} must be an integer, found: {value}')
-    _warn_or_exception(msg.format(build_flag=k, value=v))
-
-
-def _normalize_type_string(v):
-    """Normalize any data to TYPE_STRING.
-
-    YAML 1.2's booleans are all lowercase.
-
-    Things like versionName are strings, but without quotes can be
-    numbers.  Like "versionName: 1.0" would be a YAML float, but
-    should be a string.
-
-    SHA-256 values are string values, but YAML 1.2 can interpret some
-    unquoted values as decimal ints.  This converts those to a string
-    if they are over 50 digits.  In the wild, the longest 0 padding on
-    a SHA-256 key fingerprint I found was 8 zeros.
-
-    """
-    if isinstance(v, bool):
-        if v:
-            return 'true'
-        return 'false'
-    if isinstance(v, float):
-        # YAML 1.2 values for NaN, Inf, and -Inf
-        if math.isnan(v):
-            return '.nan'
-        if math.isinf(v):
-            if v > 0:
-                return '.inf'
-            return '-.inf'
-    if v and isinstance(v, int):
-        if math.log10(v) > 50:  # only if the int has this many digits
-            return '%064d' % v
-    return str(v)
-
-
-def _normalize_type_stringmap(k, v):
-    """Normalize any data to TYPE_STRINGMAP.
-
-    The internal representation of this format is a dict of dicts,
-    where the outer dict's keys are things like tag names of
-    Anti-Features, the inner dict's keys are locales, and the ultimate
-    values are human readable text.
-
-    Metadata entries like AntiFeatures: can be written in many
-    forms, including a simple one-entry string, a list of strings,
-    a dict with keys and descriptions as values, or a dict with
-    localization.
-
-    Returns
-    -------
-    A dictionary with string keys, where each value is either a string
-    message or a dict with locale keys and string message values.
-
-    """
-    if v is None:
-        return dict()
-    if isinstance(v, str) or isinstance(v, int) or isinstance(v, float):
-        return {_normalize_type_string(v): dict()}
-    if isinstance(v, list) or isinstance(v, tuple) or isinstance(v, set):
-        retdict = dict()
-        for i in v:
-            if isinstance(i, dict):
-                # transitional format
-                if len(i) != 1:
-                    _warn_or_exception(
-                        _(
-                            "'{value}' is not a valid {field}, should be {pattern}"
-                        ).format(field=k, value=v, pattern='key: value')
-                    )
-                afname = _normalize_type_string(next(iter(i)))
-                desc = _normalize_type_string(next(iter(i.values())))
-                retdict[afname] = {common.DEFAULT_LOCALE: desc}
-            else:
-                retdict[_normalize_type_string(i)] = {}
-        return retdict
-
-    retdict = dict()
-    for af, afdict in v.items():
-        key = _normalize_type_string(af)
-        if afdict:
-            if isinstance(afdict, dict):
-                retdict[key] = afdict
-            else:
-                retdict[key] = {common.DEFAULT_LOCALE: _normalize_type_string(afdict)}
-        else:
-            retdict[key] = dict()
-
-    return retdict
-
-
-def _normalize_type_list(k, v):
-    """Normalize any data to TYPE_LIST, which is always a list of strings."""
-    if isinstance(v, dict):
-        msg = _('{build_flag} must be list or string, found: {value}')
-        _warn_or_exception(msg.format(build_flag=k, value=v))
-    elif type(v) not in (list, tuple, set):
-        v = [v]
-    return [_normalize_type_string(i) for i in v]
+        if yamldata.get('Builds', None):
+            for build in yamldata.get('Builds', []):
+                # put all build flag keywords into a set to avoid
+                # excessive looping action
+                build_flag_set = set()
+                for build_flag in build.keys():
+                    build_flag_set.add(build_flag)
+                for build_flag in build_flag_set:
+                    if build_flag not in build_flags:
+                        _warn_or_exception(
+                            _("Unrecognised build flag '{build_flag}' "
+                              "in '{path}'").format(build_flag=build_flag,
+                                                    path=mf.name))
+        post_parse_yaml_metadata(yamldata)
+        app.update(yamldata)
+    return app
 
 
 def post_parse_yaml_metadata(yamldata):
-    """Convert human-readable metadata data structures into consistent data structures.
-
-    "Be conservative in what is written out, be liberal in what is parsed."
-    https://en.wikipedia.org/wiki/Robustness_principle
-
-    This also handles conversions that make metadata YAML behave
-    something like StrictYAML.  Specifically, a field should have a
-    fixed value type, regardless of YAML 1.2's type auto-detection.
-
-    TODO: None values should probably be treated as the string 'null',
-    since YAML 1.2 uses that for nulls
-
-    """
-    for k, v in yamldata.items():
-        _fieldtype = fieldtype(k)
-        if _fieldtype == TYPE_LIST:
-            if v or v == 0:
-                yamldata[k] = _normalize_type_list(k, v)
-        elif _fieldtype == TYPE_INT:
-            # ArchivePolicy used to require " versions" in the value.
-            if k == 'ArchivePolicy' and isinstance(v, str):
-                v = v.split(' ', maxsplit=1)[0]
-            v = _normalize_type_int(k, v)
-            if v or v == 0:
-                yamldata[k] = v
-        elif _fieldtype == TYPE_STRING:
-            if v or v == 0:
-                yamldata[k] = _normalize_type_string(v)
-        elif _fieldtype == TYPE_STRINGMAP:
-            if v or v == 0:  # TODO probably want just `if v:`
-                yamldata[k] = _normalize_type_stringmap(k, v)
-        elif _fieldtype == TYPE_BOOL:
-            yamldata[k] = bool(v)
-        else:
-            if type(v) in (float, int):
-                yamldata[k] = str(v)
-
-    builds = []
+    """transform yaml metadata to our internal data format"""
     for build in yamldata.get('Builds', []):
-        for k, v in build.items():
-            if v is None:
-                continue
+        for flag in build.keys():
+            _flagtype = flagtype(flag)
 
-            _flagtype = flagtype(k)
-            if _flagtype == TYPE_STRING:
-                if v or v == 0:
-                    build[k] = _normalize_type_string(v)
-            elif _flagtype == TYPE_INT:
-                v = _normalize_type_int(k, v)
-                if v or v == 0:
-                    build[k] = v
-            elif _flagtype in (TYPE_LIST, TYPE_SCRIPT):
-                if v or v == 0:
-                    build[k] = _normalize_type_list(k, v)
-            elif _flagtype == TYPE_STRINGMAP:
-                if v or v == 0:
-                    build[k] = _normalize_type_stringmap(k, v)
-            elif _flagtype == TYPE_BOOL:
-                build[k] = bool(v)
-
-        builds.append(build)
-
-    if builds:
-        yamldata['Builds'] = sorted(builds, key=lambda build: build['versionCode'])
-
-    no_source_since = yamldata.get("NoSourceSince")
-    # do not overwrite the description if it is there
-    if no_source_since and not yamldata.get('AntiFeatures', {}).get('NoSourceSince'):
-        if 'AntiFeatures' not in yamldata:
-            yamldata['AntiFeatures'] = dict()
-        yamldata['AntiFeatures']['NoSourceSince'] = {
-            common.DEFAULT_LOCALE: no_source_since
-        }
-
-
-def _format_multiline(value):
-    """TYPE_MULTILINE with newlines in them are saved as YAML literal strings."""
-    if '\n' in value:
-        return ruamel.yaml.scalarstring.preserve_literal(str(value))
-    return str(value)
-
-
-def _format_list(value):
-    """TYPE_LIST should not contain null values."""
-    return [v for v in value if v]
-
-
-def _format_script(value):
-    """TYPE_SCRIPT with one value are converted to YAML string values."""
-    value = [v for v in value if v]
-    if len(value) == 1:
-        return value[0]
-    return value
-
-
-def _format_stringmap(appid, field, stringmap, versionCode=None):
-    """Format TYPE_STRINGMAP taking into account localized files in the metadata dir.
-
-    If there are any localized versions on the filesystem already,
-    then move them all there.  Otherwise, keep them in the .yml file.
-
-    The directory for the localized files that is named after the
-    field is all lower case, following the convention set by Fastlane
-    metadata, and used by fdroidserver.
-
-    """
-    app_dir = Path('metadata', appid)
-    try:
-        next(app_dir.glob('*/%s/*.txt' % field.lower()))
-        files = []
-        overwrites = []
-        for name, descdict in stringmap.items():
-            for locale, desc in descdict.items():
-                outdir = app_dir / locale / field.lower()
-                if versionCode:
-                    filename = '%d_%s.txt' % (versionCode, name)
-                else:
-                    filename = '%s.txt' % name
-                outfile = outdir / filename
-                files.append(str(outfile))
-                if outfile.exists():
-                    if desc != outfile.read_text():
-                        overwrites.append(str(outfile))
-                else:
-                    if not outfile.parent.exists():
-                        outfile.parent.mkdir(parents=True)
-                    outfile.write_text(desc)
-        if overwrites:
-            _warn_or_exception(
-                _(
-                    'Conflicting "{field}" definitions between .yml and localized files:'
-                ).format(field=field)
-                + '\n'
-                + '\n'.join(sorted(overwrites))
-            )
-        logging.warning(
-            _('Moving Anti-Features declarations to localized files:')
-            + '\n'
-            + '\n'.join(sorted(files))
-        )
-        return
-    except StopIteration:
-        pass
-    make_list = True
-    outlist = []
-    for name in sorted(stringmap):
-        outlist.append(name)
-        descdict = stringmap.get(name)
-        if descdict and any(descdict.values()):
-            make_list = False
-            break
-    if make_list:
-        return sorted(outlist, key=str.lower)
-    return stringmap
-
-
-def _del_duplicated_NoSourceSince(app):
-    # noqa: D403 NoSourceSince is the word.
-    """NoSourceSince gets auto-added to AntiFeatures, but can also be manually added."""
-    key = 'NoSourceSince'
-    if key in app:
-        no_source_since = app.get(key)
-        af_no_source_since = app.get('AntiFeatures', dict()).get(key)
-        if af_no_source_since == {common.DEFAULT_LOCALE: no_source_since}:
-            del app['AntiFeatures'][key]
-
-
-def _builds_to_yaml(app):
-    """Reformat Builds: flags for output to YAML 1.2.
-
-    This will strip any flag/value that is not set or is empty.
-    TYPE_BOOL fields are removed when they are false.  0 is valid
-    value, it should not be stripped, so there are special cases to
-    handle that.
-
-    """
-    builds = ruamel.yaml.comments.CommentedSeq()
-    for build in app.get('Builds', []):
-        b = ruamel.yaml.comments.CommentedMap()
-        for field in build_flags:
-            v = build.get(field)
-            if v is None or v is False or v == '' or v == dict() or v == list():
-                continue
-            _flagtype = flagtype(field)
-            if _flagtype == TYPE_MULTILINE:
-                v = _format_multiline(v)
-            elif _flagtype == TYPE_LIST:
-                v = _format_list(v)
-            elif _flagtype == TYPE_SCRIPT:
-                v = _format_script(v)
-            elif _flagtype == TYPE_STRINGMAP:
-                v = _format_stringmap(app['id'], field, v, build['versionCode'])
-
-            if v or v == 0:
-                b[field] = v
-
-        builds.append(b)
-
-    # insert extra empty lines between build entries
-    for i in range(1, len(builds)):
-        builds.yaml_set_comment_before_after_key(i, 'bogus')
-        builds.ca.items[i][1][-1].value = '\n'
-
-    return builds
-
-
-def _app_to_yaml(app):
-    cm = ruamel.yaml.comments.CommentedMap()
-    insert_newline = False
-    for field in yaml_app_field_order:
-        if field == '\n':
-            # next iteration will need to insert a newline
-            insert_newline = True
-        else:
-            value = app.get(field)
-            if value or field in ('Builds', 'ArchivePolicy'):
-                _fieldtype = fieldtype(field)
-                if field == 'Builds':
-                    if app.get('Builds'):
-                        cm.update({field: _builds_to_yaml(app)})
-                elif field == 'Categories':
-                    cm[field] = sorted(value, key=str.lower)
-                elif field == 'AntiFeatures':
-                    v = _format_stringmap(app['id'], field, value)
-                    if v:
-                        cm[field] = v
-                elif field == 'AllowedAPKSigningKeys':
-                    value = [str(i).lower() for i in value]
-                    if len(value) == 1:
-                        cm[field] = value[0]
-                    else:
-                        cm[field] = value
-                elif field == 'ArchivePolicy':
-                    if value is None:
-                        continue
-                    cm[field] = value
-                elif _fieldtype == TYPE_MULTILINE:
-                    v = _format_multiline(value)
-                    if v:
-                        cm[field] = v
-                elif _fieldtype == TYPE_SCRIPT:
-                    v = _format_script(value)
-                    if v:
-                        cm[field] = v
-                else:
-                    if value:
-                        cm[field] = value
-
-                if insert_newline:
-                    # we need to prepend a newline in front of this field
-                    insert_newline = False
-                    # inserting empty lines is not supported so we add a
-                    # bogus comment and over-write its value
-                    cm.yaml_set_comment_before_after_key(field, 'bogus')
-                    cm.ca.items[field][1][-1].value = '\n'
-    return cm
+            if _flagtype is TYPE_SCRIPT:
+                # concatenate script flags into a single string if they are stored as list
+                if isinstance(build[flag], list):
+                    build[flag] = ' && '.join(build[flag])
+            elif _flagtype is TYPE_STRING:
+                # things like versionNames are strings, but without quotes can be numbers
+                if isinstance(build[flag], float) or isinstance(build[flag], int):
+                    build[flag] = str(build[flag])
+            elif _flagtype is TYPE_INT:
+                # versionCode must be int
+                if not isinstance(build[flag], int):
+                    _warn_or_exception(_('{build_flag} must be an integer, found: {value}')
+                                       .format(build_flag=flag, value=build[flag]))
 
 
 def write_yaml(mf, app):
     """Write metadata in yaml format.
 
-    This requires the 'rt' round trip dumper to maintain order and needs
-    custom indent settings, so it needs to instantiate its own YAML
-    instance.  Therefore, this function deliberately avoids using any of
-    the common YAML parser setups.
-
-    Parameters
-    ----------
-    mf
-      active file discriptor for writing
-    app
-      app metadata to written to the YAML file
-
+    :param mf: active file discriptor for writing
+    :param app: app metadata to written to the yaml file
     """
-    _del_duplicated_NoSourceSince(app)
+
+    # import rumael.yaml and check version
+    try:
+        import ruamel.yaml
+    except ImportError as e:
+        raise FDroidException('ruamel.yaml not installed, can not write metadata.') from e
+    if not ruamel.yaml.__version__:
+        raise FDroidException('ruamel.yaml.__version__ not accessible. Please make sure a ruamel.yaml >= 0.13 is installed..')
+    m = re.match(r'(?P<major>[0-9]+)\.(?P<minor>[0-9]+)\.(?P<patch>[0-9]+)(-.+)?',
+                 ruamel.yaml.__version__)
+    if not m:
+        raise FDroidException('ruamel.yaml version malfored, please install an upstream version of ruamel.yaml')
+    if int(m.group('major')) < 0 or int(m.group('minor')) < 13:
+        raise FDroidException('currently installed version of ruamel.yaml ({}) is too old, >= 1.13 required.'.format(ruamel.yaml.__version__))
+    # suiteable version ruamel.yaml imported successfully
+
+    _yaml_bools_true = ('y', 'Y', 'yes', 'Yes', 'YES',
+                        'true', 'True', 'TRUE',
+                        'on', 'On', 'ON')
+    _yaml_bools_false = ('n', 'N', 'no', 'No', 'NO',
+                         'false', 'False', 'FALSE',
+                         'off', 'Off', 'OFF')
+    _yaml_bools_plus_lists = []
+    _yaml_bools_plus_lists.extend(_yaml_bools_true)
+    _yaml_bools_plus_lists.extend([[x] for x in _yaml_bools_true])
+    _yaml_bools_plus_lists.extend(_yaml_bools_false)
+    _yaml_bools_plus_lists.extend([[x] for x in _yaml_bools_false])
+
+    def _class_as_dict_representer(dumper, data):
+        '''Creates a YAML representation of a App/Build instance'''
+        return dumper.represent_dict(data)
+
+    def _field_to_yaml(typ, value):
+        if typ is TYPE_STRING:
+            if value in _yaml_bools_plus_lists:
+                return ruamel.yaml.scalarstring.SingleQuotedScalarString(str(value))
+            return str(value)
+        elif typ is TYPE_INT:
+            return int(value)
+        elif typ is TYPE_MULTILINE:
+            if '\n' in value:
+                return ruamel.yaml.scalarstring.preserve_literal(str(value))
+            else:
+                return str(value)
+        elif typ is TYPE_SCRIPT:
+            if type(value) == list:
+                if len(value) == 1:
+                    return value[0]
+                else:
+                    return value
+            else:
+                script_lines = value.split(' && ')
+                if len(script_lines) > 1:
+                    return script_lines
+                else:
+                    return value
+        else:
+            return value
+
+    def _app_to_yaml(app):
+        cm = ruamel.yaml.comments.CommentedMap()
+        insert_newline = False
+        for field in yaml_app_field_order:
+            if field == '\n':
+                # next iteration will need to insert a newline
+                insert_newline = True
+            else:
+                if app.get(field) or field == 'Builds':
+                    # .txt called it 'builds' internally, everywhere else its 'Builds'
+                    if field == 'Builds':
+                        if app.get('builds'):
+                            cm.update({field: _builds_to_yaml(app)})
+                    elif field == 'CurrentVersionCode':
+                        cm.update({field: _field_to_yaml(TYPE_INT, getattr(app, field))})
+                    else:
+                        cm.update({field: _field_to_yaml(fieldtype(field), getattr(app, field))})
+
+                    if insert_newline:
+                        # we need to prepend a newline in front of this field
+                        insert_newline = False
+                        # inserting empty lines is not supported so we add a
+                        # bogus comment and over-write its value
+                        cm.yaml_set_comment_before_after_key(field, 'bogus')
+                        cm.ca.items[field][1][-1].value = '\n'
+        return cm
+
+    def _builds_to_yaml(app):
+        builds = ruamel.yaml.comments.CommentedSeq()
+        for build in app.builds:
+            b = ruamel.yaml.comments.CommentedMap()
+            for field in build_flags:
+                value = getattr(build, field)
+                if hasattr(build, field) and value:
+                    if field == 'gradle' and value == ['off']:
+                        value = [ruamel.yaml.scalarstring.SingleQuotedScalarString('off')]
+                    if field in ('maven', 'buildozer'):
+                        if value == 'no':
+                            continue
+                        elif value == 'yes':
+                            value = 'yes'
+                    b.update({field: _field_to_yaml(flagtype(field), value)})
+            builds.append(b)
+
+        # insert extra empty lines between build entries
+        for i in range(1, len(builds)):
+            builds.yaml_set_comment_before_after_key(i, 'bogus')
+            builds.ca.items[i][1][-1].value = '\n'
+
+        return builds
+
     yaml_app = _app_to_yaml(app)
-    yamlmf = ruamel.yaml.YAML(typ='rt')
-    yamlmf.indent(mapping=2, sequence=4, offset=2)
-    yamlmf.dump(yaml_app, stream=mf)
+    ruamel.yaml.round_trip_dump(yaml_app, mf, indent=4, block_seq_indent=2)
+
+
+build_line_sep = re.compile(r'(?<!\\),')
+build_cont = re.compile(r'^[ \t]')
 
 
 def write_metadata(metadatapath, app):
-    metadatapath = Path(metadatapath)
-    if metadatapath.suffix == '.yml':
-        with metadatapath.open('w') as mf:
-            return write_yaml(mf, app)
+    if metadatapath.endswith('.yml'):
+        if importlib.util.find_spec('ruamel.yaml'):
+            with open(metadatapath, 'w') as mf:
+                return write_yaml(mf, app)
+        else:
+            raise FDroidException(_('ruamel.yaml not installed, can not write metadata.'))
 
     _warn_or_exception(_('Unknown metadata format: %s') % metadatapath)
 
 
 def add_metadata_arguments(parser):
-    """Add common command line flags related to metadata processing."""
-    parser.add_argument(
-        "-W",
-        choices=['error', 'warn', 'ignore'],
-        default='error',
-        help=_("force metadata errors (default) to be warnings, or to be ignored."),
-    )
+    '''add common command line flags related to metadata processing'''
+    parser.add_argument("-W", choices=['error', 'warn', 'ignore'], default='error',
+                        help=_("force metadata errors (default) to be warnings, or to be ignored."))
diff --git a/fdroidserver/mirror.py b/fdroidserver/mirror.py
index b06df3b1..89da89f8 100644
--- a/fdroidserver/mirror.py
+++ b/fdroidserver/mirror.py
@@ -7,14 +7,19 @@ import posixpath
 import socket
 import subprocess
 import sys
-import urllib.parse
 from argparse import ArgumentParser
+import urllib.parse
 
-from . import _, common, index, update
+from . import _
+from . import common
+from . import index
+from . import update
+
+options = None
 
 
-def _run_wget(path, urls, verbose=False):
-    if verbose:
+def _run_wget(path, urls):
+    if options.verbose:
         verbose = '--verbose'
     else:
         verbose = '--no-verbose'
@@ -22,73 +27,38 @@ def _run_wget(path, urls, verbose=False):
     if not urls:
         return
     logging.debug(_('Running wget in {path}').format(path=path))
-    cwd = os.getcwd()
     os.makedirs(path, exist_ok=True)
     os.chdir(path)
     urls_file = '.fdroid-mirror-wget-input-file'
     with open(urls_file, 'w') as fp:
         for url in urls:
             fp.write(url.split('?')[0] + '\n')  # wget puts query string in the filename
-    subprocess.call(
-        [
-            'wget',
-            verbose,
-            '--continue',
-            '--user-agent="fdroid mirror"',
-            '--input-file=' + urls_file,
-        ]
-    )
+    subprocess.call(['wget', verbose, '--continue', '--user-agent="fdroid mirror"',
+                     '--input-file=' + urls_file])
     os.remove(urls_file)
-    os.chdir(cwd)  # leave the working env the way we found it
 
 
 def main():
+    global options
+
     parser = ArgumentParser()
     common.setup_global_opts(parser)
-    parser.add_argument(
-        "url",
-        nargs='?',
-        help=_(
-            'Base URL to mirror, can include the index signing key '
-            + 'using the query string: ?fingerprint='
-        ),
-    )
-    parser.add_argument(
-        "--all",
-        action='store_true',
-        default=False,
-        help=_("Mirror the full repo and archive, all file types."),
-    )
-    parser.add_argument(
-        "--archive",
-        action='store_true',
-        default=False,
-        help=_("Also mirror the full archive section"),
-    )
-    parser.add_argument(
-        "--build-logs",
-        action='store_true',
-        default=False,
-        help=_("Include the build logs in the mirror"),
-    )
-    parser.add_argument(
-        "--pgp-signatures",
-        action='store_true',
-        default=False,
-        help=_("Include the PGP signature .asc files in the mirror"),
-    )
-    parser.add_argument(
-        "--src-tarballs",
-        action='store_true',
-        default=False,
-        help=_("Include the source tarballs in the mirror"),
-    )
-    parser.add_argument(
-        "--output-dir", default=None, help=_("The directory to write the mirror to")
-    )
-    options = common.parse_args(parser)
-
-    common.set_console_logging(options.verbose, options.color)
+    parser.add_argument("url", nargs='?',
+                        help=_('Base URL to mirror, can include the index signing key '
+                               + 'using the query string: ?fingerprint='))
+    parser.add_argument("--all", action='store_true', default=False,
+                        help=_("Mirror the full repo and archive, all file types."))
+    parser.add_argument("--archive", action='store_true', default=False,
+                        help=_("Also mirror the full archive section"))
+    parser.add_argument("--build-logs", action='store_true', default=False,
+                        help=_("Include the build logs in the mirror"))
+    parser.add_argument("--pgp-signatures", action='store_true', default=False,
+                        help=_("Include the PGP signature .asc files in the mirror"))
+    parser.add_argument("--src-tarballs", action='store_true', default=False,
+                        help=_("Include the source tarballs in the mirror"))
+    parser.add_argument("--output-dir", default=None,
+                        help=_("The directory to write the mirror to"))
+    options = parser.parse_args()
 
     if options.all:
         options.archive = True
@@ -105,34 +75,26 @@ def main():
     fingerprint = urllib.parse.parse_qs(query).get('fingerprint')
 
     def _append_to_url_path(*args):
-        """Append the list of path components to URL, keeping the rest the same."""
+        '''Append the list of path components to URL, keeping the rest the same'''
         newpath = posixpath.join(path, *args)
-        return urllib.parse.urlunparse(
-            (scheme, hostname, newpath, params, query, fragment)
-        )
+        return urllib.parse.urlunparse((scheme, hostname, newpath, params, query, fragment))
 
     if fingerprint:
-        config = common.read_config()
+        config = common.read_config(options)
         if not ('jarsigner' in config or 'apksigner' in config):
-            logging.error(
-                _('Java JDK not found! Install in standard location or set java_paths!')
-            )
+            logging.error(_('Java JDK not found! Install in standard location or set java_paths!'))
             sys.exit(1)
 
         def _get_index(section, etag=None):
             url = _append_to_url_path(section)
             data, etag = index.download_repo_index(url, etag=etag)
             return data, etag, _append_to_url_path(section, 'index-v1.jar')
-
     else:
-
         def _get_index(section, etag=None):
             import io
             import json
             import zipfile
-
             from . import net
-
             url = _append_to_url_path(section, 'index-v1.jar')
             content, etag = net.http_get(url)
             with zipfile.ZipFile(io.BytesIO(content)) as zip:
@@ -145,30 +107,21 @@ def main():
         ip = ipaddress.ip_address(hostname)
     except ValueError:
         pass
-    if hostname == 'f-droid.org' or (
-        ip is not None and hostname in socket.gethostbyname_ex('f-droid.org')[2]
-    ):
-        logging.error(
-            _(
-                'This command should never be used to mirror f-droid.org! '
-                'A full copy requires more than 600GB.'
-            )
-        )
+    if hostname == 'f-droid.org' \
+       or (ip is not None and hostname in socket.gethostbyname_ex('f-droid.org')[2]):
+        print(_('ERROR: this command should never be used to mirror f-droid.org!\n'
+                'A full mirror of f-droid.org requires more than 200GB.'))
         sys.exit(1)
 
     path = path.rstrip('/')
     if path.endswith('repo') or path.endswith('archive'):
-        logging.warning(
-            _('Do not include "{path}" in URL!').format(path=path.split('/')[-1])
-        )
+        logging.warning(_('Do not include "{path}" in URL!')
+                        .format(path=path.split('/')[-1]))
     elif not path.endswith('fdroid'):
-        logging.warning(
-            _('{url} does not end with "fdroid", check the URL path!').format(
-                url=options.url
-            )
-        )
+        logging.warning(_('{url} does not end with "fdroid", check the URL path!')
+                        .format(url=options.url))
 
-    icondirs = ['icons']
+    icondirs = ['icons', ]
     for density in update.screen_densities:
         icondirs.append('icons-' + density)
 
@@ -181,7 +134,7 @@ def main():
     if options.archive:
         sections = ('repo', 'archive')
     else:
-        sections = ('repo',)
+        sections = ('repo', )
 
     for section in sections:
         sectiondir = os.path.join(basedir, section)
@@ -199,31 +152,25 @@ def main():
         for packageName, packageList in data['packages'].items():
             for package in packageList:
                 to_fetch = []
-                keys = ['apkName']
+                keys = ['apkName', ]
                 if options.src_tarballs:
                     keys.append('srcname')
                 for k in keys:
                     if k in package:
                         to_fetch.append(package[k])
                     elif k == 'apkName':
-                        logging.error(
-                            _('{appid} is missing {name}').format(
-                                appid=package['packageName'], name=k
-                            )
-                        )
+                        logging.error(_('{appid} is missing {name}')
+                                      .format(appid=package['packageName'], name=k))
                 for f in to_fetch:
-                    if not os.path.exists(f) or (
-                        f.endswith('.apk') and os.path.getsize(f) != package['size']
-                    ):
+                    if not os.path.exists(f) \
+                       or (f.endswith('.apk') and os.path.getsize(f) != package['size']):
                         urls.append(_append_to_url_path(section, f))
                         if options.pgp_signatures:
                             urls.append(_append_to_url_path(section, f + '.asc'))
                         if options.build_logs and f.endswith('.apk'):
-                            urls.append(
-                                _append_to_url_path(section, f[:-4] + '.log.gz')
-                            )
+                            urls.append(_append_to_url_path(section, f[:-4] + '.log.gz'))
 
-        _run_wget(sectiondir, urls, options.verbose)
+        _run_wget(sectiondir, urls)
 
         for app in data['apps']:
             localized = app.get('localized')
@@ -234,29 +181,23 @@ def main():
                     for k in update.GRAPHIC_NAMES:
                         f = d.get(k)
                         if f:
-                            filepath_tuple = components + (f,)
+                            filepath_tuple = components + (f, )
                             urls.append(_append_to_url_path(*filepath_tuple))
-                    _run_wget(os.path.join(basedir, *components), urls, options.verbose)
+                    _run_wget(os.path.join(basedir, *components), urls)
                     for k in update.SCREENSHOT_DIRS:
                         urls = []
                         filelist = d.get(k)
                         if filelist:
                             components = (section, app['packageName'], locale, k)
                             for f in filelist:
-                                filepath_tuple = components + (f,)
+                                filepath_tuple = components + (f, )
                                 urls.append(_append_to_url_path(*filepath_tuple))
-                            _run_wget(
-                                os.path.join(basedir, *components),
-                                urls,
-                                options.verbose,
-                            )
+                            _run_wget(os.path.join(basedir, *components), urls)
 
         urls = dict()
         for app in data['apps']:
             if 'icon' not in app:
-                logging.error(
-                    _('no "icon" in {appid}').format(appid=app['packageName'])
-                )
+                logging.error(_('no "icon" in {appid}').format(appid=app['packageName']))
                 continue
             icon = app['icon']
             for icondir in icondirs:
@@ -266,12 +207,7 @@ def main():
                 urls[icondir].append(url)
 
         for icondir in icondirs:
-            if icondir in urls:
-                _run_wget(
-                    os.path.join(basedir, section, icondir),
-                    urls[icondir],
-                    options.verbose,
-                )
+            _run_wget(os.path.join(basedir, section, icondir), urls[icondir])
 
 
 if __name__ == "__main__":
diff --git a/fdroidserver/net.py b/fdroidserver/net.py
index fe097fd5..3f497999 100644
--- a/fdroidserver/net.py
+++ b/fdroidserver/net.py
@@ -2,7 +2,6 @@
 #
 # net.py - part of the FDroid server tools
 # Copyright (C) 2015 Hans-Christoph Steiner <hans@eds.org>
-# Copyright (C) 2022 FC Stegerman <flx@obfusk.net>
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by
@@ -17,160 +16,38 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-import copy
-import logging
 import os
-import random
-import tempfile
-import time
-import urllib
-
 import requests
-import urllib3
-from requests.adapters import HTTPAdapter, Retry
-
-from . import _, common
-
-logger = logging.getLogger(__name__)
 
 HEADERS = {'User-Agent': 'F-Droid'}
 
 
-def download_file(url, local_filename=None, dldir='tmp', retries=3, backoff_factor=0.1):
-    """Try hard to download the file, including retrying on failures.
-
-    This has two retry cycles, one inside of the requests session, the
-    other provided by this function.  The requests retry logic applies
-    to failed DNS lookups, socket connections and connection timeouts,
-    never to requests where data has made it to the server. This
-    handles ChunkedEncodingError during transfer in its own retry
-    loop.  This can result in more retries than are specified in the
-    retries parameter.
-
-    """
-    filename = urllib.parse.urlparse(url).path.split('/')[-1]
+def download_file(url, local_filename=None, dldir='tmp'):
+    filename = url.split('/')[-1]
     if local_filename is None:
         local_filename = os.path.join(dldir, filename)
-    for i in range(retries + 1):
-        if retries:
-            max_retries = Retry(total=retries - i, backoff_factor=backoff_factor)
-            adapter = HTTPAdapter(max_retries=max_retries)
-            session = requests.Session()
-            session.mount('http://', adapter)
-            session.mount('https://', adapter)
-        else:
-            session = requests
-        # the stream=True parameter keeps memory usage low
-        r = session.get(
-            url, stream=True, allow_redirects=True, headers=HEADERS, timeout=300
-        )
-        r.raise_for_status()
-        try:
-            with open(local_filename, 'wb') as f:
-                for chunk in r.iter_content(chunk_size=1024):
-                    if chunk:  # filter out keep-alive new chunks
-                        f.write(chunk)
-                        f.flush()
-            return local_filename
-        except requests.exceptions.ChunkedEncodingError as err:
-            if i == retries:
-                raise err
-            logger.warning('Download interrupted, retrying...')
-            time.sleep(backoff_factor * 2**i)
-    raise ValueError("retries must be >= 0")
-
-
-def download_using_mirrors(mirrors, local_filename=None):
-    """Try to download the file from any working mirror.
-
-    Download the file that all URLs in the mirrors list point to,
-    trying all the tricks, starting with the most private methods
-    first.  The list of mirrors is converted into a list of mirror
-    configurations to try, in order that the should be attempted.
-
-    This builds mirror_configs_to_try using all possible combos to
-    try.  If a mirror is marked with worksWithoutSNI: True, then this
-    logic will try it twice: first without SNI, then again with SNI.
-
-    """
-    mirrors = common.parse_list_of_dicts(mirrors)
-    mirror_configs_to_try = []
-    for mirror in mirrors:
-        mirror_configs_to_try.append(mirror)
-        if mirror.get('worksWithoutSNI'):
-            m = copy.deepcopy(mirror)
-            del m['worksWithoutSNI']
-            mirror_configs_to_try.append(m)
-
-    if not local_filename:
-        for mirror in mirrors:
-            filename = urllib.parse.urlparse(mirror['url']).path.split('/')[-1]
-            if filename:
-                break
-        if filename:
-            local_filename = os.path.join(common.get_cachedir(), filename)
-        else:
-            local_filename = tempfile.mkstemp(prefix='fdroid-')
-
-    timeouts = (2, 10, 100)
-    last_exception = None
-    for timeout in timeouts:
-        for mirror in mirror_configs_to_try:
-            last_exception = None
-            urllib3.util.ssl_.HAS_SNI = not mirror.get('worksWithoutSNI')
-            try:
-                # the stream=True parameter keeps memory usage low
-                r = requests.get(
-                    mirror['url'],
-                    stream=True,
-                    allow_redirects=False,
-                    headers=HEADERS,
-                    # add jitter to the timeout to be less predictable
-                    timeout=timeout + random.randint(0, timeout),  # nosec B311
-                )
-                if r.status_code != 200:
-                    raise requests.exceptions.HTTPError(r.status_code, response=r)
-                with open(local_filename, 'wb') as f:
-                    for chunk in r.iter_content(chunk_size=1024):
-                        if chunk:  # filter out keep-alive new chunks
-                            f.write(chunk)
-                            f.flush()
-                return local_filename
-            except (
-                ConnectionError,
-                requests.exceptions.ChunkedEncodingError,
-                requests.exceptions.ConnectionError,
-                requests.exceptions.ContentDecodingError,
-                requests.exceptions.HTTPError,
-                requests.exceptions.SSLError,
-                requests.exceptions.StreamConsumedError,
-                requests.exceptions.Timeout,
-                requests.exceptions.UnrewindableBodyError,
-            ) as e:
-                last_exception = e
-                logger.debug(_('Retrying failed download: %s') % str(e))
-    # if it hasn't succeeded by now, then give up and raise last exception
-    if last_exception:
-        raise last_exception
+    # the stream=True parameter keeps memory usage low
+    r = requests.get(url, stream=True, allow_redirects=True, headers=HEADERS)
+    r.raise_for_status()
+    with open(local_filename, 'wb') as f:
+        for chunk in r.iter_content(chunk_size=1024):
+            if chunk:  # filter out keep-alive new chunks
+                f.write(chunk)
+                f.flush()
+    return local_filename
 
 
 def http_get(url, etag=None, timeout=600):
-    """Download the content from the given URL by making a GET request.
+    """
+    Downloads the content from the given URL by making a GET request.
 
     If an ETag is given, it will do a HEAD request first, to see if the content changed.
 
-    Parameters
-    ----------
-    url
-      The URL to download from.
-    etag
-      The last ETag to be used for the request (optional).
-
-    Returns
-    -------
-    A tuple consisting of:
-      - The raw content that was downloaded or None if it did not change
-      - The new eTag as returned by the HTTP request
+    :param url: The URL to download from.
+    :param etag: The last ETag to be used for the request (optional).
+    :return: A tuple consisting of:
+        - The raw content that was downloaded or None if it did not change
+        - The new eTag as returned by the HTTP request
     """
     # TODO disable TLS Session IDs and TLS Session Tickets
     #      (plain text cookie visible to anyone who can see the network traffic)
diff --git a/fdroidserver/nightly.py b/fdroidserver/nightly.py
index 372390ea..63e7d131 100644
--- a/fdroidserver/nightly.py
+++ b/fdroidserver/nightly.py
@@ -1,5 +1,4 @@
 #!/usr/bin/env python3
-"""Set up an app build for a nightly build repo."""
 #
 # nightly.py - part of the FDroid server tools
 # Copyright (C) 2017 Hans-Christoph Steiner <hans@eds.org>
@@ -19,26 +18,23 @@
 
 import base64
 import datetime
+import git
 import hashlib
-import inspect
 import logging
 import os
+import paramiko
 import platform
 import shutil
-import ssl
 import subprocess
 import sys
 import tempfile
-from argparse import ArgumentParser
-from typing import Optional
-from urllib.parse import urlparse
-
-import git
-import paramiko
 import yaml
+from urllib.parse import urlparse
+from argparse import ArgumentParser
+
+from . import _
+from . import common
 
-from . import _, common
-from .exception import VCSException
 
 # hard coded defaults for Android ~/.android/debug.keystore files
 # https://developers.google.com/android/guides/client-auth
@@ -51,121 +47,34 @@ DISTINGUISHED_NAME = 'CN=Android Debug,O=Android,C=US'
 NIGHTLY = '-nightly'
 
 
-def _get_keystore_secret_var(keystore: str) -> str:
-    """Get keystore secret as base64.
-
-    Parameters
-    ----------
-    keystore
-        The path of the keystore.
-
-    Returns
-    -------
-    base64_secret
-        The keystore secret as base64 string.
-    """
-    with open(keystore, 'rb') as fp:
-        return base64.standard_b64encode(fp.read()).decode('ascii')
-
-
-def _ssh_key_from_debug_keystore(keystore: Optional[str] = None) -> str:
-    """Convert a debug keystore to an SSH private key.
-
-    This leaves the original keystore file in place.
-
-    Parameters
-    ----------
-    keystore
-        The keystore to convert to a SSH private key.
-
-    Returns
-    -------
-    key_path
-        The SSH private key file path in the temporary directory.
-    """
-    if keystore is None:
-        # set this here so it can be overridden in the tests
-        # TODO convert this to a class to get rid of this nonsense
-        keystore = KEYSTORE_FILE
+def _ssh_key_from_debug_keystore(keystore=KEYSTORE_FILE):
     tmp_dir = tempfile.mkdtemp(prefix='.')
     privkey = os.path.join(tmp_dir, '.privkey')
     key_pem = os.path.join(tmp_dir, '.key.pem')
     p12 = os.path.join(tmp_dir, '.keystore.p12')
     _config = dict()
     common.fill_config_defaults(_config)
-    subprocess.check_call(
-        [
-            _config['keytool'],
-            '-importkeystore',
-            '-srckeystore',
-            keystore,
-            '-srcalias',
-            KEY_ALIAS,
-            '-srcstorepass',
-            PASSWORD,
-            '-srckeypass',
-            PASSWORD,
-            '-destkeystore',
-            p12,
-            '-destalias',
-            KEY_ALIAS,
-            '-deststorepass',
-            PASSWORD,
-            '-destkeypass',
-            PASSWORD,
-            '-deststoretype',
-            'PKCS12',
-        ],
-        env={'LC_ALL': 'C.UTF-8'},
-    )
-    subprocess.check_call(
-        [
-            'openssl',
-            'pkcs12',
-            '-in',
-            p12,
-            '-out',
-            key_pem,
-            '-passin',
-            'pass:' + PASSWORD,
-            '-passout',
-            'pass:' + PASSWORD,
-        ],
-        env={'LC_ALL': 'C.UTF-8'},
-    )
-
-    # OpenSSL 3.0 changed the default output format from PKCS#1 to
-    # PKCS#8, which paramiko does not support.
-    # https://www.openssl.org/docs/man3.0/man1/openssl-rsa.html#traditional
-    # https://github.com/paramiko/paramiko/issues/1015
-    openssl_rsa_cmd = ['openssl', 'rsa']
-    if ssl.OPENSSL_VERSION_INFO[0] >= 3:
-        openssl_rsa_cmd += ['-traditional']
-    subprocess.check_call(
-        openssl_rsa_cmd
-        + [
-            '-in',
-            key_pem,
-            '-out',
-            privkey,
-            '-passin',
-            'pass:' + PASSWORD,
-        ],
-        env={'LC_ALL': 'C.UTF-8'},
-    )
+    subprocess.check_call([_config['keytool'], '-importkeystore',
+                           '-srckeystore', keystore, '-srcalias', KEY_ALIAS,
+                           '-srcstorepass', PASSWORD, '-srckeypass', PASSWORD,
+                           '-destkeystore', p12, '-destalias', KEY_ALIAS,
+                           '-deststorepass', PASSWORD, '-destkeypass', PASSWORD,
+                           '-deststoretype', 'PKCS12'],
+                          env={'LC_ALL': 'C.UTF-8'})
+    subprocess.check_call(['openssl', 'pkcs12', '-in', p12, '-out', key_pem,
+                           '-passin', 'pass:' + PASSWORD, '-passout', 'pass:' + PASSWORD],
+                          env={'LC_ALL': 'C.UTF-8'})
+    subprocess.check_call(['openssl', 'rsa', '-in', key_pem, '-out', privkey,
+                           '-passin', 'pass:' + PASSWORD],
+                          env={'LC_ALL': 'C.UTF-8'})
     os.remove(key_pem)
     os.remove(p12)
     os.chmod(privkey, 0o600)  # os.umask() should cover this, but just in case
 
     rsakey = paramiko.RSAKey.from_private_key_file(privkey)
-    fingerprint = (
-        base64.b64encode(hashlib.sha256(rsakey.asbytes()).digest())
-        .decode('ascii')
-        .rstrip('=')
-    )
-    ssh_private_key_file = os.path.join(
-        tmp_dir, 'debug_keystore_' + fingerprint.replace('/', '_') + '_id_rsa'
-    )
+    fingerprint = base64.b64encode(hashlib.sha256(rsakey.asbytes()).digest()).decode('ascii').rstrip('=')
+    ssh_private_key_file = os.path.join(tmp_dir, 'debug_keystore_'
+                                        + fingerprint.replace('/', '_') + '_id_rsa')
     shutil.move(privkey, ssh_private_key_file)
 
     pub = rsakey.get_name() + ' ' + rsakey.get_base64() + ' ' + ssh_private_key_file
@@ -177,127 +86,26 @@ def _ssh_key_from_debug_keystore(keystore: Optional[str] = None) -> str:
     return ssh_private_key_file
 
 
-def get_repo_base_url(
-    clone_url: str, repo_git_base: str, force_type: Optional[str] = None
-) -> str:
-    """Generate the base URL for the F-Droid repository.
-
-    Parameters
-    ----------
-    clone_url
-        The URL to clone the Git repository.
-    repo_git_base
-        The project path of the Git repository at the Git forge.
-    force_type
-        The Git forge of the project.
-
-    Returns
-    -------
-    repo_base_url
-        The base URL of the F-Droid repository.
-    """
-    if force_type is None:
-        force_type = urlparse(clone_url).netloc
-    if force_type == 'gitlab.com':
-        return clone_url + '/-/raw/master/fdroid'
-    if force_type == 'github.com':
-        return 'https://raw.githubusercontent.com/%s/master/fdroid' % repo_git_base
-    print(_('ERROR: unsupported git host "%s", patches welcome!') % force_type)
-    sys.exit(1)
-
-
-def clone_git_repo(clone_url, git_mirror_path):
-    """Clone a git repo into the given path, failing if a password is required.
-
-    If GitPython's safe mode is present, this will use that.  Otherwise,
-    this includes a very limited version of the safe mode just to ensure
-    this won't hang on password prompts.
-
-    https://github.com/gitpython-developers/GitPython/pull/2029
-
-    """
-    logging.debug(_('cloning {url}').format(url=clone_url))
-    try:
-        sig = inspect.signature(git.Repo.clone_from)
-        if 'safe' in sig.parameters:
-            git.Repo.clone_from(clone_url, git_mirror_path, safe=True)
-        else:
-            git.Repo.clone_from(
-                clone_url,
-                git_mirror_path,
-                env={
-                    'GIT_ASKPASS': '/bin/true',
-                    'SSH_ASKPASS': '/bin/true',
-                    'GIT_USERNAME': 'u',
-                    'GIT_PASSWORD': 'p',
-                    'GIT_HTTP_USERNAME': 'u',
-                    'GIT_HTTP_PASSWORD': 'p',
-                    'GIT_SSH': '/bin/false',  # for git < 2.3
-                    'GIT_TERMINAL_PROMPT': '0',
-                },
-            )
-    except git.exc.GitCommandError as e:
-        logging.warning(_('WARNING: only public git repos are supported!'))
-        raise VCSException(f'git clone {clone_url} failed:', str(e)) from e
-
-
 def main():
-    """Deploy to F-Droid repository or generate SSH private key from keystore.
 
-    The behaviour of this function is influenced by the configuration file as
-    well as command line parameters.
-
-    Raises
-    ------
-    :exc:`~fdroidserver.exception.VCSException`
-        If the nightly Git repository could not be cloned during an attempt to
-        deploy.
-    """
     parser = ArgumentParser()
     common.setup_global_opts(parser)
-    parser.add_argument(
-        "--keystore",
-        default=KEYSTORE_FILE,
-        help=_("Specify which debug keystore file to use."),
-    )
-    parser.add_argument(
-        "--show-secret-var",
-        action="store_true",
-        default=False,
-        help=_("Print the secret variable to the terminal for easy copy/paste"),
-    )
-    parser.add_argument(
-        "--keep-private-keys",
-        action="store_true",
-        default=False,
-        help=_("Do not remove the private keys generated from the keystore"),
-    )
-    parser.add_argument(
-        "--no-deploy",
-        action="store_true",
-        default=False,
-        help=_("Do not deploy the new files to the repo"),
-    )
-    parser.add_argument(
-        "--file",
-        default='app/build/outputs/apk/*.apk',
-        help=_('The file to be included in the repo (path or glob)'),
-    )
-    parser.add_argument(
-        "--no-checksum",
-        action="store_true",
-        default=False,
-        help=_("Don't use rsync checksums"),
-    )
-    archive_older_unset = -1
-    parser.add_argument(
-        "--archive-older",
-        type=int,
-        default=archive_older_unset,
-        help=_("Set maximum releases in repo before older ones are archived"),
-    )
+    parser.add_argument("--keystore", default=KEYSTORE_FILE,
+                        help=_("Specify which debug keystore file to use."))
+    parser.add_argument("--show-secret-var", action="store_true", default=False,
+                        help=_("Print the secret variable to the terminal for easy copy/paste"))
+    parser.add_argument("--keep-private-keys", action="store_true", default=False,
+                        help=_("Do not remove the private keys generated from the keystore"))
+    parser.add_argument("--no-deploy", action="store_true", default=False,
+                        help=_("Do not deploy the new files to the repo"))
+    parser.add_argument("--file", default='app/build/outputs/apk/*.apk',
+                        help=_('The file to be included in the repo (path or glob)'))
+    parser.add_argument("--no-checksum", action="store_true", default=False,
+                        help=_("Don't use rsync checksums"))
+    parser.add_argument("--archive-older", type=int, default=20,
+                        help=_("Set maximum releases in repo before older ones are archived"))
     # TODO add --with-btlog
-    options = common.parse_args(parser)
+    options = parser.parse_args()
 
     # force a tighter umask since this writes private key material
     umask = os.umask(0o077)
@@ -321,86 +129,56 @@ def main():
         cibase = os.getcwd()
         os.makedirs(repodir, exist_ok=True)
 
-        # the 'master' branch is hardcoded in fdroidserver/deploy.py
         if 'CI_PROJECT_PATH' in os.environ and 'CI_PROJECT_URL' in os.environ:
             # we are in GitLab CI
             repo_git_base = os.getenv('CI_PROJECT_PATH') + NIGHTLY
             clone_url = os.getenv('CI_PROJECT_URL') + NIGHTLY
-            repo_base = get_repo_base_url(
-                clone_url, repo_git_base, force_type='gitlab.com'
-            )
+            repo_base = clone_url + '/raw/master/fdroid'
             servergitmirror = 'git@' + urlparse(clone_url).netloc + ':' + repo_git_base
-            deploy_key_url = (
-                f'{clone_url}/-/settings/repository#js-deploy-keys-settings'
-            )
+            deploy_key_url = clone_url + '/settings/repository'
             git_user_name = os.getenv('GITLAB_USER_NAME')
             git_user_email = os.getenv('GITLAB_USER_EMAIL')
         elif 'TRAVIS_REPO_SLUG' in os.environ:
             # we are in Travis CI
             repo_git_base = os.getenv('TRAVIS_REPO_SLUG') + NIGHTLY
             clone_url = 'https://github.com/' + repo_git_base
-            repo_base = get_repo_base_url(
-                clone_url, repo_git_base, force_type='github.com'
-            )
+            _branch = os.getenv('TRAVIS_BRANCH')
+            repo_base = 'https://raw.githubusercontent.com/' + repo_git_base + '/' + _branch + '/fdroid'
             servergitmirror = 'git@github.com:' + repo_git_base
-            deploy_key_url = (
-                f'https://github.com/{repo_git_base}/settings/keys'
-                + '\nhttps://developer.github.com/v3/guides/managing-deploy-keys/#deploy-keys'
-            )
+            deploy_key_url = ('https://github.com/' + repo_git_base + '/settings/keys'
+                              + '\nhttps://developer.github.com/v3/guides/managing-deploy-keys/#deploy-keys')
             git_user_name = repo_git_base
             git_user_email = os.getenv('USER') + '@' + platform.node()
-        elif (
-            'CIRCLE_REPOSITORY_URL' in os.environ
-            and 'CIRCLE_PROJECT_USERNAME' in os.environ
-            and 'CIRCLE_PROJECT_REPONAME' in os.environ
-        ):
+        elif 'CIRCLE_REPOSITORY_URL' in os.environ \
+             and 'CIRCLE_PROJECT_USERNAME' in os.environ \
+             and 'CIRCLE_PROJECT_REPONAME' in os.environ:
             # we are in Circle CI
-            repo_git_base = (
-                os.getenv('CIRCLE_PROJECT_USERNAME')
-                + '/'
-                + os.getenv('CIRCLE_PROJECT_REPONAME')
-                + NIGHTLY
-            )
+            repo_git_base = (os.getenv('CIRCLE_PROJECT_USERNAME')
+                             + '/' + os.getenv('CIRCLE_PROJECT_REPONAME') + NIGHTLY)
             clone_url = os.getenv('CIRCLE_REPOSITORY_URL') + NIGHTLY
-            repo_base = get_repo_base_url(
-                clone_url, repo_git_base, force_type='github.com'
-            )
+            repo_base = clone_url + '/raw/master/fdroid'
             servergitmirror = 'git@' + urlparse(clone_url).netloc + ':' + repo_git_base
-            deploy_key_url = (
-                f'https://github.com/{repo_git_base}/settings/keys'
-                + '\nhttps://developer.github.com/v3/guides/managing-deploy-keys/#deploy-keys'
-            )
+            deploy_key_url = ('https://github.com/' + repo_git_base + '/settings/keys'
+                              + '\nhttps://developer.github.com/v3/guides/managing-deploy-keys/#deploy-keys')
             git_user_name = os.getenv('CIRCLE_USERNAME')
             git_user_email = git_user_name + '@' + platform.node()
-        elif 'GITHUB_ACTIONS' in os.environ:
-            # we are in Github actions
-            repo_git_base = os.getenv('GITHUB_REPOSITORY') + NIGHTLY
-            clone_url = os.getenv('GITHUB_SERVER_URL') + '/' + repo_git_base
-            repo_base = get_repo_base_url(
-                clone_url, repo_git_base, force_type='github.com'
-            )
-            servergitmirror = 'git@' + urlparse(clone_url).netloc + ':' + repo_git_base
-            deploy_key_url = (
-                f'https://github.com/{repo_git_base}/settings/keys'
-                + '\nhttps://developer.github.com/v3/guides/managing-deploy-keys/#deploy-keys'
-            )
-            git_user_name = os.getenv('GITHUB_ACTOR')
-            git_user_email = git_user_name + '@' + platform.node()
         else:
             print(_('ERROR: unsupported CI type, patches welcome!'))
             sys.exit(1)
 
         repo_url = repo_base + '/repo'
         git_mirror_path = os.path.join(repo_basedir, 'git-mirror')
-        git_mirror_fdroiddir = os.path.join(git_mirror_path, 'fdroid')
-        git_mirror_repodir = os.path.join(git_mirror_fdroiddir, 'repo')
-        git_mirror_metadatadir = os.path.join(git_mirror_fdroiddir, 'metadata')
+        git_mirror_repodir = os.path.join(git_mirror_path, 'fdroid', 'repo')
+        git_mirror_metadatadir = os.path.join(git_mirror_path, 'fdroid', 'metadata')
+        git_mirror_statsdir = os.path.join(git_mirror_path, 'fdroid', 'stats')
         if not os.path.isdir(git_mirror_repodir):
-            clone_git_repo(clone_url, git_mirror_path)
+            logging.debug(_('cloning {url}').format(url=clone_url))
+            try:
+                git.Repo.clone_from(clone_url, git_mirror_path)
+            except Exception:
+                pass
         if not os.path.isdir(git_mirror_repodir):
             os.makedirs(git_mirror_repodir, mode=0o755)
-        if os.path.exists('LICENSE'):
-            shutil.copy2('LICENSE', git_mirror_path)
 
         mirror_git_repo = git.Repo.init(git_mirror_path)
         writer = mirror_git_repo.config_writer()
@@ -414,31 +192,34 @@ def main():
         readme = '''
 # {repo_git_base}
 
-This is an app repository for nightly versions.
-You can use it with the [F-Droid](https://f-droid.org/) Android app.
+[![{repo_url}](icon.png)]({repo_url})
 
-[![{repo_url}]({repo_url}/icons/icon.png)](https://fdroid.link/#{repo_url})
-
-Last updated: {date}'''.format(
-            repo_git_base=repo_git_base,
-            repo_url=repo_url,
-            date=datetime.datetime.now(datetime.timezone.utc).strftime(
-                '%Y-%m-%d %H:%M:%S UTC'
-            ),
-        )
+Last updated: {date}'''.format(repo_git_base=repo_git_base,
+                               repo_url=repo_url,
+                               date=datetime.datetime.utcnow().strftime('%Y-%m-%d %H:%M:%S UTC'))
         with open(readme_path, 'w') as fp:
             fp.write(readme)
         mirror_git_repo.git.add(all=True)
         mirror_git_repo.index.commit("update README")
 
+        icon_path = os.path.join(git_mirror_path, 'icon.png')
+        try:
+            import qrcode
+            qrcode.make(repo_url).save(icon_path)
+        except Exception:
+            exampleicon = os.path.join(common.get_examples_dir(), 'fdroid-icon.png')
+            shutil.copy(exampleicon, icon_path)
         mirror_git_repo.git.add(all=True)
         mirror_git_repo.index.commit("update repo/website icon")
+        shutil.copy(icon_path, repo_basedir)
 
         os.chdir(repo_basedir)
         if os.path.isdir(git_mirror_repodir):
-            common.local_rsync(options, [git_mirror_repodir + '/'], 'repo/')
+            common.local_rsync(options, git_mirror_repodir + '/', 'repo/')
         if os.path.isdir(git_mirror_metadatadir):
-            common.local_rsync(options, [git_mirror_metadatadir + '/'], 'metadata/')
+            common.local_rsync(options, git_mirror_metadatadir + '/', 'metadata/')
+        if os.path.isdir(git_mirror_statsdir):
+            common.local_rsync(options, git_mirror_statsdir + '/', 'stats/')
 
         ssh_private_key_file = _ssh_key_from_debug_keystore()
         # this is needed for GitPython to find the SSH key
@@ -449,89 +230,57 @@ Last updated: {date}'''.format(
         with open(ssh_config, 'a') as fp:
             fp.write('\n\nHost *\n\tIdentityFile %s\n' % ssh_private_key_file)
 
-        if options.archive_older == archive_older_unset:
-            fdroid_size = common.get_dir_size(git_mirror_fdroiddir)
-            max_size = common.GITLAB_COM_PAGES_MAX_SIZE
-            if fdroid_size < max_size:
-                options.archive_older = 20
-            else:
-                options.archive_older = 3
-                print(
-                    'WARNING: repo is %s over the GitLab Pages limit (%s)'
-                    % (fdroid_size - max_size, max_size)
-                )
-                print('Setting --archive-older to 3')
-
-        config = {
-            'identity_file': ssh_private_key_file,
-            'repo_name': repo_git_base,
-            'repo_url': repo_url,
-            'repo_description': 'Nightly builds from %s' % git_user_email,
-            'archive_name': repo_git_base + ' archive',
-            'archive_url': repo_base + '/archive',
-            'archive_description': 'Old nightly builds that have been archived.',
-            'archive_older': options.archive_older,
-            'servergitmirrors': [{"url": servergitmirror}],
-            'keystore': KEYSTORE_FILE,
-            'repo_keyalias': KEY_ALIAS,
-            'keystorepass': PASSWORD,
-            'keypass': PASSWORD,
-            'keydname': DISTINGUISHED_NAME,
-            'make_current_version_link': False,
-        }
-        with open(common.CONFIG_FILE, 'w', encoding='utf-8') as fp:
-            yaml.dump(config, fp, default_flow_style=False)
-        os.chmod(common.CONFIG_FILE, 0o600)
-        config = common.read_config()
+        config = ''
+        config += "identity_file = '%s'\n" % ssh_private_key_file
+        config += "repo_name = '%s'\n" % repo_git_base
+        config += "repo_url = '%s'\n" % repo_url
+        config += "repo_icon = 'icon.png'\n"
+        config += "repo_description = 'Nightly builds from %s'\n" % git_user_email
+        config += "archive_name = '%s'\n" % (repo_git_base + ' archive')
+        config += "archive_url = '%s'\n" % (repo_base + '/archive')
+        config += "archive_icon = 'icon.png'\n"
+        config += "archive_description = 'Old nightly builds that have been archived.'\n"
+        config += "archive_older = %i\n" % options.archive_older
+        config += "servergitmirrors = '%s'\n" % servergitmirror
+        config += "keystore = '%s'\n" % KEYSTORE_FILE
+        config += "repo_keyalias = '%s'\n" % KEY_ALIAS
+        config += "keystorepass = '%s'\n" % PASSWORD
+        config += "keypass = '%s'\n" % PASSWORD
+        config += "keydname = '%s'\n" % DISTINGUISHED_NAME
+        config += "make_current_version_link = False\n"
+        config += "update_stats = True\n"
+        with open('config.py', 'w') as fp:
+            fp.write(config)
+        os.chmod('config.py', 0o600)
+        config = common.read_config(options)
         common.assert_config_keystore(config)
 
-        logging.debug(
-            _(
-                'Run over {cibase} to find -debug.apk. and skip repo_basedir {repo_basedir}'
-            ).format(cibase=cibase, repo_basedir=repo_basedir)
-        )
-
         for root, dirs, files in os.walk(cibase):
-            for d in ('.git', '.gradle'):
-                if d in dirs:
+            for d in dirs:
+                if d == '.git' or d == '.gradle' or (d == 'fdroid' and root == cibase):
                     dirs.remove(d)
-            if root == cibase and 'fdroid' in dirs:
-                dirs.remove('fdroid')
-
             for f in files:
                 if f.endswith('-debug.apk'):
                     apkfilename = os.path.join(root, f)
-                    logging.debug(
-                        _('Stripping mystery signature from {apkfilename}').format(
-                            apkfilename=apkfilename
-                        )
-                    )
+                    logging.debug(_('Stripping mystery signature from {apkfilename}')
+                                  .format(apkfilename=apkfilename))
                     destapk = os.path.join(repodir, os.path.basename(f))
                     os.chmod(apkfilename, 0o644)
-                    logging.debug(
-                        _(
-                            'Resigning {apkfilename} with provided debug.keystore'
-                        ).format(apkfilename=os.path.basename(apkfilename))
-                    )
+                    logging.debug(_('Resigning {apkfilename} with provided debug.keystore')
+                                  .format(apkfilename=os.path.basename(apkfilename)))
+                    common.apk_strip_v1_signatures(apkfilename, strip_manifest=True)
                     common.sign_apk(apkfilename, destapk, KEY_ALIAS)
 
         if options.verbose:
             logging.debug(_('attempting bare SSH connection to test deploy key:'))
             try:
-                subprocess.check_call(
-                    [
-                        'ssh',
-                        '-Tvi',
-                        ssh_private_key_file,
-                        '-oIdentitiesOnly=yes',
-                        '-oStrictHostKeyChecking=no',
-                        servergitmirror.split(':')[0],
-                    ]
-                )
+                subprocess.check_call(['ssh', '-Tvi', ssh_private_key_file,
+                                       '-oIdentitiesOnly=yes', '-oStrictHostKeyChecking=no',
+                                       servergitmirror.split(':')[0]])
             except subprocess.CalledProcessError:
                 pass
 
-        app_url = clone_url[: -len(NIGHTLY)]
+        app_url = clone_url[:-len(NIGHTLY)]
         template = dict()
         template['AuthorName'] = clone_url.split('/')[4]
         template['AuthorWebSite'] = '/'.join(clone_url.split('/')[:4])
@@ -543,13 +292,10 @@ Last updated: {date}'''.format(
         with open('template.yml', 'w') as fp:
             yaml.dump(template, fp)
 
-        subprocess.check_call(
-            ['fdroid', 'update', '--rename-apks', '--create-metadata', '--verbose'],
-            cwd=repo_basedir,
-        )
-        common.local_rsync(
-            options, [repo_basedir + '/metadata/'], git_mirror_metadatadir + '/'
-        )
+        subprocess.check_call(['fdroid', 'update', '--rename-apks', '--create-metadata', '--verbose'],
+                              cwd=repo_basedir)
+        common.local_rsync(options, repo_basedir + '/metadata/', git_mirror_metadatadir + '/')
+        common.local_rsync(options, repo_basedir + '/stats/', git_mirror_statsdir + '/')
         mirror_git_repo.git.add(all=True)
         mirror_git_repo.index.commit("update app metadata")
 
@@ -558,11 +304,8 @@ Last updated: {date}'''.format(
                 cmd = ['fdroid', 'deploy', '--verbose', '--no-keep-git-mirror-archive']
                 subprocess.check_call(cmd, cwd=repo_basedir)
             except subprocess.CalledProcessError:
-                logging.error(
-                    _('cannot publish update, did you set the deploy key?')
-                    + '\n'
-                    + deploy_key_url
-                )
+                logging.error(_('cannot publish update, did you set the deploy key?')
+                              + '\n' + deploy_key_url)
                 sys.exit(1)
 
         if not options.keep_private_keys:
@@ -576,33 +319,25 @@ Last updated: {date}'''.format(
             if not os.path.exists(androiddir):
                 os.mkdir(androiddir)
                 logging.info(_('created {path}').format(path=androiddir))
-            logging.error(
-                _('{path} does not exist!  Create it by running:').format(
-                    path=options.keystore
-                )
-                + '\n    keytool -genkey -v -keystore '
-                + options.keystore
-                + ' -storepass android \\'
-                + '\n     -alias androiddebugkey -keypass android -keyalg RSA -keysize 2048 -validity 10000 \\'
-                + '\n     -dname "CN=Android Debug,O=Android,C=US"'
-            )
+            logging.error(_('{path} does not exist!  Create it by running:').format(path=options.keystore)
+                          + '\n    keytool -genkey -v -keystore ' + options.keystore + ' -storepass android \\'
+                          + '\n     -alias androiddebugkey -keypass android -keyalg RSA -keysize 2048 -validity 10000 \\'
+                          + '\n     -dname "CN=Android Debug,O=Android,C=US"')
             sys.exit(1)
         ssh_dir = os.path.join(os.getenv('HOME'), '.ssh')
+        os.makedirs(os.path.dirname(ssh_dir), exist_ok=True)
         privkey = _ssh_key_from_debug_keystore(options.keystore)
-        if os.path.exists(ssh_dir):
-            ssh_private_key_file = os.path.join(ssh_dir, os.path.basename(privkey))
-            shutil.move(privkey, ssh_private_key_file)
-            shutil.move(privkey + '.pub', ssh_private_key_file + '.pub')
+        ssh_private_key_file = os.path.join(ssh_dir, os.path.basename(privkey))
+        shutil.move(privkey, ssh_private_key_file)
+        shutil.move(privkey + '.pub', ssh_private_key_file + '.pub')
         if shutil.rmtree.avoids_symlink_attacks:
             shutil.rmtree(os.path.dirname(privkey))
 
         if options.show_secret_var:
-            debug_keystore = _get_keystore_secret_var(options.keystore)
-            print(
-                _('\n{path} encoded for the DEBUG_KEYSTORE secret variable:').format(
-                    path=options.keystore
-                )
-            )
+            with open(options.keystore, 'rb') as fp:
+                debug_keystore = base64.standard_b64encode(fp.read()).decode('ascii')
+            print(_('\n{path} encoded for the DEBUG_KEYSTORE secret variable:')
+                  .format(path=options.keystore))
             print(debug_keystore)
 
     os.umask(umask)
diff --git a/fdroidserver/publish.py b/fdroidserver/publish.py
index 42945166..41d70300 100644
--- a/fdroidserver/publish.py
+++ b/fdroidserver/publish.py
@@ -3,7 +3,6 @@
 # publish.py - part of the FDroid server tools
 # Copyright (C) 2010-13, Ciaran Gultnieks, ciaran@ciarang.com
 # Copyright (C) 2013-2014 Daniel Martí <mvdan@mvdan.cc>
-# Copyright (C) 2021 Felix C. Stegerman <flx@obfusk.net>
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by
@@ -18,40 +17,34 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-"""Sign APKs using keys or via reproducible builds signature copying.
-
-This command takes unsigned APKs and signs them.  It looks for
-unsigned APKs in the unsigned/ directory and puts successfully signed
-APKs into the repo/ directory.  The default is to run in a kind of
-batch mode, where it will only quit on certain kinds of errors. It
-mostly reports success by moving an APK from unsigned/ to repo/
-
-"""
-
-import glob
-import hashlib
-import json
-import logging
+import sys
 import os
 import re
 import shutil
-import sys
-import time
-import zipfile
+import glob
+import hashlib
 from argparse import ArgumentParser
 from collections import OrderedDict
+import logging
 from gettext import ngettext
+import json
+import time
+import zipfile
 
-from . import _, common, metadata
+from . import _
+from . import common
+from . import metadata
 from .common import FDroidPopen
 from .exception import BuildException, FDroidException
 
 config = None
+options = None
 start_timestamp = time.gmtime()
 
 
 def publish_source_tarball(apkfilename, unsigned_dir, output_dir):
     """Move the source tarball into the output directory..."""
+
     tarfilename = apkfilename[:-4] + '_src.tar.gz'
     tarfile = os.path.join(unsigned_dir, tarfilename)
     if os.path.exists(tarfile):
@@ -62,9 +55,7 @@ def publish_source_tarball(apkfilename, unsigned_dir, output_dir):
 
 
 def key_alias(appid):
-    """No summary.
-
-    Get the alias which F-Droid uses to indentify the singing key
+    """Get the alias which F-Droid uses to indentify the singing key
     for this App in F-Droids keystore.
     """
     if config and 'keyaliases' in config and appid in config['keyaliases']:
@@ -82,27 +73,24 @@ def key_alias(appid):
 
 
 def read_fingerprints_from_keystore():
-    """Obtain a dictionary containing all singning-key fingerprints which are managed by F-Droid, grouped by appid."""
-    env_vars = {'LC_ALL': 'C.UTF-8', 'FDROID_KEY_STORE_PASS': config['keystorepass']}
-    cmd = [
-        config['keytool'],
-        '-list',
-        '-v',
-        '-keystore',
-        config['keystore'],
-        '-storepass:env',
-        'FDROID_KEY_STORE_PASS',
-    ]
+    """Obtain a dictionary containing all singning-key fingerprints which
+    are managed by F-Droid, grouped by appid.
+    """
+    env_vars = {'LC_ALL': 'C.UTF-8',
+                'FDROID_KEY_STORE_PASS': config['keystorepass']}
+    cmd = [config['keytool'], '-list',
+           '-v', '-keystore', config['keystore'],
+           '-storepass:env', 'FDROID_KEY_STORE_PASS']
     if config['keystore'] == 'NONE':
         cmd += config['smartcardoptions']
     p = FDroidPopen(cmd, envs=env_vars, output=False)
     if p.returncode != 0:
         raise FDroidException('could not read keystore {}'.format(config['keystore']))
 
-    realias = re.compile('Alias name: (?P<alias>.+)' + os.linesep)
-    resha256 = re.compile(r'\s+SHA256: (?P<sha256>[:0-9A-F]{95})' + os.linesep)
+    realias = re.compile('Alias name: (?P<alias>.+)\n')
+    resha256 = re.compile(r'\s+SHA256: (?P<sha256>[:0-9A-F]{95})\n')
     fps = {}
-    for block in p.output.split(('*' * 43) + os.linesep + '*' * 43):
+    for block in p.output.split(('*' * 43) + '\n' + '*' * 43):
         s_alias = realias.search(block)
         s_sha256 = resha256.search(block)
         if s_alias and s_sha256:
@@ -112,9 +100,8 @@ def read_fingerprints_from_keystore():
 
 
 def sign_sig_key_fingerprint_list(jar_file):
-    """Sign the list of app-signing key fingerprints.
-
-    This is used primaryily by fdroid update to determine which APKs
+    """sign the list of app-signing key fingerprints which is
+    used primaryily by fdroid update to determine which APKs
     where built and signed by F-Droid and which ones were
     manually added by users.
     """
@@ -128,22 +115,19 @@ def sign_sig_key_fingerprint_list(jar_file):
         cmd += config['smartcardoptions']
     else:  # smardcards never use -keypass
         cmd += '-keypass:env', 'FDROID_KEY_PASS'
-    env_vars = {
-        'FDROID_KEY_STORE_PASS': config['keystorepass'],
-        'FDROID_KEY_PASS': config.get('keypass', ""),
-    }
+    env_vars = {'FDROID_KEY_STORE_PASS': config['keystorepass'],
+                'FDROID_KEY_PASS': config.get('keypass', "")}
     p = common.FDroidPopen(cmd, envs=env_vars)
     if p.returncode != 0:
         raise FDroidException("Failed to sign '{}'!".format(jar_file))
 
 
-def store_publish_signer_fingerprints(appids, indent=None):
+def store_stats_fdroid_signing_key_fingerprints(appids, indent=None):
     """Store list of all signing-key fingerprints for given appids to HD.
-
     This list will later on be needed by fdroid update.
     """
-    if not os.path.exists('repo'):
-        os.makedirs('repo')
+    if not os.path.exists('stats'):
+        os.makedirs('stats')
     data = OrderedDict()
     fps = read_fingerprints_from_keystore()
     for appid in sorted(appids):
@@ -151,22 +135,17 @@ def store_publish_signer_fingerprints(appids, indent=None):
         if alias in fps:
             data[appid] = {'signer': fps[key_alias(appid)]}
 
-    jar_file = os.path.join('repo', 'signer-index.jar')
-    output = json.dumps(data, indent=indent)
+    jar_file = os.path.join('stats', 'publishsigkeys.jar')
     with zipfile.ZipFile(jar_file, 'w', zipfile.ZIP_DEFLATED) as jar:
-        jar.writestr('signer-index.json', output)
-    with open(os.path.join('repo', 'signer-index.json'), 'w') as fp:
-        fp.write(output)
+        jar.writestr('publishsigkeys.json', json.dumps(data, indent=indent))
     sign_sig_key_fingerprint_list(jar_file)
 
 
 def status_update_json(generatedKeys, signedApks):
-    """Output a JSON file with metadata about this run."""
+    """Output a JSON file with metadata about this run"""
+
     logging.debug(_('Outputting JSON'))
     output = common.setup_status_output(start_timestamp)
-    output['apksigner'] = shutil.which(config.get('apksigner', ''))
-    output['jarsigner'] = shutil.which(config.get('jarsigner', ''))
-    output['keytool'] = shutil.which(config.get('keytool', ''))
     if generatedKeys:
         output['generatedKeys'] = generatedKeys
     if signedApks:
@@ -175,8 +154,8 @@ def status_update_json(generatedKeys, signedApks):
 
 
 def check_for_key_collisions(allapps):
-    """Make sure there's no collision in keyaliases from apps.
-
+    """
+    Make sure there's no collision in keyaliases from apps.
     It was suggested at
     https://dev.guardianproject.info/projects/bazaar/wiki/FDroid_Audit
     that a package could be crafted, such that it would use the same signing
@@ -185,16 +164,9 @@ def check_for_key_collisions(allapps):
     the colliding ID would be something that would be a) a valid package ID,
     and b) a sane-looking ID that would make its way into the repo.
     Nonetheless, to be sure, before publishing we check that there are no
-    collisions, and refuse to do any publishing if that's the case.
-
-    Parameters
-    ----------
-    allapps
-      a dict of all apps to process
-
-    Returns
-    -------
-    a list of all aliases corresponding to allapps
+    collisions, and refuse to do any publishing if that's the case...
+    :param allapps a dict of all apps to process
+    :return: a list of all aliases corresponding to allapps
     """
     allaliases = []
     for appid in allapps:
@@ -209,53 +181,30 @@ def check_for_key_collisions(allapps):
 
 
 def create_key_if_not_existing(keyalias):
-    """Ensure a signing key with the given keyalias exists.
-
-    Returns
-    -------
-    boolean
-      True if a new key was created, False otherwise
+    """
+    Ensures a signing key with the given keyalias exists
+    :return: boolean, True if a new key was created, false otherwise
     """
     # See if we already have a key for this application, and
     # if not generate one...
-    env_vars = {
-        'LC_ALL': 'C.UTF-8',
-        'FDROID_KEY_STORE_PASS': config['keystorepass'],
-        'FDROID_KEY_PASS': config.get('keypass', ""),
-    }
-    cmd = [
-        config['keytool'],
-        '-list',
-        '-alias',
-        keyalias,
-        '-keystore',
-        config['keystore'],
-        '-storepass:env',
-        'FDROID_KEY_STORE_PASS',
-    ]
+    env_vars = {'LC_ALL': 'C.UTF-8',
+                'FDROID_KEY_STORE_PASS': config['keystorepass'],
+                'FDROID_KEY_PASS': config.get('keypass', "")}
+    cmd = [config['keytool'], '-list',
+           '-alias', keyalias, '-keystore', config['keystore'],
+           '-storepass:env', 'FDROID_KEY_STORE_PASS']
     if config['keystore'] == 'NONE':
         cmd += config['smartcardoptions']
     p = FDroidPopen(cmd, envs=env_vars)
     if p.returncode != 0:
         logging.info("Key does not exist - generating...")
-        cmd = [
-            config['keytool'],
-            '-genkey',
-            '-keystore',
-            config['keystore'],
-            '-alias',
-            keyalias,
-            '-keyalg',
-            'RSA',
-            '-keysize',
-            '2048',
-            '-validity',
-            '10000',
-            '-storepass:env',
-            'FDROID_KEY_STORE_PASS',
-            '-dname',
-            config['keydname'],
-        ]
+        cmd = [config['keytool'], '-genkey',
+               '-keystore', config['keystore'],
+               '-alias', keyalias,
+               '-keyalg', 'RSA', '-keysize', '2048',
+               '-validity', '10000',
+               '-storepass:env', 'FDROID_KEY_STORE_PASS',
+               '-dname', config['keydname']]
         if config['keystore'] == 'NONE':
             cmd += config['smartcardoptions']
         else:
@@ -269,35 +218,22 @@ def create_key_if_not_existing(keyalias):
 
 
 def main():
-    global config
+    global config, options
 
     # Parse command line...
-    parser = ArgumentParser(
-        usage="%(prog)s [options] " "[APPID[:VERCODE] [APPID[:VERCODE] ...]]"
-    )
+    parser = ArgumentParser(usage="%(prog)s [options] "
+                                  "[APPID[:VERCODE] [APPID[:VERCODE] ...]]")
     common.setup_global_opts(parser)
-    parser.add_argument(
-        "-e",
-        "--error-on-failed",
-        action="store_true",
-        default=False,
-        help=_("When signing or verifying fails, exit with an error code."),
-    )
-    parser.add_argument(
-        "appid",
-        nargs='*',
-        help=_("application ID with optional versionCode in the form APPID[:VERCODE]"),
-    )
+    parser.add_argument("appid", nargs='*',
+                        help=_("application ID with optional versionCode in the form APPID[:VERCODE]"))
     metadata.add_metadata_arguments(parser)
-    options = common.parse_args(parser)
+    options = parser.parse_args()
     metadata.warnings_action = options.W
 
-    config = common.read_config()
+    config = common.read_config(options)
 
     if not ('jarsigner' in config and 'keytool' in config):
-        logging.critical(
-            _('Java JDK not found! Install in standard location or set java_paths!')
-        )
+        logging.critical(_('Java JDK not found! Install in standard location or set java_paths!'))
         sys.exit(1)
 
     common.assert_config_keystore(config)
@@ -329,22 +265,16 @@ def main():
 
     allapps = metadata.read_metadata()
     vercodes = common.read_pkg_args(options.appid, True)
-    common.get_metadata_files(vercodes)  # only check appids
     signed_apks = dict()
     generated_keys = dict()
     allaliases = check_for_key_collisions(allapps)
-    logging.info(
-        ngettext(
-            '{0} app, {1} key aliases', '{0} apps, {1} key aliases', len(allapps)
-        ).format(len(allapps), len(allaliases))
-    )
+    logging.info(ngettext('{0} app, {1} key aliases',
+                          '{0} apps, {1} key aliases', len(allapps)).format(len(allapps), len(allaliases)))
 
-    failed = 0
     # Process any APKs or ZIPs that are waiting to be signed...
-    for apkfile in sorted(
-        glob.glob(os.path.join(unsigned_dir, '*.apk'))
-        + glob.glob(os.path.join(unsigned_dir, '*.zip'))
-    ):
+    for apkfile in sorted(glob.glob(os.path.join(unsigned_dir, '*.apk'))
+                          + glob.glob(os.path.join(unsigned_dir, '*.zip'))):
+
         appid, vercode = common.publishednameinfo(apkfile)
         apkfilename = os.path.basename(apkfile)
         if vercodes and appid not in vercodes:
@@ -357,17 +287,13 @@ def main():
         # There ought to be valid metadata for this app, otherwise why are we
         # trying to publish it?
         if appid not in allapps:
-            logging.error(
-                "Unexpected {0} found in unsigned directory".format(apkfilename)
-            )
+            logging.error("Unexpected {0} found in unsigned directory"
+                          .format(apkfilename))
             sys.exit(1)
         app = allapps[appid]
 
-        build = None
-        for b in app.get("Builds", ()):
-            if b.get("versionCode") == vercode:
-                build = b
-        if app.Binaries or (build and build.binary):
+        if app.Binaries:
+
             # It's an app where we build from source, and verify the apk
             # contents against a developer's binary, and then publish their
             # version if everything checks out.
@@ -378,22 +304,14 @@ def main():
             srcapk = srcapk.replace(unsigned_dir, binaries_dir)
 
             if not os.path.isfile(srcapk):
-                logging.error(
-                    "...reference binary missing - publish skipped: '{refpath}'".format(
-                        refpath=srcapk
-                    )
-                )
-                failed += 1
+                logging.error("...reference binary missing - publish skipped: "
+                              "'{refpath}'".format(refpath=srcapk))
             else:
                 # Compare our unsigned one with the downloaded one...
                 compare_result = common.verify_apks(srcapk, apkfile, tmp_dir)
                 if compare_result:
-                    logging.error(
-                        "...verification failed - publish skipped : {result}".format(
-                            result=compare_result
-                        )
-                    )
-                    failed += 1
+                    logging.error("...verification failed - publish skipped : "
+                                  "{result}".format(result=compare_result))
                 else:
                     # Success! So move the downloaded file to the repo, and remove
                     # our built version.
@@ -404,6 +322,7 @@ def main():
                     logging.info('Published ' + apkfilename)
 
         elif apkfile.endswith('.zip'):
+
             # OTA ZIPs built by fdroid do not need to be signed by jarsigner,
             # just to be moved into place in the repo
             shutil.move(apkfile, os.path.join(output_dir, apkfilename))
@@ -411,6 +330,7 @@ def main():
             logging.info('Published ' + apkfilename)
 
         else:
+
             # It's a 'normal' app, i.e. we sign and publish it...
             skipsigning = False
 
@@ -421,23 +341,22 @@ def main():
                 # metadata. This means we're going to prepare both a locally
                 # signed APK and a version signed with the developers key.
 
-                signature_file, _ignored, manifest, v2_files = signingfiles
+                signaturefile, signedfile, manifest = signingfiles
 
-                with open(signature_file, 'rb') as f:
-                    devfp = common.signer_fingerprint_short(
-                        common.get_certificate(f.read())
-                    )
+                with open(signaturefile, 'rb') as f:
+                    devfp = common.signer_fingerprint_short(common.get_certificate(f.read()))
                 devsigned = '{}_{}_{}.apk'.format(appid, vercode, devfp)
                 devsignedtmp = os.path.join(tmp_dir, devsigned)
+                shutil.copy(apkfile, devsignedtmp)
 
-                common.apk_implant_signatures(apkfile, devsignedtmp, manifest=manifest)
+                common.apk_implant_signatures(devsignedtmp, signaturefile,
+                                              signedfile, manifest)
                 if common.verify_apk_signature(devsignedtmp):
                     shutil.move(devsignedtmp, os.path.join(output_dir, devsigned))
                 else:
                     os.remove(devsignedtmp)
                     logging.error('...verification failed - skipping: %s', devsigned)
                     skipsigning = True
-                    failed += 1
 
             # Now we sign with the F-Droid key.
             if not skipsigning:
@@ -449,30 +368,25 @@ def main():
 
                 signed_apk_path = os.path.join(output_dir, apkfilename)
                 if os.path.exists(signed_apk_path):
-                    raise BuildException(
-                        _(
-                            "Refusing to sign '{path}', file exists in both {dir1} and {dir2} folder."
-                        ).format(path=apkfilename, dir1=unsigned_dir, dir2=output_dir)
-                    )
+                    raise BuildException("Refusing to sign '{0}' file exists in both "
+                                         "{1} and {2} folder.".format(apkfilename,
+                                                                      unsigned_dir,
+                                                                      output_dir))
 
-                # Sign the application...
+                # Sign and zipalign the application...
                 common.sign_apk(apkfile, signed_apk_path, keyalias)
                 if appid not in signed_apks:
                     signed_apks[appid] = []
-                signed_apks[appid].append({"keyalias": keyalias, "filename": apkfile})
+                signed_apks[appid].append({"keyalias": keyalias,
+                                           "filename": apkfile})
 
                 publish_source_tarball(apkfilename, unsigned_dir, output_dir)
                 logging.info('Published ' + apkfilename)
 
-    store_publish_signer_fingerprints(allapps.keys())
+    store_stats_fdroid_signing_key_fingerprints(allapps.keys())
     status_update_json(generated_keys, signed_apks)
     logging.info('published list signing-key fingerprints')
 
-    if failed:
-        logging.error(_('%d APKs failed to be signed or verified!') % failed)
-        if options.error_on_failed:
-            sys.exit(failed)
-
 
 if __name__ == "__main__":
     main()
diff --git a/fdroidserver/readmeta.py b/fdroidserver/readmeta.py
index b3ef7c3b..b45e9559 100644
--- a/fdroidserver/readmeta.py
+++ b/fdroidserver/readmeta.py
@@ -17,17 +17,20 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 from argparse import ArgumentParser
+from . import common
+from . import metadata
 
-from . import common, metadata
+options = None
 
 
 def main():
+
     parser = ArgumentParser()
     common.setup_global_opts(parser)
     metadata.add_metadata_arguments(parser)
     options = parser.parse_args()
     metadata.warnings_action = options.W
-    common.read_config()
+    common.read_config(None)
 
     metadata.read_metadata()
 
diff --git a/fdroidserver/rewritemeta.py b/fdroidserver/rewritemeta.py
index 4bbe810d..94439b97 100644
--- a/fdroidserver/rewritemeta.py
+++ b/fdroidserver/rewritemeta.py
@@ -17,73 +17,56 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-import io
-import logging
-import shutil
-import tempfile
 from argparse import ArgumentParser
-from pathlib import Path
+import os
+import logging
+import io
+import tempfile
+import shutil
 
-from . import _, common, metadata
+from . import _
+from . import common
+from . import metadata
 
 config = None
+options = None
 
 
 def proper_format(app):
     s = io.StringIO()
     # TODO: currently reading entire file again, should reuse first
     # read in metadata.py
-    cur_content = Path(app.metadatapath).read_text(encoding='utf-8')
-    if Path(app.metadatapath).suffix == '.yml':
+    with open(app.metadatapath, 'r') as f:
+        cur_content = f.read()
+    if app.metadatapath.endswith('.yml'):
         metadata.write_yaml(s, app)
     content = s.getvalue()
     s.close()
     return content == cur_content
 
 
-def remove_blank_flags_from_builds(builds):
-    """Remove unset entries from Builds so they are not written out."""
-    if not builds:
-        return list()
-    newbuilds = list()
-    for build in builds:
-        new = dict()
-        for k in metadata.build_flags:
-            v = build.get(k)
-            # 0 is valid value, it should not be stripped
-            if v is None or v is False or v == '' or v == dict() or v == list():
-                continue
-            new[k] = v
-        newbuilds.append(new)
-    return newbuilds
-
-
 def main():
-    global config
+
+    global config, options
 
     parser = ArgumentParser()
     common.setup_global_opts(parser)
-    parser.add_argument(
-        "-l",
-        "--list",
-        action="store_true",
-        default=False,
-        help=_("List files that would be reformatted (dry run)"),
-    )
-    parser.add_argument(
-        "appid", nargs='*', help=_("application ID of file to operate on")
-    )
+    parser.add_argument("-l", "--list", action="store_true", default=False,
+                        help=_("List files that would be reformatted"))
+    parser.add_argument("appid", nargs='*', help=_("application ID of file to operate on"))
     metadata.add_metadata_arguments(parser)
-    options = common.parse_args(parser)
+    options = parser.parse_args()
     metadata.warnings_action = options.W
 
-    config = common.read_config()
+    config = common.read_config(options)
 
-    apps = common.read_app_args(options.appid)
+    # Get all apps...
+    allapps = metadata.read_metadata(options.appid)
+    apps = common.read_app_args(options.appid, allapps, False)
 
     for appid, app in apps.items():
-        path = Path(app.metadatapath)
-        if path.suffix == '.yml':
+        path = app.metadatapath
+        if path.endswith('.yml'):
             logging.info(_("Rewriting '{appid}'").format(appid=appid))
         else:
             logging.warning(_('Cannot rewrite "{path}"').format(path=path))
@@ -94,15 +77,21 @@ def main():
                 print(path)
             continue
 
-        # TODO these should be moved to metadata.write_yaml()
-        builds = remove_blank_flags_from_builds(app.get('Builds'))
-        if builds:
-            app['Builds'] = builds
+        newbuilds = []
+        for build in app.builds:
+            new = metadata.Build()
+            for k in metadata.build_flags:
+                v = build[k]
+                if v is None or v is False or v == [] or v == '':
+                    continue
+                new[k] = v
+            newbuilds.append(new)
+        app.builds = newbuilds
 
-        # rewrite to temporary file before overwriting existing
+        # rewrite to temporary file before overwriting existsing
         # file in case there's a bug in write_metadata
         with tempfile.TemporaryDirectory() as tmpdir:
-            tmp_path = Path(tmpdir) / path.name
+            tmp_path = os.path.join(tmpdir, os.path.basename(path))
             metadata.write_metadata(tmp_path, app)
             shutil.move(tmp_path, path)
 
diff --git a/fdroidserver/scanner.py b/fdroidserver/scanner.py
index f28e3803..8230831e 100644
--- a/fdroidserver/scanner.py
+++ b/fdroidserver/scanner.py
@@ -16,743 +16,147 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-import itertools
+import imghdr
 import json
-import logging
 import os
 import re
 import sys
 import traceback
-import urllib.parse
-import urllib.request
-import zipfile
 from argparse import ArgumentParser
-from dataclasses import dataclass, field, fields
-from datetime import datetime, timedelta, timezone
-from enum import IntEnum
-from pathlib import Path
-from tempfile import TemporaryDirectory
-from typing import Union
+import logging
+import itertools
 
-try:
-    import magic
-except ImportError:
-    import puremagic as magic
+from . import _
+from . import common
+from . import metadata
+from .exception import BuildException, VCSException
 
-if sys.version_info >= (3, 11):
-    import tomllib
-else:
-    import tomli as tomllib
+config = None
+options = None
 
-from . import _, common, metadata, scanner
-from .exception import BuildException, ConfigurationException, VCSException
+DEFAULT_JSON_PER_BUILD = {'errors': [], 'warnings': [], 'infos': []}
+json_per_build = DEFAULT_JSON_PER_BUILD
 
+MAVEN_URL_REGEX = re.compile(r"""\smaven\s*{.*?(?:setUrl|url)\s*=?\s*(?:uri)?\(?\s*["']?([^\s"']+)["']?[^}]*}""",
+                             re.DOTALL)
 
-@dataclass
-class MessageStore:
-    infos: list = field(default_factory=list)
-    warnings: list = field(default_factory=list)
-    errors: list = field(default_factory=list)
-
-
-MAVEN_URL_REGEX = re.compile(
-    r"""\smaven\s*(?:{.*?(?:setUrl|url)|\(\s*(?:url)?)\s*=?\s*(?:uri|URI|Uri\.create)?\(?\s*["']?([^\s"']+)["']?[^})]*[)}]""",
-    re.DOTALL,
-)
-
-DEPFILE = {
-    "Cargo.toml": ["Cargo.lock"],
-    "pubspec.yaml": ["pubspec.lock"],
-    "package.json": ["package-lock.json", "yarn.lock", "pnpm-lock.yaml", "bun.lock"],
+CODE_SIGNATURES = {
+    # The `apkanalyzer dex packages` output looks like this:
+    # M d 1   1       93      <packagename> <other stuff>
+    # The first column has P/C/M/F for package, class, method or field
+    # The second column has x/k/r/d for removed, kept, referenced and defined.
+    # We already filter for defined only in the apkanalyzer call. 'r' will be
+    # for things referenced but not distributed in the apk.
+    exp: re.compile(r'.[\s]*d[\s]*[0-9]*[\s]*[0-9*][\s]*[0-9]*[\s]*' + exp, re.IGNORECASE) for exp in [
+        r'(com\.google\.firebase[^\s]*)',
+        r'(com\.google\.android\.gms[^\s]*)',
+        r'(com\.google\.tagmanager[^\s]*)',
+        r'(com\.google\.analytics[^\s]*)',
+        r'(com\.android\.billing[^\s]*)',
+    ]
 }
 
-SCANNER_CACHE_VERSION = 1
-
-DEFAULT_CATALOG_PREFIX_REGEX = re.compile(
-    r'''defaultLibrariesExtensionName\s*=\s*['"](\w+)['"]'''
-)
-GRADLE_CATALOG_FILE_REGEX = re.compile(
-    r'''(?:create\()?['"]?(\w+)['"]?\)?\s*\{[^}]*from\(files\(['"]([^"]+)['"]\)\)'''
-)
-VERSION_CATALOG_REGEX = re.compile(r'versionCatalogs\s*\{')
-
-APK_SIGNING_BLOCK_IDS = {
-    # https://source.android.com/docs/security/features/apksigning/v2#apk-signing-block
-    # 0x7109871a: 'APK signature scheme v2',
-    # https://source.android.com/docs/security/features/apksigning/v3#apk-signing-block
-    # 0xf05368c0: 'APK signature scheme v3',
-    # See "Security metadata in early 2018"
-    # https://android-developers.googleblog.com/2017/12/improving-app-security-and-performance.html
-    0x2146444E: 'Google Play Signature aka "Frosting"',
-    # 0x42726577: 'Verity padding',
-    # 0x6DFF800D: 'Source stamp V2 X509 cert',
-    # JSON with some metadata, used by Chinese company Meituan
-    0x71777777: 'Meituan payload',
-    # Dependencies metadata generated by Gradle and encrypted by Google Play.
-    # '...The data is compressed, encrypted by a Google Play signing key...'
-    # https://developer.android.com/studio/releases/gradle-plugin#dependency-metadata
-    0x504B4453: 'Dependency metadata',
+# Common known non-free blobs (always lower case):
+NON_FREE_GRADLE_LINES = {
+    exp: re.compile(r'.*' + exp, re.IGNORECASE) for exp in [
+        r'flurryagent',
+        r'paypal.*mpl',
+        r'admob.*sdk.*android',
+        r'google.*ad.*view',
+        r'google.*admob',
+        r'google.*play.*services',
+        r'crittercism',
+        r'heyzap',
+        r'jpct.*ae',
+        r'youtube.*android.*player.*api',
+        r'bugsense',
+        r'crashlytics',
+        r'ouya.*sdk',
+        r'libspen23',
+        r'firebase',
+        r'''["']com.facebook.android['":]''',
+        r'cloudrail',
+        r'com.tencent.bugly',
+        r'appcenter-push',
+    ]
 }
 
 
-class ExitCode(IntEnum):
-    NONFREE_CODE = 1
-
-
-class GradleVersionCatalog:
-    """Parse catalog from libs.versions.toml.
-
-    https://docs.gradle.org/current/userguide/platforms.html
-    """
-
-    def __init__(self, catalog):
-        self.version = {
-            alias: self.get_version(version)
-            for alias, version in catalog.get("versions", {}).items()
-        }
-        self.libraries = {
-            self.alias_to_accessor(alias): self.library_to_coordinate(library)
-            for alias, library in catalog.get("libraries", {}).items()
-        }
-        self.plugins = {
-            self.alias_to_accessor(alias): self.plugin_to_coordinate(plugin)
-            for alias, plugin in catalog.get("plugins", {}).items()
-        }
-        self.bundles = {
-            self.alias_to_accessor(alias): self.bundle_to_coordinates(bundle)
-            for alias, bundle in catalog.get("bundles", {}).items()
-        }
-
-    @staticmethod
-    def alias_to_accessor(alias: str) -> str:
-        """Covert alias to accessor.
-
-        https://docs.gradle.org/current/userguide/platforms.html#sub:mapping-aliases-to-accessors
-        Alias is used to define a lib in catalog. Accessor is used to access it.
-        """
-        return alias.replace("-", ".").replace("_", ".")
-
-    def get_version(self, version: Union[dict, str]) -> str:
-        if isinstance(version, str):
-            return version
-        ref = version.get("ref")
-        if ref:
-            return self.version.get(ref, "")
-        return (
-            version.get("prefer", "")
-            or version.get("require", "")
-            or version.get("strictly", "")
-        )
-
-    def library_to_coordinate(self, library: Union[dict, str]) -> str:
-        """Generate the Gradle dependency coordinate from catalog."""
-        if isinstance(library, str):
-            return library
-        module = library.get("module")
-        if not module:
-            group = library.get("group")
-            name = library.get("name")
-            if group and name:
-                module = f"{group}:{name}"
-            else:
-                return ""
-
-        version = library.get("version")
-        if version:
-            return f"{module}:{self.get_version(version)}"
-        else:
-            return module
-
-    def plugin_to_coordinate(self, plugin: Union[dict, str]) -> str:
-        """Generate the Gradle plugin coordinate from catalog."""
-        if isinstance(plugin, str):
-            return plugin
-        id = plugin.get("id")
-        if not id:
-            return ""
-
-        version = plugin.get("version")
-        if version:
-            return f"{id}:{self.get_version(version)}"
-        else:
-            return id
-
-    def bundle_to_coordinates(self, bundle: list[str]) -> list[str]:
-        """Generate the Gradle dependency bundle coordinate from catalog."""
-        coordinates = []
-        for alias in bundle:
-            library = self.libraries.get(self.alias_to_accessor(alias))
-            if library:
-                coordinates.append(library)
-        return coordinates
-
-    def get_coordinate(self, accessor: str) -> list[str]:
-        """Get the Gradle coordinate from the catalog with an accessor."""
-        if accessor.startswith("plugins."):
-            return [
-                self.plugins.get(accessor[8:].removesuffix(".asLibraryDependency"), "")
-            ]
-        if accessor.startswith("bundles."):
-            return self.bundles.get(accessor[8:], [])
-        return [self.libraries.get(accessor, "")]
-
-
-def get_catalogs(root: str) -> dict[str, GradleVersionCatalog]:
-    """Get all Gradle dependency catalogs from settings.gradle[.kts].
-
-    Returns a dict with the extension and the corresponding catalog.
-    The extension is used as the prefix of the accessor to access libs in the catalog.
-    """
-    root = Path(root)
-    catalogs = {}
-    default_prefix = "libs"
-    catalog_files_m = []
-
-    def find_block_end(s, start):
-        pat = re.compile("[{}]")
-        depth = 1
-        for m in pat.finditer(s, pos=start):
-            if m.group() == "{":
-                depth += 1
-            else:
-                depth -= 1
-            if depth == 0:
-                return m.start()
-        else:
-            return -1
-
-    groovy_file = root / "settings.gradle"
-    kotlin_file = root / "settings.gradle.kts"
-    if groovy_file.is_file():
-        gradle_file = groovy_file
-    elif kotlin_file.is_file():
-        gradle_file = kotlin_file
-    else:
-        return {}
-
-    s = gradle_file.read_text(encoding="utf-8")
-    version_catalogs_m = VERSION_CATALOG_REGEX.search(s)
-    if version_catalogs_m:
-        start = version_catalogs_m.end()
-        end = find_block_end(s, start)
-        catalog_files_m = GRADLE_CATALOG_FILE_REGEX.finditer(s, start, end)
-
-    m_default = DEFAULT_CATALOG_PREFIX_REGEX.search(s)
-    if m_default:
-        default_prefix = m_default.group(1)
-    default_catalog_file = Path(root) / "gradle/libs.versions.toml"
-    if default_catalog_file.is_file():
-        with default_catalog_file.open("rb") as f:
-            catalogs[default_prefix] = GradleVersionCatalog(tomllib.load(f))
-    for m in catalog_files_m:
-        catalog_file = Path(root) / m.group(2).replace("$rootDir/", "")
-        if catalog_file.is_file():
-            with catalog_file.open("rb") as f:
-                catalogs[m.group(1)] = GradleVersionCatalog(tomllib.load(f))
-    return catalogs
-
-
 def get_gradle_compile_commands(build):
-    compileCommands = [
-        'alias',
-        'api',
-        'apk',
-        'classpath',
-        'compile',
-        'compileOnly',
-        'id',
-        'implementation',
-        'provided',
-        'runtimeOnly',
-    ]
+    compileCommands = ['compile',
+                       'provided',
+                       'apk',
+                       'implementation',
+                       'api',
+                       'compileOnly',
+                       'runtimeOnly']
     buildTypes = ['', 'release']
+    flavors = ['']
     if build.gradle and build.gradle != ['yes']:
-        flavors = common.calculate_gradle_flavor_combination(build.gradle)
-    else:
-        flavors = ['']
+        flavors += build.gradle
 
-    return [''.join(c) for c in itertools.product(flavors, buildTypes, compileCommands)]
-
-
-def get_gradle_compile_commands_without_catalog(build):
-    return [
-        re.compile(rf'''\s*{c}.*\s*\(?['"].*['"]''', re.IGNORECASE)
-        for c in get_gradle_compile_commands(build)
-    ]
-
-
-def get_gradle_compile_commands_with_catalog(build, prefix):
-    return [
-        re.compile(rf'\s*{c}.*\s*\(?{prefix}\.([a-z0-9.]+)', re.IGNORECASE)
-        for c in get_gradle_compile_commands(build)
-    ]
-
-
-def get_embedded_classes(apkfile, depth=0):
-    """Get the list of Java classes embedded into all DEX files.
-
-    :return: set of Java classes names as string
-    """
-    if depth > 10:  # zipbomb protection
-        return {_('Max recursion depth in ZIP file reached: %s') % apkfile}
-
-    archive_regex = re.compile(r'.*\.(aab|aar|apk|apks|jar|war|xapk|zip)$')
-    class_regex = re.compile(r'classes.*\.dex')
-    classes = set()
-
-    try:
-        with TemporaryDirectory() as tmp_dir, zipfile.ZipFile(apkfile, 'r') as apk_zip:
-            for info in apk_zip.infolist():
-                # apk files can contain apk files, again
-                with apk_zip.open(info) as apk_fp:
-                    if zipfile.is_zipfile(apk_fp):
-                        classes = classes.union(get_embedded_classes(apk_fp, depth + 1))
-                        if not archive_regex.search(info.filename):
-                            classes.add(
-                                'ZIP file without proper file extension: %s'
-                                % info.filename
-                            )
-                        continue
-
-                with apk_zip.open(info.filename) as fp:
-                    file_magic = fp.read(3)
-                if file_magic == b'dex':
-                    if not class_regex.search(info.filename):
-                        classes.add('DEX file with fake name: %s' % info.filename)
-                    apk_zip.extract(info, tmp_dir)
-                    run = common.SdkToolsPopen(
-                        ["dexdump", '{}/{}'.format(tmp_dir, info.filename)],
-                        output=False,
-                    )
-                    classes = classes.union(
-                        set(re.findall(r'[A-Z]+((?:\w+\/)+\w+)', run.output))
-                    )
-    except zipfile.BadZipFile as ex:
-        return {_('Problem with ZIP file: %s, error %s') % (apkfile, ex)}
-
-    return classes
-
-
-def _datetime_now():
-    """Get datetime.now(), using this funciton allows mocking it for testing."""
-    return datetime.now(timezone.utc)
-
-
-def _scanner_cachedir():
-    """Get `Path` to fdroidserver cache dir."""
-    cfg = common.get_config()
-    if not cfg:
-        raise ConfigurationException('config not initialized')
-    if "cachedir_scanner" not in cfg:
-        raise ConfigurationException("could not load 'cachedir_scanner' from config")
-    cachedir = Path(cfg["cachedir_scanner"])
-    cachedir.mkdir(exist_ok=True, parents=True)
-    return cachedir
-
-
-class SignatureDataMalformedException(Exception):
-    pass
-
-
-class SignatureDataOutdatedException(Exception):
-    pass
-
-
-class SignatureDataCacheMissException(Exception):
-    pass
-
-
-class SignatureDataNoDefaultsException(Exception):
-    pass
-
-
-class SignatureDataVersionMismatchException(Exception):
-    pass
-
-
-class SignatureDataController:
-    def __init__(self, name, filename, url):
-        self.name = name
-        self.filename = filename
-        self.url = url
-        # by default we assume cache is valid indefinitely
-        self.cache_duration = timedelta(days=999999)
-        self.data = {}
-
-    def check_data_version(self):
-        if self.data.get("version") != SCANNER_CACHE_VERSION:
-            raise SignatureDataVersionMismatchException()
-
-    def check_last_updated(self):
-        """Check if the last_updated value is ok and raise an exception if expired or inaccessible.
-
-        :raises SignatureDataMalformedException: when timestamp value is
-                                                 inaccessible or not parse-able
-        :raises SignatureDataOutdatedException: when timestamp is older then
-                                                `self.cache_duration`
-        """
-        last_updated = self.data.get("last_updated", None)
-        if last_updated:
-            try:
-                last_updated = datetime.fromtimestamp(last_updated, timezone.utc)
-            except ValueError as e:
-                raise SignatureDataMalformedException() from e
-            except TypeError as e:
-                raise SignatureDataMalformedException() from e
-            delta = (last_updated + self.cache_duration) - scanner._datetime_now()
-            if delta > timedelta(seconds=0):
-                logging.debug(
-                    _('next {name} cache update due in {time}').format(
-                        name=self.filename, time=delta
-                    )
-                )
-            else:
-                raise SignatureDataOutdatedException()
-
-    def fetch(self):
-        try:
-            self.fetch_signatures_from_web()
-            self.write_to_cache()
-        except Exception as e:
-            raise Exception(
-                _("downloading scanner signatures from '{}' failed").format(self.url)
-            ) from e
-
-    def load(self):
-        try:
-            try:
-                self.load_from_cache()
-                self.verify_data()
-                self.check_last_updated()
-            except SignatureDataCacheMissException:
-                self.load_from_defaults()
-        except (SignatureDataOutdatedException, SignatureDataNoDefaultsException):
-            self.fetch_signatures_from_web()
-            self.write_to_cache()
-        except (
-            SignatureDataMalformedException,
-            SignatureDataVersionMismatchException,
-        ) as e:
-            logging.critical(
-                _(
-                    "scanner cache is malformed! You can clear it with: '{clear}'"
-                ).format(
-                    clear='rm -r {}'.format(common.get_config()['cachedir_scanner'])
-                )
-            )
-            raise e
-
-    def load_from_defaults(self):
-        raise SignatureDataNoDefaultsException()
-
-    def load_from_cache(self):
-        sig_file = scanner._scanner_cachedir() / self.filename
-        if not sig_file.exists():
-            raise SignatureDataCacheMissException()
-        with open(sig_file) as f:
-            self.set_data(json.load(f))
-
-    def write_to_cache(self):
-        sig_file = scanner._scanner_cachedir() / self.filename
-        with open(sig_file, "w", encoding="utf-8") as f:
-            json.dump(self.data, f, indent=2)
-        logging.debug("write '{}' to cache".format(self.filename))
-
-    def verify_data(self):
-        """Clean and validate `self.data`.
-
-        Right now this function does just a basic key sanitation.
-        """
-        self.check_data_version()
-        valid_keys = [
-            'timestamp',
-            'last_updated',
-            'version',
-            'signatures',
-            'cache_duration',
-        ]
-
-        for k in list(self.data.keys()):
-            if k not in valid_keys:
-                del self.data[k]
-
-    def set_data(self, new_data):
-        self.data = new_data
-        if 'cache_duration' in new_data:
-            self.cache_duration = timedelta(seconds=new_data['cache_duration'])
-
-    def fetch_signatures_from_web(self):
-        if not self.url.startswith("https://"):
-            raise Exception(_("can't open non-https url: '{};".format(self.url)))
-        logging.debug(_("downloading '{}'").format(self.url))
-        with urllib.request.urlopen(self.url) as f:  # nosec B310 scheme filtered above
-            self.set_data(json.load(f))
-        self.data['last_updated'] = scanner._datetime_now().timestamp()
-
-
-class ExodusSignatureDataController(SignatureDataController):
-    def __init__(self):
-        super().__init__(
-            'Exodus signatures',
-            'exodus.json',
-            'https://reports.exodus-privacy.eu.org/api/trackers',
-        )
-        self.cache_duration = timedelta(days=1)  # refresh exodus cache after one day
-        self.has_trackers_json_key = True
-
-    def fetch_signatures_from_web(self):
-        logging.debug(_("downloading '{}'").format(self.url))
-
-        data = {
-            "signatures": {},
-            "timestamp": scanner._datetime_now().timestamp(),
-            "last_updated": scanner._datetime_now().timestamp(),
-            "version": SCANNER_CACHE_VERSION,
-        }
-
-        if not self.url.startswith("https://"):
-            raise Exception(_("can't open non-https url: '{};".format(self.url)))
-        with urllib.request.urlopen(self.url) as f:  # nosec B310 scheme filtered above
-            trackerlist = json.load(f)
-            if self.has_trackers_json_key:
-                trackerlist = trackerlist["trackers"].values()
-            for tracker in trackerlist:
-                if tracker.get('code_signature'):
-                    data["signatures"][tracker["name"]] = {
-                        "name": tracker["name"],
-                        "warn_code_signatures": [tracker["code_signature"]],
-                        # exodus also provides network signatures, unused atm.
-                        # "network_signatures": [tracker["network_signature"]],
-                        "AntiFeatures": ["Tracking"],  # TODO
-                        "license": "NonFree",  # We assume all trackers in exodus
-                        # are non-free, although free
-                        # trackers like piwik, acra,
-                        # etc. might be listed by exodus
-                        # too.
-                    }
-        self.set_data(data)
-
-
-class EtipSignatureDataController(ExodusSignatureDataController):
-    def __init__(self):
-        super().__init__()
-        self.name = 'ETIP signatures'
-        self.filename = 'etip.json'
-        self.url = 'https://etip.exodus-privacy.eu.org/api/trackers/?format=json'
-        self.has_trackers_json_key = False
-
-
-class SUSSDataController(SignatureDataController):
-    def __init__(self):
-        super().__init__(
-            'SUSS', 'suss.json', 'https://fdroid.gitlab.io/fdroid-suss/suss.json'
-        )
-
-    def load_from_defaults(self):
-        self.set_data(json.loads(SUSS_DEFAULT))
-
-
-class ScannerTool:
-    refresh_allowed = True
-
-    def __init__(self):
-        # we could add support for loading additional signature source
-        # definitions from config.yml here
-
-        self.scanner_data_lookup()
-
-        options = common.get_options()
-        options_refresh_scanner = (
-            hasattr(options, "refresh_scanner")
-            and options.refresh_scanner
-            and ScannerTool.refresh_allowed
-        )
-        if options_refresh_scanner or common.get_config().get('refresh_scanner'):
-            self.refresh()
-
-        self.load()
-        self.compile_regexes()
-
-    def scanner_data_lookup(self):
-        sigsources = common.get_config().get('scanner_signature_sources', [])
-        logging.debug(
-            "scanner is configured to use signature data from: '{}'".format(
-                "', '".join(sigsources)
-            )
-        )
-        self.sdcs = []
-        for i, source_url in enumerate(sigsources):
-            if source_url.lower() == 'suss':
-                self.sdcs.append(SUSSDataController())
-            elif source_url.lower() == 'exodus':
-                self.sdcs.append(ExodusSignatureDataController())
-            elif source_url.lower() == 'etip':
-                self.sdcs.append(EtipSignatureDataController())
-            else:
-                u = urllib.parse.urlparse(source_url)
-                if u.scheme != 'https' or u.path == "":
-                    raise ConfigurationException(
-                        "Invalid 'scanner_signature_sources' configuration: '{}'. "
-                        "Has to be a valid HTTPS-URL or match a predefined "
-                        "constants: 'suss', 'exodus'".format(source_url)
-                    )
-                self.sdcs.append(
-                    SignatureDataController(
-                        source_url,
-                        '{}_{}'.format(i, os.path.basename(u.path)),
-                        source_url,
-                    )
-                )
-
-    def load(self):
-        for sdc in self.sdcs:
-            sdc.load()
-
-    def compile_regexes(self):
-        self.regexs = {
-            'err_code_signatures': {},
-            'err_gradle_signatures': {},
-            'warn_code_signatures': {},
-            'warn_gradle_signatures': {},
-        }
-        for sdc in self.sdcs:
-            for signame, sigdef in sdc.data.get('signatures', {}).items():
-                for sig in sigdef.get('code_signatures', []):
-                    self.regexs['err_code_signatures'][sig] = re.compile(
-                        '.*' + sig, re.IGNORECASE
-                    )
-                for sig in sigdef.get('gradle_signatures', []):
-                    self.regexs['err_gradle_signatures'][sig] = re.compile(
-                        '.*' + sig, re.IGNORECASE
-                    )
-                for sig in sigdef.get('warn_code_signatures', []):
-                    self.regexs['warn_code_signatures'][sig] = re.compile(
-                        '.*' + sig, re.IGNORECASE
-                    )
-                for sig in sigdef.get('warn_gradle_signatures', []):
-                    self.regexs['warn_gradle_signatures'][sig] = re.compile(
-                        '.*' + sig, re.IGNORECASE
-                    )
-
-    def refresh(self):
-        for sdc in self.sdcs:
-            sdc.fetch_signatures_from_web()
-            sdc.write_to_cache()
-
-    def add(self, new_controller: SignatureDataController):
-        self.sdcs.append(new_controller)
-        self.compile_regexes()
-
-
-# TODO: change this from singleton instance to dependency injection
-# use `_get_tool()` instead of accessing this directly
-_SCANNER_TOOL = None
-
-
-def _get_tool():
-    """Lazy loading function for getting a ScannerTool instance.
-
-    ScannerTool initialization need to access `common.config` values. Those are only available after initialization through `common.read_config()`. So this factory assumes config was called at an erlier point in time.
-    """
-    if not scanner._SCANNER_TOOL:
-        scanner._SCANNER_TOOL = ScannerTool()
-    return scanner._SCANNER_TOOL
+    commands = [''.join(c) for c in itertools.product(flavors, buildTypes, compileCommands)]
+    return [re.compile(r'\s*' + c, re.IGNORECASE) for c in commands]
 
 
 def scan_binary(apkfile):
-    """Scan output of dexdump for known non-free classes."""
-    logging.info(_('Scanning APK with dexdump for known non-free classes.'))
-    result = get_embedded_classes(apkfile)
-    problems, warnings = 0, 0
-    for classname in result:
-        for suspect, regexp in _get_tool().regexs['warn_code_signatures'].items():
-            if regexp.match(classname):
-                logging.debug("Warning: found class '%s'" % classname)
-                warnings += 1
-        for suspect, regexp in _get_tool().regexs['err_code_signatures'].items():
-            if regexp.match(classname):
-                logging.debug("Problem: found class '%s'" % classname)
-                problems += 1
-
-    logging.info(_('Scanning APK for extra signing blocks.'))
-    a = common.get_androguard_APK(str(apkfile))
-    a.parse_v2_v3_signature()
-    for b in a._v2_blocks:
-        if b in APK_SIGNING_BLOCK_IDS:
-            logging.debug(
-                f"Problem: found extra signing block '{APK_SIGNING_BLOCK_IDS[b]}'"
-            )
+    logging.info("Scanning APK for known non-free classes.")
+    result = common.SdkToolsPopen(["apkanalyzer", "dex", "packages", "--defined-only", apkfile], output=False)
+    problems = 0
+    for suspect, regexp in CODE_SIGNATURES.items():
+        matches = regexp.findall(result.output)
+        if matches:
+            for m in set(matches):
+                logging.debug("Found class '%s'" % m)
             problems += 1
-
-    if warnings:
-        logging.warning(
-            _("Found {count} warnings in {filename}").format(
-                count=warnings, filename=apkfile
-            )
-        )
     if problems:
-        logging.critical(
-            _("Found {count} problems in {filename}").format(
-                count=problems, filename=apkfile
-            )
-        )
+        logging.critical("Found problems in %s" % apkfile)
     return problems
 
 
-def scan_source(build_dir, build=metadata.Build(), json_per_build=None):
-    """Scan the source code in the given directory (and all subdirectories).
-
-    Returns
-    -------
-    the number of fatal problems encountered.
-
+def scan_source(build_dir, build=metadata.Build()):
+    """Scan the source code in the given directory (and all subdirectories)
+    and return the number of fatal problems encountered
     """
+
     count = 0
 
-    if not json_per_build:
-        json_per_build = MessageStore()
+    whitelisted = [
+        'firebase-jobdispatcher',  # https://github.com/firebase/firebase-jobdispatcher-android/blob/master/LICENSE
+        'com.firebaseui',          # https://github.com/firebase/FirebaseUI-Android/blob/master/LICENSE
+        'geofire-android'          # https://github.com/firebase/geofire-java/blob/master/LICENSE
+    ]
+
+    def is_whitelisted(s):
+        return any(wl in s for wl in whitelisted)
 
     def suspects_found(s):
-        for n, r in _get_tool().regexs['err_gradle_signatures'].items():
-            if r.match(s):
+        for n, r in NON_FREE_GRADLE_LINES.items():
+            if r.match(s) and not is_whitelisted(s):
                 yield n
 
-    allowed_repos = [
-        re.compile(r'^https://' + re.escape(repo) + r'/*')
-        for repo in [
-            'repo1.maven.org/maven2',  # mavenCentral()
-            'jitpack.io',
-            'www.jitpack.io',
-            'repo.maven.apache.org/maven2',
-            'oss.jfrog.org/artifactory/oss-snapshot-local',
-            'central.sonatype.com/repository/maven-snapshots',
-            'oss.sonatype.org/content/repositories/snapshots',
-            'oss.sonatype.org/content/repositories/releases',
-            'oss.sonatype.org/content/groups/public',
-            'oss.sonatype.org/service/local/staging/deploy/maven2',
-            's01.oss.sonatype.org/content/repositories/snapshots',
-            's01.oss.sonatype.org/content/repositories/releases',
-            's01.oss.sonatype.org/content/groups/public',
-            's01.oss.sonatype.org/service/local/staging/deploy/maven2',
-            'clojars.org/repo',  # Clojure free software libs
-            'repo.clojars.org',  # Clojure free software libs
-            's3.amazonaws.com/repo.commonsware.com',  # CommonsWare
-            'plugins.gradle.org/m2',  # Gradle plugin repo
-            'maven.google.com',  # google()
+    allowed_repos = [re.compile(r'^https://' + re.escape(repo) + r'/*') for repo in [
+        'repo1.maven.org/maven2',  # mavenCentral()
+        'jcenter.bintray.com',     # jcenter()
+        'jitpack.io',
+        'www.jitpack.io',
+        'repo.maven.apache.org/maven2',
+        'oss.jfrog.org/artifactory/oss-snapshot-local',
+        'oss.sonatype.org/content/repositories/snapshots',
+        'oss.sonatype.org/content/repositories/releases',
+        'oss.sonatype.org/content/groups/public',
+        'clojars.org/repo',  # Clojure free software libs
+        's3.amazonaws.com/repo.commonsware.com',  # CommonsWare
+        'plugins.gradle.org/m2',  # Gradle plugin repo
+        'maven.google.com',  # Google Maven Repo, https://developer.android.com/studio/build/dependencies.html#google-maven
         ]
-    ] + [
-        re.compile(r'^file://' + re.escape(repo) + r'/*')
-        for repo in [
-            '/usr/share/maven-repo',  # local repo on Debian installs
+    ] + [re.compile(r'^file://' + re.escape(repo) + r'/*') for repo in [
+        '/usr/share/maven-repo',  # local repo on Debian installs
         ]
     ]
 
-    scanignore, scanignore_not_found_paths = common.getpaths_map(
-        build_dir, build.scanignore
-    )
-    scandelete, scandelete_not_found_paths = common.getpaths_map(
-        build_dir, build.scandelete
-    )
+    scanignore = common.getpaths_map(build_dir, build.scanignore)
+    scandelete = common.getpaths_map(build_dir, build.scandelete)
 
     scanignore_worked = set()
     scandelete_worked = set()
@@ -773,48 +177,29 @@ def scan_source(build_dir, build=metadata.Build(), json_per_build=None):
                     return True
         return False
 
-    def ignoreproblem(what, path_in_build_dir, json_per_build):
-        """No summary.
-
-        Parameters
-        ----------
-        what: string
-          describing the problem, will be printed in log messages
-        path_in_build_dir
-          path to the file relative to `build`-dir
-
-        Returns
-        -------
-        0 as we explicitly ignore the file, so don't count an error
-
+    def ignoreproblem(what, path_in_build_dir):
         """
-        msg = 'Ignoring %s at %s' % (what, path_in_build_dir)
+        :param what: string describing the problem, will be printed in log messages
+        :param path_in_build_dir: path to the file relative to `build`-dir
+        "returns: 0 as we explicitly ignore the file, so don't count an error
+        """
+        msg = ('Ignoring %s at %s' % (what, path_in_build_dir))
         logging.info(msg)
         if json_per_build is not None:
-            json_per_build.infos.append([msg, path_in_build_dir])
+            json_per_build['infos'].append([msg, path_in_build_dir])
         return 0
 
-    def removeproblem(what, path_in_build_dir, filepath, json_per_build):
-        """No summary.
-
-        Parameters
-        ----------
-        what: string
-          describing the problem, will be printed in log messages
-        path_in_build_dir
-          path to the file relative to `build`-dir
-        filepath
-          Path (relative to our current path) to the file
-
-        Returns
-        -------
-        0 as we deleted the offending file
-
+    def removeproblem(what, path_in_build_dir, filepath):
         """
-        msg = 'Removing %s at %s' % (what, path_in_build_dir)
+        :param what: string describing the problem, will be printed in log messages
+        :param path_in_build_dir: path to the file relative to `build`-dir
+        :param filepath: Path (relative to our current path) to the file
+        "returns: 0 as we deleted the offending file
+        """
+        msg = ('Removing %s at %s' % (what, path_in_build_dir))
         logging.info(msg)
         if json_per_build is not None:
-            json_per_build.infos.append([msg, path_in_build_dir])
+            json_per_build['infos'].append([msg, path_in_build_dir])
         try:
             os.remove(filepath)
         except FileNotFoundError:
@@ -824,66 +209,44 @@ def scan_source(build_dir, build=metadata.Build(), json_per_build=None):
             pass
         return 0
 
-    def warnproblem(what, path_in_build_dir, json_per_build):
-        """No summary.
-
-        Parameters
-        ----------
-        what: string
-          describing the problem, will be printed in log messages
-        path_in_build_dir
-          path to the file relative to `build`-dir
-
-        Returns
-        -------
-        0, as warnings don't count as errors
-
+    def warnproblem(what, path_in_build_dir):
+        """
+        :param what: string describing the problem, will be printed in log messages
+        :param path_in_build_dir: path to the file relative to `build`-dir
+        :returns: 0, as warnings don't count as errors
         """
         if toignore(path_in_build_dir):
             return 0
         logging.warning('Found %s at %s' % (what, path_in_build_dir))
         if json_per_build is not None:
-            json_per_build.warnings.append([what, path_in_build_dir])
+            json_per_build['warnings'].append([what, path_in_build_dir])
         return 0
 
-    def handleproblem(what, path_in_build_dir, filepath, json_per_build):
-        """Dispatches to problem handlers (ignore, delete, warn).
-
-        Or returns 1 for increasing the error count.
-
-        Parameters
-        ----------
-        what: string
-          describing the problem, will be printed in log messages
-        path_in_build_dir
-          path to the file relative to `build`-dir
-        filepath
-          Path (relative to our current path) to the file
-
-        Returns
-        -------
-        0 if the problem was ignored/deleted/is only a warning, 1 otherwise
+    def handleproblem(what, path_in_build_dir, filepath):
+        """Dispatches to problem handlers (ignore, delete, warn) or returns 1
+         for increasing the error count
 
+        :param what: string describing the problem, will be printed in log messages
+        :param path_in_build_dir: path to the file relative to `build`-dir
+        :param filepath: Path (relative to our current path) to the file
+        :returns: 0 if the problem was ignored/deleted/is only a warning, 1 otherwise
         """
-        options = common.get_options()
         if toignore(path_in_build_dir):
-            return ignoreproblem(what, path_in_build_dir, json_per_build)
+            return ignoreproblem(what, path_in_build_dir)
         if todelete(path_in_build_dir):
-            return removeproblem(what, path_in_build_dir, filepath, json_per_build)
-        if 'src/test' in path_in_build_dir or '/test/' in path_in_build_dir:
-            return warnproblem(what, path_in_build_dir, json_per_build)
+            return removeproblem(what, path_in_build_dir, filepath)
+        if 'src/test' in filepath or '/test/' in path_in_build_dir:
+            return warnproblem(what, path_in_build_dir)
         if options and 'json' in vars(options) and options.json:
-            json_per_build.errors.append([what, path_in_build_dir])
-        if options and (
-            options.verbose or not ('json' in vars(options) and options.json)
-        ):
+            json_per_build['errors'].append([what, path_in_build_dir])
+        if options and (options.verbose or not ('json' in vars(options) and options.json)):
             logging.error('Found %s at %s' % (what, path_in_build_dir))
         return 1
 
     def is_executable(path):
         return os.path.exists(path) and os.access(path, os.X_OK)
 
-    textchars = bytearray({7, 8, 9, 10, 12, 13, 27} | set(range(0x20, 0x100)) - {0x7f})  # fmt: skip
+    textchars = bytearray({7, 8, 9, 10, 12, 13, 27} | set(range(0x20, 0x100)) - {0x7f})
 
     def is_binary(path):
         d = None
@@ -892,21 +255,15 @@ def scan_source(build_dir, build=metadata.Build(), json_per_build=None):
         return bool(d.translate(None, textchars))
 
     # False positives patterns for files that are binary and executable.
-    safe_paths = [
-        re.compile(r)
-        for r in [
-            r".*/drawable[^/]*/.*\.png$",  # png drawables
-            r".*/mipmap[^/]*/.*\.png$",  # png mipmaps
+    safe_paths = [re.compile(r) for r in [
+        r".*/drawable[^/]*/.*\.png$",  # png drawables
+        r".*/mipmap[^/]*/.*\.png$",    # png mipmaps
         ]
     ]
 
     def is_image_file(path):
-        try:
-            mimetype = magic.from_file(path, mime=True)
-            if mimetype and mimetype.startswith('image/'):
-                return True
-        except Exception as e:
-            logging.info(e)
+        if imghdr.what(path) is not None:
+            return True
 
     def safe_path(path_in_build_dir):
         for sp in safe_paths:
@@ -914,32 +271,21 @@ def scan_source(build_dir, build=metadata.Build(), json_per_build=None):
                 return True
         return False
 
-    def is_used_by_gradle_without_catalog(line):
-        return any(
-            command.match(line)
-            for command in get_gradle_compile_commands_without_catalog(build)
-        )
+    gradle_compile_commands = get_gradle_compile_commands(build)
 
-    def is_used_by_gradle_with_catalog(line, prefix):
-        for m in (
-            command.match(line)
-            for command in get_gradle_compile_commands_with_catalog(build, prefix)
-        ):
-            if m:
-                return m
+    def is_used_by_gradle(line):
+        return any(command.match(line) for command in gradle_compile_commands)
 
-    all_catalogs = {}
     # Iterate through all files in the source code
     for root, dirs, files in os.walk(build_dir, topdown=True):
+
         # It's topdown, so checking the basename is enough
         for ignoredir in ('.hg', '.git', '.svn', '.bzr'):
             if ignoredir in dirs:
                 dirs.remove(ignoredir)
 
-        if "settings.gradle" in files or "settings.gradle.kts" in files:
-            all_catalogs[str(root)] = get_catalogs(root)
-
         for curfile in files:
+
             if curfile in ['.DS_Store']:
                 continue
 
@@ -950,179 +296,70 @@ def scan_source(build_dir, build=metadata.Build(), json_per_build=None):
                 continue
 
             path_in_build_dir = os.path.relpath(filepath, build_dir)
+            extension = os.path.splitext(path_in_build_dir)[1]
 
             if curfile in ('gradle-wrapper.jar', 'gradlew', 'gradlew.bat'):
-                removeproblem(curfile, path_in_build_dir, filepath, json_per_build)
-            elif curfile.endswith('.apk'):
-                removeproblem(
-                    _('Android APK file'), path_in_build_dir, filepath, json_per_build
-                )
+                removeproblem(curfile, path_in_build_dir, filepath)
+            elif extension == '.apk':
+                removeproblem(_('Android APK file'), path_in_build_dir, filepath)
 
-            elif curfile.endswith('.a'):
-                count += handleproblem(
-                    _('static library'), path_in_build_dir, filepath, json_per_build
-                )
-            elif curfile.endswith('.aar'):
-                count += handleproblem(
-                    _('Android AAR library'),
-                    path_in_build_dir,
-                    filepath,
-                    json_per_build,
-                )
-            elif curfile.endswith('.class'):
-                count += handleproblem(
-                    _('Java compiled class'),
-                    path_in_build_dir,
-                    filepath,
-                    json_per_build,
-                )
-            elif curfile.endswith('.dex'):
-                count += handleproblem(
-                    _('Android DEX code'), path_in_build_dir, filepath, json_per_build
-                )
-            elif curfile.endswith('.gz') or curfile.endswith('.tgz'):
-                count += handleproblem(
-                    _('gzip file archive'), path_in_build_dir, filepath, json_per_build
-                )
-            # We use a regular expression here to also match versioned shared objects like .so.0.0.0
-            elif re.match(r'.*\.so(\..+)*$', curfile):
-                count += handleproblem(
-                    _('shared library'), path_in_build_dir, filepath, json_per_build
-                )
-            elif curfile.endswith('.zip'):
-                count += handleproblem(
-                    _('ZIP file archive'), path_in_build_dir, filepath, json_per_build
-                )
-            elif curfile.endswith('.jar'):
+            elif extension == '.a':
+                count += handleproblem(_('static library'), path_in_build_dir, filepath)
+            elif extension == '.aar':
+                count += handleproblem(_('Android AAR library'), path_in_build_dir, filepath)
+            elif extension == '.class':
+                count += handleproblem(_('Java compiled class'), path_in_build_dir, filepath)
+            elif extension == '.dex':
+                count += handleproblem(_('Android DEX code'), path_in_build_dir, filepath)
+            elif extension == '.gz':
+                count += handleproblem(_('gzip file archive'), path_in_build_dir, filepath)
+            elif extension == '.so':
+                count += handleproblem(_('shared library'), path_in_build_dir, filepath)
+            elif extension == '.zip':
+                count += handleproblem(_('ZIP file archive'), path_in_build_dir, filepath)
+            elif extension == '.jar':
                 for name in suspects_found(curfile):
-                    count += handleproblem(
-                        'usual suspect \'%s\'' % name,
-                        path_in_build_dir,
-                        filepath,
-                        json_per_build,
-                    )
-                count += handleproblem(
-                    _('Java JAR file'), path_in_build_dir, filepath, json_per_build
-                )
-            elif curfile.endswith('.wasm'):
-                count += handleproblem(
-                    _('WebAssembly binary file'),
-                    path_in_build_dir,
-                    filepath,
-                    json_per_build,
-                )
+                    count += handleproblem('usual suspect \'%s\'' % name, path_in_build_dir, filepath)
+                count += handleproblem(_('Java JAR file'), path_in_build_dir, filepath)
 
-            elif curfile.endswith('.java'):
+            elif extension == '.java':
                 if not os.path.isfile(filepath):
                     continue
                 with open(filepath, 'r', errors='replace') as f:
                     for line in f:
                         if 'DexClassLoader' in line:
-                            count += handleproblem(
-                                'DexClassLoader',
-                                path_in_build_dir,
-                                filepath,
-                                json_per_build,
-                            )
+                            count += handleproblem('DexClassLoader', path_in_build_dir, filepath)
                             break
 
-            elif curfile.endswith('.gradle') or curfile.endswith('.gradle.kts'):
-                catalog_path = str(build_dir)
-                # Find the longest path of dir that the curfile is in
-                for p in all_catalogs:
-                    if os.path.commonpath([root, p]) == p:
-                        catalog_path = p
-                catalogs = all_catalogs.get(catalog_path, {})
-
+            elif extension == '.gradle':
                 if not os.path.isfile(filepath):
                     continue
                 with open(filepath, 'r', errors='replace') as f:
                     lines = f.readlines()
                 for i, line in enumerate(lines):
-                    if is_used_by_gradle_without_catalog(line):
+                    if is_used_by_gradle(line):
                         for name in suspects_found(line):
-                            count += handleproblem(
-                                f"usual suspect '{name}'",
-                                path_in_build_dir,
-                                filepath,
-                                json_per_build,
-                            )
-                    for prefix, catalog in catalogs.items():
-                        m = is_used_by_gradle_with_catalog(line, prefix)
-                        if not m:
-                            continue
-                        accessor = m[1]
-                        coordinates = catalog.get_coordinate(accessor)
-                        for coordinate in coordinates:
-                            for name in suspects_found(coordinate):
-                                count += handleproblem(
-                                    f"usual suspect '{prefix}.{accessor}: {name}'",
-                                    path_in_build_dir,
-                                    filepath,
-                                    json_per_build,
-                                )
-                noncomment_lines = [
-                    line for line in lines if not common.gradle_comment.match(line)
-                ]
-                no_comments = re.sub(
-                    r'/\*.*?\*/', '', ''.join(noncomment_lines), flags=re.DOTALL
-                )
+                            count += handleproblem("usual suspect \'%s\'" % (name),
+                                                   path_in_build_dir, filepath)
+                noncomment_lines = [line for line in lines if not common.gradle_comment.match(line)]
+                no_comments = re.sub(r'/\*.*?\*/', '', ''.join(noncomment_lines), flags=re.DOTALL)
                 for url in MAVEN_URL_REGEX.findall(no_comments):
                     if not any(r.match(url) for r in allowed_repos):
-                        count += handleproblem(
-                            'unknown maven repo \'%s\'' % url,
-                            path_in_build_dir,
-                            filepath,
-                            json_per_build,
-                        )
+                        count += handleproblem('unknown maven repo \'%s\'' % url, path_in_build_dir, filepath)
 
-            elif os.path.splitext(path_in_build_dir)[1] in ['', '.bin', '.out', '.exe']:
+            elif extension in ['', '.bin', '.out', '.exe']:
                 if is_binary(filepath):
-                    count += handleproblem(
-                        'binary', path_in_build_dir, filepath, json_per_build
-                    )
-
-            elif curfile in DEPFILE:
-                d = root
-                while d.startswith(str(build_dir)):
-                    for lockfile in DEPFILE[curfile]:
-                        if os.path.isfile(os.path.join(d, lockfile)):
-                            break
-                    else:
-                        d = os.path.dirname(d)
-                        continue
-                    break
-                else:
-                    count += handleproblem(
-                        _('dependency file without lock'),
-                        path_in_build_dir,
-                        filepath,
-                        json_per_build,
-                    )
+                    count += handleproblem('binary', path_in_build_dir, filepath)
 
             elif is_executable(filepath):
-                if is_binary(filepath) and not (
-                    safe_path(path_in_build_dir) or is_image_file(filepath)
-                ):
-                    warnproblem(
-                        _('executable binary, possibly code'),
-                        path_in_build_dir,
-                        json_per_build,
-                    )
-
-    for p in scanignore_not_found_paths:
-        logging.error(_("Non-exist scanignore path: %s") % p)
-        count += 1
+                if is_binary(filepath) and not (safe_path(path_in_build_dir) or is_image_file(filepath)):
+                    warnproblem(_('executable binary, possibly code'), path_in_build_dir)
 
     for p in scanignore:
         if p not in scanignore_worked:
             logging.error(_('Unused scanignore path: %s') % p)
             count += 1
 
-    for p in scandelete_not_found_paths:
-        logging.error(_("Non-exist scandelete path: %s") % p)
-        count += 1
-
     for p in scandelete:
         if p not in scandelete_worked:
             logging.error(_('Unused scandelete path: %s') % p)
@@ -1132,42 +369,18 @@ def scan_source(build_dir, build=metadata.Build(), json_per_build=None):
 
 
 def main():
-    parser = ArgumentParser(
-        usage="%(prog)s [options] [(APPID[:VERCODE] | path/to.apk) ...]"
-    )
+    global config, options, json_per_build
+
+    # Parse command line...
+    parser = ArgumentParser(usage="%(prog)s [options] [APPID[:VERCODE] [APPID[:VERCODE] ...]]")
     common.setup_global_opts(parser)
-    parser.add_argument(
-        "appid",
-        nargs='*',
-        help=_("application ID with optional versionCode in the form APPID[:VERCODE]"),
-    )
-    parser.add_argument(
-        "-f",
-        "--force",
-        action="store_true",
-        default=False,
-        help=_("Force scan of disabled apps and builds."),
-    )
-    parser.add_argument(
-        "--json", action="store_true", default=False, help=_("Output JSON to stdout.")
-    )
-    parser.add_argument(
-        "-r",
-        "--refresh",
-        dest="refresh_scanner",
-        action="store_true",
-        default=False,
-        help=_("fetch the latest version of signatures from the web"),
-    )
-    parser.add_argument(
-        "-e",
-        "--exit-code",
-        action="store_true",
-        default=False,
-        help=_("Exit with a non-zero code if problems were found"),
-    )
+    parser.add_argument("appid", nargs='*', help=_("application ID with optional versionCode in the form APPID[:VERCODE]"))
+    parser.add_argument("-f", "--force", action="store_true", default=False,
+                        help=_("Force scan of disabled apps and builds."))
+    parser.add_argument("--json", action="store_true", default=False,
+                        help=_("Output JSON to stdout."))
     metadata.add_metadata_arguments(parser)
-    options = common.parse_args(parser)
+    options = parser.parse_args()
     metadata.warnings_action = options.W
 
     json_output = dict()
@@ -1177,34 +390,14 @@ def main():
         else:
             logging.getLogger().setLevel(logging.ERROR)
 
-    # initialize/load configuration values
-    common.get_config()
+    config = common.read_config(options)
+
+    # Read all app and srclib metadata
+    allapps = metadata.read_metadata()
+    apps = common.read_app_args(options.appid, allapps, True)
 
     probcount = 0
 
-    appids = []
-    for apk in options.appid:
-        if os.path.isfile(apk):
-            count = scanner.scan_binary(apk)
-            if count > 0:
-                logging.warning(
-                    _('Scanner found {count} problems in {apk}').format(
-                        count=count, apk=apk
-                    )
-                )
-                probcount += count
-        else:
-            appids.append(apk)
-
-    if not appids:
-        if options.exit_code and probcount > 0:
-            sys.exit(ExitCode.NONFREE_CODE)
-        if options.refresh_scanner:
-            _get_tool()
-        return
-
-    apps = common.read_app_args(appids, allow_version_codes=True)
-
     build_dir = 'build'
     if not os.path.isdir(build_dir):
         logging.info("Creating build directory")
@@ -1213,13 +406,12 @@ def main():
     extlib_dir = os.path.join(build_dir, 'extlib')
 
     for appid, app in apps.items():
+
         json_per_appid = dict()
 
         if app.Disabled and not options.force:
             logging.info(_("Skipping {appid}: disabled").format(appid=appid))
-            json_per_appid['disabled'] = MessageStore().infos.append(
-                'Skipping: disabled'
-            )
+            json_per_appid['disabled'] = json_per_build['infos'].append('Skipping: disabled')
             continue
 
         try:
@@ -1228,1776 +420,66 @@ def main():
             else:
                 build_dir = os.path.join('build', appid)
 
-            if app.get('Builds'):
+            if app.builds:
                 logging.info(_("Processing {appid}").format(appid=appid))
                 # Set up vcs interface and make sure we have the latest code...
                 vcs = common.getvcs(app.RepoType, app.Repo, build_dir)
             else:
-                logging.info(
-                    _(
-                        "{appid}: no builds specified, running on current source state"
-                    ).format(appid=appid)
-                )
-                json_per_build = MessageStore()
+                logging.info(_("{appid}: no builds specified, running on current source state")
+                             .format(appid=appid))
+                json_per_build = DEFAULT_JSON_PER_BUILD
                 json_per_appid['current-source-state'] = json_per_build
-                count = scan_source(build_dir, json_per_build=json_per_build)
+                count = scan_source(build_dir)
                 if count > 0:
-                    logging.warning(
-                        _('Scanner found {count} problems in {appid}:').format(
-                            count=count, appid=appid
-                        )
-                    )
+                    logging.warning(_('Scanner found {count} problems in {appid}:')
+                                    .format(count=count, appid=appid))
                     probcount += count
-                app['Builds'] = []
+                app.builds = []
 
-            for build in app.get('Builds', []):
-                json_per_build = MessageStore()
+            for build in app.builds:
+                json_per_build = DEFAULT_JSON_PER_BUILD
                 json_per_appid[build.versionCode] = json_per_build
 
                 if build.disable and not options.force:
-                    logging.info(
-                        "...skipping version %s - %s"
-                        % (build.versionName, build.get('disable', build.commit[1:]))
-                    )
+                    logging.info("...skipping version %s - %s" % (
+                        build.versionName, build.get('disable', build.commit[1:])))
                     continue
 
                 logging.info("...scanning version " + build.versionName)
                 # Prepare the source code...
-                common.prepare_source(
-                    vcs, app, build, build_dir, srclib_dir, extlib_dir, False
-                )
+                common.prepare_source(vcs, app, build,
+                                      build_dir, srclib_dir,
+                                      extlib_dir, False)
 
-                count = scan_source(build_dir, build, json_per_build=json_per_build)
+                count = scan_source(build_dir, build)
                 if count > 0:
-                    logging.warning(
-                        _(
-                            'Scanner found {count} problems in {appid}:{versionCode}:'
-                        ).format(
-                            count=count, appid=appid, versionCode=build.versionCode
-                        )
-                    )
+                    logging.warning(_('Scanner found {count} problems in {appid}:{versionCode}:')
+                                    .format(count=count, appid=appid, versionCode=build.versionCode))
                     probcount += count
 
         except BuildException as be:
-            logging.warning(
-                'Could not scan app %s due to BuildException: %s' % (appid, be)
-            )
+            logging.warning('Could not scan app %s due to BuildException: %s' % (
+                appid, be))
             probcount += 1
         except VCSException as vcse:
             logging.warning('VCS error while scanning app %s: %s' % (appid, vcse))
             probcount += 1
         except Exception:
-            logging.warning(
-                'Could not scan app %s due to unknown error: %s'
-                % (appid, traceback.format_exc())
-            )
+            logging.warning('Could not scan app %s due to unknown error: %s' % (
+                appid, traceback.format_exc()))
             probcount += 1
 
         for k, v in json_per_appid.items():
-            if len(v.errors) or len(v.warnings) or len(v.infos):
-                json_output[appid] = {
-                    k: dict((field.name, getattr(v, field.name)) for field in fields(v))
-                    for k, v in json_per_appid.items()
-                }
+            if len(v['errors']) or len(v['warnings']) or len(v['infos']):
+                json_output[appid] = json_per_appid
                 break
 
     logging.info(_("Finished"))
     if options.json:
         print(json.dumps(json_output))
-    elif probcount or options.verbose:
+    else:
         print(_("%d problems found") % probcount)
 
 
 if __name__ == "__main__":
     main()
-
-
-SUSS_DEFAULT = r'''{
-  "cache_duration": 86400,
-  "signatures": {
-    "com.amazon.device.ads": {
-      "anti_features": [
-        "Ads",
-        "NonFreeComp"
-      ],
-      "code_signatures": [
-        "com/amazon/device/ads"
-      ],
-      "description": "an interface for views used to retrieve and display Amazon ads.",
-      "license": "NonFree"
-    },
-    "com.amazon.device.associates": {
-      "anti_features": [
-        "Ads",
-        "NonFreeComp"
-      ],
-      "code_signatures": [
-        "com/amazon/device/associates"
-      ],
-      "description": "library for Amazon\u2019s affiliate marketing program.",
-      "license": "NonFree"
-    },
-    "com.amazon.device.iap": {
-      "anti_features": [
-        "NonFreeComp",
-        "NonFreeNet"
-      ],
-      "code_signatures": [
-        "com/amazon/device/iap"
-      ],
-      "description": "allows an app to present, process, and fulfill purchases of digital content and subscriptions within your app.",
-      "license": "NonFree"
-    },
-    "com.amazonaws": {
-      "code_signatures": [
-        "com/amazonaws/AbortedException",
-        "com/amazonaws/AmazonClientException",
-        "com/amazonaws/AmazonServiceException$ErrorType",
-        "com/amazonaws/AmazonServiceException",
-        "com/amazonaws/AmazonWebServiceClient",
-        "com/amazonaws/AmazonWebServiceRequest",
-        "com/amazonaws/AmazonWebServiceResponse",
-        "com/amazonaws/async",
-        "com/amazonaws/auth",
-        "com/amazonaws/ClientConfiguration",
-        "com/amazonaws/cognito",
-        "com/amazonaws/DefaultRequest",
-        "com/amazonaws/event",
-        "com/amazonaws/handlers",
-        "com/amazonaws/http",
-        "com/amazonaws/HttpMethod",
-        "com/amazonaws/internal",
-        "com/amazonaws/logging",
-        "com/amazonaws/metrics",
-        "com/amazonaws/mobile",
-        "com/amazonaws/mobileconnectors",
-        "com/amazonaws/Protocol",
-        "com/amazonaws/regions",
-        "com/amazonaws/RequestClientOptions$Marker",
-        "com/amazonaws/RequestClientOptions",
-        "com/amazonaws/Request",
-        "com/amazonaws/ResponseMetadata",
-        "com/amazonaws/Response",
-        "com/amazonaws/retry",
-        "com/amazonaws/SDKGlobalConfiguration",
-        "com/amazonaws/ServiceNameFactory",
-        "com/amazonaws/services",
-        "com/amazonaws/transform",
-        "com/amazonaws/util"
-      ],
-      "gradle_signatures": [
-        "com.amazonaws:amazon-kinesis-aggregator",
-        "com.amazonaws:amazon-kinesis-connectors",
-        "com.amazonaws:amazon-kinesis-deaggregator",
-        "com.amazonaws:aws-android-sdk-apigateway-core",
-        "com.amazonaws:aws-android-sdk-auth-core",
-        "com.amazonaws:aws-android-sdk-auth-facebook",
-        "com.amazonaws:aws-android-sdk-auth-google",
-        "com.amazonaws:aws-android-sdk-auth-ui",
-        "com.amazonaws:aws-android-sdk-auth-userpools",
-        "com.amazonaws:aws-android-sdk-cognito",
-        "com.amazonaws:aws-android-sdk-cognitoauth",
-        "com.amazonaws:aws-android-sdk-cognitoidentityprovider-asf",
-        "com.amazonaws:aws-android-sdk-comprehend",
-        "com.amazonaws:aws-android-sdk-core",
-        "com.amazonaws:aws-android-sdk-ddb",
-        "com.amazonaws:aws-android-sdk-ddb-document",
-        "com.amazonaws:aws-android-sdk-iot",
-        "com.amazonaws:aws-android-sdk-kinesis",
-        "com.amazonaws:aws-android-sdk-kinesisvideo",
-        "com.amazonaws:aws-android-sdk-kinesisvideo-archivedmedia",
-        "com.amazonaws:aws-android-sdk-kms",
-        "com.amazonaws:aws-android-sdk-lambda",
-        "com.amazonaws:aws-android-sdk-lex",
-        "com.amazonaws:aws-android-sdk-location",
-        "com.amazonaws:aws-android-sdk-logs",
-        "com.amazonaws:aws-android-sdk-mobileanalytics",
-        "com.amazonaws:aws-android-sdk-mobile-client",
-        "com.amazonaws:aws-android-sdk-pinpoint",
-        "com.amazonaws:aws-android-sdk-polly",
-        "com.amazonaws:aws-android-sdk-rekognition",
-        "com.amazonaws:aws-android-sdk-s3",
-        "com.amazonaws:aws-android-sdk-ses",
-        "com.amazonaws:aws-android-sdk-sns",
-        "com.amazonaws:aws-android-sdk-sqs",
-        "com.amazonaws:aws-android-sdk-textract",
-        "com.amazonaws:aws-android-sdk-transcribe",
-        "com.amazonaws:aws-android-sdk-translate",
-        "com.amazonaws:dynamodb-key-diagnostics-library",
-        "com.amazonaws:DynamoDBLocal",
-        "com.amazonaws:dynamodb-lock-client",
-        "com.amazonaws:ivs-broadcast",
-        "com.amazonaws:ivs-player",
-        "com.amazonaws:kinesis-storm-spout"
-      ],
-      "license": "NonFree",
-      "name": "AmazonAWS"
-    },
-    "com.android.billingclient": {
-      "code_signatures": [
-        "com/android/billingclient"
-      ],
-      "documentation": [
-        "https://developer.android.com/google/play/billing/integrate"
-      ],
-      "gradle_signatures": [
-        "com.android.billingclient",
-        "com.google.androidbrowserhelper:billing",
-        "com.anjlab.android.iab.v3:library",
-        "com.github.penn5:donations",
-        "me.proton.core:payment-iap"
-      ],
-      "license": "NonFree",
-      "name": "BillingClient"
-    },
-    "com.android.installreferrer": {
-      "anti_features": [
-        "NonFreeDep",
-        "NonFreeNet"
-      ],
-      "code_signatures": [
-        "com/android/installreferrer"
-      ],
-      "documentation": [
-        "https://developer.android.com/google/play/installreferrer/library"
-      ],
-      "gradle_signatures": [
-        "com.android.installreferrer"
-      ],
-      "license": "NonFree",
-      "name": "Play Install Referrer Library"
-    },
-    "com.anychart": {
-      "anti_features": [
-        "NonFreeComp"
-      ],
-      "code_signatures": [
-        "com/anychart"
-      ],
-      "description": "a data visualization library for easily creating interactive charts in Android apps.",
-      "license": "NonFree"
-    },
-    "com.appboy": {
-      "anti_features": [
-        "NonFreeComp",
-        "Tracking"
-      ],
-      "code_signatures": [
-        "com/appboy"
-      ],
-      "description": "Targets customers based on personal interests, location, past purchases, and more; profiles users, segments audiences, and utilizes analytics for targeted advertisements.",
-      "license": "NonFree"
-    },
-    "com.appbrain": {
-      "anti_features": [
-        "Ads",
-        "NonFreeComp"
-      ],
-      "code_signatures": [
-        "com/appbrain"
-      ],
-      "description": "See <a rel='nofollow' href='https://reports.exodus-privacy.eu.org/en/trackers/136/'>Exodus Privacy</a>.",
-      "license": "NonFree"
-    },
-    "com.applause.android": {
-      "anti_features": [
-        "NonFreeComp",
-        "Tracking"
-      ],
-      "code_signatures": [
-        "com/applause/android"
-      ],
-      "description": "crowd-sourced testing. See <a rel='nofollow' href='https://www.crunchbase.com/organization/applause'>Crunchbase</a> and <a href='https://reports.exodus-privacy.eu.org/en/trackers/132/'>Exodus Privacy</a>.",
-      "license": "NonFree"
-    },
-    "com.applovin": {
-      "anti_features": [
-        "Ads"
-      ],
-      "code_signatures": [
-        "com/applovin"
-      ],
-      "description": "a mobile advertising technology company that enables brands to create mobile marketing campaigns that are fueled by data. Primary targets games.",
-      "license": "NonFree"
-    },
-    "com.appsflyer": {
-      "anti_features": [
-        "NonFreeComp",
-        "Tracking"
-      ],
-      "code_signatures": [
-        "com/appsflyer"
-      ],
-      "description": "a mobile & attribution analytics platform.",
-      "license": "NonFree"
-    },
-    "com.apptentive": {
-      "anti_features": [
-        "NonFreeComp",
-        "Tracking"
-      ],
-      "code_signatures": [
-        "com/apptentive"
-      ],
-      "description": "See <a href='https://reports.exodus-privacy.eu.org/en/trackers/115/'>Exodus Privacy</a>.",
-      "license": "NonFree"
-    },
-    "com.apptimize": {
-      "anti_features": [
-        "NonFreeComp",
-        "Tracking"
-      ],
-      "code_signatures": [
-        "com/apptimize"
-      ],
-      "description": "See <a href='https://reports.exodus-privacy.eu.org/en/trackers/135/'>Exodus Privacy</a> and <a rel='nofollow' href='https://www.crunchbase.com/organization/apptimize'>Crunchbase</a>.",
-      "license": "NonFree"
-    },
-    "com.askingpoint": {
-      "anti_features": [
-        "NonFreeComp",
-        "Tracking"
-      ],
-      "code_signatures": [
-        "com/askingpoint"
-      ],
-      "description": "complete mobile user engagement solution (power local, In-application evaluations and audits, input, user support, mobile reviews and informing).",
-      "license": "NonFree"
-    },
-    "com.baidu.mobstat": {
-      "code_signatures": [
-        "com/baidu/mobstat"
-      ],
-      "documentation": [
-        "https://mtj.baidu.com/web/sdk/index"
-      ],
-      "gradle_signatures": [
-        "com.baidu.mobstat"
-      ],
-      "license": "NonFree",
-      "name": "\u767e\u5ea6\u79fb\u52a8\u7edf\u8ba1SDK"
-    },
-    "com.batch": {
-      "anti_features": [
-        "Ads",
-        "NonFreeComp",
-        "Tracking"
-      ],
-      "code_signatures": [
-        "com/batch"
-      ],
-      "description": "mobile engagement platform to execute CRM tactics over iOS, Android & mobile websites.",
-      "license": "NonFree"
-    },
-    "com.bosch.mtprotocol": {
-      "anti_features": [
-        "NonFreeComp"
-      ],
-      "code_signatures": [
-        "com/bosch/mtprotocol"
-      ],
-      "description": "simplify and manage use of Bosch GLM and PLR laser rangefinders with Bluetooth connectivity.",
-      "license": "NonFree"
-    },
-    "com.bugsee.library.Bugsee": {
-      "anti_features": [
-        "NonFreeComp",
-        "Tracking"
-      ],
-      "code_signatures": [
-        "com/bugsee/library/Bugsee"
-      ],
-      "description": "see video, network and logs that led to bugs and crashes in live apps. No need to reproduce intermittent bugs. With Bugsee, all the crucial data is always there.",
-      "license": "NonFree"
-    },
-    "com.bugsense": {
-      "code_signatures": [
-        "com/bugsense"
-      ],
-      "documentation": [
-        "https://github.com/bugsense/docs/blob/master/android.md"
-      ],
-      "gradle_signatures": [
-        "com.bugsense"
-      ],
-      "license": "NonFree",
-      "name": "BugSense"
-    },
-    "com.chartboost.sdk": {
-      "anti_features": [
-        "Ads",
-        "NonFreeComp"
-      ],
-      "code_signatures": [
-        "com/chartboost/sdk"
-      ],
-      "description": "create customized interstitial and video ads, promote new games, and swap traffic with one another. For more details, see <a href='https://en.wikipedia.org/wiki/Chartboost'>Wikipedia</a>.",
-      "license": "NonFree"
-    },
-    "com.cloudrail": {
-      "code_signature": [
-        "com/cloudrail"
-      ],
-      "documentation": [
-        "https://cloudrail.com/"
-      ],
-      "gradle_signatures": [
-        "com.cloudrail"
-      ],
-      "license": "NonFree",
-      "name": "CloudRail"
-    },
-    "com.comscore.analytics": {
-      "anti_features": [
-        "NonFreeComp",
-        "Tracking"
-      ],
-      "code_signatures": [
-        "com/comscore"
-      ],
-      "description": "See <a href='https://en.wikipedia.org/wiki/Comscore'>Wikipedia</a> for details.",
-      "license": "NonFree"
-    },
-    "com.crashlytics.sdk.android": {
-      "code_signatures": [
-        "com/crashlytics"
-      ],
-      "documentation": [
-        "https://firebase.google.com/docs/crashlytics"
-      ],
-      "gradle_signatures": [
-        "crashlytics"
-      ],
-      "license": "NonFree",
-      "name": "Firebase Crashlytics"
-    },
-    "com.crittercism": {
-      "code_signatures": [
-        "com/crittercism"
-      ],
-      "documentation": [
-        "https://github.com/crittercism/crittercism-unity-android"
-      ],
-      "gradle_signatures": [
-        "com.crittercism"
-      ],
-      "license": "NonFree",
-      "name": "Crittercism Plugin for Unity Crash Reporting"
-    },
-    "com.criware": {
-      "anti_features": [
-        "NonFreeComp",
-        "NonFreeAssets"
-      ],
-      "code_signatures": [
-        "com/criware"
-      ],
-      "description": "audio and video solutions that can be integrated with popular game engines.",
-      "license": "NonFree"
-    },
-    "com.deezer.sdk": {
-      "anti_features": [
-        "NonFreeComp",
-        "NonFreeNet"
-      ],
-      "code_signatures": [
-        "com/deezer/sdk"
-      ],
-      "description": "a closed-source API for the Deezer music streaming service.",
-      "license": "NonFree"
-    },
-    "com.dynamicyield": {
-      "anti_features": [
-        "Ads",
-        "NonFreeComp",
-        "Tracking"
-      ],
-      "code_signatures": [
-        "com/dynamicyield"
-      ],
-      "description": "targeted advertising. Tracks user via location (GPS, WiFi, location data). Collects PII, profiling. See <a href='https://reports.exodus-privacy.eu.org/en/trackers/152/'>Exodus Privacy</a> for more details.",
-      "license": "NonFree"
-    },
-    "com.dynatrace.android.app": {
-      "anti_features": [
-        "NonFreeComp",
-        "Tracking"
-      ],
-      "code_signatures": [
-        "com/dynatrace/android/app"
-      ],
-      "description": "See <a rel='nofollow' href='https://www.crunchbase.com/organization/dynatrace-software'>Crunchbase</a> and <a href='https://reports.exodus-privacy.eu.org/en/trackers/137/'>Exodus Privacy</a>.",
-      "license": "NonFree"
-    },
-    "com.ensighten": {
-      "anti_features": [
-        "NonFreeComp",
-        "Tracking"
-      ],
-      "code_signatures": [
-        "com/ensighten"
-      ],
-      "description": "organizations can leverage first-party customer data and profiles to fuel omni-channel action and insight using their existing technology investments. See <a rel='nofollow' href='https://www.crunchbase.com/organization/ensighten'>Crunchbase</a> and <a href='https://reports.exodus-privacy.eu.org/en/trackers/151/'>Exodus Privacy</a>.",
-      "license": "NonFree"
-    },
-    "com.epicgames.mobile.eossdk": {
-      "anti_features": [
-        "NonFreeComp",
-        "NonFreeNet"
-      ],
-      "code_signatures": [
-        "com/epicgames/mobile/eossdk"
-      ],
-      "description": "integrate games with Epic Account Services and Epic Games Store",
-      "license": "NonFree"
-    },
-    "com.facebook.android": {
-      "code_signatures": [
-        "com/facebook/AccessToken",
-        "com/facebook/AccessTokenCache",
-        "com/facebook/AccessTokenManager",
-        "com/facebook/AccessTokenSource",
-        "com/facebook/AccessTokenTracker",
-        "com/facebook/all/All",
-        "com/facebook/appevents/aam/MetadataIndexer",
-        "com/facebook/appevents/aam/MetadataMatcher",
-        "com/facebook/appevents/aam/MetadataRule",
-        "com/facebook/appevents/aam/MetadataViewObserver",
-        "com/facebook/appevents/AccessTokenAppIdPair",
-        "com/facebook/appevents/AnalyticsUserIDStore",
-        "com/facebook/appevents/AppEvent",
-        "com/facebook/appevents/AppEventCollection",
-        "com/facebook/appevents/AppEventDiskStore",
-        "com/facebook/appevents/AppEventQueue",
-        "com/facebook/appevents/AppEventsConstants",
-        "com/facebook/appevents/AppEventsLogger",
-        "com/facebook/appevents/AppEventsLoggerImpl",
-        "com/facebook/appevents/AppEventsManager",
-        "com/facebook/appevents/AppEventStore",
-        "com/facebook/appevents/cloudbridge/AppEventsCAPIManager",
-        "com/facebook/appevents/cloudbridge/AppEventsConversionsAPITransformer",
-        "com/facebook/appevents/cloudbridge/AppEventsConversionsAPITransformerWebRequests",
-        "com/facebook/appevents/codeless/CodelessLoggingEventListener",
-        "com/facebook/appevents/codeless/CodelessManager",
-        "com/facebook/appevents/codeless/CodelessMatcher",
-        "com/facebook/appevents/codeless/internal/Constants",
-        "com/facebook/appevents/codeless/internal/EventBinding",
-        "com/facebook/appevents/codeless/internal/ParameterComponent",
-        "com/facebook/appevents/codeless/internal/PathComponent",
-        "com/facebook/appevents/codeless/internal/SensitiveUserDataUtils",
-        "com/facebook/appevents/codeless/internal/UnityReflection",
-        "com/facebook/appevents/codeless/internal/ViewHierarchy",
-        "com/facebook/appevents/codeless/RCTCodelessLoggingEventListener",
-        "com/facebook/appevents/codeless/ViewIndexer",
-        "com/facebook/appevents/codeless/ViewIndexingTrigger",
-        "com/facebook/appevents/eventdeactivation/EventDeactivationManager",
-        "com/facebook/appevents/FacebookSDKJSInterface",
-        "com/facebook/appevents/FlushReason",
-        "com/facebook/appevents/FlushResult",
-        "com/facebook/appevents/FlushStatistics",
-        "com/facebook/appevents/iap/InAppPurchaseActivityLifecycleTracker",
-        "com/facebook/appevents/iap/InAppPurchaseAutoLogger",
-        "com/facebook/appevents/iap/InAppPurchaseBillingClientWrapper",
-        "com/facebook/appevents/iap/InAppPurchaseEventManager",
-        "com/facebook/appevents/iap/InAppPurchaseLoggerManager",
-        "com/facebook/appevents/iap/InAppPurchaseManager",
-        "com/facebook/appevents/iap/InAppPurchaseSkuDetailsWrapper",
-        "com/facebook/appevents/iap/InAppPurchaseUtils",
-        "com/facebook/appevents/integrity/BlocklistEventsManager",
-        "com/facebook/appevents/integrity/IntegrityManager",
-        "com/facebook/appevents/integrity/MACARuleMatchingManager",
-        "com/facebook/appevents/integrity/ProtectedModeManager",
-        "com/facebook/appevents/integrity/RedactedEventsManager",
-        "com/facebook/appevents/internal/ActivityLifecycleTracker",
-        "com/facebook/appevents/InternalAppEventsLogger",
-        "com/facebook/appevents/internal/AppEventsLoggerUtility",
-        "com/facebook/appevents/internal/AppEventUtility",
-        "com/facebook/appevents/internal/AutomaticAnalyticsLogger",
-        "com/facebook/appevents/internal/Constants",
-        "com/facebook/appevents/internal/FileDownloadTask",
-        "com/facebook/appevents/internal/HashUtils",
-        "com/facebook/appevents/internal/SessionInfo",
-        "com/facebook/appevents/internal/SessionLogger",
-        "com/facebook/appevents/internal/SourceApplicationInfo",
-        "com/facebook/appevents/internal/ViewHierarchyConstants",
-        "com/facebook/appevents/ml/Model",
-        "com/facebook/appevents/ml/ModelManager",
-        "com/facebook/appevents/ml/MTensor",
-        "com/facebook/appevents/ml/Operator",
-        "com/facebook/appevents/ml/Utils",
-        "com/facebook/appevents/ondeviceprocessing/OnDeviceProcessingManager",
-        "com/facebook/appevents/ondeviceprocessing/RemoteServiceParametersHelper",
-        "com/facebook/appevents/ondeviceprocessing/RemoteServiceWrapper",
-        "com/facebook/appevents/PersistedEvents",
-        "com/facebook/appevents/restrictivedatafilter/RestrictiveDataManager",
-        "com/facebook/appevents/SessionEventsState",
-        "com/facebook/appevents/suggestedevents/FeatureExtractor",
-        "com/facebook/appevents/suggestedevents/PredictionHistoryManager",
-        "com/facebook/appevents/suggestedevents/SuggestedEventsManager",
-        "com/facebook/appevents/suggestedevents/SuggestedEventViewHierarchy",
-        "com/facebook/appevents/suggestedevents/ViewObserver",
-        "com/facebook/appevents/suggestedevents/ViewOnClickListener",
-        "com/facebook/appevents/UserDataStore",
-        "com/facebook/applinks/AppLinkData",
-        "com/facebook/applinks/AppLinks",
-        "com/facebook/applinks/FacebookAppLinkResolver",
-        "com/facebook/AuthenticationToken",
-        "com/facebook/AuthenticationTokenCache",
-        "com/facebook/AuthenticationTokenClaims",
-        "com/facebook/AuthenticationTokenHeader",
-        "com/facebook/AuthenticationTokenManager",
-        "com/facebook/AuthenticationTokenTracker",
-        "com/facebook/bolts/AggregateException",
-        "com/facebook/bolts/AndroidExecutors",
-        "com/facebook/bolts/AppLink",
-        "com/facebook/bolts/AppLinkResolver",
-        "com/facebook/bolts/AppLinks",
-        "com/facebook/bolts/BoltsExecutors",
-        "com/facebook/bolts/CancellationToken",
-        "com/facebook/bolts/CancellationTokenRegistration",
-        "com/facebook/bolts/CancellationTokenSource",
-        "com/facebook/bolts/Continuation",
-        "com/facebook/bolts/ExecutorException",
-        "com/facebook/bolts/Task",
-        "com/facebook/bolts/TaskCompletionSource",
-        "com/facebook/bolts/UnobservedErrorNotifier",
-        "com/facebook/bolts/UnobservedTaskException",
-        "com/facebook/CallbackManager",
-        "com/facebook/common/Common",
-        "com/facebook/core/Core",
-        "com/facebook/CurrentAccessTokenExpirationBroadcastReceiver",
-        "com/facebook/CustomTabActivity",
-        "com/facebook/CustomTabMainActivity",
-        "com/facebook/devicerequests/internal/DeviceRequestsHelper",
-        "com/facebook/FacebookActivity",
-        "com/facebook/FacebookAuthorizationException",
-        "com/facebook/FacebookBroadcastReceiver",
-        "com/facebook/FacebookButtonBase",
-        "com/facebook/FacebookCallback",
-        "com/facebook/FacebookContentProvider",
-        "com/facebook/FacebookDialog",
-        "com/facebook/FacebookDialogException",
-        "com/facebook/FacebookException",
-        "com/facebook/FacebookGraphResponseException",
-        "com/facebook/FacebookOperationCanceledException",
-        "com/facebook/FacebookRequestError",
-        "com/facebook/FacebookSdk",
-        "com/facebook/FacebookSdkNotInitializedException",
-        "com/facebook/FacebookSdkVersion",
-        "com/facebook/FacebookServiceException",
-        "com/facebook/gamingservices/cloudgaming/AppToUserNotificationSender",
-        "com/facebook/gamingservices/cloudgaming/CloudGameLoginHandler",
-        "com/facebook/gamingservices/cloudgaming/DaemonReceiver",
-        "com/facebook/gamingservices/cloudgaming/DaemonRequest",
-        "com/facebook/gamingservices/cloudgaming/GameFeaturesLibrary",
-        "com/facebook/gamingservices/cloudgaming/InAppAdLibrary",
-        "com/facebook/gamingservices/cloudgaming/InAppPurchaseLibrary",
-        "com/facebook/gamingservices/cloudgaming/internal/SDKAnalyticsEvents",
-        "com/facebook/gamingservices/cloudgaming/internal/SDKConstants",
-        "com/facebook/gamingservices/cloudgaming/internal/SDKLogger",
-        "com/facebook/gamingservices/cloudgaming/internal/SDKMessageEnum",
-        "com/facebook/gamingservices/cloudgaming/internal/SDKShareIntentEnum",
-        "com/facebook/gamingservices/cloudgaming/PlayableAdsLibrary",
-        "com/facebook/gamingservices/ContextChooseDialog",
-        "com/facebook/gamingservices/ContextCreateDialog",
-        "com/facebook/gamingservices/ContextSwitchDialog",
-        "com/facebook/gamingservices/CustomUpdate",
-        "com/facebook/gamingservices/FriendFinderDialog",
-        "com/facebook/gamingservices/GameRequestDialog",
-        "com/facebook/gamingservices/GamingContext",
-        "com/facebook/gamingservices/GamingGroupIntegration",
-        "com/facebook/gamingservices/GamingImageUploader",
-        "com/facebook/gamingservices/GamingPayload",
-        "com/facebook/gamingservices/GamingServices",
-        "com/facebook/gamingservices/GamingVideoUploader",
-        "com/facebook/gamingservices/internal/DateFormatter",
-        "com/facebook/gamingservices/internal/GamingMediaUploader",
-        "com/facebook/gamingservices/internal/TournamentJoinDialogURIBuilder",
-        "com/facebook/gamingservices/internal/TournamentScoreType",
-        "com/facebook/gamingservices/internal/TournamentShareDialogURIBuilder",
-        "com/facebook/gamingservices/internal/TournamentSortOrder",
-        "com/facebook/gamingservices/model/ContextChooseContent",
-        "com/facebook/gamingservices/model/ContextCreateContent",
-        "com/facebook/gamingservices/model/ContextSwitchContent",
-        "com/facebook/gamingservices/model/CustomUpdateContent",
-        "com/facebook/gamingservices/OpenGamingMediaDialog",
-        "com/facebook/gamingservices/Tournament",
-        "com/facebook/gamingservices/TournamentConfig",
-        "com/facebook/gamingservices/TournamentFetcher",
-        "com/facebook/gamingservices/TournamentJoinDialog",
-        "com/facebook/gamingservices/TournamentShareDialog",
-        "com/facebook/gamingservices/TournamentUpdater",
-        "com/facebook/GraphRequest",
-        "com/facebook/GraphRequestAsyncTask",
-        "com/facebook/GraphRequestBatch",
-        "com/facebook/GraphResponse",
-        "com/facebook/HttpMethod",
-        "com/facebook/internal/AnalyticsEvents",
-        "com/facebook/internal/AppCall",
-        "com/facebook/internal/AttributionIdentifiers",
-        "com/facebook/internal/BoltsMeasurementEventListener",
-        "com/facebook/internal/BundleJSONConverter",
-        "com/facebook/internal/CallbackManagerImpl",
-        "com/facebook/internal/CollectionMapper",
-        "com/facebook/internal/CustomTab",
-        "com/facebook/internal/CustomTabUtils",
-        "com/facebook/internal/DialogFeature",
-        "com/facebook/internal/DialogPresenter",
-        "com/facebook/internal/FacebookDialogBase",
-        "com/facebook/internal/FacebookDialogFragment",
-        "com/facebook/internal/FacebookGamingAction",
-        "com/facebook/internal/FacebookInitProvider",
-        "com/facebook/internal/FacebookRequestErrorClassification",
-        "com/facebook/internal/FacebookSignatureValidator",
-        "com/facebook/internal/FacebookWebFallbackDialog",
-        "com/facebook/internal/FeatureManager",
-        "com/facebook/internal/FetchedAppGateKeepersManager",
-        "com/facebook/internal/FetchedAppSettings",
-        "com/facebook/internal/FetchedAppSettingsManager",
-        "com/facebook/internal/FileLruCache",
-        "com/facebook/internal/FragmentWrapper",
-        "com/facebook/internal/gatekeeper/GateKeeper",
-        "com/facebook/internal/gatekeeper/GateKeeperRuntimeCache",
-        "com/facebook/internal/ImageDownloader",
-        "com/facebook/internal/ImageRequest",
-        "com/facebook/internal/ImageResponse",
-        "com/facebook/internal/ImageResponseCache",
-        "com/facebook/internal/InstagramCustomTab",
-        "com/facebook/internal/InstallReferrerUtil",
-        "com/facebook/internal/instrument/anrreport/ANRDetector",
-        "com/facebook/internal/instrument/anrreport/ANRHandler",
-        "com/facebook/internal/instrument/crashreport/CrashHandler",
-        "com/facebook/internal/instrument/crashshield/AutoHandleExceptions",
-        "com/facebook/internal/instrument/crashshield/CrashShieldHandler",
-        "com/facebook/internal/instrument/crashshield/NoAutoExceptionHandling",
-        "com/facebook/internal/instrument/errorreport/ErrorReportData",
-        "com/facebook/internal/instrument/errorreport/ErrorReportHandler",
-        "com/facebook/internal/instrument/ExceptionAnalyzer",
-        "com/facebook/internal/instrument/InstrumentData",
-        "com/facebook/internal/instrument/InstrumentManager",
-        "com/facebook/internal/instrument/InstrumentUtility",
-        "com/facebook/internal/instrument/threadcheck/ThreadCheckHandler",
-        "com/facebook/internal/InternalSettings",
-        "com/facebook/internal/LockOnGetVariable",
-        "com/facebook/internal/Logger",
-        "com/facebook/internal/logging/dumpsys/EndToEndDumper",
-        "com/facebook/internal/Mutable",
-        "com/facebook/internal/NativeAppCallAttachmentStore",
-        "com/facebook/internal/NativeProtocol",
-        "com/facebook/internal/PlatformServiceClient",
-        "com/facebook/internal/ProfileInformationCache",
-        "com/facebook/internal/qualityvalidation/Excuse",
-        "com/facebook/internal/qualityvalidation/ExcusesForDesignViolations",
-        "com/facebook/internal/security/CertificateUtil",
-        "com/facebook/internal/security/OidcSecurityUtil",
-        "com/facebook/internal/ServerProtocol",
-        "com/facebook/internal/SmartLoginOption",
-        "com/facebook/internal/UrlRedirectCache",
-        "com/facebook/internal/Utility",
-        "com/facebook/internal/Validate",
-        "com/facebook/internal/WebDialog",
-        "com/facebook/internal/WorkQueue",
-        "com/facebook/LegacyTokenHelper",
-        "com/facebook/LoggingBehavior",
-        "com/facebook/login/CodeChallengeMethod",
-        "com/facebook/login/CustomTabLoginMethodHandler",
-        "com/facebook/login/CustomTabPrefetchHelper",
-        "com/facebook/login/DefaultAudience",
-        "com/facebook/login/DeviceAuthDialog",
-        "com/facebook/login/DeviceAuthMethodHandler",
-        "com/facebook/login/DeviceLoginManager",
-        "com/facebook/login/GetTokenClient",
-        "com/facebook/login/GetTokenLoginMethodHandler",
-        "com/facebook/login/InstagramAppLoginMethodHandler",
-        "com/facebook/login/KatanaProxyLoginMethodHandler",
-        "com/facebook/login/Login",
-        "com/facebook/login/LoginBehavior",
-        "com/facebook/login/LoginClient",
-        "com/facebook/login/LoginConfiguration",
-        "com/facebook/login/LoginFragment",
-        "com/facebook/login/LoginLogger",
-        "com/facebook/login/LoginManager",
-        "com/facebook/login/LoginMethodHandler",
-        "com/facebook/login/LoginResult",
-        "com/facebook/login/LoginStatusClient",
-        "com/facebook/login/LoginTargetApp",
-        "com/facebook/login/NativeAppLoginMethodHandler",
-        "com/facebook/login/NonceUtil",
-        "com/facebook/login/PKCEUtil",
-        "com/facebook/login/StartActivityDelegate",
-        "com/facebook/LoginStatusCallback",
-        "com/facebook/login/WebLoginMethodHandler",
-        "com/facebook/login/WebViewLoginMethodHandler",
-        "com/facebook/login/widget/DeviceLoginButton",
-        "com/facebook/login/widget/LoginButton",
-        "com/facebook/login/widget/ProfilePictureView",
-        "com/facebook/login/widget/ToolTipPopup",
-        "com/facebook/messenger/Messenger",
-        "com/facebook/messenger/MessengerThreadParams",
-        "com/facebook/messenger/MessengerUtils",
-        "com/facebook/messenger/ShareToMessengerParams",
-        "com/facebook/messenger/ShareToMessengerParamsBuilder",
-        "com/facebook/Profile",
-        "com/facebook/ProfileCache",
-        "com/facebook/ProfileManager",
-        "com/facebook/ProfileTracker",
-        "com/facebook/ProgressNoopOutputStream",
-        "com/facebook/ProgressOutputStream",
-        "com/facebook/RequestOutputStream",
-        "com/facebook/RequestProgress",
-        "com/facebook/share/internal/CameraEffectFeature",
-        "com/facebook/share/internal/CameraEffectJSONUtility",
-        "com/facebook/share/internal/GameRequestValidation",
-        "com/facebook/share/internal/LegacyNativeDialogParameters",
-        "com/facebook/share/internal/MessageDialogFeature",
-        "com/facebook/share/internal/NativeDialogParameters",
-        "com/facebook/share/internal/ResultProcessor",
-        "com/facebook/share/internal/ShareConstants",
-        "com/facebook/share/internal/ShareContentValidation",
-        "com/facebook/share/internal/ShareDialogFeature",
-        "com/facebook/share/internal/ShareFeedContent",
-        "com/facebook/share/internal/ShareInternalUtility",
-        "com/facebook/share/internal/ShareStoryFeature",
-        "com/facebook/share/internal/VideoUploader",
-        "com/facebook/share/internal/WebDialogParameters",
-        "com/facebook/share/model/AppGroupCreationContent",
-        "com/facebook/share/model/CameraEffectArguments",
-        "com/facebook/share/model/CameraEffectTextures",
-        "com/facebook/share/model/GameRequestContent",
-        "com/facebook/share/model/ShareCameraEffectContent",
-        "com/facebook/share/model/ShareContent",
-        "com/facebook/share/model/ShareHashtag",
-        "com/facebook/share/model/ShareLinkContent",
-        "com/facebook/share/model/ShareMedia",
-        "com/facebook/share/model/ShareMediaContent",
-        "com/facebook/share/model/ShareMessengerActionButton",
-        "com/facebook/share/model/ShareMessengerURLActionButton",
-        "com/facebook/share/model/ShareModel",
-        "com/facebook/share/model/ShareModelBuilder",
-        "com/facebook/share/model/SharePhoto",
-        "com/facebook/share/model/SharePhotoContent",
-        "com/facebook/share/model/ShareStoryContent",
-        "com/facebook/share/model/ShareVideo",
-        "com/facebook/share/model/ShareVideoContent",
-        "com/facebook/share/Share",
-        "com/facebook/share/ShareApi",
-        "com/facebook/share/ShareBuilder",
-        "com/facebook/share/Sharer",
-        "com/facebook/share/widget/GameRequestDialog",
-        "com/facebook/share/widget/MessageDialog",
-        "com/facebook/share/widget/SendButton",
-        "com/facebook/share/widget/ShareButton",
-        "com/facebook/share/widget/ShareButtonBase",
-        "com/facebook/share/widget/ShareDialog",
-        "com/facebook/UserSettingsManager",
-        "com/facebook/WebDialog"
-      ],
-      "documentation": [
-        "https://developers.facebook.com/docs/android"
-      ],
-      "gradle_signatures": [
-        "com.facebook.android"
-      ],
-      "license": "NonFree",
-      "name": "Facebook Android SDK"
-    },
-    "com.flurry.android": {
-      "code_signature": [
-        "com/flurry"
-      ],
-      "documentation": [
-        "https://www.flurry.com/"
-      ],
-      "gradle_signatures": [
-        "com.flurry.android"
-      ],
-      "license": "NonFree",
-      "name": "Flurry Android SDK"
-    },
-    "com.garmin.android.connectiq": {
-      "anti_features": [
-        "NonFreeComp"
-      ],
-      "code_signatures": [
-        "com/garmin/android/apps/connectmobile/connectiq"
-      ],
-      "description": "SDK to build unique wearable experiences leveraging Garmin device sensors and features.",
-      "license": "NonFree"
-    },
-    "com.garmin.connectiq": {
-      "code_signatures": [
-        "com/garmin/android/connectiq"
-      ],
-      "documentation": [
-        "https://developer.garmin.com/connect-iq/core-topics/mobile-sdk-for-android/"
-      ],
-      "gradle_signatures": [
-        "com.garmin.connectiq:ciq-companion-app-sdk"
-      ],
-      "license": "NonFree",
-      "name": "Connect IQ Mobile SDK for Android"
-    },
-    "com.garmin.fit": {
-      "anti_features": [
-        "NonFreeComp"
-      ],
-      "code_signatures": [
-        "com/garmin/fit"
-      ],
-      "description": "SDK to access the Garmin Fit.",
-      "license": "NonFree"
-    },
-    "com.geetest": {
-      "code_signatures": [
-        "com/geetest"
-      ],
-      "documentation": [
-        "https://docs.geetest.com/"
-      ],
-      "gradle_signatures": [
-        "com.geetest"
-      ],
-      "license": "NonFree",
-      "name": "GeeTest"
-    },
-    "com.github.junrar": {
-      "code_signatures": [
-        "com/github/junrar"
-      ],
-      "documentation": [
-        "https://github.com/junrar/junrar"
-      ],
-      "gradle_signatures": [
-        "com.github.junrar:junrar"
-      ],
-      "license": "NonFree",
-      "name": "Junrar"
-    },
-    "com.github.omicronapps.7-Zip-JBinding-4Android": {
-      "documentation": [
-        "https://github.com/omicronapps/7-Zip-JBinding-4Android"
-      ],
-      "gradle_signatures": [
-        "com.github.omicronapps:7-Zip-JBinding-4Android"
-      ],
-      "license": "NonFree",
-      "name": "7-Zip-JBinding-4Android"
-    },
-    "com.google.ads": {
-      "code_signatures": [
-        "com/google/ads"
-      ],
-      "documentation": [
-        "https://developers.google.com/interactive-media-ads/docs/sdks/android/client-side"
-      ],
-      "gradle_signatures": [
-        "com.google.ads",
-        "com.google.android.exoplayer:extension-ima",
-        "androidx.media3:media3-exoplayer-ima"
-      ],
-      "license": "NonFree",
-      "name": "IMA SDK for Android"
-    },
-    "com.google.android.apps.auto.sdk": {
-      "anti_features": [
-        "NonFreeComp"
-      ],
-      "code_signatures": [
-        "com/google/android/apps/auto/sdk"
-      ],
-      "description": "Framework to develop apps for Android Auto",
-      "license": "NonFree"
-    },
-    "com.google.android.gcm": {
-      "anti_features": [
-        "NonFreeComp",
-        "NonFreeNet"
-      ],
-      "code_signatures": [
-        "com/google/android/gcm"
-      ],
-      "description": "<a href='https://en.wikipedia.org/wiki/Google_Cloud_Messaging' target='_blank'>Google Cloud Messaging</a> is a mobile notification service developed by Google that enables third-party application developers to send notification data or information from developer-run servers to app.",
-      "license": "NonFree"
-    },
-    "com.google.android.gms": {
-      "code_signatures": [
-        "com/google/android/gms"
-      ],
-      "documentation": [
-        "https://www.android.com/gms/"
-      ],
-      "gradle_signatures": [
-        "com.google.android.gms(?!.(oss-licenses-plugin|strict-version-matcher-plugin))",
-        "com.google.android.ump",
-        "androidx.core:core-google-shortcuts",
-        "androidx.credentials:credentials-play-services-auth",
-        "androidx.media3:media3-cast",
-        "androidx.media3:media3-datasource-cronet",
-        "androidx.wear:wear-remote-interactions",
-        "androidx.work:work-gcm",
-        "com.google.android.exoplayer:extension-cast",
-        "com.google.android.exoplayer:extension-cronet",
-        "com.evernote:android-job",
-        "com.cloudinary:cloudinary-android.*:2\\.[12]\\.",
-        "com.pierfrancescosoffritti.androidyoutubeplayer:chromecast-sender",
-        "com.yayandroid:locationmanager",
-        "(?<!org.microg.gms:)play-services",
-        "xyz.belvi.mobilevision:barcodescanner",
-        "com.google.api-client:google-api-client-android",
-        "com.google.maps.android:android-maps-utils",
-        "com.github.budowski:android-maps-utils",
-        "com.microsoft.identity:common",
-        "com.microsoft.identity.client:msal"
-      ],
-      "gradle_signatures_negative_examples": [
-        "com.google.android.gms.oss-licenses-plugin",
-        "com.google.android.gms.strict-version-matcher-plugin"
-      ],
-      "gradle_signatures_positive_examples": [
-        "com.google.android.gms:play-services-base",
-        "com.google.android.gms:play-services-oss-licenses"
-      ],
-      "license": "NonFree",
-      "name": "Google Mobile Services"
-    },
-    "com.google.android.gms.analytics": {
-      "anti_features": [
-        "NonFreeComp",
-        "Tracking"
-      ],
-      "code_signatures": [
-        "com/google/android/apps/analytics"
-      ],
-      "description": "a web analytics service offered by Google that tracks and reports. 'NoAnalytics' srclib will provide stubs for these classes.",
-      "license": "NonFree"
-    },
-    "com.google.android.libraries": {
-      "code_signatures": [
-        "com/google/android/libraries(?!/accessibility)"
-      ],
-      "code_signatures_negative_examples": [
-        "com/google/android/libraries/accessibility"
-      ],
-      "gradle_signatures": [
-        "com.google.android.libraries(?!.mapsplatform.secrets-gradle-plugin)"
-      ],
-      "gradle_signatures_negative_examples": [
-        "classpath \"com.google.android.libraries.mapsplatform.secrets-gradle-plugin:secrets-gradle-plugin:2.0.1\""
-      ],
-      "license": "NonFree",
-      "name": "Google Android Libraries"
-    },
-    "com.google.android.mediahome.video": {
-      "anti_features": [
-        "NonFreeComp"
-      ],
-      "code_signatures": [
-        "com/google/android/mediahome/video"
-      ],
-      "description": "integrate video content with <a href='https://developer.android.com/training/home-channels' target='_blank' rel='nofollow'>Home channels for mobile apps</a>.",
-      "license": "NonFree"
-    },
-    "com.google.android.play": {
-      "anti_features": [
-        "NonFreeDep",
-        "NonFreeNet"
-      ],
-      "code_signatures": [
-        "com/google/android/play/core"
-      ],
-      "documentation": [
-        "https://developer.android.com/guide/playcore"
-      ],
-      "gradle_signatures": [
-        "com.google.android.play:app-update",
-        "com.google.android.play:asset-delivery",
-        "com.google.android.play:core.*",
-        "com.google.android.play:feature-delivery",
-        "com.google.android.play:review",
-        "androidx.navigation:navigation-dynamic-features",
-        "com.github.SanojPunchihewa:InAppUpdater",
-        "com.suddenh4x.ratingdialog:awesome-app-rating"
-      ],
-      "license": "NonFree",
-      "name": "Google Play Core"
-    },
-    "com.google.android.play.appupdate": {
-      "anti_features": [
-        "NonFreeComp"
-      ],
-      "code_signatures": [
-        "com/google/android/play/appupdate"
-      ],
-      "description": "manages operations that allow an app to initiate its own updates.",
-      "license": "NonFree"
-    },
-    "com.google.android.play.integrity": {
-      "anti_features": [
-        "NonFreeComp",
-        "NonFreeNet"
-      ],
-      "code_signatures": [
-        "com/google/android/play/integrity"
-      ],
-      "description": "helps you check that interactions and server requests are coming from your genuine app binary running on a genuine Android device.",
-      "license": "NonFree"
-    },
-    "com.google.android.play.review": {
-      "anti_features": [
-        "NonFreeComp"
-      ],
-      "code_signatures": [
-        "com/google/android/play/review"
-      ],
-      "description": "lets you prompt users to submit Play Store ratings and reviews without the inconvenience of leaving your app or game.",
-      "license": "NonFree"
-    },
-    "com.google.android.vending": {
-      "anti_features": [
-        "NonFreeComp"
-      ],
-      "code_signatures": [
-        "com/google/android/vending/(?!licensing|expansion)"
-      ],
-      "description": "the Google Play Store app and its libaries, parts are FOSS and get vendored in libs as they are",
-      "documentation": [
-        "https://github.com/google/play-licensing/tree/master/lvl_library/src/main",
-        "https://github.com/googlearchive/play-apk-expansion/tree/master/zip_file/src/com/google/android/vending/expansion/zipfile",
-        "https://github.com/googlearchive/play-apk-expansion/tree/master/apkx_library/src/com/google/android/vending/expansion/downloader"
-      ],
-      "license": "NonFree"
-    },
-    "com.google.android.wearable": {
-      "code_signatures": [
-        "com/google/android/wearable/(?!compat/WearableActivityController)"
-      ],
-      "description": "an API for the Android Wear platform, note that androidx.wear:wear has a stub https://android.googlesource.com/platform/frameworks/support/+/refs/heads/androidx-master-release/wear/wear/src/androidTest/java/com/google/android/wearable/compat/WearableActivityController.java#26",
-      "gradle_signatures": [
-        "com.google.android.support:wearable",
-        "com.google.android.wearable:wearable"
-      ],
-      "license": "NonFree"
-    },
-    "com.google.android.youtube.player": {
-      "anti_features": [
-        "NonFreeComp",
-        "NonFreeNet"
-      ],
-      "code_signatures": [
-        "com/google/android/youtube/player"
-      ],
-      "description": "enables you to easily play YouTube videos and display thumbnails of YouTube videos in your Android application.",
-      "license": "NonFree"
-    },
-    "com.google.mlkit": {
-      "code_signatures": [
-        "com/google/mlkit"
-      ],
-      "documentation": [
-        "https://developers.google.com/ml-kit"
-      ],
-      "gradle_signatures": [
-        "com.google.mlkit",
-        "io.github.g00fy2.quickie"
-      ],
-      "license": "NonFree",
-      "name": "ML Kit"
-    },
-    "com.google.vr": {
-      "anti_features": [
-        "NonFreeComp"
-      ],
-      "code_signatures": [
-        "com/google/vr"
-      ],
-      "description": "enables Daydream and Cardboard app development on Android.",
-      "license": "NonFree"
-    },
-    "com.heapanalytics": {
-      "anti_features": [
-        "NonFreeComp",
-        "Tracking"
-      ],
-      "code_signatures": [
-        "com/heapanalytics"
-      ],
-      "description": "automatically captures every web, mobile, and cloud interaction: clicks, submits, transactions, emails, and more. Retroactively analyze your data without writing code.",
-      "license": "NonFree"
-    },
-    "com.heyzap": {
-      "code_signatures": [
-        "com/heyzap"
-      ],
-      "documentation": [
-        "https://www.digitalturbine.com/"
-      ],
-      "license": "NonFree",
-      "name": "Heyzap"
-    },
-    "com.huawei.hms": {
-      "anti_features": [
-        "NonFreeComp"
-      ],
-      "code_signatures": [
-        "com/huawei/hms"
-      ],
-      "description": "Huawei's pendant to GMS (Google Mobile Services)",
-      "license": "NonFree"
-    },
-    "com.hypertrack": {
-      "code_signatures": [
-        "com/hypertrack/(?!hyperlog)"
-      ],
-      "documentation": [
-        "https://github.com/hypertrack/sdk-android"
-      ],
-      "gradle_signatures": [
-        "com.hypertrack(?!:hyperlog)"
-      ],
-      "gradle_signatures_negative_examples": [
-        "com.hypertrack:hyperlog"
-      ],
-      "license": "NonFree",
-      "name": "HyperTrack SDK for Android"
-    },
-    "com.instabug": {
-      "anti_features": [
-        "NonFreeComp",
-        "Tracking"
-      ],
-      "code_signatures": [
-        "com/instabug"
-      ],
-      "description": "In-App Feedback and Bug Reporting for Mobile Apps.",
-      "license": "NonFree"
-    },
-    "com.kiddoware.kidsplace.sdk": {
-      "anti_features": [
-        "NonFreeComp"
-      ],
-      "code_signatures": [
-        "com/kiddoware/kidsplace/sdk"
-      ],
-      "description": "parental control",
-      "license": "NonFree"
-    },
-    "com.kochava.android.tracker": {
-      "anti_features": [
-        "NonFreeComp",
-        "Tracking"
-      ],
-      "code_signatures": [
-        "com/kochava/android/tracker"
-      ],
-      "description": "provides holistic, unbiased measurement for precise, real-time visualization of app performance through the funnel. See <a rel='nofollow' href='https://www.crunchbase.com/organization/kochava'>Crunchbase</a> and <a href='https://reports.exodus-privacy.eu.org/en/trackers/127/'>Exodus Privacy</a>.",
-      "license": "NonFree"
-    },
-    "com.mapbox": {
-      "MaintainerNotes": "It seems that all libs in https://github.com/mapbox/mapbox-java is fully FOSS\nsince 3.0.0.\n",
-      "documentation": [
-        "https://docs.mapbox.com/android/java/overview/",
-        "https://github.com/mapbox/mapbox-java"
-      ],
-      "gradle_signatures": [
-        "com\\.mapbox(?!\\.mapboxsdk:mapbox-sdk-(services|geojson|turf):([3-5]))"
-      ],
-      "gradle_signatures_negative_examples": [
-        "com.mapbox.mapboxsdk:mapbox-sdk-services:5.0.0",
-        "com.github.johan12345:mapbox-events-android:a21c324501",
-        "implementation(\"com.github.johan12345.AnyMaps:anymaps-mapbox:$anyMapsVersion\")"
-      ],
-      "gradle_signatures_positive_examples": [
-        "com.mapbox.mapboxsdk:mapbox-android-plugin-annotation-v7:0.6.0",
-        "com.mapbox.mapboxsdk:mapbox-android-plugin-annotation-v8:0.7.0",
-        "com.mapbox.mapboxsdk:mapbox-android-plugin-localization-v7:0.7.0",
-        "com.mapbox.mapboxsdk:mapbox-android-plugin-locationlayer:0.4.0",
-        "com.mapbox.mapboxsdk:mapbox-android-plugin-markerview-v8:0.3.0",
-        "com.mapbox.mapboxsdk:mapbox-android-plugin-places-v8:0.9.0",
-        "com.mapbox.mapboxsdk:mapbox-android-plugin-scalebar-v8:0.2.0",
-        "com.mapbox.mapboxsdk:mapbox-android-sdk:7.3.0"
-      ],
-      "license": "NonFree",
-      "name": "Mapbox Java SDK"
-    },
-    "com.microblink": {
-      "anti_features": [
-        "NonFreeComp",
-        "NonFreeNet",
-        "Tracking"
-      ],
-      "code_signatures": [
-        "com/microblink"
-      ],
-      "description": "verify users at scale and automate your document-based workflow with computer vision tech built for a remote world.",
-      "license": "NonFree"
-    },
-    "com.microsoft.band": {
-      "anti_features": [
-        "NonFreeComp"
-      ],
-      "code_signatures": [
-        "com/microsoft/band"
-      ],
-      "description": "library to access the Microsoft Band smartwatch.",
-      "license": "NonFree"
-    },
-    "com.mopub.mobileads": {
-      "anti_features": [
-        "Ads",
-        "NonFreeComp"
-      ],
-      "code_signatures": [
-        "com/mopub/mobileads"
-      ],
-      "description": "ad framework run by Twitter until 1/2022, then sold to AppLovin.",
-      "license": "NonFree"
-    },
-    "com.newrelic.agent": {
-      "anti_features": [
-        "NonFreeComp",
-        "Tracking"
-      ],
-      "code_signatures": [
-        "com/newrelic/agent"
-      ],
-      "description": "delivering full-stack visibility and analytics to enterprises around the world. See <a rel='nofollow' href='https://www.crunchbase.com/organization/new-relic'>Crunchbase</a> and <a href='https://reports.exodus-privacy.eu.org/en/trackers/130/'>Exodus Privacy</a>.",
-      "license": "NonFree"
-    },
-    "com.onesignal": {
-      "code_signatures": [
-        "com/onesignal"
-      ],
-      "documentation": [
-        "https://github.com/OneSignal/OneSignal-Android-SDK"
-      ],
-      "gradle_signatures": [
-        "com.onesignal:OneSignal"
-      ],
-      "license": "NonFree",
-      "name": "OneSignal Android Push Notification Plugin"
-    },
-    "com.optimizely": {
-      "anti_features": [
-        "NonFreeComp",
-        "Tracking"
-      ],
-      "code_signatures": [
-        "com/optimizely"
-      ],
-      "description": "part of the comScore, Inc. market research community, a leading global market research effort that studies and reports on Internet trends and behavior.",
-      "license": "NonFree"
-    },
-    "com.paypal.sdk": {
-      "code_signatures": [
-        "com/paypal"
-      ],
-      "documentation": [
-        "https://github.com/paypal/PayPal-Android-SDK",
-        "https://github.com/paypal/android-checkout-sdk"
-      ],
-      "gradle_signatures": [
-        "com.paypal"
-      ],
-      "license": "NonFree",
-      "name": "PayPal Android SDK"
-    },
-    "com.pushwoosh": {
-      "anti_features": [
-        "NonFreeComp",
-        "Tracking"
-      ],
-      "code_signatures": [
-        "com/pushwoosh"
-      ],
-      "description": "mobile analytics under the cover of push messaging.",
-      "license": "NonFree"
-    },
-    "com.quantcast.measurement.service": {
-      "anti_features": [
-        "NonFreeComp",
-        "Tracking"
-      ],
-      "code_signatures": [
-        "com/quantcast/measurement/service"
-      ],
-      "description": "processes real-time data at the intersection of commerce and culture, providing useful, actionable insights for brands and publishers. See <a rel='nofollow' href='https://www.crunchbase.com/organization/quantcast'>Crunchbase</a> and <a href='https://reports.exodus-privacy.eu.org/en/trackers/133/'>Exodus Privacy</a>.",
-      "license": "NonFree"
-    },
-    "com.revenuecat.purchases": {
-      "code_signatures": [
-        "com/revenuecat/purchases"
-      ],
-      "documentation": [
-        "https://www.revenuecat.com/"
-      ],
-      "gradle_signatures": [
-        "com.revenuecat.purchases"
-      ],
-      "license": "NonFree",
-      "name": "RevenueCat Purchases"
-    },
-    "com.samsung.accessory": {
-      "anti_features": [
-        "NonFreeComp"
-      ],
-      "code_signatures": [
-        "com/samsung/accessory"
-      ],
-      "description": "provides a stable environment in which you can use a variety features by connecting accessories to your mobile device.",
-      "license": "NonFree"
-    },
-    "com.samsung.android.sdk.look": {
-      "anti_features": [
-        "NonFreeComp"
-      ],
-      "code_signatures": [
-        "com/samsung/android/sdk/look"
-      ],
-      "description": "offers specialized widgets and service components for extended functions of the Samsung Android devices.",
-      "license": "NonFree"
-    },
-    "com.sendbird.android": {
-      "anti_features": [
-        "NonFreeComp",
-        "NonFreeNet",
-        "Tracking"
-      ],
-      "code_signatures": [
-        "com/sendbird/android"
-      ],
-      "description": "an easy-to-use Chat API, native Chat SDKs, and a fully-managed chat platform on the backend means faster time-to-market.",
-      "license": "NonFree"
-    },
-    "com.smaato.soma": {
-      "anti_features": [
-        "Ads",
-        "NonFreeComp"
-      ],
-      "code_signatures": [
-        "com/smaato/soma"
-      ],
-      "description": "a mobile ad platform that includes video ads.",
-      "license": "NonFree"
-    },
-    "com.spotify.sdk": {
-      "anti_features": [
-        "NonFreeComp",
-        "NonFreeNet"
-      ],
-      "code_signatures": [
-        "com/spotify/sdk"
-      ],
-      "description": "allows your application to interact with the Spotify app service. (Note that while the SDK repo claims Apache license, the code is not available there)",
-      "license": "NonFree"
-    },
-    "com.startapp.android": {
-      "anti_features": [
-        "Ads",
-        "Tracking",
-        "NonFreeComp"
-      ],
-      "code_signatures": [
-        "com/startapp"
-      ],
-      "description": "partly quite intrusive ad network.",
-      "license": "NonFree"
-    },
-    "com.telerik.android": {
-      "anti_features": [
-        "NonFreeComp"
-      ],
-      "code_signatures": [
-        "com/telerik/android"
-      ],
-      "description": "offers high quality Xamarin Forms UI components and Visual Studio item templates to enable every developer.",
-      "license": "NonFree"
-    },
-    "com.tencent.bugly": {
-      "code_signatures": [
-        "com/tencent/bugly"
-      ],
-      "documentation": [
-        "https://bugly.qq.com/"
-      ],
-      "gradle_signatures": [
-        "com.tencent.bugly"
-      ],
-      "license": "NonFree",
-      "name": "Bugly Android SDK"
-    },
-    "com.tencent.mapsdk": {
-      "anti_features": [
-        "NonFreeNet"
-      ],
-      "code_signatures": [
-        "com/tencent/tencentmap"
-      ],
-      "description": "giving access to <a href='https://en.wikipedia.org/wiki/Tencent_Maps' target='_blank'>Tencent Maps</a>.",
-      "license": "NonFree"
-    },
-    "com.tenjin.android.TenjinSDK": {
-      "anti_features": [
-        "Tracking"
-      ],
-      "code_signatures": [
-        "com/tenjin/android/TenjinSDK"
-      ],
-      "description": "a marketing platform designed for mobile that features analytics, automated aggregation, and direct data visualization with direct SQL access.",
-      "license": "NonFree"
-    },
-    "com.umeng.umsdk": {
-      "code_signatures": [
-        "com/umeng"
-      ],
-      "documentation": [
-        "https://developer.umeng.com/docs/119267/detail/118584"
-      ],
-      "gradle_signatures": [
-        "com.umeng"
-      ],
-      "license": "NonFree",
-      "name": "Umeng SDK"
-    },
-    "com.wei.android.lib": {
-      "code_signatures": [
-        "com/wei/android/lib/fingerprintidentify"
-      ],
-      "documentation": [
-        "https://github.com/uccmawei/FingerprintIdentify"
-      ],
-      "gradle_signatures": [
-        "com.wei.android.lib:fingerprintidentify",
-        "com.github.uccmawei:FingerprintIdentify"
-      ],
-      "gradle_signatures_positive_examples": [
-        "implementation \"com.github.uccmawei:fingerprintidentify:${safeExtGet(\"fingerprintidentify\", \"1.2.6\")}\""
-      ],
-      "license": "NonFree",
-      "name": "FingerprintIdentify"
-    },
-    "com.yandex.android": {
-      "code_signatures": [
-        "com/yandex/android/(?!:authsdk)"
-      ],
-      "gradle_signatures": [
-        "com\\.yandex\\.android(?!:authsdk)"
-      ],
-      "gradle_signatures_negative_examples": [
-        "com.yandex.android:authsdk"
-      ],
-      "license": "NonFree",
-      "name": "Yandex SDK"
-    },
-    "com.yandex.metrica": {
-      "anti_features": [
-        "NonFreeComp",
-        "Tracking"
-      ],
-      "code_signatures": [
-        "com/yandex/metrica"
-      ],
-      "description": "a mobile attribution and analytics platform developed by Yandex. It is free, real-time and has no data limits restriction. See <a rel='nofollow' href='https://www.crunchbase.com/organization/appmetrica'>Crunchbase</a> and <a href='https://reports.exodus-privacy.eu.org/en/trackers/140/'>Exodus Privacy</a>.",
-      "license": "NonFree"
-    },
-    "com.yandex.mobile.ads": {
-      "anti_features": [
-        "Ads",
-        "NonFreeComp"
-      ],
-      "code_signatures": [
-        "com/yandex/mobile/ads"
-      ],
-      "description": "See <a href='https://reports.exodus-privacy.eu.org/en/trackers/124/'>Exodus Privacy</a>.",
-      "license": "NonFree"
-    },
-    "de.epgpaid": {
-      "anti_features": [
-        "NonFreeComp"
-      ],
-      "code_signatures": [
-        "de/epgpaid"
-      ],
-      "description": "access paid <a href='https://en.wikipedia.org/wiki/EPG' target='_blank'>EPG</a> (Electronic Program Guide, for TV) data (after payment, of course). Part of <a href='https://github.com/ds10git/tvbrowserandroid' target='_blank' rel='nofollow'>TVBrowser</a>.",
-      "license": "NonFree"
-    },
-    "de.innosystec.unrar": {
-      "code_signatures": [
-        "de/innosystec/unrar"
-      ],
-      "description": "java unrar util",
-      "license": "NonFree"
-    },
-    "firebase": {
-      "code_signatures": [
-        "com/google/firebase"
-      ],
-      "documentation": [
-        "https://www.firebase.com"
-      ],
-      "gradle_signatures": [
-        "com(\\.google)?\\.firebase[.:](?!firebase-jobdispatcher|geofire-java)",
-        "com.microsoft.appcenter:appcenter-push"
-      ],
-      "gradle_signatures_negative_examples": [
-        "    compile 'com.firebase:firebase-jobdispatcher:0.8.4'",
-        "implementation 'com.firebase:geofire-java:3.0.0'",
-        "    compile 'com.firebaseui:firebase-ui-auth:3.1.3'",
-        "com.firebaseui:firebase-ui-database",
-        "com.firebaseui:firebase-ui-storage",
-        "com.github.axet:android-firebase-fake",
-        "com.github.b3er.rxfirebase:firebase-database",
-        "com.github.b3er.rxfirebase:firebase-database-kotlin",
-        "com.segment.analytics.android.integrations:firebase"
-      ],
-      "gradle_signatures_positive_examples": [
-        "\tcompile 'com.google.firebase:firebase-crash:11.0.8'",
-        "\tcompile 'com.google.firebase:firebase-core:11.0.8'",
-        "com.firebase:firebase-client-android:2.5.2",
-        "com.google.firebase.crashlytics",
-        "com.google.firebase.firebase-perf",
-        "com.google.firebase:firebase-ads",
-        "com.google.firebase:firebase-analytics",
-        "com.google.firebase:firebase-appindexing",
-        "com.google.firebase:firebase-auth",
-        "com.google.firebase:firebase-config",
-        "com.google.firebase:firebase-core",
-        "com.google.firebase:firebase-crash",
-        "com.google.firebase:firebase-crashlytics",
-        "com.google.firebase:firebase-database",
-        "com.google.firebase:firebase-dynamic-links",
-        "com.google.firebase:firebase-firestore",
-        "com.google.firebase:firebase-inappmessaging",
-        "com.google.firebase:firebase-inappmessaging-display",
-        "com.google.firebase:firebase-messaging",
-        "com.google.firebase:firebase-ml-natural-language",
-        "com.google.firebase:firebase-ml-natural-language-smart-reply-model",
-        "com.google.firebase:firebase-ml-vision",
-        "com.google.firebase:firebase-perf",
-        "com.google.firebase:firebase-plugins",
-        "com.google.firebase:firebase-storage"
-      ],
-      "license": "NonFree",
-      "name": "Firebase"
-    },
-    "google-maps": {
-      "anti_features": [
-        "NonFreeDep",
-        "NonFreeNet"
-      ],
-      "api_key_ids": [
-        "com\\.google\\.android\\.geo\\.API_KEY",
-        "com\\.google\\.android\\.maps\\.v2\\.API_KEY"
-      ],
-      "documentation": [
-        "https://developers.google.com/maps/documentation/android-sdk/overview"
-      ],
-      "license": "NonFree",
-      "name": "Google Maps"
-    },
-    "io.fabric.sdk.android": {
-      "anti_features": [
-        "NonFreeComp",
-        "Tracking"
-      ],
-      "code_signatures": [
-        "io/fabric/sdk/android"
-      ],
-      "description": "Framework to integrate services. Provides e.g. crash reports and analytics. <a rel='nofollow' href='http://fabric.io/blog/fabric-joins-google/' target='_blank' rel='nofollow'>Aquired by Google in 2017</a>.",
-      "license": "NonFree"
-    },
-    "io.github.sinaweibosdk": {
-      "code_signatures": [
-        "com/sina"
-      ],
-      "documentation": [
-        "https://github.com/sinaweibosdk/weibo_android_sdk"
-      ],
-      "gradle_signatures": [
-        "io.github.sinaweibosdk"
-      ],
-      "license": "NonFree",
-      "name": "SinaWeiboSDK"
-    },
-    "io.intercom": {
-      "anti_features": [
-        "NonFreeComp",
-        "NonFreeNet"
-      ],
-      "code_signatures": [
-        "io/intercom"
-      ],
-      "description": "engage customers with email, push, and in\u2011app messages and support them with an integrated knowledge base and help desk.",
-      "license": "NonFree"
-    },
-    "io.objectbox": {
-      "code_signatures": [
-        "io/objectbox"
-      ],
-      "documentation": [
-        "https://objectbox.io/faq/#license-pricing"
-      ],
-      "gradle_signatures": [
-        "io.objectbox:objectbox-gradle-plugin"
-      ],
-      "license": "NonFree",
-      "name": "ObjectBox Database"
-    },
-    "me.pushy": {
-      "code_signatures": [
-        "me/pushy"
-      ],
-      "documentation": [
-        "https://pushy.me/"
-      ],
-      "gradle_signatures": [
-        "me.pushy"
-      ],
-      "license": "NonFree",
-      "name": "Pushy"
-    },
-    "org.gradle.toolchains.foojay-resolver-convention": {
-      "documentation": [
-        "https://github.com/gradle/foojay-toolchains"
-      ],
-      "gradle_signatures": [
-        "org.gradle.toolchains.foojay-resolver"
-      ],
-      "license": "Apache-2.0",
-      "name": "Foojay Toolchains Plugin"
-    },
-    "org.mariuszgromada.math": {
-      "code_signatures": [
-        "org/mariuszgromada/math/mxparser/parsertokens/SyntaxStringBuilder",
-        "org/mariuszgromada/math/mxparser/CalcStepRecord",
-        "org/mariuszgromada/math/mxparser/CalcStepsRegister",
-        "org/mariuszgromada/math/mxparser/License",
-        "org/mariuszgromada/math/mxparser/CloneCache",
-        "org/mariuszgromada/math/mxparser/ElementAtTheEnd",
-        "org/mariuszgromada/math/mxparser/CompilationDetails",
-        "org/mariuszgromada/math/mxparser/CompiledElement"
-      ],
-      "documentation": [
-        "https://mathparser.org",
-        "https://mathparser.org/mxparser-license/"
-      ],
-      "gradle_signatures": [
-        "org.mariuszgromada.math:MathParser.org-mXparser:[5-9]"
-      ],
-      "license": "NonFree",
-      "name": "mXparser"
-    },
-    "tornaco.android.sec": {
-      "anti_features": [
-        "NonFreeComp"
-      ],
-      "code_signatures": [
-        "tornaco/android/sec"
-      ],
-      "description": "proprietary part of the <a href='https://github.com/Tornaco/Thanox' target='_blank' rel='nofollow noopener'>Thanox</a> application",
-      "license": "NonFree"
-    }
-  },
-  "timestamp": 1747829076.702502,
-  "version": 1,
-  "last_updated": 1750710966.431471
-}'''
diff --git a/fdroidserver/signatures.py b/fdroidserver/signatures.py
index 00c9d264..78f4bcd3 100644
--- a/fdroidserver/signatures.py
+++ b/fdroidserver/signatures.py
@@ -15,17 +15,21 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
-import logging
-import os
-import re
-import sys
 from argparse import ArgumentParser
 
-from . import _, common
+import re
+import os
+import sys
+import logging
+
+from . import _
+from . import common
+from . import net
 from .exception import FDroidException
 
 
 def extract_signature(apkpath):
+
     if not os.path.exists(apkpath):
         raise FDroidException("file APK does not exists '{}'".format(apkpath))
     if not common.verify_apk_signature(apkpath):
@@ -42,6 +46,7 @@ def extract_signature(apkpath):
 
 
 def extract(options):
+
     # Create tmp dir if missing…
     tmp_dir = 'tmp'
     if not os.path.exists(tmp_dir):
@@ -57,40 +62,26 @@ def extract(options):
         try:
             if os.path.isfile(apk):
                 sigdir = extract_signature(apk)
-                logging.info(
-                    _("Fetched signatures for '{apkfilename}' -> '{sigdir}'").format(
-                        apkfilename=apk, sigdir=sigdir
-                    )
-                )
+                logging.info(_("Fetched signatures for '{apkfilename}' -> '{sigdir}'")
+                             .format(apkfilename=apk, sigdir=sigdir))
             elif httpre.match(apk):
                 if apk.startswith('https') or options.no_check_https:
                     try:
-                        from . import net
-
                         tmp_apk = os.path.join(tmp_dir, 'signed.apk')
                         net.download_file(apk, tmp_apk)
                         sigdir = extract_signature(tmp_apk)
-                        logging.info(
-                            _(
-                                "Fetched signatures for '{apkfilename}' -> '{sigdir}'"
-                            ).format(apkfilename=apk, sigdir=sigdir)
-                        )
+                        logging.info(_("Fetched signatures for '{apkfilename}' -> '{sigdir}'")
+                                     .format(apkfilename=apk, sigdir=sigdir))
                     finally:
                         if tmp_apk and os.path.exists(tmp_apk):
                             os.remove(tmp_apk)
                 else:
-                    logging.warning(
-                        _(
-                            'refuse downloading via insecure HTTP connection '
-                            '(use HTTPS or specify --no-https-check): {apkfilename}'
-                        ).format(apkfilename=apk)
-                    )
+                    logging.warning(_('refuse downloading via insecure HTTP connection '
+                                      '(use HTTPS or specify --no-https-check): {apkfilename}')
+                                    .format(apkfilename=apk))
         except FDroidException as e:
-            logging.warning(
-                _("Failed fetching signatures for '{apkfilename}': {error}").format(
-                    apkfilename=apk, error=e
-                )
-            )
+            logging.warning(_("Failed fetching signatures for '{apkfilename}': {error}")
+                            .format(apkfilename=apk, error=e))
             if e.detail:
                 logging.debug(e.detail)
 
@@ -98,12 +89,12 @@ def extract(options):
 def main():
     parser = ArgumentParser()
     common.setup_global_opts(parser)
-    parser.add_argument(
-        "APK", nargs='*', help=_("signed APK, either a file-path or HTTPS URL.")
-    )
+    parser.add_argument("APK", nargs='*',
+                        help=_("signed APK, either a file-path or HTTPS URL."))
     parser.add_argument("--no-check-https", action="store_true", default=False)
-    options = common.parse_args(parser)
-    common.set_console_logging(options.verbose, options.color)
-    common.read_config()
+    options = parser.parse_args()
+
+    # Read config.py...
+    common.read_config(options)
 
     extract(options)
diff --git a/fdroidserver/signindex.py b/fdroidserver/signindex.py
index 47cd5ec2..2c5859d5 100644
--- a/fdroidserver/signindex.py
+++ b/fdroidserver/signindex.py
@@ -16,154 +16,70 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-import json
-import logging
 import os
 import time
 import zipfile
 from argparse import ArgumentParser
+import logging
 
-from . import _, common, metadata
+from . import _
+from . import common
 from .exception import FDroidException
 
 config = None
+options = None
 start_timestamp = time.gmtime()
 
 
-def sign_jar(jar, use_old_algs=False):
-    """Sign a JAR file with the best available algorithm.
-
-    The current signing method uses apksigner to sign the JAR so that
-    it will automatically select algorithms that are compatible with
-    Android SDK 23, which added the most recent algorithms:
-    https://developer.android.com/reference/java/security/Signature
-
-    This signing method uses then inherits the default signing
-    algothim settings, since Java and Android both maintain those.
-    That helps avoid a repeat of being stuck on an old signing
-    algorithm.  That means specifically that this call to apksigner
-    does not specify any of the algorithms.
-
-    The old indexes must be signed by SHA1withRSA otherwise they will
-    no longer be compatible with old Androids.
+def sign_jar(jar):
+    """
+    Sign a JAR file with Java's jarsigner.
 
     This method requires a properly initialized config object.
 
+    This does use old hashing algorithms, i.e. SHA1, but that's not
+    broken yet for file verification.  This could be set to SHA256,
+    but then Android < 4.3 would not be able to verify it.
+    https://code.google.com/p/android/issues/detail?id=38321
     """
-    if use_old_algs:
-        # This does use old hashing algorithms, i.e. SHA1, but that's not
-        # broken yet for file verification.  This could be set to SHA256,
-        # but then Android < 4.3 would not be able to verify it.
-        # https://code.google.com/p/android/issues/detail?id=38321
-        args = [
-            config['jarsigner'],
-            '-keystore',
-            config['keystore'],
-            '-storepass:env',
-            'FDROID_KEY_STORE_PASS',
-            '-digestalg',
-            'SHA1',
-            '-sigalg',
-            'SHA1withRSA',
-            jar,
-            config['repo_keyalias'],
-        ]
-        if config['keystore'] == 'NONE':
-            args += config['smartcardoptions']
-        else:  # smardcards never use -keypass
-            args += ['-keypass:env', 'FDROID_KEY_PASS']
-    else:
-        # https://developer.android.com/studio/command-line/apksigner
-        args = [
-            config['apksigner'],
-            'sign',
-            '--min-sdk-version',
-            '23',  # enable all current algorithms
-            '--max-sdk-version',
-            '24',  # avoid future incompatible algorithms
-            # disable all APK signature types, only use JAR sigs aka v1
-            '--v1-signing-enabled',
-            'true',
-            '--v2-signing-enabled',
-            'false',
-            '--v3-signing-enabled',
-            'false',
-            '--v4-signing-enabled',
-            'false',
-            '--ks',
-            config['keystore'],
-            '--ks-pass',
-            'env:FDROID_KEY_STORE_PASS',
-            '--ks-key-alias',
-            config['repo_keyalias'],
-        ]
-        if config['keystore'] == 'NONE':
-            args += common.get_apksigner_smartcardoptions(config['smartcardoptions'])
-        else:  # smardcards never use --key-pass
-            args += ['--key-pass', 'env:FDROID_KEY_PASS']
-        args += [jar]
+    args = [config['jarsigner'], '-keystore', config['keystore'],
+            '-storepass:env', 'FDROID_KEY_STORE_PASS',
+            '-digestalg', 'SHA1', '-sigalg', 'SHA1withRSA',
+            jar, config['repo_keyalias']]
+    if config['keystore'] == 'NONE':
+        args += config['smartcardoptions']
+    else:  # smardcards never use -keypass
+        args += ['-keypass:env', 'FDROID_KEY_PASS']
     env_vars = {
         'FDROID_KEY_STORE_PASS': config['keystorepass'],
         'FDROID_KEY_PASS': config.get('keypass', ""),
     }
     p = common.FDroidPopen(args, envs=env_vars)
-    if not use_old_algs and p.returncode != 0:
-        # workaround for apksigner v30 on f-droid.org publish server
-        v4 = args.index("--v4-signing-enabled")
-        del args[v4 + 1]
-        del args[v4]
-        p = common.FDroidPopen(args, envs=env_vars)
-        if p.returncode != 0:
-            raise FDroidException("Failed to sign %s: %s" % (jar, p.output))
+    if p.returncode != 0:
+        raise FDroidException("Failed to sign %s!" % jar)
 
 
-def sign_index(repodir, json_name):
-    """Sign data file like entry.json to make a signed JAR like entry.jar.
-
-    The data file like index-v1.json means that there is unsigned
-    data.  That file is then stuck into a jar and signed by the
-    signing process. This is a bit different than sign_jar, which is
-    used for index.jar: that creates index.xml then puts that in a
-    index_unsigned.jar, then that file is signed.
-
-    This also checks to make sure that the JSON files are intact
-    before signing them.  Broken JSON files should never be signed, so
-    taking some extra time and failing hard is the preferred
-    option. This signing process can happen on an entirely separate
-    machine and file tree, so this ensures that nothing got broken
-    during transfer.
-
+def sign_index_v1(repodir, json_name):
     """
-    json_file = os.path.join(repodir, json_name)
-    with open(json_file, encoding="utf-8") as fp:
-        data = json.load(fp)
-        if json_name == 'entry.json':
-            index_file = os.path.join(repodir, data['index']['name'].lstrip('/'))
-            sha256 = common.sha256sum(index_file)
-            if sha256 != data['index']['sha256']:
-                raise FDroidException(
-                    _('%s has bad SHA-256: %s') % (index_file, sha256)
-                )
-            with open(index_file) as fp:
-                index = json.load(fp)
-            if not isinstance(index, dict):
-                raise FDroidException(_('%s did not produce a dict!') % index_file)
-        elif json_name == 'index-v1.json':
-            [metadata.App(app) for app in data["apps"]]
+    Sign index-v1.json to make index-v1.jar
 
+    This is a bit different than index.jar: instead of their being index.xml
+    and index_unsigned.jar, the presence of index-v1.json means that there is
+    unsigned data.  That file is then stuck into a jar and signed by the
+    signing process.  index-v1.json is never published to the repo.  It is
+    included in the binary transparency log, if that is enabled.
+    """
     name, ext = common.get_extension(json_name)
+    index_file = os.path.join(repodir, json_name)
     jar_file = os.path.join(repodir, name + '.jar')
     with zipfile.ZipFile(jar_file, 'w', zipfile.ZIP_DEFLATED) as jar:
-        jar.write(json_file, json_name)
-
-    if json_name in ('index.xml', 'index-v1.json'):
-        sign_jar(jar_file, use_old_algs=True)
-    else:
-        sign_jar(jar_file)
+        jar.write(index_file, json_name)
+    sign_jar(jar_file)
 
 
 def status_update_json(signed):
-    """Output a JSON file with metadata about this run."""
+    """Output a JSON file with metadata about this run"""
+
     logging.debug(_('Outputting JSON'))
     output = common.setup_status_output(start_timestamp)
     if signed:
@@ -172,20 +88,18 @@ def status_update_json(signed):
 
 
 def main():
-    global config
+
+    global config, options
 
     parser = ArgumentParser()
     common.setup_global_opts(parser)
-    common.parse_args(parser)
+    options = parser.parse_args()
 
-    config = common.read_config()
+    config = common.read_config(options)
 
     if 'jarsigner' not in config:
         raise FDroidException(
-            _(
-                'Java jarsigner not found! Install in standard location or set java_paths!'
-            )
-        )
+            _('Java jarsigner not found! Install in standard location or set java_paths!'))
 
     repodirs = ['repo']
     if config['archive_older'] != 0:
@@ -207,14 +121,8 @@ def main():
         json_name = 'index-v1.json'
         index_file = os.path.join(output_dir, json_name)
         if os.path.exists(index_file):
-            sign_index(output_dir, json_name)
-            logging.info('Signed ' + index_file)
-            signed.append(index_file)
-
-        json_name = 'entry.json'
-        index_file = os.path.join(output_dir, json_name)
-        if os.path.exists(index_file):
-            sign_index(output_dir, json_name)
+            sign_index_v1(output_dir, json_name)
+            os.remove(index_file)
             logging.info('Signed ' + index_file)
             signed.append(index_file)
 
diff --git a/fdroidserver/stats.py b/fdroidserver/stats.py
new file mode 100644
index 00000000..9d6cbfdc
--- /dev/null
+++ b/fdroidserver/stats.py
@@ -0,0 +1,306 @@
+#!/usr/bin/env python3
+#
+# stats.py - part of the FDroid server tools
+# Copyright (C) 2010-13, Ciaran Gultnieks, ciaran@ciarang.com
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+import sys
+import os
+import re
+import time
+import traceback
+import glob
+import json
+from argparse import ArgumentParser
+import paramiko
+import socket
+import logging
+import subprocess
+from collections import Counter
+
+from . import _
+from . import common
+from . import metadata
+
+
+def carbon_send(key, value):
+    s = socket.socket()
+    s.connect((config['carbon_host'], config['carbon_port']))
+    msg = '%s %d %d\n' % (key, value, int(time.time()))
+    s.sendall(msg)
+    s.close()
+
+
+options = None
+config = None
+
+
+def most_common_stable(counts):
+    pairs = []
+    for s in counts:
+        pairs.append((s, counts[s]))
+    return sorted(pairs, key=lambda t: (-t[1], t[0]))
+
+
+def main():
+
+    global options, config
+
+    # Parse command line...
+    parser = ArgumentParser()
+    common.setup_global_opts(parser)
+    parser.add_argument("-d", "--download", action="store_true", default=False,
+                        help=_("Download logs we don't have"))
+    parser.add_argument("--recalc", action="store_true", default=False,
+                        help=_("Recalculate aggregate stats - use when changes "
+                               "have been made that would invalidate old cached data."))
+    parser.add_argument("--nologs", action="store_true", default=False,
+                        help=_("Don't do anything logs-related"))
+    metadata.add_metadata_arguments(parser)
+    options = parser.parse_args()
+    metadata.warnings_action = options.W
+
+    config = common.read_config(options)
+
+    if not config['update_stats']:
+        logging.info("Stats are disabled - set \"update_stats = True\" in your config.py")
+        sys.exit(1)
+
+    # Get all metadata-defined apps...
+    allmetaapps = [app for app in metadata.read_metadata().values()]
+    metaapps = [app for app in allmetaapps if not app.Disabled]
+
+    statsdir = 'stats'
+    logsdir = os.path.join(statsdir, 'logs')
+    datadir = os.path.join(statsdir, 'data')
+    if not os.path.exists(statsdir):
+        os.mkdir(statsdir)
+    if not os.path.exists(logsdir):
+        os.mkdir(logsdir)
+    if not os.path.exists(datadir):
+        os.mkdir(datadir)
+
+    if options.download:
+        # Get any access logs we don't have...
+        ssh = None
+        ftp = None
+        try:
+            logging.info('Retrieving logs')
+            ssh = paramiko.SSHClient()
+            ssh.load_system_host_keys()
+            ssh.connect(config['stats_server'], username=config['stats_user'],
+                        timeout=10, key_filename=config['webserver_keyfile'])
+            ftp = ssh.open_sftp()
+            ftp.get_channel().settimeout(60)
+            logging.info("...connected")
+
+            ftp.chdir('logs')
+            files = ftp.listdir()
+            for f in files:
+                if f.startswith('access-') and f.endswith('.log.gz'):
+
+                    destpath = os.path.join(logsdir, f)
+                    destsize = ftp.stat(f).st_size
+                    if not os.path.exists(destpath) \
+                       or os.path.getsize(destpath) != destsize:
+                        logging.debug("...retrieving " + f)
+                        ftp.get(f, destpath)
+        except Exception:
+            traceback.print_exc()
+            sys.exit(1)
+        finally:
+            # Disconnect
+            if ftp is not None:
+                ftp.close()
+            if ssh is not None:
+                ssh.close()
+
+    knownapks = common.KnownApks()
+    unknownapks = []
+
+    if not options.nologs:
+        # Process logs
+        logging.info('Processing logs...')
+        appscount = Counter()
+        appsvercount = Counter()
+        logexpr = r'(?P<ip>[.:0-9a-fA-F]+) - - \[(?P<time>.*?)\] ' \
+            + r'"GET (?P<uri>.*?) HTTP/1.\d" (?P<statuscode>\d+) ' \
+            + r'\d+ "(?P<referral>.*?)" "(?P<useragent>.*?)"'
+        logsearch = re.compile(logexpr).search
+        for logfile in glob.glob(os.path.join(logsdir, 'access-*.log.gz')):
+            logging.debug('...' + logfile)
+
+            # Get the date for this log - e.g. 2012-02-28
+            thisdate = os.path.basename(logfile)[7:-7]
+
+            agg_path = os.path.join(datadir, thisdate + '.json')
+            if not options.recalc and os.path.exists(agg_path):
+                # Use previously calculated aggregate data
+                with open(agg_path, 'r') as f:
+                    today = json.load(f)
+
+            else:
+                # Calculate from logs...
+
+                today = {
+                    'apps': Counter(),
+                    'appsver': Counter(),
+                    'unknown': []
+                }
+
+                p = subprocess.Popen(["zcat", logfile], stdout=subprocess.PIPE)
+                matches = (logsearch(line) for line in p.stdout)
+                for match in matches:
+                    if not match:
+                        continue
+                    if match.group('statuscode') != '200':
+                        continue
+                    if match.group('ip') in config['stats_ignore']:
+                        continue
+                    uri = match.group('uri')
+                    if not uri.endswith('.apk'):
+                        continue
+                    _ignored, apkname = os.path.split(uri)
+                    app = knownapks.getapp(apkname)
+                    if app:
+                        appid, _ignored = app
+                        today['apps'][appid] += 1
+                        # Strip the '.apk' from apkname
+                        appver = apkname[:-4]
+                        today['appsver'][appver] += 1
+                    else:
+                        if apkname not in today['unknown']:
+                            today['unknown'].append(apkname)
+
+                # Save calculated aggregate data for today to cache
+                with open(agg_path, 'w') as f:
+                    json.dump(today, f)
+
+            # Add today's stats (whether cached or recalculated) to the total
+            for appid in today['apps']:
+                appscount[appid] += today['apps'][appid]
+            for appid in today['appsver']:
+                appsvercount[appid] += today['appsver'][appid]
+            for uk in today['unknown']:
+                if uk not in unknownapks:
+                    unknownapks.append(uk)
+
+        # Calculate and write stats for total downloads...
+        lst = []
+        alldownloads = 0
+        for appid in appscount:
+            count = appscount[appid]
+            lst.append(appid + " " + str(count))
+            if config['stats_to_carbon']:
+                carbon_send('fdroid.download.' + appid.replace('.', '_'),
+                            count)
+            alldownloads += count
+        lst.append("ALL " + str(alldownloads))
+        with open(os.path.join(statsdir, 'total_downloads_app.txt'), 'w') as f:
+            f.write('# Total downloads by application, since October 2011\n')
+            for line in sorted(lst):
+                f.write(line + '\n')
+
+        lst = []
+        for appver in appsvercount:
+            count = appsvercount[appver]
+            lst.append(appver + " " + str(count))
+
+        with open(os.path.join(statsdir, 'total_downloads_app_version.txt'), 'w') as f:
+            f.write('# Total downloads by application and version, '
+                    'since October 2011\n')
+            for line in sorted(lst):
+                f.write(line + "\n")
+
+    # Calculate and write stats for repo types...
+    logging.info("Processing repo types...")
+    repotypes = Counter()
+    for app in metaapps:
+        rtype = app.RepoType or 'none'
+        if rtype == 'srclib':
+            rtype = common.getsrclibvcs(app.Repo)
+        repotypes[rtype] += 1
+    with open(os.path.join(statsdir, 'repotypes.txt'), 'w') as f:
+        for rtype, count in most_common_stable(repotypes):
+            f.write(rtype + ' ' + str(count) + '\n')
+
+    # Calculate and write stats for update check modes...
+    logging.info("Processing update check modes...")
+    ucms = Counter()
+    for app in metaapps:
+        checkmode = app.UpdateCheckMode
+        if checkmode.startswith('RepoManifest/'):
+            checkmode = checkmode[:12]
+        if checkmode.startswith('Tags '):
+            checkmode = checkmode[:4]
+        ucms[checkmode] += 1
+    with open(os.path.join(statsdir, 'update_check_modes.txt'), 'w') as f:
+        for checkmode, count in most_common_stable(ucms):
+            f.write(checkmode + ' ' + str(count) + '\n')
+
+    logging.info("Processing categories...")
+    ctgs = Counter()
+    for app in metaapps:
+        for category in app.Categories:
+            ctgs[category] += 1
+    with open(os.path.join(statsdir, 'categories.txt'), 'w') as f:
+        for category, count in most_common_stable(ctgs):
+            f.write(category + ' ' + str(count) + '\n')
+
+    logging.info("Processing antifeatures...")
+    afs = Counter()
+    for app in metaapps:
+        if app.AntiFeatures is None:
+            continue
+        for antifeature in app.AntiFeatures:
+            afs[antifeature] += 1
+    with open(os.path.join(statsdir, 'antifeatures.txt'), 'w') as f:
+        for antifeature, count in most_common_stable(afs):
+            f.write(antifeature + ' ' + str(count) + '\n')
+
+    # Calculate and write stats for licenses...
+    logging.info("Processing licenses...")
+    licenses = Counter()
+    for app in metaapps:
+        license = app.License
+        licenses[license] += 1
+    with open(os.path.join(statsdir, 'licenses.txt'), 'w') as f:
+        for license, count in most_common_stable(licenses):
+            f.write(license + ' ' + str(count) + '\n')
+
+    # Write list of disabled apps...
+    logging.info("Processing disabled apps...")
+    disabled = [app.id for app in allmetaapps if app.Disabled]
+    with open(os.path.join(statsdir, 'disabled_apps.txt'), 'w') as f:
+        for appid in sorted(disabled):
+            f.write(appid + '\n')
+
+    # Write list of latest apps added to the repo...
+    logging.info("Processing latest apps...")
+    latest = knownapks.getlatest(10)
+    with open(os.path.join(statsdir, 'latestapps.txt'), 'w') as f:
+        for appid in latest:
+            f.write(appid + '\n')
+
+    if unknownapks:
+        logging.info('\nUnknown apks:')
+        for apk in unknownapks:
+            logging.info(apk)
+
+    logging.info(_("Finished"))
+
+
+if __name__ == "__main__":
+    main()
diff --git a/fdroidserver/tail.py b/fdroidserver/tail.py
index 2bea3504..fb441f97 100644
--- a/fdroidserver/tail.py
+++ b/fdroidserver/tail.py
@@ -1,24 +1,23 @@
 #!/usr/bin/env python
 
-"""Python-Tail - Unix tail follow implementation in Python.
+'''
+Python-Tail - Unix tail follow implementation in Python.
 
 python-tail can be used to monitor changes to a file.
 
-Example
--------
->>> import tail
->>>
->>> # Create a tail instance
->>> t = tail.Tail('file-to-be-followed')
->>>
->>> # Register a callback function to be called when a new line is found in the followed file.
->>> # If no callback function is registerd, new lines would be printed to standard out.
->>> t.register_callback(callback_function)
->>>
->>> # Follow the file with 5 seconds as sleep time between iterations.
->>> # If sleep time is not provided 1 second is used as the default time.
->>> t.follow(s=5)
-"""
+Example:
+    import tail
+
+    # Create a tail instance
+    t = tail.Tail('file-to-be-followed')
+
+    # Register a callback function to be called when a new line is found in the followed file.
+    # If no callback function is registerd, new lines would be printed to standard out.
+    t.register_callback(callback_function)
+
+    # Follow the file with 5 seconds as sleep time between iterations.
+    # If sleep time is not provided 1 second is used as the default time.
+    t.follow(s=5) '''
 
 # Author - Kasun Herath <kasunh01 at gmail.com>
 # Source - https://github.com/kasun/python-tail
@@ -28,54 +27,46 @@ Example
 
 import os
 import sys
-import threading
 import time
+import threading
 
 
 class Tail(object):
-    """Represents a tail command."""
-
+    ''' Represents a tail command. '''
     def __init__(self, tailed_file):
-        """Initialize a Tail instance.
+        ''' Initiate a Tail instance.
+            Check for file validity, assigns callback function to standard out.
 
-        Check for file validity, assigns callback function to standard out.
+            Arguments:
+                tailed_file - File to be followed. '''
 
-        Parameters
-        ----------
-        tailed_file
-          File to be followed.
-        """
         self.check_file_validity(tailed_file)
         self.tailed_file = tailed_file
         self.callback = sys.stdout.write
         self.t_stop = threading.Event()
 
     def start(self, s=1):
-        """Start tailing a file in a background thread.
+        '''Start tailing a file in a background thread.
+
+        Arguments:
+            s - Number of seconds to wait between each iteration; Defaults to 3.
+        '''
 
-        Parameters
-        ----------
-        s
-          Number of seconds to wait between each iteration; Defaults to 3.
-        """
         t = threading.Thread(target=self.follow, args=(s,))
         t.start()
 
     def stop(self):
-        """Stop a background tail."""
+        '''Stop a background tail.
+        '''
         self.t_stop.set()
 
     def follow(self, s=1):
-        """Do a tail follow.
-
-        If a callback function is registered it is called with every new line.
+        ''' Do a tail follow. If a callback function is registered it is called with every new line.
         Else printed to standard out.
 
-        Parameters
-        ----------
-        s
-          Number of seconds to wait between each iteration; Defaults to 1.
-        """
+        Arguments:
+            s - Number of seconds to wait between each iteration; Defaults to 1. '''
+
         with open(self.tailed_file) as file_:
             # Go to the end of file
             file_.seek(0, 2)
@@ -90,11 +81,11 @@ class Tail(object):
                 time.sleep(s)
 
     def register_callback(self, func):
-        """Override default callback function to provided function."""
+        ''' Overrides default callback function to provided function. '''
         self.callback = func
 
     def check_file_validity(self, file_):
-        """Check whether the a given file exists, readable and is a file."""
+        ''' Check whether the a given file exists, readable and is a file '''
         if not os.access(file_, os.F_OK):
             raise TailError("File '%s' does not exist" % (file_))
         if not os.access(file_, os.R_OK):
@@ -104,8 +95,8 @@ class Tail(object):
 
 
 class TailError(Exception):
+
     def __init__(self, msg):
-        super().__init__()
         self.message = msg
 
     def __str__(self):
diff --git a/fdroidserver/update.py b/fdroidserver/update.py
index 75c4d907..fd5dc924 100644
--- a/fdroidserver/update.py
+++ b/fdroidserver/update.py
@@ -20,28 +20,23 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import argparse
-import copy
-import filecmp
-import glob
-import hashlib
-import json
-import logging
-import os
-import re
-import shutil
-import socket
 import sys
-import time
+import os
+import shutil
+import glob
+import logging
+import re
+import socket
 import warnings
 import zipfile
-from argparse import ArgumentParser
-from datetime import datetime, timezone
-from pathlib import Path
-
-import asn1crypto.cms
-import defusedxml.ElementTree as ElementTree
+import hashlib
+import json
+import time
 import yaml
-
+import copy
+from datetime import datetime
+from argparse import ArgumentParser
+from base64 import urlsafe_b64encode
 try:
     from yaml import CSafeLoader as SafeLoader
 except ImportError:
@@ -50,19 +45,18 @@ except ImportError:
 import collections
 from binascii import hexlify
 
+from . import _
+from . import common
+from . import index
+from . import metadata
+from .exception import BuildException, FDroidException
+
 from PIL import Image, PngImagePlugin
-
-import fdroidserver.index
-
-from . import _, common, metadata
-from .common import DEFAULT_LOCALE
-from .exception import BuildException, FDroidException, NoVersionCodeException, VerificationException
-
 if hasattr(Image, 'DecompressionBombWarning'):
     warnings.simplefilter('error', Image.DecompressionBombWarning)
 Image.MAX_IMAGE_PIXELS = 0xffffff  # 4096x4096
 
-METADATA_VERSION = 20002
+METADATA_VERSION = 21
 
 # less than the valid range of versionCode, i.e. Java's Integer.MIN_VALUE
 UNSET_VERSION_CODE = -0x100000000
@@ -112,7 +106,7 @@ def px_to_dpi(px):
 
 
 def get_icon_dir(repodir, density):
-    if density in ('0', '65534'):
+    if density == '0' or density == '65534':
         return os.path.join(repodir, "icons")
     else:
         return os.path.join(repodir, "icons-%s" % density)
@@ -134,32 +128,24 @@ def disabled_algorithms_allowed():
             or common.default_config['allow_disabled_algorithms'])
 
 
-def status_update_json(output, apps, apks):
-    """Output a JSON file with metadata about this `fdroid update` run.
+def status_update_json(apps, apks):
+    """Output a JSON file with metadata about this `fdroid update` run
 
-    Parameters
-    ----------
-    apps
-      fully populated list of all applications
-    apks
-      all to be published apks
+    :param apps: fully populated list of all applications
+    :param apks: all to be published apks
 
     """
+
     logging.debug(_('Outputting JSON'))
+    output = common.setup_status_output(start_timestamp)
     output['antiFeatures'] = dict()
     output['disabled'] = []
-    output['archivePolicy0'] = []
     output['failedBuilds'] = dict()
     output['noPackages'] = []
-    output['needsUpdate'] = []
-    output['noUpdateCheck'] = []
-    output['apksigner'] = shutil.which(config.get('apksigner', ''))
-    output['jarsigner'] = shutil.which(config.get('jarsigner', ''))
-    output['keytool'] = shutil.which(config.get('keytool', ''))
 
     for appid in apps:
         app = apps[appid]
-        for af in app.get('AntiFeatures', dict()):
+        for af in app.get('AntiFeatures', []):
             antiFeatures = output['antiFeatures']  # JSON camelCase
             if af not in antiFeatures:
                 antiFeatures[af] = dict()
@@ -168,61 +154,264 @@ def status_update_json(output, apps, apks):
             antiFeatures[af]['apps'].add(appid)
 
         apklist = []
-        gotcurrentver = False
         for apk in apks:
             if apk['packageName'] == appid:
-                if apk['versionCode'] == app.get('CurrentVersionCode'):
-                    gotcurrentver = True
                 apklist.append(apk)
+        builds = app.get('builds', [])
         validapks = 0
+        for build in builds:
+            if not build.get('disable'):
+                builtit = False
+                for apk in apklist:
+                    if apk['versionCode'] == int(build.versionCode):
+                        builtit = True
+                        validapks += 1
+                        break
+                if not builtit:
+                    failedBuilds = output['failedBuilds']
+                    if appid not in failedBuilds:
+                        failedBuilds[appid] = []
+                    failedBuilds[appid].append(build.versionCode)
+        if validapks == 0:
+            output['noPackages'].append(appid)
         if app.get('Disabled'):
             output['disabled'].append(appid)
-        elif app.get("ArchivePolicy") == 0:
-            output['archivePolicy0'].append(appid)
-        else:
-            for build in app.get('Builds', []):
-                if not build.get('disable'):
-                    builtit = False
-                    for apk in apklist:
-                        if apk['versionCode'] == build.versionCode:
-                            builtit = True
-                            validapks += 1
-                            break
-                    if not builtit:
-                        failedBuilds = output['failedBuilds']
-                        if appid not in failedBuilds:
-                            failedBuilds[appid] = []
-                        failedBuilds[appid].append(build.versionCode)
-            if validapks == 0:
-                output['noPackages'].append(appid)
-            if not gotcurrentver:
-                output['needsUpdate'].append(appid)
-            if app.get('UpdateCheckMode') == 'None':
-                output['noUpdateCheck'].append(appid)
     common.write_status_json(output, options.pretty)
 
 
-def output_status_stage(output, stage):
-    if 'stages' not in output:
-        output['stages'] = dict()
-    output['stages'][stage] = common.epoch_millis_now()
-    common.write_running_status_json(output)
+def update_wiki(apps, apks):
+    """Update the wiki
+
+    :param apps: fully populated list of all applications
+    :param apks: all apks, except...
+    """
+    logging.info("Updating wiki")
+    wikicat = 'Apps'
+    wikiredircat = 'App Redirects'
+    import mwclient
+    site = mwclient.Site((config['wiki_protocol'], config['wiki_server']),
+                         path=config['wiki_path'])
+    site.login(config['wiki_user'], config['wiki_password'])
+    generated_pages = {}
+    generated_redirects = {}
+
+    for appid in apps:
+        app = metadata.App(apps[appid])
+
+        wikidata = ''
+        if app.Disabled:
+            wikidata += '{{Disabled|' + app.Disabled + '}}\n'
+        if app.AntiFeatures:
+            for af in sorted(app.AntiFeatures):
+                wikidata += '{{AntiFeature|' + af + '}}\n'
+        if app.RequiresRoot:
+            requiresroot = 'Yes'
+        else:
+            requiresroot = 'No'
+        wikidata += '{{App|id=%s|name=%s|added=%s|lastupdated=%s|source=%s|tracker=%s|web=%s|changelog=%s|donate=%s|flattr=%s|liberapay=%s|bitcoin=%s|litecoin=%s|license=%s|root=%s|author=%s|email=%s}}\n' % (
+            appid,
+            app.Name,
+            app.added.strftime('%Y-%m-%d') if app.added else '',
+            app.lastUpdated.strftime('%Y-%m-%d') if app.lastUpdated else '',
+            app.SourceCode,
+            app.IssueTracker,
+            app.WebSite,
+            app.Changelog,
+            app.Donate,
+            app.FlattrID,
+            app.LiberapayID,
+            app.Bitcoin,
+            app.Litecoin,
+            app.License,
+            requiresroot,
+            app.AuthorName,
+            app.AuthorEmail)
+
+        if app.Provides:
+            wikidata += "This app provides: %s" % ', '.join(app.Summary.split(','))
+
+        wikidata += app.Summary
+        wikidata += " - [https://f-droid.org/repository/browse/?fdid=" + appid + " view in repository]\n\n"
+
+        wikidata += "=Description=\n"
+        wikidata += app.Description + "\n"
+
+        wikidata += "=Maintainer Notes=\n"
+        if app.MaintainerNotes:
+            wikidata += app.MaintainerNotes + "\n"
+        wikidata += "\nMetadata: [https://gitlab.com/fdroid/fdroiddata/blob/master/metadata/{0}.yml current] [https://gitlab.com/fdroid/fdroiddata/commits/master/metadata/{0}.yml history]\n".format(appid)
+
+        # Get a list of all packages for this application...
+        apklist = []
+        gotcurrentver = False
+        cantupdate = False
+        buildfails = False
+        for apk in apks:
+            if apk['packageName'] == appid:
+                if str(apk['versionCode']) == app.CurrentVersionCode:
+                    gotcurrentver = True
+                apklist.append(apk)
+        # Include ones we can't build, as a special case...
+        for build in app.builds:
+            if build.disable:
+                if build.versionCode == app.CurrentVersionCode:
+                    cantupdate = True
+                # TODO: Nasty: vercode is a string in the build, and an int elsewhere
+                apklist.append({'versionCode': int(build.versionCode),
+                                'versionName': build.versionName,
+                                'buildproblem': "The build for this version was manually disabled. Reason: {0}".format(build.disable),
+                                })
+            else:
+                builtit = False
+                for apk in apklist:
+                    if apk['versionCode'] == int(build.versionCode):
+                        builtit = True
+                        break
+                if not builtit:
+                    buildfails = True
+                    apklist.append({'versionCode': int(build.versionCode),
+                                    'versionName': build.versionName,
+                                    'buildproblem': "The build for this version appears to have failed. Check the [[{0}/lastbuild_{1}|build log]].".format(appid, build.versionCode),
+                                    })
+        if app.CurrentVersionCode == '0':
+            cantupdate = True
+        # Sort with most recent first...
+        apklist = sorted(apklist, key=lambda apk: apk['versionCode'], reverse=True)
+
+        wikidata += "=Versions=\n"
+        if len(apklist) == 0:
+            wikidata += "We currently have no versions of this app available."
+        elif not gotcurrentver:
+            wikidata += "We don't have the current version of this app."
+        else:
+            wikidata += "We have the current version of this app."
+        wikidata += " (Check mode: " + app.UpdateCheckMode + ") "
+        wikidata += " (Auto-update mode: " + app.AutoUpdateMode + ")\n\n"
+        if len(app.NoSourceSince) > 0:
+            wikidata += "This application has partially or entirely been missing source code since version " + app.NoSourceSince + ".\n\n"
+        if len(app.CurrentVersion) > 0:
+            wikidata += "The current (recommended) version is " + app.CurrentVersion
+            wikidata += " (version code " + app.CurrentVersionCode + ").\n\n"
+        validapks = 0
+        for apk in apklist:
+            wikidata += "==" + apk['versionName'] + "==\n"
+
+            if 'buildproblem' in apk:
+                wikidata += "We can't build this version: " + apk['buildproblem'] + "\n\n"
+            else:
+                validapks += 1
+                wikidata += "This version is built and signed by "
+                if 'srcname' in apk:
+                    wikidata += "F-Droid, and guaranteed to correspond to the source tarball published with it.\n\n"
+                else:
+                    wikidata += "the original developer.\n\n"
+            wikidata += "Version code: " + str(apk['versionCode']) + '\n'
+
+        wikidata += '\n[[Category:' + wikicat + ']]\n'
+        if len(app.NoSourceSince) > 0:
+            wikidata += '\n[[Category:Apps missing source code]]\n'
+        if validapks == 0 and not app.Disabled:
+            wikidata += '\n[[Category:Apps with no packages]]\n'
+        if cantupdate and not app.Disabled:
+            wikidata += "\n[[Category:Apps we cannot update]]\n"
+        if buildfails and not app.Disabled:
+            wikidata += "\n[[Category:Apps with failing builds]]\n"
+        elif not gotcurrentver and not cantupdate and not app.Disabled and app.UpdateCheckMode != "Static":
+            wikidata += '\n[[Category:Apps to Update]]\n'
+        if app.Disabled:
+            wikidata += '\n[[Category:Apps that are disabled]]\n'
+        if app.UpdateCheckMode == 'None' and not app.Disabled:
+            wikidata += '\n[[Category:Apps with no update check]]\n'
+        for appcat in app.Categories:
+            wikidata += '\n[[Category:{0}]]\n'.format(appcat)
+
+        # We can't have underscores in the page name, even if they're in
+        # the package ID, because MediaWiki messes with them...
+        pagename = appid.replace('_', ' ')
+
+        # Drop a trailing newline, because mediawiki is going to drop it anyway
+        # and it we don't we'll think the page has changed when it hasn't...
+        if wikidata.endswith('\n'):
+            wikidata = wikidata[:-1]
+
+        generated_pages[pagename] = wikidata
+
+        # Make a redirect from the name to the ID too, unless there's
+        # already an existing page with the name and it isn't a redirect.
+        noclobber = False
+        apppagename = app.Name
+        for ch in '_{}:[]|':
+            apppagename = apppagename.replace(ch, ' ')
+        # Drop double spaces caused mostly by replacing ':' above
+        apppagename = apppagename.replace('  ', ' ')
+        for expagename in site.allpages(prefix=apppagename,
+                                        filterredir='nonredirects',
+                                        generator=False):
+            if expagename == apppagename:
+                noclobber = True
+        # Another reason not to make the redirect page is if the app name
+        # is the same as it's ID, because that will overwrite the real page
+        # with an redirect to itself! (Although it seems like an odd
+        # scenario this happens a lot, e.g. where there is metadata but no
+        # builds or binaries to extract a name from.
+        if apppagename == pagename:
+            noclobber = True
+        if not noclobber:
+            generated_redirects[apppagename] = "#REDIRECT [[" + pagename + "]]\n[[Category:" + wikiredircat + "]]"
+
+    for tcat, genp in [(wikicat, generated_pages),
+                       (wikiredircat, generated_redirects)]:
+        catpages = site.Pages['Category:' + tcat]
+        existingpages = []
+        for page in catpages:
+            existingpages.append(page.name)
+            if page.name in genp:
+                pagetxt = page.text()
+                if pagetxt != genp[page.name]:
+                    logging.debug("Updating modified page " + page.name)
+                    page.save(genp[page.name], summary='Auto-updated')
+                else:
+                    logging.debug("Page " + page.name + " is unchanged")
+            else:
+                logging.warning('Deleting page ' + page.name)
+                page.delete('No longer published')
+        for pagename, text in genp.items():
+            logging.debug("Checking " + pagename)
+            if pagename not in existingpages:
+                logging.debug("Creating page " + pagename)
+                try:
+                    newpage = site.Pages[pagename]
+                    newpage.save(text, summary='Auto-created')
+                except Exception as e:
+                    logging.error("...FAILED to create page '{0}': {1}".format(pagename, e))
+
+    # Purge server cache to ensure counts are up to date
+    site.Pages['Repository Maintenance'].purge()
+
+    # Write a page with the last build log for this version code
+    wiki_page_path = 'update_' + time.strftime('%s', start_timestamp)
+    newpage = site.Pages[wiki_page_path]
+    txt = ''
+    txt += "* command line: <code>" + ' '.join(sys.argv) + "</code>\n"
+    txt += "* started at " + common.get_wiki_timestamp(start_timestamp) + '\n'
+    txt += "* completed at " + common.get_wiki_timestamp() + '\n'
+    txt += common.get_git_describe_link()
+    txt += "\n\n"
+    txt += common.get_android_tools_version_log()
+    newpage.save(txt, summary='Run log')
+    newpage = site.Pages['update']
+    newpage.save('#REDIRECT [[' + wiki_page_path + ']]', summary='Update redirect')
 
 
 def delete_disabled_builds(apps, apkcache, repodirs):
     """Delete disabled build outputs.
 
-    Parameters
-    ----------
-    apps
-      list of all applications, as per metadata.read_metadata
-    apkcache
-      current apk cache information
-    repodirs
-      the repo directories to process
+    :param apps: list of all applications, as per metadata.read_metadata
+    :param apkcache: current apk cache information
+    :param repodirs: the repo directories to process
     """
     for appid, app in apps.items():
-        for build in app.get('Builds', []):
+        for build in app['builds']:
             if not build.disable:
                 continue
             apkfilename = common.get_release_filename(app, build)
@@ -234,6 +423,7 @@ def delete_disabled_builds(apps, apkcache, repodirs):
                     os.path.join(repodir, apkfilename),
                     os.path.join(repodir, apkfilename + '.asc'),
                     os.path.join(repodir, apkfilename[:-4] + "_src.tar.gz"),
+                    os.path.join(repodir, apkfilename[:-4] + ".log.gz"),
                 ]
                 for density in all_screen_densities:
                     repo_dir = get_icon_dir(repodir, density)
@@ -260,7 +450,7 @@ def resize_icon(iconpath, density):
 
         if any(length > size for length in im.size):
             oldsize = im.size
-            im.thumbnail((size, size), Image.LANCZOS)
+            im.thumbnail((size, size), Image.ANTIALIAS)
             logging.debug("%s was too large at %s - new size is %s" % (
                 iconpath, oldsize, im.size))
             im.save(iconpath, "PNG", optimize=True,
@@ -275,12 +465,9 @@ def resize_icon(iconpath, density):
 
 
 def resize_all_icons(repodirs):
-    """Resize all icons that exceed the max size.
+    """Resize all icons that exceed the max size
 
-    Parameters
-    ----------
-    repodirs
-      the repo directories to process
+    :param repodirs: the repo directories to process
     """
     for repodir in repodirs:
         for density in screen_densities:
@@ -302,17 +489,12 @@ def getsig(apkpath):
     md5 digest algorithm.  This is not the same as the standard X.509
     certificate fingerprint.
 
-    Parameters
-    ----------
-    apkpath
-      path to the apk
-
-    Returns
-    -------
-    A string containing the md5 of the signature of the apk or None
-    if an error occurred.
+    :param apkpath: path to the apk
+    :returns: A string containing the md5 of the signature of the apk or None
+              if an error occurred.
 
     """
+
     cert_encoded = common.get_first_signer_certificate(apkpath)
     if not cert_encoded:
         return None
@@ -323,15 +505,8 @@ def get_cache_file():
     return os.path.join('tmp', 'apkcache.json')
 
 
-def get_cache_mtime():
-    apkcachefile = get_cache_file()
-    if os.path.exists(apkcachefile):
-        return os.stat(apkcachefile).st_mtime
-    return 0
-
-
 def get_cache():
-    """Get the cached dict of the APK index.
+    """Get the cached dict of the APK index
 
     Gather information about all the apk files in the repo directory,
     using cached data if possible. Some of the index operations take a
@@ -343,9 +518,7 @@ def get_cache():
     those cases, there is no easy way to know what has changed from
     the cache, so just rerun the whole thing.
 
-    Returns
-    -------
-    apkcache
+    :return: apkcache
 
     """
     apkcachefile = get_cache_file()
@@ -366,16 +539,9 @@ def get_cache():
         if not isinstance(v, dict):
             continue
         if 'antiFeatures' in v:
-            if not isinstance(v['antiFeatures'], dict):
-                v['antiFeatures'] = {k: {} for k in sorted(v['antiFeatures'])}
+            v['antiFeatures'] = set(v['antiFeatures'])
         if 'added' in v:
-            v['added'] = datetime.fromtimestamp(v['added'], tz=timezone.utc)
-        if v.get('srcname') and not v.get('srcnameSha256'):
-            f = f'archive/{v["srcname"]}'
-            if not os.path.exists(f):
-                f = f'repo/{v["srcname"]}'
-            if os.path.exists(f):
-                v['srcnameSha256'] = common.sha256sum(f)
+            v['added'] = datetime.fromtimestamp(v['added'])
 
     return apkcache
 
@@ -401,15 +567,39 @@ def write_cache(apkcache):
 
 
 def get_icon_bytes(apkzip, iconsrc):
-    """ZIP has no official encoding, UTF-* and CP437 are defacto."""
+    '''ZIP has no official encoding, UTF-* and CP437 are defacto'''
     try:
         return apkzip.read(iconsrc)
     except KeyError:
         return apkzip.read(iconsrc.encode('utf-8').decode('cp437'))
 
 
+def sha256sum(filename):
+    '''Calculate the sha256 of the given file'''
+    sha = hashlib.sha256()
+    with open(filename, 'rb') as f:
+        while True:
+            t = f.read(16384)
+            if len(t) == 0:
+                break
+            sha.update(t)
+    return sha.hexdigest()
+
+
+def sha256base64(filename):
+    '''Calculate the sha256 of the given file as URL-safe base64'''
+    hasher = hashlib.sha256()
+    with open(filename, 'rb') as f:
+        while True:
+            t = f.read(16384)
+            if len(t) == 0:
+                break
+            hasher.update(t)
+    return urlsafe_b64encode(hasher.digest()).decode()
+
+
 def has_known_vulnerability(filename):
-    """Check for known vulnerabilities in the APK.
+    """checks for known vulnerabilities in the APK
 
     Checks OpenSSL .so files in the APK to see if they are a known vulnerable
     version.  Google also enforces this:
@@ -422,7 +612,8 @@ def has_known_vulnerability(filename):
     Janus is similar to Master Key but is perhaps easier to scan for.
     https://www.guardsquare.com/en/blog/new-android-vulnerability-allows-attackers-modify-apps-without-affecting-their-signatures
     """
-    found_vuln = ''
+
+    found_vuln = False
 
     # statically load this pattern
     if not hasattr(has_known_vulnerability, "pattern"):
@@ -438,7 +629,7 @@ def has_known_vulnerability(filename):
     files_in_apk = set()
     with zipfile.ZipFile(filename) as zf:
         for name in zf.namelist():
-            if name.endswith('.so') and ('libcrypto' in name or 'libssl' in name):
+            if name.endswith('libcrypto.so') or name.endswith('libssl.so'):
                 lib = zf.open(name)
                 while True:
                     chunk = lib.read(4096)
@@ -453,31 +644,22 @@ def has_known_vulnerability(filename):
                             logging.debug(_('"{path}" contains recent {name} ({version})')
                                           .format(path=filename, name=name, version=version))
                         else:
-                            msg = '"{path}" contains outdated {name} ({version})'
-                            logging.warning(
-                                _(msg).format(path=filename, name=name, version=version)
-                            )
-                            found_vuln += msg.format(
-                                path=filename, name=name, version=version
-                            )
-                            found_vuln += '\n'
+                            logging.warning(_('"{path}" contains outdated {name} ({version})')
+                                            .format(path=filename, name=name, version=version))
+                            found_vuln = True
                         break
             elif name == 'AndroidManifest.xml' or name == 'classes.dex' or name.endswith('.so'):
                 if name in files_in_apk:
-                    msg = '{apkfilename} has multiple {name} files, looks like Master Key exploit!'
-                    logging.warning(
-                        _(msg).format(apkfilename=filename, name=name)
-                    )
-                    found_vuln += msg.format(apkfilename=filename, name=name)
-                    found_vuln += '\n'
+                    logging.warning(_('{apkfilename} has multiple {name} files, looks like Master Key exploit!')
+                                    .format(apkfilename=filename, name=name))
+                    found_vuln = True
                 files_in_apk.add(name)
     return found_vuln
 
 
 def insert_obbs(repodir, apps, apks):
-    """Scan the .obb files in a given repo directory and adds them to the relevant APK instances.
-
-    OBB files have versionCodes like APK
+    """Scans the .obb files in a given repo directory and adds them to the
+    relevant APK instances.  OBB files have versionCodes like APK
     files, and they are loosely associated.  If there is an OBB file
     present, then any APK with the same or higher versionCode will use
     that OBB file.  There are two OBB types: main and patch, each APK
@@ -485,15 +667,12 @@ def insert_obbs(repodir, apps, apks):
 
     https://developer.android.com/google/play/expansion-files.html
 
-    Parameters
-    ----------
-    repodir
-      repo directory to scan
-    apps
-      list of current, valid apps
-    apks
-      current information on all APKs
+    :param repodir: repo directory to scan
+    :param apps: list of current, valid apps
+    :param apks: current information on all APKs
+
     """
+
     def obbWarnDelete(f, msg):
         logging.warning(msg + ' ' + f)
         if options.delete_unknown:
@@ -511,7 +690,7 @@ def insert_obbs(repodir, apps, apks):
             obbWarnDelete(f, _('OBB filename must start with "main." or "patch.":'))
             continue
         if not re.match(r'^-?[0-9]+$', chunks[1]):
-            obbWarnDelete(f, _('The OBB versionCode must come after "{name}.":')
+            obbWarnDelete(f, _('The OBB version code must come after "{name}.":')
                           .format(name=chunks[0]))
             continue
         versionCode = int(chunks[1])
@@ -525,11 +704,10 @@ def insert_obbs(repodir, apps, apks):
             if packagename == apk['packageName'] and apk['versionCode'] > highestVersionCode:
                 highestVersionCode = apk['versionCode']
         if versionCode > highestVersionCode:
-            obbWarnDelete(f, _(
-                'OBB file has newer versionCode({integer}) than any APK:'
-            ).format(integer=versionCode))
+            obbWarnDelete(f, _('OBB file has newer versionCode({integer}) than any APK:')
+                          .format(integer=str(versionCode)))
             continue
-        obbsha256 = common.sha256sum(f)
+        obbsha256 = sha256sum(f)
         obbs.append((packagename, versionCode, obbfile, obbsha256))
 
     for apk in apks:
@@ -545,175 +723,8 @@ def insert_obbs(repodir, apps, apks):
                 break
 
 
-VERSION_STRING_RE = re.compile(r'^([0-9]+)\.([0-9]+)\.([0-9]+)$')
-
-
-def version_string_to_int(version):
-    """
-    Convert semantic version designation to versionCode.
-
-    Approximately convert a [Major].[Minor].[Patch] version string
-    consisting of numeric characters (0-9) and periods to a number. The
-    exponents are chosen such that it still fits in the 64bit JSON/Android range.
-    """
-    m = VERSION_STRING_RE.match(version)
-    if not m:
-        raise ValueError(f"invalid version string '{version}'")
-    major = int(m.group(1))
-    minor = int(m.group(2))
-    patch = int(m.group(3))
-    return major * 10**12 + minor * 10**6 + patch
-
-
-# iOS app permissions, source:
-# https://developer.apple.com/documentation/bundleresources/information_property_list/protected_resources
-IPA_PERMISSIONS = [
-    "NSBluetoothAlwaysUsageDescription",
-    "NSBluetoothPeripheralUsageDescription",
-    "NSCalendarsFullAccessUsageDescription",
-    "NSCalendarsWriteOnlyAccessUsageDescription",
-    "NSRemindersFullAccessUsageDescription",
-    "NSCameraUsageDescription",
-    "NSMicrophoneUsageDescription",
-    "NSContactsUsageDescription",
-    "NSFaceIDUsageDescription",
-    "NSDesktopFolderUsageDescription",
-    "NSDocumentsFolderUsageDescription",
-    "NSDownloadsFolderUsageDescription",
-    "NSNetworkVolumesUsageDescription",
-    "NSNetworkVolumesUsageDescription",
-    "NSRemovableVolumesUsageDescription",
-    "NSRemovableVolumesUsageDescription",
-    "NSFileProviderDomainUsageDescription",
-    "NSGKFriendListUsageDescription",
-    "NSHealthClinicalHealthRecordsShareUsageDescription",
-    "NSHealthShareUsageDescription",
-    "NSHealthUpdateUsageDescription",
-    "NSHomeKitUsageDescription",
-    "NSLocationAlwaysAndWhenInUseUsageDescription",
-    "NSLocationUsageDescription",
-    "NSLocationWhenInUseUsageDescription",
-    "NSLocationAlwaysUsageDescription",
-    "NSAppleMusicUsageDescription",
-    "NSMotionUsageDescription",
-    "NSFallDetectionUsageDescription",
-    "NSLocalNetworkUsageDescription",
-    "NSNearbyInteractionUsageDescription",
-    "NSNearbyInteractionAllowOnceUsageDescription",
-    "NFCReaderUsageDescription",
-    "NSPhotoLibraryAddUsageDescription",
-    "NSPhotoLibraryUsageDescription",
-    "NSAppDataUsageDescription",
-    "NSUserTrackingUsageDescription",
-    "NSAppleEventsUsageDescription",
-    "NSSystemAdministrationUsageDescription",
-    "NSSensorKitUsageDescription",
-    "NSSiriUsageDescription",
-    "NSSpeechRecognitionUsageDescription",
-    "NSVideoSubscriberAccountUsageDescription",
-    "NSWorldSensingUsageDescription",
-    "NSHandsTrackingUsageDescription",
-    "NSIdentityUsageDescription",
-    "NSCalendarsUsageDescription",
-    "NSRemindersUsageDescription",
-]
-
-
-def parse_ipa(ipa_path, file_size, sha256):
-    import biplist
-
-    ipa = {
-        "apkName": os.path.basename(ipa_path),
-        "hash": sha256,
-        "hashType": "sha256",
-        "size": file_size,
-        "ipa_entitlements": set(),
-        "ipa_permissions": {},
-    }
-
-    with zipfile.ZipFile(ipa_path) as ipa_zip:
-        for info in ipa_zip.infolist():
-            if re.match("Payload/[^/]*.app/Info.plist", info.filename):
-                with ipa_zip.open(info) as plist_file:
-                    plist = biplist.readPlist(plist_file)
-                    ipa["name"] = plist['CFBundleName']
-                    ipa["packageName"] = plist["CFBundleIdentifier"]
-                    # https://developer.apple.com/documentation/bundleresources/information_property_list/cfbundleshortversionstring
-                    ipa["versionCode"] = version_string_to_int(plist["CFBundleShortVersionString"])
-                    ipa["versionName"] = plist["CFBundleShortVersionString"]
-                    ipa["ipa_MinimumOSVersion"] = plist['MinimumOSVersion']
-                    ipa["ipa_DTPlatformVersion"] = plist['DTPlatformVersion']
-                    for ipap in IPA_PERMISSIONS:
-                        if ipap in plist:
-                            ipa["ipa_permissions"][ipap] = str(plist[ipap])
-            if info.filename.endswith("/embedded.mobileprovision"):
-                print("parsing", info.filename)
-                with ipa_zip.open(info) as mopro_file:
-                    mopro_content_info = asn1crypto.cms.ContentInfo.load(
-                        mopro_file.read()
-                    )
-                    mopro_payload_info = mopro_content_info['content']
-                    mopro_payload = mopro_payload_info['encap_content_info'][
-                        'content'
-                    ].native
-                    mopro = biplist.readPlistFromString(mopro_payload)
-                    # https://faq.altstore.io/distribute-your-apps/make-a-source#entitlements-array-of-strings
-                    for entitlement in mopro.get('Entitlements', {}).keys():
-                        if entitlement not in [
-                            "com.app.developer.team-identifier",
-                            'application-identifier'
-                        ]:
-                            ipa["ipa_entitlements"].add(entitlement)
-    return ipa
-
-
-def scan_repo_for_ipas(apkcache, repodir, knownapks):
-    """Scan for IPA files in a given repo directory.
-
-    Parameters
-    ----------
-    apkcache
-      cache dictionary containting cached file infos from previous runs
-    repodir
-      repo directory to scan
-    knownapks
-      list of all known files, as per metadata.read_metadata
-
-    Returns
-    -------
-    ipas
-      list of file infos for ipa files in ./repo folder
-    cachechanged
-      ture if new ipa files were found and added to `apkcache`
-    """
-    cachechanged = False
-    ipas = []
-    for ipa_path in glob.glob(os.path.join(repodir, '*.ipa')):
-        ipa_name = os.path.basename(ipa_path)
-
-        file_size = os.stat(ipa_path).st_size
-        if file_size == 0:
-            raise FDroidException(_('{path} is zero size!').format(path=ipa_path))
-
-        sha256 = common.sha256sum(ipa_path)
-        ipa = apkcache.get(ipa_name, {})
-
-        if ipa.get('hash') != sha256:
-            ipa = fdroidserver.update.parse_ipa(ipa_path, file_size, sha256)
-            apkcache[ipa_name] = ipa
-            cachechanged = True
-
-        added = knownapks.recordapk(ipa_name)
-        if added:
-            ipa['added'] = added
-
-        ipas.append(ipa)
-
-    return ipas, cachechanged
-
-
 def translate_per_build_anti_features(apps, apks):
-    """Grab the anti-features list from the build metadata.
+    """Grab the anti-features list from the build metadata
 
     For most Anti-Features, they are really most applicable per-APK,
     not for an app.  An app can fix a vulnerability, add/remove
@@ -727,13 +738,14 @@ def translate_per_build_anti_features(apps, apks):
     from the build 'antifeatures' field, not directly included.
 
     """
+
     antiFeatures = dict()
     for packageName, app in apps.items():
         d = dict()
-        for build in app.get('Builds', []):
+        for build in app['builds']:
             afl = build.get('antifeatures')
             if afl:
-                d[build.versionCode] = afl
+                d[int(build.versionCode)] = afl
         if len(d) > 0:
             antiFeatures[packageName] = d
 
@@ -742,11 +754,11 @@ def translate_per_build_anti_features(apps, apks):
         if d:
             afl = d.get(apk['versionCode'])
             if afl:
-                apk['antiFeatures'].update(afl)  # TODO
+                apk['antiFeatures'].update(afl)
 
 
 def _get_localized_dict(app, locale):
-    """Get the dict to add localized store metadata to."""
+    '''get the dict to add localized store metadata to'''
     if 'localized' not in app:
         app['localized'] = collections.OrderedDict()
     if locale not in app['localized']:
@@ -754,73 +766,43 @@ def _get_localized_dict(app, locale):
     return app['localized'][locale]
 
 
-def _set_localized_text_entry(app, locale, key, f, versionCode=None):
-    """Read a fastlane/triple-t metadata file and add an entry to the app.
-
-    This reads more than the limit, in case there is leading or
-    trailing whitespace to be stripped
-
-    """
-    try:
-        limit = config['char_limits'][key]
-        if not versionCode:
-            localized = _get_localized_dict(app, locale)
-        with open(f, errors='replace') as fp:
-            text = fp.read(limit * 2)
-            if versionCode:
-                for build in app["Builds"]:
-                    if build["versionCode"] == versionCode:
-                        if "whatsNew" not in build:
-                            build["whatsNew"] = collections.OrderedDict()
-                        build["whatsNew"][locale] = text[:limit]
-                        return
-            if len(text) > 0:
-                if key in ('name', 'summary', 'video'):  # hardcoded as a single line
-                    localized[key] = text.strip('\n')[:limit]
-                else:
-                    localized[key] = text[:limit]
-    except Exception as e:
-        logging.error(_('{path}: {error}').format(path=f, error=str(e)))
+def _set_localized_text_entry(app, locale, key, f):
+    limit = config['char_limits'][key]
+    localized = _get_localized_dict(app, locale)
+    with open(f, errors='replace') as fp:
+        text = fp.read()[:limit]
+        if len(text) > 0:
+            if key in ('name', 'summary', 'video'):  # hardcoded as a single line
+                localized[key] = text.strip('\n')
+            else:
+                localized[key] = text
 
 
 def _set_author_entry(app, key, f):
-    """Read a fastlane/triple-t author file and add the entry to the app.
-
-    This reads more than the limit, in case there is leading or
-    trailing whitespace to be stripped
-
-    """
-    try:
-        limit = config['char_limits']['author']
-        with open(f, errors='replace') as fp:
-            text = fp.read(limit * 2)
-            if len(text) > 0:
-                app[key] = text.strip()[:limit]
-    except Exception as e:
-        logging.error(_('{path}: {error}').format(path=f, error=str(e)))
+    limit = config['char_limits']['author']
+    with open(f, errors='replace') as fp:
+        text = fp.read()[:limit]
+        if len(text) > 0:
+            app[key] = text.strip()
 
 
 def _strip_and_copy_image(in_file, outpath):
-    """Remove any metadata from image and copy it to new path.
+    """Remove any metadata from image and copy it to new path
 
     Sadly, image metadata like EXIF can be used to exploit devices.
     It is not used at all in the F-Droid ecosystem, so its much safer
     just to remove it entirely.
 
-    This only uses ctime/mtime to check for a new file since this
-    process actually modifies the resulting file to strip out the EXIF.
-    Therefore, whenever the file needs to be stripped, it will have a
-    newer ctime and most likely a different size.  The mtime is copied
-    from the source to the destination, so it can be the same.
+    This uses size+mtime to check for a new file since this process
+    actually modifies the resulting file to strip out the EXIF.
 
     outpath can be path to either a file or dir.  The dir that outpath
     refers to must exist before calling this.
 
     Potential source of Python code to strip JPEGs without dependencies:
     http://www.fetidcascade.com/public/minimal_exif_writer.py
-
     """
-    logging.debug('copying %s %s', in_file, outpath)
+    logging.debug('copying ' + in_file + ' ' + outpath)
 
     if not os.path.exists(in_file):
         if os.path.islink(in_file):
@@ -834,11 +816,12 @@ def _strip_and_copy_image(in_file, outpath):
     else:
         out_file = outpath
 
-    if os.path.exists(out_file) and (
-        os.path.getmtime(in_file) <= os.path.getmtime(out_file)
-        and os.path.getctime(in_file) <= os.path.getctime(out_file)
-    ):
-        return
+    if os.path.exists(out_file):
+        in_stat = os.stat(in_file)
+        out_stat = os.stat(out_file)
+        if in_stat.st_size == out_stat.st_size \
+           and in_stat.st_mtime == out_stat.st_mtime:
+            return
 
     extension = common.get_extension(in_file)[1]
     if extension == 'png':
@@ -850,7 +833,7 @@ def _strip_and_copy_image(in_file, outpath):
         except Exception as e:
             logging.error(_("Failed copying {path}: {error}".format(path=in_file, error=e)))
             return
-    elif extension in ('jpg', 'jpeg'):
+    elif extension == 'jpg' or extension == 'jpeg':
         try:
             with open(in_file, 'rb') as fp:
                 in_image = Image.open(fp)
@@ -869,7 +852,8 @@ def _strip_and_copy_image(in_file, outpath):
 
 
 def _get_base_hash_extension(f):
-    """Split a graphic/screenshot filename into base, sha256, and extension."""
+    '''split a graphic/screenshot filename into base, sha256, and extension
+    '''
     base, extension = common.get_extension(f)
     sha256_index = base.find('_')
     if sha256_index > 0:
@@ -878,7 +862,7 @@ def _get_base_hash_extension(f):
 
 
 def sanitize_funding_yml_entry(entry):
-    """FUNDING.yml comes from upstream repos, entries must be sanitized."""
+    """FUNDING.yml comes from upstream repos, entries must be sanitized"""
     if type(entry) not in (bytes, int, float, list, str):
         return
     if isinstance(entry, bytes):
@@ -901,7 +885,7 @@ def sanitize_funding_yml_entry(entry):
 
 
 def sanitize_funding_yml_name(name):
-    """Sanitize usernames that come from FUNDING.yml."""
+    """Sanitize usernames that come from FUNDING.yml"""
     entry = sanitize_funding_yml_entry(name)
     if entry:
         m = metadata.VALID_USERNAME_REGEX.match(entry)
@@ -911,7 +895,7 @@ def sanitize_funding_yml_name(name):
 
 
 def insert_funding_yml_donation_links(apps):
-    """Include donation links from FUNDING.yml in app's source repo.
+    """include donation links from FUNDING.yml in app's source repo
 
     GitHub made a standard file format for declaring donation
     links. This parses that format from upstream repos to include in
@@ -924,6 +908,7 @@ def insert_funding_yml_donation_links(apps):
     https://help.github.com/en/articles/displaying-a-sponsor-button-in-your-repository#about-funding-files
 
     """
+
     if not os.path.isdir('build'):
         return  # nothing to do
     for packageName, app in apps.items():
@@ -954,19 +939,11 @@ def insert_funding_yml_donation_links(apps):
                     app['OpenCollective'] = s
             if not app.get('Donate'):
                 if 'liberapay' in data:
-                    del data['liberapay']
+                    del(data['liberapay'])
                 if 'open_collective' in data:
-                    del data['open_collective']
+                    del(data['open_collective'])
                 # this tuple provides a preference ordering
-                for k in (
-                    'custom',
-                    'github',
-                    'patreon',
-                    'community_bridge',
-                    'ko_fi',
-                    'issuehunt',
-                    'buy_me_a_coffee'
-                ):
+                for k in ('custom', 'github', 'patreon', 'community_bridge', 'ko_fi', 'issuehunt'):
                     v = data.get(k)
                     if not v:
                         continue
@@ -975,10 +952,10 @@ def insert_funding_yml_donation_links(apps):
                         if s:
                             app['Donate'] = s
                             break
-                    elif k in ('community_bridge', 'lfx_crowdfunding'):
+                    elif k == 'community_bridge':
                         s = sanitize_funding_yml_name(v)
                         if s:
-                            app['Donate'] = 'https://crowdfunding.lfx.linuxfoundation.org/projects/' + s
+                            app['Donate'] = 'https://funding.communitybridge.org/projects/' + s
                             break
                     elif k == 'github':
                         s = sanitize_funding_yml_name(v)
@@ -1000,20 +977,10 @@ def insert_funding_yml_donation_links(apps):
                         if s:
                             app['Donate'] = 'https://patreon.com/' + s
                             break
-                    elif k == 'buy_me_a_coffee':
-                        s = sanitize_funding_yml_name(v)
-                        if s:
-                            app['Donate'] = 'https://www.buymeacoffee.com/' + s
-                            break
-                    elif k == 'polar':
-                        s = sanitize_funding_yml_name(v)
-                        if s:
-                            app['Donate'] = 'https://polar.sh/' + s
-                            break
 
 
 def copy_triple_t_store_metadata(apps):
-    """Include store metadata from the app's source repo.
+    """Include store metadata from the app's source repo
 
     The Triple-T Gradle Play Publisher is a plugin that has a standard
     file layout for all of the metadata and graphics that the Google
@@ -1031,6 +998,7 @@ def copy_triple_t_store_metadata(apps):
     https://github.com/Triple-T/gradle-play-publisher/blob/2.1.0/README.md#publishing-listings
 
     """
+
     if not os.path.isdir('build'):
         return  # nothing to do
 
@@ -1040,48 +1008,30 @@ def copy_triple_t_store_metadata(apps):
     setting_gradle_pattern = re.compile(r"""\s*include\s+["']:([^"']+)["'](?:,[\n\s]*["']:([^"']+)["'])*""")
 
     for packageName, app in apps.items():
-        builds = app.get('Builds', [])
         gradle_subdirs = set()
-        if builds:
-            subdir = builds[-1].subdir or ''
-            for flavor in builds[-1].gradle:
-                if flavor not in ('yes', 'no', True, False):
-                    p = os.path.join('build', packageName, subdir, 'src', flavor, 'play')
-                    if os.path.exists(p):
-                        gradle_subdirs.add(p)
-            if not gradle_subdirs:
-                gradle_subdirs.update(glob.glob(os.path.join('build', packageName, subdir, 'src', '*', 'play')))
-            if not gradle_subdirs:
-                gradle_subdirs.update(glob.glob(os.path.join('build', packageName, subdir, '*', 'src', '*', 'play')))
-            if not gradle_subdirs:
-                # Flutter-style android subdir
-                gradle_subdirs.update(glob.glob(os.path.join('build', packageName, subdir, 'android', 'app', 'src', '*', 'play')))
-        if not gradle_subdirs:
-            sg_list = sorted(glob.glob(os.path.join('build', packageName, 'settings.gradle*')))
-            if sg_list:
-                settings_gradle = sg_list[0]
-                with open(settings_gradle, encoding='utf-8') as fp:
-                    data = fp.read()
-                for matches in setting_gradle_pattern.findall(data):
-                    for m in matches:
-                        if m:
-                            gradle_path = m.replace(':', '/')
-                            p = os.path.join('build', packageName, gradle_path, 'src', 'main', 'play')
-                            if os.path.exists(p):
-                                gradle_subdirs.add(p)
-                            flavors = builds[-1].gradle if builds else []
-                            for flavor in flavors:
-                                if flavor not in ('yes', 'no', True, False):
-                                    p = os.path.join('build', packageName, gradle_path, 'src', flavor, 'play')
-                                    if os.path.exists(p):
-                                        gradle_subdirs.add(p)
+        sg_list = glob.glob(os.path.join('build', packageName, 'settings.gradle*'))
+        if sg_list:
+            settings_gradle = sg_list[0]
+            with open(settings_gradle) as fp:
+                data = fp.read()
+            for matches in setting_gradle_pattern.findall(data):
+                for m in matches:
+                    if m:
+                        gradle_path = m.replace(':', '/')
+                        p = os.path.join('build', packageName, gradle_path, 'src', 'main', 'play')
+                        if os.path.exists(p):
+                            gradle_subdirs.add(p)
+                        flavors = set()
+                        if app.builds:
+                            flavors = app.builds[0].gradle
+                        for flavor in flavors:
+                            if flavor not in ('yes', 'no'):
+                                p = os.path.join('build', packageName, gradle_path, 'src', flavor, 'play')
+                            gradle_subdirs.add(p)
         if not gradle_subdirs:
             gradle_subdirs.update(glob.glob(os.path.join('build', packageName, '*', 'src', '*', 'play')))
-        if not gradle_subdirs:
-            # Flutter-style android subdir
-            gradle_subdirs.update(glob.glob(os.path.join('build', packageName, 'android', 'app', 'src', '*', 'play')))
 
-        for d in sorted(gradle_subdirs):
+        for d in gradle_subdirs:
             logging.debug('Triple-T Gradle Play Publisher: ' + d)
             for root, dirs, files in os.walk(d):
                 segments = root.split('/')
@@ -1091,61 +1041,67 @@ def copy_triple_t_store_metadata(apps):
                     locale = segments[-2]
 
                 for f in files:
-                    if f in ('fulldescription', 'full-description.txt'):
+                    if f == 'fulldescription' or f == 'full-description.txt':
                         _set_localized_text_entry(app, locale, 'description',
                                                   os.path.join(root, f))
-                    elif f in ('shortdescription', 'short-description.txt'):
+                        continue
+                    elif f == 'shortdescription' or f == 'short-description.txt':
                         _set_localized_text_entry(app, locale, 'summary',
                                                   os.path.join(root, f))
-                    elif f in ('title', 'title.txt'):
+                        continue
+                    elif f == 'title' or f == 'title.txt':
                         _set_localized_text_entry(app, locale, 'name',
                                                   os.path.join(root, f))
-                    elif f in ('video', 'video-url.txt'):
+                        continue
+                    elif f == 'video' or f == 'video-url.txt':
                         _set_localized_text_entry(app, locale, 'video',
                                                   os.path.join(root, f))
+                        continue
                     elif f == 'whatsnew':
                         _set_localized_text_entry(app, segments[-1], 'whatsNew',
                                                   os.path.join(root, f))
+                        continue
                     elif f == 'default.txt' and segments[-2] == 'release-notes':
                         _set_localized_text_entry(app, locale, 'whatsNew',
                                                   os.path.join(root, f))
-                    elif f in ('contactEmail', 'contact-email.txt'):
+                        continue
+                    elif f == 'contactEmail' or f == 'contact-email.txt':
                         _set_author_entry(app, 'authorEmail', os.path.join(root, f))
-                    elif f in ('contactPhone', 'contact-phone.txt'):
+                        continue
+                    elif f == 'contactPhone' or f == 'contact-phone.txt':
                         _set_author_entry(app, 'authorPhone', os.path.join(root, f))
-                    elif f in ('contactWebsite', 'contact-website.txt'):
+                        continue
+                    elif f == 'contactWebsite' or f == 'contact-website.txt':
                         _set_author_entry(app, 'authorWebSite', os.path.join(root, f))
-                    else:
-                        base, extension = common.get_extension(f)
-                        dirname = os.path.basename(root)
-                        if extension in ALLOWED_EXTENSIONS \
-                           and (dirname in GRAPHIC_NAMES or dirname in tt_graphic_names
-                                or dirname in SCREENSHOT_DIRS or dirname in tt_screenshot_dirs):
-                            repofilename = os.path.basename(f)
-                            if segments[-2] == 'listing':
-                                locale = segments[-3]
-                                if dirname in GRAPHIC_NAMES:
-                                    repofilename = dirname + '.' + extension
-                                    dirname = ''
-                            elif segments[-4] == 'listings':  # v2.x
-                                locale = segments[-3]
-                                if dirname in tt_graphic_names:
-                                    repofilename = GRAPHIC_NAMES[tt_graphic_names.index(dirname)]
-                                    repofilename += '.' + extension
-                                    dirname = ''
-                                else:
-                                    dirname = SCREENSHOT_DIRS[tt_screenshot_dirs.index(dirname)]
+                        continue
+
+                    base, extension = common.get_extension(f)
+                    dirname = os.path.basename(root)
+                    if extension in ALLOWED_EXTENSIONS \
+                       and (dirname in GRAPHIC_NAMES or dirname in tt_graphic_names
+                            or dirname in SCREENSHOT_DIRS or dirname in tt_screenshot_dirs):
+                        repofilename = os.path.basename(f)
+                        if segments[-2] == 'listing':
+                            locale = segments[-3]
+                        elif segments[-4] == 'listings':  # v2.x
+                            locale = segments[-3]
+                            if dirname in tt_graphic_names:
+                                repofilename = GRAPHIC_NAMES[tt_graphic_names.index(dirname)]
+                                repofilename += '.' + extension
+                                dirname = ''
                             else:
-                                locale = segments[-2]
-                            destdir = os.path.join('repo', packageName, locale, dirname)
-                            os.makedirs(destdir, mode=0o755, exist_ok=True)
-                            sourcefile = os.path.join(root, f)
-                            destfile = os.path.join(destdir, repofilename)
-                            _strip_and_copy_image(sourcefile, destfile)
+                                dirname = SCREENSHOT_DIRS[tt_screenshot_dirs.index(dirname)]
+                        else:
+                            locale = segments[-2]
+                        destdir = os.path.join('repo', packageName, locale, dirname)
+                        os.makedirs(destdir, mode=0o755, exist_ok=True)
+                        sourcefile = os.path.join(root, f)
+                        destfile = os.path.join(destdir, repofilename)
+                        _strip_and_copy_image(sourcefile, destfile)
 
 
 def insert_localized_app_metadata(apps):
-    """Scan standard locations for graphics and localized text.
+    """scans standard locations for graphics and localized text
 
     Scans for localized description files, changelogs, store graphics, and
     screenshots and adds them to the app metadata. Each app's source repo root
@@ -1154,7 +1110,6 @@ def insert_localized_app_metadata(apps):
 
     metadata/<locale>/
     fastlane/metadata/android/<locale>/
-    <subdir>/fastlane/metadata/android/<locale>/
     src/<buildFlavor>/fastlane/metadata/android/<locale>/
 
     ...as well as the /metadata/<packageName>/<locale> directory.
@@ -1173,8 +1128,9 @@ def insert_localized_app_metadata(apps):
     See also our documentation page:
     https://f-droid.org/en/docs/All_About_Descriptions_Graphics_and_Screenshots/#in-the-apps-build-metadata-in-an-fdroiddata-collection
     """
+
     sourcedirs = glob.glob(os.path.join('build', '[A-Za-z]*', 'src', '[A-Za-z]*', 'fastlane', 'metadata', 'android', '[a-z][a-z]*'))
-    sourcedirs += glob.glob(os.path.join('build', '[A-Za-z]*', '**', 'fastlane', 'metadata', 'android', '[a-z][a-z]*'), recursive=True)
+    sourcedirs += glob.glob(os.path.join('build', '[A-Za-z]*', 'fastlane', 'metadata', 'android', '[a-z][a-z]*'))
     sourcedirs += glob.glob(os.path.join('build', '[A-Za-z]*', 'metadata', '[a-z][a-z]*'))
     sourcedirs += glob.glob(os.path.join('metadata', '[A-Za-z]*', '[a-z][a-z]*'))
 
@@ -1190,40 +1146,14 @@ def insert_localized_app_metadata(apps):
             locale = segments[-1]
             destdir = os.path.join('repo', packageName, locale)
 
-            builds = apps.get(packageName, {}).get('Builds', [])
-            found_in_subdir = (
-                builds
-                and len(segments) > 6
-                and segments[-4] == "fastlane"
-                and segments[-3] == "metadata"
-                and segments[-2] == "android"
-                and '/'.join(segments[2:-4]) == builds[-1].get('subdir')
-            )
+            # flavours specified in build receipt
+            build_flavours = ""
+            if apps[packageName] and 'builds' in apps[packageName] and len(apps[packageName].builds) > 0\
+                    and 'gradle' in apps[packageName].builds[-1]:
+                build_flavours = apps[packageName].builds[-1].gradle
 
-            # flavors specified in build receipt
-            build_flavors = []
-            if builds and 'gradle' in builds[-1] and builds[-1]['gradle'] != ['yes']:
-                build_flavors = common.calculate_gradle_flavor_combination(
-                    builds[-1]['gradle']
-                )
-            found_in_flavor = (
-                len(segments) > 7
-                and segments[2] == 'src'
-                and segments[4] == "fastlane"
-                and segments[3] in build_flavors
-            )
-
-            if (
-                not found_in_subdir
-                and not found_in_flavor
-                and segments[0] == 'build'
-                and segments[2] not in ('metadata', 'fastlane')
-            ):
-                logging.debug(
-                    'Not scanning "{dir}" with unknown subdir or gradle flavor "{value}"'.format(
-                        dir=os.path.relpath(root), value=segments[3]
-                    )
-                )
+            if len(segments) >= 5 and segments[4] == "fastlane" and segments[3] not in build_flavours:
+                logging.debug("ignoring due to wrong flavour")
                 continue
 
             for f in files:
@@ -1247,48 +1177,15 @@ def insert_localized_app_metadata(apps):
                     locale = segments[-2]
                     _set_localized_text_entry(apps[packageName], locale, 'whatsNew',
                                               os.path.join(root, f))
-                elif f == 'default.txt':
-                    # use "default.txt" changelog entry as fallback.
-                    locale = segments[-2]
-                    localized = _get_localized_dict(apps[packageName], locale)
-                    if not localized.get('whatsNew', ''):
-                        _set_localized_text_entry(apps[packageName], locale, 'whatsNew',
-                                                  os.path.join(root, f))
+                    continue
 
                 base, extension = common.get_extension(f)
-
-                if extension == 'txt':
-                    try:
-                        versionCode = int(base)
-                        locale = segments[-2]
-                        if versionCode in [b["versionCode"] for b in builds]:
-                            _set_localized_text_entry(
-                                apps[packageName],
-                                locale,
-                                'whatsNew',
-                                os.path.join(root, f),
-                                versionCode,
-                            )
-                        continue
-                    except ValueError:
-                        pass
-
                 if locale == 'images':
                     locale = segments[-2]
                     destdir = os.path.join('repo', packageName, locale)
                 if base in GRAPHIC_NAMES and extension in ALLOWED_EXTENSIONS:
                     os.makedirs(destdir, mode=0o755, exist_ok=True)
                     _strip_and_copy_image(os.path.join(root, f), destdir)
-                    dst = os.path.join(destdir, f)
-                    if os.path.isfile(dst):
-                        if base == "icon":
-                            base = "iconv2"
-                        if base not in apps[packageName] or not isinstance(apps[packageName][base], collections.OrderedDict):
-                            apps[packageName][base] = collections.OrderedDict()
-                        apps[packageName][base][locale] = common.file_entry(dst)
-
-            # copy screenshots from local source code checkout into wellknown
-            # location in repo directory
             for d in dirs:
                 if d in SCREENSHOT_DIRS:
                     if locale == 'images':
@@ -1301,8 +1198,6 @@ def insert_localized_app_metadata(apps):
                             os.makedirs(screenshotdestdir, mode=0o755, exist_ok=True)
                             _strip_and_copy_image(f, screenshotdestdir)
 
-
-def ingest_screenshots_from_repo_dir(apps):
     repodirs = sorted(glob.glob(os.path.join('repo', '[A-Za-z]*', '[a-z][a-z]*')))
     for d in repodirs:
         if not os.path.isdir(d):
@@ -1333,218 +1228,53 @@ def ingest_screenshots_from_repo_dir(apps):
                     if not os.path.samefile(f, basepath):
                         os.unlink(f)
                 else:
-                    sha256 = common.sha256base64(f)
+                    sha256 = sha256base64(f)
                     filename = base + '_' + sha256 + '.' + extension
                     index_file = os.path.join(os.path.dirname(f), filename)
                     if not os.path.exists(index_file):
                         os.link(f, index_file, follow_symlinks=False)
                     graphics[base] = filename
-                    if base == "icon":
-                        base = "iconv2"
-                    if base not in apps[packageName] or not isinstance(apps[packageName][base], collections.OrderedDict):
-                        apps[packageName][base] = collections.OrderedDict()
-                    apps[packageName][base][locale] = common.file_entry(index_file)
             elif screenshotdir in SCREENSHOT_DIRS:
                 # there can any number of these per locale
                 logging.debug(_('adding to {name}: {path}').format(name=screenshotdir, path=f))
                 if screenshotdir not in graphics:
                     graphics[screenshotdir] = []
                 graphics[screenshotdir].append(filename)
-
-                newKey = screenshotdir.replace("Screenshots", "")
-                if "screenshots" not in apps[packageName]:
-                    apps[packageName]["screenshots"] = collections.OrderedDict()
-                if newKey not in apps[packageName]["screenshots"]:
-                    apps[packageName]["screenshots"][newKey] = collections.OrderedDict()
-                if locale not in apps[packageName]["screenshots"][newKey]:
-                    apps[packageName]["screenshots"][newKey][locale] = []
-                apps[packageName]["screenshots"][newKey][locale].append(common.file_entry(f))
             else:
                 logging.warning(_('Unsupported graphics file found: {path}').format(path=f))
 
 
-LANG_CODE = re.compile(r'^[a-z]{2}([-_][A-Z][a-zA-Z]{1,3})?$')
-
-
-FASTLANE_IOS_MAP = {
-    "name.txt": 'name',
-    "subtitle.txt": 'summary',
-    "description.txt": 'description',
-}
-
-
-def parse_ios_screenshot_name(path):
-    """
-    Infer type and categorization info from screenshot file name.
-
-    This is not really an exact algorithm, it's based on filenames observed in
-    the wild.
-    """
-    s = path.stem.split('@')
-    if len(s) >= 2:
-        if "iphone" in s[0].lower():
-            return ("phoneScreenshots", s[0].strip(), ('@'.join(s[1:])).split('-')[0].strip())
-        elif "ipad" in s[0].lower():
-            return ("tenInchScreenshots", s[0].strip(), ('@'.join(s[1:])).split('-')[0].strip())
-    else:
-        fragments = path.stem.lower().split("_")
-        device = "unknown"
-        os = "unknown"
-        screenshot_type = "phoneScreenshots"
-        for f in fragments:
-            if "iphone" in f:
-                device = f
-                continue
-            if "ipad" in f:
-                screenshot_type = "tenInchScreenshots"
-                device = f
-            if "ios" in f:
-                os = f
-        return (screenshot_type, device, os)
-
-    return ("phoneScreenshots", 'unknown', 'unknown')
-
-
-def discover_ios_screenshots(fastlane_dir):
-    """Traverse git checkouts in build dir, search for fastlane-screenshots and put findings into a dict."""
-    fastlane_screenshot_dir = fastlane_dir / 'screenshots'
-    screenshots = {}
-    if fastlane_screenshot_dir.is_dir():
-        for lang_sdir in fastlane_screenshot_dir.iterdir():
-            locale = lang_sdir.name
-            m = LANG_CODE.match(locale)
-            if m:
-                screenshots[locale] = {}
-                fifo_idevice = {}
-                fifo_ios = {}
-                for screenshot in lang_sdir.iterdir():
-                    if screenshot.suffix[1:] in ALLOWED_EXTENSIONS:
-                        screenshot_type, idevice_name, ios_name = parse_ios_screenshot_name(screenshot)
-
-                        # since there is no easy mapping here, we're just
-                        # resorting to fifo here, so ieg. if there's 2
-                        # screenshots categorized for more than one
-                        # iPhone/iOS combinations we just remember the
-                        # first combination, use them as screenshots in
-                        # F-Droid and ignore all other screenshots, for
-                        # this screenshot type
-                        if not fifo_idevice.get(screenshot_type):
-                            fifo_idevice[screenshot_type] = idevice_name
-                            fifo_ios[screenshot_type] = ios_name
-
-                        if fifo_idevice[screenshot_type] == idevice_name and fifo_ios[screenshot_type] == ios_name:
-                            if screenshot_type not in screenshots[locale]:
-                                screenshots[locale][screenshot_type] = []
-                            screenshots[locale][screenshot_type].append(screenshot)
-
-    # sort all found screenshots alphanumerically
-    for locale, translated_screenshots in screenshots.items():
-        for device in translated_screenshots.keys():
-            translated_screenshots[device].sort()
-
-    return screenshots
-
-
-def copy_ios_screenshots_to_repo(screenshots, package_name):
-    for locale, translated_screenshots in screenshots.items():
-        for device, translated_device_screenshots in translated_screenshots.items():
-            dest_dir = Path('repo') / package_name / locale / device
-            dest_dir.mkdir(mode=0o755, parents=True, exist_ok=True)
-            for path in translated_device_screenshots:
-                dest = dest_dir / (path.name.replace(" ", "_").replace("\t", "_"))
-                fdroidserver.update._strip_and_copy_image(str(path), str(dest))
-
-
-def insert_localized_ios_app_metadata(apps_with_packages):
-
-    if not any(Path('repo').glob('*.ipa')):
-        # no IPA files present in repo, nothing to do here, exiting early
-        return
-
-    for package_name, app in apps_with_packages.items():
-        if not any(Path('repo').glob(f'{package_name}*.ipa')):
-            # couldn't find any IPA files for this package_name
-            # so we don't have to look for fastlane data
-            continue
-
-        fastlane_dir = Path('build', package_name, 'fastlane')
-        fastlane_meta_dir = (fastlane_dir / "metadata")
-
-        if fastlane_meta_dir.is_dir():
-            for lang_dir in fastlane_meta_dir.iterdir():
-                locale = lang_dir.name
-                m = LANG_CODE.match(locale)
-                if m:
-                    for metadata_file in (lang_dir).iterdir():
-                        key = FASTLANE_IOS_MAP.get(metadata_file.name)
-                        if key:
-                            fdroidserver.update._set_localized_text_entry(
-                                app, locale, key, metadata_file
-                            )
-
-        screenshots = fdroidserver.update.discover_ios_screenshots(fastlane_dir)
-        fdroidserver.update.copy_ios_screenshots_to_repo(screenshots, package_name)
-
-        # lookup icons, copy them and put them into app
-        icon_src = _get_ipa_icon(Path('build') / package_name)
-        icon_dest = Path('repo') / package_name / 'icon.png'  # for now just assume png
-        app['iconv2'] = {
-            DEFAULT_LOCALE: {
-                'name': str(icon_dest).lstrip('repo'),
-                'sha256': common.sha256sum(icon_dest),
-                'size': os.path.getsize(icon_src),
-            }
-        }
-        if not icon_dest.exists() or not filecmp.cmp(icon_src, icon_dest):
-            icon_dest.parent.mkdir(parents=True, exist_ok=True)
-            shutil.copy2(icon_src, icon_dest)
-
-
 def scan_repo_files(apkcache, repodir, knownapks, use_date_from_file=False):
-    """Scan a repo for all files with an extension except APK/OBB/IPA.
+    """Scan a repo for all files with an extension except APK/OBB
 
-    This allows putting all kinds of files into repostories. E.g. Media Files,
-    Zip archives, ...
-
-    Parameters
-    ----------
-    apkcache
-      current cached info about all repo files
-    repodir
-      repo directory to scan
-    knownapks
-      list of all known files, as per metadata.read_metadata
-    use_date_from_file
-      use date from file (instead of current date) for newly added files
+    :param apkcache: current cached info about all repo files
+    :param repodir: repo directory to scan
+    :param knownapks: list of all known files, as per metadata.read_metadata
+    :param use_date_from_file: use date from file (instead of current date)
+                               for newly added files
     """
+
     cachechanged = False
     repo_files = []
     repodir = repodir.encode()
     for name in os.listdir(repodir):
-        # skip files based on file extensions, that are handled elsewhere
         file_extension = common.get_file_extension(name)
-        if file_extension in ('apk', 'obb', 'ipa'):
+        if file_extension == 'apk' or file_extension == 'obb':
             continue
-
-        # skip source tarballs generated by fdroidserver
         filename = os.path.join(repodir, name)
         name_utf8 = name.decode()
         if filename.endswith(b'_src.tar.gz'):
             logging.debug(_('skipping source tarball: {path}')
                           .format(path=filename.decode()))
             continue
-
-        # skip all other files generated by fdroidserver
         if not common.is_repo_file(filename):
             continue
-
         stat = os.stat(filename)
         if stat.st_size == 0:
             raise FDroidException(_('{path} is zero size!')
                                   .format(path=filename))
 
-        # load file infos from cache if not stale
-        shasum = common.sha256sum(filename)
+        shasum = sha256sum(filename)
         usecache = False
         if name_utf8 in apkcache:
             repo_file = apkcache[name_utf8]
@@ -1556,7 +1286,6 @@ def scan_repo_files(apkcache, repodir, knownapks, use_date_from_file=False):
                 logging.debug(_("Ignoring stale cache data for {apkfilename}")
                               .format(apkfilename=name_utf8))
 
-        # scan file if info wasn't in cache
         if not usecache:
             logging.debug(_("Processing {apkfilename}").format(apkfilename=name_utf8))
             repo_file = collections.OrderedDict()
@@ -1565,7 +1294,6 @@ def scan_repo_files(apkcache, repodir, knownapks, use_date_from_file=False):
             repo_file['apkName'] = name_utf8
             repo_file['hash'] = shasum
             repo_file['hashType'] = 'sha256'
-            repo_file['ipfsCIDv1'] = common.calculate_IPFS_cid(name_utf8)
             repo_file['versionCode'] = 0
             repo_file['versionName'] = shasum[0:7]
             # the static ID is the SHA256 unless it is set in the metadata
@@ -1576,10 +1304,8 @@ def scan_repo_files(apkcache, repodir, knownapks, use_date_from_file=False):
                 repo_file['packageName'] = m.group(1)
                 repo_file['versionCode'] = int(m.group(2))
             srcfilename = name + b'_src.tar.gz'
-            srcpath = os.path.join(repodir, srcfilename)
-            if os.path.exists(srcpath):
+            if os.path.exists(os.path.join(repodir, srcfilename)):
                 repo_file['srcname'] = srcfilename.decode()
-                repo_file['srcnameSha256'] = common.sha256sum(srcpath.decode())
             repo_file['size'] = stat.st_size
 
             apkcache[name_utf8] = repo_file
@@ -1587,14 +1313,13 @@ def scan_repo_files(apkcache, repodir, knownapks, use_date_from_file=False):
 
         if use_date_from_file:
             timestamp = stat.st_ctime
-            default_date_param = datetime.fromtimestamp(timestamp, tz=timezone.utc)
+            default_date_param = time.gmtime(time.mktime(datetime.fromtimestamp(timestamp).timetuple()))
         else:
             default_date_param = None
 
         # Record in knownapks, getting the added date at the same time..
-        added = knownapks.recordapk(
-            repo_file['apkName'], default_date=default_date_param
-        )
+        added = knownapks.recordapk(repo_file['apkName'], repo_file['packageName'],
+                                    default_date=default_date_param)
         if added:
             repo_file['added'] = added
 
@@ -1603,39 +1328,26 @@ def scan_repo_files(apkcache, repodir, knownapks, use_date_from_file=False):
     return repo_files, cachechanged
 
 
-def scan_apk(apk_file, require_signature=True):
-    """Scan an APK file and returns dictionary with metadata of the APK.
+def scan_apk(apk_file):
+    """
+    Scans an APK file and returns dictionary with metadata of the APK.
 
     Attention: This does *not* verify that the APK signature is correct.
 
-    Parameters
-    ----------
-    apk_file
-      The (ideally absolute) path to the APK file
-    require_signature
-      Raise an exception is there is no valid signature. Default to True.
-
-    Raises
-    ------
-    BuildException
-
-    Returns
-    -------
-    A dict containing APK metadata
+    :param apk_file: The (ideally absolute) path to the APK file
+    :raises BuildException
+    :return A dict containing APK metadata
     """
     apk = {
-        'hash': common.sha256sum(apk_file),
+        'hash': sha256sum(apk_file),
         'hashType': 'sha256',
         'uses-permission': [],
         'uses-permission-sdk-23': [],
         'features': [],
         'icons_src': {},
         'icons': {},
-        'antiFeatures': {},
+        'antiFeatures': set(),
     }
-    ipfsCIDv1 = common.calculate_IPFS_cid(apk_file)
-    if ipfsCIDv1:
-        apk['ipfsCIDv1'] = ipfsCIDv1
 
     scan_apk_androguard(apk, apk_file)
 
@@ -1649,32 +1361,29 @@ def scan_apk(apk_file, require_signature=True):
     # Get the signature, or rather the signing key fingerprints
     logging.debug('Getting signature of {0}'.format(os.path.basename(apk_file)))
     apk['sig'] = getsig(apk_file)
-    if require_signature:
-        if not apk['sig']:
-            raise BuildException(_("Failed to get APK signing key fingerprint"))
-        apk['signer'] = common.apk_signer_fingerprint(
-            os.path.join(os.getcwd(), apk_file)
-        )
-        if not apk.get('signer'):
-            raise BuildException(_("Failed to get APK signing key fingerprint"))
+    if not apk['sig']:
+        raise BuildException("Failed to get apk signature")
+    apk['signer'] = common.apk_signer_fingerprint(os.path.join(os.getcwd(),
+                                                               apk_file))
+    if not apk.get('signer'):
+        raise BuildException("Failed to get apk signing key fingerprint")
 
     # Get size of the APK
     apk['size'] = os.path.getsize(apk_file)
 
     if 'minSdkVersion' not in apk:
-        logging.warning(_("No minimum SDK version found in {0}, using default (3).").format(apk_file))
+        logging.warning("No SDK version information found in {0}".format(apk_file))
         apk['minSdkVersion'] = 3  # aapt defaults to 3 as the min
 
     # Check for known vulnerabilities
-    hkv = has_known_vulnerability(apk_file)
-    if hkv:
-        apk['antiFeatures']['KnownVuln'] = {DEFAULT_LOCALE: hkv}
+    if has_known_vulnerability(apk_file):
+        apk['antiFeatures'].add('KnownVuln')
 
     return apk
 
 
 def _get_apk_icons_src(apkfile, icon_name):
-    """Extract the paths to the app icon in all available densities.
+    """Extract the paths to the app icon in all available densities
 
     The folder name is normally generated by the Android Tools, but
     there is nothing that prevents people from using whatever DPI
@@ -1683,7 +1392,7 @@ def _get_apk_icons_src(apkfile, icon_name):
 
     """
     icons_src = dict()
-    density_re = re.compile(r'^res/(.*)/{}\.png$'.format(icon_name))
+    density_re = re.compile(r'^res/(.*)/{}\.(png|xml)$'.format(icon_name))
     with zipfile.ZipFile(apkfile) as zf:
         for filename in zf.namelist():
             m = density_re.match(filename)
@@ -1699,62 +1408,8 @@ def _get_apk_icons_src(apkfile, icon_name):
     return icons_src
 
 
-def _get_ipa_icon(src_dir):
-    """Search source directory of an IPA project for the app icon."""
-    # parse app icon name from project config file
-    src_dir = Path(src_dir)
-    prj = next(src_dir.glob("**/project.pbxproj"), None)
-    if not prj or not prj.exists():
-        return
-
-    icon_name = _parse_from_pbxproj(prj, 'ASSETCATALOG_COMPILER_APPICON_NAME')
-    if not icon_name:
-        return
-
-    icon_dir = next(src_dir.glob(f'**/{icon_name}.appiconset'), None)
-    if not icon_dir:
-        return
-
-    with open(icon_dir / "Contents.json") as f:
-        cntnt = json.load(f)
-
-    fname = None
-    fsize = 0
-    for image in cntnt['images']:
-        s = float(image.get("size", "0x0").split("x")[0])
-        if image.get('scale') == "1x" and s > fsize and s <= 128:
-            fname = image['filename']
-            fsize = s
-
-    return str(icon_dir / fname)
-
-
-def _parse_from_pbxproj(pbxproj_path, key):
-    """Parse values from apple project files.
-
-    This is a naive regex based parser. Should this proofe to unreliable we
-    might want to consider using a dedicated pbxproj parser:
-    https://pypi.org/project/pbxproj/
-
-    e.g. when looking for key 'ASSETCATALOG_COMPILER_APPICON_NAME'
-    This function will extract 'MyIcon' from if the provided file
-    contains this line:
-
-        ASSETCATALOG_COMPILER_APPICON_NAME = MyIcon;
-
-    returns None if parsing for that value didn't yield anything
-    """
-    r = re.compile(f"\\s*{key}\\s*=\\s*(?P<value>[a-zA-Z0-9-_]+)\\s*;\\s*")
-    with open(pbxproj_path, 'r', encoding='utf-8') as f:
-        for line in f.readlines():
-            m = r.match(line)
-            if m:
-                return m.group("value")
-    return None
-
-
 def _sanitize_sdk_version(value):
-    """Sanitize the raw values from androguard to handle bad values.
+    """Sanitize the raw values from androguard to handle bad values
 
     minSdkVersion/targetSdkVersion/maxSdkVersion must be integers, but
     that doesn't stop devs from doing strange things like setting them
@@ -1776,32 +1431,31 @@ def _sanitize_sdk_version(value):
 
 def scan_apk_androguard(apk, apkfile):
     try:
-        apkobject = common.get_androguard_APK(apkfile)
+        from androguard.core.bytecodes.apk import APK
+        apkobject = APK(apkfile)
         if apkobject.is_valid_APK():
             arsc = apkobject.get_android_resources()
         else:
             if options.delete_unknown:
                 if os.path.exists(apkfile):
-                    logging.error(_("Failed to get APK information, deleting {path}")
+                    logging.error(_("Failed to get apk information, deleting {path}")
                                   .format(path=apkfile))
                     os.remove(apkfile)
                 else:
                     logging.error(_("Could not find {path} to remove it")
                                   .format(path=apkfile))
             else:
-                logging.error(_("Failed to get APK information, skipping {path}")
+                logging.error(_("Failed to get apk information, skipping {path}")
                               .format(path=apkfile))
             raise BuildException(_("Invalid APK"))
-    except (FileNotFoundError, ValueError, zipfile.BadZipFile) as e:
-        logging.error(_("Could not open APK {path} for analysis: ").format(path=apkfile)
-                      + str(e))
-        raise BuildException(_("Invalid APK")) from e
+    except FileNotFoundError:
+        logging.error(_("Could not open apk file for analysis"))
+        raise BuildException(_("Invalid APK"))
 
     apk['packageName'] = apkobject.get_package()
 
     xml = apkobject.get_android_manifest_xml()
     androidmanifest_xml = apkobject.xml['AndroidManifest.xml']
-
     if len(xml.nsmap) > 0:
         # one of them surely will be the Android one, or its corrupt
         xmlns = common.XMLNS_ANDROID
@@ -1811,12 +1465,8 @@ def scan_apk_androguard(apk, apkfile):
         xmlns = '{}'
 
     vcstr = androidmanifest_xml.get(xmlns + 'versionCode')
-    logging.debug("Version Code: %r (%s)" % (vcstr, apkfile))
 
-    if not vcstr:
-        raise NoVersionCodeException(_("APK file {path} does not have a version code "
-                                       "in its manifest").format(path=apkfile))
-    elif vcstr.startswith('0x'):
+    if vcstr.startswith('0x'):
         apk['versionCode'] = int(vcstr, 16)
     else:
         apk['versionCode'] = int(vcstr)
@@ -1837,19 +1487,16 @@ def scan_apk_androguard(apk, apkfile):
     if maxSdkVersion is not None:
         apk['maxSdkVersion'] = maxSdkVersion
 
-    icon_id_str = apkobject.get_attribute_value("application", "icon")
+    icon_id_str = apkobject.get_element("application", "icon")
     if icon_id_str:
-        try:
-            icon_id = int(icon_id_str.replace("@", "0x"), 16)
-            resource_id = arsc.get_id(apk['packageName'], icon_id)
-            if resource_id:
-                icon_name = arsc.get_id(apk['packageName'], icon_id)[1]
-            else:
-                # don't use 'anydpi' aka 0xFFFE aka 65534 since it is XML
-                icon_name = os.path.splitext(os.path.basename(apkobject.get_app_icon(max_dpi=65534 - 1)))[0]
-            apk['icons_src'] = _get_apk_icons_src(apkfile, icon_name)
-        except Exception as e:
-            logging.error("Cannot fetch icon from %s: %s" % (apkfile, str(e)))
+        icon_id = int(icon_id_str.replace("@", "0x"), 16)
+        resource_id = arsc.get_id(apk['packageName'], icon_id)
+        if resource_id:
+            icon_name = arsc.get_id(apk['packageName'], icon_id)[1]
+        else:
+            # don't use 'anydpi' aka 0xFFFE aka 65534 since it is XML
+            icon_name = os.path.splitext(os.path.basename(apkobject.get_app_icon(max_dpi=65534 - 1)))[0]
+        apk['icons_src'] = _get_apk_icons_src(apkfile, icon_name)
 
     arch_re = re.compile("^lib/(.*)/.*$")
     arch = set([arch_re.match(file).group(1) for file in apkobject.get_files() if arch_re.match(file)])
@@ -1858,16 +1505,13 @@ def scan_apk_androguard(apk, apkfile):
         apk['nativecode'].extend(sorted(list(arch)))
 
     for item in xml.findall('uses-permission'):
-        name = item.attrib.get(xmlns + 'name')
-        if not name:
-            logging.debug(
-                _('Ignoring bad element in manifest: %s')
-                % ElementTree.tostring(item).decode()
-            )
-            continue
+        name = str(item.attrib[xmlns + 'name'])
         maxSdkVersion = item.attrib.get(xmlns + 'maxSdkVersion')
         maxSdkVersion = int(maxSdkVersion) if maxSdkVersion else None
-        permission = UsesPermission(str(name), maxSdkVersion)
+        permission = UsesPermission(
+            name,
+            maxSdkVersion
+        )
         apk['uses-permission'].append(permission)
     for name, maxSdkVersion in apkobject.get_uses_implied_permission_list():
         permission = UsesPermission(
@@ -1877,30 +1521,22 @@ def scan_apk_androguard(apk, apkfile):
         apk['uses-permission'].append(permission)
 
     for item in xml.findall('uses-permission-sdk-23'):
-        name = item.attrib.get(xmlns + 'name')
-        if not name:
-            logging.debug(
-                _('Ignoring bad element in manifest: %s')
-                % ElementTree.tostring(item).decode()
-            )
-            continue
+        name = str(item.attrib[xmlns + 'name'])
         maxSdkVersion = item.attrib.get(xmlns + 'maxSdkVersion')
         maxSdkVersion = int(maxSdkVersion) if maxSdkVersion else None
-        permission_sdk_23 = UsesPermissionSdk23(str(name), maxSdkVersion)
+        permission_sdk_23 = UsesPermissionSdk23(
+            name,
+            maxSdkVersion
+        )
         apk['uses-permission-sdk-23'].append(permission_sdk_23)
 
     for item in xml.findall('uses-feature'):
-        feature = str(item.attrib.get(xmlns + 'name', ''))
-        if not feature:
-            logging.debug(
-                _('Ignoring bad element in manifest: %s')
-                % ElementTree.tostring(item).decode()
-            )
+        key = xmlns + 'name'
+        if key not in item.attrib:
             continue
-        if feature not in (
-            'android.hardware.screen.portrait',
-            'android.hardware.screen.landscape',
-        ):
+        feature = str(item.attrib[key])
+        if feature != "android.hardware.screen.portrait" \
+                and feature != "android.hardware.screen.landscape":
             if feature.startswith("android.feature."):
                 feature = feature[16:]
         required = item.attrib.get(xmlns + 'required')
@@ -1909,36 +1545,24 @@ def scan_apk_androguard(apk, apkfile):
 
 
 def process_apk(apkcache, apkfilename, repodir, knownapks, use_date_from_apk=False,
-                allow_disabled_algorithms=False, archive_bad_sig=False, apps=None, cache_timestamp=0):
-    """Process the apk with the given filename in the given repo directory.
+                allow_disabled_algorithms=False, archive_bad_sig=False):
+    """Processes the apk with the given filename in the given repo directory.
 
     This also extracts the icons.
 
-    Parameters
-    ----------
-    apkcache
-      current apk cache information
-    apkfilename
-      the filename of the apk to scan
-    repodir
-      repo directory to scan
-    knownapks
-      known apks info
-    use_date_from_apk
-      use date from APK (instead of current date) for newly added APKs
-    allow_disabled_algorithms
-      allow APKs with valid signatures that include
-      disabled algorithms in the signature (e.g. MD5)
-    archive_bad_sig
-      move APKs with a bad signature to the archive
-    cache_timestamp
-      the timestamp of the cache file
-
-    Returns
-    -------
-    (skip, apk, cachechanged) where skip is a boolean indicating whether to skip this apk,
-      apk is the scanned apk information, and cachechanged is True if the apkcache got changed.
+    :param apkcache: current apk cache information
+    :param apkfilename: the filename of the apk to scan
+    :param repodir: repo directory to scan
+    :param knownapks: known apks info
+    :param use_date_from_apk: use date from APK (instead of current date)
+                              for newly added APKs
+    :param allow_disabled_algorithms: allow APKs with valid signatures that include
+                                      disabled algorithms in the signature (e.g. MD5)
+    :param archive_bad_sig: move APKs with a bad signature to the archive
+    :returns: (skip, apk, cachechanged) where skip is a boolean indicating whether to skip this apk,
+     apk is the scanned apk information, and cachechanged is True if the apkcache got changed.
     """
+
     apk = {}
     apkfile = os.path.join(repodir, apkfilename)
 
@@ -1946,8 +1570,7 @@ def process_apk(apkcache, apkfilename, repodir, knownapks, use_date_from_apk=Fal
     usecache = False
     if apkfilename in apkcache:
         apk = apkcache[apkfilename]
-        stat = os.stat(apkfile)
-        if apk.get('size') == stat.st_size and stat.st_mtime < cache_timestamp:
+        if apk.get('hash') == sha256sum(apkfile):
             logging.debug(_("Reading {apkfilename} from cache")
                           .format(apkfilename=apkfilename))
             usecache = True
@@ -1964,22 +1587,10 @@ def process_apk(apkcache, apkfilename, repodir, knownapks, use_date_from_apk=Fal
             logging.warning(_("Skipping '{apkfilename}' with invalid signature!")
                             .format(apkfilename=apkfilename))
             return True, None, False
-        except NoVersionCodeException:
-            logging.warning(_("Skipping '{apkfilename}' without versionCode!")
-                            .format(apkfilename=apkfilename))
-            return True, None, False
-
-        if apps:
-            if apk['packageName'] in apps:
-                for build in apps[apk['packageName']].get('Builds', []):
-                    if build['versionCode'] == apk['versionCode'] and build['disable']:
-                        return True, None, False
 
         # Check for debuggable apks...
-        if common.is_debuggable_or_testOnly(apkfile):
-            logging.warning(
-                "%s: debuggable or testOnly set in AndroidManifest.xml" % apkfile
-            )
+        if common.is_apk_and_debuggable(apkfile):
+            logging.warning('{0} is set to android:debuggable="true"'.format(apkfile))
 
         if options.rename_apks:
             n = apk['packageName'] + '_' + str(apk['versionCode']) + '.apk'
@@ -2006,20 +1617,17 @@ def process_apk(apkcache, apkfilename, repodir, knownapks, use_date_from_apk=Fal
 
         apk['apkName'] = apkfilename
         srcfilename = apkfilename[:-4] + "_src.tar.gz"
-        srcpath = os.path.join(repodir, srcfilename)
-        if os.path.exists(srcpath):
+        if os.path.exists(os.path.join(repodir, srcfilename)):
             apk['srcname'] = srcfilename
-            apk['srcnameSha256'] = common.sha256sum(srcpath)
 
         # verify the jar signature is correct, allow deprecated
         # algorithms only if the APK is in the archive.
         skipapk = False
         if not common.verify_apk_signature(apkfile):
             if repodir == 'archive' or allow_disabled_algorithms:
-                try:
-                    common.verify_deprecated_jar_signature(apkfile)
-                    apk['antiFeatures'].update(['KnownVuln', 'DisabledAlgorithm'])  # TODO
-                except VerificationException:
+                if common.verify_old_apk_signature(apkfile):
+                    apk['antiFeatures'].update(['KnownVuln', 'DisabledAlgorithm'])
+                else:
                     skipapk = True
             else:
                 skipapk = True
@@ -2046,7 +1654,7 @@ def process_apk(apkcache, apkfilename, repodir, knownapks, use_date_from_apk=Fal
                                 .format(apkfilename=apkfile) + str(e))
 
         # extract icons from APK zip file
-        iconfilename = "%s.%s.png" % (apk['packageName'], apk['versionCode'])
+        iconfilename = "%s.%s" % (apk['packageName'], apk['versionCode'])
         try:
             empty_densities = extract_apk_icons(iconfilename, apk, apkzip, repodir)
         finally:
@@ -2055,13 +1663,14 @@ def process_apk(apkcache, apkfilename, repodir, knownapks, use_date_from_apk=Fal
         # resize existing icons for densities missing in the APK
         fill_missing_icon_densities(empty_densities, iconfilename, apk, repodir)
 
-        if use_date_from_apk:
-            default_date_param = datetime.fromtimestamp(os.stat(apkfile).st_mtime, tz=timezone.utc)
+        if use_date_from_apk and manifest.date_time[1] != 0:
+            default_date_param = datetime(*manifest.date_time)
         else:
             default_date_param = None
 
         # Record in known apks, getting the added date at the same time..
-        added = knownapks.recordapk(apk['apkName'], default_date=default_date_param)
+        added = knownapks.recordapk(apk['apkName'], apk['packageName'],
+                                    default_date=default_date_param)
         if added:
             apk['added'] = added
 
@@ -2071,29 +1680,20 @@ def process_apk(apkcache, apkfilename, repodir, knownapks, use_date_from_apk=Fal
     return False, apk, cachechanged
 
 
-def process_apks(apkcache, repodir, knownapks, use_date_from_apk=False, apps=None, cache_timestamp=0):
-    """Process the apks in the given repo directory.
+def process_apks(apkcache, repodir, knownapks, use_date_from_apk=False):
+    """Processes the apks in the given repo directory.
 
     This also extracts the icons.
 
-    Parameters
-    ----------
-    apkcache
-      current apk cache information
-    repodir
-      repo directory to scan
-    knownapks
-     b known apks info
-    use_date_from_apk
-      use date from APK (instead of current date) for newly added APKs
-    cache_timestamp
-      the timestamp of the cache file
-
-    Returns
-    -------
-    (apks, cachechanged) where apks is a list of apk information,
-      and cachechanged is True if the apkcache got changed.
+    :param apkcache: current apk cache information
+    :param repodir: repo directory to scan
+    :param knownapks: known apks info
+    :param use_date_from_apk: use date from APK (instead of current date)
+                              for newly added APKs
+    :returns: (apks, cachechanged) where apks is a list of apk information,
+              and cachechanged is True if the apkcache got changed.
     """
+
     cachechanged = False
 
     for icon_dir in get_all_icon_dirs(repodir):
@@ -2109,7 +1709,7 @@ def process_apks(apkcache, repodir, knownapks, use_date_from_apk=False, apps=Non
         apkfilename = apkfile[len(repodir) + 1:]
         ada = disabled_algorithms_allowed()
         (skip, apk, cachethis) = process_apk(apkcache, apkfilename, repodir, knownapks,
-                                             use_date_from_apk, ada, True, apps, cache_timestamp)
+                                             use_date_from_apk, ada, True)
         if skip:
             continue
         apks.append(apk)
@@ -2119,28 +1719,19 @@ def process_apks(apkcache, repodir, knownapks, use_date_from_apk=False, apps=Non
 
 
 def extract_apk_icons(icon_filename, apk, apkzip, repo_dir):
-    """Extract PNG icons from an APK with the supported pixel densities.
+    """Extracts PNG icons from an APK with the supported pixel densities
 
     Extracts icons from the given APK zip in various densities, saves
     them into given repo directory and stores their names in the APK
     metadata dictionary.  If the icon is an XML icon, then this tries
     to find PNG icon that can replace it.
 
-    Parameters
-    ----------
-    icon_filename
-      A string representing the icon's file name
-    apk
-      A populated dictionary containing APK metadata.
-      Needs to have 'icons_src' key
-    apkzip
-      An opened zipfile.ZipFile of the APK file
-    repo_dir
-      The directory of the APK's repository
-
-    Returns
-    -------
-    A list of icon densities that are missing
+    :param icon_filename: A string representing the icon's file name
+    :param apk: A populated dictionary containing APK metadata.
+                Needs to have 'icons_src' key
+    :param apkzip: An opened zipfile.ZipFile of the APK file
+    :param repo_dir: The directory of the APK's repository
+    :return: A list of icon densities that are missing
 
     """
     res_name_re = re.compile(r'res/(drawable|mipmap)-(x*[hlm]dpi|anydpi).*/(.*)_[0-9]+dp.(png|xml)')
@@ -2150,6 +1741,8 @@ def extract_apk_icons(icon_filename, apk, apkzip, repo_dir):
         if m and m.group(4) == 'png':
             density = screen_resolutions[m.group(2)]
             pngs[m.group(3) + '/' + density] = m.group(0)
+
+    icon_type = None
     empty_densities = []
     for density in screen_densities:
         if density not in apk['icons_src']:
@@ -2157,7 +1750,7 @@ def extract_apk_icons(icon_filename, apk, apkzip, repo_dir):
             continue
         icon_src = apk['icons_src'][density]
         icon_dir = get_icon_dir(repo_dir, density)
-        icon_dest = os.path.join(icon_dir, icon_filename)
+        icon_type = '.png'
 
         # Extract the icon files per density
         if icon_src.endswith('.xml'):
@@ -2168,59 +1761,63 @@ def extract_apk_icons(icon_filename, apk, apkzip, repo_dir):
                     icon_src = name
             if icon_src.endswith('.xml'):
                 empty_densities.append(density)
-                continue
+                icon_type = '.xml'
+        icon_dest = os.path.join(icon_dir, icon_filename + icon_type)
+
         try:
             with open(icon_dest, 'wb') as f:
                 f.write(get_icon_bytes(apkzip, icon_src))
-            apk['icons'][density] = icon_filename
+            apk['icons'][density] = icon_filename + icon_type
         except (zipfile.BadZipFile, ValueError, KeyError) as e:
             logging.warning("Error retrieving icon file: %s %s", icon_dest, e)
             del apk['icons_src'][density]
             empty_densities.append(density)
 
     # '-1' here is a remnant of the parsing of aapt output, meaning "no DPI specified"
-    if '-1' in apk['icons_src'] and not apk['icons_src']['-1'].endswith('.xml'):
+    if '-1' in apk['icons_src']:
         icon_src = apk['icons_src']['-1']
-        icon_path = os.path.join(get_icon_dir(repo_dir, '0'), icon_filename)
+        icon_type = icon_src[-4:]
+        icon_path = os.path.join(get_icon_dir(repo_dir, '0'), icon_filename + icon_type)
         with open(icon_path, 'wb') as f:
             f.write(get_icon_bytes(apkzip, icon_src))
-        im = None
-        try:
-            im = Image.open(icon_path)
-            dpi = px_to_dpi(im.size[0])
-            for density in screen_densities:
-                if density in apk['icons']:
-                    break
-                if density == screen_densities[-1] or dpi >= int(density):
-                    apk['icons'][density] = icon_filename
-                    shutil.move(icon_path,
-                                os.path.join(get_icon_dir(repo_dir, density), icon_filename))
-                    empty_densities.remove(density)
-                    break
-        except Exception as e:
-            logging.warning(_("Failed reading {path}: {error}")
-                            .format(path=icon_path, error=e))
-        finally:
-            if im and hasattr(im, 'close'):
-                im.close()
+        if icon_type == '.png':
+            im = None
+            try:
+                im = Image.open(icon_path)
+                dpi = px_to_dpi(im.size[0])
+                for density in screen_densities:
+                    if density in apk['icons']:
+                        break
+                    if density == screen_densities[-1] or dpi >= int(density):
+                        apk['icons'][density] = icon_filename + icon_type
+                        shutil.move(icon_path,
+                                    os.path.join(get_icon_dir(repo_dir, density), icon_filename + icon_type))
+                        empty_densities.remove(density)
+                        break
+            except Exception as e:
+                logging.warning(_("Failed reading {path}: {error}")
+                                .format(path=icon_path, error=e))
+            finally:
+                if im and hasattr(im, 'close'):
+                    im.close()
 
     if apk['icons']:
-        apk['icon'] = icon_filename
+        apk['icon'] = icon_filename + icon_type
 
     return empty_densities
 
 
 def fill_missing_icon_densities(empty_densities, icon_filename, apk, repo_dir):
-    """Resize existing PNG icons for densities missing in the APK to ensure all densities are available.
+    """
+    Resize existing PNG icons for densities missing in the APK to ensure all densities are available
 
-    Parameters
-    ----------
-    empty_densities: A list of icon densities that are missing
-    icon_filename: A string representing the icon's file name
-    apk: A populated dictionary containing APK metadata. Needs to have 'icons' key
-    repo_dir: The directory of the APK's repository
+    :param empty_densities: A list of icon densities that are missing
+    :param icon_filename: A string representing the icon's file name
+    :param apk: A populated dictionary containing APK metadata. Needs to have 'icons' key
+    :param repo_dir: The directory of the APK's repository
 
     """
+    icon_filename += '.png'
     # First try resizing down to not lose quality
     last_density = None
     for density in screen_densities:
@@ -2242,7 +1839,7 @@ def fill_missing_icon_densities(empty_densities, icon_filename, apk, repo_dir):
 
             size = dpi_to_px(density)
 
-            im.thumbnail((size, size), Image.LANCZOS)
+            im.thumbnail((size, size), Image.ANTIALIAS)
             im.save(icon_path, "PNG", optimize=True,
                     pnginfo=BLANK_PNG_INFO, icc_profile=None)
             empty_densities.remove(density)
@@ -2281,10 +1878,8 @@ def fill_missing_icon_densities(empty_densities, icon_filename, apk, repo_dir):
 
 
 def apply_info_from_latest_apk(apps, apks):
-    """No summary.
-
+    """
     Some information from the apks needs to be applied up to the application level.
-
     When doing this, we use the info from the most recent version's apk.
     We deal with figuring out when the app was added and last updated at the same time.
     """
@@ -2296,18 +1891,35 @@ def apply_info_from_latest_apk(apps, apks):
                     bestver = apk['versionCode']
                     bestapk = apk
 
+                if app.get('NoSourceSince'):
+                    apk['antiFeatures'].add('NoSourceSince')
+
         if not app['added']:
             logging.debug("Don't know when " + appid + " was added")
         if not app['lastUpdated']:
             logging.debug("Don't know when " + appid + " was last updated")
 
         if bestver == UNSET_VERSION_CODE:
+
+            if app.get('Name') is None:
+                app['Name'] = app['AutoName'] or appid
             app['icon'] = None
             logging.debug("Application " + appid + " has no packages")
         else:
-            app.icon = bestapk['icon'] if 'icon' in bestapk else None
-            if app.get('CurrentVersionCode') is None:
-                app['CurrentVersionCode'] = bestver
+            if app.get('Name') is None:
+                app['Name'] = bestapk['name']
+            app['icon'] = bestapk['icon'] if 'icon' in bestapk else None
+            if app['CurrentVersionCode'] is None:
+                app['CurrentVersionCode'] = str(bestver)
+
+
+def make_categories_txt(repodir, categories):
+    '''Write a category list in the repo to allow quick access'''
+    catdata = ''
+    for cat in sorted(categories):
+        catdata += cat + '\n'
+    with open(os.path.join(repodir, 'categories.txt'), 'w') as f:
+        f.write(catdata)
 
 
 def archive_old_apks(apps, apks, archapks, repodir, archivedir, defaultkeepversions):
@@ -2316,13 +1928,13 @@ def archive_old_apks(apps, apks, archapks, repodir, archivedir, defaultkeepversi
         currentVersionApk = None
         for apk in apk_list:
             if apk['packageName'] == appid:
-                if app.get('CurrentVersionCode') is not None:
-                    if apk['versionCode'] == app['CurrentVersionCode']:
+                if app.CurrentVersionCode is not None:
+                    if apk['versionCode'] == common.version_code_string_to_int(app.CurrentVersionCode):
                         currentVersionApk = apk
                         continue
                 apkList.append(apk)
 
-        # Sort the apk list by versionCode. First is highest/newest.
+        # Sort the apk list by version code. First is highest/newest.
         sorted_list = sorted(apkList, key=lambda apk: apk['versionCode'], reverse=True)
         if currentVersionApk:
             # Insert apk which corresponds to currentVersion at the front
@@ -2330,9 +1942,11 @@ def archive_old_apks(apps, apks, archapks, repodir, archivedir, defaultkeepversi
         return sorted_list
 
     for appid, app in apps.items():
-        keepversions = common.calculate_archive_policy(app, defaultkeepversions)
-        if common.metadata_find_developer_signing_files(appid, app['CurrentVersionCode']):
-            keepversions *= 2
+
+        if app.ArchivePolicy:
+            keepversions = int(app.ArchivePolicy[:-9])
+        else:
+            keepversions = defaultkeepversions
 
         logging.debug(_("Checking archiving for {appid} - apks:{integer}, keepversions:{keep}, archapks:{arch}")
                       .format(appid=appid, integer=len(apks), keep=keepversions, arch=len(archapks)))
@@ -2344,7 +1958,7 @@ def archive_old_apks(apps, apks, archapks, repodir, archivedir, defaultkeepversi
         for apk in all_app_apks:
             if len(keep) == keepversions:
                 break
-            if 'antiFeatures' not in apk:  # TODO
+            if 'antiFeatures' not in apk:
                 keep.append(apk)
             elif 'DisabledAlgorithm' not in apk['antiFeatures'] or disabled_algorithms_allowed():
                 keep.append(apk)
@@ -2362,7 +1976,8 @@ def archive_old_apks(apps, apks, archapks, repodir, archivedir, defaultkeepversi
 
 
 def move_apk_between_sections(from_dir, to_dir, apk):
-    """Move an APK from repo to archive or vice versa."""
+    """move an APK from repo to archive or vice versa"""
+
     def _move_file(from_dir, to_dir, filename, ignore_missing):
         from_path = os.path.join(from_dir, filename)
         if ignore_missing and not os.path.exists(from_path):
@@ -2378,7 +1993,6 @@ def move_apk_between_sections(from_dir, to_dir, apk):
     logging.info("Moving %s from %s to %s" % (apk['apkName'], from_dir, to_dir))
     _move_file(from_dir, to_dir, apk['apkName'], False)
     _move_file(from_dir, to_dir, apk['apkName'] + '.asc', True)
-    _move_file(from_dir, to_dir, apk['apkName'] + '.idsig', True)
     _move_file(from_dir, to_dir, apk['apkName'][:-4] + '.log.gz', True)
     for density in all_screen_densities:
         from_icon_dir = get_icon_dir(from_dir, density)
@@ -2388,7 +2002,6 @@ def move_apk_between_sections(from_dir, to_dir, apk):
         _move_file(from_icon_dir, to_icon_dir, apk['icons'][density], True)
     if 'srcname' in apk:
         _move_file(from_dir, to_dir, apk['srcname'], False)
-        _move_file(from_dir, to_dir, apk['srcname'] + '.asc', True)
 
 
 def add_apks_to_per_app_repos(repodir, apks):
@@ -2414,14 +2027,16 @@ def add_apks_to_per_app_repos(repodir, apks):
 
 
 def create_metadata_from_template(apk):
-    """Create a new metadata file using internal or external template.
+    '''create a new metadata file using internal or external template
 
     Generate warnings for apk's with no metadata (or create skeleton
     metadata files, if requested on the command line).  Though the
     template file is YAML, this uses neither pyyaml nor ruamel.yaml
     since those impose things on the metadata file made from the
     template: field sort order, empty field value, formatting, etc.
-    """
+    '''
+
+    import yaml
     if os.path.exists('template.yml'):
         with open('template.yml') as f:
             metatxt = f.read()
@@ -2466,14 +2081,13 @@ def create_metadata_from_template(apk):
 
 
 def read_added_date_from_all_apks(apps, apks):
-    """No summary.
-
-    Added dates come from the repo/index-v2.json file but are
+    """
+    Added dates come from the stats/known_apks.txt file but are
     read when scanning apks and thus need to be applied form apk
     level to app level for _all_ apps and not only from non-archived
     ones
 
-    TODO: read the added dates directly from index-v2.json instead of
+    TODO: read the added dates directly from known_apks.txt instead of
           going through apks that way it also works for for repos that
           don't keep an archive of apks.
     """
@@ -2487,49 +2101,27 @@ def read_added_date_from_all_apks(apps, apks):
                         app['lastUpdated'] = apk['added']
 
 
-def insert_missing_app_names_from_apks(apps, apks):
-    """Use app name from APK if it is not set in the metadata.
-
-    Name -> localized -> from APK
-
-    The name from the APK is set as the default name for the app if
-    there is no other default set, e.g. app['Name'] or
-    app['localized'][DEFAULT_LOCALE]['name'].  The default is defined in
-    the F-Droid ecosystem as the locale of last resort, as in the one
-    that should always be present.  en-US is used since it is the
-    locale of the source strings.
-
-    This should only be used for index v0 and v1.  Later versions of
-    the index should be sorted by Application ID, since it is
-    guaranteed to always be there.  Before, the index was stored by
-    the app name (aka <application android:label="">) to save the
-    website from having to sort the entries.  That is no longer
-    relevant since the website switched from Wordpress to Jekyll.
-
-    """
+def read_names_from_apks(apps, apks):
+    """This is a stripped down copy of apply_info_from_latest_apk that only parses app names"""
     for appid, app in apps.items():
-        if app.get('Name') is not None:
-            continue
-        if app.get('localized', {}).get(DEFAULT_LOCALE, {}).get('name') is not None:
-            continue
-
         bestver = UNSET_VERSION_CODE
         for apk in apks:
             if apk['packageName'] == appid:
-                if apk.get('name') and apk['versionCode'] > bestver:
+                if apk['versionCode'] > bestver:
                     bestver = apk['versionCode']
                     bestapk = apk
 
-        if bestver != UNSET_VERSION_CODE:
-            if 'localized' not in app:
-                app['localized'] = {}
-            if DEFAULT_LOCALE not in app['localized']:
-                app['localized'][DEFAULT_LOCALE] = {}
-            app['localized'][DEFAULT_LOCALE]['name'] = bestapk.get('name')
+        if bestver == UNSET_VERSION_CODE:
+            if app.Name is None:
+                app.Name = app.AutoName or appid
+            app.icon = None
+        else:
+            if app.Name is None:
+                app.Name = bestapk['name']
 
 
 def get_apps_with_packages(apps, apks):
-    """Return a deepcopy of that subset apps that actually has any associated packages. Skips disabled apps."""
+    """Returns a deepcopy of that subset apps that actually has any associated packages. Skips disabled apps."""
     appsWithPackages = collections.OrderedDict()
     for packageName in apps:
         app = apps[packageName]
@@ -2545,46 +2137,13 @@ def get_apps_with_packages(apps, apks):
     return appsWithPackages
 
 
-def get_apks_without_allowed_signatures(app, apk):
-    """Check the APK or package has been signed by one of the allowed signing certificates.
-
-    The fingerprint of the signing certificate is the standard X.509
-    SHA-256 fingerprint as a hex string.  It can be fetched from an
-    APK using:
-
-    apksigner verify --print-certs my.apk | grep SHA-256
-
-    Parameters
-    ----------
-    app
-      The app which declares the AllowedSigningKey
-    apk
-      The APK to check
-    """
-    if not app or not apk:
-        return
-    allowed_signer_keys = app.get('AllowedAPKSigningKeys', [])
-    if not allowed_signer_keys:
-        return
-    if apk['signer'] not in allowed_signer_keys:
-        return apk['apkName']
-
-
 def prepare_apps(apps, apks, repodir):
-    """Encapsulate all necessary preparation steps before we can build an index out of apps and apks.
+    """Encapsulates all necessary preparation steps before we can build an index out of apps and apks.
 
-    Parameters
-    ----------
-    apps
-      All apps as read from metadata
-    apks
-      list of apks that belong into repo, this gets modified in place
-    repodir
-      the target repository directory, metadata files will be copied here
-
-    Returns
-    -------
-    the relevant subset of apps (as a deepcopy)
+    :param apps: All apps as read from metadata
+    :param apks: list of apks that belong into repo, this gets modified in place
+    :param repodir: the target repository directory, metadata files will be copied here
+    :return: the relevant subset of apps (as a deepcopy)
     """
     apps_with_packages = get_apps_with_packages(apps, apks)
     apply_info_from_latest_apk(apps_with_packages, apks)
@@ -2597,9 +2156,6 @@ def prepare_apps(apps, apks, repodir):
     translate_per_build_anti_features(apps_with_packages, apks)
     if repodir == 'repo':
         insert_localized_app_metadata(apps_with_packages)
-        insert_localized_ios_app_metadata(apps_with_packages)
-        ingest_screenshots_from_repo_dir(apps_with_packages)
-    insert_missing_app_names_from_apks(apps_with_packages, apks)
     return apps_with_packages
 
 
@@ -2609,6 +2165,7 @@ start_timestamp = time.gmtime()
 
 
 def main():
+
     global config, options
 
     # Parse command line...
@@ -2637,11 +2194,10 @@ def main():
     parser.add_argument("--allow-disabled-algorithms", action="store_true", default=False,
                         help=_("Include APKs that are signed with disabled algorithms like MD5"))
     metadata.add_metadata_arguments(parser)
-    options = common.parse_args(parser)
+    options = parser.parse_args()
     metadata.warnings_action = options.W
 
-    config = common.read_config()
-    status_output = common.setup_status_output(start_timestamp)
+    config = common.read_config(options)
 
     if not (('jarsigner' in config or 'apksigner' in config)
             and 'keytool' in config):
@@ -2664,8 +2220,9 @@ def main():
     for k in ['repo_icon', 'archive_icon']:
         if k in config:
             if not os.path.exists(config[k]):
-                logging.warning(_('{name} "{section}/icons/{path}" does not exist! Check "config.yml".')
-                                .format(name=k, section=k.split('_')[0], path=config[k]))
+                logging.critical(_('{name} "{path}" does not exist! Correct it in config.py.')
+                                 .format(name=k, path=config[k]))
+                sys.exit(1)
 
     # if the user asks to create a keystore, do it now, reusing whatever it can
     if options.create_key:
@@ -2696,70 +2253,28 @@ def main():
     # Get all apps...
     apps = metadata.read_metadata()
 
+    # Generate a list of categories...
+    categories = set()
+    for app in apps.values():
+        categories.update(app.Categories)
+
     # Read known apks data (will be updated and written back when we've finished)
     knownapks = common.KnownApks()
 
     # Get APK cache
     apkcache = get_cache()
-    cache_timestamp = get_cache_mtime()
 
     # Delete builds for disabled apps
-    output_status_stage(status_output, 'delete_disabled_builds')
     delete_disabled_builds(apps, apkcache, repodirs)
 
     # Scan all apks in the main repo
-    output_status_stage(status_output, 'process_apks')
-    apks, cachechanged = process_apks(apkcache, repodirs[0], knownapks,
-                                      options.use_date_from_apk, apps, cache_timestamp)
+    apks, cachechanged = process_apks(apkcache, repodirs[0], knownapks, options.use_date_from_apk)
 
-    output_status_stage(status_output, 'scan_repo_files')
     files, fcachechanged = scan_repo_files(apkcache, repodirs[0], knownapks,
                                            options.use_date_from_apk)
     cachechanged = cachechanged or fcachechanged
     apks += files
-
-    ipas, icachechanged = scan_repo_for_ipas(apkcache, repodirs[0], knownapks)
-    cachechanged = cachechanged or icachechanged
-    apks += ipas
-
-    output_status_stage(status_output, 'remove_apks')
-    appid_has_apks = set()
-    appid_has_repo_files = set()
-    sha256_has_files = collections.defaultdict(list)
-    errors = 0
-    remove_apks = []
     for apk in apks:
-        sha256 = apk['hash']
-        if sha256 in sha256_has_files:
-            errors += 1
-            for path2 in sha256_has_files[sha256]:
-                logging.error(
-                    _('{path1} is a duplicate of {path2}, remove one!').format(
-                        path1=apk["apkName"], path2=path2
-                    )
-                )
-        sha256_has_files[sha256].append(apk['apkName'])
-        to_remove = get_apks_without_allowed_signatures(apps.get(apk['packageName']), apk)
-        if to_remove:
-            remove_apks.append(apk)
-            logging.warning(
-                _('"{path}" is signed by a key that is not allowed:').format(
-                    path=to_remove
-                )
-                + '\n'
-                + apk['signer']
-            )
-            if options.delete_unknown:
-                for d in repodirs:
-                    path = Path(d) / to_remove
-                    if path.exists():
-                        logging.warning(_('Removing {path}"').format(path=path))
-                        path.unlink()
-
-        if apk['apkName'].endswith('.apk'):
-            appid_has_apks.add(apk['packageName'])
-        else:
-            appid_has_repo_files.add(apk['packageName'])
         if apk['packageName'] not in apps:
             if options.create_metadata:
                 create_metadata_from_template(apk)
@@ -2778,76 +2293,66 @@ def main():
                 else:
                     logging.warning(msg + '\n\t' + _('Use `fdroid update -c` to create it.'))
 
-    for apk in remove_apks:
-        apks.remove(apk)
-
-    for appid in appid_has_apks:
-        if appid in appid_has_repo_files:
-            appid_files = ', '.join(glob.glob(os.path.join('repo', appid + '_[0-9]*.*')))
-            errors += 1
-            logging.error(
-                _('{appid} has both APKs and files: {files}').format(
-                    appid=appid, files=appid_files
-                )
-            )
-    if errors:
-        sys.exit(errors)
-
     # Scan the archive repo for apks as well
     if len(repodirs) > 1:
-        archapks, cc = process_apks(apkcache, repodirs[1], knownapks,
-                                    options.use_date_from_apk, apps, cache_timestamp)
+        archapks, cc = process_apks(apkcache, repodirs[1], knownapks, options.use_date_from_apk)
         if cc:
             cachechanged = True
     else:
         archapks = []
 
-    if cachechanged:
-        write_cache(apkcache)
-
-    output_status_stage(status_output, 'read_added_date_from_all_apks')
+    # We need app.Name populated for all apps regardless of which repo they end up in
+    # for the old-style inter-app links, so let's do it before we do anything else.
+    # This will be done again (as part of apply_info_from_latest_apk) for repo and archive
+    # separately later on, but it's fairly cheap anyway.
+    read_names_from_apks(apps, apks + archapks)
     # The added date currently comes from the oldest apk which might be in the archive.
     # So we need this populated at app level before continuing with only processing /repo
     # or /archive
     read_added_date_from_all_apks(apps, apks + archapks)
 
     if len(repodirs) > 1:
-        output_status_stage(status_output, 'archive_old_apks archive')
         archive_old_apks(apps, apks, archapks, repodirs[0], repodirs[1], config['archive_older'])
-        output_status_stage(status_output, 'prepare_apps archive')
         archived_apps = prepare_apps(apps, archapks, repodirs[1])
-        output_status_stage(status_output, 'index.make archive')
-        fdroidserver.index.make(archived_apps, archapks, repodirs[1], True)
+        index.make(archived_apps, archapks, repodirs[1], True)
 
-    output_status_stage(status_output, 'prepare_apps repo')
     repoapps = prepare_apps(apps, apks, repodirs[0])
 
-    output_status_stage(status_output, 'index.make repo')
-
     # APKs are placed into multiple repos based on the app package, providing
     # per-app subscription feeds for nightly builds and things like it
     if config['per_app_repos']:
         add_apks_to_per_app_repos(repodirs[0], apks)
         for appid, app in apps.items():
             repodir = os.path.join(appid, 'fdroid', 'repo')
-            app_dict = dict()
-            app_dict[appid] = app
+            appdict = dict()
+            appdict[appid] = app
             if os.path.isdir(repodir):
-                fdroidserver.index.make(app_dict, apks, repodir, False)
+                index.make(appdict, apks, repodir, False)
             else:
                 logging.info(_('Skipping index generation for {appid}').format(appid=appid))
         return
 
     # Make the index for the main repo...
-    fdroidserver.index.make(repoapps, apks, repodirs[0], False)
+    index.make(repoapps, apks, repodirs[0], False)
+    make_categories_txt(repodirs[0], categories)
 
     git_remote = config.get('binary_transparency_remote')
     if git_remote or os.path.isdir(os.path.join('binary_transparency', '.git')):
         from . import btlog
-        output_status_stage(status_output, 'make_binary_transparency_log')
         btlog.make_binary_transparency_log(repodirs)
 
-    status_update_json(status_output, apps, apks + archapks)
+    if config['update_stats']:
+        # Update known apks info...
+        knownapks.writeifchanged()
+
+    if cachechanged:
+        write_cache(apkcache)
+
+    # Update the wiki...
+    if options.wiki:
+        logging.warning(_('wiki support is deprecated and will be removed in the next release!'))
+        update_wiki(apps, apks + archapks)
+    status_update_json(apps, apks + archapks)
 
     logging.info(_("Finished"))
 
diff --git a/fdroidserver/verify.py b/fdroidserver/verify.py
index 897463ae..664d06d4 100644
--- a/fdroidserver/verify.py
+++ b/fdroidserver/verify.py
@@ -16,207 +16,119 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+import sys
+import os
 import glob
 import json
 import logging
-import os
-import sys
+import requests
 from argparse import ArgumentParser
 from collections import OrderedDict
 
-import requests
-
-from . import _, common, net
+from . import _
+from . import common
+from . import net
+from . import update
 from .exception import FDroidException
 
+options = None
 config = None
 
 
-def _add_diffoscope_info(d):
-    """Add diffoscope setup metadata to provided dict under 'diffoscope' key.
+class hashabledict(OrderedDict):
+    def __key(self):
+        return tuple((k, self[k]) for k in sorted(self))
 
-    The imports are broken out at stages since various versions of
-    diffoscope support various parts of these.
+    def __hash__(self):
+        return hash(self.__key())
 
-    """
-    try:
-        import diffoscope
+    def __eq__(self, other):
+        return self.__key() == other.__key()
 
-        d['diffoscope'] = dict()
-        d['diffoscope']['VERSION'] = diffoscope.VERSION
+    def __lt__(self, other):
+        return self.__key() < other.__key()
 
-        from diffoscope.comparators import ComparatorManager
-
-        ComparatorManager().reload()
-
-        from diffoscope.tools import tool_check_installed, tool_required
-
-        external_tools = sorted(tool_required.all)
-        external_tools = [
-            tool for tool in external_tools if not tool_check_installed(tool)
-        ]
-        d['diffoscope']['External-Tools-Required'] = external_tools
-
-        from diffoscope.external_tools import EXTERNAL_TOOLS
-        from diffoscope.tools import OS_NAMES, get_current_os
-
-        current_os = get_current_os()
-        os_list = [current_os] if (current_os in OS_NAMES) else iter(OS_NAMES)
-        for os_ in os_list:
-            tools = set()
-            for x in external_tools:
-                try:
-                    tools.add(EXTERNAL_TOOLS[x][os_])
-                except KeyError:
-                    pass
-            tools = sorted(tools)
-            d['diffoscope']['Available-in-{}-packages'.format(OS_NAMES[os_])] = tools
-
-        from diffoscope.tools import python_module_missing as pmm
-
-        d['diffoscope']['Missing-Python-Modules'] = sorted(pmm.modules)
-    except ImportError:
-        pass
+    def __qt__(self, other):
+        return self.__key() > other.__key()
 
 
-def get_verified_json(path):
-    """Get the full collection of reports that is written out to verified.json."""
-    if os.path.exists(path):
-        try:
-            with open(path) as fp:
-                return json.load(fp)
-        except Exception as e:
-            logging.info(f'{path}: {e}')
+class Decoder(json.JSONDecoder):
+    def __init__(self, **kwargs):
+        json.JSONDecoder.__init__(self, **kwargs)
+        self.parse_array = self.JSONArray
+        # Use the python implemenation of the scanner
+        self.scan_once = json.scanner.py_make_scanner(self)
 
-    data = OrderedDict()
-    data['packages'] = OrderedDict()
-
-    for f in glob.glob(os.path.join(os.path.dirname(path), '*.apk.json')):
-        with open(f) as fp:
-            reports = json.load(fp)
-        for report in reports.values():
-            packageName = report['local']['packageName']
-            if packageName not in data['packages']:
-                data['packages'][packageName] = []
-            data['packages'][packageName].append(report)
-
-    return data
+    def JSONArray(self, s_and_end, scan_once, **kwargs):
+        values, end = json.decoder.JSONArray(s_and_end, scan_once, **kwargs)
+        return set(values), end
 
 
 def write_json_report(url, remote_apk, unsigned_apk, compare_result):
-    """Write out the results of the verify run to JSON.
+    """write out the results of the verify run to JSON
 
     This builds up reports on the repeated runs of `fdroid verify` on
     a set of apps.  It uses the timestamps on the compared files to
     ensure that there is only one report per file, even when run
     repeatedly.
 
-    The output is run through JSON to normalize things like tuples vs
-    lists.
-
     """
+
     jsonfile = unsigned_apk + '.json'
     if os.path.exists(jsonfile):
         with open(jsonfile) as fp:
             data = json.load(fp, object_pairs_hook=OrderedDict)
     else:
         data = OrderedDict()
-    output = dict()
-    _add_diffoscope_info(output)
+    output = hashabledict()
     output['url'] = url
     for key, filename in (('local', unsigned_apk), ('remote', remote_apk)):
-        d = dict()
+        d = hashabledict()
         output[key] = d
         d['file'] = filename
-        d['sha256'] = common.sha256sum(filename)
+        d['sha256'] = update.sha256sum(filename)
         d['timestamp'] = os.stat(filename).st_ctime
-        d['packageName'], d['versionCode'], d['versionName'] = common.get_apk_id(
-            filename
-        )
+        d['packageName'], d['versionCode'], d['versionName'] = common.get_apk_id(filename)
     if compare_result:
         output['verified'] = False
         output['result'] = compare_result
     else:
         output['verified'] = True
-    # str makes better dict keys than float
-    data[str(output['local']['timestamp'])] = output
+    data[str(output['local']['timestamp'])] = output  # str makes better dict keys than float
     with open(jsonfile, 'w') as fp:
         json.dump(data, fp, sort_keys=True)
 
-    appid, version_code = os.path.basename(unsigned_apk[:-4]).rsplit('_', 1)
-    appid_base = unsigned_apk.rsplit('_', 1)[0]
-    apkReports = sorted(
-        glob.glob(f'{appid_base}_[0-9]*.json'),  # don't include <appid>.json
-        key=lambda s: int(s[:-9].rsplit('_', 1)[1]),  # numeric sort by versionCode
-    )
-    with open(apkReports[-1]) as fp:
-        reports = json.load(fp)
-    appid_output = {'apkReports': apkReports}
-    most_recent = 0
-    for report_time, run in reports.items():
-        if float(report_time) > most_recent:
-            most_recent = float(report_time)
-            appid_output['lastRunVerified'] = run['verified']
-    with open(f'{appid_base}.json', 'w') as fp:
-        json.dump(appid_output, fp, cls=common.Encoder, sort_keys=True)
-
     if output['verified']:
-        write_verified_json(output)
-
-
-def write_verified_json(output):
-    jsonfile = 'unsigned/verified.json'
-    data = get_verified_json(jsonfile)
-    packageName = output['local']['packageName']
-
-    if packageName not in data['packages']:
-        data['packages'][packageName] = []
-    found = False
-    output_dump = json.dumps(output, sort_keys=True)
-    for p in data['packages'][packageName]:
-        if output_dump == json.dumps(p, sort_keys=True):
-            found = True
-            break
-    if not found:
-        data['packages'][packageName].insert(0, json.loads(output_dump))
-    with open(jsonfile, 'w') as fp:
-        json.dump(data, fp, cls=common.Encoder, sort_keys=True)
+        jsonfile = 'unsigned/verified.json'
+        if os.path.exists(jsonfile):
+            with open(jsonfile) as fp:
+                data = json.load(fp, cls=Decoder, object_pairs_hook=hashabledict)
+        else:
+            data = OrderedDict()
+            data['packages'] = OrderedDict()
+        packageName = output['local']['packageName']
+        if packageName not in data['packages']:
+            data['packages'][packageName] = set()
+        data['packages'][packageName].add(output)
+        with open(jsonfile, 'w') as fp:
+            json.dump(data, fp, cls=common.Encoder, sort_keys=True)
 
 
 def main():
-    global config
+
+    global options, config
 
     # Parse command line...
-    parser = ArgumentParser(
-        usage="%(prog)s [options] [APPID[:VERCODE] [APPID[:VERCODE] ...]]"
-    )
+    parser = ArgumentParser(usage="%(prog)s [options] [APPID[:VERCODE] [APPID[:VERCODE] ...]]")
     common.setup_global_opts(parser)
-    parser.add_argument(
-        "appid",
-        nargs='*',
-        help=_("application ID with optional versionCode in the form APPID[:VERCODE]"),
-    )
-    parser.add_argument(
-        "--clean-up-verified",
-        action="store_true",
-        default=False,
-        help=_("Remove source tarball and any APKs if successfully verified."),
-    )
-    parser.add_argument(
-        "--reuse-remote-apk",
-        action="store_true",
-        default=False,
-        help=_("Verify against locally cached copy rather than redownloading."),
-    )
-    parser.add_argument(
-        "--output-json",
-        action="store_true",
-        default=False,
-        help=_("Output JSON report to file named after APK."),
-    )
-    options = common.parse_args(parser)
+    parser.add_argument("appid", nargs='*', help=_("application ID with optional versionCode in the form APPID[:VERCODE]"))
+    parser.add_argument("--reuse-remote-apk", action="store_true", default=False,
+                        help=_("Verify against locally cached copy rather than redownloading."))
+    parser.add_argument("--output-json", action="store_true", default=False,
+                        help=_("Output JSON report to file named after APK."))
+    options = parser.parse_args()
 
-    config = common.read_config()
+    config = common.read_config(options)
 
     tmp_dir = 'tmp'
     if not os.path.isdir(tmp_dir):
@@ -228,13 +140,13 @@ def main():
         logging.error(_("No unsigned directory - nothing to do"))
         sys.exit(0)
 
-    processed = set()
     verified = 0
     notverified = 0
 
     vercodes = common.read_pkg_args(options.appid, True)
 
     for apkfile in sorted(glob.glob(os.path.join(unsigned_dir, '*.apk'))):
+
         apkfilename = os.path.basename(apkfile)
         url = 'https://f-droid.org/repo/' + apkfilename
         appid, vercode = common.publishednameinfo(apkfile)
@@ -244,9 +156,8 @@ def main():
         if vercodes[appid] and vercode not in vercodes[appid]:
             continue
 
-        processed.add(appid)
-
         try:
+
             logging.info("Processing {apkfilename}".format(apkfilename=apkfilename))
 
             remote_apk = os.path.join(tmp_dir, apkfilename)
@@ -258,37 +169,18 @@ def main():
                     net.download_file(url, dldir=tmp_dir)
                 except requests.exceptions.HTTPError:
                     try:
-                        net.download_file(
-                            url.replace('/repo', '/archive'), dldir=tmp_dir
-                        )
+                        net.download_file(url.replace('/repo', '/archive'), dldir=tmp_dir)
                     except requests.exceptions.HTTPError as e:
-                        raise FDroidException(
-                            _('Downloading {url} failed. {error}').format(
-                                url=url, error=e
-                            )
-                        ) from e
+                        raise FDroidException(_('Downloading {url} failed. {error}')
+                                              .format(url=url, error=e))
 
             unsigned_apk = os.path.join(unsigned_dir, apkfilename)
-            compare_result = common.verify_apks(
-                remote_apk,
-                unsigned_apk,
-                tmp_dir,
-                clean_up_verified=options.clean_up_verified,
-            )
+            compare_result = common.verify_apks(remote_apk, unsigned_apk, tmp_dir)
             if options.output_json:
                 write_json_report(url, remote_apk, unsigned_apk, compare_result)
             if compare_result:
                 raise FDroidException(compare_result)
 
-            if options.clean_up_verified:
-                src_tarball = os.path.join(
-                    unsigned_dir, common.get_src_tarball_name(appid, vercode)
-                )
-                for f in (remote_apk, unsigned_apk, src_tarball):
-                    if os.path.exists(f):
-                        logging.info(f"...cleaned up {f} after successful verification")
-                        os.remove(f)
-
             logging.info("...successfully verified")
             verified += 1
 
@@ -296,12 +188,6 @@ def main():
             logging.info("...NOT verified - {0}".format(e))
             notverified += 1
 
-    for appid in options.appid:
-        package = appid.split(":")[0]
-        if package not in processed:
-            logging.critical(_("No APK for package: %s") % package)
-            notverified += 1
-
     if verified > 0:
         logging.info("{0} successfully verified".format(verified))
     if notverified > 0:
diff --git a/fdroidserver/vmtools.py b/fdroidserver/vmtools.py
index 2ba92ad6..c231aacc 100644
--- a/fdroidserver/vmtools.py
+++ b/fdroidserver/vmtools.py
@@ -16,17 +16,20 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-import json
-import logging
+from os.path import isdir, isfile, basename, abspath, expanduser
 import os
+import math
+import json
+import tarfile
 import shutil
 import subprocess
 import textwrap
-import threading
-from os.path import abspath, basename, expanduser, isdir, isfile
-
+import logging
 from .common import FDroidException
 
+from fdroidserver import _
+import threading
+
 lock = threading.Lock()
 
 
@@ -38,19 +41,15 @@ def get_clean_builder(serverdir):
         os.makedirs(serverdir)
     vagrantfile = os.path.join(serverdir, 'Vagrantfile')
     if not os.path.isfile(vagrantfile):
-        with open(vagrantfile, 'w') as f:
-            f.write(
-                textwrap.dedent(
-                    """\
+        with open(os.path.join('builder', 'Vagrantfile'), 'w') as f:
+            f.write(textwrap.dedent("""\
                 # generated file, do not change.
 
                 Vagrant.configure("2") do |config|
                     config.vm.box = "buildserver"
                     config.vm.synced_folder ".", "/vagrant", disabled: true
                 end
-                """
-                )
-            )
+                """))
     vm = get_build_vm(serverdir)
     logging.info('destroying buildserver before build')
     vm.destroy()
@@ -80,24 +79,15 @@ def _check_output(cmd, cwd=None):
 
 
 def get_build_vm(srvdir, provider=None):
-    """No summary.
-
-    Factory function for getting FDroidBuildVm instances.
+    """Factory function for getting FDroidBuildVm instances.
 
     This function tries to figure out what hypervisor should be used
     and creates an object for controlling a build VM.
 
-    Parameters
-    ----------
-    srvdir
-      path to a directory which contains a Vagrantfile
-    provider
-      optionally this parameter allows specifiying an
-      specific vagrant provider.
-
-    Returns
-    -------
-    FDroidBuildVm instance.
+    :param srvdir: path to a directory which contains a Vagrantfile
+    :param provider: optionally this parameter allows specifiying an
+        specific vagrant provider.
+    :returns: FDroidBuildVm instance.
     """
     abssrvdir = abspath(srvdir)
 
@@ -120,37 +110,25 @@ def get_build_vm(srvdir, provider=None):
     if kvm_installed and vbox_installed:
         logging.debug('both kvm and vbox are installed.')
     elif kvm_installed:
-        logging.debug(
-            'libvirt is the sole installed and supported vagrant provider, selecting \'libvirt\''
-        )
+        logging.debug('libvirt is the sole installed and supported vagrant provider, selecting \'libvirt\'')
         return LibvirtBuildVm(abssrvdir)
     elif vbox_installed:
-        logging.debug(
-            'virtualbox is the sole installed and supported vagrant provider, selecting \'virtualbox\''
-        )
+        logging.debug('virtualbox is the sole installed and supported vagrant provider, selecting \'virtualbox\'')
         return VirtualboxBuildVm(abssrvdir)
     else:
-        logging.debug(
-            'could not confirm that either virtualbox or kvm/libvirt are installed'
-        )
+        logging.debug('could not confirm that either virtualbox or kvm/libvirt are installed')
 
     # try guessing provider from .../srvdir/.vagrant internals
-    vagrant_libvirt_path = os.path.join(
-        abssrvdir, '.vagrant', 'machines', 'default', 'libvirt'
-    )
-    has_libvirt_machine = (
-        isdir(vagrant_libvirt_path) and len(os.listdir(vagrant_libvirt_path)) > 0
-    )
-    vagrant_virtualbox_path = os.path.join(
-        abssrvdir, '.vagrant', 'machines', 'default', 'virtualbox'
-    )
-    has_vbox_machine = (
-        isdir(vagrant_virtualbox_path) and len(os.listdir(vagrant_virtualbox_path)) > 0
-    )
+    vagrant_libvirt_path = os.path.join(abssrvdir, '.vagrant', 'machines',
+                                        'default', 'libvirt')
+    has_libvirt_machine = isdir(vagrant_libvirt_path) \
+        and len(os.listdir(vagrant_libvirt_path)) > 0
+    vagrant_virtualbox_path = os.path.join(abssrvdir, '.vagrant', 'machines',
+                                           'default', 'virtualbox')
+    has_vbox_machine = isdir(vagrant_virtualbox_path) \
+        and len(os.listdir(vagrant_virtualbox_path)) > 0
     if has_libvirt_machine and has_vbox_machine:
-        logging.info(
-            'build vm provider lookup found virtualbox and libvirt, defaulting to \'virtualbox\''
-        )
+        logging.info('build vm provider lookup found virtualbox and libvirt, defaulting to \'virtualbox\'')
         return VirtualboxBuildVm(abssrvdir)
     elif has_libvirt_machine:
         logging.debug('build vm provider lookup found \'libvirt\'')
@@ -162,15 +140,12 @@ def get_build_vm(srvdir, provider=None):
     # try guessing provider from available buildserver boxes
     available_boxes = []
     import vagrant
-
     boxes = vagrant.Vagrant().box_list()
     for box in boxes:
         if box.name == "buildserver":
             available_boxes.append(box.provider)
     if "libvirt" in available_boxes and "virtualbox" in available_boxes:
-        logging.info(
-            'basebox lookup found virtualbox and libvirt boxes, defaulting to \'virtualbox\''
-        )
+        logging.info('basebox lookup found virtualbox and libvirt boxes, defaulting to \'virtualbox\'')
         return VirtualboxBuildVm(abssrvdir)
     elif "libvirt" in available_boxes:
         logging.info('\'libvirt\' buildserver box available, using that')
@@ -187,7 +162,7 @@ class FDroidBuildVmException(FDroidException):
     pass
 
 
-class FDroidBuildVm:
+class FDroidBuildVm():
     """Abstract base class for working with FDroids build-servers.
 
     Use the factory method `fdroidserver.vmtools.get_build_vm()` for
@@ -196,27 +171,19 @@ class FDroidBuildVm:
     This is intended to be a hypervisor independent, fault tolerant
     wrapper around the vagrant functions we use.
     """
-
-    def __init__(self, srvdir, provider=None):
-        """Create new server class."""
-        self.provider = provider
+    def __init__(self, srvdir):
+        """Create new server class.
+        """
         self.srvdir = srvdir
         self.srvname = basename(srvdir) + '_default'
         self.vgrntfile = os.path.join(srvdir, 'Vagrantfile')
         self.srvuuid = self._vagrant_fetch_uuid()
         if not isdir(srvdir):
-            raise FDroidBuildVmException(
-                "Can not init vagrant, directory %s not present" % (srvdir)
-            )
+            raise FDroidBuildVmException("Can not init vagrant, directory %s not present" % (srvdir))
         if not isfile(self.vgrntfile):
-            raise FDroidBuildVmException(
-                "Can not init vagrant, '%s' not present" % (self.vgrntfile)
-            )
+            raise FDroidBuildVmException("Can not init vagrant, '%s' not present" % (self.vgrntfile))
         import vagrant
-
-        self.vgrnt = vagrant.Vagrant(
-            root=srvdir, out_cm=vagrant.stdout_cm, err_cm=vagrant.stdout_cm
-        )
+        self.vgrnt = vagrant.Vagrant(root=srvdir, out_cm=vagrant.stdout_cm, err_cm=vagrant.stdout_cm)
 
     def up(self, provision=True):
         global lock
@@ -281,8 +248,11 @@ class FDroidBuildVm:
         except subprocess.CalledProcessError as e:
             logging.debug('pruning global vagrant status failed: %s', e)
 
+    def package(self, output=None):
+        self.vgrnt.package(output=output)
+
     def vagrant_uuid_okay(self):
-        """Having an uuid means that vagrant up has run successfully."""
+        '''Having an uuid means that vagrant up has run successfully.'''
         if self.srvuuid is None:
             return False
         return True
@@ -312,20 +282,13 @@ class FDroidBuildVm:
     def box_add(self, boxname, boxfile, force=True):
         """Add vagrant box to vagrant.
 
-        Parameters
-        ----------
-        boxname
-          name assigned to local deployment of box
-        boxfile
-          path to box file
-        force
-          overwrite existing box image (default: True)
+        :param boxname: name assigned to local deployment of box
+        :param boxfile: path to box file
+        :param force: overwrite existing box image (default: True)
         """
         boxfile = abspath(boxfile)
         if not isfile(boxfile):
-            raise FDroidBuildVmException(
-                'supplied boxfile \'%s\' does not exist' % boxfile
-            )
+            raise FDroidBuildVmException('supplied boxfile \'%s\' does not exist', boxfile)
         self.vgrnt.box_add(boxname, abspath(boxfile), force=force)
 
     def box_remove(self, boxname):
@@ -333,28 +296,25 @@ class FDroidBuildVm:
             _check_call(['vagrant', 'box', 'remove', '--all', '--force', boxname])
         except subprocess.CalledProcessError as e:
             logging.debug('tried removing box %s, but is did not exist: %s', boxname, e)
-        boxpath = os.path.join(
-            expanduser('~'), '.vagrant', self._vagrant_file_name(boxname)
-        )
+        boxpath = os.path.join(expanduser('~'), '.vagrant',
+                               self._vagrant_file_name(boxname))
         if isdir(boxpath):
-            logging.info(
-                "attempting to remove box '%s' by deleting: %s", boxname, boxpath
-            )
+            logging.info("attempting to remove box '%s' by deleting: %s",
+                         boxname, boxpath)
             shutil.rmtree(boxpath)
 
     def sshinfo(self):
-        """Get ssh connection info for a vagrant VM.
+        """Get ssh connection info for a vagrant VM
 
-        Returns
-        -------
-        A dictionary containing 'hostname', 'port', 'user' and 'idfile'
+        :returns: A dictionary containing 'hostname', 'port', 'user'
+            and 'idfile'
         """
         import paramiko
-
         try:
             sshconfig_path = os.path.join(self.srvdir, 'sshconfig')
             with open(sshconfig_path, 'wb') as fp:
-                fp.write(_check_output(['vagrant', 'ssh-config'], cwd=self.srvdir))
+                fp.write(_check_output(['vagrant', 'ssh-config'],
+                                       cwd=self.srvdir))
             vagranthost = 'default'  # Host in ssh config file
             sshconfig = paramiko.SSHConfig()
             with open(sshconfig_path, 'r') as f:
@@ -365,25 +325,36 @@ class FDroidBuildVm:
                 idfile = idfile[0]
             elif idfile.startswith('"') and idfile.endswith('"'):
                 idfile = idfile[1:-1]
-            return {
-                'hostname': sshconfig['hostname'],
-                'port': int(sshconfig['port']),
-                'user': sshconfig['user'],
-                'idfile': idfile,
-            }
+            return {'hostname': sshconfig['hostname'],
+                    'port': int(sshconfig['port']),
+                    'user': sshconfig['user'],
+                    'idfile': idfile}
         except subprocess.CalledProcessError as e:
             raise FDroidBuildVmException("Error getting ssh config") from e
 
+    def snapshot_create(self, snapshot_name):
+        raise NotImplementedError('not implemented, please use a sub-type instance')
+
+    def snapshot_list(self):
+        raise NotImplementedError('not implemented, please use a sub-type instance')
+
+    def snapshot_exists(self, snapshot_name):
+        raise NotImplementedError('not implemented, please use a sub-type instance')
+
+    def snapshot_revert(self, snapshot_name):
+        raise NotImplementedError('not implemented, please use a sub-type instance')
+
 
 class LibvirtBuildVm(FDroidBuildVm):
     def __init__(self, srvdir):
-        super().__init__(srvdir, 'libvirt')
+        self.provider = 'libvirt'
+        super().__init__(srvdir)
         import libvirt
 
         try:
             self.conn = libvirt.open('qemu:///system')
         except libvirt.libvirtError as e:
-            raise FDroidBuildVmException('could not connect to libvirtd: %s' % (e)) from e
+            raise FDroidBuildVmException('could not connect to libvirtd: %s' % (e))
 
     def destroy(self):
 
@@ -403,6 +374,84 @@ class LibvirtBuildVm(FDroidBuildVm):
         except subprocess.CalledProcessError as e:
             logging.info("could not undefine libvirt domain '%s': %s", self.srvname, e)
 
+    def package(self, output=None, keep_box_file=False):
+        if not output:
+            output = "buildserver.box"
+            logging.debug("no output name set for packaging '%s', "
+                          "defaulting to %s", self.srvname, output)
+        storagePool = self.conn.storagePoolLookupByName('default')
+        domainInfo = self.conn.lookupByName(self.srvname).info()
+        if storagePool:
+
+            if isfile('metadata.json'):
+                os.remove('metadata.json')
+            if isfile('Vagrantfile'):
+                os.remove('Vagrantfile')
+            if isfile('box.img'):
+                os.remove('box.img')
+
+            logging.debug('preparing box.img for box %s', output)
+            vol = storagePool.storageVolLookupByName(self.srvname + '.img')
+            imagepath = vol.path()
+            # TODO use a libvirt storage pool to ensure the img file is readable
+            if not os.access(imagepath, os.R_OK):
+                logging.warning(_('Cannot read "{path}"!').format(path=imagepath))
+                _check_call(['sudo', '/bin/chmod', '-R', 'a+rX', '/var/lib/libvirt/images'])
+            shutil.copy2(imagepath, 'box.img')
+            _check_call(['qemu-img', 'rebase', '-p', '-b', '', 'box.img'])
+            img_info_raw = _check_output(['qemu-img', 'info', '--output=json', 'box.img'])
+            img_info = json.loads(img_info_raw.decode('utf-8'))
+            metadata = {"provider": "libvirt",
+                        "format": img_info['format'],
+                        "virtual_size": math.ceil(img_info['virtual-size'] / (1024. ** 3)),
+                        }
+
+            logging.debug('preparing metadata.json for box %s', output)
+            with open('metadata.json', 'w') as fp:
+                fp.write(json.dumps(metadata))
+            logging.debug('preparing Vagrantfile for box %s', output)
+            vagrantfile = textwrap.dedent("""\
+                  Vagrant.configure("2") do |config|
+                    config.ssh.username = "vagrant"
+                    config.ssh.password = "vagrant"
+
+                    config.vm.provider :libvirt do |libvirt|
+
+                      libvirt.driver = "kvm"
+                      libvirt.host = ""
+                      libvirt.connect_via_ssh = false
+                      libvirt.storage_pool_name = "default"
+                      libvirt.cpus = {cpus}
+                      libvirt.memory = {memory}
+
+                    end
+                  end""".format_map({'memory': str(int(domainInfo[1] / 1024)), 'cpus': str(domainInfo[3])}))
+            with open('Vagrantfile', 'w') as fp:
+                fp.write(vagrantfile)
+            try:
+                import libarchive
+                with libarchive.file_writer(output, 'gnutar', 'gzip') as tar:
+                    logging.debug('adding files to box %s ...', output)
+                    tar.add_files('metadata.json', 'Vagrantfile', 'box.img')
+            except (ImportError, AttributeError):
+                with tarfile.open(output, 'w:gz') as tar:
+                    logging.debug('adding metadata.json to box %s ...', output)
+                    tar.add('metadata.json')
+                    logging.debug('adding Vagrantfile to box %s ...', output)
+                    tar.add('Vagrantfile')
+                    logging.debug('adding box.img to box %s ...', output)
+                    tar.add('box.img')
+
+            if not keep_box_file:
+                logging.debug('box packaging complete, removing temporary files.')
+                os.remove('metadata.json')
+                os.remove('Vagrantfile')
+                os.remove('box.img')
+
+        else:
+            logging.warning("could not connect to storage-pool 'default', "
+                            "skip packaging buildserver box")
+
     def box_add(self, boxname, boxfile, force=True):
         boximg = '%s_vagrant_box_image_0.img' % (boxname)
         if force:
@@ -423,8 +472,82 @@ class LibvirtBuildVm(FDroidBuildVm):
         except subprocess.CalledProcessError as e:
             logging.debug("tried removing '%s', file was not present in first place", boxname, exc_info=e)
 
+    def snapshot_create(self, snapshot_name):
+        logging.info("creating snapshot '%s' for vm '%s'", snapshot_name, self.srvname)
+        try:
+            _check_call(['virsh', '-c', 'qemu:///system', 'snapshot-create-as', self.srvname, snapshot_name])
+        except subprocess.CalledProcessError as e:
+            raise FDroidBuildVmException("could not create snapshot '%s' "
+                                         "of libvirt vm '%s'"
+                                         % (snapshot_name, self.srvname)) from e
+
+    def snapshot_list(self):
+        import libvirt
+        try:
+            dom = self.conn.lookupByName(self.srvname)
+            return dom.listAllSnapshots()
+        except libvirt.libvirtError as e:
+            raise FDroidBuildVmException('could not list snapshots for domain \'%s\'' % self.srvname) from e
+
+    def snapshot_exists(self, snapshot_name):
+        import libvirt
+        try:
+            dom = self.conn.lookupByName(self.srvname)
+            return dom.snapshotLookupByName(snapshot_name) is not None
+        except libvirt.libvirtError:
+            return False
+
+    def snapshot_revert(self, snapshot_name):
+        logging.info("reverting vm '%s' to snapshot '%s'", self.srvname, snapshot_name)
+        import libvirt
+        try:
+            dom = self.conn.lookupByName(self.srvname)
+            snap = dom.snapshotLookupByName(snapshot_name)
+            dom.revertToSnapshot(snap)
+        except libvirt.libvirtError as e:
+            raise FDroidBuildVmException('could not revert domain \'%s\' to snapshot \'%s\''
+                                         % (self.srvname, snapshot_name)) from e
+
 
 class VirtualboxBuildVm(FDroidBuildVm):
 
     def __init__(self, srvdir):
-        super().__init__(srvdir, 'virtualbox')
+        self.provider = 'virtualbox'
+        super().__init__(srvdir)
+
+    def snapshot_create(self, snapshot_name):
+        logging.info("creating snapshot '%s' for vm '%s'", snapshot_name, self.srvname)
+        try:
+            _check_call(['VBoxManage', 'snapshot', self.srvuuid, 'take', 'fdroidclean'], cwd=self.srvdir)
+        except subprocess.CalledProcessError as e:
+            raise FDroidBuildVmException('could not cerate snapshot '
+                                         'of virtualbox vm %s'
+                                         % self.srvname) from e
+
+    def snapshot_list(self):
+        try:
+            o = _check_output(['VBoxManage', 'snapshot',
+                               self.srvuuid, 'list',
+                               '--details'], cwd=self.srvdir)
+            return o
+        except subprocess.CalledProcessError as e:
+            raise FDroidBuildVmException("could not list snapshots "
+                                         "of virtualbox vm '%s'"
+                                         % (self.srvname)) from e
+
+    def snapshot_exists(self, snapshot_name):
+        try:
+            return str(snapshot_name) in str(self.snapshot_list())
+        except FDroidBuildVmException:
+            return False
+
+    def snapshot_revert(self, snapshot_name):
+        logging.info("reverting vm '%s' to snapshot '%s'",
+                     self.srvname, snapshot_name)
+        try:
+            _check_call(['VBoxManage', 'snapshot', self.srvuuid,
+                         'restore', 'fdroidclean'], cwd=self.srvdir)
+        except subprocess.CalledProcessError as e:
+            raise FDroidBuildVmException("could not load snapshot "
+                                         "'fdroidclean' for vm '%s'"
+                                         % (self.srvname)) from e
diff --git a/gradlew-fdroid b/gradlew-fdroid
new file mode 100755
index 00000000..8ccb7a67
--- /dev/null
+++ b/gradlew-fdroid
@@ -0,0 +1,240 @@
+#!/bin/bash
+
+bindir="$(dirname $0)"
+basedir="$(dirname $bindir)"
+# Check if GRADLE_VERSION_DIR/CACHEDIR is set from environment
+if [ -z "$GRADLE_VERSION_DIR" ]; then
+    gradle_version_dir="${basedir}/versions"
+else
+    gradle_version_dir="$GRADLE_VERSION_DIR"
+fi
+if [ -n "$CACHEDIR" ]; then
+    cachedir="$CACHEDIR"
+fi
+args=("$@")
+
+run_gradle() {
+    if [ ! -d "${gradle_version_dir}/${v_found}" ]; then
+        download_gradle ${v_found}
+    fi
+    echo "Running ${gradle_version_dir}/${v_found}/bin/gradle ${args[@]}"
+    "${gradle_version_dir}/${v_found}/bin/gradle" "${args[@]}"
+    exit $?
+}
+
+download_gradle() {
+    URL="https://downloads.gradle.org/distributions/gradle-${1}-bin.zip"
+    shasum=$(get_sha $1)
+    if [ $? != 0 ]; then
+        echo "No hash for gradle version $1! Exiting..."
+        exit 1
+    fi
+    if [ -n "${cachedir}" ] && [ -e "${cachedir}/gradle-$1-bin.zip" ]; then
+        echo "Using cached ${cachedir}/gradle-$1-bin.zip ..."
+        gradle_zip="${cachedir}/gradle-$1-bin.zip"
+    else
+        echo "Downloading missing gradle version $1"
+        if [ -n "${cachedir}" ]; then
+            tmpdir="${cachedir}"
+            if [ ! -d ${tmpdir} ]; then
+                mkdir -p "${cachedir}"
+            fi
+        else
+            tmpdir=$(mktemp -d)
+        fi
+        curl -o "${tmpdir}/gradle-$1-bin.zip" --silent --fail --show-error --location "${URL}"
+        gradle_zip="${tmpdir}/gradle-$1-bin.zip"
+    fi
+    echo "${shasum} ${gradle_zip}" | sha256sum -c -
+    if [ $? != 0 ]; then
+        echo "gradle download checksum mismatch! Exiting..."
+        exit 1
+    fi
+    mkdir -p "${gradle_version_dir}/"
+    unzip -q -d "${gradle_version_dir}" "${gradle_zip}"
+    mv "${gradle_version_dir}/gradle-$1" "${gradle_version_dir}/${v_found}"
+}
+
+get_sha() {
+    case $1 in
+        '1.4')    echo 'cd99e85fbcd0ae8b99e81c9992a2f10cceb7b5f009c3720ef3a0078f4f92e94e' ;;
+        '1.6')    echo 'de3e89d2113923dcc2e0def62d69be0947ceac910abd38b75ec333230183fac4' ;;
+        '1.7')    echo '360c97d51621b5a1ecf66748c718594e5f790ae4fbc1499543e0c006033c9d30' ;;
+        '1.8')    echo 'a342bbfa15fd18e2482287da4959588f45a41b60910970a16e6d97959aea5703' ;;
+        '1.9')    echo '097ddc2bcbc9da2bb08cbf6bf8079585e35ad088bafd42e8716bc96405db98e9' ;;
+        '1.10')   echo '6e6db4fc595f27ceda059d23693b6f6848583950606112b37dfd0e97a0a0a4fe' ;;
+        '1.11')   echo '07e235df824964f0e19e73ea2327ce345c44bcd06d44a0123d29ab287fc34091' ;;
+        '1.12')   echo '8734b13a401f4311ee418173ed6ca8662d2b0a535be8ff2a43ecb1c13cd406ea' ;;
+        '2.1')    echo '3eee4f9ea2ab0221b89f8e4747a96d4554d00ae46d8d633f11cfda60988bf878' ;;
+        '2.2')    echo '91e5655fe11ef414449f218c4fa2985b3a49b7903c57556da109c84fa26e1dfb' ;;
+        '2.2.1')  echo '420aa50738299327b611c10b8304b749e8d3a579407ee9e755b15921d95ff418' ;;
+        '2.3')    echo '010dd9f31849abc3d5644e282943b1c1c355f8e2635c5789833979ce590a3774' ;;
+        '2.4')    echo 'c4eaecc621a81f567ded1aede4a5ddb281cc02a03a6a87c4f5502add8fc2f16f' ;;
+        '2.5')    echo '3f953e0cb14bb3f9ebbe11946e84071547bf5dfd575d90cfe9cc4e788da38555' ;;
+        '2.6')    echo '18a98c560af231dfa0d3f8e0802c20103ae986f12428bb0a6f5396e8f14e9c83' ;;
+        '2.7')    echo 'cde43b90945b5304c43ee36e58aab4cc6fb3a3d5f9bd9449bb1709a68371cb06' ;;
+        '2.8')    echo 'a88db9c2f104defdaa8011c58cf6cda6c114298ae3695ecfb8beb30da3a903cb' ;;
+        '2.9')    echo 'c9159ec4362284c0a38d73237e224deae6139cbde0db4f0f44e1c7691dd3de2f' ;;
+        '2.10')   echo '66406247f745fc6f05ab382d3f8d3e120c339f34ef54b86f6dc5f6efc18fbb13' ;;
+        '2.11')   echo '8d7437082356c9fd6309a4479c8db307673965546daea445c6c72759cd6b1ed6' ;;
+        '2.12')   echo 'e77064981906cd0476ff1e0de3e6fef747bd18e140960f1915cca8ff6c33ab5c' ;;
+        '2.13')   echo '0f665ec6a5a67865faf7ba0d825afb19c26705ea0597cec80dd191b0f2cbb664' ;;
+        '2.14')   echo '993b4f33b652c689e9721917d8e021cab6bbd3eae81b39ab2fd46fdb19a928d5' ;;
+        '2.14.1') echo 'cfc61eda71f2d12a572822644ce13d2919407595c2aec3e3566d2aab6f97ef39' ;;
+        '3.0')    echo '39c906941a474444afbddc38144ed44166825acb0a57b0551dddb04bbf157f80' ;;
+        '3.1')    echo 'c7de3442432253525902f7e8d7eac8b5fd6ce1623f96d76916af6d0e383010fc' ;;
+        '3.2')    echo '5321b36837226dc0377047a328f12010f42c7bf88ee4a3b1cee0c11040082935' ;;
+        '3.2.1')  echo '9843a3654d3e57dce54db06d05f18b664b95c22bf90c6becccb61fc63ce60689' ;;
+        '3.3')    echo 'c58650c278d8cf0696cab65108ae3c8d95eea9c1938e0eb8b997095d5ca9a292' ;;
+        '3.4')    echo '72d0cd4dcdd5e3be165eb7cd7bbd25cf8968baf400323d9ab1bba622c3f72205' ;;
+        '3.4.1')  echo 'db1db193d479cc1202be843f17e4526660cfb0b21b57d62f3a87f88c878af9b2' ;;
+        '3.5')    echo '0b7450798c190ff76b9f9a3d02e18b33d94553f708ebc08ebe09bdf99111d110' ;;
+        '3.5.1')  echo '8dce35f52d4c7b4a4946df73aa2830e76ba7148850753d8b5e94c5dc325ceef8' ;;
+        '4.0')    echo '56bd2dde29ba2a93903c557da1745cafd72cdd8b6b0b83c05a40ed7896b79dfe' ;;
+        '4.0.1')  echo 'd717e46200d1359893f891dab047fdab98784143ac76861b53c50dbd03b44fd4' ;;
+        '4.0.2')  echo '79ac421342bd11f6a4f404e0988baa9c1f5fabf07e3c6fa65b0c15c1c31dda22' ;;
+        '4.1')    echo 'd55dfa9cfb5a3da86a1c9e75bb0b9507f9a8c8c100793ccec7beb6e259f9ed43' ;;
+        '4.2')    echo '515dd63d32e55a9c05667809c5e40a947529de3054444ad274b3b75af5582eae' ;;
+        '4.2.1')  echo 'b551cc04f2ca51c78dd14edb060621f0e5439bdfafa6fd167032a09ac708fbc0' ;;
+        '4.3')    echo '8dcbf44eef92575b475dcb1ce12b5f19d38dc79e84c662670248dc8b8247654c' ;;
+        '4.3.1')  echo '15ebe098ce0392a2d06d252bff24143cc88c4e963346582c8d88814758d93ac7' ;;
+        '4.4')    echo 'fa4873ae2c7f5e8c02ec6948ba95848cedced6134772a0169718eadcb39e0a2f' ;;
+        '4.4.1')  echo 'e7cf7d1853dfc30c1c44f571d3919eeeedef002823b66b6a988d27e919686389' ;;
+        '4.5')    echo '03f2a43a314ff0fb843a85ef68078e06d181c4549c1e5fb983f289382b59b5e3' ;;
+        '4.5.1')  echo '3e2ea0d8b96605b7c528768f646e0975bd9822f06df1f04a64fd279b1a17805e' ;;
+        '4.6')    echo '98bd5fd2b30e070517e03c51cbb32beee3e2ee1a84003a5a5d748996d4b1b915' ;;
+        '4.7')    echo 'fca5087dc8b50c64655c000989635664a73b11b9bd3703c7d6cabd31b7dcdb04' ;;
+        '4.8')    echo 'f3e29692a8faa94eb0b02ebf36fa263a642b3ae8694ef806c45c345b8683f1ba' ;;
+        '4.8.1')  echo 'af334d994b5e69e439ab55b5d2b7d086da5ea6763d78054f49f147b06370ed71' ;;
+        '4.9')    echo 'e66e69dce8173dd2004b39ba93586a184628bc6c28461bc771d6835f7f9b0d28' ;;
+        '4.10')   echo '248cfd92104ce12c5431ddb8309cf713fe58de8e330c63176543320022f59f18' ;;
+        '4.10.1') echo 'e53ce3a01cf016b5d294eef20977ad4e3c13e761ac1e475f1ffad4c6141a92bd' ;;
+        '4.10.2') echo 'b49c6da1b2cb67a0caf6c7480630b51c70a11ca2016ff2f555eaeda863143a29' ;;
+        '4.10.3') echo '8626cbf206b4e201ade7b87779090690447054bc93f052954c78480fa6ed186e' ;;
+        '5.0')    echo '6157ac9f3410bc63644625b3b3e9e96c963afd7910ae0697792db57813ee79a6' ;;
+        '5.1')    echo '7506638a380092a0406364c79d6c87d03d23017fc25a5770379d1ce23c3fcd4d' ;;
+        '5.1.1')  echo '4953323605c5d7b89e97d0dc7779e275bccedefcdac090aec123375eae0cc798' ;;
+        '5.2')    echo 'ff322863250159595e93b5a4d17a6f0d21c59a1a0497c1e1cf1d53826485503f' ;;
+        '5.2.1')  echo '748c33ff8d216736723be4037085b8dc342c6a0f309081acf682c9803e407357' ;;
+        '5.3')    echo 'bed2bdd3955be5a09ca7e0201e9d131f194f7f6c466e1795a733733ccfb09f25' ;;
+        '5.3.1')  echo '1c59a17a054e9c82f0dd881871c9646e943ec4c71dd52ebc6137d17f82337436' ;;
+        '5.4')    echo 'c8c17574245ecee9ed7fe4f6b593b696d1692d1adbfef425bef9b333e3a0e8de' ;;
+        '5.4.1')  echo '7bdbad1e4f54f13c8a78abc00c26d44dd8709d4aedb704d913fb1bb78ac025dc' ;;
+        '5.5')    echo '8d78b2ed63e7f07ad169c1186d119761c4773e681f332cfe1901045b1b0141bc' ;;
+        '5.5.1')  echo '222a03fcf2fcaf3691767ce9549f78ebd4a77e73f9e23a396899fb70b420cd00' ;;
+        '5.6')    echo '15c02ef5dd3631ec02ac52e8725703e0285d9a7eecbf4e5939aa9e924604d01d' ;;
+        '5.6.1')  echo '0986244820e4a35d32d91df2ec4b768b5ba5d6c8246753794f85159f9963ec12' ;;
+        '5.6.2')  echo '32fce6628848f799b0ad3205ae8db67d0d828c10ffe62b748a7c0d9f4a5d9ee0' ;;
+        '5.6.3')  echo '60a6d8f687e3e7a4bc901cc6bc3db190efae0f02f0cc697e323e0f9336f224a3' ;;
+        '5.6.4')  echo '1f3067073041bc44554d0efe5d402a33bc3d3c93cc39ab684f308586d732a80d' ;;
+        '6.0')    echo '5a3578b9f0bb162f5e08cf119f447dfb8fa950cedebb4d2a977e912a11a74b91' ;;
+        '6.0.1')  echo 'd364b7098b9f2e58579a3603dc0a12a1991353ac58ed339316e6762b21efba44' ;;
+        '6.1')    echo 'd0c43d14e1c70a48b82442f435d06186351a2d290d72afd5b8866f15e6d7038a' ;;
+        '6.1.1')  echo '9d94e6e4a28ad328072ef6e56bce79a810494ae756751fdcedffdeaf27c093b1' ;;
+        '6.2')    echo 'b93a5f30d01195ec201e240f029c8b42d59c24086b8d1864112c83558e23cf8a' ;;
+        '6.2.1')  echo 'a68ca7ba57f3404c3f6fc1f70a02d3a7d78652e6b46bbfaff83fc9a17168c279' ;;
+        '6.2.2')  echo '0f6ba231b986276d8221d7a870b4d98e0df76e6daf1f42e7c0baec5032fb7d17' ;;
+        '6.3')    echo '038794feef1f4745c6347107b6726279d1c824f3fc634b60f86ace1e9fbd1768' ;;
+        '6.4')    echo 'b888659f637887e759749f6226ddfcb1cb04f828c58c41279de73c463fdbacc9' ;;
+        '6.4.1')  echo 'e58cdff0cee6d9b422dcd08ebeb3177bc44eaa09bd9a2e838ff74c408fe1cbcd' ;;
+        '6.5')    echo '23e7d37e9bb4f8dabb8a3ea7fdee9dd0428b9b1a71d298aefd65b11dccea220f' ;;
+        '6.5.1')  echo '50a7d30529fa939721fe9268a0205142f3f2302bcac5fb45b27a3902e58db54a' ;;
+        '6.6')    echo 'e6f83508f0970452f56197f610d13c5f593baaf43c0e3c6a571e5967be754025' ;;
+        '6.6.1')  echo '7873ed5287f47ca03549ab8dcb6dc877ac7f0e3d7b1eb12685161d10080910ac' ;;
+        '6.7')    echo '8ad57759019a9233dc7dc4d1a530cefe109dc122000d57f7e623f8cf4ba9dfc4' ;;
+        '6.7.1')  echo '3239b5ed86c3838a37d983ac100573f64c1f3fd8e1eb6c89fa5f9529b5ec091d' ;;
+        *) exit 1
+    esac
+}
+
+contains() {
+    local e
+    for e in $2; do
+        [[ $e == $1 ]] && return 0;
+    done
+    return 1
+}
+
+# key-value pairs of what gradle version (value) each gradle plugin version
+# (key) should accept. plugin versions are actually prefixes and catch sub-
+# versions as well. Pairs are taken from:
+# https://developer.android.com/studio/releases/gradle-plugin.html#updating-gradle
+d_plugin_k=(4.1 4.0 3.6 3.5 3.4 3.3 3.2 3.1 3.0 2.3    2.2  2.1.3  2.1  2.0 1.5 1.3 1.2   1.1   1.0 0.14 0.13 0.12 0.11 0.10  0.9  0.8 0.7 0.6 0.5 0.4 0.3 0.2)
+d_plugin_v=(6.5 6.1.1 5.6.4 5.4.1 5.1.1 4.10.1 4.6 4.4 4.1 3.3 2.14.1 2.14.1 2.12 2.12 2.4 2.4 2.3 2.2.1 2.2.1  2.1  2.1 1.12 1.12 1.12 1.11 1.10 1.9 1.8 1.6 1.6 1.4 1.4)
+
+# All gradle versions we know about
+plugin_v=(6.7.1 6.7 6.6.1 6.6 6.5.1 6.5 6.4.1 6.4 6.3 6.2.2 6.2.1 6.2 6.1.1 6.1 6.0.1 6.0 5.6.4 5.6.3 5.6.2 5.6.1 5.6 5.5.1 5.5 5.4.1 5.4 5.3.1 5.3 5.2.1 5.2 5.1.1 5.1 5.0 4.10.3 4.10.2 4.10.1 4.10 4.9 4.8.1 4.8 4.7 4.6 4.5.1 4.5 4.4.1 4.4 4.3.1 4.3 4.2.1 4.2 4.1 4.0.2 4.0.1 4.0 3.5.1 3.5 3.4.1 3.4 3.3 3.2.1 3.2 3.1 3.0 2.14.1 2.14 2.13 2.12 2.11 2.10 2.9 2.8 2.7 2.6 2.5 2.4 2.3 2.2.1 2.2 2.1 1.12 1.11 1.10 1.9 1.8 1.7 1.6 1.4)
+
+v_all=${plugin_v[@]}
+
+# Earliest takes priority
+for f in {.,..}/gradle/wrapper/gradle-wrapper.properties; do
+    [[ -f $f ]] || continue
+    while IFS='' read -r line || [ -n "$line" ]; do
+        line=$(printf "$line" | tr -d '\r') # strip Windows linefeeds
+        if [[ $line == 'distributionUrl='* ]]; then
+            wrapper_ver=${line#*/gradle-}
+            wrapper_ver=${wrapper_ver%-*.zip}
+            break 2
+        fi
+    done < $f
+done
+
+if [[ -n $wrapper_ver ]]; then
+    v_found=$wrapper_ver
+    echo "Found $v_found via distributionUrl"
+    run_gradle
+fi
+
+# Earliest takes priority
+for f in {.,..}/build.gradle{,.kts}; do
+    [[ -f $f ]] || continue
+    while IFS='' read -r line || [ -n "$line" ]; do
+        line=$(printf "$line" | tr -d '\r') # strip Windows linefeeds
+        if [[ -z "$plugin_pver" && $line == *'com.android.tools.build:gradle:'* ]]; then
+            plugin_pver=${line#*[\'\"]com.android.tools.build:gradle:}
+            plugin_pver=${plugin_pver%[\'\"]*}
+        elif [[ -z "$wrapper_ver" && $line == *'gradleVersion = '* ]]; then
+            wrapper_ver=${line#*gradleVersion*=*[\'\"]}
+            wrapper_ver=${wrapper_ver%[\'\"]*}
+        fi
+    done < $f
+done
+
+if [[ -n $wrapper_ver ]]; then
+    v_found=$wrapper_ver
+    echo "Found $v_found via gradleVersion"
+    run_gradle
+fi
+
+if [[ -n $plugin_pver ]]; then
+    i=0
+    match=false
+    for k in ${d_plugin_k[@]}; do
+        if [[ $plugin_pver == ${k}* ]]; then
+            plugin_ver=${d_plugin_v[$i]}
+            match=true
+            break
+        fi
+        let i++
+    done
+    if $match; then
+        v_found=$plugin_ver
+        echo "Found $v_found via gradle plugin version $k"
+    fi
+fi
+
+# Find the highest version available
+for v in ${plugin_v[*]}; do
+    if contains $v "${v_all[*]}"; then
+        v_def=$v
+        break
+    fi
+done
+
+if [[ -z $v_found ]]; then
+    echo "No suitable gradle version found - defaulting to $v_def"
+    v_found=$v_def
+fi
+
+run_gradle
diff --git a/hooks/install-hooks.sh b/hooks/install-hooks.sh
index e266301b..69b314d4 100755
--- a/hooks/install-hooks.sh
+++ b/hooks/install-hooks.sh
@@ -2,7 +2,7 @@
 #
 # Install all the client hooks
 
-BASE_DIR="$(cd $(dirname $0) || exit; pwd -P)"
+BASE_DIR="$(cd $(dirname $0); pwd -P)"
 HOOK_NAMES="applypatch-msg pre-applypatch post-applypatch pre-commit prepare-commit-msg commit-msg post-commit pre-rebase post-checkout post-merge pre-receive update post-receive post-update pre-auto-gc"
 HOOK_DIR="$(git rev-parse --show-toplevel)/.git/hooks"
 
diff --git a/hooks/pre-commit b/hooks/pre-commit
index a147e689..a197559d 100755
--- a/hooks/pre-commit
+++ b/hooks/pre-commit
@@ -8,12 +8,12 @@ exec 1>&2
 
 files=`git diff-index --cached HEAD 2>&1 | sed 's/^:.*     //' | uniq | cut -b100-500`
 if [ -z "$files" ]; then
-    PY_FILES="fdroid makebuildserver setup.py fdroidserver/*.py examples/*.py tests/*-release-checksums.py"
-    PY_TEST_FILES="tests/test_*.py"
+    PY_FILES="fdroid makebuildserver setup.py fdroidserver/*.py"
+    PY_TEST_FILES="tests/*.TestCase"
     SH_FILES="hooks/pre-commit"
-    BASH_FILES="jenkins-build-all jenkins-setup-build-environment jenkins-test completion/bash-completion buildserver/provision-*"
+    BASH_FILES="gradlew-fdroid jenkins-build-all jenkins-setup-build-environment jenkins-test completion/bash-completion buildserver/provision-*"
     RB_FILES="buildserver/Vagrantfile"
-    YML_FILES=".*.yml .yamllint */*.yml */*.yaml"
+    YML_FILES="buildserver/*.yml examples/*.yml"
 else
     # if actually committing right now, then only run on the files
     # that are going to be committed at this moment
@@ -27,16 +27,16 @@ else
     for f in $files; do
         test -e $f || continue
         case $f in
-            test_*.py)
-                PY_TEST_FILES+=" $f"
-                ;;
             *.py)
                 PY_FILES+=" $f"
                 ;;
+            *.TestCase)
+                PY_TEST_FILES+=" $f"
+                ;;
             *.rb)
                 RB_FILES+=" $f"
                 ;;
-            *.yml|*.yaml|.yamllint)
+            *.yml)
                 YML_FILES+=" $f"
                 ;;
             *)
@@ -52,6 +52,17 @@ else
     done
 fi
 
+# We ignore the following PEP8 warnings
+# * E123: closing bracket does not match indentation of opening bracket's line
+#   - Broken if multiple indentation levels start on a single line
+# * E501: line too long (82 > 79 characters)
+#   - Recommended for readability but not enforced
+#   - Some lines are awkward to wrap around a char limit
+# * W503: line break before binary operator
+#   - Quite pedantic
+
+PEP8_IGNORE="E123,E501,W503"
+
 err() {
 	echo >&2 ERROR: "$@"
 	exit 1
@@ -66,7 +77,7 @@ cmd_exists() {
 }
 
 find_command() {
-	for name in "$@"; do
+	for name in $@; do
 		for suff in "3" "-3" "-python3" ""; do
 			cmd=${name}${suff}
 			if cmd_exists $cmd; then
@@ -80,9 +91,8 @@ find_command() {
 }
 
 DASH=$(find_command dash)
-PYDOCSTYLE=$(find_command pydocstyle)
 PYFLAKES=$(find_command pyflakes)
-PYCODESTYLE=$(find_command pycodestyle pep8)
+PEP8=$(find_command pycodestyle pep8)
 RUBY=$(find_command ruby)
 YAMLLINT=$(find_command yamllint)
 
@@ -90,20 +100,19 @@ if [ "$PY_FILES $PY_TEST_FILES" != " " ]; then
     if ! $PYFLAKES $PY_FILES $PY_TEST_FILES; then
 	err "pyflakes tests failed!"
     fi
-    # ignore vendored files
-    if ! $PYDOCSTYLE --match='(?!apksigcopier|looseversion|setup|test_).*\.py' $PY_FILES $PY_TEST_FILES; then
-	err "pydocstyle tests failed!"
-    fi
 fi
 
 if [ "$PY_FILES" != "" ]; then
-    if ! $PYCODESTYLE $PY_FILES; then
+    if ! $PEP8 --ignore=$PEP8_IGNORE $PY_FILES; then
 	err "pep8 tests failed!"
     fi
 fi
 
+# The tests use a little hack in order to cleanly import the fdroidserver
+# package locally like a regular package.  pep8 doesn't see that, so this
+# makes pep8 skip E402 on the test files that need that hack.
 if [ "$PY_TEST_FILES" != "" ]; then
-    if ! $PYCODESTYLE $PY_TEST_FILES; then
+    if ! $PEP8 --ignore=$PEP8_IGNORE,E402 $PY_TEST_FILES; then
 	err "pep8 tests failed!"
     fi
 fi
@@ -127,7 +136,7 @@ for f in $RB_FILES; do
 done
 
 for f in $YML_FILES; do
-	if ! $YAMLLINT $f; then
+	if ! $YAMLLINT $f 1>/dev/null; then
 		err ".yml tests failed on $f!"
 	fi
 done
diff --git a/jenkins-build-all b/jenkins-build-all
index 5dfebbf2..6ae96767 100755
--- a/jenkins-build-all
+++ b/jenkins-build-all
@@ -62,7 +62,7 @@ vagrant global-status \
 # so we need to "manually" clone the git repo here…
 cd $WORKSPACE
 
-# set up Android SDK to use the Debian packages
+# set up Android SDK to use the Debian packages in stretch
 export ANDROID_HOME=/usr/lib/android-sdk
 
 # now build the whole archive
@@ -83,27 +83,19 @@ fi
 
 echo "build_server_always: true" > config.yml
 echo "deploy_process_logs: true" >> config.yml
+# if the local mediawiki is available, then use it
+if nc -z -w1 localhost 32445; then
+    wikiflag="--wiki"
+    echo "wiki_protocol: http" >> config.yml
+    echo "wiki_server: localhost:32445" >> config.yml
+    echo "wiki_path: /mediawiki/" >> config.yml
+    echo "wiki_user: fdroid" >> config.yml
+    echo "wiki_password: update.TestCase" >> config.yml
+else
+    sed -i '/^wiki_/d' config.yml
+fi
 
-printf '\n@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@\nbuild all with reproducible signatures\n'
-for f in metadata/*/signatures/*; do
-    appid=$(basename $(dirname $(dirname $f)))
-    versionCode=$(basename $f)
-    rm -f repo/${appid}_${versionCode}*.* archive/${appid}_${versionCode}*.* unsigned/${appid}_${versionCode}*.*
-    $WORKSPACE/fdroid build --verbose --latest --no-tarball ${appid}:$versionCode
-done
-
-printf '\n@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@\nbuild all with Binaries:\n'
-for appid in `grep '^Binaries: ' metadata/*.yml --files-with-match | sed 's,^metadata/\(.*\)\.yml$,\1,'`; do
-    rm -f repo/${appid}_*.* archive/${appid}_*.* unsigned/${appid}_*.*
-    $WORKSPACE/fdroid build --verbose --latest --no-tarball ${appid}
-done
-
-# force global timeout to 6 hours
-sed -Ei 's,^(\s+endtime\s*=\s*time\.time\(\))\s*.*,\1 + 6 * 60 * 60  # 6 hours,' \
-    $WORKSPACE/fdroidserver/build.py
-
-printf '\n@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@\nbuild all\n'
-$WORKSPACE/fdroid build --verbose --latest --no-tarball --all
+$WORKSPACE/fdroid build --verbose --latest --no-tarball --all $wikiflag
 
 vagrant global-status
 if [ -d builder ]; then
diff --git a/jenkins-setup-build-environment b/jenkins-setup-build-environment
index 95c2049a..489717b2 100755
--- a/jenkins-setup-build-environment
+++ b/jenkins-setup-build-environment
@@ -66,11 +66,13 @@ if [ `nproc` -le 6 ]; then
 else
     cpus=6
 fi
-cat <<EOF > $WORKSPACE/buildserver/Vagrantfile.yaml
-debian_mirror: https://deb.debian.org/debian/
-boot_timeout: 1200
-memory: $memory
-cpus: $cpus
+cat <<EOF > $WORKSPACE/makebuildserver.config.py
+debian_mirror = 'http://deb.debian.org/debian/'
+boot_timeout = 1200
+apt_package_cache = True
+copy_caches_from_host = True
+memory = $memory
+cpus = $cpus
 EOF
 
 cd $WORKSPACE
diff --git a/jenkins-test b/jenkins-test
index cdacea32..4ea8702b 100755
--- a/jenkins-test
+++ b/jenkins-test
@@ -29,7 +29,7 @@ fi
 set -e
 set -x
 
-# set up Android SDK to use the Debian packages
+# set up Android SDK to use the Debian packages in stretch
 export ANDROID_HOME=/usr/lib/android-sdk
 
 rm -rf "$WORKSPACE/.testfiles"
@@ -76,3 +76,5 @@ echo "repo_pubkey: 308204e1308202c9a003020102020434597643300d06092a864886f70d010
 sed -i '/^repo_pubkey: /d' config.yml
 # when everything is copied over to run on SIGN machine
 ../fdroid signindex --verbose
+
+../fdroid checkupdates --auto --autoonly --commit
diff --git a/locale/Makefile b/locale/Makefile
index 933aaf3c..1dd27274 100644
--- a/locale/Makefile
+++ b/locale/Makefile
@@ -1,10 +1,11 @@
 
-FILES = $(wildcard ../fdroidserver/*.py) \
+FILES = ../fdroid $(wildcard ../fdroidserver/*.py) \
 	$(wildcard /usr/lib/python3.*/argparse.py) \
-	../fdroid
+	$(wildcard /usr/lib/python3.*/optparse.py) \
+	$(wildcard /usr/lib/python3.*/getopt.py)
 
 # these are the supported languages
-ALL_LINGUAS = $(shell sed -En 's,include locale/([^/]+)/.*,\1,p' ../MANIFEST.in)
+ALL_LINGUAS = bo de es fr hu it ko nb_NO pl pt_BR pt_PT ru tr uk zh_Hans zh_Hant
 POFILES = $(wildcard */LC_MESSAGES/fdroidserver.po)
 MOFILES = $(ALL_LINGUAS:=/LC_MESSAGES/fdroidserver.mo)
 
@@ -12,8 +13,6 @@ TEMPLATE = fdroidserver.pot
 
 VERSION = $(shell git describe)
 
-OPTS = --no-wrap --sort-output --add-location=file
-
 default:
 	@printf "Build the translation files using: ./setup.py compile_catalog\n\n"
 
@@ -30,24 +29,18 @@ clean:
 	-rm -f -- $(MOFILES)
 	-rm -f -- $(POFILES:=~)
 
-# to remove obsolete source strings, run xgettext without --join-existing
 $(TEMPLATE): $(FILES)
 	xgettext --join-existing --from-code=UTF-8 \
 		--language=Python --keyword=_ \
-		$(OPTS) --output=$(TEMPLATE) \
+		--no-wrap --sort-output --add-location=file --output=$(TEMPLATE) \
 		--package-name="fdroidserver" --package-version=$(VERSION) \
 		--foreign-user \
 		--msgid-bugs-address=https://gitlab.com/fdroid/fdroidserver/issues \
 		$(FILES)
-	msguniq $(OPTS) --use-first \
-		--output-file=$(TEMPLATE) $(TEMPLATE)
 	sed -i 's,CHARSET,UTF-8,' $(TEMPLATE)
 
 %.po: $(TEMPLATE)
-	msgattrib --set-obsolete --ignore-file=$(TEMPLATE) -o $@ $@
-	msgattrib $(OPTS) --no-obsolete --output-file=$@ $@
-	msguniq $(OPTS) --use-first --output-file=$@ $@
-	msgmerge $(OPTS) --update $@ $(TEMPLATE)
+	msgmerge --no-wrap --sort-output --add-location=file --update $@ $(TEMPLATE)
 
 %/LC_MESSAGES/fdroidserver.mo: %/LC_MESSAGES/fdroidserver.po
 	msgfmt --check -o $@ $(@:mo=po)
diff --git a/locale/POTFILES.in b/locale/POTFILES.in
new file mode 100644
index 00000000..07ad4fcc
--- /dev/null
+++ b/locale/POTFILES.in
@@ -0,0 +1,17 @@
+fdroid
+fdroidserver/btlog.py
+fdroidserver/build.py
+fdroidserver/checkupdates.py
+fdroidserver/common.py
+fdroidserver/deploy.py
+fdroidserver/import.py
+fdroidserver/init.py
+fdroidserver/install.py
+fdroidserver/lint.py
+fdroidserver/metadata.py
+fdroidserver/publish.py
+fdroidserver/rewritemeta.py
+fdroidserver/scanner.py
+fdroidserver/stats.py
+fdroidserver/update.py
+fdroidserver/verify.py
diff --git a/locale/ar/LC_MESSAGES/fdroidserver.po b/locale/ar/LC_MESSAGES/fdroidserver.po
deleted file mode 100644
index ca0c3426..00000000
--- a/locale/ar/LC_MESSAGES/fdroidserver.po
+++ /dev/null
@@ -1,2675 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# This file is put in the public domain.
-# Ahmad0a <Ahmad3p@protonmail.com>, 2023.
-# Rex_sa <rex.sa@pm.me>, 2023.
-# PD <macstuff@pretreer.com>, 2023.
-# Laachir <LaachirDeeper@users.noreply.hosted.weblate.org>, 2024.
-# Cool Man <mcool3273@gmail.com>, 2024.
-msgid ""
-msgstr ""
-"Project-Id-Version: fdroidserver 2.1-273-g54e84d87\n"
-"Report-Msgid-Bugs-To: https://gitlab.com/fdroid/fdroidserver/issues\n"
-"POT-Creation-Date: 2025-03-25 11:36+0100\n"
-"PO-Revision-Date: 2024-09-21 19:31+0000\n"
-"Last-Translator: Cool Man <mcool3273@gmail.com>\n"
-"Language-Team: Arabic <https://hosted.weblate.org/projects/f-droid/fdroidserver/ar/>\n"
-"Language: ar\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n"
-"X-Generator: Weblate 5.8-dev\n"
-
-#: ../fdroidserver/nightly.py
-msgid ""
-"\n"
-"SSH public key to be used as deploy key:"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-#, python-brace-format
-msgid ""
-"\n"
-"{path} encoded for the DEBUG_KEYSTORE secret variable:"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-format
-msgid "\"%s/\" has no matching metadata file!"
-msgstr ""
-
-#: ../fdroidserver/index.py
-msgid "\"isPrimary\" key should not be added to mirrors!"
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "\"local_copy_dir\" {path} does not exist!"
-msgstr ""
-
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "\"{apkfilename}\" is already installed on {dev}."
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "\"{path}\" contains recent {name} ({version})"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "\"{path}\" exists but s3cmd is not installed!"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "\"{path}\" is not a supported file format (use: metadata/*.yml)"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "\"{path}\" is signed by a key that is not allowed:"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
-#, python-brace-format
-msgid "\"{url}\" is not a valid URL!"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "%(prog)s: error: %(message)s\n"
-msgstr "%(prog)s: خطأ: %(message)s\n"
-
-#: ../fdroidserver/publish.py
-#, python-format
-msgid "%d APKs failed to be signed or verified!"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-format
-msgid "%d problems found"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "%r is not callable"
-msgstr "%r غير قابل للإستدعاء"
-
-#: ../fdroidserver/signindex.py
-#, python-format
-msgid "%s did not produce a dict!"
-msgstr ""
-
-#: ../fdroidserver/signindex.py
-#, python-format
-msgid "%s has bad SHA-256: %s"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-format
-msgid "%s is not an accepted build field"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "'keypass' not found in config.yml!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "'keystore' is NONE and 'smartcardoptions' is blank!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "'keystore' not found in config.yml!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "'keystorepass' not found in config.yml!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "'repo_keyalias' not found in config.yml!"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-msgid "'required' is an invalid argument for positionals"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "'sdk_path' not set in config.yml!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "'{aapt}' is too old, fdroid requires build-tools-{version} or newer!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "'{path}' failed to execute!"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "'{path}' has invalid format, it should be a dictionary!"
-msgstr ""
-
-#: ../fdroidserver/lint.py ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "'{value}' is not a valid {field} in {appid}. Regex pattern: {pattern}"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "'{value}' is not a valid {field}, should be {pattern}"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "--merge-request only runs on a single appid!"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "...checkupdate failed for {appid} : {error}"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-msgid ".__call__() not defined"
-msgstr ".__call__() غير محدد"
-
-#: ../fdroidserver/lint.py
-msgid "/issues is missing"
-msgstr ""
-
-#: ../fdroidserver/mirror.py
-msgid "A URL is required as an argument!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "APK signatures have different certificates in {path}:"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Add PGP signatures using GnuPG for packages in repo"
-msgstr ""
-
-#: ../fdroidserver/update.py
-msgid "Add a repo signing key to an unsigned repo"
-msgstr ""
-
-#: ../fdroidserver/update.py
-msgid "Add skeleton metadata files for APKs that are missing them"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Adding new repo for only {name}"
-msgstr ""
-
-#: ../fdroidserver/init.py
-msgid "Alias of the repo signing key in the keystore"
-msgstr ""
-
-#: ../fdroidserver/build.py
-msgid "AllowedAPKSigningKeys missing but reference binary supplied"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
-msgid "Allows a different revision (or git branch) to be specified for the initial import"
-msgstr ""
-
-#: ../fdroidserver/mirror.py
-msgid "Also mirror the full archive section"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Also warn about formatting issues, like rewritemeta -l"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "Android AAR library"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "Android APK file"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "Android DEX code"
-msgstr ""
-
-#: ../fdroidserver/init.py
-#, python-brace-format
-msgid "Android SDK not found at {path}!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Android SDK path '{path}' does not exist!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Android SDK path '{path}' is not a directory!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Android SDK tool {cmd} not found!"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "App has Binaries but does not have corresponding AllowedAPKSigningKeys to pin certificate."
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "App has NoSourceSince or ArchivePolicy \"0 versions\" or 0 but AutoUpdateMode or UpdateCheckMode are not None"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "App is in '{repo}' but has a link to {url}"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "App version has binary but does not have corresponding AllowedAPKSigningKeys to pin certificate."
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Appending .git is not necessary"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Archiving {apkfilename} with invalid signature!"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "AutoUpdateMode with UpdateCheckMode: HTTP must have a pattern."
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "Automatic no to all prompts."
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "Automatic yes to all prompts."
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "Bad entry type \"{mirrortype}\" in mirrors config: {mirror}"
-msgstr ""
-
-#: ../fdroidserver/mirror.py
-msgid "Base URL to mirror, can include the index signing key using the query string: ?fingerprint="
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Branch '{branch}' used as commit in build '{versionName}'"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Branch '{branch}' used as commit in srclib '{srclib}'"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Broken symlink: {path}"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Build a package from source"
-msgstr "بناء الحزمة من المصدر"
-
-#: ../fdroidserver/build.py
-msgid "Build all applications available"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Build generated by `fdroid import` - remove disable line once ready"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "Build metadata git repo has uncommited changes!"
-msgstr ""
-
-#: ../fdroidserver/build.py
-msgid "Build only the latest version of each package"
-msgstr ""
-
-#: ../fdroidserver/init.py
-#, python-format
-msgid "Built repo based in \"%s\" with this config:"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "Can't auto-update app with no CurrentVersionCode"
-msgstr ""
-
-#: ../fdroidserver/build.py
-msgid "Can't build due to {} error while scanning"
-msgid_plural "Can't build due to {} errors while scanning"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../fdroidserver/rewritemeta.py
-#, python-brace-format
-msgid "Cannot rewrite \"{path}\""
-msgstr ""
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
-#: ../fdroidserver/lint.py
-#, python-format
-msgid "Categories '%s' is not valid"
-msgstr ""
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
-#: ../fdroidserver/lint.py
-msgid "Categories are not set"
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "Category \"{category}\" defined but not used for any apps!"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Check for updates to applications"
-msgstr "تحقق من وجود تحديثات للتطبيقات"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Checking archiving for {appid} - apks:{integer}, keepversions:{keep}, archapks:{arch}"
-msgstr ""
-
-#: ../fdroidserver/update.py
-msgid "Clean update - don't uses caches, reprocess all APKs"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Color the log output"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
-msgid "Comma separated list of categories."
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-#, python-format
-msgid "Command '%s' not recognised.\n"
-msgstr "اﻷمر '%s' لم يتم التعرف عليه.\n"
-
-#: ../fdroidserver/checkupdates.py
-msgid "Commit changes"
-msgstr "التزم بالتغييرات"
-
-#: ../fdroidserver/checkupdates.py
-msgid "Commit changes, push, then make a merge request"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Conflicting \"{field}\" definitions between .yml and localized files:"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Conflicting arguments: '--verbose' and '--quiet' can not be specified at the same time."
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Could not find '{command}' on your system"
-msgstr ""
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/import_subcommand.py
-msgid "Could not find latest version code"
-msgstr ""
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
-#: ../fdroidserver/import_subcommand.py
-msgid "Could not find latest version name"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Could not find {path} to remove it"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Could not open APK {path} for analysis: "
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Could not parse size \"{size}\", wrong type \"{type}\""
-msgstr ""
-
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/import_subcommand.py
-msgid "Couldn't find Application ID"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "Couldn't find any version information"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "Couldn't find package ID"
-msgstr ""
-
-#: ../fdroidserver/update.py
-msgid "Cowardily refusing to overwrite existing signing key setup!"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Created new container \"{name}\""
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Creating \"{path}\" for configuring s3cmd."
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Creating empty {config_file}"
-msgstr ""
-
-#: ../fdroidserver/publish.py
-msgid "Creating log directory"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Creating new S3 bucket: {url}"
-msgstr ""
-
-#: ../fdroidserver/publish.py
-msgid "Creating output directory"
-msgstr ""
-
-#: ../fdroidserver/index.py
-msgid "Creating signed index with this key (SHA256):"
-msgstr ""
-
-#: ../fdroidserver/publish.py ../fdroidserver/verify.py
-msgid "Creating temporary directory"
-msgstr ""
-
-#: ../fdroidserver/index.py
-msgid "Creating unsigned index in preparation for signing"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "CurrentVersionCode {cv} is less than oldest build entry {versionCode}"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-msgid "DEBUG_KEYSTORE is not set or the value is incomplete"
-msgstr ""
-
-#: ../fdroidserver/update.py
-msgid "Delete APKs and/or OBBs without metadata from the repo"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Deleting archive, repo is too big ({size} max {limit})"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Deleting git-mirror history, repo is too big ({size} max {limit})"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Deleting unknown file: {path}"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-format
-msgid "Description '%s' is just the app's summary"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Description has a duplicate line"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Description of length {length} is over the {limit} char limit"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Did you mean config/{name}.yml?"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Did you mean {code}?"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
-msgid "Do not add 'disable:' to the generated build entries"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-msgid "Do not deploy the new files to the repo"
-msgstr ""
-
-#: ../fdroidserver/mirror.py
-#, python-brace-format
-msgid "Do not include \"{path}\" in URL!"
-msgstr ""
-
-#: ../fdroidserver/init.py
-msgid "Do not prompt for Android SDK path, just fail"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-msgid "Do not remove the private keys generated from the keystore"
-msgstr ""
-
-#: ../fdroidserver/build.py
-msgid "Don't create a source tarball, useful when testing a build"
-msgstr ""
-
-#: ../fdroidserver/build.py
-msgid "Don't refresh the repository, useful when testing a build with no internet connection"
-msgstr ""
-
-#: ../fdroidserver/deploy.py ../fdroidserver/nightly.py
-msgid "Don't use rsync checksums"
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "Download F-Droid.apk using mirrors that leak less to the network"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Download complete mirrors of small repos"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Downloading the repository already failed once, not trying again."
-msgstr ""
-
-#: ../fdroidserver/verify.py
-#, python-brace-format
-msgid "Downloading {url} failed. {error}"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Duplicate Anti-Feature declaration at {path} was ignored!"
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-format
-msgid "Duplicate entry \"%s\" in mirrors config!"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Duplicate link in '{field}': {url}"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-format
-msgid "ERROR: %(message)s"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "ERROR: The \"server\" subcommand has been removed, use \"deploy\"!"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-msgid "ERROR: unsupported CI type, patches welcome!"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-#, python-format
-msgid "ERROR: unsupported git host \"%s\", patches welcome!"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "ERROR: {key} in {path} is not \"archive\" or \"repo\"!"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "ERROR: {key} not a valid key!"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "ERROR: {key}'s value should be of type {t}!"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "ERROR: {key}:{subkey} in {path} is not in allowed keys: {allowed_keys}!"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-#, python-brace-format
-msgid "Encoding is set to '{enc}' fdroid might run into encoding issues. Please set it to 'UTF-8' for best results."
-msgstr ""
-
-#: ../fdroidserver/init.py
-#, python-format
-msgid ""
-"Enter the path to the Android SDK (%s) here:\n"
-"> "
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Environment variable {var} from {configname} is not set!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Environment variable {{env: {var}}} is not set!"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "Error deploying 'github_releases', {} not present. (You might need to run `fdroid update` first.)"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
-msgid "Error while getting repo address"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "Exit with a non-zero code if problems were found"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Extract application metadata from a source repository"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Extract signatures from APKs"
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "F-Droid.apk could not be downloaded from any known source!"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Failed copying {path}: {error}"
-msgstr ""
-
-#: ../fdroidserver/signatures.py
-#, python-brace-format
-msgid "Failed fetching signatures for '{apkfilename}': {error}"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Failed reading {path}: {error}"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Failed resizing {path}: {error}"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Failed to create S3 bucket: {url}"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Failed to get APK information, deleting {path}"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Failed to get APK information, skipping {path}"
-msgstr ""
-
-#: ../fdroidserver/update.py
-msgid "Failed to get APK signing key fingerprint"
-msgstr ""
-
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "Failed to install '{apkfilename}' on {dev}: {error}"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Failed to sign application"
-msgstr ""
-
-#: ../fdroidserver/build.py
-#, python-brace-format
-msgid "Fetched buildserverid from VM: {buildserverid}"
-msgstr ""
-
-#: ../fdroidserver/signatures.py
-#, python-brace-format
-msgid "Fetched signatures for '{apkfilename}' -> '{sigdir}'"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "File disappeared while processing it: {path}"
-msgstr ""
-
-#: ../fdroidserver/build.py ../fdroidserver/install.py
-#: ../fdroidserver/rewritemeta.py ../fdroidserver/scanner.py
-#: ../fdroidserver/update.py
-msgid "Finished"
-msgstr "تم الانتهاء"
-
-#: ../fdroidserver/lint.py
-msgid "Forbidden HTML tags"
-msgstr ""
-
-#: ../fdroidserver/build.py
-msgid "Force build of disabled apps, and carries on regardless of scan problems. Only allowed in test mode."
-msgstr ""
-
-#: ../fdroidserver/build.py
-#, python-brace-format
-msgid "Force halting build after {0} sec timeout!"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "Force scan of disabled apps and builds."
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Found \"{path}\" graphic without metadata for app \"{name}\"!"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Found bad funding file \"{path}\" for \"{name}\":"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Found invalid appids in arguments"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Found invalid versionCodes for some apps"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Found multiple JAR Signature Block Files in {path}"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Found multiple Signer Certificates!"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Found multiple metadata files for {appid}"
-msgstr ""
-
-#: ../fdroidserver/index.py
-msgid "Found multiple signing certificates for repository."
-msgstr ""
-
-#: ../fdroidserver/index.py
-msgid "Found no signing certificates for repository."
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-format
-msgid "Found non-file at %s"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Found {apkfilename} at {url}"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Found {count} problems in {filename}"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Found {count} warnings in {filename}"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Generated skeleton metadata for {appid}"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-format
-msgid "Git checkout of '%s' failed"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Git clean failed"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Git fetch failed"
-msgstr ""
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/common.py
-#, python-format
-msgid "Git remote set-head failed: \"%s\""
-msgstr ""
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/common.py
-msgid "Git reset failed"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Git submodule deinit failed"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Git submodule sync failed"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Git submodule update failed"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "HTTPS must be used with Subversion URLs!"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "If a git mirror gets to big, allow the archive to be deleted"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "If this upload fails, try manually uploading to {url}"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Ignoring '{field}' in '{metapath}' metadata because it is deprecated."
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-format
-msgid "Ignoring FUNDING.yml entry longer than 2048: %s"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-format
-msgid "Ignoring bad element in manifest: %s"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Ignoring deprecated {oldfile}, use {newfile}!"
-msgstr ""
-
-#: ../fdroidserver/index.py
-msgid "Ignoring package without metadata: "
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Ignoring stale cache data for {apkfilename}"
-msgstr ""
-
-#: ../fdroidserver/update.py
-msgid "Include APKs that are signed with disabled algorithms like MD5"
-msgstr ""
-
-#: ../fdroidserver/mirror.py
-msgid "Include the PGP signature .asc files in the mirror"
-msgstr ""
-
-#: ../fdroidserver/mirror.py
-msgid "Include the build logs in the mirror"
-msgstr ""
-
-#: ../fdroidserver/mirror.py
-msgid "Include the source tarballs in the mirror"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-format
-msgid "Including metadata from %s@%s"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Including metadata from {path}"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Initialising submodules"
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "Install all signed applications available"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Install built packages on devices"
-msgstr "تثبيت الحزم المدمجة على الأجهزة"
-
-#: ../fdroidserver/install.py
-#, python-format
-msgid "Installing %s..."
-msgstr ""
-
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "Installing '{apkfilename}' on {dev}..."
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Interact with the repo HTTP server"
-msgstr "التفاعل مع خادم HTTP للمستودع"
-
-#: ../fdroidserver/update.py
-msgid "Invalid APK"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "Invalid AutoUpdateMode: {mode}"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "Invalid UpdateCheckMode: {mode}"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "Invalid VercodeOperation: {field}"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Invalid VercodeOperation: {invalid_ops}"
-msgstr ""
-
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Invalid application ID {appid}"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Invalid bulleted list"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-format
-msgid "Invalid name for published file: %s"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Invalid ndk: entry in build: \"{ndk}\""
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Invalid redirect to non-HTTPS: {before} -> {after} "
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Invalid scrlib metadata: '{file}' does not exist"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Invalid srclib metadata: could not parse '{file}'"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Invalid srclib metadata: unknown key '{key}' in '{file}'"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "JAR signature failed to verify: {path}"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "JAR signature verified: {path}"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "Java JAR file"
-msgstr ""
-
-#: ../fdroidserver/mirror.py ../fdroidserver/publish.py
-#: ../fdroidserver/update.py
-msgid "Java JDK not found! Install in standard location or set java_paths!"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "Java compiled class"
-msgstr ""
-
-#: ../fdroidserver/signindex.py
-msgid "Java jarsigner not found! Install in standard location or set java_paths!"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Javascript in HTML src attributes"
-msgstr ""
-
-#: ../fdroidserver/build.py
-#, python-brace-format
-msgid "Keeping failed build \"{apkfilename}\""
-msgstr ""
-
-#: ../fdroidserver/init.py
-msgid "Keystore for signing key:\t"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Known debug key is used in AllowedAPKSigningKeys: "
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Last used commit '{commit}' looks like a tag, but UpdateCheckMode is '{ucm}'"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Liberapay donation methods belong in the Liberapay: field"
-msgstr ""
-
-#: ../fdroidserver/rewritemeta.py
-msgid "List files that would be reformatted (dry run)"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Locale included in f-droid.org URL"
-msgstr ""
-
-#: ../fdroidserver/build.py
-msgid "Make the build stop on exceptions"
-msgstr ""
-
-#: ../fdroidserver/index.py
-msgid "Malformed repository mirrors."
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "Malformed serverwebroot line:"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-format
-msgid "Max recursion depth in ZIP file reached: %s"
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "Mirror config for {url} contains \"isPrimary\" key!"
-msgstr ""
-
-#: ../fdroidserver/mirror.py
-msgid "Mirror the full repo and archive, all file types."
-msgstr ""
-
-#: ../fdroidserver/gpgsign.py
-msgid "Missing output directory"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-msgid "Moving Anti-Features declarations to localized files:"
-msgstr ""
-
-#: ../fdroidserver/index.py
-msgid "Neither \"repo_pubkey\" nor \"keystorepass\" set in config.yml"
-msgstr ""
-
-#: ../fdroidserver/verify.py
-#, python-format
-msgid "No APK for package: %s"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "No Android SDK found!"
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "No attached devices found"
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "No devices found for `adb install`! Please plug one in."
-msgstr ""
-
-#: ../fdroidserver/index.py
-msgid "No fingerprint in URL."
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "No git submodules available"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
-msgid "No gradle project could be found. Specify --subdir?"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
-msgid "No information found."
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "No matching tags found"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "No minimum SDK version found in {0}, using default (3)."
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "No need to specify that the app is Free Software"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "No need to specify that the app is for Android"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "No option set! Edit your config.yml to set at least one of these:"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "No packages specified"
-msgstr ""
-
-#: ../fdroidserver/install.py
-#, python-format
-msgid "No signed APK available for %s"
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "No signed output directory - nothing to do"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "No signing certificates found in {path}"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-format
-msgid "No such package: %s"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "No such versionCode {versionCode} for app {appid}"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "No tags found"
-msgstr ""
-
-#: ../fdroidserver/publish.py ../fdroidserver/verify.py
-msgid "No unsigned directory - nothing to do"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-#, fuzzy
-msgid "No version information could be found."
-msgstr "لم يتم العثور على معلومات النسخة"
-
-#: ../fdroidserver/common.py
-msgid "Not a valid size definition: \"{}\""
-msgstr ""
-
-#: ../fdroidserver/signindex.py
-msgid "Nothing to do"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "Nothing to do for {appid}."
-msgstr ""
-
-#: ../fdroidserver/init.py
-msgid "Now set these in config.yml:"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "OBB file has newer versionCode({integer}) than any APK:"
-msgstr ""
-
-#: ../fdroidserver/update.py
-msgid "OBB filename must start with \"main.\" or \"patch.\":"
-msgstr ""
-
-#: ../fdroidserver/update.py
-msgid "OBB's packagename does not match a supported APK:"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "Offline machine, skipping git mirror generation until `fdroid deploy`"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "One of the 'github_releases' config items is missing the 'packageNames' value. skipping ..."
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "One of the 'github_releases' config items is missing the 'projectUrl' value. skipping ..."
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "One of the 'github_releases' config items is missing the 'token' value. skipping ..."
-msgstr ""
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Only PNG and JPEG are supported for graphics, found: {path}"
-msgstr ""
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/common.py
-msgid "Only accepts a single key \"env\""
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "Only process apps with auto-updates"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "OpenCollective donation methods belong in the OpenCollective: field"
-msgstr ""
-
-#: ../fdroidserver/verify.py
-msgid "Output JSON report to file named after APK."
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "Output JSON to stdout."
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py ../fdroidserver/gpgsign.py
-#: ../fdroidserver/publish.py ../fdroidserver/signindex.py
-#: ../fdroidserver/update.py
-msgid "Outputting JSON"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
-msgid "Overall license of the project."
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "Overriding blank versionName in {apkfilename} from metadata: {version}"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
-#, python-brace-format
-msgid "Package \"{appid}\" already exists"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Parsing manifest at '{path}'"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Password required with username"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
-msgid "Path to main Android project subdirectory, if not in root."
-msgstr ""
-
-#: ../fdroidserver/init.py
-msgid "Path to the Android SDK (sometimes set in ANDROID_HOME)"
-msgstr ""
-
-#: ../fdroidserver/btlog.py
-msgid "Path to the git repo to use as the log"
-msgstr ""
-
-#: ../fdroidserver/init.py
-msgid "Path to the keystore for the repo signing key"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-msgid "Print the secret variable to the terminal for easy copy/paste"
-msgstr ""
-
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "Privacy mode was enabled based on your locale ({country_code})."
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-format
-msgid "Problem with ZIP file: %s, error %s"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Problem with xml at '{path}'"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "Process auto-updates"
-msgstr ""
-
-#: ../fdroidserver/publish.py ../fdroidserver/update.py
-#, python-brace-format
-msgid "Processing {apkfilename}"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Processing {appid}"
-msgstr ""
-
-#: ../fdroidserver/update.py
-msgid "Produce human-readable XML/JSON for index files"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
-msgid "Project URL to import from."
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Punctuation should be avoided"
-msgstr ""
-
-#: ../fdroidserver/btlog.py
-msgid "Push the log to this git remote repository"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Pushing binary transparency log to {url}"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "Pushing to remote server failed!"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Pushing to {url}"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Quickly start a new repository"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Read all the metadata files and exit"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Reading '{config_file}'"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Reading packageName/versionCode/versionName failed, APK invalid: '{apkfilename}'"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Reading packageName/versionCode/versionName failed,APK invalid: '{apkfilename}'"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Reading {apkfilename} from cache"
-msgstr ""
-
-#: ../fdroidserver/build.py
-msgid "Refresh and cache scanner rules and signatures from the network"
-msgstr ""
-
-#: ../fdroidserver/publish.py
-#, python-brace-format
-msgid "Refusing to sign '{path}', file exists in both {dir1} and {dir2} folder."
-msgstr ""
-
-#: ../fdroidserver/verify.py
-msgid "Remove source tarball and any APKs if successfully verified."
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Removing specified files"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Removing {path}\""
-msgstr ""
-
-#: ../fdroidserver/update.py
-msgid "Rename APK files that do not match package.name_123.apk"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-#, python-brace-format
-msgid "Resigning {apkfilename} with provided debug.keystore"
-msgstr ""
-
-#: ../fdroidserver/update.py
-msgid "Resize all the icons exceeding the max pixel size and exit"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Restrict output to warnings and errors"
-msgstr ""
-
-#: ../fdroidserver/net.py
-#, python-format
-msgid "Retrying failed download: %s"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Rewrite all the metadata files"
-msgstr ""
-
-#: ../fdroidserver/rewritemeta.py
-#, python-brace-format
-msgid "Rewriting '{appid}'"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "Run on git repo that has uncommitted changes"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-#, python-brace-format
-msgid "Run over {cibase} to find -debug.apk. and skip repo_basedir {repo_basedir}"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Run rewritemeta to fix formatting"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "Running first pass with MD5 checking disabled"
-msgstr ""
-
-#: ../fdroidserver/mirror.py
-#, python-brace-format
-msgid "Running wget in {path}"
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "SHA-256 of {url} does not match entry!"
-msgstr ""
-
-#: ../fdroidserver/build.py
-msgid "Scan the resulting APK(s) for known non-free classes."
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Scan the source code of a package"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Scanner found {count} problems in {apk}"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Scanner found {count} problems in {appid}:"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Scanner found {count} problems in {appid}:{versionCode}:"
-msgstr ""
-
-#: ../fdroidserver/build.py
-msgid "Scanner found {} problem"
-msgid_plural "Scanner found {} problems"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../fdroidserver/scanner.py
-msgid "Scanning APK for extra signing blocks."
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "Scanning APK with dexdump for known non-free classes."
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Set NDK {release} ({version}) up"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Set clock to that time using:"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-msgid "Set maximum releases in repo before older ones are archived"
-msgstr ""
-
-#: ../fdroidserver/build.py
-#, python-brace-format
-msgid "Set open file limit to {integer}"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Set up an app build for a nightly build repo"
-msgstr ""
-
-#: ../fdroidserver/build.py
-msgid "Setting open file limit failed: "
-msgstr ""
-
-#: ../fdroidserver/build.py
-#, python-brace-format
-msgid "Setting {0} sec timeout for this build"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Sign and place packages in the repo"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Sign indexes created using update --nosign"
-msgstr ""
-
-#: ../fdroidserver/build.py
-msgid "Skip scanning the source code for binaries and other problems"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Skipping '{apkfilename}' with invalid signature!"
-msgstr ""
-
-#: ../fdroidserver/deploy.py ../fdroidserver/index.py
-#, python-format
-msgid "Skipping GitLab Pages mirror because the repo is too large (>%.2fGB)!"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Skipping index generation for {appid}"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Skipping {apkfilename} with invalid signature!"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Skipping {appid}: disabled"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "Specify a local folder to sync the repo to"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "Specify an identity file to provide to SSH for rsyncing"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-msgid "Specify which debug keystore file to use."
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Spew out even more information than normal"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-#, python-brace-format
-msgid "Stripping mystery signature from {apkfilename}"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-format
-msgid "Summary '%s' is just the app's name"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Summary of length {length} is over the {limit} char limit"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "System clock is older than date in {path}!"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "Tags update mode only works for git, hg, bzr and git-svn repositories currently"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "Tags update mode used in git-svn, but the repo was not set up with tags"
-msgstr ""
-
-#: ../fdroidserver/build.py
-msgid "Test mode - put output in the tmp directory only, and always build, even if the output already exists."
-msgstr ""
-
-#: ../fdroidserver/index.py
-msgid "The \"qrcode\" Python package is not installed (e.g. apt-get install python3-qrcode)!"
-msgstr ""
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "The OBB version code must come after \"{name}.\":"
-msgstr ""
-
-#: ../fdroidserver/btlog.py
-msgid "The base URL for the repo to log (default: https://f-droid.org)"
-msgstr ""
-
-#: ../fdroidserver/mirror.py
-msgid "The directory to write the mirror to"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-msgid "The file to be included in the repo (path or glob)"
-msgstr ""
-
-#: ../fdroidserver/index.py
-msgid "The repository's fingerprint does not match."
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "The root dir for local_copy_dir \"{path}\" does not exist!"
-msgstr ""
-
-#: ../fdroidserver/publish.py
-msgid "There is a keyalias collision - publishing halted"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "These are the apps that have been archived from the main repo."
-msgstr ""
-
-#: ../fdroidserver/mirror.py
-msgid "This command should never be used to mirror f-droid.org! A full copy requires more than 600GB."
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "This is a repository of apps to be used with F-Droid. Applications in this repository are either official binaries built by the original application developers, or are binaries built from source by the admin of f-droid.org using the tools on https://gitlab.com/fdroid."
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
-#, python-format
-msgid "This repo already has local metadata: %s"
-msgstr ""
-
-#: ../fdroidserver/init.py
-#, python-format
-msgid ""
-"To complete the setup, add your APKs to \"%s\"\n"
-"then run \"fdroid update -c; fdroid update\".  You might also want to edit\n"
-"\"config.yml\" to set the URL, repo name, and more.  You should also set up\n"
-"a signing key (a temporary one might have been automatically generated).\n"
-"\n"
-"For more info: https://f-droid.org/docs/Setup_an_F-Droid_App_Repo\n"
-"and https://f-droid.org/docs/Signing_Process"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "To use awsbucket, awssecretkey and awsaccesskeyid must also be set in config.yml!"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "To use rclone, rclone_config and awsbucket must be set in config.yml!"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "URL must start with https:// or http://"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "URL shorteners should not be used"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "URL {url} in Description: {error}"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Unexpected license tag \"{}\"! Only use FSF or OSI approved tags from https://spdx.org/license-list"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Unexpected license tag \"{}\"! Only use license tags configured in your config file"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Unknown entry {key} in {configname}"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Unknown exception found!"
-msgstr "تم العثور على استثناء غير معروف!"
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Unknown file '{filename}' in build '{versionName}'"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-format
-msgid "Unknown metadata format: %s"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Unknown metadata format: {path} (use: *.yml)"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Unknown version of aapt, might cause problems: "
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Unnecessary leading space"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Unnecessary trailing space"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Unrecognised app field '{fieldname}' in '{path}'"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Unrecognised build flag '{build_flag}' in '{path}'"
-msgstr ""
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Unsupported file type \"{extension}\" for repo graphic"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Unsupported graphics file found: {path}"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-format
-msgid "Unused extlib at %s"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-format
-msgid "Unused file at %s"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-format
-msgid "Unused scandelete path: %s"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-format
-msgid "Unused scanignore path: %s"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Update repo information for new packages"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Update the binary transparency log for a URL"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "UpdateCheckData has invalid URL: {url}"
-msgstr ""
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "UpdateCheckData must match the version code as integer (\\d or [0-9]): {codeex}"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "UpdateCheckData must use HTTPS URL: {url}"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "UpdateCheckData not a valid URL: {url}"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "UpdateCheckMode is set but it looks like checkupdates hasn't been run yet."
-msgstr ""
-
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/lint.py
-msgid "UpdateCheckName is set to the known application ID, it can be removed"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Uploading {apkfilename} to androidobservatory.org"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Uploading {apkfilename} to virustotal"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Use /HEAD instead of /master or /main to point at a file in the default branch"
-msgstr ""
-
-#: ../fdroidserver/update.py
-msgid "Use `fdroid update -c` to create it."
-msgstr ""
-
-#: ../fdroidserver/build.py
-msgid "Use build server"
-msgstr ""
-
-#: ../fdroidserver/update.py
-msgid "Use date from APK instead of current time for newly added APKs"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Using \"{path}\" for configuring s3cmd."
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Using \"{path}\" for syncing with remote storage."
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Using APK Signature v2"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Using APK Signature v3"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Using JAR Signature"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Using Java's jarsigner, not recommended for verifying APKs! Use apksigner"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Using blank dictionary instead of contents of {path}!"
-msgstr ""
-
-#: ../fdroidserver/init.py
-#, python-brace-format
-msgid "Using existing keystore \"{path}\""
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Using rclone to sync with: {url}"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Using s3cmd to sync with: {url}"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Valid commands are:"
-msgstr "الأوامر الصالحة هي:"
-
-#: ../fdroidserver/verify.py
-msgid "Verify against locally cached copy rather than redownloading."
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Verify the integrity of downloaded packages"
-msgstr ""
-
-#: ../fdroidserver/index.py
-msgid "Verifying index signature:"
-msgstr ""
-
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "Verifying package {path} with apksigner."
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "VirusTotal API key cannot upload files larger than 32MB, use {url} to upload {path}."
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Warn about possible metadata errors"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "WebAssembly binary file"
-msgstr ""
-
-#: ../fdroidserver/update.py
-msgid "When configured for signed indexes, create only unsigned indexes at this stage"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "When linting the entire repository yamllint is disabled by default. This option forces yamllint regardless."
-msgstr ""
-
-#: ../fdroidserver/publish.py
-msgid "When signing or verifying fails, exit with an error code."
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "Would you like to download and install F-Droid.apk via adb? (YES/no)"
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "Would you like to download the app(s) from f-droid.org? (YES/no)"
-msgstr ""
-
-#: ../fdroidserver/init.py
-msgid "X.509 'Distinguished Name' used when generating keys"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "You can use ANDROID_HOME to set the path to your SDK, i.e.:"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "ZIP file archive"
-msgstr ""
-
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "adb reports {serial} is \"{status}\"!"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-#, python-brace-format
-msgid "adding IdentityFile to {path}"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "adding to {name}: {path}"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "ambiguous option: %(option)s could match %(matches)s"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "apksigner in build-tools;{version} passes APKs with invalid v3 signatures, ignoring."
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "apksigner not found! Cannot sign or verify modern APKs"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "apksigner not found, it's required for signing!"
-msgstr ""
-
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/checkupdates.py ../fdroidserver/lint.py
-#: ../fdroidserver/rewritemeta.py
-msgid "application ID of file to operate on"
-msgstr ""
-
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/build.py ../fdroidserver/install.py
-#: ../fdroidserver/publish.py ../fdroidserver/scanner.py
-#: ../fdroidserver/verify.py
-msgid "application ID with optional versionCode in the form APPID[:VERCODE]"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "archive_url needs to end with /archive"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "argument \"-\" with mode %r"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "argument %(argument_name)s: %(message)s"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-msgid "attempting bare SSH connection to test deploy key:"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "can not parse scrlib spec (not a string): '{}'"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "can't open '%(filename)s': %(error)s"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "can't open non-https url: '{};"
-msgstr ""
-
-#: ../fdroidserver/build.py
-#, python-brace-format
-msgid "cannot find required srclibs: \"{path}\""
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-msgid "cannot have multiple subparser arguments"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "cannot merge actions - two groups are named %r"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-msgid "cannot publish update, did you set the deploy key?"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-#, python-brace-format
-msgid "cloning {url}"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "commands from plugin modules:"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "conflicting option string: %s"
-msgid_plural "conflicting option strings: %s"
-msgstr[0] ""
-msgstr[1] ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "conflicting subparser alias: %s"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "conflicting subparser: %s"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "could not parse '{path}'"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "could not parse srclib spec (no name specified): '{}'"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "could not parse srclib spec (no ref specified): '{}'"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-#, python-brace-format
-msgid "created {path}"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "current version is newer: old vercode={old}, new vercode={new}"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "deleting: repo/{apkfilename}"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "dependency file without lock"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "deployed process log {path} to {dest}"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "dest= is required for options like %r"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, fuzzy
-msgid "downloading '{}'"
-msgstr "جاري التحميل %s"
-
-#: ../fdroidserver/scanner.py
-msgid "downloading scanner signatures from '{}' failed"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "executable binary, possibly code"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "expected %s argument"
-msgid_plural "expected %s arguments"
-msgstr[0] ""
-msgstr[1] ""
-
-#: /usr/lib/python3.11/argparse.py
-msgid "expected at least one argument"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-msgid "expected at most one argument"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-msgid "expected one argument"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "fdroid [<command>] [-h|--help|--version|<args>]"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "fetch the latest version of signatures from the web"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-msgid "force metadata errors (default) to be warnings, or to be ignored."
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "git svn clone failed"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "gzip file archive"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "ignored explicit argument %r"
-msgstr ""
-
-#: ../fdroidserver/index.py
-msgid "index-v1 must have a signature, use `fdroid signindex` to create it!"
-msgstr ""
-
-#: ../fdroidserver/index.py
-msgid "index-v2 must have a signature, use `fdroid signindex` to create it!"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "invalid %(type)s value: %(value)r"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "invalid choice: %(value)r (choose from %(choices)s)"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "invalid conflict_resolution value: %r"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "invalid option string %(option)r: must start with a character %(prefix_chars)r"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "ipfs_cid not found, skipping CIDv1 generation"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "latest build recipe is newer: old vercode={old}, new vercode={new}"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "local_copy_dir does not end with \"fdroid\", perhaps you meant: \"{path}\""
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "local_copy_dir must be an absolute path!"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "local_copy_dir must be directory, not a file!"
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-format
-msgid "mirror '%s' does not end with 'fdroid'!"
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "mirrors set twice, in config.yml and {path}!"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-msgid "mutually exclusive arguments must be optional"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "next {name} cache update due in {time}"
-msgstr ""
-
-#: ../fdroidserver/mirror.py
-#, python-brace-format
-msgid "no \"icon\" in {appid}"
-msgstr "لا يوجد \"أيقونة\" في {appid}"
-
-#: ../fdroidserver/signatures.py
-msgid "no APK supplied"
-msgstr "لم يتم توفير ملف APK"
-
-#: ../fdroidserver/checkupdates.py
-msgid "no version information found"
-msgstr "لم يتم العثور على معلومات النسخة"
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "not allowed with argument %s"
-msgstr "غير مسموح به مع الوسيط %s"
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "one of the arguments %s is required"
-msgstr "أحد الوسائط %s مطلوب"
-
-#: ../fdroidserver/common.py ../fdroidserver/index.py
-msgid "only accepts strings, lists, and tuples"
-msgstr "يقبل فقط السلاسل والقوائم والأنساق"
-
-#: /usr/lib/python3.11/argparse.py
-#, fuzzy
-msgid "options"
-msgstr "خيارات"
-
-#: ../fdroidserver/nightly.py
-#, python-brace-format
-msgid "overwriting existing {path}"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-msgid "positional arguments"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "process log deploy {path} to {dest} failed!"
-msgstr ""
-
-#: ../fdroidserver/build.py
-msgid "reference binary missing signature"
-msgstr ""
-
-#: ../fdroidserver/signatures.py
-#, python-brace-format
-msgid "refuse downloading via insecure HTTP connection (use HTTPS or specify --no-https-check): {apkfilename}"
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-format
-msgid "repo_icon \"repo/icons/%s\" does not exist, generating placeholder."
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "repo_url needs to end with /repo"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "rsync is missing or broken: {error}"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "s3cmd sync indexes {path} to {url} and delete"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "s3cmd syncs indexes from {path} to {url} and deletes removed"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "scanner cache is malformed! You can clear it with: '{clear}'"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "serverwebroot: path does not end with \"fdroid\", perhaps you meant one of these:"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "shared library"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-msgid "show this help message and exit"
-msgstr "اظهر رسالة المساعدة واخرج"
-
-#: ../fdroidserver/signatures.py
-msgid "signed APK, either a file-path or HTTPS URL."
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "skip deploying full build logs: log content is empty"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "skip deploying full build logs: not enabled in config"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "skipping source tarball: {path}"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "srclibs missing name and/or @"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "static library"
-msgstr ""
-
-#: ../fdroidserver/build.py
-#, python-brace-format
-msgid "supplied reference binary has allowed signer {signer}"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "the following arguments are required: %s"
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "true"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "unexpected option string: %s"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "unknown parser %(parser_name)r (choices: %(choices)s)"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "unrecognized arguments: %s"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "unsafe permissions on '{config_file}' (should be 0600)!"
-msgstr ""
-
-#: ../fdroidserver/__main__.py /usr/lib/python3.11/argparse.py
-msgid "usage: "
-msgstr "الإستخدام: "
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "using Apache libcloud to sync with {url}"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "virustotal.com is rate limiting, waiting to retry..."
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "yes"
-msgstr ""
-
-#: ../fdroidserver/publish.py
-#, python-brace-format
-msgid "{0} app, {1} key aliases"
-msgid_plural "{0} apps, {1} key aliases"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{apkfilename} ({appid}) has no metadata!"
-msgstr ""
-
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{apkfilename}'s AndroidManifest.xml has a bad date: "
-msgstr ""
-
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{appid} does not have a name! Using application ID instead."
-msgstr ""
-
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{appid} from {path} is not a valid Android application ID!"
-msgstr ""
-
-#: ../fdroidserver/metadata.py ../fdroidserver/update.py
-#, python-brace-format
-msgid "{appid} from {path} is not a valid Java Package Name!"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{appid} has both APKs and files: {files}"
-msgstr ""
-
-#: ../fdroidserver/mirror.py
-#, python-brace-format
-msgid "{appid} is missing {name}"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "{appid}: Unknown extlib {path} in build '{versionName}'"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "{appid}: no builds specified, running on current source state"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "{appid}: {field} must be a '{type}', but it is a '{fieldtype}!'"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "{appid}: {field} must be a '{type}', but it is a '{fieldtype}'!"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "{build_flag} must be an integer, found: {value}"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "{build_flag} must be list or string, found: {value}"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "{file} is blank or corrupt!"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{name} \"{section}/icons/{path}\" does not exist! Check \"config.yml\"."
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{path1} is a duplicate of {path2}, remove one!"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
-#, python-brace-format
-msgid "{path} already exists, ignoring import results!"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-#, python-brace-format
-msgid "{path} does not exist!  Create it by running:"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{path} has bad file signature \"{pattern}\", possible Janus exploit!"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "{path} has been flagged by virustotal {count} times:"
-msgstr ""
-
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "{path} has the wrong fingerprint ({fingerprint})!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "{path} is not \"key: value\" dict, but a {datatype}!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "{path} is not a standard config file!"
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "{path} is not list, but a {datatype}!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "{path} is not {expected_type}, but a {datatype}!"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{path} is zero size!"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "{path} more than 200MB, manually upload: {url}"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "{path}: \"{code}\" is not a valid ISO_3166-1 alpha-2 country code!"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{path}: {error}"
-msgstr ""
-
-#: ../fdroidserver/mirror.py
-#, python-brace-format
-msgid "{url} does not end with \"fdroid\", check the URL path!"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
-#, python-brace-format
-msgid "{url} does not start with \"http\"!"
-msgstr ""
-
-#: ../fdroidserver/build.py
-msgid "{} build failed"
-msgid_plural "{} builds failed"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../fdroidserver/build.py
-msgid "{} build succeeded"
-msgid_plural "{} builds succeeded"
-msgstr[0] ""
-msgstr[1] ""
diff --git a/locale/az/LC_MESSAGES/fdroidserver.po b/locale/az/LC_MESSAGES/fdroidserver.po
deleted file mode 100644
index 48050f95..00000000
--- a/locale/az/LC_MESSAGES/fdroidserver.po
+++ /dev/null
@@ -1,2682 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# This file is put in the public domain.
-# Mehrab Poladov <thepoladov@protonmail.com>, 2023.
-msgid ""
-msgstr ""
-"Project-Id-Version: fdroidserver 2.2.1-143-g1a5ee449\n"
-"Report-Msgid-Bugs-To: https://gitlab.com/fdroid/fdroidserver/issues\n"
-"POT-Creation-Date: 2025-06-25 09:52+0200\n"
-"PO-Revision-Date: 2023-05-26 19:39+0000\n"
-"Last-Translator: Mehrab Poladov <thepoladov@protonmail.com>\n"
-"Language-Team: Azerbaijani <https://hosted.weblate.org/projects/f-droid/fdroidserver/az/>\n"
-"Language: az\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 4.18-dev\n"
-
-#: ../fdroidserver/nightly.py
-msgid ""
-"\n"
-"SSH public key to be used as deploy key:"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-#, python-brace-format
-msgid ""
-"\n"
-"{path} encoded for the DEBUG_KEYSTORE secret variable:"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-format
-msgid "\"%s/\" has no matching metadata file!"
-msgstr ""
-
-#: ../fdroidserver/index.py
-msgid "\"isPrimary\" key should not be added to mirrors!"
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "\"local_copy_dir\" {path} does not exist!"
-msgstr ""
-
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "\"{apkfilename}\" is already installed on {dev}."
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "\"{path}\" contains recent {name} ({version})"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "\"{path}\" exists but s3cmd is not installed!"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "\"{path}\" is not a supported file format (use: metadata/*.yml)"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "\"{path}\" is signed by a key that is not allowed:"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
-#, python-brace-format
-msgid "\"{url}\" is not a valid URL!"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "%(prog)s: error: %(message)s\n"
-msgstr "%(prog)s: xəta: %(message)s\n"
-
-#: ../fdroidserver/publish.py
-#, python-format
-msgid "%d APKs failed to be signed or verified!"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-format
-msgid "%d problems found"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "%r is not callable"
-msgstr ""
-
-#: ../fdroidserver/signindex.py
-#, python-format
-msgid "%s did not produce a dict!"
-msgstr ""
-
-#: ../fdroidserver/signindex.py
-#, python-format
-msgid "%s has bad SHA-256: %s"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-format
-msgid "%s is not an accepted build field"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "'keypass' not found in config.yml!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "'keystore' is NONE and 'smartcardoptions' is blank!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "'keystore' not found in config.yml!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "'keystorepass' not found in config.yml!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "'repo_keyalias' not found in config.yml!"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-msgid "'required' is an invalid argument for positionals"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "'sdk_path' not set in config.yml!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "'{aapt}' is too old, fdroid requires build-tools-{version} or newer!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "'{path}' failed to execute!"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "'{path}' has invalid format, it should be a dictionary!"
-msgstr ""
-
-#: ../fdroidserver/lint.py ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "'{value}' is not a valid {field} in {appid}. Regex pattern: {pattern}"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "'{value}' is not a valid {field}, should be {pattern}"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "--merge-request only runs on a single appid!"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "...checkupdate failed for {appid} : {error}"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-msgid ".__call__() not defined"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "/issues is missing"
-msgstr ""
-
-#: ../fdroidserver/mirror.py
-msgid "A URL is required as an argument!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "APK signatures have different certificates in {path}:"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Add PGP signatures using GnuPG for packages in repo"
-msgstr ""
-
-#: ../fdroidserver/update.py
-msgid "Add a repo signing key to an unsigned repo"
-msgstr ""
-
-#: ../fdroidserver/update.py
-msgid "Add skeleton metadata files for APKs that are missing them"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Adding new repo for only {name}"
-msgstr ""
-
-#: ../fdroidserver/init.py
-msgid "Alias of the repo signing key in the keystore"
-msgstr ""
-
-#: ../fdroidserver/build.py
-msgid "AllowedAPKSigningKeys missing but reference binary supplied"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
-msgid "Allows a different revision (or git branch) to be specified for the initial import"
-msgstr ""
-
-#: ../fdroidserver/mirror.py
-msgid "Also mirror the full archive section"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Also warn about formatting issues, like rewritemeta -l"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "Android AAR library"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "Android APK file"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "Android DEX code"
-msgstr ""
-
-#: ../fdroidserver/init.py
-#, python-brace-format
-msgid "Android SDK not found at {path}!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Android SDK path '{path}' does not exist!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Android SDK path '{path}' is not a directory!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Android SDK tool {cmd} not found!"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "App has Binaries but does not have corresponding AllowedAPKSigningKeys to pin certificate."
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "App has NoSourceSince or ArchivePolicy \"0 versions\" or 0 but AutoUpdateMode or UpdateCheckMode are not None"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "App is in '{repo}' but has a link to {url}"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "App version has binary but does not have corresponding AllowedAPKSigningKeys to pin certificate."
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Appending .git is not necessary"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Archiving {apkfilename} with invalid signature!"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "AutoUpdateMode with UpdateCheckMode: HTTP must have a pattern."
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "Automatic no to all prompts."
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "Automatic yes to all prompts."
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "Bad entry type \"{mirrortype}\" in mirrors config: {mirror}"
-msgstr ""
-
-#: ../fdroidserver/mirror.py
-msgid "Base URL to mirror, can include the index signing key using the query string: ?fingerprint="
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Branch '{branch}' used as commit in build '{versionName}'"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Branch '{branch}' used as commit in srclib '{srclib}'"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Broken symlink: {path}"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Build a package from source"
-msgstr ""
-
-#: ../fdroidserver/build.py
-msgid "Build all applications available"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Build generated by `fdroid import` - remove disable line once ready"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "Build metadata git repo has uncommited changes!"
-msgstr ""
-
-#: ../fdroidserver/build.py
-msgid "Build only the latest version of each package"
-msgstr ""
-
-#: ../fdroidserver/init.py
-#, python-format
-msgid "Built repo based in \"%s\" with this config:"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "Can't auto-update app with no CurrentVersionCode"
-msgstr ""
-
-#: ../fdroidserver/build.py
-msgid "Can't build due to {} error while scanning"
-msgid_plural "Can't build due to {} errors while scanning"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Cannot read {path}: {error}"
-msgstr ""
-
-#: ../fdroidserver/rewritemeta.py
-#, python-brace-format
-msgid "Cannot rewrite \"{path}\""
-msgstr ""
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
-#: ../fdroidserver/lint.py
-#, python-format
-msgid "Categories '%s' is not valid"
-msgstr ""
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
-#: ../fdroidserver/lint.py
-msgid "Categories are not set"
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "Category \"{category}\" defined but not used for any apps!"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Check for updates to applications"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Checking archiving for {appid} - apks:{integer}, keepversions:{keep}, archapks:{arch}"
-msgstr ""
-
-#: ../fdroidserver/update.py
-msgid "Clean update - don't uses caches, reprocess all APKs"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Color the log output"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
-msgid "Comma separated list of categories."
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-#, python-format
-msgid "Command '%s' not recognised.\n"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "Commit changes"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "Commit changes, push, then make a merge request"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Conflicting \"{field}\" definitions between .yml and localized files:"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Conflicting arguments: '--verbose' and '--quiet' can not be specified at the same time."
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Could not find '{command}' on your system"
-msgstr ""
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/import_subcommand.py
-msgid "Could not find latest version code"
-msgstr ""
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
-#: ../fdroidserver/import_subcommand.py
-msgid "Could not find latest version name"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Could not find {path} to remove it"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Could not open APK {path} for analysis: "
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Could not parse size \"{size}\", wrong type \"{type}\""
-msgstr ""
-
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/import_subcommand.py
-msgid "Couldn't find Application ID"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "Couldn't find any version information"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "Couldn't find package ID"
-msgstr ""
-
-#: ../fdroidserver/update.py
-msgid "Cowardily refusing to overwrite existing signing key setup!"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Created new container \"{name}\""
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Creating \"{path}\" for configuring s3cmd."
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Creating empty {config_file}"
-msgstr ""
-
-#: ../fdroidserver/publish.py
-msgid "Creating log directory"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Creating new S3 bucket: {url}"
-msgstr ""
-
-#: ../fdroidserver/publish.py
-msgid "Creating output directory"
-msgstr ""
-
-#: ../fdroidserver/index.py
-msgid "Creating signed index with this key (SHA256):"
-msgstr ""
-
-#: ../fdroidserver/publish.py ../fdroidserver/verify.py
-msgid "Creating temporary directory"
-msgstr ""
-
-#: ../fdroidserver/index.py
-msgid "Creating unsigned index in preparation for signing"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "CurrentVersionCode {cv} is less than oldest build entry {versionCode}"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-msgid "DEBUG_KEYSTORE is not set or the value is incomplete"
-msgstr ""
-
-#: ../fdroidserver/update.py
-msgid "Delete APKs and/or OBBs without metadata from the repo"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Deleting archive, repo is too big ({size} max {limit})"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Deleting git-mirror history, repo is too big ({size} max {limit})"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Deleting unknown file: {path}"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-format
-msgid "Description '%s' is just the app's summary"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Description has a duplicate line"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Description of length {length} is over the {limit} char limit"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Did you mean config/{name}.yml?"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Did you mean {code}?"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
-msgid "Do not add 'disable:' to the generated build entries"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-msgid "Do not deploy the new files to the repo"
-msgstr ""
-
-#: ../fdroidserver/mirror.py
-#, python-brace-format
-msgid "Do not include \"{path}\" in URL!"
-msgstr ""
-
-#: ../fdroidserver/init.py
-msgid "Do not prompt for Android SDK path, just fail"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-msgid "Do not remove the private keys generated from the keystore"
-msgstr ""
-
-#: ../fdroidserver/build.py
-msgid "Don't create a source tarball, useful when testing a build"
-msgstr ""
-
-#: ../fdroidserver/build.py
-msgid "Don't refresh the repository, useful when testing a build with no internet connection"
-msgstr ""
-
-#: ../fdroidserver/deploy.py ../fdroidserver/nightly.py
-msgid "Don't use rsync checksums"
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "Download F-Droid.apk using mirrors that leak less to the network"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Download complete mirrors of small repos"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Downloading the repository already failed once, not trying again."
-msgstr ""
-
-#: ../fdroidserver/verify.py
-#, python-brace-format
-msgid "Downloading {url} failed. {error}"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Duplicate Anti-Feature declaration at {path} was ignored!"
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-format
-msgid "Duplicate entry \"%s\" in mirrors config!"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Duplicate link in '{field}': {url}"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-format
-msgid "ERROR: %(message)s"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "ERROR: The \"server\" subcommand has been removed, use \"deploy\"!"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-msgid "ERROR: unsupported CI type, patches welcome!"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-#, python-format
-msgid "ERROR: unsupported git host \"%s\", patches welcome!"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "ERROR: {key} in {path} is not \"archive\" or \"repo\"!"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "ERROR: {key} not a valid key!"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "ERROR: {key}'s value should be of type {t}!"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "ERROR: {key}:{subkey} in {path} is not in allowed keys: {allowed_keys}!"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-#, python-brace-format
-msgid "Encoding is set to '{enc}' fdroid might run into encoding issues. Please set it to 'UTF-8' for best results."
-msgstr ""
-
-#: ../fdroidserver/init.py
-#, python-format
-msgid ""
-"Enter the path to the Android SDK (%s) here:\n"
-"> "
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Environment variable {var} from {configname} is not set!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Environment variable {{env: {var}}} is not set!"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "Error deploying 'github_releases', {} not present. (You might need to run `fdroid update` first.)"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
-msgid "Error while getting repo address"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "Exit with a non-zero code if problems were found"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Extract application metadata from a source repository"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Extract signatures from APKs"
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "F-Droid.apk could not be downloaded from any known source!"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Failed copying {path}: {error}"
-msgstr ""
-
-#: ../fdroidserver/signatures.py
-#, python-brace-format
-msgid "Failed fetching signatures for '{apkfilename}': {error}"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Failed reading {path}: {error}"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Failed resizing {path}: {error}"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Failed to create S3 bucket: {url}"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Failed to get APK information, deleting {path}"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Failed to get APK information, skipping {path}"
-msgstr ""
-
-#: ../fdroidserver/update.py
-msgid "Failed to get APK signing key fingerprint"
-msgstr ""
-
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "Failed to install '{apkfilename}' on {dev}: {error}"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Failed to sign application"
-msgstr ""
-
-#: ../fdroidserver/build.py
-#, python-brace-format
-msgid "Fetched buildserverid from VM: {buildserverid}"
-msgstr ""
-
-#: ../fdroidserver/signatures.py
-#, python-brace-format
-msgid "Fetched signatures for '{apkfilename}' -> '{sigdir}'"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "File disappeared while processing it: {path}"
-msgstr ""
-
-#: ../fdroidserver/build.py ../fdroidserver/install.py
-#: ../fdroidserver/rewritemeta.py ../fdroidserver/scanner.py
-#: ../fdroidserver/update.py
-msgid "Finished"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Forbidden HTML tags"
-msgstr ""
-
-#: ../fdroidserver/build.py
-msgid "Force build of disabled apps, and carries on regardless of scan problems. Only allowed in test mode."
-msgstr ""
-
-#: ../fdroidserver/build.py
-#, python-brace-format
-msgid "Force halting build after {0} sec timeout!"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "Force scan of disabled apps and builds."
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Found \"{path}\" graphic without metadata for app \"{name}\"!"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Found bad funding file \"{path}\" for \"{name}\":"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Found invalid appids in arguments"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Found invalid versionCodes for some apps"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Found multiple JAR Signature Block Files in {path}"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Found multiple Signer Certificates!"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Found multiple metadata files for {appid}"
-msgstr ""
-
-#: ../fdroidserver/index.py
-msgid "Found multiple signing certificates for repository."
-msgstr ""
-
-#: ../fdroidserver/index.py
-msgid "Found no signing certificates for repository."
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-format
-msgid "Found non-file at %s"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Found {apkfilename} at {url}"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Found {count} problems in {filename}"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Found {count} warnings in {filename}"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Generated skeleton metadata for {appid}"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-format
-msgid "Git checkout of '%s' failed"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Git clean failed"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Git fetch failed"
-msgstr ""
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/common.py
-#, python-format
-msgid "Git remote set-head failed: \"%s\""
-msgstr ""
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/common.py
-msgid "Git reset failed"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Git submodule deinit failed"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Git submodule sync failed"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Git submodule update failed"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "HTTPS must be used with Subversion URLs!"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "If a git mirror gets to big, allow the archive to be deleted"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "If this upload fails, try manually uploading to {url}"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Ignoring '{field}' in '{metapath}' metadata because it is deprecated."
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-format
-msgid "Ignoring FUNDING.yml entry longer than 2048: %s"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-format
-msgid "Ignoring bad element in manifest: %s"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Ignoring deprecated {oldfile}, use {newfile}!"
-msgstr ""
-
-#: ../fdroidserver/index.py
-msgid "Ignoring package without metadata: "
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Ignoring stale cache data for {apkfilename}"
-msgstr ""
-
-#: ../fdroidserver/update.py
-msgid "Include APKs that are signed with disabled algorithms like MD5"
-msgstr ""
-
-#: ../fdroidserver/mirror.py
-msgid "Include the PGP signature .asc files in the mirror"
-msgstr ""
-
-#: ../fdroidserver/mirror.py
-msgid "Include the build logs in the mirror"
-msgstr ""
-
-#: ../fdroidserver/mirror.py
-msgid "Include the source tarballs in the mirror"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-format
-msgid "Including metadata from %s@%s"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Including metadata from {path}"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Initialising submodules"
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "Install all signed applications available"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Install built packages on devices"
-msgstr ""
-
-#: ../fdroidserver/install.py
-#, python-format
-msgid "Installing %s..."
-msgstr ""
-
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "Installing '{apkfilename}' on {dev}..."
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Interact with the repo HTTP server"
-msgstr ""
-
-#: ../fdroidserver/update.py
-msgid "Invalid APK"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "Invalid AutoUpdateMode: {mode}"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "Invalid UpdateCheckMode: {mode}"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "Invalid VercodeOperation: {field}"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Invalid VercodeOperation: {invalid_ops}"
-msgstr ""
-
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Invalid application ID {appid}"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Invalid bulleted list"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-format
-msgid "Invalid name for published file: %s"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Invalid ndk: entry in build: \"{ndk}\""
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Invalid redirect to non-HTTPS: {before} -> {after} "
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Invalid scrlib metadata: '{file}' does not exist"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Invalid srclib metadata: could not parse '{file}'"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Invalid srclib metadata: unknown key '{key}' in '{file}'"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "JAR signature failed to verify: {path}"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "JAR signature verified: {path}"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "Java JAR file"
-msgstr ""
-
-#: ../fdroidserver/mirror.py ../fdroidserver/publish.py
-#: ../fdroidserver/update.py
-msgid "Java JDK not found! Install in standard location or set java_paths!"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "Java compiled class"
-msgstr ""
-
-#: ../fdroidserver/signindex.py
-msgid "Java jarsigner not found! Install in standard location or set java_paths!"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Javascript in HTML src attributes"
-msgstr ""
-
-#: ../fdroidserver/build.py
-#, python-brace-format
-msgid "Keeping failed build \"{apkfilename}\""
-msgstr ""
-
-#: ../fdroidserver/init.py
-msgid "Keystore for signing key:\t"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Known debug key is used in AllowedAPKSigningKeys: "
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Last used commit '{commit}' looks like a tag, but UpdateCheckMode is '{ucm}'"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Liberapay donation methods belong in the Liberapay: field"
-msgstr ""
-
-#: ../fdroidserver/rewritemeta.py
-msgid "List files that would be reformatted (dry run)"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Locale included in f-droid.org URL"
-msgstr ""
-
-#: ../fdroidserver/build.py
-msgid "Make the build stop on exceptions"
-msgstr ""
-
-#: ../fdroidserver/index.py
-msgid "Malformed repository mirrors."
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "Malformed serverwebroot line:"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-format
-msgid "Max recursion depth in ZIP file reached: %s"
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "Mirror config for {url} contains \"isPrimary\" key!"
-msgstr ""
-
-#: ../fdroidserver/mirror.py
-msgid "Mirror the full repo and archive, all file types."
-msgstr ""
-
-#: ../fdroidserver/gpgsign.py
-msgid "Missing output directory"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-msgid "Moving Anti-Features declarations to localized files:"
-msgstr ""
-
-#: ../fdroidserver/index.py
-msgid "Neither \"repo_pubkey\" nor \"keystorepass\" set in config.yml"
-msgstr ""
-
-#: ../fdroidserver/verify.py
-#, python-format
-msgid "No APK for package: %s"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "No Android SDK found!"
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "No attached devices found"
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "No devices found for `adb install`! Please plug one in."
-msgstr ""
-
-#: ../fdroidserver/index.py
-msgid "No fingerprint in URL."
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "No git submodules available"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
-msgid "No gradle project could be found. Specify --subdir?"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
-msgid "No information found."
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "No matching tags found"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "No minimum SDK version found in {0}, using default (3)."
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "No need to specify that the app is Free Software"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "No need to specify that the app is for Android"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "No option set! Edit your config.yml to set at least one of these:"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "No packages specified"
-msgstr ""
-
-#: ../fdroidserver/install.py
-#, python-format
-msgid "No signed APK available for %s"
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "No signed output directory - nothing to do"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "No signing certificates found in {path}"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-format
-msgid "No such package: %s"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "No such versionCode {versionCode} for app {appid}"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "No tags found"
-msgstr ""
-
-#: ../fdroidserver/publish.py ../fdroidserver/verify.py
-msgid "No unsigned directory - nothing to do"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "No version information could be found."
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Not a valid size definition: \"{}\""
-msgstr ""
-
-#: ../fdroidserver/signindex.py
-msgid "Nothing to do"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "Nothing to do for {appid}."
-msgstr ""
-
-#: ../fdroidserver/init.py
-msgid "Now set these in config.yml:"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "OBB file has newer versionCode({integer}) than any APK:"
-msgstr ""
-
-#: ../fdroidserver/update.py
-msgid "OBB filename must start with \"main.\" or \"patch.\":"
-msgstr ""
-
-#: ../fdroidserver/update.py
-msgid "OBB's packagename does not match a supported APK:"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "Offline machine, skipping git mirror generation until `fdroid deploy`"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "One of the 'github_releases' config items is missing the 'packageNames' value. skipping ..."
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "One of the 'github_releases' config items is missing the 'projectUrl' value. skipping ..."
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "One of the 'github_releases' config items is missing the 'token' value. skipping ..."
-msgstr ""
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Only PNG and JPEG are supported for graphics, found: {path}"
-msgstr ""
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/common.py
-msgid "Only accepts a single key \"env\""
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "Only process apps with auto-updates"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "OpenCollective donation methods belong in the OpenCollective: field"
-msgstr ""
-
-#: ../fdroidserver/verify.py
-msgid "Output JSON report to file named after APK."
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "Output JSON to stdout."
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py ../fdroidserver/gpgsign.py
-#: ../fdroidserver/publish.py ../fdroidserver/signindex.py
-#: ../fdroidserver/update.py
-msgid "Outputting JSON"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
-msgid "Overall license of the project."
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "Overriding blank versionName in {apkfilename} from metadata: {version}"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
-#, python-brace-format
-msgid "Package \"{appid}\" already exists"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Parsing manifest at '{path}'"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Password required with username"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
-msgid "Path to main Android project subdirectory, if not in root."
-msgstr ""
-
-#: ../fdroidserver/init.py
-msgid "Path to the Android SDK (sometimes set in ANDROID_HOME)"
-msgstr ""
-
-#: ../fdroidserver/btlog.py
-msgid "Path to the git repo to use as the log"
-msgstr ""
-
-#: ../fdroidserver/init.py
-msgid "Path to the keystore for the repo signing key"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-msgid "Print the secret variable to the terminal for easy copy/paste"
-msgstr ""
-
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "Privacy mode was enabled based on your locale ({country_code})."
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-format
-msgid "Problem with ZIP file: %s, error %s"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Problem with xml at '{path}'"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "Process auto-updates"
-msgstr ""
-
-#: ../fdroidserver/publish.py ../fdroidserver/update.py
-#, python-brace-format
-msgid "Processing {apkfilename}"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Processing {appid}"
-msgstr ""
-
-#: ../fdroidserver/update.py
-msgid "Produce human-readable XML/JSON for index files"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
-msgid "Project URL to import from."
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Punctuation should be avoided"
-msgstr ""
-
-#: ../fdroidserver/btlog.py
-msgid "Push the log to this git remote repository"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Pushing binary transparency log to {url}"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "Pushing to remote server failed!"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Pushing to {url}"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Quickly start a new repository"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Read all the metadata files and exit"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Reading '{config_file}'"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Reading packageName/versionCode/versionName failed, APK invalid: '{apkfilename}'"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Reading packageName/versionCode/versionName failed,APK invalid: '{apkfilename}'"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Reading {apkfilename} from cache"
-msgstr ""
-
-#: ../fdroidserver/build.py
-msgid "Refresh and cache scanner rules and signatures from the network"
-msgstr ""
-
-#: ../fdroidserver/publish.py
-#, python-brace-format
-msgid "Refusing to sign '{path}', file exists in both {dir1} and {dir2} folder."
-msgstr ""
-
-#: ../fdroidserver/verify.py
-msgid "Remove source tarball and any APKs if successfully verified."
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Removing specified files"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Removing {path}\""
-msgstr ""
-
-#: ../fdroidserver/update.py
-msgid "Rename APK files that do not match package.name_123.apk"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "RepoType {type} is deprecated, please switch to git."
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-#, python-brace-format
-msgid "Resigning {apkfilename} with provided debug.keystore"
-msgstr ""
-
-#: ../fdroidserver/update.py
-msgid "Resize all the icons exceeding the max pixel size and exit"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Restrict output to warnings and errors"
-msgstr ""
-
-#: ../fdroidserver/net.py
-#, python-format
-msgid "Retrying failed download: %s"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Rewrite all the metadata files"
-msgstr ""
-
-#: ../fdroidserver/rewritemeta.py
-#, python-brace-format
-msgid "Rewriting '{appid}'"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "Run on git repo that has uncommitted changes"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-#, python-brace-format
-msgid "Run over {cibase} to find -debug.apk. and skip repo_basedir {repo_basedir}"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Run rewritemeta to fix formatting"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "Running first pass with MD5 checking disabled"
-msgstr ""
-
-#: ../fdroidserver/mirror.py
-#, python-brace-format
-msgid "Running wget in {path}"
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "SHA-256 of {url} does not match entry!"
-msgstr ""
-
-#: ../fdroidserver/build.py
-msgid "Scan the resulting APK(s) for known non-free classes."
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Scan the source code of a package"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Scanner found {count} problems in {apk}"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Scanner found {count} problems in {appid}:"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Scanner found {count} problems in {appid}:{versionCode}:"
-msgstr ""
-
-#: ../fdroidserver/build.py
-msgid "Scanner found {} problem"
-msgid_plural "Scanner found {} problems"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../fdroidserver/scanner.py
-msgid "Scanning APK for extra signing blocks."
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "Scanning APK with dexdump for known non-free classes."
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Set NDK {release} ({version}) up"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Set clock to that time using:"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-msgid "Set maximum releases in repo before older ones are archived"
-msgstr ""
-
-#: ../fdroidserver/build.py
-#, python-brace-format
-msgid "Set open file limit to {integer}"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Set up an app build for a nightly build repo"
-msgstr ""
-
-#: ../fdroidserver/build.py
-msgid "Setting open file limit failed: "
-msgstr ""
-
-#: ../fdroidserver/build.py
-#, python-brace-format
-msgid "Setting {0} sec timeout for this build"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Sign and place packages in the repo"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Sign indexes created using update --nosign"
-msgstr ""
-
-#: ../fdroidserver/build.py
-msgid "Skip scanning the source code for binaries and other problems"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Skipping '{apkfilename}' with invalid signature!"
-msgstr ""
-
-#: ../fdroidserver/deploy.py ../fdroidserver/index.py
-#, python-format
-msgid "Skipping GitLab Pages mirror because the repo is too large (>%.2fGB)!"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Skipping index generation for {appid}"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Skipping {apkfilename} with invalid signature!"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Skipping {appid}: disabled"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "Specify a local folder to sync the repo to"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "Specify an identity file to provide to SSH for rsyncing"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-msgid "Specify which debug keystore file to use."
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Spew out even more information than normal"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-#, python-brace-format
-msgid "Stripping mystery signature from {apkfilename}"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-format
-msgid "Summary '%s' is just the app's name"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Summary of length {length} is over the {limit} char limit"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "System clock is older than date in {path}!"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "Tags update mode only works for git, hg, bzr and git-svn repositories currently"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "Tags update mode used in git-svn, but the repo was not set up with tags"
-msgstr ""
-
-#: ../fdroidserver/build.py
-msgid "Test mode - put output in the tmp directory only, and always build, even if the output already exists."
-msgstr ""
-
-#: ../fdroidserver/index.py
-msgid "The \"qrcode\" Python package is not installed (e.g. apt-get install python3-qrcode)!"
-msgstr ""
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "The OBB version code must come after \"{name}.\":"
-msgstr ""
-
-#: ../fdroidserver/btlog.py
-msgid "The base URL for the repo to log (default: https://f-droid.org)"
-msgstr ""
-
-#: ../fdroidserver/mirror.py
-msgid "The directory to write the mirror to"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-msgid "The file to be included in the repo (path or glob)"
-msgstr ""
-
-#: ../fdroidserver/index.py
-msgid "The repository's fingerprint does not match."
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "The root dir for local_copy_dir \"{path}\" does not exist!"
-msgstr ""
-
-#: ../fdroidserver/publish.py
-msgid "There is a keyalias collision - publishing halted"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "These are the apps that have been archived from the main repo."
-msgstr ""
-
-#: ../fdroidserver/mirror.py
-msgid "This command should never be used to mirror f-droid.org! A full copy requires more than 600GB."
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "This is a repository of apps to be used with F-Droid. Applications in this repository are either official binaries built by the original application developers, or are binaries built from source by the admin of f-droid.org using the tools on https://gitlab.com/fdroid."
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
-#, python-format
-msgid "This repo already has local metadata: %s"
-msgstr ""
-
-#: ../fdroidserver/init.py
-#, python-format
-msgid ""
-"To complete the setup, add your APKs to \"%s\"\n"
-"then run \"fdroid update -c; fdroid update\".  You might also want to edit\n"
-"\"config.yml\" to set the URL, repo name, and more.  You should also set up\n"
-"a signing key (a temporary one might have been automatically generated).\n"
-"\n"
-"For more info: https://f-droid.org/docs/Setup_an_F-Droid_App_Repo\n"
-"and https://f-droid.org/docs/Signing_Process"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "To use awsbucket, awssecretkey and awsaccesskeyid must also be set in config.yml!"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "To use rclone, rclone_config and awsbucket must be set in config.yml!"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "URL must start with https:// or http://"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "URL shorteners should not be used"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "URL {url} in Description: {error}"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Unexpected license tag \"{}\"! Only use FSF or OSI approved tags from https://spdx.org/license-list"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Unexpected license tag \"{}\"! Only use license tags configured in your config file"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Unknown entry {key} in {configname}"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Unknown exception found!"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Unknown file '{filename}' in build '{versionName}'"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-format
-msgid "Unknown metadata format: %s"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Unknown metadata format: {path} (use: *.yml)"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Unknown version of aapt, might cause problems: "
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Unnecessary leading space"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Unnecessary trailing space"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Unrecognised app field '{fieldname}' in '{path}'"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Unrecognised build flag '{build_flag}' in '{path}'"
-msgstr ""
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Unsupported file type \"{extension}\" for repo graphic"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Unsupported graphics file found: {path}"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-format
-msgid "Unused extlib at %s"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-format
-msgid "Unused file at %s"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-format
-msgid "Unused scandelete path: %s"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-format
-msgid "Unused scanignore path: %s"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Update repo information for new packages"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Update the binary transparency log for a URL"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "UpdateCheckData has invalid URL: {url}"
-msgstr ""
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "UpdateCheckData must match the version code as integer (\\d or [0-9]): {codeex}"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "UpdateCheckData must use HTTPS URL: {url}"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "UpdateCheckData not a valid URL: {url}"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "UpdateCheckMode is set but it looks like checkupdates hasn't been run yet."
-msgstr ""
-
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/lint.py
-msgid "UpdateCheckName is set to the known application ID, it can be removed"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Uploading {apkfilename} to androidobservatory.org"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Uploading {apkfilename} to virustotal"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Use /HEAD instead of /master or /main to point at a file in the default branch"
-msgstr ""
-
-#: ../fdroidserver/update.py
-msgid "Use `fdroid update -c` to create it."
-msgstr ""
-
-#: ../fdroidserver/build.py
-msgid "Use build server"
-msgstr ""
-
-#: ../fdroidserver/update.py
-msgid "Use date from APK instead of current time for newly added APKs"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Using \"{path}\" for configuring s3cmd."
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Using \"{path}\" for syncing with remote storage."
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Using APK Signature v2"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Using APK Signature v3"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Using JAR Signature"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Using Java's jarsigner, not recommended for verifying APKs! Use apksigner"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Using blank dictionary instead of contents of {path}!"
-msgstr ""
-
-#: ../fdroidserver/init.py
-#, python-brace-format
-msgid "Using existing keystore \"{path}\""
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Using rclone to sync with: {url}"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Using s3cmd to sync with: {url}"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Valid commands are:"
-msgstr ""
-
-#: ../fdroidserver/verify.py
-msgid "Verify against locally cached copy rather than redownloading."
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Verify the integrity of downloaded packages"
-msgstr ""
-
-#: ../fdroidserver/index.py
-msgid "Verifying index signature:"
-msgstr ""
-
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "Verifying package {path} with apksigner."
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "VirusTotal API key cannot upload files larger than 32MB, use {url} to upload {path}."
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-msgid "WARNING: only public git repos are supported!"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Warn about possible metadata errors"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "WebAssembly binary file"
-msgstr ""
-
-#: ../fdroidserver/update.py
-msgid "When configured for signed indexes, create only unsigned indexes at this stage"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "When linting the entire repository yamllint is disabled by default. This option forces yamllint regardless."
-msgstr ""
-
-#: ../fdroidserver/publish.py
-msgid "When signing or verifying fails, exit with an error code."
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "Would you like to download and install F-Droid.apk via adb? (YES/no)"
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "Would you like to download the app(s) from f-droid.org? (YES/no)"
-msgstr ""
-
-#: ../fdroidserver/init.py
-msgid "X.509 'Distinguished Name' used when generating keys"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "You can use ANDROID_HOME to set the path to your SDK, i.e.:"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "ZIP file archive"
-msgstr ""
-
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "adb reports {serial} is \"{status}\"!"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-#, python-brace-format
-msgid "adding IdentityFile to {path}"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "adding to {name}: {path}"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "ambiguous option: %(option)s could match %(matches)s"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "apksigner in build-tools;{version} passes APKs with invalid v3 signatures, ignoring."
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "apksigner not found! Cannot sign or verify modern APKs"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "apksigner not found, it's required for signing!"
-msgstr ""
-
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/checkupdates.py ../fdroidserver/lint.py
-#: ../fdroidserver/rewritemeta.py
-msgid "application ID of file to operate on"
-msgstr ""
-
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/build.py ../fdroidserver/install.py
-#: ../fdroidserver/publish.py ../fdroidserver/scanner.py
-#: ../fdroidserver/verify.py
-msgid "application ID with optional versionCode in the form APPID[:VERCODE]"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "archive_url needs to end with /archive"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "argument \"-\" with mode %r"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "argument %(argument_name)s: %(message)s"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-msgid "attempting bare SSH connection to test deploy key:"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "can not parse scrlib spec (not a string): '{}'"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "can't open '%(filename)s': %(error)s"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "can't open non-https url: '{};"
-msgstr ""
-
-#: ../fdroidserver/build.py
-#, python-brace-format
-msgid "cannot find required srclibs: \"{path}\""
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-msgid "cannot have multiple subparser arguments"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "cannot merge actions - two groups are named %r"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-msgid "cannot publish update, did you set the deploy key?"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-#, python-brace-format
-msgid "cloning {url}"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "commands from plugin modules:"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "conflicting option string: %s"
-msgid_plural "conflicting option strings: %s"
-msgstr[0] ""
-msgstr[1] ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "conflicting subparser alias: %s"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "conflicting subparser: %s"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "could not parse '{path}'"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "could not parse srclib spec (no name specified): '{}'"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "could not parse srclib spec (no ref specified): '{}'"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-#, python-brace-format
-msgid "created {path}"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "current version is newer: old vercode={old}, new vercode={new}"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "deleting: repo/{apkfilename}"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "dependency file without lock"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "deployed process log {path} to {dest}"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "dest= is required for options like %r"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "downloading '{}'"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "downloading scanner signatures from '{}' failed"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "executable binary, possibly code"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "expected %s argument"
-msgid_plural "expected %s arguments"
-msgstr[0] ""
-msgstr[1] ""
-
-#: /usr/lib/python3.11/argparse.py
-msgid "expected at least one argument"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-msgid "expected at most one argument"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-msgid "expected one argument"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "fdroid [<command>] [-h|--help|--version|<args>]"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "fetch the latest version of signatures from the web"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-msgid "force metadata errors (default) to be warnings, or to be ignored."
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "git svn clone failed"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "gzip file archive"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "ignored explicit argument %r"
-msgstr ""
-
-#: ../fdroidserver/index.py
-msgid "index-v1 must have a signature, use `fdroid signindex` to create it!"
-msgstr ""
-
-#: ../fdroidserver/index.py
-msgid "index-v2 must have a signature, use `fdroid signindex` to create it!"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "invalid %(type)s value: %(value)r"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "invalid choice: %(value)r (choose from %(choices)s)"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "invalid conflict_resolution value: %r"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "invalid option string %(option)r: must start with a character %(prefix_chars)r"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "ipfs_cid not found, skipping CIDv1 generation"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "latest build recipe is newer: old vercode={old}, new vercode={new}"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "local_copy_dir does not end with \"fdroid\", perhaps you meant: \"{path}\""
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "local_copy_dir must be an absolute path!"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "local_copy_dir must be directory, not a file!"
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-format
-msgid "mirror '%s' does not end with 'fdroid'!"
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "mirrors set twice, in config.yml and {path}!"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-msgid "mutually exclusive arguments must be optional"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "next {name} cache update due in {time}"
-msgstr ""
-
-#: ../fdroidserver/mirror.py
-#, python-brace-format
-msgid "no \"icon\" in {appid}"
-msgstr ""
-
-#: ../fdroidserver/signatures.py
-msgid "no APK supplied"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "no version information found"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "not allowed with argument %s"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "one of the arguments %s is required"
-msgstr ""
-
-#: ../fdroidserver/common.py ../fdroidserver/index.py
-msgid "only accepts strings, lists, and tuples"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-msgid "options"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-#, python-brace-format
-msgid "overwriting existing {path}"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-msgid "positional arguments"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "process log deploy {path} to {dest} failed!"
-msgstr ""
-
-#: ../fdroidserver/build.py
-msgid "reference binary missing signature"
-msgstr ""
-
-#: ../fdroidserver/signatures.py
-#, python-brace-format
-msgid "refuse downloading via insecure HTTP connection (use HTTPS or specify --no-https-check): {apkfilename}"
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-format
-msgid "repo_icon \"repo/icons/%s\" does not exist, generating placeholder."
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "repo_url needs to end with /repo"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "rsync is missing or broken: {error}"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "s3cmd sync indexes {path} to {url} and delete"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "s3cmd syncs indexes from {path} to {url} and deletes removed"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "scanner cache is malformed! You can clear it with: '{clear}'"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "serverwebroot: path does not end with \"fdroid\", perhaps you meant one of these:"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "shared library"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-msgid "show this help message and exit"
-msgstr ""
-
-#: ../fdroidserver/signatures.py
-msgid "signed APK, either a file-path or HTTPS URL."
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "skip deploying full build logs: log content is empty"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "skip deploying full build logs: not enabled in config"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "skipping source tarball: {path}"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "srclibs missing name and/or @"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "static library"
-msgstr ""
-
-#: ../fdroidserver/build.py
-#, python-brace-format
-msgid "supplied reference binary has allowed signer {signer}"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "the following arguments are required: %s"
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "true"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "unexpected option string: %s"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "unknown parser %(parser_name)r (choices: %(choices)s)"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "unrecognized arguments: %s"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "unsafe permissions on '{config_file}' (should be 0600)!"
-msgstr ""
-
-#: ../fdroidserver/__main__.py /usr/lib/python3.11/argparse.py
-msgid "usage: "
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "using Apache libcloud to sync with {url}"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "virustotal.com is rate limiting, waiting to retry..."
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "yes"
-msgstr ""
-
-#: ../fdroidserver/publish.py
-#, python-brace-format
-msgid "{0} app, {1} key aliases"
-msgid_plural "{0} apps, {1} key aliases"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{apkfilename} ({appid}) has no metadata!"
-msgstr ""
-
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{apkfilename}'s AndroidManifest.xml has a bad date: "
-msgstr ""
-
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{appid} does not have a name! Using application ID instead."
-msgstr ""
-
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{appid} from {path} is not a valid Android application ID!"
-msgstr ""
-
-#: ../fdroidserver/metadata.py ../fdroidserver/update.py
-#, python-brace-format
-msgid "{appid} from {path} is not a valid Java Package Name!"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{appid} has both APKs and files: {files}"
-msgstr ""
-
-#: ../fdroidserver/mirror.py
-#, python-brace-format
-msgid "{appid} is missing {name}"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "{appid}: Unknown extlib {path} in build '{versionName}'"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "{appid}: no builds specified, running on current source state"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "{appid}: {field} must be a '{type}', but it is a '{fieldtype}!'"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "{appid}: {field} must be a '{type}', but it is a '{fieldtype}'!"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "{build_flag} must be an integer, found: {value}"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "{build_flag} must be list or string, found: {value}"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "{file} is blank or corrupt!"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{name} \"{section}/icons/{path}\" does not exist! Check \"config.yml\"."
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{path1} is a duplicate of {path2}, remove one!"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
-#, python-brace-format
-msgid "{path} already exists, ignoring import results!"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-#, python-brace-format
-msgid "{path} does not exist!  Create it by running:"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{path} has bad file signature \"{pattern}\", possible Janus exploit!"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "{path} has been flagged by virustotal {count} times:"
-msgstr ""
-
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "{path} has the wrong fingerprint ({fingerprint})!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "{path} is not \"key: value\" dict, but a {datatype}!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "{path} is not a standard config file!"
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "{path} is not list, but a {datatype}!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "{path} is not {expected_type}, but a {datatype}!"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{path} is zero size!"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "{path} more than 200MB, manually upload: {url}"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "{path}: \"{code}\" is not a valid ISO_3166-1 alpha-2 country code!"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{path}: {error}"
-msgstr ""
-
-#: ../fdroidserver/mirror.py
-#, python-brace-format
-msgid "{url} does not end with \"fdroid\", check the URL path!"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
-#, python-brace-format
-msgid "{url} does not start with \"http\"!"
-msgstr ""
-
-#: ../fdroidserver/build.py
-msgid "{} build failed"
-msgid_plural "{} builds failed"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../fdroidserver/build.py
-msgid "{} build succeeded"
-msgid_plural "{} builds succeeded"
-msgstr[0] ""
-msgstr[1] ""
diff --git a/locale/ba/LC_MESSAGES/fdroidserver.po b/locale/ba/LC_MESSAGES/fdroidserver.po
deleted file mode 100644
index 9804a4f7..00000000
--- a/locale/ba/LC_MESSAGES/fdroidserver.po
+++ /dev/null
@@ -1,2695 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# This file is put in the public domain.
-# Zulfar <mzulfar20@gmail.com>, 2025.
-msgid ""
-msgstr ""
-"Project-Id-Version: fdroidserver 2.4.0\n"
-"Report-Msgid-Bugs-To: https://gitlab.com/fdroid/fdroidserver/issues\n"
-"POT-Creation-Date: 2025-06-25 09:52+0200\n"
-"PO-Revision-Date: 2025-06-22 06:50+0000\n"
-"Last-Translator: Zulfar <mzulfar20@gmail.com>\n"
-"Language-Team: Bashkir <https://hosted.weblate.org/projects/f-droid/fdroidserver/ba/>\n"
-"Language: ba\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 5.13-dev\n"
-
-#: ../fdroidserver/nightly.py
-msgid ""
-"\n"
-"SSH public key to be used as deploy key:"
-msgstr ""
-"\n"
-"Урынлаштырыу асҡысы итеп ҡулланыу өсөн SSH асыҡ асҡысы:"
-
-#: ../fdroidserver/nightly.py
-#, python-brace-format
-msgid ""
-"\n"
-"{path} encoded for the DEBUG_KEYSTORE secret variable:"
-msgstr ""
-"\n"
-"{path} DEBUG_KEYSTORE йәшерен үҙгәреүсәне өсөн кодланған:"
-
-#: ../fdroidserver/lint.py
-#, python-format
-msgid "\"%s/\" has no matching metadata file!"
-msgstr "\"%s/\" өсөн ярашлы мета-мәғлүмәт файлы юҡ!"
-
-#: ../fdroidserver/index.py
-msgid "\"isPrimary\" key should not be added to mirrors!"
-msgstr "\"isPrimary\" асҡысы көҙгөләргә өҫтәлергә тейеш түгел!"
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "\"local_copy_dir\" {path} does not exist!"
-msgstr "\"local_copy_dir\" {path} каталогы юҡ!"
-
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "\"{apkfilename}\" is already installed on {dev}."
-msgstr "\"{apkfilename}\" {dev} ҡоролмаһында инде ҡуйылған."
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "\"{path}\" contains recent {name} ({version})"
-msgstr "\"{path}\" эсендә {name} ({version}) ҡушымтаһының яңы версияһы бар."
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "\"{path}\" exists but s3cmd is not installed!"
-msgstr "\"{path}\" бар, ләкин s3cmd ҡуйылмаған!"
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "\"{path}\" is not a supported file format (use: metadata/*.yml)"
-msgstr "\"{path}\" — яраҡлы файл форматы түгел (ҡулланығыҙ: metadata/*.yml)"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "\"{path}\" is signed by a key that is not allowed:"
-msgstr "\"{path}\" рөхсәт ителмәгән асҡыс менән тамғаланған:"
-
-#: ../fdroidserver/import_subcommand.py
-#, python-brace-format
-msgid "\"{url}\" is not a valid URL!"
-msgstr "\"{url}\" — дөрөҫ URL түгел!"
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "%(prog)s: error: %(message)s\n"
-msgstr "%(prog)s: хата: %(message)s\n"
-
-#: ../fdroidserver/publish.py
-#, python-format
-msgid "%d APKs failed to be signed or verified!"
-msgstr "%d APK тамғаланманы йәки тикшерелмәне!"
-
-#: ../fdroidserver/scanner.py
-#, python-format
-msgid "%d problems found"
-msgstr "%d проблема табылды"
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "%r is not callable"
-msgstr "%r саҡырылмалы түгел"
-
-#: ../fdroidserver/signindex.py
-#, python-format
-msgid "%s did not produce a dict!"
-msgstr "%s һүҙлек (dict) ҡайтарманы!"
-
-#: ../fdroidserver/signindex.py
-#, python-format
-msgid "%s has bad SHA-256: %s"
-msgstr "%s файлының SHA-256 суммаһы дөрөҫ түгел: %s"
-
-#: ../fdroidserver/lint.py
-#, python-format
-msgid "%s is not an accepted build field"
-msgstr "%s — рөхсәт ителгән йыйыу яланы түгел"
-
-#: ../fdroidserver/common.py
-msgid "'keypass' not found in config.yml!"
-msgstr "config.yml файлында 'keypass' табылманы!"
-
-#: ../fdroidserver/common.py
-msgid "'keystore' is NONE and 'smartcardoptions' is blank!"
-msgstr "'keystore' күрһәтелмәгән һәм 'smartcardoptions' буш!"
-
-#: ../fdroidserver/common.py
-msgid "'keystore' not found in config.yml!"
-msgstr "config.yml файлында 'keystore' табылманы!"
-
-#: ../fdroidserver/common.py
-msgid "'keystorepass' not found in config.yml!"
-msgstr "config.yml файлында 'keystorepass' табылманы!"
-
-#: ../fdroidserver/common.py
-msgid "'repo_keyalias' not found in config.yml!"
-msgstr "config.yml файлында 'repo_keyalias' табылманы!"
-
-#: /usr/lib/python3.11/argparse.py
-msgid "'required' is an invalid argument for positionals"
-msgstr "Позицион аргументтар өсөн 'required' — дөрөҫ булмаған аргумент"
-
-#: ../fdroidserver/common.py
-msgid "'sdk_path' not set in config.yml!"
-msgstr "config.yml файлында 'sdk_path' күрһәтелмәгән!"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "'{aapt}' is too old, fdroid requires build-tools-{version} or newer!"
-msgstr "'{aapt}' бигерәк иҫке, F-Droid өсөн build-tools-{version} йәки яңыраҡ версияһы кәрәк!"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "'{path}' failed to execute!"
-msgstr "'{path}' башҡарылманы!"
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "'{path}' has invalid format, it should be a dictionary!"
-msgstr "'{path}' форматы дөрөҫ түгел, ул һүҙлек булырға тейеш!"
-
-#: ../fdroidserver/lint.py ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "'{value}' is not a valid {field} in {appid}. Regex pattern: {pattern}"
-msgstr "'{appid}' өсөн '{value}' — дөрөҫ булмаған {field} ҡиммәте. Regex ҡалыбы: {pattern}"
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "'{value}' is not a valid {field}, should be {pattern}"
-msgstr "'{value}' — яраҡлы {field} түгел, {pattern} булырға тейеш"
-
-#: ../fdroidserver/checkupdates.py
-msgid "--merge-request only runs on a single appid!"
-msgstr "--merge-request тик бер appid менән генә эшләй!"
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "...checkupdate failed for {appid} : {error}"
-msgstr "...{appid} өсөн checkupdate уңышһыҙ үтте: {error}"
-
-#: /usr/lib/python3.11/argparse.py
-msgid ".__call__() not defined"
-msgstr ".__call__() билдәләнмәгән"
-
-#: ../fdroidserver/lint.py
-msgid "/issues is missing"
-msgstr "/issues юҡ"
-
-#: ../fdroidserver/mirror.py
-msgid "A URL is required as an argument!"
-msgstr "Аргумент итеп URL күрһәтеү мотлаҡ!"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "APK signatures have different certificates in {path}:"
-msgstr "{path} эсендәге APK-имзаларҙың сертификаттары төрлө:"
-
-#: ../fdroidserver/__main__.py
-msgid "Add PGP signatures using GnuPG for packages in repo"
-msgstr "Репозиторийҙағы пакеттарға GnuPG ярҙамында PGP-имзалар өҫтәү"
-
-#: ../fdroidserver/update.py
-msgid "Add a repo signing key to an unsigned repo"
-msgstr "Тамғаланмаған репозиторийға репо-имзалау асҡысын өҫтәү"
-
-#: ../fdroidserver/update.py
-msgid "Add skeleton metadata files for APKs that are missing them"
-msgstr "Мета-мәғлүмәт файлдары булмаған APK-лар өсөн ҡалыптар өҫтәү"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Adding new repo for only {name}"
-msgstr "Тик {name} өсөн генә яңы репозиторий өҫтәү"
-
-#: ../fdroidserver/init.py
-msgid "Alias of the repo signing key in the keystore"
-msgstr "Асҡыстар һаҡлағысындағы репо-имзалау асҡысының псевдонимы"
-
-#: ../fdroidserver/build.py
-msgid "AllowedAPKSigningKeys missing but reference binary supplied"
-msgstr "AllowedAPKSigningKeys юҡ, ләкин өлгө бинар файл бирелгән"
-
-#: ../fdroidserver/import_subcommand.py
-msgid "Allows a different revision (or git branch) to be specified for the initial import"
-msgstr "Башланғыс импорт өсөн икенсе ревизия (йәки git ботағын) күрһәтергә мөмкинлек бирә"
-
-#: ../fdroidserver/mirror.py
-msgid "Also mirror the full archive section"
-msgstr "Шулай уҡ архив бүлегенең тулы күсермәһен яһау"
-
-#: ../fdroidserver/lint.py
-msgid "Also warn about formatting issues, like rewritemeta -l"
-msgstr "Шулай уҡ rewritemeta -l кеүек форматлау проблемалары тураһында иҫкәртеү"
-
-#: ../fdroidserver/scanner.py
-msgid "Android AAR library"
-msgstr "Android AAR китапханаһы"
-
-#: ../fdroidserver/scanner.py
-msgid "Android APK file"
-msgstr "Android APK файлы"
-
-#: ../fdroidserver/scanner.py
-msgid "Android DEX code"
-msgstr "Android DEX коды"
-
-#: ../fdroidserver/init.py
-#, python-brace-format
-msgid "Android SDK not found at {path}!"
-msgstr "Android SDK {path} юлында табылманы!"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Android SDK path '{path}' does not exist!"
-msgstr "'{path}' Android SDK юлы юҡ!"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Android SDK path '{path}' is not a directory!"
-msgstr "'{path}' Android SDK юлы — каталог түгел!"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Android SDK tool {cmd} not found!"
-msgstr "{cmd} Android SDK ҡоралы табылманы!"
-
-#: ../fdroidserver/lint.py
-msgid "App has Binaries but does not have corresponding AllowedAPKSigningKeys to pin certificate."
-msgstr "Ҡушымтала Binaries бар, ләкин сертификатты беркетеү өсөн тейешле AllowedAPKSigningKeys юҡ."
-
-#: ../fdroidserver/lint.py
-msgid "App has NoSourceSince or ArchivePolicy \"0 versions\" or 0 but AutoUpdateMode or UpdateCheckMode are not None"
-msgstr "Ҡушымтала NoSourceSince йәки ArchivePolicy \"0 versions\" йәки 0 ҡуйылған, ләкин AutoUpdateMode йәки UpdateCheckMode None түгел"
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "App is in '{repo}' but has a link to {url}"
-msgstr "Ҡушымта '{repo}' эсендә, ләкин {url} адресына һылтанмаһы бар"
-
-#: ../fdroidserver/lint.py
-msgid "App version has binary but does not have corresponding AllowedAPKSigningKeys to pin certificate."
-msgstr "Ҡушымта версияһында бинар файл бар, ләкин сертификатты беркетеү өсөн тейешле AllowedAPKSigningKeys юҡ."
-
-#: ../fdroidserver/lint.py
-msgid "Appending .git is not necessary"
-msgstr ".git ҡушып яҙыу мотлаҡ түгел"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Archiving {apkfilename} with invalid signature!"
-msgstr "{apkfilename} дөрөҫ булмаған имза менән архивлана!"
-
-#: ../fdroidserver/lint.py
-msgid "AutoUpdateMode with UpdateCheckMode: HTTP must have a pattern."
-msgstr "AutoUpdateMode-ла UpdateCheckMode: HTTP өсөн ҡалып булырға тейеш."
-
-#: ../fdroidserver/install.py
-msgid "Automatic no to all prompts."
-msgstr "Барлыҡ һорауҙарға автоматик рәүештә \"юҡ\" тигән яуап."
-
-#: ../fdroidserver/install.py
-msgid "Automatic yes to all prompts."
-msgstr "Барлыҡ һорауҙарға автоматик рәүештә \"эйе\" тигән яуап."
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "Bad entry type \"{mirrortype}\" in mirrors config: {mirror}"
-msgstr "Көҙгөләр көйләүҙәрендә дөрөҫ булмаған яҙма төрө \"{mirrortype}\": {mirror}"
-
-#: ../fdroidserver/mirror.py
-msgid "Base URL to mirror, can include the index signing key using the query string: ?fingerprint="
-msgstr "Көҙгө яһау өсөн төп URL, һорау юлы аша индекс имзалау асҡысын ҡушырға мөмкин: ?fingerprint="
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Branch '{branch}' used as commit in build '{versionName}'"
-msgstr "'{versionName}' йыйылмаһында '{branch}' ботағы коммит булараҡ ҡулланылған"
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Branch '{branch}' used as commit in srclib '{srclib}'"
-msgstr "'{srclib}' сығанаҡ китапханаһында '{branch}' ботағы коммит булараҡ ҡулланылған"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Broken symlink: {path}"
-msgstr "Өҙөлгән символик һылтанма: {path}"
-
-#: ../fdroidserver/__main__.py
-msgid "Build a package from source"
-msgstr "Пакетты сығанаҡ кодтан йыйыу"
-
-#: ../fdroidserver/build.py
-msgid "Build all applications available"
-msgstr "Барлыҡ ҡушымталарҙы йыйыу"
-
-#: ../fdroidserver/lint.py
-msgid "Build generated by `fdroid import` - remove disable line once ready"
-msgstr "`fdroid import` менән яһалған йыйылма — әҙер булғас, һүндереү юлын алып ташлағыҙ"
-
-#: ../fdroidserver/checkupdates.py
-msgid "Build metadata git repo has uncommited changes!"
-msgstr "Йыйыу мета-мәғлүмәттәренең git репозиторийында һаҡланмаған үҙгәрештәр бар!"
-
-#: ../fdroidserver/build.py
-msgid "Build only the latest version of each package"
-msgstr "Һәр пакеттың һуңғы версияһын ғына йыйыу"
-
-#: ../fdroidserver/init.py
-#, python-format
-msgid "Built repo based in \"%s\" with this config:"
-msgstr "\"%s\" каталогында ошо көйләүҙәр менән репозиторий төҙөлдө:"
-
-#: ../fdroidserver/checkupdates.py
-msgid "Can't auto-update app with no CurrentVersionCode"
-msgstr "CurrentVersionCode булмаған ҡушымтаны автоматик яңыртып булмай"
-
-#: ../fdroidserver/build.py
-msgid "Can't build due to {} error while scanning"
-msgid_plural "Can't build due to {} errors while scanning"
-msgstr[0] "Сканлау ваҡытындағы {} хата арҡаһында йыйып булмай"
-msgstr[1] "Сканлау ваҡытындағы {} хата арҡаһында йыйып булмай"
-
-#: ../fdroidserver/common.py
-#, fuzzy, python-brace-format
-msgid "Cannot read {path}: {error}"
-msgstr "{path} уҡылманы: {error}"
-
-#: ../fdroidserver/rewritemeta.py
-#, python-brace-format
-msgid "Cannot rewrite \"{path}\""
-msgstr "\"{path}\" файлын үҙгәртеп яҙып булмай"
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
-#: ../fdroidserver/lint.py
-#, python-format
-msgid "Categories '%s' is not valid"
-msgstr "'%s' категориялары дөрөҫ түгел"
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
-#: ../fdroidserver/lint.py
-msgid "Categories are not set"
-msgstr "Категориялар күрһәтелмәгән"
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "Category \"{category}\" defined but not used for any apps!"
-msgstr "\"{category}\" категорияһы билдәләнгән, ләкин бер ҡушымтала ла ҡулланылмай!"
-
-#: ../fdroidserver/__main__.py
-msgid "Check for updates to applications"
-msgstr "Ҡушымталар өсөн яңыртыуҙарҙы тикшереү"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Checking archiving for {appid} - apks:{integer}, keepversions:{keep}, archapks:{arch}"
-msgstr "{appid} өсөн архивлауҙы тикшереү - apk:{integer}, һаҡларға:{keep}, архивта:{arch}"
-
-#: ../fdroidserver/update.py
-msgid "Clean update - don't uses caches, reprocess all APKs"
-msgstr "Таҙа яңыртыу — кештарҙы ҡулланмаҫҡа, бөтә APK-ларҙы яңынан эшкәртергә"
-
-#: ../fdroidserver/common.py
-msgid "Color the log output"
-msgstr "Лог сығарылышын төҫлө итеү"
-
-#: ../fdroidserver/import_subcommand.py
-msgid "Comma separated list of categories."
-msgstr "Өтөр менән айырылған категориялар исемлеге."
-
-#: ../fdroidserver/__main__.py
-#, python-format
-msgid "Command '%s' not recognised.\n"
-msgstr "'%s' командаһы танылманы.\n"
-
-#: ../fdroidserver/checkupdates.py
-msgid "Commit changes"
-msgstr "Үҙгәрештәрҙе һаҡлау (commit)"
-
-#: ../fdroidserver/checkupdates.py
-msgid "Commit changes, push, then make a merge request"
-msgstr "Үҙгәрештәрҙе һаҡларға (commit), ебәрергә (push), шунан берләштереүгә һорау яһарға"
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Conflicting \"{field}\" definitions between .yml and localized files:"
-msgstr ".yml һәм локалләштерелгән файлдар араһында \"{field}\" өсөн ҡапма-ҡаршылыҡлы билдәләмәләр:"
-
-#: ../fdroidserver/__main__.py
-msgid "Conflicting arguments: '--verbose' and '--quiet' can not be specified at the same time."
-msgstr "Ҡапма-ҡаршылыҡлы аргументтар: '--verbose' һәм '--quiet' бер үк ваҡытта күрһәтелә алмай."
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Could not find '{command}' on your system"
-msgstr "Системала '{command}' табылманы"
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/import_subcommand.py
-msgid "Could not find latest version code"
-msgstr "Һуңғы версияның кодын табып булманы"
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
-#: ../fdroidserver/import_subcommand.py
-msgid "Could not find latest version name"
-msgstr "Һуңғы версияның исемен табып булманы"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Could not find {path} to remove it"
-msgstr "Юйыу өсөн {path} табылманы"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Could not open APK {path} for analysis: "
-msgstr "Анализ өсөн {path} APK файлын асып булманы: "
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Could not parse size \"{size}\", wrong type \"{type}\""
-msgstr "\"{size}\" үлсәмен танып булманы, дөрөҫ булмаған тип \"{type}\""
-
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/import_subcommand.py
-msgid "Couldn't find Application ID"
-msgstr "Ҡушымтаның идентификаторын (Application ID) табып булманы"
-
-#: ../fdroidserver/checkupdates.py
-msgid "Couldn't find any version information"
-msgstr "Бер ниндәй ҙә версия мәғлүмәте табылманы"
-
-#: ../fdroidserver/checkupdates.py
-msgid "Couldn't find package ID"
-msgstr "Пакет идентификаторын табып булманы"
-
-#: ../fdroidserver/update.py
-msgid "Cowardily refusing to overwrite existing signing key setup!"
-msgstr "Инде булған имзалау асҡысы көйләүҙәрен өҫтөнән яҙҙырыуҙан ҡурҡаҡтарса баш тартам!"
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Created new container \"{name}\""
-msgstr "Яңы \"{name}\" контейнеры булдырылды"
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Creating \"{path}\" for configuring s3cmd."
-msgstr "s3cmd-ты көйләү өсөн \"{path}\" булдырыла."
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Creating empty {config_file}"
-msgstr "Буш {config_file} булдырыла"
-
-#: ../fdroidserver/publish.py
-msgid "Creating log directory"
-msgstr "Логтар каталогы булдырыла"
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Creating new S3 bucket: {url}"
-msgstr "Яңы S3 биҙрәһе булдырыла: {url}"
-
-#: ../fdroidserver/publish.py
-msgid "Creating output directory"
-msgstr "Сығарыу каталогы булдырыла"
-
-#: ../fdroidserver/index.py
-msgid "Creating signed index with this key (SHA256):"
-msgstr "Ошо асҡыс менән тамғаланған индекс булдырыла (SHA256):"
-
-#: ../fdroidserver/publish.py ../fdroidserver/verify.py
-msgid "Creating temporary directory"
-msgstr "Ваҡытлыса каталог булдырыла"
-
-#: ../fdroidserver/index.py
-msgid "Creating unsigned index in preparation for signing"
-msgstr "Тамғалауға әҙерлек өсөн тамғаланмаған индекс булдырыла"
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "CurrentVersionCode {cv} is less than oldest build entry {versionCode}"
-msgstr "Ағымдағы CurrentVersionCode {cv} иң иҫке йыйылма яҙмаһынан {versionCode} бәләкәйерәк"
-
-#: ../fdroidserver/nightly.py
-msgid "DEBUG_KEYSTORE is not set or the value is incomplete"
-msgstr "DEBUG_KEYSTORE күрһәтелмәгән йәки уның ҡиммәте тулы түгел"
-
-#: ../fdroidserver/update.py
-msgid "Delete APKs and/or OBBs without metadata from the repo"
-msgstr "Репозиторийҙан мета-мәғлүмәттәрһеҙ APK-ларҙы һәм/йәки OBB-ларҙы юйыу"
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Deleting archive, repo is too big ({size} max {limit})"
-msgstr "Архив юйыла, репозиторий бигерәк ҙур ({size} макс. {limit})"
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Deleting git-mirror history, repo is too big ({size} max {limit})"
-msgstr "git-көҙгөнөң тарихы юйыла, репозиторий бигерәк ҙур ({size} макс. {limit})"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Deleting unknown file: {path}"
-msgstr "Билдәһеҙ файл юйыла: {path}"
-
-#: ../fdroidserver/lint.py
-#, python-format
-msgid "Description '%s' is just the app's summary"
-msgstr "'%s' тасуирламаһы — ул ҡушымтаның ҡыҫҡаса аңлатмаһы ғына"
-
-#: ../fdroidserver/lint.py
-msgid "Description has a duplicate line"
-msgstr "Тасуирламала ҡабатланған юл бар"
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Description of length {length} is over the {limit} char limit"
-msgstr "{length} оҙонлоғондағы тасуирлама {limit} символ сикләүенән артып китә"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Did you mean config/{name}.yml?"
-msgstr "Һеҙ config/{name}.yml-ды күҙ уңында тоттоғоҙмо?"
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Did you mean {code}?"
-msgstr "Һеҙ {code}-ты күҙ уңында тоттоғоҙмо?"
-
-#: ../fdroidserver/import_subcommand.py
-msgid "Do not add 'disable:' to the generated build entries"
-msgstr "Булдырылған йыйылма яҙмаларына 'disable:' өҫтәмәгеҙ"
-
-#: ../fdroidserver/nightly.py
-msgid "Do not deploy the new files to the repo"
-msgstr "Яңы файлдарҙы репозиторийға урынлаштырмағыҙ"
-
-#: ../fdroidserver/mirror.py
-#, python-brace-format
-msgid "Do not include \"{path}\" in URL!"
-msgstr "URL-ға \"{path}\"-ты индермәгеҙ!"
-
-#: ../fdroidserver/init.py
-msgid "Do not prompt for Android SDK path, just fail"
-msgstr "Android SDK юлын һорамаҫҡа, шунда уҡ уңышһыҙлыҡ менән тамамларға"
-
-#: ../fdroidserver/nightly.py
-msgid "Do not remove the private keys generated from the keystore"
-msgstr "Асҡыстар һаҡлағысынан булдырылған шәхси асҡыстарҙы юймағыҙ"
-
-#: ../fdroidserver/build.py
-msgid "Don't create a source tarball, useful when testing a build"
-msgstr "Сығанаҡ кодтарҙың tarball-ын яһамаҫҡа, йыйылманы һынағанда файҙалы"
-
-#: ../fdroidserver/build.py
-msgid "Don't refresh the repository, useful when testing a build with no internet connection"
-msgstr "Репозиторийҙы яңыртмаҫҡа, интернетһыҙ йыйылманы һынағанда файҙалы"
-
-#: ../fdroidserver/deploy.py ../fdroidserver/nightly.py
-msgid "Don't use rsync checksums"
-msgstr "rsync контроль суммаларын ҡулланмаҫҡа"
-
-#: ../fdroidserver/install.py
-msgid "Download F-Droid.apk using mirrors that leak less to the network"
-msgstr "F-Droid.apk-ны селтәргә аҙыраҡ мәғлүмәт ебәргән көҙгөләр аша йөкмәтергә"
-
-#: ../fdroidserver/__main__.py
-msgid "Download complete mirrors of small repos"
-msgstr "Бәләкәй репозиторийҙарҙың тулы көҙгөләрен йөкмәтеү"
-
-#: ../fdroidserver/common.py
-msgid "Downloading the repository already failed once, not trying again."
-msgstr "Репозиторийҙы йөкмәтеү бер тапҡыр уңышһыҙ булды инде, яңынан ҡабатланмаясаҡ."
-
-#: ../fdroidserver/verify.py
-#, python-brace-format
-msgid "Downloading {url} failed. {error}"
-msgstr "{url} йөкмәтелмәне. {error}"
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Duplicate Anti-Feature declaration at {path} was ignored!"
-msgstr "{path} юлындағы ҡабатланған Anti-Feature декларацияһы иғтибарһыҙ ҡалдырылды!"
-
-#: ../fdroidserver/index.py
-#, python-format
-msgid "Duplicate entry \"%s\" in mirrors config!"
-msgstr "Көҙгөләр көйләүҙәрендә ҡабатланған \"%s\" яҙмаһы!"
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Duplicate link in '{field}': {url}"
-msgstr "'{field}' яланында ҡабатланған һылтанма: {url}"
-
-#: ../fdroidserver/common.py
-#, python-format
-msgid "ERROR: %(message)s"
-msgstr "ХАТА: %(message)s"
-
-#: ../fdroidserver/__main__.py
-msgid "ERROR: The \"server\" subcommand has been removed, use \"deploy\"!"
-msgstr "ХАТА: \"server\" аҫкомандаһы алынды, \"deploy\" командаһын ҡулланығыҙ!"
-
-#: ../fdroidserver/nightly.py
-msgid "ERROR: unsupported CI type, patches welcome!"
-msgstr "ХАТА: яраҡһыҙ CI төрө, төҙәтмәләр хуплана!"
-
-#: ../fdroidserver/nightly.py
-#, python-format
-msgid "ERROR: unsupported git host \"%s\", patches welcome!"
-msgstr "ХАТА: яраҡһыҙ git хосты \"%s\", төҙәтмәләр хуплана!"
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "ERROR: {key} in {path} is not \"archive\" or \"repo\"!"
-msgstr "ХАТА: {path} эсендәге {key} асҡысы \"archive\" йәки \"repo\" түгел!"
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "ERROR: {key} not a valid key!"
-msgstr "ХАТА: {key} — дөрөҫ асҡыс түгел!"
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "ERROR: {key}'s value should be of type {t}!"
-msgstr "ХАТА: {key} асҡысының ҡиммәте {t} тибында булырға тейеш!"
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "ERROR: {key}:{subkey} in {path} is not in allowed keys: {allowed_keys}!"
-msgstr "ХАТА: {path} эсендәге {key}:{subkey} рөхсәт ителгән асҡыстар исемлегендә юҡ: {allowed_keys}!"
-
-#: ../fdroidserver/__main__.py
-#, python-brace-format
-msgid "Encoding is set to '{enc}' fdroid might run into encoding issues. Please set it to 'UTF-8' for best results."
-msgstr "Кодировка '{enc}' итеп ҡуйылған, F-Droid-та кодировка проблемалары булыуы мөмкин. Иң яҡшы һөҙөмтә өсөн уны 'UTF-8'-гә ҡуйығыҙ."
-
-#: ../fdroidserver/init.py
-#, python-format
-msgid ""
-"Enter the path to the Android SDK (%s) here:\n"
-"> "
-msgstr ""
-"Android SDK-ның юлын (%s) бында яҙығыҙ:\n"
-"> "
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Environment variable {var} from {configname} is not set!"
-msgstr "{configname} эсенән {var} мөхит үҙгәреүсәне күрһәтелмәгән!"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Environment variable {{env: {var}}} is not set!"
-msgstr "{{env: {var}}} мөхит үҙгәреүсәне күрһәтелмәгән!"
-
-#: ../fdroidserver/deploy.py
-msgid "Error deploying 'github_releases', {} not present. (You might need to run `fdroid update` first.)"
-msgstr "'github_releases' урынлаштырыу хатаһы, {} юҡ. (Башта `fdroid update` командаһын эшләтеп алырға кәрәк булыуы мөмкин.)"
-
-#: ../fdroidserver/import_subcommand.py
-msgid "Error while getting repo address"
-msgstr "Репозиторий адресын алғанда хата"
-
-#: ../fdroidserver/scanner.py
-msgid "Exit with a non-zero code if problems were found"
-msgstr "Проблемалар табылһа, нулдән айырмалы код менән сығырға"
-
-#: ../fdroidserver/__main__.py
-msgid "Extract application metadata from a source repository"
-msgstr "Сығанаҡ репозиторийынан ҡушымтаның мета-мәғлүмәттәрен сығарыу"
-
-#: ../fdroidserver/__main__.py
-msgid "Extract signatures from APKs"
-msgstr "APK-ларҙан имзаларҙы сығарыу"
-
-#: ../fdroidserver/install.py
-msgid "F-Droid.apk could not be downloaded from any known source!"
-msgstr "F-Droid.apk-ны билдәле сығанаҡтарҙың береһенән дә йөкмәтеп булманы!"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Failed copying {path}: {error}"
-msgstr "{path} күсерелмәне: {error}"
-
-#: ../fdroidserver/signatures.py
-#, python-brace-format
-msgid "Failed fetching signatures for '{apkfilename}': {error}"
-msgstr "'{apkfilename}' өсөн имзаларҙы алып булманы: {error}"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Failed reading {path}: {error}"
-msgstr "{path} уҡылманы: {error}"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Failed resizing {path}: {error}"
-msgstr "{path} үлсәме үҙгәртелмәне: {error}"
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Failed to create S3 bucket: {url}"
-msgstr "S3 контейнерын булдырып булманы: {url}"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Failed to get APK information, deleting {path}"
-msgstr "APK тураһында мәғлүмәт алып булманы, {path} юйыла"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Failed to get APK information, skipping {path}"
-msgstr "APK тураһында мәғлүмәт алып булманы, {path} үткәреп ебәрелә"
-
-#: ../fdroidserver/update.py
-msgid "Failed to get APK signing key fingerprint"
-msgstr "APK имзалау асҡысының бармаҡ эҙен алып булманы"
-
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "Failed to install '{apkfilename}' on {dev}: {error}"
-msgstr "'{apkfilename}' {dev} ҡоролмаһына ҡуйылманы: {error}"
-
-#: ../fdroidserver/common.py
-msgid "Failed to sign application"
-msgstr "Ҡушымтаны тамғалап булманы"
-
-#: ../fdroidserver/build.py
-#, python-brace-format
-msgid "Fetched buildserverid from VM: {buildserverid}"
-msgstr "VM-дан йыйыу-серверының ID-һы алынды: {buildserverid}"
-
-#: ../fdroidserver/signatures.py
-#, python-brace-format
-msgid "Fetched signatures for '{apkfilename}' -> '{sigdir}'"
-msgstr "'{apkfilename}' өсөн имзалар алынды -> '{sigdir}'"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "File disappeared while processing it: {path}"
-msgstr "Файл эшкәртелгән ваҡытта юғалды: {path}"
-
-#: ../fdroidserver/build.py ../fdroidserver/install.py
-#: ../fdroidserver/rewritemeta.py ../fdroidserver/scanner.py
-#: ../fdroidserver/update.py
-msgid "Finished"
-msgstr "Тамамланды"
-
-#: ../fdroidserver/lint.py
-msgid "Forbidden HTML tags"
-msgstr "Тыйылған HTML тегтары"
-
-#: ../fdroidserver/build.py
-msgid "Force build of disabled apps, and carries on regardless of scan problems. Only allowed in test mode."
-msgstr "Һүндерелгән ҡушымталарҙы мәжбүри йыйыу һәм сканлау проблемаларына ҡарамаҫтан дауам итеү. Тик һынау режимында ғына рөхсәт ителә."
-
-#: ../fdroidserver/build.py
-#, python-brace-format
-msgid "Force halting build after {0} sec timeout!"
-msgstr "{0} секундлыҡ тайм-ауттан һуң йыйыуҙы мәжбүри туҡтатыу!"
-
-#: ../fdroidserver/scanner.py
-msgid "Force scan of disabled apps and builds."
-msgstr "Һүндерелгән ҡушымталарҙы һәм йыйылмаларҙы мәжбүри сканлау."
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Found \"{path}\" graphic without metadata for app \"{name}\"!"
-msgstr "\"{name}\" ҡушымтаһы өсөн мета-мәғлүмәтһеҙ \"{path}\" графикаһы табылды!"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Found bad funding file \"{path}\" for \"{name}\":"
-msgstr "\"{name}\" өсөн дөрөҫ булмаған \"{path}\" финанслау файлы табылды:"
-
-#: ../fdroidserver/common.py
-msgid "Found invalid appids in arguments"
-msgstr "Аргументтарҙа дөрөҫ булмаған appid-ҙар табылды"
-
-#: ../fdroidserver/common.py
-msgid "Found invalid versionCodes for some apps"
-msgstr "Ҡайһы бер ҡушымталар өсөн дөрөҫ булмаған versionCode-тар табылды"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Found multiple JAR Signature Block Files in {path}"
-msgstr "{path} эсендә бер нисә JAR имза блок файлы табылды"
-
-#: ../fdroidserver/common.py
-msgid "Found multiple Signer Certificates!"
-msgstr "Бер нисә имзалаусы сертификаты табылды!"
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Found multiple metadata files for {appid}"
-msgstr "{appid} өсөн бер нисә мета-мәғлүмәт файлы табылды"
-
-#: ../fdroidserver/index.py
-msgid "Found multiple signing certificates for repository."
-msgstr "Репозиторий өсөн бер нисә имзалау сертификаты табылды."
-
-#: ../fdroidserver/index.py
-msgid "Found no signing certificates for repository."
-msgstr "Репозиторий өсөн имзалау сертификаттары табылманы."
-
-#: ../fdroidserver/lint.py
-#, python-format
-msgid "Found non-file at %s"
-msgstr "%s юлында файл булмаған объект табылды"
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Found {apkfilename} at {url}"
-msgstr "{apkfilename} {url} адресында табылды"
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Found {count} problems in {filename}"
-msgstr "{filename} эсендә {count} проблема табылды"
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Found {count} warnings in {filename}"
-msgstr "{filename} эсендә {count} иҫкәрмә табылды"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Generated skeleton metadata for {appid}"
-msgstr "{appid} өсөн мета-мәғлүмәт ҡалыбы булдырылды"
-
-#: ../fdroidserver/common.py
-#, python-format
-msgid "Git checkout of '%s' failed"
-msgstr "'%s' Git checkout-ы уңышһыҙ булды"
-
-#: ../fdroidserver/common.py
-msgid "Git clean failed"
-msgstr "Git clean уңышһыҙ булды"
-
-#: ../fdroidserver/common.py
-msgid "Git fetch failed"
-msgstr "Git fetch уңышһыҙ булды"
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/common.py
-#, python-format
-msgid "Git remote set-head failed: \"%s\""
-msgstr "Git remote set-head уңышһыҙ булды: \"%s\""
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/common.py
-msgid "Git reset failed"
-msgstr "Git reset уңышһыҙ булды"
-
-#: ../fdroidserver/common.py
-msgid "Git submodule deinit failed"
-msgstr "Git submodule deinit уңышһыҙ булды"
-
-#: ../fdroidserver/common.py
-msgid "Git submodule sync failed"
-msgstr "Git submodule sync уңышһыҙ булды"
-
-#: ../fdroidserver/common.py
-msgid "Git submodule update failed"
-msgstr "Git submodule update уңышһыҙ булды"
-
-#: ../fdroidserver/common.py
-msgid "HTTPS must be used with Subversion URLs!"
-msgstr "Subversion URL-дары менән HTTPS ҡулланылырға тейеш!"
-
-#: ../fdroidserver/deploy.py
-msgid "If a git mirror gets to big, allow the archive to be deleted"
-msgstr "git көҙгөһө бигерәк ҙурайып китһә, архивты юйырға рөхсәт итеү"
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "If this upload fails, try manually uploading to {url}"
-msgstr "Был йөкмәү уңышһыҙ булһа, {url} адресына ҡулдан йөкмәп ҡарағыҙ"
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Ignoring '{field}' in '{metapath}' metadata because it is deprecated."
-msgstr "'{metapath}' мета-мәғлүмәттәрендәге '{field}' иҫкергән булғанға иғтибарһыҙ ҡалдырыла."
-
-#: ../fdroidserver/update.py
-#, python-format
-msgid "Ignoring FUNDING.yml entry longer than 2048: %s"
-msgstr "2048-ҙән оҙонораҡ FUNDING.yml яҙмаһы иғтибарһыҙ ҡалдырыла: %s"
-
-#: ../fdroidserver/update.py
-#, python-format
-msgid "Ignoring bad element in manifest: %s"
-msgstr "Манифестағы дөрөҫ булмаған элемент иғтибарһыҙ ҡалдырыла: %s"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Ignoring deprecated {oldfile}, use {newfile}!"
-msgstr "Иҫкергән {oldfile} иғтибарһыҙ ҡалдырыла, {newfile} ҡулланығыҙ!"
-
-#: ../fdroidserver/index.py
-msgid "Ignoring package without metadata: "
-msgstr "Мета-мәғлүмәтһеҙ пакет иғтибарһыҙ ҡалдырыла: "
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Ignoring stale cache data for {apkfilename}"
-msgstr "{apkfilename} өсөн иҫкергән кеш мәғлүмәттәре иғтибарһыҙ ҡалдырыла"
-
-#: ../fdroidserver/update.py
-msgid "Include APKs that are signed with disabled algorithms like MD5"
-msgstr "MD5 кеүек һүндерелгән алгоритмдар менән тамғаланған APK-ларҙы индереү"
-
-#: ../fdroidserver/mirror.py
-msgid "Include the PGP signature .asc files in the mirror"
-msgstr "Көҙгөгә PGP-имзалы .asc файлдарын индереү"
-
-#: ../fdroidserver/mirror.py
-msgid "Include the build logs in the mirror"
-msgstr "Көҙгөгә йыйыу логтарын индереү"
-
-#: ../fdroidserver/mirror.py
-msgid "Include the source tarballs in the mirror"
-msgstr "Көҙгөгә сығанаҡ tarball-дарҙы индереү"
-
-#: ../fdroidserver/metadata.py
-#, python-format
-msgid "Including metadata from %s@%s"
-msgstr "%s@%s версияһынан мета-мәғлүмәттәр индерелә"
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Including metadata from {path}"
-msgstr "{path} юлынан мета-мәғлүмәттәр индерелә"
-
-#: ../fdroidserver/common.py
-msgid "Initialising submodules"
-msgstr "Аҫмодулдәрҙе инициализациялау"
-
-#: ../fdroidserver/install.py
-msgid "Install all signed applications available"
-msgstr "Барлыҡ тамғаланған ҡушымталарҙы ҡуйыу"
-
-#: ../fdroidserver/__main__.py
-msgid "Install built packages on devices"
-msgstr "Йыйылған пакеттарҙы ҡоролмаларға ҡуйыу"
-
-#: ../fdroidserver/install.py
-#, python-format
-msgid "Installing %s..."
-msgstr "%s ҡуйыла..."
-
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "Installing '{apkfilename}' on {dev}..."
-msgstr "'{apkfilename}' {dev} ҡоролмаһына ҡуйыла..."
-
-#: ../fdroidserver/__main__.py
-msgid "Interact with the repo HTTP server"
-msgstr "Репоның HTTP-серверы менән эш итеү"
-
-#: ../fdroidserver/update.py
-msgid "Invalid APK"
-msgstr "Дөрөҫ булмаған APK"
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "Invalid AutoUpdateMode: {mode}"
-msgstr "Дөрөҫ булмаған AutoUpdateMode: {mode}"
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "Invalid UpdateCheckMode: {mode}"
-msgstr "Дөрөҫ булмаған UpdateCheckMode: {mode}"
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "Invalid VercodeOperation: {field}"
-msgstr "Дөрөҫ булмаған VercodeOperation: {field}"
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Invalid VercodeOperation: {invalid_ops}"
-msgstr "Дөрөҫ булмаған VercodeOperation: {invalid_ops}"
-
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Invalid application ID {appid}"
-msgstr "Дөрөҫ булмаған ҡушымта идентификаторы {appid}"
-
-#: ../fdroidserver/lint.py
-msgid "Invalid bulleted list"
-msgstr "Дөрөҫ булмаған маркировкалы исемлек"
-
-#: ../fdroidserver/common.py
-#, python-format
-msgid "Invalid name for published file: %s"
-msgstr "Баҫтырылған файл өсөн дөрөҫ булмаған исем: %s"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Invalid ndk: entry in build: \"{ndk}\""
-msgstr "Йыйылмала дөрөҫ булмаған ndk: яҙмаһы: \"{ndk}\""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Invalid redirect to non-HTTPS: {before} -> {after} "
-msgstr "HTTPS булмаған адресҡа дөрөҫ булмаған йүнәлтеү: {before} -> {after} "
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Invalid scrlib metadata: '{file}' does not exist"
-msgstr "Дөрөҫ булмаған scrlib мета-мәғлүмәте: '{file}' юҡ"
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Invalid srclib metadata: could not parse '{file}'"
-msgstr "Дөрөҫ булмаған srclib мета-мәғлүмәте: '{file}' танылманы"
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Invalid srclib metadata: unknown key '{key}' in '{file}'"
-msgstr "Дөрөҫ булмаған srclib мета-мәғлүмәте: '{file}' эсендә билдәһеҙ '{key}' асҡысы"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "JAR signature failed to verify: {path}"
-msgstr "JAR имзаһы тикшерелмәне: {path}"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "JAR signature verified: {path}"
-msgstr "JAR имзаһы тикшерелде: {path}"
-
-#: ../fdroidserver/scanner.py
-msgid "Java JAR file"
-msgstr "Java JAR файлы"
-
-#: ../fdroidserver/mirror.py ../fdroidserver/publish.py
-#: ../fdroidserver/update.py
-msgid "Java JDK not found! Install in standard location or set java_paths!"
-msgstr "Java JDK табылманы! Стандарт урынға ҡуйығыҙ йәки java_paths-ты күрһәтегеҙ!"
-
-#: ../fdroidserver/scanner.py
-msgid "Java compiled class"
-msgstr "Компиляцияланған Java класы"
-
-#: ../fdroidserver/signindex.py
-msgid "Java jarsigner not found! Install in standard location or set java_paths!"
-msgstr "Java jarsigner табылманы! Стандарт урынға ҡуйығыҙ йәки java_paths-ты күрһәтегеҙ!"
-
-#: ../fdroidserver/lint.py
-msgid "Javascript in HTML src attributes"
-msgstr "HTML-дың src атрибуттарында Javascript"
-
-#: ../fdroidserver/build.py
-#, python-brace-format
-msgid "Keeping failed build \"{apkfilename}\""
-msgstr "Уңышһыҙ йыйылған \"{apkfilename}\" һаҡлана"
-
-#: ../fdroidserver/init.py
-msgid "Keystore for signing key:\t"
-msgstr "Имзалау асҡысы өсөн асҡыстар һаҡлағысы:\t"
-
-#: ../fdroidserver/lint.py
-msgid "Known debug key is used in AllowedAPKSigningKeys: "
-msgstr "AllowedAPKSigningKeys-та билдәле төҙәтеү асҡысы ҡулланыла: "
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Last used commit '{commit}' looks like a tag, but UpdateCheckMode is '{ucm}'"
-msgstr "Һуңғы ҡулланылған '{commit}' коммиты тегҡа оҡшаған, ләкин UpdateCheckMode '{ucm}' итеп ҡуйылған"
-
-#: ../fdroidserver/lint.py
-msgid "Liberapay donation methods belong in the Liberapay: field"
-msgstr "Liberapay иғәнә ысулдары Liberapay: яланында булырға тейеш"
-
-#: ../fdroidserver/rewritemeta.py
-msgid "List files that would be reformatted (dry run)"
-msgstr "Яңынан форматланасаҡ файлдарҙың исемлеге (ҡоро эшләтеп ҡарау)"
-
-#: ../fdroidserver/lint.py
-msgid "Locale included in f-droid.org URL"
-msgstr "f-droid.org URL-ында локаль бар"
-
-#: ../fdroidserver/build.py
-msgid "Make the build stop on exceptions"
-msgstr "Хаталар булғанда йыйыуҙы туҡтатыу"
-
-#: ../fdroidserver/index.py
-msgid "Malformed repository mirrors."
-msgstr "Репозиторий көҙгөләре дөрөҫ форматланмаған."
-
-#: ../fdroidserver/deploy.py
-msgid "Malformed serverwebroot line:"
-msgstr "serverwebroot юлы дөрөҫ форматланмаған:"
-
-#: ../fdroidserver/scanner.py
-#, python-format
-msgid "Max recursion depth in ZIP file reached: %s"
-msgstr "ZIP файлында максималь рекурсия тәрәнлегенә етелде: %s"
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "Mirror config for {url} contains \"isPrimary\" key!"
-msgstr "{url} өсөн көҙгө көйләүҙәрендә \"isPrimary\" асҡысы бар!"
-
-#: ../fdroidserver/mirror.py
-msgid "Mirror the full repo and archive, all file types."
-msgstr "Репо менән архивтың тулы көҙгөһөн яһау, бөтә файл төрҙәре."
-
-#: ../fdroidserver/gpgsign.py
-msgid "Missing output directory"
-msgstr "Сығарыу каталогы юҡ"
-
-#: ../fdroidserver/metadata.py
-msgid "Moving Anti-Features declarations to localized files:"
-msgstr "Anti-Features декларацияларын локалләштерелгән файлдарға күсереү:"
-
-#: ../fdroidserver/index.py
-msgid "Neither \"repo_pubkey\" nor \"keystorepass\" set in config.yml"
-msgstr "config.yml-да \"repo_pubkey\" ҙә, \"keystorepass\" та күрһәтелмәгән"
-
-#: ../fdroidserver/verify.py
-#, python-format
-msgid "No APK for package: %s"
-msgstr "%s пакеты өсөн APK юҡ"
-
-#: ../fdroidserver/common.py
-msgid "No Android SDK found!"
-msgstr "Android SDK табылманы!"
-
-#: ../fdroidserver/install.py
-msgid "No attached devices found"
-msgstr "Тоташтырылған ҡоролмалар табылманы"
-
-#: ../fdroidserver/install.py
-msgid "No devices found for `adb install`! Please plug one in."
-msgstr "`adb install` өсөн ҡоролмалар табылманы! Зинһар, берәйһен тоташтырығыҙ."
-
-#: ../fdroidserver/index.py
-msgid "No fingerprint in URL."
-msgstr "URL-да бармаҡ эҙе юҡ."
-
-#: ../fdroidserver/common.py
-msgid "No git submodules available"
-msgstr "git аҫмодулдәре юҡ"
-
-#: ../fdroidserver/import_subcommand.py
-msgid "No gradle project could be found. Specify --subdir?"
-msgstr "gradle проекты табылманы. --subdir күрһәтеп ҡарайһығыҙмы?"
-
-#: ../fdroidserver/import_subcommand.py
-msgid "No information found."
-msgstr "Мәғлүмәт табылманы."
-
-#: ../fdroidserver/checkupdates.py
-msgid "No matching tags found"
-msgstr "Ярашлы тегтар табылманы"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "No minimum SDK version found in {0}, using default (3)."
-msgstr "{0} эсендә SDK-ның минималь версияһы табылманы, стандарт (3) ҡулланыла."
-
-#: ../fdroidserver/lint.py
-msgid "No need to specify that the app is Free Software"
-msgstr "Ҡушымтаның Ирекле Программа булыуын күрһәтеү кәрәкмәй"
-
-#: ../fdroidserver/lint.py
-msgid "No need to specify that the app is for Android"
-msgstr "Ҡушымтаның Android өсөн булыуын күрһәтеү кәрәкмәй"
-
-#: ../fdroidserver/deploy.py
-msgid "No option set! Edit your config.yml to set at least one of these:"
-msgstr "Бер параметр ҙа күрһәтелмәгән! config.yml файлына үҙгәреш индереп, ошоларҙың кәмендә береһен күрһәтегеҙ:"
-
-#: ../fdroidserver/common.py
-msgid "No packages specified"
-msgstr "Пакеттар күрһәтелмәгән"
-
-#: ../fdroidserver/install.py
-#, python-format
-msgid "No signed APK available for %s"
-msgstr "%s өсөн тамғаланған APK юҡ"
-
-#: ../fdroidserver/install.py
-msgid "No signed output directory - nothing to do"
-msgstr "Тамғаланған сығарыу каталогы юҡ — эшләр нәмә юҡ"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "No signing certificates found in {path}"
-msgstr "{path} эсендә имзалау сертификаттары табылманы"
-
-#: ../fdroidserver/common.py
-#, python-format
-msgid "No such package: %s"
-msgstr "Бындай пакет юҡ: %s"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "No such versionCode {versionCode} for app {appid}"
-msgstr "{appid} ҡушымтаһы өсөн бындай {versionCode} versionCode-ы юҡ"
-
-#: ../fdroidserver/checkupdates.py
-msgid "No tags found"
-msgstr "Тегтар табылманы"
-
-#: ../fdroidserver/publish.py ../fdroidserver/verify.py
-msgid "No unsigned directory - nothing to do"
-msgstr "Тамғаланмаған каталог юҡ — эшләр нәмә юҡ"
-
-#: ../fdroidserver/__main__.py
-msgid "No version information could be found."
-msgstr "Версия тураһында мәғлүмәт табылманы."
-
-#: ../fdroidserver/common.py
-msgid "Not a valid size definition: \"{}\""
-msgstr "Дөрөҫ булмаған үлсәм билдәләмәһе: \"{}\""
-
-#: ../fdroidserver/signindex.py
-msgid "Nothing to do"
-msgstr "Эшләр нәмә юҡ"
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "Nothing to do for {appid}."
-msgstr "{appid} өсөн эшләр нәмә юҡ."
-
-#: ../fdroidserver/init.py
-msgid "Now set these in config.yml:"
-msgstr "Хәҙер ошоларҙы config.yml-да күрһәтегеҙ:"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "OBB file has newer versionCode({integer}) than any APK:"
-msgstr "OBB файлының versionCode-ы ({integer}) теләһә ҡайһы APK-ныҡынан яңыраҡ:"
-
-#: ../fdroidserver/update.py
-msgid "OBB filename must start with \"main.\" or \"patch.\":"
-msgstr "OBB файлының исеме \"main.\" йәки \"patch.\" менән башланырға тейеш:"
-
-#: ../fdroidserver/update.py
-msgid "OBB's packagename does not match a supported APK:"
-msgstr "OBB-ның пакет исеме яраҡлы APK-ға тап килмәй:"
-
-#: ../fdroidserver/deploy.py
-msgid "Offline machine, skipping git mirror generation until `fdroid deploy`"
-msgstr "Офлайн машина, `fdroid deploy` эшләтелгәнгә тиклем git көҙгөһөн булдырыу үткәреп ебәрелә"
-
-#: ../fdroidserver/deploy.py
-msgid "One of the 'github_releases' config items is missing the 'packageNames' value. skipping ..."
-msgstr "'github_releases' көйләүҙәренең береһендә 'packageNames' ҡиммәте юҡ. үткәреп ебәрелә ..."
-
-#: ../fdroidserver/deploy.py
-msgid "One of the 'github_releases' config items is missing the 'projectUrl' value. skipping ..."
-msgstr "'github_releases' көйләүҙәренең береһендә 'projectUrl' ҡиммәте юҡ. үткәреп ебәрелә ..."
-
-#: ../fdroidserver/deploy.py
-msgid "One of the 'github_releases' config items is missing the 'token' value. skipping ..."
-msgstr "'github_releases' көйләүҙәренең береһендә 'token' ҡиммәте юҡ. үткәреп ебәрелә ..."
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Only PNG and JPEG are supported for graphics, found: {path}"
-msgstr "Графика өсөн тик PNG һәм JPEG ғына ярай, табылды: {path}"
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/common.py
-msgid "Only accepts a single key \"env\""
-msgstr "Тик бер генә \"env\" асҡысын ҡабул итә"
-
-#: ../fdroidserver/checkupdates.py
-msgid "Only process apps with auto-updates"
-msgstr "Тик автоматик яңыртылыусы ҡушымталарҙы ғына эшкәртеү"
-
-#: ../fdroidserver/lint.py
-msgid "OpenCollective donation methods belong in the OpenCollective: field"
-msgstr "OpenCollective иғәнә ысулдары OpenCollective: яланында булырға тейеш"
-
-#: ../fdroidserver/verify.py
-msgid "Output JSON report to file named after APK."
-msgstr "JSON отчетын APK исеме менән аталған файлға сығарыу."
-
-#: ../fdroidserver/scanner.py
-msgid "Output JSON to stdout."
-msgstr "JSON-ды стандарт сығарыу ағымына (stdout) сығарыу."
-
-#: ../fdroidserver/checkupdates.py ../fdroidserver/gpgsign.py
-#: ../fdroidserver/publish.py ../fdroidserver/signindex.py
-#: ../fdroidserver/update.py
-msgid "Outputting JSON"
-msgstr "JSON сығарыла"
-
-#: ../fdroidserver/import_subcommand.py
-msgid "Overall license of the project."
-msgstr "Проекттың дөйөм лицензияһы."
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "Overriding blank versionName in {apkfilename} from metadata: {version}"
-msgstr "{apkfilename} эсендәге буш versionName мета-мәғлүмәттән алынған {version} менән алмаштырыла"
-
-#: ../fdroidserver/import_subcommand.py
-#, python-brace-format
-msgid "Package \"{appid}\" already exists"
-msgstr "\"{appid}\" пакеты инде бар"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Parsing manifest at '{path}'"
-msgstr "'{path}' юлындағы манифест таныла"
-
-#: ../fdroidserver/common.py
-msgid "Password required with username"
-msgstr "Ҡулланыусы исеме менән бергә пароль кәрәк"
-
-#: ../fdroidserver/import_subcommand.py
-msgid "Path to main Android project subdirectory, if not in root."
-msgstr "Төп Android проектының аҫкаталогына юл, әгәр ул тамыр каталогында булмаһа."
-
-#: ../fdroidserver/init.py
-msgid "Path to the Android SDK (sometimes set in ANDROID_HOME)"
-msgstr "Android SDK-ға юл (ҡайһы саҡ ANDROID_HOME-да күрһәтелә)"
-
-#: ../fdroidserver/btlog.py
-msgid "Path to the git repo to use as the log"
-msgstr "Лог итеп ҡулланыу өсөн git репозиторийына юл"
-
-#: ../fdroidserver/init.py
-msgid "Path to the keystore for the repo signing key"
-msgstr "Репо имзалау асҡысы өсөн асҡыстар һаҡлағысына юл"
-
-#: ../fdroidserver/nightly.py
-msgid "Print the secret variable to the terminal for easy copy/paste"
-msgstr "Йәшерен үҙгәреүсәнде күсереп-ҡуйыу еңел булһын өсөн терминалға сығарыу"
-
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "Privacy mode was enabled based on your locale ({country_code})."
-msgstr "Һеҙҙең локаль ({country_code}) нигеҙендә хосусилыҡ режимы ҡабыҙылды."
-
-#: ../fdroidserver/scanner.py
-#, python-format
-msgid "Problem with ZIP file: %s, error %s"
-msgstr "ZIP файлы менән проблема: %s, хата %s"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Problem with xml at '{path}'"
-msgstr "'{path}' юлындағы xml менән проблема"
-
-#: ../fdroidserver/checkupdates.py
-msgid "Process auto-updates"
-msgstr "Автоматик яңыртыуҙарҙы эшкәртеү"
-
-#: ../fdroidserver/publish.py ../fdroidserver/update.py
-#, python-brace-format
-msgid "Processing {apkfilename}"
-msgstr "{apkfilename} эшкәртелә"
-
-#: ../fdroidserver/checkupdates.py ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Processing {appid}"
-msgstr "{appid} эшкәртелә"
-
-#: ../fdroidserver/update.py
-msgid "Produce human-readable XML/JSON for index files"
-msgstr "Индекс файлдары өсөн кеше уҡый алырлыҡ XML/JSON булдырыу"
-
-#: ../fdroidserver/import_subcommand.py
-msgid "Project URL to import from."
-msgstr "Импортлау өсөн проекттың URL-ы."
-
-#: ../fdroidserver/lint.py
-msgid "Punctuation should be avoided"
-msgstr "Тыныш билдәләренән ҡасырға кәрәк"
-
-#: ../fdroidserver/btlog.py
-msgid "Push the log to this git remote repository"
-msgstr "Логты ошо алыҫтағы git репозиторийына ебәреү"
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Pushing binary transparency log to {url}"
-msgstr "Бинар асыҡлыҡ логы {url} адресына ебәрелә"
-
-#: ../fdroidserver/deploy.py
-msgid "Pushing to remote server failed!"
-msgstr "Алыҫтағы серверға ебәреү уңышһыҙ булды!"
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Pushing to {url}"
-msgstr "{url} адресына ебәрелә"
-
-#: ../fdroidserver/__main__.py
-msgid "Quickly start a new repository"
-msgstr "Яңы репозиторийҙы тиҙ генә башлау"
-
-#: ../fdroidserver/__main__.py
-msgid "Read all the metadata files and exit"
-msgstr "Барлыҡ мета-мәғлүмәт файлдарын уҡыу һәм сығыу"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Reading '{config_file}'"
-msgstr "'{config_file}' уҡыла"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Reading packageName/versionCode/versionName failed, APK invalid: '{apkfilename}'"
-msgstr "packageName/versionCode/versionName уҡылманы, APK дөрөҫ түгел: '{apkfilename}'"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Reading packageName/versionCode/versionName failed,APK invalid: '{apkfilename}'"
-msgstr "packageName/versionCode/versionName уҡылманы, APK дөрөҫ түгел: '{apkfilename}'"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Reading {apkfilename} from cache"
-msgstr "{apkfilename} кештан уҡыла"
-
-#: ../fdroidserver/build.py
-msgid "Refresh and cache scanner rules and signatures from the network"
-msgstr "Сканлаусы ҡағиҙәләрен һәм имзаларын селтәрҙән яңыртыу һәм кешлау"
-
-#: ../fdroidserver/publish.py
-#, python-brace-format
-msgid "Refusing to sign '{path}', file exists in both {dir1} and {dir2} folder."
-msgstr "'{path}' тамғалауҙан баш тартам, файл {dir1} һәм {dir2} каталогтарында ла бар."
-
-#: ../fdroidserver/verify.py
-msgid "Remove source tarball and any APKs if successfully verified."
-msgstr "Уңышлы тикшерелһә, сығанаҡ tarball-ды һәм теләһә ниндәй APK-ларҙы юйыу."
-
-#: ../fdroidserver/common.py
-msgid "Removing specified files"
-msgstr "Күрһәтелгән файлдар юйыла"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Removing {path}\""
-msgstr "\"{path} юйыла"
-
-#: ../fdroidserver/update.py
-msgid "Rename APK files that do not match package.name_123.apk"
-msgstr "package.name_123.apk ҡалыбына тап килмәгән APK файлдарының исемен үҙгәртеү"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "RepoType {type} is deprecated, please switch to git."
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-#, python-brace-format
-msgid "Resigning {apkfilename} with provided debug.keystore"
-msgstr "{apkfilename} бирелгән debug.keystore менән яңынан тамғалана"
-
-#: ../fdroidserver/update.py
-msgid "Resize all the icons exceeding the max pixel size and exit"
-msgstr "Максималь пиксель үлсәменән артҡан бөтә иконкаларҙың үлсәмен үҙгәртеү һәм сығыу"
-
-#: ../fdroidserver/common.py
-msgid "Restrict output to warnings and errors"
-msgstr "Сығарылышты иҫкәрмәләр һәм хаталар менән сикләү"
-
-#: ../fdroidserver/net.py
-#, python-format
-msgid "Retrying failed download: %s"
-msgstr "Уңышһыҙ йөкмәү ҡабатлана: %s"
-
-#: ../fdroidserver/__main__.py
-msgid "Rewrite all the metadata files"
-msgstr "Барлыҡ мета-мәғлүмәт файлдарын үҙгәртеп яҙыу"
-
-#: ../fdroidserver/rewritemeta.py
-#, python-brace-format
-msgid "Rewriting '{appid}'"
-msgstr "'{appid}' үҙгәртеп яҙыла"
-
-#: ../fdroidserver/checkupdates.py
-msgid "Run on git repo that has uncommitted changes"
-msgstr "Һаҡланмаған үҙгәрештәре булған git репозиторийында эшләтеү"
-
-#: ../fdroidserver/nightly.py
-#, python-brace-format
-msgid "Run over {cibase} to find -debug.apk. and skip repo_basedir {repo_basedir}"
-msgstr "{cibase} буйлап -debug.apk. табыу өсөн эшләтеү. һәм repo_basedir {repo_basedir} үткәреп ебәреү"
-
-#: ../fdroidserver/lint.py
-msgid "Run rewritemeta to fix formatting"
-msgstr "Форматлауҙы төҙәтеү өсөн rewritemeta-ны эшләтегеҙ"
-
-#: ../fdroidserver/deploy.py
-msgid "Running first pass with MD5 checking disabled"
-msgstr "MD5 тикшереүе һүндерелгән килеш беренсе үтеү башҡарыла"
-
-#: ../fdroidserver/mirror.py
-#, python-brace-format
-msgid "Running wget in {path}"
-msgstr "wget {path} каталогында эшләтелә"
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "SHA-256 of {url} does not match entry!"
-msgstr "{url} адресының SHA-256 суммаһы яҙмаға тап килмәй!"
-
-#: ../fdroidserver/build.py
-msgid "Scan the resulting APK(s) for known non-free classes."
-msgstr "Алынған APK(-лар)ҙы билдәле ирекле булмаған кластарға сканлау."
-
-#: ../fdroidserver/__main__.py
-msgid "Scan the source code of a package"
-msgstr "Пакеттың сығанаҡ кодын сканлау"
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Scanner found {count} problems in {apk}"
-msgstr "Сканлаусы {apk} эсендә {count} проблема тапты"
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Scanner found {count} problems in {appid}:"
-msgstr "Сканлаусы {appid} эсендә {count} проблема тапты:"
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Scanner found {count} problems in {appid}:{versionCode}:"
-msgstr "Сканлаусы {appid}:{versionCode} эсендә {count} проблема тапты:"
-
-#: ../fdroidserver/build.py
-msgid "Scanner found {} problem"
-msgid_plural "Scanner found {} problems"
-msgstr[0] "Сканлаусы {} проблема тапты"
-msgstr[1] "Сканлаусы {} проблема тапты"
-
-#: ../fdroidserver/scanner.py
-msgid "Scanning APK for extra signing blocks."
-msgstr "APK-ны өҫтәмә имзалау блоктарына сканлау."
-
-#: ../fdroidserver/scanner.py
-msgid "Scanning APK with dexdump for known non-free classes."
-msgstr "APK-ны dexdump менән билдәле ирекле булмаған кластарға сканлау."
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Set NDK {release} ({version}) up"
-msgstr "NDK {release} ({version}) көйләнде"
-
-#: ../fdroidserver/common.py
-msgid "Set clock to that time using:"
-msgstr "Сәғәтте ошо ваҡытҡа ҡуйыу өсөн ҡулланығыҙ:"
-
-#: ../fdroidserver/nightly.py
-msgid "Set maximum releases in repo before older ones are archived"
-msgstr "Иҫкерәктәре архивланыр алдынан репозиторийҙағы максималь релиздар һанын билдәләү"
-
-#: ../fdroidserver/build.py
-#, python-brace-format
-msgid "Set open file limit to {integer}"
-msgstr "Асыҡ файлдар сикләүен {integer} итеп ҡуйыу"
-
-#: ../fdroidserver/__main__.py
-msgid "Set up an app build for a nightly build repo"
-msgstr "Төнгө йыйыу репозиторийы өсөн ҡушымта йыйыуҙы көйләү"
-
-#: ../fdroidserver/build.py
-msgid "Setting open file limit failed: "
-msgstr "Асыҡ файлдар сикләүен ҡуйып булманы: "
-
-#: ../fdroidserver/build.py
-#, python-brace-format
-msgid "Setting {0} sec timeout for this build"
-msgstr "Был йыйыу өсөн {0} секундлыҡ тайм-аут ҡуйыла"
-
-#: ../fdroidserver/__main__.py
-msgid "Sign and place packages in the repo"
-msgstr "Пакеттарҙы тамғалау һәм репозиторийға урынлаштырыу"
-
-#: ../fdroidserver/__main__.py
-msgid "Sign indexes created using update --nosign"
-msgstr "update --nosign ярҙамында булдырылған индекстарҙы тамғалау"
-
-#: ../fdroidserver/build.py
-msgid "Skip scanning the source code for binaries and other problems"
-msgstr "Сығанаҡ кодты бинарҙарға һәм башҡа проблемаларға сканлауҙы үткәреп ебәреү"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Skipping '{apkfilename}' with invalid signature!"
-msgstr "Дөрөҫ булмаған имзалы '{apkfilename}' үткәреп ебәрелә!"
-
-#: ../fdroidserver/deploy.py ../fdroidserver/index.py
-#, python-format
-msgid "Skipping GitLab Pages mirror because the repo is too large (>%.2fGB)!"
-msgstr "GitLab Pages көҙгөһө үткәреп ебәрелә, сөнки репозиторий бигерәк ҙур (>%.2fGB)!"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Skipping index generation for {appid}"
-msgstr "{appid} өсөн индекс булдырыу үткәреп ебәрелә"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Skipping {apkfilename} with invalid signature!"
-msgstr "Дөрөҫ булмаған имзалы {apkfilename} үткәреп ебәрелә!"
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Skipping {appid}: disabled"
-msgstr "{appid} үткәреп ебәрелә: һүндерелгән"
-
-#: ../fdroidserver/deploy.py
-msgid "Specify a local folder to sync the repo to"
-msgstr "Репоны синхронлаштырыу өсөн локаль каталогты күрһәтегеҙ"
-
-#: ../fdroidserver/deploy.py
-msgid "Specify an identity file to provide to SSH for rsyncing"
-msgstr "rsync өсөн SSH-ға биреләсәк идентификация файлын күрһәтегеҙ"
-
-#: ../fdroidserver/nightly.py
-msgid "Specify which debug keystore file to use."
-msgstr "Ҡайһы төҙәтеү асҡыстар һаҡлағысы файлын ҡулланырға икәнен күрһәтегеҙ."
-
-#: ../fdroidserver/common.py
-msgid "Spew out even more information than normal"
-msgstr "Ғәҙәттәгенән дә күберәк мәғлүмәт сығарыу"
-
-#: ../fdroidserver/nightly.py
-#, python-brace-format
-msgid "Stripping mystery signature from {apkfilename}"
-msgstr "Серле имза {apkfilename} файлынан алына"
-
-#: ../fdroidserver/lint.py
-#, python-format
-msgid "Summary '%s' is just the app's name"
-msgstr "'%s' ҡыҫҡаса аңлатмаһы — ул ҡушымтаның исеме генә"
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Summary of length {length} is over the {limit} char limit"
-msgstr "{length} оҙонлоғондағы ҡыҫҡаса аңлатма {limit} символ сикләүенән артып китә"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "System clock is older than date in {path}!"
-msgstr "Система сәғәте {path} эсендәге датанан иҫкерәк!"
-
-#: ../fdroidserver/checkupdates.py
-msgid "Tags update mode only works for git, hg, bzr and git-svn repositories currently"
-msgstr "Тегтарҙы яңыртыу режимы әлеге ваҡытта тик git, hg, bzr һәм git-svn репозиторийҙары өсөн генә эшләй"
-
-#: ../fdroidserver/checkupdates.py
-msgid "Tags update mode used in git-svn, but the repo was not set up with tags"
-msgstr "Тегтарҙы яңыртыу режимы git-svn-да ҡулланылған, ләкин репо тегтар менән көйләнмәгән"
-
-#: ../fdroidserver/build.py
-msgid "Test mode - put output in the tmp directory only, and always build, even if the output already exists."
-msgstr "Һынау режимы — сығарылышты тик tmp каталогына ғына урынлаштырыу һәм сығарылыш булһа ла, һәр ваҡыт йыйыу."
-
-#: ../fdroidserver/index.py
-msgid "The \"qrcode\" Python package is not installed (e.g. apt-get install python3-qrcode)!"
-msgstr "\"qrcode\" Python пакеты ҡуйылмаған (мәҫ. apt-get install python3-qrcode)!"
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "The OBB version code must come after \"{name}.\":"
-msgstr "OBB версия коды \"{name}.\" һуңынан килергә тейеш:"
-
-#: ../fdroidserver/btlog.py
-msgid "The base URL for the repo to log (default: https://f-droid.org)"
-msgstr "Лог яһаласаҡ репоның төп URL-ы (стандарт: https://f-droid.org)"
-
-#: ../fdroidserver/mirror.py
-msgid "The directory to write the mirror to"
-msgstr "Көҙгөнө яҙыу өсөн каталог"
-
-#: ../fdroidserver/nightly.py
-msgid "The file to be included in the repo (path or glob)"
-msgstr "Репоға индереләсәк файл (юл йәки ҡалып)"
-
-#: ../fdroidserver/index.py
-msgid "The repository's fingerprint does not match."
-msgstr "Репозиторийҙың бармаҡ эҙе тап килмәй."
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "The root dir for local_copy_dir \"{path}\" does not exist!"
-msgstr "local_copy_dir \"{path}\" өсөн тамыр каталогы юҡ!"
-
-#: ../fdroidserver/publish.py
-msgid "There is a keyalias collision - publishing halted"
-msgstr "keyalias ҡапма-ҡаршылығы бар — баҫтырыу туҡтатылды"
-
-#: ../fdroidserver/common.py
-msgid "These are the apps that have been archived from the main repo."
-msgstr "Былар — төп репозиторийҙан архиваланған ҡушымталар."
-
-#: ../fdroidserver/mirror.py
-msgid "This command should never be used to mirror f-droid.org! A full copy requires more than 600GB."
-msgstr "Был команда f-droid.org-тың көҙгөһөн яһау өсөн бер ҡасан да ҡулланылырға тейеш түгел! Тулы күсермә өсөн 600GB-тан ашыу урын кәрәк."
-
-#: ../fdroidserver/common.py
-msgid "This is a repository of apps to be used with F-Droid. Applications in this repository are either official binaries built by the original application developers, or are binaries built from source by the admin of f-droid.org using the tools on https://gitlab.com/fdroid."
-msgstr "Был — F-Droid менән ҡулланыу өсөн ҡушымталар репозиторийы. Был репозиторийҙағы ҡушымталар йә оригиналь эшләүселәр тарафынан йыйылған рәсми бинарҙар, йә f-droid.org администраторы тарафынан https://gitlab.com/fdroid адресындағы ҡоралдар ярҙамында сығанаҡ кодтан йыйылған бинарҙар."
-
-#: ../fdroidserver/import_subcommand.py
-#, python-format
-msgid "This repo already has local metadata: %s"
-msgstr "Был репоның инде локаль мета-мәғлүмәттәре бар: %s"
-
-#: ../fdroidserver/init.py
-#, python-format
-msgid ""
-"To complete the setup, add your APKs to \"%s\"\n"
-"then run \"fdroid update -c; fdroid update\".  You might also want to edit\n"
-"\"config.yml\" to set the URL, repo name, and more.  You should also set up\n"
-"a signing key (a temporary one might have been automatically generated).\n"
-"\n"
-"For more info: https://f-droid.org/docs/Setup_an_F-Droid_App_Repo\n"
-"and https://f-droid.org/docs/Signing_Process"
-msgstr ""
-"Көйләүҙе тамамлау өсөн, APK-ларығыҙҙы \"%s\" каталогына өҫтәгеҙ,\n"
-"шунан \"fdroid update -c; fdroid update\" командаһын эшләтегеҙ.  Шулай уҡ URL-ды, репо исемен\n"
-"һәм башҡаларҙы көйләү өсөн \"config.yml\" файлына үҙгәреш индерергә теләрһегеҙ. \n"
-"Шулай уҡ имзалау асҡысын көйләргә тейешһегеҙ (ваҡытлыса асҡыс автоматик рәүештә булдырылған булырға мөмкин).\n"
-"\n"
-"Күберәк мәғлүмәт өсөн: https://f-droid.org/docs/Setup_an_F-Droid_App_Repo\n"
-"һәм https://f-droid.org/docs/Signing_Process"
-
-#: ../fdroidserver/deploy.py
-msgid "To use awsbucket, awssecretkey and awsaccesskeyid must also be set in config.yml!"
-msgstr "awsbucket-ты ҡулланыу өсөн config.yml-да awssecretkey һәм awsaccesskeyid та күрһәтелергә тейеш!"
-
-#: ../fdroidserver/deploy.py
-msgid "To use rclone, rclone_config and awsbucket must be set in config.yml!"
-msgstr "rclone-ды ҡулланыу өсөн config.yml-да rclone_config һәм awsbucket күрһәтелергә тейеш!"
-
-#: ../fdroidserver/lint.py
-msgid "URL must start with https:// or http://"
-msgstr "URL https:// йәки http:// менән башланырға тейеш"
-
-#: ../fdroidserver/lint.py
-msgid "URL shorteners should not be used"
-msgstr "URL ҡыҫҡартҡыстары ҡулланылырға тейеш түгел"
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "URL {url} in Description: {error}"
-msgstr "Тасуирламалағы {url} URL-ы: {error}"
-
-#: ../fdroidserver/lint.py
-msgid "Unexpected license tag \"{}\"! Only use FSF or OSI approved tags from https://spdx.org/license-list"
-msgstr "Көтөлмәгән \"{}\" лицензия тегы! Тик https://spdx.org/license-list адресынан FSF йәки OSI тарафынан раҫланған тегтарҙы ҡулланығыҙ"
-
-#: ../fdroidserver/lint.py
-msgid "Unexpected license tag \"{}\"! Only use license tags configured in your config file"
-msgstr "Көтөлмәгән \"{}\" лицензия тегы! Тик конфигурация файлында көйләнгән лицензия тегтарын ҡулланығыҙ"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Unknown entry {key} in {configname}"
-msgstr "{configname} эсендә билдәһеҙ {key} яҙмаһы"
-
-#: ../fdroidserver/__main__.py
-msgid "Unknown exception found!"
-msgstr "Билдәһеҙ хата табылды!"
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Unknown file '{filename}' in build '{versionName}'"
-msgstr "'{versionName}' йыйылмаһында билдәһеҙ '{filename}' файлы"
-
-#: ../fdroidserver/metadata.py
-#, python-format
-msgid "Unknown metadata format: %s"
-msgstr "Билдәһеҙ мета-мәғлүмәт форматы: %s"
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Unknown metadata format: {path} (use: *.yml)"
-msgstr "Билдәһеҙ мета-мәғлүмәт форматы: {path} (ҡулланығыҙ: *.yml)"
-
-#: ../fdroidserver/common.py
-msgid "Unknown version of aapt, might cause problems: "
-msgstr "aapt-тың билдәһеҙ версияһы, проблемалар тыуҙырыуы мөмкин: "
-
-#: ../fdroidserver/lint.py
-msgid "Unnecessary leading space"
-msgstr "Кәрәкмәгән алғы буш урын"
-
-#: ../fdroidserver/lint.py
-msgid "Unnecessary trailing space"
-msgstr "Кәрәкмәгән артҡы буш урын"
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Unrecognised app field '{fieldname}' in '{path}'"
-msgstr "'{path}' эсендә танылмаған '{fieldname}' ҡушымта яланы"
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Unrecognised build flag '{build_flag}' in '{path}'"
-msgstr "'{path}' эсендә танылмаған '{build_flag}' йыйыу флагы"
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Unsupported file type \"{extension}\" for repo graphic"
-msgstr "Репо графикаһы өсөн яраҡһыҙ \"{extension}\" файл төрө"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Unsupported graphics file found: {path}"
-msgstr "Яраҡһыҙ графика файлы табылды: {path}"
-
-#: ../fdroidserver/lint.py
-#, python-format
-msgid "Unused extlib at %s"
-msgstr "%s юлында ҡулланылмаған extlib"
-
-#: ../fdroidserver/lint.py
-#, python-format
-msgid "Unused file at %s"
-msgstr "%s юлында ҡулланылмаған файл"
-
-#: ../fdroidserver/scanner.py
-#, python-format
-msgid "Unused scandelete path: %s"
-msgstr "Ҡулланылмаған scandelete юлы: %s"
-
-#: ../fdroidserver/scanner.py
-#, python-format
-msgid "Unused scanignore path: %s"
-msgstr "Ҡулланылмаған scanignore юлы: %s"
-
-#: ../fdroidserver/__main__.py
-msgid "Update repo information for new packages"
-msgstr "Яңы пакеттар өсөн репо мәғлүмәтен яңыртыу"
-
-#: ../fdroidserver/__main__.py
-msgid "Update the binary transparency log for a URL"
-msgstr "URL өсөн бинар асыҡлыҡ логын яңыртыу"
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "UpdateCheckData has invalid URL: {url}"
-msgstr "UpdateCheckData-ла дөрөҫ булмаған URL: {url}"
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "UpdateCheckData must match the version code as integer (\\d or [0-9]): {codeex}"
-msgstr "UpdateCheckData версия кодына бөтөн һан булараҡ тап килергә тейеш (\\d йәки [0-9]): {codeex}"
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "UpdateCheckData must use HTTPS URL: {url}"
-msgstr "UpdateCheckData HTTPS URL-ын ҡулланырға тейеш: {url}"
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "UpdateCheckData not a valid URL: {url}"
-msgstr "UpdateCheckData — дөрөҫ URL түгел: {url}"
-
-#: ../fdroidserver/lint.py
-msgid "UpdateCheckMode is set but it looks like checkupdates hasn't been run yet."
-msgstr "UpdateCheckMode ҡуйылған, ләкин checkupdates әле эшләтелмәгән кеүек."
-
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/lint.py
-msgid "UpdateCheckName is set to the known application ID, it can be removed"
-msgstr "UpdateCheckName билдәле ҡушымта идентификаторына ҡуйылған, уны алып ташларға мөмкин"
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Uploading {apkfilename} to androidobservatory.org"
-msgstr "{apkfilename} androidobservatory.org-ҡа йөкләнә"
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Uploading {apkfilename} to virustotal"
-msgstr "{apkfilename} virustotal-ға йөкләнә"
-
-#: ../fdroidserver/lint.py
-msgid "Use /HEAD instead of /master or /main to point at a file in the default branch"
-msgstr "Стандарт ботаҡтағы файлға күрһәтеү өсөн /master йәки /main урынына /HEAD ҡулланығыҙ"
-
-#: ../fdroidserver/update.py
-msgid "Use `fdroid update -c` to create it."
-msgstr "Уны булдырыу өсөн `fdroid update -c` ҡулланығыҙ."
-
-#: ../fdroidserver/build.py
-msgid "Use build server"
-msgstr "Йыйыу серверын ҡулланыу"
-
-#: ../fdroidserver/update.py
-msgid "Use date from APK instead of current time for newly added APKs"
-msgstr "Яңы өҫтәлгән APK-лар өсөн ағымдағы ваҡыт урынына APK-нан датаны ҡулланыу"
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Using \"{path}\" for configuring s3cmd."
-msgstr "s3cmd-ты көйләү өсөн \"{path}\" ҡулланыла."
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Using \"{path}\" for syncing with remote storage."
-msgstr "Алыҫтағы һаҡлағыс менән синхронлаштырыу өсөн \"{path}\" ҡулланыла."
-
-#: ../fdroidserver/common.py
-msgid "Using APK Signature v2"
-msgstr "APK имзаһының v2 версияһы ҡулланыла"
-
-#: ../fdroidserver/common.py
-msgid "Using APK Signature v3"
-msgstr "APK имзаһының v3 версияһы ҡулланыла"
-
-#: ../fdroidserver/common.py
-msgid "Using JAR Signature"
-msgstr "JAR имзаһы ҡулланыла"
-
-#: ../fdroidserver/common.py
-msgid "Using Java's jarsigner, not recommended for verifying APKs! Use apksigner"
-msgstr "Java-ның jarsigner-ы ҡулланыла, APK-ларҙы тикшереү өсөн тәҡдим ителмәй! apksigner ҡулланығыҙ"
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Using blank dictionary instead of contents of {path}!"
-msgstr "{path} эстәлеге урынына буш һүҙлек ҡулланыла!"
-
-#: ../fdroidserver/init.py
-#, python-brace-format
-msgid "Using existing keystore \"{path}\""
-msgstr "Инде булған \"{path}\" асҡыстар һаҡлағысы ҡулланыла"
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Using rclone to sync with: {url}"
-msgstr "Синхронлаштырыу өсөн rclone ҡулланыла: {url}"
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Using s3cmd to sync with: {url}"
-msgstr "Синхронлаштырыу өсөн s3cmd ҡулланыла: {url}"
-
-#: ../fdroidserver/__main__.py
-msgid "Valid commands are:"
-msgstr "Яраҡлы командалар:"
-
-#: ../fdroidserver/verify.py
-msgid "Verify against locally cached copy rather than redownloading."
-msgstr "Яңынан йөкмәү урынына локаль кешланған күсермәгә ҡаршы тикшереү."
-
-#: ../fdroidserver/__main__.py
-msgid "Verify the integrity of downloaded packages"
-msgstr "Йөкләнгән пакеттарҙың бөтөнлөгөн тикшереү"
-
-#: ../fdroidserver/index.py
-msgid "Verifying index signature:"
-msgstr "Индекс имзаһы тикшерелә:"
-
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "Verifying package {path} with apksigner."
-msgstr "{path} пакеты apksigner менән тикшерелә."
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "VirusTotal API key cannot upload files larger than 32MB, use {url} to upload {path}."
-msgstr "VirusTotal API асҡысы 32MB-тан ҙурыраҡ файлдарҙы йөкләй алмай, {path} файлын йөкләү өсөн {url} ҡулланығыҙ."
-
-#: ../fdroidserver/nightly.py
-msgid "WARNING: only public git repos are supported!"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Warn about possible metadata errors"
-msgstr "Мөмкин булған мета-мәғлүмәт хаталары тураһында иҫкәртеү"
-
-#: ../fdroidserver/scanner.py
-msgid "WebAssembly binary file"
-msgstr "WebAssembly бинар файлы"
-
-#: ../fdroidserver/update.py
-msgid "When configured for signed indexes, create only unsigned indexes at this stage"
-msgstr "Тамғаланған индекстар өсөн көйләнгәндә, был этапта тик тамғаланмаған индекстарҙы ғына булдырыу"
-
-#: ../fdroidserver/lint.py
-msgid "When linting the entire repository yamllint is disabled by default. This option forces yamllint regardless."
-msgstr "Бөтә репозиторийҙы линтлағанда yamllint стандарт буйынса һүндерелгән. Был опция yamllint-ты мәжбүри рәүештә эшләтә."
-
-#: ../fdroidserver/publish.py
-msgid "When signing or verifying fails, exit with an error code."
-msgstr "Тамғалау йәки тикшереү уңышһыҙ булһа, хата коды менән сығыу."
-
-#: ../fdroidserver/install.py
-msgid "Would you like to download and install F-Droid.apk via adb? (YES/no)"
-msgstr "F-Droid.apk-ны adb аша йөкләп ҡуйырға теләйһегеҙме? (ЭЙЕ/юҡ)"
-
-#: ../fdroidserver/install.py
-msgid "Would you like to download the app(s) from f-droid.org? (YES/no)"
-msgstr "Ҡушымта(лар)ҙы f-droid.org-тан йөкләргә теләйһегеҙме? (ЭЙЕ/юҡ)"
-
-#: ../fdroidserver/init.py
-msgid "X.509 'Distinguished Name' used when generating keys"
-msgstr "Асҡыстарҙы булдырғанда ҡулланылған X.509 'Айырым исем' (Distinguished Name)"
-
-#: ../fdroidserver/common.py
-msgid "You can use ANDROID_HOME to set the path to your SDK, i.e.:"
-msgstr "SDK-ға юлды күрһәтеү өсөн ANDROID_HOME ҡуллана алаһығыҙ, йәғни:"
-
-#: ../fdroidserver/scanner.py
-msgid "ZIP file archive"
-msgstr "ZIP файл архивы"
-
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "adb reports {serial} is \"{status}\"!"
-msgstr "adb хәбәр итә: {serial} — \"{status}\"!"
-
-#: ../fdroidserver/nightly.py
-#, python-brace-format
-msgid "adding IdentityFile to {path}"
-msgstr "IdentityFile {path} юлына өҫтәлә"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "adding to {name}: {path}"
-msgstr "{name}-ға өҫтәлә: {path}"
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "ambiguous option: %(option)s could match %(matches)s"
-msgstr "ике мәғәнәле опция: %(option)s %(matches)s-ҡа тап килеүе мөмкин"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "apksigner in build-tools;{version} passes APKs with invalid v3 signatures, ignoring."
-msgstr "build-tools;{version} эсендәге apksigner дөрөҫ булмаған v3 имзалы APK-ларҙы үткәрә, иғтибарһыҙ ҡалдырыла."
-
-#: ../fdroidserver/common.py
-msgid "apksigner not found! Cannot sign or verify modern APKs"
-msgstr "apksigner табылманы! Заманса APK-ларҙы тамғалап йәки тикшереп булмай"
-
-#: ../fdroidserver/common.py
-msgid "apksigner not found, it's required for signing!"
-msgstr "apksigner табылманы, ул тамғалау өсөн кәрәк!"
-
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/checkupdates.py ../fdroidserver/lint.py
-#: ../fdroidserver/rewritemeta.py
-msgid "application ID of file to operate on"
-msgstr "эшкәртеләсәк файлдың ҡушымта идентификаторы"
-
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/build.py ../fdroidserver/install.py
-#: ../fdroidserver/publish.py ../fdroidserver/scanner.py
-#: ../fdroidserver/verify.py
-msgid "application ID with optional versionCode in the form APPID[:VERCODE]"
-msgstr "ҡушымта идентификаторы, APPID[:VERCODE] рәүешендә versionCode өҫтәмә булыуы мөмкин"
-
-#: ../fdroidserver/common.py
-msgid "archive_url needs to end with /archive"
-msgstr "archive_url /archive менән тамамланырға тейеш"
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "argument \"-\" with mode %r"
-msgstr "%r режимлы \"-\" аргументы"
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "argument %(argument_name)s: %(message)s"
-msgstr "%(argument_name)s аргументы: %(message)s"
-
-#: ../fdroidserver/nightly.py
-msgid "attempting bare SSH connection to test deploy key:"
-msgstr "урынлаштырыу асҡысын һынау өсөн ябай SSH тоташыуы яһала:"
-
-#: ../fdroidserver/common.py
-msgid "can not parse scrlib spec (not a string): '{}'"
-msgstr "scrlib спецификацияһын танып булмай (юл түгел): '{}'"
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "can't open '%(filename)s': %(error)s"
-msgstr "'%(filename)s' асылманы: %(error)s"
-
-#: ../fdroidserver/scanner.py
-msgid "can't open non-https url: '{};"
-msgstr "https булмаған url-ды асып булмай: '{};"
-
-#: ../fdroidserver/build.py
-#, python-brace-format
-msgid "cannot find required srclibs: \"{path}\""
-msgstr "кәрәкле srclib-тар табылманы: \"{path}\""
-
-#: /usr/lib/python3.11/argparse.py
-msgid "cannot have multiple subparser arguments"
-msgstr "бер нисә аҫпарсер аргументы була алмай"
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "cannot merge actions - two groups are named %r"
-msgstr "ғәмәлдәрҙе берләштереп булмай — ике төркөм %r тип аталған"
-
-#: ../fdroidserver/nightly.py
-msgid "cannot publish update, did you set the deploy key?"
-msgstr "яңыртыуҙы баҫтырып булмай, урынлаштырыу асҡысын күрһәттегеҙме?"
-
-#: ../fdroidserver/nightly.py
-#, python-brace-format
-msgid "cloning {url}"
-msgstr "{url} клонлана"
-
-#: ../fdroidserver/__main__.py
-msgid "commands from plugin modules:"
-msgstr "плагин модулдәренән командалар:"
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "conflicting option string: %s"
-msgid_plural "conflicting option strings: %s"
-msgstr[0] "ҡапма-ҡаршылыҡлы опция юлы: %s"
-msgstr[1] "ҡапма-ҡаршылыҡлы опция юлдары: %s"
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "conflicting subparser alias: %s"
-msgstr "ҡапма-ҡаршылыҡлы аҫпарсер псевдонимы: %s"
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "conflicting subparser: %s"
-msgstr "ҡапма-ҡаршылыҡлы аҫпарсер: %s"
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "could not parse '{path}'"
-msgstr "'{path}' танылманы"
-
-#: ../fdroidserver/common.py
-msgid "could not parse srclib spec (no name specified): '{}'"
-msgstr "srclib спецификацияһын танып булманы (исем күрһәтелмәгән): '{}'"
-
-#: ../fdroidserver/common.py
-msgid "could not parse srclib spec (no ref specified): '{}'"
-msgstr "srclib спецификацияһын танып булманы (ref күрһәтелмәгән): '{}'"
-
-#: ../fdroidserver/nightly.py
-#, python-brace-format
-msgid "created {path}"
-msgstr "{path} булдырылды"
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "current version is newer: old vercode={old}, new vercode={new}"
-msgstr "ағымдағы версия яңыраҡ: иҫке vercode={old}, яңы vercode={new}"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "deleting: repo/{apkfilename}"
-msgstr "юйыла: repo/{apkfilename}"
-
-#: ../fdroidserver/scanner.py
-msgid "dependency file without lock"
-msgstr "йоҙаҡһыҙ бәйлелек файлы"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "deployed process log {path} to {dest}"
-msgstr "эшкәртеү логы {path} {dest} адресына урынлаштырылды"
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "dest= is required for options like %r"
-msgstr "%r кеүек опциялар өсөн dest= кәрәк"
-
-#: ../fdroidserver/scanner.py
-msgid "downloading '{}'"
-msgstr "'{}' йөкләнә"
-
-#: ../fdroidserver/scanner.py
-msgid "downloading scanner signatures from '{}' failed"
-msgstr "сканлаусы имзаларын '{}' адресынан йөкләү уңышһыҙ булды"
-
-#: ../fdroidserver/scanner.py
-msgid "executable binary, possibly code"
-msgstr "башҡарылыусы бинар, код булыуы мөмкин"
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "expected %s argument"
-msgid_plural "expected %s arguments"
-msgstr[0] "%s аргумент көтөлә"
-msgstr[1] "%s аргумент көтөлә"
-
-#: /usr/lib/python3.11/argparse.py
-msgid "expected at least one argument"
-msgstr "кәмендә бер аргумент көтөлә"
-
-#: /usr/lib/python3.11/argparse.py
-msgid "expected at most one argument"
-msgstr "күп тигәндә бер аргумент көтөлә"
-
-#: /usr/lib/python3.11/argparse.py
-msgid "expected one argument"
-msgstr "бер аргумент көтөлә"
-
-#: ../fdroidserver/__main__.py
-msgid "fdroid [<command>] [-h|--help|--version|<args>]"
-msgstr "fdroid [<команда>] [-h|--help|--version|<аргументтар>]"
-
-#: ../fdroidserver/scanner.py
-msgid "fetch the latest version of signatures from the web"
-msgstr "имзаларҙың һуңғы версияһын вебтән алыу"
-
-#: ../fdroidserver/metadata.py
-msgid "force metadata errors (default) to be warnings, or to be ignored."
-msgstr "мета-мәғлүмәт хаталарын (стандарт) иҫкәрмәләргә әйләндерергә йәки иғтибарһыҙ ҡалдырырға мәжбүр итеү."
-
-#: ../fdroidserver/common.py
-msgid "git svn clone failed"
-msgstr "git svn clone уңышһыҙ булды"
-
-#: ../fdroidserver/scanner.py
-msgid "gzip file archive"
-msgstr "gzip файл архивы"
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "ignored explicit argument %r"
-msgstr "асыҡтан-асыҡ %r аргументы иғтибарһыҙ ҡалдырылды"
-
-#: ../fdroidserver/index.py
-msgid "index-v1 must have a signature, use `fdroid signindex` to create it!"
-msgstr "index-v1 имзалы булырға тейеш, уны булдырыу өсөн `fdroid signindex` ҡулланығыҙ!"
-
-#: ../fdroidserver/index.py
-msgid "index-v2 must have a signature, use `fdroid signindex` to create it!"
-msgstr "index-v2 имзалы булырға тейеш, уны булдырыу өсөн `fdroid signindex` ҡулланығыҙ!"
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "invalid %(type)s value: %(value)r"
-msgstr "дөрөҫ булмаған %(type)s ҡиммәте: %(value)r"
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "invalid choice: %(value)r (choose from %(choices)s)"
-msgstr "дөрөҫ булмаған һайлау: %(value)r (%(choices)s араһынан һайлағыҙ)"
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "invalid conflict_resolution value: %r"
-msgstr "дөрөҫ булмаған conflict_resolution ҡиммәте: %r"
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "invalid option string %(option)r: must start with a character %(prefix_chars)r"
-msgstr "дөрөҫ булмаған %(option)r опция юлы: %(prefix_chars)r символы менән башланырға тейеш"
-
-#: ../fdroidserver/common.py
-msgid "ipfs_cid not found, skipping CIDv1 generation"
-msgstr "ipfs_cid табылманы, CIDv1 булдырыу үткәреп ебәрелә"
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "latest build recipe is newer: old vercode={old}, new vercode={new}"
-msgstr "һуңғы йыйыу рецебы яңыраҡ: иҫке vercode={old}, яңы vercode={new}"
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "local_copy_dir does not end with \"fdroid\", perhaps you meant: \"{path}\""
-msgstr "local_copy_dir \"fdroid\" менән тамамланмай, бәлки һеҙ быны күҙ уңында тоттоғоҙ: \"{path}\""
-
-#: ../fdroidserver/deploy.py
-msgid "local_copy_dir must be an absolute path!"
-msgstr "local_copy_dir абсолют юл булырға тейеш!"
-
-#: ../fdroidserver/deploy.py
-msgid "local_copy_dir must be directory, not a file!"
-msgstr "local_copy_dir каталог булырға тейеш, файл түгел!"
-
-#: ../fdroidserver/index.py
-#, python-format
-msgid "mirror '%s' does not end with 'fdroid'!"
-msgstr "'%s' көҙгөһө 'fdroid' менән тамамланмай!"
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "mirrors set twice, in config.yml and {path}!"
-msgstr "көҙгөләр ике тапҡыр күрһәтелгән, config.yml-да һәм {path}-та!"
-
-#: /usr/lib/python3.11/argparse.py
-msgid "mutually exclusive arguments must be optional"
-msgstr "бер-береһен инҡар итеүсе аргументтар өҫтәмә булырға тейеш"
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "next {name} cache update due in {time}"
-msgstr "киләһе {name} кешын яңыртыу {time} аша"
-
-#: ../fdroidserver/mirror.py
-#, python-brace-format
-msgid "no \"icon\" in {appid}"
-msgstr "{appid}-та \"icon\" юҡ"
-
-#: ../fdroidserver/signatures.py
-msgid "no APK supplied"
-msgstr "APK бирелмәгән"
-
-#: ../fdroidserver/checkupdates.py
-msgid "no version information found"
-msgstr "версия тураһында мәғлүмәт табылманы"
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "not allowed with argument %s"
-msgstr "%s аргументы менән рөхсәт ителмәй"
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "one of the arguments %s is required"
-msgstr "%s аргументтарының береһе кәрәк"
-
-#: ../fdroidserver/common.py ../fdroidserver/index.py
-msgid "only accepts strings, lists, and tuples"
-msgstr "тик юлдарҙы, исемлектәрҙе һәм кортеждарҙы ғына ҡабул итә"
-
-#: /usr/lib/python3.11/argparse.py
-msgid "options"
-msgstr "опциялар"
-
-#: ../fdroidserver/nightly.py
-#, python-brace-format
-msgid "overwriting existing {path}"
-msgstr "инде булған {path} өҫтөнән яҙыла"
-
-#: /usr/lib/python3.11/argparse.py
-msgid "positional arguments"
-msgstr "позицион аргументтар"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "process log deploy {path} to {dest} failed!"
-msgstr "эшкәртеү логын {path} {dest} адресына урынлаштырыу уңышһыҙ булды!"
-
-#: ../fdroidserver/build.py
-msgid "reference binary missing signature"
-msgstr "өлгө бинарҙың имзаһы юҡ"
-
-#: ../fdroidserver/signatures.py
-#, python-brace-format
-msgid "refuse downloading via insecure HTTP connection (use HTTPS or specify --no-https-check): {apkfilename}"
-msgstr "хәүефһеҙ булмаған HTTP тоташыуы аша йөкләүҙән баш тартыу (HTTPS ҡулланығыҙ йәки --no-https-check күрһәтегеҙ): {apkfilename}"
-
-#: ../fdroidserver/index.py
-#, python-format
-msgid "repo_icon \"repo/icons/%s\" does not exist, generating placeholder."
-msgstr "\"repo/icons/%s\" repo_icon-ы юҡ, ҡалып булдырыла."
-
-#: ../fdroidserver/common.py
-msgid "repo_url needs to end with /repo"
-msgstr "repo_url /repo менән тамамланырға тейеш"
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "rsync is missing or broken: {error}"
-msgstr "rsync юҡ йәки боҙолған: {error}"
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "s3cmd sync indexes {path} to {url} and delete"
-msgstr "s3cmd индекстарҙы {path}-тан {url}-ға синхронлаштыра һәм юя"
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "s3cmd syncs indexes from {path} to {url} and deletes removed"
-msgstr "s3cmd индекстарҙы {path}-тан {url}-ға синхронлаштыра һәм юйылғандарҙы юя"
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "scanner cache is malformed! You can clear it with: '{clear}'"
-msgstr "сканлаусы кешы боҙолған! Уны былай таҙартырға мөмкин: '{clear}'"
-
-#: ../fdroidserver/deploy.py
-msgid "serverwebroot: path does not end with \"fdroid\", perhaps you meant one of these:"
-msgstr "serverwebroot: юл \"fdroid\" менән тамамланмай, бәлки һеҙ быларҙың береһен күҙ уңында тоттоғоҙ:"
-
-#: ../fdroidserver/scanner.py
-msgid "shared library"
-msgstr "уртаҡ китапхана"
-
-#: /usr/lib/python3.11/argparse.py
-msgid "show this help message and exit"
-msgstr "был ярҙам хәбәрен күрһәтеү һәм сығыу"
-
-#: ../fdroidserver/signatures.py
-msgid "signed APK, either a file-path or HTTPS URL."
-msgstr "тамғаланған APK, файл юлы йәки HTTPS URL-ы."
-
-#: ../fdroidserver/common.py
-msgid "skip deploying full build logs: log content is empty"
-msgstr "тулы йыйыу логтарын урынлаштырыуҙы үткәреп ебәреү: лог эстәлеге буш"
-
-#: ../fdroidserver/common.py
-msgid "skip deploying full build logs: not enabled in config"
-msgstr "тулы йыйыу логтарын урынлаштырыуҙы үткәреп ебәреү: конфигурацияла ҡабыҙылмаған"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "skipping source tarball: {path}"
-msgstr "сығанаҡ tarball үткәреп ебәрелә: {path}"
-
-#: ../fdroidserver/lint.py
-msgid "srclibs missing name and/or @"
-msgstr "srclibs-та исем һәм/йәки @ юҡ"
-
-#: ../fdroidserver/scanner.py
-msgid "static library"
-msgstr "статик китапхана"
-
-#: ../fdroidserver/build.py
-#, python-brace-format
-msgid "supplied reference binary has allowed signer {signer}"
-msgstr "бирелгән өлгө бинарҙың рөхсәт ителгән имзалаусыһы {signer} бар"
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "the following arguments are required: %s"
-msgstr "түбәндәге аргументтар мотлаҡ: %s"
-
-#: ../fdroidserver/install.py
-msgid "true"
-msgstr "дөрөҫ"
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "unexpected option string: %s"
-msgstr "көтөлмәгән опция юлы: %s"
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "unknown parser %(parser_name)r (choices: %(choices)s)"
-msgstr "билдәһеҙ парсер %(parser_name)r (һайлау варианттары: %(choices)s)"
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "unrecognized arguments: %s"
-msgstr "танылмаған аргументтар: %s"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "unsafe permissions on '{config_file}' (should be 0600)!"
-msgstr "'{config_file}' өсөн хәүефле рөхсәттәр (0600 булырға тейеш)!"
-
-#: ../fdroidserver/__main__.py /usr/lib/python3.11/argparse.py
-msgid "usage: "
-msgstr "ҡулланыу: "
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "using Apache libcloud to sync with {url}"
-msgstr "{url} менән синхронлаштырыу өсөн Apache libcloud ҡулланыла"
-
-#: ../fdroidserver/deploy.py
-msgid "virustotal.com is rate limiting, waiting to retry..."
-msgstr "virustotal.com сикләү ҡуйҙы, ҡабатлап ҡарау өсөн көтөлә..."
-
-#: ../fdroidserver/install.py
-msgid "yes"
-msgstr "эйе"
-
-#: ../fdroidserver/publish.py
-#, python-brace-format
-msgid "{0} app, {1} key aliases"
-msgid_plural "{0} apps, {1} key aliases"
-msgstr[0] "{0} ҡушымта, {1} асҡыс псевдонимы"
-msgstr[1] "{0} ҡушымта, {1} асҡыс псевдонимы"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{apkfilename} ({appid}) has no metadata!"
-msgstr "{apkfilename} ({appid}) өсөн мета-мәғлүмәт юҡ!"
-
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{apkfilename}'s AndroidManifest.xml has a bad date: "
-msgstr "{apkfilename}-ның AndroidManifest.xml-ында дөрөҫ булмаған дата: "
-
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{appid} does not have a name! Using application ID instead."
-msgstr "{appid} өсөн исем юҡ! Уның урынына ҡушымта идентификаторы ҡулланыла."
-
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{appid} from {path} is not a valid Android application ID!"
-msgstr "{path} эсендәге {appid} — дөрөҫ Android ҡушымта идентификаторы түгел!"
-
-#: ../fdroidserver/metadata.py ../fdroidserver/update.py
-#, python-brace-format
-msgid "{appid} from {path} is not a valid Java Package Name!"
-msgstr "{path} эсендәге {appid} — дөрөҫ Java пакет исеме түгел!"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{appid} has both APKs and files: {files}"
-msgstr "{appid}-та APK-лар ҙа, файлдар ҙа бар: {files}"
-
-#: ../fdroidserver/mirror.py
-#, python-brace-format
-msgid "{appid} is missing {name}"
-msgstr "{appid}-та {name} юҡ"
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "{appid}: Unknown extlib {path} in build '{versionName}'"
-msgstr "{appid}: '{versionName}' йыйылмаһында билдәһеҙ extlib {path}"
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "{appid}: no builds specified, running on current source state"
-msgstr "{appid}: йыйылмалар күрһәтелмәгән, ағымдағы сығанаҡ хәлендә эшләтелә"
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "{appid}: {field} must be a '{type}', but it is a '{fieldtype}!'"
-msgstr "{appid}: {field} '{type}' булырға тейеш, ләкин ул '{fieldtype}'!"
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "{appid}: {field} must be a '{type}', but it is a '{fieldtype}'!"
-msgstr "{appid}: {field} '{type}' булырға тейеш, ләкин ул '{fieldtype}'!"
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "{build_flag} must be an integer, found: {value}"
-msgstr "{build_flag} бөтөн һан булырға тейеш, табылды: {value}"
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "{build_flag} must be list or string, found: {value}"
-msgstr "{build_flag} исемлек йәки юл булырға тейеш, табылды: {value}"
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "{file} is blank or corrupt!"
-msgstr "{file} буш йәки боҙолған!"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{name} \"{section}/icons/{path}\" does not exist! Check \"config.yml\"."
-msgstr "{name} \"{section}/icons/{path}\" юҡ! \"config.yml\"-ды тикшерегеҙ."
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{path1} is a duplicate of {path2}, remove one!"
-msgstr "{path1} — {path2}-нең күсермәһе, береһен юйығыҙ!"
-
-#: ../fdroidserver/import_subcommand.py
-#, python-brace-format
-msgid "{path} already exists, ignoring import results!"
-msgstr "{path} инде бар, импорт һөҙөмтәләре иғтибарһыҙ ҡалдырыла!"
-
-#: ../fdroidserver/nightly.py
-#, python-brace-format
-msgid "{path} does not exist!  Create it by running:"
-msgstr "{path} юҡ!  Уны булдырыу өсөн эшләтегеҙ:"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{path} has bad file signature \"{pattern}\", possible Janus exploit!"
-msgstr "{path} файлының имзаһы дөрөҫ түгел \"{pattern}\", Janus эксплойты булыуы мөмкин!"
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "{path} has been flagged by virustotal {count} times:"
-msgstr "{path} virustotal тарафынан {count} тапҡыр билдәләнгән:"
-
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "{path} has the wrong fingerprint ({fingerprint})!"
-msgstr "{path} файлының бармаҡ эҙе дөрөҫ түгел ({fingerprint})!"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "{path} is not \"key: value\" dict, but a {datatype}!"
-msgstr "{path} — \"key: value\" һүҙлеге түгел, ә {datatype}!"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "{path} is not a standard config file!"
-msgstr "{path} — стандарт конфигурация файлы түгел!"
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "{path} is not list, but a {datatype}!"
-msgstr "{path} — исемлек түгел, ә {datatype}!"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "{path} is not {expected_type}, but a {datatype}!"
-msgstr "{path} — {expected_type} түгел, ә {datatype}!"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{path} is zero size!"
-msgstr "{path} үлсәме нуль!"
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "{path} more than 200MB, manually upload: {url}"
-msgstr "{path} 200MB-тан ҙурыраҡ, ҡулдан йөкләү: {url}"
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "{path}: \"{code}\" is not a valid ISO_3166-1 alpha-2 country code!"
-msgstr "{path}: \"{code}\" — дөрөҫ ISO_3166-1 alpha-2 ил коды түгел!"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{path}: {error}"
-msgstr "{path}: {error}"
-
-#: ../fdroidserver/mirror.py
-#, python-brace-format
-msgid "{url} does not end with \"fdroid\", check the URL path!"
-msgstr "{url} \"fdroid\" менән тамамланмай, URL юлын тикшерегеҙ!"
-
-#: ../fdroidserver/import_subcommand.py
-#, python-brace-format
-msgid "{url} does not start with \"http\"!"
-msgstr "{url} \"http\" менән башланмай!"
-
-#: ../fdroidserver/build.py
-msgid "{} build failed"
-msgid_plural "{} builds failed"
-msgstr[0] "{} йыйыу уңышһыҙ булды"
-msgstr[1] "{} йыйыу уңышһыҙ булды"
-
-#: ../fdroidserver/build.py
-msgid "{} build succeeded"
-msgid_plural "{} builds succeeded"
-msgstr[0] "{} йыйыу уңышлы булды"
-msgstr[1] "{} йыйыу уңышлы булды"
diff --git a/locale/be/LC_MESSAGES/fdroidserver.po b/locale/be/LC_MESSAGES/fdroidserver.po
deleted file mode 100644
index 9526f6ea..00000000
--- a/locale/be/LC_MESSAGES/fdroidserver.po
+++ /dev/null
@@ -1,2687 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# This file is put in the public domain.
-# Макар Разин <makarrazin14@gmail.com>, 2023.
-# flac <flac_twin@keemail.me>, 2024.
-msgid ""
-msgstr ""
-"Project-Id-Version: fdroidserver 2.2.1-143-g1a5ee449\n"
-"Report-Msgid-Bugs-To: https://gitlab.com/fdroid/fdroidserver/issues\n"
-"POT-Creation-Date: 2025-06-25 09:52+0200\n"
-"PO-Revision-Date: 2024-01-21 00:08+0000\n"
-"Last-Translator: flac <flac_twin@keemail.me>\n"
-"Language-Team: Belarusian <https://hosted.weblate.org/projects/f-droid/fdroidserver/be/>\n"
-"Language: be\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Generator: Weblate 5.4-dev\n"
-
-#: ../fdroidserver/nightly.py
-msgid ""
-"\n"
-"SSH public key to be used as deploy key:"
-msgstr ""
-"\n"
-"публічны ключ SSH будзе ключом разгортвання:"
-
-#: ../fdroidserver/nightly.py
-#, python-brace-format
-msgid ""
-"\n"
-"{path} encoded for the DEBUG_KEYSTORE secret variable:"
-msgstr ""
-"\n"
-"файл {path} зашыфраваны для сакрэтнай зменнай DEBUG_KEYSTORE:"
-
-#: ../fdroidserver/lint.py
-#, python-format
-msgid "\"%s/\" has no matching metadata file!"
-msgstr "\"%s/\" не супадае з файлам метаданных!"
-
-#: ../fdroidserver/index.py
-msgid "\"isPrimary\" key should not be added to mirrors!"
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "\"local_copy_dir\" {path} does not exist!"
-msgstr ""
-
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "\"{apkfilename}\" is already installed on {dev}."
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "\"{path}\" contains recent {name} ({version})"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "\"{path}\" exists but s3cmd is not installed!"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "\"{path}\" is not a supported file format (use: metadata/*.yml)"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "\"{path}\" is signed by a key that is not allowed:"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
-#, python-brace-format
-msgid "\"{url}\" is not a valid URL!"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "%(prog)s: error: %(message)s\n"
-msgstr "%(prog)s: памылка: %(message)s\n"
-
-#: ../fdroidserver/publish.py
-#, python-format
-msgid "%d APKs failed to be signed or verified!"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-format
-msgid "%d problems found"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "%r is not callable"
-msgstr "%r нельга выклікаць"
-
-#: ../fdroidserver/signindex.py
-#, python-format
-msgid "%s did not produce a dict!"
-msgstr ""
-
-#: ../fdroidserver/signindex.py
-#, python-format
-msgid "%s has bad SHA-256: %s"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-format
-msgid "%s is not an accepted build field"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "'keypass' not found in config.yml!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "'keystore' is NONE and 'smartcardoptions' is blank!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "'keystore' not found in config.yml!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "'keystorepass' not found in config.yml!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "'repo_keyalias' not found in config.yml!"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-msgid "'required' is an invalid argument for positionals"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "'sdk_path' not set in config.yml!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "'{aapt}' is too old, fdroid requires build-tools-{version} or newer!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "'{path}' failed to execute!"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "'{path}' has invalid format, it should be a dictionary!"
-msgstr ""
-
-#: ../fdroidserver/lint.py ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "'{value}' is not a valid {field} in {appid}. Regex pattern: {pattern}"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "'{value}' is not a valid {field}, should be {pattern}"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "--merge-request only runs on a single appid!"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "...checkupdate failed for {appid} : {error}"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-msgid ".__call__() not defined"
-msgstr ".__call__() не вызначана"
-
-#: ../fdroidserver/lint.py
-msgid "/issues is missing"
-msgstr ""
-
-#: ../fdroidserver/mirror.py
-msgid "A URL is required as an argument!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "APK signatures have different certificates in {path}:"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Add PGP signatures using GnuPG for packages in repo"
-msgstr ""
-
-#: ../fdroidserver/update.py
-msgid "Add a repo signing key to an unsigned repo"
-msgstr ""
-
-#: ../fdroidserver/update.py
-msgid "Add skeleton metadata files for APKs that are missing them"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Adding new repo for only {name}"
-msgstr ""
-
-#: ../fdroidserver/init.py
-msgid "Alias of the repo signing key in the keystore"
-msgstr ""
-
-#: ../fdroidserver/build.py
-msgid "AllowedAPKSigningKeys missing but reference binary supplied"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
-msgid "Allows a different revision (or git branch) to be specified for the initial import"
-msgstr ""
-
-#: ../fdroidserver/mirror.py
-msgid "Also mirror the full archive section"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Also warn about formatting issues, like rewritemeta -l"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "Android AAR library"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "Android APK file"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "Android DEX code"
-msgstr ""
-
-#: ../fdroidserver/init.py
-#, python-brace-format
-msgid "Android SDK not found at {path}!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Android SDK path '{path}' does not exist!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Android SDK path '{path}' is not a directory!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Android SDK tool {cmd} not found!"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "App has Binaries but does not have corresponding AllowedAPKSigningKeys to pin certificate."
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "App has NoSourceSince or ArchivePolicy \"0 versions\" or 0 but AutoUpdateMode or UpdateCheckMode are not None"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "App is in '{repo}' but has a link to {url}"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "App version has binary but does not have corresponding AllowedAPKSigningKeys to pin certificate."
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Appending .git is not necessary"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Archiving {apkfilename} with invalid signature!"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "AutoUpdateMode with UpdateCheckMode: HTTP must have a pattern."
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "Automatic no to all prompts."
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "Automatic yes to all prompts."
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "Bad entry type \"{mirrortype}\" in mirrors config: {mirror}"
-msgstr ""
-
-#: ../fdroidserver/mirror.py
-msgid "Base URL to mirror, can include the index signing key using the query string: ?fingerprint="
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Branch '{branch}' used as commit in build '{versionName}'"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Branch '{branch}' used as commit in srclib '{srclib}'"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Broken symlink: {path}"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Build a package from source"
-msgstr "Сабраць пакет з зыходнага кода"
-
-#: ../fdroidserver/build.py
-msgid "Build all applications available"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Build generated by `fdroid import` - remove disable line once ready"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "Build metadata git repo has uncommited changes!"
-msgstr ""
-
-#: ../fdroidserver/build.py
-msgid "Build only the latest version of each package"
-msgstr ""
-
-#: ../fdroidserver/init.py
-#, python-format
-msgid "Built repo based in \"%s\" with this config:"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "Can't auto-update app with no CurrentVersionCode"
-msgstr ""
-
-#: ../fdroidserver/build.py
-msgid "Can't build due to {} error while scanning"
-msgid_plural "Can't build due to {} errors while scanning"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Cannot read {path}: {error}"
-msgstr ""
-
-#: ../fdroidserver/rewritemeta.py
-#, python-brace-format
-msgid "Cannot rewrite \"{path}\""
-msgstr ""
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
-#: ../fdroidserver/lint.py
-#, python-format
-msgid "Categories '%s' is not valid"
-msgstr ""
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
-#: ../fdroidserver/lint.py
-msgid "Categories are not set"
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "Category \"{category}\" defined but not used for any apps!"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Check for updates to applications"
-msgstr "Праверце наяўнасць абнаўленняў праграм"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Checking archiving for {appid} - apks:{integer}, keepversions:{keep}, archapks:{arch}"
-msgstr ""
-
-#: ../fdroidserver/update.py
-msgid "Clean update - don't uses caches, reprocess all APKs"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Color the log output"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
-msgid "Comma separated list of categories."
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-#, python-format
-msgid "Command '%s' not recognised.\n"
-msgstr "Каманда '%s' не распазнана.\n"
-
-#: ../fdroidserver/checkupdates.py
-msgid "Commit changes"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "Commit changes, push, then make a merge request"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Conflicting \"{field}\" definitions between .yml and localized files:"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Conflicting arguments: '--verbose' and '--quiet' can not be specified at the same time."
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Could not find '{command}' on your system"
-msgstr ""
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/import_subcommand.py
-msgid "Could not find latest version code"
-msgstr ""
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
-#: ../fdroidserver/import_subcommand.py
-msgid "Could not find latest version name"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Could not find {path} to remove it"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Could not open APK {path} for analysis: "
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Could not parse size \"{size}\", wrong type \"{type}\""
-msgstr ""
-
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/import_subcommand.py
-msgid "Couldn't find Application ID"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "Couldn't find any version information"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "Couldn't find package ID"
-msgstr ""
-
-#: ../fdroidserver/update.py
-msgid "Cowardily refusing to overwrite existing signing key setup!"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Created new container \"{name}\""
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Creating \"{path}\" for configuring s3cmd."
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Creating empty {config_file}"
-msgstr ""
-
-#: ../fdroidserver/publish.py
-msgid "Creating log directory"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Creating new S3 bucket: {url}"
-msgstr ""
-
-#: ../fdroidserver/publish.py
-msgid "Creating output directory"
-msgstr ""
-
-#: ../fdroidserver/index.py
-msgid "Creating signed index with this key (SHA256):"
-msgstr ""
-
-#: ../fdroidserver/publish.py ../fdroidserver/verify.py
-msgid "Creating temporary directory"
-msgstr ""
-
-#: ../fdroidserver/index.py
-msgid "Creating unsigned index in preparation for signing"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "CurrentVersionCode {cv} is less than oldest build entry {versionCode}"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-msgid "DEBUG_KEYSTORE is not set or the value is incomplete"
-msgstr ""
-
-#: ../fdroidserver/update.py
-msgid "Delete APKs and/or OBBs without metadata from the repo"
-msgstr "Выдаліце APK і/або OBB без метададзеных з рэпазітара"
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Deleting archive, repo is too big ({size} max {limit})"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Deleting git-mirror history, repo is too big ({size} max {limit})"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Deleting unknown file: {path}"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-format
-msgid "Description '%s' is just the app's summary"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Description has a duplicate line"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Description of length {length} is over the {limit} char limit"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Did you mean config/{name}.yml?"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Did you mean {code}?"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
-msgid "Do not add 'disable:' to the generated build entries"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-msgid "Do not deploy the new files to the repo"
-msgstr ""
-
-#: ../fdroidserver/mirror.py
-#, python-brace-format
-msgid "Do not include \"{path}\" in URL!"
-msgstr ""
-
-#: ../fdroidserver/init.py
-msgid "Do not prompt for Android SDK path, just fail"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-msgid "Do not remove the private keys generated from the keystore"
-msgstr ""
-
-#: ../fdroidserver/build.py
-msgid "Don't create a source tarball, useful when testing a build"
-msgstr ""
-
-#: ../fdroidserver/build.py
-msgid "Don't refresh the repository, useful when testing a build with no internet connection"
-msgstr ""
-
-#: ../fdroidserver/deploy.py ../fdroidserver/nightly.py
-msgid "Don't use rsync checksums"
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "Download F-Droid.apk using mirrors that leak less to the network"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Download complete mirrors of small repos"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Downloading the repository already failed once, not trying again."
-msgstr ""
-
-#: ../fdroidserver/verify.py
-#, python-brace-format
-msgid "Downloading {url} failed. {error}"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Duplicate Anti-Feature declaration at {path} was ignored!"
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-format
-msgid "Duplicate entry \"%s\" in mirrors config!"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Duplicate link in '{field}': {url}"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-format
-msgid "ERROR: %(message)s"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "ERROR: The \"server\" subcommand has been removed, use \"deploy\"!"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-msgid "ERROR: unsupported CI type, patches welcome!"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-#, python-format
-msgid "ERROR: unsupported git host \"%s\", patches welcome!"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "ERROR: {key} in {path} is not \"archive\" or \"repo\"!"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "ERROR: {key} not a valid key!"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "ERROR: {key}'s value should be of type {t}!"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "ERROR: {key}:{subkey} in {path} is not in allowed keys: {allowed_keys}!"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-#, python-brace-format
-msgid "Encoding is set to '{enc}' fdroid might run into encoding issues. Please set it to 'UTF-8' for best results."
-msgstr ""
-
-#: ../fdroidserver/init.py
-#, python-format
-msgid ""
-"Enter the path to the Android SDK (%s) here:\n"
-"> "
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Environment variable {var} from {configname} is not set!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Environment variable {{env: {var}}} is not set!"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "Error deploying 'github_releases', {} not present. (You might need to run `fdroid update` first.)"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
-msgid "Error while getting repo address"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "Exit with a non-zero code if problems were found"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Extract application metadata from a source repository"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Extract signatures from APKs"
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "F-Droid.apk could not be downloaded from any known source!"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Failed copying {path}: {error}"
-msgstr ""
-
-#: ../fdroidserver/signatures.py
-#, python-brace-format
-msgid "Failed fetching signatures for '{apkfilename}': {error}"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Failed reading {path}: {error}"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Failed resizing {path}: {error}"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Failed to create S3 bucket: {url}"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Failed to get APK information, deleting {path}"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Failed to get APK information, skipping {path}"
-msgstr ""
-
-#: ../fdroidserver/update.py
-msgid "Failed to get APK signing key fingerprint"
-msgstr ""
-
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "Failed to install '{apkfilename}' on {dev}: {error}"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Failed to sign application"
-msgstr ""
-
-#: ../fdroidserver/build.py
-#, python-brace-format
-msgid "Fetched buildserverid from VM: {buildserverid}"
-msgstr ""
-
-#: ../fdroidserver/signatures.py
-#, python-brace-format
-msgid "Fetched signatures for '{apkfilename}' -> '{sigdir}'"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "File disappeared while processing it: {path}"
-msgstr ""
-
-#: ../fdroidserver/build.py ../fdroidserver/install.py
-#: ../fdroidserver/rewritemeta.py ../fdroidserver/scanner.py
-#: ../fdroidserver/update.py
-msgid "Finished"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Forbidden HTML tags"
-msgstr ""
-
-#: ../fdroidserver/build.py
-msgid "Force build of disabled apps, and carries on regardless of scan problems. Only allowed in test mode."
-msgstr ""
-
-#: ../fdroidserver/build.py
-#, python-brace-format
-msgid "Force halting build after {0} sec timeout!"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "Force scan of disabled apps and builds."
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Found \"{path}\" graphic without metadata for app \"{name}\"!"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Found bad funding file \"{path}\" for \"{name}\":"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Found invalid appids in arguments"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Found invalid versionCodes for some apps"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Found multiple JAR Signature Block Files in {path}"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Found multiple Signer Certificates!"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Found multiple metadata files for {appid}"
-msgstr ""
-
-#: ../fdroidserver/index.py
-msgid "Found multiple signing certificates for repository."
-msgstr ""
-
-#: ../fdroidserver/index.py
-msgid "Found no signing certificates for repository."
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-format
-msgid "Found non-file at %s"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Found {apkfilename} at {url}"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Found {count} problems in {filename}"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Found {count} warnings in {filename}"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Generated skeleton metadata for {appid}"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-format
-msgid "Git checkout of '%s' failed"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Git clean failed"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Git fetch failed"
-msgstr ""
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/common.py
-#, python-format
-msgid "Git remote set-head failed: \"%s\""
-msgstr ""
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/common.py
-msgid "Git reset failed"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Git submodule deinit failed"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Git submodule sync failed"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Git submodule update failed"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "HTTPS must be used with Subversion URLs!"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "If a git mirror gets to big, allow the archive to be deleted"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "If this upload fails, try manually uploading to {url}"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Ignoring '{field}' in '{metapath}' metadata because it is deprecated."
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-format
-msgid "Ignoring FUNDING.yml entry longer than 2048: %s"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-format
-msgid "Ignoring bad element in manifest: %s"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Ignoring deprecated {oldfile}, use {newfile}!"
-msgstr ""
-
-#: ../fdroidserver/index.py
-msgid "Ignoring package without metadata: "
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Ignoring stale cache data for {apkfilename}"
-msgstr ""
-
-#: ../fdroidserver/update.py
-msgid "Include APKs that are signed with disabled algorithms like MD5"
-msgstr ""
-
-#: ../fdroidserver/mirror.py
-msgid "Include the PGP signature .asc files in the mirror"
-msgstr ""
-
-#: ../fdroidserver/mirror.py
-msgid "Include the build logs in the mirror"
-msgstr ""
-
-#: ../fdroidserver/mirror.py
-msgid "Include the source tarballs in the mirror"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-format
-msgid "Including metadata from %s@%s"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Including metadata from {path}"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Initialising submodules"
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "Install all signed applications available"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Install built packages on devices"
-msgstr "Усталюйце ўбудаваныя пакеты на прылады"
-
-#: ../fdroidserver/install.py
-#, python-format
-msgid "Installing %s..."
-msgstr ""
-
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "Installing '{apkfilename}' on {dev}..."
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Interact with the repo HTTP server"
-msgstr "Узаемадзейнічайце з HTTP-серверам рэпазітара"
-
-#: ../fdroidserver/update.py
-msgid "Invalid APK"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "Invalid AutoUpdateMode: {mode}"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "Invalid UpdateCheckMode: {mode}"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "Invalid VercodeOperation: {field}"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Invalid VercodeOperation: {invalid_ops}"
-msgstr ""
-
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Invalid application ID {appid}"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Invalid bulleted list"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-format
-msgid "Invalid name for published file: %s"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Invalid ndk: entry in build: \"{ndk}\""
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Invalid redirect to non-HTTPS: {before} -> {after} "
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Invalid scrlib metadata: '{file}' does not exist"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Invalid srclib metadata: could not parse '{file}'"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Invalid srclib metadata: unknown key '{key}' in '{file}'"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "JAR signature failed to verify: {path}"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "JAR signature verified: {path}"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "Java JAR file"
-msgstr ""
-
-#: ../fdroidserver/mirror.py ../fdroidserver/publish.py
-#: ../fdroidserver/update.py
-msgid "Java JDK not found! Install in standard location or set java_paths!"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "Java compiled class"
-msgstr ""
-
-#: ../fdroidserver/signindex.py
-msgid "Java jarsigner not found! Install in standard location or set java_paths!"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Javascript in HTML src attributes"
-msgstr ""
-
-#: ../fdroidserver/build.py
-#, python-brace-format
-msgid "Keeping failed build \"{apkfilename}\""
-msgstr ""
-
-#: ../fdroidserver/init.py
-msgid "Keystore for signing key:\t"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Known debug key is used in AllowedAPKSigningKeys: "
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Last used commit '{commit}' looks like a tag, but UpdateCheckMode is '{ucm}'"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Liberapay donation methods belong in the Liberapay: field"
-msgstr ""
-
-#: ../fdroidserver/rewritemeta.py
-msgid "List files that would be reformatted (dry run)"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Locale included in f-droid.org URL"
-msgstr ""
-
-#: ../fdroidserver/build.py
-msgid "Make the build stop on exceptions"
-msgstr ""
-
-#: ../fdroidserver/index.py
-msgid "Malformed repository mirrors."
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "Malformed serverwebroot line:"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-format
-msgid "Max recursion depth in ZIP file reached: %s"
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "Mirror config for {url} contains \"isPrimary\" key!"
-msgstr ""
-
-#: ../fdroidserver/mirror.py
-msgid "Mirror the full repo and archive, all file types."
-msgstr ""
-
-#: ../fdroidserver/gpgsign.py
-msgid "Missing output directory"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-msgid "Moving Anti-Features declarations to localized files:"
-msgstr ""
-
-#: ../fdroidserver/index.py
-msgid "Neither \"repo_pubkey\" nor \"keystorepass\" set in config.yml"
-msgstr ""
-
-#: ../fdroidserver/verify.py
-#, python-format
-msgid "No APK for package: %s"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "No Android SDK found!"
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "No attached devices found"
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "No devices found for `adb install`! Please plug one in."
-msgstr ""
-
-#: ../fdroidserver/index.py
-msgid "No fingerprint in URL."
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "No git submodules available"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
-msgid "No gradle project could be found. Specify --subdir?"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
-msgid "No information found."
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "No matching tags found"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "No minimum SDK version found in {0}, using default (3)."
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "No need to specify that the app is Free Software"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "No need to specify that the app is for Android"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "No option set! Edit your config.yml to set at least one of these:"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "No packages specified"
-msgstr ""
-
-#: ../fdroidserver/install.py
-#, python-format
-msgid "No signed APK available for %s"
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "No signed output directory - nothing to do"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "No signing certificates found in {path}"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-format
-msgid "No such package: %s"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "No such versionCode {versionCode} for app {appid}"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "No tags found"
-msgstr ""
-
-#: ../fdroidserver/publish.py ../fdroidserver/verify.py
-msgid "No unsigned directory - nothing to do"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "No version information could be found."
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Not a valid size definition: \"{}\""
-msgstr ""
-
-#: ../fdroidserver/signindex.py
-msgid "Nothing to do"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "Nothing to do for {appid}."
-msgstr ""
-
-#: ../fdroidserver/init.py
-msgid "Now set these in config.yml:"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "OBB file has newer versionCode({integer}) than any APK:"
-msgstr ""
-
-#: ../fdroidserver/update.py
-msgid "OBB filename must start with \"main.\" or \"patch.\":"
-msgstr ""
-
-#: ../fdroidserver/update.py
-msgid "OBB's packagename does not match a supported APK:"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "Offline machine, skipping git mirror generation until `fdroid deploy`"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "One of the 'github_releases' config items is missing the 'packageNames' value. skipping ..."
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "One of the 'github_releases' config items is missing the 'projectUrl' value. skipping ..."
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "One of the 'github_releases' config items is missing the 'token' value. skipping ..."
-msgstr ""
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Only PNG and JPEG are supported for graphics, found: {path}"
-msgstr ""
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/common.py
-msgid "Only accepts a single key \"env\""
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "Only process apps with auto-updates"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "OpenCollective donation methods belong in the OpenCollective: field"
-msgstr ""
-
-#: ../fdroidserver/verify.py
-msgid "Output JSON report to file named after APK."
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "Output JSON to stdout."
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py ../fdroidserver/gpgsign.py
-#: ../fdroidserver/publish.py ../fdroidserver/signindex.py
-#: ../fdroidserver/update.py
-msgid "Outputting JSON"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
-msgid "Overall license of the project."
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "Overriding blank versionName in {apkfilename} from metadata: {version}"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
-#, python-brace-format
-msgid "Package \"{appid}\" already exists"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Parsing manifest at '{path}'"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Password required with username"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
-msgid "Path to main Android project subdirectory, if not in root."
-msgstr ""
-
-#: ../fdroidserver/init.py
-msgid "Path to the Android SDK (sometimes set in ANDROID_HOME)"
-msgstr ""
-
-#: ../fdroidserver/btlog.py
-msgid "Path to the git repo to use as the log"
-msgstr ""
-
-#: ../fdroidserver/init.py
-msgid "Path to the keystore for the repo signing key"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-msgid "Print the secret variable to the terminal for easy copy/paste"
-msgstr ""
-
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "Privacy mode was enabled based on your locale ({country_code})."
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-format
-msgid "Problem with ZIP file: %s, error %s"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Problem with xml at '{path}'"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "Process auto-updates"
-msgstr ""
-
-#: ../fdroidserver/publish.py ../fdroidserver/update.py
-#, python-brace-format
-msgid "Processing {apkfilename}"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Processing {appid}"
-msgstr ""
-
-#: ../fdroidserver/update.py
-msgid "Produce human-readable XML/JSON for index files"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
-msgid "Project URL to import from."
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Punctuation should be avoided"
-msgstr ""
-
-#: ../fdroidserver/btlog.py
-msgid "Push the log to this git remote repository"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Pushing binary transparency log to {url}"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "Pushing to remote server failed!"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Pushing to {url}"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Quickly start a new repository"
-msgstr "Хутка запусціце новы рэпазітар"
-
-#: ../fdroidserver/__main__.py
-msgid "Read all the metadata files and exit"
-msgstr "Прачытайце ўсе файлы метададзеных і выйдзіце"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Reading '{config_file}'"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Reading packageName/versionCode/versionName failed, APK invalid: '{apkfilename}'"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Reading packageName/versionCode/versionName failed,APK invalid: '{apkfilename}'"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Reading {apkfilename} from cache"
-msgstr ""
-
-#: ../fdroidserver/build.py
-msgid "Refresh and cache scanner rules and signatures from the network"
-msgstr ""
-
-#: ../fdroidserver/publish.py
-#, python-brace-format
-msgid "Refusing to sign '{path}', file exists in both {dir1} and {dir2} folder."
-msgstr ""
-
-#: ../fdroidserver/verify.py
-msgid "Remove source tarball and any APKs if successfully verified."
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Removing specified files"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Removing {path}\""
-msgstr ""
-
-#: ../fdroidserver/update.py
-msgid "Rename APK files that do not match package.name_123.apk"
-msgstr "Перайменуйце файлы APK, якія не адпавядаюць package.name_123.apk"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "RepoType {type} is deprecated, please switch to git."
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-#, python-brace-format
-msgid "Resigning {apkfilename} with provided debug.keystore"
-msgstr ""
-
-#: ../fdroidserver/update.py
-msgid "Resize all the icons exceeding the max pixel size and exit"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Restrict output to warnings and errors"
-msgstr ""
-
-#: ../fdroidserver/net.py
-#, python-format
-msgid "Retrying failed download: %s"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Rewrite all the metadata files"
-msgstr "Перапішыце ўсе файлы метададзеных"
-
-#: ../fdroidserver/rewritemeta.py
-#, python-brace-format
-msgid "Rewriting '{appid}'"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "Run on git repo that has uncommitted changes"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-#, python-brace-format
-msgid "Run over {cibase} to find -debug.apk. and skip repo_basedir {repo_basedir}"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Run rewritemeta to fix formatting"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "Running first pass with MD5 checking disabled"
-msgstr ""
-
-#: ../fdroidserver/mirror.py
-#, python-brace-format
-msgid "Running wget in {path}"
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "SHA-256 of {url} does not match entry!"
-msgstr ""
-
-#: ../fdroidserver/build.py
-msgid "Scan the resulting APK(s) for known non-free classes."
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Scan the source code of a package"
-msgstr "Сканіруйце зыходны код пакета"
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Scanner found {count} problems in {apk}"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Scanner found {count} problems in {appid}:"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Scanner found {count} problems in {appid}:{versionCode}:"
-msgstr ""
-
-#: ../fdroidserver/build.py
-msgid "Scanner found {} problem"
-msgid_plural "Scanner found {} problems"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../fdroidserver/scanner.py
-msgid "Scanning APK for extra signing blocks."
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "Scanning APK with dexdump for known non-free classes."
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Set NDK {release} ({version}) up"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Set clock to that time using:"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-msgid "Set maximum releases in repo before older ones are archived"
-msgstr ""
-
-#: ../fdroidserver/build.py
-#, python-brace-format
-msgid "Set open file limit to {integer}"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Set up an app build for a nightly build repo"
-msgstr ""
-
-#: ../fdroidserver/build.py
-msgid "Setting open file limit failed: "
-msgstr ""
-
-#: ../fdroidserver/build.py
-#, python-brace-format
-msgid "Setting {0} sec timeout for this build"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Sign and place packages in the repo"
-msgstr "Падпішыце і зафіксуйце пакеты ў рэпазітары"
-
-#: ../fdroidserver/__main__.py
-msgid "Sign indexes created using update --nosign"
-msgstr "Падпісвайце індэксы, створаныя з дапамогай update --nosign"
-
-#: ../fdroidserver/build.py
-msgid "Skip scanning the source code for binaries and other problems"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Skipping '{apkfilename}' with invalid signature!"
-msgstr ""
-
-#: ../fdroidserver/deploy.py ../fdroidserver/index.py
-#, python-format
-msgid "Skipping GitLab Pages mirror because the repo is too large (>%.2fGB)!"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Skipping index generation for {appid}"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Skipping {apkfilename} with invalid signature!"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Skipping {appid}: disabled"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "Specify a local folder to sync the repo to"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "Specify an identity file to provide to SSH for rsyncing"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-msgid "Specify which debug keystore file to use."
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Spew out even more information than normal"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-#, python-brace-format
-msgid "Stripping mystery signature from {apkfilename}"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-format
-msgid "Summary '%s' is just the app's name"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Summary of length {length} is over the {limit} char limit"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "System clock is older than date in {path}!"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "Tags update mode only works for git, hg, bzr and git-svn repositories currently"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "Tags update mode used in git-svn, but the repo was not set up with tags"
-msgstr ""
-
-#: ../fdroidserver/build.py
-msgid "Test mode - put output in the tmp directory only, and always build, even if the output already exists."
-msgstr ""
-
-#: ../fdroidserver/index.py
-msgid "The \"qrcode\" Python package is not installed (e.g. apt-get install python3-qrcode)!"
-msgstr ""
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "The OBB version code must come after \"{name}.\":"
-msgstr ""
-
-#: ../fdroidserver/btlog.py
-msgid "The base URL for the repo to log (default: https://f-droid.org)"
-msgstr ""
-
-#: ../fdroidserver/mirror.py
-msgid "The directory to write the mirror to"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-msgid "The file to be included in the repo (path or glob)"
-msgstr ""
-
-#: ../fdroidserver/index.py
-msgid "The repository's fingerprint does not match."
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "The root dir for local_copy_dir \"{path}\" does not exist!"
-msgstr ""
-
-#: ../fdroidserver/publish.py
-msgid "There is a keyalias collision - publishing halted"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "These are the apps that have been archived from the main repo."
-msgstr ""
-
-#: ../fdroidserver/mirror.py
-msgid "This command should never be used to mirror f-droid.org! A full copy requires more than 600GB."
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "This is a repository of apps to be used with F-Droid. Applications in this repository are either official binaries built by the original application developers, or are binaries built from source by the admin of f-droid.org using the tools on https://gitlab.com/fdroid."
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
-#, python-format
-msgid "This repo already has local metadata: %s"
-msgstr ""
-
-#: ../fdroidserver/init.py
-#, python-format
-msgid ""
-"To complete the setup, add your APKs to \"%s\"\n"
-"then run \"fdroid update -c; fdroid update\".  You might also want to edit\n"
-"\"config.yml\" to set the URL, repo name, and more.  You should also set up\n"
-"a signing key (a temporary one might have been automatically generated).\n"
-"\n"
-"For more info: https://f-droid.org/docs/Setup_an_F-Droid_App_Repo\n"
-"and https://f-droid.org/docs/Signing_Process"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "To use awsbucket, awssecretkey and awsaccesskeyid must also be set in config.yml!"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "To use rclone, rclone_config and awsbucket must be set in config.yml!"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "URL must start with https:// or http://"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "URL shorteners should not be used"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "URL {url} in Description: {error}"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Unexpected license tag \"{}\"! Only use FSF or OSI approved tags from https://spdx.org/license-list"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Unexpected license tag \"{}\"! Only use license tags configured in your config file"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Unknown entry {key} in {configname}"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Unknown exception found!"
-msgstr "Знойдзена невядомае выключэнне!"
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Unknown file '{filename}' in build '{versionName}'"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-format
-msgid "Unknown metadata format: %s"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Unknown metadata format: {path} (use: *.yml)"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Unknown version of aapt, might cause problems: "
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Unnecessary leading space"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Unnecessary trailing space"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Unrecognised app field '{fieldname}' in '{path}'"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Unrecognised build flag '{build_flag}' in '{path}'"
-msgstr ""
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Unsupported file type \"{extension}\" for repo graphic"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Unsupported graphics file found: {path}"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-format
-msgid "Unused extlib at %s"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-format
-msgid "Unused file at %s"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-format
-msgid "Unused scandelete path: %s"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-format
-msgid "Unused scanignore path: %s"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Update repo information for new packages"
-msgstr "Абнаўленне інфармацыі рэпазітара для новых пакетаў"
-
-#: ../fdroidserver/__main__.py
-msgid "Update the binary transparency log for a URL"
-msgstr "Абнавіць бінарны журнал празрыстасці для URL"
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "UpdateCheckData has invalid URL: {url}"
-msgstr ""
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "UpdateCheckData must match the version code as integer (\\d or [0-9]): {codeex}"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "UpdateCheckData must use HTTPS URL: {url}"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "UpdateCheckData not a valid URL: {url}"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "UpdateCheckMode is set but it looks like checkupdates hasn't been run yet."
-msgstr ""
-
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/lint.py
-msgid "UpdateCheckName is set to the known application ID, it can be removed"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Uploading {apkfilename} to androidobservatory.org"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Uploading {apkfilename} to virustotal"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Use /HEAD instead of /master or /main to point at a file in the default branch"
-msgstr ""
-
-#: ../fdroidserver/update.py
-msgid "Use `fdroid update -c` to create it."
-msgstr ""
-
-#: ../fdroidserver/build.py
-msgid "Use build server"
-msgstr ""
-
-#: ../fdroidserver/update.py
-msgid "Use date from APK instead of current time for newly added APKs"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Using \"{path}\" for configuring s3cmd."
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Using \"{path}\" for syncing with remote storage."
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Using APK Signature v2"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Using APK Signature v3"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Using JAR Signature"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Using Java's jarsigner, not recommended for verifying APKs! Use apksigner"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Using blank dictionary instead of contents of {path}!"
-msgstr ""
-
-#: ../fdroidserver/init.py
-#, python-brace-format
-msgid "Using existing keystore \"{path}\""
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Using rclone to sync with: {url}"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Using s3cmd to sync with: {url}"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Valid commands are:"
-msgstr "Дапушчальныя каманды:"
-
-#: ../fdroidserver/verify.py
-msgid "Verify against locally cached copy rather than redownloading."
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Verify the integrity of downloaded packages"
-msgstr "Праверце цэласнасць спампаваных пакетаў"
-
-#: ../fdroidserver/index.py
-msgid "Verifying index signature:"
-msgstr ""
-
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "Verifying package {path} with apksigner."
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "VirusTotal API key cannot upload files larger than 32MB, use {url} to upload {path}."
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-msgid "WARNING: only public git repos are supported!"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Warn about possible metadata errors"
-msgstr "Папярэджваць аб магчымых памылках метададзеных"
-
-#: ../fdroidserver/scanner.py
-msgid "WebAssembly binary file"
-msgstr ""
-
-#: ../fdroidserver/update.py
-msgid "When configured for signed indexes, create only unsigned indexes at this stage"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "When linting the entire repository yamllint is disabled by default. This option forces yamllint regardless."
-msgstr ""
-
-#: ../fdroidserver/publish.py
-msgid "When signing or verifying fails, exit with an error code."
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "Would you like to download and install F-Droid.apk via adb? (YES/no)"
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "Would you like to download the app(s) from f-droid.org? (YES/no)"
-msgstr ""
-
-#: ../fdroidserver/init.py
-msgid "X.509 'Distinguished Name' used when generating keys"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "You can use ANDROID_HOME to set the path to your SDK, i.e.:"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "ZIP file archive"
-msgstr ""
-
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "adb reports {serial} is \"{status}\"!"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-#, python-brace-format
-msgid "adding IdentityFile to {path}"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "adding to {name}: {path}"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "ambiguous option: %(option)s could match %(matches)s"
-msgstr "неадназначны варыянт: %(option)s можа адпавядаць %(matches)s"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "apksigner in build-tools;{version} passes APKs with invalid v3 signatures, ignoring."
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "apksigner not found! Cannot sign or verify modern APKs"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "apksigner not found, it's required for signing!"
-msgstr ""
-
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/checkupdates.py ../fdroidserver/lint.py
-#: ../fdroidserver/rewritemeta.py
-msgid "application ID of file to operate on"
-msgstr ""
-
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/build.py ../fdroidserver/install.py
-#: ../fdroidserver/publish.py ../fdroidserver/scanner.py
-#: ../fdroidserver/verify.py
-msgid "application ID with optional versionCode in the form APPID[:VERCODE]"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "archive_url needs to end with /archive"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "argument \"-\" with mode %r"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "argument %(argument_name)s: %(message)s"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-msgid "attempting bare SSH connection to test deploy key:"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "can not parse scrlib spec (not a string): '{}'"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "can't open '%(filename)s': %(error)s"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "can't open non-https url: '{};"
-msgstr ""
-
-#: ../fdroidserver/build.py
-#, python-brace-format
-msgid "cannot find required srclibs: \"{path}\""
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-msgid "cannot have multiple subparser arguments"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "cannot merge actions - two groups are named %r"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-msgid "cannot publish update, did you set the deploy key?"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-#, python-brace-format
-msgid "cloning {url}"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "commands from plugin modules:"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "conflicting option string: %s"
-msgid_plural "conflicting option strings: %s"
-msgstr[0] ""
-msgstr[1] ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "conflicting subparser alias: %s"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "conflicting subparser: %s"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "could not parse '{path}'"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "could not parse srclib spec (no name specified): '{}'"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "could not parse srclib spec (no ref specified): '{}'"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-#, python-brace-format
-msgid "created {path}"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "current version is newer: old vercode={old}, new vercode={new}"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "deleting: repo/{apkfilename}"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "dependency file without lock"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "deployed process log {path} to {dest}"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "dest= is required for options like %r"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "downloading '{}'"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "downloading scanner signatures from '{}' failed"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "executable binary, possibly code"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "expected %s argument"
-msgid_plural "expected %s arguments"
-msgstr[0] ""
-msgstr[1] ""
-
-#: /usr/lib/python3.11/argparse.py
-msgid "expected at least one argument"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-msgid "expected at most one argument"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-msgid "expected one argument"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "fdroid [<command>] [-h|--help|--version|<args>]"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "fetch the latest version of signatures from the web"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-msgid "force metadata errors (default) to be warnings, or to be ignored."
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "git svn clone failed"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "gzip file archive"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "ignored explicit argument %r"
-msgstr ""
-
-#: ../fdroidserver/index.py
-msgid "index-v1 must have a signature, use `fdroid signindex` to create it!"
-msgstr ""
-
-#: ../fdroidserver/index.py
-msgid "index-v2 must have a signature, use `fdroid signindex` to create it!"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "invalid %(type)s value: %(value)r"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "invalid choice: %(value)r (choose from %(choices)s)"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "invalid conflict_resolution value: %r"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "invalid option string %(option)r: must start with a character %(prefix_chars)r"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "ipfs_cid not found, skipping CIDv1 generation"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "latest build recipe is newer: old vercode={old}, new vercode={new}"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "local_copy_dir does not end with \"fdroid\", perhaps you meant: \"{path}\""
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "local_copy_dir must be an absolute path!"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "local_copy_dir must be directory, not a file!"
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-format
-msgid "mirror '%s' does not end with 'fdroid'!"
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "mirrors set twice, in config.yml and {path}!"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-msgid "mutually exclusive arguments must be optional"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "next {name} cache update due in {time}"
-msgstr ""
-
-#: ../fdroidserver/mirror.py
-#, python-brace-format
-msgid "no \"icon\" in {appid}"
-msgstr ""
-
-#: ../fdroidserver/signatures.py
-msgid "no APK supplied"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "no version information found"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "not allowed with argument %s"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "one of the arguments %s is required"
-msgstr ""
-
-#: ../fdroidserver/common.py ../fdroidserver/index.py
-msgid "only accepts strings, lists, and tuples"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-msgid "options"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-#, python-brace-format
-msgid "overwriting existing {path}"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-msgid "positional arguments"
-msgstr "пазіцыйныя аргументы"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "process log deploy {path} to {dest} failed!"
-msgstr ""
-
-#: ../fdroidserver/build.py
-msgid "reference binary missing signature"
-msgstr ""
-
-#: ../fdroidserver/signatures.py
-#, python-brace-format
-msgid "refuse downloading via insecure HTTP connection (use HTTPS or specify --no-https-check): {apkfilename}"
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-format
-msgid "repo_icon \"repo/icons/%s\" does not exist, generating placeholder."
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "repo_url needs to end with /repo"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "rsync is missing or broken: {error}"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "s3cmd sync indexes {path} to {url} and delete"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "s3cmd syncs indexes from {path} to {url} and deletes removed"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "scanner cache is malformed! You can clear it with: '{clear}'"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "serverwebroot: path does not end with \"fdroid\", perhaps you meant one of these:"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "shared library"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-msgid "show this help message and exit"
-msgstr "паказаць гэта паведамленне дапамогі і выйсці"
-
-#: ../fdroidserver/signatures.py
-msgid "signed APK, either a file-path or HTTPS URL."
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "skip deploying full build logs: log content is empty"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "skip deploying full build logs: not enabled in config"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "skipping source tarball: {path}"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "srclibs missing name and/or @"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "static library"
-msgstr ""
-
-#: ../fdroidserver/build.py
-#, python-brace-format
-msgid "supplied reference binary has allowed signer {signer}"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "the following arguments are required: %s"
-msgstr "патрабуюцца наступныя аргументы: %s"
-
-#: ../fdroidserver/install.py
-msgid "true"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "unexpected option string: %s"
-msgstr "нечаканы параметр: %s"
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "unknown parser %(parser_name)r (choices: %(choices)s)"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "unrecognized arguments: %s"
-msgstr "незнаёмыя аргументы: %s"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "unsafe permissions on '{config_file}' (should be 0600)!"
-msgstr "небяспечныя дазволы доступу для '{config_file}' (патрэбна быць 0600)!"
-
-#: ../fdroidserver/__main__.py /usr/lib/python3.11/argparse.py
-msgid "usage: "
-msgstr "выкарыстанне: "
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "using Apache libcloud to sync with {url}"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "virustotal.com is rate limiting, waiting to retry..."
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "yes"
-msgstr ""
-
-#: ../fdroidserver/publish.py
-#, python-brace-format
-msgid "{0} app, {1} key aliases"
-msgid_plural "{0} apps, {1} key aliases"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{apkfilename} ({appid}) has no metadata!"
-msgstr ""
-
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{apkfilename}'s AndroidManifest.xml has a bad date: "
-msgstr ""
-
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{appid} does not have a name! Using application ID instead."
-msgstr ""
-
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{appid} from {path} is not a valid Android application ID!"
-msgstr ""
-
-#: ../fdroidserver/metadata.py ../fdroidserver/update.py
-#, python-brace-format
-msgid "{appid} from {path} is not a valid Java Package Name!"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{appid} has both APKs and files: {files}"
-msgstr ""
-
-#: ../fdroidserver/mirror.py
-#, python-brace-format
-msgid "{appid} is missing {name}"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "{appid}: Unknown extlib {path} in build '{versionName}'"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "{appid}: no builds specified, running on current source state"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "{appid}: {field} must be a '{type}', but it is a '{fieldtype}!'"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "{appid}: {field} must be a '{type}', but it is a '{fieldtype}'!"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "{build_flag} must be an integer, found: {value}"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "{build_flag} must be list or string, found: {value}"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "{file} is blank or corrupt!"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{name} \"{section}/icons/{path}\" does not exist! Check \"config.yml\"."
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{path1} is a duplicate of {path2}, remove one!"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
-#, python-brace-format
-msgid "{path} already exists, ignoring import results!"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-#, python-brace-format
-msgid "{path} does not exist!  Create it by running:"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{path} has bad file signature \"{pattern}\", possible Janus exploit!"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "{path} has been flagged by virustotal {count} times:"
-msgstr ""
-
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "{path} has the wrong fingerprint ({fingerprint})!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "{path} is not \"key: value\" dict, but a {datatype}!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "{path} is not a standard config file!"
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "{path} is not list, but a {datatype}!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "{path} is not {expected_type}, but a {datatype}!"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{path} is zero size!"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "{path} more than 200MB, manually upload: {url}"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "{path}: \"{code}\" is not a valid ISO_3166-1 alpha-2 country code!"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{path}: {error}"
-msgstr ""
-
-#: ../fdroidserver/mirror.py
-#, python-brace-format
-msgid "{url} does not end with \"fdroid\", check the URL path!"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
-#, python-brace-format
-msgid "{url} does not start with \"http\"!"
-msgstr ""
-
-#: ../fdroidserver/build.py
-msgid "{} build failed"
-msgid_plural "{} builds failed"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../fdroidserver/build.py
-msgid "{} build succeeded"
-msgid_plural "{} builds succeeded"
-msgstr[0] ""
-msgstr[1] ""
diff --git a/locale/bg/LC_MESSAGES/fdroidserver.po b/locale/bg/LC_MESSAGES/fdroidserver.po
deleted file mode 100644
index bbcbc06a..00000000
--- a/locale/bg/LC_MESSAGES/fdroidserver.po
+++ /dev/null
@@ -1,2683 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# This file is put in the public domain.
-# Aleksandar Hadzhivelichkov <Raphaelo245@gmail.com>, 2022.
-# 109247019824 <stoyan@gmx.com>, 2024.
-msgid ""
-msgstr ""
-"Project-Id-Version: fdroidserver 2.1b0\n"
-"Report-Msgid-Bugs-To: https://gitlab.com/fdroid/fdroidserver/issues\n"
-"POT-Creation-Date: 2025-06-25 09:52+0200\n"
-"PO-Revision-Date: 2024-07-19 10:21+0000\n"
-"Last-Translator: 109247019824 <stoyan@gmx.com>\n"
-"Language-Team: Bulgarian <https://hosted.weblate.org/projects/f-droid/fdroidserver/bg/>\n"
-"Language: bg\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 5.7-dev\n"
-
-#: ../fdroidserver/nightly.py
-msgid ""
-"\n"
-"SSH public key to be used as deploy key:"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-#, python-brace-format
-msgid ""
-"\n"
-"{path} encoded for the DEBUG_KEYSTORE secret variable:"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-format
-msgid "\"%s/\" has no matching metadata file!"
-msgstr ""
-
-#: ../fdroidserver/index.py
-msgid "\"isPrimary\" key should not be added to mirrors!"
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "\"local_copy_dir\" {path} does not exist!"
-msgstr ""
-
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "\"{apkfilename}\" is already installed on {dev}."
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "\"{path}\" contains recent {name} ({version})"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "\"{path}\" exists but s3cmd is not installed!"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "\"{path}\" is not a supported file format (use: metadata/*.yml)"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "\"{path}\" is signed by a key that is not allowed:"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
-#, python-brace-format
-msgid "\"{url}\" is not a valid URL!"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "%(prog)s: error: %(message)s\n"
-msgstr ""
-
-#: ../fdroidserver/publish.py
-#, python-format
-msgid "%d APKs failed to be signed or verified!"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-format
-msgid "%d problems found"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "%r is not callable"
-msgstr ""
-
-#: ../fdroidserver/signindex.py
-#, python-format
-msgid "%s did not produce a dict!"
-msgstr ""
-
-#: ../fdroidserver/signindex.py
-#, python-format
-msgid "%s has bad SHA-256: %s"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-format
-msgid "%s is not an accepted build field"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "'keypass' not found in config.yml!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "'keystore' is NONE and 'smartcardoptions' is blank!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "'keystore' not found in config.yml!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "'keystorepass' not found in config.yml!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "'repo_keyalias' not found in config.yml!"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-msgid "'required' is an invalid argument for positionals"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "'sdk_path' not set in config.yml!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "'{aapt}' is too old, fdroid requires build-tools-{version} or newer!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "'{path}' failed to execute!"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "'{path}' has invalid format, it should be a dictionary!"
-msgstr ""
-
-#: ../fdroidserver/lint.py ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "'{value}' is not a valid {field} in {appid}. Regex pattern: {pattern}"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "'{value}' is not a valid {field}, should be {pattern}"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "--merge-request only runs on a single appid!"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "...checkupdate failed for {appid} : {error}"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-msgid ".__call__() not defined"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "/issues is missing"
-msgstr ""
-
-#: ../fdroidserver/mirror.py
-msgid "A URL is required as an argument!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "APK signatures have different certificates in {path}:"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Add PGP signatures using GnuPG for packages in repo"
-msgstr ""
-
-#: ../fdroidserver/update.py
-msgid "Add a repo signing key to an unsigned repo"
-msgstr ""
-
-#: ../fdroidserver/update.py
-msgid "Add skeleton metadata files for APKs that are missing them"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Adding new repo for only {name}"
-msgstr ""
-
-#: ../fdroidserver/init.py
-msgid "Alias of the repo signing key in the keystore"
-msgstr ""
-
-#: ../fdroidserver/build.py
-msgid "AllowedAPKSigningKeys missing but reference binary supplied"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
-msgid "Allows a different revision (or git branch) to be specified for the initial import"
-msgstr ""
-
-#: ../fdroidserver/mirror.py
-msgid "Also mirror the full archive section"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Also warn about formatting issues, like rewritemeta -l"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "Android AAR library"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "Android APK file"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "Android DEX code"
-msgstr ""
-
-#: ../fdroidserver/init.py
-#, python-brace-format
-msgid "Android SDK not found at {path}!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Android SDK path '{path}' does not exist!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Android SDK path '{path}' is not a directory!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Android SDK tool {cmd} not found!"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "App has Binaries but does not have corresponding AllowedAPKSigningKeys to pin certificate."
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "App has NoSourceSince or ArchivePolicy \"0 versions\" or 0 but AutoUpdateMode or UpdateCheckMode are not None"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "App is in '{repo}' but has a link to {url}"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "App version has binary but does not have corresponding AllowedAPKSigningKeys to pin certificate."
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Appending .git is not necessary"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Archiving {apkfilename} with invalid signature!"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "AutoUpdateMode with UpdateCheckMode: HTTP must have a pattern."
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "Automatic no to all prompts."
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "Automatic yes to all prompts."
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "Bad entry type \"{mirrortype}\" in mirrors config: {mirror}"
-msgstr ""
-
-#: ../fdroidserver/mirror.py
-msgid "Base URL to mirror, can include the index signing key using the query string: ?fingerprint="
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Branch '{branch}' used as commit in build '{versionName}'"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Branch '{branch}' used as commit in srclib '{srclib}'"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Broken symlink: {path}"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Build a package from source"
-msgstr ""
-
-#: ../fdroidserver/build.py
-msgid "Build all applications available"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Build generated by `fdroid import` - remove disable line once ready"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "Build metadata git repo has uncommited changes!"
-msgstr ""
-
-#: ../fdroidserver/build.py
-msgid "Build only the latest version of each package"
-msgstr ""
-
-#: ../fdroidserver/init.py
-#, python-format
-msgid "Built repo based in \"%s\" with this config:"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "Can't auto-update app with no CurrentVersionCode"
-msgstr ""
-
-#: ../fdroidserver/build.py
-msgid "Can't build due to {} error while scanning"
-msgid_plural "Can't build due to {} errors while scanning"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Cannot read {path}: {error}"
-msgstr ""
-
-#: ../fdroidserver/rewritemeta.py
-#, python-brace-format
-msgid "Cannot rewrite \"{path}\""
-msgstr ""
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
-#: ../fdroidserver/lint.py
-#, python-format
-msgid "Categories '%s' is not valid"
-msgstr ""
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
-#: ../fdroidserver/lint.py
-msgid "Categories are not set"
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "Category \"{category}\" defined but not used for any apps!"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Check for updates to applications"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Checking archiving for {appid} - apks:{integer}, keepversions:{keep}, archapks:{arch}"
-msgstr ""
-
-#: ../fdroidserver/update.py
-msgid "Clean update - don't uses caches, reprocess all APKs"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Color the log output"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
-msgid "Comma separated list of categories."
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-#, python-format
-msgid "Command '%s' not recognised.\n"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "Commit changes"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "Commit changes, push, then make a merge request"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Conflicting \"{field}\" definitions between .yml and localized files:"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Conflicting arguments: '--verbose' and '--quiet' can not be specified at the same time."
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Could not find '{command}' on your system"
-msgstr ""
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/import_subcommand.py
-msgid "Could not find latest version code"
-msgstr ""
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
-#: ../fdroidserver/import_subcommand.py
-msgid "Could not find latest version name"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Could not find {path} to remove it"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Could not open APK {path} for analysis: "
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Could not parse size \"{size}\", wrong type \"{type}\""
-msgstr ""
-
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/import_subcommand.py
-msgid "Couldn't find Application ID"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "Couldn't find any version information"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "Couldn't find package ID"
-msgstr ""
-
-#: ../fdroidserver/update.py
-msgid "Cowardily refusing to overwrite existing signing key setup!"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Created new container \"{name}\""
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Creating \"{path}\" for configuring s3cmd."
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Creating empty {config_file}"
-msgstr ""
-
-#: ../fdroidserver/publish.py
-msgid "Creating log directory"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Creating new S3 bucket: {url}"
-msgstr ""
-
-#: ../fdroidserver/publish.py
-msgid "Creating output directory"
-msgstr ""
-
-#: ../fdroidserver/index.py
-msgid "Creating signed index with this key (SHA256):"
-msgstr ""
-
-#: ../fdroidserver/publish.py ../fdroidserver/verify.py
-msgid "Creating temporary directory"
-msgstr ""
-
-#: ../fdroidserver/index.py
-msgid "Creating unsigned index in preparation for signing"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "CurrentVersionCode {cv} is less than oldest build entry {versionCode}"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-msgid "DEBUG_KEYSTORE is not set or the value is incomplete"
-msgstr ""
-
-#: ../fdroidserver/update.py
-msgid "Delete APKs and/or OBBs without metadata from the repo"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Deleting archive, repo is too big ({size} max {limit})"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Deleting git-mirror history, repo is too big ({size} max {limit})"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Deleting unknown file: {path}"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-format
-msgid "Description '%s' is just the app's summary"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Description has a duplicate line"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Description of length {length} is over the {limit} char limit"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Did you mean config/{name}.yml?"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Did you mean {code}?"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
-msgid "Do not add 'disable:' to the generated build entries"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-msgid "Do not deploy the new files to the repo"
-msgstr ""
-
-#: ../fdroidserver/mirror.py
-#, python-brace-format
-msgid "Do not include \"{path}\" in URL!"
-msgstr ""
-
-#: ../fdroidserver/init.py
-msgid "Do not prompt for Android SDK path, just fail"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-msgid "Do not remove the private keys generated from the keystore"
-msgstr ""
-
-#: ../fdroidserver/build.py
-msgid "Don't create a source tarball, useful when testing a build"
-msgstr ""
-
-#: ../fdroidserver/build.py
-msgid "Don't refresh the repository, useful when testing a build with no internet connection"
-msgstr ""
-
-#: ../fdroidserver/deploy.py ../fdroidserver/nightly.py
-msgid "Don't use rsync checksums"
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "Download F-Droid.apk using mirrors that leak less to the network"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Download complete mirrors of small repos"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Downloading the repository already failed once, not trying again."
-msgstr ""
-
-#: ../fdroidserver/verify.py
-#, python-brace-format
-msgid "Downloading {url} failed. {error}"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Duplicate Anti-Feature declaration at {path} was ignored!"
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-format
-msgid "Duplicate entry \"%s\" in mirrors config!"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Duplicate link in '{field}': {url}"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-format
-msgid "ERROR: %(message)s"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "ERROR: The \"server\" subcommand has been removed, use \"deploy\"!"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-msgid "ERROR: unsupported CI type, patches welcome!"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-#, python-format
-msgid "ERROR: unsupported git host \"%s\", patches welcome!"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "ERROR: {key} in {path} is not \"archive\" or \"repo\"!"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "ERROR: {key} not a valid key!"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "ERROR: {key}'s value should be of type {t}!"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "ERROR: {key}:{subkey} in {path} is not in allowed keys: {allowed_keys}!"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-#, python-brace-format
-msgid "Encoding is set to '{enc}' fdroid might run into encoding issues. Please set it to 'UTF-8' for best results."
-msgstr ""
-
-#: ../fdroidserver/init.py
-#, python-format
-msgid ""
-"Enter the path to the Android SDK (%s) here:\n"
-"> "
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Environment variable {var} from {configname} is not set!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Environment variable {{env: {var}}} is not set!"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "Error deploying 'github_releases', {} not present. (You might need to run `fdroid update` first.)"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
-msgid "Error while getting repo address"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "Exit with a non-zero code if problems were found"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Extract application metadata from a source repository"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Extract signatures from APKs"
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "F-Droid.apk could not be downloaded from any known source!"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Failed copying {path}: {error}"
-msgstr ""
-
-#: ../fdroidserver/signatures.py
-#, python-brace-format
-msgid "Failed fetching signatures for '{apkfilename}': {error}"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Failed reading {path}: {error}"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Failed resizing {path}: {error}"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Failed to create S3 bucket: {url}"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Failed to get APK information, deleting {path}"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Failed to get APK information, skipping {path}"
-msgstr ""
-
-#: ../fdroidserver/update.py
-msgid "Failed to get APK signing key fingerprint"
-msgstr ""
-
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "Failed to install '{apkfilename}' on {dev}: {error}"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Failed to sign application"
-msgstr ""
-
-#: ../fdroidserver/build.py
-#, python-brace-format
-msgid "Fetched buildserverid from VM: {buildserverid}"
-msgstr ""
-
-#: ../fdroidserver/signatures.py
-#, python-brace-format
-msgid "Fetched signatures for '{apkfilename}' -> '{sigdir}'"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "File disappeared while processing it: {path}"
-msgstr ""
-
-#: ../fdroidserver/build.py ../fdroidserver/install.py
-#: ../fdroidserver/rewritemeta.py ../fdroidserver/scanner.py
-#: ../fdroidserver/update.py
-msgid "Finished"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Forbidden HTML tags"
-msgstr ""
-
-#: ../fdroidserver/build.py
-msgid "Force build of disabled apps, and carries on regardless of scan problems. Only allowed in test mode."
-msgstr ""
-
-#: ../fdroidserver/build.py
-#, python-brace-format
-msgid "Force halting build after {0} sec timeout!"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "Force scan of disabled apps and builds."
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Found \"{path}\" graphic without metadata for app \"{name}\"!"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Found bad funding file \"{path}\" for \"{name}\":"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Found invalid appids in arguments"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Found invalid versionCodes for some apps"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Found multiple JAR Signature Block Files in {path}"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Found multiple Signer Certificates!"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Found multiple metadata files for {appid}"
-msgstr ""
-
-#: ../fdroidserver/index.py
-msgid "Found multiple signing certificates for repository."
-msgstr ""
-
-#: ../fdroidserver/index.py
-msgid "Found no signing certificates for repository."
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-format
-msgid "Found non-file at %s"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Found {apkfilename} at {url}"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Found {count} problems in {filename}"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Found {count} warnings in {filename}"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Generated skeleton metadata for {appid}"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-format
-msgid "Git checkout of '%s' failed"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Git clean failed"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Git fetch failed"
-msgstr ""
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/common.py
-#, python-format
-msgid "Git remote set-head failed: \"%s\""
-msgstr ""
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/common.py
-msgid "Git reset failed"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Git submodule deinit failed"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Git submodule sync failed"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Git submodule update failed"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "HTTPS must be used with Subversion URLs!"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "If a git mirror gets to big, allow the archive to be deleted"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "If this upload fails, try manually uploading to {url}"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Ignoring '{field}' in '{metapath}' metadata because it is deprecated."
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-format
-msgid "Ignoring FUNDING.yml entry longer than 2048: %s"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-format
-msgid "Ignoring bad element in manifest: %s"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Ignoring deprecated {oldfile}, use {newfile}!"
-msgstr ""
-
-#: ../fdroidserver/index.py
-msgid "Ignoring package without metadata: "
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Ignoring stale cache data for {apkfilename}"
-msgstr ""
-
-#: ../fdroidserver/update.py
-msgid "Include APKs that are signed with disabled algorithms like MD5"
-msgstr ""
-
-#: ../fdroidserver/mirror.py
-msgid "Include the PGP signature .asc files in the mirror"
-msgstr ""
-
-#: ../fdroidserver/mirror.py
-msgid "Include the build logs in the mirror"
-msgstr ""
-
-#: ../fdroidserver/mirror.py
-msgid "Include the source tarballs in the mirror"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-format
-msgid "Including metadata from %s@%s"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Including metadata from {path}"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Initialising submodules"
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "Install all signed applications available"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Install built packages on devices"
-msgstr ""
-
-#: ../fdroidserver/install.py
-#, python-format
-msgid "Installing %s..."
-msgstr ""
-
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "Installing '{apkfilename}' on {dev}..."
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Interact with the repo HTTP server"
-msgstr ""
-
-#: ../fdroidserver/update.py
-msgid "Invalid APK"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "Invalid AutoUpdateMode: {mode}"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "Invalid UpdateCheckMode: {mode}"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "Invalid VercodeOperation: {field}"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Invalid VercodeOperation: {invalid_ops}"
-msgstr ""
-
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Invalid application ID {appid}"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Invalid bulleted list"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-format
-msgid "Invalid name for published file: %s"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Invalid ndk: entry in build: \"{ndk}\""
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Invalid redirect to non-HTTPS: {before} -> {after} "
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Invalid scrlib metadata: '{file}' does not exist"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Invalid srclib metadata: could not parse '{file}'"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Invalid srclib metadata: unknown key '{key}' in '{file}'"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "JAR signature failed to verify: {path}"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "JAR signature verified: {path}"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "Java JAR file"
-msgstr ""
-
-#: ../fdroidserver/mirror.py ../fdroidserver/publish.py
-#: ../fdroidserver/update.py
-msgid "Java JDK not found! Install in standard location or set java_paths!"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "Java compiled class"
-msgstr ""
-
-#: ../fdroidserver/signindex.py
-msgid "Java jarsigner not found! Install in standard location or set java_paths!"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Javascript in HTML src attributes"
-msgstr ""
-
-#: ../fdroidserver/build.py
-#, python-brace-format
-msgid "Keeping failed build \"{apkfilename}\""
-msgstr ""
-
-#: ../fdroidserver/init.py
-msgid "Keystore for signing key:\t"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Known debug key is used in AllowedAPKSigningKeys: "
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Last used commit '{commit}' looks like a tag, but UpdateCheckMode is '{ucm}'"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Liberapay donation methods belong in the Liberapay: field"
-msgstr ""
-
-#: ../fdroidserver/rewritemeta.py
-msgid "List files that would be reformatted (dry run)"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Locale included in f-droid.org URL"
-msgstr ""
-
-#: ../fdroidserver/build.py
-msgid "Make the build stop on exceptions"
-msgstr ""
-
-#: ../fdroidserver/index.py
-msgid "Malformed repository mirrors."
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "Malformed serverwebroot line:"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-format
-msgid "Max recursion depth in ZIP file reached: %s"
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "Mirror config for {url} contains \"isPrimary\" key!"
-msgstr ""
-
-#: ../fdroidserver/mirror.py
-msgid "Mirror the full repo and archive, all file types."
-msgstr ""
-
-#: ../fdroidserver/gpgsign.py
-msgid "Missing output directory"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-msgid "Moving Anti-Features declarations to localized files:"
-msgstr ""
-
-#: ../fdroidserver/index.py
-msgid "Neither \"repo_pubkey\" nor \"keystorepass\" set in config.yml"
-msgstr ""
-
-#: ../fdroidserver/verify.py
-#, python-format
-msgid "No APK for package: %s"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "No Android SDK found!"
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "No attached devices found"
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "No devices found for `adb install`! Please plug one in."
-msgstr ""
-
-#: ../fdroidserver/index.py
-msgid "No fingerprint in URL."
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "No git submodules available"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
-msgid "No gradle project could be found. Specify --subdir?"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
-msgid "No information found."
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "No matching tags found"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "No minimum SDK version found in {0}, using default (3)."
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "No need to specify that the app is Free Software"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "No need to specify that the app is for Android"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "No option set! Edit your config.yml to set at least one of these:"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "No packages specified"
-msgstr ""
-
-#: ../fdroidserver/install.py
-#, python-format
-msgid "No signed APK available for %s"
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "No signed output directory - nothing to do"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "No signing certificates found in {path}"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-format
-msgid "No such package: %s"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "No such versionCode {versionCode} for app {appid}"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "No tags found"
-msgstr ""
-
-#: ../fdroidserver/publish.py ../fdroidserver/verify.py
-msgid "No unsigned directory - nothing to do"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "No version information could be found."
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Not a valid size definition: \"{}\""
-msgstr ""
-
-#: ../fdroidserver/signindex.py
-msgid "Nothing to do"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "Nothing to do for {appid}."
-msgstr ""
-
-#: ../fdroidserver/init.py
-msgid "Now set these in config.yml:"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "OBB file has newer versionCode({integer}) than any APK:"
-msgstr ""
-
-#: ../fdroidserver/update.py
-msgid "OBB filename must start with \"main.\" or \"patch.\":"
-msgstr ""
-
-#: ../fdroidserver/update.py
-msgid "OBB's packagename does not match a supported APK:"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "Offline machine, skipping git mirror generation until `fdroid deploy`"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "One of the 'github_releases' config items is missing the 'packageNames' value. skipping ..."
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "One of the 'github_releases' config items is missing the 'projectUrl' value. skipping ..."
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "One of the 'github_releases' config items is missing the 'token' value. skipping ..."
-msgstr ""
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Only PNG and JPEG are supported for graphics, found: {path}"
-msgstr ""
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/common.py
-msgid "Only accepts a single key \"env\""
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "Only process apps with auto-updates"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "OpenCollective donation methods belong in the OpenCollective: field"
-msgstr ""
-
-#: ../fdroidserver/verify.py
-msgid "Output JSON report to file named after APK."
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "Output JSON to stdout."
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py ../fdroidserver/gpgsign.py
-#: ../fdroidserver/publish.py ../fdroidserver/signindex.py
-#: ../fdroidserver/update.py
-msgid "Outputting JSON"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
-msgid "Overall license of the project."
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "Overriding blank versionName in {apkfilename} from metadata: {version}"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
-#, python-brace-format
-msgid "Package \"{appid}\" already exists"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Parsing manifest at '{path}'"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Password required with username"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
-msgid "Path to main Android project subdirectory, if not in root."
-msgstr ""
-
-#: ../fdroidserver/init.py
-msgid "Path to the Android SDK (sometimes set in ANDROID_HOME)"
-msgstr ""
-
-#: ../fdroidserver/btlog.py
-msgid "Path to the git repo to use as the log"
-msgstr ""
-
-#: ../fdroidserver/init.py
-msgid "Path to the keystore for the repo signing key"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-msgid "Print the secret variable to the terminal for easy copy/paste"
-msgstr ""
-
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "Privacy mode was enabled based on your locale ({country_code})."
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-format
-msgid "Problem with ZIP file: %s, error %s"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Problem with xml at '{path}'"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "Process auto-updates"
-msgstr ""
-
-#: ../fdroidserver/publish.py ../fdroidserver/update.py
-#, python-brace-format
-msgid "Processing {apkfilename}"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Processing {appid}"
-msgstr ""
-
-#: ../fdroidserver/update.py
-msgid "Produce human-readable XML/JSON for index files"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
-msgid "Project URL to import from."
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Punctuation should be avoided"
-msgstr ""
-
-#: ../fdroidserver/btlog.py
-msgid "Push the log to this git remote repository"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Pushing binary transparency log to {url}"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "Pushing to remote server failed!"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Pushing to {url}"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Quickly start a new repository"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Read all the metadata files and exit"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Reading '{config_file}'"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Reading packageName/versionCode/versionName failed, APK invalid: '{apkfilename}'"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Reading packageName/versionCode/versionName failed,APK invalid: '{apkfilename}'"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Reading {apkfilename} from cache"
-msgstr ""
-
-#: ../fdroidserver/build.py
-msgid "Refresh and cache scanner rules and signatures from the network"
-msgstr ""
-
-#: ../fdroidserver/publish.py
-#, python-brace-format
-msgid "Refusing to sign '{path}', file exists in both {dir1} and {dir2} folder."
-msgstr ""
-
-#: ../fdroidserver/verify.py
-msgid "Remove source tarball and any APKs if successfully verified."
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Removing specified files"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Removing {path}\""
-msgstr ""
-
-#: ../fdroidserver/update.py
-msgid "Rename APK files that do not match package.name_123.apk"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "RepoType {type} is deprecated, please switch to git."
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-#, python-brace-format
-msgid "Resigning {apkfilename} with provided debug.keystore"
-msgstr ""
-
-#: ../fdroidserver/update.py
-msgid "Resize all the icons exceeding the max pixel size and exit"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Restrict output to warnings and errors"
-msgstr ""
-
-#: ../fdroidserver/net.py
-#, python-format
-msgid "Retrying failed download: %s"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Rewrite all the metadata files"
-msgstr ""
-
-#: ../fdroidserver/rewritemeta.py
-#, python-brace-format
-msgid "Rewriting '{appid}'"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "Run on git repo that has uncommitted changes"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-#, python-brace-format
-msgid "Run over {cibase} to find -debug.apk. and skip repo_basedir {repo_basedir}"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Run rewritemeta to fix formatting"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "Running first pass with MD5 checking disabled"
-msgstr ""
-
-#: ../fdroidserver/mirror.py
-#, python-brace-format
-msgid "Running wget in {path}"
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "SHA-256 of {url} does not match entry!"
-msgstr ""
-
-#: ../fdroidserver/build.py
-msgid "Scan the resulting APK(s) for known non-free classes."
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Scan the source code of a package"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Scanner found {count} problems in {apk}"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Scanner found {count} problems in {appid}:"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Scanner found {count} problems in {appid}:{versionCode}:"
-msgstr ""
-
-#: ../fdroidserver/build.py
-msgid "Scanner found {} problem"
-msgid_plural "Scanner found {} problems"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../fdroidserver/scanner.py
-msgid "Scanning APK for extra signing blocks."
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "Scanning APK with dexdump for known non-free classes."
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Set NDK {release} ({version}) up"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Set clock to that time using:"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-msgid "Set maximum releases in repo before older ones are archived"
-msgstr ""
-
-#: ../fdroidserver/build.py
-#, python-brace-format
-msgid "Set open file limit to {integer}"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Set up an app build for a nightly build repo"
-msgstr ""
-
-#: ../fdroidserver/build.py
-msgid "Setting open file limit failed: "
-msgstr ""
-
-#: ../fdroidserver/build.py
-#, python-brace-format
-msgid "Setting {0} sec timeout for this build"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Sign and place packages in the repo"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Sign indexes created using update --nosign"
-msgstr ""
-
-#: ../fdroidserver/build.py
-msgid "Skip scanning the source code for binaries and other problems"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Skipping '{apkfilename}' with invalid signature!"
-msgstr ""
-
-#: ../fdroidserver/deploy.py ../fdroidserver/index.py
-#, python-format
-msgid "Skipping GitLab Pages mirror because the repo is too large (>%.2fGB)!"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Skipping index generation for {appid}"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Skipping {apkfilename} with invalid signature!"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Skipping {appid}: disabled"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "Specify a local folder to sync the repo to"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "Specify an identity file to provide to SSH for rsyncing"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-msgid "Specify which debug keystore file to use."
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Spew out even more information than normal"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-#, python-brace-format
-msgid "Stripping mystery signature from {apkfilename}"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-format
-msgid "Summary '%s' is just the app's name"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Summary of length {length} is over the {limit} char limit"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "System clock is older than date in {path}!"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "Tags update mode only works for git, hg, bzr and git-svn repositories currently"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "Tags update mode used in git-svn, but the repo was not set up with tags"
-msgstr ""
-
-#: ../fdroidserver/build.py
-msgid "Test mode - put output in the tmp directory only, and always build, even if the output already exists."
-msgstr ""
-
-#: ../fdroidserver/index.py
-msgid "The \"qrcode\" Python package is not installed (e.g. apt-get install python3-qrcode)!"
-msgstr ""
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "The OBB version code must come after \"{name}.\":"
-msgstr ""
-
-#: ../fdroidserver/btlog.py
-msgid "The base URL for the repo to log (default: https://f-droid.org)"
-msgstr ""
-
-#: ../fdroidserver/mirror.py
-msgid "The directory to write the mirror to"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-msgid "The file to be included in the repo (path or glob)"
-msgstr ""
-
-#: ../fdroidserver/index.py
-msgid "The repository's fingerprint does not match."
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "The root dir for local_copy_dir \"{path}\" does not exist!"
-msgstr ""
-
-#: ../fdroidserver/publish.py
-msgid "There is a keyalias collision - publishing halted"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "These are the apps that have been archived from the main repo."
-msgstr ""
-
-#: ../fdroidserver/mirror.py
-msgid "This command should never be used to mirror f-droid.org! A full copy requires more than 600GB."
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "This is a repository of apps to be used with F-Droid. Applications in this repository are either official binaries built by the original application developers, or are binaries built from source by the admin of f-droid.org using the tools on https://gitlab.com/fdroid."
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
-#, python-format
-msgid "This repo already has local metadata: %s"
-msgstr ""
-
-#: ../fdroidserver/init.py
-#, python-format
-msgid ""
-"To complete the setup, add your APKs to \"%s\"\n"
-"then run \"fdroid update -c; fdroid update\".  You might also want to edit\n"
-"\"config.yml\" to set the URL, repo name, and more.  You should also set up\n"
-"a signing key (a temporary one might have been automatically generated).\n"
-"\n"
-"For more info: https://f-droid.org/docs/Setup_an_F-Droid_App_Repo\n"
-"and https://f-droid.org/docs/Signing_Process"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "To use awsbucket, awssecretkey and awsaccesskeyid must also be set in config.yml!"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "To use rclone, rclone_config and awsbucket must be set in config.yml!"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "URL must start with https:// or http://"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "URL shorteners should not be used"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "URL {url} in Description: {error}"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Unexpected license tag \"{}\"! Only use FSF or OSI approved tags from https://spdx.org/license-list"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Unexpected license tag \"{}\"! Only use license tags configured in your config file"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Unknown entry {key} in {configname}"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Unknown exception found!"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Unknown file '{filename}' in build '{versionName}'"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-format
-msgid "Unknown metadata format: %s"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Unknown metadata format: {path} (use: *.yml)"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Unknown version of aapt, might cause problems: "
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Unnecessary leading space"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Unnecessary trailing space"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Unrecognised app field '{fieldname}' in '{path}'"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Unrecognised build flag '{build_flag}' in '{path}'"
-msgstr ""
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Unsupported file type \"{extension}\" for repo graphic"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Unsupported graphics file found: {path}"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-format
-msgid "Unused extlib at %s"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-format
-msgid "Unused file at %s"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-format
-msgid "Unused scandelete path: %s"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-format
-msgid "Unused scanignore path: %s"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Update repo information for new packages"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Update the binary transparency log for a URL"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "UpdateCheckData has invalid URL: {url}"
-msgstr ""
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "UpdateCheckData must match the version code as integer (\\d or [0-9]): {codeex}"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "UpdateCheckData must use HTTPS URL: {url}"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "UpdateCheckData not a valid URL: {url}"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "UpdateCheckMode is set but it looks like checkupdates hasn't been run yet."
-msgstr ""
-
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/lint.py
-msgid "UpdateCheckName is set to the known application ID, it can be removed"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Uploading {apkfilename} to androidobservatory.org"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Uploading {apkfilename} to virustotal"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Use /HEAD instead of /master or /main to point at a file in the default branch"
-msgstr ""
-
-#: ../fdroidserver/update.py
-msgid "Use `fdroid update -c` to create it."
-msgstr ""
-
-#: ../fdroidserver/build.py
-msgid "Use build server"
-msgstr ""
-
-#: ../fdroidserver/update.py
-msgid "Use date from APK instead of current time for newly added APKs"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Using \"{path}\" for configuring s3cmd."
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Using \"{path}\" for syncing with remote storage."
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Using APK Signature v2"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Using APK Signature v3"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Using JAR Signature"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Using Java's jarsigner, not recommended for verifying APKs! Use apksigner"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Using blank dictionary instead of contents of {path}!"
-msgstr ""
-
-#: ../fdroidserver/init.py
-#, python-brace-format
-msgid "Using existing keystore \"{path}\""
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Using rclone to sync with: {url}"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Using s3cmd to sync with: {url}"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Valid commands are:"
-msgstr ""
-
-#: ../fdroidserver/verify.py
-msgid "Verify against locally cached copy rather than redownloading."
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Verify the integrity of downloaded packages"
-msgstr ""
-
-#: ../fdroidserver/index.py
-msgid "Verifying index signature:"
-msgstr ""
-
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "Verifying package {path} with apksigner."
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "VirusTotal API key cannot upload files larger than 32MB, use {url} to upload {path}."
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-msgid "WARNING: only public git repos are supported!"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Warn about possible metadata errors"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "WebAssembly binary file"
-msgstr ""
-
-#: ../fdroidserver/update.py
-msgid "When configured for signed indexes, create only unsigned indexes at this stage"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "When linting the entire repository yamllint is disabled by default. This option forces yamllint regardless."
-msgstr ""
-
-#: ../fdroidserver/publish.py
-msgid "When signing or verifying fails, exit with an error code."
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "Would you like to download and install F-Droid.apk via adb? (YES/no)"
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "Would you like to download the app(s) from f-droid.org? (YES/no)"
-msgstr ""
-
-#: ../fdroidserver/init.py
-msgid "X.509 'Distinguished Name' used when generating keys"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "You can use ANDROID_HOME to set the path to your SDK, i.e.:"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "ZIP file archive"
-msgstr ""
-
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "adb reports {serial} is \"{status}\"!"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-#, python-brace-format
-msgid "adding IdentityFile to {path}"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "adding to {name}: {path}"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "ambiguous option: %(option)s could match %(matches)s"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "apksigner in build-tools;{version} passes APKs with invalid v3 signatures, ignoring."
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "apksigner not found! Cannot sign or verify modern APKs"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "apksigner not found, it's required for signing!"
-msgstr ""
-
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/checkupdates.py ../fdroidserver/lint.py
-#: ../fdroidserver/rewritemeta.py
-msgid "application ID of file to operate on"
-msgstr ""
-
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/build.py ../fdroidserver/install.py
-#: ../fdroidserver/publish.py ../fdroidserver/scanner.py
-#: ../fdroidserver/verify.py
-msgid "application ID with optional versionCode in the form APPID[:VERCODE]"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "archive_url needs to end with /archive"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "argument \"-\" with mode %r"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "argument %(argument_name)s: %(message)s"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-msgid "attempting bare SSH connection to test deploy key:"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "can not parse scrlib spec (not a string): '{}'"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "can't open '%(filename)s': %(error)s"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "can't open non-https url: '{};"
-msgstr ""
-
-#: ../fdroidserver/build.py
-#, python-brace-format
-msgid "cannot find required srclibs: \"{path}\""
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-msgid "cannot have multiple subparser arguments"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "cannot merge actions - two groups are named %r"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-msgid "cannot publish update, did you set the deploy key?"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-#, python-brace-format
-msgid "cloning {url}"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "commands from plugin modules:"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "conflicting option string: %s"
-msgid_plural "conflicting option strings: %s"
-msgstr[0] ""
-msgstr[1] ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "conflicting subparser alias: %s"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "conflicting subparser: %s"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "could not parse '{path}'"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "could not parse srclib spec (no name specified): '{}'"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "could not parse srclib spec (no ref specified): '{}'"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-#, python-brace-format
-msgid "created {path}"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "current version is newer: old vercode={old}, new vercode={new}"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "deleting: repo/{apkfilename}"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "dependency file without lock"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "deployed process log {path} to {dest}"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "dest= is required for options like %r"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "downloading '{}'"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "downloading scanner signatures from '{}' failed"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "executable binary, possibly code"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "expected %s argument"
-msgid_plural "expected %s arguments"
-msgstr[0] ""
-msgstr[1] ""
-
-#: /usr/lib/python3.11/argparse.py
-msgid "expected at least one argument"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-msgid "expected at most one argument"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-msgid "expected one argument"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "fdroid [<command>] [-h|--help|--version|<args>]"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "fetch the latest version of signatures from the web"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-msgid "force metadata errors (default) to be warnings, or to be ignored."
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "git svn clone failed"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "gzip file archive"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "ignored explicit argument %r"
-msgstr ""
-
-#: ../fdroidserver/index.py
-msgid "index-v1 must have a signature, use `fdroid signindex` to create it!"
-msgstr ""
-
-#: ../fdroidserver/index.py
-msgid "index-v2 must have a signature, use `fdroid signindex` to create it!"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "invalid %(type)s value: %(value)r"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "invalid choice: %(value)r (choose from %(choices)s)"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "invalid conflict_resolution value: %r"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "invalid option string %(option)r: must start with a character %(prefix_chars)r"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "ipfs_cid not found, skipping CIDv1 generation"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "latest build recipe is newer: old vercode={old}, new vercode={new}"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "local_copy_dir does not end with \"fdroid\", perhaps you meant: \"{path}\""
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "local_copy_dir must be an absolute path!"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "local_copy_dir must be directory, not a file!"
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-format
-msgid "mirror '%s' does not end with 'fdroid'!"
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "mirrors set twice, in config.yml and {path}!"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-msgid "mutually exclusive arguments must be optional"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "next {name} cache update due in {time}"
-msgstr ""
-
-#: ../fdroidserver/mirror.py
-#, python-brace-format
-msgid "no \"icon\" in {appid}"
-msgstr ""
-
-#: ../fdroidserver/signatures.py
-msgid "no APK supplied"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "no version information found"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "not allowed with argument %s"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "one of the arguments %s is required"
-msgstr ""
-
-#: ../fdroidserver/common.py ../fdroidserver/index.py
-msgid "only accepts strings, lists, and tuples"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-msgid "options"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-#, python-brace-format
-msgid "overwriting existing {path}"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-msgid "positional arguments"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "process log deploy {path} to {dest} failed!"
-msgstr ""
-
-#: ../fdroidserver/build.py
-msgid "reference binary missing signature"
-msgstr ""
-
-#: ../fdroidserver/signatures.py
-#, python-brace-format
-msgid "refuse downloading via insecure HTTP connection (use HTTPS or specify --no-https-check): {apkfilename}"
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-format
-msgid "repo_icon \"repo/icons/%s\" does not exist, generating placeholder."
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "repo_url needs to end with /repo"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "rsync is missing or broken: {error}"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "s3cmd sync indexes {path} to {url} and delete"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "s3cmd syncs indexes from {path} to {url} and deletes removed"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "scanner cache is malformed! You can clear it with: '{clear}'"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "serverwebroot: path does not end with \"fdroid\", perhaps you meant one of these:"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "shared library"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-msgid "show this help message and exit"
-msgstr ""
-
-#: ../fdroidserver/signatures.py
-msgid "signed APK, either a file-path or HTTPS URL."
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "skip deploying full build logs: log content is empty"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "skip deploying full build logs: not enabled in config"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "skipping source tarball: {path}"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "srclibs missing name and/or @"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "static library"
-msgstr ""
-
-#: ../fdroidserver/build.py
-#, python-brace-format
-msgid "supplied reference binary has allowed signer {signer}"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "the following arguments are required: %s"
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "true"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "unexpected option string: %s"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "unknown parser %(parser_name)r (choices: %(choices)s)"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "unrecognized arguments: %s"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "unsafe permissions on '{config_file}' (should be 0600)!"
-msgstr ""
-
-#: ../fdroidserver/__main__.py /usr/lib/python3.11/argparse.py
-msgid "usage: "
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "using Apache libcloud to sync with {url}"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "virustotal.com is rate limiting, waiting to retry..."
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "yes"
-msgstr ""
-
-#: ../fdroidserver/publish.py
-#, python-brace-format
-msgid "{0} app, {1} key aliases"
-msgid_plural "{0} apps, {1} key aliases"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{apkfilename} ({appid}) has no metadata!"
-msgstr ""
-
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{apkfilename}'s AndroidManifest.xml has a bad date: "
-msgstr ""
-
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{appid} does not have a name! Using application ID instead."
-msgstr ""
-
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{appid} from {path} is not a valid Android application ID!"
-msgstr ""
-
-#: ../fdroidserver/metadata.py ../fdroidserver/update.py
-#, python-brace-format
-msgid "{appid} from {path} is not a valid Java Package Name!"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{appid} has both APKs and files: {files}"
-msgstr ""
-
-#: ../fdroidserver/mirror.py
-#, python-brace-format
-msgid "{appid} is missing {name}"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "{appid}: Unknown extlib {path} in build '{versionName}'"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "{appid}: no builds specified, running on current source state"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "{appid}: {field} must be a '{type}', but it is a '{fieldtype}!'"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "{appid}: {field} must be a '{type}', but it is a '{fieldtype}'!"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "{build_flag} must be an integer, found: {value}"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "{build_flag} must be list or string, found: {value}"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "{file} is blank or corrupt!"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{name} \"{section}/icons/{path}\" does not exist! Check \"config.yml\"."
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{path1} is a duplicate of {path2}, remove one!"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
-#, python-brace-format
-msgid "{path} already exists, ignoring import results!"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-#, python-brace-format
-msgid "{path} does not exist!  Create it by running:"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{path} has bad file signature \"{pattern}\", possible Janus exploit!"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "{path} has been flagged by virustotal {count} times:"
-msgstr ""
-
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "{path} has the wrong fingerprint ({fingerprint})!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "{path} is not \"key: value\" dict, but a {datatype}!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "{path} is not a standard config file!"
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "{path} is not list, but a {datatype}!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "{path} is not {expected_type}, but a {datatype}!"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{path} is zero size!"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "{path} more than 200MB, manually upload: {url}"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "{path}: \"{code}\" is not a valid ISO_3166-1 alpha-2 country code!"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{path}: {error}"
-msgstr ""
-
-#: ../fdroidserver/mirror.py
-#, python-brace-format
-msgid "{url} does not end with \"fdroid\", check the URL path!"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
-#, python-brace-format
-msgid "{url} does not start with \"http\"!"
-msgstr ""
-
-#: ../fdroidserver/build.py
-msgid "{} build failed"
-msgid_plural "{} builds failed"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../fdroidserver/build.py
-msgid "{} build succeeded"
-msgid_plural "{} builds succeeded"
-msgstr[0] ""
-msgstr[1] ""
diff --git a/locale/bn/LC_MESSAGES/fdroidserver.po b/locale/bn/LC_MESSAGES/fdroidserver.po
index 44e14abf..4e58c37d 100644
--- a/locale/bn/LC_MESSAGES/fdroidserver.po
+++ b/locale/bn/LC_MESSAGES/fdroidserver.po
@@ -1,20 +1,36 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# Oymate <dhruboadittya96@gmail.com>, 2021.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: fdroidserver 1.0.6-70-g54bc858\n"
 "Report-Msgid-Bugs-To: https://gitlab.com/fdroid/fdroidserver/issues\n"
-"POT-Creation-Date: 2025-06-25 09:52+0200\n"
-"PO-Revision-Date: 2021-02-12 09:48+0000\n"
-"Last-Translator: Oymate <dhruboadittya96@gmail.com>\n"
-"Language-Team: Bengali <https://hosted.weblate.org/projects/f-droid/fdroidserver/bn/>\n"
+"POT-Creation-Date: 2020-10-21 18:05+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
 "Language: bn\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Generator: Weblate 4.5-dev\n"
+
+#: ../fdroidserver/common.py
+msgid ""
+"\n"
+"        This is a repository of apps to be used with FDroid. Applications in this\n"
+"        repository are either official binaries built by the original application\n"
+"        developers, or are binaries built from source by f-droid.org using the\n"
+"        tools on https://gitlab.com/fdroid.\n"
+"        "
+msgstr ""
+
+#: ../fdroidserver/nightly.py
+msgid ""
+"\n"
+"SSH Public Key to be used as Deploy Key:"
+msgstr ""
 
 #: ../fdroidserver/nightly.py
 msgid ""
@@ -34,26 +50,22 @@ msgstr ""
 msgid "\"%s/\" has no matching metadata file!"
 msgstr ""
 
-#: ../fdroidserver/index.py
-msgid "\"isPrimary\" key should not be added to mirrors!"
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "\"local_copy_dir\" {path} does not exist!"
-msgstr ""
-
 #: ../fdroidserver/install.py
 #, python-brace-format
 msgid "\"{apkfilename}\" is already installed on {dev}."
 msgstr ""
 
+#: ../fdroidserver/update.py
+#, python-brace-format
+msgid "\"{path}\" contains outdated {name} ({version})"
+msgstr ""
+
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "\"{path}\" contains recent {name} ({version})"
 msgstr ""
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "\"{path}\" exists but s3cmd is not installed!"
 msgstr ""
@@ -63,24 +75,33 @@ msgstr ""
 msgid "\"{path}\" is not a supported file format (use: metadata/*.yml)"
 msgstr ""
 
-#: ../fdroidserver/update.py
+#: ../fdroidserver/metadata.py
 #, python-brace-format
-msgid "\"{path}\" is signed by a key that is not allowed:"
+msgid "\"{path}\" is not an accepted format, convert to: {formats}"
 msgstr ""
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/common.py
 #, python-brace-format
 msgid "\"{url}\" is not a valid URL!"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, python-format
+msgid "%(option)s option requires %(number)d argument"
+msgid_plural "%(option)s option requires %(number)d arguments"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../fdroidserver/mirror.py
+#, python-format
+msgid "%(prog)s [options] url"
+msgstr ""
+
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "%(prog)s: error: %(message)s\n"
-msgstr "%(prog)s: ত্রুটি: %(message)s\n"
-
-#: ../fdroidserver/publish.py
-#, python-format
-msgid "%d APKs failed to be signed or verified!"
 msgstr ""
 
 #: ../fdroidserver/scanner.py
@@ -88,52 +109,63 @@ msgstr ""
 msgid "%d problems found"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "%prog [options]"
+msgstr ""
+
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "%r is not callable"
 msgstr ""
 
-#: ../fdroidserver/signindex.py
-#, python-format
-msgid "%s did not produce a dict!"
-msgstr ""
-
-#: ../fdroidserver/signindex.py
-#, python-format
-msgid "%s has bad SHA-256: %s"
-msgstr ""
-
 #: ../fdroidserver/lint.py
 #, python-format
 msgid "%s is not an accepted build field"
 msgstr ""
 
-#: ../fdroidserver/common.py
-msgid "'keypass' not found in config.yml!"
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, python-format
+msgid "%s option does not take a value"
+msgstr ""
+
+#: ../fdroidserver/index.py ../fdroidserver/common.py
+msgid "'keypass' not found in config.py!"
 msgstr ""
 
 #: ../fdroidserver/common.py
 msgid "'keystore' is NONE and 'smartcardoptions' is blank!"
 msgstr ""
 
-#: ../fdroidserver/common.py
-msgid "'keystore' not found in config.yml!"
+#: ../fdroidserver/index.py ../fdroidserver/common.py
+msgid "'keystore' not found in config.py!"
 msgstr ""
 
-#: ../fdroidserver/common.py
-msgid "'keystorepass' not found in config.yml!"
+#: ../fdroidserver/index.py ../fdroidserver/common.py
+msgid "'keystorepass' not found in config.py!"
 msgstr ""
 
-#: ../fdroidserver/common.py
-msgid "'repo_keyalias' not found in config.yml!"
+#: ../fdroidserver/index.py ../fdroidserver/common.py
+msgid "'repo_keyalias' not found in config.py!"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "'required' is an invalid argument for positionals"
 msgstr ""
 
 #: ../fdroidserver/common.py
-msgid "'sdk_path' not set in config.yml!"
+msgid "'sdk_path' not set in 'config.py'!"
+msgstr ""
+
+#. Translators: "build-tools" is the file name of a package from
+#. Google, it is part of the Android SDK. So it probably shouldn't be
+#. translated or transliterated.
+#: ../fdroidserver/common.py
+#, python-brace-format
+msgid "'{aapt}' is too old, fdroid requires build-tools-23.0.0 or newer!"
 msgstr ""
 
 #: ../fdroidserver/common.py
@@ -141,6 +173,21 @@ msgstr ""
 msgid "'{aapt}' is too old, fdroid requires build-tools-{version} or newer!"
 msgstr ""
 
+#: ../fdroidserver/install.py
+#, python-brace-format
+msgid "'{apkfilename}' is already installed on {dev}."
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "'{field}' in {linedesc} is obsolete, see docs for current fields:"
+msgstr ""
+
+#: ../fdroidserver/common.py
+#, python-brace-format
+msgid "'{field}' will be in random order! Use () or [] brackets if order is important!"
+msgstr ""
+
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "'{path}' failed to execute!"
@@ -148,32 +195,23 @@ msgstr ""
 
 #: ../fdroidserver/metadata.py
 #, python-brace-format
-msgid "'{path}' has invalid format, it should be a dictionary!"
-msgstr ""
-
-#: ../fdroidserver/lint.py ../fdroidserver/metadata.py
-#, python-brace-format
 msgid "'{value}' is not a valid {field} in {appid}. Regex pattern: {pattern}"
 msgstr ""
 
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "'{value}' is not a valid {field}, should be {pattern}"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "--merge-request only runs on a single appid!"
-msgstr ""
-
 #: ../fdroidserver/checkupdates.py
 #, python-brace-format
 msgid "...checkupdate failed for {appid} : {error}"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid ".__call__() not defined"
 msgstr ""
 
+#: ../fdroidserver/metadata.py
+msgid ".fdroid.txt is not supported!  Convert to .fdroid.yml or .fdroid.json."
+msgstr ""
+
 #: ../fdroidserver/lint.py
 msgid "/issues is missing"
 msgstr ""
@@ -182,13 +220,12 @@ msgstr ""
 msgid "A URL is required as an argument!"
 msgstr ""
 
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "APK signatures have different certificates in {path}:"
+#: ../fdroid ../fdroidserver/__main__.py
+msgid "Add PGP signatures using GnuPG for packages in repo"
 msgstr ""
 
-#: ../fdroidserver/__main__.py
-msgid "Add PGP signatures using GnuPG for packages in repo"
+#: ../fdroid ../fdroidserver/__main__.py
+msgid "Add a new application from its source code"
 msgstr ""
 
 #: ../fdroidserver/update.py
@@ -208,11 +245,7 @@ msgstr ""
 msgid "Alias of the repo signing key in the keystore"
 msgstr ""
 
-#: ../fdroidserver/build.py
-msgid "AllowedAPKSigningKeys missing but reference binary supplied"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "Allows a different revision (or git branch) to be specified for the initial import"
 msgstr ""
 
@@ -236,9 +269,13 @@ msgstr ""
 msgid "Android DEX code"
 msgstr ""
 
-#: ../fdroidserver/init.py
+#: ../fdroidserver/common.py ../fdroidserver/build.py
 #, python-brace-format
-msgid "Android SDK not found at {path}!"
+msgid "Android SDK '{path}' does not have '{dirname}' installed!"
+msgstr ""
+
+#: ../fdroidserver/common.py
+msgid "Android SDK not found!"
 msgstr ""
 
 #: ../fdroidserver/common.py
@@ -251,17 +288,16 @@ msgstr ""
 msgid "Android SDK path '{path}' is not a directory!"
 msgstr ""
 
+#. Translators: "build-tools" is the file name of a package from
+#. Google, it is part of the Android SDK. So it probably shouldn't be
+#. translated or transliterated.
 #: ../fdroidserver/common.py
 #, python-brace-format
-msgid "Android SDK tool {cmd} not found!"
+msgid "Android build-tools path '{path}' does not exist!"
 msgstr ""
 
-#: ../fdroidserver/lint.py
-msgid "App has Binaries but does not have corresponding AllowedAPKSigningKeys to pin certificate."
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "App has NoSourceSince or ArchivePolicy \"0 versions\" or 0 but AutoUpdateMode or UpdateCheckMode are not None"
+#: ../fdroidserver/update.py
+msgid "AndroidManifest.xml has no date"
 msgstr ""
 
 #: ../fdroidserver/lint.py
@@ -269,10 +305,6 @@ msgstr ""
 msgid "App is in '{repo}' but has a link to {url}"
 msgstr ""
 
-#: ../fdroidserver/lint.py
-msgid "App version has binary but does not have corresponding AllowedAPKSigningKeys to pin certificate."
-msgstr ""
-
 #: ../fdroidserver/lint.py
 msgid "Appending .git is not necessary"
 msgstr ""
@@ -282,27 +314,11 @@ msgstr ""
 msgid "Archiving {apkfilename} with invalid signature!"
 msgstr ""
 
-#: ../fdroidserver/lint.py
-msgid "AutoUpdateMode with UpdateCheckMode: HTTP must have a pattern."
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "Automatic no to all prompts."
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "Automatic yes to all prompts."
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "Bad entry type \"{mirrortype}\" in mirrors config: {mirror}"
-msgstr ""
-
 #: ../fdroidserver/mirror.py
 msgid "Base URL to mirror, can include the index signing key using the query string: ?fingerprint="
 msgstr ""
 
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "Branch '{branch}' used as commit in build '{versionName}'"
@@ -318,7 +334,7 @@ msgstr ""
 msgid "Broken symlink: {path}"
 msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Build a package from source"
 msgstr ""
 
@@ -338,24 +354,31 @@ msgstr ""
 msgid "Build only the latest version of each package"
 msgstr ""
 
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Build should have comma-separated versionName and versionCode, not \"{value}\", in {linedesc}"
+msgstr ""
+
 #: ../fdroidserver/init.py
 #, python-format
 msgid "Built repo based in \"%s\" with this config:"
 msgstr ""
 
-#: ../fdroidserver/checkupdates.py
-msgid "Can't auto-update app with no CurrentVersionCode"
-msgstr ""
-
 #: ../fdroidserver/build.py
 msgid "Can't build due to {} error while scanning"
 msgid_plural "Can't build due to {} errors while scanning"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../fdroidserver/common.py
+#: ../fdroidserver/vmtools.py
 #, python-brace-format
-msgid "Cannot read {path}: {error}"
+msgid "Cannot read \"{path}\"!"
+msgstr ""
+
+#. Translators: https://developer.android.com/studio/build/application-id
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Cannot resolve application ID {appid}"
 msgstr ""
 
 #: ../fdroidserver/rewritemeta.py
@@ -363,23 +386,25 @@ msgstr ""
 msgid "Cannot rewrite \"{path}\""
 msgstr ""
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
+#: ../fdroidserver/rewritemeta.py
+msgid "Cannot use --list and --to at the same time"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Cannot write \"{path}\", not an accepted format, use: {formats}"
+msgstr ""
+
 #: ../fdroidserver/lint.py
 #, python-format
 msgid "Categories '%s' is not valid"
 msgstr ""
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
 #: ../fdroidserver/lint.py
 msgid "Categories are not set"
 msgstr ""
 
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "Category \"{category}\" defined but not used for any apps!"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Check for updates to applications"
 msgstr ""
 
@@ -388,34 +413,33 @@ msgstr ""
 msgid "Checking archiving for {appid} - apks:{integer}, keepversions:{keep}, archapks:{arch}"
 msgstr ""
 
+#: ../fdroidserver/dscanner.py
+msgid "Clean after all scans have finished"
+msgstr ""
+
+#: ../fdroidserver/dscanner.py
+msgid "Clean before the scans start and rebuild the container"
+msgstr ""
+
+#: ../fdroidserver/dscanner.py
+msgid "Clean up all containers and then exit"
+msgstr ""
+
 #: ../fdroidserver/update.py
 msgid "Clean update - don't uses caches, reprocess all APKs"
 msgstr ""
 
-#: ../fdroidserver/common.py
-msgid "Color the log output"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "Comma separated list of categories."
 msgstr ""
 
-#: ../fdroidserver/__main__.py
-#, python-format
+#: ../fdroid ../fdroidserver/__main__.py
+#, c-format, python-format
 msgid "Command '%s' not recognised.\n"
-msgstr "'%s' কমান্ড চিনা যায়নি।\n"
+msgstr ""
 
 #: ../fdroidserver/checkupdates.py
 msgid "Commit changes"
-msgstr "পরিবর্তন জমা দাও"
-
-#: ../fdroidserver/checkupdates.py
-msgid "Commit changes, push, then make a merge request"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Conflicting \"{field}\" definitions between .yml and localized files:"
 msgstr ""
 
 #: ../fdroidserver/__main__.py
@@ -427,13 +451,11 @@ msgstr ""
 msgid "Could not find '{command}' on your system"
 msgstr ""
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "Could not find latest version code"
 msgstr ""
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "Could not find latest version name"
 msgstr ""
 
@@ -443,8 +465,7 @@ msgid "Could not find {path} to remove it"
 msgstr ""
 
 #: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Could not open APK {path} for analysis: "
+msgid "Could not open apk file for analysis"
 msgstr ""
 
 #: ../fdroidserver/common.py
@@ -452,16 +473,22 @@ msgstr ""
 msgid "Could not parse size \"{size}\", wrong type \"{type}\""
 msgstr ""
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/import_subcommand.py
+#. Translators: https://developer.android.com/studio/build/application-id
+#: ../fdroidserver/import.py
 msgid "Couldn't find Application ID"
 msgstr ""
 
-#: ../fdroidserver/checkupdates.py
-msgid "Couldn't find any version information"
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
+#: ../fdroidserver/import.py
+msgid "Couldn't find latest version code"
 msgstr ""
 
-#: ../fdroidserver/checkupdates.py
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
+#: ../fdroidserver/import.py
+msgid "Couldn't find latest version name"
+msgstr ""
+
+#: ../fdroidserver/import.py
 msgid "Couldn't find package ID"
 msgstr ""
 
@@ -469,26 +496,29 @@ msgstr ""
 msgid "Cowardily refusing to overwrite existing signing key setup!"
 msgstr ""
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/update.py
+msgid "Create a repo signing key in a keystore"
+msgstr ""
+
+#: ../fdroidserver/update.py
+msgid "Create skeleton metadata files that are missing"
+msgstr ""
+
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Created new container \"{name}\""
 msgstr ""
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Creating \"{path}\" for configuring s3cmd."
 msgstr ""
 
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Creating empty {config_file}"
-msgstr ""
-
 #: ../fdroidserver/publish.py
 msgid "Creating log directory"
 msgstr ""
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Creating new S3 bucket: {url}"
 msgstr ""
@@ -501,7 +531,8 @@ msgstr ""
 msgid "Creating signed index with this key (SHA256):"
 msgstr ""
 
-#: ../fdroidserver/publish.py ../fdroidserver/verify.py
+#: ../fdroidserver/import.py ../fdroidserver/verify.py
+#: ../fdroidserver/publish.py
 msgid "Creating temporary directory"
 msgstr ""
 
@@ -547,21 +578,16 @@ msgid "Description has a duplicate line"
 msgstr ""
 
 #: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Description of length {length} is over the {limit} char limit"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Did you mean config/{name}.yml?"
+#, python-format
+msgid "Description has a list (%s) but it isn't bulleted (*) nor numbered (#)"
 msgstr ""
 
 #: ../fdroidserver/lint.py
 #, python-brace-format
-msgid "Did you mean {code}?"
+msgid "Description of length {length} is over the {limit} char limit"
 msgstr ""
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "Do not add 'disable:' to the generated build entries"
 msgstr ""
 
@@ -586,20 +612,25 @@ msgstr ""
 msgid "Don't create a source tarball, useful when testing a build"
 msgstr ""
 
+#: ../fdroidserver/stats.py
+msgid "Don't do anything logs-related"
+msgstr ""
+
 #: ../fdroidserver/build.py
 msgid "Don't refresh the repository, useful when testing a build with no internet connection"
 msgstr ""
 
 #: ../fdroidserver/deploy.py ../fdroidserver/nightly.py
+#: ../fdroidserver/upload.py
 msgid "Don't use rsync checksums"
 msgstr ""
 
-#: ../fdroidserver/install.py
-msgid "Download F-Droid.apk using mirrors that leak less to the network"
+#: ../fdroid ../fdroidserver/__main__.py
+msgid "Download complete mirrors of small repos"
 msgstr ""
 
-#: ../fdroidserver/__main__.py
-msgid "Download complete mirrors of small repos"
+#: ../fdroidserver/stats.py
+msgid "Download logs we don't have"
 msgstr ""
 
 #: ../fdroidserver/common.py
@@ -613,12 +644,7 @@ msgstr ""
 
 #: ../fdroidserver/metadata.py
 #, python-brace-format
-msgid "Duplicate Anti-Feature declaration at {path} was ignored!"
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-format
-msgid "Duplicate entry \"%s\" in mirrors config!"
+msgid "Duplicate build recipe found for versionCode {versionCode} in {linedesc}"
 msgstr ""
 
 #: ../fdroidserver/lint.py
@@ -626,42 +652,27 @@ msgstr ""
 msgid "Duplicate link in '{field}': {url}"
 msgstr ""
 
-#: ../fdroidserver/common.py
-#, python-format
-msgid "ERROR: %(message)s"
+#: ../fdroid
+msgid "Dynamically scan APKs post build"
 msgstr ""
 
 #: ../fdroidserver/__main__.py
 msgid "ERROR: The \"server\" subcommand has been removed, use \"deploy\"!"
 msgstr ""
 
+#: ../fdroidserver/mirror.py
+msgid ""
+"ERROR: this command should never be used to mirror f-droid.org!\n"
+"A full mirror of f-droid.org requires more than 200GB."
+msgstr ""
+
 #: ../fdroidserver/nightly.py
 msgid "ERROR: unsupported CI type, patches welcome!"
 msgstr ""
 
-#: ../fdroidserver/nightly.py
-#, python-format
-msgid "ERROR: unsupported git host \"%s\", patches welcome!"
-msgstr ""
-
-#: ../fdroidserver/lint.py
+#: ../fdroidserver/metadata.py
 #, python-brace-format
-msgid "ERROR: {key} in {path} is not \"archive\" or \"repo\"!"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "ERROR: {key} not a valid key!"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "ERROR: {key}'s value should be of type {t}!"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "ERROR: {key}:{subkey} in {path} is not in allowed keys: {allowed_keys}!"
+msgid "Empty build flag at {linedesc}"
 msgstr ""
 
 #: ../fdroidserver/__main__.py
@@ -676,40 +687,20 @@ msgid ""
 "> "
 msgstr ""
 
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Environment variable {var} from {configname} is not set!"
+#: ../fdroidserver/deploy.py ../fdroidserver/checkupdates.py
+#: ../fdroidserver/upload.py
+#, python-format
+msgid "Error while attempting to publish log: %s"
 msgstr ""
 
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Environment variable {{env: {var}}} is not set!"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "Error deploying 'github_releases', {} not present. (You might need to run `fdroid update` first.)"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py ../fdroidserver/common.py
 msgid "Error while getting repo address"
 msgstr ""
 
-#: ../fdroidserver/scanner.py
-msgid "Exit with a non-zero code if problems were found"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Extract application metadata from a source repository"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Extract signatures from APKs"
 msgstr ""
 
-#: ../fdroidserver/install.py
-msgid "F-Droid.apk could not be downloaded from any known source!"
-msgstr ""
-
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Failed copying {path}: {error}"
@@ -730,23 +721,27 @@ msgstr ""
 msgid "Failed resizing {path}: {error}"
 msgstr ""
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/publish.py
+msgid "Failed to align application"
+msgstr ""
+
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Failed to create S3 bucket: {url}"
 msgstr ""
 
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Failed to get APK information, deleting {path}"
+#: ../fdroidserver/common.py
+msgid "Failed to get APK manifest information"
 msgstr ""
 
 #: ../fdroidserver/update.py
 #, python-brace-format
-msgid "Failed to get APK information, skipping {path}"
+msgid "Failed to get apk information, deleting {path}"
 msgstr ""
 
 #: ../fdroidserver/update.py
-msgid "Failed to get APK signing key fingerprint"
+#, python-brace-format
+msgid "Failed to get apk information, skipping {path}"
 msgstr ""
 
 #: ../fdroidserver/install.py
@@ -754,10 +749,14 @@ msgstr ""
 msgid "Failed to install '{apkfilename}' on {dev}: {error}"
 msgstr ""
 
-#: ../fdroidserver/common.py
+#: ../fdroidserver/publish.py ../fdroidserver/common.py
 msgid "Failed to sign application"
 msgstr ""
 
+#: ../fdroidserver/common.py
+msgid "Failed to zipalign application"
+msgstr ""
+
 #: ../fdroidserver/build.py
 #, python-brace-format
 msgid "Fetched buildserverid from VM: {buildserverid}"
@@ -773,11 +772,20 @@ msgstr ""
 msgid "File disappeared while processing it: {path}"
 msgstr ""
 
-#: ../fdroidserver/build.py ../fdroidserver/install.py
-#: ../fdroidserver/rewritemeta.py ../fdroidserver/scanner.py
-#: ../fdroidserver/update.py
+#: ../fdroidserver/verify.py ../fdroidserver/stats.py ../fdroidserver/update.py
+#: ../fdroidserver/rewritemeta.py ../fdroidserver/build.py
+#: ../fdroidserver/checkupdates.py ../fdroidserver/scanner.py
+#: ../fdroidserver/install.py
 msgid "Finished"
-msgstr "সম্পূর্ণ"
+msgstr ""
+
+#: ../fdroidserver/lint.py
+msgid "Flattr donation methods belong in the FlattrID flag"
+msgstr ""
+
+#: ../fdroidserver/lint.py
+msgid "Flattr donation methods belong in the FlattrID: field"
+msgstr ""
 
 #: ../fdroidserver/lint.py
 msgid "Forbidden HTML tags"
@@ -810,6 +818,7 @@ msgstr ""
 msgid "Found invalid appids in arguments"
 msgstr ""
 
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
 #: ../fdroidserver/common.py
 msgid "Found invalid versionCodes for some apps"
 msgstr ""
@@ -819,10 +828,6 @@ msgstr ""
 msgid "Found multiple JAR Signature Block Files in {path}"
 msgstr ""
 
-#: ../fdroidserver/common.py
-msgid "Found multiple Signer Certificates!"
-msgstr ""
-
 #: ../fdroidserver/metadata.py
 #, python-brace-format
 msgid "Found multiple metadata files for {appid}"
@@ -832,6 +837,11 @@ msgstr ""
 msgid "Found multiple signing certificates for repository."
 msgstr ""
 
+#: ../fdroidserver/update.py
+#, python-brace-format
+msgid "Found multiple signing certificates in {path}"
+msgstr ""
+
 #: ../fdroidserver/index.py
 msgid "Found no signing certificates for repository."
 msgstr ""
@@ -846,16 +856,6 @@ msgstr ""
 msgid "Found {apkfilename} at {url}"
 msgstr ""
 
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Found {count} problems in {filename}"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Found {count} warnings in {filename}"
-msgstr ""
-
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Generated skeleton metadata for {appid}"
@@ -874,21 +874,19 @@ msgstr ""
 msgid "Git fetch failed"
 msgstr ""
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
+#: ../fdroidserver/common.py
+msgid "Git remote set-head failed"
+msgstr ""
+
 #: ../fdroidserver/common.py
 #, python-format
 msgid "Git remote set-head failed: \"%s\""
 msgstr ""
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
 #: ../fdroidserver/common.py
 msgid "Git reset failed"
 msgstr ""
 
-#: ../fdroidserver/common.py
-msgid "Git submodule deinit failed"
-msgstr ""
-
 #: ../fdroidserver/common.py
 msgid "Git submodule sync failed"
 msgstr ""
@@ -920,16 +918,6 @@ msgstr ""
 msgid "Ignoring FUNDING.yml entry longer than 2048: %s"
 msgstr ""
 
-#: ../fdroidserver/update.py
-#, python-format
-msgid "Ignoring bad element in manifest: %s"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Ignoring deprecated {oldfile}, use {newfile}!"
-msgstr ""
-
 #: ../fdroidserver/index.py
 msgid "Ignoring package without metadata: "
 msgstr ""
@@ -939,6 +927,11 @@ msgstr ""
 msgid "Ignoring stale cache data for {apkfilename}"
 msgstr ""
 
+#: ../fdroidserver/rewritemeta.py
+#, python-brace-format
+msgid "Ignoring {ext} file at '{path}'"
+msgstr ""
+
 #: ../fdroidserver/update.py
 msgid "Include APKs that are signed with disabled algorithms like MD5"
 msgstr ""
@@ -955,25 +948,15 @@ msgstr ""
 msgid "Include the source tarballs in the mirror"
 msgstr ""
 
-#: ../fdroidserver/metadata.py
-#, python-format
-msgid "Including metadata from %s@%s"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Including metadata from {path}"
-msgstr ""
-
 #: ../fdroidserver/common.py
 msgid "Initialising submodules"
-msgstr "উপমডিউল শুরু করা হচ্ছে"
+msgstr ""
 
 #: ../fdroidserver/install.py
 msgid "Install all signed applications available"
 msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Install built packages on devices"
 msgstr ""
 
@@ -982,49 +965,76 @@ msgstr ""
 msgid "Installing %s..."
 msgstr ""
 
+#: ../fdroidserver/install.py
+#, python-format
+msgid "Installing %s…"
+msgstr ""
+
 #: ../fdroidserver/install.py
 #, python-brace-format
 msgid "Installing '{apkfilename}' on {dev}..."
 msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroidserver/install.py
+#, python-brace-format
+msgid "Installing '{apkfilename}' on {dev}…"
+msgstr ""
+
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Interact with the repo HTTP server"
 msgstr ""
 
 #: ../fdroidserver/update.py
 msgid "Invalid APK"
-msgstr "অবৈধ এপিকে"
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "Invalid AutoUpdateMode: {mode}"
 msgstr ""
 
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "Invalid UpdateCheckMode: {mode}"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
+#: ../fdroidserver/lint.py ../fdroidserver/checkupdates.py
 #, python-brace-format
 msgid "Invalid VercodeOperation: {field}"
 msgstr ""
 
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Invalid VercodeOperation: {invalid_ops}"
-msgstr ""
-
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "Invalid application ID {appid}"
 msgstr ""
 
+#: ../fdroidserver/metadata.py
+#, python-format
+msgid "Invalid boolean '%s'"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Invalid build flag at {line} in {linedesc}"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Invalid build format: {value} in {name}"
+msgstr ""
+
 #: ../fdroidserver/lint.py
 msgid "Invalid bulleted list"
 msgstr ""
 
+#: ../fdroidserver/lint.py
+#, python-format
+msgid "Invalid license tag \"%s\"! Use only tags from https://spdx.org/license-list"
+msgstr ""
+
+#: ../fdroidserver/lint.py
+msgid "Invalid link - use [http://foo.bar Link title] or [http://foo.bar]"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+#, python-format
+msgid "Invalid metadata in %s:%d"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+msgid "Invalid metadata in: "
+msgstr ""
+
 #: ../fdroidserver/common.py
 #, python-format
 msgid "Invalid name for published file: %s"
@@ -1032,7 +1042,7 @@ msgstr ""
 
 #: ../fdroidserver/common.py
 #, python-brace-format
-msgid "Invalid ndk: entry in build: \"{ndk}\""
+msgid "Invalid package name {0}"
 msgstr ""
 
 #: ../fdroidserver/common.py
@@ -1055,6 +1065,11 @@ msgstr ""
 msgid "Invalid srclib metadata: unknown key '{key}' in '{file}'"
 msgstr ""
 
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Invalid versionCode: \"{versionCode}\" is not an integer!"
+msgstr ""
+
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "JAR signature failed to verify: {path}"
@@ -1069,8 +1084,8 @@ msgstr ""
 msgid "Java JAR file"
 msgstr ""
 
-#: ../fdroidserver/mirror.py ../fdroidserver/publish.py
-#: ../fdroidserver/update.py
+#: ../fdroidserver/publish.py ../fdroidserver/update.py
+#: ../fdroidserver/mirror.py
 msgid "Java JDK not found! Install in standard location or set java_paths!"
 msgstr ""
 
@@ -1086,19 +1101,10 @@ msgstr ""
 msgid "Javascript in HTML src attributes"
 msgstr ""
 
-#: ../fdroidserver/build.py
-#, fuzzy, python-brace-format
-msgid "Keeping failed build \"{apkfilename}\""
-msgstr "{apkfilename} প্রক্রিয়ারত"
-
 #: ../fdroidserver/init.py
 msgid "Keystore for signing key:\t"
 msgstr ""
 
-#: ../fdroidserver/lint.py
-msgid "Known debug key is used in AllowedAPKSigningKeys: "
-msgstr ""
-
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "Last used commit '{commit}' looks like a tag, but UpdateCheckMode is '{ucm}'"
@@ -1108,8 +1114,12 @@ msgstr ""
 msgid "Liberapay donation methods belong in the Liberapay: field"
 msgstr ""
 
+#: ../fdroidserver/lint.py
+msgid "Liberapay donation methods belong in the LiberapayID flag"
+msgstr ""
+
 #: ../fdroidserver/rewritemeta.py
-msgid "List files that would be reformatted (dry run)"
+msgid "List files that would be reformatted"
 msgstr ""
 
 #: ../fdroidserver/lint.py
@@ -1128,16 +1138,6 @@ msgstr ""
 msgid "Malformed serverwebroot line:"
 msgstr ""
 
-#: ../fdroidserver/scanner.py
-#, python-format
-msgid "Max recursion depth in ZIP file reached: %s"
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "Mirror config for {url} contains \"isPrimary\" key!"
-msgstr ""
-
 #: ../fdroidserver/mirror.py
 msgid "Mirror the full repo and archive, all file types."
 msgstr ""
@@ -1146,29 +1146,30 @@ msgstr ""
 msgid "Missing output directory"
 msgstr ""
 
-#: ../fdroidserver/metadata.py
-msgid "Moving Anti-Features declarations to localized files:"
-msgstr ""
-
-#: ../fdroidserver/index.py
-msgid "Neither \"repo_pubkey\" nor \"keystorepass\" set in config.yml"
-msgstr ""
-
-#: ../fdroidserver/verify.py
+#: ../fdroidserver/lint.py
 #, python-format
-msgid "No APK for package: %s"
+msgid "Name '%s' is just the auto name - remove it"
+msgstr ""
+
+#: ../fdroidserver/common.py
+msgid "No 'config.py' found, using defaults."
 msgstr ""
 
 #: ../fdroidserver/common.py
 msgid "No Android SDK found!"
 msgstr ""
 
+#: ../fdroidserver/import.py
+msgid "No android or kivy project could be found. Specify --subdir?"
+msgstr ""
+
 #: ../fdroidserver/install.py
 msgid "No attached devices found"
 msgstr ""
 
-#: ../fdroidserver/install.py
-msgid "No devices found for `adb install`! Please plug one in."
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "No commit specified for {versionName} in {linedesc}"
 msgstr ""
 
 #: ../fdroidserver/index.py
@@ -1179,23 +1180,14 @@ msgstr ""
 msgid "No git submodules available"
 msgstr ""
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "No gradle project could be found. Specify --subdir?"
 msgstr ""
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py ../fdroidserver/common.py
 msgid "No information found."
 msgstr ""
 
-#: ../fdroidserver/checkupdates.py
-msgid "No matching tags found"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "No minimum SDK version found in {0}, using default (3)."
-msgstr ""
-
 #: ../fdroidserver/lint.py
 msgid "No need to specify that the app is Free Software"
 msgstr ""
@@ -1205,7 +1197,7 @@ msgid "No need to specify that the app is for Android"
 msgstr ""
 
 #: ../fdroidserver/deploy.py
-msgid "No option set! Edit your config.yml to set at least one of these:"
+msgid "No option set! Edit your config.py to set at least one of these:"
 msgstr ""
 
 #: ../fdroidserver/common.py
@@ -1214,14 +1206,14 @@ msgstr ""
 
 #: ../fdroidserver/install.py
 #, python-format
-msgid "No signed APK available for %s"
+msgid "No signed apk available for %s"
 msgstr ""
 
 #: ../fdroidserver/install.py
 msgid "No signed output directory - nothing to do"
 msgstr ""
 
-#: ../fdroidserver/common.py
+#: ../fdroidserver/update.py ../fdroidserver/common.py
 #, python-brace-format
 msgid "No signing certificates found in {path}"
 msgstr ""
@@ -1231,23 +1223,16 @@ msgstr ""
 msgid "No such package: %s"
 msgstr ""
 
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "No such versionCode {versionCode} for app {appid}"
 msgstr ""
 
-#: ../fdroidserver/checkupdates.py
-msgid "No tags found"
-msgstr ""
-
-#: ../fdroidserver/publish.py ../fdroidserver/verify.py
+#: ../fdroidserver/verify.py ../fdroidserver/publish.py
 msgid "No unsigned directory - nothing to do"
 msgstr ""
 
-#: ../fdroidserver/__main__.py
-msgid "No version information could be found."
-msgstr ""
-
 #: ../fdroidserver/common.py
 msgid "Not a valid size definition: \"{}\""
 msgstr ""
@@ -1262,9 +1247,10 @@ msgid "Nothing to do for {appid}."
 msgstr ""
 
 #: ../fdroidserver/init.py
-msgid "Now set these in config.yml:"
+msgid "Now set these in config.py:"
 msgstr ""
 
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "OBB file has newer versionCode({integer}) than any APK:"
@@ -1282,27 +1268,22 @@ msgstr ""
 msgid "Offline machine, skipping git mirror generation until `fdroid deploy`"
 msgstr ""
 
-#: ../fdroidserver/deploy.py
-msgid "One of the 'github_releases' config items is missing the 'packageNames' value. skipping ..."
+#: ../fdroidserver/common.py
+#, python-brace-format
+msgid "Old APK signature failed to verify: {path}"
 msgstr ""
 
-#: ../fdroidserver/deploy.py
-msgid "One of the 'github_releases' config items is missing the 'projectUrl' value. skipping ..."
+#: ../fdroid ../fdroidserver/__main__.py
+msgid "Old, deprecated name for fdroid deploy"
 msgstr ""
 
-#: ../fdroidserver/deploy.py
-msgid "One of the 'github_releases' config items is missing the 'token' value. skipping ..."
-msgstr ""
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Only PNG and JPEG are supported for graphics, found: {path}"
 msgstr ""
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/common.py
-msgid "Only accepts a single key \"env\""
+#: ../fdroidserver/checkupdates.py
+msgid "Only print differences with the Play Store"
 msgstr ""
 
 #: ../fdroidserver/checkupdates.py
@@ -1313,6 +1294,11 @@ msgstr ""
 msgid "OpenCollective donation methods belong in the OpenCollective: field"
 msgstr ""
 
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "Options"
+msgstr ""
+
 #: ../fdroidserver/verify.py
 msgid "Output JSON report to file named after APK."
 msgstr ""
@@ -1321,22 +1307,26 @@ msgstr ""
 msgid "Output JSON to stdout."
 msgstr ""
 
-#: ../fdroidserver/checkupdates.py ../fdroidserver/gpgsign.py
-#: ../fdroidserver/publish.py ../fdroidserver/signindex.py
-#: ../fdroidserver/update.py
+#: ../fdroidserver/gpgsign.py ../fdroidserver/publish.py
+#: ../fdroidserver/update.py ../fdroidserver/signindex.py
+#: ../fdroidserver/checkupdates.py
 msgid "Outputting JSON"
 msgstr ""
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "Overall license of the project."
 msgstr ""
 
+#: ../fdroidserver/dscanner.py
+msgid "Override path for repo APKs (default: ./repo)"
+msgstr ""
+
 #: ../fdroidserver/index.py
 #, python-brace-format
 msgid "Overriding blank versionName in {apkfilename} from metadata: {version}"
 msgstr ""
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 #, python-brace-format
 msgid "Package \"{appid}\" already exists"
 msgstr ""
@@ -1350,10 +1340,13 @@ msgstr ""
 msgid "Password required with username"
 msgstr ""
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "Path to main Android project subdirectory, if not in root."
 msgstr ""
 
+msgid "Path to main android project subdirectory, if not in root."
+msgstr ""
+
 #: ../fdroidserver/init.py
 msgid "Path to the Android SDK (sometimes set in ANDROID_HOME)"
 msgstr ""
@@ -1366,18 +1359,20 @@ msgstr ""
 msgid "Path to the keystore for the repo signing key"
 msgstr ""
 
+#: ../fdroidserver/dscanner.py
+msgid "Prepare Drozer to run a scan"
+msgstr ""
+
+msgid "Prepare drozer to run a scan"
+msgstr ""
+
 #: ../fdroidserver/nightly.py
 msgid "Print the secret variable to the terminal for easy copy/paste"
 msgstr ""
 
-#: ../fdroidserver/install.py
+#: ../fdroidserver/metadata.py
 #, python-brace-format
-msgid "Privacy mode was enabled based on your locale ({country_code})."
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-format
-msgid "Problem with ZIP file: %s, error %s"
+msgid "Problem with description of {appid}: {error}"
 msgstr ""
 
 #: ../fdroidserver/common.py
@@ -1387,23 +1382,27 @@ msgstr ""
 
 #: ../fdroidserver/checkupdates.py
 msgid "Process auto-updates"
-msgstr "স্বয়ংক্রিয়-হালনাগাদ প্রক্রিয়া করো"
+msgstr ""
 
 #: ../fdroidserver/publish.py ../fdroidserver/update.py
 #, python-brace-format
 msgid "Processing {apkfilename}"
-msgstr "{apkfilename} প্রক্রিয়ারত"
+msgstr ""
 
 #: ../fdroidserver/checkupdates.py ../fdroidserver/scanner.py
 #, python-brace-format
 msgid "Processing {appid}"
-msgstr "{appid} প্রক্রিয়ারত"
+msgstr ""
 
 #: ../fdroidserver/update.py
 msgid "Produce human-readable XML/JSON for index files"
 msgstr ""
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/update.py
+msgid "Produce human-readable index.xml"
+msgstr ""
+
+#: ../fdroidserver/import.py
 msgid "Project URL to import from."
 msgstr ""
 
@@ -1415,25 +1414,21 @@ msgstr ""
 msgid "Push the log to this git remote repository"
 msgstr ""
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Pushing binary transparency log to {url}"
 msgstr ""
 
-#: ../fdroidserver/deploy.py
-msgid "Pushing to remote server failed!"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Pushing to {url}"
 msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Quickly start a new repository"
 msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Read all the metadata files and exit"
 msgstr ""
 
@@ -1444,12 +1439,14 @@ msgstr ""
 
 #: ../fdroidserver/common.py
 #, python-brace-format
-msgid "Reading packageName/versionCode/versionName failed, APK invalid: '{apkfilename}'"
+msgid "Reading minSdkVersion failed: \"{apkfilename}\""
 msgstr ""
 
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
+#. https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
 #: ../fdroidserver/common.py
 #, python-brace-format
-msgid "Reading packageName/versionCode/versionName failed,APK invalid: '{apkfilename}'"
+msgid "Reading packageName/versionCode/versionName failed, APK invalid: '{apkfilename}'"
 msgstr ""
 
 #: ../fdroidserver/update.py
@@ -1457,35 +1454,24 @@ msgstr ""
 msgid "Reading {apkfilename} from cache"
 msgstr ""
 
-#: ../fdroidserver/build.py
-msgid "Refresh and cache scanner rules and signatures from the network"
-msgstr ""
-
-#: ../fdroidserver/publish.py
-#, python-brace-format
-msgid "Refusing to sign '{path}', file exists in both {dir1} and {dir2} folder."
-msgstr ""
-
-#: ../fdroidserver/verify.py
-msgid "Remove source tarball and any APKs if successfully verified."
+#: ../fdroidserver/stats.py
+msgid "Recalculate aggregate stats - use when changes have been made that would invalidate old cached data."
 msgstr ""
 
 #: ../fdroidserver/common.py
 msgid "Removing specified files"
 msgstr ""
 
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Removing {path}\""
-msgstr ""
-
 #: ../fdroidserver/update.py
 msgid "Rename APK files that do not match package.name_123.apk"
 msgstr ""
 
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "RepoType {type} is deprecated, please switch to git."
+#: ../fdroidserver/update.py
+msgid "Report on build data status"
+msgstr ""
+
+#: ../fdroidserver/build.py
+msgid "Reset and create a brand new build server, even if the existing one appears to be ok."
 msgstr ""
 
 #: ../fdroidserver/nightly.py
@@ -1501,13 +1487,12 @@ msgstr ""
 msgid "Restrict output to warnings and errors"
 msgstr ""
 
-#: ../fdroidserver/net.py
-#, python-format
-msgid "Retrying failed download: %s"
+#: ../fdroid ../fdroidserver/__main__.py
+msgid "Rewrite all the metadata files"
 msgstr ""
 
-#: ../fdroidserver/__main__.py
-msgid "Rewrite all the metadata files"
+#: ../fdroidserver/rewritemeta.py
+msgid "Rewrite to a specific format: "
 msgstr ""
 
 #: ../fdroidserver/rewritemeta.py
@@ -1515,20 +1500,20 @@ msgstr ""
 msgid "Rewriting '{appid}'"
 msgstr ""
 
-#: ../fdroidserver/checkupdates.py
-msgid "Run on git repo that has uncommitted changes"
+#: ../fdroidserver/rewritemeta.py
+#, python-brace-format
+msgid "Rewriting '{appid}' to '{path}'"
 msgstr ""
 
-#: ../fdroidserver/nightly.py
-#, python-brace-format
-msgid "Run over {cibase} to find -debug.apk. and skip repo_basedir {repo_basedir}"
+#: ../fdroidserver/checkupdates.py
+msgid "Run on git repo that has uncommitted changes"
 msgstr ""
 
 #: ../fdroidserver/lint.py
 msgid "Run rewritemeta to fix formatting"
 msgstr ""
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 msgid "Running first pass with MD5 checking disabled"
 msgstr ""
 
@@ -1537,24 +1522,18 @@ msgstr ""
 msgid "Running wget in {path}"
 msgstr ""
 
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "SHA-256 of {url} does not match entry!"
+#: ../fdroidserver/dscanner.py
+msgid "Scan only the latest version of each package"
 msgstr ""
 
 #: ../fdroidserver/build.py
 msgid "Scan the resulting APK(s) for known non-free classes."
 msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Scan the source code of a package"
 msgstr ""
 
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Scanner found {count} problems in {apk}"
-msgstr ""
-
 #: ../fdroidserver/scanner.py
 #, python-brace-format
 msgid "Scanner found {count} problems in {appid}:"
@@ -1571,19 +1550,6 @@ msgid_plural "Scanner found {} problems"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../fdroidserver/scanner.py
-msgid "Scanning APK for extra signing blocks."
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "Scanning APK with dexdump for known non-free classes."
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Set NDK {release} ({version}) up"
-msgstr ""
-
 #: ../fdroidserver/common.py
 msgid "Set clock to that time using:"
 msgstr ""
@@ -1597,7 +1563,7 @@ msgstr ""
 msgid "Set open file limit to {integer}"
 msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Set up an app build for a nightly build repo"
 msgstr ""
 
@@ -1610,11 +1576,18 @@ msgstr ""
 msgid "Setting {0} sec timeout for this build"
 msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroidserver/build.py
+msgid "Setup an emulator, install the APK on it and perform a Drozer scan"
+msgstr ""
+
+msgid "Setup an emulator, install the apk on it and perform a drozer scan"
+msgstr ""
+
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Sign and place packages in the repo"
 msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Sign indexes created using update --nosign"
 msgstr ""
 
@@ -1627,11 +1600,6 @@ msgstr ""
 msgid "Skipping '{apkfilename}' with invalid signature!"
 msgstr ""
 
-#: ../fdroidserver/deploy.py ../fdroidserver/index.py
-#, python-format
-msgid "Skipping GitLab Pages mirror because the repo is too large (>%.2fGB)!"
-msgstr ""
-
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Skipping index generation for {appid}"
@@ -1647,14 +1615,23 @@ msgstr ""
 msgid "Skipping {appid}: disabled"
 msgstr ""
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/scanner.py
+#, python-brace-format
+msgid "Skipping {appid}: no builds specified"
+msgstr ""
+
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 msgid "Specify a local folder to sync the repo to"
 msgstr ""
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 msgid "Specify an identity file to provide to SSH for rsyncing"
 msgstr ""
 
+#: ../fdroidserver/build.py
+msgid "Specify that we're running on the build server"
+msgstr ""
+
 #: ../fdroidserver/nightly.py
 msgid "Specify which debug keystore file to use."
 msgstr ""
@@ -1663,6 +1640,11 @@ msgstr ""
 msgid "Spew out even more information than normal"
 msgstr ""
 
+#: ../fdroidserver/nightly.py
+#, python-brace-format
+msgid "Striping mystery signature from {apkfilename}"
+msgstr ""
+
 #: ../fdroidserver/nightly.py
 #, python-brace-format
 msgid "Stripping mystery signature from {apkfilename}"
@@ -1683,22 +1665,10 @@ msgstr ""
 msgid "System clock is older than date in {path}!"
 msgstr ""
 
-#: ../fdroidserver/checkupdates.py
-msgid "Tags update mode only works for git, hg, bzr and git-svn repositories currently"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "Tags update mode used in git-svn, but the repo was not set up with tags"
-msgstr ""
-
 #: ../fdroidserver/build.py
 msgid "Test mode - put output in the tmp directory only, and always build, even if the output already exists."
 msgstr ""
 
-#: ../fdroidserver/index.py
-msgid "The \"qrcode\" Python package is not installed (e.g. apt-get install python3-qrcode)!"
-msgstr ""
-
 #. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
 #: ../fdroidserver/update.py
 #, python-brace-format
@@ -1717,10 +1687,18 @@ msgstr ""
 msgid "The file to be included in the repo (path or glob)"
 msgstr ""
 
+#: ../fdroidserver/deploy.py
+msgid "The only commands currently supported are 'init' and 'update'"
+msgstr ""
+
 #: ../fdroidserver/index.py
 msgid "The repository's fingerprint does not match."
 msgstr ""
 
+#: ../fdroidserver/common.py
+msgid "The repository's index could not be verified."
+msgstr ""
+
 #: ../fdroidserver/deploy.py
 #, python-brace-format
 msgid "The root dir for local_copy_dir \"{path}\" does not exist!"
@@ -1734,37 +1712,13 @@ msgstr ""
 msgid "These are the apps that have been archived from the main repo."
 msgstr ""
 
-#: ../fdroidserver/mirror.py
-msgid "This command should never be used to mirror f-droid.org! A full copy requires more than 600GB."
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "This is a repository of apps to be used with F-Droid. Applications in this repository are either official binaries built by the original application developers, or are binaries built from source by the admin of f-droid.org using the tools on https://gitlab.com/fdroid."
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 #, python-format
 msgid "This repo already has local metadata: %s"
 msgstr ""
 
-#: ../fdroidserver/init.py
-#, python-format
-msgid ""
-"To complete the setup, add your APKs to \"%s\"\n"
-"then run \"fdroid update -c; fdroid update\".  You might also want to edit\n"
-"\"config.yml\" to set the URL, repo name, and more.  You should also set up\n"
-"a signing key (a temporary one might have been automatically generated).\n"
-"\n"
-"For more info: https://f-droid.org/docs/Setup_an_F-Droid_App_Repo\n"
-"and https://f-droid.org/docs/Signing_Process"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "To use awsbucket, awssecretkey and awsaccesskeyid must also be set in config.yml!"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "To use rclone, rclone_config and awsbucket must be set in config.yml!"
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
+msgid "To use awsbucket, awssecretkey and awsaccesskeyid must also be set in config.py!"
 msgstr ""
 
 #: ../fdroidserver/lint.py
@@ -1775,6 +1729,10 @@ msgstr ""
 msgid "URL shorteners should not be used"
 msgstr ""
 
+#: ../fdroidserver/metadata.py
+msgid "URL title is just the URL, use brackets: [URL]"
+msgstr ""
+
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "URL {url} in Description: {error}"
@@ -1788,15 +1746,16 @@ msgstr ""
 msgid "Unexpected license tag \"{}\"! Only use license tags configured in your config file"
 msgstr ""
 
-#: ../fdroidserver/common.py
+#: ../fdroidserver/metadata.py
 #, python-brace-format
-msgid "Unknown entry {key} in {configname}"
+msgid "Unexpected text on same line as {field} in {linedesc}"
 msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Unknown exception found!"
-msgstr "অজানা ব্যতিক্রম পাওয়া গেছে!"
+msgstr ""
 
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "Unknown file '{filename}' in build '{versionName}'"
@@ -1807,6 +1766,11 @@ msgstr ""
 msgid "Unknown metadata format: %s"
 msgstr ""
 
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Unknown metadata format: {path}"
+msgstr ""
+
 #: ../fdroidserver/metadata.py
 #, python-brace-format
 msgid "Unknown metadata format: {path} (use: *.yml)"
@@ -1816,6 +1780,10 @@ msgstr ""
 msgid "Unknown version of aapt, might cause problems: "
 msgstr ""
 
+#: ../fdroidserver/lint.py
+msgid "Unlinkified link - use [http://foo.bar Link title] or [http://foo.bar]"
+msgstr ""
+
 #: ../fdroidserver/lint.py
 msgid "Unnecessary leading space"
 msgstr ""
@@ -1829,12 +1797,20 @@ msgstr ""
 msgid "Unrecognised app field '{fieldname}' in '{path}'"
 msgstr ""
 
+#: ../fdroidserver/metadata.py
+msgid "Unrecognised app field: "
+msgstr ""
+
 #: ../fdroidserver/metadata.py
 #, python-brace-format
 msgid "Unrecognised build flag '{build_flag}' in '{path}'"
 msgstr ""
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Unrecognised field '{field}' in {linedesc}"
+msgstr ""
+
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Unsupported file type \"{extension}\" for repo graphic"
@@ -1845,6 +1821,29 @@ msgstr ""
 msgid "Unsupported graphics file found: {path}"
 msgstr ""
 
+#: ../fdroidserver/rewritemeta.py
+#, python-brace-format
+msgid "Unsupported metadata format, use: --to [{supported}]"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+msgid "Unterminated ]"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+msgid "Unterminated ]]"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Unterminated build in {name}"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Unterminated continuation in {name}"
+msgstr ""
+
 #: ../fdroidserver/lint.py
 #, python-format
 msgid "Unused extlib at %s"
@@ -1865,25 +1864,27 @@ msgstr ""
 msgid "Unused scanignore path: %s"
 msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Update repo information for new packages"
 msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Update the binary transparency log for a URL"
 msgstr ""
 
+#: ../fdroid ../fdroidserver/__main__.py
+msgid "Update the stats of the repo"
+msgstr ""
+
+#: ../fdroidserver/update.py ../fdroidserver/build.py
+msgid "Update the wiki"
+msgstr ""
+
 #: ../fdroidserver/checkupdates.py
 #, python-brace-format
 msgid "UpdateCheckData has invalid URL: {url}"
 msgstr ""
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "UpdateCheckData must match the version code as integer (\\d or [0-9]): {codeex}"
-msgstr ""
-
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "UpdateCheckData must use HTTPS URL: {url}"
@@ -1895,10 +1896,14 @@ msgid "UpdateCheckData not a valid URL: {url}"
 msgstr ""
 
 #: ../fdroidserver/lint.py
-msgid "UpdateCheckMode is set but it looks like checkupdates hasn't been run yet."
+msgid "UpdateCheckMode is set but it looks like checkupdates hasn't been run yet"
+msgstr ""
+
+#. Translators: https://developer.android.com/studio/build/application-id
+#: ../fdroidserver/lint.py
+msgid "UpdateCheckName is set to the known application ID - it can be removed"
 msgstr ""
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
 #: ../fdroidserver/lint.py
 msgid "UpdateCheckName is set to the known application ID, it can be removed"
 msgstr ""
@@ -1913,8 +1918,19 @@ msgstr ""
 msgid "Uploading {apkfilename} to virustotal"
 msgstr ""
 
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "Usage"
+msgstr ""
+
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, python-format
+msgid "Usage: %s\n"
+msgstr ""
+
 #: ../fdroidserver/lint.py
-msgid "Use /HEAD instead of /master or /main to point at a file in the default branch"
+msgid "Use /HEAD instead of /master to point at a file in the default branch"
 msgstr ""
 
 #: ../fdroidserver/update.py
@@ -1929,14 +1945,12 @@ msgstr ""
 msgid "Use date from APK instead of current time for newly added APKs"
 msgstr ""
 
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Using \"{path}\" for configuring s3cmd."
+msgid "Use date from apk instead of current time for newly added apks"
 msgstr ""
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
-msgid "Using \"{path}\" for syncing with remote storage."
+msgid "Using \"{path}\" for configuring s3cmd."
 msgstr ""
 
 #: ../fdroidserver/common.py
@@ -1947,17 +1961,13 @@ msgstr ""
 msgid "Using APK Signature v3"
 msgstr ""
 
-#: ../fdroidserver/common.py
-msgid "Using JAR Signature"
-msgstr ""
-
 #: ../fdroidserver/common.py
 msgid "Using Java's jarsigner, not recommended for verifying APKs! Use apksigner"
 msgstr ""
 
-#: ../fdroidserver/metadata.py
+#: ../fdroidserver/common.py
 #, python-brace-format
-msgid "Using blank dictionary instead of contents of {path}!"
+msgid "Using androguard from \"{path}\""
 msgstr ""
 
 #: ../fdroidserver/init.py
@@ -1965,25 +1975,20 @@ msgstr ""
 msgid "Using existing keystore \"{path}\""
 msgstr ""
 
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Using rclone to sync with: {url}"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Using s3cmd to sync with: {url}"
 msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Valid commands are:"
-msgstr "বৈধ কমান্ড হলো:"
+msgstr ""
 
 #: ../fdroidserver/verify.py
 msgid "Verify against locally cached copy rather than redownloading."
 msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Verify the integrity of downloaded packages"
 msgstr ""
 
@@ -1991,28 +1996,15 @@ msgstr ""
 msgid "Verifying index signature:"
 msgstr ""
 
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "Verifying package {path} with apksigner."
-msgstr ""
-
 #: ../fdroidserver/deploy.py
 #, python-brace-format
 msgid "VirusTotal API key cannot upload files larger than 32MB, use {url} to upload {path}."
 msgstr ""
 
-#: ../fdroidserver/nightly.py
-msgid "WARNING: only public git repos are supported!"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Warn about possible metadata errors"
 msgstr ""
 
-#: ../fdroidserver/scanner.py
-msgid "WebAssembly binary file"
-msgstr ""
-
 #: ../fdroidserver/update.py
 msgid "When configured for signed indexes, create only unsigned indexes at this stage"
 msgstr ""
@@ -2021,16 +2013,7 @@ msgstr ""
 msgid "When linting the entire repository yamllint is disabled by default. This option forces yamllint regardless."
 msgstr ""
 
-#: ../fdroidserver/publish.py
-msgid "When signing or verifying fails, exit with an error code."
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "Would you like to download and install F-Droid.apk via adb? (YES/no)"
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "Would you like to download the app(s) from f-droid.org? (YES/no)"
+msgid "X.509 'Distiguished Name' used when generating keys"
 msgstr ""
 
 #: ../fdroidserver/init.py
@@ -2045,11 +2028,6 @@ msgstr ""
 msgid "ZIP file archive"
 msgstr ""
 
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "adb reports {serial} is \"{status}\"!"
-msgstr ""
-
 #: ../fdroidserver/nightly.py
 #, python-brace-format
 msgid "adding IdentityFile to {path}"
@@ -2060,66 +2038,70 @@ msgstr ""
 msgid "adding to {name}: {path}"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "ambiguous option: %(option)s could match %(matches)s"
 msgstr ""
 
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "apksigner in build-tools;{version} passes APKs with invalid v3 signatures, ignoring."
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "apksigner not found! Cannot sign or verify modern APKs"
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, python-format
+msgid "ambiguous option: %s (%s?)"
 msgstr ""
 
 #: ../fdroidserver/common.py
 msgid "apksigner not found, it's required for signing!"
 msgstr ""
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/checkupdates.py ../fdroidserver/lint.py
-#: ../fdroidserver/rewritemeta.py
+#: ../fdroidserver/lint.py ../fdroidserver/rewritemeta.py
+#: ../fdroidserver/checkupdates.py
 msgid "application ID of file to operate on"
 msgstr ""
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/build.py ../fdroidserver/install.py
-#: ../fdroidserver/publish.py ../fdroidserver/scanner.py
-#: ../fdroidserver/verify.py
+#: ../fdroidserver/verify.py ../fdroidserver/publish.py
+#: ../fdroidserver/build.py ../fdroidserver/scanner.py
+#: ../fdroidserver/install.py
 msgid "application ID with optional versionCode in the form APPID[:VERCODE]"
 msgstr ""
 
-#: ../fdroidserver/common.py
-msgid "archive_url needs to end with /archive"
+#: ../fdroidserver/lint.py ../fdroidserver/rewritemeta.py
+msgid "applicationId in the form APPID"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: ../fdroidserver/checkupdates.py
+msgid "applicationId to check for updates"
+msgstr ""
+
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
+#: ../fdroidserver/verify.py ../fdroidserver/publish.py
+#: ../fdroidserver/dscanner.py ../fdroidserver/build.py
+#: ../fdroidserver/scanner.py ../fdroidserver/install.py
+msgid "applicationId with optional versionCode in the form APPID[:VERCODE]"
+msgstr ""
+
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "argument \"-\" with mode %r"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "argument %(argument_name)s: %(message)s"
-msgstr ""
-
 #: ../fdroidserver/nightly.py
 msgid "attempting bare SSH connection to test deploy key:"
 msgstr ""
 
+#: ../fdroidserver/nightly.py
+msgid "attempting bare ssh connection to test deploy key:"
+msgstr ""
+
 #: ../fdroidserver/common.py
 msgid "can not parse scrlib spec (not a string): '{}'"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
-msgid "can't open '%(filename)s': %(error)s"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "can't open non-https url: '{};"
+msgid "can't open '%s': %s"
 msgstr ""
 
 #: ../fdroidserver/build.py
@@ -2127,11 +2109,13 @@ msgstr ""
 msgid "cannot find required srclibs: \"{path}\""
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "cannot have multiple subparser arguments"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "cannot merge actions - two groups are named %r"
 msgstr ""
@@ -2145,25 +2129,30 @@ msgstr ""
 msgid "cloning {url}"
 msgstr ""
 
+#: ../fdroidserver/deploy.py
+msgid "command to execute, either 'init' or 'update'"
+msgstr ""
+
 #: ../fdroidserver/__main__.py
 msgid "commands from plugin modules:"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "complex"
+msgstr ""
+
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "conflicting option string: %s"
 msgid_plural "conflicting option strings: %s"
 msgstr[0] ""
 msgstr[1] ""
 
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "conflicting subparser alias: %s"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "conflicting subparser: %s"
+#: ../fdroidserver/nightly.py
+#, python-brace-format
+msgid "copying {apkfilename} into {path}"
 msgstr ""
 
 #: ../fdroidserver/metadata.py
@@ -2172,11 +2161,11 @@ msgid "could not parse '{path}'"
 msgstr ""
 
 #: ../fdroidserver/common.py
-msgid "could not parse srclib spec (no name specified): '{}'"
+msgid "could not parse srclib spec (no ref specified): '{}'"
 msgstr ""
 
 #: ../fdroidserver/common.py
-msgid "could not parse srclib spec (no ref specified): '{}'"
+msgid "could not parse srclib spec (too many '@' signs): '{}'"
 msgstr ""
 
 #: ../fdroidserver/nightly.py
@@ -2184,18 +2173,14 @@ msgstr ""
 msgid "created {path}"
 msgstr ""
 
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "current version is newer: old vercode={old}, new vercode={new}"
-msgstr ""
-
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "deleting: repo/{apkfilename}"
 msgstr ""
 
-#: ../fdroidserver/scanner.py
-msgid "dependency file without lock"
+#: ../fdroidserver/common.py
+#, python-brace-format
+msgid "deployed build logs to '{path}'"
 msgstr ""
 
 #: ../fdroidserver/common.py
@@ -2203,48 +2188,59 @@ msgstr ""
 msgid "deployed process log {path} to {dest}"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "dest= is required for options like %r"
 msgstr ""
 
-#: ../fdroidserver/scanner.py
-msgid "downloading '{}'"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "downloading scanner signatures from '{}' failed"
-msgstr ""
-
 #: ../fdroidserver/scanner.py
 msgid "executable binary, possibly code"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "expected %s argument"
 msgid_plural "expected %s arguments"
 msgstr[0] ""
 msgstr[1] ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "expected at least one argument"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "expected at most one argument"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "expected one argument"
 msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroidserver/common.py
+#, python-brace-format
+msgid "failed deploying build logs to '{path}'"
+msgstr ""
+
+#: ../fdroid
+msgid "fdroid [-h|--help|--version] <command> [<args>]"
+msgstr ""
+
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "fdroid [<command>] [-h|--help|--version|<args>]"
 msgstr ""
 
-#: ../fdroidserver/scanner.py
-msgid "fetch the latest version of signatures from the web"
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "floating-point"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+msgid "force errors to be warnings, or ignore"
 msgstr ""
 
 #: ../fdroidserver/metadata.py
@@ -2259,7 +2255,8 @@ msgstr ""
 msgid "gzip file archive"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "ignored explicit argument %r"
 msgstr ""
@@ -2268,39 +2265,35 @@ msgstr ""
 msgid "index-v1 must have a signature, use `fdroid signindex` to create it!"
 msgstr ""
 
-#: ../fdroidserver/index.py
-msgid "index-v2 must have a signature, use `fdroid signindex` to create it!"
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "integer"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "invalid %(type)s value: %(value)r"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "invalid choice: %(value)r (choose from %(choices)s)"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "invalid conflict_resolution value: %r"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "invalid option string %(option)r: must start with a character %(prefix_chars)r"
 msgstr ""
 
-#: ../fdroidserver/common.py
-msgid "ipfs_cid not found, skipping CIDv1 generation"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "latest build recipe is newer: old vercode={old}, new vercode={new}"
-msgstr ""
-
 #: ../fdroidserver/deploy.py
 #, python-brace-format
 msgid "local_copy_dir does not end with \"fdroid\", perhaps you meant: \"{path}\""
@@ -2319,20 +2312,11 @@ msgstr ""
 msgid "mirror '%s' does not end with 'fdroid'!"
 msgstr ""
 
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "mirrors set twice, in config.yml and {path}!"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "mutually exclusive arguments must be optional"
 msgstr ""
 
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "next {name} cache update due in {time}"
-msgstr ""
-
 #: ../fdroidserver/mirror.py
 #, python-brace-format
 msgid "no \"icon\" in {appid}"
@@ -2342,35 +2326,97 @@ msgstr ""
 msgid "no APK supplied"
 msgstr ""
 
-#: ../fdroidserver/checkupdates.py
-msgid "no version information found"
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, python-format
+msgid "no such option: %s"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: ../fdroid ../fdroidserver/__main__.py
+msgid "no version info found!"
+msgstr ""
+
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "not allowed with argument %s"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "one of the arguments %s is required"
 msgstr ""
 
-#: ../fdroidserver/common.py ../fdroidserver/index.py
+#: ../fdroidserver/index.py ../fdroidserver/common.py
 msgid "only accepts strings, lists, and tuples"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
-#, fuzzy
-msgid "options"
-msgstr "বিকল্পসমূহ"
+#: ../fdroidserver/install.py
+#, python-format
+msgid "option %s: If you really want to install all the signed apps, use --all"
+msgstr ""
+
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, python-format
+msgid "option %s: invalid %s value: %r"
+msgstr ""
+
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, python-format
+msgid "option %s: invalid choice: %r (choose from %s)"
+msgstr ""
+
+#: /usr/lib/python3.5/getopt.py /usr/lib/python3.6/getopt.py
+#: /usr/lib/python3.7/getopt.py
+#, python-format
+msgid "option -%s not recognized"
+msgstr ""
+
+#: /usr/lib/python3.5/getopt.py /usr/lib/python3.6/getopt.py
+#: /usr/lib/python3.7/getopt.py
+#, python-format
+msgid "option -%s requires argument"
+msgstr ""
+
+#: /usr/lib/python3.5/getopt.py /usr/lib/python3.6/getopt.py
+#: /usr/lib/python3.7/getopt.py
+#, python-format
+msgid "option --%s must not have an argument"
+msgstr ""
+
+#: /usr/lib/python3.5/getopt.py /usr/lib/python3.6/getopt.py
+#: /usr/lib/python3.7/getopt.py
+#, python-format
+msgid "option --%s not a unique prefix"
+msgstr ""
+
+#: /usr/lib/python3.5/getopt.py /usr/lib/python3.6/getopt.py
+#: /usr/lib/python3.7/getopt.py
+#, python-format
+msgid "option --%s not recognized"
+msgstr ""
+
+#: /usr/lib/python3.5/getopt.py /usr/lib/python3.6/getopt.py
+#: /usr/lib/python3.7/getopt.py
+#, python-format
+msgid "option --%s requires argument"
+msgstr ""
+
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
+msgid "optional arguments"
+msgstr ""
 
 #: ../fdroidserver/nightly.py
 #, python-brace-format
 msgid "overwriting existing {path}"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "positional arguments"
 msgstr ""
 
@@ -2379,53 +2425,42 @@ msgstr ""
 msgid "process log deploy {path} to {dest} failed!"
 msgstr ""
 
-#: ../fdroidserver/build.py
-msgid "reference binary missing signature"
-msgstr ""
-
 #: ../fdroidserver/signatures.py
 #, python-brace-format
 msgid "refuse downloading via insecure HTTP connection (use HTTPS or specify --no-https-check): {apkfilename}"
 msgstr ""
 
+#: ../fdroidserver/signatures.py
+#, python-brace-format
+msgid "refuse downloading via insecure http connection (use https or specify --no-https-check): {apkfilename}"
+msgstr ""
+
 #: ../fdroidserver/index.py
 #, python-format
-msgid "repo_icon \"repo/icons/%s\" does not exist, generating placeholder."
+msgid "repo_icon %s does not exist, generating placeholder."
 msgstr ""
 
-#: ../fdroidserver/common.py
-msgid "repo_url needs to end with /repo"
+#: ../fdroidserver/metadata.py
+msgid "ruamel.yaml not installed, can not write metadata."
 msgstr ""
 
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "rsync is missing or broken: {error}"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "s3cmd sync indexes {path} to {url} and delete"
 msgstr ""
 
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "s3cmd syncs indexes from {path} to {url} and deletes removed"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "scanner cache is malformed! You can clear it with: '{clear}'"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "serverwebroot: path does not end with \"fdroid\", perhaps you meant one of these:"
-msgstr ""
-
 #: ../fdroidserver/scanner.py
 msgid "shared library"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "show program's version number and exit"
+msgstr ""
+
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.5/optparse.py
+#: /usr/lib/python3.6/argparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/argparse.py /usr/lib/python3.7/optparse.py
 msgid "show this help message and exit"
 msgstr ""
 
@@ -2454,31 +2489,31 @@ msgstr ""
 msgid "static library"
 msgstr ""
 
-#: ../fdroidserver/build.py
+#: ../fdroidserver/common.py
 #, python-brace-format
-msgid "supplied reference binary has allowed signer {signer}"
+msgid "supplied timestamp value '{timestamp}' is not a unix timestamp"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "the following arguments are required: %s"
 msgstr ""
 
-#: ../fdroidserver/install.py
-msgid "true"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "unexpected option string: %s"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "unknown parser %(parser_name)r (choices: %(choices)s)"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "unrecognized arguments: %s"
 msgstr ""
@@ -2488,11 +2523,16 @@ msgstr ""
 msgid "unsafe permissions on '{config_file}' (should be 0600)!"
 msgstr ""
 
-#: ../fdroidserver/__main__.py /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py ../fdroid
+#: /usr/lib/python3.7/argparse.py ../fdroidserver/__main__.py
 msgid "usage: "
-msgstr "ব্যবহার: "
+msgstr ""
 
-#: ../fdroidserver/deploy.py
+#: ../fdroid
+msgid "usage: fdroid [-h|--help|--version] <command> [<args>]"
+msgstr ""
+
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "using Apache libcloud to sync with {url}"
 msgstr ""
@@ -2501,8 +2541,8 @@ msgstr ""
 msgid "virustotal.com is rate limiting, waiting to retry..."
 msgstr ""
 
-#: ../fdroidserver/install.py
-msgid "yes"
+#: ../fdroidserver/update.py
+msgid "wiki support is deprecated and will be removed in the next release!"
 msgstr ""
 
 #: ../fdroidserver/publish.py
@@ -2517,19 +2557,31 @@ msgstr[1] ""
 msgid "{apkfilename} ({appid}) has no metadata!"
 msgstr ""
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
+#: ../fdroidserver/update.py
+#, python-brace-format
+msgid "{apkfilename} has multiple {name} files, looks like Master Key exploit!"
+msgstr ""
+
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "{apkfilename}'s AndroidManifest.xml has a bad date: "
 msgstr ""
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "{appid} does not have a name! Using application ID instead."
 msgstr ""
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
+#: ../fdroidserver/update.py
+#, python-brace-format
+msgid "{appid} does not have a name! Using package name instead."
+msgstr ""
+
+#: ../fdroidserver/update.py
+#, python-brace-format
+msgid "{appid} from {path} is not a valid Android Package Name!"
+msgstr ""
+
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "{appid} from {path} is not a valid Android application ID!"
@@ -2540,16 +2592,12 @@ msgstr ""
 msgid "{appid} from {path} is not a valid Java Package Name!"
 msgstr ""
 
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{appid} has both APKs and files: {files}"
-msgstr ""
-
 #: ../fdroidserver/mirror.py
 #, python-brace-format
 msgid "{appid} is missing {name}"
 msgstr ""
 
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "{appid}: Unknown extlib {path} in build '{versionName}'"
@@ -2577,7 +2625,7 @@ msgstr ""
 
 #: ../fdroidserver/metadata.py
 #, python-brace-format
-msgid "{build_flag} must be list or string, found: {value}"
+msgid "{field} not terminated in {name}"
 msgstr ""
 
 #: ../fdroidserver/metadata.py
@@ -2587,15 +2635,10 @@ msgstr ""
 
 #: ../fdroidserver/update.py
 #, python-brace-format
-msgid "{name} \"{section}/icons/{path}\" does not exist! Check \"config.yml\"."
+msgid "{name} \"{path}\" does not exist! Correct it in config.py."
 msgstr ""
 
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{path1} is a duplicate of {path2}, remove one!"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 #, python-brace-format
 msgid "{path} already exists, ignoring import results!"
 msgstr ""
@@ -2610,36 +2653,6 @@ msgstr ""
 msgid "{path} has bad file signature \"{pattern}\", possible Janus exploit!"
 msgstr ""
 
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "{path} has been flagged by virustotal {count} times:"
-msgstr ""
-
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "{path} has the wrong fingerprint ({fingerprint})!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "{path} is not \"key: value\" dict, but a {datatype}!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "{path} is not a standard config file!"
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "{path} is not list, but a {datatype}!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "{path} is not {expected_type}, but a {datatype}!"
-msgstr ""
-
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "{path} is zero size!"
@@ -2650,22 +2663,12 @@ msgstr ""
 msgid "{path} more than 200MB, manually upload: {url}"
 msgstr ""
 
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "{path}: \"{code}\" is not a valid ISO_3166-1 alpha-2 country code!"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{path}: {error}"
-msgstr ""
-
 #: ../fdroidserver/mirror.py
 #, python-brace-format
 msgid "{url} does not end with \"fdroid\", check the URL path!"
 msgstr ""
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/common.py
 #, python-brace-format
 msgid "{url} does not start with \"http\"!"
 msgstr ""
diff --git a/locale/bo/LC_MESSAGES/fdroidserver.po b/locale/bo/LC_MESSAGES/fdroidserver.po
index cbd1c63c..3f59444c 100644
--- a/locale/bo/LC_MESSAGES/fdroidserver.po
+++ b/locale/bo/LC_MESSAGES/fdroidserver.po
@@ -1,12 +1,12 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Free Software Foundation, Inc.
-# Hans-Christoph Steiner <hans@guardianproject.info>, 2020, 2021, 2022, 2024.
+# Hans-Christoph Steiner <hans@guardianproject.info>, 2020.
 msgid ""
 msgstr ""
 "Project-Id-Version: fdroidserver 0.9\n"
 "Report-Msgid-Bugs-To: https://gitlab.com/fdroid/fdroidserver/issues\n"
-"POT-Creation-Date: 2025-06-25 09:52+0200\n"
-"PO-Revision-Date: 2024-04-10 13:33+0000\n"
+"POT-Creation-Date: 2020-10-21 18:05+0200\n"
+"PO-Revision-Date: 2020-11-10 16:20+0000\n"
 "Last-Translator: Hans-Christoph Steiner <hans@guardianproject.info>\n"
 "Language-Team: Tibetan <https://hosted.weblate.org/projects/f-droid/fdroidserver/bo/>\n"
 "Language: bo\n"
@@ -14,7 +14,25 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Weblate 5.5-dev\n"
+"X-Generator: Weblate 4.4-dev\n"
+
+#: ../fdroidserver/common.py
+msgid ""
+"\n"
+"        This is a repository of apps to be used with FDroid. Applications in this\n"
+"        repository are either official binaries built by the original application\n"
+"        developers, or are binaries built from source by f-droid.org using the\n"
+"        tools on https://gitlab.com/fdroid.\n"
+"        "
+msgstr ""
+
+#: ../fdroidserver/nightly.py
+msgid ""
+"\n"
+"SSH Public Key to be used as Deploy Key:"
+msgstr ""
+"\n"
+"SSHདམངས་ཀྱི་ལྡེ་མིག་དེ་ཕྱོགས་སྐྱོད་ལྡ་ེམིག་ལ་བེད་སྤྱོད་བྱེད།:"
 
 #: ../fdroidserver/nightly.py
 #, fuzzy
@@ -39,26 +57,22 @@ msgstr ""
 msgid "\"%s/\" has no matching metadata file!"
 msgstr "\"%s/\" འདི་དང་མཐུན་པའི་རྒྱབ་ལྗོངས་ཡིག་ཆ་མིན་འདུག!"
 
-#: ../fdroidserver/index.py
-msgid "\"isPrimary\" key should not be added to mirrors!"
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, fuzzy, python-brace-format
-msgid "\"local_copy_dir\" {path} does not exist!"
-msgstr "dir གྱི་རྩ་བ་ for local_copy_dir \"{path}\" མིན་འདུག!"
-
 #: ../fdroidserver/install.py
 #, fuzzy, python-brace-format
 msgid "\"{apkfilename}\" is already installed on {dev}."
 msgstr "'{apkfilename}' འདི་{dev}.ནང་སྔོན་ཚོད་ནས་སྒྲིག་བཅུག་བྱས་ཟིན།."
 
+#: ../fdroidserver/update.py
+#, python-brace-format
+msgid "\"{path}\" contains outdated {name} ({version})"
+msgstr "\"{path}\"དུས་ཚོད་ཡོལ་ཟིན་པའི་{name} ({version})ཚུད་ཡོད།"
+
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "\"{path}\" contains recent {name} ({version})"
 msgstr "\"{path}\" ཉེ་ཆར་{name} ({version})རྣམས་ཚུད་ཡོད།"
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "\"{path}\" exists but s3cmd is not installed!"
 msgstr ""
@@ -68,85 +82,118 @@ msgstr ""
 msgid "\"{path}\" is not a supported file format (use: metadata/*.yml)"
 msgstr ""
 
-#: ../fdroidserver/update.py
+#: ../fdroidserver/metadata.py
 #, python-brace-format
-msgid "\"{path}\" is signed by a key that is not allowed:"
-msgstr ""
+msgid "\"{path}\" is not an accepted format, convert to: {formats}"
+msgstr "\"{path}སྒྲིག་བཀོད་འདི་ངོས་ལེན་བྱེད་ཐུབ་ཀྱི་མིན་འདུག:{formats}"
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/common.py
 #, python-brace-format
 msgid "\"{url}\" is not a valid URL!"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, python-format
+msgid "%(option)s option requires %(number)d argument"
+msgid_plural "%(option)s option requires %(number)d arguments"
+msgstr[0] "%(option)s གདམ་ཀ་དགོས་ %(number)d རྩོད་པ།"
+
+#: ../fdroidserver/mirror.py
+#, fuzzy, python-format
+msgid "%(prog)s [options] url"
+msgstr "%(prog)s [གདམ་ཀ།] url"
+
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "%(prog)s: error: %(message)s\n"
 msgstr "%(prog)s: ནོར་སྐྱོན: %(message)s\n"
 
-#: ../fdroidserver/publish.py
-#, python-format
-msgid "%d APKs failed to be signed or verified!"
-msgstr ""
-
 #: ../fdroidserver/scanner.py
 #, python-format
 msgid "%d problems found"
-msgstr "%d དཀའ་རྙོག་ཐོན་སོང་།"
+msgstr "%d  དཀའ་རྙོག་ཐོན་སོང་།"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "%prog [options]"
+msgstr "%prog [གདམ་ཀ།]"
+
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "%r is not callable"
 msgstr "%r 1 བྱེད་ལས་མིན་འདུག"
 
-#: ../fdroidserver/signindex.py
-#, python-format
-msgid "%s did not produce a dict!"
-msgstr ""
-
-#: ../fdroidserver/signindex.py
-#, python-format
-msgid "%s has bad SHA-256: %s"
-msgstr ""
-
 #: ../fdroidserver/lint.py
 #, python-format
 msgid "%s is not an accepted build field"
 msgstr "%s 1འདི་ཁས་ལེན་ཐུབ་པའི་བཟོ་སྐྲུན་རྭ་བ་མ་རེད།"
 
-#: ../fdroidserver/common.py
-msgid "'keypass' not found in config.yml!"
-msgstr "'keypass' འདི་config.yml ནང་རྙེད་མ་སོང་།!"
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, python-format
+msgid "%s option does not take a value"
+msgstr "%sགདམ་ཀ་ནུས་མེད་རེད་འདུག"
+
+#: ../fdroidserver/index.py ../fdroidserver/common.py
+msgid "'keypass' not found in config.py!"
+msgstr "'keypass' འདི་config.py ནང་རྙེད་མ་སོང་།!"
 
 #: ../fdroidserver/common.py
 msgid "'keystore' is NONE and 'smartcardoptions' is blank!"
 msgstr ""
 
-#: ../fdroidserver/common.py
-msgid "'keystore' not found in config.yml!"
-msgstr "'keystore' འདི་ config.yml ནང་རྙེད་མ་སོང་།!"
+#: ../fdroidserver/index.py ../fdroidserver/common.py
+msgid "'keystore' not found in config.py!"
+msgstr "'keystore' འདི་ config.py ནང་རྙེད་མ་སོང་།!"
 
-#: ../fdroidserver/common.py
-msgid "'keystorepass' not found in config.yml!"
-msgstr "'keystorepass' འདི་ config.yml ནང་རྙེད་མ་སོང་།!"
+#: ../fdroidserver/index.py ../fdroidserver/common.py
+msgid "'keystorepass' not found in config.py!"
+msgstr "'keystorepass' འདི་ config.py ནང་རྙེད་མ་སོང་།!"
 
-#: ../fdroidserver/common.py
-msgid "'repo_keyalias' not found in config.yml!"
-msgstr "'repo_keyalias' འདི་ config.yml ནང་རྙེད་མ་སོང་།!"
+#: ../fdroidserver/index.py ../fdroidserver/common.py
+msgid "'repo_keyalias' not found in config.py!"
+msgstr "'repo_keyalias' འདི་ config.py ནང་རྙེད་མ་སོང་།!"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "'required' is an invalid argument for positionals"
 msgstr "'དགསོ་མཁོ།' ནི་གནས་སྟངས་འདི་ལ་ཁུངས་ལྡན་གྱི་རྩོད་པ་རེད་མིན་འདུག"
 
 #: ../fdroidserver/common.py
-#, fuzzy
-msgid "'sdk_path' not set in config.yml!"
-msgstr "'sdk_path' འདི་ 'config.yml' ནང་སྒྲིག་ཐུབ་མ་སོང་།!"
+msgid "'sdk_path' not set in 'config.py'!"
+msgstr "'sdk_path' འདི་ 'config.py' ནང་སྒྲིག་ཐུབ་མ་སོང་།!"
+
+#. Translators: "build-tools" is the file name of a package from
+#. Google, it is part of the Android SDK. So it probably shouldn't be
+#. translated or transliterated.
+#: ../fdroidserver/common.py
+#, python-brace-format
+msgid "'{aapt}' is too old, fdroid requires build-tools-23.0.0 or newer!"
+msgstr "'{aapt}1' འདི་ཧ་ཅང་གི་རྙིང་པ་རེད་འདུག, ཨེཕ་རོཌ་ལ་བཟོ་སྐྲུན་མ་ལག-23.0.0 དང་ཡང་ན་དེ་ལས་གསར་བ་དགོས།!"
 
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "'{aapt}' is too old, fdroid requires build-tools-{version} or newer!"
 msgstr ""
 
+#: ../fdroidserver/install.py
+#, python-brace-format
+msgid "'{apkfilename}' is already installed on {dev}."
+msgstr "'{apkfilename}' འདི་{dev}.ནང་སྔོན་ཚོད་ནས་སྒྲིག་བཅུག་བྱས་ཟིན།."
+
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "'{field}' in {linedesc} is obsolete, see docs for current fields:"
+msgstr ""
+
+#: ../fdroidserver/common.py
+#, python-brace-format
+msgid "'{field}' will be in random order! Use () or [] brackets if order is important!"
+msgstr "'{field}1' ནི་གོ་རིམ་ངེས་མེད།! བེད་སྤྱོད། () ཡང་ན། [] གོ་རིམ་གལ་ཆེན་པོའི་རིགས་ལ་གུག་རྟགས་ནང་བཅུག!"
+
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "'{path}' failed to execute!"
@@ -154,49 +201,40 @@ msgstr "'{path}1' ལག་བསྟར་ཐུབ་མ་སོང་།!"
 
 #: ../fdroidserver/metadata.py
 #, python-brace-format
-msgid "'{path}' has invalid format, it should be a dictionary!"
-msgstr ""
-
-#: ../fdroidserver/lint.py ../fdroidserver/metadata.py
-#, python-brace-format
 msgid "'{value}' is not a valid {field} in {appid}. Regex pattern: {pattern}"
 msgstr "'{value}' ཁུངས་ལྡན་རེད་མིན་འདུག{field} འདི་ནང་ {appid}. Regex འགྲོ་ལུགས་: {pattern}"
 
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "'{value}' is not a valid {field}, should be {pattern}"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "--merge-request only runs on a single appid!"
-msgstr ""
-
 #: ../fdroidserver/checkupdates.py
 #, python-brace-format
 msgid "...checkupdate failed for {appid} : {error}"
 msgstr "...{appid} གྱི་ཆེད་དུ་གསར་བསྒྱུར་འཚོལ་མི་ཐུབ།་: {error}"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid ".__call__() not defined"
-msgstr ".__call__() ངོས་འཛིན་ཐུབ་མེད།"
+msgstr ".__call__()  ངོས་འཛིན་ཐུབ་མེད།"
+
+#: ../fdroidserver/metadata.py
+msgid ".fdroid.txt is not supported!  Convert to .fdroid.yml or .fdroid.json."
+msgstr ""
 
 #: ../fdroidserver/lint.py
 msgid "/issues is missing"
 msgstr "/གནས་དོན་བོར་བརླག་སོང་འདུག"
 
 #: ../fdroidserver/mirror.py
+#, fuzzy
 msgid "A URL is required as an argument!"
-msgstr ""
+msgstr "གདམ་ཀ།  -%s 1 རྩོད་དགོས།"
 
-#: ../fdroidserver/common.py
-#, fuzzy, python-brace-format
-msgid "APK signatures have different certificates in {path}:"
-msgstr "{path}མིང་རྟགས་བཀོད་པའི་ཆོག་མཆན་ལག་ཁྱེར་འདིའི་ནང་རྙེད་མ་སོང་།"
-
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Add PGP signatures using GnuPG for packages in repo"
 msgstr "PGP གྱི་མིང་རྟགས་དེ་རེ་པོ་ཐུམ་སྒྲིལ་ནང་GnuPG ཁ་སྣོན་བྱས་ནས་རེ་པོ་ནང་ལ་བཅུག"
 
+#: ../fdroid ../fdroidserver/__main__.py
+msgid "Add a new application from its source code"
+msgstr "འབྱུང་ཁུངས་ཨང་རྟགས་ནས་མཉེན་ཆས་གསར་པ་ཁ་སྣོན་བྱེད།"
+
 #: ../fdroidserver/update.py
 msgid "Add a repo signing key to an unsigned repo"
 msgstr "མིང་རྟགས་མི་བཀོད་པའི་རེ་པོ་ནང་ལ་རེ་པོ་མིང་རྟགས་ལྡེ་མིག་འདི་ཁ་སྣོན་བྱེད།"
@@ -214,11 +252,7 @@ msgstr "{name}ཁོ་ནའི་ཆེད་དུ་རེ་པོ་གས
 msgid "Alias of the repo signing key in the keystore"
 msgstr "ལྡེ་མིག་གསོག་ཉར་ཁང་ནང་རེ་པོ་མིང་རྟགས་ལྡེ་མིག་བཀོད་པའི་གསང་མིང་།"
 
-#: ../fdroidserver/build.py
-msgid "AllowedAPKSigningKeys missing but reference binary supplied"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "Allows a different revision (or git branch) to be specified for the initial import"
 msgstr "ཐོག་མའི་ནང་འདྲེན་བྱེད་པའི་སྐབས་གསལ་པོའི་ཐོག་ནས་སྐྱར་སྦྱོང་(ཡང་ན་གིཊ་ཡན་ལག་)མི་འདྲ་བ་རྣམས་ལ་ཆོག་མཆན་སྤྲོད།"
 
@@ -239,13 +273,18 @@ msgid "Android APK file"
 msgstr ""
 
 #: ../fdroidserver/scanner.py
+#, fuzzy
 msgid "Android DEX code"
-msgstr ""
+msgstr "ཨེན་ཀྲོཌ་ SDK རྙེད་མ་སོང་།!"
 
-#: ../fdroidserver/init.py
+#: ../fdroidserver/common.py ../fdroidserver/build.py
 #, python-brace-format
-msgid "Android SDK not found at {path}!"
-msgstr ""
+msgid "Android SDK '{path}' does not have '{dirname}' installed!"
+msgstr "ཨེན་ཀྲོཌ་SDK '{path}1{dirname}' '{dirname}'སྒྲིག་བཅུག་མིན་འདུག!"
+
+#: ../fdroidserver/common.py
+msgid "Android SDK not found!"
+msgstr "ཨེན་ཀྲོཌ་ SDK རྙེད་སོན་བྱུང་མ་སོང་།!"
 
 #: ../fdroidserver/common.py
 #, python-brace-format
@@ -257,28 +296,23 @@ msgstr "ཨེན་ཀྲོཌ་SDK ཐབས་ལམ་ '{path}'མིན
 msgid "Android SDK path '{path}' is not a directory!"
 msgstr "ཨེན་ཀྲོཌSDKཐབས་ལམ་ '{path}1' ཡིག་ཆ་གསོག་ཉར་རེད་མིན་འདུག!"
 
+#. Translators: "build-tools" is the file name of a package from
+#. Google, it is part of the Android SDK. So it probably shouldn't be
+#. translated or transliterated.
 #: ../fdroidserver/common.py
 #, python-brace-format
-msgid "Android SDK tool {cmd} not found!"
-msgstr ""
+msgid "Android build-tools path '{path}' does not exist!"
+msgstr "ཨེན་ཀྲོཌ་བཟོ་སྐྲུན་-མ་ལག་ཐབས་ལམ་'{path}'མིན་འདུག!"
 
-#: ../fdroidserver/lint.py
-msgid "App has Binaries but does not have corresponding AllowedAPKSigningKeys to pin certificate."
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "App has NoSourceSince or ArchivePolicy \"0 versions\" or 0 but AutoUpdateMode or UpdateCheckMode are not None"
-msgstr ""
+#: ../fdroidserver/update.py
+msgid "AndroidManifest.xml has no date"
+msgstr "AndroidManifest.xmlལ་ཟླ་ཚེས་མིན་འདུག"
 
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "App is in '{repo}' but has a link to {url}"
 msgstr "མཉེན་ཆས་འདི་'{repo}1ནང་འདུག འོན་ཀྱང་སྦྲེལ་མཐུད་དེ་ {url}2ཡོད།"
 
-#: ../fdroidserver/lint.py
-msgid "App version has binary but does not have corresponding AllowedAPKSigningKeys to pin certificate."
-msgstr ""
-
 #: ../fdroidserver/lint.py
 msgid "Appending .git is not necessary"
 msgstr "Appending .git ངེས་པར་དགོས་ཀྱི་མེད།"
@@ -288,27 +322,11 @@ msgstr "Appending .git ངེས་པར་དགོས་ཀྱི་མེད
 msgid "Archiving {apkfilename} with invalid signature!"
 msgstr "མཛོད་ཁང་{apkfilename} ལ་ཁུངས་ལྡན་མིན་པའི་མིང་རྟགས་!"
 
-#: ../fdroidserver/lint.py
-msgid "AutoUpdateMode with UpdateCheckMode: HTTP must have a pattern."
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "Automatic no to all prompts."
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "Automatic yes to all prompts."
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "Bad entry type \"{mirrortype}\" in mirrors config: {mirror}"
-msgstr ""
-
 #: ../fdroidserver/mirror.py
 msgid "Base URL to mirror, can include the index signing key using the query string: ?fingerprint="
 msgstr ""
 
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "Branch '{branch}' used as commit in build '{versionName}'"
@@ -317,14 +335,14 @@ msgstr "ཡན་ལག '{branch}1' བཟོ་སྐྲུན་ནང་བ
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "Branch '{branch}' used as commit in srclib '{srclib}'"
-msgstr "ཡན་ལག '{branch}1'' srclib ནང་བེད་སྤྱོད་བྱེད་རྒྱུ་ཁས་ལེན་ཡོད་།'{srclib}'"
+msgstr "ཡན་ལག '{branch}1''  srclib ནང་བེད་སྤྱོད་བྱེད་རྒྱུ་ཁས་ལེན་ཡོད་།'{srclib}'"
 
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Broken symlink: {path}"
 msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Build a package from source"
 msgstr "འབྱུང་ཁུངས་ནས་ཐུམ་སྒྲིལ་བཟོས་འདུག"
 
@@ -344,69 +362,86 @@ msgstr ""
 msgid "Build only the latest version of each package"
 msgstr "ཐུམ་སྒྲིལ་རེ་རེ་ལ་ཁོ་ནར་བཟོས་པའི་ཐོན་རིམ་གསར་ཤོས།"
 
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Build should have comma-separated versionName and versionCode, not \"{value}\", in {linedesc}"
+msgstr "བཟོ་སྐྲུན་ལ་ངེས་པར་དུ་བར་ཚེགས་ཀྱི་དབྱེ་མཚམས་ཡོད་པའི་ཐོན་རིམ་གྱི་མིང་དང་ཐོན་རྟགས་དགོས།\"{value}\"ནང་{linedesc}"
+
 #: ../fdroidserver/init.py
 #, python-format
 msgid "Built repo based in \"%s\" with this config:"
 msgstr "རེ་པོ་བཟོ་སྐྲུན་གཞི་རྩ་ \"%s\" སྒྲིག་བཀོད་འདི་དང་མཉམ་དུ་ཡོད།:"
 
-#: ../fdroidserver/checkupdates.py
-msgid "Can't auto-update app with no CurrentVersionCode"
-msgstr ""
-
 #: ../fdroidserver/build.py
 msgid "Can't build due to {} error while scanning"
 msgid_plural "Can't build due to {} errors while scanning"
 msgstr[0] "ཚགས་རྒྱབ་པའི་སྐབས་སུ་ནོར་སྐྱོན་ {} ཤོར་བས་བཟོ་སྐྲུན་བྱེད་ཐུབ་མེད།"
 
-#: ../fdroidserver/common.py
+#: ../fdroidserver/vmtools.py
+#, python-brace-format
+msgid "Cannot read \"{path}\"!"
+msgstr ""
+
+#. Translators: https://developer.android.com/studio/build/application-id
+#: ../fdroidserver/metadata.py
 #, fuzzy, python-brace-format
-msgid "Cannot read {path}: {error}"
-msgstr "ཀློག་མི་ཐུབ།{path}: {error}"
+msgid "Cannot resolve application ID {appid}"
+msgstr "{appid} app idཐག་ཆོད་ཐུབ་མ་སོང་།"
 
 #: ../fdroidserver/rewritemeta.py
 #, python-brace-format
 msgid "Cannot rewrite \"{path}\""
 msgstr ""
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
+#: ../fdroidserver/rewritemeta.py
+msgid "Cannot use --list and --to at the same time"
+msgstr "བེད་སྤྱོད་གཏོང་མི་ཐུབ་། --ཐོ་གཞུང་དང--དུས་མཉམ།"
+
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Cannot write \"{path}\", not an accepted format, use: {formats}"
+msgstr "འབྲི་ཐུབ་ཀྱི་མིན་འདུག\"{path}\", སྒྲིག་བཀོད་འདི་ལ་ངོས་ལེན་མིན། བེད་སྤྱོད།:{formats}"
+
 #: ../fdroidserver/lint.py
 #, fuzzy, python-format
 msgid "Categories '%s' is not valid"
 msgstr "སྡེ་ཚན་'%s' ཁུངས་ལྡན་མ་རེད།"
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
 #: ../fdroidserver/lint.py
 msgid "Categories are not set"
 msgstr "སྡེ་ཚན་རྣམས་སྒྲིག་མེད།"
 
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "Category \"{category}\" defined but not used for any apps!"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Check for updates to applications"
 msgstr "མཉེན་ཆས་རྣམས་གསར་བསྒྱུར་བྱས་མིན་གཟིགས་ཞིབ་གནང་དང་།"
 
 #: ../fdroidserver/update.py
-#, fuzzy, python-brace-format
+#, python-brace-format
 msgid "Checking archiving for {appid} - apks:{integer}, keepversions:{keep}, archapks:{arch}"
-msgstr "མཛོད་ཁང་ཚོད་ལྟའི་ཆེད་དུ།{appid} - APKs:{integer},ཐོན་རིམ་ཉར་ཚགས།:{keep},archapks:{arch}"
+msgstr "མཛོད་ཁང་ཚོད་ལྟའི་ཆེད་དུ།{appid} - apks:{integer},ཐོན་རིམ་ཉར་ཚགས།:{keep},archapks:{arch}"
+
+#: ../fdroidserver/dscanner.py
+msgid "Clean after all scans have finished"
+msgstr "ཆ་ཚང་འཚག་རྒྱབ་ཚར་བའི་རྗེས་སུ་གཙང་མ་བཟོས།"
+
+#: ../fdroidserver/dscanner.py
+msgid "Clean before the scans start and rebuild the container"
+msgstr "འཚག་རྒྱབ་འགོ་མ་བཙུགས་གོང་ལ་གཙང་མ་དང་སྣོད་དེ་སྐྱར་དུ་བཟོས།"
+
+#: ../fdroidserver/dscanner.py
+msgid "Clean up all containers and then exit"
+msgstr "སྣོད་ཆ་ཚང་གཙང་མ་བཟོས་ནས་ཕྱིར་ཐོན།"
 
 #: ../fdroidserver/update.py
 msgid "Clean update - don't uses caches, reprocess all APKs"
-msgstr "གསར་བསྒྱུར་གཙང་བཟོ།-ཡིག་ཆ་གསོག་ཉར་བེད་སྤྱོ་མ་བྱེད། APKs ཚང་མ་སྐྱར་སྤྱོད་བྱེད།"
+msgstr "གསར་བསྒྱུར་གཙང་བཟོ།-ཡིག་ཆ་གསོག་ཉར་བེད་སྤྱོ་མ་བྱེད། apks ཚང་མ་སྐྱར་སྤྱོད་བྱེད།"
 
-#: ../fdroidserver/common.py
-msgid "Color the log output"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "Comma separated list of categories."
 msgstr "སྡེ་ཚན་སོ་སོའི་ཐོ་གཞུང་ལ་བར་མཚམས་རེ་འཇོག།."
 
-#: ../fdroidserver/__main__.py
-#, python-format
+#: ../fdroid ../fdroidserver/__main__.py
+#, c-format, python-format
 msgid "Command '%s' not recognised.\n"
 msgstr "བཀའ་ཁྱབ་ '%s 1'ངོས་འཛིན་ཐུབ་མ་སོང་།\n"
 
@@ -414,15 +449,6 @@ msgstr "བཀའ་ཁྱབ་ '%s 1'ངོས་འཛིན་ཐུབ་
 msgid "Commit changes"
 msgstr "བསྒྱུར་བ་གཏོང་བར་མོས་མཐུན་ཡོད།"
 
-#: ../fdroidserver/checkupdates.py
-msgid "Commit changes, push, then make a merge request"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Conflicting \"{field}\" definitions between .yml and localized files:"
-msgstr ""
-
 #: ../fdroidserver/__main__.py
 msgid "Conflicting arguments: '--verbose' and '--quiet' can not be specified at the same time."
 msgstr ""
@@ -432,14 +458,12 @@ msgstr ""
 msgid "Could not find '{command}' on your system"
 msgstr "ཁྱེད་རང་གི་མ་ལག་སྒང་ལ་'{command}1' རྙེད་མ་སོང་།"
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 #, fuzzy
 msgid "Could not find latest version code"
 msgstr "ཐོན་རིམ་གསར་གསར་ཤོས་ཀྱི་ཨང་རྟགས་འདི་འདི་རྙེད་མ་སོང་།"
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 #, fuzzy
 msgid "Could not find latest version name"
 msgstr "ཐོན་རིམ་གསར་ཤོས་འདིའི་མིང་རྙེད་མ་སོང་།"
@@ -450,27 +474,31 @@ msgid "Could not find {path} to remove it"
 msgstr "{path}མེད་པ་བཟོས་པ་ལ་རྙེད་མ་སོང་།"
 
 #: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Could not open APK {path} for analysis: "
-msgstr ""
+msgid "Could not open apk file for analysis"
+msgstr "དཔྱད་ཞིབ་ཀྱི་ཆེད་དུ་apk ཡིག་ཆ་ཁ་ཕྱེས་ཐུབ་ཀྱི་མིན་འདུག"
 
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "Could not parse size \"{size}\", wrong type \"{type}\""
 msgstr ""
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/import_subcommand.py
+#. Translators: https://developer.android.com/studio/build/application-id
+#: ../fdroidserver/import.py
 #, fuzzy
 msgid "Couldn't find Application ID"
 msgstr "ཐུམ་སྒྲིལ་ངོས་འཛིན་རྙེད་སོན་བྱུང་མ་སོང་།"
 
-#: ../fdroidserver/checkupdates.py
-#, fuzzy
-msgid "Couldn't find any version information"
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
+#: ../fdroidserver/import.py
+msgid "Couldn't find latest version code"
+msgstr "ཐོན་རིམ་གསར་གསར་ཤོས་ཀྱི་ཨང་རྟགས་འདི་འདི་རྙེད་མ་སོང་།"
+
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
+#: ../fdroidserver/import.py
+msgid "Couldn't find latest version name"
 msgstr "ཐོན་རིམ་གསར་ཤོས་འདིའི་མིང་རྙེད་མ་སོང་།"
 
-#: ../fdroidserver/checkupdates.py
+#: ../fdroidserver/import.py
 msgid "Couldn't find package ID"
 msgstr "ཐུམ་སྒྲིལ་ངོས་འཛིན་རྙེད་སོན་བྱུང་མ་སོང་།"
 
@@ -478,26 +506,29 @@ msgstr "ཐུམ་སྒྲིལ་ངོས་འཛིན་རྙེད་
 msgid "Cowardily refusing to overwrite existing signing key setup!"
 msgstr "མིང་རྟགས་ལྡེ་མིག་སྒྲིག་བཀོད་ལ་སྐྱར་བྲིས་བྱེད་མི་བདེ་བ།!"
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/update.py
+msgid "Create a repo signing key in a keystore"
+msgstr "ལྡེ་མིག་གསོག་ཉར་ཁག་གི་ནང་ལ་རེ་པོ་མིང་རྟགས་བཀོད་པའི་ལྡེ་མིག་གཅིག་བཟོས།"
+
+#: ../fdroidserver/update.py
+msgid "Create skeleton metadata files that are missing"
+msgstr "བོར་བརླག་ཏུ་སོང་བའི་ཡིག་ཚགས་ཀྱི་རྒྱབ་ལྗོངས་ལོ་རྒྱུས་ཡང་སྐྱར་བཟོས།"
+
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Created new container \"{name}\""
 msgstr "དྲྭ་སྣོད་གསར་པ་བཟོས་\"{name}\""
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Creating \"{path}\" for configuring s3cmd."
 msgstr ""
 
-#: ../fdroidserver/common.py
-#, fuzzy, python-brace-format
-msgid "Creating empty {config_file}"
-msgstr "ཀློག་བཞིན་པ་། '{config_file}'"
-
 #: ../fdroidserver/publish.py
 msgid "Creating log directory"
 msgstr "ཉིན་ཐོ་ཕྱོགས་དེབ་བཟོ་བཞིན་པ།"
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Creating new S3 bucket: {url}"
 msgstr "S3 སྣོད་གསར་པ་བཟོ་བཞིན་པ།:{url}"
@@ -510,7 +541,8 @@ msgstr "ཐོན་སྐྱེད་ཕྱོགས་དེབ་བཟོ་
 msgid "Creating signed index with this key (SHA256):"
 msgstr "ལྡེ་མིག་འདི་(SHA256)དང་མཉམ་དུ་མིང་རྟགས་ཕྱོགས་སྟོན་བཟོ་བཞིན་པ།:"
 
-#: ../fdroidserver/publish.py ../fdroidserver/verify.py
+#: ../fdroidserver/import.py ../fdroidserver/verify.py
+#: ../fdroidserver/publish.py
 msgid "Creating temporary directory"
 msgstr "གནས་སྐབས་ཕྱོགས་དེབ་བཟོ་བཞིན་པ།"
 
@@ -549,28 +581,23 @@ msgstr "ངོས་འཛིན་མི་ཐུབ་པའི་ཡིག་
 #: ../fdroidserver/lint.py
 #, python-format
 msgid "Description '%s' is just the app's summary"
-msgstr "འགྲེལ་བཤད་'%s 1' ནི་མཉེན་ཆས་མདོར་བསྡུས་ཤིག་རེད།"
+msgstr "འགྲེལ་བཤད་'%s 1'  ནི་མཉེན་ཆས་མདོར་བསྡུས་ཤིག་རེད།"
 
 #: ../fdroidserver/lint.py
 msgid "Description has a duplicate line"
 msgstr "འགྲེལ་བཤད་འདི་ལ་རིམ་པ་རྫུན་མ་ཡོད།"
 
 #: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Description of length {length} is over the {limit} char limit"
-msgstr "རིང་ཐུང་གི་འགྲེལ་བཤད་ {length} {limit} ལས་བརྒལ་འདུག char limit"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Did you mean config/{name}.yml?"
-msgstr ""
+#, python-format
+msgid "Description has a list (%s) but it isn't bulleted (*) nor numbered (#)"
+msgstr "འགྲེལ་བཤད་འདི་ལ་ཐོ་གཞུང་ཡོད། (%s 1)  འོན་ཀྱང་འདི་ལ་ཚགས་རྒྱབ་མིན་འདུག(*)གྲངས་ཀྱང་མེད། (#)"
 
 #: ../fdroidserver/lint.py
 #, python-brace-format
-msgid "Did you mean {code}?"
-msgstr ""
+msgid "Description of length {length} is over the {limit} char limit"
+msgstr "རིང་ཐུང་གི་འགྲེལ་བཤད་ {length}  {limit} ལས་བརྒལ་འདུག char limit"
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "Do not add 'disable:' to the generated build entries"
 msgstr ""
 
@@ -595,22 +622,27 @@ msgstr ""
 msgid "Don't create a source tarball, useful when testing a build"
 msgstr "ཊར་བོལ་གྱི་འབྱུང་ཁུངས་མ་བཟོས། འདིས་ཐོན་སྐྱེད་ཚོད་ལྟ་བྱེད་པ་ལ་ཕན་ཐོགས།"
 
+#: ../fdroidserver/stats.py
+msgid "Don't do anything logs-related"
+msgstr "ཐོ་གཞུང་དང་འབྲེལ་བ་ཡོད་པའི་རིགས་ལ་གང་ཡང་མ་བྱེད།"
+
 #: ../fdroidserver/build.py
 msgid "Don't refresh the repository, useful when testing a build with no internet connection"
 msgstr "མཛོད་ཁང་སྐྱར་སོས་མ་བྱེད། དྲྭ་རྒྱ་མེད་པའི་སྐབས་ལ་ཐོན་སྐྱེད་ཚོད་ལྟ་བྱེད་པར་ཕན་ཐོགས་ཡོང་།"
 
 #: ../fdroidserver/deploy.py ../fdroidserver/nightly.py
+#: ../fdroidserver/upload.py
 msgid "Don't use rsync checksums"
 msgstr "rsync ཡིག་ཚགས་བརྟག་དཔྱད་ཀྱི་གསོག་ཉར་ཁང་འདི་བེད་སྤྱོད་མ་བྱེད།"
 
-#: ../fdroidserver/install.py
-msgid "Download F-Droid.apk using mirrors that leak less to the network"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Download complete mirrors of small repos"
 msgstr ""
 
+#: ../fdroidserver/stats.py
+msgid "Download logs we don't have"
+msgstr "ཐོ་གཞུང་ཕབ་ལེན་ང་ཚོར་མེད།"
+
 #: ../fdroidserver/common.py
 msgid "Downloading the repository already failed once, not trying again."
 msgstr "མཛོད་ཁང་ཕབ་ལེན་ཐེངས་གཅིག་བྱས་པ་འདི་ཐུབ་མ་སོང་། ཡང་སྐྱར་ཐབས་ཤེས་བྱེད་ཀྱི་མིན་།."
@@ -622,56 +654,36 @@ msgstr "{url} ཕབ་ལེན་ཐུབ་མ་སོང་།{error}"
 
 #: ../fdroidserver/metadata.py
 #, python-brace-format
-msgid "Duplicate Anti-Feature declaration at {path} was ignored!"
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-format
-msgid "Duplicate entry \"%s\" in mirrors config!"
-msgstr ""
+msgid "Duplicate build recipe found for versionCode {versionCode} in {linedesc}"
+msgstr "བཟོ་སྐྲུན་ངོ་བཤུས་རིམ་པ་དེ་བཞིན་ཐོན་རིམ་ཨང་རྟགས་ནང་རྙེད་སོན་བྱུང་འདུག{versionCode} ནང་ {linedesc}"
 
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "Duplicate link in '{field}': {url}"
 msgstr "'{field}'ནང་གི་ངོ་བཤུས་སྦྲེལ་མཐུད།: {url}"
 
-#: ../fdroidserver/common.py
-#, python-format
-msgid "ERROR: %(message)s"
-msgstr ""
+#: ../fdroid
+msgid "Dynamically scan APKs post build"
+msgstr "APKs ཐོན་སྐྱེད་རྗེས་ཀྱི་ཞིབ་ཚགས་པོའི་འཚག་རྒྱབ།"
 
 #: ../fdroidserver/__main__.py
 msgid "ERROR: The \"server\" subcommand has been removed, use \"deploy\"!"
 msgstr ""
 
+#: ../fdroidserver/mirror.py
+msgid ""
+"ERROR: this command should never be used to mirror f-droid.org!\n"
+"A full mirror of f-droid.org requires more than 200GB."
+msgstr ""
+
 #: ../fdroidserver/nightly.py
 msgid "ERROR: unsupported CI type, patches welcome!"
 msgstr "ནོར་འཁྲུལ།: རྒྱབ་སྐྱོར་མེད་པའི་CI རྣམ་གྲངས་དང་ལྷན་པ་རྒྱབ་ནའང་འགྲིག་གི་ཡོད།!"
 
-#: ../fdroidserver/nightly.py
-#, python-format
-msgid "ERROR: unsupported git host \"%s\", patches welcome!"
-msgstr ""
-
-#: ../fdroidserver/lint.py
+#: ../fdroidserver/metadata.py
 #, python-brace-format
-msgid "ERROR: {key} in {path} is not \"archive\" or \"repo\"!"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "ERROR: {key} not a valid key!"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "ERROR: {key}'s value should be of type {t}!"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "ERROR: {key}:{subkey} in {path} is not in allowed keys: {allowed_keys}!"
-msgstr ""
+msgid "Empty build flag at {linedesc}"
+msgstr "{linedesc}ལ་ཡོད་པའི་བཟོ་དར་སྟོང་པ།"
 
 #: ../fdroidserver/__main__.py
 #, python-brace-format
@@ -687,40 +699,20 @@ msgstr ""
 "ཨེན་ཀྲོཌ་SDKགྱི་ལམ་འདིར་ཡོད་པས་ནང་འཛུལ་བྱེད། (%s) :\n"
 "> "
 
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Environment variable {var} from {configname} is not set!"
-msgstr ""
+#: ../fdroidserver/deploy.py ../fdroidserver/checkupdates.py
+#: ../fdroidserver/upload.py
+#, fuzzy, python-format
+msgid "Error while attempting to publish log: %s"
+msgstr "རེ་པོ་ཁ་བྱང་ལེན་སྐབས་ནོར་སྐྱོན།: %s"
 
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Environment variable {{env: {var}}} is not set!"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "Error deploying 'github_releases', {} not present. (You might need to run `fdroid update` first.)"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py ../fdroidserver/common.py
 msgid "Error while getting repo address"
 msgstr "རེ་པོ་ཁ་བྱང་ལེན་སྐབས་ནོར་སྐྱོན།"
 
-#: ../fdroidserver/scanner.py
-msgid "Exit with a non-zero code if problems were found"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Extract application metadata from a source repository"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Extract signatures from APKs"
 msgstr "APKs ནས་མིང་རྟགས་ཕྱིར་སྟོན་བྱེད།"
 
-#: ../fdroidserver/install.py
-msgid "F-Droid.apk could not be downloaded from any known source!"
-msgstr ""
-
 #: ../fdroidserver/update.py
 #, fuzzy, python-brace-format
 msgid "Failed copying {path}: {error}"
@@ -741,35 +733,43 @@ msgstr "ཀློག་མི་ཐུབ།{path}: {error}"
 msgid "Failed resizing {path}: {error}"
 msgstr "ཆེ་ཆུང་སྐྱར་སྒྲིག་ཐུབ་མ་སོང་། {path}: {error}"
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/publish.py
+msgid "Failed to align application"
+msgstr "མཉེན་ཆས་ཡོད་རྣམས་ཕྱོགས་སྒྲིག་བྱེད་ཐུབ་མ་སོང་།"
+
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Failed to create S3 bucket: {url}"
 msgstr "S3 དྲྭ་སྣོད་བཟོས་ཐུབ་མ་སོང་། :{url}"
 
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Failed to get APK information, deleting {path}"
-msgstr "APK གནས་ཚུལ་རག་གི་མིན་འདུག {path}སུབ་བཞིན་པ།"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Failed to get APK information, skipping {path}"
-msgstr "APK གནས་ཚུལ་རག་གི་མིན་འདུག {path}མཆོང་།"
-
-#: ../fdroidserver/update.py
-#, fuzzy
-msgid "Failed to get APK signing key fingerprint"
+#: ../fdroidserver/common.py
+msgid "Failed to get APK manifest information"
 msgstr "APKནང་གསལ་བའི་གནས་ཚུལ་རྣམས་ལེན་ཐུབ་མ་སོང་།"
 
+#: ../fdroidserver/update.py
+#, python-brace-format
+msgid "Failed to get apk information, deleting {path}"
+msgstr "apk གནས་ཚུལ་རག་གི་མིན་འདུག {path}སུབ་བཞིན་པ།"
+
+#: ../fdroidserver/update.py
+#, python-brace-format
+msgid "Failed to get apk information, skipping {path}"
+msgstr "apk གནས་ཚུལ་རག་གི་མིན་འདུག {path}མཆོང་།"
+
 #: ../fdroidserver/install.py
 #, python-brace-format
 msgid "Failed to install '{apkfilename}' on {dev}: {error}"
 msgstr "སྒྲིག་བཅུག་བྱེད་མ་སོང་། '{apkfilename}' སྒང་ལ་ {dev}: {error}"
 
-#: ../fdroidserver/common.py
+#: ../fdroidserver/publish.py ../fdroidserver/common.py
 msgid "Failed to sign application"
 msgstr "མཉེན་ཆས་མིང་རྟགས་བཀོད་མིན་འདུག"
 
+#: ../fdroidserver/common.py
+#, fuzzy
+msgid "Failed to zipalign application"
+msgstr "མཉེན་ཆས་ཡོད་རྣམས་ཕྱོགས་སྒྲིག་བྱེད་ཐུབ་མ་སོང་།"
+
 #: ../fdroidserver/build.py
 #, python-brace-format
 msgid "Fetched buildserverid from VM: {buildserverid}"
@@ -785,12 +785,22 @@ msgstr "'{apkfilename}' ཆེད་དུ་མིང་རྟགས་འཚ
 msgid "File disappeared while processing it: {path}"
 msgstr ""
 
-#: ../fdroidserver/build.py ../fdroidserver/install.py
-#: ../fdroidserver/rewritemeta.py ../fdroidserver/scanner.py
-#: ../fdroidserver/update.py
+#: ../fdroidserver/verify.py ../fdroidserver/stats.py ../fdroidserver/update.py
+#: ../fdroidserver/rewritemeta.py ../fdroidserver/build.py
+#: ../fdroidserver/checkupdates.py ../fdroidserver/scanner.py
+#: ../fdroidserver/install.py
 msgid "Finished"
 msgstr "ཚར་སོང་།"
 
+#: ../fdroidserver/lint.py
+msgid "Flattr donation methods belong in the FlattrID flag"
+msgstr "Flattr ཞལ་འདེབས་ཐབས་ལམ་འདི་བཞིན་FlattrID flag ལ་ཐོབ་ཀྱི་ཡོད་།"
+
+#: ../fdroidserver/lint.py
+#, fuzzy
+msgid "Flattr donation methods belong in the FlattrID: field"
+msgstr "Flattr ཞལ་འདེབས་ཐབས་ལམ་འདི་བཞིན་FlattrID flag ལ་ཐོབ་ཀྱི་ཡོད་།"
+
 #: ../fdroidserver/lint.py
 msgid "Forbidden HTML tags"
 msgstr ""
@@ -822,6 +832,7 @@ msgstr ""
 msgid "Found invalid appids in arguments"
 msgstr "རྩོད་པའི་ནང་ཁུངས་ལྡན་མིན་པའི་appids རྙེད་འདུག"
 
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
 #: ../fdroidserver/common.py
 msgid "Found invalid versionCodes for some apps"
 msgstr "མཉེན་ཆས་ཁ་ཤས་ཀྱི་ཁུངས་ལྡན་མིན་པའི་ཐོན་རིམ་ཨང་རྟགས་རྙེད་འདུག"
@@ -831,11 +842,6 @@ msgstr "མཉེན་ཆས་ཁ་ཤས་ཀྱི་ཁུངས་ལྡ
 msgid "Found multiple JAR Signature Block Files in {path}"
 msgstr "{path}ནང་ལ་སྣ་མང་མིང་རྟགས་ཆོག་མཆན་ལག་ཁྱེར་རྙེད་སོང་།"
 
-#: ../fdroidserver/common.py
-#, fuzzy
-msgid "Found multiple Signer Certificates!"
-msgstr "མཛོད་ཁང་ཆེད་དུ་་མིང་རྟགས་བཀོད་པའི་ལག་ཁྱེར་མང་པོ་རྙེད་འདུག."
-
 #: ../fdroidserver/metadata.py
 #, python-brace-format
 msgid "Found multiple metadata files for {appid}"
@@ -845,6 +851,11 @@ msgstr "རྒྱབ་ལྗོངས་ཡིག་ཚགས་སྣ་མང
 msgid "Found multiple signing certificates for repository."
 msgstr "མཛོད་ཁང་ཆེད་དུ་་མིང་རྟགས་བཀོད་པའི་ལག་ཁྱེར་མང་པོ་རྙེད་འདུག."
 
+#: ../fdroidserver/update.py
+#, python-brace-format
+msgid "Found multiple signing certificates in {path}"
+msgstr "{path}ནང་ལ་སྣ་མང་མིང་རྟགས་ཆོག་མཆན་ལག་ཁྱེར་རྙེད་སོང་།"
+
 #: ../fdroidserver/index.py
 msgid "Found no signing certificates for repository."
 msgstr "མཛོད་ཁང་ཆེད་དུ་མིང་རྟགས་བཀོད་པའི་ལག་ཁྱེར་རྙེད་མ་སོང་།."
@@ -859,16 +870,6 @@ msgstr "འདི་ལ་%s 1 ཡིག་ཆ་མིན་པ་རྙེད
 msgid "Found {apkfilename} at {url}"
 msgstr "{url} ནང་ལ་ {apkfilename}ཤུས་བཞིན་པ།"
 
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Found {count} problems in {filename}"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Found {count} warnings in {filename}"
-msgstr ""
-
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Generated skeleton metadata for {appid}"
@@ -887,22 +888,19 @@ msgstr "གིཊ་གཙང་བཟོ་ཐུབ་མ་སོང་།"
 msgid "Git fetch failed"
 msgstr "གིཊ་འཚོལ་ཐུབ་མ་སོང་།"
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
+#: ../fdroidserver/common.py
+msgid "Git remote set-head failed"
+msgstr "གིཊ་རྒྱང་ཐག་སྒྲིག་འགོ་ཐུབ་མ་སོང་།"
+
 #: ../fdroidserver/common.py
 #, python-format
 msgid "Git remote set-head failed: \"%s\""
 msgstr ""
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
 #: ../fdroidserver/common.py
 msgid "Git reset failed"
 msgstr "གིཊ་སྐྱར་སྒྲིག་ཐུབ་མ་སོང་།"
 
-#: ../fdroidserver/common.py
-#, fuzzy
-msgid "Git submodule deinit failed"
-msgstr "གིཊ་ཡན་ལག་རྒྱ་ཁྱོན་གསར་བསྒྱུར་ཐུབ་མ་སོང་།"
-
 #: ../fdroidserver/common.py
 msgid "Git submodule sync failed"
 msgstr "གིཊ་རྒྱ་ཁྱོན་མཉམ་བསྲེ་ཐུབ་མ་སོང་།"
@@ -934,16 +932,6 @@ msgstr ""
 msgid "Ignoring FUNDING.yml entry longer than 2048: %s"
 msgstr ""
 
-#: ../fdroidserver/update.py
-#, python-format
-msgid "Ignoring bad element in manifest: %s"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Ignoring deprecated {oldfile}, use {newfile}!"
-msgstr ""
-
 #: ../fdroidserver/index.py
 msgid "Ignoring package without metadata: "
 msgstr "རྒྱབ་ལྗོངས་ཡིག་ཆ་མེད་པའི་ཐུམ་སྒྲིལ་ཡ་ལན་མ་བྱས། "
@@ -953,6 +941,11 @@ msgstr "རྒྱབ་ལྗོངས་ཡིག་ཆ་མེད་པའི
 msgid "Ignoring stale cache data for {apkfilename}"
 msgstr "{apkfilename}ཡིག་ཆ་སྦས་ཁུང་རྙིང་པ་ལ་ཡ་ལན་མ་བྱས་"
 
+#: ../fdroidserver/rewritemeta.py
+#, python-brace-format
+msgid "Ignoring {ext} file at '{path}'"
+msgstr "{ext} ཡིག་ལ་ཡ་ལན་མེད་པ་ '{path}'"
+
 #: ../fdroidserver/update.py
 msgid "Include APKs that are signed with disabled algorithms like MD5"
 msgstr "MD5ལྟ་བུའི་མཚན་རྟགས་ཡོད་པའི་APKs ནང་ཚུད།"
@@ -969,16 +962,6 @@ msgstr ""
 msgid "Include the source tarballs in the mirror"
 msgstr ""
 
-#: ../fdroidserver/metadata.py
-#, python-format
-msgid "Including metadata from %s@%s"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Including metadata from {path}"
-msgstr ""
-
 #: ../fdroidserver/common.py
 msgid "Initialising submodules"
 msgstr "ཐོག་མིའི་ཡན་ལག་རྒྱ་ཁྱོན།"
@@ -987,7 +970,7 @@ msgstr "ཐོག་མིའི་ཡན་ལག་རྒྱ་ཁྱོན།
 msgid "Install all signed applications available"
 msgstr "ཡོད་བཞིན་པའི་མིང་རྟགས་བཀོད་པའི་མཉེན་ཆས་ཆ་ཚང་འགྲིག་བཅུག་བྱེད།"
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Install built packages on devices"
 msgstr "ཡོ་བྱད་སྒང་གི་ཐུམ་སྒྲིལ་བཟོས་པ་རྣམས་འགྲིག་བཅུག་བྱེད།"
 
@@ -996,12 +979,22 @@ msgstr "ཡོ་བྱད་སྒང་གི་ཐུམ་སྒྲིལ་
 msgid "Installing %s..."
 msgstr "སྒྲིག་བཅུག་བྱེད་བཞིན་པ།%s 1…"
 
+#: ../fdroidserver/install.py
+#, python-format
+msgid "Installing %s…"
+msgstr "སྒྲིག་བཅུག་བྱེད་བཞིན་པ།%s 1…"
+
 #: ../fdroidserver/install.py
 #, fuzzy, python-brace-format
 msgid "Installing '{apkfilename}' on {dev}..."
 msgstr "'{apkfilename}' སྒྲིག་བཅུག་བྱེད་བཞིན་པ{dev}གྱི་སྒང་ལ་…"
 
-#: ../fdroidserver/__main__.py
+#: ../fdroidserver/install.py
+#, python-brace-format
+msgid "Installing '{apkfilename}' on {dev}…"
+msgstr "'{apkfilename}' སྒྲིག་བཅུག་བྱེད་བཞིན་པ{dev}གྱི་སྒང་ལ་…"
+
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Interact with the repo HTTP server"
 msgstr "རེ་པོ་HTTP ཞབས་ཞུ་འཕྲུལ་ཆས་དང་ཐུགས་ཕྲད།"
 
@@ -1009,36 +1002,53 @@ msgstr "རེ་པོ་HTTP ཞབས་ཞུ་འཕྲུལ་ཆས་
 msgid "Invalid APK"
 msgstr "ཁུངས་ལྡན་མིན་པའི་APK"
 
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "Invalid AutoUpdateMode: {mode}"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "Invalid UpdateCheckMode: {mode}"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
+#: ../fdroidserver/lint.py ../fdroidserver/checkupdates.py
 #, python-brace-format
 msgid "Invalid VercodeOperation: {field}"
 msgstr ""
 
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Invalid VercodeOperation: {invalid_ops}"
-msgstr ""
-
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
 #: ../fdroidserver/common.py
 #, fuzzy, python-brace-format
 msgid "Invalid application ID {appid}"
 msgstr "ལས་ཀ་བྱེད་བཞིན་པ།{appid}"
 
+#: ../fdroidserver/metadata.py
+#, python-format
+msgid "Invalid boolean '%s'"
+msgstr "ཁུངས་ལྡན་མིན་པའི་boolean '%s 1'"
+
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Invalid build flag at {line} in {linedesc}"
+msgstr "{linedesc}ནང་གི་ཁུངས་ལྡན་མིན་པའི་བཟོ་དར་{line}"
+
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Invalid build format: {value} in {name}"
+msgstr "ཁུངས་ལྡན་མིན་པའི་བཟོ་སྐྲུན་སྒྲིག་བཀོད།: {value} ནང་ {name}"
+
 #: ../fdroidserver/lint.py
 msgid "Invalid bulleted list"
 msgstr "ཚད་ལྡན་མིན་པའི་ཚགས་ཀྱི་ཐོ་གཞུང་།"
 
+#: ../fdroidserver/lint.py
+#, python-format
+msgid "Invalid license tag \"%s\"! Use only tags from https://spdx.org/license-list"
+msgstr "ཁུངས་ལྡན་མིན་པའི་ཆོག་མཆན་ལག་ཁྱེར་སྦྱར་ \"%s 1\"! https://spdx.org/license-list ཁོ་ན་ནས་ཡིན་པ་སྦྱར་ཏེ་བེད་སྤྱོད་བྱེད་།"
+
+#: ../fdroidserver/lint.py
+msgid "Invalid link - use [http://foo.bar Link title] or [http://foo.bar]"
+msgstr "ཁུངས་ལྡན་མིན་པའི་སྦྲེལ་མཐུད།  - [http://foo.bar Link title] or [http://foo.bar]བེད་སྤྱོད་བྱེད།"
+
+#: ../fdroidserver/metadata.py
+#, python-format
+msgid "Invalid metadata in %s:%d"
+msgstr "ཁུངས་ལྡན་མིན་པའི་རྒྱབ་ལྗོངས་ཡིག་ཆའི་ནང་།%s 1:%d 2"
+
+#: ../fdroidserver/metadata.py
+msgid "Invalid metadata in: "
+msgstr "ཁུངས་ལྡན་མིན་པའི་རྒྱབ་ལྗོངས་ཡིག་ཆའི་ནང་: "
+
 #: ../fdroidserver/common.py
 #, python-format
 msgid "Invalid name for published file: %s"
@@ -1046,8 +1056,8 @@ msgstr "པར་སྐྲུན་ཡིག་ཆའི་ཆེད་དུ་
 
 #: ../fdroidserver/common.py
 #, python-brace-format
-msgid "Invalid ndk: entry in build: \"{ndk}\""
-msgstr ""
+msgid "Invalid package name {0}"
+msgstr "ཁུངས་ལྡན་མིན་པའི་ཐུམ་སྒྲིལ་གྱི་མིང་།{0}"
 
 #: ../fdroidserver/common.py
 #, python-brace-format
@@ -1069,6 +1079,11 @@ msgstr ""
 msgid "Invalid srclib metadata: unknown key '{key}' in '{file}'"
 msgstr ""
 
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Invalid versionCode: \"{versionCode}\" is not an integer!"
+msgstr "ཁུངས་ལྡན་མིན་པའི་ཐོན་རིམ་ཨང་རྟགས: \"{versionCode}\" གོང་བུ་མ་རེད།!"
+
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "JAR signature failed to verify: {path}"
@@ -1083,8 +1098,8 @@ msgstr ""
 msgid "Java JAR file"
 msgstr ""
 
-#: ../fdroidserver/mirror.py ../fdroidserver/publish.py
-#: ../fdroidserver/update.py
+#: ../fdroidserver/publish.py ../fdroidserver/update.py
+#: ../fdroidserver/mirror.py
 msgid "Java JDK not found! Install in standard location or set java_paths!"
 msgstr "Java JDK རྙེད་མ་སོང་།! ཚད་ལྡན་གྱི་ས་གནས་ནང་སྒྲིག་བཅུག་བྱེད་པའམ་ཡང་ན་java_paths སྒྲིག!"
 
@@ -1100,19 +1115,10 @@ msgstr "Java jarsigner རྙེད་མ་སོང་། !ཚད་ལྡན
 msgid "Javascript in HTML src attributes"
 msgstr ""
 
-#: ../fdroidserver/build.py
-#, fuzzy, python-brace-format
-msgid "Keeping failed build \"{apkfilename}\""
-msgstr "ཐུམ་སྒྲིལ་གྱི་མིང་ཀློག་བཞིནཔ།/ཐོན་རིམ་ཨང་རྟགས་/ཐོན་རིམ་གྱི་མིང་བདེ་སྤྱོད་མེད། APK ཁུངས་ལྡན་མིན།: '{apkfilename}'"
-
 #: ../fdroidserver/init.py
 msgid "Keystore for signing key:\t"
 msgstr "མིང་རྟགས་བཀོད་པའི་ལྡེ་མིག་ཆེད་དུ་སྟོན་པའི་ལྡེ་མིག་གསོག་ཉར་ཁང་གི་ལམ།\t"
 
-#: ../fdroidserver/lint.py
-msgid "Known debug key is used in AllowedAPKSigningKeys: "
-msgstr ""
-
 #: ../fdroidserver/lint.py
 #, fuzzy, python-brace-format
 msgid "Last used commit '{commit}' looks like a tag, but UpdateCheckMode is '{ucm}'"
@@ -1123,9 +1129,13 @@ msgstr "ཁས་ལེན་བྱས་པའི་བེད་སྤྱོད
 msgid "Liberapay donation methods belong in the Liberapay: field"
 msgstr "Flattr ཞལ་འདེབས་ཐབས་ལམ་འདི་བཞིན་FlattrID flag ལ་ཐོབ་ཀྱི་ཡོད་།"
 
-#: ../fdroidserver/rewritemeta.py
+#: ../fdroidserver/lint.py
 #, fuzzy
-msgid "List files that would be reformatted (dry run)"
+msgid "Liberapay donation methods belong in the LiberapayID flag"
+msgstr "Flattr ཞལ་འདེབས་ཐབས་ལམ་འདི་བཞིན་FlattrID flag ལ་ཐོབ་ཀྱི་ཡོད་།"
+
+#: ../fdroidserver/rewritemeta.py
+msgid "List files that would be reformatted"
 msgstr "སྐྱར་དུ་བཀོད་སྒྲིག་བྱེད་དགོས་པའི་ཡག་ཆ་རྣམས་ཀྱི་ཐོ་གཞུང་།"
 
 #: ../fdroidserver/lint.py
@@ -1144,16 +1154,6 @@ msgstr "བཟོ་ལྟ་མེད་པའི་མཛོད་ཁང་ཤ
 msgid "Malformed serverwebroot line:"
 msgstr "བཟོ་ལྟ་ཤོར་བའི་ serverwebroot line:"
 
-#: ../fdroidserver/scanner.py
-#, python-format
-msgid "Max recursion depth in ZIP file reached: %s"
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "Mirror config for {url} contains \"isPrimary\" key!"
-msgstr ""
-
 #: ../fdroidserver/mirror.py
 msgid "Mirror the full repo and archive, all file types."
 msgstr ""
@@ -1162,30 +1162,31 @@ msgstr ""
 msgid "Missing output directory"
 msgstr "ཕྱོགས་དེབ་ཐོན་སྐྱེད་བོར་བརླག"
 
-#: ../fdroidserver/metadata.py
-msgid "Moving Anti-Features declarations to localized files:"
-msgstr ""
+#: ../fdroidserver/lint.py
+#, python-format
+msgid "Name '%s' is just the auto name - remove it"
+msgstr "མིང་། '%s 1'  ནི་རང་མིང་ཁོ་ན་རེད་། - མེད་པ་བཟོས།"
 
-#: ../fdroidserver/index.py
-msgid "Neither \"repo_pubkey\" nor \"keystorepass\" set in config.yml"
-msgstr ""
-
-#: ../fdroidserver/verify.py
-#, fuzzy, python-format
-msgid "No APK for package: %s"
-msgstr "ཐུམ་སྒྲིལ་དེ་འདྲ་མིན་འདུག: %s 1"
+#: ../fdroidserver/common.py
+msgid "No 'config.py' found, using defaults."
+msgstr "'config.py' རྙེད་མ་སོང་།, སོར་བཞག་བེད་སྤྱོད་བྱེད་བཞིན་པ།."
 
 #: ../fdroidserver/common.py
 msgid "No Android SDK found!"
 msgstr "ཨེན་ཀྲོཌ་ SDK རྙེད་མ་སོང་།!"
 
+#: ../fdroidserver/import.py
+msgid "No android or kivy project could be found. Specify --subdir?"
+msgstr "ཨེན་ཀྲོཌ་དང་ཡང་ན་ཀི་བི་ལས་འཆར་གང་ཡང་རྙེད་ས་མ་རེད། དམིགས་སྟོན་བྱེད་--subdir?"
+
 #: ../fdroidserver/install.py
 msgid "No attached devices found"
 msgstr "ཟུར་སྣོན་ཡོ་བྱད་རྙེད་མ་སོང་།"
 
-#: ../fdroidserver/install.py
-msgid "No devices found for `adb install`! Please plug one in."
-msgstr ""
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "No commit specified for {versionName} in {linedesc}"
+msgstr "{linedesc} ནང་གྱི་ {versionName}འདིའི་ཆེད་དུ་ཁས་ལེན་དམིགས་བསལ་གང་ཡང་མིན་འདུག"
 
 #: ../fdroidserver/index.py
 msgid "No fingerprint in URL."
@@ -1195,25 +1196,15 @@ msgstr "URL ནང་ལག་མཐིལ་པར་ཤུས་རྙེད
 msgid "No git submodules available"
 msgstr "གིཊ་ཡན་ལག་རྒྱ་ཁྱོན་མིན་འདུག"
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 #, fuzzy
 msgid "No gradle project could be found. Specify --subdir?"
 msgstr "ཨེན་ཀྲོཌ་དང་ཡང་ན་ཀི་བི་ལས་འཆར་གང་ཡང་རྙེད་ས་མ་རེད། དམིགས་སྟོན་བྱེད་--subdir?"
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py ../fdroidserver/common.py
 msgid "No information found."
 msgstr "གནས་ཚུལ་རྙེད་མ་སོང་།."
 
-#: ../fdroidserver/checkupdates.py
-#, fuzzy
-msgid "No matching tags found"
-msgstr "གནས་ཚུལ་རྙེད་མ་སོང་།"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "No minimum SDK version found in {0}, using default (3)."
-msgstr ""
-
 #: ../fdroidserver/lint.py
 msgid "No need to specify that the app is Free Software"
 msgstr "མཉེས་ཆས་འདི་རིན་མེད་མཉེན་ཆས་ཡིན་པ་དམིགས་སྟོན་བྱེད་དགོས་དོན་མེད་།"
@@ -1223,8 +1214,8 @@ msgid "No need to specify that the app is for Android"
 msgstr "མཉེན་ཆས་འདི་ཨེན་ཀྲོཌ་ཆེད་དུ་ཡིན་པ་དམིགས་སྟོན་བྱེད་དགོས་དོན་མེད།"
 
 #: ../fdroidserver/deploy.py
-msgid "No option set! Edit your config.yml to set at least one of these:"
-msgstr "གདམ་ཀ་མེད་པ་སྒྲིག།! ཁྱེད་རང་གི་config.yml འདིའི་ནང་ནས་མ་མཐའ་ཡིན་ཡང་གང་རུང་ཞིག་རྩོམ་སྒྲིག་བྱེད་:"
+msgid "No option set! Edit your config.py to set at least one of these:"
+msgstr "གདམ་ཀ་མེད་པ་སྒྲིག།! ཁྱེད་རང་གི་config.py འདིའི་ནང་ནས་མ་མཐའ་ཡིན་ཡང་གང་རུང་ཞིག་རྩོམ་སྒྲིག་བྱེད་:"
 
 #: ../fdroidserver/common.py
 msgid "No packages specified"
@@ -1232,14 +1223,14 @@ msgstr "ཐུམ་སྒྲིལ་དམིགས་སྟོན་བྱེ
 
 #: ../fdroidserver/install.py
 #, python-format
-msgid "No signed APK available for %s"
-msgstr "%s 1ཆེད་དུ་མིང་རྟགས་བཀོད་པའི་ APK མེད།"
+msgid "No signed apk available for %s"
+msgstr "%s 1ཆེད་དུ་མིང་རྟགས་བཀོད་པའི་ apk མེད།"
 
 #: ../fdroidserver/install.py
 msgid "No signed output directory - nothing to do"
 msgstr "མིང་རྟགས་མ་བཀོད་པའི་ཕྱོགས་དེབ་ཐོན་སྐྱེད། -བྱ་རྒྱུ་གང་ཡང་མེད།"
 
-#: ../fdroidserver/common.py
+#: ../fdroidserver/update.py ../fdroidserver/common.py
 #, python-brace-format
 msgid "No signing certificates found in {path}"
 msgstr "{path}མིང་རྟགས་བཀོད་པའི་ཆོག་མཆན་ལག་ཁྱེར་འདིའི་ནང་རྙེད་མ་སོང་།"
@@ -1249,25 +1240,16 @@ msgstr "{path}མིང་རྟགས་བཀོད་པའི་ཆོག་
 msgid "No such package: %s"
 msgstr "ཐུམ་སྒྲིལ་དེ་འདྲ་མིན་འདུག: %s 1"
 
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "No such versionCode {versionCode} for app {appid}"
-msgstr "ཐོན་རིམ་ཨང་རྟགས་དེ་འདྲ་མིན་འདུག {versionCode} མཉེན་ཆས་ཆེད་དུ།{appid}"
+msgstr "ཐོན་རིམ་ཨང་རྟགས་དེ་འདྲ་མིན་འདུག {versionCode}  མཉེན་ཆས་ཆེད་དུ།{appid}"
 
-#: ../fdroidserver/checkupdates.py
-#, fuzzy
-msgid "No tags found"
-msgstr "ཟུར་སྣོན་ཡོ་བྱད་རྙེད་མ་སོང་།"
-
-#: ../fdroidserver/publish.py ../fdroidserver/verify.py
+#: ../fdroidserver/verify.py ../fdroidserver/publish.py
 msgid "No unsigned directory - nothing to do"
 msgstr "མིང་རྟགས་མ་བཀོད་པའི་ཕྱོགས་དེབ་མིན་འདུག-བྱ་རྒྱུ་གང་ཡང་མེད།"
 
-#: ../fdroidserver/__main__.py
-#, fuzzy
-msgid "No version information could be found."
-msgstr "ཆ་རྒྱུས་མེད་པའི་དམིགས་བསལ་ཞིག་རྙེད་སོང་།"
-
 #: ../fdroidserver/common.py
 msgid "Not a valid size definition: \"{}\""
 msgstr ""
@@ -1282,9 +1264,11 @@ msgid "Nothing to do for {appid}."
 msgstr "{appid} ཆེད་དུ་བྱ་རྒྱུ་གང་ཡང་མེད་།."
 
 #: ../fdroidserver/init.py
-msgid "Now set these in config.yml:"
-msgstr ""
+#, fuzzy
+msgid "Now set these in config.py:"
+msgstr "'sdk_path' འདི་ 'config.py' ནང་སྒྲིག་ཐུབ་མ་སོང་།!"
 
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "OBB file has newer versionCode({integer}) than any APK:"
@@ -1302,28 +1286,23 @@ msgstr "OBB's ཐུམ་སྒྲིལ་མིང་འདིས་APK ར
 msgid "Offline machine, skipping git mirror generation until `fdroid deploy`"
 msgstr ""
 
-#: ../fdroidserver/deploy.py
-msgid "One of the 'github_releases' config items is missing the 'packageNames' value. skipping ..."
+#: ../fdroidserver/common.py
+#, python-brace-format
+msgid "Old APK signature failed to verify: {path}"
 msgstr ""
 
-#: ../fdroidserver/deploy.py
-msgid "One of the 'github_releases' config items is missing the 'projectUrl' value. skipping ..."
+#: ../fdroid ../fdroidserver/__main__.py
+msgid "Old, deprecated name for fdroid deploy"
 msgstr ""
 
-#: ../fdroidserver/deploy.py
-msgid "One of the 'github_releases' config items is missing the 'token' value. skipping ..."
-msgstr ""
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Only PNG and JPEG are supported for graphics, found: {path}"
 msgstr "PNG དང་ JPEG ཁོ་ན་བརྐོས་རིས་རྒྱབ་སྐྱོར་རྙེད་སོང་། :{path}"
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/common.py
-msgid "Only accepts a single key \"env\""
-msgstr ""
+#: ../fdroidserver/checkupdates.py
+msgid "Only print differences with the Play Store"
+msgstr "མཉེས་ཆས་གསོག་ཉར་ཁང་དང་མི་འདྲ་པ་ཡོད་པ་ཁོ་ནར་པར་ཤུས་བྱེད།"
 
 #: ../fdroidserver/checkupdates.py
 msgid "Only process apps with auto-updates"
@@ -1334,6 +1313,11 @@ msgstr "མཉེན་ཆས་ཁོ་ནར་རང་འགུལ་གས
 msgid "OpenCollective donation methods belong in the OpenCollective: field"
 msgstr "Flattr ཞལ་འདེབས་ཐབས་ལམ་འདི་བཞིན་FlattrID flag ལ་ཐོབ་ཀྱི་ཡོད་།"
 
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "Options"
+msgstr "གདམ་ཀ།"
+
 #: ../fdroidserver/verify.py
 msgid "Output JSON report to file named after APK."
 msgstr ""
@@ -1342,22 +1326,26 @@ msgstr ""
 msgid "Output JSON to stdout."
 msgstr ""
 
-#: ../fdroidserver/checkupdates.py ../fdroidserver/gpgsign.py
-#: ../fdroidserver/publish.py ../fdroidserver/signindex.py
-#: ../fdroidserver/update.py
+#: ../fdroidserver/gpgsign.py ../fdroidserver/publish.py
+#: ../fdroidserver/update.py ../fdroidserver/signindex.py
+#: ../fdroidserver/checkupdates.py
 msgid "Outputting JSON"
 msgstr ""
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "Overall license of the project."
 msgstr "ལས་འཆར་འདིའི་ཁྱོན་ཡོངས་ཀྱི་ཆོག་མཆན་ལག་ཁྱེར།."
 
+#: ../fdroidserver/dscanner.py
+msgid "Override path for repo APKs (default: ./repo)"
+msgstr "རེ་པོ་APKs ལམ་གྱི་སྒང་ལ་སྐྱར་སྣོན། (སོར་བཞག་: ./repo)"
+
 #: ../fdroidserver/index.py
 #, python-brace-format
 msgid "Overriding blank versionName in {apkfilename} from metadata: {version}"
 msgstr ""
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 #, python-brace-format
 msgid "Package \"{appid}\" already exists"
 msgstr ""
@@ -1371,10 +1359,13 @@ msgstr "'{path}'འདིའི་ནང་དབྱེ་མཚམས་མང
 msgid "Password required with username"
 msgstr "སྤྱོད་མིང་དང་མཉམ་དུ་གསང་ཨང་དགོས།"
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "Path to main Android project subdirectory, if not in root."
 msgstr "གལ་སྲིད་ཆོག་མཆན་ཨ་མའི་ནང་ལ་མེད་ན། ལམ་གྱི་གཙོ་བོ་འདི་ཨེན་ཀྲོཌ་ལས་འཆར་གྱི་ཕྱོགས་དེབ་ཡན་ལག་སྟོན་ཡོད།."
 
+msgid "Path to main android project subdirectory, if not in root."
+msgstr "གལ་སྲིད་ཆོག་མཆན་ཨ་མའི་ནང་ལ་མེད་ན། ལམ་གྱི་གཙོ་བོ་འདི་ཨེན་ཀྲོཌ་ལས་འཆར་གྱི་ཕྱོགས་དེབ་ཡན་ལག་སྟོན་ཡོད།."
+
 #: ../fdroidserver/init.py
 msgid "Path to the Android SDK (sometimes set in ANDROID_HOME)"
 msgstr "ཨེན་ཀྲོཌ་SDK ཀྱི་ལམ། (སྐབས་རེ་ཨེན་ཀྲོཌ_ཁྱིམ་དུ་སྒྲིག་ཡོད།)"
@@ -1387,19 +1378,21 @@ msgstr "གིཊ་རེ་པོའི་ཆེད་དུ་བདེ་ས
 msgid "Path to the keystore for the repo signing key"
 msgstr "རེ་པོ་མིང་རྟགས་བཀོད་པའི་ལྡེ་མིག་ཆེད་དུ་སྟོན་པའི་ལྡེ་མིག་གསོག་ཉར་ཁང་གི་ལམ།"
 
+#: ../fdroidserver/dscanner.py
+msgid "Prepare Drozer to run a scan"
+msgstr "འཚག་རྒྱབ་འཁོར་སྐྱོད་ཐུབ་པའི་ཆེད་དུ་ཌོ་ཛར་གྲ་སྒྲིག་བྱེད།"
+
+msgid "Prepare drozer to run a scan"
+msgstr "འཚག་རྒྱབ་འཁོར་སྐྱོད་ཐུབ་པའི་ཆེད་དུ་ཌོ་ཛར་གྲ་སྒྲིག་བྱེད།"
+
 #: ../fdroidserver/nightly.py
 msgid "Print the secret variable to the terminal for easy copy/paste"
 msgstr "ས་ཚིགས་ཀྱི་གསང་ཁྱབ་ངོ་བཤུས་དང་/སྦྱར་བ་སྟབས་བདེ་ཡོང་བའི་ཆེད་དུ་འདྲ་བཤུས་"
 
-#: ../fdroidserver/install.py
+#: ../fdroidserver/metadata.py
 #, python-brace-format
-msgid "Privacy mode was enabled based on your locale ({country_code})."
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-format
-msgid "Problem with ZIP file: %s, error %s"
-msgstr ""
+msgid "Problem with description of {appid}: {error}"
+msgstr "{appid}འགྲེལ་བཤད་རྒྱབ་རྒྱུར་དཀའ་ངལ། : {error}"
 
 #: ../fdroidserver/common.py
 #, python-brace-format
@@ -1424,7 +1417,11 @@ msgstr "ལས་ཀ་བྱེད་བཞིན་པ།{appid}"
 msgid "Produce human-readable XML/JSON for index files"
 msgstr "མིས་ཀློག་ཐུབ་པའི་XML/JSON ཕྱོགས་སྟོན་གྱི་ཡིག་ཆ་བཟོས།"
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/update.py
+msgid "Produce human-readable index.xml"
+msgstr "མིས་ཀློག་ཐུབ་པའི་index.xml བཟོས།"
+
+#: ../fdroidserver/import.py
 msgid "Project URL to import from."
 msgstr "URL ལས་འཆར་ནང་འདྲེན།."
 
@@ -1436,25 +1433,21 @@ msgstr "ཡི་གེའི་བར་རྟགས་རིགས་ངེས
 msgid "Push the log to this git remote repository"
 msgstr "ཐོ་གཞུད་འདི་གིཊ་ཐག་རིང་གི་མཛོད་ཁང་ནང་འབུད་རྒྱག་གཏོང་།"
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Pushing binary transparency log to {url}"
 msgstr "{url}ཆེད་དུ་ཨང་གྲངས་ཀྱི་ཐོ་གཞུང་གསར་བསྒྱུར།"
 
-#: ../fdroidserver/deploy.py
-msgid "Pushing to remote server failed!"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Pushing to {url}"
 msgstr "{url}ཕྱོགས་ལ་འབུད་རྒྱབ་རྒྱོབ།"
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Quickly start a new repository"
 msgstr "མཛོད་ཁང་གསར་པ་ཞིག་མྱུར་དུ་འགོ་བཙུགས།"
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Read all the metadata files and exit"
 msgstr "ཡིག་ཚགས་ཀྱི་རྒྱབ་ལྗོངས་ལོ་རྒྱུས་ཀློག་ནས་ཕྱིར་ཐོན།"
 
@@ -1464,13 +1457,15 @@ msgid "Reading '{config_file}'"
 msgstr "ཀློག་བཞིན་པ་། '{config_file}'"
 
 #: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Reading packageName/versionCode/versionName failed, APK invalid: '{apkfilename}'"
+#, fuzzy, python-brace-format
+msgid "Reading minSdkVersion failed: \"{apkfilename}\""
 msgstr "ཐུམ་སྒྲིལ་གྱི་མིང་ཀློག་བཞིནཔ།/ཐོན་རིམ་ཨང་རྟགས་/ཐོན་རིམ་གྱི་མིང་བདེ་སྤྱོད་མེད། APK ཁུངས་ལྡན་མིན།: '{apkfilename}'"
 
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
+#. https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
 #: ../fdroidserver/common.py
-#, fuzzy, python-brace-format
-msgid "Reading packageName/versionCode/versionName failed,APK invalid: '{apkfilename}'"
+#, python-brace-format
+msgid "Reading packageName/versionCode/versionName failed, APK invalid: '{apkfilename}'"
 msgstr "ཐུམ་སྒྲིལ་གྱི་མིང་ཀློག་བཞིནཔ།/ཐོན་རིམ་ཨང་རྟགས་/ཐོན་རིམ་གྱི་མིང་བདེ་སྤྱོད་མེད། APK ཁུངས་ལྡན་མིན།: '{apkfilename}'"
 
 #: ../fdroidserver/update.py
@@ -1478,36 +1473,25 @@ msgstr "ཐུམ་སྒྲིལ་གྱི་མིང་ཀློག་བ
 msgid "Reading {apkfilename} from cache"
 msgstr "སྦས་ཁུང་ནས་ {apkfilename}ཀློག་བཞིན་པ།"
 
-#: ../fdroidserver/build.py
-msgid "Refresh and cache scanner rules and signatures from the network"
-msgstr ""
-
-#: ../fdroidserver/publish.py
-#, python-brace-format
-msgid "Refusing to sign '{path}', file exists in both {dir1} and {dir2} folder."
-msgstr ""
-
-#: ../fdroidserver/verify.py
-msgid "Remove source tarball and any APKs if successfully verified."
-msgstr ""
+#: ../fdroidserver/stats.py
+msgid "Recalculate aggregate stats - use when changes have been made that would invalidate old cached data."
+msgstr "ཕྱོགས་བསྡོམས་བྱས་པའི་གྲངས་ཐོ་རྣམས་སྐྱར་རྩིས་བྱེད། -བསྒྱུར་བ་འགྲོ་བའི་སྐབས་ལ་བེད་སྤྱོད་བྱེད།."
 
 #: ../fdroidserver/common.py
 msgid "Removing specified files"
 msgstr "དམིགས་སྟོན་བྱས་པའི་ཡིག་ཆ་རྣམས་མེད་པ་བཟོ་བཞིན་པ།"
 
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Removing {path}\""
-msgstr ""
-
 #: ../fdroidserver/update.py
 msgid "Rename APK files that do not match package.name_123.apk"
 msgstr "package.name_123.apk དང་མི་འདྲ་བའི་APK ཡིག་ཆ་དེ་ཚོར་མིང་སྐྱར་ཏུ་བཏགས།"
 
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "RepoType {type} is deprecated, please switch to git."
-msgstr ""
+#: ../fdroidserver/update.py
+msgid "Report on build data status"
+msgstr "ཐོན་སྐྱེད་ཡིག་ཚགས་གནས་བབས་སྒང་གི་སྙན་ཐོ།"
+
+#: ../fdroidserver/build.py
+msgid "Reset and create a brand new build server, even if the existing one appears to be ok."
+msgstr "ཡོད་བཞིན་པའི་ཞབས་ཞུ་འཕྲུལ་ཆས་འདི་ལ་སྐྱོན་མེད་པ་ཡིན་རུང་། ཐོན་སྐྱེད་ཞབས་ཞུ་འཕྲུལ་ཆས་གསར་པ་ཞིག་སྐྱར་སྒྲིག་དང་བཟོས།."
 
 #: ../fdroidserver/nightly.py
 #, fuzzy, python-brace-format
@@ -1522,34 +1506,33 @@ msgstr "པར་གྱི་རྒྱུ་ཆེ་ཆུང་ཚད་ལས
 msgid "Restrict output to warnings and errors"
 msgstr "ཡིག་ཚགས་ལ་ཉེན་བརྡ་དང་སྐྱོན་ཅན་རྣམས་དམ་བསྒྲགས་བྱེད།"
 
-#: ../fdroidserver/net.py
-#, python-format
-msgid "Retrying failed download: %s"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Rewrite all the metadata files"
 msgstr "ཡིག་ཚགས་ཀྱི་རྒྱབ་ལྗོངས་ལོ་རྒྱུས་ཚང་མ་སྐྱར་ཟིན།"
 
+#: ../fdroidserver/rewritemeta.py
+msgid "Rewrite to a specific format: "
+msgstr "བཀོད་སྒྲིག་འདི་ག་རང་ལ་སྐྱར་བྲིས་བྱེད།: "
+
 #: ../fdroidserver/rewritemeta.py
 #, python-brace-format
 msgid "Rewriting '{appid}'"
 msgstr "སྐྱར་བྲིས། '{appid}'"
 
+#: ../fdroidserver/rewritemeta.py
+#, python-brace-format
+msgid "Rewriting '{appid}' to '{path}'"
+msgstr "སྐྱར་བྲིས '{appid}' དེ་ནས། '{path}'"
+
 #: ../fdroidserver/checkupdates.py
 msgid "Run on git repo that has uncommitted changes"
 msgstr ""
 
-#: ../fdroidserver/nightly.py
-#, python-brace-format
-msgid "Run over {cibase} to find -debug.apk. and skip repo_basedir {repo_basedir}"
-msgstr ""
-
 #: ../fdroidserver/lint.py
 msgid "Run rewritemeta to fix formatting"
 msgstr "བཀོད་སྒྲིག་འདི་ག་རང་ལ་སྐྱར་བྲིས་བྱེད།"
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 msgid "Running first pass with MD5 checking disabled"
 msgstr "MD5 ཚོད་ལྟ་བེད་སྤྱོད་མེད་པ་དང་མཉམ་དུ་ཐེངས་དང་པོ་འཁོར་སྐྱོད་བྱེད་བཞིན་པ།"
 
@@ -1558,24 +1541,18 @@ msgstr "MD5 ཚོད་ལྟ་བེད་སྤྱོད་མེད་པ
 msgid "Running wget in {path}"
 msgstr "སྐྱར་བྲིས་ཡོད་།{path}"
 
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "SHA-256 of {url} does not match entry!"
-msgstr ""
+#: ../fdroidserver/dscanner.py
+msgid "Scan only the latest version of each package"
+msgstr "ཐུམ་སྒྲིལ་རེ་རེ་བའི་ཐོན་རིམ་གསར་ཤོས་གཅིག་པུ་འཚག་རྒྱབ།"
 
 #: ../fdroidserver/build.py
 msgid "Scan the resulting APK(s) for known non-free classes."
 msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Scan the source code of a package"
 msgstr "ཐུམ་སྒྲིལ་བྱས་པའི་འབྱུང་ཁུངས་ཨང་རྟགས་འཚག་རྒྱབ"
 
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Scanner found {count} problems in {apk}"
-msgstr ""
-
 #: ../fdroidserver/scanner.py
 #, python-brace-format
 msgid "Scanner found {count} problems in {appid}:"
@@ -1591,19 +1568,6 @@ msgid "Scanner found {} problem"
 msgid_plural "Scanner found {} problems"
 msgstr[0] "འཚག་རྒྱབ་ལ་སྐྱོན་རྙེད་པ།"
 
-#: ../fdroidserver/scanner.py
-msgid "Scanning APK for extra signing blocks."
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "Scanning APK with dexdump for known non-free classes."
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Set NDK {release} ({version}) up"
-msgstr ""
-
 #: ../fdroidserver/common.py
 msgid "Set clock to that time using:"
 msgstr ""
@@ -1617,7 +1581,7 @@ msgstr ""
 msgid "Set open file limit to {integer}"
 msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Set up an app build for a nightly build repo"
 msgstr "མཚན་མོའི་རེ་པོ་བཟོ་སྐྲུན་ཆེད་དུ་སྒྲིག་བཀོད་བྱས་པའི་མཉེན་ཆས་བཟོ་སྐྲུན།"
 
@@ -1630,11 +1594,18 @@ msgstr ""
 msgid "Setting {0} sec timeout for this build"
 msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroidserver/build.py
+msgid "Setup an emulator, install the APK on it and perform a Drozer scan"
+msgstr "གློག་ཀླད་ལད་མོ་མཁན་ཞིག་སྒྲིག འདིའི་སྒང་ལ་ APK ནང་འགྲིག་བཅུག་བྱེད་དུ་བཅུག་ནས་ཌོ་ཛར་འཚག་རྒྱབ་འགོ་བཙུགས་བྱེད།"
+
+msgid "Setup an emulator, install the apk on it and perform a drozer scan"
+msgstr "གློག་ཀླད་ལད་མོ་མཁན་ཞིག་སྒྲིག འདིའི་སྒང་ལ་apk ནང་འགྲིག་བཅུག་བྱེད་དུ་བཅུག་ནས་ཌོ་ཛར་འཚག་རྒྱབ་འགོ་བཙུགས་བྱེད།"
+
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Sign and place packages in the repo"
 msgstr "མིང་རྟགས་བཀོད་ནས་ཐུམ་སྒྲིལ་རྣམས་རེ་པོ་ནང་བཞག"
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Sign indexes created using update --nosign"
 msgstr "གསར་བསྒྱུར་བེད་སྤྱོད་བྱས་ཏེ་བཟོས་པའི་མིང་རྟགས་བརྡ་སྟོན། --མིང་རྟགས་མེད།"
 
@@ -1647,11 +1618,6 @@ msgstr "འབྱུང་ཁུངས་ཨ་རྟགས་དང་དཀའ
 msgid "Skipping '{apkfilename}' with invalid signature!"
 msgstr "'{apkfilename}'མཆོང་ནས་ཁུངས་ལྡན་མ་ཡིན་པའི་མིང་རྟགས་དང་མཉམ་དུ།!"
 
-#: ../fdroidserver/deploy.py ../fdroidserver/index.py
-#, python-format
-msgid "Skipping GitLab Pages mirror because the repo is too large (>%.2fGB)!"
-msgstr ""
-
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Skipping index generation for {appid}"
@@ -1667,14 +1633,23 @@ msgstr "{apkfilename} མཆོང་རྒྱབ་མཉམ་དུ་ཁུ
 msgid "Skipping {appid}: disabled"
 msgstr "མཆོང་བཞིན་པ་ {appid}: བེད་མེད།"
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/scanner.py
+#, python-brace-format
+msgid "Skipping {appid}: no builds specified"
+msgstr "མཆོང་བཞིན་པ་ {appid}: བཟོ་སྐྲུན་དམིགས་སྟོན་མིན་འདུག"
+
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 msgid "Specify a local folder to sync the repo to"
 msgstr "བསྟི་གནས་ཀྱི་ཡིག་ཁུག་གཅིག་ཁ་ཕྱེས་ནས་རེ་པོ་འདི་ལ་མཉམ་བསྲེས།"
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 msgid "Specify an identity file to provide to SSH for rsyncing"
 msgstr "rsync གྱི་ཆེད་དུ་SSH འདི་ངོ་ཐག་ཆོད་པའི་ཡིག་ཆ་ཞིག་དམིགས་སུ་བཀར་ནས་སྟེར།"
 
+#: ../fdroidserver/build.py
+msgid "Specify that we're running on the build server"
+msgstr "ང་ཚོས་ཐོན་སྐྱེད་ཞབས་ཞུ་འཕྲུལ་ཆས་འདིའི་སྒང་ལ་འཁོར་སྐྱོད་བྱེད་བཞིན་གསལ་སྟོན་བྱེད།"
+
 #: ../fdroidserver/nightly.py
 msgid "Specify which debug keystore file to use."
 msgstr ""
@@ -1683,6 +1658,11 @@ msgstr ""
 msgid "Spew out even more information than normal"
 msgstr "ནམ་རྒྱུན་ལས་ཀྱང་མང་བའི་གནས་ཚུལ་ཕྱིར་སྟོན།"
 
+#: ../fdroidserver/nightly.py
+#, fuzzy, python-brace-format
+msgid "Striping mystery signature from {apkfilename}"
+msgstr "{apkfilename}ཡིག་ཆ་སྦས་ཁུང་རྙིང་པ་ལ་ཡ་ལན་མ་བྱས་"
+
 #: ../fdroidserver/nightly.py
 #, fuzzy, python-brace-format
 msgid "Stripping mystery signature from {apkfilename}"
@@ -1696,29 +1676,17 @@ msgstr "སྙིང་བསྔུས་ '%s 1' ནི་མཉེན་ཆས
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "Summary of length {length} is over the {limit} char limit"
-msgstr "སྙིང་བསྔུས་ཀྱི་རིང་ཐུང་། {length} charཚད་{limit} ལས་བརྒལ་འདུག"
+msgstr "སྙིང་བསྔུས་ཀྱི་རིང་ཐུང་། {length}  charཚད་{limit} ལས་བརྒལ་འདུག"
 
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "System clock is older than date in {path}!"
 msgstr ""
 
-#: ../fdroidserver/checkupdates.py
-msgid "Tags update mode only works for git, hg, bzr and git-svn repositories currently"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "Tags update mode used in git-svn, but the repo was not set up with tags"
-msgstr ""
-
 #: ../fdroidserver/build.py
 msgid "Test mode - put output in the tmp directory only, and always build, even if the output already exists."
 msgstr "ཚོད་ལྟའི་ཚུལ་-གལ་སྲིད་ཡིག་ཚགས་འདི་སྔོན་ཚོད་ནས་ཡོད་ནའང་། ཡིག་ཚགས་འདི་སྐབས་ཕྲལ་གྱི་ཕྱོགས་དེབ་ཁོ་ནའི་ནང་ལ་བླུགས་པ་དང་རྟག་ཏུ་ཐོན་སྐྱེད་བཟོས།."
 
-#: ../fdroidserver/index.py
-msgid "The \"qrcode\" Python package is not installed (e.g. apt-get install python3-qrcode)!"
-msgstr ""
-
 #. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
 #: ../fdroidserver/update.py
 #, python-brace-format
@@ -1737,10 +1705,18 @@ msgstr ""
 msgid "The file to be included in the repo (path or glob)"
 msgstr "(path or glob)རེ་པོ་ནང་ཚུད་པའི་ཡིག་ཆ།"
 
+#: ../fdroidserver/deploy.py
+msgid "The only commands currently supported are 'init' and 'update'"
+msgstr "ལག་བསྟར་བྱེད་རྒྱུར་བཀའ་གཏོང། ཡང་ན་'init'འམ་ཡང་ན་ 'གསར་བསྒྱུར།'"
+
 #: ../fdroidserver/index.py
 msgid "The repository's fingerprint does not match."
 msgstr "མཛོད་ཁང་གི་མཛུབ་མཐིལ་དང་མཐུན་གྱི་མིན་འདུག."
 
+#: ../fdroidserver/common.py
+msgid "The repository's index could not be verified."
+msgstr "མཛོད་ཁང་གི་ཕྱོགས་སྟོན་ར་སྤྲོད་ཐུབ་མ་སོང་།."
+
 #: ../fdroidserver/deploy.py
 #, python-brace-format
 msgid "The root dir for local_copy_dir \"{path}\" does not exist!"
@@ -1754,39 +1730,14 @@ msgstr "ལྡེ་མིག་གཞན་ལ་སྐྱོན་ཆ་འད
 msgid "These are the apps that have been archived from the main repo."
 msgstr ""
 
-#: ../fdroidserver/mirror.py
-msgid "This command should never be used to mirror f-droid.org! A full copy requires more than 600GB."
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "This is a repository of apps to be used with F-Droid. Applications in this repository are either official binaries built by the original application developers, or are binaries built from source by the admin of f-droid.org using the tools on https://gitlab.com/fdroid."
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 #, python-format
 msgid "This repo already has local metadata: %s"
 msgstr "རེ་པོ་འདི་ལ་སྔོན་ཚོད་ནས་ས་གནས་ཀྱི་རྒྱབ་ལྗོངས་ཡིག་ཆ་འདུག: %s 1"
 
-#: ../fdroidserver/init.py
-#, python-format
-msgid ""
-"To complete the setup, add your APKs to \"%s\"\n"
-"then run \"fdroid update -c; fdroid update\".  You might also want to edit\n"
-"\"config.yml\" to set the URL, repo name, and more.  You should also set up\n"
-"a signing key (a temporary one might have been automatically generated).\n"
-"\n"
-"For more info: https://f-droid.org/docs/Setup_an_F-Droid_App_Repo\n"
-"and https://f-droid.org/docs/Signing_Process"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "To use awsbucket, awssecretkey and awsaccesskeyid must also be set in config.yml!"
-msgstr "awsbucket, awssecretkey དང་། awsaccesskeyid བེད་སྤྱོད་བྱེད་པའི་ཆེད་དུ་ config.yml ནང་དུ་ངེས་པར་དུ་སྒྲིག་དགོས།!"
-
-#: ../fdroidserver/deploy.py
-#, fuzzy
-msgid "To use rclone, rclone_config and awsbucket must be set in config.yml!"
-msgstr "awsbucket, awssecretkey དང་། awsaccesskeyid བེད་སྤྱོད་བྱེད་པའི་ཆེད་དུ་ config.yml ནང་དུ་ངེས་པར་དུ་སྒྲིག་དགོས།!"
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
+msgid "To use awsbucket, awssecretkey and awsaccesskeyid must also be set in config.py!"
+msgstr "awsbucket, awssecretkey དང་། awsaccesskeyid བེད་སྤྱོད་བྱེད་པའི་ཆེད་དུ་ config.py ནང་དུ་ངེས་པར་དུ་སྒྲིག་དགོས།!"
 
 #: ../fdroidserver/lint.py
 msgid "URL must start with https:// or http://"
@@ -1796,6 +1747,10 @@ msgstr ""
 msgid "URL shorteners should not be used"
 msgstr "URL ཐུང་དུ་གཏོང་མཁན་ངེས་པར་དུ་བེད་སྤྱོད་བྱེད།"
 
+#: ../fdroidserver/metadata.py
+msgid "URL title is just the URL, use brackets: [URL]"
+msgstr "URL འགོ་བརྗོད་དེ་URL རང་རེད་། གུག་རྟགས་བེད་སྤྱོད་།: [URL]"
+
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "URL {url} in Description: {error}"
@@ -1810,15 +1765,16 @@ msgstr "ཁུངས་ལྡན་མིན་པའི་ཆོག་མཆན
 msgid "Unexpected license tag \"{}\"! Only use license tags configured in your config file"
 msgstr ""
 
-#: ../fdroidserver/common.py
+#: ../fdroidserver/metadata.py
 #, python-brace-format
-msgid "Unknown entry {key} in {configname}"
-msgstr ""
+msgid "Unexpected text on same line as {field} in {linedesc}"
+msgstr "{linedesc}ནང་། {field}་ཁ་ཕྱོགས་དེ་ག་རང་ནང་རེ་བ་མ་བྱས་པའི་ཡིག་ཚགས་"
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Unknown exception found!"
 msgstr "ཆ་རྒྱུས་མེད་པའི་དམིགས་བསལ་ཞིག་རྙེད་སོང་།!"
 
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "Unknown file '{filename}' in build '{versionName}'"
@@ -1829,6 +1785,11 @@ msgstr "ངོས་འཛིན་མི་ཐུབ་པའི་ཡིག་
 msgid "Unknown metadata format: %s"
 msgstr "ངོས་འཛིན་མ་བྱས་པའི་རྒྱབ་ལྗོངས་ཡིག་ཆའི་སྒྲིག་བཀོད།:%s 1"
 
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Unknown metadata format: {path}"
+msgstr "ངོས་འཛིན་མི་ཐུབ་པའི་རྒྱབ་ལྗོངས་ཡིག་ཆའི་སྒྲིག་བཀོད། : {path}"
+
 #: ../fdroidserver/metadata.py
 #, fuzzy, python-brace-format
 msgid "Unknown metadata format: {path} (use: *.yml)"
@@ -1838,6 +1799,10 @@ msgstr "ངོས་འཛིན་མི་ཐུབ་པའི་རྒྱབ
 msgid "Unknown version of aapt, might cause problems: "
 msgstr "aapt གྱི་ངོས་འཛིན་མ་ཐུབ་པའི་ཐོན་རིམ། དཀའ་ངལ་ཕྲད་སྲིད་པ།: "
 
+#: ../fdroidserver/lint.py
+msgid "Unlinkified link - use [http://foo.bar Link title] or [http://foo.bar]"
+msgstr "སྦྲེལ་མཐུད་བྱེད་མི་ཐུབ་པའི་སྦྲེལ་མཐུད། -བེད་སྤྱོད། [http://foo.bar Link title] or [http://foo.bar]"
+
 #: ../fdroidserver/lint.py
 msgid "Unnecessary leading space"
 msgstr "དགོས་མེད་ཀྱི་སྣེ་ཁྲིད་བར་མཚམས།"
@@ -1851,12 +1816,20 @@ msgstr "དགོས་མེད་ཀྱི་རྫེས་ཤུལ་བར
 msgid "Unrecognised app field '{fieldname}' in '{path}'"
 msgstr ""
 
+#: ../fdroidserver/metadata.py
+msgid "Unrecognised app field: "
+msgstr "ངོས་འཛིན་མ་ཐུབ་པའི་མཉེན་ཆས་རྭ་བ།: "
+
 #: ../fdroidserver/metadata.py
 #, python-brace-format
 msgid "Unrecognised build flag '{build_flag}' in '{path}'"
 msgstr ""
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Unrecognised field '{field}' in {linedesc}"
+msgstr "{linedesc}ནང་ངོས་འཛིན་མ་ཐུབ་པའི་རྭ་བ།{field}"
+
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Unsupported file type \"{extension}\" for repo graphic"
@@ -1867,6 +1840,29 @@ msgstr ""
 msgid "Unsupported graphics file found: {path}"
 msgstr "རྒྱབ་སྐྱོར་མེད་པའི་བརྐོས་རིས་ཡིག་ཆ་རྙེད་སོང་།: {path}"
 
+#: ../fdroidserver/rewritemeta.py
+#, python-brace-format
+msgid "Unsupported metadata format, use: --to [{supported}]"
+msgstr "རྒྱབ་སྐྱོར་མེད་པའི་རྒྱབ་ལྗོངས་ཡིག་ཆའི་འགྲོ་ལུགས། བེད་སྤྱོད་: --to [{supported}]"
+
+#: ../fdroidserver/metadata.py
+msgid "Unterminated ]"
+msgstr "མེད་པ་མ་ཆགས་པ།]"
+
+#: ../fdroidserver/metadata.py
+msgid "Unterminated ]]"
+msgstr "མེད་པ་མ་ཆགས་པ་]]"
+
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Unterminated build in {name}"
+msgstr "མེད་པ་མ་ཆགས་པའི་བཟོ་སྐྲུན་ནང་།{name}"
+
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Unterminated continuation in {name}"
+msgstr "{name}ནང་གི་མེད་པ་མ་ཆགས་པའི་མུ་མཐུད་པ།"
+
 #: ../fdroidserver/lint.py
 #, python-format
 msgid "Unused extlib at %s"
@@ -1887,25 +1883,27 @@ msgstr "%s 1 དེ་ལ་བེད་སྤྱོད་མེད་པའི
 msgid "Unused scanignore path: %s"
 msgstr "%s 1 དེ་ལ་བེད་སྤྱོད་མེད་པའི་ཡིག་ཆ།"
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Update repo information for new packages"
 msgstr "ཐུམ་སྒྲིལ་གསར་པའི་ཆེད་དུ་རེ་པོ་གནས་ཚུལ་གསར་བསྒྱུར་བྱེད།"
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Update the binary transparency log for a URL"
 msgstr "URLཆེད་དུ་ཨང་གྲངས་ཀྱི་ཐོ་གཞུང་གསར་བསྒྱུར།"
 
+#: ../fdroid ../fdroidserver/__main__.py
+msgid "Update the stats of the repo"
+msgstr "རེ་པོའི་གྲངས་ཐོ་རྣམས་གསར་བསྒྱུར་བྱེད།"
+
+#: ../fdroidserver/update.py ../fdroidserver/build.py
+msgid "Update the wiki"
+msgstr "ཝི་ཀི་གསར་བསྒྱུར་བྱེད།"
+
 #: ../fdroidserver/checkupdates.py
 #, python-brace-format
 msgid "UpdateCheckData has invalid URL: {url}"
 msgstr ""
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "UpdateCheckData must match the version code as integer (\\d or [0-9]): {codeex}"
-msgstr ""
-
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "UpdateCheckData must use HTTPS URL: {url}"
@@ -1917,10 +1915,15 @@ msgid "UpdateCheckData not a valid URL: {url}"
 msgstr ""
 
 #: ../fdroidserver/lint.py
-msgid "UpdateCheckMode is set but it looks like checkupdates hasn't been run yet."
-msgstr ""
+msgid "UpdateCheckMode is set but it looks like checkupdates hasn't been run yet"
+msgstr "UpdateCheckModeསྒྲིག་བཀོད་བྱས་ཟིན་ཡང་གསར་བསྒྱུར་འཚོལ་བ་དེ་འགོ་འཛུགས་མིན་འདུག"
+
+#. Translators: https://developer.android.com/studio/build/application-id
+#: ../fdroidserver/lint.py
+#, fuzzy
+msgid "UpdateCheckName is set to the known application ID - it can be removed"
+msgstr "མཉེན་ཆས་ཁ་བྱང་ནང་ལ་གསར་བསྒྱུར་འཚོལ་བའི་མིང་སྒྲིག་ཚར་འདུག -འདི་སུབས་ཆོག་གི་རེད།"
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
 #: ../fdroidserver/lint.py
 #, fuzzy
 msgid "UpdateCheckName is set to the known application ID, it can be removed"
@@ -1936,9 +1939,19 @@ msgstr ""
 msgid "Uploading {apkfilename} to virustotal"
 msgstr "སྦས་ཁུང་ནས་ {apkfilename}ཀློག་བཞིན་པ།"
 
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "Usage"
+msgstr "བེད་སྤྱོད།"
+
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, python-format
+msgid "Usage: %s\n"
+msgstr "བེད་སྤྱོད།:%s 1\n"
+
 #: ../fdroidserver/lint.py
-#, fuzzy
-msgid "Use /HEAD instead of /master or /main to point at a file in the default branch"
+msgid "Use /HEAD instead of /master to point at a file in the default branch"
 msgstr "བེད་སྤྱོད།/HEAD གྱི་ཚབ་ཏུ།/ སོར་བཞག་ཡན་ལག་ནང་དུ་ཡོད་པའི་དོན་ཚན་ཨ་མ།"
 
 #: ../fdroidserver/update.py
@@ -1953,16 +1966,14 @@ msgstr "ཐོན་སྐྱེད་ཞབས་ཞུ་འཕྲུལ་ཆ
 msgid "Use date from APK instead of current time for newly added APKs"
 msgstr "APK རང་གི་ཚེས་གྲངས་དེ་བེད་སྤྱོད་བྱས་པ་ལས་ཁ་སྣོན་བྱས་པའི་ APKs གསར་པའི་དུས་ཚོས་བེད་སྤྱོད་མ་བྱེད།"
 
-#: ../fdroidserver/deploy.py
+msgid "Use date from apk instead of current time for newly added apks"
+msgstr "apk རང་གི་ཚེས་གྲངས་དེ་བེད་སྤྱོད་བྱས་པ་ལས་ཁ་སྣོན་བྱས་པའི་apk གསར་པའི་དུས་ཚོས་བེད་སྤྱོད་མ་བྱེད།"
+
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Using \"{path}\" for configuring s3cmd."
 msgstr ""
 
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Using \"{path}\" for syncing with remote storage."
-msgstr ""
-
 #: ../fdroidserver/common.py
 msgid "Using APK Signature v2"
 msgstr ""
@@ -1971,35 +1982,26 @@ msgstr ""
 msgid "Using APK Signature v3"
 msgstr ""
 
-#: ../fdroidserver/common.py
-msgid "Using JAR Signature"
-msgstr ""
-
 #: ../fdroidserver/common.py
 msgid "Using Java's jarsigner, not recommended for verifying APKs! Use apksigner"
 msgstr ""
 
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Using blank dictionary instead of contents of {path}!"
-msgstr ""
+#: ../fdroidserver/common.py
+#, fuzzy, python-brace-format
+msgid "Using androguard from \"{path}\""
+msgstr "སྐྱར་བྲིས་ཡོད་།{path}"
 
 #: ../fdroidserver/init.py
 #, fuzzy, python-brace-format
 msgid "Using existing keystore \"{path}\""
 msgstr "སྐྱར་བྲིས་ཡོད་།{path}"
 
-#: ../fdroidserver/deploy.py
-#, fuzzy, python-brace-format
-msgid "Using rclone to sync with: {url}"
-msgstr "s3cmd བེད་སྤྱོད་བྱས་ནས་: {url}1དང་མཉམ་དུ་sync"
-
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Using s3cmd to sync with: {url}"
 msgstr "s3cmd བེད་སྤྱོད་བྱས་ནས་: {url}1དང་མཉམ་དུ་sync"
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Valid commands are:"
 msgstr "ཁུངས་ལྡན་གྱི་བཀའ་ཁྱབ་ནི།:"
 
@@ -2007,7 +2009,7 @@ msgstr "ཁུངས་ལྡན་གྱི་བཀའ་ཁྱབ་ནི།
 msgid "Verify against locally cached copy rather than redownloading."
 msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Verify the integrity of downloaded packages"
 msgstr "ཕབ་ལེན་བྱས་པའི་ཐུམ་སྒྲིལ་གྱི་སྤུས་ཚད་ར་སྤྲོད།"
 
@@ -2015,28 +2017,15 @@ msgstr "ཕབ་ལེན་བྱས་པའི་ཐུམ་སྒྲིལ
 msgid "Verifying index signature:"
 msgstr ""
 
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "Verifying package {path} with apksigner."
-msgstr ""
-
 #: ../fdroidserver/deploy.py
 #, python-brace-format
 msgid "VirusTotal API key cannot upload files larger than 32MB, use {url} to upload {path}."
 msgstr ""
 
-#: ../fdroidserver/nightly.py
-msgid "WARNING: only public git repos are supported!"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Warn about possible metadata errors"
 msgstr "ཡིག་ཚགས་ཀྱི་རྒྱབ་ལྗོངས་ལོ་རྒྱུས་སྐྱོན་སྲིད་པ་རྣམས་པ་ཉེན་བརྡ་གཏོང་།"
 
-#: ../fdroidserver/scanner.py
-msgid "WebAssembly binary file"
-msgstr ""
-
 #: ../fdroidserver/update.py
 msgid "When configured for signed indexes, create only unsigned indexes at this stage"
 msgstr "བརྡ་སྟོན་པའི་མིང་རྟགས་དེ་སྒྲིག་བཀོད་བྱས་ཚར་ན། གནས་སྐབས་མིང་རྟགས་མ་བཀོད་པའི་བརྡ་སྟོན་རྣམས་བཟོས།"
@@ -2045,17 +2034,8 @@ msgstr "བརྡ་སྟོན་པའི་མིང་རྟགས་དེ
 msgid "When linting the entire repository yamllint is disabled by default. This option forces yamllint regardless."
 msgstr ""
 
-#: ../fdroidserver/publish.py
-msgid "When signing or verifying fails, exit with an error code."
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "Would you like to download and install F-Droid.apk via adb? (YES/no)"
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "Would you like to download the app(s) from f-droid.org? (YES/no)"
-msgstr ""
+msgid "X.509 'Distiguished Name' used when generating keys"
+msgstr "X.509 'ཁྱད་པར་ཅན་གྱི་མིང་' ལྡེ་མིག་བཟོས་པའི་སྐབས་ལ་བེད་སྤྱོད་བྱེད།"
 
 #: ../fdroidserver/init.py
 msgid "X.509 'Distinguished Name' used when generating keys"
@@ -2069,11 +2049,6 @@ msgstr "ཁྱེད་རང་གིས་ཨེན་ཀྲོཌ་མདུ
 msgid "ZIP file archive"
 msgstr ""
 
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "adb reports {serial} is \"{status}\"!"
-msgstr ""
-
 #: ../fdroidserver/nightly.py
 #, python-brace-format
 msgid "adding IdentityFile to {path}"
@@ -2084,81 +2059,87 @@ msgstr "{path}ལ་ངོས་འཛིན་ཡིག་ཆ་ཁ་སྣོ
 msgid "adding to {name}: {path}"
 msgstr "{name}ལ་ཁ་སྣོན་བྱེད།: {path}"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "ambiguous option: %(option)s could match %(matches)s"
-msgstr "གསལ་ཁ་མེད་པའི་གདམ་ཀ: %(option)s མཐུན་མི་སོང་།%(matches)s"
+msgstr "གསལ་ཁ་མེད་པའི་གདམ་ཀ: %(option)s  མཐུན་མི་སོང་།%(matches)s"
 
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "apksigner in build-tools;{version} passes APKs with invalid v3 signatures, ignoring."
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "apksigner not found! Cannot sign or verify modern APKs"
-msgstr ""
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, python-format
+msgid "ambiguous option: %s (%s?)"
+msgstr "གསལ་ཁ་མེད་པའི་གདམ་ཀ:%s 1 (%s 2?)"
 
 #: ../fdroidserver/common.py
 msgid "apksigner not found, it's required for signing!"
 msgstr ""
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/checkupdates.py ../fdroidserver/lint.py
-#: ../fdroidserver/rewritemeta.py
+#: ../fdroidserver/lint.py ../fdroidserver/rewritemeta.py
+#: ../fdroidserver/checkupdates.py
 #, fuzzy
 msgid "application ID of file to operate on"
 msgstr "མཉེས་ཆས་ཁ་བྱང་རྒྱུད་གསར་བསྒྱར་ཡོད་མིན་ལྟོས།"
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/build.py ../fdroidserver/install.py
-#: ../fdroidserver/publish.py ../fdroidserver/scanner.py
-#: ../fdroidserver/verify.py
+#: ../fdroidserver/verify.py ../fdroidserver/publish.py
+#: ../fdroidserver/build.py ../fdroidserver/scanner.py
+#: ../fdroidserver/install.py
 #, fuzzy
 msgid "application ID with optional versionCode in the form APPID[:VERCODE]"
 msgstr "མཉེན་ཆས་ཀྱི་ངོ་བོ་དང་མཉམ་དུ་གདམ་ཀ་ཅན་གྱི་ཐོན་རིམ་ཨང་རྟགས་APPID[:VERCODE]"
 
-#: ../fdroidserver/common.py
-msgid "archive_url needs to end with /archive"
-msgstr ""
+#: ../fdroidserver/lint.py ../fdroidserver/rewritemeta.py
+msgid "applicationId in the form APPID"
+msgstr "APPID བཀོད་པའི་ནང་གི་མཉེས་ཆས་ཁ་བྱང་།"
 
-#: /usr/lib/python3.11/argparse.py
+#: ../fdroidserver/checkupdates.py
+msgid "applicationId to check for updates"
+msgstr "མཉེས་ཆས་ཁ་བྱང་རྒྱུད་གསར་བསྒྱར་ཡོད་མིན་ལྟོས།"
+
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
+#: ../fdroidserver/verify.py ../fdroidserver/publish.py
+#: ../fdroidserver/dscanner.py ../fdroidserver/build.py
+#: ../fdroidserver/scanner.py ../fdroidserver/install.py
+msgid "applicationId with optional versionCode in the form APPID[:VERCODE]"
+msgstr "མཉེན་ཆས་ཀྱི་ངོ་བོ་དང་མཉམ་དུ་གདམ་ཀ་ཅན་གྱི་ཐོན་རིམ་ཨང་རྟགས་APPID[:VERCODE]"
+
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "argument \"-\" with mode %r"
 msgstr "རྩོད་པ།\"-\" འགྲོ་ལུགས་འདི་དང་མཉམ་དུ། %r 1"
 
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "argument %(argument_name)s: %(message)s"
-msgstr ""
-
 #: ../fdroidserver/nightly.py
 #, fuzzy
 msgid "attempting bare SSH connection to test deploy key:"
 msgstr "ཕྱོགས་སྐྱོད་ལྡེ་མིག་ཚོད་ལྟ་ལ་bare ssh མཐུད་ཀ་་རྒྱབ་བཞིན་པ།:"
 
+#: ../fdroidserver/nightly.py
+msgid "attempting bare ssh connection to test deploy key:"
+msgstr "ཕྱོགས་སྐྱོད་ལྡེ་མིག་ཚོད་ལྟ་ལ་bare ssh མཐུད་ཀ་་རྒྱབ་བཞིན་པ།:"
+
 #: ../fdroidserver/common.py
 msgid "can not parse scrlib spec (not a string): '{}'"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
-msgid "can't open '%(filename)s': %(error)s"
-msgstr "ཁ་ཕྱེས་ཐུབ་མ་སོང་།'%(filename)s': %(error)s"
-
-#: ../fdroidserver/scanner.py
-msgid "can't open non-https url: '{};"
-msgstr ""
+msgid "can't open '%s': %s"
+msgstr "ཁ་ཕྱེས་ཐུབ་མ་སོང་།'%s 1': %s 2"
 
 #: ../fdroidserver/build.py
 #, fuzzy, python-brace-format
 msgid "cannot find required srclibs: \"{path}\""
 msgstr "{path}!གྱི་ཆེད་དུ་ཐུམ་སྒྲིལ་གྱི་མིང་རྙེད་མ་སོང་།"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "cannot have multiple subparser arguments"
 msgstr "subparser རྩོད་པ་དུ་མ་ཡོད་ཐབས་མེད།"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "cannot merge actions - two groups are named %r"
 msgstr "བྱ་བ་ཟླ་སྒྲིལ་བཏང་ཐུབ་མ་སོང་། - སྡེ་ཚན་གཉིས་ཀྱི་མིང་ལ་%r 1"
@@ -2172,25 +2153,30 @@ msgstr "པར་སྐྲུན་གསར་བསྒྱུར་བྱེད
 msgid "cloning {url}"
 msgstr "འདྲ་བཟོས་{url}"
 
+#: ../fdroidserver/deploy.py
+msgid "command to execute, either 'init' or 'update'"
+msgstr "ལག་བསྟར་བྱེད་རྒྱུར་བཀའ་གཏོང། ཡང་ན་'init'འམ་ཡང་ན་ 'གསར་བསྒྱུར།'"
+
 #: ../fdroidserver/__main__.py
 msgid "commands from plugin modules:"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "complex"
+msgstr "མགོ་རྙོག"
+
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "conflicting option string: %s"
 msgid_plural "conflicting option strings: %s"
 msgstr[0] "ཚིག་སྒྲུབ་ཀྱི་གདམ་ཀའི་རྙོག་ཕྲ།: %s 1"
 
-#: /usr/lib/python3.11/argparse.py
-#, fuzzy, python-format
-msgid "conflicting subparser alias: %s"
-msgstr "ཚིག་སྒྲུབ་ཀྱི་གདམ་ཀའི་རྙོག་ཕྲ།: %s 1"
-
-#: /usr/lib/python3.11/argparse.py
-#, fuzzy, python-format
-msgid "conflicting subparser: %s"
-msgstr "ཚིག་སྒྲུབ་ཀྱི་གདམ་ཀའི་རྙོག་ཕྲ།: %s 1"
+#: ../fdroidserver/nightly.py
+#, python-brace-format
+msgid "copying {apkfilename} into {path}"
+msgstr "{path} ནང་ལ་ {apkfilename}ཤུས་བཞིན་པ།"
 
 #: ../fdroidserver/metadata.py
 #, python-brace-format
@@ -2198,11 +2184,11 @@ msgid "could not parse '{path}'"
 msgstr ""
 
 #: ../fdroidserver/common.py
-msgid "could not parse srclib spec (no name specified): '{}'"
+msgid "could not parse srclib spec (no ref specified): '{}'"
 msgstr ""
 
 #: ../fdroidserver/common.py
-msgid "could not parse srclib spec (no ref specified): '{}'"
+msgid "could not parse srclib spec (too many '@' signs): '{}'"
 msgstr ""
 
 #: ../fdroidserver/nightly.py
@@ -2210,18 +2196,14 @@ msgstr ""
 msgid "created {path}"
 msgstr ""
 
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "current version is newer: old vercode={old}, new vercode={new}"
-msgstr ""
-
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "deleting: repo/{apkfilename}"
 msgstr "སུབ་བཞིན་པ།:རེ་པོ་/{apkfilename}"
 
-#: ../fdroidserver/scanner.py
-msgid "dependency file without lock"
+#: ../fdroidserver/common.py
+#, python-brace-format
+msgid "deployed build logs to '{path}'"
 msgstr ""
 
 #: ../fdroidserver/common.py
@@ -2229,55 +2211,65 @@ msgstr ""
 msgid "deployed process log {path} to {dest}"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "dest= is required for options like %r"
 msgstr "dest= ནི་གདམ་ཀ་འདི་འདྲ་ལ་%r 1དགོས་པ་ཡོད།"
 
-#: ../fdroidserver/scanner.py
-msgid "downloading '{}'"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, fuzzy
-msgid "downloading scanner signatures from '{}' failed"
-msgstr "{apkfilename}ཡིག་ཆ་སྦས་ཁུང་རྙིང་པ་ལ་ཡ་ལན་མ་བྱས་"
-
 #: ../fdroidserver/scanner.py
 msgid "executable binary, possibly code"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "expected %s argument"
 msgid_plural "expected %s arguments"
 msgstr[0] "ཚོད་དཔག་བྱེད་པའི་%s 1 རྩོད་པ་"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "expected at least one argument"
 msgstr "མ་མཐའ་ཡིན་ནའང་རེ་བ་བྱེད་པའི་རྩོད་པ།"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "expected at most one argument"
 msgstr "རེ་བ་བྱས་པའི་རྩོད་པ་ཆེ་ཤེོས་གཅིག"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "expected one argument"
 msgstr "རེ་བ་བྱས་པའི་རྩོད་པ་གཅིག"
 
-#: ../fdroidserver/__main__.py
+#: ../fdroidserver/common.py
+#, python-brace-format
+msgid "failed deploying build logs to '{path}'"
+msgstr ""
+
+#: ../fdroid
+msgid "fdroid [-h|--help|--version] <command> [<args>]"
+msgstr "བེད་སྤྱོད་: ཨེཕ་རོཌ་ [-h|-རོགས་པ་|--ཐོན་རིམ་] <command> [<args>]"
+
+#: ../fdroid ../fdroidserver/__main__.py
 #, fuzzy
 msgid "fdroid [<command>] [-h|--help|--version|<args>]"
 msgstr "བེད་སྤྱོད་: ཨེཕ་རོཌ་ [-h|-རོགས་པ་|--ཐོན་རིམ་] <command> [<args>]"
 
-#: ../fdroidserver/scanner.py
-msgid "fetch the latest version of signatures from the web"
-msgstr ""
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "floating-point"
+msgstr "གཡེང་ཚེག"
+
+#: ../fdroidserver/metadata.py
+msgid "force errors to be warnings, or ignore"
+msgstr "སྐྱོན་ཤོར་བ་ལ་ཉེན་བརྡ་ངེས་པར་དུ་གཏོང་དགོས་པ་དང་། ཡང་ན་ཡ་མ་བྱེད།"
 
 #: ../fdroidserver/metadata.py
 #, fuzzy
 msgid "force metadata errors (default) to be warnings, or to be ignored."
-msgstr "སྐྱོན་ཤོར་བ་ལ་ཉེན་བརྡ་ངེས་པར་དུ་གཏོང་དགོས་པ་དང་། ཡང་ན་ཡ་མ་བྱེད།."
+msgstr "སྐྱོན་ཤོར་བ་ལ་ཉེན་བརྡ་ངེས་པར་དུ་གཏོང་དགོས་པ་དང་། ཡང་ན་ཡ་མ་བྱེད།"
 
 #: ../fdroidserver/common.py
 #, fuzzy
@@ -2288,7 +2280,8 @@ msgstr "གིཊ་གཙང་བཟོ་ཐུབ་མ་སོང་།"
 msgid "gzip file archive"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "ignored explicit argument %r"
 msgstr "དངོས་སུ་རྩོད་པ་པ་ལ་ཡ་ལན་མེད། %r 1"
@@ -2297,44 +2290,39 @@ msgstr "དངོས་སུ་རྩོད་པ་པ་ལ་ཡ་ལན་
 msgid "index-v1 must have a signature, use `fdroid signindex` to create it!"
 msgstr "index-v1 ངེས་པར་དུ་མིང་རྟགས་དགོས། བེད་སྤྱོད་`fdroid signindex`འདི་བཟོས་པ་རེད།!"
 
-#: ../fdroidserver/index.py
-#, fuzzy
-msgid "index-v2 must have a signature, use `fdroid signindex` to create it!"
-msgstr "index-v1 ངེས་པར་དུ་མིང་རྟགས་དགོས། བེད་སྤྱོད་`fdroid signindex`འདི་བཟོས་པ་རེད།!"
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "integer"
+msgstr "གོང་བུ།"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "invalid %(type)s value: %(value)r"
 msgstr "ཁུངས་ལྡན་མིན་པ་ %(type)s value: %(value)r"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "invalid choice: %(value)r (choose from %(choices)s)"
-msgstr "ཁུངས་ལྡན་མིན་པའི་གདམ་ཀ: %(value)r (དེ་ནས་གདམ་ཀ་%(choices)s)"
+msgstr "ཁུངས་ལྡན་མིན་པའི་གདམ་ཀ: %(value)r  (དེ་ནས་གདམ་ཀ་%(choices)s)"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "invalid conflict_resolution value: %r"
 msgstr "ཁུངས་ལྡན་མིན་པའི་རྙོག་ཕྲ།_resolution value: %r"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "invalid option string %(option)r: must start with a character %(prefix_chars)r"
 msgstr "ཁུངས་ལྡན་མིན་པའི་ཚིག་སྒྲུབ་གདམ་ཀ། %(option)r: ཁྱད་ཆོས་དང་མཉམ་དུ་འགོ་བཙུགས། %(prefix_chars)r"
 
-#: ../fdroidserver/common.py
-msgid "ipfs_cid not found, skipping CIDv1 generation"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "latest build recipe is newer: old vercode={old}, new vercode={new}"
-msgstr ""
-
 #: ../fdroidserver/deploy.py
 #, python-brace-format
 msgid "local_copy_dir does not end with \"fdroid\", perhaps you meant: \"{path}\""
-msgstr "local_copy_dir \"fdroid\"གིས་མཇུག་སྐྱོང་མིན་འདུག་ : \"{path}1\""
+msgstr "local_copy_dir  \"fdroid\"གིས་མཇུག་སྐྱོང་མིན་འདུག་ : \"{path}1\""
 
 #: ../fdroidserver/deploy.py
 msgid "local_copy_dir must be an absolute path!"
@@ -2347,22 +2335,13 @@ msgstr "local_copy_dir ངེས་པར་ཕྱོགས་དེབ་ཡི
 #: ../fdroidserver/index.py
 #, python-format
 msgid "mirror '%s' does not end with 'fdroid'!"
-msgstr "མེ་ལོང་། '%s 1' 'fdroid'དང་མཉམ་དུ་མཇུག་སྐྱོང་མི་ཐུབ།!"
+msgstr "མེ་ལོང་། '%s 1'  'fdroid'དང་མཉམ་དུ་མཇུག་སྐྱོང་མི་ཐུབ།!"
 
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "mirrors set twice, in config.yml and {path}!"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "mutually exclusive arguments must be optional"
 msgstr "ནང་ཕན་ཚུན་རྩོད་པ་དེ་གདམ་ཀ་ཅན་ངེས་པར་དུ་བཞག་དགོས་།"
 
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "next {name} cache update due in {time}"
-msgstr ""
-
 #: ../fdroidserver/mirror.py
 #, fuzzy, python-brace-format
 msgid "no \"icon\" in {appid}"
@@ -2372,36 +2351,97 @@ msgstr "ལས་ཀ་བྱེད་བཞིན་པ།{appid}"
 msgid "no APK supplied"
 msgstr "APK མཁོ་སྤྲོད་མིན་འདུག"
 
-#: ../fdroidserver/checkupdates.py
-#, fuzzy
-msgid "no version information found"
-msgstr "ཆ་རྒྱུས་མེད་པའི་དམིགས་བསལ་ཞིག་རྙེད་སོང་།"
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, python-format
+msgid "no such option: %s"
+msgstr "གདམ་ཀ་དེ་འདྲ་མིན་འདུག: %s"
 
-#: /usr/lib/python3.11/argparse.py
+#: ../fdroid ../fdroidserver/__main__.py
+msgid "no version info found!"
+msgstr "ཆ་རྒྱུས་མེད་པའི་དམིགས་བསལ་ཞིག་རྙེད་སོང་།!"
+
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "not allowed with argument %s"
 msgstr "རྩོད་པ་དང་མཉམ་དུ་ཆོག་མཆན་མེད། %s 1"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "one of the arguments %s is required"
 msgstr "རྩོད་པ་གཅིག་དགོས་ཀྱི་ཡོད། %s 1"
 
-#: ../fdroidserver/common.py ../fdroidserver/index.py
+#: ../fdroidserver/index.py ../fdroidserver/common.py
 msgid "only accepts strings, lists, and tuples"
 msgstr "ཚིག་སྒྲུབ་དང་ཐོ་གཞུང་། ཡིག་ཚགས་ཁོ་ན་ངོས་ལེན་བྱེད།"
 
-#: /usr/lib/python3.11/argparse.py
-#, fuzzy
-msgid "options"
-msgstr "གདམ་ཀ།"
+#: ../fdroidserver/install.py
+#, python-format
+msgid "option %s: If you really want to install all the signed apps, use --all"
+msgstr "གདམ་ཀ %s 1: གལ་ཏེ་ཁྱེད་ཀྱིས་མིང་རྟགས་བཀོད་པའི་མཉེན་ཆས་རིགས་ཚང་མ་ངེས་པར་དུ་སྒྲིག་བཅུག་བྱེད་འདོད་ཡོད་། བེད་སྤྱོད་ --ཚང་མ།"
+
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, python-format
+msgid "option %s: invalid %s value: %r"
+msgstr "གདམ་ཀ %s 1: ཁུངས་ལྡན་མིན་པ་ %s 2  རིན་ཐང་།: %r 3"
+
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, python-format
+msgid "option %s: invalid choice: %r (choose from %s)"
+msgstr "གདམ་ཀ %s 1: ཁུངས་ལྡན་མིན་པའི་གདམ་ཀ: %r 2 (choose from %s 3)"
+
+#: /usr/lib/python3.5/getopt.py /usr/lib/python3.6/getopt.py
+#: /usr/lib/python3.7/getopt.py
+#, python-format
+msgid "option -%s not recognized"
+msgstr "གདམ་ཀ། '%s 1'ངོས་འཛིན་ཐུབ་མ་སོང་།"
+
+#: /usr/lib/python3.5/getopt.py /usr/lib/python3.6/getopt.py
+#: /usr/lib/python3.7/getopt.py
+#, python-format
+msgid "option -%s requires argument"
+msgstr "གདམ་ཀ།  -%s 1 རྩོད་དགོས།"
+
+#: /usr/lib/python3.5/getopt.py /usr/lib/python3.6/getopt.py
+#: /usr/lib/python3.7/getopt.py
+#, python-format
+msgid "option --%s must not have an argument"
+msgstr "གདམ་ཀ། --%s 1གང་བྱས་ཀྱང་རྩོད་པ་མེད།"
+
+#: /usr/lib/python3.5/getopt.py /usr/lib/python3.6/getopt.py
+#: /usr/lib/python3.7/getopt.py
+#, python-format
+msgid "option --%s not a unique prefix"
+msgstr "གདམ་ཀ་--%s ཐུན་མོང་མ་ཡིན་པའི་སྔོན་འཇུག་མ་རེད།"
+
+#: /usr/lib/python3.5/getopt.py /usr/lib/python3.6/getopt.py
+#: /usr/lib/python3.7/getopt.py
+#, python-format
+msgid "option --%s not recognized"
+msgstr "གདམ་ཀ།--%s 1 ངོས་འཛིན་ཐུབ་མ་སོང་།"
+
+#: /usr/lib/python3.5/getopt.py /usr/lib/python3.6/getopt.py
+#: /usr/lib/python3.7/getopt.py
+#, python-format
+msgid "option --%s requires argument"
+msgstr "གདམ་ཀ། --%s རྩོད་དགོས།"
+
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
+msgid "optional arguments"
+msgstr "གདམ་ཀ་ཅན་གྱི་རྩོད་པ།"
 
 #: ../fdroidserver/nightly.py
 #, python-brace-format
 msgid "overwriting existing {path}"
 msgstr "སྐྱར་བྲིས་ཡོད་།{path}"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "positional arguments"
 msgstr "གནས་སྟངས་ལ་གཞིགས་པའི་རྩོད་པ།"
 
@@ -2410,60 +2450,48 @@ msgstr "གནས་སྟངས་ལ་གཞིགས་པའི་རྩོ
 msgid "process log deploy {path} to {dest} failed!"
 msgstr ""
 
-#: ../fdroidserver/build.py
-msgid "reference binary missing signature"
-msgstr ""
-
 #: ../fdroidserver/signatures.py
 #, python-brace-format
 msgid "refuse downloading via insecure HTTP connection (use HTTPS or specify --no-https-check): {apkfilename}"
 msgstr "བདེ་ཆགས་མེད་པའི་HTTPMམཐུད་ཀ་རྒྱུད་དེ་ཕབ་བཤུས་ངོས་ལེན་མེད། (HTTPS བེད་སྤྱོད་དང་ཡང་ན་དམིགས་སྟོན་། --no-https-check){apkfilename}"
 
+#: ../fdroidserver/signatures.py
+#, python-brace-format
+msgid "refuse downloading via insecure http connection (use https or specify --no-https-check): {apkfilename}"
+msgstr "བེད་ཆགས་མེད་པའི་དྲྭ་རྒྱའི་ཁ་བྱང་http ནས་ཕབ་ལེན་བཀག།  (use https or specify --no-https-check): {apkfilename}"
+
 #: ../fdroidserver/index.py
 #, python-format
-msgid "repo_icon \"repo/icons/%s\" does not exist, generating placeholder."
+msgid "repo_icon %s does not exist, generating placeholder."
 msgstr ""
 
-#: ../fdroidserver/common.py
-msgid "repo_url needs to end with /repo"
+#: ../fdroidserver/metadata.py
+msgid "ruamel.yaml not installed, can not write metadata."
 msgstr ""
 
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "rsync is missing or broken: {error}"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "s3cmd sync indexes {path} to {url} and delete"
 msgstr "s3cmd sync ཕྱོགས་སྟོན།{path}1 དེ་ནས {url} དང་སུབས།"
 
-#: ../fdroidserver/deploy.py
-#, fuzzy, python-brace-format
-msgid "s3cmd syncs indexes from {path} to {url} and deletes removed"
-msgstr "s3cmd sync ཕྱོགས་སྟོན།{path}1 དེ་ནས {url} དང་སུབས།"
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "scanner cache is malformed! You can clear it with: '{clear}'"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, fuzzy
-msgid "serverwebroot: path does not end with \"fdroid\", perhaps you meant one of these:"
-msgstr "local_copy_dir \"fdroid\"གིས་མཇུག་སྐྱོང་མིན་འདུག་ : \"{path}1\""
-
 #: ../fdroidserver/scanner.py
 msgid "shared library"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "show program's version number and exit"
+msgstr "ལས་རིམ་རྣམ་གཞག་གི་ཐོན་རིམ་ཨང་གྲངས་སྟོན་ནས་ཕྱིར་ཐོན་བྱེད།"
+
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.5/optparse.py
+#: /usr/lib/python3.6/argparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/argparse.py /usr/lib/python3.7/optparse.py
 msgid "show this help message and exit"
 msgstr "རོགས་པ་བྱེད་པའི་འཕྲིན་ཐུང་སྟོན་ནས་ཕྱིར་ཐོན།"
 
 #: ../fdroidserver/signatures.py
 msgid "signed APK, either a file-path or HTTPS URL."
-msgstr "APK མིང་རྟགས་, ཡིག་ཆའི་འགྲོ་ལམ་མམ་ཡང་ན། HTTPS URL."
+msgstr "APK མིང་རྟགས་, ཡིག་ཆའི་འགྲོ་ལམ་མམ་ཡང་ན།  HTTPS URL."
 
 #: ../fdroidserver/common.py
 msgid "skip deploying full build logs: log content is empty"
@@ -2486,31 +2514,31 @@ msgstr ""
 msgid "static library"
 msgstr ""
 
-#: ../fdroidserver/build.py
+#: ../fdroidserver/common.py
 #, python-brace-format
-msgid "supplied reference binary has allowed signer {signer}"
+msgid "supplied timestamp value '{timestamp}' is not a unix timestamp"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "the following arguments are required: %s"
 msgstr "གཤམ་གྱི་རྩོད་པ་དེ་དག་དགོས།:%s"
 
-#: ../fdroidserver/install.py
-msgid "true"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "unexpected option string: %s"
 msgstr "རེ་བ་མེད་པའི་གདམ་ཀ་ཅན་གྱི་ཚིག་སྒྲུབ།:%s"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "unknown parser %(parser_name)r (choices: %(choices)s)"
 msgstr "ངོས་འཛིན་མི་ཐུབ་པའི་ parser %(parser_name)r (གདམ་ཀ།: %(choices)s)"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "unrecognized arguments: %s"
 msgstr "ངོས་འཛིན་མི་ཐུབ་པའི་རྩོད་པ།: %s"
@@ -2520,11 +2548,16 @@ msgstr "ངོས་འཛིན་མི་ཐུབ་པའི་རྩོད
 msgid "unsafe permissions on '{config_file}' (should be 0600)!"
 msgstr "'{config_file}' སྒང་གི་བདེ་ཆགས་མེད་པའི་ཆོག་མཆན་ (ངེས་པར་དུ། 0600)!"
 
-#: ../fdroidserver/__main__.py /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py ../fdroid
+#: /usr/lib/python3.7/argparse.py ../fdroidserver/__main__.py
 msgid "usage: "
 msgstr "བེད་སྤྱོད།: "
 
-#: ../fdroidserver/deploy.py
+#: ../fdroid
+msgid "usage: fdroid [-h|--help|--version] <command> [<args>]"
+msgstr "བེད་སྤྱོད་: ཨེཕ་རོཌ་[-h|--help|--version] <command> [<args>]"
+
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "using Apache libcloud to sync with {url}"
 msgstr "Apache libcloud བེད་སྤྱོད་བྱས་པའི་ཐོག་ {url}1དང་མཉམ་དུ་ཟླ་སྒྲིལ་གཏོང་།"
@@ -2533,34 +2566,46 @@ msgstr "Apache libcloud བེད་སྤྱོད་བྱས་པའི་
 msgid "virustotal.com is rate limiting, waiting to retry..."
 msgstr ""
 
-#: ../fdroidserver/install.py
-msgid "yes"
+#: ../fdroidserver/update.py
+msgid "wiki support is deprecated and will be removed in the next release!"
 msgstr ""
 
 #: ../fdroidserver/publish.py
 #, python-brace-format
 msgid "{0} app, {1} key aliases"
 msgid_plural "{0} apps, {1} key aliases"
-msgstr[0] "{0} མཉེས་ཆས་, {1} key aliases"
+msgstr[0] "{0}  མཉེས་ཆས་, {1} key aliases"
 
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "{apkfilename} ({appid}) has no metadata!"
 msgstr "{apkfilename} ({appid}) ལ་རྒྱབ་ལྗོངས་ཡིག་ཆ་མིན་འདུག!"
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
+#: ../fdroidserver/update.py
+#, python-brace-format
+msgid "{apkfilename} has multiple {name} files, looks like Master Key exploit!"
+msgstr ""
+
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "{apkfilename}'s AndroidManifest.xml has a bad date: "
 msgstr ""
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
 #: ../fdroidserver/update.py
 #, fuzzy, python-brace-format
 msgid "{appid} does not have a name! Using application ID instead."
 msgstr "{appid} ལ་མིང་ཡོད་མ་རེད། !དེའི་ཚབ་ལ་ཐུམ་སྒྲིལ་མིང་བེད་སྤྱོད་བྱེད།."
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
+#: ../fdroidserver/update.py
+#, python-brace-format
+msgid "{appid} does not have a name! Using package name instead."
+msgstr "{appid} ལ་མིང་ཡོད་མ་རེད། !དེའི་ཚབ་ལ་ཐུམ་སྒྲིལ་མིང་བེད་སྤྱོད་བྱེད།."
+
+#: ../fdroidserver/update.py
+#, python-brace-format
+msgid "{appid} from {path} is not a valid Android Package Name!"
+msgstr ""
+
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "{appid} from {path} is not a valid Android application ID!"
@@ -2571,20 +2616,16 @@ msgstr ""
 msgid "{appid} from {path} is not a valid Java Package Name!"
 msgstr ""
 
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{appid} has both APKs and files: {files}"
-msgstr ""
-
 #: ../fdroidserver/mirror.py
 #, python-brace-format
 msgid "{appid} is missing {name}"
 msgstr ""
 
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "{appid}: Unknown extlib {path} in build '{versionName}'"
-msgstr "{appid}1: ངོས་འཛིན་མི་ཐུབ་པའི་ extlib {path}2 བཟོ་སྐྲུན་ནང་ལ '{versionName}3'"
+msgstr "{appid}1: ངོས་འཛིན་མི་ཐུབ་པའི་ extlib {path}2  བཟོ་སྐྲུན་ནང་ལ '{versionName}3'"
 
 #: ../fdroidserver/scanner.py
 #, python-brace-format
@@ -2608,8 +2649,8 @@ msgstr ""
 
 #: ../fdroidserver/metadata.py
 #, python-brace-format
-msgid "{build_flag} must be list or string, found: {value}"
-msgstr ""
+msgid "{field} not terminated in {name}"
+msgstr "{field} སྒོ་རྒྱབ་མིན་འདུག {name}"
 
 #: ../fdroidserver/metadata.py
 #, python-brace-format
@@ -2618,15 +2659,10 @@ msgstr ""
 
 #: ../fdroidserver/update.py
 #, python-brace-format
-msgid "{name} \"{section}/icons/{path}\" does not exist! Check \"config.yml\"."
-msgstr ""
+msgid "{name} \"{path}\" does not exist! Correct it in config.py."
+msgstr "{name} \"{path}\" མིན་འདུག! config.pyནོར་བཅོས་བྱེད།."
 
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{path1} is a duplicate of {path2}, remove one!"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 #, python-brace-format
 msgid "{path} already exists, ignoring import results!"
 msgstr ""
@@ -2641,36 +2677,6 @@ msgstr ""
 msgid "{path} has bad file signature \"{pattern}\", possible Janus exploit!"
 msgstr ""
 
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "{path} has been flagged by virustotal {count} times:"
-msgstr ""
-
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "{path} has the wrong fingerprint ({fingerprint})!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "{path} is not \"key: value\" dict, but a {datatype}!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, fuzzy, python-brace-format
-msgid "{path} is not a standard config file!"
-msgstr "'sdk_path' འདི་ 'config.yml' ནང་སྒྲིག་ཐུབ་མ་སོང་།!"
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "{path} is not list, but a {datatype}!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "{path} is not {expected_type}, but a {datatype}!"
-msgstr ""
-
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "{path} is zero size!"
@@ -2681,22 +2687,12 @@ msgstr "{path} ལ་ཆེ་ཆུང་མེད།!"
 msgid "{path} more than 200MB, manually upload: {url}"
 msgstr ""
 
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "{path}: \"{code}\" is not a valid ISO_3166-1 alpha-2 country code!"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, fuzzy, python-brace-format
-msgid "{path}: {error}"
-msgstr "ཀློག་མི་ཐུབ།{path}: {error}"
-
 #: ../fdroidserver/mirror.py
 #, python-brace-format
 msgid "{url} does not end with \"fdroid\", check the URL path!"
 msgstr ""
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/common.py
 #, python-brace-format
 msgid "{url} does not start with \"http\"!"
 msgstr ""
@@ -2710,3 +2706,40 @@ msgstr[0] "{} བཟོ་སྐྲུན་བྱེད་མི་ཐུབ།
 msgid "{} build succeeded"
 msgid_plural "{} builds succeeded"
 msgstr[0] "{} བཟོ་སྐྲུན་ལེགས་སྒྲུབ།"
+
+#~ msgid "Android Build Tools path '{path}' does not exist!"
+#~ msgstr "ཨེན་ཀྲོཌ་བཟོ་སྐྲུན་མ་ལག་ཐབས་ལམ '{path}1' མིན་འདུག!"
+
+#~ msgid "Cannot find a packageName for {path}!"
+#~ msgstr "{path}གྱི་ཆེད་དུ་ཐུམ་སྒྲིལ་གྱི་མིང་རྙེད་མ་སོང་།!"
+
+#, fuzzy
+#~ msgid "Cannot find an appid for {path}!"
+#~ msgstr "{path}!གྱི་ཆེད་དུ་ཐུམ་སྒྲིལ་གྱི་མིང་རྙེད་མ་སོང་།"
+
+#~ msgid "Clean update - don't uses caches, reprocess all apks"
+#~ msgstr "གསར་བསྒྱུར་གཙང་བཟོ།-ཡིག་ཆ་གསོག་ཉར་བེད་སྤྱོ་མ་བྱེད། apks ཚང་མ་སྐྱར་སྤྱོད་བྱེད།"
+
+#~ msgid "Interactively ask about things that need updating."
+#~ msgstr "གསར་བསྒྱུར་བྱེད་དགོས་པའི་རིགས་ལ་སྦས་གསང་མེད་པའི་ཐོག་ནས་གསུངས་རོགས།."
+
+#~ msgid "Specify editor to use in interactive mode. Default "
+#~ msgstr "སྒྲིག་བཀོད་པར་དམིགས་སྟོན་བྱས་ནས་ལན་འདེབས་ཀྱི་ཚུལ་འདི་བེད་སྤྱོད་བྱེད་ སོར་བཞག "
+
+#~ msgid "Specify editor to use in interactive mode. Default %s"
+#~ msgstr "སྒྲིག་བཀོད་པར་དམིགས་སྟོན་བྱས་ནས་ལན་འདེབས་ཀྱི་ཚུལ་འདི་བེད་སྤྱོད་བྱེད་ སོར་བཞག %s 1"
+
+#~ msgid "Specify editor to use in interactive mode. Default is {path}"
+#~ msgstr "སྒྲིག་བཀོད་པར་དམིགས་སྟོན་བྱས་ནས་ལན་འདེབས་ཀྱི་ཚུལ་འདི་བེད་སྤྱོད་བྱེད་ སོར་བཞག་ནི་{path}"
+
+#~ msgid "app-id in the form APPID"
+#~ msgstr "APPID བཀོད་པའི་ནང་གི་མཉེས་ཆས་ཁ་བྱང་།"
+
+#~ msgid "app-id to check for updates"
+#~ msgstr "མཉེས་ཆས་ཁ་བྱང་རྒྱུད་གསར་བསྒྱར་ཡོད་མིན་ལྟོས།"
+
+#~ msgid "app-id with optional versionCode in the form APPID[:VERCODE]"
+#~ msgstr "མཉེན་ཆས་ཀྱི་ངོ་བོ་དང་མཉམ་དུ་གདམ་ཀ་ཅན་གྱི་ཐོན་རིམ་ཨང་རྟགས་APPID[:VERCODE]"
+
+#~ msgid "app-id with optional versioncode in the form APPID[:VERCODE]"
+#~ msgstr "མཉེས་ཆས་ཁ་བྱང་དང་མཉམ་དུ་གདམ་ཀ་ཅན་གྱི་ཐོན་རིམ་ཨང་རྟགས།APPID[:VERCODE]"
diff --git a/locale/ca/LC_MESSAGES/fdroidserver.po b/locale/ca/LC_MESSAGES/fdroidserver.po
deleted file mode 100644
index 48cea1fc..00000000
--- a/locale/ca/LC_MESSAGES/fdroidserver.po
+++ /dev/null
@@ -1,2701 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# This file is put in the public domain.
-# Rubén <rubenx@mail.com>, 2023.
-# pitroig <ona@riseup.net>, 2024, 2025.
-# raulmagdalena <4omoald1a@mozmail.com>, 2024.
-# Adrià Martín <adriamartinmor@gmail.com>, 2024.
-# unmes <jordi.guiu.pujols@gmail.com>, 2024.
-# Joan Pujolar <joan.pujolar@gmail.com>, 2024.
-# Ecron <ecron_89@hotmail.com>, 2024, 2025.
-msgid ""
-msgstr ""
-"Project-Id-Version: fdroidserver 2.1-273-g54e84d87\n"
-"Report-Msgid-Bugs-To: https://gitlab.com/fdroid/fdroidserver/issues\n"
-"POT-Creation-Date: 2025-06-25 09:52+0200\n"
-"PO-Revision-Date: 2025-05-16 16:36+0000\n"
-"Last-Translator: Ecron <ecron_89@hotmail.com>\n"
-"Language-Team: Catalan <https://hosted.weblate.org/projects/f-droid/fdroidserver/ca/>\n"
-"Language: ca\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 5.12-dev\n"
-
-#: ../fdroidserver/nightly.py
-msgid ""
-"\n"
-"SSH public key to be used as deploy key:"
-msgstr ""
-"\n"
-"Clau pública SSH que s'utilitzarà com a clau de desplegament:"
-
-#: ../fdroidserver/nightly.py
-#, python-brace-format
-msgid ""
-"\n"
-"{path} encoded for the DEBUG_KEYSTORE secret variable:"
-msgstr ""
-"\n"
-"{path} codificat per a la variable secreta DEBUG_KEYSTORE:"
-
-#: ../fdroidserver/lint.py
-#, python-format
-msgid "\"%s/\" has no matching metadata file!"
-msgstr "\"%s/\" no té cap fitxer de metadades coincidents!"
-
-#: ../fdroidserver/index.py
-msgid "\"isPrimary\" key should not be added to mirrors!"
-msgstr "La clau «isPrimary» no s'hauria d'afegir a les rèpliques!"
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "\"local_copy_dir\" {path} does not exist!"
-msgstr "\"local_copy_dir\" {path} no existeix!"
-
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "\"{apkfilename}\" is already installed on {dev}."
-msgstr "\"{apkfilename}\" ja està instal·lat en {dev}."
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "\"{path}\" contains recent {name} ({version})"
-msgstr "\"{path}\" conté {name} ({version}) recent"
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "\"{path}\" exists but s3cmd is not installed!"
-msgstr "\"{path}\" existeix, però s3cmd no està instal·lada!"
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "\"{path}\" is not a supported file format (use: metadata/*.yml)"
-msgstr "\"{path}\" no és un format de fitxer compatible (utilitza: metadata/*.yml)"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "\"{path}\" is signed by a key that is not allowed:"
-msgstr "\"{path}\" està signat per una clau que no està permesa:"
-
-#: ../fdroidserver/import_subcommand.py
-#, python-brace-format
-msgid "\"{url}\" is not a valid URL!"
-msgstr "\"{url}\" no és un URL vàlid!"
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "%(prog)s: error: %(message)s\n"
-msgstr "%(prog)s: errada: %(message)s\n"
-
-#: ../fdroidserver/publish.py
-#, python-format
-msgid "%d APKs failed to be signed or verified!"
-msgstr "%d APKs no han pogut ser signats o verificats."
-
-#: ../fdroidserver/scanner.py
-#, python-format
-msgid "%d problems found"
-msgstr "%d problemes trobats"
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "%r is not callable"
-msgstr "no es pot cridar a %r"
-
-#: ../fdroidserver/signindex.py
-#, python-format
-msgid "%s did not produce a dict!"
-msgstr "%s no ha produït cap dictat!"
-
-#: ../fdroidserver/signindex.py
-#, python-format
-msgid "%s has bad SHA-256: %s"
-msgstr "%s té un SHA-256 dolent: %s"
-
-#: ../fdroidserver/lint.py
-#, python-format
-msgid "%s is not an accepted build field"
-msgstr "%s no és un camp de compilació acceptat"
-
-#: ../fdroidserver/common.py
-msgid "'keypass' not found in config.yml!"
-msgstr "'keypass' no s'ha trobat a config.yml!"
-
-#: ../fdroidserver/common.py
-msgid "'keystore' is NONE and 'smartcardoptions' is blank!"
-msgstr "'keystore' és NONE i 'smartcardoptions' està en blanc!"
-
-#: ../fdroidserver/common.py
-msgid "'keystore' not found in config.yml!"
-msgstr "'keystore' no s'ha trobat a config.yml!"
-
-#: ../fdroidserver/common.py
-msgid "'keystorepass' not found in config.yml!"
-msgstr "'keystorepass' no s'ha trobat a config.yml!"
-
-#: ../fdroidserver/common.py
-msgid "'repo_keyalias' not found in config.yml!"
-msgstr "'repo_keyalias' no s'ha trobat a config.yml!"
-
-#: /usr/lib/python3.11/argparse.py
-msgid "'required' is an invalid argument for positionals"
-msgstr "\"obligatori\" és un argument no vàlid per a posicionals"
-
-#: ../fdroidserver/common.py
-msgid "'sdk_path' not set in config.yml!"
-msgstr "'sdk_path' no establert a config.yml!"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "'{aapt}' is too old, fdroid requires build-tools-{version} or newer!"
-msgstr "'{aapt}' és massa antic, fdroid requereix build-tools-{version} o superior."
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "'{path}' failed to execute!"
-msgstr "Error en l'execució de '{path}'."
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "'{path}' has invalid format, it should be a dictionary!"
-msgstr "'{path}' té un format invàlid; hauria de ser un diccionari!"
-
-#: ../fdroidserver/lint.py ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "'{value}' is not a valid {field} in {appid}. Regex pattern: {pattern}"
-msgstr "'{value}' no és un {field} vàlid a {appid}. Expressió regular: {pattern}"
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "'{value}' is not a valid {field}, should be {pattern}"
-msgstr "'{value}' no és un {field} vàlid; hauria de ser {pattern}"
-
-#: ../fdroidserver/checkupdates.py
-msgid "--merge-request only runs on a single appid!"
-msgstr "--merge-request només funciona amb un sol ID d'aplicació!"
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "...checkupdate failed for {appid} : {error}"
-msgstr "...ha fallat la comprovació de {appid} : {error}"
-
-#: /usr/lib/python3.11/argparse.py
-msgid ".__call__() not defined"
-msgstr ".__call__() no definida"
-
-#: ../fdroidserver/lint.py
-msgid "/issues is missing"
-msgstr "Falta /issues"
-
-#: ../fdroidserver/mirror.py
-msgid "A URL is required as an argument!"
-msgstr "Cal que l'argument sigui un URL!"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "APK signatures have different certificates in {path}:"
-msgstr "Les signatures APK tenen certificats diferents a {path}:"
-
-#: ../fdroidserver/__main__.py
-msgid "Add PGP signatures using GnuPG for packages in repo"
-msgstr "Afegiu signatures PGP mitjançant GnuPG per a paquets en un dipòsit"
-
-#: ../fdroidserver/update.py
-msgid "Add a repo signing key to an unsigned repo"
-msgstr "Afegiu una clau de firma a un dipòsit sense signar"
-
-#: ../fdroidserver/update.py
-msgid "Add skeleton metadata files for APKs that are missing them"
-msgstr "Afegiu els fitxers d'esquelet per a APKs que no en tinguin"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Adding new repo for only {name}"
-msgstr "S'està afegint un dipòsit nou només per a {name}"
-
-#: ../fdroidserver/init.py
-msgid "Alias of the repo signing key in the keystore"
-msgstr "Àlies de la clau de signatura del dipòsit al magatzem de claus"
-
-#: ../fdroidserver/build.py
-msgid "AllowedAPKSigningKeys missing but reference binary supplied"
-msgstr "Manca AllowedAPKSigningKeys però s'ha subministrat el binari de referència"
-
-#: ../fdroidserver/import_subcommand.py
-msgid "Allows a different revision (or git branch) to be specified for the initial import"
-msgstr "Permet especificar una revisió diferent (o branca git) per a la importació inicial"
-
-#: ../fdroidserver/mirror.py
-msgid "Also mirror the full archive section"
-msgstr "Replica també la secció completa de l'arxiu"
-
-#: ../fdroidserver/lint.py
-msgid "Also warn about formatting issues, like rewritemeta -l"
-msgstr "També avisa sobre els problemes de formatació, com ara rewritemeta -l"
-
-#: ../fdroidserver/scanner.py
-msgid "Android AAR library"
-msgstr "Biblioteca Android AAR"
-
-#: ../fdroidserver/scanner.py
-msgid "Android APK file"
-msgstr "Fitxer APK de l'Android"
-
-#: ../fdroidserver/scanner.py
-msgid "Android DEX code"
-msgstr "Codi DEX Android"
-
-#: ../fdroidserver/init.py
-#, python-brace-format
-msgid "Android SDK not found at {path}!"
-msgstr "No s'ha trobat l'SDK d'Android a {path}!"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Android SDK path '{path}' does not exist!"
-msgstr "El camí SDK d'Android '{path}' no existeix!"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Android SDK path '{path}' is not a directory!"
-msgstr "El camí SDK d'Android '{path}' no és un directori!"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Android SDK tool {cmd} not found!"
-msgstr "No s'ha trobat l'eina Android SDK {cmd}!"
-
-#: ../fdroidserver/lint.py
-msgid "App has Binaries but does not have corresponding AllowedAPKSigningKeys to pin certificate."
-msgstr "L'aplicació té binaris però no té el corresponent certificat AllowedAPKSigningKeys per fixar."
-
-#: ../fdroidserver/lint.py
-msgid "App has NoSourceSince or ArchivePolicy \"0 versions\" or 0 but AutoUpdateMode or UpdateCheckMode are not None"
-msgstr "L'aplicació té NoSourceSince o ArchivePolicy \"0 versions\" o 0 però AutoUpdateMode o UpdateCheckMode no són None"
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "App is in '{repo}' but has a link to {url}"
-msgstr "L'aplicació és a '{repo}', però té un enllaç a {url}"
-
-#: ../fdroidserver/lint.py
-msgid "App version has binary but does not have corresponding AllowedAPKSigningKeys to pin certificate."
-msgstr "La versió de l'aplicació té binari, però no té el corresponent certificat AllowedAPKSigningKeys per fixar."
-
-#: ../fdroidserver/lint.py
-msgid "Appending .git is not necessary"
-msgstr "No és necessari afegir .git"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Archiving {apkfilename} with invalid signature!"
-msgstr "S'està arxivant {apkfilename} amb una signatura no vàlida!"
-
-#: ../fdroidserver/lint.py
-msgid "AutoUpdateMode with UpdateCheckMode: HTTP must have a pattern."
-msgstr "AutoUpdateMode amb UpdateCheckMode: HTTP ha de tenir un patró."
-
-#: ../fdroidserver/install.py
-msgid "Automatic no to all prompts."
-msgstr "No automàtic a totes les demandes."
-
-#: ../fdroidserver/install.py
-msgid "Automatic yes to all prompts."
-msgstr "Sí automàtic a totes les demandes."
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "Bad entry type \"{mirrortype}\" in mirrors config: {mirror}"
-msgstr "Tipus d'entrada incorrecta «{mirrortype}» a la configuració de les rèpliques: {mirror}"
-
-#: ../fdroidserver/mirror.py
-msgid "Base URL to mirror, can include the index signing key using the query string: ?fingerprint="
-msgstr "URL base a la rèplica, podeu incloure la clau de signatura de l'índex utilitzant la cadena de consulta: ?fingerprint="
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Branch '{branch}' used as commit in build '{versionName}'"
-msgstr "La branca '{branch}' utilitzada com a publicació en la construcció '{versionName}'"
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Branch '{branch}' used as commit in srclib '{srclib}'"
-msgstr "La branca '{branch}' s'utilitza com a entrega al srclib '{srclib}'"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Broken symlink: {path}"
-msgstr "Enllaç simbòlic trencat: {path}"
-
-#: ../fdroidserver/__main__.py
-msgid "Build a package from source"
-msgstr "Construeix un paquet des de l'origen"
-
-#: ../fdroidserver/build.py
-msgid "Build all applications available"
-msgstr "Construeix totes les aplicacions disponibles"
-
-#: ../fdroidserver/lint.py
-msgid "Build generated by `fdroid import` - remove disable line once ready"
-msgstr "Construcció generada per `fdroid import` -elimina la línia de desactivació una vegada llesta"
-
-#: ../fdroidserver/checkupdates.py
-msgid "Build metadata git repo has uncommited changes!"
-msgstr "El dipòsit git de metadades de construcció té canvis sense publicar!"
-
-#: ../fdroidserver/build.py
-msgid "Build only the latest version of each package"
-msgstr "Construeix només la versió més recent de cada paquet"
-
-#: ../fdroidserver/init.py
-#, python-format
-msgid "Built repo based in \"%s\" with this config:"
-msgstr "S'ha construït el dipòsit basat en \"%s\" amb aquesta configuració:"
-
-#: ../fdroidserver/checkupdates.py
-msgid "Can't auto-update app with no CurrentVersionCode"
-msgstr "No es pot actualitzar automàticament l'aplicació sense el CurrentVersionCode"
-
-#: ../fdroidserver/build.py
-msgid "Can't build due to {} error while scanning"
-msgid_plural "Can't build due to {} errors while scanning"
-msgstr[0] "No es pot construir a causa d'un error {} en escanejar"
-msgstr[1] "No es pot construir a causa d'errors {} en escanejar"
-
-#: ../fdroidserver/common.py
-#, fuzzy, python-brace-format
-msgid "Cannot read {path}: {error}"
-msgstr "No s'ha pogut llegir {path}: {error}"
-
-#: ../fdroidserver/rewritemeta.py
-#, python-brace-format
-msgid "Cannot rewrite \"{path}\""
-msgstr "No es pot reescriure \"{path}\""
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
-#: ../fdroidserver/lint.py
-#, python-format
-msgid "Categories '%s' is not valid"
-msgstr "Les categories '%s' no són vàlides"
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
-#: ../fdroidserver/lint.py
-msgid "Categories are not set"
-msgstr "No s'han definit categories"
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "Category \"{category}\" defined but not used for any apps!"
-msgstr "Categoria \"{category}\" definida però no utilitzada per a cap aplicació!"
-
-#: ../fdroidserver/__main__.py
-msgid "Check for updates to applications"
-msgstr "Cerca actualitzacions a les aplicacions"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Checking archiving for {appid} - apks:{integer}, keepversions:{keep}, archapks:{arch}"
-msgstr "S'està comprovant l'arxivat per a {appid} - apks:{integer}, keepversions:{keep}, archapks:{arch}"
-
-#: ../fdroidserver/update.py
-msgid "Clean update - don't uses caches, reprocess all APKs"
-msgstr "Actualització neta - no utilitza la memòria cau, reprocessa tots els APK"
-
-#: ../fdroidserver/common.py
-msgid "Color the log output"
-msgstr "Color de l'egressió del registre"
-
-#: ../fdroidserver/import_subcommand.py
-msgid "Comma separated list of categories."
-msgstr "Llista de categories separades per comes."
-
-#: ../fdroidserver/__main__.py
-#, python-format
-msgid "Command '%s' not recognised.\n"
-msgstr "Ordre '%s' no reconeguda.\n"
-
-#: ../fdroidserver/checkupdates.py
-msgid "Commit changes"
-msgstr "Publicar els canvis"
-
-#: ../fdroidserver/checkupdates.py
-msgid "Commit changes, push, then make a merge request"
-msgstr "Sancioneu els canvis, publiqueu-los i després feu una sol·licitud de fusió"
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Conflicting \"{field}\" definitions between .yml and localized files:"
-msgstr "Definicions conflictives de \"{field}\" entre .yml i fitxers localitzats:"
-
-#: ../fdroidserver/__main__.py
-msgid "Conflicting arguments: '--verbose' and '--quiet' can not be specified at the same time."
-msgstr "Arguments conflictius: no es poden especificar al mateix temps '--verbose' i '--quiet'."
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Could not find '{command}' on your system"
-msgstr "No s'ha pogut trobar '{command}' al vostre sistema"
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/import_subcommand.py
-msgid "Could not find latest version code"
-msgstr "No s'ha pogut trobar el codi de versió més recent"
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
-#: ../fdroidserver/import_subcommand.py
-msgid "Could not find latest version name"
-msgstr "No s'ha pogut trobar el codi de versió més recent"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Could not find {path} to remove it"
-msgstr "No s'ha pogut trobar {path} per eliminar-lo"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Could not open APK {path} for analysis: "
-msgstr "No s'ha pogut obrir APK {path} per a l'anàlisi: "
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Could not parse size \"{size}\", wrong type \"{type}\""
-msgstr "No s'ha pogut analitzar la mida \"{size}\", tipus incorrecte \"{type}\""
-
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/import_subcommand.py
-msgid "Couldn't find Application ID"
-msgstr "No s'ha pogut trobar l'identificador de l'aplicació"
-
-#: ../fdroidserver/checkupdates.py
-msgid "Couldn't find any version information"
-msgstr "No s'ha pogut trobar cap informació de versió"
-
-#: ../fdroidserver/checkupdates.py
-msgid "Couldn't find package ID"
-msgstr "No s'ha pogut trobar l'identificador del paquet"
-
-#: ../fdroidserver/update.py
-msgid "Cowardily refusing to overwrite existing signing key setup!"
-msgstr "Rebutjant covardament sobreescriure la configuració de la clau de signatura existent!"
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Created new container \"{name}\""
-msgstr "S'ha creat el contenidor nou \"{name}\""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Creating \"{path}\" for configuring s3cmd."
-msgstr "S'està creant \"{path}\" per configurar s3cmd."
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Creating empty {config_file}"
-msgstr "S'està creant un «{config_file}» buit"
-
-#: ../fdroidserver/publish.py
-msgid "Creating log directory"
-msgstr "S'està creant el directori de registre"
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Creating new S3 bucket: {url}"
-msgstr "S'està creant un contenidor S3 nou: {url}"
-
-#: ../fdroidserver/publish.py
-msgid "Creating output directory"
-msgstr "S'està creant el directori de sortida"
-
-#: ../fdroidserver/index.py
-msgid "Creating signed index with this key (SHA256):"
-msgstr "S'està creant l'índex signat amb aquesta clau (SHA256):"
-
-#: ../fdroidserver/publish.py ../fdroidserver/verify.py
-msgid "Creating temporary directory"
-msgstr "S'està creant el directori temporal"
-
-#: ../fdroidserver/index.py
-msgid "Creating unsigned index in preparation for signing"
-msgstr "S'està creant un índex sense signar en preparació per a la signatura"
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "CurrentVersionCode {cv} is less than oldest build entry {versionCode}"
-msgstr "CurrentVersionCode {cv} és menys que l'entrada de construcció més antiga {versionCode}"
-
-#: ../fdroidserver/nightly.py
-msgid "DEBUG_KEYSTORE is not set or the value is incomplete"
-msgstr "DEBUG theKEYSTORE no està definit o el valor és incomplet"
-
-#: ../fdroidserver/update.py
-msgid "Delete APKs and/or OBBs without metadata from the repo"
-msgstr "Esborra els APK o els OBB sense metadades del dipòsit"
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Deleting archive, repo is too big ({size} max {limit})"
-msgstr "S'està suprimint l'arxiu, el dipòsit és massa gran ({size} màxim {limit})"
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Deleting git-mirror history, repo is too big ({size} max {limit})"
-msgstr "S'està suprimint l'historial git-mirror, el dipòsit és massa gran ({size}, màxim {limit})"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Deleting unknown file: {path}"
-msgstr "S'està suprimint el fitxer desconegut: {path}"
-
-#: ../fdroidserver/lint.py
-#, python-format
-msgid "Description '%s' is just the app's summary"
-msgstr "La descripció '%s' és només el resum de l'aplicació"
-
-#: ../fdroidserver/lint.py
-msgid "Description has a duplicate line"
-msgstr "La descripció té una línia duplicada"
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Description of length {length} is over the {limit} char limit"
-msgstr "La descripció de la longitud {length} és superior al límit de {limit} caràcters"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Did you mean config/{name}.yml?"
-msgstr "Volíeu dir config/{name}.yml?"
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Did you mean {code}?"
-msgstr "Volíeu dir {code}?"
-
-#: ../fdroidserver/import_subcommand.py
-msgid "Do not add 'disable:' to the generated build entries"
-msgstr "No afegeixis 'disable:' a les entrades generades de construcció"
-
-#: ../fdroidserver/nightly.py
-msgid "Do not deploy the new files to the repo"
-msgstr "No despleguis els fitxers nous al dipòsit"
-
-#: ../fdroidserver/mirror.py
-#, python-brace-format
-msgid "Do not include \"{path}\" in URL!"
-msgstr "No incloeu \"{path}\" a l'URL!"
-
-#: ../fdroidserver/init.py
-msgid "Do not prompt for Android SDK path, just fail"
-msgstr "No preguntis pel camí de l'SDK de l'Android, simplement falla"
-
-#: ../fdroidserver/nightly.py
-msgid "Do not remove the private keys generated from the keystore"
-msgstr "No eliminis les claus privades generades de l'espai de claus"
-
-#: ../fdroidserver/build.py
-msgid "Don't create a source tarball, useful when testing a build"
-msgstr "No crea un arxiu tar d'origen, útil quan es prova una construcció"
-
-#: ../fdroidserver/build.py
-msgid "Don't refresh the repository, useful when testing a build with no internet connection"
-msgstr "No actualitzar el dipòsit, útil quan es prova una construcció sense connexió a Internet"
-
-#: ../fdroidserver/deploy.py ../fdroidserver/nightly.py
-msgid "Don't use rsync checksums"
-msgstr "No usis les sumes de verificació \"rsync\""
-
-#: ../fdroidserver/install.py
-msgid "Download F-Droid.apk using mirrors that leak less to the network"
-msgstr "Baixeu l'F-Droid.apk amb les rèpliques que filtren menys dades a la xarxa"
-
-#: ../fdroidserver/__main__.py
-msgid "Download complete mirrors of small repos"
-msgstr "Baixa les rèpliques completes dels petits dipòsits"
-
-#: ../fdroidserver/common.py
-msgid "Downloading the repository already failed once, not trying again."
-msgstr "La baixada del repositori ja ha fallat una vegada, no s'ha tornat a provar."
-
-#: ../fdroidserver/verify.py
-#, python-brace-format
-msgid "Downloading {url} failed. {error}"
-msgstr "Ha fallat la baixada de {url}. {error}"
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Duplicate Anti-Feature declaration at {path} was ignored!"
-msgstr "S'ha ignorat la declaració de característiques no adients per duplicada a {path}!"
-
-#: ../fdroidserver/index.py
-#, python-format
-msgid "Duplicate entry \"%s\" in mirrors config!"
-msgstr "Entrada duplicada \"%s\" a la configuració de les rèpliques!"
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Duplicate link in '{field}': {url}"
-msgstr "Enllaç duplicat a '{field}': {url}"
-
-#: ../fdroidserver/common.py
-#, python-format
-msgid "ERROR: %(message)s"
-msgstr "ERROR: %(message)s"
-
-#: ../fdroidserver/__main__.py
-msgid "ERROR: The \"server\" subcommand has been removed, use \"deploy\"!"
-msgstr "ERROR: S'ha eliminat la subordre \"servidor\", useu \"deploy\"!"
-
-#: ../fdroidserver/nightly.py
-msgid "ERROR: unsupported CI type, patches welcome!"
-msgstr "ERROR: tipus CI no suportat, pedaços benvinguts!"
-
-#: ../fdroidserver/nightly.py
-#, python-format
-msgid "ERROR: unsupported git host \"%s\", patches welcome!"
-msgstr "ERROR: no s'admet l'amfitrió git \"%s\", els pedaços són benvinguts!"
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "ERROR: {key} in {path} is not \"archive\" or \"repo\"!"
-msgstr "ERROR: {key} a {path} no és \"arxiu\" o \"dipòsit\"!"
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "ERROR: {key} not a valid key!"
-msgstr "ERROR: {key} no és una clau vàlida!"
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "ERROR: {key}'s value should be of type {t}!"
-msgstr "ERROR: el valor de {key} hauria de ser del tipus {t}!"
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "ERROR: {key}:{subkey} in {path} is not in allowed keys: {allowed_keys}!"
-msgstr "ERROR: {key}:{subkey} a {path} no està a les claus permeses: {allowed_keys}!"
-
-#: ../fdroidserver/__main__.py
-#, python-brace-format
-msgid "Encoding is set to '{enc}' fdroid might run into encoding issues. Please set it to 'UTF-8' for best results."
-msgstr "La codificació està establerta a '{enc}' fdroid podria tenir problemes de codificació. Si us plau, establiu-lo a 'UTF-8' per obtenir els millors resultats."
-
-#: ../fdroidserver/init.py
-#, python-format
-msgid ""
-"Enter the path to the Android SDK (%s) here:\n"
-"> "
-msgstr ""
-"Introduïu aquí el camí cap a l'SDK d'Android (%s):\n"
-"> "
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Environment variable {var} from {configname} is not set!"
-msgstr "La variable d'entorn {var} de {configname} no està establerta!"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Environment variable {{env: {var}}} is not set!"
-msgstr "La variable d'entorn {{env: {var}}} no està establerta!"
-
-#: ../fdroidserver/deploy.py
-msgid "Error deploying 'github_releases', {} not present. (You might need to run `fdroid update` first.)"
-msgstr "S'ha produït un error en desplegar 'github_releases', no hi ha {}. (Pot ser necessari executar `fdroid update` primer.)"
-
-#: ../fdroidserver/import_subcommand.py
-msgid "Error while getting repo address"
-msgstr "S'ha produït un error en obtenir l'adreça del dipòsit"
-
-#: ../fdroidserver/scanner.py
-msgid "Exit with a non-zero code if problems were found"
-msgstr "Sortiu amb un codi non-zero si s'han trobat problemes"
-
-#: ../fdroidserver/__main__.py
-msgid "Extract application metadata from a source repository"
-msgstr "Extreu les metadades de l'aplicació des d'un dipòsit de codi font"
-
-#: ../fdroidserver/__main__.py
-msgid "Extract signatures from APKs"
-msgstr "Extreu les signatures dels APKs"
-
-#: ../fdroidserver/install.py
-msgid "F-Droid.apk could not be downloaded from any known source!"
-msgstr "No s'ha pogut baixar l'F-Droid.apk des de cap font coneguda!"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Failed copying {path}: {error}"
-msgstr "No s'ha pogut copiar {path}: {error}"
-
-#: ../fdroidserver/signatures.py
-#, python-brace-format
-msgid "Failed fetching signatures for '{apkfilename}': {error}"
-msgstr "No s'han pogut recuperar les signatures per a '{apkfilename}': {error}"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Failed reading {path}: {error}"
-msgstr "No s'ha pogut llegir {path}: {error}"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Failed resizing {path}: {error}"
-msgstr "No s'ha pogut canviar la mida de {path}: {error}"
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Failed to create S3 bucket: {url}"
-msgstr "No s'ha pogut crear el contenidor S3: {url}"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Failed to get APK information, deleting {path}"
-msgstr "No s'ha pogut obtenir la informació APK, s'està suprimint {path}"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Failed to get APK information, skipping {path}"
-msgstr "No s'ha pogut obtenir la informació de l'APK, s'ometrà {path}"
-
-#: ../fdroidserver/update.py
-msgid "Failed to get APK signing key fingerprint"
-msgstr "No s'ha pogut obtenir l'empremta digital de la clau de signatura APK"
-
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "Failed to install '{apkfilename}' on {dev}: {error}"
-msgstr "No s'ha pogut instal·lar '{apkfilename}' a {dev}: {error}"
-
-#: ../fdroidserver/common.py
-msgid "Failed to sign application"
-msgstr "No s'ha pogut signar l'aplicació"
-
-#: ../fdroidserver/build.py
-#, python-brace-format
-msgid "Fetched buildserverid from VM: {buildserverid}"
-msgstr "S'ha establert buildserverid des de la MV: {buildserverid}"
-
-#: ../fdroidserver/signatures.py
-#, python-brace-format
-msgid "Fetched signatures for '{apkfilename}' -> '{sigdir}'"
-msgstr "Signatures fixades per a '{apkfilename}' -> '{sigdir}'"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "File disappeared while processing it: {path}"
-msgstr "El fitxer ha desaparegut en processar-lo: {path}"
-
-#: ../fdroidserver/build.py ../fdroidserver/install.py
-#: ../fdroidserver/rewritemeta.py ../fdroidserver/scanner.py
-#: ../fdroidserver/update.py
-msgid "Finished"
-msgstr "Finalitzat"
-
-#: ../fdroidserver/lint.py
-msgid "Forbidden HTML tags"
-msgstr "Etiquetes HTML prohibida"
-
-#: ../fdroidserver/build.py
-msgid "Force build of disabled apps, and carries on regardless of scan problems. Only allowed in test mode."
-msgstr "Força la construcció d'aplicacions desactivades i continua sense tenir en compte els problemes d'escaneig. Només es permet en mode de prova."
-
-#: ../fdroidserver/build.py
-#, python-brace-format
-msgid "Force halting build after {0} sec timeout!"
-msgstr "Força aturar la construcció després de {0} segons de temps d'espera!"
-
-#: ../fdroidserver/scanner.py
-msgid "Force scan of disabled apps and builds."
-msgstr "Força l'escaneig de les aplicacions i construccions desactivades."
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Found \"{path}\" graphic without metadata for app \"{name}\"!"
-msgstr "S'ha trobat el gràfic \"{path}\" sense metadades per a l'aplicació «{name}»!"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Found bad funding file \"{path}\" for \"{name}\":"
-msgstr "S'ha trobat un fitxer de finançament incorrecte \"{path}\" per a \"{name}\":"
-
-#: ../fdroidserver/common.py
-msgid "Found invalid appids in arguments"
-msgstr "S'han trobat aplicacions no vàlides als arguments"
-
-#: ../fdroidserver/common.py
-msgid "Found invalid versionCodes for some apps"
-msgstr "S'han trobat versionsCodes no vàlides per a algunes aplicacions"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Found multiple JAR Signature Block Files in {path}"
-msgstr "S'han trobat múltiples fitxers de bloc de signatura JAR a {path}"
-
-#: ../fdroidserver/common.py
-msgid "Found multiple Signer Certificates!"
-msgstr "S'han trobat múltiples certificats de signatura!"
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Found multiple metadata files for {appid}"
-msgstr "S'han trobat múltiples fitxers de metadades per a {appid}"
-
-#: ../fdroidserver/index.py
-msgid "Found multiple signing certificates for repository."
-msgstr "S'han trobat múltiples certificats de signatura per al dipòsit."
-
-#: ../fdroidserver/index.py
-msgid "Found no signing certificates for repository."
-msgstr "No s'ha trobat cap certificat de signatura per al dipòsit."
-
-#: ../fdroidserver/lint.py
-#, python-format
-msgid "Found non-file at %s"
-msgstr "S'ha trobat un no-fitxer a %s"
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Found {apkfilename} at {url}"
-msgstr "S'ha trobat {apkfilename} al {url}"
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Found {count} problems in {filename}"
-msgstr "S'han trobat {count} problemes al {filename}"
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Found {count} warnings in {filename}"
-msgstr "S'han trobat {count} avisos al {filename}"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Generated skeleton metadata for {appid}"
-msgstr "S'han generat metadades d'esquelet per a {appid}"
-
-#: ../fdroidserver/common.py
-#, python-format
-msgid "Git checkout of '%s' failed"
-msgstr "Ha fallat la comprovació del Git de «%s»"
-
-#: ../fdroidserver/common.py
-msgid "Git clean failed"
-msgstr "Ha fallat la neteja del Git"
-
-#: ../fdroidserver/common.py
-msgid "Git fetch failed"
-msgstr "Ha fallat l'obtenció del Git"
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/common.py
-#, python-format
-msgid "Git remote set-head failed: \"%s\""
-msgstr "Ha fallat el set-head remot del Git: «%s»"
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/common.py
-msgid "Git reset failed"
-msgstr "Ha fallat el restabliment del Git"
-
-#: ../fdroidserver/common.py
-msgid "Git submodule deinit failed"
-msgstr "Ha fallat l'inici del submòdul Git"
-
-#: ../fdroidserver/common.py
-msgid "Git submodule sync failed"
-msgstr "Ha fallat la sincronització del submòdul Git"
-
-#: ../fdroidserver/common.py
-msgid "Git submodule update failed"
-msgstr "Ha fallat l'actualització del submòdul del Git"
-
-#: ../fdroidserver/common.py
-msgid "HTTPS must be used with Subversion URLs!"
-msgstr "HTTPS s'ha d'utilitzar amb URL de Subversion!"
-
-#: ../fdroidserver/deploy.py
-msgid "If a git mirror gets to big, allow the archive to be deleted"
-msgstr "Si una rèplica de git es fa gran, permet que l'arxiu se suprimeixi"
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "If this upload fails, try manually uploading to {url}"
-msgstr "Si aquesta pujada falla, proveu de pujar manualment a {url}"
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Ignoring '{field}' in '{metapath}' metadata because it is deprecated."
-msgstr "S'ignorarà '{field}' a les metadades '{metapath}' perquè està obsolet."
-
-#: ../fdroidserver/update.py
-#, python-format
-msgid "Ignoring FUNDING.yml entry longer than 2048: %s"
-msgstr "S'ignorarà l'entrada FUNDING.yml més llarga de 2048: %s"
-
-#: ../fdroidserver/update.py
-#, python-format
-msgid "Ignoring bad element in manifest: %s"
-msgstr "S'ignorarà l'element incorrecte al manifest: %s"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Ignoring deprecated {oldfile}, use {newfile}!"
-msgstr "S'ignorarà el {oldfile} obsolet, utilitzeu {newfile}!"
-
-#: ../fdroidserver/index.py
-msgid "Ignoring package without metadata: "
-msgstr "S'ignorarà el paquet sense metadades: "
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Ignoring stale cache data for {apkfilename}"
-msgstr "S'estan ignorant les dades de la memòria cau obsoleta per a {apkfilename}"
-
-#: ../fdroidserver/update.py
-msgid "Include APKs that are signed with disabled algorithms like MD5"
-msgstr "Inclou els APK que estan signats amb algorismes desactivats com MD5"
-
-#: ../fdroidserver/mirror.py
-msgid "Include the PGP signature .asc files in the mirror"
-msgstr "Inclou els fitxers .asc de signatura PGP a la rèplica"
-
-#: ../fdroidserver/mirror.py
-msgid "Include the build logs in the mirror"
-msgstr "Inclou els registres de construcció en la rèplica"
-
-#: ../fdroidserver/mirror.py
-msgid "Include the source tarballs in the mirror"
-msgstr "Inclou els fitxers tarball del codi font en la rèplica"
-
-#: ../fdroidserver/metadata.py
-#, python-format
-msgid "Including metadata from %s@%s"
-msgstr "S'inclouen les metadades de %s@%s"
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Including metadata from {path}"
-msgstr "S'inclouen les metadades de {path}"
-
-#: ../fdroidserver/common.py
-msgid "Initialising submodules"
-msgstr "S'estan inicialitzant els submòduls"
-
-#: ../fdroidserver/install.py
-msgid "Install all signed applications available"
-msgstr "Instal·la totes les aplicacions signades disponibles"
-
-#: ../fdroidserver/__main__.py
-msgid "Install built packages on devices"
-msgstr "Instal·la els paquets integrats en dispositius"
-
-#: ../fdroidserver/install.py
-#, python-format
-msgid "Installing %s..."
-msgstr "S'està instal·lant %s..."
-
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "Installing '{apkfilename}' on {dev}..."
-msgstr "S'està instal·lant '{apkfilename}' a {dev}..."
-
-#: ../fdroidserver/__main__.py
-msgid "Interact with the repo HTTP server"
-msgstr "Interactua amb el servidor HTTP del dipòsit"
-
-#: ../fdroidserver/update.py
-msgid "Invalid APK"
-msgstr "APK no vàlid"
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "Invalid AutoUpdateMode: {mode}"
-msgstr "AutoUpdateMode no vàlid: {mode}"
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "Invalid UpdateCheckMode: {mode}"
-msgstr "UpdateCheckMode no vàlid: {mode}"
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "Invalid VercodeOperation: {field}"
-msgstr "VercodeOperation no vàlid: {field}"
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Invalid VercodeOperation: {invalid_ops}"
-msgstr "VercodeOperation no vàlid: {invalid_ops}"
-
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Invalid application ID {appid}"
-msgstr "ID d'aplicació {appid} invàlid"
-
-#: ../fdroidserver/lint.py
-msgid "Invalid bulleted list"
-msgstr "Llista de pics no vàlida"
-
-#: ../fdroidserver/common.py
-#, python-format
-msgid "Invalid name for published file: %s"
-msgstr "Nom no vàlid per al fitxer publicat: %s"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Invalid ndk: entry in build: \"{ndk}\""
-msgstr "ndk no vàlid: entrada a la construcció: \"{ndk}\""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Invalid redirect to non-HTTPS: {before} -> {after} "
-msgstr "Redireccions no vàlides a no HTTPS: {before} -> {after} "
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Invalid scrlib metadata: '{file}' does not exist"
-msgstr "Metadades scrlib no vàlides: '{file}' no existeix"
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Invalid srclib metadata: could not parse '{file}'"
-msgstr "Metadades srclib no vàlides: no s'ha pogut analitzar '{file}'"
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Invalid srclib metadata: unknown key '{key}' in '{file}'"
-msgstr "Metadades srclib no vàlides: clau desconeguda '{key}' a '{file}'"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "JAR signature failed to verify: {path}"
-msgstr "No s'ha pogut verificar la signatura JAR: {path}"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "JAR signature verified: {path}"
-msgstr "S'ha verificat la signatura JAR: {path}"
-
-#: ../fdroidserver/scanner.py
-msgid "Java JAR file"
-msgstr "Fitxer JAR del Java"
-
-#: ../fdroidserver/mirror.py ../fdroidserver/publish.py
-#: ../fdroidserver/update.py
-msgid "Java JDK not found! Install in standard location or set java_paths!"
-msgstr "No s'ha trobat el Java JDK! Instal·leu-lo en una ubicació estàndard o establiu java_paths!"
-
-#: ../fdroidserver/scanner.py
-msgid "Java compiled class"
-msgstr "Classe compilada de Java"
-
-#: ../fdroidserver/signindex.py
-msgid "Java jarsigner not found! Install in standard location or set java_paths!"
-msgstr "No s'ha trobat el jarsigner de Java! Instal·leu-lo en una ubicació estàndard o establiu java_paths!"
-
-#: ../fdroidserver/lint.py
-msgid "Javascript in HTML src attributes"
-msgstr "Javascript en els atributs HTML src"
-
-#: ../fdroidserver/build.py
-#, python-brace-format
-msgid "Keeping failed build \"{apkfilename}\""
-msgstr "Ha fallat el manteniment de la construcció \"{apkfilename}\""
-
-#: ../fdroidserver/init.py
-msgid "Keystore for signing key:\t"
-msgstr "Keystore per a la clau de signatura:\t"
-
-#: ../fdroidserver/lint.py
-msgid "Known debug key is used in AllowedAPKSigningKeys: "
-msgstr "La clau de depuració coneguda s'utilitza a AllowedAPKSigningKeys: "
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Last used commit '{commit}' looks like a tag, but UpdateCheckMode is '{ucm}'"
-msgstr "L'última publicació utilitzada '{commit}' sembla una etiqueta, però UpdateCheckMode és '{ucm}'"
-
-#: ../fdroidserver/lint.py
-msgid "Liberapay donation methods belong in the Liberapay: field"
-msgstr "Els mètodes de donació de Liberapay pertanyen al camp Liberapay: field"
-
-#: ../fdroidserver/rewritemeta.py
-msgid "List files that would be reformatted (dry run)"
-msgstr "Llista els fitxers que es reformatitzaran (execució seca)"
-
-#: ../fdroidserver/lint.py
-msgid "Locale included in f-droid.org URL"
-msgstr "Configuració regional inclosa a l'URL de f-droid.org"
-
-#: ../fdroidserver/build.py
-msgid "Make the build stop on exceptions"
-msgstr "Fes que la construcció s'aturi amb excepcions"
-
-#: ../fdroidserver/index.py
-msgid "Malformed repository mirrors."
-msgstr "Espills de dipòsit mal formats."
-
-#: ../fdroidserver/deploy.py
-msgid "Malformed serverwebroot line:"
-msgstr "Línia mal formada de serverwebroot:"
-
-#: ../fdroidserver/scanner.py
-#, python-format
-msgid "Max recursion depth in ZIP file reached: %s"
-msgstr "S'ha arribat a la profunditat màxima de recursivitat en el fitxer ZIP: %s"
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "Mirror config for {url} contains \"isPrimary\" key!"
-msgstr "La configuració de la rèplica per a {url} conté la clau «isPrimary»!"
-
-#: ../fdroidserver/mirror.py
-msgid "Mirror the full repo and archive, all file types."
-msgstr "Reflecteix el dipòsit complet i l'arxiu, tots els tipus de fitxers."
-
-#: ../fdroidserver/gpgsign.py
-msgid "Missing output directory"
-msgstr "Falta el directori de sortida"
-
-#: ../fdroidserver/metadata.py
-msgid "Moving Anti-Features declarations to localized files:"
-msgstr "S'estan movent les declaracions de característiques no adients als fitxers localitzats:"
-
-#: ../fdroidserver/index.py
-msgid "Neither \"repo_pubkey\" nor \"keystorepass\" set in config.yml"
-msgstr "Ni \"repo_pubkey\" ni \"keystorepass\" estan establerts a config.yml"
-
-#: ../fdroidserver/verify.py
-#, python-format
-msgid "No APK for package: %s"
-msgstr "No hi ha APK per al paquet: %s"
-
-#: ../fdroidserver/common.py
-msgid "No Android SDK found!"
-msgstr "No s'ha trobat cap SDK d'Android!"
-
-#: ../fdroidserver/install.py
-msgid "No attached devices found"
-msgstr "No s'ha trobat cap dispositiu adjunt"
-
-#: ../fdroidserver/install.py
-msgid "No devices found for `adb install`! Please plug one in."
-msgstr "No s'han trobat dispositius per a `adb install`! Connecteu-ne algun."
-
-#: ../fdroidserver/index.py
-msgid "No fingerprint in URL."
-msgstr "No hi ha cap empremta digital a l'URL."
-
-#: ../fdroidserver/common.py
-msgid "No git submodules available"
-msgstr "No hi ha submòduls git disponibles"
-
-#: ../fdroidserver/import_subcommand.py
-msgid "No gradle project could be found. Specify --subdir?"
-msgstr "No s'ha pogut trobar cap projecte de gradle. Voleu especificar --subdir?"
-
-#: ../fdroidserver/import_subcommand.py
-msgid "No information found."
-msgstr "No s'ha trobat informació."
-
-#: ../fdroidserver/checkupdates.py
-msgid "No matching tags found"
-msgstr "No s'ha trobat cap etiqueta coincident"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "No minimum SDK version found in {0}, using default (3)."
-msgstr "No s'ha trobat cap versió SDK mínima a {0}, s'usarà el valor per defecte (3)."
-
-#: ../fdroidserver/lint.py
-msgid "No need to specify that the app is Free Software"
-msgstr "No cal especificar que l'aplicació és programari lliure"
-
-#: ../fdroidserver/lint.py
-msgid "No need to specify that the app is for Android"
-msgstr "No cal especificar que l'aplicació és per a Android"
-
-#: ../fdroidserver/deploy.py
-msgid "No option set! Edit your config.yml to set at least one of these:"
-msgstr "No s'ha establert cap opció! Editeu el vostre config.yml per establir almenys un d'aquests:"
-
-#: ../fdroidserver/common.py
-msgid "No packages specified"
-msgstr "No s'ha especificat cap paquet"
-
-#: ../fdroidserver/install.py
-#, python-format
-msgid "No signed APK available for %s"
-msgstr "No hi ha disponible APK signat per a %s"
-
-#: ../fdroidserver/install.py
-msgid "No signed output directory - nothing to do"
-msgstr "No hi ha cap directori de sortida signat - res a fer"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "No signing certificates found in {path}"
-msgstr "No s'ha trobat cap certificat de signatura a {path}"
-
-#: ../fdroidserver/common.py
-#, python-format
-msgid "No such package: %s"
-msgstr "No existeix el paquet: %s"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "No such versionCode {versionCode} for app {appid}"
-msgstr "No existeix el codi de versió {versionCode} per a l'aplicació {appid}"
-
-#: ../fdroidserver/checkupdates.py
-msgid "No tags found"
-msgstr "No s'ha trobat cap etiqueta"
-
-#: ../fdroidserver/publish.py ../fdroidserver/verify.py
-msgid "No unsigned directory - nothing to do"
-msgstr "No hi ha cap directori sense signar - res a fer"
-
-#: ../fdroidserver/__main__.py
-msgid "No version information could be found."
-msgstr "No s'ha pogut trobar cap informació de versió."
-
-#: ../fdroidserver/common.py
-msgid "Not a valid size definition: \"{}\""
-msgstr "Definició de mida no vàlida: \"{}\""
-
-#: ../fdroidserver/signindex.py
-msgid "Nothing to do"
-msgstr "No hi ha res a fer"
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "Nothing to do for {appid}."
-msgstr "No hi ha res a fer per {appid}."
-
-#: ../fdroidserver/init.py
-msgid "Now set these in config.yml:"
-msgstr "Ara establiu-los a config.yml:"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "OBB file has newer versionCode({integer}) than any APK:"
-msgstr "El fitxer OBB té una versionCode({integer}) més nova que qualsevol APK:"
-
-#: ../fdroidserver/update.py
-msgid "OBB filename must start with \"main.\" or \"patch.\":"
-msgstr "El nom de fitxer OBB ha de començar amb \"main.\" o \"patch.\":"
-
-#: ../fdroidserver/update.py
-msgid "OBB's packagename does not match a supported APK:"
-msgstr "El nom del paquet de l'OBB no coincideix amb un APK compatible:"
-
-#: ../fdroidserver/deploy.py
-msgid "Offline machine, skipping git mirror generation until `fdroid deploy`"
-msgstr "Màquina fora de línia, s'ometrà la generació de la rèplica git fins al `fdroid deploy`"
-
-#: ../fdroidserver/deploy.py
-msgid "One of the 'github_releases' config items is missing the 'packageNames' value. skipping ..."
-msgstr "Un dels elements de configuració 'github_releases' manca el valor 'packageNames'. s'està ometent..."
-
-#: ../fdroidserver/deploy.py
-msgid "One of the 'github_releases' config items is missing the 'projectUrl' value. skipping ..."
-msgstr "Un dels elements de configuració 'github_releases' manca el valor 'projectUrl'. s'està ometent..."
-
-#: ../fdroidserver/deploy.py
-msgid "One of the 'github_releases' config items is missing the 'token' value. skipping ..."
-msgstr "Un dels elements de configuració 'github_releases' manca el valor 'token'. s'està ometent..."
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Only PNG and JPEG are supported for graphics, found: {path}"
-msgstr "Només s'admeten PNG i JPEG per als gràfics, s'ha trobat: {path}"
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/common.py
-msgid "Only accepts a single key \"env\""
-msgstr "Només accepta una clau única «env»"
-
-#: ../fdroidserver/checkupdates.py
-msgid "Only process apps with auto-updates"
-msgstr "Només processa aplicacions amb actualitzacions automàtiques"
-
-#: ../fdroidserver/lint.py
-msgid "OpenCollective donation methods belong in the OpenCollective: field"
-msgstr "Els mètodes de donació OpenCollective pertanyen al camp OpenCollective: field"
-
-#: ../fdroidserver/verify.py
-msgid "Output JSON report to file named after APK."
-msgstr "Informe de sortida JSON a un fitxer anomenat segons l'APK."
-
-#: ../fdroidserver/scanner.py
-msgid "Output JSON to stdout."
-msgstr "Sortida JSON a stdout."
-
-#: ../fdroidserver/checkupdates.py ../fdroidserver/gpgsign.py
-#: ../fdroidserver/publish.py ../fdroidserver/signindex.py
-#: ../fdroidserver/update.py
-msgid "Outputting JSON"
-msgstr "JSON de sortida"
-
-#: ../fdroidserver/import_subcommand.py
-msgid "Overall license of the project."
-msgstr "Llicència general del projecte."
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "Overriding blank versionName in {apkfilename} from metadata: {version}"
-msgstr "S'està reemplaçant el versionName en blanc a {apkfilename} des de les metadades: {version}"
-
-#: ../fdroidserver/import_subcommand.py
-#, python-brace-format
-msgid "Package \"{appid}\" already exists"
-msgstr "El paquet \"{appid}\" ja existeix"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Parsing manifest at '{path}'"
-msgstr "S'està analitzant el manifest a '{path}'"
-
-#: ../fdroidserver/common.py
-msgid "Password required with username"
-msgstr "Cal una contrasenya amb el nom d'usuari"
-
-#: ../fdroidserver/import_subcommand.py
-msgid "Path to main Android project subdirectory, if not in root."
-msgstr "Camí al subdirectori principal del projecte Android, si no és a l'arrel."
-
-#: ../fdroidserver/init.py
-msgid "Path to the Android SDK (sometimes set in ANDROID_HOME)"
-msgstr "Camí al SDK d'Android (de vegades establert a ANDROID_HOME)"
-
-#: ../fdroidserver/btlog.py
-msgid "Path to the git repo to use as the log"
-msgstr "Camí al dipòsit git a usar com a registre"
-
-#: ../fdroidserver/init.py
-msgid "Path to the keystore for the repo signing key"
-msgstr "Camí al magatzem de claus per a la clau de signatura del dipòsit"
-
-#: ../fdroidserver/nightly.py
-msgid "Print the secret variable to the terminal for easy copy/paste"
-msgstr "Imprimeix la variable secreta al terminal per a copiar/enganxar fàcilment"
-
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "Privacy mode was enabled based on your locale ({country_code})."
-msgstr "El mode privat s'ha habilitat d'acord amb el vostre codi regional ({country_code})."
-
-#: ../fdroidserver/scanner.py
-#, python-format
-msgid "Problem with ZIP file: %s, error %s"
-msgstr "Problema amb el fitxer ZIP: %s, error %s"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Problem with xml at '{path}'"
-msgstr "Problema amb xml a '{path}'"
-
-#: ../fdroidserver/checkupdates.py
-msgid "Process auto-updates"
-msgstr "Processa les actualitzacions automàtiques"
-
-#: ../fdroidserver/publish.py ../fdroidserver/update.py
-#, python-brace-format
-msgid "Processing {apkfilename}"
-msgstr "S'està processant {apkfilename}"
-
-#: ../fdroidserver/checkupdates.py ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Processing {appid}"
-msgstr "S'està processant {appid}"
-
-#: ../fdroidserver/update.py
-msgid "Produce human-readable XML/JSON for index files"
-msgstr "Produeix XML/JSON llegible per humans per a fitxers d'índex"
-
-#: ../fdroidserver/import_subcommand.py
-msgid "Project URL to import from."
-msgstr "URL del projecte des del qual importar."
-
-#: ../fdroidserver/lint.py
-msgid "Punctuation should be avoided"
-msgstr "S'ha d'evitar la puntuació"
-
-#: ../fdroidserver/btlog.py
-msgid "Push the log to this git remote repository"
-msgstr "Empeny el registre a aquest repositori remot git"
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Pushing binary transparency log to {url}"
-msgstr "S'està enviant el registre de transparència binària a {url}"
-
-#: ../fdroidserver/deploy.py
-msgid "Pushing to remote server failed!"
-msgstr "Ha fallat l'enviament al servidor remot!"
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Pushing to {url}"
-msgstr "S'està pujant a {url}"
-
-#: ../fdroidserver/__main__.py
-msgid "Quickly start a new repository"
-msgstr "Crea ràpidament un dipòsit nou"
-
-#: ../fdroidserver/__main__.py
-msgid "Read all the metadata files and exit"
-msgstr "Llegeix tots els fitxers de metadades i surt"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Reading '{config_file}'"
-msgstr "S'està llegint '{config_file}'"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Reading packageName/versionCode/versionName failed, APK invalid: '{apkfilename}'"
-msgstr "Ha fallat la lectura del nompaquet/versioCodi/versioNom, l'APK no és vàlid: '{apkfilename}'"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Reading packageName/versionCode/versionName failed,APK invalid: '{apkfilename}'"
-msgstr "Ha fallat la lectura del nompaquet/versioCodi/versioNom, l'APK no és vàlid: '{apkfilename}'"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Reading {apkfilename} from cache"
-msgstr "S'està llegint {apkfilename} des de la memòria cau"
-
-#: ../fdroidserver/build.py
-msgid "Refresh and cache scanner rules and signatures from the network"
-msgstr "Actualitza i cau les regles de l'escàner i les signatures de la xarxa"
-
-#: ../fdroidserver/publish.py
-#, python-brace-format
-msgid "Refusing to sign '{path}', file exists in both {dir1} and {dir2} folder."
-msgstr "No se signarà «{path}», el fitxer existeix a les dues carpetes {dir1} i {dir2}."
-
-#: ../fdroidserver/verify.py
-msgid "Remove source tarball and any APKs if successfully verified."
-msgstr "Elimina el fitxer tar d'origen i qualsevol APKs si s'ha verificat correctament."
-
-#: ../fdroidserver/common.py
-msgid "Removing specified files"
-msgstr "S'estan suprimint els fitxers especificats"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Removing {path}\""
-msgstr "S'està suprimint {path}\""
-
-#: ../fdroidserver/update.py
-msgid "Rename APK files that do not match package.name_123.apk"
-msgstr "Canvia el nom dels fitxers APK que no coincideixin amb package.name_123.apk"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "RepoType {type} is deprecated, please switch to git."
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-#, python-brace-format
-msgid "Resigning {apkfilename} with provided debug.keystore"
-msgstr "S'està resignant {apkfilename} amb la depuració proporcionada per debug.keystore"
-
-#: ../fdroidserver/update.py
-msgid "Resize all the icons exceeding the max pixel size and exit"
-msgstr "Canvia la mida de totes les icones que excedeixen la mida màxima del píxel i surt"
-
-#: ../fdroidserver/common.py
-msgid "Restrict output to warnings and errors"
-msgstr "Restringeix la sortida a avisos i errors"
-
-#: ../fdroidserver/net.py
-#, python-format
-msgid "Retrying failed download: %s"
-msgstr "S'està tornant a baixar: %s"
-
-#: ../fdroidserver/__main__.py
-msgid "Rewrite all the metadata files"
-msgstr "Reescriu tots els fitxers de metadades"
-
-#: ../fdroidserver/rewritemeta.py
-#, python-brace-format
-msgid "Rewriting '{appid}'"
-msgstr "S'està reescrivint '{appid}'"
-
-#: ../fdroidserver/checkupdates.py
-msgid "Run on git repo that has uncommitted changes"
-msgstr "Executa en el diposit git que té canvis no publicats"
-
-#: ../fdroidserver/nightly.py
-#, python-brace-format
-msgid "Run over {cibase} to find -debug.apk. and skip repo_basedir {repo_basedir}"
-msgstr "Executeu {cibase} per trobar -debug.apk. i omet repo_basedir {repo_basedir}"
-
-#: ../fdroidserver/lint.py
-msgid "Run rewritemeta to fix formatting"
-msgstr "Executa rewritemeta per esmenar el format"
-
-#: ../fdroidserver/deploy.py
-msgid "Running first pass with MD5 checking disabled"
-msgstr "S'està executant la primera passada amb la comprovació MD5 desactivada"
-
-#: ../fdroidserver/mirror.py
-#, python-brace-format
-msgid "Running wget in {path}"
-msgstr "S'està executant wget a {path}"
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "SHA-256 of {url} does not match entry!"
-msgstr "El SHA-256 de {url} no coincideix amb l'entrada!"
-
-#: ../fdroidserver/build.py
-msgid "Scan the resulting APK(s) for known non-free classes."
-msgstr "Escaneja els APK(s) resultants per a les classes conegudes no lliures."
-
-#: ../fdroidserver/__main__.py
-msgid "Scan the source code of a package"
-msgstr "Escaneja el codi font d'un paquet"
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Scanner found {count} problems in {apk}"
-msgstr "L'escàner ha trobat {count} problemes a {apk}"
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Scanner found {count} problems in {appid}:"
-msgstr "L'escàner ha trobat {count} problemes a {appid}:"
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Scanner found {count} problems in {appid}:{versionCode}:"
-msgstr "S'han trobat {count} problemes a {appid}:{versionCode}:"
-
-#: ../fdroidserver/build.py
-msgid "Scanner found {} problem"
-msgid_plural "Scanner found {} problems"
-msgstr[0] "L'escàner ha trobat {} problema"
-msgstr[1] "L'escàner ha trobat {} problemes"
-
-#: ../fdroidserver/scanner.py
-msgid "Scanning APK for extra signing blocks."
-msgstr "S'està escanejant l'APK en cerca de blocs signants addicionals."
-
-#: ../fdroidserver/scanner.py
-msgid "Scanning APK with dexdump for known non-free classes."
-msgstr "S'està escanejant l'APK amb dexdump per a les classes no lliures conegudes."
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Set NDK {release} ({version}) up"
-msgstr "Estableix NDK {release} ({version}) cap amunt"
-
-#: ../fdroidserver/common.py
-msgid "Set clock to that time using:"
-msgstr "Estableix el rellotge a aquest temps utilitzant:"
-
-#: ../fdroidserver/nightly.py
-msgid "Set maximum releases in repo before older ones are archived"
-msgstr "Estableix el nombre màxim de llançaments al dipòsit abans que s'arxivin els més antics"
-
-#: ../fdroidserver/build.py
-#, python-brace-format
-msgid "Set open file limit to {integer}"
-msgstr "Estableix el límit de fitxer obert a {integer}"
-
-#: ../fdroidserver/__main__.py
-msgid "Set up an app build for a nightly build repo"
-msgstr "Configura una construcció d'aplicació per a un dipòsit de construcció nocturn"
-
-#: ../fdroidserver/build.py
-msgid "Setting open file limit failed: "
-msgstr "Ha fallat l'establiment del límit de fitxer obert: "
-
-#: ../fdroidserver/build.py
-#, python-brace-format
-msgid "Setting {0} sec timeout for this build"
-msgstr "S'està establint el temps d'espera de {0} segons per a aquesta construcció"
-
-#: ../fdroidserver/__main__.py
-msgid "Sign and place packages in the repo"
-msgstr "Signa i publica els paquets al dipòsit"
-
-#: ../fdroidserver/__main__.py
-msgid "Sign indexes created using update --nosign"
-msgstr "Signa els índexs creats amb update --nosign"
-
-#: ../fdroidserver/build.py
-msgid "Skip scanning the source code for binaries and other problems"
-msgstr "Omet l'escaneig del codi font pels binaris i altres problemes"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Skipping '{apkfilename}' with invalid signature!"
-msgstr "S'està saltant \"{apkfilename}\" amb una signatura no vàlida!"
-
-#: ../fdroidserver/deploy.py ../fdroidserver/index.py
-#, python-format
-msgid "Skipping GitLab Pages mirror because the repo is too large (>%.2fGB)!"
-msgstr "S'ometrà la rèplica de les pàgines del GitLab perquè el dipòsit és massa gran (>%.2fGB)!"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Skipping index generation for {appid}"
-msgstr "S'està ometent la generació de l'índex per a {appid}"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Skipping {apkfilename} with invalid signature!"
-msgstr "S'està ometent {apkfilename} amb una signatura no vàlida!"
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Skipping {appid}: disabled"
-msgstr "Omet {appid}: desactivat"
-
-#: ../fdroidserver/deploy.py
-msgid "Specify a local folder to sync the repo to"
-msgstr "Especifiqueu una carpeta local a la qual sincronitzar el dipòsit"
-
-#: ../fdroidserver/deploy.py
-msgid "Specify an identity file to provide to SSH for rsyncing"
-msgstr "Especifiqueu un fitxer d'identitat que s'ha de proporcionar a SSH per a la sincronització"
-
-#: ../fdroidserver/nightly.py
-msgid "Specify which debug keystore file to use."
-msgstr "Especifiqueu quin fitxer de depuració del magatzem de claus s'ha d'utilitzar."
-
-#: ../fdroidserver/common.py
-msgid "Spew out even more information than normal"
-msgstr "Escampa encara més informació de la normal"
-
-#: ../fdroidserver/nightly.py
-#, python-brace-format
-msgid "Stripping mystery signature from {apkfilename}"
-msgstr "S'està suprimint la signatura de misteri de {apkfilename}"
-
-#: ../fdroidserver/lint.py
-#, python-format
-msgid "Summary '%s' is just the app's name"
-msgstr "El resum '%s' només és el nom de l'aplicació"
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Summary of length {length} is over the {limit} char limit"
-msgstr "El resum de la longitud {length} és superior al límit de {limit} caràcters"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "System clock is older than date in {path}!"
-msgstr "El rellotge del sistema és més antic que la data a {path}!"
-
-#: ../fdroidserver/checkupdates.py
-msgid "Tags update mode only works for git, hg, bzr and git-svn repositories currently"
-msgstr "El mode d'actualització de les etiquetes només funciona per als dipòsits git, hg, bzr i git-svn actualment"
-
-#: ../fdroidserver/checkupdates.py
-msgid "Tags update mode used in git-svn, but the repo was not set up with tags"
-msgstr "Mode d'actualització de les etiquetes utilitzat a git-svn, però el repositori no s'ha configurat amb etiquetes"
-
-#: ../fdroidserver/build.py
-msgid "Test mode - put output in the tmp directory only, and always build, even if the output already exists."
-msgstr "Mode de prova: posa la sortida només al directori tmp, i sempre construeix, fins i tot si la sortida ja existeix."
-
-#: ../fdroidserver/index.py
-msgid "The \"qrcode\" Python package is not installed (e.g. apt-get install python3-qrcode)!"
-msgstr "No s'ha instal·lat el paquet de Python «qrcode» (p. ex. apt-get install python3-qrcode)!"
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "The OBB version code must come after \"{name}.\":"
-msgstr "El codi de la versió de l'OBB ha de venir després de \"{name}.\":"
-
-#: ../fdroidserver/btlog.py
-msgid "The base URL for the repo to log (default: https://f-droid.org)"
-msgstr "L'URL base pel registre del dipòsit (predeterminat: https://f-droid.org)"
-
-#: ../fdroidserver/mirror.py
-msgid "The directory to write the mirror to"
-msgstr "El directori on escriure la rèplica"
-
-#: ../fdroidserver/nightly.py
-msgid "The file to be included in the repo (path or glob)"
-msgstr "El fitxer que s'inclourà al dipòsit (camí o glob)"
-
-#: ../fdroidserver/index.py
-msgid "The repository's fingerprint does not match."
-msgstr "L'empremta digital del repositori no coincideix."
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "The root dir for local_copy_dir \"{path}\" does not exist!"
-msgstr "El directori arrel per a local_copy_dir \"{path}\" no existeix!"
-
-#: ../fdroidserver/publish.py
-msgid "There is a keyalias collision - publishing halted"
-msgstr "Hi ha una col·lisió de keyalias - s'ha aturat la publicació"
-
-#: ../fdroidserver/common.py
-msgid "These are the apps that have been archived from the main repo."
-msgstr "Aquestes són les aplicacions que s'han arxivat del dipòsit principal."
-
-#: ../fdroidserver/mirror.py
-msgid "This command should never be used to mirror f-droid.org! A full copy requires more than 600GB."
-msgstr "Aquesta ordre no s'ha d'utilitzar mai per a reflectir f-droid.org! Una còpia completa requereix més de 600 GB."
-
-#: ../fdroidserver/common.py
-msgid "This is a repository of apps to be used with F-Droid. Applications in this repository are either official binaries built by the original application developers, or are binaries built from source by the admin of f-droid.org using the tools on https://gitlab.com/fdroid."
-msgstr "Aquest és un dipòsit d'aplicacions que s'utilitzaran amb l'F-Droid. Les aplicacions d'aquest dipòsit són o bé binaris oficials construïts pels desenvolupadors originals de l'aplicació, o bé binaris construïts a partir del codi font per l'administrador de f-droid.org utilitzant les eines a https://gitlab.com/fdroid."
-
-#: ../fdroidserver/import_subcommand.py
-#, python-format
-msgid "This repo already has local metadata: %s"
-msgstr "Aquest dipòsit ja té metadades locals: %s"
-
-#: ../fdroidserver/init.py
-#, python-format
-msgid ""
-"To complete the setup, add your APKs to \"%s\"\n"
-"then run \"fdroid update -c; fdroid update\".  You might also want to edit\n"
-"\"config.yml\" to set the URL, repo name, and more.  You should also set up\n"
-"a signing key (a temporary one might have been automatically generated).\n"
-"\n"
-"For more info: https://f-droid.org/docs/Setup_an_F-Droid_App_Repo\n"
-"and https://f-droid.org/docs/Signing_Process"
-msgstr ""
-"Per completar la configuració, afegiu els APKs a \"%s\"\n"
-"i executeu \"fdroid update -c; fdroid update\".  Potser també voleu editar\n"
-"\"config.yml\" per a definir l'URL, el nom del dipòsit i més.  També hauries de configurar\n"
-"una clau de signatura (pot ser que s'hagi generat automàticament una clau temporal).\n"
-"\n"
-"Per a més informació:  https://f-droid.org/docs/Setup_an_F-Droid_App_Repo\n"
-"i https://f-droid.org/docs/Signing_Process"
-
-#: ../fdroidserver/deploy.py
-msgid "To use awsbucket, awssecretkey and awsaccesskeyid must also be set in config.yml!"
-msgstr "Per utilitzar awsbucket, awssecretkey i awsaccesskeyid també s'han d'establir a config.yml!"
-
-#: ../fdroidserver/deploy.py
-msgid "To use rclone, rclone_config and awsbucket must be set in config.yml!"
-msgstr "Per utilitzar rclone, rclone_config i awsbucket s'han d'establir a config.yml!"
-
-#: ../fdroidserver/lint.py
-msgid "URL must start with https:// or http://"
-msgstr "L'URL ha de començar per https:// o http://"
-
-#: ../fdroidserver/lint.py
-msgid "URL shorteners should not be used"
-msgstr "No s'han d'utilitzar els escurçadors d'URL"
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "URL {url} in Description: {error}"
-msgstr "URL {url} a la descripció: {error}"
-
-#: ../fdroidserver/lint.py
-msgid "Unexpected license tag \"{}\"! Only use FSF or OSI approved tags from https://spdx.org/license-list"
-msgstr "Etiqueta de llicència inesperada \"{}\"! Utilitza només les etiquetes aprovades per FSF o OSI de https://spdx.org/license-list"
-
-#: ../fdroidserver/lint.py
-msgid "Unexpected license tag \"{}\"! Only use license tags configured in your config file"
-msgstr "Etiqueta de llicència inesperada \"{}\"! Utilitza només les etiquetes de llicència configurades al fitxer de configuració"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Unknown entry {key} in {configname}"
-msgstr "Entrada desconeguda {key} a {configname}"
-
-#: ../fdroidserver/__main__.py
-msgid "Unknown exception found!"
-msgstr "S'ha trobat una excepció desconeguda!"
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Unknown file '{filename}' in build '{versionName}'"
-msgstr "Fitxer desconegut '{filename}' a la construcció '{versionName}'"
-
-#: ../fdroidserver/metadata.py
-#, python-format
-msgid "Unknown metadata format: %s"
-msgstr "Format de metadades desconegut: %s"
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Unknown metadata format: {path} (use: *.yml)"
-msgstr "Format de metadades desconegut: {path} (utilitzeu: *.yml)"
-
-#: ../fdroidserver/common.py
-msgid "Unknown version of aapt, might cause problems: "
-msgstr "Versió desconeguda de l'aapt, pot causar problemes: "
-
-#: ../fdroidserver/lint.py
-msgid "Unnecessary leading space"
-msgstr "Espai inicial innecessari"
-
-#: ../fdroidserver/lint.py
-msgid "Unnecessary trailing space"
-msgstr "Espai final innecessari"
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Unrecognised app field '{fieldname}' in '{path}'"
-msgstr "Camp d'aplicació no reconegut '{fieldname}' a '{path}'"
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Unrecognised build flag '{build_flag}' in '{path}'"
-msgstr "Indicador de construcció no reconegut '{build_flag}' a '{path}'"
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Unsupported file type \"{extension}\" for repo graphic"
-msgstr "Tipus de fitxer \"{extension}\" no admès per al gràfic del dipòsit"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Unsupported graphics file found: {path}"
-msgstr "S'ha trobat un fitxer de gràfics no admès: {path}"
-
-#: ../fdroidserver/lint.py
-#, python-format
-msgid "Unused extlib at %s"
-msgstr "Extlib no utilitzada a %s"
-
-#: ../fdroidserver/lint.py
-#, python-format
-msgid "Unused file at %s"
-msgstr "Fitxer no utilitzat a %s"
-
-#: ../fdroidserver/scanner.py
-#, python-format
-msgid "Unused scandelete path: %s"
-msgstr "Camí de l'escandelete no utilitzat: %s"
-
-#: ../fdroidserver/scanner.py
-#, python-format
-msgid "Unused scanignore path: %s"
-msgstr "Camí de scanignore no utilitzat: %s"
-
-#: ../fdroidserver/__main__.py
-msgid "Update repo information for new packages"
-msgstr "Actualitza la informació del dipòsit amb paquets nous"
-
-#: ../fdroidserver/__main__.py
-msgid "Update the binary transparency log for a URL"
-msgstr "Actualitza l'informe de transparència binari amb un nou URL"
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "UpdateCheckData has invalid URL: {url}"
-msgstr "UpdateCheckData té un URL no vàlid: {url}"
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "UpdateCheckData must match the version code as integer (\\d or [0-9]): {codeex}"
-msgstr "UpdateCheckData ha de coincidir amb el codi de versió com a enter (\\d o [0-9]): {codeex}"
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "UpdateCheckData must use HTTPS URL: {url}"
-msgstr "UpdateCheckData ha d'utilitzar l'URL HTTPS: {url}"
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "UpdateCheckData not a valid URL: {url}"
-msgstr "UpdateCheckData no és un URL vàlid: {url}"
-
-#: ../fdroidserver/lint.py
-msgid "UpdateCheckMode is set but it looks like checkupdates hasn't been run yet."
-msgstr "UpdateCheckMode està establert però sembla que encara no s'han executat les revisions."
-
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/lint.py
-msgid "UpdateCheckName is set to the known application ID, it can be removed"
-msgstr "UpdateCheckName està establert a l'identificador d'aplicació conegut, es pot eliminar"
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Uploading {apkfilename} to androidobservatory.org"
-msgstr "S'està pujant {apkfilename} a androidobservatory.org"
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Uploading {apkfilename} to virustotal"
-msgstr "S'està pujant {apkfilename} a virustotal"
-
-#: ../fdroidserver/lint.py
-msgid "Use /HEAD instead of /master or /main to point at a file in the default branch"
-msgstr "Usa /HEAD en lloc de /master o /main per apuntar a un fitxer a la branca predeterminada"
-
-#: ../fdroidserver/update.py
-msgid "Use `fdroid update -c` to create it."
-msgstr "Utilitzeu `fdroid update -c`per a crear-lo."
-
-#: ../fdroidserver/build.py
-msgid "Use build server"
-msgstr "Utilitza el servidor de construcció"
-
-#: ../fdroidserver/update.py
-msgid "Use date from APK instead of current time for newly added APKs"
-msgstr "Usa la data de l'APK en lloc de l'hora actual per als APKs nous afegits"
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Using \"{path}\" for configuring s3cmd."
-msgstr "S'està utilitzant \"{path}\" per configurar s3cmd."
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Using \"{path}\" for syncing with remote storage."
-msgstr "S'està utilitzant \"{path}\" per a sincronitzar amb l'emmagatzematge remot."
-
-#: ../fdroidserver/common.py
-msgid "Using APK Signature v2"
-msgstr "Ús de la signatura APK v2"
-
-#: ../fdroidserver/common.py
-msgid "Using APK Signature v3"
-msgstr "Ús de la signatura APK v3"
-
-#: ../fdroidserver/common.py
-msgid "Using JAR Signature"
-msgstr "Ús de la signatura JAR"
-
-#: ../fdroidserver/common.py
-msgid "Using Java's jarsigner, not recommended for verifying APKs! Use apksigner"
-msgstr "Utilitzant el jarsigner de Java, no es recomana verificar APKs! Useu l'apksigner"
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Using blank dictionary instead of contents of {path}!"
-msgstr "S'està utilitzant un diccionari en blanc en lloc del contingut de {path}!"
-
-#: ../fdroidserver/init.py
-#, python-brace-format
-msgid "Using existing keystore \"{path}\""
-msgstr "S'està utilitzant l'espai de claus existent \"{path}\""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Using rclone to sync with: {url}"
-msgstr "S'està utilitzant el rclone per a sincronitzar-lo: {url}"
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Using s3cmd to sync with: {url}"
-msgstr "S'està utilitzant s3cmd per sincronitzar amb: {url}"
-
-#: ../fdroidserver/__main__.py
-msgid "Valid commands are:"
-msgstr "Les ordres vàlides són:"
-
-#: ../fdroidserver/verify.py
-msgid "Verify against locally cached copy rather than redownloading."
-msgstr "Verifiqueu contra la còpia local a la memòria cau en lloc de tornar a baixar."
-
-#: ../fdroidserver/__main__.py
-msgid "Verify the integrity of downloaded packages"
-msgstr "Verifica la integritat dels paquets descarregats"
-
-#: ../fdroidserver/index.py
-msgid "Verifying index signature:"
-msgstr "Verificació de la signatura de l'índex:"
-
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "Verifying package {path} with apksigner."
-msgstr "S'està verificant el paquet {path} l'apksigner."
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "VirusTotal API key cannot upload files larger than 32MB, use {url} to upload {path}."
-msgstr "La clau de l'API VirusTotal no pot pujar fitxers més grans de 32 MB, utilitzeu {url} per pujar {path}."
-
-#: ../fdroidserver/nightly.py
-msgid "WARNING: only public git repos are supported!"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Warn about possible metadata errors"
-msgstr "Avisa de possibles errors a les metadades"
-
-#: ../fdroidserver/scanner.py
-msgid "WebAssembly binary file"
-msgstr "Fitxer binari WebAssembly"
-
-#: ../fdroidserver/update.py
-msgid "When configured for signed indexes, create only unsigned indexes at this stage"
-msgstr "Quan es configura per als índexs signats, només es creen els índexs no signats en aquesta fase"
-
-#: ../fdroidserver/lint.py
-msgid "When linting the entire repository yamllint is disabled by default. This option forces yamllint regardless."
-msgstr "Quan es mostra tot el «yamllint» del repositori està desactivat de manera predeterminada. Aquesta opció força la «yamllint» independentment."
-
-#: ../fdroidserver/publish.py
-msgid "When signing or verifying fails, exit with an error code."
-msgstr "Quan signar o verificar falla, sortiu amb un codi d'error."
-
-#: ../fdroidserver/install.py
-msgid "Would you like to download and install F-Droid.apk via adb? (YES/no)"
-msgstr "Voleu baixar i instal·lar l'F-Droid.apk mitjançant adb? (SÍ/no)"
-
-#: ../fdroidserver/install.py
-msgid "Would you like to download the app(s) from f-droid.org? (YES/no)"
-msgstr "Voleu baixar les aplicacions des de f-droid.org? (SÍ/no)"
-
-#: ../fdroidserver/init.py
-msgid "X.509 'Distinguished Name' used when generating keys"
-msgstr "X.509 'Nom distint' utilitzat en generar claus"
-
-#: ../fdroidserver/common.py
-msgid "You can use ANDROID_HOME to set the path to your SDK, i.e.:"
-msgstr "Podeu utilitzar ANDROID_HOME per establir el camí al vostre SDK, és a dir:"
-
-#: ../fdroidserver/scanner.py
-msgid "ZIP file archive"
-msgstr "arxiu de fitxers ZIP"
-
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "adb reports {serial} is \"{status}\"!"
-msgstr "adb informa que {serial} és: «{status}»!"
-
-#: ../fdroidserver/nightly.py
-#, python-brace-format
-msgid "adding IdentityFile to {path}"
-msgstr "s'està afegint el fitxer d'identitat a {path}"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "adding to {name}: {path}"
-msgstr "s'està afegint a {name}: {path}"
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "ambiguous option: %(option)s could match %(matches)s"
-msgstr "opció ambigua: %(option)s podria correspondre amb %(matches)s"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "apksigner in build-tools;{version} passes APKs with invalid v3 signatures, ignoring."
-msgstr "apksigner en build-tools;{version} passa APKs sense sigantures v3 vàlides, ingnorant."
-
-#: ../fdroidserver/common.py
-msgid "apksigner not found! Cannot sign or verify modern APKs"
-msgstr "No s'ha trobat l'apksigner! No es poden signar o verificar els APK moderns"
-
-#: ../fdroidserver/common.py
-msgid "apksigner not found, it's required for signing!"
-msgstr "No s'ha trobat l'apksigner, és necessari per signar!"
-
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/checkupdates.py ../fdroidserver/lint.py
-#: ../fdroidserver/rewritemeta.py
-msgid "application ID of file to operate on"
-msgstr "ID de l'aplicació del fitxer en què s'ha d'operar"
-
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/build.py ../fdroidserver/install.py
-#: ../fdroidserver/publish.py ../fdroidserver/scanner.py
-#: ../fdroidserver/verify.py
-msgid "application ID with optional versionCode in the form APPID[:VERCODE]"
-msgstr "ID de l'aplicació amb versió opcionalCode en el formulari APPID[:VERCODE]"
-
-#: ../fdroidserver/common.py
-msgid "archive_url needs to end with /archive"
-msgstr "archive_url necessita acabar amb /archive"
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "argument \"-\" with mode %r"
-msgstr "argument \"-\" amb mode %r"
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "argument %(argument_name)s: %(message)s"
-msgstr "argument %(argument_name)s: %(message)s"
-
-#: ../fdroidserver/nightly.py
-msgid "attempting bare SSH connection to test deploy key:"
-msgstr "s'està provant la connexió SSH per comprovar la clau de desplegament:"
-
-#: ../fdroidserver/common.py
-msgid "can not parse scrlib spec (not a string): '{}'"
-msgstr "no es pot analitzar l'especificació de la «scrlib» (no és una cadena): '{}'"
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "can't open '%(filename)s': %(error)s"
-msgstr "no es pot obrir '%(filename)s': %(error)s"
-
-#: ../fdroidserver/scanner.py
-msgid "can't open non-https url: '{};"
-msgstr "no es pot obrir l'URL no-https: '{};"
-
-#: ../fdroidserver/build.py
-#, python-brace-format
-msgid "cannot find required srclibs: \"{path}\""
-msgstr "no s'han pogut trobar els srclibs requerits: \"{path}\""
-
-#: /usr/lib/python3.11/argparse.py
-msgid "cannot have multiple subparser arguments"
-msgstr "no es poden tenir múltiples arguments de subanalitzador"
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "cannot merge actions - two groups are named %r"
-msgstr "no es poden fusionar les accions - dos grups s'anomenen %r"
-
-#: ../fdroidserver/nightly.py
-msgid "cannot publish update, did you set the deploy key?"
-msgstr "no es pot publicar l'actualització. Heu establert la clau de desplegament?"
-
-#: ../fdroidserver/nightly.py
-#, python-brace-format
-msgid "cloning {url}"
-msgstr "s'està clonant {url}"
-
-#: ../fdroidserver/__main__.py
-msgid "commands from plugin modules:"
-msgstr "ordres dels mòduls del connector:"
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "conflicting option string: %s"
-msgid_plural "conflicting option strings: %s"
-msgstr[0] "cadena d'opció conflictiva: %s"
-msgstr[1] "cadenes d'opció conflictiva: %s"
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "conflicting subparser alias: %s"
-msgstr "àlies de subanalitzador conflictiu: %s"
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "conflicting subparser: %s"
-msgstr "subanalitzador conflictiu: %s"
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "could not parse '{path}'"
-msgstr "no s'ha pogut analitzar '{path}'"
-
-#: ../fdroidserver/common.py
-msgid "could not parse srclib spec (no name specified): '{}'"
-msgstr "no s'ha pogut analitzar l'especificació «srclib» (no s'ha especificat cap nom): '{}'"
-
-#: ../fdroidserver/common.py
-msgid "could not parse srclib spec (no ref specified): '{}'"
-msgstr "no s'ha pogut analitzar l'especificació «srclib» (no s'ha especificat cap referència): '{}'"
-
-#: ../fdroidserver/nightly.py
-#, python-brace-format
-msgid "created {path}"
-msgstr "s'ha creat {path}"
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "current version is newer: old vercode={old}, new vercode={new}"
-msgstr "la versió actual és més nova: antic vercode={old}, nou vercode={new}"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "deleting: repo/{apkfilename}"
-msgstr "s'està suprimint: dipòsit/{apkfilename}"
-
-#: ../fdroidserver/scanner.py
-msgid "dependency file without lock"
-msgstr "fitxer de dependència sense blocatge"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "deployed process log {path} to {dest}"
-msgstr "s'ha desplegat el registre de procés {path} a {dest}"
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "dest= is required for options like %r"
-msgstr "dest= és obligatori per opcions com %r"
-
-#: ../fdroidserver/scanner.py
-msgid "downloading '{}'"
-msgstr "s'està baixant '{}'"
-
-#: ../fdroidserver/scanner.py
-msgid "downloading scanner signatures from '{}' failed"
-msgstr "ha fallat la baixada de signatures de l'escàner des de '{}'"
-
-#: ../fdroidserver/scanner.py
-msgid "executable binary, possibly code"
-msgstr "binari executable, possiblement codi"
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "expected %s argument"
-msgid_plural "expected %s arguments"
-msgstr[0] "s'esperava l'argument %s"
-msgstr[1] "s'esperaven els arguments %s"
-
-#: /usr/lib/python3.11/argparse.py
-msgid "expected at least one argument"
-msgstr "s'esperava almenys un argument"
-
-#: /usr/lib/python3.11/argparse.py
-msgid "expected at most one argument"
-msgstr "s'esperava com a màxim un argument"
-
-#: /usr/lib/python3.11/argparse.py
-msgid "expected one argument"
-msgstr "s'esperava un argument"
-
-#: ../fdroidserver/__main__.py
-msgid "fdroid [<command>] [-h|--help|--version|<args>]"
-msgstr "fdroid [<command>] [-h|--help|--version|<args>]"
-
-#: ../fdroidserver/scanner.py
-msgid "fetch the latest version of signatures from the web"
-msgstr "recupera l'última versió de les signatures del web"
-
-#: ../fdroidserver/metadata.py
-msgid "force metadata errors (default) to be warnings, or to be ignored."
-msgstr "força que els errors de metadades (predeterminat) siguin avisos o s'ignorin."
-
-#: ../fdroidserver/common.py
-msgid "git svn clone failed"
-msgstr "Ha fallat el clon de «git svn»"
-
-#: ../fdroidserver/scanner.py
-msgid "gzip file archive"
-msgstr "arxiu de fitxers gzip"
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "ignored explicit argument %r"
-msgstr "s'ha ignorat l'argument explícit %r"
-
-#: ../fdroidserver/index.py
-msgid "index-v1 must have a signature, use `fdroid signindex` to create it!"
-msgstr "index-v1 ha de tenir una signatura, utilitzeu `fdroid signindex` per a crear-la!"
-
-#: ../fdroidserver/index.py
-msgid "index-v2 must have a signature, use `fdroid signindex` to create it!"
-msgstr "index-v2 ha de tenir una signatura, utilitzeu `fdroid signindex`per a crear-la!"
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "invalid %(type)s value: %(value)r"
-msgstr "valor %(type)s no vàlid: %(value)r"
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "invalid choice: %(value)r (choose from %(choices)s)"
-msgstr "elecció no vàlida: %(value)r (trieu de %(choices)s)"
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "invalid conflict_resolution value: %r"
-msgstr "el valor conflict_resolution no és vàlid: %r"
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "invalid option string %(option)r: must start with a character %(prefix_chars)r"
-msgstr "cadena d'opció no vàlida %(option)r: ha de començar amb un caràcter %(prefix_chars)r"
-
-#: ../fdroidserver/common.py
-msgid "ipfs_cid not found, skipping CIDv1 generation"
-msgstr "no s'ha trobat l'ipfs_cid, s'ometrà la generació CIDv1"
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "latest build recipe is newer: old vercode={old}, new vercode={new}"
-msgstr "la darrera recepta de construcció és més nova: antic vercode={old}, nou vercode={new}"
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "local_copy_dir does not end with \"fdroid\", perhaps you meant: \"{path}\""
-msgstr "local_copy_dir no acaba amb \"fdroid\", potser voldríeu dir: \"{path}\""
-
-#: ../fdroidserver/deploy.py
-msgid "local_copy_dir must be an absolute path!"
-msgstr "local_copy_dir ha de ser un camí absolut!"
-
-#: ../fdroidserver/deploy.py
-msgid "local_copy_dir must be directory, not a file!"
-msgstr "local_copy_dir ha de ser directori, no un fitxer!"
-
-#: ../fdroidserver/index.py
-#, python-format
-msgid "mirror '%s' does not end with 'fdroid'!"
-msgstr "La rèplica «%s» no acaba amb «fdroid»!"
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "mirrors set twice, in config.yml and {path}!"
-msgstr "rèpliques establertes dues vegades, a config.yml i {path}!"
-
-#: /usr/lib/python3.11/argparse.py
-msgid "mutually exclusive arguments must be optional"
-msgstr "els arguments mútuament excloents han de ser opcionals"
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "next {name} cache update due in {time}"
-msgstr "la propera actualització de la memòria cau de {name} vencerà a {time}"
-
-#: ../fdroidserver/mirror.py
-#, python-brace-format
-msgid "no \"icon\" in {appid}"
-msgstr "no hi ha cap \"icona\" a {appid}"
-
-#: ../fdroidserver/signatures.py
-msgid "no APK supplied"
-msgstr "no s'ha subministrat cap APK"
-
-#: ../fdroidserver/checkupdates.py
-msgid "no version information found"
-msgstr "no s'ha trobat cap informació de versió"
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "not allowed with argument %s"
-msgstr "no està permès amb l'argument %s"
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "one of the arguments %s is required"
-msgstr "es requereix un dels arguments %s"
-
-#: ../fdroidserver/common.py ../fdroidserver/index.py
-msgid "only accepts strings, lists, and tuples"
-msgstr "només accepta cadenes, llistes i tuples"
-
-#: /usr/lib/python3.11/argparse.py
-msgid "options"
-msgstr "opcions"
-
-#: ../fdroidserver/nightly.py
-#, python-brace-format
-msgid "overwriting existing {path}"
-msgstr "s'està sobreescrivint {path}"
-
-#: /usr/lib/python3.11/argparse.py
-msgid "positional arguments"
-msgstr "arguments posicionals"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "process log deploy {path} to {dest} failed!"
-msgstr "ha fallat el desplegament del registre de processos {path} a {dest}!"
-
-#: ../fdroidserver/build.py
-msgid "reference binary missing signature"
-msgstr "falta la signatura al binari de referència"
-
-#: ../fdroidserver/signatures.py
-#, python-brace-format
-msgid "refuse downloading via insecure HTTP connection (use HTTPS or specify --no-https-check): {apkfilename}"
-msgstr "rebutja la baixada via connexió HTTP insegura (utilitzeu HTTPS o especifiqueu --no-https-check): {apkfilename}"
-
-#: ../fdroidserver/index.py
-#, python-format
-msgid "repo_icon \"repo/icons/%s\" does not exist, generating placeholder."
-msgstr "repo_icon \"repo/icons/%s\" no existeix, generant marcador de posició."
-
-#: ../fdroidserver/common.py
-msgid "repo_url needs to end with /repo"
-msgstr "repo_url ha d'acabar amb /repo"
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "rsync is missing or broken: {error}"
-msgstr "falta el rsync o està trencat: {error}"
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "s3cmd sync indexes {path} to {url} and delete"
-msgstr "s3cmd sincronitza els índexs {path} a {url} i suprimeix"
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "s3cmd syncs indexes from {path} to {url} and deletes removed"
-msgstr "s3cmd sincronitza els índexs de {path} a {url} i esborra els suprimits"
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "scanner cache is malformed! You can clear it with: '{clear}'"
-msgstr "la memòria cau de l'escàner està mal formada! Podeu netejar-la amb: '{clear}'"
-
-#: ../fdroidserver/deploy.py
-msgid "serverwebroot: path does not end with \"fdroid\", perhaps you meant one of these:"
-msgstr "serverwebroot: el camí no acaba amb \"fdroid\", potser volíeu dir una d'aquestes:"
-
-#: ../fdroidserver/scanner.py
-msgid "shared library"
-msgstr "biblioteca compartida"
-
-#: /usr/lib/python3.11/argparse.py
-msgid "show this help message and exit"
-msgstr "mostra aquest missatge d'ajuda i surt"
-
-#: ../fdroidserver/signatures.py
-msgid "signed APK, either a file-path or HTTPS URL."
-msgstr "APK signat, ja sigui un camí de fitxer o un URL HTTPS."
-
-#: ../fdroidserver/common.py
-msgid "skip deploying full build logs: log content is empty"
-msgstr "s'omet el desplegament de registres de construcció complets: el contingut del registre està buit"
-
-#: ../fdroidserver/common.py
-msgid "skip deploying full build logs: not enabled in config"
-msgstr "s'omet el desplegament de registres de construcció complets: no està habilitat a la configuració"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "skipping source tarball: {path}"
-msgstr "s'està ometent l'arxiu tar d'origen: {path}"
-
-#: ../fdroidserver/lint.py
-msgid "srclibs missing name and/or @"
-msgstr "manca el nom i/o @ de srclibs"
-
-#: ../fdroidserver/scanner.py
-msgid "static library"
-msgstr "biblioteca estàtica"
-
-#: ../fdroidserver/build.py
-#, python-brace-format
-msgid "supplied reference binary has allowed signer {signer}"
-msgstr "el binari de referència proporcionat ha permès el signant {signer}"
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "the following arguments are required: %s"
-msgstr "els arguments següents són obligatoris: %s"
-
-#: ../fdroidserver/install.py
-msgid "true"
-msgstr "vertader"
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "unexpected option string: %s"
-msgstr "cadena d'opcions inesperada: %s"
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "unknown parser %(parser_name)r (choices: %(choices)s)"
-msgstr "analitzador desconegut %(parser_name)r (opcions: %(choices)s)"
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "unrecognized arguments: %s"
-msgstr "arguments desconeguts: %s"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "unsafe permissions on '{config_file}' (should be 0600)!"
-msgstr "permisos a «{config_file}» insegurs (hauria de ser 0600)!"
-
-#: ../fdroidserver/__main__.py /usr/lib/python3.11/argparse.py
-msgid "usage: "
-msgstr "us: "
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "using Apache libcloud to sync with {url}"
-msgstr "s'està utilitzant libcloud d'Apache per sincronitzar amb {url}"
-
-#: ../fdroidserver/deploy.py
-msgid "virustotal.com is rate limiting, waiting to retry..."
-msgstr "virustotal.com és limitant de velocitat, esperant tornar-ho a provar..."
-
-#: ../fdroidserver/install.py
-msgid "yes"
-msgstr "sí"
-
-#: ../fdroidserver/publish.py
-#, python-brace-format
-msgid "{0} app, {1} key aliases"
-msgid_plural "{0} apps, {1} key aliases"
-msgstr[0] "{0} aplicació, {1} àlies de claus"
-msgstr[1] "{0} aplicacions, {1} àlies de claus"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{apkfilename} ({appid}) has no metadata!"
-msgstr "{apkfilename} ({appid}) no té metadades!"
-
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{apkfilename}'s AndroidManifest.xml has a bad date: "
-msgstr "L'AndroidManifest.xml de {apkfilename} té una data incorrecta: "
-
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{appid} does not have a name! Using application ID instead."
-msgstr "{appid} no té nom! S'està utilitzant l'identificador de l'aplicació."
-
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{appid} from {path} is not a valid Android application ID!"
-msgstr "{appid} de {path} no és un ID d'aplicació Android vàlid!"
-
-#: ../fdroidserver/metadata.py ../fdroidserver/update.py
-#, python-brace-format
-msgid "{appid} from {path} is not a valid Java Package Name!"
-msgstr "{appid} de {path} no és un nom de paquet Java vàlid!"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{appid} has both APKs and files: {files}"
-msgstr "{appid} té tant APK com fitxers: {files}"
-
-#: ../fdroidserver/mirror.py
-#, python-brace-format
-msgid "{appid} is missing {name}"
-msgstr "{appid} no té {name}"
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "{appid}: Unknown extlib {path} in build '{versionName}'"
-msgstr "{appid}: Extlib {path} desconegut a la construcció '{versionName}'"
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "{appid}: no builds specified, running on current source state"
-msgstr "{appid}: no s'ha especificat cap construcció, s'està executant en l'estat font actual"
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "{appid}: {field} must be a '{type}', but it is a '{fieldtype}!'"
-msgstr "{appid}: {field} ha de ser un '{type}', però és un '{fieldtype}!'"
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "{appid}: {field} must be a '{type}', but it is a '{fieldtype}'!"
-msgstr "{appid}: {field} ha de ser un '{type}', però és un '{fieldtype}'!"
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "{build_flag} must be an integer, found: {value}"
-msgstr "{build_flag} ha de ser un enter, s'ha trobat: {value}"
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "{build_flag} must be list or string, found: {value}"
-msgstr "{build_flag} ha de ser llista o cadena, s'ha trobat: {value}"
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "{file} is blank or corrupt!"
-msgstr "{file} està en blanc o corromput!"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{name} \"{section}/icons/{path}\" does not exist! Check \"config.yml\"."
-msgstr "{name} \"{section}/icons/{path}\" no existeix! Comproveu \"config.yml\"."
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{path1} is a duplicate of {path2}, remove one!"
-msgstr "{path1} és un duplicat de {path2}, elimineu-ne un!"
-
-#: ../fdroidserver/import_subcommand.py
-#, python-brace-format
-msgid "{path} already exists, ignoring import results!"
-msgstr "{path} ja existeix, s'ignoraran els resultats d'importació!"
-
-#: ../fdroidserver/nightly.py
-#, python-brace-format
-msgid "{path} does not exist!  Create it by running:"
-msgstr "{path} no existeix! Crea-ho executant:"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{path} has bad file signature \"{pattern}\", possible Janus exploit!"
-msgstr "{path} té una signatura de fitxer incorrecta \"{pattern}\", possible Janus exploit!"
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "{path} has been flagged by virustotal {count} times:"
-msgstr "{path} ha estat marcat pel virustotal {count} vegades:"
-
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "{path} has the wrong fingerprint ({fingerprint})!"
-msgstr "{path} no té l'emprempta correcta ({fingerprint})!"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "{path} is not \"key: value\" dict, but a {datatype}!"
-msgstr "{path} no és \"clau: valor\" dict, sinó un {datatype}!"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "{path} is not a standard config file!"
-msgstr "{path} no és un fitxer de configuració estàndard!"
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "{path} is not list, but a {datatype}!"
-msgstr "{path} no és una llista, sinó {datatype}!"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "{path} is not {expected_type}, but a {datatype}!"
-msgstr "{path} no és {expected_type}, sinó {datatype}!"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{path} is zero size!"
-msgstr "{path} és de mida zero!"
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "{path} more than 200MB, manually upload: {url}"
-msgstr "{path} més de 200MB, puja manualment: {url}"
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "{path}: \"{code}\" is not a valid ISO_3166-1 alpha-2 country code!"
-msgstr "{path}: \"{code}\" no és un codi de país ISO313166-1 alfa-2 vàlid!"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{path}: {error}"
-msgstr "{path}: {error}"
-
-#: ../fdroidserver/mirror.py
-#, python-brace-format
-msgid "{url} does not end with \"fdroid\", check the URL path!"
-msgstr "{url} no acaba amb \"fdroid\", comproveu el camí de l'URL!"
-
-#: ../fdroidserver/import_subcommand.py
-#, python-brace-format
-msgid "{url} does not start with \"http\"!"
-msgstr "{url} no comença amb «http»!"
-
-#: ../fdroidserver/build.py
-msgid "{} build failed"
-msgid_plural "{} builds failed"
-msgstr[0] "Ha fallat la construcció {}"
-msgstr[1] "Han fallat les construccions {}"
-
-#: ../fdroidserver/build.py
-msgid "{} build succeeded"
-msgid_plural "{} builds succeeded"
-msgstr[0] "{} construcció correcta"
-msgstr[1] "{} construccions correctes"
diff --git a/locale/cs/LC_MESSAGES/fdroidserver.po b/locale/cs/LC_MESSAGES/fdroidserver.po
index 351d8885..78a8aeab 100644
--- a/locale/cs/LC_MESSAGES/fdroidserver.po
+++ b/locale/cs/LC_MESSAGES/fdroidserver.po
@@ -1,36 +1,43 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# mondstern <mondstern@snopyta.org>, 2021.
-# Petr Novák <nit.monkey@gmail.com>, 2021.
-# Fjuro <fjuro@seznam.cz>, 2022.
-# Filip Klopec <filipklopec@gmail.com>, 2022.
-# Fjuro <ifjuro@proton.me>, 2022, 2023.
-# Daniel Hejduk <jellymail@protonmail.com>, 2023.
-# Fjuro <fjuro@alius.cz>, 2024.
-# Jakub Boukal <www.bagr@gmail.com>, 2024.
-# Fjuro <fjuro@users.noreply.hosted.weblate.org>, 2025.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: fdroidserver 1.0.0-95-gd7af22b\n"
 "Report-Msgid-Bugs-To: https://gitlab.com/fdroid/fdroidserver/issues\n"
-"POT-Creation-Date: 2025-06-25 09:52+0200\n"
-"PO-Revision-Date: 2025-03-26 10:00+0000\n"
-"Last-Translator: Fjuro <fjuro@users.noreply.hosted.weblate.org>\n"
+"POT-Creation-Date: 2020-10-21 18:05+0200\n"
+"PO-Revision-Date: 2019-02-01 13:33+0000\n"
+"Last-Translator: Michal Čihař <michal@cihar.com>\n"
 "Language-Team: Czech <https://hosted.weblate.org/projects/f-droid/fdroidserver/cs/>\n"
 "Language: cs\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=((n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2);\n"
-"X-Generator: Weblate 5.11-dev\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+"X-Generator: Weblate 3.5-dev\n"
+
+#: ../fdroidserver/common.py
+msgid ""
+"\n"
+"        This is a repository of apps to be used with FDroid. Applications in this\n"
+"        repository are either official binaries built by the original application\n"
+"        developers, or are binaries built from source by f-droid.org using the\n"
+"        tools on https://gitlab.com/fdroid.\n"
+"        "
+msgstr ""
+
+#: ../fdroidserver/nightly.py
+msgid ""
+"\n"
+"SSH Public Key to be used as Deploy Key:"
+msgstr ""
 
 #: ../fdroidserver/nightly.py
 msgid ""
 "\n"
 "SSH public key to be used as deploy key:"
 msgstr ""
-"\n"
-"Veřejný klíč SSH, který se použijte jako klíč pro nasazení:"
 
 #: ../fdroidserver/nightly.py
 #, python-brace-format
@@ -38,153 +45,174 @@ msgid ""
 "\n"
 "{path} encoded for the DEBUG_KEYSTORE secret variable:"
 msgstr ""
-"\n"
-"{path} zakódováno pro tajnou proměnnou DEBUG_KEYSTORE:"
 
 #: ../fdroidserver/lint.py
 #, python-format
 msgid "\"%s/\" has no matching metadata file!"
-msgstr "„%s/“ nemá žádný odpovídající soubor metadat!"
-
-#: ../fdroidserver/index.py
-msgid "\"isPrimary\" key should not be added to mirrors!"
-msgstr "Klíč „isPrimary“ by neměl být přidán k zrcadlům!"
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "\"local_copy_dir\" {path} does not exist!"
-msgstr "„local_copy_dir“ {path} neexistuje!"
+msgstr ""
 
 #: ../fdroidserver/install.py
 #, python-brace-format
 msgid "\"{apkfilename}\" is already installed on {dev}."
-msgstr "Aplikace „{apkfilename}“ je již nainstalována na {dev}."
+msgstr ""
+
+#: ../fdroidserver/update.py
+#, python-brace-format
+msgid "\"{path}\" contains outdated {name} ({version})"
+msgstr ""
 
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "\"{path}\" contains recent {name} ({version})"
-msgstr "„{path}“ obsahuje nedávné {name} ({version})"
+msgstr ""
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "\"{path}\" exists but s3cmd is not installed!"
-msgstr "„{path}“ existuje, ale s3cmd není nainstalován!"
+msgstr ""
 
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "\"{path}\" is not a supported file format (use: metadata/*.yml)"
-msgstr "„{path}“ není podporovaný formát souboru (použijte: metadata/*.yml)"
+msgstr ""
 
-#: ../fdroidserver/update.py
+#: ../fdroidserver/metadata.py
 #, python-brace-format
-msgid "\"{path}\" is signed by a key that is not allowed:"
-msgstr "„{path}“ je podepsáno klíčem, který není povolen:"
+msgid "\"{path}\" is not an accepted format, convert to: {formats}"
+msgstr ""
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/common.py
 #, python-brace-format
 msgid "\"{url}\" is not a valid URL!"
-msgstr "„{url}“ není platná adresa URL!"
+msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, python-format
+msgid "%(option)s option requires %(number)d argument"
+msgid_plural "%(option)s option requires %(number)d arguments"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: ../fdroidserver/mirror.py
+#, python-format
+msgid "%(prog)s [options] url"
+msgstr ""
+
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "%(prog)s: error: %(message)s\n"
 msgstr "%(prog)s: chyba: %(message)s\n"
 
-#: ../fdroidserver/publish.py
-#, python-format
-msgid "%d APKs failed to be signed or verified!"
-msgstr "Nepodařilo se podepsat nebo ověřit %d souborů APK!"
-
 #: ../fdroidserver/scanner.py
 #, python-format
 msgid "%d problems found"
-msgstr "nalezeno %d problémů"
+msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "%prog [options]"
+msgstr ""
+
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "%r is not callable"
-msgstr "%r není možné volat"
-
-#: ../fdroidserver/signindex.py
-#, python-format
-msgid "%s did not produce a dict!"
-msgstr "%s nevytvořil dict!"
-
-#: ../fdroidserver/signindex.py
-#, python-format
-msgid "%s has bad SHA-256: %s"
-msgstr "%s má špatný kód SHA-256: %s"
+msgstr ""
 
 #: ../fdroidserver/lint.py
 #, python-format
 msgid "%s is not an accepted build field"
-msgstr "%s není akceptované pole sestavení"
+msgstr ""
 
-#: ../fdroidserver/common.py
-msgid "'keypass' not found in config.yml!"
-msgstr "„keypass“ nebyl nalezen v souboru config.yml!"
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, python-format
+msgid "%s option does not take a value"
+msgstr ""
+
+#: ../fdroidserver/index.py ../fdroidserver/common.py
+msgid "'keypass' not found in config.py!"
+msgstr ""
 
 #: ../fdroidserver/common.py
 msgid "'keystore' is NONE and 'smartcardoptions' is blank!"
-msgstr "„keystore“ je NONE a „smartcardoptions“ je prázdný!"
+msgstr ""
 
-#: ../fdroidserver/common.py
-msgid "'keystore' not found in config.yml!"
-msgstr "„keystore“ nebyl nalezen v souboru config.yml!"
+#: ../fdroidserver/index.py ../fdroidserver/common.py
+msgid "'keystore' not found in config.py!"
+msgstr ""
 
-#: ../fdroidserver/common.py
-msgid "'keystorepass' not found in config.yml!"
-msgstr "„keystorepass“ nebyl nalezen v souboru config.yml!"
+#: ../fdroidserver/index.py ../fdroidserver/common.py
+msgid "'keystorepass' not found in config.py!"
+msgstr ""
 
-#: ../fdroidserver/common.py
-msgid "'repo_keyalias' not found in config.yml!"
-msgstr "„repo_keyalias“ nebyl nalezen v souboru config.yml!"
+#: ../fdroidserver/index.py ../fdroidserver/common.py
+msgid "'repo_keyalias' not found in config.py!"
+msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "'required' is an invalid argument for positionals"
-msgstr "„required je neplatný argument pro positionals"
+msgstr ""
 
 #: ../fdroidserver/common.py
-msgid "'sdk_path' not set in config.yml!"
-msgstr "„sdk_path“ není nastavena v souboru config.yml!"
+msgid "'sdk_path' not set in 'config.py'!"
+msgstr ""
+
+#. Translators: "build-tools" is the file name of a package from
+#. Google, it is part of the Android SDK. So it probably shouldn't be
+#. translated or transliterated.
+#: ../fdroidserver/common.py
+#, python-brace-format
+msgid "'{aapt}' is too old, fdroid requires build-tools-23.0.0 or newer!"
+msgstr ""
 
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "'{aapt}' is too old, fdroid requires build-tools-{version} or newer!"
-msgstr "„{aapt}“ je příliš starý, fdroid vyžaduje build-tools-{version} nebo novější!"
+msgstr ""
+
+#: ../fdroidserver/install.py
+#, python-brace-format
+msgid "'{apkfilename}' is already installed on {dev}."
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "'{field}' in {linedesc} is obsolete, see docs for current fields:"
+msgstr ""
+
+#: ../fdroidserver/common.py
+#, python-brace-format
+msgid "'{field}' will be in random order! Use () or [] brackets if order is important!"
+msgstr ""
 
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "'{path}' failed to execute!"
-msgstr "„{path}“ se nepodařilo spustit!"
+msgstr ""
 
 #: ../fdroidserver/metadata.py
 #, python-brace-format
-msgid "'{path}' has invalid format, it should be a dictionary!"
-msgstr "„{path}“ má neplatný formát, měl by to být slovník!"
-
-#: ../fdroidserver/lint.py ../fdroidserver/metadata.py
-#, python-brace-format
 msgid "'{value}' is not a valid {field} in {appid}. Regex pattern: {pattern}"
-msgstr "„{value}“ není platný {field} v {appid}. Vzor regex: {pattern}"
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "'{value}' is not a valid {field}, should be {pattern}"
-msgstr "„{value}“ není platný {field}, měl by to být {pattern}"
-
-#: ../fdroidserver/checkupdates.py
-msgid "--merge-request only runs on a single appid!"
-msgstr "--merge-request beží pouze u jednoho appid!"
+msgstr ""
 
 #: ../fdroidserver/checkupdates.py
 #, python-brace-format
 msgid "...checkupdate failed for {appid} : {error}"
-msgstr "...checkupdate selhal pro {appid} : {error}"
+msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid ".__call__() not defined"
-msgstr ".__call__() není definováno"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+msgid ".fdroid.txt is not supported!  Convert to .fdroid.yml or .fdroid.json."
+msgstr ""
 
 #: ../fdroidserver/lint.py
 msgid "/issues is missing"
@@ -192,495 +220,469 @@ msgstr "/issues chybí"
 
 #: ../fdroidserver/mirror.py
 msgid "A URL is required as an argument!"
-msgstr "Jako argument je vyžadována adresa URL!"
+msgstr ""
 
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "APK signatures have different certificates in {path}:"
-msgstr "Podpisy souborů APK mají rozdílné certifikáty v {path}:"
-
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Add PGP signatures using GnuPG for packages in repo"
-msgstr "Přidat podpisy PGP pomocí GnuPG pro balíčky v repozitáři"
+msgstr ""
+
+#: ../fdroid ../fdroidserver/__main__.py
+msgid "Add a new application from its source code"
+msgstr ""
 
 #: ../fdroidserver/update.py
 msgid "Add a repo signing key to an unsigned repo"
-msgstr "Přidat podpisový klíč repozitáře k nepodepsanému repozitáři"
+msgstr ""
 
 #: ../fdroidserver/update.py
 msgid "Add skeleton metadata files for APKs that are missing them"
-msgstr "Přidat souborů metadat kostry pro soubory APK, u kterých chybí"
+msgstr ""
 
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Adding new repo for only {name}"
-msgstr "Přidávám nový repozitář pouze pro {name}"
+msgstr ""
 
 #: ../fdroidserver/init.py
 msgid "Alias of the repo signing key in the keystore"
-msgstr "Alias podepisovacího klíče repozitáře v keystore"
+msgstr ""
 
-#: ../fdroidserver/build.py
-msgid "AllowedAPKSigningKeys missing but reference binary supplied"
-msgstr "Chybí AllowedAPKSigningKeys, ale byl dodán referenční binární soubor"
-
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "Allows a different revision (or git branch) to be specified for the initial import"
-msgstr "Umožňuje zadat jinou revizi (nebo větev gitu) pro počáteční import"
+msgstr ""
 
 #: ../fdroidserver/mirror.py
 msgid "Also mirror the full archive section"
-msgstr "Také zrcadlit celou sekci archivu"
+msgstr ""
 
 #: ../fdroidserver/lint.py
 msgid "Also warn about formatting issues, like rewritemeta -l"
-msgstr "Také varovat před problémy s formátováním, jako rewritemeta -l"
+msgstr ""
 
 #: ../fdroidserver/scanner.py
 msgid "Android AAR library"
-msgstr "Knihovna AAR pro Android"
+msgstr ""
 
 #: ../fdroidserver/scanner.py
 msgid "Android APK file"
-msgstr "Soubor APK pro Android"
+msgstr ""
 
 #: ../fdroidserver/scanner.py
 msgid "Android DEX code"
-msgstr "Kód Android DEX"
+msgstr ""
 
-#: ../fdroidserver/init.py
+#: ../fdroidserver/common.py ../fdroidserver/build.py
 #, python-brace-format
-msgid "Android SDK not found at {path}!"
-msgstr "Android SDK nebylo nalezeno v {path}!"
+msgid "Android SDK '{path}' does not have '{dirname}' installed!"
+msgstr ""
+
+#: ../fdroidserver/common.py
+msgid "Android SDK not found!"
+msgstr ""
 
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "Android SDK path '{path}' does not exist!"
-msgstr "Android SDK s cestou „{path}“ neexistuje!"
+msgstr ""
 
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "Android SDK path '{path}' is not a directory!"
-msgstr "Cesta Android SDK „{path}“ není adresář!"
+msgstr ""
 
+#. Translators: "build-tools" is the file name of a package from
+#. Google, it is part of the Android SDK. So it probably shouldn't be
+#. translated or transliterated.
 #: ../fdroidserver/common.py
 #, python-brace-format
-msgid "Android SDK tool {cmd} not found!"
-msgstr "Nástroj Android SDK {cmd} nenalezen!"
+msgid "Android build-tools path '{path}' does not exist!"
+msgstr ""
 
-#: ../fdroidserver/lint.py
-msgid "App has Binaries but does not have corresponding AllowedAPKSigningKeys to pin certificate."
-msgstr "Aplikace má binární soubory, ale nemá odpovídající AllowedAPKSigningKeys pro připnutí certifikátu."
-
-#: ../fdroidserver/lint.py
-msgid "App has NoSourceSince or ArchivePolicy \"0 versions\" or 0 but AutoUpdateMode or UpdateCheckMode are not None"
-msgstr "Aplikace má NoSourceSince nebo ArchivePolicy „0 versions“ nebo 0, ale AutoUpdateMode nebo UpdateCheckMode nejsou None"
+#: ../fdroidserver/update.py
+msgid "AndroidManifest.xml has no date"
+msgstr ""
 
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "App is in '{repo}' but has a link to {url}"
-msgstr "Aplikace je v repozitáři „{repo}“ ale má odkaz na {url}"
-
-#: ../fdroidserver/lint.py
-msgid "App version has binary but does not have corresponding AllowedAPKSigningKeys to pin certificate."
-msgstr "Verze aplikace má binární soubor, ale nemá odpovídající AllowedAPKSigningKeys pro připnutí certifikátu."
+msgstr ""
 
 #: ../fdroidserver/lint.py
 msgid "Appending .git is not necessary"
-msgstr "Přidání .git není nutné"
+msgstr ""
 
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Archiving {apkfilename} with invalid signature!"
-msgstr "Archivuji {apkfilename} s neplatným podpisem!"
-
-#: ../fdroidserver/lint.py
-msgid "AutoUpdateMode with UpdateCheckMode: HTTP must have a pattern."
-msgstr "AutoUpdateMode s UpdateCheckMode: HTTP musí mít vzor."
-
-#: ../fdroidserver/install.py
-msgid "Automatic no to all prompts."
-msgstr "Automatické ne na všechny výzvy."
-
-#: ../fdroidserver/install.py
-msgid "Automatic yes to all prompts."
-msgstr "Automatické ano na všechny výzvy."
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "Bad entry type \"{mirrortype}\" in mirrors config: {mirror}"
-msgstr "Nesprávný typ záznamu „{mirrortype}“ v konfiguraci zrcadel: {mirror}"
+msgstr ""
 
 #: ../fdroidserver/mirror.py
 msgid "Base URL to mirror, can include the index signing key using the query string: ?fingerprint="
-msgstr "Základní adresa URL pro zrcadlení, může obsahovat klíč pro podepisování indexu pomocí řetězce dotazu: ?fingerprint="
+msgstr ""
 
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "Branch '{branch}' used as commit in build '{versionName}'"
-msgstr "Větev „{branch}“ použitá jako revize v sestavení „{versionName}“"
+msgstr ""
 
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "Branch '{branch}' used as commit in srclib '{srclib}'"
-msgstr "Větev „{branch}“ použitá jako revize v srclib „{srclib}“"
+msgstr ""
 
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Broken symlink: {path}"
-msgstr "Rozbitý symlink: {path}"
+msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Build a package from source"
 msgstr "Sestavit balíček ze zdroje"
 
 #: ../fdroidserver/build.py
 msgid "Build all applications available"
-msgstr "Sestavit všechny dostupné aplikace"
+msgstr ""
 
 #: ../fdroidserver/lint.py
 msgid "Build generated by `fdroid import` - remove disable line once ready"
-msgstr "Sestavení vygenerováno pomocí `fdroid import` - odeberte řádek se zákazem, jakmile budete připraveni"
+msgstr ""
 
 #: ../fdroidserver/checkupdates.py
 msgid "Build metadata git repo has uncommited changes!"
-msgstr "Git repozitář s metadaty sestavení má neodeslané změny!"
+msgstr ""
 
 #: ../fdroidserver/build.py
 msgid "Build only the latest version of each package"
-msgstr "Sestavit pouze nejnovější verzi každého balíčku"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Build should have comma-separated versionName and versionCode, not \"{value}\", in {linedesc}"
+msgstr ""
 
 #: ../fdroidserver/init.py
 #, python-format
 msgid "Built repo based in \"%s\" with this config:"
-msgstr "Sestaven repozitář založený v „%s“ s touto konfigurací:"
-
-#: ../fdroidserver/checkupdates.py
-msgid "Can't auto-update app with no CurrentVersionCode"
-msgstr "Nelze automaticky aktualizovat aplikaci bez CurrentVersionCode"
+msgstr ""
 
 #: ../fdroidserver/build.py
 msgid "Can't build due to {} error while scanning"
 msgid_plural "Can't build due to {} errors while scanning"
-msgstr[0] "Nelze sestavit kvůli {} chybě při skenování"
-msgstr[1] "Nelze sestavit kvůli {} chybám při skenování"
-msgstr[2] "Nelze sestavit kvůli {} chybám při skenování"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
-#: ../fdroidserver/common.py
-#, fuzzy, python-brace-format
-msgid "Cannot read {path}: {error}"
-msgstr "Chyba při čtení {path}: {error}"
+#: ../fdroidserver/vmtools.py
+#, python-brace-format
+msgid "Cannot read \"{path}\"!"
+msgstr ""
+
+#. Translators: https://developer.android.com/studio/build/application-id
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Cannot resolve application ID {appid}"
+msgstr ""
 
 #: ../fdroidserver/rewritemeta.py
 #, python-brace-format
 msgid "Cannot rewrite \"{path}\""
-msgstr "Nelze přepsat „{path}“"
+msgstr ""
+
+#: ../fdroidserver/rewritemeta.py
+msgid "Cannot use --list and --to at the same time"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Cannot write \"{path}\", not an accepted format, use: {formats}"
+msgstr ""
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
 #: ../fdroidserver/lint.py
 #, python-format
 msgid "Categories '%s' is not valid"
 msgstr "Kategorie „%s“ není platná"
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
 #: ../fdroidserver/lint.py
 msgid "Categories are not set"
 msgstr "Kategorie nejsou nastavené"
 
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "Category \"{category}\" defined but not used for any apps!"
-msgstr "Kategorie „{category}“ je definována, ale není používána u žádných aplikací!"
-
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Check for updates to applications"
-msgstr "Zkontrolovat aktualizace aplikací"
+msgstr ""
 
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Checking archiving for {appid} - apks:{integer}, keepversions:{keep}, archapks:{arch}"
-msgstr "Kontrola archivace u {appid} - apks:{integer}, keepversions:{keep}, archapks:{arch}"
+msgstr ""
+
+#: ../fdroidserver/dscanner.py
+msgid "Clean after all scans have finished"
+msgstr "Po dokončení všech skenů vyčistit"
+
+#: ../fdroidserver/dscanner.py
+msgid "Clean before the scans start and rebuild the container"
+msgstr ""
+
+#: ../fdroidserver/dscanner.py
+msgid "Clean up all containers and then exit"
+msgstr ""
 
 #: ../fdroidserver/update.py
 msgid "Clean update - don't uses caches, reprocess all APKs"
-msgstr "Čistá aktualizace - nepoužívat mezipaměti, znovu zpracovat všechny soubory APK"
+msgstr ""
 
-#: ../fdroidserver/common.py
-msgid "Color the log output"
-msgstr "Obarvit výstup protokolu"
-
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "Comma separated list of categories."
-msgstr "Seznam kategorií oddělený čárkami."
+msgstr ""
 
-#: ../fdroidserver/__main__.py
-#, python-format
+#: ../fdroid ../fdroidserver/__main__.py
+#, c-format, python-format
 msgid "Command '%s' not recognised.\n"
-msgstr "Příkaz „%s“ nebyl rozpoznán.\n"
+msgstr "Příkaz '%s' nebyl rozpoznán.\n"
 
 #: ../fdroidserver/checkupdates.py
 msgid "Commit changes"
-msgstr "Odeslat změny"
-
-#: ../fdroidserver/checkupdates.py
-msgid "Commit changes, push, then make a merge request"
-msgstr "Commitněte změny, proveďte a push a poté vytvořte žádost o sloučení"
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Conflicting \"{field}\" definitions between .yml and localized files:"
-msgstr "Konfliktní definice „{field}“ mezi soubory .yml a lokalizovanými soubory:"
+msgstr ""
 
 #: ../fdroidserver/__main__.py
 msgid "Conflicting arguments: '--verbose' and '--quiet' can not be specified at the same time."
-msgstr "Konfliktní argumenty: „--verbose“ a „--quiet“ nelze zadat současně."
+msgstr ""
 
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "Could not find '{command}' on your system"
-msgstr "Ve vašem systému se nepodařilo najít příkaz „{command}“"
+msgstr ""
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "Could not find latest version code"
-msgstr "Nepodařilo se najít kód poslední verze"
+msgstr ""
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "Could not find latest version name"
-msgstr "Nepodařilo se najít název poslední verze"
+msgstr ""
 
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Could not find {path} to remove it"
-msgstr "Nepodařilo se nalézt {path} k odstranění"
+msgstr ""
 
 #: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Could not open APK {path} for analysis: "
-msgstr "Nepodařilo se otevřít APK {path} pro analýzu: "
+msgid "Could not open apk file for analysis"
+msgstr ""
 
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "Could not parse size \"{size}\", wrong type \"{type}\""
-msgstr "Nepodařilo se parsovat velikost „{size}“, nesprávný typ „{type}“"
+msgstr ""
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/import_subcommand.py
+#. Translators: https://developer.android.com/studio/build/application-id
+#: ../fdroidserver/import.py
+#, fuzzy
 msgid "Couldn't find Application ID"
-msgstr "Nepodařilo se nalézt ID aplikace"
+msgstr "Nedaří se nalézt identif. balíčku"
 
-#: ../fdroidserver/checkupdates.py
-msgid "Couldn't find any version information"
-msgstr "Nepodařilo se najít žádné informace o verzi"
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
+#: ../fdroidserver/import.py
+msgid "Couldn't find latest version code"
+msgstr ""
 
-#: ../fdroidserver/checkupdates.py
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
+#: ../fdroidserver/import.py
+msgid "Couldn't find latest version name"
+msgstr ""
+
+#: ../fdroidserver/import.py
 msgid "Couldn't find package ID"
-msgstr "Nepodařilo se nalézt ID balíčku"
+msgstr "Nedaří se nalézt identif. balíčku"
 
 #: ../fdroidserver/update.py
 msgid "Cowardily refusing to overwrite existing signing key setup!"
-msgstr "Zbaběle odmítám přepsat existující nastavení podpisového klíče!"
+msgstr ""
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/update.py
+msgid "Create a repo signing key in a keystore"
+msgstr ""
+
+#: ../fdroidserver/update.py
+msgid "Create skeleton metadata files that are missing"
+msgstr ""
+
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Created new container \"{name}\""
-msgstr "Vytvořen nový kontejner „{name}“"
+msgstr ""
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Creating \"{path}\" for configuring s3cmd."
-msgstr "Vytváření „{path}“ pro konfiguraci s3cmd."
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Creating empty {config_file}"
-msgstr "Vytvářím prázdný {config_file}"
+msgstr ""
 
 #: ../fdroidserver/publish.py
 msgid "Creating log directory"
-msgstr "Vytváření adresáře protokolů"
+msgstr ""
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Creating new S3 bucket: {url}"
-msgstr "Vytváření nového bucketu S3: {url}"
+msgstr ""
 
 #: ../fdroidserver/publish.py
 msgid "Creating output directory"
-msgstr "Vytváření výstupního adresáře"
+msgstr ""
 
 #: ../fdroidserver/index.py
 msgid "Creating signed index with this key (SHA256):"
-msgstr "Vytváření podepsaného indexu s tímto klíčem (SHA256):"
+msgstr ""
 
-#: ../fdroidserver/publish.py ../fdroidserver/verify.py
+#: ../fdroidserver/import.py ../fdroidserver/verify.py
+#: ../fdroidserver/publish.py
 msgid "Creating temporary directory"
 msgstr "Vytváření dočasné složky"
 
 #: ../fdroidserver/index.py
 msgid "Creating unsigned index in preparation for signing"
-msgstr "Vytváření nepodepsaného indexu v rámci přípravy na podpis"
+msgstr ""
 
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "CurrentVersionCode {cv} is less than oldest build entry {versionCode}"
-msgstr "CurrentVersionCode {cv} je menší než nejstarší položka sestavení {versionCode}"
+msgstr ""
 
 #: ../fdroidserver/nightly.py
 msgid "DEBUG_KEYSTORE is not set or the value is incomplete"
-msgstr "DEBUG_KEYSTORE není nastaven nebo je hodnota neúplná"
+msgstr ""
 
 #: ../fdroidserver/update.py
 msgid "Delete APKs and/or OBBs without metadata from the repo"
-msgstr "Odstranit soubory APK a/nebo OBB bez metadat z úložiště"
+msgstr ""
 
 #: ../fdroidserver/deploy.py
 #, python-brace-format
 msgid "Deleting archive, repo is too big ({size} max {limit})"
-msgstr "Mazání archivu, repozitář je příliš velký ({size} max {limit})"
+msgstr ""
 
 #: ../fdroidserver/deploy.py
 #, python-brace-format
 msgid "Deleting git-mirror history, repo is too big ({size} max {limit})"
-msgstr "Mazání historie git-mirroru, repozitář je příliš velký ({size} max {limit})"
+msgstr ""
 
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Deleting unknown file: {path}"
-msgstr "Mazání neznámého souboru: {path}"
+msgstr ""
 
 #: ../fdroidserver/lint.py
 #, python-format
 msgid "Description '%s' is just the app's summary"
-msgstr "Popis „%s“ je pouze souhrn aplikace"
+msgstr ""
 
 #: ../fdroidserver/lint.py
 msgid "Description has a duplicate line"
-msgstr "Popis má duplicitní řádek"
+msgstr ""
+
+#: ../fdroidserver/lint.py
+#, python-format
+msgid "Description has a list (%s) but it isn't bulleted (*) nor numbered (#)"
+msgstr ""
 
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "Description of length {length} is over the {limit} char limit"
-msgstr "Popis délky {length} přesahuje limit {limit} znaků"
+msgstr ""
 
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Did you mean config/{name}.yml?"
-msgstr "Mysleli jste config/{name}.yml?"
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Did you mean {code}?"
-msgstr "Mysleli jste {code}?"
-
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "Do not add 'disable:' to the generated build entries"
-msgstr "Nepřidávat „disable:“ k vygenerovaným položkám sestavení"
+msgstr ""
 
 #: ../fdroidserver/nightly.py
 msgid "Do not deploy the new files to the repo"
-msgstr "Nevydávat nové soubory do repozitáře"
+msgstr ""
 
 #: ../fdroidserver/mirror.py
 #, python-brace-format
 msgid "Do not include \"{path}\" in URL!"
-msgstr "V URL neuvádějte „{path}“!"
+msgstr ""
 
 #: ../fdroidserver/init.py
 msgid "Do not prompt for Android SDK path, just fail"
-msgstr "Nevyžadovat cestu Android SDK, prostě selhat"
+msgstr ""
 
 #: ../fdroidserver/nightly.py
 msgid "Do not remove the private keys generated from the keystore"
-msgstr "Nemazat soukromé klíče vygenerované z keystore"
+msgstr ""
 
 #: ../fdroidserver/build.py
 msgid "Don't create a source tarball, useful when testing a build"
-msgstr "Nevytvářet zdrojový tarball, užitečné při testování sestavení"
+msgstr ""
+
+#: ../fdroidserver/stats.py
+msgid "Don't do anything logs-related"
+msgstr ""
 
 #: ../fdroidserver/build.py
 msgid "Don't refresh the repository, useful when testing a build with no internet connection"
-msgstr "Neobnovovat repozitář, užitečné při testování sestavení bez připojení k internetu"
+msgstr ""
 
 #: ../fdroidserver/deploy.py ../fdroidserver/nightly.py
+#: ../fdroidserver/upload.py
 msgid "Don't use rsync checksums"
-msgstr "Nepoužívat kontrolní součty rsync"
+msgstr ""
 
-#: ../fdroidserver/install.py
-msgid "Download F-Droid.apk using mirrors that leak less to the network"
-msgstr "Stáhnout F-Droid.apk pomocí zrcadel, která do sítě vypouštějí méně informací"
-
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Download complete mirrors of small repos"
-msgstr "Stáhnout kompletní mirrory malých repozitářů"
+msgstr ""
+
+#: ../fdroidserver/stats.py
+msgid "Download logs we don't have"
+msgstr ""
 
 #: ../fdroidserver/common.py
 msgid "Downloading the repository already failed once, not trying again."
-msgstr "Stahování repozitáře již jednou selhalo, nezkouším to znovu."
+msgstr ""
 
 #: ../fdroidserver/verify.py
 #, python-brace-format
 msgid "Downloading {url} failed. {error}"
-msgstr "Stahování {url} selhalo. {error}"
+msgstr ""
 
 #: ../fdroidserver/metadata.py
 #, python-brace-format
-msgid "Duplicate Anti-Feature declaration at {path} was ignored!"
-msgstr "Duplicitní prohlášení anti-funkcí v {path} bylo ignorováno!"
-
-#: ../fdroidserver/index.py
-#, python-format
-msgid "Duplicate entry \"%s\" in mirrors config!"
-msgstr "Duplicitní záznam „%s“ v konfiguraci zrcadel!"
+msgid "Duplicate build recipe found for versionCode {versionCode} in {linedesc}"
+msgstr ""
 
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "Duplicate link in '{field}': {url}"
-msgstr "Duplicitní odkaz v „{field}“: {url}"
+msgstr ""
 
-#: ../fdroidserver/common.py
-#, python-format
-msgid "ERROR: %(message)s"
-msgstr "CHYBA: %(message)s"
+#: ../fdroid
+msgid "Dynamically scan APKs post build"
+msgstr ""
 
 #: ../fdroidserver/__main__.py
 msgid "ERROR: The \"server\" subcommand has been removed, use \"deploy\"!"
-msgstr "CHYBA: Podpříkaz „server“ byl odebrán, použijte „deploy“!"
+msgstr ""
+
+#: ../fdroidserver/mirror.py
+msgid ""
+"ERROR: this command should never be used to mirror f-droid.org!\n"
+"A full mirror of f-droid.org requires more than 200GB."
+msgstr ""
 
 #: ../fdroidserver/nightly.py
 msgid "ERROR: unsupported CI type, patches welcome!"
-msgstr "CHYBA: nepodporovaný typ CI, opravy vítány!"
+msgstr ""
 
-#: ../fdroidserver/nightly.py
-#, python-format
-msgid "ERROR: unsupported git host \"%s\", patches welcome!"
-msgstr "CHYBA: nepodporovaný git host „%s“, opravy vítány!"
-
-#: ../fdroidserver/lint.py
+#: ../fdroidserver/metadata.py
 #, python-brace-format
-msgid "ERROR: {key} in {path} is not \"archive\" or \"repo\"!"
-msgstr "CHYBA: {key} v {path} není „archive“ nebo „repo“!"
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "ERROR: {key} not a valid key!"
-msgstr "CHYBA: {key} není platný klíč!"
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "ERROR: {key}'s value should be of type {t}!"
-msgstr "CHYBA: hodnota klíče {key} by měla být typu {t}!"
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "ERROR: {key}:{subkey} in {path} is not in allowed keys: {allowed_keys}!"
-msgstr "CHYBA: {key}:{subkey} v {path} není v povolených klíčích: {allowed_keys}!"
+msgid "Empty build flag at {linedesc}"
+msgstr ""
 
 #: ../fdroidserver/__main__.py
 #, python-brace-format
 msgid "Encoding is set to '{enc}' fdroid might run into encoding issues. Please set it to 'UTF-8' for best results."
-msgstr "Kódování je nastaveno na „{enc}“, fdroid může mít problémy s kódováním. Pro dosažení nejlepších výsledků jej prosím nastavte na „UTF-8“."
+msgstr ""
 
 #: ../fdroidserver/init.py
 #, python-format
@@ -688,1821 +690,1837 @@ msgid ""
 "Enter the path to the Android SDK (%s) here:\n"
 "> "
 msgstr ""
-"Zadejte cestu k Android SDK (%s) zde:\n"
-"> "
 
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Environment variable {var} from {configname} is not set!"
-msgstr "Proměnná prostředí {var} z {configname} není nastavena!"
+#: ../fdroidserver/deploy.py ../fdroidserver/checkupdates.py
+#: ../fdroidserver/upload.py
+#, python-format
+msgid "Error while attempting to publish log: %s"
+msgstr ""
 
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Environment variable {{env: {var}}} is not set!"
-msgstr "Proměnná prostředí {{env: {var}}} není nastavena!"
-
-#: ../fdroidserver/deploy.py
-msgid "Error deploying 'github_releases', {} not present. (You might need to run `fdroid update` first.)"
-msgstr "Chyba při nasazení „github_releases“, {} není k dispozici. (Možná budete muset nejprve spustit `fdroid update`.)"
-
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py ../fdroidserver/common.py
 msgid "Error while getting repo address"
-msgstr "Chyba při získávání adresy repozitáře"
+msgstr ""
 
-#: ../fdroidserver/scanner.py
-msgid "Exit with a non-zero code if problems were found"
-msgstr "Ukončit s nenulovým kódem při nalezení problémů"
-
-#: ../fdroidserver/__main__.py
-msgid "Extract application metadata from a source repository"
-msgstr "Extrahovat metadata aplikace ze zdrojového repozitáře"
-
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Extract signatures from APKs"
-msgstr "Extrahovat podpisy ze souborů APK"
-
-#: ../fdroidserver/install.py
-msgid "F-Droid.apk could not be downloaded from any known source!"
-msgstr "F-Droid.apk se nepodařilo stáhnout z žádného známého zdroje!"
+msgstr ""
 
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Failed copying {path}: {error}"
-msgstr "Chyba při kopírování {path}: {error}"
+msgstr ""
 
 #: ../fdroidserver/signatures.py
 #, python-brace-format
 msgid "Failed fetching signatures for '{apkfilename}': {error}"
-msgstr "Chyba při načítání podpisů pro „{apkfilename}“: {error}"
+msgstr ""
 
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Failed reading {path}: {error}"
-msgstr "Chyba při čtení {path}: {error}"
+msgstr ""
 
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Failed resizing {path}: {error}"
-msgstr "Chyba při změně velikosti {path}: {error}"
+msgstr ""
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/publish.py
+msgid "Failed to align application"
+msgstr ""
+
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Failed to create S3 bucket: {url}"
-msgstr "Chyba při vytváření bucketu S3: {url}"
+msgstr ""
+
+#: ../fdroidserver/common.py
+msgid "Failed to get APK manifest information"
+msgstr ""
 
 #: ../fdroidserver/update.py
 #, python-brace-format
-msgid "Failed to get APK information, deleting {path}"
-msgstr "Nepodařilo se získat informace o APK, mazání {path}"
+msgid "Failed to get apk information, deleting {path}"
+msgstr ""
 
 #: ../fdroidserver/update.py
 #, python-brace-format
-msgid "Failed to get APK information, skipping {path}"
-msgstr "Nepodařilo se získat informace o APK, přeskakování {path}"
-
-#: ../fdroidserver/update.py
-msgid "Failed to get APK signing key fingerprint"
-msgstr "Nepodařilo se získat otisk podpisového klíče APK"
+msgid "Failed to get apk information, skipping {path}"
+msgstr ""
 
 #: ../fdroidserver/install.py
 #, python-brace-format
 msgid "Failed to install '{apkfilename}' on {dev}: {error}"
-msgstr "Nepodařilo se nainstalovat „{apkfilename}“ na {dev}: {error}"
+msgstr ""
+
+#: ../fdroidserver/publish.py ../fdroidserver/common.py
+msgid "Failed to sign application"
+msgstr ""
 
 #: ../fdroidserver/common.py
-msgid "Failed to sign application"
-msgstr "Nepodařilo se podepsat aplikaci"
+msgid "Failed to zipalign application"
+msgstr ""
 
 #: ../fdroidserver/build.py
 #, python-brace-format
 msgid "Fetched buildserverid from VM: {buildserverid}"
-msgstr "Načteno buildserverid z VM: {buildserverid}"
+msgstr ""
 
 #: ../fdroidserver/signatures.py
 #, python-brace-format
 msgid "Fetched signatures for '{apkfilename}' -> '{sigdir}'"
-msgstr "Načteny podpisy pro „{apkfilename}“ -> „{sigdir}“"
+msgstr ""
 
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "File disappeared while processing it: {path}"
-msgstr "Soubor zmizel při jeho zpracování: {path}"
+msgstr ""
 
-#: ../fdroidserver/build.py ../fdroidserver/install.py
-#: ../fdroidserver/rewritemeta.py ../fdroidserver/scanner.py
-#: ../fdroidserver/update.py
+#: ../fdroidserver/verify.py ../fdroidserver/stats.py ../fdroidserver/update.py
+#: ../fdroidserver/rewritemeta.py ../fdroidserver/build.py
+#: ../fdroidserver/checkupdates.py ../fdroidserver/scanner.py
+#: ../fdroidserver/install.py
 msgid "Finished"
-msgstr "Dokončeno"
+msgstr ""
+
+#: ../fdroidserver/lint.py
+msgid "Flattr donation methods belong in the FlattrID flag"
+msgstr ""
+
+#: ../fdroidserver/lint.py
+msgid "Flattr donation methods belong in the FlattrID: field"
+msgstr ""
 
 #: ../fdroidserver/lint.py
 msgid "Forbidden HTML tags"
-msgstr "Zakázané značky HTML"
+msgstr ""
 
 #: ../fdroidserver/build.py
 msgid "Force build of disabled apps, and carries on regardless of scan problems. Only allowed in test mode."
-msgstr "Vynutí sestavení zakázaných aplikací a pokračuje bez ohledu na problémy se skenováním. Povoleno pouze v testovacím režimu."
+msgstr ""
 
 #: ../fdroidserver/build.py
 #, python-brace-format
 msgid "Force halting build after {0} sec timeout!"
-msgstr "Vynutit zastavení sestavování po uplynutí časového limitu {0} sekund!"
+msgstr ""
 
 #: ../fdroidserver/scanner.py
 msgid "Force scan of disabled apps and builds."
-msgstr "Vynutit kontrolu zakázaných aplikací a sestavení."
+msgstr ""
 
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Found \"{path}\" graphic without metadata for app \"{name}\"!"
-msgstr "Nalezena grafika „{path}“ bez metadat u aplikace „{name}“!"
+msgstr ""
 
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Found bad funding file \"{path}\" for \"{name}\":"
-msgstr "Nalezeno špatné financování souboru „{path}“ pro „{name}“:"
+msgstr ""
 
 #: ../fdroidserver/common.py
 msgid "Found invalid appids in arguments"
-msgstr "V argumentech nalezena neplatná id aplikací"
+msgstr ""
 
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
 #: ../fdroidserver/common.py
 msgid "Found invalid versionCodes for some apps"
-msgstr "U některých aplikací nalezeny neplatné versionCodes"
+msgstr ""
 
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "Found multiple JAR Signature Block Files in {path}"
-msgstr "V {path} nalezeno několik souborů podpisových bloků JAR"
-
-#: ../fdroidserver/common.py
-msgid "Found multiple Signer Certificates!"
-msgstr "Nalezeno více podpisových certifikátů!"
+msgstr ""
 
 #: ../fdroidserver/metadata.py
 #, python-brace-format
 msgid "Found multiple metadata files for {appid}"
-msgstr "Nalezeno několik souborů metadat pro {appid}"
+msgstr ""
 
 #: ../fdroidserver/index.py
 msgid "Found multiple signing certificates for repository."
-msgstr "Nalezeno více podpisových certifikátů pro repozitář."
+msgstr ""
+
+#: ../fdroidserver/update.py
+#, python-brace-format
+msgid "Found multiple signing certificates in {path}"
+msgstr ""
 
 #: ../fdroidserver/index.py
 msgid "Found no signing certificates for repository."
-msgstr "Pro repozitář nenalezen žádný podpisový certifikát."
+msgstr ""
 
 #: ../fdroidserver/lint.py
 #, python-format
 msgid "Found non-file at %s"
-msgstr "Nalezen ne-soubor v %s"
+msgstr ""
 
 #: ../fdroidserver/deploy.py
 #, python-brace-format
 msgid "Found {apkfilename} at {url}"
-msgstr "Nalezen {apkfilename} na {url}"
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Found {count} problems in {filename}"
-msgstr "Skener našel {count} problémů v {filename}"
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Found {count} warnings in {filename}"
-msgstr "Nalezeno {count} varování v {filename}"
+msgstr ""
 
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Generated skeleton metadata for {appid}"
-msgstr "Vygenerována kostra metadat pro {appid}"
+msgstr ""
 
 #: ../fdroidserver/common.py
 #, python-format
 msgid "Git checkout of '%s' failed"
-msgstr "Git checkout „%s“ se nezdařil"
+msgstr ""
 
 #: ../fdroidserver/common.py
 msgid "Git clean failed"
-msgstr "Git clean se nezdařil"
+msgstr ""
 
 #: ../fdroidserver/common.py
 msgid "Git fetch failed"
-msgstr "Git fetch se nezdařil"
+msgstr ""
+
+#: ../fdroidserver/common.py
+msgid "Git remote set-head failed"
+msgstr ""
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
 #: ../fdroidserver/common.py
 #, python-format
 msgid "Git remote set-head failed: \"%s\""
-msgstr "Git remote set-head se nezdařil: „%s“"
+msgstr ""
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
 #: ../fdroidserver/common.py
 msgid "Git reset failed"
-msgstr "Git reset se nezdařil"
-
-#: ../fdroidserver/common.py
-msgid "Git submodule deinit failed"
-msgstr "Git submodule deinit se nezdařil"
+msgstr ""
 
 #: ../fdroidserver/common.py
 msgid "Git submodule sync failed"
-msgstr "Git submodule sync se nezdařil"
+msgstr ""
 
 #: ../fdroidserver/common.py
 msgid "Git submodule update failed"
-msgstr "Git submodule update se nezdařil"
+msgstr ""
 
 #: ../fdroidserver/common.py
 msgid "HTTPS must be used with Subversion URLs!"
-msgstr "U URL adres Subversion musí být použito HTTPS!"
+msgstr ""
 
 #: ../fdroidserver/deploy.py
 msgid "If a git mirror gets to big, allow the archive to be deleted"
-msgstr "Pokud se git mirror stane příliš velkým, umožnit smazání archivu"
+msgstr ""
 
 #: ../fdroidserver/deploy.py
 #, python-brace-format
 msgid "If this upload fails, try manually uploading to {url}"
-msgstr "Pokud toto nahrání selže, zkuste manuálně nahrát na {url}"
+msgstr ""
 
 #: ../fdroidserver/metadata.py
 #, python-brace-format
 msgid "Ignoring '{field}' in '{metapath}' metadata because it is deprecated."
-msgstr "Ignorování pole „{field}“ v metadatech „{metapath}“, protože je zastaralé."
+msgstr ""
 
 #: ../fdroidserver/update.py
 #, python-format
 msgid "Ignoring FUNDING.yml entry longer than 2048: %s"
-msgstr "Ignorování vstupu FUNDING.yml delšího než 2048: %s"
-
-#: ../fdroidserver/update.py
-#, python-format
-msgid "Ignoring bad element in manifest: %s"
-msgstr "Ignorování nesprávného prvku v manifestu: %s"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Ignoring deprecated {oldfile}, use {newfile}!"
-msgstr "Ignoruji zastaralý {oldfile}, použijte {newfile}!"
+msgstr ""
 
 #: ../fdroidserver/index.py
 msgid "Ignoring package without metadata: "
-msgstr "Ignorování balíčku bez metadat: "
+msgstr ""
 
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Ignoring stale cache data for {apkfilename}"
-msgstr "Ignorování zastaralých dat mezipaměti {apkfilename}"
+msgstr ""
+
+#: ../fdroidserver/rewritemeta.py
+#, python-brace-format
+msgid "Ignoring {ext} file at '{path}'"
+msgstr ""
 
 #: ../fdroidserver/update.py
 msgid "Include APKs that are signed with disabled algorithms like MD5"
-msgstr "Zahrnout soubory APK, které jsou podepsané vypnutými algoritmy jako MD5"
+msgstr ""
 
 #: ../fdroidserver/mirror.py
 msgid "Include the PGP signature .asc files in the mirror"
-msgstr "Zahrnout .asc soubory podpisu PGP do mirroru"
+msgstr ""
 
 #: ../fdroidserver/mirror.py
 msgid "Include the build logs in the mirror"
-msgstr "Zahrnout protokoly sestavení do mirroru"
+msgstr ""
 
 #: ../fdroidserver/mirror.py
 msgid "Include the source tarballs in the mirror"
-msgstr "Zahrnout zdrojové tarbally do mirroru"
-
-#: ../fdroidserver/metadata.py
-#, python-format
-msgid "Including metadata from %s@%s"
-msgstr "Včetně metadat z %s@%s"
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Including metadata from {path}"
-msgstr "Včetně metadat z {path}"
+msgstr ""
 
 #: ../fdroidserver/common.py
 msgid "Initialising submodules"
-msgstr "Inicializace submodulů"
+msgstr ""
 
 #: ../fdroidserver/install.py
 msgid "Install all signed applications available"
-msgstr "Instalace všech dostupných podepsaných aplikací"
+msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Install built packages on devices"
-msgstr "Nainstalovat vestavěné balíčky na zařízení"
+msgstr ""
 
 #: ../fdroidserver/install.py
 #, python-format
 msgid "Installing %s..."
-msgstr "Instalace %s..."
+msgstr ""
+
+#: ../fdroidserver/install.py
+#, python-format
+msgid "Installing %s…"
+msgstr ""
 
 #: ../fdroidserver/install.py
 #, python-brace-format
 msgid "Installing '{apkfilename}' on {dev}..."
-msgstr "Instalace „{apkfilename}“ na {dev}..."
+msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroidserver/install.py
+#, python-brace-format
+msgid "Installing '{apkfilename}' on {dev}…"
+msgstr ""
+
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Interact with the repo HTTP server"
-msgstr "Interakce se serverem HTTP repozitáře"
+msgstr ""
 
 #: ../fdroidserver/update.py
 msgid "Invalid APK"
-msgstr "Neplatné APK"
+msgstr ""
 
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "Invalid AutoUpdateMode: {mode}"
-msgstr "Neplatný AutoUpdateMode: {mode}"
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "Invalid UpdateCheckMode: {mode}"
-msgstr "Neplatný UpdateCheckMode: {mode}"
-
-#: ../fdroidserver/checkupdates.py
+#: ../fdroidserver/lint.py ../fdroidserver/checkupdates.py
 #, python-brace-format
 msgid "Invalid VercodeOperation: {field}"
-msgstr "Neplatný VercodeOperation: {field}"
+msgstr ""
 
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Invalid VercodeOperation: {invalid_ops}"
-msgstr "Neplatný VercodeOperation: {invalid_ops}"
-
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "Invalid application ID {appid}"
-msgstr "Neplatné ID aplikace {appid}"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+#, python-format
+msgid "Invalid boolean '%s'"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Invalid build flag at {line} in {linedesc}"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Invalid build format: {value} in {name}"
+msgstr ""
 
 #: ../fdroidserver/lint.py
 msgid "Invalid bulleted list"
-msgstr "Neplatný seznam s odrážkami"
+msgstr ""
+
+#: ../fdroidserver/lint.py
+#, python-format
+msgid "Invalid license tag \"%s\"! Use only tags from https://spdx.org/license-list"
+msgstr ""
+
+#: ../fdroidserver/lint.py
+msgid "Invalid link - use [http://foo.bar Link title] or [http://foo.bar]"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+#, python-format
+msgid "Invalid metadata in %s:%d"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+msgid "Invalid metadata in: "
+msgstr ""
 
 #: ../fdroidserver/common.py
 #, python-format
 msgid "Invalid name for published file: %s"
-msgstr "Neplatný název pro publikovaný soubor: %s"
+msgstr ""
 
 #: ../fdroidserver/common.py
 #, python-brace-format
-msgid "Invalid ndk: entry in build: \"{ndk}\""
-msgstr "Neplatné ndk: záznam v sestavení: „{ndk}“"
+msgid "Invalid package name {0}"
+msgstr ""
 
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "Invalid redirect to non-HTTPS: {before} -> {after} "
-msgstr "Neplatné přesměrování na jiný než HTTPS: {before} -> {after} "
+msgstr ""
 
 #: ../fdroidserver/metadata.py
 #, python-brace-format
 msgid "Invalid scrlib metadata: '{file}' does not exist"
-msgstr "Neplatná metadata scrlib: „{file}“ neexistuje"
+msgstr ""
 
 #: ../fdroidserver/metadata.py
 #, python-brace-format
 msgid "Invalid srclib metadata: could not parse '{file}'"
-msgstr "Neplatná srclib metadata: nelze parsovat „{file}“"
+msgstr ""
 
 #: ../fdroidserver/metadata.py
 #, python-brace-format
 msgid "Invalid srclib metadata: unknown key '{key}' in '{file}'"
-msgstr "Neplatná srclib metadata: neznámý klíč „{key}“ v „{file}“"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Invalid versionCode: \"{versionCode}\" is not an integer!"
+msgstr ""
 
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "JAR signature failed to verify: {path}"
-msgstr "Podpis JAR se nepodařilo ověřit: {path}"
+msgstr ""
 
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "JAR signature verified: {path}"
-msgstr "Ověření podpisu JAR: {path}"
+msgstr ""
 
 #: ../fdroidserver/scanner.py
 msgid "Java JAR file"
-msgstr "Soubor Java JAR"
+msgstr ""
 
-#: ../fdroidserver/mirror.py ../fdroidserver/publish.py
-#: ../fdroidserver/update.py
+#: ../fdroidserver/publish.py ../fdroidserver/update.py
+#: ../fdroidserver/mirror.py
 msgid "Java JDK not found! Install in standard location or set java_paths!"
-msgstr "Java JDK nenalezeno! Nainstalujte jej do standardního umístění nebo nastavte java_paths!"
+msgstr ""
 
 #: ../fdroidserver/scanner.py
 msgid "Java compiled class"
-msgstr "Zkompilovaná třída Java"
+msgstr ""
 
 #: ../fdroidserver/signindex.py
 msgid "Java jarsigner not found! Install in standard location or set java_paths!"
-msgstr "Java jarsigner nebyl nalezen! Nainstalujte jej do standardního umístění nebo nastavte java_paths!"
+msgstr ""
 
 #: ../fdroidserver/lint.py
 msgid "Javascript in HTML src attributes"
-msgstr "Javascript v atributech HTML src"
-
-#: ../fdroidserver/build.py
-#, python-brace-format
-msgid "Keeping failed build \"{apkfilename}\""
-msgstr "Uchovávání neúspěšného sestavení „{apkfilename}“"
+msgstr ""
 
 #: ../fdroidserver/init.py
 msgid "Keystore for signing key:\t"
-msgstr "Úložiště klíčů pro podpisový klíč:\t"
-
-#: ../fdroidserver/lint.py
-msgid "Known debug key is used in AllowedAPKSigningKeys: "
-msgstr "V AllowedAPKSigningKeys je použit známý ladicí klíč: "
+msgstr ""
 
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "Last used commit '{commit}' looks like a tag, but UpdateCheckMode is '{ucm}'"
-msgstr "Poslední použitá revize „{commit}“ vypadá jako značka, ale UpdateCheckMode je „{ucm}“"
+msgstr ""
 
 #: ../fdroidserver/lint.py
 msgid "Liberapay donation methods belong in the Liberapay: field"
-msgstr "Darovací metody Liberapay patří do pole „Liberapay:“"
+msgstr ""
+
+#: ../fdroidserver/lint.py
+msgid "Liberapay donation methods belong in the LiberapayID flag"
+msgstr ""
 
 #: ../fdroidserver/rewritemeta.py
-msgid "List files that would be reformatted (dry run)"
-msgstr "Seznam souborů, které budou přeformátovány (zkušební spuštění)"
+msgid "List files that would be reformatted"
+msgstr ""
 
 #: ../fdroidserver/lint.py
 msgid "Locale included in f-droid.org URL"
-msgstr "Překlad obsažený v URL f-droid.org"
+msgstr ""
 
 #: ../fdroidserver/build.py
 msgid "Make the build stop on exceptions"
-msgstr "Zastavení sestavování při výjimkách"
+msgstr ""
 
 #: ../fdroidserver/index.py
 msgid "Malformed repository mirrors."
-msgstr "Poškozené mirrory repozitáře."
+msgstr ""
 
 #: ../fdroidserver/deploy.py
 msgid "Malformed serverwebroot line:"
-msgstr "Poškozený řádek serverwebroot:"
-
-#: ../fdroidserver/scanner.py
-#, python-format
-msgid "Max recursion depth in ZIP file reached: %s"
-msgstr "Dosažena maximální hloubka rekurze v souboru ZIP: %s"
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "Mirror config for {url} contains \"isPrimary\" key!"
-msgstr "Konfigurace zrcadla {url} obsahuje klíč „isPrimary“!"
+msgstr ""
 
 #: ../fdroidserver/mirror.py
 msgid "Mirror the full repo and archive, all file types."
-msgstr "Zrcadlení celého repozitáře a archivu, všechny typy souborů."
+msgstr ""
 
 #: ../fdroidserver/gpgsign.py
 msgid "Missing output directory"
-msgstr "Chybějící výstupní adresář"
+msgstr ""
 
-#: ../fdroidserver/metadata.py
-msgid "Moving Anti-Features declarations to localized files:"
-msgstr "Přesun deklarací anti-funkcí do lokalizovaných souborů:"
-
-#: ../fdroidserver/index.py
-msgid "Neither \"repo_pubkey\" nor \"keystorepass\" set in config.yml"
-msgstr "V souboru config.yml není nastaven „repo_pubkey“ ani „keystorepass“"
-
-#: ../fdroidserver/verify.py
+#: ../fdroidserver/lint.py
 #, python-format
-msgid "No APK for package: %s"
-msgstr "Žádné APK pro balíček: %s"
+msgid "Name '%s' is just the auto name - remove it"
+msgstr ""
+
+#: ../fdroidserver/common.py
+msgid "No 'config.py' found, using defaults."
+msgstr ""
 
 #: ../fdroidserver/common.py
 msgid "No Android SDK found!"
-msgstr "Nebylo nalezeno Android SDK!"
+msgstr ""
+
+#: ../fdroidserver/import.py
+msgid "No android or kivy project could be found. Specify --subdir?"
+msgstr ""
 
 #: ../fdroidserver/install.py
 msgid "No attached devices found"
-msgstr "Nebyla nalezena žádná připojená zařízení"
+msgstr ""
 
-#: ../fdroidserver/install.py
-msgid "No devices found for `adb install`! Please plug one in."
-msgstr "Nenalezena žádná zařízení pro `adb install`! Zapojte prosím alespoň jedno."
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "No commit specified for {versionName} in {linedesc}"
+msgstr ""
 
 #: ../fdroidserver/index.py
 msgid "No fingerprint in URL."
-msgstr "V adrese URL není otisk."
+msgstr ""
 
 #: ../fdroidserver/common.py
 msgid "No git submodules available"
-msgstr "Nejsou k dispozici žádné submoduly git"
+msgstr ""
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "No gradle project could be found. Specify --subdir?"
-msgstr "Nebyl nalezen žádný projekt gradle. Specifikujte --subdir?"
+msgstr ""
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py ../fdroidserver/common.py
 msgid "No information found."
-msgstr "Nebyly nalezeny žádné informace."
-
-#: ../fdroidserver/checkupdates.py
-msgid "No matching tags found"
-msgstr "Nebyly nalezeny žádné odpovídající štítky"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "No minimum SDK version found in {0}, using default (3)."
-msgstr "V {0} nebyla nalezena minimální verze SDK, použita výchozí (3)."
+msgstr ""
 
 #: ../fdroidserver/lint.py
 msgid "No need to specify that the app is Free Software"
-msgstr "Není třeba uvádět, že aplikace je svobodný software"
+msgstr ""
 
 #: ../fdroidserver/lint.py
 msgid "No need to specify that the app is for Android"
-msgstr "Není třeba uvádět, že je aplikace určena pro Android"
+msgstr ""
 
 #: ../fdroidserver/deploy.py
-msgid "No option set! Edit your config.yml to set at least one of these:"
-msgstr "Není nastavena žádná možnost! Upravte svůj config.yml a nastavte alespoň jedno z těchto:"
+msgid "No option set! Edit your config.py to set at least one of these:"
+msgstr ""
 
 #: ../fdroidserver/common.py
 msgid "No packages specified"
-msgstr "Nebyly upřesněny žádné balíčky"
+msgstr ""
 
 #: ../fdroidserver/install.py
 #, python-format
-msgid "No signed APK available for %s"
-msgstr "Žádné podepsané APK k dispozici pro %s"
+msgid "No signed apk available for %s"
+msgstr ""
 
 #: ../fdroidserver/install.py
 msgid "No signed output directory - nothing to do"
-msgstr "Žádný podepsaný výstupní adresář - není co dělat"
+msgstr ""
 
-#: ../fdroidserver/common.py
+#: ../fdroidserver/update.py ../fdroidserver/common.py
 #, python-brace-format
 msgid "No signing certificates found in {path}"
-msgstr "Nenalezeny žádné podpisové certifikáty v {path}"
+msgstr ""
 
 #: ../fdroidserver/common.py
 #, python-format
 msgid "No such package: %s"
-msgstr "Žádný takový balíček: %s"
+msgstr ""
 
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "No such versionCode {versionCode} for app {appid}"
-msgstr "Žádný takový versionCode {versionCode} pro aplikaci {appid}"
+msgstr ""
 
-#: ../fdroidserver/checkupdates.py
-msgid "No tags found"
-msgstr "Nebyly nalezeny žádné značky"
-
-#: ../fdroidserver/publish.py ../fdroidserver/verify.py
+#: ../fdroidserver/verify.py ../fdroidserver/publish.py
 msgid "No unsigned directory - nothing to do"
-msgstr "Žádný nepodepsaný adresář - není co dělat"
-
-#: ../fdroidserver/__main__.py
-msgid "No version information could be found."
-msgstr "Nenalezeny žádné informace o verzi."
+msgstr ""
 
 #: ../fdroidserver/common.py
 msgid "Not a valid size definition: \"{}\""
-msgstr "Neplatná definice velikosti: „{}“"
+msgstr ""
 
 #: ../fdroidserver/signindex.py
 msgid "Nothing to do"
-msgstr "Není co dělat"
+msgstr ""
 
 #: ../fdroidserver/checkupdates.py
 #, python-brace-format
 msgid "Nothing to do for {appid}."
-msgstr "Pro {appid} není co dělat."
+msgstr ""
 
 #: ../fdroidserver/init.py
-msgid "Now set these in config.yml:"
-msgstr "Nyní nastavte následující v config.yml:"
+msgid "Now set these in config.py:"
+msgstr ""
 
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "OBB file has newer versionCode({integer}) than any APK:"
-msgstr "Soubor OBB má novější versionCode({integer}) než jakýkoli APK:"
+msgstr ""
 
 #: ../fdroidserver/update.py
 msgid "OBB filename must start with \"main.\" or \"patch.\":"
-msgstr "Název souboru OBB musí začínat s „main.“ nebo „patch.“:"
+msgstr ""
 
 #: ../fdroidserver/update.py
 msgid "OBB's packagename does not match a supported APK:"
-msgstr "Packagename souboru OBB neodpovídá podporovanému souboru APK:"
+msgstr ""
 
 #: ../fdroidserver/deploy.py
 msgid "Offline machine, skipping git mirror generation until `fdroid deploy`"
-msgstr "Offline počítač, přeskakuji generování mirroru gitu až do `fdroid deploy`"
+msgstr ""
 
-#: ../fdroidserver/deploy.py
-msgid "One of the 'github_releases' config items is missing the 'packageNames' value. skipping ..."
-msgstr "Jedné z položek konfigurace „github_releases“ chybí hodnota „packageNames“. Přeskakuji ..."
+#: ../fdroidserver/common.py
+#, python-brace-format
+msgid "Old APK signature failed to verify: {path}"
+msgstr ""
 
-#: ../fdroidserver/deploy.py
-msgid "One of the 'github_releases' config items is missing the 'projectUrl' value. skipping ..."
-msgstr "Jedné z položek konfigurace „github_releases“ chybí hodnota „projectUrl“. Přeskakuji ..."
+#: ../fdroid ../fdroidserver/__main__.py
+msgid "Old, deprecated name for fdroid deploy"
+msgstr ""
 
-#: ../fdroidserver/deploy.py
-msgid "One of the 'github_releases' config items is missing the 'token' value. skipping ..."
-msgstr "Jedné z položek konfigurace „github_releases“ chybí hodnota „token“. Přeskakuji ..."
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Only PNG and JPEG are supported for graphics, found: {path}"
-msgstr "Pro grafiku jsou podporovány pouze formáty PNG a JPEG, nalezeno: {path}"
+msgstr ""
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/common.py
-msgid "Only accepts a single key \"env\""
-msgstr "Přijímá pouze jediný klíč „env“"
+#: ../fdroidserver/checkupdates.py
+msgid "Only print differences with the Play Store"
+msgstr ""
 
 #: ../fdroidserver/checkupdates.py
 msgid "Only process apps with auto-updates"
-msgstr "Zpracovat pouze aplikace s automatickými aktualizacemi"
+msgstr ""
 
 #: ../fdroidserver/lint.py
 msgid "OpenCollective donation methods belong in the OpenCollective: field"
-msgstr "Darovací metody OpenCollective patří do pole „OpenCollective:“"
+msgstr ""
+
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "Options"
+msgstr "Možnosti"
 
 #: ../fdroidserver/verify.py
 msgid "Output JSON report to file named after APK."
-msgstr "Uložit hlášení JSON do souboru pojmenovaného podle APK."
+msgstr ""
 
 #: ../fdroidserver/scanner.py
 msgid "Output JSON to stdout."
-msgstr "Uložit JSON do stdout."
+msgstr ""
 
-#: ../fdroidserver/checkupdates.py ../fdroidserver/gpgsign.py
-#: ../fdroidserver/publish.py ../fdroidserver/signindex.py
-#: ../fdroidserver/update.py
+#: ../fdroidserver/gpgsign.py ../fdroidserver/publish.py
+#: ../fdroidserver/update.py ../fdroidserver/signindex.py
+#: ../fdroidserver/checkupdates.py
 msgid "Outputting JSON"
-msgstr "Ukládání výstupu JSON"
+msgstr ""
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "Overall license of the project."
-msgstr "Celková licence projektu."
+msgstr ""
+
+#: ../fdroidserver/dscanner.py
+msgid "Override path for repo APKs (default: ./repo)"
+msgstr ""
 
 #: ../fdroidserver/index.py
 #, python-brace-format
 msgid "Overriding blank versionName in {apkfilename} from metadata: {version}"
-msgstr "Přepisování prázdného versionName v {apkfilename} z metadat: {version}"
+msgstr ""
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 #, python-brace-format
 msgid "Package \"{appid}\" already exists"
-msgstr "Balíček „{appid}“ již existuje"
+msgstr ""
 
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "Parsing manifest at '{path}'"
-msgstr "Parsování manifestu v „{path}“"
+msgstr ""
 
 #: ../fdroidserver/common.py
 msgid "Password required with username"
-msgstr "Vyžadováno heslo s uživatelským jménem"
+msgstr ""
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "Path to main Android project subdirectory, if not in root."
-msgstr "Cesta k hlavnímu podadresáři projektu Android, pokud není v kořenovém adresáři."
+msgstr ""
+
+msgid "Path to main android project subdirectory, if not in root."
+msgstr ""
 
 #: ../fdroidserver/init.py
 msgid "Path to the Android SDK (sometimes set in ANDROID_HOME)"
-msgstr "Cesta k Android SDK (někdy nastavena v ANDROID_HOME)"
+msgstr ""
 
 #: ../fdroidserver/btlog.py
 msgid "Path to the git repo to use as the log"
-msgstr "Cesta ke git repozitáři k použití jako protokol"
+msgstr ""
 
 #: ../fdroidserver/init.py
 msgid "Path to the keystore for the repo signing key"
-msgstr "Cesta k úložišti klíčů pro podpisový klíč repozitáře"
+msgstr ""
+
+#: ../fdroidserver/dscanner.py
+msgid "Prepare Drozer to run a scan"
+msgstr ""
+
+msgid "Prepare drozer to run a scan"
+msgstr ""
 
 #: ../fdroidserver/nightly.py
 msgid "Print the secret variable to the terminal for easy copy/paste"
-msgstr "Zobrazit tajnou proměnnou v terminálu pro jednoduché kopírování/vložení"
+msgstr ""
 
-#: ../fdroidserver/install.py
+#: ../fdroidserver/metadata.py
 #, python-brace-format
-msgid "Privacy mode was enabled based on your locale ({country_code})."
-msgstr "Režim ochrany osobních údajů byl povolen na základě vaší lokality ({country_code})."
-
-#: ../fdroidserver/scanner.py
-#, python-format
-msgid "Problem with ZIP file: %s, error %s"
-msgstr "Problém se souborem ZIP: %s, chyba %s"
+msgid "Problem with description of {appid}: {error}"
+msgstr ""
 
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "Problem with xml at '{path}'"
-msgstr "Problém s xml v „{path}“"
+msgstr ""
 
 #: ../fdroidserver/checkupdates.py
 msgid "Process auto-updates"
-msgstr "Zpracovávat auto-aktualizace"
+msgstr ""
 
 #: ../fdroidserver/publish.py ../fdroidserver/update.py
 #, python-brace-format
 msgid "Processing {apkfilename}"
-msgstr "Zpracovávání {apkfilename}"
+msgstr ""
 
 #: ../fdroidserver/checkupdates.py ../fdroidserver/scanner.py
 #, python-brace-format
 msgid "Processing {appid}"
-msgstr "Zpracovávání {appid}"
+msgstr ""
 
 #: ../fdroidserver/update.py
 msgid "Produce human-readable XML/JSON for index files"
-msgstr "Vytváření lidsky čitelných souborů XML/JSON pro indexové soubory"
+msgstr ""
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/update.py
+msgid "Produce human-readable index.xml"
+msgstr "Vytvořit člověku čitelný index.xml"
+
+#: ../fdroidserver/import.py
 msgid "Project URL to import from."
-msgstr "Adresa URL projektu, ze které se má importovat."
+msgstr ""
 
 #: ../fdroidserver/lint.py
 msgid "Punctuation should be avoided"
-msgstr "Mělo by být vyvarováno interpunkce"
+msgstr ""
 
 #: ../fdroidserver/btlog.py
 msgid "Push the log to this git remote repository"
-msgstr "Odeslat protokol do tohoto vzdáleného git repozitáře"
+msgstr ""
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Pushing binary transparency log to {url}"
-msgstr "Odeslání protokolu binární průhlednosti do {url}"
+msgstr ""
 
-#: ../fdroidserver/deploy.py
-msgid "Pushing to remote server failed!"
-msgstr "Odeslání na vzdálený server se nezdařilo!"
-
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Pushing to {url}"
-msgstr "Odesílání do {url}"
+msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Quickly start a new repository"
-msgstr "Rychle vytvořit nový repozitář"
+msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Read all the metadata files and exit"
-msgstr "Přečíst všechny soubory metadat a ukončit program"
+msgstr ""
 
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "Reading '{config_file}'"
-msgstr "Čtení „{config_file}“"
+msgstr ""
 
+#: ../fdroidserver/common.py
+#, python-brace-format
+msgid "Reading minSdkVersion failed: \"{apkfilename}\""
+msgstr ""
+
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
+#. https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "Reading packageName/versionCode/versionName failed, APK invalid: '{apkfilename}'"
-msgstr "Čtení packageName/versionCode/versionName se nezdařilo, APK neplatné: „{apkfilename}“"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Reading packageName/versionCode/versionName failed,APK invalid: '{apkfilename}'"
-msgstr "Čtení packageName/versionCode/versionName se nezdařilo, APK neplatné: „{apkfilename}“"
+msgstr ""
 
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Reading {apkfilename} from cache"
-msgstr "Čtení {apkfilename} z mezipaměti"
+msgstr ""
 
-#: ../fdroidserver/build.py
-msgid "Refresh and cache scanner rules and signatures from the network"
-msgstr "Obnovit a uložit pravidla a podpisy skeneru ze sítě do mezipaměti"
-
-#: ../fdroidserver/publish.py
-#, python-brace-format
-msgid "Refusing to sign '{path}', file exists in both {dir1} and {dir2} folder."
-msgstr "Odmítám podespat „{path}“, soubor existuje ve složce {dir1} i {dir2}."
-
-#: ../fdroidserver/verify.py
-msgid "Remove source tarball and any APKs if successfully verified."
-msgstr "Odstranit zdrojový tarball a všechny soubory APK při úspěšném ověření."
+#: ../fdroidserver/stats.py
+msgid "Recalculate aggregate stats - use when changes have been made that would invalidate old cached data."
+msgstr ""
 
 #: ../fdroidserver/common.py
 msgid "Removing specified files"
-msgstr "Odebírání určených souborů"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Removing {path}\""
-msgstr "Odebírání {path}\""
+msgstr ""
 
 #: ../fdroidserver/update.py
 msgid "Rename APK files that do not match package.name_123.apk"
-msgstr "Přejmenovat soubory APK, které se neshodují s package.name_123.apk"
+msgstr ""
 
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "RepoType {type} is deprecated, please switch to git."
+#: ../fdroidserver/update.py
+msgid "Report on build data status"
+msgstr ""
+
+#: ../fdroidserver/build.py
+msgid "Reset and create a brand new build server, even if the existing one appears to be ok."
 msgstr ""
 
 #: ../fdroidserver/nightly.py
 #, python-brace-format
 msgid "Resigning {apkfilename} with provided debug.keystore"
-msgstr "Opětovné podepisování {apkfilename} s poskytnutým debug.keystore"
+msgstr ""
 
 #: ../fdroidserver/update.py
 msgid "Resize all the icons exceeding the max pixel size and exit"
-msgstr "Změnit velikost všech ikon přesahujících maximální velikost pixelů a ukončit aplikaci"
+msgstr ""
 
 #: ../fdroidserver/common.py
 msgid "Restrict output to warnings and errors"
-msgstr "Omezit výstup na varování a chyby"
+msgstr ""
 
-#: ../fdroidserver/net.py
-#, python-format
-msgid "Retrying failed download: %s"
-msgstr "Opakování nezdařeného stahování: %s"
-
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Rewrite all the metadata files"
 msgstr "Přepsat všechny soubory metadat"
 
+#: ../fdroidserver/rewritemeta.py
+msgid "Rewrite to a specific format: "
+msgstr ""
+
 #: ../fdroidserver/rewritemeta.py
 #, python-brace-format
 msgid "Rewriting '{appid}'"
-msgstr "Přepisování „{appid}“"
+msgstr ""
+
+#: ../fdroidserver/rewritemeta.py
+#, python-brace-format
+msgid "Rewriting '{appid}' to '{path}'"
+msgstr ""
 
 #: ../fdroidserver/checkupdates.py
 msgid "Run on git repo that has uncommitted changes"
-msgstr "Spustit v repozitáři git s nezveřejněnými změnami"
-
-#: ../fdroidserver/nightly.py
-#, python-brace-format
-msgid "Run over {cibase} to find -debug.apk. and skip repo_basedir {repo_basedir}"
-msgstr "Spustit přes {cibase} pro nalezení -debug.apk. a přeskočit repo_basedir {repo_basedir}"
+msgstr ""
 
 #: ../fdroidserver/lint.py
 msgid "Run rewritemeta to fix formatting"
-msgstr "Spustit rewritemeta pro opravu formátování"
+msgstr ""
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 msgid "Running first pass with MD5 checking disabled"
-msgstr "Spuštění prvního průchodu s vypnutou kontrolou MD5"
+msgstr ""
 
 #: ../fdroidserver/mirror.py
 #, python-brace-format
 msgid "Running wget in {path}"
-msgstr "Spouštění wget v {path}"
+msgstr ""
 
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "SHA-256 of {url} does not match entry!"
-msgstr "SHA-256 z {url} neodpovídá zadání!"
+#: ../fdroidserver/dscanner.py
+msgid "Scan only the latest version of each package"
+msgstr ""
 
 #: ../fdroidserver/build.py
 msgid "Scan the resulting APK(s) for known non-free classes."
-msgstr "Oskenovat výsledná APK, zda neobsahují známé nesvobodné třídy."
+msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Scan the source code of a package"
-msgstr "Skenovat zdrojový kód balíčku"
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Scanner found {count} problems in {apk}"
-msgstr "Skener našel {count} problémů v {apk}"
+msgstr ""
 
 #: ../fdroidserver/scanner.py
 #, python-brace-format
 msgid "Scanner found {count} problems in {appid}:"
-msgstr "Skener našel {count} problémů v {appid}:"
+msgstr ""
 
 #: ../fdroidserver/scanner.py
 #, python-brace-format
 msgid "Scanner found {count} problems in {appid}:{versionCode}:"
-msgstr "Skener našel {count} problémů v {appid}:{versionCode}:"
+msgstr ""
 
 #: ../fdroidserver/build.py
 msgid "Scanner found {} problem"
 msgid_plural "Scanner found {} problems"
-msgstr[0] "Skener našel {} problém"
-msgstr[1] "Skener našel {} problémy"
-msgstr[2] "Skener našel {} problémů"
-
-#: ../fdroidserver/scanner.py
-msgid "Scanning APK for extra signing blocks."
-msgstr "Skenování APK na další podpisové bloky."
-
-#: ../fdroidserver/scanner.py
-msgid "Scanning APK with dexdump for known non-free classes."
-msgstr "Skenování APK pomocí dexdump na známé nesvobodné třídy."
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Set NDK {release} ({version}) up"
-msgstr "Nastavit NDK {release} ({version})"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
 #: ../fdroidserver/common.py
 msgid "Set clock to that time using:"
-msgstr "Nastavit hodiny na daný čas pomocí:"
+msgstr ""
 
 #: ../fdroidserver/nightly.py
 msgid "Set maximum releases in repo before older ones are archived"
-msgstr "Nastavit maximální počet vydání před archivací starších"
+msgstr ""
 
 #: ../fdroidserver/build.py
 #, python-brace-format
 msgid "Set open file limit to {integer}"
-msgstr "Nastavit limit otevřených souborů na {integer}"
+msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Set up an app build for a nightly build repo"
-msgstr "Nastavit sestavení aplikace pro nightly sestavení repozitáře"
+msgstr ""
 
 #: ../fdroidserver/build.py
 msgid "Setting open file limit failed: "
-msgstr "Nastavení limitu otevřených souborů se nezdařilo: "
+msgstr ""
 
 #: ../fdroidserver/build.py
 #, python-brace-format
 msgid "Setting {0} sec timeout for this build"
-msgstr "Nastavení časového limitu {0} sekund pro toto sestavení"
+msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroidserver/build.py
+msgid "Setup an emulator, install the APK on it and perform a Drozer scan"
+msgstr ""
+
+msgid "Setup an emulator, install the apk on it and perform a drozer scan"
+msgstr ""
+
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Sign and place packages in the repo"
-msgstr "Podepsat a umístit balíčky do repozitáře"
+msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Sign indexes created using update --nosign"
-msgstr "Podepsat indexy vytvořené pomocí update --nosign"
+msgstr ""
 
 #: ../fdroidserver/build.py
 msgid "Skip scanning the source code for binaries and other problems"
-msgstr "Přeskočení kontroly zdrojového kódu binárních souborů a dalších problémů"
+msgstr ""
 
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Skipping '{apkfilename}' with invalid signature!"
-msgstr "Přeskakování „{apkfilename}“ s neplatným podpisem!"
-
-#: ../fdroidserver/deploy.py ../fdroidserver/index.py
-#, python-format
-msgid "Skipping GitLab Pages mirror because the repo is too large (>%.2fGB)!"
-msgstr "Přeskakování mirroru GitLab Pages, protože je repozitář příliš velký (>%.2fGB)!"
+msgstr ""
 
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Skipping index generation for {appid}"
-msgstr "Přeskakování generování indexu pro {appid}"
+msgstr ""
 
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Skipping {apkfilename} with invalid signature!"
-msgstr "Přeskakování {apkfilename} s neplatným podpisem!"
+msgstr ""
 
 #: ../fdroidserver/scanner.py
 #, python-brace-format
 msgid "Skipping {appid}: disabled"
-msgstr "Přeskakování {appid}: zakázáno"
+msgstr ""
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/scanner.py
+#, python-brace-format
+msgid "Skipping {appid}: no builds specified"
+msgstr ""
+
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 msgid "Specify a local folder to sync the repo to"
-msgstr "Určete místní složku, do které chcete synchronizovat repozitář"
+msgstr ""
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 msgid "Specify an identity file to provide to SSH for rsyncing"
-msgstr "Určete soubor identity k poskytnutí pro SSH pro rsyncing"
+msgstr ""
+
+#: ../fdroidserver/build.py
+msgid "Specify that we're running on the build server"
+msgstr ""
 
 #: ../fdroidserver/nightly.py
 msgid "Specify which debug keystore file to use."
-msgstr "Určete, který ladicí soubor úložiště klíčů se má použít."
+msgstr ""
 
 #: ../fdroidserver/common.py
 msgid "Spew out even more information than normal"
-msgstr "Zobrazovat ještě více informací než normálně"
+msgstr ""
+
+#: ../fdroidserver/nightly.py
+#, python-brace-format
+msgid "Striping mystery signature from {apkfilename}"
+msgstr ""
 
 #: ../fdroidserver/nightly.py
 #, python-brace-format
 msgid "Stripping mystery signature from {apkfilename}"
-msgstr "Odstraňování tajemného podpisu z {apkfilename}"
+msgstr ""
 
 #: ../fdroidserver/lint.py
 #, python-format
 msgid "Summary '%s' is just the app's name"
-msgstr "Shrnutí „%s“ je pouze název aplikace"
+msgstr ""
 
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "Summary of length {length} is over the {limit} char limit"
-msgstr "Souhrn délky {length} je nad limitem {limit} znaků"
+msgstr ""
 
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "System clock is older than date in {path}!"
-msgstr "Systémové hodiny jsou starší než datum v {path}!"
-
-#: ../fdroidserver/checkupdates.py
-msgid "Tags update mode only works for git, hg, bzr and git-svn repositories currently"
-msgstr "Režim aktualizace štítků v současné době funguje pouze pro repozitáře git, hg, bzr a git-svn"
-
-#: ../fdroidserver/checkupdates.py
-msgid "Tags update mode used in git-svn, but the repo was not set up with tags"
-msgstr "Režim aktualizace pomocí značek se používá v git-svn, ale repozitář nebyl nastaven se značkami"
+msgstr ""
 
 #: ../fdroidserver/build.py
 msgid "Test mode - put output in the tmp directory only, and always build, even if the output already exists."
-msgstr "Testovací režim - výstup se ukládá pouze do adresáře tmp a vždy se sestavuje, i když výstup již existuje."
-
-#: ../fdroidserver/index.py
-msgid "The \"qrcode\" Python package is not installed (e.g. apt-get install python3-qrcode)!"
-msgstr "Python balíček „qrcode“ není nainstalován (např. apt-get install python3-qrcode)!"
+msgstr ""
 
 #. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "The OBB version code must come after \"{name}.\":"
-msgstr "Kód verze OBB musí být uveden za „{name}.“:"
+msgstr ""
 
 #: ../fdroidserver/btlog.py
 msgid "The base URL for the repo to log (default: https://f-droid.org)"
-msgstr "Základní URL repozitáře k logování (výchozí: https://f-droid.org)"
+msgstr ""
 
 #: ../fdroidserver/mirror.py
 msgid "The directory to write the mirror to"
-msgstr "Adresář, do kterého se má zapsat mirror"
+msgstr ""
 
 #: ../fdroidserver/nightly.py
 msgid "The file to be included in the repo (path or glob)"
-msgstr "Soubor, který má být zahrnut do repozitáře (cesta nebo glob)"
+msgstr ""
+
+#: ../fdroidserver/deploy.py
+msgid "The only commands currently supported are 'init' and 'update'"
+msgstr ""
 
 #: ../fdroidserver/index.py
 msgid "The repository's fingerprint does not match."
-msgstr "Otisk repozitáře se neshoduje."
+msgstr ""
+
+#: ../fdroidserver/common.py
+msgid "The repository's index could not be verified."
+msgstr ""
 
 #: ../fdroidserver/deploy.py
 #, python-brace-format
 msgid "The root dir for local_copy_dir \"{path}\" does not exist!"
-msgstr "Kořenový adresář pro local_copy_dir „{path}“ neexistuje!"
+msgstr ""
 
 #: ../fdroidserver/publish.py
 msgid "There is a keyalias collision - publishing halted"
-msgstr "Došlo ke kolizi keyalias – publikování zastaveno"
+msgstr ""
 
 #: ../fdroidserver/common.py
 msgid "These are the apps that have been archived from the main repo."
-msgstr "Aplikace, které byly archivovány z hlavního repozitáře."
+msgstr ""
 
-#: ../fdroidserver/mirror.py
-msgid "This command should never be used to mirror f-droid.org! A full copy requires more than 600GB."
-msgstr "Tento příkaz by nikdy neměl být použit k zrcadlení f-droid.org! Celá kopie vyžaduje více než 600GB."
-
-#: ../fdroidserver/common.py
-msgid "This is a repository of apps to be used with F-Droid. Applications in this repository are either official binaries built by the original application developers, or are binaries built from source by the admin of f-droid.org using the tools on https://gitlab.com/fdroid."
-msgstr "Toto je repozitář aplikací, který lze používat s aplikací F-Droid. Aplikace v tomto repozitáři jsou buď oficiální binární soubory sestavené původními vývojáři aplikací, nebo binární soubory sestavené ze zdrojových kódů správcem f-droid.org pomocí nástrojů na adrese https://gitlab.com/fdroid."
-
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 #, python-format
 msgid "This repo already has local metadata: %s"
-msgstr "Tento repozitář již má místní metadata: %s"
-
-#: ../fdroidserver/init.py
-#, python-format
-msgid ""
-"To complete the setup, add your APKs to \"%s\"\n"
-"then run \"fdroid update -c; fdroid update\".  You might also want to edit\n"
-"\"config.yml\" to set the URL, repo name, and more.  You should also set up\n"
-"a signing key (a temporary one might have been automatically generated).\n"
-"\n"
-"For more info: https://f-droid.org/docs/Setup_an_F-Droid_App_Repo\n"
-"and https://f-droid.org/docs/Signing_Process"
 msgstr ""
-"Chcete-li dokončit nastavení, přidejte soubory APK na adresu „%s“.\n"
-"poté spusťte příkaz „fdroid update -c; fdroid update“.  Možná budete chtít také upravit\n"
-"„config.yml“, abyste nastavili adresu URL, název repozitáře a další údaje.  Měli byste také\n"
-"nastavit podpisový klíč (dočasný klíč již mohl být vygenerován automaticky).\n"
-"\n"
-"Další informace: https://f-droid.org/docs/Setup_an_F-Droid_App_Repo\n"
-"a https://f-droid.org/docs/Signing_Process"
 
-#: ../fdroidserver/deploy.py
-msgid "To use awsbucket, awssecretkey and awsaccesskeyid must also be set in config.yml!"
-msgstr "Chcete-li používat awsbucket, musí být v souboru config.yml nastaven také awssecretkey a awsaccesskeyid!"
-
-#: ../fdroidserver/deploy.py
-msgid "To use rclone, rclone_config and awsbucket must be set in config.yml!"
-msgstr "Chcete-li používat rclone, musí být v souboru config.yml nastaven rclone_config a awsbucket!"
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
+msgid "To use awsbucket, awssecretkey and awsaccesskeyid must also be set in config.py!"
+msgstr ""
 
 #: ../fdroidserver/lint.py
 msgid "URL must start with https:// or http://"
-msgstr "URL musí začínat s https:// nebo http://"
+msgstr ""
 
 #: ../fdroidserver/lint.py
 msgid "URL shorteners should not be used"
-msgstr "Zkracovače URL by neměly být používány"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+msgid "URL title is just the URL, use brackets: [URL]"
+msgstr ""
 
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "URL {url} in Description: {error}"
-msgstr "URL {url} v popisu: {error}"
+msgstr ""
 
 #: ../fdroidserver/lint.py
 msgid "Unexpected license tag \"{}\"! Only use FSF or OSI approved tags from https://spdx.org/license-list"
-msgstr "Neočekávaná licenční značka „{}“! Používejte pouze značky schválené FSF nebo OSI z https://spdx.org/license-list"
+msgstr ""
 
 #: ../fdroidserver/lint.py
 msgid "Unexpected license tag \"{}\"! Only use license tags configured in your config file"
-msgstr "Neočekávaná licenční značka „{}“! Používejte pouze licenční značky nakonfigurované v konfiguračním souboru"
+msgstr ""
 
-#: ../fdroidserver/common.py
+#: ../fdroidserver/metadata.py
 #, python-brace-format
-msgid "Unknown entry {key} in {configname}"
-msgstr "Neznámá položka {key} in {configname}"
+msgid "Unexpected text on same line as {field} in {linedesc}"
+msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Unknown exception found!"
 msgstr "Došlo k neznámé chybě!"
 
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "Unknown file '{filename}' in build '{versionName}'"
-msgstr "Neznámý soubor „{filename}“ v sestavení „{versionName}“"
+msgstr ""
 
 #: ../fdroidserver/metadata.py
 #, python-format
 msgid "Unknown metadata format: %s"
-msgstr "Neznámý formát metadat: %s"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Unknown metadata format: {path}"
+msgstr ""
 
 #: ../fdroidserver/metadata.py
 #, python-brace-format
 msgid "Unknown metadata format: {path} (use: *.yml)"
-msgstr "Neznámý formát metadat: {path} (použijte: *.yml)"
+msgstr ""
 
 #: ../fdroidserver/common.py
 msgid "Unknown version of aapt, might cause problems: "
-msgstr "Neznámá verze aapt, může způsobit problémy: "
+msgstr ""
+
+#: ../fdroidserver/lint.py
+msgid "Unlinkified link - use [http://foo.bar Link title] or [http://foo.bar]"
+msgstr ""
 
 #: ../fdroidserver/lint.py
 msgid "Unnecessary leading space"
-msgstr "Zbytečná úvodní mezera"
+msgstr ""
 
 #: ../fdroidserver/lint.py
 msgid "Unnecessary trailing space"
-msgstr "Zbytečná mezera na konci"
+msgstr ""
 
 #: ../fdroidserver/metadata.py
 #, python-brace-format
 msgid "Unrecognised app field '{fieldname}' in '{path}'"
-msgstr "Nerozpoznané pole aplikace „{fieldname}“ v „{path}“"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+msgid "Unrecognised app field: "
+msgstr ""
 
 #: ../fdroidserver/metadata.py
 #, python-brace-format
 msgid "Unrecognised build flag '{build_flag}' in '{path}'"
-msgstr "Nerozpoznaný příznak sestavení „{build_flag}“ v „{path}“"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Unrecognised field '{field}' in {linedesc}"
+msgstr ""
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Unsupported file type \"{extension}\" for repo graphic"
-msgstr "Nepodporovaný typ souboru „{extension}“ pro grafiku repozitáře"
+msgstr ""
 
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Unsupported graphics file found: {path}"
-msgstr "Nalezen nepodporovaný soubor grafiky: {path}"
+msgstr ""
+
+#: ../fdroidserver/rewritemeta.py
+#, python-brace-format
+msgid "Unsupported metadata format, use: --to [{supported}]"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+msgid "Unterminated ]"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+msgid "Unterminated ]]"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Unterminated build in {name}"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Unterminated continuation in {name}"
+msgstr ""
 
 #: ../fdroidserver/lint.py
 #, python-format
 msgid "Unused extlib at %s"
-msgstr "Nepoužitý extlib na %s"
+msgstr ""
 
 #: ../fdroidserver/lint.py
 #, python-format
 msgid "Unused file at %s"
-msgstr "Nepoužitý soubor na %s"
+msgstr ""
 
 #: ../fdroidserver/scanner.py
 #, python-format
 msgid "Unused scandelete path: %s"
-msgstr "Nepoužitá cesta scandelete: %s"
+msgstr ""
 
 #: ../fdroidserver/scanner.py
 #, python-format
 msgid "Unused scanignore path: %s"
-msgstr "Nepoužitá cesta scanignore: %s"
+msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Update repo information for new packages"
-msgstr "Aktualizovat informace o repozitáři pro nové balíčky"
+msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Update the binary transparency log for a URL"
-msgstr "Aktualizovat protokol binární transparentnosti pro URL"
+msgstr ""
+
+#: ../fdroid ../fdroidserver/__main__.py
+msgid "Update the stats of the repo"
+msgstr "Aktualizovat statistiky repozitáře"
+
+#: ../fdroidserver/update.py ../fdroidserver/build.py
+msgid "Update the wiki"
+msgstr ""
 
 #: ../fdroidserver/checkupdates.py
 #, python-brace-format
 msgid "UpdateCheckData has invalid URL: {url}"
-msgstr "UpdateCheckData má neplatnou URL: {url}"
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "UpdateCheckData must match the version code as integer (\\d or [0-9]): {codeex}"
-msgstr "UpdateCheckData musí odpovídat kódu verze jako celému číslu (\\d nebo [0-9]): {codeex}"
+msgstr ""
 
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "UpdateCheckData must use HTTPS URL: {url}"
-msgstr "UpdateCheckData musí používat HTTPS URL: {url}"
+msgstr ""
 
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "UpdateCheckData not a valid URL: {url}"
-msgstr "UpdateCheckData není platná URL: {url}"
+msgstr ""
 
 #: ../fdroidserver/lint.py
-msgid "UpdateCheckMode is set but it looks like checkupdates hasn't been run yet."
-msgstr "UpdateCheckMode je nastaven, ale vypadá to, že akce checkupdates ještě nebyla spuštěna."
+msgid "UpdateCheckMode is set but it looks like checkupdates hasn't been run yet"
+msgstr ""
+
+#. Translators: https://developer.android.com/studio/build/application-id
+#: ../fdroidserver/lint.py
+msgid "UpdateCheckName is set to the known application ID - it can be removed"
+msgstr ""
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
 #: ../fdroidserver/lint.py
 msgid "UpdateCheckName is set to the known application ID, it can be removed"
-msgstr "UpdateCheckName je nastaveno na známé ID aplikace, lze jej odstranit"
+msgstr ""
 
 #: ../fdroidserver/deploy.py
 #, python-brace-format
 msgid "Uploading {apkfilename} to androidobservatory.org"
-msgstr "Nahrávání {apkfilename} na androidobservatory.org"
+msgstr ""
 
 #: ../fdroidserver/deploy.py
 #, python-brace-format
 msgid "Uploading {apkfilename} to virustotal"
-msgstr "Nahrávání {apkfilename} na VirusTotal"
+msgstr ""
+
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "Usage"
+msgstr "Použití"
+
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, python-format
+msgid "Usage: %s\n"
+msgstr "Použití: %s\n"
 
 #: ../fdroidserver/lint.py
-msgid "Use /HEAD instead of /master or /main to point at a file in the default branch"
-msgstr "Použijte /HEAD namísto /master nebo /main k ukázání na soubor ve výchozí větvi"
+msgid "Use /HEAD instead of /master to point at a file in the default branch"
+msgstr ""
 
 #: ../fdroidserver/update.py
 msgid "Use `fdroid update -c` to create it."
-msgstr "K vytvoření použijte `fdroid update -c`."
+msgstr ""
 
 #: ../fdroidserver/build.py
 msgid "Use build server"
-msgstr "Použít server pro sestavení"
+msgstr ""
 
 #: ../fdroidserver/update.py
 msgid "Use date from APK instead of current time for newly added APKs"
-msgstr "Pro nově přidaná APK použít datum z APK místo aktuálního času"
+msgstr ""
 
-#: ../fdroidserver/deploy.py
+msgid "Use date from apk instead of current time for newly added apks"
+msgstr ""
+
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Using \"{path}\" for configuring s3cmd."
-msgstr "Používám „{path}“ pro konfiguraci s3cmd."
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Using \"{path}\" for syncing with remote storage."
-msgstr "Používám „{path}“ pro synchronizaci se vzdáleným úložištěm."
+msgstr ""
 
 #: ../fdroidserver/common.py
 msgid "Using APK Signature v2"
-msgstr "Používám APK Signature v2"
+msgstr ""
 
 #: ../fdroidserver/common.py
 msgid "Using APK Signature v3"
-msgstr "Používám APK Signature v3"
-
-#: ../fdroidserver/common.py
-msgid "Using JAR Signature"
-msgstr "Používám JAR Signature"
+msgstr ""
 
 #: ../fdroidserver/common.py
 msgid "Using Java's jarsigner, not recommended for verifying APKs! Use apksigner"
-msgstr "Používám jarsigner Javy, není doporučeno pro ověřování APK! Použijte apksigner"
+msgstr ""
 
-#: ../fdroidserver/metadata.py
+#: ../fdroidserver/common.py
 #, python-brace-format
-msgid "Using blank dictionary instead of contents of {path}!"
-msgstr "Použití prázdného slovníku místo obsahu {path}!"
+msgid "Using androguard from \"{path}\""
+msgstr ""
 
 #: ../fdroidserver/init.py
 #, python-brace-format
 msgid "Using existing keystore \"{path}\""
-msgstr "Používám existující keystore „{path}“"
+msgstr ""
 
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Using rclone to sync with: {url}"
-msgstr "Používám rclone pro synchronizaci s: {url}"
-
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Using s3cmd to sync with: {url}"
-msgstr "Používám s3cmd pro synchronizaci s: {url}"
+msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Valid commands are:"
 msgstr "Platné příkazy jsou:"
 
 #: ../fdroidserver/verify.py
 msgid "Verify against locally cached copy rather than redownloading."
-msgstr "Ověřit proti lokálně uložené kopii místo opětovného stahování."
+msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Verify the integrity of downloaded packages"
-msgstr "Ověřit integritu stažených balíčků"
+msgstr ""
 
 #: ../fdroidserver/index.py
 msgid "Verifying index signature:"
-msgstr "Ověřování podpisu indexu:"
-
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "Verifying package {path} with apksigner."
-msgstr "Ověřování balíčku {path} pomocí apksigner."
+msgstr ""
 
 #: ../fdroidserver/deploy.py
 #, python-brace-format
 msgid "VirusTotal API key cannot upload files larger than 32MB, use {url} to upload {path}."
-msgstr "Klíč API VirusTotal neumožňuje nahrávání souborů větších než 32 MB, k nahrání {path} použijte {url}."
-
-#: ../fdroidserver/nightly.py
-msgid "WARNING: only public git repos are supported!"
 msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Warn about possible metadata errors"
 msgstr "Varovat ohledně možných chyb metadat"
 
-#: ../fdroidserver/scanner.py
-msgid "WebAssembly binary file"
-msgstr "Binární soubor WebAssembly"
-
 #: ../fdroidserver/update.py
 msgid "When configured for signed indexes, create only unsigned indexes at this stage"
-msgstr "Pokud jsou nakonfigurovány podepsané indexy, vytvořit v této fázi pouze nepodepsané indexy"
+msgstr ""
 
 #: ../fdroidserver/lint.py
 msgid "When linting the entire repository yamllint is disabled by default. This option forces yamllint regardless."
-msgstr "Při lintingu celého úložiště je yamllint ve výchozím nastavení zakázán. Tato volba vynucuje yamllint bez ohledu na to."
+msgstr ""
 
-#: ../fdroidserver/publish.py
-msgid "When signing or verifying fails, exit with an error code."
-msgstr "Pokud podpis nebo ověření selže, ukončit proces s chybovým kódem."
-
-#: ../fdroidserver/install.py
-msgid "Would you like to download and install F-Droid.apk via adb? (YES/no)"
-msgstr "Chcete stáhnout a nainstalovat F-Droid.apk skrze adb? (ANO/ne)"
-
-#: ../fdroidserver/install.py
-msgid "Would you like to download the app(s) from f-droid.org? (YES/no)"
-msgstr "Chcete stáhnout aplikace z f-droid.org? (ANO/ne)"
+msgid "X.509 'Distiguished Name' used when generating keys"
+msgstr ""
 
 #: ../fdroidserver/init.py
 msgid "X.509 'Distinguished Name' used when generating keys"
-msgstr "X.509 „Distinguished Name“ používané při generování klíčů"
+msgstr ""
 
 #: ../fdroidserver/common.py
 msgid "You can use ANDROID_HOME to set the path to your SDK, i.e.:"
-msgstr "Pro nastavení cesty k vašemu SDK můžete použít ANDROID_HOME, např.:"
+msgstr ""
 
 #: ../fdroidserver/scanner.py
 msgid "ZIP file archive"
-msgstr "Archiv souborů ZIP"
-
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "adb reports {serial} is \"{status}\"!"
-msgstr "adb hlásí, že {serial} je „{status}“!"
+msgstr ""
 
 #: ../fdroidserver/nightly.py
 #, python-brace-format
 msgid "adding IdentityFile to {path}"
-msgstr "přidávám IdentityFile do {path}"
+msgstr ""
 
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "adding to {name}: {path}"
-msgstr "přidávání do {name}: {path}"
+msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "ambiguous option: %(option)s could match %(matches)s"
-msgstr "nejednoznačná možnost: %(option)s by mohlo odpovídat %(matches)s"
+msgstr ""
 
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "apksigner in build-tools;{version} passes APKs with invalid v3 signatures, ignoring."
-msgstr "apksigner v build-tools;{version} předává soubory APK s neplatnými v3 podpisy, ignoruji."
-
-#: ../fdroidserver/common.py
-msgid "apksigner not found! Cannot sign or verify modern APKs"
-msgstr "apksigner nenalezen! Nelze podepsat nebo ověřit moderní APK"
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, python-format
+msgid "ambiguous option: %s (%s?)"
+msgstr ""
 
 #: ../fdroidserver/common.py
 msgid "apksigner not found, it's required for signing!"
-msgstr "apksigner nenalezen, je vyžadován k podepisování!"
+msgstr ""
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/checkupdates.py ../fdroidserver/lint.py
-#: ../fdroidserver/rewritemeta.py
+#: ../fdroidserver/lint.py ../fdroidserver/rewritemeta.py
+#: ../fdroidserver/checkupdates.py
 msgid "application ID of file to operate on"
-msgstr "ID aplikace nebo soubor, se kterým se má pracovat"
+msgstr ""
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/build.py ../fdroidserver/install.py
-#: ../fdroidserver/publish.py ../fdroidserver/scanner.py
-#: ../fdroidserver/verify.py
+#: ../fdroidserver/verify.py ../fdroidserver/publish.py
+#: ../fdroidserver/build.py ../fdroidserver/scanner.py
+#: ../fdroidserver/install.py
 msgid "application ID with optional versionCode in the form APPID[:VERCODE]"
-msgstr "ID aplikace s nepovinným kódem verze ve tvaru APPID[:VERCODE]"
+msgstr ""
 
-#: ../fdroidserver/common.py
-msgid "archive_url needs to end with /archive"
-msgstr "archive_url musí končit na /archive"
+#: ../fdroidserver/lint.py ../fdroidserver/rewritemeta.py
+msgid "applicationId in the form APPID"
+msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: ../fdroidserver/checkupdates.py
+msgid "applicationId to check for updates"
+msgstr ""
+
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
+#: ../fdroidserver/verify.py ../fdroidserver/publish.py
+#: ../fdroidserver/dscanner.py ../fdroidserver/build.py
+#: ../fdroidserver/scanner.py ../fdroidserver/install.py
+msgid "applicationId with optional versionCode in the form APPID[:VERCODE]"
+msgstr ""
+
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "argument \"-\" with mode %r"
-msgstr "argument „-“ s režimem %r"
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "argument %(argument_name)s: %(message)s"
-msgstr "argument %(argument_name)s: %(message)s"
+msgstr ""
 
 #: ../fdroidserver/nightly.py
 msgid "attempting bare SSH connection to test deploy key:"
-msgstr "pokus o holé připojení SSH k testování klíče pro nasazení:"
+msgstr ""
+
+#: ../fdroidserver/nightly.py
+msgid "attempting bare ssh connection to test deploy key:"
+msgstr ""
 
 #: ../fdroidserver/common.py
 msgid "can not parse scrlib spec (not a string): '{}'"
-msgstr "nelze zpracovat specifikaci scrlib (není to řetězec): „{}“"
+msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
-msgid "can't open '%(filename)s': %(error)s"
-msgstr "nelze otevřít „%(filename)s“: %(error)s"
-
-#: ../fdroidserver/scanner.py
-msgid "can't open non-https url: '{};"
-msgstr "nelze otevřít non-https url: '{};"
+msgid "can't open '%s': %s"
+msgstr ""
 
 #: ../fdroidserver/build.py
 #, python-brace-format
 msgid "cannot find required srclibs: \"{path}\""
-msgstr "nelze najít požadované srclibs: „{path}“"
+msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "cannot have multiple subparser arguments"
-msgstr "nelze mít více argumentů subparseru"
+msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "cannot merge actions - two groups are named %r"
-msgstr "nelze sloučit akce - dvě skupiny jsou pojmenovány %r"
+msgstr ""
 
 #: ../fdroidserver/nightly.py
 msgid "cannot publish update, did you set the deploy key?"
-msgstr "nelze publikovat aktualizaci, nastavili jste klíč pro nasazení?"
+msgstr ""
 
 #: ../fdroidserver/nightly.py
 #, python-brace-format
 msgid "cloning {url}"
-msgstr "klonování {url}"
+msgstr ""
+
+#: ../fdroidserver/deploy.py
+msgid "command to execute, either 'init' or 'update'"
+msgstr ""
 
 #: ../fdroidserver/__main__.py
 msgid "commands from plugin modules:"
-msgstr "příkazy z modulů pluginů:"
+msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "complex"
+msgstr ""
+
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "conflicting option string: %s"
 msgid_plural "conflicting option strings: %s"
-msgstr[0] "konfliktní řetězec možnosti: %s"
-msgstr[1] "konfliktní řetězce možnosti: %s"
-msgstr[2] "konfliktní řetězce možnosti: %s"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "conflicting subparser alias: %s"
-msgstr "konfliktní alias subparseru: %s"
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "conflicting subparser: %s"
-msgstr "konfliktní subparser: %s"
+#: ../fdroidserver/nightly.py
+#, python-brace-format
+msgid "copying {apkfilename} into {path}"
+msgstr ""
 
 #: ../fdroidserver/metadata.py
 #, python-brace-format
 msgid "could not parse '{path}'"
-msgstr "nepodařilo se parsovat „{path}“"
-
-#: ../fdroidserver/common.py
-msgid "could not parse srclib spec (no name specified): '{}'"
-msgstr "nepodařilo se parsovat srclib spec (není určen název): „{}“"
+msgstr ""
 
 #: ../fdroidserver/common.py
 msgid "could not parse srclib spec (no ref specified): '{}'"
-msgstr "nepodařilo se parsovat srclib spec (není určen ref): „{}“"
+msgstr ""
+
+#: ../fdroidserver/common.py
+msgid "could not parse srclib spec (too many '@' signs): '{}'"
+msgstr ""
 
 #: ../fdroidserver/nightly.py
 #, python-brace-format
 msgid "created {path}"
-msgstr "vytvořeno {path}"
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "current version is newer: old vercode={old}, new vercode={new}"
-msgstr "současná verze je novější: starý vercode={old}, nový vercode={new}"
+msgstr ""
 
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "deleting: repo/{apkfilename}"
-msgstr "mazání: repo/{apkfilename}"
+msgstr ""
 
-#: ../fdroidserver/scanner.py
-msgid "dependency file without lock"
-msgstr "soubor závislostí bez zámku"
+#: ../fdroidserver/common.py
+#, python-brace-format
+msgid "deployed build logs to '{path}'"
+msgstr ""
 
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "deployed process log {path} to {dest}"
-msgstr "protokol procesu {path} nasazen do {dest}"
+msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "dest= is required for options like %r"
-msgstr "dest= je vyžadován pro možnosti jako %r"
-
-#: ../fdroidserver/scanner.py
-msgid "downloading '{}'"
-msgstr "stahování „{}“"
-
-#: ../fdroidserver/scanner.py
-msgid "downloading scanner signatures from '{}' failed"
-msgstr "stahování podpisů skeneru z „{}“ se nezdařilo"
+msgstr ""
 
 #: ../fdroidserver/scanner.py
 msgid "executable binary, possibly code"
-msgstr "spustitelná binárka, případně kód"
+msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "expected %s argument"
 msgid_plural "expected %s arguments"
-msgstr[0] "očekáván %s argument"
-msgstr[1] "očekávány %s argumenty"
-msgstr[2] "očekáváno %s argumentů"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "expected at least one argument"
-msgstr "očekáván alespoň jeden argument"
+msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "expected at most one argument"
-msgstr "očekáván maximálně jeden argument"
+msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "expected one argument"
-msgstr "očekáván jeden argument"
+msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroidserver/common.py
+#, python-brace-format
+msgid "failed deploying build logs to '{path}'"
+msgstr ""
+
+#: ../fdroid
+msgid "fdroid [-h|--help|--version] <command> [<args>]"
+msgstr ""
+
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "fdroid [<command>] [-h|--help|--version|<args>]"
-msgstr "fdroid [<příkaz>] [-h|--help|--version|<argumenty>]"
+msgstr ""
 
-#: ../fdroidserver/scanner.py
-msgid "fetch the latest version of signatures from the web"
-msgstr "stáhnout nejnovější verzi podpisů z webu"
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "floating-point"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+msgid "force errors to be warnings, or ignore"
+msgstr ""
 
 #: ../fdroidserver/metadata.py
 msgid "force metadata errors (default) to be warnings, or to be ignored."
-msgstr "vynutit, aby chyby metadat (výchozí) byly varování nebo byly ignorovány."
+msgstr ""
 
 #: ../fdroidserver/common.py
 msgid "git svn clone failed"
-msgstr "git svn clone selhalo"
+msgstr ""
 
 #: ../fdroidserver/scanner.py
 msgid "gzip file archive"
-msgstr "archiv souborů gzip"
+msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "ignored explicit argument %r"
-msgstr "ignorován explicitní argument %r"
+msgstr ""
 
 #: ../fdroidserver/index.py
 msgid "index-v1 must have a signature, use `fdroid signindex` to create it!"
-msgstr "index-v1 musí mít podpis, použijte `fdroid signindex` pro jeho vytvoření!"
+msgstr ""
 
-#: ../fdroidserver/index.py
-msgid "index-v2 must have a signature, use `fdroid signindex` to create it!"
-msgstr "index-v2 musí mít podpis, použijte `fdroid signindex` pro jeho vytvoření!"
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "integer"
+msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "invalid %(type)s value: %(value)r"
-msgstr "neplatná hodnota %(type)s: %(value)r"
+msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "invalid choice: %(value)r (choose from %(choices)s)"
-msgstr "neplatná volba: %(value)r (vyberte si z %(choices)s)"
+msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "invalid conflict_resolution value: %r"
-msgstr "neplatná hodnota conflict_resolution: %r"
+msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "invalid option string %(option)r: must start with a character %(prefix_chars)r"
-msgstr "neplatný řetězec možnosti %(option)r: musí začínat znakem %(prefix_chars)r"
-
-#: ../fdroidserver/common.py
-msgid "ipfs_cid not found, skipping CIDv1 generation"
-msgstr "ipfs_cid nenalezeno, přeskakování generování CIDv1"
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "latest build recipe is newer: old vercode={old}, new vercode={new}"
-msgstr "poslední recept sestavení je novější: starý vercode={old}, nový vercode={new}"
+msgstr ""
 
 #: ../fdroidserver/deploy.py
 #, python-brace-format
 msgid "local_copy_dir does not end with \"fdroid\", perhaps you meant: \"{path}\""
-msgstr "local_copy_dir nekončí s „fdroid“, možná jste měli na mysli: „{path}“"
+msgstr ""
 
 #: ../fdroidserver/deploy.py
 msgid "local_copy_dir must be an absolute path!"
-msgstr "local_copy_dir musí být absolutní cesta!"
+msgstr ""
 
 #: ../fdroidserver/deploy.py
 msgid "local_copy_dir must be directory, not a file!"
-msgstr "local_copy_dir musí být adresář, ne soubor!"
+msgstr ""
 
 #: ../fdroidserver/index.py
 #, python-format
 msgid "mirror '%s' does not end with 'fdroid'!"
-msgstr "mirror „%s“ nekončí s „fdroid“!"
+msgstr ""
 
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "mirrors set twice, in config.yml and {path}!"
-msgstr "zrcadla nastavena dvakrát, v config.yml a {path}!"
-
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "mutually exclusive arguments must be optional"
-msgstr "společně exkluzivní argumenty musí být volitelné"
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "next {name} cache update due in {time}"
-msgstr "příští aktualizace mezipaměti {name} proběhne za {time}"
+msgstr ""
 
 #: ../fdroidserver/mirror.py
 #, python-brace-format
 msgid "no \"icon\" in {appid}"
-msgstr "žádná „icon“ v {appid}"
+msgstr ""
 
 #: ../fdroidserver/signatures.py
 msgid "no APK supplied"
-msgstr "neposkytnuto APK"
+msgstr ""
 
-#: ../fdroidserver/checkupdates.py
-msgid "no version information found"
-msgstr "nenalezeny informace o verzi"
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, python-format
+msgid "no such option: %s"
+msgstr "žádná taková volba: %s"
 
-#: /usr/lib/python3.11/argparse.py
+#: ../fdroid ../fdroidserver/__main__.py
+msgid "no version info found!"
+msgstr ""
+
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "not allowed with argument %s"
-msgstr "není povoleno s argumentem %s"
+msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "one of the arguments %s is required"
-msgstr "jeden z argumentů %s je vyžadován"
+msgstr ""
 
-#: ../fdroidserver/common.py ../fdroidserver/index.py
+#: ../fdroidserver/index.py ../fdroidserver/common.py
 msgid "only accepts strings, lists, and tuples"
-msgstr "přijímá pouze řetězce, seznamy a tuply"
+msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
-msgid "options"
-msgstr "možnosti"
+#: ../fdroidserver/install.py
+#, python-format
+msgid "option %s: If you really want to install all the signed apps, use --all"
+msgstr ""
+
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, python-format
+msgid "option %s: invalid %s value: %r"
+msgstr ""
+
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, python-format
+msgid "option %s: invalid choice: %r (choose from %s)"
+msgstr ""
+
+#: /usr/lib/python3.5/getopt.py /usr/lib/python3.6/getopt.py
+#: /usr/lib/python3.7/getopt.py
+#, python-format
+msgid "option -%s not recognized"
+msgstr ""
+
+#: /usr/lib/python3.5/getopt.py /usr/lib/python3.6/getopt.py
+#: /usr/lib/python3.7/getopt.py
+#, python-format
+msgid "option -%s requires argument"
+msgstr ""
+
+#: /usr/lib/python3.5/getopt.py /usr/lib/python3.6/getopt.py
+#: /usr/lib/python3.7/getopt.py
+#, python-format
+msgid "option --%s must not have an argument"
+msgstr ""
+
+#: /usr/lib/python3.5/getopt.py /usr/lib/python3.6/getopt.py
+#: /usr/lib/python3.7/getopt.py
+#, python-format
+msgid "option --%s not a unique prefix"
+msgstr ""
+
+#: /usr/lib/python3.5/getopt.py /usr/lib/python3.6/getopt.py
+#: /usr/lib/python3.7/getopt.py
+#, python-format
+msgid "option --%s not recognized"
+msgstr ""
+
+#: /usr/lib/python3.5/getopt.py /usr/lib/python3.6/getopt.py
+#: /usr/lib/python3.7/getopt.py
+#, python-format
+msgid "option --%s requires argument"
+msgstr ""
+
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
+msgid "optional arguments"
+msgstr "volitelné argumenty"
 
 #: ../fdroidserver/nightly.py
 #, python-brace-format
 msgid "overwriting existing {path}"
-msgstr "přepisování existující {path}"
+msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "positional arguments"
 msgstr "poziční argumenty"
 
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "process log deploy {path} to {dest} failed!"
-msgstr "proces nasazení protokolu {path} do {dest} selhal!"
-
-#: ../fdroidserver/build.py
-msgid "reference binary missing signature"
-msgstr "chybějící podpis v referenčním binárním souboru"
+msgstr ""
 
 #: ../fdroidserver/signatures.py
 #, python-brace-format
 msgid "refuse downloading via insecure HTTP connection (use HTTPS or specify --no-https-check): {apkfilename}"
-msgstr "odmítnout stahování přes nezabezpečené spojení HTTP (použijte HTTPS nebo upřesněte --no-https-check): {apkfilename}"
+msgstr ""
+
+#: ../fdroidserver/signatures.py
+#, python-brace-format
+msgid "refuse downloading via insecure http connection (use https or specify --no-https-check): {apkfilename}"
+msgstr ""
 
 #: ../fdroidserver/index.py
 #, python-format
-msgid "repo_icon \"repo/icons/%s\" does not exist, generating placeholder."
-msgstr "repo_icon „repo/icons/%s“ neexistuje, generování placeholderu."
+msgid "repo_icon %s does not exist, generating placeholder."
+msgstr ""
 
-#: ../fdroidserver/common.py
-msgid "repo_url needs to end with /repo"
-msgstr "repo_url musí končit na /repo"
+#: ../fdroidserver/metadata.py
+msgid "ruamel.yaml not installed, can not write metadata."
+msgstr ""
 
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "rsync is missing or broken: {error}"
-msgstr "rsync chybí nebo je rozbitý: {error}"
-
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "s3cmd sync indexes {path} to {url} and delete"
-msgstr "s3cmd sync indexes {path} do {url} a odstranit"
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "s3cmd syncs indexes from {path} to {url} and deletes removed"
-msgstr "s3cmd synchronizuje indexy z {path} do {url} a odstraní smazané"
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "scanner cache is malformed! You can clear it with: '{clear}'"
-msgstr "mezipaměť skeneru je poškozena! Můžete ji vymazat pomocí: „{clear}“"
-
-#: ../fdroidserver/deploy.py
-msgid "serverwebroot: path does not end with \"fdroid\", perhaps you meant one of these:"
-msgstr "serverwebroot: cesta nekončí s „fdroid“, možná jste mysleli jednu z následujících:"
+msgstr ""
 
 #: ../fdroidserver/scanner.py
 msgid "shared library"
-msgstr "sdílená knihovna"
+msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "show program's version number and exit"
+msgstr ""
+
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.5/optparse.py
+#: /usr/lib/python3.6/argparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/argparse.py /usr/lib/python3.7/optparse.py
 msgid "show this help message and exit"
-msgstr "zobrazí tuto nápovědu a ukončí program"
+msgstr "zobrazí tuto nápovědu a skončí"
 
 #: ../fdroidserver/signatures.py
 msgid "signed APK, either a file-path or HTTPS URL."
-msgstr "podepsané APK, buď file-path nebo HTTPS URL."
+msgstr ""
 
 #: ../fdroidserver/common.py
 msgid "skip deploying full build logs: log content is empty"
-msgstr "přeskočit nasazení plných protokolů sestavení: obsah protokolu je prázdný"
+msgstr ""
 
 #: ../fdroidserver/common.py
 msgid "skip deploying full build logs: not enabled in config"
-msgstr "přeskočit nasazení plných protokolů sestavení: není povoleno v configu"
+msgstr ""
 
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "skipping source tarball: {path}"
-msgstr "přeskakování zdrojového tarballu: {path}"
+msgstr ""
 
 #: ../fdroidserver/lint.py
 msgid "srclibs missing name and/or @"
-msgstr "scribls chybí název a/nebo @"
+msgstr ""
 
 #: ../fdroidserver/scanner.py
 msgid "static library"
-msgstr "statická knihovna"
+msgstr ""
 
-#: ../fdroidserver/build.py
+#: ../fdroidserver/common.py
 #, python-brace-format
-msgid "supplied reference binary has allowed signer {signer}"
-msgstr "dodaný referenční binární soubor umožnil podepisujícího {signer}"
+msgid "supplied timestamp value '{timestamp}' is not a unix timestamp"
+msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "the following arguments are required: %s"
-msgstr "jsou vyžadovány následující argumenty: %s"
+msgstr ""
 
-#: ../fdroidserver/install.py
-msgid "true"
-msgstr "pravda"
-
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "unexpected option string: %s"
-msgstr "neočekávaný řetězec možností: %s"
+msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "unknown parser %(parser_name)r (choices: %(choices)s)"
-msgstr "neznámý parser %(parser_name)r (volby: %(choices)s)"
+msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "unrecognized arguments: %s"
 msgstr "nerozpoznané argumenty: %s"
@@ -2510,201 +2528,169 @@ msgstr "nerozpoznané argumenty: %s"
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "unsafe permissions on '{config_file}' (should be 0600)!"
-msgstr "nebezpečné oprávnění u „{config_file}“ (má být 0600)!"
+msgstr ""
 
-#: ../fdroidserver/__main__.py /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py ../fdroid
+#: /usr/lib/python3.7/argparse.py ../fdroidserver/__main__.py
 msgid "usage: "
 msgstr "použití: "
 
-#: ../fdroidserver/deploy.py
+#: ../fdroid
+msgid "usage: fdroid [-h|--help|--version] <command> [<args>]"
+msgstr ""
+
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "using Apache libcloud to sync with {url}"
-msgstr "používám Apache libcloud pro synchronizaci s {url}"
+msgstr ""
 
 #: ../fdroidserver/deploy.py
 msgid "virustotal.com is rate limiting, waiting to retry..."
-msgstr "virustotal.com omezuje rychlost, čekám na opětovný pokus..."
+msgstr ""
 
-#: ../fdroidserver/install.py
-msgid "yes"
-msgstr "ano"
+#: ../fdroidserver/update.py
+msgid "wiki support is deprecated and will be removed in the next release!"
+msgstr ""
 
 #: ../fdroidserver/publish.py
 #, python-brace-format
 msgid "{0} app, {1} key aliases"
 msgid_plural "{0} apps, {1} key aliases"
-msgstr[0] "{0} aplikace, {1} aliasů klíčů"
-msgstr[1] "{0} aplikace, {1} aliasů klíčů"
-msgstr[2] "{0} aplikací, {1} aliasů klíčů"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "{apkfilename} ({appid}) has no metadata!"
-msgstr "{apkfilename} ({appid}) nemá žádná metadata!"
+msgstr ""
+
+#: ../fdroidserver/update.py
+#, python-brace-format
+msgid "{apkfilename} has multiple {name} files, looks like Master Key exploit!"
+msgstr ""
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "{apkfilename}'s AndroidManifest.xml has a bad date: "
-msgstr "AndroidManifest.xml aplikace {apkfilename} má špatné datum: "
+msgstr ""
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "{appid} does not have a name! Using application ID instead."
-msgstr "{appid} nemá název! Používám ID aplikace."
+msgstr ""
+
+#: ../fdroidserver/update.py
+#, python-brace-format
+msgid "{appid} does not have a name! Using package name instead."
+msgstr ""
+
+#: ../fdroidserver/update.py
+#, python-brace-format
+msgid "{appid} from {path} is not a valid Android Package Name!"
+msgstr ""
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "{appid} from {path} is not a valid Android application ID!"
-msgstr "{appid} z {path} není platné ID Android aplikace!"
+msgstr ""
 
 #: ../fdroidserver/metadata.py ../fdroidserver/update.py
 #, python-brace-format
 msgid "{appid} from {path} is not a valid Java Package Name!"
-msgstr "{appid} z {path} není platný název balíčku Java!"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{appid} has both APKs and files: {files}"
-msgstr "{appid} má APK i soubory: {files}"
+msgstr ""
 
 #: ../fdroidserver/mirror.py
 #, python-brace-format
 msgid "{appid} is missing {name}"
-msgstr "{appid} chybí {name}"
+msgstr ""
 
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "{appid}: Unknown extlib {path} in build '{versionName}'"
-msgstr "{appid}: Neznámá extlib {path} v sestavení „{versionName}“"
+msgstr ""
 
 #: ../fdroidserver/scanner.py
 #, python-brace-format
 msgid "{appid}: no builds specified, running on current source state"
-msgstr "{appid}: žádná určená sestavení, běžím na současném stavu zdroje"
+msgstr ""
 
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "{appid}: {field} must be a '{type}', but it is a '{fieldtype}!'"
-msgstr "{appid}: {field} musí být „{type}“, ale je „{fieldtype}!“"
+msgstr ""
 
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "{appid}: {field} must be a '{type}', but it is a '{fieldtype}'!"
-msgstr "{appid}: {field} musí být „{type}“, ale je „{fieldtype}“!"
+msgstr ""
 
 #: ../fdroidserver/metadata.py
 #, python-brace-format
 msgid "{build_flag} must be an integer, found: {value}"
-msgstr "{build_flag} musí být celé číslo, nalezeno: {value}"
+msgstr ""
 
 #: ../fdroidserver/metadata.py
 #, python-brace-format
-msgid "{build_flag} must be list or string, found: {value}"
-msgstr "{build_flag} musí být seznam nebo řetězec, nalezeno: {value}"
+msgid "{field} not terminated in {name}"
+msgstr ""
 
 #: ../fdroidserver/metadata.py
 #, python-brace-format
 msgid "{file} is blank or corrupt!"
-msgstr "{file} je prázdný nebo poškozený!"
+msgstr ""
 
 #: ../fdroidserver/update.py
 #, python-brace-format
-msgid "{name} \"{section}/icons/{path}\" does not exist! Check \"config.yml\"."
-msgstr "{name} „{section}/icons/{path}“ neexistuje! Zkontrolujte „config.yml“."
+msgid "{name} \"{path}\" does not exist! Correct it in config.py."
+msgstr ""
 
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{path1} is a duplicate of {path2}, remove one!"
-msgstr "{path1} je kopií {path2}, jednu odstraňte!"
-
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 #, python-brace-format
 msgid "{path} already exists, ignoring import results!"
-msgstr "{path} již existuje, ignorování importování výsledků!"
+msgstr ""
 
 #: ../fdroidserver/nightly.py
 #, python-brace-format
 msgid "{path} does not exist!  Create it by running:"
-msgstr "{path} neexistuje!  Vytvořte ji spuštěním:"
+msgstr ""
 
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "{path} has bad file signature \"{pattern}\", possible Janus exploit!"
-msgstr "{path} má nesprávný podpis balíčku „{pattern}“, možný exploit Janus!"
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "{path} has been flagged by virustotal {count} times:"
-msgstr "{path} byl označen službou VirusTotal {count}krát:"
-
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "{path} has the wrong fingerprint ({fingerprint})!"
-msgstr "{path} má nesprávný otisk ({fingerprint})!"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "{path} is not \"key: value\" dict, but a {datatype}!"
-msgstr "{path} není „key: value“ dict, ale {datatype}!"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "{path} is not a standard config file!"
-msgstr "{path} není standardní konfigurační soubor!"
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "{path} is not list, but a {datatype}!"
-msgstr "{path} není list, ale {datatype}!"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "{path} is not {expected_type}, but a {datatype}!"
-msgstr "{path} není {expected_type}, ale {datatype}!"
+msgstr ""
 
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "{path} is zero size!"
-msgstr "{path} má nulovou velikost!"
+msgstr ""
 
 #: ../fdroidserver/deploy.py
 #, python-brace-format
 msgid "{path} more than 200MB, manually upload: {url}"
-msgstr "{path} více než 200 MB, ruční nahrání: {url}"
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "{path}: \"{code}\" is not a valid ISO_3166-1 alpha-2 country code!"
-msgstr "{path}: „{code}“ není platný kód země ve formátu ISO_3166-1 alpha-2!"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{path}: {error}"
-msgstr "{path}: {error}"
+msgstr ""
 
 #: ../fdroidserver/mirror.py
 #, python-brace-format
 msgid "{url} does not end with \"fdroid\", check the URL path!"
-msgstr "{url} nekončí s „fdroid“, zkontrolujte cestu URL!"
+msgstr ""
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/common.py
 #, python-brace-format
 msgid "{url} does not start with \"http\"!"
-msgstr "{url} nezačíná s „http“!"
+msgstr ""
 
 #: ../fdroidserver/build.py
 msgid "{} build failed"
 msgid_plural "{} builds failed"
-msgstr[0] "{} sestavení selhalo"
-msgstr[1] "{} sestavení selhala"
-msgstr[2] "{} sestavení selhalo"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
 #: ../fdroidserver/build.py
 msgid "{} build succeeded"
 msgid_plural "{} builds succeeded"
-msgstr[0] "{} sestavení úspěšné"
-msgstr[1] "{} sestavení úspěšná"
-msgstr[2] "{} sestavení úspěšných"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
diff --git a/locale/cy/LC_MESSAGES/fdroidserver.po b/locale/cy/LC_MESSAGES/fdroidserver.po
deleted file mode 100644
index 8451062c..00000000
--- a/locale/cy/LC_MESSAGES/fdroidserver.po
+++ /dev/null
@@ -1,2718 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# This file is put in the public domain.
-# Aled Powell <aled@aledpowell.cymru>, 2021.
-msgid ""
-msgstr ""
-"Project-Id-Version: fdroidserver 2.0a5-27-gf24eae0f\n"
-"Report-Msgid-Bugs-To: https://gitlab.com/fdroid/fdroidserver/issues\n"
-"POT-Creation-Date: 2025-06-25 09:52+0200\n"
-"PO-Revision-Date: 2021-01-16 21:23+0000\n"
-"Last-Translator: Aled Powell <aled@aledpowell.cymru>\n"
-"Language-Team: Welsh <https://hosted.weblate.org/projects/f-droid/fdroidserver/cy/>\n"
-"Language: cy\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=6; plural=(n==0) ? 0 : (n==1) ? 1 : (n==2) ? 2 : (n==3) ? 3 :(n==6) ? 4 : 5;\n"
-"X-Generator: Weblate 4.5-dev\n"
-
-#: ../fdroidserver/nightly.py
-msgid ""
-"\n"
-"SSH public key to be used as deploy key:"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-#, python-brace-format
-msgid ""
-"\n"
-"{path} encoded for the DEBUG_KEYSTORE secret variable:"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-format
-msgid "\"%s/\" has no matching metadata file!"
-msgstr ""
-
-#: ../fdroidserver/index.py
-msgid "\"isPrimary\" key should not be added to mirrors!"
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "\"local_copy_dir\" {path} does not exist!"
-msgstr ""
-
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "\"{apkfilename}\" is already installed on {dev}."
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "\"{path}\" contains recent {name} ({version})"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "\"{path}\" exists but s3cmd is not installed!"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "\"{path}\" is not a supported file format (use: metadata/*.yml)"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "\"{path}\" is signed by a key that is not allowed:"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
-#, python-brace-format
-msgid "\"{url}\" is not a valid URL!"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "%(prog)s: error: %(message)s\n"
-msgstr ""
-
-#: ../fdroidserver/publish.py
-#, python-format
-msgid "%d APKs failed to be signed or verified!"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-format
-msgid "%d problems found"
-msgstr "canfuwyd %d problem"
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "%r is not callable"
-msgstr ""
-
-#: ../fdroidserver/signindex.py
-#, python-format
-msgid "%s did not produce a dict!"
-msgstr ""
-
-#: ../fdroidserver/signindex.py
-#, python-format
-msgid "%s has bad SHA-256: %s"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-format
-msgid "%s is not an accepted build field"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "'keypass' not found in config.yml!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "'keystore' is NONE and 'smartcardoptions' is blank!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "'keystore' not found in config.yml!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "'keystorepass' not found in config.yml!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "'repo_keyalias' not found in config.yml!"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-msgid "'required' is an invalid argument for positionals"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "'sdk_path' not set in config.yml!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "'{aapt}' is too old, fdroid requires build-tools-{version} or newer!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "'{path}' failed to execute!"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "'{path}' has invalid format, it should be a dictionary!"
-msgstr ""
-
-#: ../fdroidserver/lint.py ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "'{value}' is not a valid {field} in {appid}. Regex pattern: {pattern}"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "'{value}' is not a valid {field}, should be {pattern}"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "--merge-request only runs on a single appid!"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "...checkupdate failed for {appid} : {error}"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-msgid ".__call__() not defined"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "/issues is missing"
-msgstr ""
-
-#: ../fdroidserver/mirror.py
-msgid "A URL is required as an argument!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "APK signatures have different certificates in {path}:"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Add PGP signatures using GnuPG for packages in repo"
-msgstr ""
-
-#: ../fdroidserver/update.py
-msgid "Add a repo signing key to an unsigned repo"
-msgstr ""
-
-#: ../fdroidserver/update.py
-msgid "Add skeleton metadata files for APKs that are missing them"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Adding new repo for only {name}"
-msgstr ""
-
-#: ../fdroidserver/init.py
-msgid "Alias of the repo signing key in the keystore"
-msgstr ""
-
-#: ../fdroidserver/build.py
-msgid "AllowedAPKSigningKeys missing but reference binary supplied"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
-msgid "Allows a different revision (or git branch) to be specified for the initial import"
-msgstr ""
-
-#: ../fdroidserver/mirror.py
-msgid "Also mirror the full archive section"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Also warn about formatting issues, like rewritemeta -l"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "Android AAR library"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "Android APK file"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "Android DEX code"
-msgstr ""
-
-#: ../fdroidserver/init.py
-#, python-brace-format
-msgid "Android SDK not found at {path}!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Android SDK path '{path}' does not exist!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Android SDK path '{path}' is not a directory!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Android SDK tool {cmd} not found!"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "App has Binaries but does not have corresponding AllowedAPKSigningKeys to pin certificate."
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "App has NoSourceSince or ArchivePolicy \"0 versions\" or 0 but AutoUpdateMode or UpdateCheckMode are not None"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "App is in '{repo}' but has a link to {url}"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "App version has binary but does not have corresponding AllowedAPKSigningKeys to pin certificate."
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Appending .git is not necessary"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Archiving {apkfilename} with invalid signature!"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "AutoUpdateMode with UpdateCheckMode: HTTP must have a pattern."
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "Automatic no to all prompts."
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "Automatic yes to all prompts."
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "Bad entry type \"{mirrortype}\" in mirrors config: {mirror}"
-msgstr ""
-
-#: ../fdroidserver/mirror.py
-msgid "Base URL to mirror, can include the index signing key using the query string: ?fingerprint="
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Branch '{branch}' used as commit in build '{versionName}'"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Branch '{branch}' used as commit in srclib '{srclib}'"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Broken symlink: {path}"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Build a package from source"
-msgstr "Adeiladu pecyn o'r ffynhonnell"
-
-#: ../fdroidserver/build.py
-msgid "Build all applications available"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Build generated by `fdroid import` - remove disable line once ready"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "Build metadata git repo has uncommited changes!"
-msgstr ""
-
-#: ../fdroidserver/build.py
-msgid "Build only the latest version of each package"
-msgstr ""
-
-#: ../fdroidserver/init.py
-#, python-format
-msgid "Built repo based in \"%s\" with this config:"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "Can't auto-update app with no CurrentVersionCode"
-msgstr ""
-
-#: ../fdroidserver/build.py
-msgid "Can't build due to {} error while scanning"
-msgid_plural "Can't build due to {} errors while scanning"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
-msgstr[4] ""
-msgstr[5] ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Cannot read {path}: {error}"
-msgstr ""
-
-#: ../fdroidserver/rewritemeta.py
-#, python-brace-format
-msgid "Cannot rewrite \"{path}\""
-msgstr ""
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
-#: ../fdroidserver/lint.py
-#, python-format
-msgid "Categories '%s' is not valid"
-msgstr ""
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
-#: ../fdroidserver/lint.py
-msgid "Categories are not set"
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "Category \"{category}\" defined but not used for any apps!"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Check for updates to applications"
-msgstr "Gwirio am ddiweddariadau i apiau"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Checking archiving for {appid} - apks:{integer}, keepversions:{keep}, archapks:{arch}"
-msgstr ""
-
-#: ../fdroidserver/update.py
-msgid "Clean update - don't uses caches, reprocess all APKs"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Color the log output"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
-msgid "Comma separated list of categories."
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-#, python-format
-msgid "Command '%s' not recognised.\n"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "Commit changes"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "Commit changes, push, then make a merge request"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Conflicting \"{field}\" definitions between .yml and localized files:"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Conflicting arguments: '--verbose' and '--quiet' can not be specified at the same time."
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Could not find '{command}' on your system"
-msgstr ""
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/import_subcommand.py
-msgid "Could not find latest version code"
-msgstr ""
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
-#: ../fdroidserver/import_subcommand.py
-msgid "Could not find latest version name"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Could not find {path} to remove it"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Could not open APK {path} for analysis: "
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Could not parse size \"{size}\", wrong type \"{type}\""
-msgstr ""
-
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/import_subcommand.py
-msgid "Couldn't find Application ID"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "Couldn't find any version information"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "Couldn't find package ID"
-msgstr ""
-
-#: ../fdroidserver/update.py
-msgid "Cowardily refusing to overwrite existing signing key setup!"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Created new container \"{name}\""
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Creating \"{path}\" for configuring s3cmd."
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Creating empty {config_file}"
-msgstr ""
-
-#: ../fdroidserver/publish.py
-msgid "Creating log directory"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Creating new S3 bucket: {url}"
-msgstr ""
-
-#: ../fdroidserver/publish.py
-msgid "Creating output directory"
-msgstr ""
-
-#: ../fdroidserver/index.py
-msgid "Creating signed index with this key (SHA256):"
-msgstr ""
-
-#: ../fdroidserver/publish.py ../fdroidserver/verify.py
-msgid "Creating temporary directory"
-msgstr ""
-
-#: ../fdroidserver/index.py
-msgid "Creating unsigned index in preparation for signing"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "CurrentVersionCode {cv} is less than oldest build entry {versionCode}"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-msgid "DEBUG_KEYSTORE is not set or the value is incomplete"
-msgstr ""
-
-#: ../fdroidserver/update.py
-msgid "Delete APKs and/or OBBs without metadata from the repo"
-msgstr "Dileu ffeiliau APK a/neu OBB heb fetaddata o'r ystorfa"
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Deleting archive, repo is too big ({size} max {limit})"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Deleting git-mirror history, repo is too big ({size} max {limit})"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Deleting unknown file: {path}"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-format
-msgid "Description '%s' is just the app's summary"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Description has a duplicate line"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Description of length {length} is over the {limit} char limit"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Did you mean config/{name}.yml?"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Did you mean {code}?"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
-msgid "Do not add 'disable:' to the generated build entries"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-msgid "Do not deploy the new files to the repo"
-msgstr ""
-
-#: ../fdroidserver/mirror.py
-#, python-brace-format
-msgid "Do not include \"{path}\" in URL!"
-msgstr ""
-
-#: ../fdroidserver/init.py
-msgid "Do not prompt for Android SDK path, just fail"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-msgid "Do not remove the private keys generated from the keystore"
-msgstr ""
-
-#: ../fdroidserver/build.py
-msgid "Don't create a source tarball, useful when testing a build"
-msgstr ""
-
-#: ../fdroidserver/build.py
-msgid "Don't refresh the repository, useful when testing a build with no internet connection"
-msgstr ""
-
-#: ../fdroidserver/deploy.py ../fdroidserver/nightly.py
-msgid "Don't use rsync checksums"
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "Download F-Droid.apk using mirrors that leak less to the network"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Download complete mirrors of small repos"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Downloading the repository already failed once, not trying again."
-msgstr ""
-
-#: ../fdroidserver/verify.py
-#, python-brace-format
-msgid "Downloading {url} failed. {error}"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Duplicate Anti-Feature declaration at {path} was ignored!"
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-format
-msgid "Duplicate entry \"%s\" in mirrors config!"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Duplicate link in '{field}': {url}"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-format
-msgid "ERROR: %(message)s"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "ERROR: The \"server\" subcommand has been removed, use \"deploy\"!"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-msgid "ERROR: unsupported CI type, patches welcome!"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-#, python-format
-msgid "ERROR: unsupported git host \"%s\", patches welcome!"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "ERROR: {key} in {path} is not \"archive\" or \"repo\"!"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "ERROR: {key} not a valid key!"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "ERROR: {key}'s value should be of type {t}!"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "ERROR: {key}:{subkey} in {path} is not in allowed keys: {allowed_keys}!"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-#, python-brace-format
-msgid "Encoding is set to '{enc}' fdroid might run into encoding issues. Please set it to 'UTF-8' for best results."
-msgstr ""
-
-#: ../fdroidserver/init.py
-#, python-format
-msgid ""
-"Enter the path to the Android SDK (%s) here:\n"
-"> "
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Environment variable {var} from {configname} is not set!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Environment variable {{env: {var}}} is not set!"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "Error deploying 'github_releases', {} not present. (You might need to run `fdroid update` first.)"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
-msgid "Error while getting repo address"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "Exit with a non-zero code if problems were found"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Extract application metadata from a source repository"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Extract signatures from APKs"
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "F-Droid.apk could not be downloaded from any known source!"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Failed copying {path}: {error}"
-msgstr ""
-
-#: ../fdroidserver/signatures.py
-#, python-brace-format
-msgid "Failed fetching signatures for '{apkfilename}': {error}"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Failed reading {path}: {error}"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Failed resizing {path}: {error}"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Failed to create S3 bucket: {url}"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Failed to get APK information, deleting {path}"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Failed to get APK information, skipping {path}"
-msgstr ""
-
-#: ../fdroidserver/update.py
-msgid "Failed to get APK signing key fingerprint"
-msgstr ""
-
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "Failed to install '{apkfilename}' on {dev}: {error}"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Failed to sign application"
-msgstr ""
-
-#: ../fdroidserver/build.py
-#, python-brace-format
-msgid "Fetched buildserverid from VM: {buildserverid}"
-msgstr ""
-
-#: ../fdroidserver/signatures.py
-#, python-brace-format
-msgid "Fetched signatures for '{apkfilename}' -> '{sigdir}'"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "File disappeared while processing it: {path}"
-msgstr ""
-
-#: ../fdroidserver/build.py ../fdroidserver/install.py
-#: ../fdroidserver/rewritemeta.py ../fdroidserver/scanner.py
-#: ../fdroidserver/update.py
-msgid "Finished"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Forbidden HTML tags"
-msgstr ""
-
-#: ../fdroidserver/build.py
-msgid "Force build of disabled apps, and carries on regardless of scan problems. Only allowed in test mode."
-msgstr ""
-
-#: ../fdroidserver/build.py
-#, python-brace-format
-msgid "Force halting build after {0} sec timeout!"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "Force scan of disabled apps and builds."
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Found \"{path}\" graphic without metadata for app \"{name}\"!"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Found bad funding file \"{path}\" for \"{name}\":"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Found invalid appids in arguments"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Found invalid versionCodes for some apps"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Found multiple JAR Signature Block Files in {path}"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Found multiple Signer Certificates!"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Found multiple metadata files for {appid}"
-msgstr ""
-
-#: ../fdroidserver/index.py
-msgid "Found multiple signing certificates for repository."
-msgstr ""
-
-#: ../fdroidserver/index.py
-msgid "Found no signing certificates for repository."
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-format
-msgid "Found non-file at %s"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Found {apkfilename} at {url}"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Found {count} problems in {filename}"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Found {count} warnings in {filename}"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Generated skeleton metadata for {appid}"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-format
-msgid "Git checkout of '%s' failed"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Git clean failed"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Git fetch failed"
-msgstr ""
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/common.py
-#, python-format
-msgid "Git remote set-head failed: \"%s\""
-msgstr ""
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/common.py
-msgid "Git reset failed"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Git submodule deinit failed"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Git submodule sync failed"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Git submodule update failed"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "HTTPS must be used with Subversion URLs!"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "If a git mirror gets to big, allow the archive to be deleted"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "If this upload fails, try manually uploading to {url}"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Ignoring '{field}' in '{metapath}' metadata because it is deprecated."
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-format
-msgid "Ignoring FUNDING.yml entry longer than 2048: %s"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-format
-msgid "Ignoring bad element in manifest: %s"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Ignoring deprecated {oldfile}, use {newfile}!"
-msgstr ""
-
-#: ../fdroidserver/index.py
-msgid "Ignoring package without metadata: "
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Ignoring stale cache data for {apkfilename}"
-msgstr ""
-
-#: ../fdroidserver/update.py
-msgid "Include APKs that are signed with disabled algorithms like MD5"
-msgstr ""
-
-#: ../fdroidserver/mirror.py
-msgid "Include the PGP signature .asc files in the mirror"
-msgstr ""
-
-#: ../fdroidserver/mirror.py
-msgid "Include the build logs in the mirror"
-msgstr ""
-
-#: ../fdroidserver/mirror.py
-msgid "Include the source tarballs in the mirror"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-format
-msgid "Including metadata from %s@%s"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Including metadata from {path}"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Initialising submodules"
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "Install all signed applications available"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Install built packages on devices"
-msgstr "Gosod ar ddyfeisiau'r pecynnau a adeiladir"
-
-#: ../fdroidserver/install.py
-#, python-format
-msgid "Installing %s..."
-msgstr ""
-
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "Installing '{apkfilename}' on {dev}..."
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Interact with the repo HTTP server"
-msgstr "Rhyngweithio â gweinydd HTTP yr ystorfa"
-
-#: ../fdroidserver/update.py
-msgid "Invalid APK"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "Invalid AutoUpdateMode: {mode}"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "Invalid UpdateCheckMode: {mode}"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "Invalid VercodeOperation: {field}"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Invalid VercodeOperation: {invalid_ops}"
-msgstr ""
-
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Invalid application ID {appid}"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Invalid bulleted list"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-format
-msgid "Invalid name for published file: %s"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Invalid ndk: entry in build: \"{ndk}\""
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Invalid redirect to non-HTTPS: {before} -> {after} "
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Invalid scrlib metadata: '{file}' does not exist"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Invalid srclib metadata: could not parse '{file}'"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Invalid srclib metadata: unknown key '{key}' in '{file}'"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "JAR signature failed to verify: {path}"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "JAR signature verified: {path}"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "Java JAR file"
-msgstr ""
-
-#: ../fdroidserver/mirror.py ../fdroidserver/publish.py
-#: ../fdroidserver/update.py
-msgid "Java JDK not found! Install in standard location or set java_paths!"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "Java compiled class"
-msgstr ""
-
-#: ../fdroidserver/signindex.py
-msgid "Java jarsigner not found! Install in standard location or set java_paths!"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Javascript in HTML src attributes"
-msgstr ""
-
-#: ../fdroidserver/build.py
-#, python-brace-format
-msgid "Keeping failed build \"{apkfilename}\""
-msgstr ""
-
-#: ../fdroidserver/init.py
-msgid "Keystore for signing key:\t"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Known debug key is used in AllowedAPKSigningKeys: "
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Last used commit '{commit}' looks like a tag, but UpdateCheckMode is '{ucm}'"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Liberapay donation methods belong in the Liberapay: field"
-msgstr ""
-
-#: ../fdroidserver/rewritemeta.py
-msgid "List files that would be reformatted (dry run)"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Locale included in f-droid.org URL"
-msgstr ""
-
-#: ../fdroidserver/build.py
-msgid "Make the build stop on exceptions"
-msgstr ""
-
-#: ../fdroidserver/index.py
-msgid "Malformed repository mirrors."
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "Malformed serverwebroot line:"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-format
-msgid "Max recursion depth in ZIP file reached: %s"
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "Mirror config for {url} contains \"isPrimary\" key!"
-msgstr ""
-
-#: ../fdroidserver/mirror.py
-msgid "Mirror the full repo and archive, all file types."
-msgstr ""
-
-#: ../fdroidserver/gpgsign.py
-msgid "Missing output directory"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-msgid "Moving Anti-Features declarations to localized files:"
-msgstr ""
-
-#: ../fdroidserver/index.py
-msgid "Neither \"repo_pubkey\" nor \"keystorepass\" set in config.yml"
-msgstr ""
-
-#: ../fdroidserver/verify.py
-#, python-format
-msgid "No APK for package: %s"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "No Android SDK found!"
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "No attached devices found"
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "No devices found for `adb install`! Please plug one in."
-msgstr ""
-
-#: ../fdroidserver/index.py
-msgid "No fingerprint in URL."
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "No git submodules available"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
-msgid "No gradle project could be found. Specify --subdir?"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
-msgid "No information found."
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "No matching tags found"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "No minimum SDK version found in {0}, using default (3)."
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "No need to specify that the app is Free Software"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "No need to specify that the app is for Android"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "No option set! Edit your config.yml to set at least one of these:"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "No packages specified"
-msgstr ""
-
-#: ../fdroidserver/install.py
-#, python-format
-msgid "No signed APK available for %s"
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "No signed output directory - nothing to do"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "No signing certificates found in {path}"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-format
-msgid "No such package: %s"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "No such versionCode {versionCode} for app {appid}"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "No tags found"
-msgstr ""
-
-#: ../fdroidserver/publish.py ../fdroidserver/verify.py
-msgid "No unsigned directory - nothing to do"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "No version information could be found."
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Not a valid size definition: \"{}\""
-msgstr ""
-
-#: ../fdroidserver/signindex.py
-msgid "Nothing to do"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "Nothing to do for {appid}."
-msgstr ""
-
-#: ../fdroidserver/init.py
-msgid "Now set these in config.yml:"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "OBB file has newer versionCode({integer}) than any APK:"
-msgstr ""
-
-#: ../fdroidserver/update.py
-msgid "OBB filename must start with \"main.\" or \"patch.\":"
-msgstr ""
-
-#: ../fdroidserver/update.py
-msgid "OBB's packagename does not match a supported APK:"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "Offline machine, skipping git mirror generation until `fdroid deploy`"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "One of the 'github_releases' config items is missing the 'packageNames' value. skipping ..."
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "One of the 'github_releases' config items is missing the 'projectUrl' value. skipping ..."
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "One of the 'github_releases' config items is missing the 'token' value. skipping ..."
-msgstr ""
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Only PNG and JPEG are supported for graphics, found: {path}"
-msgstr ""
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/common.py
-msgid "Only accepts a single key \"env\""
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "Only process apps with auto-updates"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "OpenCollective donation methods belong in the OpenCollective: field"
-msgstr ""
-
-#: ../fdroidserver/verify.py
-msgid "Output JSON report to file named after APK."
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "Output JSON to stdout."
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py ../fdroidserver/gpgsign.py
-#: ../fdroidserver/publish.py ../fdroidserver/signindex.py
-#: ../fdroidserver/update.py
-msgid "Outputting JSON"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
-msgid "Overall license of the project."
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "Overriding blank versionName in {apkfilename} from metadata: {version}"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
-#, python-brace-format
-msgid "Package \"{appid}\" already exists"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Parsing manifest at '{path}'"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Password required with username"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
-msgid "Path to main Android project subdirectory, if not in root."
-msgstr ""
-
-#: ../fdroidserver/init.py
-msgid "Path to the Android SDK (sometimes set in ANDROID_HOME)"
-msgstr ""
-
-#: ../fdroidserver/btlog.py
-msgid "Path to the git repo to use as the log"
-msgstr ""
-
-#: ../fdroidserver/init.py
-msgid "Path to the keystore for the repo signing key"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-msgid "Print the secret variable to the terminal for easy copy/paste"
-msgstr ""
-
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "Privacy mode was enabled based on your locale ({country_code})."
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-format
-msgid "Problem with ZIP file: %s, error %s"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Problem with xml at '{path}'"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "Process auto-updates"
-msgstr ""
-
-#: ../fdroidserver/publish.py ../fdroidserver/update.py
-#, python-brace-format
-msgid "Processing {apkfilename}"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Processing {appid}"
-msgstr ""
-
-#: ../fdroidserver/update.py
-msgid "Produce human-readable XML/JSON for index files"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
-msgid "Project URL to import from."
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Punctuation should be avoided"
-msgstr ""
-
-#: ../fdroidserver/btlog.py
-msgid "Push the log to this git remote repository"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Pushing binary transparency log to {url}"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "Pushing to remote server failed!"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Pushing to {url}"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Quickly start a new repository"
-msgstr "Dechrau ystorfa newydd yn gyflym"
-
-#: ../fdroidserver/__main__.py
-msgid "Read all the metadata files and exit"
-msgstr "Darllen yr holl ffeiliau metaddata a gadael"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Reading '{config_file}'"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Reading packageName/versionCode/versionName failed, APK invalid: '{apkfilename}'"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Reading packageName/versionCode/versionName failed,APK invalid: '{apkfilename}'"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Reading {apkfilename} from cache"
-msgstr ""
-
-#: ../fdroidserver/build.py
-msgid "Refresh and cache scanner rules and signatures from the network"
-msgstr ""
-
-#: ../fdroidserver/publish.py
-#, python-brace-format
-msgid "Refusing to sign '{path}', file exists in both {dir1} and {dir2} folder."
-msgstr ""
-
-#: ../fdroidserver/verify.py
-msgid "Remove source tarball and any APKs if successfully verified."
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Removing specified files"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Removing {path}\""
-msgstr ""
-
-#: ../fdroidserver/update.py
-msgid "Rename APK files that do not match package.name_123.apk"
-msgstr "Ailenwi ffeiliau APK na sy'n dilyn y ffurf package.name_123.apk"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "RepoType {type} is deprecated, please switch to git."
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-#, python-brace-format
-msgid "Resigning {apkfilename} with provided debug.keystore"
-msgstr ""
-
-#: ../fdroidserver/update.py
-msgid "Resize all the icons exceeding the max pixel size and exit"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Restrict output to warnings and errors"
-msgstr ""
-
-#: ../fdroidserver/net.py
-#, python-format
-msgid "Retrying failed download: %s"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Rewrite all the metadata files"
-msgstr "Ailysgrifennu'r holl ffeiliau metaddata"
-
-#: ../fdroidserver/rewritemeta.py
-#, python-brace-format
-msgid "Rewriting '{appid}'"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "Run on git repo that has uncommitted changes"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-#, python-brace-format
-msgid "Run over {cibase} to find -debug.apk. and skip repo_basedir {repo_basedir}"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Run rewritemeta to fix formatting"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "Running first pass with MD5 checking disabled"
-msgstr ""
-
-#: ../fdroidserver/mirror.py
-#, python-brace-format
-msgid "Running wget in {path}"
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "SHA-256 of {url} does not match entry!"
-msgstr ""
-
-#: ../fdroidserver/build.py
-msgid "Scan the resulting APK(s) for known non-free classes."
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Scan the source code of a package"
-msgstr "Sganio cod ffynhonnell pecyn"
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Scanner found {count} problems in {apk}"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Scanner found {count} problems in {appid}:"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Scanner found {count} problems in {appid}:{versionCode}:"
-msgstr ""
-
-#: ../fdroidserver/build.py
-msgid "Scanner found {} problem"
-msgid_plural "Scanner found {} problems"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
-msgstr[4] ""
-msgstr[5] ""
-
-#: ../fdroidserver/scanner.py
-msgid "Scanning APK for extra signing blocks."
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "Scanning APK with dexdump for known non-free classes."
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Set NDK {release} ({version}) up"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Set clock to that time using:"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-msgid "Set maximum releases in repo before older ones are archived"
-msgstr ""
-
-#: ../fdroidserver/build.py
-#, python-brace-format
-msgid "Set open file limit to {integer}"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Set up an app build for a nightly build repo"
-msgstr ""
-
-#: ../fdroidserver/build.py
-msgid "Setting open file limit failed: "
-msgstr ""
-
-#: ../fdroidserver/build.py
-#, python-brace-format
-msgid "Setting {0} sec timeout for this build"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Sign and place packages in the repo"
-msgstr "Llofnodi a gosod pecynnau yn yr ystorfa"
-
-#: ../fdroidserver/__main__.py
-msgid "Sign indexes created using update --nosign"
-msgstr "Llofnodi mynegai gan ddefnyddio update --nosign"
-
-#: ../fdroidserver/build.py
-msgid "Skip scanning the source code for binaries and other problems"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Skipping '{apkfilename}' with invalid signature!"
-msgstr ""
-
-#: ../fdroidserver/deploy.py ../fdroidserver/index.py
-#, python-format
-msgid "Skipping GitLab Pages mirror because the repo is too large (>%.2fGB)!"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Skipping index generation for {appid}"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Skipping {apkfilename} with invalid signature!"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Skipping {appid}: disabled"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "Specify a local folder to sync the repo to"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "Specify an identity file to provide to SSH for rsyncing"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-msgid "Specify which debug keystore file to use."
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Spew out even more information than normal"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-#, python-brace-format
-msgid "Stripping mystery signature from {apkfilename}"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-format
-msgid "Summary '%s' is just the app's name"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Summary of length {length} is over the {limit} char limit"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "System clock is older than date in {path}!"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "Tags update mode only works for git, hg, bzr and git-svn repositories currently"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "Tags update mode used in git-svn, but the repo was not set up with tags"
-msgstr ""
-
-#: ../fdroidserver/build.py
-msgid "Test mode - put output in the tmp directory only, and always build, even if the output already exists."
-msgstr ""
-
-#: ../fdroidserver/index.py
-msgid "The \"qrcode\" Python package is not installed (e.g. apt-get install python3-qrcode)!"
-msgstr ""
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "The OBB version code must come after \"{name}.\":"
-msgstr ""
-
-#: ../fdroidserver/btlog.py
-msgid "The base URL for the repo to log (default: https://f-droid.org)"
-msgstr ""
-
-#: ../fdroidserver/mirror.py
-msgid "The directory to write the mirror to"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-msgid "The file to be included in the repo (path or glob)"
-msgstr ""
-
-#: ../fdroidserver/index.py
-msgid "The repository's fingerprint does not match."
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "The root dir for local_copy_dir \"{path}\" does not exist!"
-msgstr ""
-
-#: ../fdroidserver/publish.py
-msgid "There is a keyalias collision - publishing halted"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "These are the apps that have been archived from the main repo."
-msgstr ""
-
-#: ../fdroidserver/mirror.py
-msgid "This command should never be used to mirror f-droid.org! A full copy requires more than 600GB."
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, fuzzy
-msgid "This is a repository of apps to be used with F-Droid. Applications in this repository are either official binaries built by the original application developers, or are binaries built from source by the admin of f-droid.org using the tools on https://gitlab.com/fdroid."
-msgstr ""
-"\n"
-"        Mae hon yn ystorfa o apiau i'w defnyddio gydag F-Droid. Mae apiau yn\n"
-"        yr ystorfa hon naill ai wedi eu hadeiladu gan ddatblygwyr yr ap\n"
-"        gwreiddiol, neu wedi eu hadeiladu o'u ffynonellau gan f-droid.org\n"
-"        wrth ddefnyddio'r offer ar https://gitlab.com/F-Droid.\n"
-"        "
-
-#: ../fdroidserver/import_subcommand.py
-#, python-format
-msgid "This repo already has local metadata: %s"
-msgstr ""
-
-#: ../fdroidserver/init.py
-#, python-format
-msgid ""
-"To complete the setup, add your APKs to \"%s\"\n"
-"then run \"fdroid update -c; fdroid update\".  You might also want to edit\n"
-"\"config.yml\" to set the URL, repo name, and more.  You should also set up\n"
-"a signing key (a temporary one might have been automatically generated).\n"
-"\n"
-"For more info: https://f-droid.org/docs/Setup_an_F-Droid_App_Repo\n"
-"and https://f-droid.org/docs/Signing_Process"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "To use awsbucket, awssecretkey and awsaccesskeyid must also be set in config.yml!"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "To use rclone, rclone_config and awsbucket must be set in config.yml!"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "URL must start with https:// or http://"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "URL shorteners should not be used"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "URL {url} in Description: {error}"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Unexpected license tag \"{}\"! Only use FSF or OSI approved tags from https://spdx.org/license-list"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Unexpected license tag \"{}\"! Only use license tags configured in your config file"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Unknown entry {key} in {configname}"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Unknown exception found!"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Unknown file '{filename}' in build '{versionName}'"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-format
-msgid "Unknown metadata format: %s"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Unknown metadata format: {path} (use: *.yml)"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Unknown version of aapt, might cause problems: "
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Unnecessary leading space"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Unnecessary trailing space"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Unrecognised app field '{fieldname}' in '{path}'"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Unrecognised build flag '{build_flag}' in '{path}'"
-msgstr ""
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Unsupported file type \"{extension}\" for repo graphic"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Unsupported graphics file found: {path}"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-format
-msgid "Unused extlib at %s"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-format
-msgid "Unused file at %s"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-format
-msgid "Unused scandelete path: %s"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-format
-msgid "Unused scanignore path: %s"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Update repo information for new packages"
-msgstr "Diweddaru gwybodaeth ystorfa am becynnau newydd"
-
-#: ../fdroidserver/__main__.py
-msgid "Update the binary transparency log for a URL"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "UpdateCheckData has invalid URL: {url}"
-msgstr ""
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "UpdateCheckData must match the version code as integer (\\d or [0-9]): {codeex}"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "UpdateCheckData must use HTTPS URL: {url}"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "UpdateCheckData not a valid URL: {url}"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "UpdateCheckMode is set but it looks like checkupdates hasn't been run yet."
-msgstr ""
-
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/lint.py
-msgid "UpdateCheckName is set to the known application ID, it can be removed"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Uploading {apkfilename} to androidobservatory.org"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Uploading {apkfilename} to virustotal"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Use /HEAD instead of /master or /main to point at a file in the default branch"
-msgstr ""
-
-#: ../fdroidserver/update.py
-msgid "Use `fdroid update -c` to create it."
-msgstr ""
-
-#: ../fdroidserver/build.py
-msgid "Use build server"
-msgstr ""
-
-#: ../fdroidserver/update.py
-msgid "Use date from APK instead of current time for newly added APKs"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Using \"{path}\" for configuring s3cmd."
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Using \"{path}\" for syncing with remote storage."
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Using APK Signature v2"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Using APK Signature v3"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Using JAR Signature"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Using Java's jarsigner, not recommended for verifying APKs! Use apksigner"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Using blank dictionary instead of contents of {path}!"
-msgstr ""
-
-#: ../fdroidserver/init.py
-#, python-brace-format
-msgid "Using existing keystore \"{path}\""
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Using rclone to sync with: {url}"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Using s3cmd to sync with: {url}"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Valid commands are:"
-msgstr "Gorchmynion dilys yw:"
-
-#: ../fdroidserver/verify.py
-msgid "Verify against locally cached copy rather than redownloading."
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Verify the integrity of downloaded packages"
-msgstr "Gwirio dilysrwydd pecynnau a lawrlwythir"
-
-#: ../fdroidserver/index.py
-msgid "Verifying index signature:"
-msgstr ""
-
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "Verifying package {path} with apksigner."
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "VirusTotal API key cannot upload files larger than 32MB, use {url} to upload {path}."
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-msgid "WARNING: only public git repos are supported!"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Warn about possible metadata errors"
-msgstr "Rhybuddio am wallau metaddata posib"
-
-#: ../fdroidserver/scanner.py
-msgid "WebAssembly binary file"
-msgstr ""
-
-#: ../fdroidserver/update.py
-msgid "When configured for signed indexes, create only unsigned indexes at this stage"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "When linting the entire repository yamllint is disabled by default. This option forces yamllint regardless."
-msgstr ""
-
-#: ../fdroidserver/publish.py
-msgid "When signing or verifying fails, exit with an error code."
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "Would you like to download and install F-Droid.apk via adb? (YES/no)"
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "Would you like to download the app(s) from f-droid.org? (YES/no)"
-msgstr ""
-
-#: ../fdroidserver/init.py
-msgid "X.509 'Distinguished Name' used when generating keys"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "You can use ANDROID_HOME to set the path to your SDK, i.e.:"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "ZIP file archive"
-msgstr ""
-
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "adb reports {serial} is \"{status}\"!"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-#, python-brace-format
-msgid "adding IdentityFile to {path}"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "adding to {name}: {path}"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "ambiguous option: %(option)s could match %(matches)s"
-msgstr "dewis amwys: gall %(option)s gydweddu â %(matches)s"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "apksigner in build-tools;{version} passes APKs with invalid v3 signatures, ignoring."
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "apksigner not found! Cannot sign or verify modern APKs"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "apksigner not found, it's required for signing!"
-msgstr ""
-
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/checkupdates.py ../fdroidserver/lint.py
-#: ../fdroidserver/rewritemeta.py
-msgid "application ID of file to operate on"
-msgstr ""
-
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/build.py ../fdroidserver/install.py
-#: ../fdroidserver/publish.py ../fdroidserver/scanner.py
-#: ../fdroidserver/verify.py
-msgid "application ID with optional versionCode in the form APPID[:VERCODE]"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "archive_url needs to end with /archive"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "argument \"-\" with mode %r"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "argument %(argument_name)s: %(message)s"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-msgid "attempting bare SSH connection to test deploy key:"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "can not parse scrlib spec (not a string): '{}'"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "can't open '%(filename)s': %(error)s"
-msgstr "methu agor '%(filename)s': %(error)s"
-
-#: ../fdroidserver/scanner.py
-msgid "can't open non-https url: '{};"
-msgstr ""
-
-#: ../fdroidserver/build.py
-#, python-brace-format
-msgid "cannot find required srclibs: \"{path}\""
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-msgid "cannot have multiple subparser arguments"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "cannot merge actions - two groups are named %r"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-msgid "cannot publish update, did you set the deploy key?"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-#, python-brace-format
-msgid "cloning {url}"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "commands from plugin modules:"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "conflicting option string: %s"
-msgid_plural "conflicting option strings: %s"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
-msgstr[4] ""
-msgstr[5] ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "conflicting subparser alias: %s"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "conflicting subparser: %s"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "could not parse '{path}'"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "could not parse srclib spec (no name specified): '{}'"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "could not parse srclib spec (no ref specified): '{}'"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-#, python-brace-format
-msgid "created {path}"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "current version is newer: old vercode={old}, new vercode={new}"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "deleting: repo/{apkfilename}"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "dependency file without lock"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "deployed process log {path} to {dest}"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "dest= is required for options like %r"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "downloading '{}'"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "downloading scanner signatures from '{}' failed"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "executable binary, possibly code"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "expected %s argument"
-msgid_plural "expected %s arguments"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
-msgstr[4] ""
-msgstr[5] ""
-
-#: /usr/lib/python3.11/argparse.py
-msgid "expected at least one argument"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-msgid "expected at most one argument"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-msgid "expected one argument"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "fdroid [<command>] [-h|--help|--version|<args>]"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "fetch the latest version of signatures from the web"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-msgid "force metadata errors (default) to be warnings, or to be ignored."
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "git svn clone failed"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "gzip file archive"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "ignored explicit argument %r"
-msgstr ""
-
-#: ../fdroidserver/index.py
-msgid "index-v1 must have a signature, use `fdroid signindex` to create it!"
-msgstr ""
-
-#: ../fdroidserver/index.py
-msgid "index-v2 must have a signature, use `fdroid signindex` to create it!"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "invalid %(type)s value: %(value)r"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "invalid choice: %(value)r (choose from %(choices)s)"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "invalid conflict_resolution value: %r"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "invalid option string %(option)r: must start with a character %(prefix_chars)r"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "ipfs_cid not found, skipping CIDv1 generation"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "latest build recipe is newer: old vercode={old}, new vercode={new}"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "local_copy_dir does not end with \"fdroid\", perhaps you meant: \"{path}\""
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "local_copy_dir must be an absolute path!"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "local_copy_dir must be directory, not a file!"
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-format
-msgid "mirror '%s' does not end with 'fdroid'!"
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "mirrors set twice, in config.yml and {path}!"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-msgid "mutually exclusive arguments must be optional"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "next {name} cache update due in {time}"
-msgstr ""
-
-#: ../fdroidserver/mirror.py
-#, python-brace-format
-msgid "no \"icon\" in {appid}"
-msgstr ""
-
-#: ../fdroidserver/signatures.py
-msgid "no APK supplied"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "no version information found"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "not allowed with argument %s"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "one of the arguments %s is required"
-msgstr ""
-
-#: ../fdroidserver/common.py ../fdroidserver/index.py
-msgid "only accepts strings, lists, and tuples"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, fuzzy
-msgid "options"
-msgstr "Dewisiadau"
-
-#: ../fdroidserver/nightly.py
-#, python-brace-format
-msgid "overwriting existing {path}"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-msgid "positional arguments"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "process log deploy {path} to {dest} failed!"
-msgstr ""
-
-#: ../fdroidserver/build.py
-msgid "reference binary missing signature"
-msgstr ""
-
-#: ../fdroidserver/signatures.py
-#, python-brace-format
-msgid "refuse downloading via insecure HTTP connection (use HTTPS or specify --no-https-check): {apkfilename}"
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-format
-msgid "repo_icon \"repo/icons/%s\" does not exist, generating placeholder."
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "repo_url needs to end with /repo"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "rsync is missing or broken: {error}"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "s3cmd sync indexes {path} to {url} and delete"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "s3cmd syncs indexes from {path} to {url} and deletes removed"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "scanner cache is malformed! You can clear it with: '{clear}'"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "serverwebroot: path does not end with \"fdroid\", perhaps you meant one of these:"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "shared library"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-msgid "show this help message and exit"
-msgstr "dangos y neges cymorth hon a gadael"
-
-#: ../fdroidserver/signatures.py
-msgid "signed APK, either a file-path or HTTPS URL."
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "skip deploying full build logs: log content is empty"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "skip deploying full build logs: not enabled in config"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "skipping source tarball: {path}"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "srclibs missing name and/or @"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "static library"
-msgstr ""
-
-#: ../fdroidserver/build.py
-#, python-brace-format
-msgid "supplied reference binary has allowed signer {signer}"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "the following arguments are required: %s"
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "true"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "unexpected option string: %s"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "unknown parser %(parser_name)r (choices: %(choices)s)"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "unrecognized arguments: %s"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "unsafe permissions on '{config_file}' (should be 0600)!"
-msgstr ""
-
-#: ../fdroidserver/__main__.py /usr/lib/python3.11/argparse.py
-msgid "usage: "
-msgstr "defnydd: "
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "using Apache libcloud to sync with {url}"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "virustotal.com is rate limiting, waiting to retry..."
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "yes"
-msgstr ""
-
-#: ../fdroidserver/publish.py
-#, python-brace-format
-msgid "{0} app, {1} key aliases"
-msgid_plural "{0} apps, {1} key aliases"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
-msgstr[4] ""
-msgstr[5] ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{apkfilename} ({appid}) has no metadata!"
-msgstr ""
-
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{apkfilename}'s AndroidManifest.xml has a bad date: "
-msgstr ""
-
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{appid} does not have a name! Using application ID instead."
-msgstr ""
-
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{appid} from {path} is not a valid Android application ID!"
-msgstr ""
-
-#: ../fdroidserver/metadata.py ../fdroidserver/update.py
-#, python-brace-format
-msgid "{appid} from {path} is not a valid Java Package Name!"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{appid} has both APKs and files: {files}"
-msgstr ""
-
-#: ../fdroidserver/mirror.py
-#, python-brace-format
-msgid "{appid} is missing {name}"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "{appid}: Unknown extlib {path} in build '{versionName}'"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "{appid}: no builds specified, running on current source state"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "{appid}: {field} must be a '{type}', but it is a '{fieldtype}!'"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "{appid}: {field} must be a '{type}', but it is a '{fieldtype}'!"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "{build_flag} must be an integer, found: {value}"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "{build_flag} must be list or string, found: {value}"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "{file} is blank or corrupt!"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{name} \"{section}/icons/{path}\" does not exist! Check \"config.yml\"."
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{path1} is a duplicate of {path2}, remove one!"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
-#, python-brace-format
-msgid "{path} already exists, ignoring import results!"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-#, python-brace-format
-msgid "{path} does not exist!  Create it by running:"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{path} has bad file signature \"{pattern}\", possible Janus exploit!"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "{path} has been flagged by virustotal {count} times:"
-msgstr ""
-
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "{path} has the wrong fingerprint ({fingerprint})!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "{path} is not \"key: value\" dict, but a {datatype}!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "{path} is not a standard config file!"
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "{path} is not list, but a {datatype}!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "{path} is not {expected_type}, but a {datatype}!"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{path} is zero size!"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "{path} more than 200MB, manually upload: {url}"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "{path}: \"{code}\" is not a valid ISO_3166-1 alpha-2 country code!"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{path}: {error}"
-msgstr ""
-
-#: ../fdroidserver/mirror.py
-#, python-brace-format
-msgid "{url} does not end with \"fdroid\", check the URL path!"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
-#, python-brace-format
-msgid "{url} does not start with \"http\"!"
-msgstr ""
-
-#: ../fdroidserver/build.py
-msgid "{} build failed"
-msgid_plural "{} builds failed"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
-msgstr[4] ""
-msgstr[5] ""
-
-#: ../fdroidserver/build.py
-msgid "{} build succeeded"
-msgid_plural "{} builds succeeded"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
-msgstr[4] ""
-msgstr[5] ""
diff --git a/locale/de/LC_MESSAGES/fdroidserver.po b/locale/de/LC_MESSAGES/fdroidserver.po
index 5dde0e8f..a866f5b0 100644
--- a/locale/de/LC_MESSAGES/fdroidserver.po
+++ b/locale/de/LC_MESSAGES/fdroidserver.po
@@ -3,43 +3,52 @@
 # Oliver <websites@posteo.de>, 2020.
 # Fynn Godau <fynngodau@mailbox.org>, 2020.
 # melusine <melusine@mailbox.org>, 2020.
-# marzzzello <anmeldezeugs@top-email.net>, 2020, 2022.
-# Hans-Christoph Steiner <hans@guardianproject.info>, 2020, 2021.
-# Predatorix Phoenix <predatorix@web.de>, 2021.
-# cheese1 <cheese@nosuchhost.net>, 2021.
-# Aleph Null <atzeje@web.de>, 2021.
-# nautilusx <translate@disroot.org>, 2021, 2022.
-# forght <forght@posteo.de>, 2021.
-# TobiGr <tobigr@mail.de>, 2021.
-# FW <weblate.scordium@slmail.me>, 2021.
-# fossdd <fossdd@tutanota.com>, 2021.
-# Ceeee <marius.romanus@gmx.de>, 2021, 2025.
-# C. Rüdinger <Mail-an-CR@web.de>, 2021, 2022.
-# VfBFan <drop0815@posteo.de>, 2021, 2023, 2024, 2025.
-# Roman Leo <roman.leo@gmx.de>, 2021.
-# Follpvosten <wolfi@karpador.xyz>, 2021.
-# ssantos <ssantos@web.de>, 2022, 2023, 2024.
-# "C. Rüdinger" <Mail-an-CR@web.de>, 2023, 2025.
-# VfBFan <VfBFan@users.noreply.hosted.weblate.org>, 2024.
-# Maxi <maxitendo01@proton.me>, 2024.
+# marzzzello <anmeldezeugs@top-email.net>, 2020.
+# Hans-Christoph Steiner <hans@guardianproject.info>, 2020.
 msgid ""
 msgstr ""
 "Project-Id-Version: fdroidserver 0.9\n"
 "Report-Msgid-Bugs-To: https://gitlab.com/fdroid/fdroidserver/issues\n"
-"POT-Creation-Date: 2025-06-25 09:52+0200\n"
-"PO-Revision-Date: 2025-04-29 10:16+0000\n"
-"Last-Translator: VfBFan <drop0815@posteo.de>\n"
+"POT-Creation-Date: 2020-10-21 18:05+0200\n"
+"PO-Revision-Date: 2020-11-10 16:20+0000\n"
+"Last-Translator: Hans-Christoph Steiner <hans@guardianproject.info>\n"
 "Language-Team: German <https://hosted.weblate.org/projects/f-droid/fdroidserver/de/>\n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 5.12-dev\n"
+"X-Generator: Weblate 4.4-dev\n"
+
+#: ../fdroidserver/common.py
+msgid ""
+"\n"
+"        This is a repository of apps to be used with FDroid. Applications in this\n"
+"        repository are either official binaries built by the original application\n"
+"        developers, or are binaries built from source by f-droid.org using the\n"
+"        tools on https://gitlab.com/fdroid.\n"
+"        "
+msgstr ""
+"\n"
+"        Dies ist eine Paketquelle für Anwendungen, die für die Benutzung\n"
+"        zusammen mit F-Droid gedacht ist. Die darin enthaltenen\n"
+"        Anwendungen sind entweder offizielle von den Entwicklern erstellte\n"
+"        Binärdateien oder werden von f-droid.org mithilfe des Werkzeugs auf\n"
+"        https://gitlab.com/fdroid aus dem Quellcode erstellt.\n"
+"        "
 
 #: ../fdroidserver/nightly.py
 msgid ""
 "\n"
+"SSH Public Key to be used as Deploy Key:"
+msgstr ""
+"\n"
+"Öffentlicher SSH-Schlüssel, der als Bereitstellungsschlüssel verwendet werden soll:"
+
+#: ../fdroidserver/nightly.py
+#, fuzzy
+msgid ""
+"\n"
 "SSH public key to be used as deploy key:"
 msgstr ""
 "\n"
@@ -59,163 +68,184 @@ msgstr ""
 msgid "\"%s/\" has no matching metadata file!"
 msgstr "\"%s/\" besitzt keine zugehörige Metadaten-Datei!"
 
-#: ../fdroidserver/index.py
-msgid "\"isPrimary\" key should not be added to mirrors!"
-msgstr "\"isPrimary\"-Schlüssel sollte nicht zu den Spiegelservern hinzugefügt werden!"
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "\"local_copy_dir\" {path} does not exist!"
-msgstr "\"local_copy_dir\" {path}\" existiert nicht!"
-
 #: ../fdroidserver/install.py
-#, python-brace-format
+#, fuzzy, python-brace-format
 msgid "\"{apkfilename}\" is already installed on {dev}."
-msgstr "\"{apkfilename}\" ist bereits auf {dev} installiert."
+msgstr "'{apkfilename}' ist auf {dev} bereits installiert."
+
+#: ../fdroidserver/update.py
+#, python-brace-format
+msgid "\"{path}\" contains outdated {name} ({version})"
+msgstr "{name} ({version}) in „{path}” veraltet"
 
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "\"{path}\" contains recent {name} ({version})"
 msgstr "{name} ({version}) in \"{path}\" ist aktuell"
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "\"{path}\" exists but s3cmd is not installed!"
-msgstr "\"{path}” vorhanden, aber S3cmd ist nicht installiert!"
+msgstr "„{path}” vorhanden, aber S3cmd ist nicht installiert!"
 
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "\"{path}\" is not a supported file format (use: metadata/*.yml)"
-msgstr "\"{path}\" ist ein nicht unterstütztes Dateiformat (Verwendung: metadata/*.yml)"
+msgstr "\"{path}\" ist kein akzeptiertes Format, umwandeln in metadata/*.yml"
 
-#: ../fdroidserver/update.py
+#: ../fdroidserver/metadata.py
 #, python-brace-format
-msgid "\"{path}\" is signed by a key that is not allowed:"
-msgstr "\"{path}” ist mit einem nicht zulässigen Schlüssel signiert:"
+msgid "\"{path}\" is not an accepted format, convert to: {formats}"
+msgstr "\"{path}\" ist kein akzeptiertes Format, umwandeln in: {formats}"
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/common.py
 #, python-brace-format
 msgid "\"{url}\" is not a valid URL!"
 msgstr "\"{url}\" ist keine gültige URL!"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, python-format
+msgid "%(option)s option requires %(number)d argument"
+msgid_plural "%(option)s option requires %(number)d arguments"
+msgstr[0] "Option %(option)s benötigt %(number)d Argument"
+msgstr[1] "Option %(option)s benötigt %(number)d Argumente"
+
+#: ../fdroidserver/mirror.py
+#, python-format
+msgid "%(prog)s [options] url"
+msgstr "%(prog)s [options]-URL"
+
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "%(prog)s: error: %(message)s\n"
 msgstr "%(prog)s: Fehler: %(message)s\n"
 
-#: ../fdroidserver/publish.py
-#, python-format
-msgid "%d APKs failed to be signed or verified!"
-msgstr "%d APKs konnten nicht signiert oder verifiziert werden!"
-
 #: ../fdroidserver/scanner.py
 #, python-format
 msgid "%d problems found"
 msgstr "%d Probleme gefunden"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "%prog [options]"
+msgstr "%prog [Optionen]"
+
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "%r is not callable"
 msgstr "%r ist nicht abrufbar"
 
-#: ../fdroidserver/signindex.py
-#, python-format
-msgid "%s did not produce a dict!"
-msgstr "%s hat kein dict hervorgebracht!"
-
-#: ../fdroidserver/signindex.py
-#, python-format
-msgid "%s has bad SHA-256: %s"
-msgstr "%s hat schlechtes SHA-256: %s"
-
 #: ../fdroidserver/lint.py
 #, python-format
 msgid "%s is not an accepted build field"
 msgstr "%s ist kein zulässiges Build-Feld"
 
-#: ../fdroidserver/common.py
-msgid "'keypass' not found in config.yml!"
-msgstr "'keypass' nicht in config.yml vorhanden!"
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, python-format
+msgid "%s option does not take a value"
+msgstr "Option %s verfügt über keinen Wert"
+
+#: ../fdroidserver/index.py ../fdroidserver/common.py
+msgid "'keypass' not found in config.py!"
+msgstr "„keypass” nicht in config.py vorhanden!"
 
 #: ../fdroidserver/common.py
 msgid "'keystore' is NONE and 'smartcardoptions' is blank!"
 msgstr "'keystore' ist NONE und 'smartcardoptions' ist leer!"
 
-#: ../fdroidserver/common.py
-msgid "'keystore' not found in config.yml!"
-msgstr "'keystore' nicht in config.yml vorhanden!"
+#: ../fdroidserver/index.py ../fdroidserver/common.py
+msgid "'keystore' not found in config.py!"
+msgstr "„keystore” nicht in config.py vorhanden!"
 
-#: ../fdroidserver/common.py
-msgid "'keystorepass' not found in config.yml!"
-msgstr "'keystorepass' nicht in config.yml vorhanden!"
+#: ../fdroidserver/index.py ../fdroidserver/common.py
+msgid "'keystorepass' not found in config.py!"
+msgstr "„keystorepass” nicht in config.py vorhanden!"
 
-#: ../fdroidserver/common.py
-msgid "'repo_keyalias' not found in config.yml!"
-msgstr "'repo_keyalias' nicht in config.yml vorhanden!"
+#: ../fdroidserver/index.py ../fdroidserver/common.py
+msgid "'repo_keyalias' not found in config.py!"
+msgstr "„repo_keyalias” nicht in config.py vorhanden!"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "'required' is an invalid argument for positionals"
-msgstr "'required' ist ein ungültiges Argument für Positionsangaben"
+msgstr "„required” ist ein ungültiges Argument für Positionsangaben"
 
 #: ../fdroidserver/common.py
-msgid "'sdk_path' not set in config.yml!"
-msgstr "Kein 'sdk_path' in 'config.yml' festgelegt!"
+msgid "'sdk_path' not set in 'config.py'!"
+msgstr "Kein 'sdk_path' in 'config.py' festgelegt!"
+
+#. Translators: "build-tools" is the file name of a package from
+#. Google, it is part of the Android SDK. So it probably shouldn't be
+#. translated or transliterated.
+#: ../fdroidserver/common.py
+#, python-brace-format
+msgid "'{aapt}' is too old, fdroid requires build-tools-23.0.0 or newer!"
+msgstr "'{aapt}' ist zu alt, fdroid benötigt build-tools-23.0.0 oder neuer!"
 
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "'{aapt}' is too old, fdroid requires build-tools-{version} or newer!"
-msgstr "'{aapt}' ist veraltet, fdroid benötigt build-tools-{version} oder neuer!"
+msgstr "„{aapt}” ist veraltet, fdroid benötigt build-tools-{version} oder neuer!"
+
+#: ../fdroidserver/install.py
+#, python-brace-format
+msgid "'{apkfilename}' is already installed on {dev}."
+msgstr "'{apkfilename}' ist auf {dev} bereits installiert."
+
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "'{field}' in {linedesc} is obsolete, see docs for current fields:"
+msgstr "'{field}' in {linedesc} ist veraltet, siehe Dokumentation für aktuelle Felder:"
+
+#: ../fdroidserver/common.py
+#, python-brace-format
+msgid "'{field}' will be in random order! Use () or [] brackets if order is important!"
+msgstr "Das Feld „{field}” wird in zufälliger Reihenfolge angezeigt! Verwenden Sie runde ( ) oder eckige [ ] Klammern, wenn die Reihenfolge wichtig ist!"
 
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "'{path}' failed to execute!"
-msgstr "'{path}' konnte nicht ausgeführt werden!"
+msgstr "„{path}” konnte nicht ausgeführt werden!"
 
 #: ../fdroidserver/metadata.py
 #, python-brace-format
-msgid "'{path}' has invalid format, it should be a dictionary!"
-msgstr "'{path}' in ungültigem Format, sollte ein Wörterbuch sein!"
-
-#: ../fdroidserver/lint.py ../fdroidserver/metadata.py
-#, python-brace-format
 msgid "'{value}' is not a valid {field} in {appid}. Regex pattern: {pattern}"
-msgstr "'{value}' ist kein gültiges {field} in {appid}. Regex-Muster: {pattern}"
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "'{value}' is not a valid {field}, should be {pattern}"
-msgstr "'{value}' ist kein gültiges {field}, sollte {pattern} sein"
-
-#: ../fdroidserver/checkupdates.py
-msgid "--merge-request only runs on a single appid!"
-msgstr "--merge-request läuft nur auf einer einzigen App-ID!"
+msgstr "„{value}” ist kein gültiges {field} in {appid}. Regex-Muster: {pattern}"
 
 #: ../fdroidserver/checkupdates.py
 #, python-brace-format
 msgid "...checkupdate failed for {appid} : {error}"
-msgstr "… checkupdate für {appid} fehlgeschlagen: {error}"
+msgstr "...checkupdate für {appid} fehlgeschlagen: {error}"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid ".__call__() not defined"
 msgstr ".__call__() nicht festgelegt"
 
+#: ../fdroidserver/metadata.py
+msgid ".fdroid.txt is not supported!  Convert to .fdroid.yml or .fdroid.json."
+msgstr ".fdroid.txt wird nicht unterstützt!  Konvertieren Sie in .fdroid.yml oder .fdroid.json."
+
 #: ../fdroidserver/lint.py
 msgid "/issues is missing"
-msgstr "/issues fehlt"
+msgstr "/Probleme fehlen"
 
 #: ../fdroidserver/mirror.py
 msgid "A URL is required as an argument!"
 msgstr "Als Argument wird eine URL benötigt!"
 
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "APK signatures have different certificates in {path}:"
-msgstr "APK-Signaturen haben verschiedene Zertifikate in {path}:"
-
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Add PGP signatures using GnuPG for packages in repo"
 msgstr "GnuPG PGP-Signaturen für Programmpakete in der Paketquelle hinzufügen"
 
+#: ../fdroid ../fdroidserver/__main__.py
+msgid "Add a new application from its source code"
+msgstr "Eine neue Anwendung aus ihrem Quellcode hinzufügen"
+
 #: ../fdroidserver/update.py
 msgid "Add a repo signing key to an unsigned repo"
 msgstr "Füge einen Repository-Signierschlüssel zu einem unsignierten Repository hinzu"
@@ -227,17 +257,13 @@ msgstr "Füge eine Metadaten-Vorlage für APKs hinzu, die keine haben"
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Adding new repo for only {name}"
-msgstr "Nur für {name} eine neues Repo hinzufügen"
+msgstr "Nur für {name} eine neue Repro hinzufügen"
 
 #: ../fdroidserver/init.py
 msgid "Alias of the repo signing key in the keystore"
 msgstr "Pseudonym des Repository-Signierchlüssels im Schlüsselspeicher"
 
-#: ../fdroidserver/build.py
-msgid "AllowedAPKSigningKeys missing but reference binary supplied"
-msgstr "AllowedAPKSigningKeys fehlen aber Referenz-Binärdatei geliefert"
-
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "Allows a different revision (or git branch) to be specified for the initial import"
 msgstr "Ermöglicht die Bestimmung unterschiedlicher Überarbeitungen (oder Git-Zweige) für den Erstimport"
 
@@ -251,52 +277,52 @@ msgstr "Auch vor Formatierungsfehler warnen, wie etwa \"rewritemeta -l\""
 
 #: ../fdroidserver/scanner.py
 msgid "Android AAR library"
-msgstr "Android-AAR-Bibliothek"
+msgstr "Android AAR-Bibliothek"
 
 #: ../fdroidserver/scanner.py
 msgid "Android APK file"
-msgstr "Android-APK-Datei"
+msgstr "Android APK-Datei"
 
 #: ../fdroidserver/scanner.py
+#, fuzzy
 msgid "Android DEX code"
-msgstr "Android-DEX-Code"
+msgstr "Keine Android SDK gefunden!"
 
-#: ../fdroidserver/init.py
+#: ../fdroidserver/common.py ../fdroidserver/build.py
 #, python-brace-format
-msgid "Android SDK not found at {path}!"
-msgstr "Android-SDK nicht unter {path} gefunden!"
+msgid "Android SDK '{path}' does not have '{dirname}' installed!"
+msgstr "Im „{path}” der Android SDK wurde „{dirname}” nicht installiert!"
+
+#: ../fdroidserver/common.py
+msgid "Android SDK not found!"
+msgstr "Android-SDK nicht gefunden!"
 
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "Android SDK path '{path}' does not exist!"
-msgstr "Android-SDK-Pfad '{path}' nicht vorhanden!"
+msgstr "Android-SDK-Pfad »{path}« nicht vorhanden!"
 
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "Android SDK path '{path}' is not a directory!"
-msgstr "Android-SDK-Pfad '{path}' ist kein Verzeichnis!"
+msgstr "Android-SDK-Pfad »{path}« ist kein Verzeichnis!"
 
+#. Translators: "build-tools" is the file name of a package from
+#. Google, it is part of the Android SDK. So it probably shouldn't be
+#. translated or transliterated.
 #: ../fdroidserver/common.py
 #, python-brace-format
-msgid "Android SDK tool {cmd} not found!"
-msgstr "Android-SDK-Tool {cmd} nicht gefunden!"
+msgid "Android build-tools path '{path}' does not exist!"
+msgstr "Pfad '{path}' zu den Android Build-Tools nicht vorhanden!"
 
-#: ../fdroidserver/lint.py
-msgid "App has Binaries but does not have corresponding AllowedAPKSigningKeys to pin certificate."
-msgstr "App besitzt Binärdateien aber keine entsprechenden AllowedAPKSigningKeys, um Zertifikat zu verankern."
-
-#: ../fdroidserver/lint.py
-msgid "App has NoSourceSince or ArchivePolicy \"0 versions\" or 0 but AutoUpdateMode or UpdateCheckMode are not None"
-msgstr "App hat NoSourceSince oder ArchivePolicy \"0 versions\" oder 0, aber AutoUpdateMode oder UpdateCheckMode sind nicht None"
+#: ../fdroidserver/update.py
+msgid "AndroidManifest.xml has no date"
+msgstr "AndroidManifest.xml enthält kein Datum"
 
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "App is in '{repo}' but has a link to {url}"
-msgstr "App befindet sich in '{repo}', enthält aber einen Verweis auf {url}"
-
-#: ../fdroidserver/lint.py
-msgid "App version has binary but does not have corresponding AllowedAPKSigningKeys to pin certificate."
-msgstr "App-Version besitzt Binärdateien aber keine entsprechenden AllowedAPKSigningKeys, um Zertifikat zu verankern."
+msgstr "App befindet sich in „{repo}”, enthält aber einen Verweis auf {url}"
 
 #: ../fdroidserver/lint.py
 msgid "Appending .git is not necessary"
@@ -307,43 +333,27 @@ msgstr "Das Anhängen von .git ist nicht notwendig"
 msgid "Archiving {apkfilename} with invalid signature!"
 msgstr "Archivierung von {apkfilename} mit ungültiger Signatur!"
 
-#: ../fdroidserver/lint.py
-msgid "AutoUpdateMode with UpdateCheckMode: HTTP must have a pattern."
-msgstr "AutoUpdateMode mit UpdateCheckMode: HTTP muss ein Muster haben."
-
-#: ../fdroidserver/install.py
-msgid "Automatic no to all prompts."
-msgstr "Automatisches Nein zu allen Aufforderungen."
-
-#: ../fdroidserver/install.py
-msgid "Automatic yes to all prompts."
-msgstr "Automatisches Ja zu allen Aufforderungen."
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "Bad entry type \"{mirrortype}\" in mirrors config: {mirror}"
-msgstr "Falscher Typeneintrag \"{mirrortype}\" in Spiegelserver-Konfiguration von: {mirror}"
-
 #: ../fdroidserver/mirror.py
 msgid "Base URL to mirror, can include the index signing key using the query string: ?fingerprint="
 msgstr "Basis-URL zum Spiegeln, kann den Index-Signierungsschlüssel mit Hilfe des Abfrage-Strings enthalten: ?fingerprint="
 
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "Branch '{branch}' used as commit in build '{versionName}'"
-msgstr "Branch '{branch}', der als Bestätigung im Build verwendet wird '{versionName}'"
+msgstr "Zweig „{branch}”, der als Bestätigung im Build verwendet wird „{versionName}”"
 
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "Branch '{branch}' used as commit in srclib '{srclib}'"
-msgstr "Branch '{branch}' wird als Bestätigung in srclib verwendet '{srclib}'"
+msgstr "Zweig „{branch}” wird als Bestätigung in srclib verwendet „{srclib}”."
 
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Broken symlink: {path}"
 msgstr "Kaputter Symlink: {path}"
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Build a package from source"
 msgstr "Programmpaket aus Quellcode erstellen"
 
@@ -357,54 +367,63 @@ msgstr "Build durch „fdroid import” erstellt - Entfernen Sie die Zeile „De
 
 #: ../fdroidserver/checkupdates.py
 msgid "Build metadata git repo has uncommited changes!"
-msgstr "Build-Metadaten-Git-Repo hat nicht committete Änderungen!"
+msgstr "Build Metadaten Git Repo hat nicht committete Änderungen!"
 
 #: ../fdroidserver/build.py
 msgid "Build only the latest version of each package"
 msgstr "Nur die neueste Version jedes Programmpakets erstellen"
 
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Build should have comma-separated versionName and versionCode, not \"{value}\", in {linedesc}"
+msgstr "Build sollte kommagetrennte versionName und versionCode enthalten, nicht „{value}”, in {linedesc}"
+
 #: ../fdroidserver/init.py
 #, python-format
 msgid "Built repo based in \"%s\" with this config:"
-msgstr "Built-Repo basiert in \"%s\" auf der Konfiguration von:"
-
-#: ../fdroidserver/checkupdates.py
-msgid "Can't auto-update app with no CurrentVersionCode"
-msgstr "Auto-Update der App ohne CurrentVersionCode nicht möglich"
+msgstr "Built-Repo basiert in „%s” auf der Konfiguration von:"
 
 #: ../fdroidserver/build.py
 msgid "Can't build due to {} error while scanning"
 msgid_plural "Can't build due to {} errors while scanning"
-msgstr[0] "Kann nicht erstellt werden, da {} Fehler beim Prüfen aufgetreten ist"
-msgstr[1] "Kann nicht erstellt werden, da {} Fehler beim Prüfen aufgetreten sind"
+msgstr[0] "Kann nicht erstellt werden, da {} Fehler beim Prüfen aufgetreten ist."
+msgstr[1] "Kann nicht erstellt werden, da {} Fehler beim Prüfen aufgetreten sind."
 
-#: ../fdroidserver/common.py
+#: ../fdroidserver/vmtools.py
+#, python-brace-format
+msgid "Cannot read \"{path}\"!"
+msgstr "„{path}” konnte nicht gelesen werden!"
+
+#. Translators: https://developer.android.com/studio/build/application-id
+#: ../fdroidserver/metadata.py
 #, fuzzy, python-brace-format
-msgid "Cannot read {path}: {error}"
-msgstr "Lesen von {path} fehlgeschlagen: {error}"
+msgid "Cannot resolve application ID {appid}"
+msgstr "AppID {appid} konnte nicht aufgelöst werden"
 
 #: ../fdroidserver/rewritemeta.py
-#, python-brace-format
+#, fuzzy, python-brace-format
 msgid "Cannot rewrite \"{path}\""
-msgstr "\"{path}\" konnte nicht überschrieben werden"
+msgstr "„{path}” konnte nicht gelesen werden!"
+
+#: ../fdroidserver/rewritemeta.py
+msgid "Cannot use --list and --to at the same time"
+msgstr "--list und --to können nicht gleichzeitig verwendet werden"
+
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Cannot write \"{path}\", not an accepted format, use: {formats}"
+msgstr "„{path}” konnte nicht geschrieben werden, kein akzeptiertes Format, verwenden Sie: {formats}"
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
 #: ../fdroidserver/lint.py
 #, python-format
 msgid "Categories '%s' is not valid"
-msgstr "Kategorie '%s' ist nicht gültig"
+msgstr "Kategorie »%s« ist nicht gültig"
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
 #: ../fdroidserver/lint.py
 msgid "Categories are not set"
-msgstr "Keine Kategorien festgelegt"
+msgstr "Kategorien sind nicht festgelegt"
 
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "Category \"{category}\" defined but not used for any apps!"
-msgstr "Kategorie \"{category}\" definiert, aber für keine Apps verwendet!"
-
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Check for updates to applications"
 msgstr "Auf Aktualisierungen für Anwendungen prüfen"
 
@@ -413,35 +432,34 @@ msgstr "Auf Aktualisierungen für Anwendungen prüfen"
 msgid "Checking archiving for {appid} - apks:{integer}, keepversions:{keep}, archapks:{arch}"
 msgstr "Archivierung auf {appid} überprüfen - apks:{integer}, keepversions:{keep}, archapks:{arch}"
 
+#: ../fdroidserver/dscanner.py
+msgid "Clean after all scans have finished"
+msgstr "Nach Abschluss aller Scans bereinigen"
+
+#: ../fdroidserver/dscanner.py
+msgid "Clean before the scans start and rebuild the container"
+msgstr "Vor Beginn der Scans bereinigen und Container neu erstellen"
+
+#: ../fdroidserver/dscanner.py
+msgid "Clean up all containers and then exit"
+msgstr "Alle Container bereinigen und danach beenden"
+
 #: ../fdroidserver/update.py
 msgid "Clean update - don't uses caches, reprocess all APKs"
 msgstr "Sauber aktualisieren - ohne Verwendung der Zwischenspeicher, alle APKs wiederaufbereiten"
 
-#: ../fdroidserver/common.py
-msgid "Color the log output"
-msgstr "Einfärben der Protokollausgabe"
-
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "Comma separated list of categories."
 msgstr "Liste der Kategorien durch Kommata getrennt."
 
-#: ../fdroidserver/__main__.py
-#, python-format
+#: ../fdroid ../fdroidserver/__main__.py
+#, c-format, python-format
 msgid "Command '%s' not recognised.\n"
 msgstr "Befehl '%s' nicht erkannt.\n"
 
 #: ../fdroidserver/checkupdates.py
 msgid "Commit changes"
-msgstr "Änderungen committen"
-
-#: ../fdroidserver/checkupdates.py
-msgid "Commit changes, push, then make a merge request"
-msgstr "Änderungen committen, pushen und dann eine Merge-Anfrage stellen"
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Conflicting \"{field}\" definitions between .yml and localized files:"
-msgstr "Widersprüchliche \"{field}\"-Definitionen in .yml- bzw. übersetzten Dateien:"
+msgstr "Änderungen übergeben"
 
 #: ../fdroidserver/__main__.py
 msgid "Conflicting arguments: '--verbose' and '--quiet' can not be specified at the same time."
@@ -450,15 +468,15 @@ msgstr "Widersprüchliche Argumente: '--verbose' und '--quiet' können nicht gle
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "Could not find '{command}' on your system"
-msgstr "'{command}' konnte auf Ihrem System nicht gefunden werden"
+msgstr "„{command}” konnte auf Ihrem System nicht gefunden werden"
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
+#, fuzzy
 msgid "Could not find latest version code"
 msgstr "Neuester Versionscode konnte nicht gefunden werden"
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
+#, fuzzy
 msgid "Could not find latest version name"
 msgstr "Neuester Versionsname konnte nicht gefunden werden"
 
@@ -468,25 +486,31 @@ msgid "Could not find {path} to remove it"
 msgstr "{path} konnte nicht gefunden werden, um ihn zu entfernen"
 
 #: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Could not open APK {path} for analysis: "
-msgstr "Konnte APK-Datei {path} nicht für Analyse öffnen "
+msgid "Could not open apk file for analysis"
+msgstr "Konnte APK-Datei nicht für Analyse öffnen"
 
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "Could not parse size \"{size}\", wrong type \"{type}\""
 msgstr "Konnte Größe \"{size}\" nicht parsen, falscher Typ \"{type}\""
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/import_subcommand.py
+#. Translators: https://developer.android.com/studio/build/application-id
+#: ../fdroidserver/import.py
+#, fuzzy
 msgid "Couldn't find Application ID"
-msgstr "Konnte Anwendungs-ID nicht finden"
+msgstr "Konnte Paket-ID nicht finden"
 
-#: ../fdroidserver/checkupdates.py
-msgid "Couldn't find any version information"
-msgstr "Versionsinformationen konnten nicht gefunden werden"
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
+#: ../fdroidserver/import.py
+msgid "Couldn't find latest version code"
+msgstr "Neuester Versionscode konnte nicht gefunden werden"
 
-#: ../fdroidserver/checkupdates.py
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
+#: ../fdroidserver/import.py
+msgid "Couldn't find latest version name"
+msgstr "Neuester Versionsname konnte nicht gefunden werden"
+
+#: ../fdroidserver/import.py
 msgid "Couldn't find package ID"
 msgstr "Konnte Paket-ID nicht finden"
 
@@ -494,26 +518,29 @@ msgstr "Konnte Paket-ID nicht finden"
 msgid "Cowardily refusing to overwrite existing signing key setup!"
 msgstr "Es ist ungehörig, bestehende Signaturschlüssel-Einstellungen zu überschreiben!"
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/update.py
+msgid "Create a repo signing key in a keystore"
+msgstr "Repository-Signierschlüssel in einem Schlüsselspeicher erstellen"
+
+#: ../fdroidserver/update.py
+msgid "Create skeleton metadata files that are missing"
+msgstr "Gerüst für fehlende Metadaten-Dateien erstellen"
+
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Created new container \"{name}\""
-msgstr "Neuer Container \"{name}\" wurde erstellt"
+msgstr "Neuer Container „{name}” wurde erstellt"
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Creating \"{path}\" for configuring s3cmd."
-msgstr "\"{path}\" für die Konfiguration von S3cmd wird erstellt."
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Creating empty {config_file}"
-msgstr "Erstelle leere {config_file}"
+msgstr "„{path}” für die Konfiguration von S3cmd wird erstellt."
 
 #: ../fdroidserver/publish.py
 msgid "Creating log directory"
-msgstr "Erstelle Logverzeichnis"
+msgstr "Erstelle Log Verzeichnis"
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Creating new S3 bucket: {url}"
 msgstr "Neuer S3-Bucket wird erstellt: {url}"
@@ -524,9 +551,10 @@ msgstr "Erstelle Ausgabeverzeichnis"
 
 #: ../fdroidserver/index.py
 msgid "Creating signed index with this key (SHA256):"
-msgstr "Signierter Index wird mit diesem Schlüssel (SHA256) erstellt:"
+msgstr "Signierter Index mit diesem Schlüssel (SHA256) wird erstellt:"
 
-#: ../fdroidserver/publish.py ../fdroidserver/verify.py
+#: ../fdroidserver/import.py ../fdroidserver/verify.py
+#: ../fdroidserver/publish.py
 msgid "Creating temporary directory"
 msgstr "Erstelle temporäres Verzeichnis"
 
@@ -537,7 +565,7 @@ msgstr "Unsignierter Index zur Vorbereitung der Signierung wird erstellt"
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "CurrentVersionCode {cv} is less than oldest build entry {versionCode}"
-msgstr "CurrentVersionCode {cv} ist niedriger als ältester Build-Eintrag {versionCode}"
+msgstr "CurrentVersionCode {cv} ist kleiner als der älteste Build-Eintrag {versionCode}"
 
 #: ../fdroidserver/nightly.py
 msgid "DEBUG_KEYSTORE is not set or the value is incomplete"
@@ -548,9 +576,9 @@ msgid "Delete APKs and/or OBBs without metadata from the repo"
 msgstr "APKs und/oder OBBs ohne Metadaten aus dem Repository löschen"
 
 #: ../fdroidserver/deploy.py
-#, python-brace-format
+#, fuzzy, python-brace-format
 msgid "Deleting archive, repo is too big ({size} max {limit})"
-msgstr "Lösche Archiv, Repository ist zu groß ({size} max {limit})"
+msgstr "Archiv löschen, Repo ist zu groß ({size} max {limit})"
 
 #: ../fdroidserver/deploy.py
 #, python-brace-format
@@ -572,23 +600,18 @@ msgid "Description has a duplicate line"
 msgstr "Beschreibung enthält eine doppelte Zeile"
 
 #: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Description of length {length} is over the {limit} char limit"
-msgstr "Länge der Beschreibung {length} übersteigt die zulässige Zeichenzahl {limit}"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Did you mean config/{name}.yml?"
-msgstr "Meinten Sie config/{name}.yml?"
+#, python-format
+msgid "Description has a list (%s) but it isn't bulleted (*) nor numbered (#)"
+msgstr "Beschreibung enthält eine Liste (%s), ist aber weder aufgezählt (*) noch nummeriert (#)"
 
 #: ../fdroidserver/lint.py
 #, python-brace-format
-msgid "Did you mean {code}?"
-msgstr "Meinten Sie {code}?"
+msgid "Description of length {length} is over the {limit} char limit"
+msgstr "Beschreibung der Länge {length} ist über dem {limit}-Zeichen Limit"
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "Do not add 'disable:' to the generated build entries"
-msgstr "Nicht 'disable:' zu den erzeugten Erstellungseinträgen hinzufügen"
+msgstr ""
 
 #: ../fdroidserver/nightly.py
 msgid "Do not deploy the new files to the repo"
@@ -597,7 +620,7 @@ msgstr "Verteilen Sie die neuen Dateien nicht in das Repo"
 #: ../fdroidserver/mirror.py
 #, python-brace-format
 msgid "Do not include \"{path}\" in URL!"
-msgstr "\"{path}\" nicht in die URL einfügen!"
+msgstr "„{path}” nicht in die URL einfügen!"
 
 #: ../fdroidserver/init.py
 msgid "Do not prompt for Android SDK path, just fail"
@@ -611,25 +634,30 @@ msgstr "Entfernen Sie die vom Schlüsselspeicher erzeugten privaten Schlüssel n
 msgid "Don't create a source tarball, useful when testing a build"
 msgstr "Keinen Tarball vom Quellcode erstellen, nützlich bei Test eines Builds"
 
+#: ../fdroidserver/stats.py
+msgid "Don't do anything logs-related"
+msgstr "Mache auf Logs bezogen nichts"
+
 #: ../fdroidserver/build.py
 msgid "Don't refresh the repository, useful when testing a build with no internet connection"
 msgstr "Keine Aktualisierung des Repositorys. Nützlich, wenn ein Build ohne Internetverbindung getestet wird"
 
 #: ../fdroidserver/deploy.py ../fdroidserver/nightly.py
+#: ../fdroidserver/upload.py
 msgid "Don't use rsync checksums"
 msgstr "Keine rsync-Prüfsummen verwenden"
 
-#: ../fdroidserver/install.py
-msgid "Download F-Droid.apk using mirrors that leak less to the network"
-msgstr "F-Droid.apk über Spiegelserver herunterladen, die weniger Datenlecks ins Netzwerk haben"
-
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Download complete mirrors of small repos"
-msgstr "Komplette Spiegel von kleinen Paketquellen herunterladen"
+msgstr "Komplette Spiegel von kleinen Repos herunterladen"
+
+#: ../fdroidserver/stats.py
+msgid "Download logs we don't have"
+msgstr "Herunterladung von Logs welche wir nicht haben"
 
 #: ../fdroidserver/common.py
 msgid "Downloading the repository already failed once, not trying again."
-msgstr "Herunterladen des Repositorys bereits einmal fehlgeschlagen, versuche es nicht nochmal."
+msgstr "Herunterladen des Repositories bereits einmal fehlgeschlagen, versuche es nicht nochmal."
 
 #: ../fdroidserver/verify.py
 #, python-brace-format
@@ -638,56 +666,38 @@ msgstr "Herunterladen von {url} fehlgeschlagen. {error}"
 
 #: ../fdroidserver/metadata.py
 #, python-brace-format
-msgid "Duplicate Anti-Feature declaration at {path} was ignored!"
-msgstr "Doppelte Anti-Feature-Deklaration in {path} wurde ignoriert!"
-
-#: ../fdroidserver/index.py
-#, python-format
-msgid "Duplicate entry \"%s\" in mirrors config!"
-msgstr "Doppelter Eintrag \"%s\" in Spiegelserver-Konfiguration!"
+msgid "Duplicate build recipe found for versionCode {versionCode} in {linedesc}"
+msgstr "Doppelte Build-Rezeptur für versionCode {versionCode} in {linedesc} gefunden"
 
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "Duplicate link in '{field}': {url}"
-msgstr "Link in '{field}' duplizieren: {url}"
+msgstr "Link in „{field}” duplizieren: {url}"
 
-#: ../fdroidserver/common.py
-#, python-format
-msgid "ERROR: %(message)s"
-msgstr "FEHLER: %(message)s"
+#: ../fdroid
+msgid "Dynamically scan APKs post build"
+msgstr "APKs nach Erstellung dynamisch durchsuchen"
 
 #: ../fdroidserver/__main__.py
 msgid "ERROR: The \"server\" subcommand has been removed, use \"deploy\"!"
-msgstr "FEHLER: Der \"server\"-Unterbefehl wurde entfernt, verwende \"deploy\"!"
+msgstr ""
+
+#: ../fdroidserver/mirror.py
+msgid ""
+"ERROR: this command should never be used to mirror f-droid.org!\n"
+"A full mirror of f-droid.org requires more than 200GB."
+msgstr ""
+"FEHLER: Dieser Befehl sollte niemals verwendet werden, um f-droid.org zu spiegeln!\n"
+"Ein vollständiger Spiegel von f-droid.org erfordert mehr als 200 GB."
 
 #: ../fdroidserver/nightly.py
 msgid "ERROR: unsupported CI type, patches welcome!"
 msgstr "FEHLER: nicht unterstützter CI-Typ, Patches willkommen!"
 
-#: ../fdroidserver/nightly.py
-#, python-format
-msgid "ERROR: unsupported git host \"%s\", patches welcome!"
-msgstr "FEHLER: nicht unterstützter Git-Host \"%s\", Patches willkommen!"
-
-#: ../fdroidserver/lint.py
+#: ../fdroidserver/metadata.py
 #, python-brace-format
-msgid "ERROR: {key} in {path} is not \"archive\" or \"repo\"!"
-msgstr "FEHLER: {key} in {path} ist nicht \"archive\" oder \"repo\"!"
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "ERROR: {key} not a valid key!"
-msgstr "FEHLER: {key} ist kein gültiger Schlüssel!"
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "ERROR: {key}'s value should be of type {t}!"
-msgstr "FEHLER: {key}s Wert sollte vom Typ {t} sein!"
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "ERROR: {key}:{subkey} in {path} is not in allowed keys: {allowed_keys}!"
-msgstr "FEHLER: {key}:{subkey} in {path} ist keiner der erlaubten Schlüssel: {allowed_keys}!"
+msgid "Empty build flag at {linedesc}"
+msgstr "Build-Flag bei {linedesc} leeren"
 
 #: ../fdroidserver/__main__.py
 #, python-brace-format
@@ -703,49 +713,29 @@ msgstr ""
 "Geben Sie hier den Pfad zum Android-SDK (%s) ein:\n"
 "> "
 
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Environment variable {var} from {configname} is not set!"
-msgstr "Umgebungsvariable {var} von {configname} ist nicht gesetzt!"
+#: ../fdroidserver/deploy.py ../fdroidserver/checkupdates.py
+#: ../fdroidserver/upload.py
+#, python-format
+msgid "Error while attempting to publish log: %s"
+msgstr "Fehler beim Versuch, das Protokoll zu veröffentlichen: %s"
 
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Environment variable {{env: {var}}} is not set!"
-msgstr "Umgebungsvariable {{env: {var}}} ist nicht gesetzt!"
-
-#: ../fdroidserver/deploy.py
-msgid "Error deploying 'github_releases', {} not present. (You might need to run `fdroid update` first.)"
-msgstr "Fehler beim Bereitstellen von 'github_releases', {} nicht vorhanden. (Sie müssen zuerst `fdroid update` ausführen.)"
-
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py ../fdroidserver/common.py
 msgid "Error while getting repo address"
 msgstr "Fehler bei der Ermittlung der Repro-Adresse"
 
-#: ../fdroidserver/scanner.py
-msgid "Exit with a non-zero code if problems were found"
-msgstr "Mit einem von Null verschiedenen Code beenden, falls Probleme auftreten"
-
-#: ../fdroidserver/__main__.py
-msgid "Extract application metadata from a source repository"
-msgstr "Extrahieren von Anwendungsmetadaten aus einem Quell-Repository"
-
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Extract signatures from APKs"
 msgstr "Signaturen aus APKs extrahieren"
 
-#: ../fdroidserver/install.py
-msgid "F-Droid.apk could not be downloaded from any known source!"
-msgstr "F-Droid.apk konnte von keiner bekannten Quelle heruntergeladen werden!"
-
 #: ../fdroidserver/update.py
-#, python-brace-format
+#, fuzzy, python-brace-format
 msgid "Failed copying {path}: {error}"
-msgstr "Kopieren von {path} fehlgeschlagen: {error}"
+msgstr "Lesen von {path} fehlgeschlagen: {error}"
 
 #: ../fdroidserver/signatures.py
 #, python-brace-format
 msgid "Failed fetching signatures for '{apkfilename}': {error}"
-msgstr "Abrufen von Signaturen für '{apkfilename}' fehlgeschlagen: {error}"
+msgstr "Abrufen von Signaturen für „{apkfilename}” fehlgeschlagen: {error}"
 
 #: ../fdroidserver/update.py
 #, python-brace-format
@@ -757,34 +747,42 @@ msgstr "Lesen von {path} fehlgeschlagen: {error}"
 msgid "Failed resizing {path}: {error}"
 msgstr "Größenanpassung von {path} fehlgeschlagen: {error}"
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/publish.py
+msgid "Failed to align application"
+msgstr "Anwendung konnte nicht angepasst werden"
+
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Failed to create S3 bucket: {url}"
 msgstr "S3-Bucket konnte nicht erstellt werden: {url}"
 
+#: ../fdroidserver/common.py
+msgid "Failed to get APK manifest information"
+msgstr "Abrufen der APK-Manifest-Informationen fehlgeschlagen"
+
 #: ../fdroidserver/update.py
 #, python-brace-format
-msgid "Failed to get APK information, deleting {path}"
+msgid "Failed to get apk information, deleting {path}"
 msgstr "Abrufen der APK-Informationen fehlgeschlagen, {path} wird gelöscht"
 
 #: ../fdroidserver/update.py
 #, python-brace-format
-msgid "Failed to get APK information, skipping {path}"
+msgid "Failed to get apk information, skipping {path}"
 msgstr "Abrufen der APK-Informationen fehlgeschlagen, {path} wird übersprungen"
 
-#: ../fdroidserver/update.py
-msgid "Failed to get APK signing key fingerprint"
-msgstr "Abrufen des APK-Signierschlüssel-Fingerabdrucks fehlgeschlagen"
-
 #: ../fdroidserver/install.py
 #, python-brace-format
 msgid "Failed to install '{apkfilename}' on {dev}: {error}"
-msgstr "Installation von '{apkfilename}' auf {dev} fehlgeschlagen: {error}"
+msgstr "Installation von „{apkfilename}” auf {dev} fehlgeschlagen: {error}"
 
-#: ../fdroidserver/common.py
+#: ../fdroidserver/publish.py ../fdroidserver/common.py
 msgid "Failed to sign application"
 msgstr "Signieren der Anwendung fehlgeschlagen"
 
+#: ../fdroidserver/common.py
+msgid "Failed to zipalign application"
+msgstr "Anwendung konnte nicht mit zipalign komprimiert werden"
+
 #: ../fdroidserver/build.py
 #, python-brace-format
 msgid "Fetched buildserverid from VM: {buildserverid}"
@@ -793,19 +791,29 @@ msgstr "BuildServerID von VM abgerufen: {buildserverid}"
 #: ../fdroidserver/signatures.py
 #, python-brace-format
 msgid "Fetched signatures for '{apkfilename}' -> '{sigdir}'"
-msgstr "Signaturen für '{apkfilename} '-> '{sigdir}' abgerufen"
+msgstr "Signaturen für {apkfilename} -> {sigdir} abgerufen"
 
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "File disappeared while processing it: {path}"
 msgstr "Datei verschwand während der Verarbeitung: {path}"
 
-#: ../fdroidserver/build.py ../fdroidserver/install.py
-#: ../fdroidserver/rewritemeta.py ../fdroidserver/scanner.py
-#: ../fdroidserver/update.py
+#: ../fdroidserver/verify.py ../fdroidserver/stats.py ../fdroidserver/update.py
+#: ../fdroidserver/rewritemeta.py ../fdroidserver/build.py
+#: ../fdroidserver/checkupdates.py ../fdroidserver/scanner.py
+#: ../fdroidserver/install.py
 msgid "Finished"
 msgstr "Fertiggestellt"
 
+#: ../fdroidserver/lint.py
+msgid "Flattr donation methods belong in the FlattrID flag"
+msgstr "Flattr-Spendenmethoden gehören in die FlattrID-Flagge"
+
+#: ../fdroidserver/lint.py
+#, fuzzy
+msgid "Flattr donation methods belong in the FlattrID: field"
+msgstr "Flattr-Spendenmethoden gehören in die FlattrID-Flagge"
+
 #: ../fdroidserver/lint.py
 msgid "Forbidden HTML tags"
 msgstr "Verbotene HTML-Befehle"
@@ -829,26 +837,23 @@ msgid "Found \"{path}\" graphic without metadata for app \"{name}\"!"
 msgstr "Grafik \"{path}\" ohne Metadaten für App \"{name}\" gefunden!"
 
 #: ../fdroidserver/update.py
-#, python-brace-format
+#, fuzzy, python-brace-format
 msgid "Found bad funding file \"{path}\" for \"{name}\":"
 msgstr "Schlechte Finanzierungsdatei \"{path}\" für \"{name}\" gefunden:"
 
 #: ../fdroidserver/common.py
 msgid "Found invalid appids in arguments"
-msgstr "Ungültige App-IDs in Argumenten gefunden"
+msgstr "Ungültige Appids in Argumenten gefunden"
 
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
 #: ../fdroidserver/common.py
 msgid "Found invalid versionCodes for some apps"
 msgstr "Ungültige versionCodes für einige Apps gefunden"
 
 #: ../fdroidserver/common.py
-#, python-brace-format
+#, fuzzy, python-brace-format
 msgid "Found multiple JAR Signature Block Files in {path}"
-msgstr "Mehrere JAR-Signaturzertifikate in {path} gefunden"
-
-#: ../fdroidserver/common.py
-msgid "Found multiple Signer Certificates!"
-msgstr "Mehrere Signaturzertifikate für das Repository gefunden!"
+msgstr "Mehrere Signaturzertifikate in {path} gefunden"
 
 #: ../fdroidserver/metadata.py
 #, python-brace-format
@@ -859,6 +864,11 @@ msgstr "Mehrere Metadaten-Dateien für {appid} gefunden"
 msgid "Found multiple signing certificates for repository."
 msgstr "Mehrere Signaturzertifikate für das Repository gefunden."
 
+#: ../fdroidserver/update.py
+#, python-brace-format
+msgid "Found multiple signing certificates in {path}"
+msgstr "Mehrere Signaturzertifikate in {path} gefunden"
+
 #: ../fdroidserver/index.py
 msgid "Found no signing certificates for repository."
 msgstr "Es wurden keine Signaturzertifikate für das Repository gefunden."
@@ -866,22 +876,12 @@ msgstr "Es wurden keine Signaturzertifikate für das Repository gefunden."
 #: ../fdroidserver/lint.py
 #, python-format
 msgid "Found non-file at %s"
-msgstr "Ungültige Datei bei %s gefunden"
+msgstr "Eine Nicht-Datei gefunden bei %s"
 
 #: ../fdroidserver/deploy.py
 #, python-brace-format
 msgid "Found {apkfilename} at {url}"
-msgstr "{apkfilename} gefunden auf {url}"
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Found {count} problems in {filename}"
-msgstr "{count} Probleme in {filename} gefunden"
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Found {count} warnings in {filename}"
-msgstr "{count} Warnungen in {filename} gefunden"
+msgstr ""
 
 #: ../fdroidserver/update.py
 #, python-brace-format
@@ -901,41 +901,40 @@ msgstr "Git clean fehlgeschlagen"
 msgid "Git fetch failed"
 msgstr "Git fetch fehlgeschlagen"
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
+#: ../fdroidserver/common.py
+msgid "Git remote set-head failed"
+msgstr "Git remote set-head fehlgeschlagen"
+
 #: ../fdroidserver/common.py
 #, python-format
 msgid "Git remote set-head failed: \"%s\""
 msgstr "Git remote set-head fehlgeschlagen: \"%s\""
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
 #: ../fdroidserver/common.py
 msgid "Git reset failed"
 msgstr "Git reset fehlgeschlagen"
 
-#: ../fdroidserver/common.py
-msgid "Git submodule deinit failed"
-msgstr "Git-Submodul deinit fehlgeschlagen"
-
 #: ../fdroidserver/common.py
 msgid "Git submodule sync failed"
-msgstr "Git-Submodul sync fehlgeschlagen"
+msgstr "Git submodule sync fehlgeschlagen"
 
 #: ../fdroidserver/common.py
 msgid "Git submodule update failed"
-msgstr "Git-Submodul update fehlgeschlagen"
+msgstr "Git submodule update fehlgeschlagen"
 
 #: ../fdroidserver/common.py
 msgid "HTTPS must be used with Subversion URLs!"
 msgstr "HTTPS muss bei Subversion-URLs verwendet werden!"
 
 #: ../fdroidserver/deploy.py
+#, fuzzy
 msgid "If a git mirror gets to big, allow the archive to be deleted"
-msgstr "Wenn ein Git-Mirror zu groß wird, erlaube dem Archiv gelöscht zu werden"
+msgstr "Wenn ein Git-Mirror zu groß wird, kann das Archiv gelöscht werden"
 
 #: ../fdroidserver/deploy.py
-#, python-brace-format
+#, fuzzy, python-brace-format
 msgid "If this upload fails, try manually uploading to {url}"
-msgstr "Wenn das Hochladen fehlschlägt, versuchen Sie ihn manuell auf {url} hochzuladen"
+msgstr "Wenn dieser Upload fehlschlägt, versuchen Sie ihn manuell auf {url} hochzuladen."
 
 #: ../fdroidserver/metadata.py
 #, python-brace-format
@@ -945,17 +944,7 @@ msgstr "'{field}' in '{metapath}' Metadaten wird ignoriert, da es veraltet ist."
 #: ../fdroidserver/update.py
 #, python-format
 msgid "Ignoring FUNDING.yml entry longer than 2048: %s"
-msgstr "Ignoriere FUNDING.yml-Einträge länger als 2048: %s"
-
-#: ../fdroidserver/update.py
-#, python-format
-msgid "Ignoring bad element in manifest: %s"
-msgstr "Ignoriere schlechtes Element im Manifest: %s"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Ignoring deprecated {oldfile}, use {newfile}!"
-msgstr "Ignoriere veraltete {oldfile}, benutze {newfile}!"
+msgstr "Ignoriere FUNDING.yml Einträge länger als 2048: %s"
 
 #: ../fdroidserver/index.py
 msgid "Ignoring package without metadata: "
@@ -966,31 +955,26 @@ msgstr "Ignoriere Paket ohne Metadaten: "
 msgid "Ignoring stale cache data for {apkfilename}"
 msgstr "Ignoriere veraltete Cachedaten für {apkfilename}"
 
+#: ../fdroidserver/rewritemeta.py
+#, python-brace-format
+msgid "Ignoring {ext} file at '{path}'"
+msgstr "Ignoriere die Datei {ext} bei '{path}'"
+
 #: ../fdroidserver/update.py
 msgid "Include APKs that are signed with disabled algorithms like MD5"
-msgstr "APKs einschließen, die mit untauglichen Algorithmen wie MD5 signiert sind"
+msgstr "APKs einschliessen, die mit deaktivierten Algorithmen wie MD5 signiert sind"
 
 #: ../fdroidserver/mirror.py
 msgid "Include the PGP signature .asc files in the mirror"
-msgstr "Einbinden der .asc-PGP-Signaturdateien in den Spiegelserver"
+msgstr ""
 
 #: ../fdroidserver/mirror.py
 msgid "Include the build logs in the mirror"
-msgstr "Einbinden der Build-Protokolle in den Spiegelserver"
+msgstr ""
 
 #: ../fdroidserver/mirror.py
 msgid "Include the source tarballs in the mirror"
-msgstr "Einbinden der Quellen-Tarballs in den Spiegelserver"
-
-#: ../fdroidserver/metadata.py
-#, python-format
-msgid "Including metadata from %s@%s"
-msgstr "Einschließlich der Metadaten von %s@%s"
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Including metadata from {path}"
-msgstr "Einschließlich der Metadaten von {path}"
+msgstr ""
 
 #: ../fdroidserver/common.py
 msgid "Initialising submodules"
@@ -1000,21 +984,31 @@ msgstr "Initialisiere Submodule"
 msgid "Install all signed applications available"
 msgstr "Alle verfügbaren, signierten Anwendungen installieren"
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Install built packages on devices"
 msgstr "Erstellte Programmpakete auf Geräten installieren"
 
 #: ../fdroidserver/install.py
-#, python-format
+#, fuzzy, python-format
 msgid "Installing %s..."
-msgstr "Installiere %s …"
+msgstr "%s installieren …"
+
+#: ../fdroidserver/install.py
+#, python-format
+msgid "Installing %s…"
+msgstr "%s installieren …"
+
+#: ../fdroidserver/install.py
+#, fuzzy, python-brace-format
+msgid "Installing '{apkfilename}' on {dev}..."
+msgstr "Installiere '{apkfilename}' auf {dev}.…"
 
 #: ../fdroidserver/install.py
 #, python-brace-format
-msgid "Installing '{apkfilename}' on {dev}..."
-msgstr "Installiere '{apkfilename}' auf {dev} …"
+msgid "Installing '{apkfilename}' on {dev}…"
+msgstr "Installiere '{apkfilename}' auf {dev}.…"
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Interact with the repo HTTP server"
 msgstr "Mit dem HTTP-Server des Repository kommunizieren"
 
@@ -1022,36 +1016,53 @@ msgstr "Mit dem HTTP-Server des Repository kommunizieren"
 msgid "Invalid APK"
 msgstr "Ungültige APK"
 
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "Invalid AutoUpdateMode: {mode}"
-msgstr "Ungültiger AutoUpdateMode: {mode}"
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "Invalid UpdateCheckMode: {mode}"
-msgstr "Ungültiger UpdateCheckMode: {mode}"
-
-#: ../fdroidserver/checkupdates.py
+#: ../fdroidserver/lint.py ../fdroidserver/checkupdates.py
 #, python-brace-format
 msgid "Invalid VercodeOperation: {field}"
 msgstr "Ungültige VercodeOperation: {field}"
 
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Invalid VercodeOperation: {invalid_ops}"
-msgstr "Ungültige VercodeOperation: {invalid_ops}"
-
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "Invalid application ID {appid}"
-msgstr "Ungültige Anwendungs-ID {appid}"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+#, python-format
+msgid "Invalid boolean '%s'"
+msgstr "Ungültiger boolescher Wert '%s'"
+
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Invalid build flag at {line} in {linedesc}"
+msgstr "Ungültiges Build-Flag bei {line} in {linedesc}"
+
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Invalid build format: {value} in {name}"
+msgstr "Ungültiges Buildformat: {value} in {name}"
 
 #: ../fdroidserver/lint.py
 msgid "Invalid bulleted list"
 msgstr "Ungültige Aufzählung"
 
+#: ../fdroidserver/lint.py
+#, python-format
+msgid "Invalid license tag \"%s\"! Use only tags from https://spdx.org/license-list"
+msgstr "Ungültiges Lizenz-Tag \"%s\"! Verwenden Sie nur Tags von https://spdx.org/license-list"
+
+#: ../fdroidserver/lint.py
+msgid "Invalid link - use [http://foo.bar Link title] or [http://foo.bar]"
+msgstr "Ungültiger Link - verwenden Sie [http://foo.bar Linktitel] oder [http://foo.bar]"
+
+#: ../fdroidserver/metadata.py
+#, python-format
+msgid "Invalid metadata in %s:%d"
+msgstr "Ungültige Metadaten in %s:%d"
+
+#: ../fdroidserver/metadata.py
+msgid "Invalid metadata in: "
+msgstr "Ungültige Metadaten in: "
+
 #: ../fdroidserver/common.py
 #, python-format
 msgid "Invalid name for published file: %s"
@@ -1059,28 +1070,33 @@ msgstr "Ungültiger Name für die veröffentlichte Datei: %s"
 
 #: ../fdroidserver/common.py
 #, python-brace-format
-msgid "Invalid ndk: entry in build: \"{ndk}\""
-msgstr "Ungültiger ndk: Eintrag in Build: \"{ndk}\""
+msgid "Invalid package name {0}"
+msgstr "Ungültiger Paketname {0}"
 
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "Invalid redirect to non-HTTPS: {before} -> {after} "
-msgstr "Ungültige Umleitung auf Nicht-HTTPS: {before} -> {after} "
+msgstr "Ungültige Umleitung auf Nicht-HTTTPS: {before} -> {after} "
 
 #: ../fdroidserver/metadata.py
 #, python-brace-format
 msgid "Invalid scrlib metadata: '{file}' does not exist"
-msgstr "Ungültige scrlib-Metadaten: '{file}' ist nicht vorhanden"
+msgstr ""
 
 #: ../fdroidserver/metadata.py
 #, python-brace-format
 msgid "Invalid srclib metadata: could not parse '{file}'"
-msgstr "Ungültige srclib-Metadaten: '{file}' konnte nicht analysiert werden"
+msgstr ""
 
 #: ../fdroidserver/metadata.py
 #, python-brace-format
 msgid "Invalid srclib metadata: unknown key '{key}' in '{file}'"
-msgstr "Ungültige srclib-Metadaten: unbekannter Schlüssel '{key}' in '{file}'"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Invalid versionCode: \"{versionCode}\" is not an integer!"
+msgstr "Ungültiger Versionscode: \"{versionCode}\" ist keine ganze Zahl!"
 
 #: ../fdroidserver/common.py
 #, python-brace-format
@@ -1096,8 +1112,8 @@ msgstr "JAR-Signatur verifiziert: {path}"
 msgid "Java JAR file"
 msgstr "Java JAR-Datei"
 
-#: ../fdroidserver/mirror.py ../fdroidserver/publish.py
-#: ../fdroidserver/update.py
+#: ../fdroidserver/publish.py ../fdroidserver/update.py
+#: ../fdroidserver/mirror.py
 msgid "Java JDK not found! Install in standard location or set java_paths!"
 msgstr "Java JDK nicht gefunden! Installieren Sie es in einem Standardordner oder setzen Sie java_paths!"
 
@@ -1113,31 +1129,27 @@ msgstr "Java jarsigner nicht gefunden! Installieren Sie es in einem Standardordn
 msgid "Javascript in HTML src attributes"
 msgstr "Javascript in HTML src-Attributen"
 
-#: ../fdroidserver/build.py
-#, python-brace-format
-msgid "Keeping failed build \"{apkfilename}\""
-msgstr "Fehlgeschlagener Build \"{apkfilename}\" behalten"
-
 #: ../fdroidserver/init.py
 msgid "Keystore for signing key:\t"
 msgstr "Schlüsselspeicher für den Signierschlüssel:\t"
 
 #: ../fdroidserver/lint.py
-msgid "Known debug key is used in AllowedAPKSigningKeys: "
-msgstr "Bekannte Debug-Schlüssel werden in AllowedAPKSigningKeys verwendet: "
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
+#, fuzzy, python-brace-format
 msgid "Last used commit '{commit}' looks like a tag, but UpdateCheckMode is '{ucm}'"
-msgstr "Der zuletzt verwendete Commit '{commit}' sieht aus wie ein Tag, aber der Aktualisierung-Überprüfungs-Modus ist '{ucm}'"
+msgstr "Der zuletzt verwendete Commit '{commit}' sieht aus wie ein Tag, aber der Update Check Modus ist '{ucm}'"
 
 #: ../fdroidserver/lint.py
+#, fuzzy
 msgid "Liberapay donation methods belong in the Liberapay: field"
-msgstr "Liberapay-Spendenmethoden gehören in das Liberapay: Feld"
+msgstr "Liberapay-Spendenmethoden gehören in das LiberapayID-Flag"
+
+#: ../fdroidserver/lint.py
+msgid "Liberapay donation methods belong in the LiberapayID flag"
+msgstr "Liberapay-Spendenmethoden gehören in das LiberapayID-Flag"
 
 #: ../fdroidserver/rewritemeta.py
-msgid "List files that would be reformatted (dry run)"
-msgstr "Dateien listen, die reformatiert würden (Probelauf)"
+msgid "List files that would be reformatted"
+msgstr "Dateien listen, die reformatiert würden"
 
 #: ../fdroidserver/lint.py
 msgid "Locale included in f-droid.org URL"
@@ -1149,54 +1161,45 @@ msgstr "Erstellung bei Fehlern anhalten"
 
 #: ../fdroidserver/index.py
 msgid "Malformed repository mirrors."
-msgstr "Fehlerhafte Paketquellen-Spiegelserver."
+msgstr "Fehlerhafte Repository Mirrors."
 
 #: ../fdroidserver/deploy.py
 msgid "Malformed serverwebroot line:"
-msgstr "Fehlerhafte serverwebroot-Zeile:"
-
-#: ../fdroidserver/scanner.py
-#, python-format
-msgid "Max recursion depth in ZIP file reached: %s"
-msgstr "Maximale Rekursionstiefe in ZIP-Datei erreicht: %s"
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "Mirror config for {url} contains \"isPrimary\" key!"
-msgstr "Spiegelserver-Konfiguration für {url} enthält \"isPrimary\"-Schlüssel!"
+msgstr "Fehlerhafte serverwebroot Zeile:"
 
 #: ../fdroidserver/mirror.py
 msgid "Mirror the full repo and archive, all file types."
-msgstr "Spiegeln Sie die komplette Paketquelle und das Archiv, inklusive aller Dateitypen."
+msgstr ""
 
 #: ../fdroidserver/gpgsign.py
 msgid "Missing output directory"
 msgstr "Fehlendes Ausgabeverzeichnis"
 
-#: ../fdroidserver/metadata.py
-msgid "Moving Anti-Features declarations to localized files:"
-msgstr "Verschiebe Anti-Feature-Deklarationen in lokalisierte Dateien:"
-
-#: ../fdroidserver/index.py
-msgid "Neither \"repo_pubkey\" nor \"keystorepass\" set in config.yml"
-msgstr "Weder \"repo_pubkey\" noch \"keystorepass\" in config.yml gesetzt"
-
-#: ../fdroidserver/verify.py
+#: ../fdroidserver/lint.py
 #, python-format
-msgid "No APK for package: %s"
-msgstr "Kein APK für das Paket: %s"
+msgid "Name '%s' is just the auto name - remove it"
+msgstr "Name '%s' ist nur der automatische Name - entfernen Sie ihn"
+
+#: ../fdroidserver/common.py
+msgid "No 'config.py' found, using defaults."
+msgstr "Keine 'config.py' gefunden, nutze Standardeinstellungen."
 
 #: ../fdroidserver/common.py
 msgid "No Android SDK found!"
-msgstr "Kein Android-SDK gefunden!"
+msgstr "Keine Android SDK gefunden!"
+
+#: ../fdroidserver/import.py
+msgid "No android or kivy project could be found. Specify --subdir?"
+msgstr "Es konnte kein Android- oder Kivy-Projekt gefunden werden. --subdir angeben?"
 
 #: ../fdroidserver/install.py
 msgid "No attached devices found"
 msgstr "Keine angeschlossenen Geräte gefunden"
 
-#: ../fdroidserver/install.py
-msgid "No devices found for `adb install`! Please plug one in."
-msgstr "Keine Geräte für `adb install` gefunden! Bitte schließen Sie eines an."
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "No commit specified for {versionName} in {linedesc}"
+msgstr "Kein Commit angegeben für {versionName} in {linedesc}"
 
 #: ../fdroidserver/index.py
 msgid "No fingerprint in URL."
@@ -1206,34 +1209,26 @@ msgstr "Kein Fingerabdruck in der URL."
 msgid "No git submodules available"
 msgstr "Keine Git-Submodule verfügbar"
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
+#, fuzzy
 msgid "No gradle project could be found. Specify --subdir?"
-msgstr "Es konnte kein Gradle-Projekt gefunden werden. \"--subdir\" angeben?"
+msgstr "Es konnte kein Android- oder Kivy-Projekt gefunden werden. --subdir angeben?"
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py ../fdroidserver/common.py
 msgid "No information found."
 msgstr "Keine Informationen gefunden."
 
-#: ../fdroidserver/checkupdates.py
-msgid "No matching tags found"
-msgstr "Keine passenden Tags gefunden"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "No minimum SDK version found in {0}, using default (3)."
-msgstr "Keine Mindest-SDK-Version in {0} gefunden, Standard (3) verwendet."
-
 #: ../fdroidserver/lint.py
 msgid "No need to specify that the app is Free Software"
-msgstr "Sie müssen nicht angeben, dass die App Freie Software ist"
+msgstr "Sie müssen nicht angeben, dass die App freie Software ist"
 
 #: ../fdroidserver/lint.py
 msgid "No need to specify that the app is for Android"
 msgstr "Sie müssen nicht angeben, dass die App für Android ist"
 
 #: ../fdroidserver/deploy.py
-msgid "No option set! Edit your config.yml to set at least one of these:"
-msgstr "Keine Option gesetzt! Bearbeiten Sie Ihre config.yml, um mindestens eine davon zu setzen:"
+msgid "No option set! Edit your config.py to set at least one of these:"
+msgstr "Keine Option gesetzt! Bearbeiten Sie Ihre config.py, um mindestens eine davon zu setzen:"
 
 #: ../fdroidserver/common.py
 msgid "No packages specified"
@@ -1241,14 +1236,14 @@ msgstr "Keine Pakete angegeben"
 
 #: ../fdroidserver/install.py
 #, python-format
-msgid "No signed APK available for %s"
+msgid "No signed apk available for %s"
 msgstr "Keine signierte Apk für %s verfügbar"
 
 #: ../fdroidserver/install.py
 msgid "No signed output directory - nothing to do"
-msgstr "Kein signiertes Ausgabeverzeichnis – nichts zu tun"
+msgstr "Kein signiertes Ausgabeverzeichnis - nichts zu tun"
 
-#: ../fdroidserver/common.py
+#: ../fdroidserver/update.py ../fdroidserver/common.py
 #, python-brace-format
 msgid "No signing certificates found in {path}"
 msgstr "Keine Signaturzertifikate in {path} gefunden"
@@ -1258,22 +1253,15 @@ msgstr "Keine Signaturzertifikate in {path} gefunden"
 msgid "No such package: %s"
 msgstr "Kein solches Paket: %s"
 
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "No such versionCode {versionCode} for app {appid}"
 msgstr "Kein Versionscode {versionCode} für App {appid}"
 
-#: ../fdroidserver/checkupdates.py
-msgid "No tags found"
-msgstr "Keine Tags gefunden"
-
-#: ../fdroidserver/publish.py ../fdroidserver/verify.py
+#: ../fdroidserver/verify.py ../fdroidserver/publish.py
 msgid "No unsigned directory - nothing to do"
-msgstr "Kein unsigniertes Verzeichnis – nichts zu tun"
-
-#: ../fdroidserver/__main__.py
-msgid "No version information could be found."
-msgstr "Es konnten keine Versionsinformation gefunden werden."
+msgstr "Kein unsigniertes Verzeichnis - nichts zu tun"
 
 #: ../fdroidserver/common.py
 msgid "Not a valid size definition: \"{}\""
@@ -1289,9 +1277,10 @@ msgid "Nothing to do for {appid}."
 msgstr "Keine zu erledigenden Aufgaben für {appid}."
 
 #: ../fdroidserver/init.py
-msgid "Now set these in config.yml:"
-msgstr "Legen Sie diese nun in der config.yml fest:"
+msgid "Now set these in config.py:"
+msgstr "Legen Sie diese nun in der config.py fest:"
 
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "OBB file has newer versionCode({integer}) than any APK:"
@@ -1307,63 +1296,68 @@ msgstr "Der OBB-Packetname stimmt mit keinem unterstützten APK überein:"
 
 #: ../fdroidserver/deploy.py
 msgid "Offline machine, skipping git mirror generation until `fdroid deploy`"
-msgstr "Maschine offline, überspringe git-Spiegelgeneration bis `fdroid deploy`"
+msgstr ""
 
-#: ../fdroidserver/deploy.py
-msgid "One of the 'github_releases' config items is missing the 'packageNames' value. skipping ..."
-msgstr "Einem der Konfigurationselemente von 'github_releases' fehlt der Wert 'packageNames'. Überspringe …"
+#: ../fdroidserver/common.py
+#, python-brace-format
+msgid "Old APK signature failed to verify: {path}"
+msgstr "Alte APK-Signatur konnte nicht überprüft werden: {path}"
 
-#: ../fdroidserver/deploy.py
-msgid "One of the 'github_releases' config items is missing the 'projectUrl' value. skipping ..."
-msgstr "Einem der Konfigurationselemente von 'github_releases' fehlt der Wert 'projectUrl'. Überspringe …"
+#: ../fdroid ../fdroidserver/__main__.py
+msgid "Old, deprecated name for fdroid deploy"
+msgstr "Veralteter Name für fdroid deploy"
 
-#: ../fdroidserver/deploy.py
-msgid "One of the 'github_releases' config items is missing the 'token' value. skipping ..."
-msgstr "Einem der Konfigurationselemente von 'github_releases' fehlt der Wert 'token'. Überspringe …"
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Only PNG and JPEG are supported for graphics, found: {path}"
 msgstr "Nur PNG und JPEG werden für Grafiken unterstützt, gefunden wurde: {path}"
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/common.py
-msgid "Only accepts a single key \"env\""
-msgstr "Nur ein einziger Schlüssel \"env\" wird akzeptiert"
+#: ../fdroidserver/checkupdates.py
+msgid "Only print differences with the Play Store"
+msgstr "Nur Unterschiede zum Play Store ausgeben"
 
 #: ../fdroidserver/checkupdates.py
 msgid "Only process apps with auto-updates"
 msgstr "Nur Apps mit automatischen Aktualisierungen verarbeiten"
 
 #: ../fdroidserver/lint.py
+#, fuzzy
 msgid "OpenCollective donation methods belong in the OpenCollective: field"
-msgstr "OpenCollective-Spendenmethoden gehören in das OpenCollective: Feld"
+msgstr "Flattr-Spendenmethoden gehören in die FlattrID-Flagge"
+
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "Options"
+msgstr "Optionen"
 
 #: ../fdroidserver/verify.py
 msgid "Output JSON report to file named after APK."
-msgstr "In Datei ausgegebener JSON-Bericht wird nach APK benannt."
+msgstr "JSON-Bericht in eine nach der APK benannte Datei ausgeben."
 
 #: ../fdroidserver/scanner.py
 msgid "Output JSON to stdout."
-msgstr "JSON an stdout ausgeben."
+msgstr ""
 
-#: ../fdroidserver/checkupdates.py ../fdroidserver/gpgsign.py
-#: ../fdroidserver/publish.py ../fdroidserver/signindex.py
-#: ../fdroidserver/update.py
+#: ../fdroidserver/gpgsign.py ../fdroidserver/publish.py
+#: ../fdroidserver/update.py ../fdroidserver/signindex.py
+#: ../fdroidserver/checkupdates.py
 msgid "Outputting JSON"
 msgstr "JSON ausgeben"
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "Overall license of the project."
 msgstr "Gesamt-Lizenz des Projekts."
 
+#: ../fdroidserver/dscanner.py
+msgid "Override path for repo APKs (default: ./repo)"
+msgstr "Pfad für die APK-Paketquelle überschreiben (Standard: ./repo)"
+
 #: ../fdroidserver/index.py
 #, python-brace-format
 msgid "Overriding blank versionName in {apkfilename} from metadata: {version}"
 msgstr "Überschreiben von leeren Versionsnamen in {apkfilename} aus Metadaten: {version}"
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 #, python-brace-format
 msgid "Package \"{appid}\" already exists"
 msgstr "Paket \"{appid}\" existiert bereits"
@@ -1371,16 +1365,19 @@ msgstr "Paket \"{appid}\" existiert bereits"
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "Parsing manifest at '{path}'"
-msgstr "Analysiere Manifest bei '{path}'"
+msgstr "Analysiere Manifest bei {path}"
 
 #: ../fdroidserver/common.py
 msgid "Password required with username"
 msgstr "Passwort mit Benutzername benötigt"
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "Path to main Android project subdirectory, if not in root."
 msgstr "Pfad zum Unterverzeichnis des Android-Hauptprojekts, wenn es nicht im Stammverzeichnis ist."
 
+msgid "Path to main android project subdirectory, if not in root."
+msgstr "Pfad zum zentralen Androidprojekt-Unterverzeichnis, wenn es nicht im Stammverzeichnis ist."
+
 #: ../fdroidserver/init.py
 msgid "Path to the Android SDK (sometimes set in ANDROID_HOME)"
 msgstr "Pfad zum Android-SDK (Softwareentwicklungsbaukasten) (mitunter in ANDROID_HOME festgelegt)"
@@ -1393,24 +1390,26 @@ msgstr "Pfad zum Git-Repository, der zur Anmeldung verwendet werden soll"
 msgid "Path to the keystore for the repo signing key"
 msgstr "Pfad zum Schlüsselspeicher für den Repository-Signierschlüssel"
 
+#: ../fdroidserver/dscanner.py
+msgid "Prepare Drozer to run a scan"
+msgstr "Drozer auf einen Suchlauf vorbereiten"
+
+msgid "Prepare drozer to run a scan"
+msgstr "Drozer auf einen Scan vorbereiten"
+
 #: ../fdroidserver/nightly.py
 msgid "Print the secret variable to the terminal for easy copy/paste"
 msgstr "Drucken der geheimen Variable in das Terminal zum einfachen Kopieren/Einfügen"
 
-#: ../fdroidserver/install.py
+#: ../fdroidserver/metadata.py
 #, python-brace-format
-msgid "Privacy mode was enabled based on your locale ({country_code})."
-msgstr "Der Datenschutzmodus wurde auf der Grundlage Ihres Gebietsschemas ({country_code}) aktiviert."
-
-#: ../fdroidserver/scanner.py
-#, python-format
-msgid "Problem with ZIP file: %s, error %s"
-msgstr "Problem mit der ZIP-Datei: %s, Fehler %s"
+msgid "Problem with description of {appid}: {error}"
+msgstr "Problem mit der Beschreibung von {appid}: {error}"
 
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "Problem with xml at '{path}'"
-msgstr "Problem mit xml bei '{path}'"
+msgstr "Problem mit xml bei {path}"
 
 #: ../fdroidserver/checkupdates.py
 msgid "Process auto-updates"
@@ -1430,7 +1429,11 @@ msgstr "Verarbeite {appid}"
 msgid "Produce human-readable XML/JSON for index files"
 msgstr "Erstelle menschenlesbares XML/JSON für Indexdateien"
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/update.py
+msgid "Produce human-readable index.xml"
+msgstr "Visuell lesbare „index.xml“ herstellen"
+
+#: ../fdroidserver/import.py
 msgid "Project URL to import from."
 msgstr "Projekt-Adresse, von der importiert werden soll."
 
@@ -1442,25 +1445,21 @@ msgstr "Interpunktion sollte vermieden werden"
 msgid "Push the log to this git remote repository"
 msgstr "Anmeldung an diesem Git-Repository durchführen"
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Pushing binary transparency log to {url}"
 msgstr "Binäres Transparenz-Log nach {url} pushen"
 
-#: ../fdroidserver/deploy.py
-msgid "Pushing to remote server failed!"
-msgstr "Pushen zum Remote-Server fehlgeschlagen!"
-
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Pushing to {url}"
 msgstr "Pushen auf {url}"
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Quickly start a new repository"
 msgstr "Schnellstart eines neuen Repositorys"
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Read all the metadata files and exit"
 msgstr "Alle Metadaten-Dateien betrachten und beenden"
 
@@ -1471,49 +1470,40 @@ msgstr "Lese '{config_file}'"
 
 #: ../fdroidserver/common.py
 #, python-brace-format
-msgid "Reading packageName/versionCode/versionName failed, APK invalid: '{apkfilename}'"
-msgstr "Lesen von packageName/versionCode/versionName fehlgeschlagen, APK ungültig: '{apkfilename}'"
+msgid "Reading minSdkVersion failed: \"{apkfilename}\""
+msgstr "Lesen von minSdkVersion fehlgeschlagen: \"{apkfilename}\""
 
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
+#. https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
 #: ../fdroidserver/common.py
 #, python-brace-format
-msgid "Reading packageName/versionCode/versionName failed,APK invalid: '{apkfilename}'"
-msgstr "Lesen von packageName/versionCode/versionName fehlgeschlagen,APK ungültig: '{apkfilename}'"
+msgid "Reading packageName/versionCode/versionName failed, APK invalid: '{apkfilename}'"
+msgstr "Lesen von packageName/versionCode/versionName fehlgeschlagen, APK ungültig: '{apkfilename}'"
 
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Reading {apkfilename} from cache"
 msgstr "Lese {apkfilename} aus dem Cache"
 
-#: ../fdroidserver/build.py
-msgid "Refresh and cache scanner rules and signatures from the network"
-msgstr "Aktualisieren und Zwischenspeichern von Scannerregeln und Signaturen aus dem Netzwerk"
-
-#: ../fdroidserver/publish.py
-#, python-brace-format
-msgid "Refusing to sign '{path}', file exists in both {dir1} and {dir2} folder."
-msgstr "Eintragen von '{path}' abgelehnt, Datei ist sowohl in Ordner {dir1} als auch {dir2} vorhanden."
-
-#: ../fdroidserver/verify.py
-msgid "Remove source tarball and any APKs if successfully verified."
-msgstr "Den Quell-Tarball und alle APKs entfernen, wenn sie erfolgreich verifiziert wurden."
+#: ../fdroidserver/stats.py
+msgid "Recalculate aggregate stats - use when changes have been made that would invalidate old cached data."
+msgstr "Sammelstatistik neu berechnen - nach Änderungen anwenden, die alte zwischengespeicherte Daten entwerten würden."
 
 #: ../fdroidserver/common.py
 msgid "Removing specified files"
 msgstr "Entferne angegebene Dateien"
 
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Removing {path}\""
-msgstr "Entferne {path}\""
-
 #: ../fdroidserver/update.py
 msgid "Rename APK files that do not match package.name_123.apk"
 msgstr "APK-Dateien umbenennen, die nicht dem Muster „package.name_123.apk“ entsprechen"
 
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "RepoType {type} is deprecated, please switch to git."
-msgstr ""
+#: ../fdroidserver/update.py
+msgid "Report on build data status"
+msgstr "Bericht zum Build-Datenstatus"
+
+#: ../fdroidserver/build.py
+msgid "Reset and create a brand new build server, even if the existing one appears to be ok."
+msgstr "Zurücksetzen und ganz neuen Build-Server einrichten, auch wenn der bestehende in Ordnung zu sein scheint."
 
 #: ../fdroidserver/nightly.py
 #, python-brace-format
@@ -1522,40 +1512,39 @@ msgstr "{apkfilename} erneut mit dem mitgelieferten debug.keystore signieren"
 
 #: ../fdroidserver/update.py
 msgid "Resize all the icons exceeding the max pixel size and exit"
-msgstr "Größe aller Symbole ändern, welche die maximale Pixelgröße überschreiten, und beenden"
+msgstr "Größe aller Symbole ändern, die die maximale Pixelgröße überschreiten, und beenden"
 
 #: ../fdroidserver/common.py
 msgid "Restrict output to warnings and errors"
 msgstr "Ausgabe auf Warnungen und Fehler beschränken"
 
-#: ../fdroidserver/net.py
-#, python-format
-msgid "Retrying failed download: %s"
-msgstr "Wiederholung des fehlgeschlagenen Downloads: %s"
-
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Rewrite all the metadata files"
 msgstr "Alle Metadaten-Dateien neu schreiben"
 
+#: ../fdroidserver/rewritemeta.py
+msgid "Rewrite to a specific format: "
+msgstr "In ein spezielles Format umschreiben: "
+
 #: ../fdroidserver/rewritemeta.py
 #, python-brace-format
 msgid "Rewriting '{appid}'"
 msgstr "Schreibe '{appid}' neu"
 
+#: ../fdroidserver/rewritemeta.py
+#, python-brace-format
+msgid "Rewriting '{appid}' to '{path}'"
+msgstr "Schreibe '{appid}' auf '{path}' neu"
+
 #: ../fdroidserver/checkupdates.py
 msgid "Run on git repo that has uncommitted changes"
 msgstr "Auf Git Repo, das nicht committete Änderungen hat, laufen lassen"
 
-#: ../fdroidserver/nightly.py
-#, python-brace-format
-msgid "Run over {cibase} to find -debug.apk. and skip repo_basedir {repo_basedir}"
-msgstr "{cibase} ausführen, um -debug.apk zu finden. und repo_basedir {repo_basedir} überspringen"
-
 #: ../fdroidserver/lint.py
 msgid "Run rewritemeta to fix formatting"
 msgstr "Metadaten neu schreiben, um Formatierungen zu korrigieren"
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 msgid "Running first pass with MD5 checking disabled"
 msgstr "Erster Durchlauf mit MD5-Prüfung abgeschaltet"
 
@@ -1564,24 +1553,18 @@ msgstr "Erster Durchlauf mit MD5-Prüfung abgeschaltet"
 msgid "Running wget in {path}"
 msgstr "Ausführen von wget in {path}"
 
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "SHA-256 of {url} does not match entry!"
-msgstr "SHA-256 der {url} stimmt nicht mit Eintrag überein!"
+#: ../fdroidserver/dscanner.py
+msgid "Scan only the latest version of each package"
+msgstr "Nur die neueste Version jedes Programmpakets durchsuchen"
 
 #: ../fdroidserver/build.py
 msgid "Scan the resulting APK(s) for known non-free classes."
-msgstr "Die resultierende(n) APK(s) auf bekannte nicht-quelloffene Klassen scannen."
+msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Scan the source code of a package"
 msgstr "Quellcode eines Programmpakets durchsuchen"
 
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Scanner found {count} problems in {apk}"
-msgstr "Scanner fand {count} Probleme in {apk}"
-
 #: ../fdroidserver/scanner.py
 #, python-brace-format
 msgid "Scanner found {count} problems in {appid}:"
@@ -1598,33 +1581,20 @@ msgid_plural "Scanner found {} problems"
 msgstr[0] "Scanner fand {count} Problem"
 msgstr[1] "Scanner fand {count} Probleme"
 
-#: ../fdroidserver/scanner.py
-msgid "Scanning APK for extra signing blocks."
-msgstr "APK auf zusätzliche Signierblöcke scannen."
-
-#: ../fdroidserver/scanner.py
-msgid "Scanning APK with dexdump for known non-free classes."
-msgstr "APK mit dexdump auf bekannte nicht-quelloffene Klassen scannen."
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Set NDK {release} ({version}) up"
-msgstr "NDK {release} ({version}) einrichten"
-
 #: ../fdroidserver/common.py
 msgid "Set clock to that time using:"
 msgstr "Einstellen der Uhr auf diese Zeit mit:"
 
 #: ../fdroidserver/nightly.py
 msgid "Set maximum releases in repo before older ones are archived"
-msgstr "Setze maximale Veröffentlichungen im Repo, bevor ältere archiviert werden"
+msgstr ""
 
 #: ../fdroidserver/build.py
 #, python-brace-format
 msgid "Set open file limit to {integer}"
 msgstr "Setzen des Limits für geöffnete Dateien auf {integer}"
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Set up an app build for a nightly build repo"
 msgstr "Ein App-Build für einen nightly Build-Repo einrichten"
 
@@ -1637,11 +1607,18 @@ msgstr "Das Setzen des Limits für geöffnete Dateien ist fehlgeschlagen: "
 msgid "Setting {0} sec timeout for this build"
 msgstr "Stelle einen {0} Sek timeout für diesen Build ein"
 
-#: ../fdroidserver/__main__.py
+#: ../fdroidserver/build.py
+msgid "Setup an emulator, install the APK on it and perform a Drozer scan"
+msgstr "Einen Emulator einrichten, die APK installieren und mit ihm eine Sicherheitsprüfung (Drozer scan) durchführen"
+
+msgid "Setup an emulator, install the apk on it and perform a drozer scan"
+msgstr "Einen Emulator einrichten, die APK installieren und mit ihm eine Sicherheitsprüfung (Drozer scan) durchführen"
+
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Sign and place packages in the repo"
 msgstr "Programmpakete in Paketquelle signieren und einstellen"
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Sign indexes created using update --nosign"
 msgstr "Erstellte Indizes durch Verwendung von „update --nosign“ signieren"
 
@@ -1654,11 +1631,6 @@ msgstr "Durchsuchen des Quellcodes nach Binärdateien und anderen Problemen übe
 msgid "Skipping '{apkfilename}' with invalid signature!"
 msgstr "Überspringen von '{apkfilename}' mit ungültiger Signatur!"
 
-#: ../fdroidserver/deploy.py ../fdroidserver/index.py
-#, python-format
-msgid "Skipping GitLab Pages mirror because the repo is too large (>%.2fGB)!"
-msgstr "Überspringe GitLab-Pages-Spiegelserver, da das Repo zu groß ist (>%.2f GB)!"
-
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Skipping index generation for {appid}"
@@ -1674,14 +1646,23 @@ msgstr "Überspringe '{apkfilename}' mit ungültiger Signatur!"
 msgid "Skipping {appid}: disabled"
 msgstr "Überspringen von {appid}: deaktiviert"
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/scanner.py
+#, python-brace-format
+msgid "Skipping {appid}: no builds specified"
+msgstr "Überspringe {appid}: keine Builds angegeben"
+
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 msgid "Specify a local folder to sync the repo to"
 msgstr "Einen lokalen Ordner bestimmen, in dem das Repository synchronisiert wird"
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 msgid "Specify an identity file to provide to SSH for rsyncing"
 msgstr "Eine Identitätsdatei bestimmen, die bei Re-Synchronisation an SSH übergeben wird"
 
+#: ../fdroidserver/build.py
+msgid "Specify that we're running on the build server"
+msgstr "Festlegen, dass F-Droid auf dem Build-Server läuft"
+
 #: ../fdroidserver/nightly.py
 msgid "Specify which debug keystore file to use."
 msgstr "Geben Sie an, welche Debug Keystore-Datei verwendet werden soll."
@@ -1692,6 +1673,11 @@ msgstr "Mehr Informationen als gewöhnlich ausspucken"
 
 #: ../fdroidserver/nightly.py
 #, python-brace-format
+msgid "Striping mystery signature from {apkfilename}"
+msgstr "Entferne mysteriöse Signatur aus {apkfilename}"
+
+#: ../fdroidserver/nightly.py
+#, fuzzy, python-brace-format
 msgid "Stripping mystery signature from {apkfilename}"
 msgstr "Entferne mysteriöse Signatur aus {apkfilename}"
 
@@ -1710,21 +1696,9 @@ msgstr "Zusammenfassung mit der Länge {length} liegt über der {limit} Zeicheng
 msgid "System clock is older than date in {path}!"
 msgstr "Die System-Uhr ist älter als das Datum in {path}!"
 
-#: ../fdroidserver/checkupdates.py
-msgid "Tags update mode only works for git, hg, bzr and git-svn repositories currently"
-msgstr "Der Aktualisierungsmodus funktioniert derzeit nur für Git-, Hg-, Bzr- und Git-SVN-Paketquellen"
-
-#: ../fdroidserver/checkupdates.py
-msgid "Tags update mode used in git-svn, but the repo was not set up with tags"
-msgstr "Aktualisierungsmodus mit Tags in git-svn verwendet, aber das Repo wurde nicht mit Tags eingerichtet"
-
 #: ../fdroidserver/build.py
 msgid "Test mode - put output in the tmp directory only, and always build, even if the output already exists."
-msgstr "Testmodus – Ausgabe nur ins tmp-Verzeichnis einfügen, immer erstellen, selbst wenn die Ausgabe bereits vorhanden ist."
-
-#: ../fdroidserver/index.py
-msgid "The \"qrcode\" Python package is not installed (e.g. apt-get install python3-qrcode)!"
-msgstr "Das Python-Paket \"qrcode\" ist nicht installiert (z. B. apt-get install python3-qrcode)!"
+msgstr "Testmodus - Ausgabe nur ins tmp-Verzeichnis einfügen, immer erstellen, selbst wenn die Ausgabe bereits vorhanden ist."
 
 #. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
 #: ../fdroidserver/update.py
@@ -1738,15 +1712,23 @@ msgstr "Basis-Adresse zur Anmeldung am Repository (Standard: https://f-droid.org
 
 #: ../fdroidserver/mirror.py
 msgid "The directory to write the mirror to"
-msgstr "Das Verzeichnis in das der Spiegelserver geschrieben werden soll"
+msgstr "Das Verzeichnis, in das der Mirror geschrieben werden soll"
 
 #: ../fdroidserver/nightly.py
 msgid "The file to be included in the repo (path or glob)"
 msgstr "Die in das Repo aufzunehmende Datei (Pfad oder Glob)"
 
+#: ../fdroidserver/deploy.py
+msgid "The only commands currently supported are 'init' and 'update'"
+msgstr "Derzeit werden nur die Befehle „init” und „update” unterstützt"
+
 #: ../fdroidserver/index.py
 msgid "The repository's fingerprint does not match."
-msgstr "Der Fingerabdruck des Repositorys stimmt nicht."
+msgstr "Der Fingerabdruck des Repositories stimmt nicht."
+
+#: ../fdroidserver/common.py
+msgid "The repository's index could not be verified."
+msgstr "Der Index des Repositories konnte nicht verifiziert werden."
 
 #: ../fdroidserver/deploy.py
 #, python-brace-format
@@ -1755,86 +1737,61 @@ msgstr "Das Wurzelverzeichnis für local_copy_dir \"{path}\" existiert nicht!"
 
 #: ../fdroidserver/publish.py
 msgid "There is a keyalias collision - publishing halted"
-msgstr "Es gibt eine Keyalias-Kollision – Veröffentlichung gestoppt"
+msgstr "Es gibt eine Keyalias-Kollision - Veröffentlichung gestoppt"
 
 #: ../fdroidserver/common.py
 msgid "These are the apps that have been archived from the main repo."
-msgstr "Dies sind die Apps, die aus dem Hauptrepository archiviert wurden."
+msgstr ""
 
-#: ../fdroidserver/mirror.py
-msgid "This command should never be used to mirror f-droid.org! A full copy requires more than 600GB."
-msgstr "Dieser Befehl sollte niemals verwendet werden, um f-droid.org zu spiegeln! Eine vollständige Kopie benötigt mehr als 600 GB."
-
-#: ../fdroidserver/common.py
-msgid "This is a repository of apps to be used with F-Droid. Applications in this repository are either official binaries built by the original application developers, or are binaries built from source by the admin of f-droid.org using the tools on https://gitlab.com/fdroid."
-msgstr "Dies ist eine Paketquelle für Anwendungen, die für die Benutzung zusammen mit F-Droid gedacht ist. Die darin enthaltenen Anwendungen sind entweder offizielle von den Entwicklern erstellte Binärdateien oder werden von f-droid.org mithilfe der Werkzeuge auf https://gitlab.com/fdroid aus dem Quellcode erstellt."
-
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 #, python-format
 msgid "This repo already has local metadata: %s"
 msgstr "Dieses Repo hat bereits lokale Metadaten: %s"
 
-#: ../fdroidserver/init.py
-#, python-format
-msgid ""
-"To complete the setup, add your APKs to \"%s\"\n"
-"then run \"fdroid update -c; fdroid update\".  You might also want to edit\n"
-"\"config.yml\" to set the URL, repo name, and more.  You should also set up\n"
-"a signing key (a temporary one might have been automatically generated).\n"
-"\n"
-"For more info: https://f-droid.org/docs/Setup_an_F-Droid_App_Repo\n"
-"and https://f-droid.org/docs/Signing_Process"
-msgstr ""
-"Um die Einrichtung abzuschließen, fügen Sie Ihre APKs zu \"%s\"\n"
-"und führen Sie dann \"fdroid update -c; fdroid update\" aus.  Vielleicht möchten Sie auch\n"
-"\"config.yml\" bearbeiten, um die URL, den Repo-Namen und mehr festzulegen.  Sie sollten auch\n"
-"einen Signierschlüssel einrichten (ein temporärer Schlüssel könnte automatisch generiert worden sein).\n"
-"\n"
-"Für weitere Informationen: https://f-droid.org/docs/Setup_an_F-Droid_App_Repo\n"
-"und https://f-droid.org/docs/Signing_Process"
-
-#: ../fdroidserver/deploy.py
-msgid "To use awsbucket, awssecretkey and awsaccesskeyid must also be set in config.yml!"
-msgstr "Um awsbucket zu benutzen, müssen awssecretkey und awsaccesskeyid auch in der config.yml gesetzt sein!"
-
-#: ../fdroidserver/deploy.py
-msgid "To use rclone, rclone_config and awsbucket must be set in config.yml!"
-msgstr "Um rclone zu benutzen, müssen rclone_config und awsbucket auch in der config.yml gesetzt sein!"
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
+msgid "To use awsbucket, awssecretkey and awsaccesskeyid must also be set in config.py!"
+msgstr "Um awsbucket zu benutzen, müssen awssecretkey und awsaccesskeyid auch in der config.py gesetzt sein!"
 
 #: ../fdroidserver/lint.py
 msgid "URL must start with https:// or http://"
-msgstr "URL muss mit https:// oder http:// beginnen"
+msgstr ""
 
 #: ../fdroidserver/lint.py
 msgid "URL shorteners should not be used"
 msgstr "Kurz-URL-Dienste sollten nicht verwendet werden"
 
+#: ../fdroidserver/metadata.py
+msgid "URL title is just the URL, use brackets: [URL]"
+msgstr "URL-Titel ist nur die URL, verwenden Sie Klammern: [URL]"
+
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "URL {url} in Description: {error}"
 msgstr "URL {url} in der Beschreibung: {error}"
 
 #: ../fdroidserver/lint.py
+#, fuzzy
 msgid "Unexpected license tag \"{}\"! Only use FSF or OSI approved tags from https://spdx.org/license-list"
-msgstr "Ungültiges Lizenz-Tag \"{}\"! Verwenden Sie nur Kennzeichen von https://spdx.org/license-list, die von FSF oder OSI anerkannt sind"
+msgstr "Ungültiges Lizenz-Tag \"%s\"! Verwenden Sie nur Tags von https://spdx.org/license-list"
 
 #: ../fdroidserver/lint.py
 msgid "Unexpected license tag \"{}\"! Only use license tags configured in your config file"
-msgstr "Unerwartetes Lizenz-Tag \"{}\"! Nur Lizenz-Tags verwenden, die in deiner config-Datei eingerichtet sind"
+msgstr ""
 
-#: ../fdroidserver/common.py
+#: ../fdroidserver/metadata.py
 #, python-brace-format
-msgid "Unknown entry {key} in {configname}"
-msgstr "Unbekannter Eintrag {key} in {configname}"
+msgid "Unexpected text on same line as {field} in {linedesc}"
+msgstr "Unerwarteter Text in der gleichen Zeile wie {field} in {linedesc}"
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Unknown exception found!"
 msgstr "Unbekannter Fehler aufgetreten!"
 
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "Unknown file '{filename}' in build '{versionName}'"
-msgstr "Unbekannte Datei '{filename}' im Build '{versionName}'"
+msgstr "Unbekannte Datei '{filename}' im Build '{versionName}''"
 
 #: ../fdroidserver/metadata.py
 #, python-format
@@ -1843,13 +1800,22 @@ msgstr "Unbekanntes Metadatenformat: %s"
 
 #: ../fdroidserver/metadata.py
 #, python-brace-format
+msgid "Unknown metadata format: {path}"
+msgstr "Unbekanntes Metadaten-Format: {path}"
+
+#: ../fdroidserver/metadata.py
+#, fuzzy, python-brace-format
 msgid "Unknown metadata format: {path} (use: *.yml)"
-msgstr "Unbekanntes Metadaten-Format: {path} (benutze: *.yml)"
+msgstr "Unbekanntes Metadaten-Format: {path}"
 
 #: ../fdroidserver/common.py
 msgid "Unknown version of aapt, might cause problems: "
 msgstr "Unbekannte Version von aapt, könnte Probleme verursachen: "
 
+#: ../fdroidserver/lint.py
+msgid "Unlinkified link - use [http://foo.bar Link title] or [http://foo.bar]"
+msgstr "Nicht verlinkter Link - verwenden Sie [http://foo.bar Linktitel] oder [http://foo.bar]"
+
 #: ../fdroidserver/lint.py
 msgid "Unnecessary leading space"
 msgstr "Unnötige führende Leerzeichen"
@@ -1863,12 +1829,20 @@ msgstr "Unnötige Leerzeichen an Ende"
 msgid "Unrecognised app field '{fieldname}' in '{path}'"
 msgstr "Nicht erkanntes App-Feld '{fieldname}' in '{path}'"
 
+#: ../fdroidserver/metadata.py
+msgid "Unrecognised app field: "
+msgstr "Nicht erkanntes App-Feld: "
+
 #: ../fdroidserver/metadata.py
 #, python-brace-format
 msgid "Unrecognised build flag '{build_flag}' in '{path}'"
-msgstr "Nicht erkanntes Build-Flag '{build_flag}' in '{path}'"
+msgstr "NIcht erkannte Build Flag '{build_flag}' in '{path}'"
+
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Unrecognised field '{field}' in {linedesc}"
+msgstr "Nicht erkanntes Feld '{field}' in {linedesc}"
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Unsupported file type \"{extension}\" for repo graphic"
@@ -1879,6 +1853,29 @@ msgstr "Nicht unterstützter Dateityp \"{extension}\" für Repo-Grafik"
 msgid "Unsupported graphics file found: {path}"
 msgstr "Nicht unterstützte Grafikdatei gefunden: {path}"
 
+#: ../fdroidserver/rewritemeta.py
+#, python-brace-format
+msgid "Unsupported metadata format, use: --to [{supported}]"
+msgstr "Nicht-unterstütztes Metadatenformat, verwenden Sie --to [{supported}]"
+
+#: ../fdroidserver/metadata.py
+msgid "Unterminated ]"
+msgstr "Unbeendet ]"
+
+#: ../fdroidserver/metadata.py
+msgid "Unterminated ]]"
+msgstr "Unbeendet ]]"
+
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Unterminated build in {name}"
+msgstr "Unbeendeter Build in {name}"
+
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Unterminated continuation in {name}"
+msgstr "Unfertige Fortsetzung in {name}"
+
 #: ../fdroidserver/lint.py
 #, python-format
 msgid "Unused extlib at %s"
@@ -1890,34 +1887,36 @@ msgid "Unused file at %s"
 msgstr "Nicht verwendete Datei bei %s"
 
 #: ../fdroidserver/scanner.py
-#, python-format
+#, fuzzy, python-format
 msgid "Unused scandelete path: %s"
-msgstr "Nicht verwendeter „scandelete“-Pfad: %s"
+msgstr "Nicht verwendete Datei bei %s"
 
 #: ../fdroidserver/scanner.py
-#, python-format
+#, fuzzy, python-format
 msgid "Unused scanignore path: %s"
-msgstr "Nicht verwendeter „scanignore“-Pfad: %s"
+msgstr "Nicht verwendete Datei bei %s"
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Update repo information for new packages"
 msgstr "Paketquelleninformationen zu neuen Programmpaketen aktualisieren"
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Update the binary transparency log for a URL"
 msgstr "Binäres Transparency-Log einer URL aktualisieren"
 
+#: ../fdroid ../fdroidserver/__main__.py
+msgid "Update the stats of the repo"
+msgstr "Repository-Statistik aktualisieren"
+
+#: ../fdroidserver/update.py ../fdroidserver/build.py
+msgid "Update the wiki"
+msgstr "Wiki aktualisieren"
+
 #: ../fdroidserver/checkupdates.py
 #, python-brace-format
 msgid "UpdateCheckData has invalid URL: {url}"
 msgstr "UpdateCheckData hat eine ungültige URL: {url}"
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "UpdateCheckData must match the version code as integer (\\d or [0-9]): {codeex}"
-msgstr "UpdateCheckData muss mit dem Versionscode als Ganzzahl (\\d oder [0-9]) übereinstimmen: {codeex}"
-
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "UpdateCheckData must use HTTPS URL: {url}"
@@ -1929,143 +1928,127 @@ msgid "UpdateCheckData not a valid URL: {url}"
 msgstr "UpdateCheckData hat eine ungültige URL: {url}"
 
 #: ../fdroidserver/lint.py
-msgid "UpdateCheckMode is set but it looks like checkupdates hasn't been run yet."
-msgstr "UpdateCheckMode ist gesetzt, aber likecheckupdates wurde vermutlich noch nicht ausgeführt."
+msgid "UpdateCheckMode is set but it looks like checkupdates hasn't been run yet"
+msgstr "UpdateCheckMode ist gesetzt, aber es sieht so aus, als ob checkupdates noch nicht ausgeführt wurde"
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
+#. Translators: https://developer.android.com/studio/build/application-id
 #: ../fdroidserver/lint.py
+#, fuzzy
+msgid "UpdateCheckName is set to the known application ID - it can be removed"
+msgstr "Update Check Name ist auf die bekannte App-ID gesetzt - sie kann entfernt werden"
+
+#: ../fdroidserver/lint.py
+#, fuzzy
 msgid "UpdateCheckName is set to the known application ID, it can be removed"
-msgstr "UpdateCheckName ist auf eine bekannte App-ID gesetzt, sie kann entfernt werden"
+msgstr "Update Check Name ist auf die bekannte App-ID gesetzt - sie kann entfernt werden"
 
 #: ../fdroidserver/deploy.py
 #, python-brace-format
 msgid "Uploading {apkfilename} to androidobservatory.org"
-msgstr "Lade {apkfilename} auf androidobservatory.org hoch"
+msgstr ""
 
 #: ../fdroidserver/deploy.py
-#, python-brace-format
+#, fuzzy, python-brace-format
 msgid "Uploading {apkfilename} to virustotal"
-msgstr "Lade {apkfilename} auf VirusTotal hoch"
+msgstr "Lese {apkfilename} aus dem Cache"
+
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "Usage"
+msgstr "Syntax"
+
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, python-format
+msgid "Usage: %s\n"
+msgstr "Syntax: %s\n"
 
 #: ../fdroidserver/lint.py
-msgid "Use /HEAD instead of /master or /main to point at a file in the default branch"
-msgstr "Verwende /HEAD anstelle von /master oder /main, um auf eine Datei im Hauptzweig zu verweisen"
+msgid "Use /HEAD instead of /master to point at a file in the default branch"
+msgstr "Verwenden Sie /HEAD anstelle von /master, um auf eine Datei im Hauptzweig zu verweisen"
 
 #: ../fdroidserver/update.py
 msgid "Use `fdroid update -c` to create it."
-msgstr "Verwende `fdroid update -c` zum Erstellen."
+msgstr "Verwenden Sie `fdroid update -c´ zum Erstellen."
 
 #: ../fdroidserver/build.py
 msgid "Use build server"
-msgstr "Verwende Buildserver"
+msgstr "Build-Server verwenden"
 
 #: ../fdroidserver/update.py
 msgid "Use date from APK instead of current time for newly added APKs"
-msgstr "Verwende APK-Datum statt der aktuellen Zeit für neu hinzugefügte APKs"
+msgstr "APK-Datum statt der aktuellen Zeit für neu hinzugefügte APKs verwenden"
 
-#: ../fdroidserver/deploy.py
+msgid "Use date from apk instead of current time for newly added apks"
+msgstr "APK-Datum statt der aktuellen Zeit für neu hinzugefügte APKs verwenden"
+
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Using \"{path}\" for configuring s3cmd."
-msgstr "Verwende \"{path}\" zur Konfiguration von s3cmd."
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Using \"{path}\" for syncing with remote storage."
-msgstr "Verwende „{path}“ zur Synchronisation mit Remote-Speicher."
+msgstr "Verwende {path} zur Konfiguration von s3cmd."
 
 #: ../fdroidserver/common.py
 msgid "Using APK Signature v2"
-msgstr "Verwende APK-Signatur v2"
+msgstr ""
 
 #: ../fdroidserver/common.py
 msgid "Using APK Signature v3"
-msgstr "Verwende APK-Signatur v3"
-
-#: ../fdroidserver/common.py
-msgid "Using JAR Signature"
-msgstr "Verwende JAR-Signatur"
+msgstr ""
 
 #: ../fdroidserver/common.py
 msgid "Using Java's jarsigner, not recommended for verifying APKs! Use apksigner"
 msgstr "Von Java jarsigner zur Verifikation von APKs wird abgeraten! Verwenden Sie apksigner"
 
-#: ../fdroidserver/metadata.py
+#: ../fdroidserver/common.py
 #, python-brace-format
-msgid "Using blank dictionary instead of contents of {path}!"
-msgstr "Verwende leeres Verzeichnis statt der Inhalte von {path}!"
+msgid "Using androguard from \"{path}\""
+msgstr "Verwende Androguard von \"{path}\""
 
 #: ../fdroidserver/init.py
 #, python-brace-format
 msgid "Using existing keystore \"{path}\""
 msgstr "Verwende vorhandenen Schlüsselspeicher \"{path}\""
 
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Using rclone to sync with: {url}"
-msgstr "Verwende rclone zum Synchronisieren mit: {url}"
-
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Using s3cmd to sync with: {url}"
 msgstr "Verwende s3cmd zum Synchronisieren mit: {url}"
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Valid commands are:"
 msgstr "Gültige Befehle sind:"
 
 #: ../fdroidserver/verify.py
 msgid "Verify against locally cached copy rather than redownloading."
-msgstr "Lokal zwischengespeicherte Kopie vergleichen, anstatt erneut herunterzuladen."
+msgstr "Vergleichen Sie mit lokal zwischengespeicherter Kopie, anstatt erneut herunterzuladen."
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Verify the integrity of downloaded packages"
 msgstr "Integrität der heruntergeladenen Programmpakete überprüfen"
 
 #: ../fdroidserver/index.py
 msgid "Verifying index signature:"
-msgstr "Überprüfen der Index-Signatur:"
-
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "Verifying package {path} with apksigner."
-msgstr "Überprüfen des Pakets {path} mit apksigner."
+msgstr "Überprüfe die Index-Signatur:"
 
 #: ../fdroidserver/deploy.py
 #, python-brace-format
 msgid "VirusTotal API key cannot upload files larger than 32MB, use {url} to upload {path}."
-msgstr "VirusTotal-API-Schlüssel kann nicht Dateien größer 32MB hochladen, verwende {url} um {path} hochzuladen."
-
-#: ../fdroidserver/nightly.py
-msgid "WARNING: only public git repos are supported!"
 msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Warn about possible metadata errors"
 msgstr "Vor möglichen Metadaten-Fehlern warnen"
 
-#: ../fdroidserver/scanner.py
-msgid "WebAssembly binary file"
-msgstr "WebAssembly-Binärdatei"
-
 #: ../fdroidserver/update.py
 msgid "When configured for signed indexes, create only unsigned indexes at this stage"
 msgstr "Bei einer Konfiguration mit signierten Indizes, in dieser Phase nur unsignierte Indizes erstellen"
 
 #: ../fdroidserver/lint.py
 msgid "When linting the entire repository yamllint is disabled by default. This option forces yamllint regardless."
-msgstr "Beim Linting des gesamten Repositoriums wird yamllint standardmäßig deaktiviert. Diese Option erzwingt yamllint ungeachtet dessen."
+msgstr ""
 
-#: ../fdroidserver/publish.py
-msgid "When signing or verifying fails, exit with an error code."
-msgstr "Wenn das Signieren oder Verifizieren fehlschlägt, wird der Vorgang mit einem Fehlercode beendet."
-
-#: ../fdroidserver/install.py
-msgid "Would you like to download and install F-Droid.apk via adb? (YES/no)"
-msgstr "Möchten Sie F-Droid.apk über adb herunterladen und installieren? (JA/nein)"
-
-#: ../fdroidserver/install.py
-msgid "Would you like to download the app(s) from f-droid.org? (YES/no)"
-msgstr "Möchten Sie die App(s) von f-droid.org herunterladen? (JA/nein)"
+msgid "X.509 'Distiguished Name' used when generating keys"
+msgstr "X.509 'Angesehener Name' wenn Schlüssel generiert werden"
 
 #: ../fdroidserver/init.py
 msgid "X.509 'Distinguished Name' used when generating keys"
@@ -2073,102 +2056,106 @@ msgstr "X.509 'Distinguished Name' zum Erzeugen von Schlüsseln"
 
 #: ../fdroidserver/common.py
 msgid "You can use ANDROID_HOME to set the path to your SDK, i.e.:"
-msgstr "Sie können ANDROID_HOME verwenden, um den Pfad zu Ihrem SDK zu setzen, z. B.:"
+msgstr "Sie können ANDROID_HOME verwenden, um den Pfad zu Ihrem SDK zu setzen, z.B.:"
 
 #: ../fdroidserver/scanner.py
 msgid "ZIP file archive"
-msgstr "ZIP-Dateiarchiv"
-
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "adb reports {serial} is \"{status}\"!"
-msgstr "adb meldet {serial} ist „{status}“!"
+msgstr ""
 
 #: ../fdroidserver/nightly.py
 #, python-brace-format
 msgid "adding IdentityFile to {path}"
-msgstr "IdentityFile zu {path} hinzufügen"
+msgstr "Füge IdentityFile zu {path} hinzu"
 
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "adding to {name}: {path}"
 msgstr "Hinzufügen zu {name}: {path}"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "ambiguous option: %(option)s could match %(matches)s"
 msgstr "Mehrdeutige Option: %(option)s könnte übereinstimmen mit %(matches)s"
 
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "apksigner in build-tools;{version} passes APKs with invalid v3 signatures, ignoring."
-msgstr "apksigner in build-tools;{version} übergibt APKs mit ungültigen v3-Signaturen und ignoriert sie."
-
-#: ../fdroidserver/common.py
-msgid "apksigner not found! Cannot sign or verify modern APKs"
-msgstr "apksigner nicht gefunden! Moderne APKs können nicht signiert oder verifiziert werden"
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, python-format
+msgid "ambiguous option: %s (%s?)"
+msgstr "Mehrdeutige Option: %s (%s?)"
 
 #: ../fdroidserver/common.py
 msgid "apksigner not found, it's required for signing!"
-msgstr "apksigner nicht gefunden, er wird zum Signieren benötigt!"
+msgstr ""
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/checkupdates.py ../fdroidserver/lint.py
-#: ../fdroidserver/rewritemeta.py
+#: ../fdroidserver/lint.py ../fdroidserver/rewritemeta.py
+#: ../fdroidserver/checkupdates.py
+#, fuzzy
 msgid "application ID of file to operate on"
-msgstr "App-ID der Datei, die bearbeitet werden soll"
+msgstr "App-ID, um auf Aktualisierungen zu prüfen"
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/build.py ../fdroidserver/install.py
-#: ../fdroidserver/publish.py ../fdroidserver/scanner.py
-#: ../fdroidserver/verify.py
+#: ../fdroidserver/verify.py ../fdroidserver/publish.py
+#: ../fdroidserver/build.py ../fdroidserver/scanner.py
+#: ../fdroidserver/install.py
+#, fuzzy
 msgid "application ID with optional versionCode in the form APPID[:VERCODE]"
-msgstr "App-ID mit fakultativem Versionscode in der Form APPID[:VERCODE]"
+msgstr "App-ID mit optionalem Versionscode in der Form APPID[:VERCODE]"
 
-#: ../fdroidserver/common.py
-msgid "archive_url needs to end with /archive"
-msgstr "archive_url muss mit /archive enden"
+#: ../fdroidserver/lint.py ../fdroidserver/rewritemeta.py
+msgid "applicationId in the form APPID"
+msgstr "App-ID in der Form APPID"
 
-#: /usr/lib/python3.11/argparse.py
+#: ../fdroidserver/checkupdates.py
+msgid "applicationId to check for updates"
+msgstr "App-ID, um auf Aktualisierungen zu prüfen"
+
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
+#: ../fdroidserver/verify.py ../fdroidserver/publish.py
+#: ../fdroidserver/dscanner.py ../fdroidserver/build.py
+#: ../fdroidserver/scanner.py ../fdroidserver/install.py
+msgid "applicationId with optional versionCode in the form APPID[:VERCODE]"
+msgstr "App-ID mit optionalem Versionscode in der Form APPID[:VERCODE]"
+
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "argument \"-\" with mode %r"
 msgstr "Argument \"-\" mit Modus %r"
 
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "argument %(argument_name)s: %(message)s"
-msgstr "Argument %(argument_name)s: %(message)s"
+#: ../fdroidserver/nightly.py
+#, fuzzy
+msgid "attempting bare SSH connection to test deploy key:"
+msgstr "Versuch einer reinen ssh-Verbindung, um den Deployment-Key zu testen:"
 
 #: ../fdroidserver/nightly.py
-msgid "attempting bare SSH connection to test deploy key:"
-msgstr "Versuch einer reinen SSH-Verbindung, um den Deployment-Key zu testen:"
+msgid "attempting bare ssh connection to test deploy key:"
+msgstr "Versuch einer reinen ssh-Verbindung, um den Deployment-Key zu testen:"
 
 #: ../fdroidserver/common.py
 msgid "can not parse scrlib spec (not a string): '{}'"
-msgstr "kann scrlib-Spezifikation nicht parsen (keine Zeichenkette): '{}'"
+msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
-msgid "can't open '%(filename)s': %(error)s"
-msgstr "'%(filename)s' kann nicht geöffnet werden: %(error)s"
-
-#: ../fdroidserver/scanner.py
-msgid "can't open non-https url: '{};"
-msgstr "Nicht-HTTPS-URL kann nicht geöffnet werden: '{};"
+msgid "can't open '%s': %s"
+msgstr "„%s” konnte nicht geöffnet werden: %s"
 
 #: ../fdroidserver/build.py
-#, python-brace-format
+#, fuzzy, python-brace-format
 msgid "cannot find required srclibs: \"{path}\""
-msgstr "Konnte die benötigten srclibs nicht finden: \"{path}\""
+msgstr "AppID für {path} konnte nicht gefunden werden!"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "cannot have multiple subparser arguments"
 msgstr "Mehrere Subparser-Argumente sind unzulässig"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "cannot merge actions - two groups are named %r"
-msgstr "kann keine Aktionen zusammenführen – zwei Gruppen heißen %r"
+msgstr "kann keine Aktionen zusammenführen - zwei Gruppen heißen %r"
 
 #: ../fdroidserver/nightly.py
 msgid "cannot publish update, did you set the deploy key?"
@@ -2179,107 +2166,119 @@ msgstr "Kann das Update nicht veröffentlichen. Ist der Deploy-Schlüssel gesetz
 msgid "cloning {url}"
 msgstr "Klone {url}"
 
+#: ../fdroidserver/deploy.py
+msgid "command to execute, either 'init' or 'update'"
+msgstr "Ausführungsbefehl, entweder 'init' oder 'update'"
+
 #: ../fdroidserver/__main__.py
 msgid "commands from plugin modules:"
-msgstr "Befehle aus den PlugIn-Modulen:"
+msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "complex"
+msgstr "komplex"
+
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "conflicting option string: %s"
 msgid_plural "conflicting option strings: %s"
 msgstr[0] "widersprüchliche Optionsangabe: %s"
 msgstr[1] "widersprüchliche Optionsangaben: %s"
 
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "conflicting subparser alias: %s"
-msgstr "widersprüchlicher Subparser-Alias: %s"
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "conflicting subparser: %s"
-msgstr "widersprüchlicher Subparser: %s"
+#: ../fdroidserver/nightly.py
+#, python-brace-format
+msgid "copying {apkfilename} into {path}"
+msgstr "Kopiere {apkfilename} nach {path}"
 
 #: ../fdroidserver/metadata.py
 #, python-brace-format
 msgid "could not parse '{path}'"
-msgstr "konnte '{path}' nicht parsen"
-
-#: ../fdroidserver/common.py
-msgid "could not parse srclib spec (no name specified): '{}'"
-msgstr "konnte srclib-Spezifikation nicht parsen (kein Name angegeben): '{}'"
+msgstr ""
 
 #: ../fdroidserver/common.py
 msgid "could not parse srclib spec (no ref specified): '{}'"
-msgstr "konnte srclib-Spezifikation nicht parsen (keine ref angegeben): '{}'"
+msgstr ""
+
+#: ../fdroidserver/common.py
+msgid "could not parse srclib spec (too many '@' signs): '{}'"
+msgstr ""
 
 #: ../fdroidserver/nightly.py
 #, python-brace-format
 msgid "created {path}"
 msgstr "{path} erzeugt"
 
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "current version is newer: old vercode={old}, new vercode={new}"
-msgstr "die aktuelle Version ist neuer: alter vercode={old}, neuer vercode={new}"
-
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "deleting: repo/{apkfilename}"
 msgstr "Lösche: repo/{apkfilename}"
 
-#: ../fdroidserver/scanner.py
-msgid "dependency file without lock"
-msgstr "Abhängigkeitsdatei ohne Sperre"
+#: ../fdroidserver/common.py
+#, python-brace-format
+msgid "deployed build logs to '{path}'"
+msgstr "Build Logs deployed zu {path}"
 
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "deployed process log {path} to {dest}"
-msgstr "Verarbeitungsprotokoll {path} unter {dest} bereitgestellt"
+msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "dest= is required for options like %r"
 msgstr "dest= wird benötigt für Optionen wie %r"
 
-#: ../fdroidserver/scanner.py
-msgid "downloading '{}'"
-msgstr "Herunterladen von '{}'"
-
-#: ../fdroidserver/scanner.py
-msgid "downloading scanner signatures from '{}' failed"
-msgstr "Herunterladen der Scanner-Signaturen von '{}' fehlgeschlagen"
-
 #: ../fdroidserver/scanner.py
 msgid "executable binary, possibly code"
-msgstr "ausführbare Binärdatei, vermutlich Code"
+msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "expected %s argument"
 msgid_plural "expected %s arguments"
 msgstr[0] "%s Argument erwartet"
 msgstr[1] "%s Argumente erwartet"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "expected at least one argument"
 msgstr "mindestens ein Argument erwartet"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "expected at most one argument"
 msgstr "höchstens ein Argument erwartet"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "expected one argument"
 msgstr "ein Argument erwartet"
 
-#: ../fdroidserver/__main__.py
+#: ../fdroidserver/common.py
+#, python-brace-format
+msgid "failed deploying build logs to '{path}'"
+msgstr "Build Logs zu '{path}' deployen fehlgeschlagen"
+
+#: ../fdroid
+msgid "fdroid [-h|--help|--version] <command> [<args>]"
+msgstr "fdroid [-h|--help|--version] <command> [<args>]"
+
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "fdroid [<command>] [-h|--help|--version|<args>]"
 msgstr "fdroid [<command>] [-h|--help|--version|<args>]"
 
-#: ../fdroidserver/scanner.py
-msgid "fetch the latest version of signatures from the web"
-msgstr "Abrufen der neuesten Version von Signaturen aus dem Web"
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "floating-point"
+msgstr "Gleitkomma"
+
+#: ../fdroidserver/metadata.py
+msgid "force errors to be warnings, or ignore"
+msgstr "Fehler zwingend als Warnungen ausgeben oder ignorieren"
 
 #: ../fdroidserver/metadata.py
 msgid "force metadata errors (default) to be warnings, or to be ignored."
@@ -2291,9 +2290,10 @@ msgstr "git svn Klonen fehlgeschlagen"
 
 #: ../fdroidserver/scanner.py
 msgid "gzip file archive"
-msgstr "gzip Dateiarchiv"
+msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "ignored explicit argument %r"
 msgstr "Ausdrückliches Argument %r ignoriert"
@@ -2302,39 +2302,35 @@ msgstr "Ausdrückliches Argument %r ignoriert"
 msgid "index-v1 must have a signature, use `fdroid signindex` to create it!"
 msgstr "index-v1 muß eine Signatur haben, verwenden Sie `fdroid signindex` um sie zu erzeugen!"
 
-#: ../fdroidserver/index.py
-msgid "index-v2 must have a signature, use `fdroid signindex` to create it!"
-msgstr "index-v2 muss eine Signatur haben, verwenden Sie `fdroid signindex`, um sie zu erstellen!"
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "integer"
+msgstr "Ganzzahl"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "invalid %(type)s value: %(value)r"
 msgstr "Ungültige(r) %(type)s mit Wert: %(value)r"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "invalid choice: %(value)r (choose from %(choices)s)"
 msgstr "Ungültige Auswahl: %(value)r (Wählen Sie aus %(choices)s)"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "invalid conflict_resolution value: %r"
 msgstr "Ungültiger conflict_resolution-Wert: %r"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "invalid option string %(option)r: must start with a character %(prefix_chars)r"
 msgstr "Ungültige Optionszeichenfolge %(option)r: muss mit einem Zeichen %(prefix_chars)r beginnen"
 
-#: ../fdroidserver/common.py
-msgid "ipfs_cid not found, skipping CIDv1 generation"
-msgstr "ipfs_cid nicht gefunden, CIDv1-Generierung wird übersprungen"
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "latest build recipe is newer: old vercode={old}, new vercode={new}"
-msgstr "Neuestes Build-Rezept ist neuer: alter Vercode={old}, neuer Vercode={new}"
-
 #: ../fdroidserver/deploy.py
 #, python-brace-format
 msgid "local_copy_dir does not end with \"fdroid\", perhaps you meant: \"{path}\""
@@ -2351,22 +2347,13 @@ msgstr "local_copy_dir muß ein Verzeichnis sein, keine Datei!"
 #: ../fdroidserver/index.py
 #, python-format
 msgid "mirror '%s' does not end with 'fdroid'!"
-msgstr "Spiegelserver '%s' ended nicht mit 'fdroid'!"
+msgstr "Mirror '%s' ended nicht auf 'fdroid'!"
 
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "mirrors set twice, in config.yml and {path}!"
-msgstr "Spiegelserver zweimal gesetzt, in config.yml und {path}!"
-
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "mutually exclusive arguments must be optional"
 msgstr "sich gegenseitig ausschließende Argumente müssen optional sein"
 
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "next {name} cache update due in {time}"
-msgstr "nächstes {name} Cache-Update fällig in {time}"
-
 #: ../fdroidserver/mirror.py
 #, python-brace-format
 msgid "no \"icon\" in {appid}"
@@ -2374,91 +2361,143 @@ msgstr "kein \"icon\" in {appid}"
 
 #: ../fdroidserver/signatures.py
 msgid "no APK supplied"
-msgstr "kein APK bereitgestellt"
+msgstr "Kein APK bereitgestellt"
 
-#: ../fdroidserver/checkupdates.py
-msgid "no version information found"
-msgstr "keine Versionsinformation gefunden"
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, python-format
+msgid "no such option: %s"
+msgstr "keine solche Option: %s"
 
-#: /usr/lib/python3.11/argparse.py
+#: ../fdroid ../fdroidserver/__main__.py
+msgid "no version info found!"
+msgstr "Keine Versionsinformationen gefunden!"
+
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "not allowed with argument %s"
 msgstr "unzulässig mit Argument %s"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "one of the arguments %s is required"
 msgstr "eines der Argumente %s ist erforderlich"
 
-#: ../fdroidserver/common.py ../fdroidserver/index.py
+#: ../fdroidserver/index.py ../fdroidserver/common.py
 msgid "only accepts strings, lists, and tuples"
 msgstr "akzeptiert nur Zeichenketten, Listen und Tupel"
 
-#: /usr/lib/python3.11/argparse.py
-msgid "options"
-msgstr "Optionen"
+#: ../fdroidserver/install.py
+#, python-format
+msgid "option %s: If you really want to install all the signed apps, use --all"
+msgstr "Option %s: Wenn Sie wirklich alle signierten Apps installieren wollen, verwenden Sie --all"
+
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, python-format
+msgid "option %s: invalid %s value: %r"
+msgstr "Option %s: ungültiger %s Wert: %r"
+
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, python-format
+msgid "option %s: invalid choice: %r (choose from %s)"
+msgstr "Option %s: ungültige Wahl: %r (wählen Sie aus %s)"
+
+#: /usr/lib/python3.5/getopt.py /usr/lib/python3.6/getopt.py
+#: /usr/lib/python3.7/getopt.py
+#, python-format
+msgid "option -%s not recognized"
+msgstr "Option -%s nicht erkannt"
+
+#: /usr/lib/python3.5/getopt.py /usr/lib/python3.6/getopt.py
+#: /usr/lib/python3.7/getopt.py
+#, python-format
+msgid "option -%s requires argument"
+msgstr "Option -%s erfordert Argument"
+
+#: /usr/lib/python3.5/getopt.py /usr/lib/python3.6/getopt.py
+#: /usr/lib/python3.7/getopt.py
+#, python-format
+msgid "option --%s must not have an argument"
+msgstr "Option --%s darf kein Argument haben"
+
+#: /usr/lib/python3.5/getopt.py /usr/lib/python3.6/getopt.py
+#: /usr/lib/python3.7/getopt.py
+#, python-format
+msgid "option --%s not a unique prefix"
+msgstr "option --%s ist kein eindeutiges Präfix"
+
+#: /usr/lib/python3.5/getopt.py /usr/lib/python3.6/getopt.py
+#: /usr/lib/python3.7/getopt.py
+#, python-format
+msgid "option --%s not recognized"
+msgstr "Option --%s nicht erkannt"
+
+#: /usr/lib/python3.5/getopt.py /usr/lib/python3.6/getopt.py
+#: /usr/lib/python3.7/getopt.py
+#, python-format
+msgid "option --%s requires argument"
+msgstr "Option --%s erfordert Argument"
+
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
+msgid "optional arguments"
+msgstr "optionale Argumente"
 
 #: ../fdroidserver/nightly.py
 #, python-brace-format
 msgid "overwriting existing {path}"
 msgstr "überschreiben des vorhandenen {path}"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "positional arguments"
 msgstr "Positionsparameter"
 
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "process log deploy {path} to {dest} failed!"
-msgstr "Bereitstellen des Verarbeitungsprotokolls {path} auf {dest} ist fehlgeschlagen!"
-
-#: ../fdroidserver/build.py
-msgid "reference binary missing signature"
-msgstr "Referenz-Binärdatei fehlt Signatur"
+msgstr ""
 
 #: ../fdroidserver/signatures.py
 #, python-brace-format
 msgid "refuse downloading via insecure HTTP connection (use HTTPS or specify --no-https-check): {apkfilename}"
 msgstr "Download über ungesicherte HTTP-Verbindung verweigert (verwenden Sie HTTPS oder geben Sie --no-https-check an): {apkfilename}"
 
+#: ../fdroidserver/signatures.py
+#, python-brace-format
+msgid "refuse downloading via insecure http connection (use https or specify --no-https-check): {apkfilename}"
+msgstr "Download über ungesicherte HTTP-Verbindung verweigert (verwenden Sie HTTPS oder geben Sie --no-https-check an): {apkfilename}"
+
 #: ../fdroidserver/index.py
 #, python-format
-msgid "repo_icon \"repo/icons/%s\" does not exist, generating placeholder."
-msgstr "repo_icon \"repo/icons/%s\" existiert nicht, erzeuge Platzhalter."
+msgid "repo_icon %s does not exist, generating placeholder."
+msgstr ""
 
-#: ../fdroidserver/common.py
-msgid "repo_url needs to end with /repo"
-msgstr "repo_url muss mit /repo enden"
+#: ../fdroidserver/metadata.py
+msgid "ruamel.yaml not installed, can not write metadata."
+msgstr ""
 
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "rsync is missing or broken: {error}"
-msgstr "rsync fehlt oder ist kaputt: {error}"
-
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "s3cmd sync indexes {path} to {url} and delete"
-msgstr "s3cmd synchronisiert Indizes von {path} nach {url} und löscht diese"
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "s3cmd syncs indexes from {path} to {url} and deletes removed"
-msgstr "s3cmd synchronisiert Indizes von {path} nach {url} und löscht entfernte"
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "scanner cache is malformed! You can clear it with: '{clear}'"
-msgstr "Der Scanner-Cache ist fehlerhaft! Sie können ihn löschen mit: '{clear}'"
-
-#: ../fdroidserver/deploy.py
-msgid "serverwebroot: path does not end with \"fdroid\", perhaps you meant one of these:"
-msgstr "serverwebroot: Der Pfad endet nicht mit \"fdroid\", vielleicht meinten Sie einen dieser Pfade:"
+msgstr "s3cmd-Sync {path} indizieren auf {url} und dann löschen"
 
 #: ../fdroidserver/scanner.py
 msgid "shared library"
-msgstr "dynamische Bibliothek"
+msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "show program's version number and exit"
+msgstr "Versionsnummer der Anwendung anzeigen und beenden"
+
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.5/optparse.py
+#: /usr/lib/python3.6/argparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/argparse.py /usr/lib/python3.7/optparse.py
 msgid "show this help message and exit"
 msgstr "diese Hilfemeldung anzeigen und beenden"
 
@@ -2485,33 +2524,33 @@ msgstr "Srclibs-Name fehlt und/oder @"
 
 #: ../fdroidserver/scanner.py
 msgid "static library"
-msgstr "statische Bibliothek"
+msgstr ""
 
-#: ../fdroidserver/build.py
+#: ../fdroidserver/common.py
 #, python-brace-format
-msgid "supplied reference binary has allowed signer {signer}"
-msgstr "Angewandte Referenz-Binary erlaubt Signer {signer}"
+msgid "supplied timestamp value '{timestamp}' is not a unix timestamp"
+msgstr "gelieferter Zeitstempelwert '{timestamp}' ist kein Unix-Zeitstempel"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "the following arguments are required: %s"
-msgstr "die folgenden Argumente sind erforderlich: %s"
+msgstr "die Folgenden Argumente sind erforderlich: %s"
 
-#: ../fdroidserver/install.py
-msgid "true"
-msgstr "wahr"
-
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "unexpected option string: %s"
 msgstr "Unerwartete Optionsverkettung: %s"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "unknown parser %(parser_name)r (choices: %(choices)s)"
 msgstr "Unbekannter Parser %(parser_name)r (Auswahl: %(choices)s)"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "unrecognized arguments: %s"
 msgstr "nicht erkannte Argumente: %s"
@@ -2521,68 +2560,81 @@ msgstr "nicht erkannte Argumente: %s"
 msgid "unsafe permissions on '{config_file}' (should be 0600)!"
 msgstr "Unsichere Berechtigungen in „{config_file}” (sollte 0600 sein)!"
 
-#: ../fdroidserver/__main__.py /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py ../fdroid
+#: /usr/lib/python3.7/argparse.py ../fdroidserver/__main__.py
 msgid "usage: "
 msgstr "Syntax: "
 
-#: ../fdroidserver/deploy.py
+#: ../fdroid
+msgid "usage: fdroid [-h|--help|--version] <command> [<args>]"
+msgstr "Syntax: fdroid [-h|--help|--version] <command> [<args>]"
+
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "using Apache libcloud to sync with {url}"
 msgstr "Verwende Apache libcloud zur Synchronisation mit {url}"
 
 #: ../fdroidserver/deploy.py
 msgid "virustotal.com is rate limiting, waiting to retry..."
-msgstr "virustotal.com limitiert die Zugriffe, warte auf Wiederholung …"
+msgstr ""
 
-#: ../fdroidserver/install.py
-msgid "yes"
-msgstr "ja"
+#: ../fdroidserver/update.py
+msgid "wiki support is deprecated and will be removed in the next release!"
+msgstr ""
 
 #: ../fdroidserver/publish.py
 #, python-brace-format
 msgid "{0} app, {1} key aliases"
 msgid_plural "{0} apps, {1} key aliases"
-msgstr[0] "{0} App, {1} Schlüssel-Aliase"
-msgstr[1] "{0} Apps, {1} Schlüssel-Aliase"
+msgstr[0] "{0} app, {1} Schlüsselaliase"
+msgstr[1] "{0} apps, {1} Schlüsselaliase"
 
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "{apkfilename} ({appid}) has no metadata!"
 msgstr "{apkfilename} ({appid}) besitzt keine Metadaten!"
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
+#: ../fdroidserver/update.py
+#, python-brace-format
+msgid "{apkfilename} has multiple {name} files, looks like Master Key exploit!"
+msgstr "{apkfilename} hat mehrere {name} Dateien, sieht aus wie Master Key Exploit!"
+
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "{apkfilename}'s AndroidManifest.xml has a bad date: "
 msgstr "Die AndroidManifest.xml der App „{apkfilename}” hat ein ungültiges Datum: "
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
 #: ../fdroidserver/update.py
-#, python-brace-format
+#, fuzzy, python-brace-format
 msgid "{appid} does not have a name! Using application ID instead."
-msgstr "{appid} besitzt keinen Namen! Die Anwendungs-ID wird stattdessen verwendet."
+msgstr "{appid} besitzt keinen Namen! Verwende den Paketnamen stattdessen."
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
 #: ../fdroidserver/update.py
 #, python-brace-format
+msgid "{appid} does not have a name! Using package name instead."
+msgstr "{appid} besitzt keinen Namen! Verwende den Paketnamen stattdessen."
+
+#: ../fdroidserver/update.py
+#, python-brace-format
+msgid "{appid} from {path} is not a valid Android Package Name!"
+msgstr "{appid} von {path} ist kein gültiger Android-Paketname!"
+
+#: ../fdroidserver/update.py
+#, fuzzy, python-brace-format
 msgid "{appid} from {path} is not a valid Android application ID!"
-msgstr "{appid} von {path} ist keine gültige Android-Anwendungs-ID!"
+msgstr "{appid} von {path} ist kein gültiger Android-Paketname!"
 
 #: ../fdroidserver/metadata.py ../fdroidserver/update.py
 #, python-brace-format
 msgid "{appid} from {path} is not a valid Java Package Name!"
-msgstr "{appid} aus {path} ist kein gültiger Java-Paketname!"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{appid} has both APKs and files: {files}"
-msgstr "{appid} hat sowohl APKs als auch Dateien: {files}"
+msgstr "{appid} von {path} ist kein gültiger Java-Paketname!"
 
 #: ../fdroidserver/mirror.py
 #, python-brace-format
 msgid "{appid} is missing {name}"
 msgstr "{appid} fehlt {name}"
 
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "{appid}: Unknown extlib {path} in build '{versionName}'"
@@ -2591,7 +2643,7 @@ msgstr "{appid}: unbekannte Extlib {path} im Build '{versionName}'"
 #: ../fdroidserver/scanner.py
 #, python-brace-format
 msgid "{appid}: no builds specified, running on current source state"
-msgstr "{appid}: Kein Build angegeben; verwende aktuellen Quellen-Stand"
+msgstr "{appid}: keine builds angegeben, läuft auf dem aktuellen source-Stand"
 
 #: ../fdroidserver/lint.py
 #, python-brace-format
@@ -2606,32 +2658,27 @@ msgstr "{appid}: {field} muss ein '{type}' sein, ist aber ein '{fieldtype}'!"
 #: ../fdroidserver/metadata.py
 #, python-brace-format
 msgid "{build_flag} must be an integer, found: {value}"
-msgstr "{build_flag} muss ein Integer sein, gefunden: {value}"
+msgstr ""
 
 #: ../fdroidserver/metadata.py
 #, python-brace-format
-msgid "{build_flag} must be list or string, found: {value}"
-msgstr "{build_flag} muss eine Liste oder Zeichenkette sein, gefunden: {value}"
+msgid "{field} not terminated in {name}"
+msgstr "{field} nicht in {name} beendet"
 
 #: ../fdroidserver/metadata.py
 #, python-brace-format
 msgid "{file} is blank or corrupt!"
-msgstr "{file} ist leer oder beschädigt!"
+msgstr ""
 
 #: ../fdroidserver/update.py
 #, python-brace-format
-msgid "{name} \"{section}/icons/{path}\" does not exist! Check \"config.yml\"."
-msgstr "{name} \"{section}/icons/{path}\" existiert nicht! Überprüfe \"config.yml\"."
+msgid "{name} \"{path}\" does not exist! Correct it in config.py."
+msgstr "{name} \"{path}\" existiert nicht! Korrigieren Sie es in der config.py."
 
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{path1} is a duplicate of {path2}, remove one!"
-msgstr "{path1} ist ein Duplikat von {path2}, entfernen Sie eines!"
-
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 #, python-brace-format
 msgid "{path} already exists, ignoring import results!"
-msgstr "{path} existiert schon, importierte Ergebnisse werden nicht berücksichtigt!"
+msgstr ""
 
 #: ../fdroidserver/nightly.py
 #, python-brace-format
@@ -2641,37 +2688,7 @@ msgstr "{path} existiert nicht! Erstellen Sie es durch Ausführen von:"
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "{path} has bad file signature \"{pattern}\", possible Janus exploit!"
-msgstr "{path} hat falsche Dateisignatur \"{pattern}\", möglicher Janus-Exploit!"
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "{path} has been flagged by virustotal {count} times:"
-msgstr "{path} wurde von virustotal {count} Mal markiert:"
-
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "{path} has the wrong fingerprint ({fingerprint})!"
-msgstr "{path} hat den falschen Fingerabdruck {fingerprint}!"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "{path} is not \"key: value\" dict, but a {datatype}!"
-msgstr "{path} ist kein \"Schlüssel: Wert\"-Diktat, sondern ein {datatype}!"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "{path} is not a standard config file!"
-msgstr "{path} ist keine Standard Config Datei!"
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "{path} is not list, but a {datatype}!"
-msgstr "{path} ist keine Liste, sondern ein {datatype}!"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "{path} is not {expected_type}, but a {datatype}!"
-msgstr "{path} ist kein {expected_type}, sondern ein {datatype}!"
+msgstr "{path} hat die schlechte Dateisignatur \"{pattern}\", möglicher Janus-Exploit!"
 
 #: ../fdroidserver/update.py
 #, python-brace-format
@@ -2681,27 +2698,17 @@ msgstr "{path} hat Dateigröße Null!"
 #: ../fdroidserver/deploy.py
 #, python-brace-format
 msgid "{path} more than 200MB, manually upload: {url}"
-msgstr "{path} ist größer als 200MB und muss manuell auf {url} hochgeladen werden"
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "{path}: \"{code}\" is not a valid ISO_3166-1 alpha-2 country code!"
-msgstr "{path}: \"{code}\" ist kein gültiger ISO_3166-1 alpha-2 country code!"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{path}: {error}"
-msgstr "{path}: {error}"
+msgstr ""
 
 #: ../fdroidserver/mirror.py
 #, python-brace-format
 msgid "{url} does not end with \"fdroid\", check the URL path!"
 msgstr "{url} endet nicht mit \"fdroid\", überprüfen Sie den URL-Pfad!"
 
-#: ../fdroidserver/import_subcommand.py
-#, python-brace-format
+#: ../fdroidserver/common.py
+#, fuzzy, python-brace-format
 msgid "{url} does not start with \"http\"!"
-msgstr "{url} beginnt nicht mit \"http\"!"
+msgstr "{url} endet nicht mit \"fdroid\", überprüfen Sie den URL-Pfad!"
 
 #: ../fdroidserver/build.py
 msgid "{} build failed"
@@ -2712,5 +2719,45 @@ msgstr[1] "{} Builds fehlgeschlagen"
 #: ../fdroidserver/build.py
 msgid "{} build succeeded"
 msgid_plural "{} builds succeeded"
-msgstr[0] "{} Build erfolgreich"
-msgstr[1] "{} Builds erfolgreich"
+msgstr[0] "Buildvorgang erfolgreich"
+msgstr[1] "Buildvorgänge erfolgreich"
+
+#, fuzzy
+#~ msgid "Add PGP signatures for packages in repo using GnuPG"
+#~ msgstr "GPG-Signaturen für Programmpakete in der Paketquelle hinzufügen"
+
+#~ msgid "Add gpg signatures for packages in repo"
+#~ msgstr "GPG-Signaturen für Programmpakete in der Paketquelle hinzufügen"
+
+#~ msgid "Cannot find a packageName for {path}!"
+#~ msgstr "packageName für {path} konnte nicht gefunden werden!"
+
+#~ msgid "Cannot find an appid for {path}!"
+#~ msgstr "AppID für {path} konnte nicht gefunden werden!"
+
+#~ msgid "Clean update - don't uses caches, reprocess all apks"
+#~ msgstr "Sauber - ohne Verwendung der Zwischenspeicher - aktualisieren, alle APKs wiederaufbereiten"
+
+#~ msgid "Interactively ask about things that need updating."
+#~ msgstr "Angelegenheiten, die Aktualisierungen erfordern, interaktiv abfragen."
+
+#~ msgid "Specify editor to use in interactive mode. Default "
+#~ msgstr "Editor festlegen, der im interaktiven Modus verwendet werden soll. Standard "
+
+#~ msgid "Specify editor to use in interactive mode. Default %s"
+#~ msgstr "Editor festlegen, der im interaktiven Modus verwendet werden soll. Standard %s"
+
+#~ msgid "Specify editor to use in interactive mode. Default is {path}"
+#~ msgstr "Editor festlegen, der im interaktiven Modus verwendet werden soll. Standard ist {path}"
+
+#~ msgid "app-id in the form APPID"
+#~ msgstr "App-ID in der Form APPID"
+
+#~ msgid "app-id to check for updates"
+#~ msgstr "App-ID, um auf Aktualisierungen zu prüfen"
+
+#~ msgid "app-id with optional versionCode in the form APPID[:VERCODE]"
+#~ msgstr "App-ID mit optionalem Versionscode in der Form APPID[:VERCODE]"
+
+#~ msgid "app-id with optional versioncode in the form APPID[:VERCODE]"
+#~ msgstr "App-ID mit optionalem Versionscode in der Form APPID[:VERCODE]"
diff --git a/locale/el/LC_MESSAGES/fdroidserver.po b/locale/el/LC_MESSAGES/fdroidserver.po
deleted file mode 100644
index 5bd92c4a..00000000
--- a/locale/el/LC_MESSAGES/fdroidserver.po
+++ /dev/null
@@ -1,2690 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# This file is put in the public domain.
-# THANOS SIOURDAKIS <siourdakisthanos@gmail.com>, 2020.
-# fresh <fresh190@protonmail.com>, 2020, 2021.
-# Michalis <michalisntovas@yahoo.gr>, 2021.
-# ΣΤΑΥΡΟΣ ΔΑΛΙΑΚΟΠΟΥΛΟΣ <stavros.daliakopoulos@gmail.com>, 2024.
-msgid ""
-msgstr ""
-"Project-Id-Version: fdroidserver 2.0a0-62-gc63c4b3d\n"
-"Report-Msgid-Bugs-To: https://gitlab.com/fdroid/fdroidserver/issues\n"
-"POT-Creation-Date: 2025-06-25 09:52+0200\n"
-"PO-Revision-Date: 2024-05-10 13:24+0000\n"
-"Last-Translator: ΣΤΑΥΡΟΣ ΔΑΛΙΑΚΟΠΟΥΛΟΣ <stavros.daliakopoulos@gmail.com>\n"
-"Language-Team: Greek <https://hosted.weblate.org/projects/f-droid/fdroidserver/el/>\n"
-"Language: el\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 5.5.4\n"
-
-#: ../fdroidserver/nightly.py
-msgid ""
-"\n"
-"SSH public key to be used as deploy key:"
-msgstr ""
-"\n"
-"Δημόσιο κλειδί SSH που θα χρησιμοποιηθεί ως κλειδί ανάπτυξης:"
-
-#: ../fdroidserver/nightly.py
-#, python-brace-format
-msgid ""
-"\n"
-"{path} encoded for the DEBUG_KEYSTORE secret variable:"
-msgstr ""
-"\n"
-"{path} κωδικοποιημένη για τη μυστική μεταβλητή DEBUG_KEYSTORE:"
-
-#: ../fdroidserver/lint.py
-#, python-format
-msgid "\"%s/\" has no matching metadata file!"
-msgstr "\"%s/\" δεν έχει αρχείο μετα-δεδομένων που να ταιριάζει!"
-
-#: ../fdroidserver/index.py
-msgid "\"isPrimary\" key should not be added to mirrors!"
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "\"local_copy_dir\" {path} does not exist!"
-msgstr ""
-
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "\"{apkfilename}\" is already installed on {dev}."
-msgstr "Το \"{apkfilename}\" είναι ήδη εγκατεστημένο στο {dev}."
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "\"{path}\" contains recent {name} ({version})"
-msgstr "Το \"{path}\" περιέχει ένα πρόσφατο {name} ({version})"
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "\"{path}\" exists but s3cmd is not installed!"
-msgstr "Το \"{path}\" υπάρχει, αλλά το s3cmd δεν έχει εγκατασταθεί!"
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "\"{path}\" is not a supported file format (use: metadata/*.yml)"
-msgstr "Το \"{path}\" δεν είναι υποστηριζόμενη μορφή αρχείου (χρήση: μεταδεδομένα/*.yml)"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "\"{path}\" is signed by a key that is not allowed:"
-msgstr "Το \"{path}\" έχει υπογραφή από ένα κλειδί που δεν επιτρέπεται:"
-
-#: ../fdroidserver/import_subcommand.py
-#, python-brace-format
-msgid "\"{url}\" is not a valid URL!"
-msgstr "Το \"{url}\" δεν είναι έγκυρο URL!"
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "%(prog)s: error: %(message)s\n"
-msgstr "%(prog)s: σφάλμα: %(message)s\n"
-
-#: ../fdroidserver/publish.py
-#, python-format
-msgid "%d APKs failed to be signed or verified!"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-format
-msgid "%d problems found"
-msgstr "%d προβλήματα εντοπίστηκαν"
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "%r is not callable"
-msgstr "Δεν είναι δυνατή η κλήση του %r"
-
-#: ../fdroidserver/signindex.py
-#, python-format
-msgid "%s did not produce a dict!"
-msgstr ""
-
-#: ../fdroidserver/signindex.py
-#, python-format
-msgid "%s has bad SHA-256: %s"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-format
-msgid "%s is not an accepted build field"
-msgstr "Το %s δεν είναι αποδεκτό πεδίο δόμησης"
-
-#: ../fdroidserver/common.py
-msgid "'keypass' not found in config.yml!"
-msgstr "Το «keypass» δεν βρέθηκε στο config.yml!"
-
-#: ../fdroidserver/common.py
-msgid "'keystore' is NONE and 'smartcardoptions' is blank!"
-msgstr "Το \"keystore\" είναι NONE και το \"smartcardoptions\" είναι κενό!"
-
-#: ../fdroidserver/common.py
-msgid "'keystore' not found in config.yml!"
-msgstr "Το 'keystore' δεν βρέθηκε στο config.yml!"
-
-#: ../fdroidserver/common.py
-msgid "'keystorepass' not found in config.yml!"
-msgstr "Το 'keystorepass' δεν βρέθηκε στο config.yml!"
-
-#: ../fdroidserver/common.py
-msgid "'repo_keyalias' not found in config.yml!"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-msgid "'required' is an invalid argument for positionals"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "'sdk_path' not set in config.yml!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "'{aapt}' is too old, fdroid requires build-tools-{version} or newer!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "'{path}' failed to execute!"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "'{path}' has invalid format, it should be a dictionary!"
-msgstr ""
-
-#: ../fdroidserver/lint.py ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "'{value}' is not a valid {field} in {appid}. Regex pattern: {pattern}"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "'{value}' is not a valid {field}, should be {pattern}"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "--merge-request only runs on a single appid!"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "...checkupdate failed for {appid} : {error}"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-msgid ".__call__() not defined"
-msgstr ". __call__ () δεν έχει οριστεί"
-
-#: ../fdroidserver/lint.py
-msgid "/issues is missing"
-msgstr ""
-
-#: ../fdroidserver/mirror.py
-msgid "A URL is required as an argument!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "APK signatures have different certificates in {path}:"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Add PGP signatures using GnuPG for packages in repo"
-msgstr ""
-
-#: ../fdroidserver/update.py
-msgid "Add a repo signing key to an unsigned repo"
-msgstr ""
-
-#: ../fdroidserver/update.py
-msgid "Add skeleton metadata files for APKs that are missing them"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Adding new repo for only {name}"
-msgstr ""
-
-#: ../fdroidserver/init.py
-msgid "Alias of the repo signing key in the keystore"
-msgstr ""
-
-#: ../fdroidserver/build.py
-msgid "AllowedAPKSigningKeys missing but reference binary supplied"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
-msgid "Allows a different revision (or git branch) to be specified for the initial import"
-msgstr ""
-
-#: ../fdroidserver/mirror.py
-msgid "Also mirror the full archive section"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Also warn about formatting issues, like rewritemeta -l"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "Android AAR library"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "Android APK file"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "Android DEX code"
-msgstr ""
-
-#: ../fdroidserver/init.py
-#, python-brace-format
-msgid "Android SDK not found at {path}!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Android SDK path '{path}' does not exist!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Android SDK path '{path}' is not a directory!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Android SDK tool {cmd} not found!"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "App has Binaries but does not have corresponding AllowedAPKSigningKeys to pin certificate."
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "App has NoSourceSince or ArchivePolicy \"0 versions\" or 0 but AutoUpdateMode or UpdateCheckMode are not None"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "App is in '{repo}' but has a link to {url}"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "App version has binary but does not have corresponding AllowedAPKSigningKeys to pin certificate."
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Appending .git is not necessary"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Archiving {apkfilename} with invalid signature!"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "AutoUpdateMode with UpdateCheckMode: HTTP must have a pattern."
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "Automatic no to all prompts."
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "Automatic yes to all prompts."
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "Bad entry type \"{mirrortype}\" in mirrors config: {mirror}"
-msgstr ""
-
-#: ../fdroidserver/mirror.py
-msgid "Base URL to mirror, can include the index signing key using the query string: ?fingerprint="
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Branch '{branch}' used as commit in build '{versionName}'"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Branch '{branch}' used as commit in srclib '{srclib}'"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Broken symlink: {path}"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Build a package from source"
-msgstr "Δημιουργήστε ένα πακέτο από τον πηγαίο κώδικα"
-
-#: ../fdroidserver/build.py
-msgid "Build all applications available"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Build generated by `fdroid import` - remove disable line once ready"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "Build metadata git repo has uncommited changes!"
-msgstr ""
-
-#: ../fdroidserver/build.py
-msgid "Build only the latest version of each package"
-msgstr ""
-
-#: ../fdroidserver/init.py
-#, python-format
-msgid "Built repo based in \"%s\" with this config:"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "Can't auto-update app with no CurrentVersionCode"
-msgstr ""
-
-#: ../fdroidserver/build.py
-msgid "Can't build due to {} error while scanning"
-msgid_plural "Can't build due to {} errors while scanning"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Cannot read {path}: {error}"
-msgstr ""
-
-#: ../fdroidserver/rewritemeta.py
-#, python-brace-format
-msgid "Cannot rewrite \"{path}\""
-msgstr ""
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
-#: ../fdroidserver/lint.py
-#, python-format
-msgid "Categories '%s' is not valid"
-msgstr ""
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
-#: ../fdroidserver/lint.py
-msgid "Categories are not set"
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "Category \"{category}\" defined but not used for any apps!"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Check for updates to applications"
-msgstr "Έλεγχος για ενημερώσεις εφαρμογών"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Checking archiving for {appid} - apks:{integer}, keepversions:{keep}, archapks:{arch}"
-msgstr ""
-
-#: ../fdroidserver/update.py
-msgid "Clean update - don't uses caches, reprocess all APKs"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Color the log output"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
-msgid "Comma separated list of categories."
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-#, python-format
-msgid "Command '%s' not recognised.\n"
-msgstr "Η εντολή «%s» δεν αναγνωρίζεται.\n"
-
-#: ../fdroidserver/checkupdates.py
-msgid "Commit changes"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "Commit changes, push, then make a merge request"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Conflicting \"{field}\" definitions between .yml and localized files:"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Conflicting arguments: '--verbose' and '--quiet' can not be specified at the same time."
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Could not find '{command}' on your system"
-msgstr ""
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/import_subcommand.py
-msgid "Could not find latest version code"
-msgstr ""
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
-#: ../fdroidserver/import_subcommand.py
-msgid "Could not find latest version name"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Could not find {path} to remove it"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Could not open APK {path} for analysis: "
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Could not parse size \"{size}\", wrong type \"{type}\""
-msgstr ""
-
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/import_subcommand.py
-msgid "Couldn't find Application ID"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "Couldn't find any version information"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "Couldn't find package ID"
-msgstr ""
-
-#: ../fdroidserver/update.py
-msgid "Cowardily refusing to overwrite existing signing key setup!"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Created new container \"{name}\""
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Creating \"{path}\" for configuring s3cmd."
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Creating empty {config_file}"
-msgstr ""
-
-#: ../fdroidserver/publish.py
-msgid "Creating log directory"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Creating new S3 bucket: {url}"
-msgstr ""
-
-#: ../fdroidserver/publish.py
-msgid "Creating output directory"
-msgstr ""
-
-#: ../fdroidserver/index.py
-msgid "Creating signed index with this key (SHA256):"
-msgstr ""
-
-#: ../fdroidserver/publish.py ../fdroidserver/verify.py
-msgid "Creating temporary directory"
-msgstr ""
-
-#: ../fdroidserver/index.py
-msgid "Creating unsigned index in preparation for signing"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "CurrentVersionCode {cv} is less than oldest build entry {versionCode}"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-msgid "DEBUG_KEYSTORE is not set or the value is incomplete"
-msgstr ""
-
-#: ../fdroidserver/update.py
-msgid "Delete APKs and/or OBBs without metadata from the repo"
-msgstr "Διαγραφή APKs και/ή OBBs χωρίς μεταδεδομένα από το αποθετήριο"
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Deleting archive, repo is too big ({size} max {limit})"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Deleting git-mirror history, repo is too big ({size} max {limit})"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Deleting unknown file: {path}"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-format
-msgid "Description '%s' is just the app's summary"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Description has a duplicate line"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Description of length {length} is over the {limit} char limit"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Did you mean config/{name}.yml?"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Did you mean {code}?"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
-msgid "Do not add 'disable:' to the generated build entries"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-msgid "Do not deploy the new files to the repo"
-msgstr ""
-
-#: ../fdroidserver/mirror.py
-#, python-brace-format
-msgid "Do not include \"{path}\" in URL!"
-msgstr ""
-
-#: ../fdroidserver/init.py
-msgid "Do not prompt for Android SDK path, just fail"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-msgid "Do not remove the private keys generated from the keystore"
-msgstr ""
-
-#: ../fdroidserver/build.py
-msgid "Don't create a source tarball, useful when testing a build"
-msgstr ""
-
-#: ../fdroidserver/build.py
-msgid "Don't refresh the repository, useful when testing a build with no internet connection"
-msgstr ""
-
-#: ../fdroidserver/deploy.py ../fdroidserver/nightly.py
-msgid "Don't use rsync checksums"
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "Download F-Droid.apk using mirrors that leak less to the network"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Download complete mirrors of small repos"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Downloading the repository already failed once, not trying again."
-msgstr ""
-
-#: ../fdroidserver/verify.py
-#, python-brace-format
-msgid "Downloading {url} failed. {error}"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Duplicate Anti-Feature declaration at {path} was ignored!"
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-format
-msgid "Duplicate entry \"%s\" in mirrors config!"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Duplicate link in '{field}': {url}"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-format
-msgid "ERROR: %(message)s"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "ERROR: The \"server\" subcommand has been removed, use \"deploy\"!"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-msgid "ERROR: unsupported CI type, patches welcome!"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-#, python-format
-msgid "ERROR: unsupported git host \"%s\", patches welcome!"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "ERROR: {key} in {path} is not \"archive\" or \"repo\"!"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "ERROR: {key} not a valid key!"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "ERROR: {key}'s value should be of type {t}!"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "ERROR: {key}:{subkey} in {path} is not in allowed keys: {allowed_keys}!"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-#, python-brace-format
-msgid "Encoding is set to '{enc}' fdroid might run into encoding issues. Please set it to 'UTF-8' for best results."
-msgstr ""
-
-#: ../fdroidserver/init.py
-#, python-format
-msgid ""
-"Enter the path to the Android SDK (%s) here:\n"
-"> "
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Environment variable {var} from {configname} is not set!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Environment variable {{env: {var}}} is not set!"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "Error deploying 'github_releases', {} not present. (You might need to run `fdroid update` first.)"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
-msgid "Error while getting repo address"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "Exit with a non-zero code if problems were found"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Extract application metadata from a source repository"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Extract signatures from APKs"
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "F-Droid.apk could not be downloaded from any known source!"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Failed copying {path}: {error}"
-msgstr ""
-
-#: ../fdroidserver/signatures.py
-#, python-brace-format
-msgid "Failed fetching signatures for '{apkfilename}': {error}"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Failed reading {path}: {error}"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Failed resizing {path}: {error}"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Failed to create S3 bucket: {url}"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Failed to get APK information, deleting {path}"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Failed to get APK information, skipping {path}"
-msgstr ""
-
-#: ../fdroidserver/update.py
-msgid "Failed to get APK signing key fingerprint"
-msgstr ""
-
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "Failed to install '{apkfilename}' on {dev}: {error}"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Failed to sign application"
-msgstr ""
-
-#: ../fdroidserver/build.py
-#, python-brace-format
-msgid "Fetched buildserverid from VM: {buildserverid}"
-msgstr ""
-
-#: ../fdroidserver/signatures.py
-#, python-brace-format
-msgid "Fetched signatures for '{apkfilename}' -> '{sigdir}'"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "File disappeared while processing it: {path}"
-msgstr ""
-
-#: ../fdroidserver/build.py ../fdroidserver/install.py
-#: ../fdroidserver/rewritemeta.py ../fdroidserver/scanner.py
-#: ../fdroidserver/update.py
-msgid "Finished"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Forbidden HTML tags"
-msgstr ""
-
-#: ../fdroidserver/build.py
-msgid "Force build of disabled apps, and carries on regardless of scan problems. Only allowed in test mode."
-msgstr ""
-
-#: ../fdroidserver/build.py
-#, python-brace-format
-msgid "Force halting build after {0} sec timeout!"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "Force scan of disabled apps and builds."
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Found \"{path}\" graphic without metadata for app \"{name}\"!"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Found bad funding file \"{path}\" for \"{name}\":"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Found invalid appids in arguments"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Found invalid versionCodes for some apps"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Found multiple JAR Signature Block Files in {path}"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Found multiple Signer Certificates!"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Found multiple metadata files for {appid}"
-msgstr ""
-
-#: ../fdroidserver/index.py
-msgid "Found multiple signing certificates for repository."
-msgstr ""
-
-#: ../fdroidserver/index.py
-msgid "Found no signing certificates for repository."
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-format
-msgid "Found non-file at %s"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Found {apkfilename} at {url}"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Found {count} problems in {filename}"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Found {count} warnings in {filename}"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Generated skeleton metadata for {appid}"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-format
-msgid "Git checkout of '%s' failed"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Git clean failed"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Git fetch failed"
-msgstr ""
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/common.py
-#, python-format
-msgid "Git remote set-head failed: \"%s\""
-msgstr ""
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/common.py
-msgid "Git reset failed"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Git submodule deinit failed"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Git submodule sync failed"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Git submodule update failed"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "HTTPS must be used with Subversion URLs!"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "If a git mirror gets to big, allow the archive to be deleted"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "If this upload fails, try manually uploading to {url}"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Ignoring '{field}' in '{metapath}' metadata because it is deprecated."
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-format
-msgid "Ignoring FUNDING.yml entry longer than 2048: %s"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-format
-msgid "Ignoring bad element in manifest: %s"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Ignoring deprecated {oldfile}, use {newfile}!"
-msgstr ""
-
-#: ../fdroidserver/index.py
-msgid "Ignoring package without metadata: "
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Ignoring stale cache data for {apkfilename}"
-msgstr ""
-
-#: ../fdroidserver/update.py
-msgid "Include APKs that are signed with disabled algorithms like MD5"
-msgstr ""
-
-#: ../fdroidserver/mirror.py
-msgid "Include the PGP signature .asc files in the mirror"
-msgstr ""
-
-#: ../fdroidserver/mirror.py
-msgid "Include the build logs in the mirror"
-msgstr ""
-
-#: ../fdroidserver/mirror.py
-msgid "Include the source tarballs in the mirror"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-format
-msgid "Including metadata from %s@%s"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Including metadata from {path}"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Initialising submodules"
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "Install all signed applications available"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Install built packages on devices"
-msgstr "Εγκατάσταση έτοιμων πακέτων σε συσκευές"
-
-#: ../fdroidserver/install.py
-#, python-format
-msgid "Installing %s..."
-msgstr ""
-
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "Installing '{apkfilename}' on {dev}..."
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Interact with the repo HTTP server"
-msgstr "Αλληλεπίδραση με το διακομιστή HTTP του αποθετηρίου"
-
-#: ../fdroidserver/update.py
-msgid "Invalid APK"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "Invalid AutoUpdateMode: {mode}"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "Invalid UpdateCheckMode: {mode}"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "Invalid VercodeOperation: {field}"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Invalid VercodeOperation: {invalid_ops}"
-msgstr ""
-
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Invalid application ID {appid}"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Invalid bulleted list"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-format
-msgid "Invalid name for published file: %s"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Invalid ndk: entry in build: \"{ndk}\""
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Invalid redirect to non-HTTPS: {before} -> {after} "
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Invalid scrlib metadata: '{file}' does not exist"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Invalid srclib metadata: could not parse '{file}'"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Invalid srclib metadata: unknown key '{key}' in '{file}'"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "JAR signature failed to verify: {path}"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "JAR signature verified: {path}"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "Java JAR file"
-msgstr ""
-
-#: ../fdroidserver/mirror.py ../fdroidserver/publish.py
-#: ../fdroidserver/update.py
-msgid "Java JDK not found! Install in standard location or set java_paths!"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "Java compiled class"
-msgstr ""
-
-#: ../fdroidserver/signindex.py
-msgid "Java jarsigner not found! Install in standard location or set java_paths!"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Javascript in HTML src attributes"
-msgstr ""
-
-#: ../fdroidserver/build.py
-#, python-brace-format
-msgid "Keeping failed build \"{apkfilename}\""
-msgstr ""
-
-#: ../fdroidserver/init.py
-msgid "Keystore for signing key:\t"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Known debug key is used in AllowedAPKSigningKeys: "
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Last used commit '{commit}' looks like a tag, but UpdateCheckMode is '{ucm}'"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Liberapay donation methods belong in the Liberapay: field"
-msgstr ""
-
-#: ../fdroidserver/rewritemeta.py
-msgid "List files that would be reformatted (dry run)"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Locale included in f-droid.org URL"
-msgstr ""
-
-#: ../fdroidserver/build.py
-msgid "Make the build stop on exceptions"
-msgstr ""
-
-#: ../fdroidserver/index.py
-msgid "Malformed repository mirrors."
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "Malformed serverwebroot line:"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-format
-msgid "Max recursion depth in ZIP file reached: %s"
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "Mirror config for {url} contains \"isPrimary\" key!"
-msgstr ""
-
-#: ../fdroidserver/mirror.py
-msgid "Mirror the full repo and archive, all file types."
-msgstr ""
-
-#: ../fdroidserver/gpgsign.py
-msgid "Missing output directory"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-msgid "Moving Anti-Features declarations to localized files:"
-msgstr ""
-
-#: ../fdroidserver/index.py
-msgid "Neither \"repo_pubkey\" nor \"keystorepass\" set in config.yml"
-msgstr ""
-
-#: ../fdroidserver/verify.py
-#, python-format
-msgid "No APK for package: %s"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "No Android SDK found!"
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "No attached devices found"
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "No devices found for `adb install`! Please plug one in."
-msgstr ""
-
-#: ../fdroidserver/index.py
-msgid "No fingerprint in URL."
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "No git submodules available"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
-msgid "No gradle project could be found. Specify --subdir?"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
-msgid "No information found."
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "No matching tags found"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "No minimum SDK version found in {0}, using default (3)."
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "No need to specify that the app is Free Software"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "No need to specify that the app is for Android"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "No option set! Edit your config.yml to set at least one of these:"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "No packages specified"
-msgstr ""
-
-#: ../fdroidserver/install.py
-#, python-format
-msgid "No signed APK available for %s"
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "No signed output directory - nothing to do"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "No signing certificates found in {path}"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-format
-msgid "No such package: %s"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "No such versionCode {versionCode} for app {appid}"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "No tags found"
-msgstr ""
-
-#: ../fdroidserver/publish.py ../fdroidserver/verify.py
-msgid "No unsigned directory - nothing to do"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "No version information could be found."
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Not a valid size definition: \"{}\""
-msgstr ""
-
-#: ../fdroidserver/signindex.py
-msgid "Nothing to do"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "Nothing to do for {appid}."
-msgstr ""
-
-#: ../fdroidserver/init.py
-msgid "Now set these in config.yml:"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "OBB file has newer versionCode({integer}) than any APK:"
-msgstr ""
-
-#: ../fdroidserver/update.py
-msgid "OBB filename must start with \"main.\" or \"patch.\":"
-msgstr ""
-
-#: ../fdroidserver/update.py
-msgid "OBB's packagename does not match a supported APK:"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "Offline machine, skipping git mirror generation until `fdroid deploy`"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "One of the 'github_releases' config items is missing the 'packageNames' value. skipping ..."
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "One of the 'github_releases' config items is missing the 'projectUrl' value. skipping ..."
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "One of the 'github_releases' config items is missing the 'token' value. skipping ..."
-msgstr ""
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Only PNG and JPEG are supported for graphics, found: {path}"
-msgstr ""
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/common.py
-msgid "Only accepts a single key \"env\""
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "Only process apps with auto-updates"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "OpenCollective donation methods belong in the OpenCollective: field"
-msgstr ""
-
-#: ../fdroidserver/verify.py
-msgid "Output JSON report to file named after APK."
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "Output JSON to stdout."
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py ../fdroidserver/gpgsign.py
-#: ../fdroidserver/publish.py ../fdroidserver/signindex.py
-#: ../fdroidserver/update.py
-msgid "Outputting JSON"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
-msgid "Overall license of the project."
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "Overriding blank versionName in {apkfilename} from metadata: {version}"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
-#, python-brace-format
-msgid "Package \"{appid}\" already exists"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Parsing manifest at '{path}'"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Password required with username"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
-msgid "Path to main Android project subdirectory, if not in root."
-msgstr ""
-
-#: ../fdroidserver/init.py
-msgid "Path to the Android SDK (sometimes set in ANDROID_HOME)"
-msgstr ""
-
-#: ../fdroidserver/btlog.py
-msgid "Path to the git repo to use as the log"
-msgstr ""
-
-#: ../fdroidserver/init.py
-msgid "Path to the keystore for the repo signing key"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-msgid "Print the secret variable to the terminal for easy copy/paste"
-msgstr ""
-
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "Privacy mode was enabled based on your locale ({country_code})."
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-format
-msgid "Problem with ZIP file: %s, error %s"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Problem with xml at '{path}'"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "Process auto-updates"
-msgstr ""
-
-#: ../fdroidserver/publish.py ../fdroidserver/update.py
-#, python-brace-format
-msgid "Processing {apkfilename}"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Processing {appid}"
-msgstr ""
-
-#: ../fdroidserver/update.py
-msgid "Produce human-readable XML/JSON for index files"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
-msgid "Project URL to import from."
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Punctuation should be avoided"
-msgstr ""
-
-#: ../fdroidserver/btlog.py
-msgid "Push the log to this git remote repository"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Pushing binary transparency log to {url}"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "Pushing to remote server failed!"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Pushing to {url}"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Quickly start a new repository"
-msgstr "Γρήγορη εκκίνηση νέου αποθετηρίου"
-
-#: ../fdroidserver/__main__.py
-msgid "Read all the metadata files and exit"
-msgstr "Ανάγνωση όλων των αρχείων μεταδεδομένων κι έξοδος"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Reading '{config_file}'"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Reading packageName/versionCode/versionName failed, APK invalid: '{apkfilename}'"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Reading packageName/versionCode/versionName failed,APK invalid: '{apkfilename}'"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Reading {apkfilename} from cache"
-msgstr ""
-
-#: ../fdroidserver/build.py
-msgid "Refresh and cache scanner rules and signatures from the network"
-msgstr ""
-
-#: ../fdroidserver/publish.py
-#, python-brace-format
-msgid "Refusing to sign '{path}', file exists in both {dir1} and {dir2} folder."
-msgstr ""
-
-#: ../fdroidserver/verify.py
-msgid "Remove source tarball and any APKs if successfully verified."
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Removing specified files"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Removing {path}\""
-msgstr ""
-
-#: ../fdroidserver/update.py
-msgid "Rename APK files that do not match package.name_123.apk"
-msgstr "Μετονομασία αρχείων APK που δεν αντιστοιχούν με «όνομα.πακέτου_123.apk»"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "RepoType {type} is deprecated, please switch to git."
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-#, python-brace-format
-msgid "Resigning {apkfilename} with provided debug.keystore"
-msgstr ""
-
-#: ../fdroidserver/update.py
-msgid "Resize all the icons exceeding the max pixel size and exit"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Restrict output to warnings and errors"
-msgstr ""
-
-#: ../fdroidserver/net.py
-#, python-format
-msgid "Retrying failed download: %s"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Rewrite all the metadata files"
-msgstr "Επανεγγραφή όλων των αρχείων μετα-δεδομένων"
-
-#: ../fdroidserver/rewritemeta.py
-#, python-brace-format
-msgid "Rewriting '{appid}'"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "Run on git repo that has uncommitted changes"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-#, python-brace-format
-msgid "Run over {cibase} to find -debug.apk. and skip repo_basedir {repo_basedir}"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Run rewritemeta to fix formatting"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "Running first pass with MD5 checking disabled"
-msgstr ""
-
-#: ../fdroidserver/mirror.py
-#, python-brace-format
-msgid "Running wget in {path}"
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "SHA-256 of {url} does not match entry!"
-msgstr ""
-
-#: ../fdroidserver/build.py
-msgid "Scan the resulting APK(s) for known non-free classes."
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Scan the source code of a package"
-msgstr "Έλεγχος του πηγαίου κώδικα ενός πακέτου"
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Scanner found {count} problems in {apk}"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Scanner found {count} problems in {appid}:"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Scanner found {count} problems in {appid}:{versionCode}:"
-msgstr ""
-
-#: ../fdroidserver/build.py
-msgid "Scanner found {} problem"
-msgid_plural "Scanner found {} problems"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../fdroidserver/scanner.py
-msgid "Scanning APK for extra signing blocks."
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "Scanning APK with dexdump for known non-free classes."
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Set NDK {release} ({version}) up"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Set clock to that time using:"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-msgid "Set maximum releases in repo before older ones are archived"
-msgstr ""
-
-#: ../fdroidserver/build.py
-#, python-brace-format
-msgid "Set open file limit to {integer}"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Set up an app build for a nightly build repo"
-msgstr ""
-
-#: ../fdroidserver/build.py
-msgid "Setting open file limit failed: "
-msgstr ""
-
-#: ../fdroidserver/build.py
-#, python-brace-format
-msgid "Setting {0} sec timeout for this build"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Sign and place packages in the repo"
-msgstr "Υπογράψτε και τοποθετήστε τα πακέτα στο αποθετήριο"
-
-#: ../fdroidserver/__main__.py
-msgid "Sign indexes created using update --nosign"
-msgstr "Υπογραφή ευρετηρίων που δημιουργήθηκαν με τη χρήση update --nosign"
-
-#: ../fdroidserver/build.py
-msgid "Skip scanning the source code for binaries and other problems"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Skipping '{apkfilename}' with invalid signature!"
-msgstr ""
-
-#: ../fdroidserver/deploy.py ../fdroidserver/index.py
-#, python-format
-msgid "Skipping GitLab Pages mirror because the repo is too large (>%.2fGB)!"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Skipping index generation for {appid}"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Skipping {apkfilename} with invalid signature!"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Skipping {appid}: disabled"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "Specify a local folder to sync the repo to"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "Specify an identity file to provide to SSH for rsyncing"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-msgid "Specify which debug keystore file to use."
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Spew out even more information than normal"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-#, python-brace-format
-msgid "Stripping mystery signature from {apkfilename}"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-format
-msgid "Summary '%s' is just the app's name"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Summary of length {length} is over the {limit} char limit"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "System clock is older than date in {path}!"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "Tags update mode only works for git, hg, bzr and git-svn repositories currently"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "Tags update mode used in git-svn, but the repo was not set up with tags"
-msgstr ""
-
-#: ../fdroidserver/build.py
-msgid "Test mode - put output in the tmp directory only, and always build, even if the output already exists."
-msgstr ""
-
-#: ../fdroidserver/index.py
-msgid "The \"qrcode\" Python package is not installed (e.g. apt-get install python3-qrcode)!"
-msgstr ""
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "The OBB version code must come after \"{name}.\":"
-msgstr ""
-
-#: ../fdroidserver/btlog.py
-msgid "The base URL for the repo to log (default: https://f-droid.org)"
-msgstr ""
-
-#: ../fdroidserver/mirror.py
-msgid "The directory to write the mirror to"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-msgid "The file to be included in the repo (path or glob)"
-msgstr ""
-
-#: ../fdroidserver/index.py
-msgid "The repository's fingerprint does not match."
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "The root dir for local_copy_dir \"{path}\" does not exist!"
-msgstr ""
-
-#: ../fdroidserver/publish.py
-msgid "There is a keyalias collision - publishing halted"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "These are the apps that have been archived from the main repo."
-msgstr ""
-
-#: ../fdroidserver/mirror.py
-msgid "This command should never be used to mirror f-droid.org! A full copy requires more than 600GB."
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "This is a repository of apps to be used with F-Droid. Applications in this repository are either official binaries built by the original application developers, or are binaries built from source by the admin of f-droid.org using the tools on https://gitlab.com/fdroid."
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
-#, python-format
-msgid "This repo already has local metadata: %s"
-msgstr ""
-
-#: ../fdroidserver/init.py
-#, python-format
-msgid ""
-"To complete the setup, add your APKs to \"%s\"\n"
-"then run \"fdroid update -c; fdroid update\".  You might also want to edit\n"
-"\"config.yml\" to set the URL, repo name, and more.  You should also set up\n"
-"a signing key (a temporary one might have been automatically generated).\n"
-"\n"
-"For more info: https://f-droid.org/docs/Setup_an_F-Droid_App_Repo\n"
-"and https://f-droid.org/docs/Signing_Process"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "To use awsbucket, awssecretkey and awsaccesskeyid must also be set in config.yml!"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "To use rclone, rclone_config and awsbucket must be set in config.yml!"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "URL must start with https:// or http://"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "URL shorteners should not be used"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "URL {url} in Description: {error}"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Unexpected license tag \"{}\"! Only use FSF or OSI approved tags from https://spdx.org/license-list"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Unexpected license tag \"{}\"! Only use license tags configured in your config file"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Unknown entry {key} in {configname}"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Unknown exception found!"
-msgstr "Βρέθηκε άγνωστη εξαίρεση!"
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Unknown file '{filename}' in build '{versionName}'"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-format
-msgid "Unknown metadata format: %s"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Unknown metadata format: {path} (use: *.yml)"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Unknown version of aapt, might cause problems: "
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Unnecessary leading space"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Unnecessary trailing space"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Unrecognised app field '{fieldname}' in '{path}'"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Unrecognised build flag '{build_flag}' in '{path}'"
-msgstr ""
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Unsupported file type \"{extension}\" for repo graphic"
-msgstr "Μη υποστηριζόμενος τύπος αρχείου «{extension}» για αποθήκευση γραφικών"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Unsupported graphics file found: {path}"
-msgstr "Βρέθηκε μη υποστηριζόμενο γραφικό αρχείο: {path}"
-
-#: ../fdroidserver/lint.py
-#, python-format
-msgid "Unused extlib at %s"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-format
-msgid "Unused file at %s"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-format
-msgid "Unused scandelete path: %s"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-format
-msgid "Unused scanignore path: %s"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Update repo information for new packages"
-msgstr "Ενημέρωση πληροφοριών αποθετηρίου για νέα πακέτα"
-
-#: ../fdroidserver/__main__.py
-msgid "Update the binary transparency log for a URL"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "UpdateCheckData has invalid URL: {url}"
-msgstr ""
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "UpdateCheckData must match the version code as integer (\\d or [0-9]): {codeex}"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "UpdateCheckData must use HTTPS URL: {url}"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "UpdateCheckData not a valid URL: {url}"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "UpdateCheckMode is set but it looks like checkupdates hasn't been run yet."
-msgstr ""
-
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/lint.py
-msgid "UpdateCheckName is set to the known application ID, it can be removed"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Uploading {apkfilename} to androidobservatory.org"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Uploading {apkfilename} to virustotal"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Use /HEAD instead of /master or /main to point at a file in the default branch"
-msgstr ""
-
-#: ../fdroidserver/update.py
-msgid "Use `fdroid update -c` to create it."
-msgstr ""
-
-#: ../fdroidserver/build.py
-msgid "Use build server"
-msgstr ""
-
-#: ../fdroidserver/update.py
-msgid "Use date from APK instead of current time for newly added APKs"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Using \"{path}\" for configuring s3cmd."
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Using \"{path}\" for syncing with remote storage."
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Using APK Signature v2"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Using APK Signature v3"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Using JAR Signature"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Using Java's jarsigner, not recommended for verifying APKs! Use apksigner"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Using blank dictionary instead of contents of {path}!"
-msgstr ""
-
-#: ../fdroidserver/init.py
-#, python-brace-format
-msgid "Using existing keystore \"{path}\""
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, fuzzy, python-brace-format
-msgid "Using rclone to sync with: {url}"
-msgstr "χρήση Apache libcloud για συγχρονισμό με {url}"
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Using s3cmd to sync with: {url}"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Valid commands are:"
-msgstr "Οι έγκυρες εντολές είναι οι εξής:"
-
-#: ../fdroidserver/verify.py
-msgid "Verify against locally cached copy rather than redownloading."
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Verify the integrity of downloaded packages"
-msgstr "Επαλήθευση της ακεραιότητας των πακέτων που έχουν ληφθεί"
-
-#: ../fdroidserver/index.py
-msgid "Verifying index signature:"
-msgstr ""
-
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "Verifying package {path} with apksigner."
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "VirusTotal API key cannot upload files larger than 32MB, use {url} to upload {path}."
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-msgid "WARNING: only public git repos are supported!"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Warn about possible metadata errors"
-msgstr "Προειδοποίηση για πιθανά σφάλματα μετα-δεδομένων"
-
-#: ../fdroidserver/scanner.py
-msgid "WebAssembly binary file"
-msgstr ""
-
-#: ../fdroidserver/update.py
-msgid "When configured for signed indexes, create only unsigned indexes at this stage"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "When linting the entire repository yamllint is disabled by default. This option forces yamllint regardless."
-msgstr ""
-
-#: ../fdroidserver/publish.py
-msgid "When signing or verifying fails, exit with an error code."
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "Would you like to download and install F-Droid.apk via adb? (YES/no)"
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "Would you like to download the app(s) from f-droid.org? (YES/no)"
-msgstr ""
-
-#: ../fdroidserver/init.py
-msgid "X.509 'Distinguished Name' used when generating keys"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "You can use ANDROID_HOME to set the path to your SDK, i.e.:"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "ZIP file archive"
-msgstr ""
-
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "adb reports {serial} is \"{status}\"!"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-#, python-brace-format
-msgid "adding IdentityFile to {path}"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "adding to {name}: {path}"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "ambiguous option: %(option)s could match %(matches)s"
-msgstr "Ασαφής επιλογή: %(option)s θα μπορούσε να ταιριάζει με %(matches)s"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "apksigner in build-tools;{version} passes APKs with invalid v3 signatures, ignoring."
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "apksigner not found! Cannot sign or verify modern APKs"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "apksigner not found, it's required for signing!"
-msgstr ""
-
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/checkupdates.py ../fdroidserver/lint.py
-#: ../fdroidserver/rewritemeta.py
-msgid "application ID of file to operate on"
-msgstr ""
-
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/build.py ../fdroidserver/install.py
-#: ../fdroidserver/publish.py ../fdroidserver/scanner.py
-#: ../fdroidserver/verify.py
-msgid "application ID with optional versionCode in the form APPID[:VERCODE]"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "archive_url needs to end with /archive"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "argument \"-\" with mode %r"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "argument %(argument_name)s: %(message)s"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-msgid "attempting bare SSH connection to test deploy key:"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "can not parse scrlib spec (not a string): '{}'"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "can't open '%(filename)s': %(error)s"
-msgstr "δεν είναι δυνατό το άνοιγμα του '%(filename)s': %(error)s"
-
-#: ../fdroidserver/scanner.py
-msgid "can't open non-https url: '{};"
-msgstr ""
-
-#: ../fdroidserver/build.py
-#, python-brace-format
-msgid "cannot find required srclibs: \"{path}\""
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-msgid "cannot have multiple subparser arguments"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "cannot merge actions - two groups are named %r"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-msgid "cannot publish update, did you set the deploy key?"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-#, python-brace-format
-msgid "cloning {url}"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "commands from plugin modules:"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "conflicting option string: %s"
-msgid_plural "conflicting option strings: %s"
-msgstr[0] ""
-msgstr[1] ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "conflicting subparser alias: %s"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "conflicting subparser: %s"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "could not parse '{path}'"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "could not parse srclib spec (no name specified): '{}'"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "could not parse srclib spec (no ref specified): '{}'"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-#, python-brace-format
-msgid "created {path}"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "current version is newer: old vercode={old}, new vercode={new}"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "deleting: repo/{apkfilename}"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "dependency file without lock"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "deployed process log {path} to {dest}"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "dest= is required for options like %r"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "downloading '{}'"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "downloading scanner signatures from '{}' failed"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "executable binary, possibly code"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "expected %s argument"
-msgid_plural "expected %s arguments"
-msgstr[0] ""
-msgstr[1] ""
-
-#: /usr/lib/python3.11/argparse.py
-msgid "expected at least one argument"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-msgid "expected at most one argument"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-msgid "expected one argument"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "fdroid [<command>] [-h|--help|--version|<args>]"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "fetch the latest version of signatures from the web"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-msgid "force metadata errors (default) to be warnings, or to be ignored."
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "git svn clone failed"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "gzip file archive"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "ignored explicit argument %r"
-msgstr ""
-
-#: ../fdroidserver/index.py
-msgid "index-v1 must have a signature, use `fdroid signindex` to create it!"
-msgstr ""
-
-#: ../fdroidserver/index.py
-msgid "index-v2 must have a signature, use `fdroid signindex` to create it!"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "invalid %(type)s value: %(value)r"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "invalid choice: %(value)r (choose from %(choices)s)"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "invalid conflict_resolution value: %r"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "invalid option string %(option)r: must start with a character %(prefix_chars)r"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "ipfs_cid not found, skipping CIDv1 generation"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "latest build recipe is newer: old vercode={old}, new vercode={new}"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "local_copy_dir does not end with \"fdroid\", perhaps you meant: \"{path}\""
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "local_copy_dir must be an absolute path!"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "local_copy_dir must be directory, not a file!"
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-format
-msgid "mirror '%s' does not end with 'fdroid'!"
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "mirrors set twice, in config.yml and {path}!"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-msgid "mutually exclusive arguments must be optional"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "next {name} cache update due in {time}"
-msgstr ""
-
-#: ../fdroidserver/mirror.py
-#, python-brace-format
-msgid "no \"icon\" in {appid}"
-msgstr ""
-
-#: ../fdroidserver/signatures.py
-msgid "no APK supplied"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "no version information found"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "not allowed with argument %s"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "one of the arguments %s is required"
-msgstr ""
-
-#: ../fdroidserver/common.py ../fdroidserver/index.py
-msgid "only accepts strings, lists, and tuples"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, fuzzy
-msgid "options"
-msgstr "Επιλογές"
-
-#: ../fdroidserver/nightly.py
-#, python-brace-format
-msgid "overwriting existing {path}"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-msgid "positional arguments"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "process log deploy {path} to {dest} failed!"
-msgstr ""
-
-#: ../fdroidserver/build.py
-msgid "reference binary missing signature"
-msgstr ""
-
-#: ../fdroidserver/signatures.py
-#, python-brace-format
-msgid "refuse downloading via insecure HTTP connection (use HTTPS or specify --no-https-check): {apkfilename}"
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-format
-msgid "repo_icon \"repo/icons/%s\" does not exist, generating placeholder."
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "repo_url needs to end with /repo"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "rsync is missing or broken: {error}"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "s3cmd sync indexes {path} to {url} and delete"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "s3cmd syncs indexes from {path} to {url} and deletes removed"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "scanner cache is malformed! You can clear it with: '{clear}'"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "serverwebroot: path does not end with \"fdroid\", perhaps you meant one of these:"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "shared library"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-msgid "show this help message and exit"
-msgstr "εμφάνιση αυτού του βοηθητικού μηνύματος κι έξοδος"
-
-#: ../fdroidserver/signatures.py
-msgid "signed APK, either a file-path or HTTPS URL."
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "skip deploying full build logs: log content is empty"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "skip deploying full build logs: not enabled in config"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "skipping source tarball: {path}"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "srclibs missing name and/or @"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "static library"
-msgstr "στατική βιβλιοθήκη"
-
-#: ../fdroidserver/build.py
-#, python-brace-format
-msgid "supplied reference binary has allowed signer {signer}"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "the following arguments are required: %s"
-msgstr "Απαιτούνται τα ακόλουθα ορίσματα: %s"
-
-#: ../fdroidserver/install.py
-msgid "true"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "unexpected option string: %s"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "unknown parser %(parser_name)r (choices: %(choices)s)"
-msgstr "άγνωστος συντακτικός αναλυτής %(parser_name)r (επιλογές: %(choices)s)"
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "unrecognized arguments: %s"
-msgstr "μη αναγνωρίσιμα ορίσματα: %s"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "unsafe permissions on '{config_file}' (should be 0600)!"
-msgstr "μη ασφαλή δικαιώματα στο '{config_file}' (πρέπει να είναι 0600)!"
-
-#: ../fdroidserver/__main__.py /usr/lib/python3.11/argparse.py
-msgid "usage: "
-msgstr "χρήση: "
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "using Apache libcloud to sync with {url}"
-msgstr "χρήση Apache libcloud για συγχρονισμό με {url}"
-
-#: ../fdroidserver/deploy.py
-msgid "virustotal.com is rate limiting, waiting to retry..."
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "yes"
-msgstr ""
-
-#: ../fdroidserver/publish.py
-#, python-brace-format
-msgid "{0} app, {1} key aliases"
-msgid_plural "{0} apps, {1} key aliases"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{apkfilename} ({appid}) has no metadata!"
-msgstr ""
-
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{apkfilename}'s AndroidManifest.xml has a bad date: "
-msgstr ""
-
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{appid} does not have a name! Using application ID instead."
-msgstr ""
-
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{appid} from {path} is not a valid Android application ID!"
-msgstr ""
-
-#: ../fdroidserver/metadata.py ../fdroidserver/update.py
-#, python-brace-format
-msgid "{appid} from {path} is not a valid Java Package Name!"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{appid} has both APKs and files: {files}"
-msgstr ""
-
-#: ../fdroidserver/mirror.py
-#, python-brace-format
-msgid "{appid} is missing {name}"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "{appid}: Unknown extlib {path} in build '{versionName}'"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "{appid}: no builds specified, running on current source state"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "{appid}: {field} must be a '{type}', but it is a '{fieldtype}!'"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "{appid}: {field} must be a '{type}', but it is a '{fieldtype}'!"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "{build_flag} must be an integer, found: {value}"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "{build_flag} must be list or string, found: {value}"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "{file} is blank or corrupt!"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{name} \"{section}/icons/{path}\" does not exist! Check \"config.yml\"."
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{path1} is a duplicate of {path2}, remove one!"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
-#, python-brace-format
-msgid "{path} already exists, ignoring import results!"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-#, python-brace-format
-msgid "{path} does not exist!  Create it by running:"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{path} has bad file signature \"{pattern}\", possible Janus exploit!"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "{path} has been flagged by virustotal {count} times:"
-msgstr ""
-
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "{path} has the wrong fingerprint ({fingerprint})!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "{path} is not \"key: value\" dict, but a {datatype}!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "{path} is not a standard config file!"
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "{path} is not list, but a {datatype}!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "{path} is not {expected_type}, but a {datatype}!"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{path} is zero size!"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "{path} more than 200MB, manually upload: {url}"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "{path}: \"{code}\" is not a valid ISO_3166-1 alpha-2 country code!"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{path}: {error}"
-msgstr ""
-
-#: ../fdroidserver/mirror.py
-#, python-brace-format
-msgid "{url} does not end with \"fdroid\", check the URL path!"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
-#, python-brace-format
-msgid "{url} does not start with \"http\"!"
-msgstr ""
-
-#: ../fdroidserver/build.py
-msgid "{} build failed"
-msgid_plural "{} builds failed"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../fdroidserver/build.py
-msgid "{} build succeeded"
-msgid_plural "{} builds succeeded"
-msgstr[0] ""
-msgstr[1] ""
diff --git a/locale/es/LC_MESSAGES/fdroidserver.po b/locale/es/LC_MESSAGES/fdroidserver.po
index 64a43a1c..aba7edc4 100644
--- a/locale/es/LC_MESSAGES/fdroidserver.po
+++ b/locale/es/LC_MESSAGES/fdroidserver.po
@@ -3,36 +3,52 @@
 # This file is distributed under the same license as the PACKAGE package.
 # Maximiliano Castañón <maximi89@gmail.com>, 2020.
 # Jo <joaquinfc@protonmail.com>, 2020.
-# Hans-Christoph Steiner <hans@guardianproject.info>, 2020, 2021, 2022.
+# Hans-Christoph Steiner <hans@guardianproject.info>, 2020.
 # Alvaro <alvaro@null.net>, 2020.
-# Fioddor Superconcentrado <fioddor@gmail.com>, 2021.
-# Adolfo Jayme Barrientos <fitojb@ubuntu.com>, 2021.
-# mondstern <mondstern@snopyta.org>, 2021.
-# Germe the fur star <FOSSgerme.deb@tuta.io>, 2021.
-# Iago <iagrivmoa@gmail.com>, 2022.
-# Iago <translate@delthia.com>, 2022.
-# Jaime Marquínez Ferrándiz <weblate@jregistros.fastmail.net>, 2022.
-# gallegonovato <fran-carro@hotmail.es>, 2022, 2023, 2024.
-# Nicolás Pérez <ccnicolasperez@gmail.com>, 2025.
-# Swyter <swyterzone@gmail.com>, 2025.
 msgid ""
 msgstr ""
 "Project-Id-Version: fdroidserver 0.9\n"
 "Report-Msgid-Bugs-To: https://gitlab.com/fdroid/fdroidserver/issues\n"
-"POT-Creation-Date: 2025-06-25 09:52+0200\n"
-"PO-Revision-Date: 2025-06-24 11:02+0000\n"
-"Last-Translator: Swyter <swyterzone@gmail.com>\n"
+"POT-Creation-Date: 2020-10-21 18:05+0200\n"
+"PO-Revision-Date: 2020-11-20 23:28+0000\n"
+"Last-Translator: Alvaro <alvaro@null.net>\n"
 "Language-Team: Spanish <https://hosted.weblate.org/projects/f-droid/fdroidserver/es/>\n"
 "Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 5.13-dev\n"
+"X-Generator: Weblate 4.4-dev\n"
+
+#: ../fdroidserver/common.py
+#, fuzzy
+msgid ""
+"\n"
+"        This is a repository of apps to be used with FDroid. Applications in this\n"
+"        repository are either official binaries built by the original application\n"
+"        developers, or are binaries built from source by f-droid.org using the\n"
+"        tools on https://gitlab.com/fdroid.\n"
+"        "
+msgstr ""
+"\n"
+"        Este es un repositorio de aplicaciones para usar con FDroid. Las aplicaciones en este\n"
+"        repositorio son binarios oficiales construidos por los desarrolladores originales de la \n"
+"        aplicación, o son binarios creados a partir de la fuente por f-droid.org utilizando las\n"
+"        herramientas en https://gitlab.com/fdroid.\n"
+"        "
 
 #: ../fdroidserver/nightly.py
 msgid ""
 "\n"
+"SSH Public Key to be used as Deploy Key:"
+msgstr ""
+"\n"
+"Clave pública SSH que se usará como clave de despliegue:"
+
+#: ../fdroidserver/nightly.py
+#, fuzzy
+msgid ""
+"\n"
 "SSH public key to be used as deploy key:"
 msgstr ""
 "\n"
@@ -52,26 +68,22 @@ msgstr ""
 msgid "\"%s/\" has no matching metadata file!"
 msgstr "¡\"%s/\" no tiene su correspondiente fichero de metadatos!"
 
-#: ../fdroidserver/index.py
-msgid "\"isPrimary\" key should not be added to mirrors!"
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "\"local_copy_dir\" {path} does not exist!"
-msgstr "¡El directorio raíz para local_copy_dir \"{path}\" no existe!"
-
 #: ../fdroidserver/install.py
-#, python-brace-format
+#, fuzzy, python-brace-format
 msgid "\"{apkfilename}\" is already installed on {dev}."
-msgstr "\"{apkfilename}\" ya está instalado en {dev}."
+msgstr "'{apkfilename}' ya está instalado en {dev}."
+
+#: ../fdroidserver/update.py
+#, python-brace-format
+msgid "\"{path}\" contains outdated {name} ({version})"
+msgstr "\"{path}\" contiene {name} ({version}) caducado"
 
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "\"{path}\" contains recent {name} ({version})"
 msgstr "\"{path}\" contiene {name} ({version}) reciente"
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "\"{path}\" exists but s3cmd is not installed!"
 msgstr "\"{path}\" existe pero ¡s3cmd no está instalado!"
@@ -81,84 +93,119 @@ msgstr "\"{path}\" existe pero ¡s3cmd no está instalado!"
 msgid "\"{path}\" is not a supported file format (use: metadata/*.yml)"
 msgstr "\"{path}\" no es un formato reconocido, convertir a metadata/*.yml"
 
-#: ../fdroidserver/update.py
+#: ../fdroidserver/metadata.py
 #, python-brace-format
-msgid "\"{path}\" is signed by a key that is not allowed:"
-msgstr "\"{path}\" está firmado por una clave no permitida:"
+msgid "\"{path}\" is not an accepted format, convert to: {formats}"
+msgstr "\"{path}\" no es un formato reconocido, convertir a: {formats}"
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/common.py
 #, python-brace-format
 msgid "\"{url}\" is not a valid URL!"
 msgstr "\"{url}\" no es una URL válida!"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, python-format
+msgid "%(option)s option requires %(number)d argument"
+msgid_plural "%(option)s option requires %(number)d arguments"
+msgstr[0] "la opción %(option)s requiere %(number)d argumento"
+msgstr[1] "la opción %(option)s requiere %(number)d argumentos"
+
+#: ../fdroidserver/mirror.py
+#, python-format
+msgid "%(prog)s [options] url"
+msgstr "%(prog)s [opciones] url"
+
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "%(prog)s: error: %(message)s\n"
 msgstr "%(prog)s: error: %(message)s\n"
 
-#: ../fdroidserver/publish.py
-#, python-format
-msgid "%d APKs failed to be signed or verified!"
-msgstr "¡%d APKs fallaron al ser firmados o verificados!"
-
 #: ../fdroidserver/scanner.py
 #, python-format
 msgid "%d problems found"
 msgstr "%d problemas encontrados"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "%prog [options]"
+msgstr "%prog [opciones]"
+
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "%r is not callable"
 msgstr "no se puede llamar a %r"
 
-#: ../fdroidserver/signindex.py
-#, python-format
-msgid "%s did not produce a dict!"
-msgstr "¡%s no ha producido un dict!"
-
-#: ../fdroidserver/signindex.py
-#, python-format
-msgid "%s has bad SHA-256: %s"
-msgstr "%s tienes mal un SHA-256: %s"
-
 #: ../fdroidserver/lint.py
 #, python-format
 msgid "%s is not an accepted build field"
 msgstr "%s no es un campo de construcción aceptado"
 
-#: ../fdroidserver/common.py
-msgid "'keypass' not found in config.yml!"
-msgstr "¡'keypass' no encontrado en config.yml!"
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, python-format
+msgid "%s option does not take a value"
+msgstr "la opción %s no toma un valor"
+
+#: ../fdroidserver/index.py ../fdroidserver/common.py
+msgid "'keypass' not found in config.py!"
+msgstr "¡'keypass' no encontrado en config.py!"
 
 #: ../fdroidserver/common.py
 msgid "'keystore' is NONE and 'smartcardoptions' is blank!"
-msgstr "¡\"keystore\" es NONE y \"smartcardoptions\" está vacío!"
+msgstr ""
 
-#: ../fdroidserver/common.py
-msgid "'keystore' not found in config.yml!"
-msgstr "¡'keystore' no encontrado en config.yml!"
+#: ../fdroidserver/index.py ../fdroidserver/common.py
+msgid "'keystore' not found in config.py!"
+msgstr "¡'keystore' no encontrado en config.py!"
 
-#: ../fdroidserver/common.py
-msgid "'keystorepass' not found in config.yml!"
-msgstr "¡'keystorepass' no encontrado en config.yml!"
+#: ../fdroidserver/index.py ../fdroidserver/common.py
+msgid "'keystorepass' not found in config.py!"
+msgstr "¡'keystorepass' no encontrado en config.py!"
 
-#: ../fdroidserver/common.py
-msgid "'repo_keyalias' not found in config.yml!"
-msgstr "¡'repo_keyalias' no encontrado en config.yml!"
+#: ../fdroidserver/index.py ../fdroidserver/common.py
+msgid "'repo_keyalias' not found in config.py!"
+msgstr "¡'repo_keyalias' no encontrado en config.py!"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "'required' is an invalid argument for positionals"
 msgstr "'required' es un argumento inválido para posicionales"
 
 #: ../fdroidserver/common.py
-msgid "'sdk_path' not set in config.yml!"
-msgstr "¡'sdk_path' no establecido en 'config.yml'!"
+msgid "'sdk_path' not set in 'config.py'!"
+msgstr "¡'sdk_path' no establecido en 'config.py'!"
+
+#. Translators: "build-tools" is the file name of a package from
+#. Google, it is part of the Android SDK. So it probably shouldn't be
+#. translated or transliterated.
+#: ../fdroidserver/common.py
+#, python-brace-format
+msgid "'{aapt}' is too old, fdroid requires build-tools-23.0.0 or newer!"
+msgstr "¡'{aapt}' es demasiado antiguo, fdroid requiere build-tools-23.0.0 o posterior!"
 
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "'{aapt}' is too old, fdroid requires build-tools-{version} or newer!"
 msgstr "¡'{aapt}' es demasiado antiguo, fdroid requiere build-tools-{version} o posterior!"
 
+#: ../fdroidserver/install.py
+#, python-brace-format
+msgid "'{apkfilename}' is already installed on {dev}."
+msgstr "'{apkfilename}' ya está instalado en {dev}."
+
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "'{field}' in {linedesc} is obsolete, see docs for current fields:"
+msgstr ""
+
+#: ../fdroidserver/common.py
+#, python-brace-format
+msgid "'{field}' will be in random order! Use () or [] brackets if order is important!"
+msgstr "¡'{field}' estará en un orden aleatorio! ¡Use paréntesis () o [] si el orden es importante!"
+
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "'{path}' failed to execute!"
@@ -166,32 +213,23 @@ msgstr "¡Falló la ejecución de '{path}'!"
 
 #: ../fdroidserver/metadata.py
 #, python-brace-format
-msgid "'{path}' has invalid format, it should be a dictionary!"
-msgstr "'{path}' tiene un formato inválido, ¡debería ser un diccionario!"
-
-#: ../fdroidserver/lint.py ../fdroidserver/metadata.py
-#, python-brace-format
 msgid "'{value}' is not a valid {field} in {appid}. Regex pattern: {pattern}"
 msgstr "'{value}' no es un {field} válido en {appid}. Patrón de expresión regular: {pattern}"
 
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "'{value}' is not a valid {field}, should be {pattern}"
-msgstr "'{value}' no es un {field} válido, debería ser {pattern}"
-
-#: ../fdroidserver/checkupdates.py
-msgid "--merge-request only runs on a single appid!"
-msgstr "¡--merge-request solo se ejecuta en un único ID de aplicación!"
-
 #: ../fdroidserver/checkupdates.py
 #, python-brace-format
 msgid "...checkupdate failed for {appid} : {error}"
 msgstr "...falló la comprobación de actualizaciones para {appid} : {error}"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid ".__call__() not defined"
 msgstr ".__call__() no definida"
 
+#: ../fdroidserver/metadata.py
+msgid ".fdroid.txt is not supported!  Convert to .fdroid.yml or .fdroid.json."
+msgstr "¡.fdroid.txt no está soportado!  Conviértalo a .fdroid.yml o .fdroid.json."
+
 #: ../fdroidserver/lint.py
 msgid "/issues is missing"
 msgstr "no se encuentra /issues"
@@ -200,15 +238,14 @@ msgstr "no se encuentra /issues"
 msgid "A URL is required as an argument!"
 msgstr "¡Se requiere una URL como argumento!"
 
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "APK signatures have different certificates in {path}:"
-msgstr "Las firmas APK tienen diferentes certificados en {path}:"
-
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Add PGP signatures using GnuPG for packages in repo"
 msgstr "Añadir las firmas PGP para los paquetes en el repositorio usando GnuPG"
 
+#: ../fdroid ../fdroidserver/__main__.py
+msgid "Add a new application from its source code"
+msgstr "Añadir una nueva aplicación desde su código fuente"
+
 #: ../fdroidserver/update.py
 msgid "Add a repo signing key to an unsigned repo"
 msgstr "Cree una clave de firmado para un repositorio sin firmar"
@@ -226,11 +263,7 @@ msgstr "Agregando nuevo repo solamente para {name}"
 msgid "Alias of the repo signing key in the keystore"
 msgstr "Alias de la clave de firma de repositorio en el depósitio de claves"
 
-#: ../fdroidserver/build.py
-msgid "AllowedAPKSigningKeys missing but reference binary supplied"
-msgstr "Falta la AllowedAPKSigningKeys, pero se proporcionó un binario de referencia"
-
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "Allows a different revision (or git branch) to be specified for the initial import"
 msgstr "Permite especificar una revisión diferente (o git sector) para la importación inicial"
 
@@ -244,20 +277,25 @@ msgstr "También advierta sobre problemas de formato, como r rewritemeta-l"
 
 #: ../fdroidserver/scanner.py
 msgid "Android AAR library"
-msgstr "Biblioteca AAR para Android"
+msgstr ""
 
 #: ../fdroidserver/scanner.py
 msgid "Android APK file"
 msgstr "Fichero APK de Android"
 
 #: ../fdroidserver/scanner.py
+#, fuzzy
 msgid "Android DEX code"
-msgstr "Código DEX en Android"
+msgstr "¡No se encontró Android SDK!"
 
-#: ../fdroidserver/init.py
+#: ../fdroidserver/common.py ../fdroidserver/build.py
 #, python-brace-format
-msgid "Android SDK not found at {path}!"
-msgstr "¡No se encontró el SDK de Android en {path}!"
+msgid "Android SDK '{path}' does not have '{dirname}' installed!"
+msgstr "¡El SDK de Android '{path}' no tiene '{dirname}' instalado!"
+
+#: ../fdroidserver/common.py
+msgid "Android SDK not found!"
+msgstr "¡No se encontró el SDK de Android!"
 
 #: ../fdroidserver/common.py
 #, python-brace-format
@@ -269,28 +307,23 @@ msgstr "¡No existe la ruta '{path}' al SDK de Android!"
 msgid "Android SDK path '{path}' is not a directory!"
 msgstr "¡La ruta al SDK de Android '{path}' no es un directorio!"
 
+#. Translators: "build-tools" is the file name of a package from
+#. Google, it is part of the Android SDK. So it probably shouldn't be
+#. translated or transliterated.
 #: ../fdroidserver/common.py
 #, python-brace-format
-msgid "Android SDK tool {cmd} not found!"
-msgstr "¡No se encontró la herramienta {cmd} del SDK de Android!"
+msgid "Android build-tools path '{path}' does not exist!"
+msgstr "¡La ruta a build-tools de Android '{path}' no existe!"
 
-#: ../fdroidserver/lint.py
-msgid "App has Binaries but does not have corresponding AllowedAPKSigningKeys to pin certificate."
-msgstr "La aplicación tiene archivos binarios, pero no las AllowedAPKSigningKeys correspondientes para fijat el certificado."
-
-#: ../fdroidserver/lint.py
-msgid "App has NoSourceSince or ArchivePolicy \"0 versions\" or 0 but AutoUpdateMode or UpdateCheckMode are not None"
-msgstr "La aplicación tiene NoSourceSince o ArchivePolicy \"versiones 0\" o 0, pero AutoUpdateMode o UpdateCheckMode no son Ninguna"
+#: ../fdroidserver/update.py
+msgid "AndroidManifest.xml has no date"
+msgstr "AndroidManifest.xml no tiene fecha"
 
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "App is in '{repo}' but has a link to {url}"
 msgstr "La aplicación está en '{repo}' pero tiene un enlace a {url}"
 
-#: ../fdroidserver/lint.py
-msgid "App version has binary but does not have corresponding AllowedAPKSigningKeys to pin certificate."
-msgstr "La versión de la aplicación es binaria pero no tiene las correspondientes AllowedAPKSigningKeys para fijar el certificado."
-
 #: ../fdroidserver/lint.py
 msgid "Appending .git is not necessary"
 msgstr "No es necesario agregar .git"
@@ -300,27 +333,11 @@ msgstr "No es necesario agregar .git"
 msgid "Archiving {apkfilename} with invalid signature!"
 msgstr "¡Archivando {apkfilename} con una firma inválida!"
 
-#: ../fdroidserver/lint.py
-msgid "AutoUpdateMode with UpdateCheckMode: HTTP must have a pattern."
-msgstr "AutoUpdateMode con UpdateCheckMode: el HTTP debe tener un patrón."
-
-#: ../fdroidserver/install.py
-msgid "Automatic no to all prompts."
-msgstr "No automático a todos las solicitudes."
-
-#: ../fdroidserver/install.py
-msgid "Automatic yes to all prompts."
-msgstr "No automático a todos los avisos."
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "Bad entry type \"{mirrortype}\" in mirrors config: {mirror}"
-msgstr "Tipo de entrada incorrecto \"{mirrortype}\" en la configuración de los espejos: {mirror}"
-
 #: ../fdroidserver/mirror.py
 msgid "Base URL to mirror, can include the index signing key using the query string: ?fingerprint="
 msgstr "URL base para replicar, puede incluir la clave de firma del índice usando la cadena de consulta: ?fingerprint="
 
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "Branch '{branch}' used as commit in build '{versionName}'"
@@ -334,9 +351,9 @@ msgstr "Rama '{branch}' usada como \"commit\" en srclib '{srclib}'"
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Broken symlink: {path}"
-msgstr "Enlace simbólico roto: {path}"
+msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Build a package from source"
 msgstr "Crear un paquete desde la fuente"
 
@@ -350,110 +367,118 @@ msgstr "Build generada por `fdroid import` - Eliminar \"disable line\" cuando es
 
 #: ../fdroidserver/checkupdates.py
 msgid "Build metadata git repo has uncommited changes!"
-msgstr "¡El repositorio git de la compilación de metadatos tiene cambios pendientes!"
+msgstr ""
 
 #: ../fdroidserver/build.py
 msgid "Build only the latest version of each package"
 msgstr "Construir sólo la última versión de cada paquete"
 
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Build should have comma-separated versionName and versionCode, not \"{value}\", in {linedesc}"
+msgstr "La compilación debe tener versionName y versionCode separados por comas, no \"{value}\", en {linedesc}"
+
 #: ../fdroidserver/init.py
 #, python-format
 msgid "Built repo based in \"%s\" with this config:"
 msgstr "Repositorio creado en \"%s\" con esta configuración:"
 
-#: ../fdroidserver/checkupdates.py
-msgid "Can't auto-update app with no CurrentVersionCode"
-msgstr "No se puede actualizar automáticamente, app sin CurrentVersionCode"
-
 #: ../fdroidserver/build.py
 msgid "Can't build due to {} error while scanning"
 msgid_plural "Can't build due to {} errors while scanning"
 msgstr[0] "No se puede construir debido al error {} mientras se comprobaba"
 msgstr[1] "No se puede construir debido a los errores {} mientras se comprobaba"
 
-#: ../fdroidserver/common.py
+#: ../fdroidserver/vmtools.py
+#, python-brace-format
+msgid "Cannot read \"{path}\"!"
+msgstr "¡No se puede leer \"{path}\"!"
+
+#. Translators: https://developer.android.com/studio/build/application-id
+#: ../fdroidserver/metadata.py
 #, fuzzy, python-brace-format
-msgid "Cannot read {path}: {error}"
-msgstr "Fallo al leer {path}: {error}"
+msgid "Cannot resolve application ID {appid}"
+msgstr "No se puede resolver el identificador de aplicación {appid}"
 
 #: ../fdroidserver/rewritemeta.py
-#, python-brace-format
+#, fuzzy, python-brace-format
 msgid "Cannot rewrite \"{path}\""
-msgstr "No se puede reescribir \"{path}\""
+msgstr "¡No se puede leer \"{path}\"!"
+
+#: ../fdroidserver/rewritemeta.py
+msgid "Cannot use --list and --to at the same time"
+msgstr "No se puede usar --list y --to al mismo tiempo"
+
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Cannot write \"{path}\", not an accepted format, use: {formats}"
+msgstr "No se puede escribir \"{path}\", no está en un formato aceptado, use: {formats}"
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
 #: ../fdroidserver/lint.py
 #, python-format
 msgid "Categories '%s' is not valid"
 msgstr "La categoría '%s' no es válida"
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
 #: ../fdroidserver/lint.py
 msgid "Categories are not set"
 msgstr "No se han establecido categorías"
 
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "Category \"{category}\" defined but not used for any apps!"
-msgstr "¡Categoría \"{category}\" definida pero no utilizada para ninguna aplicación!"
-
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Check for updates to applications"
 msgstr "Buscar actualizaciones de aplicaciones"
 
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Checking archiving for {appid} - apks:{integer}, keepversions:{keep}, archapks:{arch}"
-msgstr "Comprobando la operación de archivo para {appid} - APKs:{integer}, versiones mantenidas:{keep}, arquitecturas de apk:{arch}"
+msgstr "Comprobando la operación de archivo para {appid} - apks:{integer}, keepversions:{keep}, archapks:{arch}"
+
+#: ../fdroidserver/dscanner.py
+msgid "Clean after all scans have finished"
+msgstr "Limpiar después de que todos los análisis hayan finalizado"
+
+#: ../fdroidserver/dscanner.py
+msgid "Clean before the scans start and rebuild the container"
+msgstr "Limpiar antes de que los análisis inicien y reconstruir el contenedor"
+
+#: ../fdroidserver/dscanner.py
+msgid "Clean up all containers and then exit"
+msgstr "Limpiar todos los contenedores y luego salir"
 
 #: ../fdroidserver/update.py
 msgid "Clean update - don't uses caches, reprocess all APKs"
 msgstr "Actualización limpia, no usa la caché, procesa todas las APKs"
 
-#: ../fdroidserver/common.py
-msgid "Color the log output"
-msgstr "Colorear el registro de salida"
-
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "Comma separated list of categories."
 msgstr "Lista de categorías separadas por comas."
 
-#: ../fdroidserver/__main__.py
-#, python-format
+#: ../fdroid ../fdroidserver/__main__.py
+#, c-format, python-format
 msgid "Command '%s' not recognised.\n"
-msgstr "No se reconoció la orden «%s».\n"
+msgstr "Comando %s no reconocido\n"
 
 #: ../fdroidserver/checkupdates.py
 msgid "Commit changes"
 msgstr "Aplicar cambios"
 
-#: ../fdroidserver/checkupdates.py
-msgid "Commit changes, push, then make a merge request"
-msgstr "Confirmar los cambios, empujar, a continuación, hacer una solicitud de fusión"
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Conflicting \"{field}\" definitions between .yml and localized files:"
-msgstr "Definiciones \"{field}\" contradictorias entre los archivos .yml y los archivos localizados:"
-
 #: ../fdroidserver/__main__.py
 msgid "Conflicting arguments: '--verbose' and '--quiet' can not be specified at the same time."
-msgstr "Argumentos incompatibles: No se puede especificar \"--verbose\" y \"--quiet\" a la vez."
+msgstr ""
 
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "Could not find '{command}' on your system"
 msgstr "No se pudo encontrar '{command}' en el sistema"
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
+#, fuzzy
 msgid "Could not find latest version code"
-msgstr "No se pudo encontrar el último código de versión"
+msgstr "No se ha podido encontrar el último código de versión"
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
+#, fuzzy
 msgid "Could not find latest version name"
-msgstr "No se pudo encontrar el último nombre de versión"
+msgstr "No se ha podido encontrar el último nombre de versión"
 
 #: ../fdroidserver/update.py
 #, python-brace-format
@@ -461,25 +486,31 @@ msgid "Could not find {path} to remove it"
 msgstr "No se pudo encontrar {path} para eliminarlo"
 
 #: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Could not open APK {path} for analysis: "
-msgstr "No se pudo abrir el archivo APK {path} para analizarlo: "
+msgid "Could not open apk file for analysis"
+msgstr "No se ha podido abrir el archivo apk para analizarlo"
 
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "Could not parse size \"{size}\", wrong type \"{type}\""
-msgstr "No se puede procesar el tamaño \"{size}\", tipo erróneo \"{type}\""
+msgstr ""
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/import_subcommand.py
+#. Translators: https://developer.android.com/studio/build/application-id
+#: ../fdroidserver/import.py
+#, fuzzy
 msgid "Couldn't find Application ID"
-msgstr "No se pudo encontrar el identificador de aplicación"
+msgstr "No se ha podido encontrar el identificador de paquete"
 
-#: ../fdroidserver/checkupdates.py
-msgid "Couldn't find any version information"
-msgstr "No se pudo encontrar ninguna información sobre la versión"
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
+#: ../fdroidserver/import.py
+msgid "Couldn't find latest version code"
+msgstr "No se ha podido encontrar el último código de versión"
 
-#: ../fdroidserver/checkupdates.py
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
+#: ../fdroidserver/import.py
+msgid "Couldn't find latest version name"
+msgstr "No se ha podido encontrar el último nombre de versión"
+
+#: ../fdroidserver/import.py
 msgid "Couldn't find package ID"
 msgstr "No se ha podido encontrar el identificador de paquete"
 
@@ -487,26 +518,29 @@ msgstr "No se ha podido encontrar el identificador de paquete"
 msgid "Cowardily refusing to overwrite existing signing key setup!"
 msgstr "¡Se ha rechazado (cobardemente) sobrescribir la configuración existente de clave de firma!"
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/update.py
+msgid "Create a repo signing key in a keystore"
+msgstr "Cree una clave de firmado de repositorios en un llavero de claves"
+
+#: ../fdroidserver/update.py
+msgid "Create skeleton metadata files that are missing"
+msgstr "Crear esqueleto de metadatos de archivos que faltan"
+
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Created new container \"{name}\""
 msgstr "Se ha creado el contenedor nuevo \"{name}\""
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Creating \"{path}\" for configuring s3cmd."
 msgstr "Creando \"{path}\" para configurar s3cmd."
 
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Creating empty {config_file}"
-msgstr "Creando el archivo vacío {config_file}"
-
 #: ../fdroidserver/publish.py
 msgid "Creating log directory"
 msgstr "Creando el directorio de registro (\"log\")"
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Creating new S3 bucket: {url}"
 msgstr "Creando nuevo cubo S3: {url} 1"
@@ -519,7 +553,8 @@ msgstr "Creando el directorio de salida"
 msgid "Creating signed index with this key (SHA256):"
 msgstr "Creando índice firmado con esta clave (SHA256):"
 
-#: ../fdroidserver/publish.py ../fdroidserver/verify.py
+#: ../fdroidserver/import.py ../fdroidserver/verify.py
+#: ../fdroidserver/publish.py
 msgid "Creating temporary directory"
 msgstr "Creando directorio temporal"
 
@@ -530,7 +565,7 @@ msgstr "Creando índice no firmado, en preparación de la firma"
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "CurrentVersionCode {cv} is less than oldest build entry {versionCode}"
-msgstr "CurrentVersionCode {cv} es menor que la compilación más antigua registrada {versionCode}"
+msgstr ""
 
 #: ../fdroidserver/nightly.py
 msgid "DEBUG_KEYSTORE is not set or the value is incomplete"
@@ -543,12 +578,12 @@ msgstr "Borrar del repositorio archivos APK y/o OBB sin metadatos"
 #: ../fdroidserver/deploy.py
 #, python-brace-format
 msgid "Deleting archive, repo is too big ({size} max {limit})"
-msgstr "Borrando archivo, el repositorio es demasiado grande ({size} vs. {limit} máximo)"
+msgstr ""
 
 #: ../fdroidserver/deploy.py
 #, python-brace-format
 msgid "Deleting git-mirror history, repo is too big ({size} max {limit})"
-msgstr "Borrando la historia del repositorio git espejo, el repositorio es demasiado grande({size} vs. {limit} máximo)"
+msgstr ""
 
 #: ../fdroidserver/update.py
 #, python-brace-format
@@ -564,28 +599,23 @@ msgstr "La descripción '%s' es simplemente el resumen de la aplicación"
 msgid "Description has a duplicate line"
 msgstr "La descripción contiene una línea duplicada"
 
+#: ../fdroidserver/lint.py
+#, python-format
+msgid "Description has a list (%s) but it isn't bulleted (*) nor numbered (#)"
+msgstr "La descripción tiene una lista (%s) pero no está estructurada (*) ni numerada (#)"
+
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "Description of length {length} is over the {limit} char limit"
 msgstr "La descripción de longitud {length} supera el límite de caracteres, {limit}"
 
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Did you mean config/{name}.yml?"
-msgstr "¿Quiere decir config/{name}.yml?"
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Did you mean {code}?"
-msgstr "¿Querías decir {code}?"
-
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "Do not add 'disable:' to the generated build entries"
-msgstr "No agregar 'disable:' a las entradas de compilaciones generadas"
+msgstr ""
 
 #: ../fdroidserver/nightly.py
 msgid "Do not deploy the new files to the repo"
-msgstr "No desplegar los ficheros nuevos en el repositorio"
+msgstr ""
 
 #: ../fdroidserver/mirror.py
 #, python-brace-format
@@ -604,22 +634,27 @@ msgstr "No elimine las claves privadas generadas del almacén de claves"
 msgid "Don't create a source tarball, useful when testing a build"
 msgstr "No cree un tarball de origen, útil al probar una compilación"
 
+#: ../fdroidserver/stats.py
+msgid "Don't do anything logs-related"
+msgstr "No haga nada con registros relacionados"
+
 #: ../fdroidserver/build.py
 msgid "Don't refresh the repository, useful when testing a build with no internet connection"
 msgstr "No actualizar el repositorio, útil al probar una compilación sin conexión a Internet"
 
 #: ../fdroidserver/deploy.py ../fdroidserver/nightly.py
+#: ../fdroidserver/upload.py
 msgid "Don't use rsync checksums"
 msgstr "No use rsync checksums"
 
-#: ../fdroidserver/install.py
-msgid "Download F-Droid.apk using mirrors that leak less to the network"
-msgstr "Descarga F-Droid.apk usando espejos que filtren menos a la red"
-
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Download complete mirrors of small repos"
 msgstr "Descargar réplicas completas de repositorios pequeños"
 
+#: ../fdroidserver/stats.py
+msgid "Download logs we don't have"
+msgstr "Descargar registros que no tenemos"
+
 #: ../fdroidserver/common.py
 msgid "Downloading the repository already failed once, not trying again."
 msgstr "La descarga del repositorio ya falló una vez, no se intentará de nuevo."
@@ -631,61 +666,43 @@ msgstr "La descarga de {url} falló. {error}"
 
 #: ../fdroidserver/metadata.py
 #, python-brace-format
-msgid "Duplicate Anti-Feature declaration at {path} was ignored!"
-msgstr "¡Se ignoró la declaración duplicada de Anti-Feature en la {path}!"
-
-#: ../fdroidserver/index.py
-#, python-format
-msgid "Duplicate entry \"%s\" in mirrors config!"
-msgstr "¡Entrada duplicada \"%s\"en la configuración de los espejos!"
+msgid "Duplicate build recipe found for versionCode {versionCode} in {linedesc}"
+msgstr ""
 
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "Duplicate link in '{field}': {url}"
 msgstr "Enlace duplicado en '{field}': {url}"
 
-#: ../fdroidserver/common.py
-#, python-format
-msgid "ERROR: %(message)s"
-msgstr "ERROR: %(message)s"
+#: ../fdroid
+msgid "Dynamically scan APKs post build"
+msgstr "Ejecutar Fdroid dscanner de una aplicación APK, previamente construída,"
 
 #: ../fdroidserver/__main__.py
 msgid "ERROR: The \"server\" subcommand has been removed, use \"deploy\"!"
-msgstr "ERROR: ¡El subcomando \"server\" se ha eliminado. Use \"deploy\"!"
+msgstr ""
+
+#: ../fdroidserver/mirror.py
+msgid ""
+"ERROR: this command should never be used to mirror f-droid.org!\n"
+"A full mirror of f-droid.org requires more than 200GB."
+msgstr ""
+"ERROR: ¡esta orden no se debería usar nunca para replicar f-droid.org!\n"
+"Una réplica completa de f-droid.org requiere más de 200GB."
 
 #: ../fdroidserver/nightly.py
 msgid "ERROR: unsupported CI type, patches welcome!"
 msgstr "ERROR: tipo de CI no soportado, ¡se aceptan parches!"
 
-#: ../fdroidserver/nightly.py
-#, python-format
-msgid "ERROR: unsupported git host \"%s\", patches welcome!"
-msgstr "ERROR: host git no soportado \"%s\", ¡parches bienvenidos!"
-
-#: ../fdroidserver/lint.py
+#: ../fdroidserver/metadata.py
 #, python-brace-format
-msgid "ERROR: {key} in {path} is not \"archive\" or \"repo\"!"
-msgstr "ERROR: ¡{key} en {path} no es un \"archivo\" o un \"repositorio\"!"
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "ERROR: {key} not a valid key!"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "ERROR: {key}'s value should be of type {t}!"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "ERROR: {key}:{subkey} in {path} is not in allowed keys: {allowed_keys}!"
-msgstr "ERROR: ¡{key}:{subkey} en {path} no está en las claves permitidas: {allowed_keys}!"
+msgid "Empty build flag at {linedesc}"
+msgstr "Bandera de compilación vacía en {linedesc}"
 
 #: ../fdroidserver/__main__.py
 #, python-brace-format
 msgid "Encoding is set to '{enc}' fdroid might run into encoding issues. Please set it to 'UTF-8' for best results."
-msgstr "La codificación establecida es '{enc}'. fdroid podría sufrir problemas de codificación. Por favor establecerla a 'UTF-8' para resultados óptimos."
+msgstr ""
 
 #: ../fdroidserver/init.py
 #, python-format
@@ -696,44 +713,24 @@ msgstr ""
 "Introduzca la ruta a Android SDK (%s) aquí:\n"
 "> "
 
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Environment variable {var} from {configname} is not set!"
-msgstr "¡La variable de entorno {var} de {configname} no tiene valor asignado!"
+#: ../fdroidserver/deploy.py ../fdroidserver/checkupdates.py
+#: ../fdroidserver/upload.py
+#, python-format
+msgid "Error while attempting to publish log: %s"
+msgstr "Error mientras se intentaba publicar el registro: %s"
 
-#: ../fdroidserver/common.py
-#, fuzzy, python-brace-format
-msgid "Environment variable {{env: {var}}} is not set!"
-msgstr "¡La variable de entorno {var} de {configname} no tiene valor asignado!"
-
-#: ../fdroidserver/deploy.py
-msgid "Error deploying 'github_releases', {} not present. (You might need to run `fdroid update` first.)"
-msgstr "Error desplegando 'github_releases', {} no está presente. (Puede que necesites ejecutar `fdroid update` primero)"
-
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py ../fdroidserver/common.py
 msgid "Error while getting repo address"
 msgstr "Error al obtener la dirección del repositorio"
 
-#: ../fdroidserver/scanner.py
-msgid "Exit with a non-zero code if problems were found"
-msgstr "Salir con un código distinto de cero si se encontraron problemas"
-
-#: ../fdroidserver/__main__.py
-msgid "Extract application metadata from a source repository"
-msgstr "Extraer los metadatos de la aplicación de un repositorio de origen"
-
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Extract signatures from APKs"
 msgstr "Extraer firmas de APKs"
 
-#: ../fdroidserver/install.py
-msgid "F-Droid.apk could not be downloaded from any known source!"
-msgstr "¡F-Droid.apk no pudo ser descargado de ninguna fuente conocida!"
-
 #: ../fdroidserver/update.py
-#, python-brace-format
+#, fuzzy, python-brace-format
 msgid "Failed copying {path}: {error}"
-msgstr "Fallo copiando {path}: {error}"
+msgstr "Fallo al leer {path}: {error}"
 
 #: ../fdroidserver/signatures.py
 #, python-brace-format
@@ -750,55 +747,73 @@ msgstr "Fallo al leer {path}: {error}"
 msgid "Failed resizing {path}: {error}"
 msgstr "Fallo al cambiar de tamaño {path}: {error}"
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/publish.py
+msgid "Failed to align application"
+msgstr "Fallo al alinear aplicación"
+
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Failed to create S3 bucket: {url}"
-msgstr "Fallo al crear bucket S3 : {url}"
+msgstr ""
 
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Failed to get APK information, deleting {path}"
-msgstr "Fallo al obtener la información de APK, borrando {path}"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Failed to get APK information, skipping {path}"
-msgstr "Fallo al obtener la información de APK, omitiendo {path}"
-
-#: ../fdroidserver/update.py
-msgid "Failed to get APK signing key fingerprint"
+#: ../fdroidserver/common.py
+msgid "Failed to get APK manifest information"
 msgstr "Fallo al obtener la información de manifiesto APK"
 
+#: ../fdroidserver/update.py
+#, python-brace-format
+msgid "Failed to get apk information, deleting {path}"
+msgstr "Fallo al obtener la información de apk, borrando {path}"
+
+#: ../fdroidserver/update.py
+#, python-brace-format
+msgid "Failed to get apk information, skipping {path}"
+msgstr "Fallo al obtener la información de apk, omitiendo {path}"
+
 #: ../fdroidserver/install.py
 #, python-brace-format
 msgid "Failed to install '{apkfilename}' on {dev}: {error}"
 msgstr "Fallo al instalar '{apkfilename}' en {dev}: {error}"
 
-#: ../fdroidserver/common.py
+#: ../fdroidserver/publish.py ../fdroidserver/common.py
 msgid "Failed to sign application"
 msgstr "Fallo al firmar la aplicación"
 
+#: ../fdroidserver/common.py
+msgid "Failed to zipalign application"
+msgstr "Fallo al aplicar zipalign para alinear aplicación"
+
 #: ../fdroidserver/build.py
 #, python-brace-format
 msgid "Fetched buildserverid from VM: {buildserverid}"
-msgstr "Buildserverid obtenido de la VM: {buildserverid}"
+msgstr ""
 
 #: ../fdroidserver/signatures.py
 #, python-brace-format
 msgid "Fetched signatures for '{apkfilename}' -> '{sigdir}'"
-msgstr "Firmas obtenidas para '{apkfilename}'-> '{sigdir}'"
+msgstr ""
 
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "File disappeared while processing it: {path}"
-msgstr "El archivo desapareció al procesarlo: {path}"
+msgstr ""
 
-#: ../fdroidserver/build.py ../fdroidserver/install.py
-#: ../fdroidserver/rewritemeta.py ../fdroidserver/scanner.py
-#: ../fdroidserver/update.py
+#: ../fdroidserver/verify.py ../fdroidserver/stats.py ../fdroidserver/update.py
+#: ../fdroidserver/rewritemeta.py ../fdroidserver/build.py
+#: ../fdroidserver/checkupdates.py ../fdroidserver/scanner.py
+#: ../fdroidserver/install.py
 msgid "Finished"
 msgstr "Terminado"
 
+#: ../fdroidserver/lint.py
+msgid "Flattr donation methods belong in the FlattrID flag"
+msgstr ""
+
+#: ../fdroidserver/lint.py
+#, fuzzy
+msgid "Flattr donation methods belong in the FlattrID: field"
+msgstr "Los métodos de donación de Liberapay pertenecen a la bandera de LiberapayID"
+
 #: ../fdroidserver/lint.py
 msgid "Forbidden HTML tags"
 msgstr "Etiquetas HTML prohibidas"
@@ -810,38 +825,35 @@ msgstr "Forzar la creación de compilaciones deshabilitadas, independientemente
 #: ../fdroidserver/build.py
 #, python-brace-format
 msgid "Force halting build after {0} sec timeout!"
-msgstr "¡Forzar la suspensión de la compilación tras {0} segundos!"
+msgstr ""
 
 #: ../fdroidserver/scanner.py
 msgid "Force scan of disabled apps and builds."
-msgstr "Forzar el escaneo de aplicaciones y compilaciones deshabilitadas."
+msgstr ""
 
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Found \"{path}\" graphic without metadata for app \"{name}\"!"
-msgstr "¡Se encontró la gráfica \"{path}\" sin metadatos para la aplicación \"{name}\"!"
+msgstr ""
 
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Found bad funding file \"{path}\" for \"{name}\":"
-msgstr "Se encontró archivo de financiación \"{path}\" para \"{name}\":"
+msgstr ""
 
 #: ../fdroidserver/common.py
 msgid "Found invalid appids in arguments"
-msgstr "Se encontraron identificadores de aplicaciones inválidos en los argumentos"
+msgstr ""
 
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
 #: ../fdroidserver/common.py
 msgid "Found invalid versionCodes for some apps"
-msgstr "Se encontraron códigos de versión (versionCodes) inválidos para algunas aplicaciones"
+msgstr ""
 
 #: ../fdroidserver/common.py
-#, python-brace-format
+#, fuzzy, python-brace-format
 msgid "Found multiple JAR Signature Block Files in {path}"
-msgstr "Encontrados varios ficheros de bloque de firma JAR en {path}"
-
-#: ../fdroidserver/common.py
-msgid "Found multiple Signer Certificates!"
-msgstr "¡Se han encontrado varios certificados de firmante!"
+msgstr "Encontrados varios certificados de firma en {path}"
 
 #: ../fdroidserver/metadata.py
 #, python-brace-format
@@ -852,6 +864,11 @@ msgstr "Se encontraron multiples ficheros de metadatos para {appid}"
 msgid "Found multiple signing certificates for repository."
 msgstr "Encontrados varios certificados de firma para el repositorio."
 
+#: ../fdroidserver/update.py
+#, python-brace-format
+msgid "Found multiple signing certificates in {path}"
+msgstr "Encontrados varios certificados de firma en {path}"
+
 #: ../fdroidserver/index.py
 msgid "Found no signing certificates for repository."
 msgstr "Ningún certificado de firma encontrado para el repositorio."
@@ -859,22 +876,12 @@ msgstr "Ningún certificado de firma encontrado para el repositorio."
 #: ../fdroidserver/lint.py
 #, python-format
 msgid "Found non-file at %s"
-msgstr "Se encontró algo que no es un fichero en %s"
+msgstr ""
 
 #: ../fdroidserver/deploy.py
 #, python-brace-format
 msgid "Found {apkfilename} at {url}"
-msgstr "Se encontró {apkfilename} en {url}"
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Found {count} problems in {filename}"
-msgstr "Encontró {count} problemas en {filename}"
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Found {count} warnings in {filename}"
-msgstr "Se encontraron {count} advertencias en {filename}"
+msgstr ""
 
 #: ../fdroidserver/update.py
 #, python-brace-format
@@ -884,7 +891,7 @@ msgstr "Creada la estructura de metadatos para {appid}"
 #: ../fdroidserver/common.py
 #, python-format
 msgid "Git checkout of '%s' failed"
-msgstr "Falló el checkout Git de '%s'"
+msgstr ""
 
 #: ../fdroidserver/common.py
 msgid "Git clean failed"
@@ -894,21 +901,19 @@ msgstr "Git clean falló"
 msgid "Git fetch failed"
 msgstr "Git fetch falló"
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
+#: ../fdroidserver/common.py
+msgid "Git remote set-head failed"
+msgstr ""
+
 #: ../fdroidserver/common.py
 #, python-format
 msgid "Git remote set-head failed: \"%s\""
 msgstr "Git remote set-head falló: \"%s\""
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
 #: ../fdroidserver/common.py
 msgid "Git reset failed"
 msgstr "Git reset falló"
 
-#: ../fdroidserver/common.py
-msgid "Git submodule deinit failed"
-msgstr "Fallo en la desinstalación del submódulo Git"
-
 #: ../fdroidserver/common.py
 msgid "Git submodule sync failed"
 msgstr "La sincronización del submodulo de Git falló"
@@ -923,32 +928,22 @@ msgstr "¡Se debe usar HTTPS con URLs de Subversion!"
 
 #: ../fdroidserver/deploy.py
 msgid "If a git mirror gets to big, allow the archive to be deleted"
-msgstr "Si un repositorio espejo git crece mucho, permitir borrar el archivo"
+msgstr ""
 
 #: ../fdroidserver/deploy.py
 #, python-brace-format
 msgid "If this upload fails, try manually uploading to {url}"
-msgstr "Si esta carga falla, prueba cargarlo manualmente a {url}"
+msgstr ""
 
 #: ../fdroidserver/metadata.py
 #, python-brace-format
 msgid "Ignoring '{field}' in '{metapath}' metadata because it is deprecated."
-msgstr "Ignorando '{field}' en medatos '{metapath}' por obsoleto."
+msgstr ""
 
 #: ../fdroidserver/update.py
 #, python-format
 msgid "Ignoring FUNDING.yml entry longer than 2048: %s"
-msgstr "Ignorando entrada en FUNDING.yml mayor de 2048: %s"
-
-#: ../fdroidserver/update.py
-#, python-format
-msgid "Ignoring bad element in manifest: %s"
-msgstr "Ignorar el elemento incorrecto en el manifiesto: %s"
-
-#: ../fdroidserver/common.py
-#, fuzzy, python-brace-format
-msgid "Ignoring deprecated {oldfile}, use {newfile}!"
-msgstr "{oldfile} está obsoleto, use {newfile}"
+msgstr ""
 
 #: ../fdroidserver/index.py
 msgid "Ignoring package without metadata: "
@@ -957,7 +952,12 @@ msgstr "Ignorando paquete sin metadatos: "
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Ignoring stale cache data for {apkfilename}"
-msgstr "Ignorando datos de cache atascada para {apkfilename}"
+msgstr ""
+
+#: ../fdroidserver/rewritemeta.py
+#, python-brace-format
+msgid "Ignoring {ext} file at '{path}'"
+msgstr "Ignorando archivo {ext} en '{path}'"
 
 #: ../fdroidserver/update.py
 msgid "Include APKs that are signed with disabled algorithms like MD5"
@@ -965,25 +965,15 @@ msgstr "Incluir APKs que están firmados con algoritmos deshabilitados como MD5"
 
 #: ../fdroidserver/mirror.py
 msgid "Include the PGP signature .asc files in the mirror"
-msgstr "Incluir los archivos .asc de firma PGP en el espejo"
+msgstr ""
 
 #: ../fdroidserver/mirror.py
 msgid "Include the build logs in the mirror"
-msgstr "Incluir las bitácoras de compilación en el repositorio espejo"
+msgstr ""
 
 #: ../fdroidserver/mirror.py
 msgid "Include the source tarballs in the mirror"
-msgstr "Incluir en el espejo los archivos tarball de código fuente"
-
-#: ../fdroidserver/metadata.py
-#, python-format
-msgid "Including metadata from %s@%s"
-msgstr "Incluyendo metadatos de %s@%s"
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Including metadata from {path}"
-msgstr "Incluyendo metadatos de {path}"
+msgstr ""
 
 #: ../fdroidserver/common.py
 msgid "Initialising submodules"
@@ -993,21 +983,31 @@ msgstr "Inicializando submodules"
 msgid "Install all signed applications available"
 msgstr "Instalar todas las aplicaciones firmadas disponibles"
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Install built packages on devices"
 msgstr "Instalar paquetes constuídos en el dispositivo"
 
 #: ../fdroidserver/install.py
-#, python-format
+#, fuzzy, python-format
 msgid "Installing %s..."
 msgstr "Instalando %s…"
 
 #: ../fdroidserver/install.py
-#, python-brace-format
+#, python-format
+msgid "Installing %s…"
+msgstr "Instalando %s…"
+
+#: ../fdroidserver/install.py
+#, fuzzy, python-brace-format
 msgid "Installing '{apkfilename}' on {dev}..."
 msgstr "Instalando '{apkfilename}' en {dev}…"
 
-#: ../fdroidserver/__main__.py
+#: ../fdroidserver/install.py
+#, python-brace-format
+msgid "Installing '{apkfilename}' on {dev}…"
+msgstr "Instalando '{apkfilename}' en {dev}…"
+
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Interact with the repo HTTP server"
 msgstr "Interactuar con el servidor HTTP del repositorio"
 
@@ -1015,36 +1015,53 @@ msgstr "Interactuar con el servidor HTTP del repositorio"
 msgid "Invalid APK"
 msgstr "APK no válido"
 
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "Invalid AutoUpdateMode: {mode}"
-msgstr "ModoActualizaciónAutomática Inválido: {mode}"
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "Invalid UpdateCheckMode: {mode}"
-msgstr "UpdateCheckMode no válido {mode}"
-
-#: ../fdroidserver/checkupdates.py
+#: ../fdroidserver/lint.py ../fdroidserver/checkupdates.py
 #, python-brace-format
 msgid "Invalid VercodeOperation: {field}"
-msgstr "VercodeOperation no válida: {field}"
+msgstr ""
 
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Invalid VercodeOperation: {invalid_ops}"
-msgstr "VercodeOperation no válido: {invalid_ops}"
-
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "Invalid application ID {appid}"
-msgstr "ID de aplicación inválido {appid}"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+#, python-format
+msgid "Invalid boolean '%s'"
+msgstr "Valor booleano no válido '%s'"
+
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Invalid build flag at {line} in {linedesc}"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Invalid build format: {value} in {name}"
+msgstr ""
 
 #: ../fdroidserver/lint.py
 msgid "Invalid bulleted list"
 msgstr "Lista no numerada no válida"
 
+#: ../fdroidserver/lint.py
+#, python-format
+msgid "Invalid license tag \"%s\"! Use only tags from https://spdx.org/license-list"
+msgstr ""
+
+#: ../fdroidserver/lint.py
+msgid "Invalid link - use [http://foo.bar Link title] or [http://foo.bar]"
+msgstr "Enlace no válido - use [http://foo.bar Título de enlace] o [http://foo.bar]"
+
+#: ../fdroidserver/metadata.py
+#, python-format
+msgid "Invalid metadata in %s:%d"
+msgstr "Metadatos no válidos en %s:%d"
+
+#: ../fdroidserver/metadata.py
+msgid "Invalid metadata in: "
+msgstr "Metadatos no válidos en: "
+
 #: ../fdroidserver/common.py
 #, python-format
 msgid "Invalid name for published file: %s"
@@ -1052,8 +1069,8 @@ msgstr "Nombre no válido para archivo publicado: %s"
 
 #: ../fdroidserver/common.py
 #, python-brace-format
-msgid "Invalid ndk: entry in build: \"{ndk}\""
-msgstr "Ndk no válido: entrada en paquete: \"{ndk}\""
+msgid "Invalid package name {0}"
+msgstr "Nombre de paquete no válido {0}"
 
 #: ../fdroidserver/common.py
 #, python-brace-format
@@ -1061,19 +1078,24 @@ msgid "Invalid redirect to non-HTTPS: {before} -> {after} "
 msgstr "Redirección no válida a no HTTPS: {before} -> {after} "
 
 #: ../fdroidserver/metadata.py
-#, python-brace-format
+#, fuzzy, python-brace-format
 msgid "Invalid scrlib metadata: '{file}' does not exist"
-msgstr "Metadato scrlib inválido: '{file}' no existe"
+msgstr "Leer todos los archivos de metadatos y salir"
 
 #: ../fdroidserver/metadata.py
 #, python-brace-format
 msgid "Invalid srclib metadata: could not parse '{file}'"
-msgstr "Metadato scrlib no válido: no se pudo procesar '{file}'"
+msgstr ""
 
 #: ../fdroidserver/metadata.py
 #, python-brace-format
 msgid "Invalid srclib metadata: unknown key '{key}' in '{file}'"
-msgstr "Metadato scrlib no válido: clave desconocida '{key}' en el archivo '{file}'"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Invalid versionCode: \"{versionCode}\" is not an integer!"
+msgstr "versionCode no válido: \"{versionCode}\" no es un entero!"
 
 #: ../fdroidserver/common.py
 #, python-brace-format
@@ -1087,16 +1109,16 @@ msgstr "Firma JAR verificada: {path}"
 
 #: ../fdroidserver/scanner.py
 msgid "Java JAR file"
-msgstr "Archivo java JAR"
+msgstr ""
 
-#: ../fdroidserver/mirror.py ../fdroidserver/publish.py
-#: ../fdroidserver/update.py
+#: ../fdroidserver/publish.py ../fdroidserver/update.py
+#: ../fdroidserver/mirror.py
 msgid "Java JDK not found! Install in standard location or set java_paths!"
 msgstr "¡No se encontró Java JDK! ¡Instale en una ubicación estándar o establezca java_paths!"
 
 #: ../fdroidserver/scanner.py
 msgid "Java compiled class"
-msgstr "Clase compilada java"
+msgstr ""
 
 #: ../fdroidserver/signindex.py
 msgid "Java jarsigner not found! Install in standard location or set java_paths!"
@@ -1106,35 +1128,31 @@ msgstr "Java jarsigner no encontrado! Instalar en una ubicación estándar o est
 msgid "Javascript in HTML src attributes"
 msgstr "Javascript en atributos src de HTML src"
 
-#: ../fdroidserver/build.py
-#, python-brace-format
-msgid "Keeping failed build \"{apkfilename}\""
-msgstr "Mantener la compilación fallida \"{apkfilename}\""
-
 #: ../fdroidserver/init.py
 msgid "Keystore for signing key:\t"
 msgstr "Depósito de claves para la clave de firma de repositorio:\t"
 
 #: ../fdroidserver/lint.py
-msgid "Known debug key is used in AllowedAPKSigningKeys: "
-msgstr "La clave de depuración conocida se utiliza en AllowedAPKSigningKeys: "
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
+#, fuzzy, python-brace-format
 msgid "Last used commit '{commit}' looks like a tag, but UpdateCheckMode is '{ucm}'"
 msgstr "La última confirmación utilizada '{commit}' parece una etiqueta, pero Update Check Mode es '{ucm}'"
 
 #: ../fdroidserver/lint.py
+#, fuzzy
 msgid "Liberapay donation methods belong in the Liberapay: field"
-msgstr "Los métodos de donación de Liberapay pertenecen al Liberapay: field"
+msgstr "Los métodos de donación de Liberapay pertenecen a la bandera de LiberapayID"
+
+#: ../fdroidserver/lint.py
+msgid "Liberapay donation methods belong in the LiberapayID flag"
+msgstr "Los métodos de donación de Liberapay pertenecen a la bandera de LiberapayID"
 
 #: ../fdroidserver/rewritemeta.py
-msgid "List files that would be reformatted (dry run)"
-msgstr "Lista de archivos que se reformatearán (ejecución en seco)"
+msgid "List files that would be reformatted"
+msgstr "Lista de archivos que se reformatearán"
 
 #: ../fdroidserver/lint.py
 msgid "Locale included in f-droid.org URL"
-msgstr "Locale incluída en la URL de f-droid.org"
+msgstr ""
 
 #: ../fdroidserver/build.py
 msgid "Make the build stop on exceptions"
@@ -1148,48 +1166,39 @@ msgstr "Réplicas de repositorio mal formadas."
 msgid "Malformed serverwebroot line:"
 msgstr "Línea serverwebroot mal formada:"
 
-#: ../fdroidserver/scanner.py
-#, python-format
-msgid "Max recursion depth in ZIP file reached: %s"
-msgstr "Se alcanzó el máximo en el archivo ZIP: %s"
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "Mirror config for {url} contains \"isPrimary\" key!"
-msgstr ""
-
 #: ../fdroidserver/mirror.py
 msgid "Mirror the full repo and archive, all file types."
-msgstr "Crea un espejo completo del repositorio y del archivo, todos los tipos de fichero."
+msgstr ""
 
 #: ../fdroidserver/gpgsign.py
 msgid "Missing output directory"
 msgstr "Falta el directorio de salida"
 
-#: ../fdroidserver/metadata.py
-msgid "Moving Anti-Features declarations to localized files:"
-msgstr "Moviendo las declaraciones de Anti-Features a los archivos localizados:"
-
-#: ../fdroidserver/index.py
-msgid "Neither \"repo_pubkey\" nor \"keystorepass\" set in config.yml"
-msgstr "Ni \"repo_pubkey\" ni \"keystorepass\" establecidos en config.yml"
-
-#: ../fdroidserver/verify.py
+#: ../fdroidserver/lint.py
 #, python-format
-msgid "No APK for package: %s"
-msgstr "No existe APK para tal paquete: %s"
+msgid "Name '%s' is just the auto name - remove it"
+msgstr "El nombre '%s' es simplemente el nombre automático - elimínelo"
+
+#: ../fdroidserver/common.py
+msgid "No 'config.py' found, using defaults."
+msgstr "No se encontró 'config.py', se usarán los valores predeterminados."
 
 #: ../fdroidserver/common.py
 msgid "No Android SDK found!"
 msgstr "¡No se encontró Android SDK!"
 
+#: ../fdroidserver/import.py
+msgid "No android or kivy project could be found. Specify --subdir?"
+msgstr "No se ha encontrado proyecto android o kivy. ¿Especifique --subdir?"
+
 #: ../fdroidserver/install.py
 msgid "No attached devices found"
 msgstr "No se han encontrado dispositivos asociados"
 
-#: ../fdroidserver/install.py
-msgid "No devices found for `adb install`! Please plug one in."
-msgstr "¡No se han encontrado dispositivos para `adb install`! Por favor, conecte uno."
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "No commit specified for {versionName} in {linedesc}"
+msgstr "No se ha especificado ninguna confirmación para {versionName} en {linedesc}"
 
 #: ../fdroidserver/index.py
 msgid "No fingerprint in URL."
@@ -1199,23 +1208,15 @@ msgstr "No hay huella digital en la URL."
 msgid "No git submodules available"
 msgstr "No hay git submodules disponibles"
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
+#, fuzzy
 msgid "No gradle project could be found. Specify --subdir?"
-msgstr "No se encontró ningún proyecto gradle. ¿Quizá quiera especificar --subdir?"
+msgstr "No se ha encontrado proyecto android o kivy. ¿Especifique --subdir?"
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py ../fdroidserver/common.py
 msgid "No information found."
 msgstr "No se encontró información."
 
-#: ../fdroidserver/checkupdates.py
-msgid "No matching tags found"
-msgstr "No se encontraron etiquetas coincidentes"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "No minimum SDK version found in {0}, using default (3)."
-msgstr "No se encontró una versión de SDK mínima en {0}, utilizando el valor por defecto (3)."
-
 #: ../fdroidserver/lint.py
 msgid "No need to specify that the app is Free Software"
 msgstr "No hay necesidad de especificar que la aplicación es software libre"
@@ -1225,8 +1226,8 @@ msgid "No need to specify that the app is for Android"
 msgstr "No hay necesidad de especificar que la aplicación es para Android"
 
 #: ../fdroidserver/deploy.py
-msgid "No option set! Edit your config.yml to set at least one of these:"
-msgstr "No hay opción establecida! Edita tu config.yml para establecer al menos una de estas opciones:"
+msgid "No option set! Edit your config.py to set at least one of these:"
+msgstr "No hay opción establecida! Edita tu config.py para establecer al menos una de estas opciones:"
 
 #: ../fdroidserver/common.py
 msgid "No packages specified"
@@ -1234,14 +1235,14 @@ msgstr "No se han especificado paquetes"
 
 #: ../fdroidserver/install.py
 #, python-format
-msgid "No signed APK available for %s"
-msgstr "No hay APK firmado disponible para %s"
+msgid "No signed apk available for %s"
+msgstr "No hay apk firmado disponible para %s"
 
 #: ../fdroidserver/install.py
 msgid "No signed output directory - nothing to do"
 msgstr "Sin directorio de salida firmado - nada que hacer"
 
-#: ../fdroidserver/common.py
+#: ../fdroidserver/update.py ../fdroidserver/common.py
 #, python-brace-format
 msgid "No signing certificates found in {path}"
 msgstr "No se ha encontrado ningún certificado de firma en {path}"
@@ -1251,26 +1252,19 @@ msgstr "No se ha encontrado ningún certificado de firma en {path}"
 msgid "No such package: %s"
 msgstr "No existe tal paquete: %s"
 
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "No such versionCode {versionCode} for app {appid}"
 msgstr "No existe tal versiónCode {versionCode} para app {appid}"
 
-#: ../fdroidserver/checkupdates.py
-msgid "No tags found"
-msgstr "No se encontró ninguna etiqueta"
-
-#: ../fdroidserver/publish.py ../fdroidserver/verify.py
+#: ../fdroidserver/verify.py ../fdroidserver/publish.py
 msgid "No unsigned directory - nothing to do"
 msgstr "No hay directorio sin firma - nada que hacer"
 
-#: ../fdroidserver/__main__.py
-msgid "No version information could be found."
-msgstr "No se ha podido encontrar información sobre la versión."
-
 #: ../fdroidserver/common.py
 msgid "Not a valid size definition: \"{}\""
-msgstr "No es una definición válida del tamaño: \"{}\""
+msgstr ""
 
 #: ../fdroidserver/signindex.py
 msgid "Nothing to do"
@@ -1282,9 +1276,10 @@ msgid "Nothing to do for {appid}."
 msgstr "Nada que hacer para {appid}."
 
 #: ../fdroidserver/init.py
-msgid "Now set these in config.yml:"
-msgstr "Ahora establezca lo siguiente en config.yml:"
+msgid "Now set these in config.py:"
+msgstr "Ahora establezca lo siguiente en config.py:"
 
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "OBB file has newer versionCode({integer}) than any APK:"
@@ -1300,80 +1295,88 @@ msgstr "El nombre de paquete de OBB no coincide con un APK soportado:"
 
 #: ../fdroidserver/deploy.py
 msgid "Offline machine, skipping git mirror generation until `fdroid deploy`"
-msgstr "Maquina desconectada. Saltando la generación del repositorio espejo git hasta`fdroid deploy`"
+msgstr ""
 
-#: ../fdroidserver/deploy.py
-msgid "One of the 'github_releases' config items is missing the 'packageNames' value. skipping ..."
-msgstr "A uno de los elementos de configuración de 'github_releases' le falta el valor 'packageNames'. omitiendo ..."
+#: ../fdroidserver/common.py
+#, python-brace-format
+msgid "Old APK signature failed to verify: {path}"
+msgstr ""
 
-#: ../fdroidserver/deploy.py
-msgid "One of the 'github_releases' config items is missing the 'projectUrl' value. skipping ..."
-msgstr "A uno de los elementos de configuración 'github_releases' le falta el valor 'projectUrl'. omitiendo ..."
+#: ../fdroid ../fdroidserver/__main__.py
+msgid "Old, deprecated name for fdroid deploy"
+msgstr "Nombre antiguo y obsoleto de fdroid deploy"
 
-#: ../fdroidserver/deploy.py
-msgid "One of the 'github_releases' config items is missing the 'token' value. skipping ..."
-msgstr "A uno de los elementos de configuración 'github_releases' le falta el valor 'token'. Omitiendo ..."
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Only PNG and JPEG are supported for graphics, found: {path}"
 msgstr "Sólo PNG y JPEG son compatibles con los gráficos, encontrados: {path}"
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/common.py
-msgid "Only accepts a single key \"env\""
-msgstr ""
+#: ../fdroidserver/checkupdates.py
+msgid "Only print differences with the Play Store"
+msgstr "Solo imprimir diferencias con el Play Store"
 
 #: ../fdroidserver/checkupdates.py
 msgid "Only process apps with auto-updates"
 msgstr "Solo procesar aplicaciones con actualizaciones automáticas"
 
 #: ../fdroidserver/lint.py
+#, fuzzy
 msgid "OpenCollective donation methods belong in the OpenCollective: field"
-msgstr "Los métodos de donación de OpenCollective pertenecen al OpenCollective: field"
+msgstr "Los métodos de donación de Liberapay pertenecen a la bandera de LiberapayID"
+
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "Options"
+msgstr "Opciones"
 
 #: ../fdroidserver/verify.py
 msgid "Output JSON report to file named after APK."
-msgstr "Sacar el informe JSON a un fichero nombrado según el APK."
+msgstr ""
 
 #: ../fdroidserver/scanner.py
 msgid "Output JSON to stdout."
-msgstr "Sacar JSON a stdout."
+msgstr ""
 
-#: ../fdroidserver/checkupdates.py ../fdroidserver/gpgsign.py
-#: ../fdroidserver/publish.py ../fdroidserver/signindex.py
-#: ../fdroidserver/update.py
+#: ../fdroidserver/gpgsign.py ../fdroidserver/publish.py
+#: ../fdroidserver/update.py ../fdroidserver/signindex.py
+#: ../fdroidserver/checkupdates.py
 msgid "Outputting JSON"
-msgstr "Sacando JSON"
+msgstr ""
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "Overall license of the project."
 msgstr "Licencia general del proyecto."
 
+#: ../fdroidserver/dscanner.py
+msgid "Override path for repo APKs (default: ./repo)"
+msgstr "Ruta de remplazo par el repositorio de APK (default: ./repo)"
+
 #: ../fdroidserver/index.py
 #, python-brace-format
 msgid "Overriding blank versionName in {apkfilename} from metadata: {version}"
 msgstr "Sobrescribir versionName vacío en {apkfilename} con el de los metadatos: {version}"
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 #, python-brace-format
 msgid "Package \"{appid}\" already exists"
-msgstr "El paquete \"{appid}\" ya existe"
+msgstr ""
 
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "Parsing manifest at '{path}'"
-msgstr "Procesando el manifiesto en '{path}'"
+msgstr ""
 
 #: ../fdroidserver/common.py
 msgid "Password required with username"
 msgstr "Se requiere contraseña con el nombre de usuario"
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "Path to main Android project subdirectory, if not in root."
 msgstr "Ruta al subdirectorio principal del proyecto Android, si no está en la raíz."
 
+msgid "Path to main android project subdirectory, if not in root."
+msgstr "Ruta al subdirectorio principal del proyecto Android, si no es en la raíz."
+
 #: ../fdroidserver/init.py
 msgid "Path to the Android SDK (sometimes set in ANDROID_HOME)"
 msgstr "Ruta al Android SDK (a veces ubicado en ANDROID_HOME)"
@@ -1386,19 +1389,21 @@ msgstr "Ruta de acceso al reporte git para usarlo como registro"
 msgid "Path to the keystore for the repo signing key"
 msgstr "Ruta al depósito de claves para la clave de firma de repositorio"
 
+#: ../fdroidserver/dscanner.py
+msgid "Prepare Drozer to run a scan"
+msgstr "Preparar \"Drozer\" para ejecutar un análisis"
+
+msgid "Prepare drozer to run a scan"
+msgstr "Preparar \"Drozer\" para ejecutar un análisis"
+
 #: ../fdroidserver/nightly.py
 msgid "Print the secret variable to the terminal for easy copy/paste"
 msgstr "Mostrar la variable secreta en el terminal para copiar/pegar fácilmente"
 
-#: ../fdroidserver/install.py
+#: ../fdroidserver/metadata.py
 #, python-brace-format
-msgid "Privacy mode was enabled based on your locale ({country_code})."
-msgstr "Se ha activado el modo de privacidad en función de su configuración regional ({country_code})."
-
-#: ../fdroidserver/scanner.py
-#, python-format
-msgid "Problem with ZIP file: %s, error %s"
-msgstr "Problema con el archivo ZIP: %s, error %s"
+msgid "Problem with description of {appid}: {error}"
+msgstr "Problema con la descripción de {appid}: {error}"
 
 #: ../fdroidserver/common.py
 #, python-brace-format
@@ -1423,7 +1428,11 @@ msgstr "Procesando {appid}"
 msgid "Produce human-readable XML/JSON for index files"
 msgstr "Para los ficheros de índice, produce un documento XML/JSON legible por humanos"
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/update.py
+msgid "Produce human-readable index.xml"
+msgstr "Produce un índice legible index.xml"
+
+#: ../fdroidserver/import.py
 msgid "Project URL to import from."
 msgstr "importar desde.URL del proyecto."
 
@@ -1435,78 +1444,65 @@ msgstr "Se debe evitar la puntuación"
 msgid "Push the log to this git remote repository"
 msgstr "Pulse el registro a este repositorio remoto Git"
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Pushing binary transparency log to {url}"
 msgstr "Publicar el registro de transparencia binario en {url}"
 
-#: ../fdroidserver/deploy.py
-msgid "Pushing to remote server failed!"
-msgstr "¡Error al enviar al servidor remoto!"
-
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Pushing to {url}"
 msgstr "Empujando a {url}"
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Quickly start a new repository"
 msgstr "Iniciar rápidamente un nuevo repositorio"
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Read all the metadata files and exit"
 msgstr "Leer todos los archivos de metadatos y salir"
 
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "Reading '{config_file}'"
-msgstr "Leyendo '{config_file}'"
+msgstr ""
 
+#: ../fdroidserver/common.py
+#, python-brace-format
+msgid "Reading minSdkVersion failed: \"{apkfilename}\""
+msgstr "Falló lectura de minSdkVersion: \"{apkfilename}\""
+
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
+#. https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "Reading packageName/versionCode/versionName failed, APK invalid: '{apkfilename}'"
 msgstr "Falló lectura de packageName/versionCode/versionName, APK inválida: '{apkfilename}'"
 
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Reading packageName/versionCode/versionName failed,APK invalid: '{apkfilename}'"
-msgstr "Error al leer packageName/versionCode/versionName,APK inválido: '{apkfilename}'"
-
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Reading {apkfilename} from cache"
-msgstr "Leyendo {apkfilename} desde caché"
-
-#: ../fdroidserver/build.py
-msgid "Refresh and cache scanner rules and signatures from the network"
-msgstr "Actualización y almacenamiento en caché de las reglas y firmas del escáner desde la red"
-
-#: ../fdroidserver/publish.py
-#, python-brace-format
-msgid "Refusing to sign '{path}', file exists in both {dir1} and {dir2} folder."
 msgstr ""
 
-#: ../fdroidserver/verify.py
-msgid "Remove source tarball and any APKs if successfully verified."
-msgstr "Elimine el archivo tar de origen y todos los APK si se verifican correctamente."
+#: ../fdroidserver/stats.py
+msgid "Recalculate aggregate stats - use when changes have been made that would invalidate old cached data."
+msgstr "Recalcular agregación de estados - usar cuando se hacen cambios que invalidarían los datos antiguos cacheados."
 
 #: ../fdroidserver/common.py
 msgid "Removing specified files"
 msgstr "Removiendo archivos especificados"
 
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Removing {path}\""
-msgstr "Eliminando {path}\""
-
 #: ../fdroidserver/update.py
 msgid "Rename APK files that do not match package.name_123.apk"
 msgstr "Cambiar el nombre de archivos APK que no coinciden con el formato package.name_123.apk"
 
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "RepoType {type} is deprecated, please switch to git."
-msgstr ""
+#: ../fdroidserver/update.py
+msgid "Report on build data status"
+msgstr "Informe sobre el estado de los datos de compilación"
+
+#: ../fdroidserver/build.py
+msgid "Reset and create a brand new build server, even if the existing one appears to be ok."
+msgstr "Restablecer y crear un nuevo servidor de compilación, incluso si el existente parece estar bien."
 
 #: ../fdroidserver/nightly.py
 #, python-brace-format
@@ -1521,69 +1517,62 @@ msgstr "Cambiar el tamaño de todos los iconos que exceden el tamaño máximo de
 msgid "Restrict output to warnings and errors"
 msgstr "Restringir los resultados a advertencias y errores"
 
-#: ../fdroidserver/net.py
-#, python-format
-msgid "Retrying failed download: %s"
-msgstr "Reintentando descarga fallida: %s"
-
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Rewrite all the metadata files"
 msgstr "Reescribir todos los archivos de metadatos"
 
+#: ../fdroidserver/rewritemeta.py
+msgid "Rewrite to a specific format: "
+msgstr "Reescribir a un formato específico: "
+
 #: ../fdroidserver/rewritemeta.py
 #, python-brace-format
 msgid "Rewriting '{appid}'"
 msgstr "Reescribiendo '{appid}'"
 
+#: ../fdroidserver/rewritemeta.py
+#, python-brace-format
+msgid "Rewriting '{appid}' to '{path}'"
+msgstr ""
+
 #: ../fdroidserver/checkupdates.py
 msgid "Run on git repo that has uncommitted changes"
-msgstr "Ejecutar en repositorio git con cambios pendientes"
-
-#: ../fdroidserver/nightly.py
-#, python-brace-format
-msgid "Run over {cibase} to find -debug.apk. and skip repo_basedir {repo_basedir}"
-msgstr "Ejecutar sobre {cibase} para encontrar -debug.apk. y omitir repo_basedir {repo_basedir}"
+msgstr ""
 
 #: ../fdroidserver/lint.py
 msgid "Run rewritemeta to fix formatting"
 msgstr "Ejecutar rewritemeta para arreglar el formato"
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 msgid "Running first pass with MD5 checking disabled"
-msgstr "Ejecutando la primera iteración con la comprobación de MD5 deshabilitada"
+msgstr ""
 
 #: ../fdroidserver/mirror.py
 #, python-brace-format
 msgid "Running wget in {path}"
 msgstr "Ejecutando wget en {path}"
 
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "SHA-256 of {url} does not match entry!"
-msgstr "¡El SHA-256 de {url} no coincide con la entrada!"
+#: ../fdroidserver/dscanner.py
+msgid "Scan only the latest version of each package"
+msgstr "Escanear solo la última versión de cada paquete"
 
 #: ../fdroidserver/build.py
 msgid "Scan the resulting APK(s) for known non-free classes."
-msgstr "Escaneando los APK(s) resultantes en busca de clases no libres conocidas."
+msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Scan the source code of a package"
 msgstr "Escanear el código fuente de un paquete"
 
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Scanner found {count} problems in {apk}"
-msgstr "El escáner encontró {count} problemas en {apk}"
-
 #: ../fdroidserver/scanner.py
 #, python-brace-format
 msgid "Scanner found {count} problems in {appid}:"
-msgstr "El escáner encontró {count} problemas en {appid}:"
+msgstr ""
 
 #: ../fdroidserver/scanner.py
 #, python-brace-format
 msgid "Scanner found {count} problems in {appid}:{versionCode}:"
-msgstr "El escáner encontró {count} problemas en {appid}:{versionCode}:"
+msgstr ""
 
 #: ../fdroidserver/build.py
 msgid "Scanner found {} problem"
@@ -1591,35 +1580,22 @@ msgid_plural "Scanner found {} problems"
 msgstr[0] "El escáner encontró {} problema"
 msgstr[1] "El escáner encontró {} problemas"
 
-#: ../fdroidserver/scanner.py
-msgid "Scanning APK for extra signing blocks."
-msgstr "Escaneando el APK en busca de bloques de firma adicionales."
-
-#: ../fdroidserver/scanner.py
-msgid "Scanning APK with dexdump for known non-free classes."
-msgstr "Escaneo del APK con dexdump para clases no gratuitas conocidas."
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Set NDK {release} ({version}) up"
-msgstr "Configurar el NDK de {release} ({version}) arriba"
-
 #: ../fdroidserver/common.py
 msgid "Set clock to that time using:"
-msgstr "Ajustar el reloj a esa hora usando:"
+msgstr ""
 
 #: ../fdroidserver/nightly.py
 msgid "Set maximum releases in repo before older ones are archived"
-msgstr "Establecer la cantidad máxima de lanzamientos antes de que los anteriores sean archivados"
+msgstr ""
 
 #: ../fdroidserver/build.py
 #, python-brace-format
 msgid "Set open file limit to {integer}"
-msgstr "Establecer el límite de ficheros abiertos a {integer}"
+msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Set up an app build for a nightly build repo"
-msgstr "Configurar una compilación de app para un repositorio de compilación nocturna"
+msgstr ""
 
 #: ../fdroidserver/build.py
 msgid "Setting open file limit failed: "
@@ -1628,13 +1604,20 @@ msgstr "Configuración fallida de límite de apertura de archivo: "
 #: ../fdroidserver/build.py
 #, python-brace-format
 msgid "Setting {0} sec timeout for this build"
-msgstr "Estableciendo un máximo de {0} segundos para esta compilación"
+msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroidserver/build.py
+msgid "Setup an emulator, install the APK on it and perform a Drozer scan"
+msgstr "Establecer un emulador, instalar la APK en el y realizar un escaneo con \"Drozer\""
+
+msgid "Setup an emulator, install the apk on it and perform a drozer scan"
+msgstr "Configurar un emulador, instalar la aplicación APK en él y realizar una \"Drozer\" scan"
+
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Sign and place packages in the repo"
 msgstr "Firmar y colocar paquetes en el repositorio"
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Sign indexes created using update --nosign"
 msgstr "Firmar los índices creados usando update --nosign"
 
@@ -1645,39 +1628,43 @@ msgstr "Omitir el escaneo del código fuente por problemas binarios u otros prob
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Skipping '{apkfilename}' with invalid signature!"
-msgstr "¡Ignorando '{apkfilename}' por firma no válida!"
-
-#: ../fdroidserver/deploy.py ../fdroidserver/index.py
-#, python-format
-msgid "Skipping GitLab Pages mirror because the repo is too large (>%.2fGB)!"
-msgstr "¡Saltando el mirror de GitLab Pages porque el repositorio es demasiado grande (>%.2fGB)!"
+msgstr ""
 
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Skipping index generation for {appid}"
-msgstr "Saltando la generación de índices para {appid}"
+msgstr ""
 
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Skipping {apkfilename} with invalid signature!"
-msgstr "¡Ignorando {apkfilename} por firma no válida!"
+msgstr ""
 
 #: ../fdroidserver/scanner.py
 #, python-brace-format
 msgid "Skipping {appid}: disabled"
 msgstr "Saltando {appid}: desactivado"
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/scanner.py
+#, python-brace-format
+msgid "Skipping {appid}: no builds specified"
+msgstr ""
+
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 msgid "Specify a local folder to sync the repo to"
 msgstr "Especifique una carpeta local para sincronizar el"
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 msgid "Specify an identity file to provide to SSH for rsyncing"
 msgstr "Especifique un fichero de identidad que ofrezca SSH para rsync"
 
+#: ../fdroidserver/build.py
+msgid "Specify that we're running on the build server"
+msgstr "Especificar que estamos ejecutando en el servidor de compilación"
+
 #: ../fdroidserver/nightly.py
 msgid "Specify which debug keystore file to use."
-msgstr "Especifique qué fichero de almacenamiento de claves usar para depuración."
+msgstr ""
 
 #: ../fdroidserver/common.py
 msgid "Spew out even more information than normal"
@@ -1685,8 +1672,13 @@ msgstr "Diseminar más información de lo normal"
 
 #: ../fdroidserver/nightly.py
 #, python-brace-format
+msgid "Striping mystery signature from {apkfilename}"
+msgstr ""
+
+#: ../fdroidserver/nightly.py
+#, fuzzy, python-brace-format
 msgid "Stripping mystery signature from {apkfilename}"
-msgstr "Quitando firma misteriosa de {apkfilename}"
+msgstr "Fallo al obtener firmas para '{apkfilename}': {error}"
 
 #: ../fdroidserver/lint.py
 #, python-format
@@ -1696,257 +1688,284 @@ msgstr "Resúmen '%s' es sólo el nombre de la app"
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "Summary of length {length} is over the {limit} char limit"
-msgstr "El resumen de longitud {length} supera el límite de {limit} caracteres"
+msgstr ""
 
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "System clock is older than date in {path}!"
-msgstr "¡El fecha del sistema es anterior a la de {path}!"
-
-#: ../fdroidserver/checkupdates.py
-msgid "Tags update mode only works for git, hg, bzr and git-svn repositories currently"
-msgstr "El modo de actualización de etiquetas actualmente solo funciona para repositorios de git, hg, bzr y git-svn"
-
-#: ../fdroidserver/checkupdates.py
-msgid "Tags update mode used in git-svn, but the repo was not set up with tags"
-msgstr "El modo de actualización de etiquetas se utilizó en git-svn, pero el repositorio no se configuró con etiquetas"
+msgstr ""
 
 #: ../fdroidserver/build.py
 msgid "Test mode - put output in the tmp directory only, and always build, even if the output already exists."
 msgstr "Modo de prueba: ponga la salida solo en el directorio tmp y siga desarrollando, incluso si la salida ya existe."
 
-#: ../fdroidserver/index.py
-msgid "The \"qrcode\" Python package is not installed (e.g. apt-get install python3-qrcode)!"
-msgstr ""
-
 #. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "The OBB version code must come after \"{name}.\":"
-msgstr "El código de versión OBB tiene que venir tras \"{name}.\":"
+msgstr ""
 
 #: ../fdroidserver/btlog.py
 msgid "The base URL for the repo to log (default: https://f-droid.org)"
-msgstr "El URL base para el registro del repositorio (por defecto: https://f-droid.org)"
+msgstr "El URL base para  el registro del repositorio  (por defecto: https://f-droid.org)"
 
 #: ../fdroidserver/mirror.py
 msgid "The directory to write the mirror to"
-msgstr "El directorio al que escribir el espejo"
+msgstr ""
 
 #: ../fdroidserver/nightly.py
 msgid "The file to be included in the repo (path or glob)"
-msgstr "El fichero a incluír en el repositorio (ruta o glob)"
+msgstr ""
+
+#: ../fdroidserver/deploy.py
+msgid "The only commands currently supported are 'init' and 'update'"
+msgstr "Los únicos comandos soportados son 'init' y 'update'"
 
 #: ../fdroidserver/index.py
 msgid "The repository's fingerprint does not match."
 msgstr "La huella digital del repositorio no coincide."
 
+#: ../fdroidserver/common.py
+msgid "The repository's index could not be verified."
+msgstr ""
+
 #: ../fdroidserver/deploy.py
 #, python-brace-format
 msgid "The root dir for local_copy_dir \"{path}\" does not exist!"
-msgstr "¡El directorio raíz para local_copy_dir \"{path}\" no existe!"
+msgstr ""
 
 #: ../fdroidserver/publish.py
 msgid "There is a keyalias collision - publishing halted"
-msgstr "Hay una colisión de keyalias - publicación detenida"
+msgstr ""
 
 #: ../fdroidserver/common.py
 msgid "These are the apps that have been archived from the main repo."
-msgstr "Estas son aplicaciones del repositorio principal que se han archivado."
+msgstr ""
 
-#: ../fdroidserver/mirror.py
-msgid "This command should never be used to mirror f-droid.org! A full copy requires more than 600GB."
-msgstr "¡Este comando no debe usarse nunca para replicar f-droid.org!. Una copia completa requiere más de 600 GB."
-
-#: ../fdroidserver/common.py
-msgid "This is a repository of apps to be used with F-Droid. Applications in this repository are either official binaries built by the original application developers, or are binaries built from source by the admin of f-droid.org using the tools on https://gitlab.com/fdroid."
-msgstr "Este es un repositorio de aplicaciones para usar con F-Droid. Las aplicaciones en este repositorio son binarios oficiales construidos por los desarrolladores originales de la aplicación, o son binarios creados a partir de su código fuente por f-droid.org utilizando las herramientas de https://gitlab.com/fdroid."
-
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 #, python-format
 msgid "This repo already has local metadata: %s"
 msgstr "Este repo ya tiene metadatos locales: %s"
 
-#: ../fdroidserver/init.py
-#, python-format
-msgid ""
-"To complete the setup, add your APKs to \"%s\"\n"
-"then run \"fdroid update -c; fdroid update\".  You might also want to edit\n"
-"\"config.yml\" to set the URL, repo name, and more.  You should also set up\n"
-"a signing key (a temporary one might have been automatically generated).\n"
-"\n"
-"For more info: https://f-droid.org/docs/Setup_an_F-Droid_App_Repo\n"
-"and https://f-droid.org/docs/Signing_Process"
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
+msgid "To use awsbucket, awssecretkey and awsaccesskeyid must also be set in config.py!"
 msgstr ""
-"Para completar la configuración, añade tus APKs a \"%s\"\n"
-"después ejecuta \"fdroid update -c; fdroid update\".  Puede que también quieras editar \"config.yml\" \n"
-"para especificar la URL, el nombre del repositorio, y más.  También debes de configurar una \n"
-"llave de firmado (puede que se haya generrado automáticamente una temporal).\n"
-"\n"
-"ara más información: https://f-droid.org/docs/Setup_an_F-Droid_App_Repo\n"
-"y https://f-droid.org/docs/Signing_Process"
-
-#: ../fdroidserver/deploy.py
-msgid "To use awsbucket, awssecretkey and awsaccesskeyid must also be set in config.yml!"
-msgstr "¡Para usar awsbucket hay que configurar también awssecretkey y awsaccesskeyid en config.yml!"
-
-#: ../fdroidserver/deploy.py
-msgid "To use rclone, rclone_config and awsbucket must be set in config.yml!"
-msgstr "¡Para utilizar rclone, rclone_config y awsbucket deben estar configurados en config.yml!"
 
 #: ../fdroidserver/lint.py
 msgid "URL must start with https:// or http://"
-msgstr "La URL debe comenzar con https:// o http://"
+msgstr ""
 
 #: ../fdroidserver/lint.py
 msgid "URL shorteners should not be used"
 msgstr "Acortadores de URL no deben ser utilizados"
 
+#: ../fdroidserver/metadata.py
+msgid "URL title is just the URL, use brackets: [URL]"
+msgstr ""
+
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "URL {url} in Description: {error}"
-msgstr "URL {url} en Descripción: {error}"
+msgstr ""
 
 #: ../fdroidserver/lint.py
 msgid "Unexpected license tag \"{}\"! Only use FSF or OSI approved tags from https://spdx.org/license-list"
-msgstr "¡Etiqueta de licencia inesperada \"{}\"! Use solo etiquetas aprobadas por FSF u OSI de https://spdx.org/license-list"
+msgstr ""
 
 #: ../fdroidserver/lint.py
 msgid "Unexpected license tag \"{}\"! Only use license tags configured in your config file"
-msgstr "¡Etiqueta de licencia inesperada \"{}\"! Use solo etiquetas de licencia configuradas en su archivo de configuración"
+msgstr ""
 
-#: ../fdroidserver/common.py
+#: ../fdroidserver/metadata.py
 #, python-brace-format
-msgid "Unknown entry {key} in {configname}"
-msgstr "Entrada desconocida {key} en {configname}"
+msgid "Unexpected text on same line as {field} in {linedesc}"
+msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Unknown exception found!"
-msgstr "Se ha producido una excepción desconocida"
+msgstr "¡Se encontró una excepción desconocida!"
 
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "Unknown file '{filename}' in build '{versionName}'"
-msgstr "Fichero '{filename}' desconocido en compilación '{versionName}'"
+msgstr ""
 
 #: ../fdroidserver/metadata.py
 #, python-format
 msgid "Unknown metadata format: %s"
-msgstr "Formato de metadatos desconocido: %s"
+msgstr ""
 
 #: ../fdroidserver/metadata.py
 #, python-brace-format
+msgid "Unknown metadata format: {path}"
+msgstr "Formato de metadatos desconocido: {path}"
+
+#: ../fdroidserver/metadata.py
+#, fuzzy, python-brace-format
 msgid "Unknown metadata format: {path} (use: *.yml)"
-msgstr "Formato de metadatos desconocido: {path} (use: *.yml)"
+msgstr "Formato de metadatos desconocido: {path}"
 
 #: ../fdroidserver/common.py
 msgid "Unknown version of aapt, might cause problems: "
-msgstr "Versión desconocida de aapt, podría causar problemas: "
+msgstr ""
+
+#: ../fdroidserver/lint.py
+msgid "Unlinkified link - use [http://foo.bar Link title] or [http://foo.bar]"
+msgstr ""
 
 #: ../fdroidserver/lint.py
 msgid "Unnecessary leading space"
-msgstr "Espacio innecesario al principio"
+msgstr ""
 
 #: ../fdroidserver/lint.py
 msgid "Unnecessary trailing space"
-msgstr "Espacio innecesario al final"
+msgstr ""
 
 #: ../fdroidserver/metadata.py
 #, python-brace-format
 msgid "Unrecognised app field '{fieldname}' in '{path}'"
-msgstr "Campo de app '{fieldname}' desconocido en '{path}'"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+msgid "Unrecognised app field: "
+msgstr ""
 
 #: ../fdroidserver/metadata.py
 #, python-brace-format
 msgid "Unrecognised build flag '{build_flag}' in '{path}'"
-msgstr "Flag de compilación '{build_flag}' desconocido en '{path}'"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Unrecognised field '{field}' in {linedesc}"
+msgstr ""
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Unsupported file type \"{extension}\" for repo graphic"
-msgstr "Tipo de fichero \"{extension}\" no soportado para gráfico de repositorio"
+msgstr ""
 
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Unsupported graphics file found: {path}"
-msgstr "Fichero de gráficos no soportado: {path}"
+msgstr ""
+
+#: ../fdroidserver/rewritemeta.py
+#, python-brace-format
+msgid "Unsupported metadata format, use: --to [{supported}]"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+msgid "Unterminated ]"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+msgid "Unterminated ]]"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Unterminated build in {name}"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Unterminated continuation in {name}"
+msgstr ""
 
 #: ../fdroidserver/lint.py
 #, python-format
 msgid "Unused extlib at %s"
-msgstr "Extlib no utilizada en %s"
+msgstr ""
 
 #: ../fdroidserver/lint.py
 #, python-format
 msgid "Unused file at %s"
-msgstr "Fichero no utilizado en %s"
+msgstr ""
 
 #: ../fdroidserver/scanner.py
 #, python-format
 msgid "Unused scandelete path: %s"
-msgstr "Ruta scandelete sin uso: %s"
+msgstr ""
 
 #: ../fdroidserver/scanner.py
 #, python-format
 msgid "Unused scanignore path: %s"
-msgstr "Ruta scanignore sin uso: %s"
+msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Update repo information for new packages"
 msgstr "Actualizar la información del repositorio para nuevos paquetes"
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Update the binary transparency log for a URL"
 msgstr "Actualizar el registro de transparencia binario para una URL"
 
+#: ../fdroid ../fdroidserver/__main__.py
+msgid "Update the stats of the repo"
+msgstr "Actualizar las estadísticas del repositorio"
+
+#: ../fdroidserver/update.py ../fdroidserver/build.py
+msgid "Update the wiki"
+msgstr "Actualizar el wiki"
+
 #: ../fdroidserver/checkupdates.py
 #, python-brace-format
 msgid "UpdateCheckData has invalid URL: {url}"
-msgstr "UpdateCheckData tiene una URL no válida: {url}"
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "UpdateCheckData must match the version code as integer (\\d or [0-9]): {codeex}"
-msgstr "UpdateCheckData debe coincidir con el código de la versión como entero (\\d o [0-9]): {codeex}"
+msgstr ""
 
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "UpdateCheckData must use HTTPS URL: {url}"
-msgstr "UpdateCheckData tiene que usar una URL HTTPS: {url}"
+msgstr ""
 
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "UpdateCheckData not a valid URL: {url}"
-msgstr "UpdateCheckData tiene una URL no válida: {url}"
+msgstr ""
 
 #: ../fdroidserver/lint.py
-msgid "UpdateCheckMode is set but it looks like checkupdates hasn't been run yet."
-msgstr "UpdateCheckMode está configurado pero parece que aún no se han ejecutado las actualizaciones."
+msgid "UpdateCheckMode is set but it looks like checkupdates hasn't been run yet"
+msgstr ""
+
+#. Translators: https://developer.android.com/studio/build/application-id
+#: ../fdroidserver/lint.py
+msgid "UpdateCheckName is set to the known application ID - it can be removed"
+msgstr ""
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
 #: ../fdroidserver/lint.py
 msgid "UpdateCheckName is set to the known application ID, it can be removed"
-msgstr "UpdateCheckName está configurado con el ID de la aplicación conocida, se puede eliminar"
+msgstr ""
 
 #: ../fdroidserver/deploy.py
 #, python-brace-format
 msgid "Uploading {apkfilename} to androidobservatory.org"
-msgstr "Subiendo {apkfilename} a androidobservatory.org"
+msgstr ""
 
 #: ../fdroidserver/deploy.py
 #, python-brace-format
 msgid "Uploading {apkfilename} to virustotal"
-msgstr "Subiendo {apkfilename} a virustotal"
+msgstr ""
+
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "Usage"
+msgstr "Uso"
+
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, python-format
+msgid "Usage: %s\n"
+msgstr "Uso: %s\n"
 
 #: ../fdroidserver/lint.py
-msgid "Use /HEAD instead of /master or /main to point at a file in the default branch"
-msgstr "Utiliza /HEAD en lugar de /master o /main para apuntar a un archivo de la rama por defecto"
+msgid "Use /HEAD instead of /master to point at a file in the default branch"
+msgstr ""
 
 #: ../fdroidserver/update.py
 msgid "Use `fdroid update -c` to create it."
-msgstr "Use `fdroid update -c` para crearlo."
+msgstr ""
 
 #: ../fdroidserver/build.py
 msgid "Use build server"
@@ -1956,109 +1975,76 @@ msgstr "Use un servidor de compilación"
 msgid "Use date from APK instead of current time for newly added APKs"
 msgstr "Use la fecha del APK en vez de la fecha actual para los nuevos APK añadidos"
 
-#: ../fdroidserver/deploy.py
+msgid "Use date from apk instead of current time for newly added apks"
+msgstr "Use la fecha del «apk» en vez de la fecha actual para los nuevos «apk» añadidos"
+
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Using \"{path}\" for configuring s3cmd."
-msgstr "Usando \"{path}\" para configurar s3cmd."
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Using \"{path}\" for syncing with remote storage."
-msgstr "Usando \"{path}\" para sincronizar con almacenamiento remoto."
+msgstr ""
 
 #: ../fdroidserver/common.py
 msgid "Using APK Signature v2"
-msgstr "Utilizando Firma APK v2"
+msgstr ""
 
 #: ../fdroidserver/common.py
 msgid "Using APK Signature v3"
-msgstr "Utilizando firma APK v3"
-
-#: ../fdroidserver/common.py
-msgid "Using JAR Signature"
-msgstr "Utilizar la firma JAR"
+msgstr ""
 
 #: ../fdroidserver/common.py
 msgid "Using Java's jarsigner, not recommended for verifying APKs! Use apksigner"
-msgstr "¡Usando jarsigner de Java. No recomendado para verificar APKs! Use apksigner"
+msgstr ""
 
-#: ../fdroidserver/metadata.py
+#: ../fdroidserver/common.py
 #, python-brace-format
-msgid "Using blank dictionary instead of contents of {path}!"
-msgstr "¡Usando un diccionario en blanco en lugar del contenido de la {path}!"
+msgid "Using androguard from \"{path}\""
+msgstr ""
 
 #: ../fdroidserver/init.py
 #, python-brace-format
 msgid "Using existing keystore \"{path}\""
-msgstr "Usando almacén de claves existente \"{path}\""
+msgstr ""
 
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Using rclone to sync with: {url}"
-msgstr "Usando rclone para sincronizar con: {url}"
-
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Using s3cmd to sync with: {url}"
-msgstr "Usando s3cmd para sincronizar con: {url}"
+msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Valid commands are:"
-msgstr "Las órdenes válidas son:"
+msgstr "Los comandos válidos son:"
 
 #: ../fdroidserver/verify.py
 msgid "Verify against locally cached copy rather than redownloading."
-msgstr "Verificar una copia en caché local en vez de volver a descargar."
+msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Verify the integrity of downloaded packages"
 msgstr "Verificar la integridad de los paquetes descargados"
 
 #: ../fdroidserver/index.py
 msgid "Verifying index signature:"
-msgstr "Verificar el índice de la firma:"
-
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "Verifying package {path} with apksigner."
-msgstr "Verificando el paquete {path} con apksigner."
+msgstr ""
 
 #: ../fdroidserver/deploy.py
 #, python-brace-format
 msgid "VirusTotal API key cannot upload files larger than 32MB, use {url} to upload {path}."
-msgstr "La clave de API de VirusTotal no puede subir archivos mayores de 32MB. Use {url} para subir {path}."
-
-#: ../fdroidserver/nightly.py
-msgid "WARNING: only public git repos are supported!"
 msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Warn about possible metadata errors"
 msgstr "Alertar sobre posibles errores de metadatos"
 
-#: ../fdroidserver/scanner.py
-msgid "WebAssembly binary file"
-msgstr "Archivo binario WebAssembly"
-
 #: ../fdroidserver/update.py
 msgid "When configured for signed indexes, create only unsigned indexes at this stage"
 msgstr "Cuando está configurado para índices firmados, crear solo índices sin signo en esta etapa"
 
 #: ../fdroidserver/lint.py
 msgid "When linting the entire repository yamllint is disabled by default. This option forces yamllint regardless."
-msgstr "Cuando se limpia el repositorio completo yamllint está deshabilitado por defecto. Esta opción fuerza yamllint a pesar de todo."
+msgstr ""
 
-#: ../fdroidserver/publish.py
-msgid "When signing or verifying fails, exit with an error code."
-msgstr "Cuando falla la firma o la verificación, sale con un código de error."
-
-#: ../fdroidserver/install.py
-msgid "Would you like to download and install F-Droid.apk via adb? (YES/no)"
-msgstr "¿Desea descargar e instalar F-Droid.apk mediante adb? (SÍ/no)"
-
-#: ../fdroidserver/install.py
-msgid "Would you like to download the app(s) from f-droid.org? (YES/no)"
-msgstr "¿Desea descargar la(s) aplicación(es) de f-droid.org? (SÍ/no)"
+msgid "X.509 'Distiguished Name' used when generating keys"
+msgstr "X.509 'Nombre Distintivo' (DN) usado al generar claves"
 
 #: ../fdroidserver/init.py
 msgid "X.509 'Distinguished Name' used when generating keys"
@@ -2066,213 +2052,228 @@ msgstr "X.509 'Nombre Distintivo' (DN) usado al generar claves"
 
 #: ../fdroidserver/common.py
 msgid "You can use ANDROID_HOME to set the path to your SDK, i.e.:"
-msgstr "Puede usar ANDROID_HOME para definir la ruta a su SDK, p.ej.:"
+msgstr ""
 
 #: ../fdroidserver/scanner.py
 msgid "ZIP file archive"
-msgstr "Archivo de ficheros ZIP"
-
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "adb reports {serial} is \"{status}\"!"
-msgstr "¡adb informa que {serial} es \"{status}\"!"
+msgstr ""
 
 #: ../fdroidserver/nightly.py
 #, python-brace-format
 msgid "adding IdentityFile to {path}"
-msgstr "añadiendo IdentityFile a {path}"
+msgstr ""
 
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "adding to {name}: {path}"
-msgstr "añadiendo a {name}: {path}"
+msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "ambiguous option: %(option)s could match %(matches)s"
 msgstr "opción ambigua: %(option)s podría corresponderse con %(matches)s"
 
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "apksigner in build-tools;{version} passes APKs with invalid v3 signatures, ignoring."
-msgstr "apksigner en build-tools;{version} pasa APK con firmas v3 no válidas, ignorándolos."
-
-#: ../fdroidserver/common.py
-msgid "apksigner not found! Cannot sign or verify modern APKs"
-msgstr "¡No se encontró apksigner! No se pueden firmar o verificar los APKs modernos"
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, python-format
+msgid "ambiguous option: %s (%s?)"
+msgstr "opción ambigua: %s (%s?)"
 
 #: ../fdroidserver/common.py
 msgid "apksigner not found, it's required for signing!"
-msgstr "¡Se requiere apksigner para firmar pero no se encontró!"
+msgstr ""
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/checkupdates.py ../fdroidserver/lint.py
-#: ../fdroidserver/rewritemeta.py
+#: ../fdroidserver/lint.py ../fdroidserver/rewritemeta.py
+#: ../fdroidserver/checkupdates.py
+#, fuzzy
 msgid "application ID of file to operate on"
-msgstr "identificador de aplicación del fichero en el que operar"
+msgstr "applicationId para buscar actualizaciones"
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/build.py ../fdroidserver/install.py
-#: ../fdroidserver/publish.py ../fdroidserver/scanner.py
-#: ../fdroidserver/verify.py
+#: ../fdroidserver/verify.py ../fdroidserver/publish.py
+#: ../fdroidserver/build.py ../fdroidserver/scanner.py
+#: ../fdroidserver/install.py
+#, fuzzy
 msgid "application ID with optional versionCode in the form APPID[:VERCODE]"
-msgstr "identificador de aplicación con código de versión opcional en la forma APPID[: VERCODE]"
+msgstr "applicationId con código de versión opcional en la forma APPID [: VERCODE]"
 
-#: ../fdroidserver/common.py
-msgid "archive_url needs to end with /archive"
-msgstr "El archive_url debe terminar con /archive"
+#: ../fdroidserver/lint.py ../fdroidserver/rewritemeta.py
+msgid "applicationId in the form APPID"
+msgstr "applicationId en el formato APPID"
 
-#: /usr/lib/python3.11/argparse.py
+#: ../fdroidserver/checkupdates.py
+msgid "applicationId to check for updates"
+msgstr "applicationId para buscar actualizaciones"
+
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
+#: ../fdroidserver/verify.py ../fdroidserver/publish.py
+#: ../fdroidserver/dscanner.py ../fdroidserver/build.py
+#: ../fdroidserver/scanner.py ../fdroidserver/install.py
+msgid "applicationId with optional versionCode in the form APPID[:VERCODE]"
+msgstr "applicationId con código de versión opcional en la forma APPID [: VERCODE]"
+
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "argument \"-\" with mode %r"
-msgstr "argumento \"-\" con modo %r"
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "argument %(argument_name)s: %(message)s"
-msgstr "argumento %(argument_name)s: %(message)s"
+msgstr ""
 
 #: ../fdroidserver/nightly.py
 msgid "attempting bare SSH connection to test deploy key:"
-msgstr "intentando conexión SSH pura para probar la llave de despliegue:"
+msgstr ""
+
+#: ../fdroidserver/nightly.py
+msgid "attempting bare ssh connection to test deploy key:"
+msgstr ""
 
 #: ../fdroidserver/common.py
 msgid "can not parse scrlib spec (not a string): '{}'"
-msgstr "no se puede procesar (no es una cadena) la especificación scrlib: '{}'"
+msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
-msgid "can't open '%(filename)s': %(error)s"
-msgstr "no se puede abrir '%(filename)s': %(error)s"
-
-#: ../fdroidserver/scanner.py
-msgid "can't open non-https url: '{};"
-msgstr "no se puede abrir una url que no sea https: '{};"
+msgid "can't open '%s': %s"
+msgstr "no se puede abrir '%s': %s"
 
 #: ../fdroidserver/build.py
-#, python-brace-format
+#, fuzzy, python-brace-format
 msgid "cannot find required srclibs: \"{path}\""
-msgstr "no se encuentran las srclibs requeridas: \"{path}\""
+msgstr "¡No se puede encontrar un appid para {path}!"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "cannot have multiple subparser arguments"
-msgstr "no se puede tener varios argumentos de subparser"
+msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "cannot merge actions - two groups are named %r"
-msgstr "no se pueden fundir acciones - 2 grupos se llaman %r"
+msgstr ""
 
 #: ../fdroidserver/nightly.py
 msgid "cannot publish update, did you set the deploy key?"
-msgstr "no se puede publicar actualización. ¿Estableció Ud. la clave de despliegue?"
+msgstr ""
 
 #: ../fdroidserver/nightly.py
 #, python-brace-format
 msgid "cloning {url}"
-msgstr "clonando {url}"
+msgstr ""
+
+#: ../fdroidserver/deploy.py
+msgid "command to execute, either 'init' or 'update'"
+msgstr "Comando para ejecutar, ya sea 'init' o 'update'"
 
 #: ../fdroidserver/__main__.py
 msgid "commands from plugin modules:"
-msgstr "órdenes de módulos de extensión (plugins):"
+msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "complex"
+msgstr ""
+
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "conflicting option string: %s"
 msgid_plural "conflicting option strings: %s"
-msgstr[0] "cadena de opción conflictiva: %s"
-msgstr[1] "cadenas de opción conflictivas: %s"
+msgstr[0] ""
+msgstr[1] ""
 
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "conflicting subparser alias: %s"
-msgstr "Alias de los subanalizadores en el conflicto:%s"
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "conflicting subparser: %s"
-msgstr "subanalizador del conflictivo:%s"
+#: ../fdroidserver/nightly.py
+#, python-brace-format
+msgid "copying {apkfilename} into {path}"
+msgstr ""
 
 #: ../fdroidserver/metadata.py
 #, python-brace-format
 msgid "could not parse '{path}'"
-msgstr "no se pudo procesar '{path}'"
-
-#: ../fdroidserver/common.py
-msgid "could not parse srclib spec (no name specified): '{}'"
-msgstr "no se ha podido analizar la especificación srclib (no se ha especificado el nombre): '{}'"
+msgstr ""
 
 #: ../fdroidserver/common.py
 msgid "could not parse srclib spec (no ref specified): '{}'"
-msgstr "no se pudo procesar especificación srclib (sin especificar ref): '{}'"
+msgstr ""
+
+#: ../fdroidserver/common.py
+msgid "could not parse srclib spec (too many '@' signs): '{}'"
+msgstr ""
 
 #: ../fdroidserver/nightly.py
 #, python-brace-format
 msgid "created {path}"
-msgstr "{path} creado"
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "current version is newer: old vercode={old}, new vercode={new}"
-msgstr "la versión actual es más nueva: código de versión viejo={old}, código de versión nuevo={new}"
+msgstr ""
 
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "deleting: repo/{apkfilename}"
-msgstr "eliminando: repo/{apkfilename}"
+msgstr ""
 
-#: ../fdroidserver/scanner.py
-msgid "dependency file without lock"
-msgstr "archivo de dependencia sin bloqueo"
+#: ../fdroidserver/common.py
+#, python-brace-format
+msgid "deployed build logs to '{path}'"
+msgstr ""
 
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "deployed process log {path} to {dest}"
-msgstr "registro de proceso {path} desplegado en '{dest}'"
+msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "dest= is required for options like %r"
-msgstr "las opciones como %r requieren dest ="
-
-#: ../fdroidserver/scanner.py
-msgid "downloading '{}'"
-msgstr "Descargando '{}'"
-
-#: ../fdroidserver/scanner.py
-msgid "downloading scanner signatures from '{}' failed"
-msgstr "la descarga del escaneo de la firma para '{}' falló"
+msgstr ""
 
 #: ../fdroidserver/scanner.py
 msgid "executable binary, possibly code"
-msgstr "binario ejecutable, posiblemente código"
+msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "expected %s argument"
 msgid_plural "expected %s arguments"
-msgstr[0] "argumento inesperado %s"
-msgstr[1] "argumentos inesperados %s"
+msgstr[0] ""
+msgstr[1] ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "expected at least one argument"
-msgstr "se esperaba al menos 1 argumento"
+msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "expected at most one argument"
-msgstr "no se esperaba más de 1 argumento"
+msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "expected one argument"
-msgstr "se esperaba 1 argumento"
+msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroidserver/common.py
+#, python-brace-format
+msgid "failed deploying build logs to '{path}'"
+msgstr ""
+
+#: ../fdroid
+msgid "fdroid [-h|--help|--version] <command> [<args>]"
+msgstr "fdroid [-h|--help|--version] <orden> [<argumentos>]"
+
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "fdroid [<command>] [-h|--help|--version|<args>]"
 msgstr "fdroid [<orden>] [-h|--help|--version|<argumentos>]"
 
-#: ../fdroidserver/scanner.py
-msgid "fetch the latest version of signatures from the web"
-msgstr "obtener la última versión de las firmas de la web"
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "floating-point"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+msgid "force errors to be warnings, or ignore"
+msgstr "Forzar a los errores a ser advertencias o ignorarlas"
 
 #: ../fdroidserver/metadata.py
 msgid "force metadata errors (default) to be warnings, or to be ignored."
@@ -2280,231 +2281,271 @@ msgstr "forzar que los errores en metadatos sean avisos, o que se ignoren (valor
 
 #: ../fdroidserver/common.py
 msgid "git svn clone failed"
-msgstr "falló git svn clone"
+msgstr ""
 
 #: ../fdroidserver/scanner.py
 msgid "gzip file archive"
-msgstr "archivo de ficheros gzip"
+msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "ignored explicit argument %r"
-msgstr "argumento explícito %r ignorado"
+msgstr ""
 
 #: ../fdroidserver/index.py
 msgid "index-v1 must have a signature, use `fdroid signindex` to create it!"
-msgstr "¡index-v1 tiene que tener una firma, use `fdroid signindex` para crearla!"
+msgstr ""
 
-#: ../fdroidserver/index.py
-msgid "index-v2 must have a signature, use `fdroid signindex` to create it!"
-msgstr "index-v2 debe tener una firma, ¡ use `f droid signindex` para crearla!"
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "integer"
+msgstr "entero"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "invalid %(type)s value: %(value)r"
-msgstr "valor inválido de tipo %(type)s: %(value)r"
+msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "invalid choice: %(value)r (choose from %(choices)s)"
-msgstr "opción no válida: %(value)r (escoja de entre %(choices)s)"
+msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "invalid conflict_resolution value: %r"
-msgstr "valor para conflict_resolution no válido: %r"
+msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "invalid option string %(option)r: must start with a character %(prefix_chars)r"
-msgstr "cadena de opciones %(option)r no válida: tiene que comenzar por un carácter %(prefix_chars)r"
-
-#: ../fdroidserver/common.py
-msgid "ipfs_cid not found, skipping CIDv1 generation"
-msgstr "ipfs_cid no encontrado, omitiendo la generación de CIDv1"
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "latest build recipe is newer: old vercode={old}, new vercode={new}"
-msgstr "la última receta de empaquetado es más nueva: vercode={old}, nuevo vercode={new}"
+msgstr ""
 
 #: ../fdroidserver/deploy.py
 #, python-brace-format
 msgid "local_copy_dir does not end with \"fdroid\", perhaps you meant: \"{path}\""
-msgstr "local_copy_dir no termina en \"fdroid\", tal vez quisiste decir: \"{path}\""
+msgstr ""
 
 #: ../fdroidserver/deploy.py
 msgid "local_copy_dir must be an absolute path!"
-msgstr "¡local_copy_dir tiene que ser una ruta absoluta!"
+msgstr ""
 
 #: ../fdroidserver/deploy.py
 msgid "local_copy_dir must be directory, not a file!"
-msgstr "¡local_copy_dir tiene que ser un directorio, no un fichero!"
+msgstr ""
 
 #: ../fdroidserver/index.py
 #, python-format
 msgid "mirror '%s' does not end with 'fdroid'!"
-msgstr "¡el espejo '%s' no termina en 'fdroid'!"
+msgstr ""
 
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "mirrors set twice, in config.yml and {path}!"
-msgstr "¡espejos establecidos dos veces, en config.yml y {path}!"
-
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "mutually exclusive arguments must be optional"
-msgstr "los argumentos mutuamente exclusivos tienen que ser opcionales"
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "next {name} cache update due in {time}"
-msgstr "la próxima actualización de la caché de {name} tendrá lugar después de {time}"
+msgstr ""
 
 #: ../fdroidserver/mirror.py
 #, python-brace-format
 msgid "no \"icon\" in {appid}"
-msgstr "{appid} sin \"icono\""
+msgstr ""
 
 #: ../fdroidserver/signatures.py
 msgid "no APK supplied"
-msgstr "no se ha indicado APK"
+msgstr ""
 
-#: ../fdroidserver/checkupdates.py
-msgid "no version information found"
-msgstr "no se encontró información de la versión"
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, python-format
+msgid "no such option: %s"
+msgstr "no hay tal opción: %s"
 
-#: /usr/lib/python3.11/argparse.py
+#: ../fdroid ../fdroidserver/__main__.py
+msgid "no version info found!"
+msgstr "¡no se encontró información de la versión!"
+
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "not allowed with argument %s"
 msgstr "no permitido con el argumento %s"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "one of the arguments %s is required"
-msgstr "se necesita 1 de los argumentos %s"
+msgstr ""
 
-#: ../fdroidserver/common.py ../fdroidserver/index.py
+#: ../fdroidserver/index.py ../fdroidserver/common.py
 msgid "only accepts strings, lists, and tuples"
-msgstr "solo acepta cadenas, listas, y tuplas"
+msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
-msgid "options"
-msgstr "opciones"
+#: ../fdroidserver/install.py
+#, python-format
+msgid "option %s: If you really want to install all the signed apps, use --all"
+msgstr ""
+
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, python-format
+msgid "option %s: invalid %s value: %r"
+msgstr ""
+
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, python-format
+msgid "option %s: invalid choice: %r (choose from %s)"
+msgstr ""
+
+#: /usr/lib/python3.5/getopt.py /usr/lib/python3.6/getopt.py
+#: /usr/lib/python3.7/getopt.py
+#, python-format
+msgid "option -%s not recognized"
+msgstr "opción -%s no reconocida"
+
+#: /usr/lib/python3.5/getopt.py /usr/lib/python3.6/getopt.py
+#: /usr/lib/python3.7/getopt.py
+#, python-format
+msgid "option -%s requires argument"
+msgstr "opción -%s requiere un argumento"
+
+#: /usr/lib/python3.5/getopt.py /usr/lib/python3.6/getopt.py
+#: /usr/lib/python3.7/getopt.py
+#, python-format
+msgid "option --%s must not have an argument"
+msgstr "opción --%s no puede llevar argumento"
+
+#: /usr/lib/python3.5/getopt.py /usr/lib/python3.6/getopt.py
+#: /usr/lib/python3.7/getopt.py
+#, python-format
+msgid "option --%s not a unique prefix"
+msgstr "opción --%s no es un prefijo único"
+
+#: /usr/lib/python3.5/getopt.py /usr/lib/python3.6/getopt.py
+#: /usr/lib/python3.7/getopt.py
+#, python-format
+msgid "option --%s not recognized"
+msgstr "opción --%s no reconocida"
+
+#: /usr/lib/python3.5/getopt.py /usr/lib/python3.6/getopt.py
+#: /usr/lib/python3.7/getopt.py
+#, python-format
+msgid "option --%s requires argument"
+msgstr "opción --%s requiere un argumento"
+
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
+msgid "optional arguments"
+msgstr "argumentos opcionales"
 
 #: ../fdroidserver/nightly.py
 #, python-brace-format
 msgid "overwriting existing {path}"
-msgstr "sobrescribiendo {path} existente"
+msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "positional arguments"
 msgstr "argumentos posicionales"
 
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "process log deploy {path} to {dest} failed!"
-msgstr "¡Falló el despliegue del registro de proceso {path} en {dest}!"
-
-#: ../fdroidserver/build.py
-msgid "reference binary missing signature"
-msgstr "falta la firma del archivo binario de referencia"
+msgstr ""
 
 #: ../fdroidserver/signatures.py
 #, python-brace-format
 msgid "refuse downloading via insecure HTTP connection (use HTTPS or specify --no-https-check): {apkfilename}"
-msgstr "rechazar descarga por conexión HTTP insegura (use HTTPS o especifique --no-https-check): {apkfilename}"
+msgstr ""
+
+#: ../fdroidserver/signatures.py
+#, python-brace-format
+msgid "refuse downloading via insecure http connection (use https or specify --no-https-check): {apkfilename}"
+msgstr ""
 
 #: ../fdroidserver/index.py
 #, python-format
-msgid "repo_icon \"repo/icons/%s\" does not exist, generating placeholder."
-msgstr "repo_icon \"repo/icons/%s\" no existe, generando placeholder."
+msgid "repo_icon %s does not exist, generating placeholder."
+msgstr ""
 
-#: ../fdroidserver/common.py
-msgid "repo_url needs to end with /repo"
-msgstr "repo_url debe terminar con /repo"
+#: ../fdroidserver/metadata.py
+msgid "ruamel.yaml not installed, can not write metadata."
+msgstr ""
 
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "rsync is missing or broken: {error}"
-msgstr "rsync no existe o no funciona: {error}"
-
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "s3cmd sync indexes {path} to {url} and delete"
-msgstr "s3cmd sync indexa {path} a {url} y elimina"
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "s3cmd syncs indexes from {path} to {url} and deletes removed"
-msgstr "s3cmd sincroniza los índices de {path} a {url} y borra los eliminados"
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "scanner cache is malformed! You can clear it with: '{clear}'"
-msgstr "¡El escaner de la cache está mal realizado! Puedes borrarlo con: '{clear}'"
-
-#: ../fdroidserver/deploy.py
-msgid "serverwebroot: path does not end with \"fdroid\", perhaps you meant one of these:"
-msgstr "serverwebroot: la ruta no termina con \"fdroid\", tal vez se refería a uno de estos:"
+msgstr ""
 
 #: ../fdroidserver/scanner.py
 msgid "shared library"
-msgstr "biblioteca compartida"
+msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "show program's version number and exit"
+msgstr "mostrar el número de versión del programa y salir"
+
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.5/optparse.py
+#: /usr/lib/python3.6/argparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/argparse.py /usr/lib/python3.7/optparse.py
 msgid "show this help message and exit"
 msgstr "mostrar este mensaje de ayuda y salir"
 
 #: ../fdroidserver/signatures.py
 msgid "signed APK, either a file-path or HTTPS URL."
-msgstr "APK firmado, o una ruta a fichero o una URL HTTPS."
+msgstr ""
 
 #: ../fdroidserver/common.py
 msgid "skip deploying full build logs: log content is empty"
-msgstr "saltar el despliegue de registros de compilación completos: el registro está vacío"
+msgstr ""
 
 #: ../fdroidserver/common.py
 msgid "skip deploying full build logs: not enabled in config"
-msgstr "saltar el despliegue de registros de compilación completos: no está activado en la configuración"
+msgstr ""
 
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "skipping source tarball: {path}"
-msgstr "ignorando tarball de fuentes: {path}"
+msgstr ""
 
 #: ../fdroidserver/lint.py
 msgid "srclibs missing name and/or @"
-msgstr "a scrlibs le falta el nombre y/o @"
+msgstr ""
 
 #: ../fdroidserver/scanner.py
 msgid "static library"
-msgstr "biblioteca estática"
+msgstr ""
 
-#: ../fdroidserver/build.py
+#: ../fdroidserver/common.py
 #, python-brace-format
-msgid "supplied reference binary has allowed signer {signer}"
-msgstr "el archivo binario de referencia ha proporcionado autorización al firmante {signer}"
+msgid "supplied timestamp value '{timestamp}' is not a unix timestamp"
+msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "the following arguments are required: %s"
 msgstr "se requieren los siguientes argumentos: %s"
 
-#: ../fdroidserver/install.py
-msgid "true"
-msgstr "verdadero"
-
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "unexpected option string: %s"
 msgstr "cadena de opción inesperada: %s"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "unknown parser %(parser_name)r (choices: %(choices)s)"
-msgstr "parser '%(parser_name)r' desconocido. (Opciones válidas: %(choices)s)"
+msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "unrecognized arguments: %s"
 msgstr "argumentos no reconocidos: %s"
@@ -2514,196 +2555,204 @@ msgstr "argumentos no reconocidos: %s"
 msgid "unsafe permissions on '{config_file}' (should be 0600)!"
 msgstr "permisos inseguros en '{config_file}' (¡debería ser 0600)!"
 
-#: ../fdroidserver/__main__.py /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py ../fdroid
+#: /usr/lib/python3.7/argparse.py ../fdroidserver/__main__.py
 msgid "usage: "
 msgstr "uso: "
 
-#: ../fdroidserver/deploy.py
+#: ../fdroid
+msgid "usage: fdroid [-h|--help|--version] <command> [<args>]"
+msgstr "Uso: fdroid [-h|--help|--version] <command> [<args>]"
+
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "using Apache libcloud to sync with {url}"
 msgstr "usando Apache libcloud para sincronizar con {url}"
 
 #: ../fdroidserver/deploy.py
 msgid "virustotal.com is rate limiting, waiting to retry..."
-msgstr "virustotal.com está limitando el consumo, esperando para reintentar..."
+msgstr ""
 
-#: ../fdroidserver/install.py
-msgid "yes"
-msgstr "sí"
+#: ../fdroidserver/update.py
+msgid "wiki support is deprecated and will be removed in the next release!"
+msgstr ""
 
 #: ../fdroidserver/publish.py
 #, python-brace-format
 msgid "{0} app, {1} key aliases"
 msgid_plural "{0} apps, {1} key aliases"
-msgstr[0] "{0} aplicación, {1} alias de clave"
-msgstr[1] "{0} aplicaciones, {1} alias de clave"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "{apkfilename} ({appid}) has no metadata!"
-msgstr "¡{apkfilename} ({appid}) no tiene metadatos!"
+msgstr ""
+
+#: ../fdroidserver/update.py
+#, python-brace-format
+msgid "{apkfilename} has multiple {name} files, looks like Master Key exploit!"
+msgstr ""
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "{apkfilename}'s AndroidManifest.xml has a bad date: "
 msgstr "El AndroidManifest.xml de {apkfilename} tiene la fecha mal: "
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "{appid} does not have a name! Using application ID instead."
-msgstr "¡{appid} no tiene nombre! Usando su identificador."
+msgstr ""
+
+#: ../fdroidserver/update.py
+#, python-brace-format
+msgid "{appid} does not have a name! Using package name instead."
+msgstr ""
+
+#: ../fdroidserver/update.py
+#, python-brace-format
+msgid "{appid} from {path} is not a valid Android Package Name!"
+msgstr ""
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "{appid} from {path} is not a valid Android application ID!"
-msgstr "¡{appid} de {path} no es un identificador (ID) de aplicación Android válido!"
+msgstr ""
 
 #: ../fdroidserver/metadata.py ../fdroidserver/update.py
 #, python-brace-format
 msgid "{appid} from {path} is not a valid Java Package Name!"
-msgstr "¡{appid} de {path} no es un nombre de paquete Java válido!"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{appid} has both APKs and files: {files}"
-msgstr "{appid} tiene tanto APKs como archivos: {files}"
+msgstr ""
 
 #: ../fdroidserver/mirror.py
 #, python-brace-format
 msgid "{appid} is missing {name}"
-msgstr "{appid} no tiene {name}"
+msgstr ""
 
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "{appid}: Unknown extlib {path} in build '{versionName}'"
-msgstr "{appid}: extlib {path} desconocido en la compilación '{versionName}'"
+msgstr ""
 
 #: ../fdroidserver/scanner.py
 #, python-brace-format
 msgid "{appid}: no builds specified, running on current source state"
-msgstr "{appid}: no se ha especificado compilación, ejecutando sobre el estado actual del código fuente"
+msgstr ""
 
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "{appid}: {field} must be a '{type}', but it is a '{fieldtype}!'"
-msgstr "¡{appid}: {field} tiene que ser un '{type}' pero es un '{fieldtype}!'"
+msgstr ""
 
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "{appid}: {field} must be a '{type}', but it is a '{fieldtype}'!"
-msgstr "¡{appid}: {field} tiene que ser un '{type}' pero es un '{fieldtype}'!"
+msgstr ""
 
 #: ../fdroidserver/metadata.py
 #, python-brace-format
 msgid "{build_flag} must be an integer, found: {value}"
-msgstr "{build_flag} tiene que ser un entero pero se ha encontrado: {value}"
+msgstr ""
 
 #: ../fdroidserver/metadata.py
 #, python-brace-format
-msgid "{build_flag} must be list or string, found: {value}"
-msgstr "{build_flag} debe ser una lista o una cadena, encontrada: {value}"
+msgid "{field} not terminated in {name}"
+msgstr ""
 
 #: ../fdroidserver/metadata.py
 #, python-brace-format
 msgid "{file} is blank or corrupt!"
-msgstr "¡{file} está vacío o corrupto!"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{name} \"{section}/icons/{path}\" does not exist! Check \"config.yml\"."
-msgstr "¡{name} \"{section}/icons/{path}\" no existe! Corrijalo en config.yml."
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{path1} is a duplicate of {path2}, remove one!"
 msgstr ""
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/update.py
+#, python-brace-format
+msgid "{name} \"{path}\" does not exist! Correct it in config.py."
+msgstr ""
+
+#: ../fdroidserver/import.py
 #, python-brace-format
 msgid "{path} already exists, ignoring import results!"
-msgstr "¡{path} ya existe, ignorando resultados de importaciones!"
+msgstr ""
 
 #: ../fdroidserver/nightly.py
 #, python-brace-format
 msgid "{path} does not exist!  Create it by running:"
-msgstr "¡{path} no existe! Créela ejecutando:"
+msgstr ""
 
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "{path} has bad file signature \"{pattern}\", possible Janus exploit!"
-msgstr "¡{path} tiene una firma de fichero \"{pattern}\" mala, posible exploit Janus!"
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "{path} has been flagged by virustotal {count} times:"
-msgstr "{path} ha sido marcado por virustotal {count} veces:"
-
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "{path} has the wrong fingerprint ({fingerprint})!"
-msgstr "¡{path} tiene la huella incorrecta ({fingerprint})!"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "{path} is not \"key: value\" dict, but a {datatype}!"
-msgstr "¡{path} no es un dict \"clave: valor\", sino un {datatype}!"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "{path} is not a standard config file!"
-msgstr "¡{path} no es un archivo de configuración estándar!"
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "{path} is not list, but a {datatype}!"
-msgstr "¡{path} no es una lista, sino un {datatype}!"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "{path} is not {expected_type}, but a {datatype}!"
-msgstr "¡{path} no es {expected_type}, sino un {datatype}!"
+msgstr ""
 
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "{path} is zero size!"
-msgstr "¡{path} está vacío!"
+msgstr ""
 
 #: ../fdroidserver/deploy.py
 #, python-brace-format
 msgid "{path} more than 200MB, manually upload: {url}"
-msgstr "{path} mayor de 200MB, subir manualmente: {url}"
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "{path}: \"{code}\" is not a valid ISO_3166-1 alpha-2 country code!"
-msgstr "¡{path}: \"{code}\" no es un código de país ISO_3166-1 alpha-2 válido!"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{path}: {error}"
-msgstr "{path}: {error}"
+msgstr ""
 
 #: ../fdroidserver/mirror.py
 #, python-brace-format
 msgid "{url} does not end with \"fdroid\", check the URL path!"
-msgstr "¡{url} no termina en \"fdroid\", verifique la URL!"
+msgstr ""
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/common.py
 #, python-brace-format
 msgid "{url} does not start with \"http\"!"
-msgstr "¡{url} no empieza por \"http\"!"
+msgstr ""
 
 #: ../fdroidserver/build.py
 msgid "{} build failed"
 msgid_plural "{} builds failed"
-msgstr[0] "compilación fallida {}"
-msgstr[1] "compilaciones fallidas {}"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../fdroidserver/build.py
 msgid "{} build succeeded"
 msgid_plural "{} builds succeeded"
-msgstr[0] "compilación con éxito {}"
-msgstr[1] "compilaciones con éxito {}"
+msgstr[0] ""
+msgstr[1] ""
+
+#, fuzzy
+#~ msgid "Add PGP signatures for packages in repo using GnuPG"
+#~ msgstr "Añadir las firmas gpg para los paquetes en el repositorio"
+
+#~ msgid "Add gpg signatures for packages in repo"
+#~ msgstr "Añadir las firmas gpg para los paquetes en el repositorio"
+
+#~ msgid "Cannot find a packageName for {path}!"
+#~ msgstr "¡No se puede encontrar un packageName para {path}!"
+
+#~ msgid "Cannot find an appid for {path}!"
+#~ msgstr "¡No se puede encontrar un appid para {path}!"
+
+#~ msgid "Clean update - don't uses caches, reprocess all apks"
+#~ msgstr "Actualización limpia, no usa caché, reprocesa todas las aplicaciones  APK"
+
+#~ msgid "Interactively ask about things that need updating."
+#~ msgstr "Pregunte de forma interactiva sobre temas que necesitan una actualización."
+
+#~ msgid "Specify editor to use in interactive mode. Default "
+#~ msgstr "Especifique el editor para utilizar en modo interactivo. Predeterminado "
+
+#~ msgid "Specify editor to use in interactive mode. Default %s"
+#~ msgstr "Especifique el editor para utilizar en modo interactivo. Predeterminado %s"
+
+#~ msgid "Specify editor to use in interactive mode. Default is {path}"
+#~ msgstr "Especifique el editor para utilizar en modo interactivo. Por defecto es {path}"
+
+#~ msgid "app-id in the form APPID"
+#~ msgstr "APP-ID en el formato APPID"
+
+#~ msgid "app-id to check for updates"
+#~ msgstr "APP-ID para buscar actualizaciones"
+
+#~ msgid "app-id with optional versionCode in the form APPID[:VERCODE]"
+#~ msgstr "APP-ID con código de versión opcional en la forma APPID [: VERCODE]"
+
+#~ msgid "app-id with optional versioncode in the form APPID[:VERCODE]"
+#~ msgstr "APP-ID con código de versión opcional en la forma APPID [: VERCODE]"
diff --git a/locale/es_AR/LC_MESSAGES/fdroidserver.po b/locale/es_AR/LC_MESSAGES/fdroidserver.po
index a15ddd81..49b4d592 100644
--- a/locale/es_AR/LC_MESSAGES/fdroidserver.po
+++ b/locale/es_AR/LC_MESSAGES/fdroidserver.po
@@ -3,23 +3,36 @@
 # This file is distributed under the same license as the PACKAGE package.
 # Hans-Christoph Steiner <hans@guardianproject.info>, 2020.
 # riveravaldez <riveravaldezmail@gmail.com>, 2020.
-# Eduardo Rodrigues <edu.rodrigues2580@gmail.com>, 2020.
-# Lilian Sosa <liliancsosa@gmail.com>, 2021.
-# Germe the fur star <FOSSgerme.deb@tuta.io>, 2021.
 msgid ""
 msgstr ""
 "Project-Id-Version: fdroidserver 0.9\n"
 "Report-Msgid-Bugs-To: https://gitlab.com/fdroid/fdroidserver/issues\n"
-"POT-Creation-Date: 2025-06-25 09:52+0200\n"
-"PO-Revision-Date: 2021-04-10 21:26+0000\n"
-"Last-Translator: Germe the fur star <FOSSgerme.deb@tuta.io>\n"
+"POT-Creation-Date: 2020-10-21 18:05+0200\n"
+"PO-Revision-Date: 2020-11-10 16:20+0000\n"
+"Last-Translator: Hans-Christoph Steiner <hans@guardianproject.info>\n"
 "Language-Team: Spanish (Argentina) <https://hosted.weblate.org/projects/f-droid/fdroidserver/es_AR/>\n"
 "Language: es_AR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 4.6-dev\n"
+"X-Generator: Weblate 4.4-dev\n"
+
+#: ../fdroidserver/common.py
+msgid ""
+"\n"
+"        This is a repository of apps to be used with FDroid. Applications in this\n"
+"        repository are either official binaries built by the original application\n"
+"        developers, or are binaries built from source by f-droid.org using the\n"
+"        tools on https://gitlab.com/fdroid.\n"
+"        "
+msgstr ""
+
+#: ../fdroidserver/nightly.py
+msgid ""
+"\n"
+"SSH Public Key to be used as Deploy Key:"
+msgstr ""
 
 #: ../fdroidserver/nightly.py
 msgid ""
@@ -39,26 +52,22 @@ msgstr ""
 msgid "\"%s/\" has no matching metadata file!"
 msgstr ""
 
-#: ../fdroidserver/index.py
-msgid "\"isPrimary\" key should not be added to mirrors!"
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, fuzzy, python-brace-format
-msgid "\"local_copy_dir\" {path} does not exist!"
-msgstr "directorio_copia_local ¡tiene que ser una ruta absoluta!"
-
 #: ../fdroidserver/install.py
 #, python-brace-format
 msgid "\"{apkfilename}\" is already installed on {dev}."
 msgstr ""
 
+#: ../fdroidserver/update.py
+#, python-brace-format
+msgid "\"{path}\" contains outdated {name} ({version})"
+msgstr ""
+
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "\"{path}\" contains recent {name} ({version})"
 msgstr ""
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "\"{path}\" exists but s3cmd is not installed!"
 msgstr ""
@@ -68,24 +77,33 @@ msgstr ""
 msgid "\"{path}\" is not a supported file format (use: metadata/*.yml)"
 msgstr ""
 
-#: ../fdroidserver/update.py
+#: ../fdroidserver/metadata.py
 #, python-brace-format
-msgid "\"{path}\" is signed by a key that is not allowed:"
+msgid "\"{path}\" is not an accepted format, convert to: {formats}"
 msgstr ""
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/common.py
 #, python-brace-format
 msgid "\"{url}\" is not a valid URL!"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, python-format
+msgid "%(option)s option requires %(number)d argument"
+msgid_plural "%(option)s option requires %(number)d arguments"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../fdroidserver/mirror.py
+#, python-format
+msgid "%(prog)s [options] url"
+msgstr ""
+
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "%(prog)s: error: %(message)s\n"
-msgstr "%(prog)s: error: %(message)s\n"
-
-#: ../fdroidserver/publish.py
-#, python-format
-msgid "%d APKs failed to be signed or verified!"
 msgstr ""
 
 #: ../fdroidserver/scanner.py
@@ -93,19 +111,15 @@ msgstr ""
 msgid "%d problems found"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "%r is not callable"
-msgstr "no se puede llamar a %r"
-
-#: ../fdroidserver/signindex.py
-#, python-format
-msgid "%s did not produce a dict!"
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "%prog [options]"
 msgstr ""
 
-#: ../fdroidserver/signindex.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
-msgid "%s has bad SHA-256: %s"
+msgid "%r is not callable"
 msgstr ""
 
 #: ../fdroidserver/lint.py
@@ -113,32 +127,47 @@ msgstr ""
 msgid "%s is not an accepted build field"
 msgstr ""
 
-#: ../fdroidserver/common.py
-msgid "'keypass' not found in config.yml!"
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, python-format
+msgid "%s option does not take a value"
+msgstr ""
+
+#: ../fdroidserver/index.py ../fdroidserver/common.py
+msgid "'keypass' not found in config.py!"
 msgstr ""
 
 #: ../fdroidserver/common.py
 msgid "'keystore' is NONE and 'smartcardoptions' is blank!"
 msgstr ""
 
-#: ../fdroidserver/common.py
-msgid "'keystore' not found in config.yml!"
+#: ../fdroidserver/index.py ../fdroidserver/common.py
+msgid "'keystore' not found in config.py!"
 msgstr ""
 
-#: ../fdroidserver/common.py
-msgid "'keystorepass' not found in config.yml!"
+#: ../fdroidserver/index.py ../fdroidserver/common.py
+msgid "'keystorepass' not found in config.py!"
 msgstr ""
 
-#: ../fdroidserver/common.py
-msgid "'repo_keyalias' not found in config.yml!"
+#: ../fdroidserver/index.py ../fdroidserver/common.py
+msgid "'repo_keyalias' not found in config.py!"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "'required' is an invalid argument for positionals"
 msgstr ""
 
 #: ../fdroidserver/common.py
-msgid "'sdk_path' not set in config.yml!"
+msgid "'sdk_path' not set in 'config.py'!"
+msgstr ""
+
+#. Translators: "build-tools" is the file name of a package from
+#. Google, it is part of the Android SDK. So it probably shouldn't be
+#. translated or transliterated.
+#: ../fdroidserver/common.py
+#, python-brace-format
+msgid "'{aapt}' is too old, fdroid requires build-tools-23.0.0 or newer!"
 msgstr ""
 
 #: ../fdroidserver/common.py
@@ -146,6 +175,21 @@ msgstr ""
 msgid "'{aapt}' is too old, fdroid requires build-tools-{version} or newer!"
 msgstr ""
 
+#: ../fdroidserver/install.py
+#, python-brace-format
+msgid "'{apkfilename}' is already installed on {dev}."
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "'{field}' in {linedesc} is obsolete, see docs for current fields:"
+msgstr ""
+
+#: ../fdroidserver/common.py
+#, python-brace-format
+msgid "'{field}' will be in random order! Use () or [] brackets if order is important!"
+msgstr ""
+
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "'{path}' failed to execute!"
@@ -153,31 +197,22 @@ msgstr ""
 
 #: ../fdroidserver/metadata.py
 #, python-brace-format
-msgid "'{path}' has invalid format, it should be a dictionary!"
-msgstr ""
-
-#: ../fdroidserver/lint.py ../fdroidserver/metadata.py
-#, python-brace-format
 msgid "'{value}' is not a valid {field} in {appid}. Regex pattern: {pattern}"
 msgstr ""
 
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "'{value}' is not a valid {field}, should be {pattern}"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "--merge-request only runs on a single appid!"
-msgstr ""
-
 #: ../fdroidserver/checkupdates.py
 #, python-brace-format
 msgid "...checkupdate failed for {appid} : {error}"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid ".__call__() not defined"
-msgstr ".__call__() no definida"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+msgid ".fdroid.txt is not supported!  Convert to .fdroid.yml or .fdroid.json."
+msgstr ""
 
 #: ../fdroidserver/lint.py
 msgid "/issues is missing"
@@ -187,16 +222,15 @@ msgstr ""
 msgid "A URL is required as an argument!"
 msgstr ""
 
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "APK signatures have different certificates in {path}:"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 #, fuzzy
 msgid "Add PGP signatures using GnuPG for packages in repo"
 msgstr "Agregar firmas GPG a paquetes en el repositorio"
 
+#: ../fdroid ../fdroidserver/__main__.py
+msgid "Add a new application from its source code"
+msgstr "Agregar una aplicación nueva desde su código fuente"
+
 #: ../fdroidserver/update.py
 #, fuzzy
 msgid "Add a repo signing key to an unsigned repo"
@@ -216,11 +250,7 @@ msgstr ""
 msgid "Alias of the repo signing key in the keystore"
 msgstr "Alias de la llave de firmado del repositorio en el almacén de llaves"
 
-#: ../fdroidserver/build.py
-msgid "AllowedAPKSigningKeys missing but reference binary supplied"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "Allows a different revision (or git branch) to be specified for the initial import"
 msgstr "Permitir que una revision diferente (o rama de git) sea especificada en la importación inicial"
 
@@ -244,41 +274,40 @@ msgstr ""
 msgid "Android DEX code"
 msgstr ""
 
-#: ../fdroidserver/init.py
+#: ../fdroidserver/common.py ../fdroidserver/build.py
 #, python-brace-format
-msgid "Android SDK not found at {path}!"
+msgid "Android SDK '{path}' does not have '{dirname}' installed!"
+msgstr ""
+
+#: ../fdroidserver/common.py
+msgid "Android SDK not found!"
 msgstr ""
 
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "Android SDK path '{path}' does not exist!"
-msgstr "No existe ruta '{path}' Android SDK!"
+msgstr ""
 
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "Android SDK path '{path}' is not a directory!"
 msgstr ""
 
+#. Translators: "build-tools" is the file name of a package from
+#. Google, it is part of the Android SDK. So it probably shouldn't be
+#. translated or transliterated.
 #: ../fdroidserver/common.py
-#, fuzzy, python-brace-format
-msgid "Android SDK tool {cmd} not found!"
-msgstr "No se encontró Android SDK!"
-
-#: ../fdroidserver/lint.py
-msgid "App has Binaries but does not have corresponding AllowedAPKSigningKeys to pin certificate."
+#, python-brace-format
+msgid "Android build-tools path '{path}' does not exist!"
 msgstr ""
 
-#: ../fdroidserver/lint.py
-msgid "App has NoSourceSince or ArchivePolicy \"0 versions\" or 0 but AutoUpdateMode or UpdateCheckMode are not None"
+#: ../fdroidserver/update.py
+msgid "AndroidManifest.xml has no date"
 msgstr ""
 
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "App is in '{repo}' but has a link to {url}"
-msgstr "La aplicación está en '{repo}' pero no tiene enlace a {url}"
-
-#: ../fdroidserver/lint.py
-msgid "App version has binary but does not have corresponding AllowedAPKSigningKeys to pin certificate."
 msgstr ""
 
 #: ../fdroidserver/lint.py
@@ -288,33 +317,17 @@ msgstr ""
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Archiving {apkfilename} with invalid signature!"
-msgstr "Archivando {apkfilename} con una firma invalida!"
-
-#: ../fdroidserver/lint.py
-msgid "AutoUpdateMode with UpdateCheckMode: HTTP must have a pattern."
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "Automatic no to all prompts."
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "Automatic yes to all prompts."
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "Bad entry type \"{mirrortype}\" in mirrors config: {mirror}"
 msgstr ""
 
 #: ../fdroidserver/mirror.py
 msgid "Base URL to mirror, can include the index signing key using the query string: ?fingerprint="
 msgstr ""
 
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "Branch '{branch}' used as commit in build '{versionName}'"
-msgstr "Rama {branch} fue publicada en la versión {versionName}"
+msgstr ""
 
 #: ../fdroidserver/lint.py
 #, python-brace-format
@@ -326,7 +339,7 @@ msgstr ""
 msgid "Broken symlink: {path}"
 msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Build a package from source"
 msgstr "Compilar una paquete desde su código"
 
@@ -346,48 +359,57 @@ msgstr ""
 msgid "Build only the latest version of each package"
 msgstr "Empaquetado con la ultima versión de cada paquete"
 
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Build should have comma-separated versionName and versionCode, not \"{value}\", in {linedesc}"
+msgstr ""
+
 #: ../fdroidserver/init.py
 #, python-format
 msgid "Built repo based in \"%s\" with this config:"
-msgstr "Empaquetar repositorio basado en %s con esta configuración:"
-
-#: ../fdroidserver/checkupdates.py
-msgid "Can't auto-update app with no CurrentVersionCode"
 msgstr ""
 
 #: ../fdroidserver/build.py
 msgid "Can't build due to {} error while scanning"
 msgid_plural "Can't build due to {} errors while scanning"
-msgstr[0] "No se pudo empaquetar debido al {} error mientras se escaneaba"
-msgstr[1] "No se pudo empaquetar debido a los {} errores mientras se escaneaba"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../fdroidserver/common.py
-#, fuzzy, python-brace-format
-msgid "Cannot read {path}: {error}"
-msgstr "No se puede reescribir \"{path}\""
+#: ../fdroidserver/vmtools.py
+#, python-brace-format
+msgid "Cannot read \"{path}\"!"
+msgstr ""
+
+#. Translators: https://developer.android.com/studio/build/application-id
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Cannot resolve application ID {appid}"
+msgstr ""
 
 #: ../fdroidserver/rewritemeta.py
 #, python-brace-format
 msgid "Cannot rewrite \"{path}\""
-msgstr "No se puede reescribir \"{path}\""
+msgstr ""
+
+#: ../fdroidserver/rewritemeta.py
+msgid "Cannot use --list and --to at the same time"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Cannot write \"{path}\", not an accepted format, use: {formats}"
+msgstr ""
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
 #: ../fdroidserver/lint.py
 #, python-format
 msgid "Categories '%s' is not valid"
 msgstr ""
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
 #: ../fdroidserver/lint.py
 msgid "Categories are not set"
 msgstr ""
 
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "Category \"{category}\" defined but not used for any apps!"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Check for updates to applications"
 msgstr "Buscar actualizaciones de las aplicaciones"
 
@@ -396,20 +418,29 @@ msgstr "Buscar actualizaciones de las aplicaciones"
 msgid "Checking archiving for {appid} - apks:{integer}, keepversions:{keep}, archapks:{arch}"
 msgstr ""
 
+#: ../fdroidserver/dscanner.py
+msgid "Clean after all scans have finished"
+msgstr "Limpiar luego de que todos los escaneos hayan terminado"
+
+#: ../fdroidserver/dscanner.py
+msgid "Clean before the scans start and rebuild the container"
+msgstr "Limpiar antes de que el escaneo comience y reconstruir el contenedor"
+
+#: ../fdroidserver/dscanner.py
+msgid "Clean up all containers and then exit"
+msgstr "Limpiar todos los contenedores y salir"
+
 #: ../fdroidserver/update.py
+#, fuzzy
 msgid "Clean update - don't uses caches, reprocess all APKs"
 msgstr "Limpiar actualización - no utiliza cachés, reprocesa todos los APK's"
 
-#: ../fdroidserver/common.py
-msgid "Color the log output"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "Comma separated list of categories."
 msgstr "Lista de categorías separadas por coma."
 
-#: ../fdroidserver/__main__.py
-#, python-format
+#: ../fdroid ../fdroidserver/__main__.py
+#, c-format, python-format
 msgid "Command '%s' not recognised.\n"
 msgstr "No se reconoce el comando \"%s\".\n"
 
@@ -417,15 +448,6 @@ msgstr "No se reconoce el comando \"%s\".\n"
 msgid "Commit changes"
 msgstr "Cometer cambios"
 
-#: ../fdroidserver/checkupdates.py
-msgid "Commit changes, push, then make a merge request"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Conflicting \"{field}\" definitions between .yml and localized files:"
-msgstr ""
-
 #: ../fdroidserver/__main__.py
 msgid "Conflicting arguments: '--verbose' and '--quiet' can not be specified at the same time."
 msgstr ""
@@ -435,14 +457,12 @@ msgstr ""
 msgid "Could not find '{command}' on your system"
 msgstr ""
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 #, fuzzy
 msgid "Could not find latest version code"
 msgstr "Empaquetado con la ultima versión de cada paquete"
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 #, fuzzy
 msgid "Could not find latest version name"
 msgstr "Empaquetado con la ultima versión de cada paquete"
@@ -453,8 +473,7 @@ msgid "Could not find {path} to remove it"
 msgstr ""
 
 #: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Could not open APK {path} for analysis: "
+msgid "Could not open apk file for analysis"
 msgstr ""
 
 #: ../fdroidserver/common.py
@@ -462,18 +481,23 @@ msgstr ""
 msgid "Could not parse size \"{size}\", wrong type \"{type}\""
 msgstr ""
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/import_subcommand.py
+#. Translators: https://developer.android.com/studio/build/application-id
+#: ../fdroidserver/import.py
 #, fuzzy
 msgid "Couldn't find Application ID"
 msgstr "Construir todas las aplicaciones disponibles"
 
-#: ../fdroidserver/checkupdates.py
-#, fuzzy
-msgid "Couldn't find any version information"
-msgstr "Empaquetado con la ultima versión de cada paquete"
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
+#: ../fdroidserver/import.py
+msgid "Couldn't find latest version code"
+msgstr ""
 
-#: ../fdroidserver/checkupdates.py
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
+#: ../fdroidserver/import.py
+msgid "Couldn't find latest version name"
+msgstr ""
+
+#: ../fdroidserver/import.py
 msgid "Couldn't find package ID"
 msgstr ""
 
@@ -481,26 +505,30 @@ msgstr ""
 msgid "Cowardily refusing to overwrite existing signing key setup!"
 msgstr ""
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/update.py
+#, fuzzy
+msgid "Create a repo signing key in a keystore"
+msgstr "Crear una llave de firmado en un almacén de llaves para el repositorio"
+
+#: ../fdroidserver/update.py
+msgid "Create skeleton metadata files that are missing"
+msgstr "Crear plantilla de metadatos de los archivos faltantes"
+
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Created new container \"{name}\""
 msgstr ""
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Creating \"{path}\" for configuring s3cmd."
 msgstr ""
 
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Creating empty {config_file}"
-msgstr ""
-
 #: ../fdroidserver/publish.py
 msgid "Creating log directory"
 msgstr ""
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Creating new S3 bucket: {url}"
 msgstr ""
@@ -513,7 +541,8 @@ msgstr ""
 msgid "Creating signed index with this key (SHA256):"
 msgstr ""
 
-#: ../fdroidserver/publish.py ../fdroidserver/verify.py
+#: ../fdroidserver/import.py ../fdroidserver/verify.py
+#: ../fdroidserver/publish.py
 msgid "Creating temporary directory"
 msgstr ""
 
@@ -559,21 +588,16 @@ msgid "Description has a duplicate line"
 msgstr ""
 
 #: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Description of length {length} is over the {limit} char limit"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Did you mean config/{name}.yml?"
+#, python-format
+msgid "Description has a list (%s) but it isn't bulleted (*) nor numbered (#)"
 msgstr ""
 
 #: ../fdroidserver/lint.py
 #, python-brace-format
-msgid "Did you mean {code}?"
+msgid "Description of length {length} is over the {limit} char limit"
 msgstr ""
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "Do not add 'disable:' to the generated build entries"
 msgstr ""
 
@@ -598,22 +622,28 @@ msgstr ""
 msgid "Don't create a source tarball, useful when testing a build"
 msgstr "No crear el tarbal de codigo fuente, útil cuando se esta probando la construcción"
 
+#: ../fdroidserver/stats.py
+#, fuzzy
+msgid "Don't do anything logs-related"
+msgstr "No hacer nada que refiera a los registros"
+
 #: ../fdroidserver/build.py
 msgid "Don't refresh the repository, useful when testing a build with no internet connection"
 msgstr "No refrescar el repositorio, útil cuando se esta probando la construcción y no se tiene conexión a Internet"
 
 #: ../fdroidserver/deploy.py ../fdroidserver/nightly.py
+#: ../fdroidserver/upload.py
 msgid "Don't use rsync checksums"
 msgstr "No usar sumas de validación de rsync"
 
-#: ../fdroidserver/install.py
-msgid "Download F-Droid.apk using mirrors that leak less to the network"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Download complete mirrors of small repos"
 msgstr ""
 
+#: ../fdroidserver/stats.py
+msgid "Download logs we don't have"
+msgstr "Descargar los registros que no faltan"
+
 #: ../fdroidserver/common.py
 msgid "Downloading the repository already failed once, not trying again."
 msgstr ""
@@ -625,12 +655,7 @@ msgstr ""
 
 #: ../fdroidserver/metadata.py
 #, python-brace-format
-msgid "Duplicate Anti-Feature declaration at {path} was ignored!"
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-format
-msgid "Duplicate entry \"%s\" in mirrors config!"
+msgid "Duplicate build recipe found for versionCode {versionCode} in {linedesc}"
 msgstr ""
 
 #: ../fdroidserver/lint.py
@@ -638,42 +663,27 @@ msgstr ""
 msgid "Duplicate link in '{field}': {url}"
 msgstr ""
 
-#: ../fdroidserver/common.py
-#, python-format
-msgid "ERROR: %(message)s"
-msgstr ""
+#: ../fdroid
+msgid "Dynamically scan APKs post build"
+msgstr "Escanear dinámicamente APKs después de compilar"
 
 #: ../fdroidserver/__main__.py
 msgid "ERROR: The \"server\" subcommand has been removed, use \"deploy\"!"
 msgstr ""
 
+#: ../fdroidserver/mirror.py
+msgid ""
+"ERROR: this command should never be used to mirror f-droid.org!\n"
+"A full mirror of f-droid.org requires more than 200GB."
+msgstr ""
+
 #: ../fdroidserver/nightly.py
 msgid "ERROR: unsupported CI type, patches welcome!"
 msgstr ""
 
-#: ../fdroidserver/nightly.py
-#, python-format
-msgid "ERROR: unsupported git host \"%s\", patches welcome!"
-msgstr ""
-
-#: ../fdroidserver/lint.py
+#: ../fdroidserver/metadata.py
 #, python-brace-format
-msgid "ERROR: {key} in {path} is not \"archive\" or \"repo\"!"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "ERROR: {key} not a valid key!"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "ERROR: {key}'s value should be of type {t}!"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "ERROR: {key}:{subkey} in {path} is not in allowed keys: {allowed_keys}!"
+msgid "Empty build flag at {linedesc}"
 msgstr ""
 
 #: ../fdroidserver/__main__.py
@@ -688,40 +698,20 @@ msgid ""
 "> "
 msgstr ""
 
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Environment variable {var} from {configname} is not set!"
+#: ../fdroidserver/deploy.py ../fdroidserver/checkupdates.py
+#: ../fdroidserver/upload.py
+#, python-format
+msgid "Error while attempting to publish log: %s"
 msgstr ""
 
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Environment variable {{env: {var}}} is not set!"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "Error deploying 'github_releases', {} not present. (You might need to run `fdroid update` first.)"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py ../fdroidserver/common.py
 msgid "Error while getting repo address"
 msgstr ""
 
-#: ../fdroidserver/scanner.py
-msgid "Exit with a non-zero code if problems were found"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Extract application metadata from a source repository"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Extract signatures from APKs"
 msgstr ""
 
-#: ../fdroidserver/install.py
-msgid "F-Droid.apk could not be downloaded from any known source!"
-msgstr ""
-
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Failed copying {path}: {error}"
@@ -742,23 +732,28 @@ msgstr ""
 msgid "Failed resizing {path}: {error}"
 msgstr ""
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/publish.py
+#, fuzzy
+msgid "Failed to align application"
+msgstr "Construir todas las aplicaciones disponibles"
+
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Failed to create S3 bucket: {url}"
 msgstr ""
 
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Failed to get APK information, deleting {path}"
+#: ../fdroidserver/common.py
+msgid "Failed to get APK manifest information"
 msgstr ""
 
 #: ../fdroidserver/update.py
 #, python-brace-format
-msgid "Failed to get APK information, skipping {path}"
+msgid "Failed to get apk information, deleting {path}"
 msgstr ""
 
 #: ../fdroidserver/update.py
-msgid "Failed to get APK signing key fingerprint"
+#, python-brace-format
+msgid "Failed to get apk information, skipping {path}"
 msgstr ""
 
 #: ../fdroidserver/install.py
@@ -766,10 +761,15 @@ msgstr ""
 msgid "Failed to install '{apkfilename}' on {dev}: {error}"
 msgstr ""
 
-#: ../fdroidserver/common.py
+#: ../fdroidserver/publish.py ../fdroidserver/common.py
 msgid "Failed to sign application"
 msgstr ""
 
+#: ../fdroidserver/common.py
+#, fuzzy
+msgid "Failed to zipalign application"
+msgstr "Construir todas las aplicaciones disponibles"
+
 #: ../fdroidserver/build.py
 #, python-brace-format
 msgid "Fetched buildserverid from VM: {buildserverid}"
@@ -785,12 +785,21 @@ msgstr ""
 msgid "File disappeared while processing it: {path}"
 msgstr ""
 
-#: ../fdroidserver/build.py ../fdroidserver/install.py
-#: ../fdroidserver/rewritemeta.py ../fdroidserver/scanner.py
-#: ../fdroidserver/update.py
+#: ../fdroidserver/verify.py ../fdroidserver/stats.py ../fdroidserver/update.py
+#: ../fdroidserver/rewritemeta.py ../fdroidserver/build.py
+#: ../fdroidserver/checkupdates.py ../fdroidserver/scanner.py
+#: ../fdroidserver/install.py
 msgid "Finished"
 msgstr ""
 
+#: ../fdroidserver/lint.py
+msgid "Flattr donation methods belong in the FlattrID flag"
+msgstr ""
+
+#: ../fdroidserver/lint.py
+msgid "Flattr donation methods belong in the FlattrID: field"
+msgstr ""
+
 #: ../fdroidserver/lint.py
 msgid "Forbidden HTML tags"
 msgstr ""
@@ -822,6 +831,7 @@ msgstr ""
 msgid "Found invalid appids in arguments"
 msgstr ""
 
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
 #: ../fdroidserver/common.py
 msgid "Found invalid versionCodes for some apps"
 msgstr ""
@@ -831,10 +841,6 @@ msgstr ""
 msgid "Found multiple JAR Signature Block Files in {path}"
 msgstr ""
 
-#: ../fdroidserver/common.py
-msgid "Found multiple Signer Certificates!"
-msgstr ""
-
 #: ../fdroidserver/metadata.py
 #, python-brace-format
 msgid "Found multiple metadata files for {appid}"
@@ -844,6 +850,11 @@ msgstr ""
 msgid "Found multiple signing certificates for repository."
 msgstr ""
 
+#: ../fdroidserver/update.py
+#, python-brace-format
+msgid "Found multiple signing certificates in {path}"
+msgstr ""
+
 #: ../fdroidserver/index.py
 msgid "Found no signing certificates for repository."
 msgstr ""
@@ -858,16 +869,6 @@ msgstr ""
 msgid "Found {apkfilename} at {url}"
 msgstr ""
 
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Found {count} problems in {filename}"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Found {count} warnings in {filename}"
-msgstr ""
-
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Generated skeleton metadata for {appid}"
@@ -886,21 +887,19 @@ msgstr ""
 msgid "Git fetch failed"
 msgstr ""
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
+#: ../fdroidserver/common.py
+msgid "Git remote set-head failed"
+msgstr ""
+
 #: ../fdroidserver/common.py
 #, python-format
 msgid "Git remote set-head failed: \"%s\""
 msgstr ""
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
 #: ../fdroidserver/common.py
 msgid "Git reset failed"
 msgstr ""
 
-#: ../fdroidserver/common.py
-msgid "Git submodule deinit failed"
-msgstr ""
-
 #: ../fdroidserver/common.py
 msgid "Git submodule sync failed"
 msgstr ""
@@ -932,16 +931,6 @@ msgstr ""
 msgid "Ignoring FUNDING.yml entry longer than 2048: %s"
 msgstr ""
 
-#: ../fdroidserver/update.py
-#, python-format
-msgid "Ignoring bad element in manifest: %s"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Ignoring deprecated {oldfile}, use {newfile}!"
-msgstr ""
-
 #: ../fdroidserver/index.py
 msgid "Ignoring package without metadata: "
 msgstr ""
@@ -951,6 +940,11 @@ msgstr ""
 msgid "Ignoring stale cache data for {apkfilename}"
 msgstr ""
 
+#: ../fdroidserver/rewritemeta.py
+#, python-brace-format
+msgid "Ignoring {ext} file at '{path}'"
+msgstr ""
+
 #: ../fdroidserver/update.py
 msgid "Include APKs that are signed with disabled algorithms like MD5"
 msgstr ""
@@ -967,16 +961,6 @@ msgstr ""
 msgid "Include the source tarballs in the mirror"
 msgstr ""
 
-#: ../fdroidserver/metadata.py
-#, python-format
-msgid "Including metadata from %s@%s"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Including metadata from {path}"
-msgstr ""
-
 #: ../fdroidserver/common.py
 msgid "Initialising submodules"
 msgstr ""
@@ -985,7 +969,7 @@ msgstr ""
 msgid "Install all signed applications available"
 msgstr "Instalar todas las aplicaciones firmadas disponibles"
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Install built packages on devices"
 msgstr "Instalar paquetes compilados en dispositivos"
 
@@ -994,12 +978,22 @@ msgstr "Instalar paquetes compilados en dispositivos"
 msgid "Installing %s..."
 msgstr ""
 
+#: ../fdroidserver/install.py
+#, python-format
+msgid "Installing %s…"
+msgstr ""
+
 #: ../fdroidserver/install.py
 #, python-brace-format
 msgid "Installing '{apkfilename}' on {dev}..."
 msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroidserver/install.py
+#, python-brace-format
+msgid "Installing '{apkfilename}' on {dev}…"
+msgstr ""
+
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Interact with the repo HTTP server"
 msgstr "Interactuar con el servidor HTTP del repositorio"
 
@@ -1007,36 +1001,53 @@ msgstr "Interactuar con el servidor HTTP del repositorio"
 msgid "Invalid APK"
 msgstr ""
 
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "Invalid AutoUpdateMode: {mode}"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "Invalid UpdateCheckMode: {mode}"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
+#: ../fdroidserver/lint.py ../fdroidserver/checkupdates.py
 #, python-brace-format
 msgid "Invalid VercodeOperation: {field}"
 msgstr ""
 
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Invalid VercodeOperation: {invalid_ops}"
-msgstr ""
-
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "Invalid application ID {appid}"
 msgstr ""
 
+#: ../fdroidserver/metadata.py
+#, python-format
+msgid "Invalid boolean '%s'"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Invalid build flag at {line} in {linedesc}"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Invalid build format: {value} in {name}"
+msgstr ""
+
 #: ../fdroidserver/lint.py
 msgid "Invalid bulleted list"
 msgstr ""
 
+#: ../fdroidserver/lint.py
+#, python-format
+msgid "Invalid license tag \"%s\"! Use only tags from https://spdx.org/license-list"
+msgstr ""
+
+#: ../fdroidserver/lint.py
+msgid "Invalid link - use [http://foo.bar Link title] or [http://foo.bar]"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+#, python-format
+msgid "Invalid metadata in %s:%d"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+msgid "Invalid metadata in: "
+msgstr ""
+
 #: ../fdroidserver/common.py
 #, python-format
 msgid "Invalid name for published file: %s"
@@ -1044,7 +1055,7 @@ msgstr ""
 
 #: ../fdroidserver/common.py
 #, python-brace-format
-msgid "Invalid ndk: entry in build: \"{ndk}\""
+msgid "Invalid package name {0}"
 msgstr ""
 
 #: ../fdroidserver/common.py
@@ -1067,6 +1078,11 @@ msgstr ""
 msgid "Invalid srclib metadata: unknown key '{key}' in '{file}'"
 msgstr ""
 
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Invalid versionCode: \"{versionCode}\" is not an integer!"
+msgstr ""
+
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "JAR signature failed to verify: {path}"
@@ -1081,8 +1097,8 @@ msgstr ""
 msgid "Java JAR file"
 msgstr ""
 
-#: ../fdroidserver/mirror.py ../fdroidserver/publish.py
-#: ../fdroidserver/update.py
+#: ../fdroidserver/publish.py ../fdroidserver/update.py
+#: ../fdroidserver/mirror.py
 msgid "Java JDK not found! Install in standard location or set java_paths!"
 msgstr ""
 
@@ -1098,20 +1114,11 @@ msgstr ""
 msgid "Javascript in HTML src attributes"
 msgstr ""
 
-#: ../fdroidserver/build.py
-#, python-brace-format
-msgid "Keeping failed build \"{apkfilename}\""
-msgstr ""
-
 #: ../fdroidserver/init.py
 #, fuzzy
 msgid "Keystore for signing key:\t"
 msgstr "Ruta al almacén de claves para la llave de firmado del repositorio"
 
-#: ../fdroidserver/lint.py
-msgid "Known debug key is used in AllowedAPKSigningKeys: "
-msgstr ""
-
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "Last used commit '{commit}' looks like a tag, but UpdateCheckMode is '{ucm}'"
@@ -1121,9 +1128,12 @@ msgstr ""
 msgid "Liberapay donation methods belong in the Liberapay: field"
 msgstr ""
 
+#: ../fdroidserver/lint.py
+msgid "Liberapay donation methods belong in the LiberapayID flag"
+msgstr ""
+
 #: ../fdroidserver/rewritemeta.py
-#, fuzzy
-msgid "List files that would be reformatted (dry run)"
+msgid "List files that would be reformatted"
 msgstr "Listar archivos que serán reformateados"
 
 #: ../fdroidserver/lint.py
@@ -1142,16 +1152,6 @@ msgstr ""
 msgid "Malformed serverwebroot line:"
 msgstr ""
 
-#: ../fdroidserver/scanner.py
-#, python-format
-msgid "Max recursion depth in ZIP file reached: %s"
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "Mirror config for {url} contains \"isPrimary\" key!"
-msgstr ""
-
 #: ../fdroidserver/mirror.py
 msgid "Mirror the full repo and archive, all file types."
 msgstr ""
@@ -1160,29 +1160,30 @@ msgstr ""
 msgid "Missing output directory"
 msgstr ""
 
-#: ../fdroidserver/metadata.py
-msgid "Moving Anti-Features declarations to localized files:"
-msgstr ""
-
-#: ../fdroidserver/index.py
-msgid "Neither \"repo_pubkey\" nor \"keystorepass\" set in config.yml"
-msgstr ""
-
-#: ../fdroidserver/verify.py
+#: ../fdroidserver/lint.py
 #, python-format
-msgid "No APK for package: %s"
+msgid "Name '%s' is just the auto name - remove it"
+msgstr ""
+
+#: ../fdroidserver/common.py
+msgid "No 'config.py' found, using defaults."
 msgstr ""
 
 #: ../fdroidserver/common.py
 msgid "No Android SDK found!"
 msgstr ""
 
+#: ../fdroidserver/import.py
+msgid "No android or kivy project could be found. Specify --subdir?"
+msgstr ""
+
 #: ../fdroidserver/install.py
 msgid "No attached devices found"
 msgstr ""
 
-#: ../fdroidserver/install.py
-msgid "No devices found for `adb install`! Please plug one in."
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "No commit specified for {versionName} in {linedesc}"
 msgstr ""
 
 #: ../fdroidserver/index.py
@@ -1193,23 +1194,14 @@ msgstr ""
 msgid "No git submodules available"
 msgstr ""
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "No gradle project could be found. Specify --subdir?"
 msgstr ""
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py ../fdroidserver/common.py
 msgid "No information found."
 msgstr ""
 
-#: ../fdroidserver/checkupdates.py
-msgid "No matching tags found"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "No minimum SDK version found in {0}, using default (3)."
-msgstr ""
-
 #: ../fdroidserver/lint.py
 msgid "No need to specify that the app is Free Software"
 msgstr ""
@@ -1219,7 +1211,7 @@ msgid "No need to specify that the app is for Android"
 msgstr ""
 
 #: ../fdroidserver/deploy.py
-msgid "No option set! Edit your config.yml to set at least one of these:"
+msgid "No option set! Edit your config.py to set at least one of these:"
 msgstr ""
 
 #: ../fdroidserver/common.py
@@ -1228,14 +1220,14 @@ msgstr ""
 
 #: ../fdroidserver/install.py
 #, python-format
-msgid "No signed APK available for %s"
+msgid "No signed apk available for %s"
 msgstr ""
 
 #: ../fdroidserver/install.py
 msgid "No signed output directory - nothing to do"
 msgstr ""
 
-#: ../fdroidserver/common.py
+#: ../fdroidserver/update.py ../fdroidserver/common.py
 #, python-brace-format
 msgid "No signing certificates found in {path}"
 msgstr ""
@@ -1245,24 +1237,16 @@ msgstr ""
 msgid "No such package: %s"
 msgstr ""
 
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "No such versionCode {versionCode} for app {appid}"
 msgstr ""
 
-#: ../fdroidserver/checkupdates.py
-msgid "No tags found"
-msgstr ""
-
-#: ../fdroidserver/publish.py ../fdroidserver/verify.py
+#: ../fdroidserver/verify.py ../fdroidserver/publish.py
 msgid "No unsigned directory - nothing to do"
 msgstr ""
 
-#: ../fdroidserver/__main__.py
-#, fuzzy
-msgid "No version information could be found."
-msgstr "¡Se encontró una excepción desconocida!"
-
 #: ../fdroidserver/common.py
 msgid "Not a valid size definition: \"{}\""
 msgstr ""
@@ -1277,9 +1261,10 @@ msgid "Nothing to do for {appid}."
 msgstr ""
 
 #: ../fdroidserver/init.py
-msgid "Now set these in config.yml:"
+msgid "Now set these in config.py:"
 msgstr ""
 
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "OBB file has newer versionCode({integer}) than any APK:"
@@ -1297,28 +1282,23 @@ msgstr ""
 msgid "Offline machine, skipping git mirror generation until `fdroid deploy`"
 msgstr ""
 
-#: ../fdroidserver/deploy.py
-msgid "One of the 'github_releases' config items is missing the 'packageNames' value. skipping ..."
+#: ../fdroidserver/common.py
+#, python-brace-format
+msgid "Old APK signature failed to verify: {path}"
 msgstr ""
 
-#: ../fdroidserver/deploy.py
-msgid "One of the 'github_releases' config items is missing the 'projectUrl' value. skipping ..."
+#: ../fdroid ../fdroidserver/__main__.py
+msgid "Old, deprecated name for fdroid deploy"
 msgstr ""
 
-#: ../fdroidserver/deploy.py
-msgid "One of the 'github_releases' config items is missing the 'token' value. skipping ..."
-msgstr ""
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Only PNG and JPEG are supported for graphics, found: {path}"
 msgstr ""
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/common.py
-msgid "Only accepts a single key \"env\""
-msgstr ""
+#: ../fdroidserver/checkupdates.py
+msgid "Only print differences with the Play Store"
+msgstr "Solo mostrar las diferencias con el Plays Store"
 
 #: ../fdroidserver/checkupdates.py
 msgid "Only process apps with auto-updates"
@@ -1328,6 +1308,11 @@ msgstr "Solo procesar las aplicaciones que cuenten con actualizaciones automatic
 msgid "OpenCollective donation methods belong in the OpenCollective: field"
 msgstr ""
 
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "Options"
+msgstr "Opciones"
+
 #: ../fdroidserver/verify.py
 msgid "Output JSON report to file named after APK."
 msgstr ""
@@ -1336,22 +1321,26 @@ msgstr ""
 msgid "Output JSON to stdout."
 msgstr ""
 
-#: ../fdroidserver/checkupdates.py ../fdroidserver/gpgsign.py
-#: ../fdroidserver/publish.py ../fdroidserver/signindex.py
-#: ../fdroidserver/update.py
+#: ../fdroidserver/gpgsign.py ../fdroidserver/publish.py
+#: ../fdroidserver/update.py ../fdroidserver/signindex.py
+#: ../fdroidserver/checkupdates.py
 msgid "Outputting JSON"
 msgstr ""
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "Overall license of the project."
 msgstr "Licencia general del proyecto."
 
+#: ../fdroidserver/dscanner.py
+msgid "Override path for repo APKs (default: ./repo)"
+msgstr "Sobrescribir la ruta de los repositorios APKs (por defecto ./repo)"
+
 #: ../fdroidserver/index.py
 #, python-brace-format
 msgid "Overriding blank versionName in {apkfilename} from metadata: {version}"
 msgstr ""
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 #, python-brace-format
 msgid "Package \"{appid}\" already exists"
 msgstr ""
@@ -1365,11 +1354,14 @@ msgstr ""
 msgid "Password required with username"
 msgstr ""
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 #, fuzzy
 msgid "Path to main Android project subdirectory, if not in root."
 msgstr "Ruta al subdirectorio del proyecto principal de android, si no es la raíz."
 
+msgid "Path to main android project subdirectory, if not in root."
+msgstr "Ruta al subdirectorio del proyecto principal de android, si no es la raíz."
+
 #: ../fdroidserver/init.py
 msgid "Path to the Android SDK (sometimes set in ANDROID_HOME)"
 msgstr "Ruta al SDK de Android ( a veces cargada en ANDROID_HOME)"
@@ -1382,18 +1374,20 @@ msgstr "Ruta de acceso al repositorio git para usar como registro"
 msgid "Path to the keystore for the repo signing key"
 msgstr "Ruta al almacén de claves para la llave de firmado del repositorio"
 
+#: ../fdroidserver/dscanner.py
+msgid "Prepare Drozer to run a scan"
+msgstr ""
+
+msgid "Prepare drozer to run a scan"
+msgstr "Preparar drozer para que ejecute un escaneo"
+
 #: ../fdroidserver/nightly.py
 msgid "Print the secret variable to the terminal for easy copy/paste"
 msgstr ""
 
-#: ../fdroidserver/install.py
+#: ../fdroidserver/metadata.py
 #, python-brace-format
-msgid "Privacy mode was enabled based on your locale ({country_code})."
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-format
-msgid "Problem with ZIP file: %s, error %s"
+msgid "Problem with description of {appid}: {error}"
 msgstr ""
 
 #: ../fdroidserver/common.py
@@ -1420,7 +1414,11 @@ msgstr ""
 msgid "Produce human-readable XML/JSON for index files"
 msgstr "Producir index.xml legible"
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/update.py
+msgid "Produce human-readable index.xml"
+msgstr "Producir index.xml legible"
+
+#: ../fdroidserver/import.py
 msgid "Project URL to import from."
 msgstr "URL del proyecto a importar."
 
@@ -1432,25 +1430,21 @@ msgstr ""
 msgid "Push the log to this git remote repository"
 msgstr "Subir el registro al repositorio remoto de git"
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Pushing binary transparency log to {url}"
 msgstr "Actualizar el registro de transparencia binario de {url}"
 
-#: ../fdroidserver/deploy.py
-msgid "Pushing to remote server failed!"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Pushing to {url}"
 msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Quickly start a new repository"
 msgstr "Empezar rápidamente un repositorio nuevo"
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Read all the metadata files and exit"
 msgstr "Leer todos los archivos de metadatos y salir"
 
@@ -1461,12 +1455,14 @@ msgstr ""
 
 #: ../fdroidserver/common.py
 #, python-brace-format
-msgid "Reading packageName/versionCode/versionName failed, APK invalid: '{apkfilename}'"
+msgid "Reading minSdkVersion failed: \"{apkfilename}\""
 msgstr ""
 
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
+#. https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
 #: ../fdroidserver/common.py
 #, python-brace-format
-msgid "Reading packageName/versionCode/versionName failed,APK invalid: '{apkfilename}'"
+msgid "Reading packageName/versionCode/versionName failed, APK invalid: '{apkfilename}'"
 msgstr ""
 
 #: ../fdroidserver/update.py
@@ -1474,36 +1470,27 @@ msgstr ""
 msgid "Reading {apkfilename} from cache"
 msgstr ""
 
-#: ../fdroidserver/build.py
-msgid "Refresh and cache scanner rules and signatures from the network"
-msgstr ""
-
-#: ../fdroidserver/publish.py
-#, python-brace-format
-msgid "Refusing to sign '{path}', file exists in both {dir1} and {dir2} folder."
-msgstr ""
-
-#: ../fdroidserver/verify.py
-msgid "Remove source tarball and any APKs if successfully verified."
-msgstr ""
+#: ../fdroidserver/stats.py
+#, fuzzy
+msgid "Recalculate aggregate stats - use when changes have been made that would invalidate old cached data."
+msgstr "Recalcular las agregaciones - usar cuando haya cambios"
 
 #: ../fdroidserver/common.py
 msgid "Removing specified files"
 msgstr ""
 
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Removing {path}\""
-msgstr ""
-
 #: ../fdroidserver/update.py
 msgid "Rename APK files that do not match package.name_123.apk"
 msgstr "Renombrar archivos APK que no corresponden a package.name_123.apk"
 
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "RepoType {type} is deprecated, please switch to git."
-msgstr ""
+#: ../fdroidserver/update.py
+msgid "Report on build data status"
+msgstr "Reportar el estado de la construcción"
+
+#: ../fdroidserver/build.py
+#, fuzzy
+msgid "Reset and create a brand new build server, even if the existing one appears to be ok."
+msgstr "Resetear y crear un nuevo servidor de construcción, incluso si el existente parece estar bien."
 
 #: ../fdroidserver/nightly.py
 #, python-brace-format
@@ -1518,34 +1505,33 @@ msgstr ""
 msgid "Restrict output to warnings and errors"
 msgstr "Restringir la salida solo para advertencias y errores"
 
-#: ../fdroidserver/net.py
-#, python-format
-msgid "Retrying failed download: %s"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Rewrite all the metadata files"
 msgstr "Rescribir todos los archivos de metadatos"
 
+#: ../fdroidserver/rewritemeta.py
+msgid "Rewrite to a specific format: "
+msgstr "Rescribir a un formato especifico: "
+
 #: ../fdroidserver/rewritemeta.py
 #, python-brace-format
 msgid "Rewriting '{appid}'"
 msgstr ""
 
-#: ../fdroidserver/checkupdates.py
-msgid "Run on git repo that has uncommitted changes"
+#: ../fdroidserver/rewritemeta.py
+#, python-brace-format
+msgid "Rewriting '{appid}' to '{path}'"
 msgstr ""
 
-#: ../fdroidserver/nightly.py
-#, python-brace-format
-msgid "Run over {cibase} to find -debug.apk. and skip repo_basedir {repo_basedir}"
+#: ../fdroidserver/checkupdates.py
+msgid "Run on git repo that has uncommitted changes"
 msgstr ""
 
 #: ../fdroidserver/lint.py
 msgid "Run rewritemeta to fix formatting"
 msgstr ""
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 msgid "Running first pass with MD5 checking disabled"
 msgstr ""
 
@@ -1554,24 +1540,18 @@ msgstr ""
 msgid "Running wget in {path}"
 msgstr ""
 
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "SHA-256 of {url} does not match entry!"
-msgstr ""
+#: ../fdroidserver/dscanner.py
+msgid "Scan only the latest version of each package"
+msgstr "Escanear solo la ultima versión de cada paquete"
 
 #: ../fdroidserver/build.py
 msgid "Scan the resulting APK(s) for known non-free classes."
 msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Scan the source code of a package"
 msgstr "Escanear en código fuente de un paquete"
 
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Scanner found {count} problems in {apk}"
-msgstr ""
-
 #: ../fdroidserver/scanner.py
 #, python-brace-format
 msgid "Scanner found {count} problems in {appid}:"
@@ -1588,19 +1568,6 @@ msgid_plural "Scanner found {} problems"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../fdroidserver/scanner.py
-msgid "Scanning APK for extra signing blocks."
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "Scanning APK with dexdump for known non-free classes."
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Set NDK {release} ({version}) up"
-msgstr ""
-
 #: ../fdroidserver/common.py
 msgid "Set clock to that time using:"
 msgstr ""
@@ -1614,7 +1581,7 @@ msgstr ""
 msgid "Set open file limit to {integer}"
 msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Set up an app build for a nightly build repo"
 msgstr ""
 
@@ -1627,11 +1594,19 @@ msgstr ""
 msgid "Setting {0} sec timeout for this build"
 msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroidserver/build.py
+#, fuzzy
+msgid "Setup an emulator, install the APK on it and perform a Drozer scan"
+msgstr "Configurar un emulador, instalarle el apk y realizar el escaneo de barrido"
+
+msgid "Setup an emulator, install the apk on it and perform a drozer scan"
+msgstr "Configurar un emulador, instalarle el apk y realizar el escaneo de barrido"
+
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Sign and place packages in the repo"
 msgstr "Firmar y ubicar paquetes en el repositorio"
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Sign indexes created using update --nosign"
 msgstr "Firmar índicescreados con \"update --nosign\""
 
@@ -1644,11 +1619,6 @@ msgstr "Saltear el escaneo de binarios y otros problemas en el código fuente"
 msgid "Skipping '{apkfilename}' with invalid signature!"
 msgstr ""
 
-#: ../fdroidserver/deploy.py ../fdroidserver/index.py
-#, python-format
-msgid "Skipping GitLab Pages mirror because the repo is too large (>%.2fGB)!"
-msgstr ""
-
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Skipping index generation for {appid}"
@@ -1664,13 +1634,23 @@ msgstr ""
 msgid "Skipping {appid}: disabled"
 msgstr ""
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/scanner.py
+#, python-brace-format
+msgid "Skipping {appid}: no builds specified"
+msgstr ""
+
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 msgid "Specify a local folder to sync the repo to"
 msgstr "Especificar un directorio local donde sincronizar el repositorio"
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
+#, fuzzy
 msgid "Specify an identity file to provide to SSH for rsyncing"
-msgstr "Especifique un fichero de identidad que ofrezca SSH para rsync"
+msgstr "Especifique una archivo de identificación para la resincronización vía SSH"
+
+#: ../fdroidserver/build.py
+msgid "Specify that we're running on the build server"
+msgstr ""
 
 #: ../fdroidserver/nightly.py
 msgid "Specify which debug keystore file to use."
@@ -1680,6 +1660,11 @@ msgstr ""
 msgid "Spew out even more information than normal"
 msgstr "Mostrar más información que de costumbre"
 
+#: ../fdroidserver/nightly.py
+#, python-brace-format
+msgid "Striping mystery signature from {apkfilename}"
+msgstr ""
+
 #: ../fdroidserver/nightly.py
 #, python-brace-format
 msgid "Stripping mystery signature from {apkfilename}"
@@ -1700,22 +1685,10 @@ msgstr ""
 msgid "System clock is older than date in {path}!"
 msgstr ""
 
-#: ../fdroidserver/checkupdates.py
-msgid "Tags update mode only works for git, hg, bzr and git-svn repositories currently"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "Tags update mode used in git-svn, but the repo was not set up with tags"
-msgstr ""
-
 #: ../fdroidserver/build.py
 msgid "Test mode - put output in the tmp directory only, and always build, even if the output already exists."
 msgstr "Modo prueba - pone la salida solo en el directorio temporal, y siempre construye, incluso cuando la salida ya exista."
 
-#: ../fdroidserver/index.py
-msgid "The \"qrcode\" Python package is not installed (e.g. apt-get install python3-qrcode)!"
-msgstr ""
-
 #. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
 #: ../fdroidserver/update.py
 #, python-brace-format
@@ -1734,10 +1707,19 @@ msgstr ""
 msgid "The file to be included in the repo (path or glob)"
 msgstr ""
 
+#: ../fdroidserver/deploy.py
+#, fuzzy
+msgid "The only commands currently supported are 'init' and 'update'"
+msgstr "comando a ejecutar, ya sea 'iniciar' o 'actualizar'"
+
 #: ../fdroidserver/index.py
 msgid "The repository's fingerprint does not match."
 msgstr ""
 
+#: ../fdroidserver/common.py
+msgid "The repository's index could not be verified."
+msgstr ""
+
 #: ../fdroidserver/deploy.py
 #, python-brace-format
 msgid "The root dir for local_copy_dir \"{path}\" does not exist!"
@@ -1751,37 +1733,13 @@ msgstr ""
 msgid "These are the apps that have been archived from the main repo."
 msgstr ""
 
-#: ../fdroidserver/mirror.py
-msgid "This command should never be used to mirror f-droid.org! A full copy requires more than 600GB."
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "This is a repository of apps to be used with F-Droid. Applications in this repository are either official binaries built by the original application developers, or are binaries built from source by the admin of f-droid.org using the tools on https://gitlab.com/fdroid."
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 #, python-format
 msgid "This repo already has local metadata: %s"
 msgstr ""
 
-#: ../fdroidserver/init.py
-#, python-format
-msgid ""
-"To complete the setup, add your APKs to \"%s\"\n"
-"then run \"fdroid update -c; fdroid update\".  You might also want to edit\n"
-"\"config.yml\" to set the URL, repo name, and more.  You should also set up\n"
-"a signing key (a temporary one might have been automatically generated).\n"
-"\n"
-"For more info: https://f-droid.org/docs/Setup_an_F-Droid_App_Repo\n"
-"and https://f-droid.org/docs/Signing_Process"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "To use awsbucket, awssecretkey and awsaccesskeyid must also be set in config.yml!"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "To use rclone, rclone_config and awsbucket must be set in config.yml!"
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
+msgid "To use awsbucket, awssecretkey and awsaccesskeyid must also be set in config.py!"
 msgstr ""
 
 #: ../fdroidserver/lint.py
@@ -1792,6 +1750,10 @@ msgstr ""
 msgid "URL shorteners should not be used"
 msgstr ""
 
+#: ../fdroidserver/metadata.py
+msgid "URL title is just the URL, use brackets: [URL]"
+msgstr ""
+
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "URL {url} in Description: {error}"
@@ -1805,15 +1767,16 @@ msgstr ""
 msgid "Unexpected license tag \"{}\"! Only use license tags configured in your config file"
 msgstr ""
 
-#: ../fdroidserver/common.py
+#: ../fdroidserver/metadata.py
 #, python-brace-format
-msgid "Unknown entry {key} in {configname}"
+msgid "Unexpected text on same line as {field} in {linedesc}"
 msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Unknown exception found!"
 msgstr "¡Se encontró una excepción desconocida!"
 
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "Unknown file '{filename}' in build '{versionName}'"
@@ -1824,6 +1787,11 @@ msgstr ""
 msgid "Unknown metadata format: %s"
 msgstr ""
 
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Unknown metadata format: {path}"
+msgstr ""
+
 #: ../fdroidserver/metadata.py
 #, python-brace-format
 msgid "Unknown metadata format: {path} (use: *.yml)"
@@ -1833,6 +1801,10 @@ msgstr ""
 msgid "Unknown version of aapt, might cause problems: "
 msgstr ""
 
+#: ../fdroidserver/lint.py
+msgid "Unlinkified link - use [http://foo.bar Link title] or [http://foo.bar]"
+msgstr ""
+
 #: ../fdroidserver/lint.py
 msgid "Unnecessary leading space"
 msgstr ""
@@ -1846,12 +1818,20 @@ msgstr ""
 msgid "Unrecognised app field '{fieldname}' in '{path}'"
 msgstr ""
 
+#: ../fdroidserver/metadata.py
+msgid "Unrecognised app field: "
+msgstr ""
+
 #: ../fdroidserver/metadata.py
 #, python-brace-format
 msgid "Unrecognised build flag '{build_flag}' in '{path}'"
 msgstr ""
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Unrecognised field '{field}' in {linedesc}"
+msgstr ""
+
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Unsupported file type \"{extension}\" for repo graphic"
@@ -1862,6 +1842,29 @@ msgstr ""
 msgid "Unsupported graphics file found: {path}"
 msgstr ""
 
+#: ../fdroidserver/rewritemeta.py
+#, python-brace-format
+msgid "Unsupported metadata format, use: --to [{supported}]"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+msgid "Unterminated ]"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+msgid "Unterminated ]]"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Unterminated build in {name}"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Unterminated continuation in {name}"
+msgstr ""
+
 #: ../fdroidserver/lint.py
 #, python-format
 msgid "Unused extlib at %s"
@@ -1882,25 +1885,27 @@ msgstr ""
 msgid "Unused scanignore path: %s"
 msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Update repo information for new packages"
 msgstr "Actualizar información del repositorio para paquetes nuevos"
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Update the binary transparency log for a URL"
 msgstr "Actualizar el registro de transparencia binario de un URL"
 
+#: ../fdroid ../fdroidserver/__main__.py
+msgid "Update the stats of the repo"
+msgstr "Actualizar las estadísticas del repositorio"
+
+#: ../fdroidserver/update.py ../fdroidserver/build.py
+msgid "Update the wiki"
+msgstr "Actualizar la wiki"
+
 #: ../fdroidserver/checkupdates.py
 #, python-brace-format
 msgid "UpdateCheckData has invalid URL: {url}"
 msgstr ""
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "UpdateCheckData must match the version code as integer (\\d or [0-9]): {codeex}"
-msgstr ""
-
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "UpdateCheckData must use HTTPS URL: {url}"
@@ -1912,10 +1917,14 @@ msgid "UpdateCheckData not a valid URL: {url}"
 msgstr ""
 
 #: ../fdroidserver/lint.py
-msgid "UpdateCheckMode is set but it looks like checkupdates hasn't been run yet."
+msgid "UpdateCheckMode is set but it looks like checkupdates hasn't been run yet"
+msgstr ""
+
+#. Translators: https://developer.android.com/studio/build/application-id
+#: ../fdroidserver/lint.py
+msgid "UpdateCheckName is set to the known application ID - it can be removed"
 msgstr ""
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
 #: ../fdroidserver/lint.py
 msgid "UpdateCheckName is set to the known application ID, it can be removed"
 msgstr ""
@@ -1930,8 +1939,19 @@ msgstr ""
 msgid "Uploading {apkfilename} to virustotal"
 msgstr ""
 
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "Usage"
+msgstr "Uso"
+
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, python-format
+msgid "Usage: %s\n"
+msgstr "Uso: %s\n"
+
 #: ../fdroidserver/lint.py
-msgid "Use /HEAD instead of /master or /main to point at a file in the default branch"
+msgid "Use /HEAD instead of /master to point at a file in the default branch"
 msgstr ""
 
 #: ../fdroidserver/update.py
@@ -1943,19 +1963,18 @@ msgid "Use build server"
 msgstr "Usar servidor de construccion"
 
 #: ../fdroidserver/update.py
+#, fuzzy
 msgid "Use date from APK instead of current time for newly added APKs"
-msgstr "Utilizar la fecha del APK en vez de la actual para los APKs nuevos que se agreguen"
+msgstr "Utilizar la fecha del apk en vez de la actual para los apks nuevos que se agreguen"
 
-#: ../fdroidserver/deploy.py
+msgid "Use date from apk instead of current time for newly added apks"
+msgstr "Utilizar la fecha del apk en vez de la actual para los apks nuevos que se agreguen"
+
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Using \"{path}\" for configuring s3cmd."
 msgstr ""
 
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Using \"{path}\" for syncing with remote storage."
-msgstr ""
-
 #: ../fdroidserver/common.py
 msgid "Using APK Signature v2"
 msgstr ""
@@ -1964,17 +1983,13 @@ msgstr ""
 msgid "Using APK Signature v3"
 msgstr ""
 
-#: ../fdroidserver/common.py
-msgid "Using JAR Signature"
-msgstr ""
-
 #: ../fdroidserver/common.py
 msgid "Using Java's jarsigner, not recommended for verifying APKs! Use apksigner"
 msgstr ""
 
-#: ../fdroidserver/metadata.py
+#: ../fdroidserver/common.py
 #, python-brace-format
-msgid "Using blank dictionary instead of contents of {path}!"
+msgid "Using androguard from \"{path}\""
 msgstr ""
 
 #: ../fdroidserver/init.py
@@ -1982,17 +1997,12 @@ msgstr ""
 msgid "Using existing keystore \"{path}\""
 msgstr ""
 
-#: ../fdroidserver/deploy.py
-#, fuzzy, python-brace-format
-msgid "Using rclone to sync with: {url}"
-msgstr "usando libcloud de Apache para sincronizar con {url}"
-
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Using s3cmd to sync with: {url}"
 msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Valid commands are:"
 msgstr "Los comandos válidos son:"
 
@@ -2000,7 +2010,7 @@ msgstr "Los comandos válidos son:"
 msgid "Verify against locally cached copy rather than redownloading."
 msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Verify the integrity of downloaded packages"
 msgstr "Verificar la integridad de los paquetes descargados"
 
@@ -2008,28 +2018,15 @@ msgstr "Verificar la integridad de los paquetes descargados"
 msgid "Verifying index signature:"
 msgstr ""
 
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "Verifying package {path} with apksigner."
-msgstr ""
-
 #: ../fdroidserver/deploy.py
 #, python-brace-format
 msgid "VirusTotal API key cannot upload files larger than 32MB, use {url} to upload {path}."
 msgstr ""
 
-#: ../fdroidserver/nightly.py
-msgid "WARNING: only public git repos are supported!"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Warn about possible metadata errors"
 msgstr "Advertir sobre posibles errores en los metadatos"
 
-#: ../fdroidserver/scanner.py
-msgid "WebAssembly binary file"
-msgstr ""
-
 #: ../fdroidserver/update.py
 msgid "When configured for signed indexes, create only unsigned indexes at this stage"
 msgstr "Si está configurado para índices firmados, crear sólo índices sin firma en este punto"
@@ -2038,17 +2035,8 @@ msgstr "Si está configurado para índices firmados, crear sólo índices sin fi
 msgid "When linting the entire repository yamllint is disabled by default. This option forces yamllint regardless."
 msgstr ""
 
-#: ../fdroidserver/publish.py
-msgid "When signing or verifying fails, exit with an error code."
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "Would you like to download and install F-Droid.apk via adb? (YES/no)"
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "Would you like to download the app(s) from f-droid.org? (YES/no)"
-msgstr ""
+msgid "X.509 'Distiguished Name' used when generating keys"
+msgstr "X.509 'Nombre Distinguido' usado cuando se generaron las llaves"
 
 #: ../fdroidserver/init.py
 #, fuzzy
@@ -2063,11 +2051,6 @@ msgstr ""
 msgid "ZIP file archive"
 msgstr ""
 
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "adb reports {serial} is \"{status}\"!"
-msgstr ""
-
 #: ../fdroidserver/nightly.py
 #, python-brace-format
 msgid "adding IdentityFile to {path}"
@@ -2078,68 +2061,75 @@ msgstr ""
 msgid "adding to {name}: {path}"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "ambiguous option: %(option)s could match %(matches)s"
-msgstr "opción ambigua: %(option)s podría corresponderse con %(matches)s"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "apksigner in build-tools;{version} passes APKs with invalid v3 signatures, ignoring."
 msgstr ""
 
-#: ../fdroidserver/common.py
-msgid "apksigner not found! Cannot sign or verify modern APKs"
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, python-format
+msgid "ambiguous option: %s (%s?)"
 msgstr ""
 
 #: ../fdroidserver/common.py
 msgid "apksigner not found, it's required for signing!"
 msgstr ""
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/checkupdates.py ../fdroidserver/lint.py
-#: ../fdroidserver/rewritemeta.py
+#: ../fdroidserver/lint.py ../fdroidserver/rewritemeta.py
+#: ../fdroidserver/checkupdates.py
 #, fuzzy
 msgid "application ID of file to operate on"
 msgstr "app-id para verificar actualizaciones"
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/build.py ../fdroidserver/install.py
-#: ../fdroidserver/publish.py ../fdroidserver/scanner.py
-#: ../fdroidserver/verify.py
+#: ../fdroidserver/verify.py ../fdroidserver/publish.py
+#: ../fdroidserver/build.py ../fdroidserver/scanner.py
+#: ../fdroidserver/install.py
 #, fuzzy
 msgid "application ID with optional versionCode in the form APPID[:VERCODE]"
 msgstr "app-id con VersionCode opcional con el formato APPID[:VERCODE]"
 
-#: ../fdroidserver/common.py
-msgid "archive_url needs to end with /archive"
-msgstr ""
+#: ../fdroidserver/lint.py ../fdroidserver/rewritemeta.py
+#, fuzzy
+msgid "applicationId in the form APPID"
+msgstr "app-id en el formato APPID"
 
-#: /usr/lib/python3.11/argparse.py
+#: ../fdroidserver/checkupdates.py
+#, fuzzy
+msgid "applicationId to check for updates"
+msgstr "app-id para verificar actualizaciones"
+
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
+#: ../fdroidserver/verify.py ../fdroidserver/publish.py
+#: ../fdroidserver/dscanner.py ../fdroidserver/build.py
+#: ../fdroidserver/scanner.py ../fdroidserver/install.py
+#, fuzzy
+msgid "applicationId with optional versionCode in the form APPID[:VERCODE]"
+msgstr "app-id con VersionCode opcional con el formato APPID[:VERCODE]"
+
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "argument \"-\" with mode %r"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "argument %(argument_name)s: %(message)s"
-msgstr ""
-
 #: ../fdroidserver/nightly.py
 msgid "attempting bare SSH connection to test deploy key:"
 msgstr ""
 
+#: ../fdroidserver/nightly.py
+msgid "attempting bare ssh connection to test deploy key:"
+msgstr ""
+
 #: ../fdroidserver/common.py
 msgid "can not parse scrlib spec (not a string): '{}'"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
-msgid "can't open '%(filename)s': %(error)s"
-msgstr "no se puede abrir '%(filename)s': %(error)s"
-
-#: ../fdroidserver/scanner.py
-msgid "can't open non-https url: '{};"
+msgid "can't open '%s': %s"
 msgstr ""
 
 #: ../fdroidserver/build.py
@@ -2147,11 +2137,13 @@ msgstr ""
 msgid "cannot find required srclibs: \"{path}\""
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "cannot have multiple subparser arguments"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "cannot merge actions - two groups are named %r"
 msgstr ""
@@ -2165,25 +2157,30 @@ msgstr ""
 msgid "cloning {url}"
 msgstr ""
 
+#: ../fdroidserver/deploy.py
+msgid "command to execute, either 'init' or 'update'"
+msgstr "comando a ejecutar, ya sea 'iniciar' o 'actualizar'"
+
 #: ../fdroidserver/__main__.py
 msgid "commands from plugin modules:"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "complex"
+msgstr ""
+
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "conflicting option string: %s"
 msgid_plural "conflicting option strings: %s"
 msgstr[0] ""
 msgstr[1] ""
 
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "conflicting subparser alias: %s"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "conflicting subparser: %s"
+#: ../fdroidserver/nightly.py
+#, python-brace-format
+msgid "copying {apkfilename} into {path}"
 msgstr ""
 
 #: ../fdroidserver/metadata.py
@@ -2192,11 +2189,11 @@ msgid "could not parse '{path}'"
 msgstr ""
 
 #: ../fdroidserver/common.py
-msgid "could not parse srclib spec (no name specified): '{}'"
+msgid "could not parse srclib spec (no ref specified): '{}'"
 msgstr ""
 
 #: ../fdroidserver/common.py
-msgid "could not parse srclib spec (no ref specified): '{}'"
+msgid "could not parse srclib spec (too many '@' signs): '{}'"
 msgstr ""
 
 #: ../fdroidserver/nightly.py
@@ -2204,18 +2201,14 @@ msgstr ""
 msgid "created {path}"
 msgstr ""
 
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "current version is newer: old vercode={old}, new vercode={new}"
-msgstr ""
-
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "deleting: repo/{apkfilename}"
 msgstr ""
 
-#: ../fdroidserver/scanner.py
-msgid "dependency file without lock"
+#: ../fdroidserver/common.py
+#, python-brace-format
+msgid "deployed build logs to '{path}'"
 msgstr ""
 
 #: ../fdroidserver/common.py
@@ -2223,51 +2216,63 @@ msgstr ""
 msgid "deployed process log {path} to {dest}"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "dest= is required for options like %r"
 msgstr ""
 
-#: ../fdroidserver/scanner.py
-msgid "downloading '{}'"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "downloading scanner signatures from '{}' failed"
-msgstr ""
-
 #: ../fdroidserver/scanner.py
 msgid "executable binary, possibly code"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "expected %s argument"
 msgid_plural "expected %s arguments"
 msgstr[0] ""
 msgstr[1] ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "expected at least one argument"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "expected at most one argument"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "expected one argument"
 msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroidserver/common.py
+#, python-brace-format
+msgid "failed deploying build logs to '{path}'"
+msgstr ""
+
+#: ../fdroid
+#, fuzzy
+msgid "fdroid [-h|--help|--version] <command> [<args>]"
+msgstr "uso: fdroid [-h|--help|--version] <comando> [<args>]"
+
+#: ../fdroid ../fdroidserver/__main__.py
 #, fuzzy
 msgid "fdroid [<command>] [-h|--help|--version|<args>]"
 msgstr "uso: fdroid [-h|--help|--version] <comando> [<args>]"
 
-#: ../fdroidserver/scanner.py
-msgid "fetch the latest version of signatures from the web"
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "floating-point"
 msgstr ""
 
+#: ../fdroidserver/metadata.py
+msgid "force errors to be warnings, or ignore"
+msgstr "forzar errores al ser advertencias, o ignorar"
+
 #: ../fdroidserver/metadata.py
 msgid "force metadata errors (default) to be warnings, or to be ignored."
 msgstr "forzar errores al ser advertencias, o ignorar."
@@ -2280,7 +2285,8 @@ msgstr ""
 msgid "gzip file archive"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "ignored explicit argument %r"
 msgstr ""
@@ -2289,39 +2295,35 @@ msgstr ""
 msgid "index-v1 must have a signature, use `fdroid signindex` to create it!"
 msgstr ""
 
-#: ../fdroidserver/index.py
-msgid "index-v2 must have a signature, use `fdroid signindex` to create it!"
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "integer"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "invalid %(type)s value: %(value)r"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "invalid choice: %(value)r (choose from %(choices)s)"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "invalid conflict_resolution value: %r"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "invalid option string %(option)r: must start with a character %(prefix_chars)r"
 msgstr ""
 
-#: ../fdroidserver/common.py
-msgid "ipfs_cid not found, skipping CIDv1 generation"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "latest build recipe is newer: old vercode={old}, new vercode={new}"
-msgstr ""
-
 #: ../fdroidserver/deploy.py
 #, fuzzy, python-brace-format
 msgid "local_copy_dir does not end with \"fdroid\", perhaps you meant: \"{path}\""
@@ -2341,20 +2343,11 @@ msgstr "directorio_copia_local tiene que ser un directorio, ¡no un archivo!"
 msgid "mirror '%s' does not end with 'fdroid'!"
 msgstr ""
 
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "mirrors set twice, in config.yml and {path}!"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "mutually exclusive arguments must be optional"
 msgstr ""
 
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "next {name} cache update due in {time}"
-msgstr ""
-
 #: ../fdroidserver/mirror.py
 #, python-brace-format
 msgid "no \"icon\" in {appid}"
@@ -2364,94 +2357,144 @@ msgstr ""
 msgid "no APK supplied"
 msgstr ""
 
-#: ../fdroidserver/checkupdates.py
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, python-format
+msgid "no such option: %s"
+msgstr ""
+
+#: ../fdroid ../fdroidserver/__main__.py
 #, fuzzy
-msgid "no version information found"
+msgid "no version info found!"
 msgstr "¡Se encontró una excepción desconocida!"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "not allowed with argument %s"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "one of the arguments %s is required"
 msgstr ""
 
-#: ../fdroidserver/common.py ../fdroidserver/index.py
+#: ../fdroidserver/index.py ../fdroidserver/common.py
 msgid "only accepts strings, lists, and tuples"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
-#, fuzzy
-msgid "options"
-msgstr "Opciones"
+#: ../fdroidserver/install.py
+#, python-format
+msgid "option %s: If you really want to install all the signed apps, use --all"
+msgstr ""
+
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, python-format
+msgid "option %s: invalid %s value: %r"
+msgstr ""
+
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, python-format
+msgid "option %s: invalid choice: %r (choose from %s)"
+msgstr ""
+
+#: /usr/lib/python3.5/getopt.py /usr/lib/python3.6/getopt.py
+#: /usr/lib/python3.7/getopt.py
+#, python-format
+msgid "option -%s not recognized"
+msgstr "No se reconoce el comando \"%s\""
+
+#: /usr/lib/python3.5/getopt.py /usr/lib/python3.6/getopt.py
+#: /usr/lib/python3.7/getopt.py
+#, python-format
+msgid "option -%s requires argument"
+msgstr ""
+
+#: /usr/lib/python3.5/getopt.py /usr/lib/python3.6/getopt.py
+#: /usr/lib/python3.7/getopt.py
+#, python-format
+msgid "option --%s must not have an argument"
+msgstr ""
+
+#: /usr/lib/python3.5/getopt.py /usr/lib/python3.6/getopt.py
+#: /usr/lib/python3.7/getopt.py
+#, python-format
+msgid "option --%s not a unique prefix"
+msgstr ""
+
+#: /usr/lib/python3.5/getopt.py /usr/lib/python3.6/getopt.py
+#: /usr/lib/python3.7/getopt.py
+#, python-format
+msgid "option --%s not recognized"
+msgstr "No se reconoce el comando --\"%s\""
+
+#: /usr/lib/python3.5/getopt.py /usr/lib/python3.6/getopt.py
+#: /usr/lib/python3.7/getopt.py
+#, python-format
+msgid "option --%s requires argument"
+msgstr ""
+
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
+msgid "optional arguments"
+msgstr ""
 
 #: ../fdroidserver/nightly.py
 #, python-brace-format
 msgid "overwriting existing {path}"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "positional arguments"
-msgstr "argumentos posicionales"
+msgstr ""
 
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "process log deploy {path} to {dest} failed!"
 msgstr ""
 
-#: ../fdroidserver/build.py
-msgid "reference binary missing signature"
-msgstr ""
-
 #: ../fdroidserver/signatures.py
 #, python-brace-format
 msgid "refuse downloading via insecure HTTP connection (use HTTPS or specify --no-https-check): {apkfilename}"
 msgstr ""
 
+#: ../fdroidserver/signatures.py
+#, python-brace-format
+msgid "refuse downloading via insecure http connection (use https or specify --no-https-check): {apkfilename}"
+msgstr ""
+
 #: ../fdroidserver/index.py
 #, python-format
-msgid "repo_icon \"repo/icons/%s\" does not exist, generating placeholder."
+msgid "repo_icon %s does not exist, generating placeholder."
 msgstr ""
 
-#: ../fdroidserver/common.py
-msgid "repo_url needs to end with /repo"
+#: ../fdroidserver/metadata.py
+msgid "ruamel.yaml not installed, can not write metadata."
 msgstr ""
 
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "rsync is missing or broken: {error}"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "s3cmd sync indexes {path} to {url} and delete"
 msgstr ""
 
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "s3cmd syncs indexes from {path} to {url} and deletes removed"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "scanner cache is malformed! You can clear it with: '{clear}'"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, fuzzy
-msgid "serverwebroot: path does not end with \"fdroid\", perhaps you meant one of these:"
-msgstr "local_copy_dir no termina en \"fdroid\", quizá quiso escribir: \"{path}\""
-
 #: ../fdroidserver/scanner.py
 msgid "shared library"
-msgstr "librería compartida"
+msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "show program's version number and exit"
+msgstr ""
+
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.5/optparse.py
+#: /usr/lib/python3.6/argparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/argparse.py /usr/lib/python3.7/optparse.py
 msgid "show this help message and exit"
-msgstr "mostrar este mensaje de ayuda y salir"
+msgstr ""
 
 #: ../fdroidserver/signatures.py
 msgid "signed APK, either a file-path or HTTPS URL."
@@ -2476,47 +2519,52 @@ msgstr ""
 
 #: ../fdroidserver/scanner.py
 msgid "static library"
-msgstr "librería estática"
-
-#: ../fdroidserver/build.py
-#, python-brace-format
-msgid "supplied reference binary has allowed signer {signer}"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: ../fdroidserver/common.py
+#, python-brace-format
+msgid "supplied timestamp value '{timestamp}' is not a unix timestamp"
+msgstr ""
+
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "the following arguments are required: %s"
-msgstr "se requieren los siguientes argumentos: %s"
-
-#: ../fdroidserver/install.py
-msgid "true"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "unexpected option string: %s"
-msgstr "Cadena de opción inesperada: %s"
+msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "unknown parser %(parser_name)r (choices: %(choices)s)"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "unrecognized arguments: %s"
-msgstr "argumentos no reconocidos: %s"
+msgstr ""
 
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "unsafe permissions on '{config_file}' (should be 0600)!"
 msgstr ""
 
-#: ../fdroidserver/__main__.py /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py ../fdroid
+#: /usr/lib/python3.7/argparse.py ../fdroidserver/__main__.py
 msgid "usage: "
-msgstr "uso: "
+msgstr ""
 
-#: ../fdroidserver/deploy.py
+#: ../fdroid
+msgid "usage: fdroid [-h|--help|--version] <command> [<args>]"
+msgstr "uso: fdroid [-h|--help|--version] <comando> [<args>]"
+
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "using Apache libcloud to sync with {url}"
 msgstr "usando libcloud de Apache para sincronizar con {url}"
@@ -2525,8 +2573,8 @@ msgstr "usando libcloud de Apache para sincronizar con {url}"
 msgid "virustotal.com is rate limiting, waiting to retry..."
 msgstr ""
 
-#: ../fdroidserver/install.py
-msgid "yes"
+#: ../fdroidserver/update.py
+msgid "wiki support is deprecated and will be removed in the next release!"
 msgstr ""
 
 #: ../fdroidserver/publish.py
@@ -2541,19 +2589,31 @@ msgstr[1] ""
 msgid "{apkfilename} ({appid}) has no metadata!"
 msgstr ""
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
+#: ../fdroidserver/update.py
+#, python-brace-format
+msgid "{apkfilename} has multiple {name} files, looks like Master Key exploit!"
+msgstr ""
+
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "{apkfilename}'s AndroidManifest.xml has a bad date: "
-msgstr "el AndroidManifest.xml del {apkfilename} tiene una mala fecha: "
+msgstr ""
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "{appid} does not have a name! Using application ID instead."
 msgstr ""
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
+#: ../fdroidserver/update.py
+#, python-brace-format
+msgid "{appid} does not have a name! Using package name instead."
+msgstr ""
+
+#: ../fdroidserver/update.py
+#, python-brace-format
+msgid "{appid} from {path} is not a valid Android Package Name!"
+msgstr ""
+
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "{appid} from {path} is not a valid Android application ID!"
@@ -2564,16 +2624,12 @@ msgstr ""
 msgid "{appid} from {path} is not a valid Java Package Name!"
 msgstr ""
 
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{appid} has both APKs and files: {files}"
-msgstr ""
-
 #: ../fdroidserver/mirror.py
 #, python-brace-format
 msgid "{appid} is missing {name}"
 msgstr ""
 
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "{appid}: Unknown extlib {path} in build '{versionName}'"
@@ -2601,7 +2657,7 @@ msgstr ""
 
 #: ../fdroidserver/metadata.py
 #, python-brace-format
-msgid "{build_flag} must be list or string, found: {value}"
+msgid "{field} not terminated in {name}"
 msgstr ""
 
 #: ../fdroidserver/metadata.py
@@ -2611,15 +2667,10 @@ msgstr ""
 
 #: ../fdroidserver/update.py
 #, python-brace-format
-msgid "{name} \"{section}/icons/{path}\" does not exist! Check \"config.yml\"."
+msgid "{name} \"{path}\" does not exist! Correct it in config.py."
 msgstr ""
 
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{path1} is a duplicate of {path2}, remove one!"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 #, python-brace-format
 msgid "{path} already exists, ignoring import results!"
 msgstr ""
@@ -2634,36 +2685,6 @@ msgstr ""
 msgid "{path} has bad file signature \"{pattern}\", possible Janus exploit!"
 msgstr ""
 
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "{path} has been flagged by virustotal {count} times:"
-msgstr ""
-
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "{path} has the wrong fingerprint ({fingerprint})!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "{path} is not \"key: value\" dict, but a {datatype}!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "{path} is not a standard config file!"
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "{path} is not list, but a {datatype}!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "{path} is not {expected_type}, but a {datatype}!"
-msgstr ""
-
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "{path} is zero size!"
@@ -2674,22 +2695,12 @@ msgstr ""
 msgid "{path} more than 200MB, manually upload: {url}"
 msgstr ""
 
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "{path}: \"{code}\" is not a valid ISO_3166-1 alpha-2 country code!"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{path}: {error}"
-msgstr ""
-
 #: ../fdroidserver/mirror.py
 #, python-brace-format
 msgid "{url} does not end with \"fdroid\", check the URL path!"
 msgstr ""
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/common.py
 #, python-brace-format
 msgid "{url} does not start with \"http\"!"
 msgstr ""
@@ -2705,3 +2716,40 @@ msgid "{} build succeeded"
 msgid_plural "{} builds succeeded"
 msgstr[0] ""
 msgstr[1] ""
+
+#, fuzzy
+#~ msgid "Add PGP signatures for packages in repo using GnuPG"
+#~ msgstr "Agregar firmas GPG a paquetes en el repositorio"
+
+#~ msgid "Add gpg signatures for packages in repo"
+#~ msgstr "Agregar firmas GPG a paquetes en el repositorio"
+
+#~ msgid "Clean update - don't uses caches, reprocess all apks"
+#~ msgstr "Limpiar actualización - no utiliza cachés, reprocesa todos los APK's"
+
+#~ msgid "Interactively ask about things that need updating."
+#~ msgstr "Preguntar de forma interactiva sobre las cosas necesarias a actualizar."
+
+#, fuzzy
+#~ msgid "Specify editor to use in interactive mode. Default "
+#~ msgstr "Especificar el editor a usar en modo interactivo. Por defecto %s"
+
+#~ msgid "Specify editor to use in interactive mode. Default %s"
+#~ msgstr "Especificar el editor a usar en modo interactivo. Por defecto %s"
+
+#, fuzzy
+#~ msgid "Specify editor to use in interactive mode. Default is {path}"
+#~ msgstr "Especificar el editor a usar en modo interactivo. Por defecto %s"
+
+#~ msgid "app-id in the form APPID"
+#~ msgstr "app-id en el formato APPID"
+
+#~ msgid "app-id to check for updates"
+#~ msgstr "app-id para verificar actualizaciones"
+
+#, fuzzy
+#~ msgid "app-id with optional versionCode in the form APPID[:VERCODE]"
+#~ msgstr "app-id con VersionCode opcional con el formato APPID[:VERCODE]"
+
+#~ msgid "app-id with optional versioncode in the form APPID[:VERCODE]"
+#~ msgstr "app-id con versioncode opcional en el formato APPID[:VERCODE]"
diff --git a/locale/es_MX/LC_MESSAGES/fdroidserver.po b/locale/es_MX/LC_MESSAGES/fdroidserver.po
index aaddd007..fd036b37 100644
--- a/locale/es_MX/LC_MESSAGES/fdroidserver.po
+++ b/locale/es_MX/LC_MESSAGES/fdroidserver.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fdroidserver 1.0.6-349-g907c04ea\n"
 "Report-Msgid-Bugs-To: https://gitlab.com/fdroid/fdroidserver/issues\n"
-"POT-Creation-Date: 2025-06-25 09:52+0200\n"
+"POT-Creation-Date: 2020-10-21 18:05+0200\n"
 "PO-Revision-Date: 2020-04-29 12:49+0000\n"
 "Last-Translator: Hans-Christoph Steiner <hans@guardianproject.info>\n"
 "Language-Team: Spanish (Mexico) <https://hosted.weblate.org/projects/f-droid/fdroidserver/es_MX/>\n"
@@ -17,6 +17,22 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 4.0.2\n"
 
+#: ../fdroidserver/common.py
+msgid ""
+"\n"
+"        This is a repository of apps to be used with FDroid. Applications in this\n"
+"        repository are either official binaries built by the original application\n"
+"        developers, or are binaries built from source by f-droid.org using the\n"
+"        tools on https://gitlab.com/fdroid.\n"
+"        "
+msgstr ""
+
+#: ../fdroidserver/nightly.py
+msgid ""
+"\n"
+"SSH Public Key to be used as Deploy Key:"
+msgstr ""
+
 #: ../fdroidserver/nightly.py
 msgid ""
 "\n"
@@ -35,26 +51,22 @@ msgstr ""
 msgid "\"%s/\" has no matching metadata file!"
 msgstr ""
 
-#: ../fdroidserver/index.py
-msgid "\"isPrimary\" key should not be added to mirrors!"
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "\"local_copy_dir\" {path} does not exist!"
-msgstr ""
-
 #: ../fdroidserver/install.py
 #, python-brace-format
 msgid "\"{apkfilename}\" is already installed on {dev}."
 msgstr ""
 
+#: ../fdroidserver/update.py
+#, python-brace-format
+msgid "\"{path}\" contains outdated {name} ({version})"
+msgstr ""
+
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "\"{path}\" contains recent {name} ({version})"
 msgstr ""
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "\"{path}\" exists but s3cmd is not installed!"
 msgstr ""
@@ -64,77 +76,97 @@ msgstr ""
 msgid "\"{path}\" is not a supported file format (use: metadata/*.yml)"
 msgstr ""
 
-#: ../fdroidserver/update.py
+#: ../fdroidserver/metadata.py
 #, python-brace-format
-msgid "\"{path}\" is signed by a key that is not allowed:"
+msgid "\"{path}\" is not an accepted format, convert to: {formats}"
 msgstr ""
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/common.py
 #, python-brace-format
 msgid "\"{url}\" is not a valid URL!"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, python-format
+msgid "%(option)s option requires %(number)d argument"
+msgid_plural "%(option)s option requires %(number)d arguments"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../fdroidserver/mirror.py
+#, python-format
+msgid "%(prog)s [options] url"
+msgstr ""
+
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "%(prog)s: error: %(message)s\n"
 msgstr "%(prog)s: error: %(message)s\n"
 
-#: ../fdroidserver/publish.py
-#, python-format
-msgid "%d APKs failed to be signed or verified!"
-msgstr ""
-
 #: ../fdroidserver/scanner.py
 #, python-format
 msgid "%d problems found"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "%prog [options]"
+msgstr "%prog [opciones]"
+
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "%r is not callable"
 msgstr ""
 
-#: ../fdroidserver/signindex.py
-#, python-format
-msgid "%s did not produce a dict!"
-msgstr ""
-
-#: ../fdroidserver/signindex.py
-#, python-format
-msgid "%s has bad SHA-256: %s"
-msgstr ""
-
 #: ../fdroidserver/lint.py
 #, python-format
 msgid "%s is not an accepted build field"
 msgstr ""
 
-#: ../fdroidserver/common.py
-msgid "'keypass' not found in config.yml!"
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, python-format
+msgid "%s option does not take a value"
+msgstr ""
+
+#: ../fdroidserver/index.py ../fdroidserver/common.py
+msgid "'keypass' not found in config.py!"
 msgstr ""
 
 #: ../fdroidserver/common.py
 msgid "'keystore' is NONE and 'smartcardoptions' is blank!"
 msgstr ""
 
-#: ../fdroidserver/common.py
-msgid "'keystore' not found in config.yml!"
+#: ../fdroidserver/index.py ../fdroidserver/common.py
+msgid "'keystore' not found in config.py!"
 msgstr ""
 
-#: ../fdroidserver/common.py
-msgid "'keystorepass' not found in config.yml!"
+#: ../fdroidserver/index.py ../fdroidserver/common.py
+msgid "'keystorepass' not found in config.py!"
 msgstr ""
 
-#: ../fdroidserver/common.py
-msgid "'repo_keyalias' not found in config.yml!"
+#: ../fdroidserver/index.py ../fdroidserver/common.py
+msgid "'repo_keyalias' not found in config.py!"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "'required' is an invalid argument for positionals"
 msgstr ""
 
 #: ../fdroidserver/common.py
-msgid "'sdk_path' not set in config.yml!"
+msgid "'sdk_path' not set in 'config.py'!"
+msgstr ""
+
+#. Translators: "build-tools" is the file name of a package from
+#. Google, it is part of the Android SDK. So it probably shouldn't be
+#. translated or transliterated.
+#: ../fdroidserver/common.py
+#, python-brace-format
+msgid "'{aapt}' is too old, fdroid requires build-tools-23.0.0 or newer!"
 msgstr ""
 
 #: ../fdroidserver/common.py
@@ -142,6 +174,21 @@ msgstr ""
 msgid "'{aapt}' is too old, fdroid requires build-tools-{version} or newer!"
 msgstr ""
 
+#: ../fdroidserver/install.py
+#, python-brace-format
+msgid "'{apkfilename}' is already installed on {dev}."
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "'{field}' in {linedesc} is obsolete, see docs for current fields:"
+msgstr ""
+
+#: ../fdroidserver/common.py
+#, python-brace-format
+msgid "'{field}' will be in random order! Use () or [] brackets if order is important!"
+msgstr ""
+
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "'{path}' failed to execute!"
@@ -149,32 +196,23 @@ msgstr ""
 
 #: ../fdroidserver/metadata.py
 #, python-brace-format
-msgid "'{path}' has invalid format, it should be a dictionary!"
-msgstr ""
-
-#: ../fdroidserver/lint.py ../fdroidserver/metadata.py
-#, python-brace-format
 msgid "'{value}' is not a valid {field} in {appid}. Regex pattern: {pattern}"
 msgstr ""
 
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "'{value}' is not a valid {field}, should be {pattern}"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "--merge-request only runs on a single appid!"
-msgstr ""
-
 #: ../fdroidserver/checkupdates.py
 #, python-brace-format
 msgid "...checkupdate failed for {appid} : {error}"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid ".__call__() not defined"
 msgstr ""
 
+#: ../fdroidserver/metadata.py
+msgid ".fdroid.txt is not supported!  Convert to .fdroid.yml or .fdroid.json."
+msgstr ""
+
 #: ../fdroidserver/lint.py
 msgid "/issues is missing"
 msgstr ""
@@ -183,13 +221,12 @@ msgstr ""
 msgid "A URL is required as an argument!"
 msgstr ""
 
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "APK signatures have different certificates in {path}:"
+#: ../fdroid ../fdroidserver/__main__.py
+msgid "Add PGP signatures using GnuPG for packages in repo"
 msgstr ""
 
-#: ../fdroidserver/__main__.py
-msgid "Add PGP signatures using GnuPG for packages in repo"
+#: ../fdroid ../fdroidserver/__main__.py
+msgid "Add a new application from its source code"
 msgstr ""
 
 #: ../fdroidserver/update.py
@@ -209,11 +246,7 @@ msgstr ""
 msgid "Alias of the repo signing key in the keystore"
 msgstr ""
 
-#: ../fdroidserver/build.py
-msgid "AllowedAPKSigningKeys missing but reference binary supplied"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "Allows a different revision (or git branch) to be specified for the initial import"
 msgstr ""
 
@@ -237,9 +270,13 @@ msgstr ""
 msgid "Android DEX code"
 msgstr ""
 
-#: ../fdroidserver/init.py
+#: ../fdroidserver/common.py ../fdroidserver/build.py
 #, python-brace-format
-msgid "Android SDK not found at {path}!"
+msgid "Android SDK '{path}' does not have '{dirname}' installed!"
+msgstr ""
+
+#: ../fdroidserver/common.py
+msgid "Android SDK not found!"
 msgstr ""
 
 #: ../fdroidserver/common.py
@@ -252,17 +289,16 @@ msgstr ""
 msgid "Android SDK path '{path}' is not a directory!"
 msgstr ""
 
+#. Translators: "build-tools" is the file name of a package from
+#. Google, it is part of the Android SDK. So it probably shouldn't be
+#. translated or transliterated.
 #: ../fdroidserver/common.py
 #, python-brace-format
-msgid "Android SDK tool {cmd} not found!"
+msgid "Android build-tools path '{path}' does not exist!"
 msgstr ""
 
-#: ../fdroidserver/lint.py
-msgid "App has Binaries but does not have corresponding AllowedAPKSigningKeys to pin certificate."
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "App has NoSourceSince or ArchivePolicy \"0 versions\" or 0 but AutoUpdateMode or UpdateCheckMode are not None"
+#: ../fdroidserver/update.py
+msgid "AndroidManifest.xml has no date"
 msgstr ""
 
 #: ../fdroidserver/lint.py
@@ -270,10 +306,6 @@ msgstr ""
 msgid "App is in '{repo}' but has a link to {url}"
 msgstr ""
 
-#: ../fdroidserver/lint.py
-msgid "App version has binary but does not have corresponding AllowedAPKSigningKeys to pin certificate."
-msgstr ""
-
 #: ../fdroidserver/lint.py
 msgid "Appending .git is not necessary"
 msgstr ""
@@ -283,27 +315,11 @@ msgstr ""
 msgid "Archiving {apkfilename} with invalid signature!"
 msgstr ""
 
-#: ../fdroidserver/lint.py
-msgid "AutoUpdateMode with UpdateCheckMode: HTTP must have a pattern."
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "Automatic no to all prompts."
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "Automatic yes to all prompts."
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "Bad entry type \"{mirrortype}\" in mirrors config: {mirror}"
-msgstr ""
-
 #: ../fdroidserver/mirror.py
 msgid "Base URL to mirror, can include the index signing key using the query string: ?fingerprint="
 msgstr ""
 
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "Branch '{branch}' used as commit in build '{versionName}'"
@@ -319,7 +335,7 @@ msgstr ""
 msgid "Broken symlink: {path}"
 msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Build a package from source"
 msgstr ""
 
@@ -339,24 +355,31 @@ msgstr ""
 msgid "Build only the latest version of each package"
 msgstr ""
 
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Build should have comma-separated versionName and versionCode, not \"{value}\", in {linedesc}"
+msgstr ""
+
 #: ../fdroidserver/init.py
 #, python-format
 msgid "Built repo based in \"%s\" with this config:"
 msgstr ""
 
-#: ../fdroidserver/checkupdates.py
-msgid "Can't auto-update app with no CurrentVersionCode"
-msgstr ""
-
 #: ../fdroidserver/build.py
 msgid "Can't build due to {} error while scanning"
 msgid_plural "Can't build due to {} errors while scanning"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../fdroidserver/common.py
+#: ../fdroidserver/vmtools.py
 #, python-brace-format
-msgid "Cannot read {path}: {error}"
+msgid "Cannot read \"{path}\"!"
+msgstr ""
+
+#. Translators: https://developer.android.com/studio/build/application-id
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Cannot resolve application ID {appid}"
 msgstr ""
 
 #: ../fdroidserver/rewritemeta.py
@@ -364,23 +387,25 @@ msgstr ""
 msgid "Cannot rewrite \"{path}\""
 msgstr ""
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
+#: ../fdroidserver/rewritemeta.py
+msgid "Cannot use --list and --to at the same time"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Cannot write \"{path}\", not an accepted format, use: {formats}"
+msgstr ""
+
 #: ../fdroidserver/lint.py
 #, python-format
 msgid "Categories '%s' is not valid"
 msgstr ""
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
 #: ../fdroidserver/lint.py
 msgid "Categories are not set"
 msgstr ""
 
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "Category \"{category}\" defined but not used for any apps!"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Check for updates to applications"
 msgstr ""
 
@@ -389,36 +414,35 @@ msgstr ""
 msgid "Checking archiving for {appid} - apks:{integer}, keepversions:{keep}, archapks:{arch}"
 msgstr ""
 
+#: ../fdroidserver/dscanner.py
+msgid "Clean after all scans have finished"
+msgstr "Limpiar después de que todos los escaneos hayan terminado"
+
+#: ../fdroidserver/dscanner.py
+msgid "Clean before the scans start and rebuild the container"
+msgstr "Limpiar antes de que comiencen los escaneos y reconstruya el contenedor"
+
+#: ../fdroidserver/dscanner.py
+msgid "Clean up all containers and then exit"
+msgstr "Limpiar todos los contenedores y luego salir"
+
 #: ../fdroidserver/update.py
 msgid "Clean update - don't uses caches, reprocess all APKs"
 msgstr "Actualización limpia: no usar cachés, reprocese todos los APK"
 
-#: ../fdroidserver/common.py
-msgid "Color the log output"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "Comma separated list of categories."
 msgstr "Lista de categorías separadas por comas."
 
-#: ../fdroidserver/__main__.py
-#, python-format
+#: ../fdroid ../fdroidserver/__main__.py
+#, c-format, python-format
 msgid "Command '%s' not recognised.\n"
-msgstr "El comando '%s' no fue reconocido\n"
+msgstr ""
 
 #: ../fdroidserver/checkupdates.py
 msgid "Commit changes"
 msgstr "Hacer Cambios"
 
-#: ../fdroidserver/checkupdates.py
-msgid "Commit changes, push, then make a merge request"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Conflicting \"{field}\" definitions between .yml and localized files:"
-msgstr ""
-
 #: ../fdroidserver/__main__.py
 msgid "Conflicting arguments: '--verbose' and '--quiet' can not be specified at the same time."
 msgstr ""
@@ -428,14 +452,12 @@ msgstr ""
 msgid "Could not find '{command}' on your system"
 msgstr "No se pudo encontrar '{command}' en su sistema"
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 #, fuzzy
 msgid "Could not find latest version code"
 msgstr "No se pudo encontrar el código de la última versión"
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 #, fuzzy
 msgid "Could not find latest version name"
 msgstr "No se pudo encontrar el nombre de la última versión"
@@ -446,27 +468,31 @@ msgid "Could not find {path} to remove it"
 msgstr "No se pudo encontrar {path} para eliminarlo"
 
 #: ../fdroidserver/update.py
-#, fuzzy, python-brace-format
-msgid "Could not open APK {path} for analysis: "
-msgstr "No se pudo abrir el archivo APK para su análisis"
+msgid "Could not open apk file for analysis"
+msgstr "No se pudo abrir el archivo apk para su análisis"
 
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "Could not parse size \"{size}\", wrong type \"{type}\""
 msgstr ""
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/import_subcommand.py
+#. Translators: https://developer.android.com/studio/build/application-id
+#: ../fdroidserver/import.py
 #, fuzzy
 msgid "Couldn't find Application ID"
 msgstr "No se pudo encontrar la ID del paquete"
 
-#: ../fdroidserver/checkupdates.py
-#, fuzzy
-msgid "Couldn't find any version information"
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
+#: ../fdroidserver/import.py
+msgid "Couldn't find latest version code"
+msgstr "No se pudo encontrar el código de la última versión"
+
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
+#: ../fdroidserver/import.py
+msgid "Couldn't find latest version name"
 msgstr "No se pudo encontrar el nombre de la última versión"
 
-#: ../fdroidserver/checkupdates.py
+#: ../fdroidserver/import.py
 msgid "Couldn't find package ID"
 msgstr "No se pudo encontrar la ID del paquete"
 
@@ -474,26 +500,29 @@ msgstr "No se pudo encontrar la ID del paquete"
 msgid "Cowardily refusing to overwrite existing signing key setup!"
 msgstr "¡Negarse cobardemente a sobrescribir la configuración de clave de firma existente!"
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/update.py
+msgid "Create a repo signing key in a keystore"
+msgstr "Crear una clave de firma de repositorio en un almacén de claves"
+
+#: ../fdroidserver/update.py
+msgid "Create skeleton metadata files that are missing"
+msgstr ""
+
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Created new container \"{name}\""
 msgstr "Se creó un nuevo contenedor \"{name}\""
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Creating \"{path}\" for configuring s3cmd."
 msgstr "Creando \"{path}\" para configurar s3cmd."
 
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Creating empty {config_file}"
-msgstr ""
-
 #: ../fdroidserver/publish.py
 msgid "Creating log directory"
 msgstr "Creando directorio de registro"
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Creating new S3 bucket: {url}"
 msgstr "Crear un nuevo depósito de S3: {url}"
@@ -506,7 +535,8 @@ msgstr "Creando directorio de salida"
 msgid "Creating signed index with this key (SHA256):"
 msgstr "Creando índice firmado con esta clave (SHA256):"
 
-#: ../fdroidserver/publish.py ../fdroidserver/verify.py
+#: ../fdroidserver/import.py ../fdroidserver/verify.py
+#: ../fdroidserver/publish.py
 msgid "Creating temporary directory"
 msgstr "Creando Directorio Temporal"
 
@@ -552,21 +582,16 @@ msgid "Description has a duplicate line"
 msgstr "La descripción tiene una línea duplicada"
 
 #: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Description of length {length} is over the {limit} char limit"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Did you mean config/{name}.yml?"
+#, python-format
+msgid "Description has a list (%s) but it isn't bulleted (*) nor numbered (#)"
 msgstr ""
 
 #: ../fdroidserver/lint.py
 #, python-brace-format
-msgid "Did you mean {code}?"
+msgid "Description of length {length} is over the {limit} char limit"
 msgstr ""
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "Do not add 'disable:' to the generated build entries"
 msgstr ""
 
@@ -591,20 +616,25 @@ msgstr ""
 msgid "Don't create a source tarball, useful when testing a build"
 msgstr ""
 
+#: ../fdroidserver/stats.py
+msgid "Don't do anything logs-related"
+msgstr ""
+
 #: ../fdroidserver/build.py
 msgid "Don't refresh the repository, useful when testing a build with no internet connection"
 msgstr ""
 
 #: ../fdroidserver/deploy.py ../fdroidserver/nightly.py
+#: ../fdroidserver/upload.py
 msgid "Don't use rsync checksums"
 msgstr ""
 
-#: ../fdroidserver/install.py
-msgid "Download F-Droid.apk using mirrors that leak less to the network"
+#: ../fdroid ../fdroidserver/__main__.py
+msgid "Download complete mirrors of small repos"
 msgstr ""
 
-#: ../fdroidserver/__main__.py
-msgid "Download complete mirrors of small repos"
+#: ../fdroidserver/stats.py
+msgid "Download logs we don't have"
 msgstr ""
 
 #: ../fdroidserver/common.py
@@ -618,12 +648,7 @@ msgstr ""
 
 #: ../fdroidserver/metadata.py
 #, python-brace-format
-msgid "Duplicate Anti-Feature declaration at {path} was ignored!"
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-format
-msgid "Duplicate entry \"%s\" in mirrors config!"
+msgid "Duplicate build recipe found for versionCode {versionCode} in {linedesc}"
 msgstr ""
 
 #: ../fdroidserver/lint.py
@@ -631,42 +656,27 @@ msgstr ""
 msgid "Duplicate link in '{field}': {url}"
 msgstr ""
 
-#: ../fdroidserver/common.py
-#, python-format
-msgid "ERROR: %(message)s"
+#: ../fdroid
+msgid "Dynamically scan APKs post build"
 msgstr ""
 
 #: ../fdroidserver/__main__.py
 msgid "ERROR: The \"server\" subcommand has been removed, use \"deploy\"!"
 msgstr ""
 
+#: ../fdroidserver/mirror.py
+msgid ""
+"ERROR: this command should never be used to mirror f-droid.org!\n"
+"A full mirror of f-droid.org requires more than 200GB."
+msgstr ""
+
 #: ../fdroidserver/nightly.py
 msgid "ERROR: unsupported CI type, patches welcome!"
 msgstr ""
 
-#: ../fdroidserver/nightly.py
-#, python-format
-msgid "ERROR: unsupported git host \"%s\", patches welcome!"
-msgstr ""
-
-#: ../fdroidserver/lint.py
+#: ../fdroidserver/metadata.py
 #, python-brace-format
-msgid "ERROR: {key} in {path} is not \"archive\" or \"repo\"!"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "ERROR: {key} not a valid key!"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "ERROR: {key}'s value should be of type {t}!"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "ERROR: {key}:{subkey} in {path} is not in allowed keys: {allowed_keys}!"
+msgid "Empty build flag at {linedesc}"
 msgstr ""
 
 #: ../fdroidserver/__main__.py
@@ -681,40 +691,20 @@ msgid ""
 "> "
 msgstr ""
 
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Environment variable {var} from {configname} is not set!"
+#: ../fdroidserver/deploy.py ../fdroidserver/checkupdates.py
+#: ../fdroidserver/upload.py
+#, python-format
+msgid "Error while attempting to publish log: %s"
 msgstr ""
 
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Environment variable {{env: {var}}} is not set!"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "Error deploying 'github_releases', {} not present. (You might need to run `fdroid update` first.)"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py ../fdroidserver/common.py
 msgid "Error while getting repo address"
 msgstr ""
 
-#: ../fdroidserver/scanner.py
-msgid "Exit with a non-zero code if problems were found"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Extract application metadata from a source repository"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Extract signatures from APKs"
 msgstr ""
 
-#: ../fdroidserver/install.py
-msgid "F-Droid.apk could not be downloaded from any known source!"
-msgstr ""
-
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Failed copying {path}: {error}"
@@ -735,23 +725,27 @@ msgstr ""
 msgid "Failed resizing {path}: {error}"
 msgstr ""
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/publish.py
+msgid "Failed to align application"
+msgstr ""
+
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Failed to create S3 bucket: {url}"
 msgstr ""
 
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Failed to get APK information, deleting {path}"
+#: ../fdroidserver/common.py
+msgid "Failed to get APK manifest information"
 msgstr ""
 
 #: ../fdroidserver/update.py
 #, python-brace-format
-msgid "Failed to get APK information, skipping {path}"
+msgid "Failed to get apk information, deleting {path}"
 msgstr ""
 
 #: ../fdroidserver/update.py
-msgid "Failed to get APK signing key fingerprint"
+#, python-brace-format
+msgid "Failed to get apk information, skipping {path}"
 msgstr ""
 
 #: ../fdroidserver/install.py
@@ -759,10 +753,14 @@ msgstr ""
 msgid "Failed to install '{apkfilename}' on {dev}: {error}"
 msgstr ""
 
-#: ../fdroidserver/common.py
+#: ../fdroidserver/publish.py ../fdroidserver/common.py
 msgid "Failed to sign application"
 msgstr ""
 
+#: ../fdroidserver/common.py
+msgid "Failed to zipalign application"
+msgstr ""
+
 #: ../fdroidserver/build.py
 #, python-brace-format
 msgid "Fetched buildserverid from VM: {buildserverid}"
@@ -778,12 +776,21 @@ msgstr ""
 msgid "File disappeared while processing it: {path}"
 msgstr ""
 
-#: ../fdroidserver/build.py ../fdroidserver/install.py
-#: ../fdroidserver/rewritemeta.py ../fdroidserver/scanner.py
-#: ../fdroidserver/update.py
+#: ../fdroidserver/verify.py ../fdroidserver/stats.py ../fdroidserver/update.py
+#: ../fdroidserver/rewritemeta.py ../fdroidserver/build.py
+#: ../fdroidserver/checkupdates.py ../fdroidserver/scanner.py
+#: ../fdroidserver/install.py
 msgid "Finished"
 msgstr ""
 
+#: ../fdroidserver/lint.py
+msgid "Flattr donation methods belong in the FlattrID flag"
+msgstr ""
+
+#: ../fdroidserver/lint.py
+msgid "Flattr donation methods belong in the FlattrID: field"
+msgstr ""
+
 #: ../fdroidserver/lint.py
 msgid "Forbidden HTML tags"
 msgstr ""
@@ -815,6 +822,7 @@ msgstr ""
 msgid "Found invalid appids in arguments"
 msgstr ""
 
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
 #: ../fdroidserver/common.py
 msgid "Found invalid versionCodes for some apps"
 msgstr ""
@@ -824,10 +832,6 @@ msgstr ""
 msgid "Found multiple JAR Signature Block Files in {path}"
 msgstr ""
 
-#: ../fdroidserver/common.py
-msgid "Found multiple Signer Certificates!"
-msgstr ""
-
 #: ../fdroidserver/metadata.py
 #, python-brace-format
 msgid "Found multiple metadata files for {appid}"
@@ -837,6 +841,11 @@ msgstr ""
 msgid "Found multiple signing certificates for repository."
 msgstr ""
 
+#: ../fdroidserver/update.py
+#, python-brace-format
+msgid "Found multiple signing certificates in {path}"
+msgstr ""
+
 #: ../fdroidserver/index.py
 msgid "Found no signing certificates for repository."
 msgstr ""
@@ -851,16 +860,6 @@ msgstr ""
 msgid "Found {apkfilename} at {url}"
 msgstr ""
 
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Found {count} problems in {filename}"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Found {count} warnings in {filename}"
-msgstr ""
-
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Generated skeleton metadata for {appid}"
@@ -879,21 +878,19 @@ msgstr ""
 msgid "Git fetch failed"
 msgstr ""
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
+#: ../fdroidserver/common.py
+msgid "Git remote set-head failed"
+msgstr ""
+
 #: ../fdroidserver/common.py
 #, python-format
 msgid "Git remote set-head failed: \"%s\""
 msgstr ""
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
 #: ../fdroidserver/common.py
 msgid "Git reset failed"
 msgstr ""
 
-#: ../fdroidserver/common.py
-msgid "Git submodule deinit failed"
-msgstr ""
-
 #: ../fdroidserver/common.py
 msgid "Git submodule sync failed"
 msgstr ""
@@ -925,16 +922,6 @@ msgstr ""
 msgid "Ignoring FUNDING.yml entry longer than 2048: %s"
 msgstr ""
 
-#: ../fdroidserver/update.py
-#, python-format
-msgid "Ignoring bad element in manifest: %s"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Ignoring deprecated {oldfile}, use {newfile}!"
-msgstr ""
-
 #: ../fdroidserver/index.py
 msgid "Ignoring package without metadata: "
 msgstr ""
@@ -944,6 +931,11 @@ msgstr ""
 msgid "Ignoring stale cache data for {apkfilename}"
 msgstr ""
 
+#: ../fdroidserver/rewritemeta.py
+#, python-brace-format
+msgid "Ignoring {ext} file at '{path}'"
+msgstr ""
+
 #: ../fdroidserver/update.py
 msgid "Include APKs that are signed with disabled algorithms like MD5"
 msgstr ""
@@ -960,16 +952,6 @@ msgstr ""
 msgid "Include the source tarballs in the mirror"
 msgstr ""
 
-#: ../fdroidserver/metadata.py
-#, python-format
-msgid "Including metadata from %s@%s"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Including metadata from {path}"
-msgstr ""
-
 #: ../fdroidserver/common.py
 msgid "Initialising submodules"
 msgstr ""
@@ -978,7 +960,7 @@ msgstr ""
 msgid "Install all signed applications available"
 msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Install built packages on devices"
 msgstr ""
 
@@ -987,12 +969,22 @@ msgstr ""
 msgid "Installing %s..."
 msgstr ""
 
+#: ../fdroidserver/install.py
+#, python-format
+msgid "Installing %s…"
+msgstr ""
+
 #: ../fdroidserver/install.py
 #, python-brace-format
 msgid "Installing '{apkfilename}' on {dev}..."
 msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroidserver/install.py
+#, python-brace-format
+msgid "Installing '{apkfilename}' on {dev}…"
+msgstr ""
+
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Interact with the repo HTTP server"
 msgstr ""
 
@@ -1000,36 +992,53 @@ msgstr ""
 msgid "Invalid APK"
 msgstr ""
 
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "Invalid AutoUpdateMode: {mode}"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "Invalid UpdateCheckMode: {mode}"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
+#: ../fdroidserver/lint.py ../fdroidserver/checkupdates.py
 #, python-brace-format
 msgid "Invalid VercodeOperation: {field}"
 msgstr ""
 
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Invalid VercodeOperation: {invalid_ops}"
-msgstr ""
-
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "Invalid application ID {appid}"
 msgstr ""
 
+#: ../fdroidserver/metadata.py
+#, python-format
+msgid "Invalid boolean '%s'"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Invalid build flag at {line} in {linedesc}"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Invalid build format: {value} in {name}"
+msgstr ""
+
 #: ../fdroidserver/lint.py
 msgid "Invalid bulleted list"
 msgstr ""
 
+#: ../fdroidserver/lint.py
+#, python-format
+msgid "Invalid license tag \"%s\"! Use only tags from https://spdx.org/license-list"
+msgstr ""
+
+#: ../fdroidserver/lint.py
+msgid "Invalid link - use [http://foo.bar Link title] or [http://foo.bar]"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+#, python-format
+msgid "Invalid metadata in %s:%d"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+msgid "Invalid metadata in: "
+msgstr ""
+
 #: ../fdroidserver/common.py
 #, python-format
 msgid "Invalid name for published file: %s"
@@ -1037,7 +1046,7 @@ msgstr ""
 
 #: ../fdroidserver/common.py
 #, python-brace-format
-msgid "Invalid ndk: entry in build: \"{ndk}\""
+msgid "Invalid package name {0}"
 msgstr ""
 
 #: ../fdroidserver/common.py
@@ -1060,6 +1069,11 @@ msgstr ""
 msgid "Invalid srclib metadata: unknown key '{key}' in '{file}'"
 msgstr ""
 
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Invalid versionCode: \"{versionCode}\" is not an integer!"
+msgstr ""
+
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "JAR signature failed to verify: {path}"
@@ -1074,8 +1088,8 @@ msgstr ""
 msgid "Java JAR file"
 msgstr ""
 
-#: ../fdroidserver/mirror.py ../fdroidserver/publish.py
-#: ../fdroidserver/update.py
+#: ../fdroidserver/publish.py ../fdroidserver/update.py
+#: ../fdroidserver/mirror.py
 msgid "Java JDK not found! Install in standard location or set java_paths!"
 msgstr ""
 
@@ -1091,19 +1105,10 @@ msgstr ""
 msgid "Javascript in HTML src attributes"
 msgstr ""
 
-#: ../fdroidserver/build.py
-#, python-brace-format
-msgid "Keeping failed build \"{apkfilename}\""
-msgstr ""
-
 #: ../fdroidserver/init.py
 msgid "Keystore for signing key:\t"
 msgstr ""
 
-#: ../fdroidserver/lint.py
-msgid "Known debug key is used in AllowedAPKSigningKeys: "
-msgstr ""
-
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "Last used commit '{commit}' looks like a tag, but UpdateCheckMode is '{ucm}'"
@@ -1113,8 +1118,12 @@ msgstr ""
 msgid "Liberapay donation methods belong in the Liberapay: field"
 msgstr ""
 
+#: ../fdroidserver/lint.py
+msgid "Liberapay donation methods belong in the LiberapayID flag"
+msgstr ""
+
 #: ../fdroidserver/rewritemeta.py
-msgid "List files that would be reformatted (dry run)"
+msgid "List files that would be reformatted"
 msgstr ""
 
 #: ../fdroidserver/lint.py
@@ -1133,16 +1142,6 @@ msgstr ""
 msgid "Malformed serverwebroot line:"
 msgstr ""
 
-#: ../fdroidserver/scanner.py
-#, python-format
-msgid "Max recursion depth in ZIP file reached: %s"
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "Mirror config for {url} contains \"isPrimary\" key!"
-msgstr ""
-
 #: ../fdroidserver/mirror.py
 msgid "Mirror the full repo and archive, all file types."
 msgstr ""
@@ -1151,29 +1150,30 @@ msgstr ""
 msgid "Missing output directory"
 msgstr ""
 
-#: ../fdroidserver/metadata.py
-msgid "Moving Anti-Features declarations to localized files:"
-msgstr ""
-
-#: ../fdroidserver/index.py
-msgid "Neither \"repo_pubkey\" nor \"keystorepass\" set in config.yml"
-msgstr ""
-
-#: ../fdroidserver/verify.py
+#: ../fdroidserver/lint.py
 #, python-format
-msgid "No APK for package: %s"
+msgid "Name '%s' is just the auto name - remove it"
+msgstr ""
+
+#: ../fdroidserver/common.py
+msgid "No 'config.py' found, using defaults."
 msgstr ""
 
 #: ../fdroidserver/common.py
 msgid "No Android SDK found!"
 msgstr ""
 
+#: ../fdroidserver/import.py
+msgid "No android or kivy project could be found. Specify --subdir?"
+msgstr ""
+
 #: ../fdroidserver/install.py
 msgid "No attached devices found"
 msgstr ""
 
-#: ../fdroidserver/install.py
-msgid "No devices found for `adb install`! Please plug one in."
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "No commit specified for {versionName} in {linedesc}"
 msgstr ""
 
 #: ../fdroidserver/index.py
@@ -1184,23 +1184,14 @@ msgstr ""
 msgid "No git submodules available"
 msgstr ""
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "No gradle project could be found. Specify --subdir?"
 msgstr ""
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py ../fdroidserver/common.py
 msgid "No information found."
 msgstr ""
 
-#: ../fdroidserver/checkupdates.py
-msgid "No matching tags found"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "No minimum SDK version found in {0}, using default (3)."
-msgstr ""
-
 #: ../fdroidserver/lint.py
 msgid "No need to specify that the app is Free Software"
 msgstr ""
@@ -1210,7 +1201,7 @@ msgid "No need to specify that the app is for Android"
 msgstr ""
 
 #: ../fdroidserver/deploy.py
-msgid "No option set! Edit your config.yml to set at least one of these:"
+msgid "No option set! Edit your config.py to set at least one of these:"
 msgstr ""
 
 #: ../fdroidserver/common.py
@@ -1219,14 +1210,14 @@ msgstr ""
 
 #: ../fdroidserver/install.py
 #, python-format
-msgid "No signed APK available for %s"
+msgid "No signed apk available for %s"
 msgstr ""
 
 #: ../fdroidserver/install.py
 msgid "No signed output directory - nothing to do"
 msgstr ""
 
-#: ../fdroidserver/common.py
+#: ../fdroidserver/update.py ../fdroidserver/common.py
 #, python-brace-format
 msgid "No signing certificates found in {path}"
 msgstr ""
@@ -1236,23 +1227,16 @@ msgstr ""
 msgid "No such package: %s"
 msgstr ""
 
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "No such versionCode {versionCode} for app {appid}"
 msgstr ""
 
-#: ../fdroidserver/checkupdates.py
-msgid "No tags found"
-msgstr ""
-
-#: ../fdroidserver/publish.py ../fdroidserver/verify.py
+#: ../fdroidserver/verify.py ../fdroidserver/publish.py
 msgid "No unsigned directory - nothing to do"
 msgstr ""
 
-#: ../fdroidserver/__main__.py
-msgid "No version information could be found."
-msgstr ""
-
 #: ../fdroidserver/common.py
 msgid "Not a valid size definition: \"{}\""
 msgstr ""
@@ -1267,9 +1251,10 @@ msgid "Nothing to do for {appid}."
 msgstr ""
 
 #: ../fdroidserver/init.py
-msgid "Now set these in config.yml:"
+msgid "Now set these in config.py:"
 msgstr ""
 
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "OBB file has newer versionCode({integer}) than any APK:"
@@ -1287,27 +1272,22 @@ msgstr ""
 msgid "Offline machine, skipping git mirror generation until `fdroid deploy`"
 msgstr ""
 
-#: ../fdroidserver/deploy.py
-msgid "One of the 'github_releases' config items is missing the 'packageNames' value. skipping ..."
+#: ../fdroidserver/common.py
+#, python-brace-format
+msgid "Old APK signature failed to verify: {path}"
 msgstr ""
 
-#: ../fdroidserver/deploy.py
-msgid "One of the 'github_releases' config items is missing the 'projectUrl' value. skipping ..."
+#: ../fdroid ../fdroidserver/__main__.py
+msgid "Old, deprecated name for fdroid deploy"
 msgstr ""
 
-#: ../fdroidserver/deploy.py
-msgid "One of the 'github_releases' config items is missing the 'token' value. skipping ..."
-msgstr ""
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Only PNG and JPEG are supported for graphics, found: {path}"
 msgstr ""
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/common.py
-msgid "Only accepts a single key \"env\""
+#: ../fdroidserver/checkupdates.py
+msgid "Only print differences with the Play Store"
 msgstr ""
 
 #: ../fdroidserver/checkupdates.py
@@ -1318,6 +1298,11 @@ msgstr ""
 msgid "OpenCollective donation methods belong in the OpenCollective: field"
 msgstr ""
 
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "Options"
+msgstr ""
+
 #: ../fdroidserver/verify.py
 msgid "Output JSON report to file named after APK."
 msgstr ""
@@ -1326,22 +1311,26 @@ msgstr ""
 msgid "Output JSON to stdout."
 msgstr ""
 
-#: ../fdroidserver/checkupdates.py ../fdroidserver/gpgsign.py
-#: ../fdroidserver/publish.py ../fdroidserver/signindex.py
-#: ../fdroidserver/update.py
+#: ../fdroidserver/gpgsign.py ../fdroidserver/publish.py
+#: ../fdroidserver/update.py ../fdroidserver/signindex.py
+#: ../fdroidserver/checkupdates.py
 msgid "Outputting JSON"
 msgstr ""
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "Overall license of the project."
 msgstr ""
 
+#: ../fdroidserver/dscanner.py
+msgid "Override path for repo APKs (default: ./repo)"
+msgstr ""
+
 #: ../fdroidserver/index.py
 #, python-brace-format
 msgid "Overriding blank versionName in {apkfilename} from metadata: {version}"
 msgstr ""
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 #, python-brace-format
 msgid "Package \"{appid}\" already exists"
 msgstr ""
@@ -1355,10 +1344,13 @@ msgstr ""
 msgid "Password required with username"
 msgstr ""
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "Path to main Android project subdirectory, if not in root."
 msgstr ""
 
+msgid "Path to main android project subdirectory, if not in root."
+msgstr ""
+
 #: ../fdroidserver/init.py
 msgid "Path to the Android SDK (sometimes set in ANDROID_HOME)"
 msgstr ""
@@ -1371,18 +1363,20 @@ msgstr ""
 msgid "Path to the keystore for the repo signing key"
 msgstr ""
 
+#: ../fdroidserver/dscanner.py
+msgid "Prepare Drozer to run a scan"
+msgstr ""
+
+msgid "Prepare drozer to run a scan"
+msgstr ""
+
 #: ../fdroidserver/nightly.py
 msgid "Print the secret variable to the terminal for easy copy/paste"
 msgstr ""
 
-#: ../fdroidserver/install.py
+#: ../fdroidserver/metadata.py
 #, python-brace-format
-msgid "Privacy mode was enabled based on your locale ({country_code})."
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-format
-msgid "Problem with ZIP file: %s, error %s"
+msgid "Problem with description of {appid}: {error}"
 msgstr ""
 
 #: ../fdroidserver/common.py
@@ -1408,7 +1402,11 @@ msgstr ""
 msgid "Produce human-readable XML/JSON for index files"
 msgstr ""
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/update.py
+msgid "Produce human-readable index.xml"
+msgstr ""
+
+#: ../fdroidserver/import.py
 msgid "Project URL to import from."
 msgstr ""
 
@@ -1420,25 +1418,21 @@ msgstr ""
 msgid "Push the log to this git remote repository"
 msgstr ""
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Pushing binary transparency log to {url}"
 msgstr ""
 
-#: ../fdroidserver/deploy.py
-msgid "Pushing to remote server failed!"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Pushing to {url}"
 msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Quickly start a new repository"
 msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Read all the metadata files and exit"
 msgstr ""
 
@@ -1449,12 +1443,14 @@ msgstr ""
 
 #: ../fdroidserver/common.py
 #, python-brace-format
-msgid "Reading packageName/versionCode/versionName failed, APK invalid: '{apkfilename}'"
+msgid "Reading minSdkVersion failed: \"{apkfilename}\""
 msgstr ""
 
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
+#. https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
 #: ../fdroidserver/common.py
 #, python-brace-format
-msgid "Reading packageName/versionCode/versionName failed,APK invalid: '{apkfilename}'"
+msgid "Reading packageName/versionCode/versionName failed, APK invalid: '{apkfilename}'"
 msgstr ""
 
 #: ../fdroidserver/update.py
@@ -1462,35 +1458,24 @@ msgstr ""
 msgid "Reading {apkfilename} from cache"
 msgstr ""
 
-#: ../fdroidserver/build.py
-msgid "Refresh and cache scanner rules and signatures from the network"
-msgstr ""
-
-#: ../fdroidserver/publish.py
-#, python-brace-format
-msgid "Refusing to sign '{path}', file exists in both {dir1} and {dir2} folder."
-msgstr ""
-
-#: ../fdroidserver/verify.py
-msgid "Remove source tarball and any APKs if successfully verified."
+#: ../fdroidserver/stats.py
+msgid "Recalculate aggregate stats - use when changes have been made that would invalidate old cached data."
 msgstr ""
 
 #: ../fdroidserver/common.py
 msgid "Removing specified files"
 msgstr ""
 
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Removing {path}\""
-msgstr ""
-
 #: ../fdroidserver/update.py
 msgid "Rename APK files that do not match package.name_123.apk"
 msgstr ""
 
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "RepoType {type} is deprecated, please switch to git."
+#: ../fdroidserver/update.py
+msgid "Report on build data status"
+msgstr ""
+
+#: ../fdroidserver/build.py
+msgid "Reset and create a brand new build server, even if the existing one appears to be ok."
 msgstr ""
 
 #: ../fdroidserver/nightly.py
@@ -1506,13 +1491,12 @@ msgstr ""
 msgid "Restrict output to warnings and errors"
 msgstr ""
 
-#: ../fdroidserver/net.py
-#, python-format
-msgid "Retrying failed download: %s"
+#: ../fdroid ../fdroidserver/__main__.py
+msgid "Rewrite all the metadata files"
 msgstr ""
 
-#: ../fdroidserver/__main__.py
-msgid "Rewrite all the metadata files"
+#: ../fdroidserver/rewritemeta.py
+msgid "Rewrite to a specific format: "
 msgstr ""
 
 #: ../fdroidserver/rewritemeta.py
@@ -1520,20 +1504,20 @@ msgstr ""
 msgid "Rewriting '{appid}'"
 msgstr ""
 
-#: ../fdroidserver/checkupdates.py
-msgid "Run on git repo that has uncommitted changes"
+#: ../fdroidserver/rewritemeta.py
+#, python-brace-format
+msgid "Rewriting '{appid}' to '{path}'"
 msgstr ""
 
-#: ../fdroidserver/nightly.py
-#, python-brace-format
-msgid "Run over {cibase} to find -debug.apk. and skip repo_basedir {repo_basedir}"
+#: ../fdroidserver/checkupdates.py
+msgid "Run on git repo that has uncommitted changes"
 msgstr ""
 
 #: ../fdroidserver/lint.py
 msgid "Run rewritemeta to fix formatting"
 msgstr ""
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 msgid "Running first pass with MD5 checking disabled"
 msgstr ""
 
@@ -1542,24 +1526,18 @@ msgstr ""
 msgid "Running wget in {path}"
 msgstr ""
 
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "SHA-256 of {url} does not match entry!"
+#: ../fdroidserver/dscanner.py
+msgid "Scan only the latest version of each package"
 msgstr ""
 
 #: ../fdroidserver/build.py
 msgid "Scan the resulting APK(s) for known non-free classes."
 msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Scan the source code of a package"
 msgstr ""
 
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Scanner found {count} problems in {apk}"
-msgstr ""
-
 #: ../fdroidserver/scanner.py
 #, python-brace-format
 msgid "Scanner found {count} problems in {appid}:"
@@ -1576,19 +1554,6 @@ msgid_plural "Scanner found {} problems"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../fdroidserver/scanner.py
-msgid "Scanning APK for extra signing blocks."
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "Scanning APK with dexdump for known non-free classes."
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Set NDK {release} ({version}) up"
-msgstr ""
-
 #: ../fdroidserver/common.py
 msgid "Set clock to that time using:"
 msgstr ""
@@ -1602,7 +1567,7 @@ msgstr ""
 msgid "Set open file limit to {integer}"
 msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Set up an app build for a nightly build repo"
 msgstr ""
 
@@ -1615,11 +1580,18 @@ msgstr ""
 msgid "Setting {0} sec timeout for this build"
 msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroidserver/build.py
+msgid "Setup an emulator, install the APK on it and perform a Drozer scan"
+msgstr ""
+
+msgid "Setup an emulator, install the apk on it and perform a drozer scan"
+msgstr ""
+
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Sign and place packages in the repo"
 msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Sign indexes created using update --nosign"
 msgstr ""
 
@@ -1632,11 +1604,6 @@ msgstr ""
 msgid "Skipping '{apkfilename}' with invalid signature!"
 msgstr ""
 
-#: ../fdroidserver/deploy.py ../fdroidserver/index.py
-#, python-format
-msgid "Skipping GitLab Pages mirror because the repo is too large (>%.2fGB)!"
-msgstr ""
-
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Skipping index generation for {appid}"
@@ -1652,14 +1619,23 @@ msgstr ""
 msgid "Skipping {appid}: disabled"
 msgstr ""
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/scanner.py
+#, python-brace-format
+msgid "Skipping {appid}: no builds specified"
+msgstr ""
+
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 msgid "Specify a local folder to sync the repo to"
 msgstr ""
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 msgid "Specify an identity file to provide to SSH for rsyncing"
 msgstr ""
 
+#: ../fdroidserver/build.py
+msgid "Specify that we're running on the build server"
+msgstr ""
+
 #: ../fdroidserver/nightly.py
 msgid "Specify which debug keystore file to use."
 msgstr ""
@@ -1668,6 +1644,11 @@ msgstr ""
 msgid "Spew out even more information than normal"
 msgstr ""
 
+#: ../fdroidserver/nightly.py
+#, python-brace-format
+msgid "Striping mystery signature from {apkfilename}"
+msgstr ""
+
 #: ../fdroidserver/nightly.py
 #, python-brace-format
 msgid "Stripping mystery signature from {apkfilename}"
@@ -1688,22 +1669,10 @@ msgstr ""
 msgid "System clock is older than date in {path}!"
 msgstr ""
 
-#: ../fdroidserver/checkupdates.py
-msgid "Tags update mode only works for git, hg, bzr and git-svn repositories currently"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "Tags update mode used in git-svn, but the repo was not set up with tags"
-msgstr ""
-
 #: ../fdroidserver/build.py
 msgid "Test mode - put output in the tmp directory only, and always build, even if the output already exists."
 msgstr ""
 
-#: ../fdroidserver/index.py
-msgid "The \"qrcode\" Python package is not installed (e.g. apt-get install python3-qrcode)!"
-msgstr ""
-
 #. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
 #: ../fdroidserver/update.py
 #, python-brace-format
@@ -1722,10 +1691,18 @@ msgstr ""
 msgid "The file to be included in the repo (path or glob)"
 msgstr ""
 
+#: ../fdroidserver/deploy.py
+msgid "The only commands currently supported are 'init' and 'update'"
+msgstr ""
+
 #: ../fdroidserver/index.py
 msgid "The repository's fingerprint does not match."
 msgstr ""
 
+#: ../fdroidserver/common.py
+msgid "The repository's index could not be verified."
+msgstr ""
+
 #: ../fdroidserver/deploy.py
 #, python-brace-format
 msgid "The root dir for local_copy_dir \"{path}\" does not exist!"
@@ -1739,37 +1716,13 @@ msgstr ""
 msgid "These are the apps that have been archived from the main repo."
 msgstr ""
 
-#: ../fdroidserver/mirror.py
-msgid "This command should never be used to mirror f-droid.org! A full copy requires more than 600GB."
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "This is a repository of apps to be used with F-Droid. Applications in this repository are either official binaries built by the original application developers, or are binaries built from source by the admin of f-droid.org using the tools on https://gitlab.com/fdroid."
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 #, python-format
 msgid "This repo already has local metadata: %s"
 msgstr ""
 
-#: ../fdroidserver/init.py
-#, python-format
-msgid ""
-"To complete the setup, add your APKs to \"%s\"\n"
-"then run \"fdroid update -c; fdroid update\".  You might also want to edit\n"
-"\"config.yml\" to set the URL, repo name, and more.  You should also set up\n"
-"a signing key (a temporary one might have been automatically generated).\n"
-"\n"
-"For more info: https://f-droid.org/docs/Setup_an_F-Droid_App_Repo\n"
-"and https://f-droid.org/docs/Signing_Process"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "To use awsbucket, awssecretkey and awsaccesskeyid must also be set in config.yml!"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "To use rclone, rclone_config and awsbucket must be set in config.yml!"
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
+msgid "To use awsbucket, awssecretkey and awsaccesskeyid must also be set in config.py!"
 msgstr ""
 
 #: ../fdroidserver/lint.py
@@ -1780,6 +1733,10 @@ msgstr ""
 msgid "URL shorteners should not be used"
 msgstr ""
 
+#: ../fdroidserver/metadata.py
+msgid "URL title is just the URL, use brackets: [URL]"
+msgstr ""
+
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "URL {url} in Description: {error}"
@@ -1793,15 +1750,16 @@ msgstr ""
 msgid "Unexpected license tag \"{}\"! Only use license tags configured in your config file"
 msgstr ""
 
-#: ../fdroidserver/common.py
+#: ../fdroidserver/metadata.py
 #, python-brace-format
-msgid "Unknown entry {key} in {configname}"
+msgid "Unexpected text on same line as {field} in {linedesc}"
 msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Unknown exception found!"
 msgstr ""
 
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "Unknown file '{filename}' in build '{versionName}'"
@@ -1812,6 +1770,11 @@ msgstr ""
 msgid "Unknown metadata format: %s"
 msgstr ""
 
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Unknown metadata format: {path}"
+msgstr ""
+
 #: ../fdroidserver/metadata.py
 #, python-brace-format
 msgid "Unknown metadata format: {path} (use: *.yml)"
@@ -1821,6 +1784,10 @@ msgstr ""
 msgid "Unknown version of aapt, might cause problems: "
 msgstr ""
 
+#: ../fdroidserver/lint.py
+msgid "Unlinkified link - use [http://foo.bar Link title] or [http://foo.bar]"
+msgstr ""
+
 #: ../fdroidserver/lint.py
 msgid "Unnecessary leading space"
 msgstr ""
@@ -1834,12 +1801,20 @@ msgstr ""
 msgid "Unrecognised app field '{fieldname}' in '{path}'"
 msgstr ""
 
+#: ../fdroidserver/metadata.py
+msgid "Unrecognised app field: "
+msgstr ""
+
 #: ../fdroidserver/metadata.py
 #, python-brace-format
 msgid "Unrecognised build flag '{build_flag}' in '{path}'"
 msgstr ""
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Unrecognised field '{field}' in {linedesc}"
+msgstr ""
+
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Unsupported file type \"{extension}\" for repo graphic"
@@ -1850,6 +1825,29 @@ msgstr ""
 msgid "Unsupported graphics file found: {path}"
 msgstr ""
 
+#: ../fdroidserver/rewritemeta.py
+#, python-brace-format
+msgid "Unsupported metadata format, use: --to [{supported}]"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+msgid "Unterminated ]"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+msgid "Unterminated ]]"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Unterminated build in {name}"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Unterminated continuation in {name}"
+msgstr ""
+
 #: ../fdroidserver/lint.py
 #, python-format
 msgid "Unused extlib at %s"
@@ -1870,25 +1868,27 @@ msgstr ""
 msgid "Unused scanignore path: %s"
 msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Update repo information for new packages"
 msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Update the binary transparency log for a URL"
 msgstr ""
 
+#: ../fdroid ../fdroidserver/__main__.py
+msgid "Update the stats of the repo"
+msgstr ""
+
+#: ../fdroidserver/update.py ../fdroidserver/build.py
+msgid "Update the wiki"
+msgstr ""
+
 #: ../fdroidserver/checkupdates.py
 #, python-brace-format
 msgid "UpdateCheckData has invalid URL: {url}"
 msgstr ""
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "UpdateCheckData must match the version code as integer (\\d or [0-9]): {codeex}"
-msgstr ""
-
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "UpdateCheckData must use HTTPS URL: {url}"
@@ -1900,10 +1900,14 @@ msgid "UpdateCheckData not a valid URL: {url}"
 msgstr ""
 
 #: ../fdroidserver/lint.py
-msgid "UpdateCheckMode is set but it looks like checkupdates hasn't been run yet."
+msgid "UpdateCheckMode is set but it looks like checkupdates hasn't been run yet"
+msgstr ""
+
+#. Translators: https://developer.android.com/studio/build/application-id
+#: ../fdroidserver/lint.py
+msgid "UpdateCheckName is set to the known application ID - it can be removed"
 msgstr ""
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
 #: ../fdroidserver/lint.py
 msgid "UpdateCheckName is set to the known application ID, it can be removed"
 msgstr ""
@@ -1918,8 +1922,19 @@ msgstr ""
 msgid "Uploading {apkfilename} to virustotal"
 msgstr ""
 
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "Usage"
+msgstr ""
+
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, python-format
+msgid "Usage: %s\n"
+msgstr ""
+
 #: ../fdroidserver/lint.py
-msgid "Use /HEAD instead of /master or /main to point at a file in the default branch"
+msgid "Use /HEAD instead of /master to point at a file in the default branch"
 msgstr ""
 
 #: ../fdroidserver/update.py
@@ -1934,14 +1949,12 @@ msgstr ""
 msgid "Use date from APK instead of current time for newly added APKs"
 msgstr ""
 
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Using \"{path}\" for configuring s3cmd."
+msgid "Use date from apk instead of current time for newly added apks"
 msgstr ""
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
-msgid "Using \"{path}\" for syncing with remote storage."
+msgid "Using \"{path}\" for configuring s3cmd."
 msgstr ""
 
 #: ../fdroidserver/common.py
@@ -1952,17 +1965,13 @@ msgstr ""
 msgid "Using APK Signature v3"
 msgstr ""
 
-#: ../fdroidserver/common.py
-msgid "Using JAR Signature"
-msgstr ""
-
 #: ../fdroidserver/common.py
 msgid "Using Java's jarsigner, not recommended for verifying APKs! Use apksigner"
 msgstr ""
 
-#: ../fdroidserver/metadata.py
+#: ../fdroidserver/common.py
 #, python-brace-format
-msgid "Using blank dictionary instead of contents of {path}!"
+msgid "Using androguard from \"{path}\""
 msgstr ""
 
 #: ../fdroidserver/init.py
@@ -1970,17 +1979,12 @@ msgstr ""
 msgid "Using existing keystore \"{path}\""
 msgstr ""
 
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Using rclone to sync with: {url}"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Using s3cmd to sync with: {url}"
 msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Valid commands are:"
 msgstr ""
 
@@ -1988,7 +1992,7 @@ msgstr ""
 msgid "Verify against locally cached copy rather than redownloading."
 msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Verify the integrity of downloaded packages"
 msgstr ""
 
@@ -1996,28 +2000,15 @@ msgstr ""
 msgid "Verifying index signature:"
 msgstr ""
 
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "Verifying package {path} with apksigner."
-msgstr ""
-
 #: ../fdroidserver/deploy.py
 #, python-brace-format
 msgid "VirusTotal API key cannot upload files larger than 32MB, use {url} to upload {path}."
 msgstr ""
 
-#: ../fdroidserver/nightly.py
-msgid "WARNING: only public git repos are supported!"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Warn about possible metadata errors"
 msgstr ""
 
-#: ../fdroidserver/scanner.py
-msgid "WebAssembly binary file"
-msgstr ""
-
 #: ../fdroidserver/update.py
 msgid "When configured for signed indexes, create only unsigned indexes at this stage"
 msgstr ""
@@ -2026,16 +2017,7 @@ msgstr ""
 msgid "When linting the entire repository yamllint is disabled by default. This option forces yamllint regardless."
 msgstr ""
 
-#: ../fdroidserver/publish.py
-msgid "When signing or verifying fails, exit with an error code."
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "Would you like to download and install F-Droid.apk via adb? (YES/no)"
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "Would you like to download the app(s) from f-droid.org? (YES/no)"
+msgid "X.509 'Distiguished Name' used when generating keys"
 msgstr ""
 
 #: ../fdroidserver/init.py
@@ -2050,11 +2032,6 @@ msgstr ""
 msgid "ZIP file archive"
 msgstr ""
 
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "adb reports {serial} is \"{status}\"!"
-msgstr ""
-
 #: ../fdroidserver/nightly.py
 #, python-brace-format
 msgid "adding IdentityFile to {path}"
@@ -2065,66 +2042,70 @@ msgstr ""
 msgid "adding to {name}: {path}"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "ambiguous option: %(option)s could match %(matches)s"
 msgstr ""
 
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "apksigner in build-tools;{version} passes APKs with invalid v3 signatures, ignoring."
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "apksigner not found! Cannot sign or verify modern APKs"
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, python-format
+msgid "ambiguous option: %s (%s?)"
 msgstr ""
 
 #: ../fdroidserver/common.py
 msgid "apksigner not found, it's required for signing!"
 msgstr ""
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/checkupdates.py ../fdroidserver/lint.py
-#: ../fdroidserver/rewritemeta.py
+#: ../fdroidserver/lint.py ../fdroidserver/rewritemeta.py
+#: ../fdroidserver/checkupdates.py
 msgid "application ID of file to operate on"
 msgstr ""
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/build.py ../fdroidserver/install.py
-#: ../fdroidserver/publish.py ../fdroidserver/scanner.py
-#: ../fdroidserver/verify.py
+#: ../fdroidserver/verify.py ../fdroidserver/publish.py
+#: ../fdroidserver/build.py ../fdroidserver/scanner.py
+#: ../fdroidserver/install.py
 msgid "application ID with optional versionCode in the form APPID[:VERCODE]"
 msgstr ""
 
-#: ../fdroidserver/common.py
-msgid "archive_url needs to end with /archive"
+#: ../fdroidserver/lint.py ../fdroidserver/rewritemeta.py
+msgid "applicationId in the form APPID"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: ../fdroidserver/checkupdates.py
+msgid "applicationId to check for updates"
+msgstr ""
+
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
+#: ../fdroidserver/verify.py ../fdroidserver/publish.py
+#: ../fdroidserver/dscanner.py ../fdroidserver/build.py
+#: ../fdroidserver/scanner.py ../fdroidserver/install.py
+msgid "applicationId with optional versionCode in the form APPID[:VERCODE]"
+msgstr ""
+
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "argument \"-\" with mode %r"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "argument %(argument_name)s: %(message)s"
-msgstr ""
-
 #: ../fdroidserver/nightly.py
 msgid "attempting bare SSH connection to test deploy key:"
 msgstr ""
 
+#: ../fdroidserver/nightly.py
+msgid "attempting bare ssh connection to test deploy key:"
+msgstr ""
+
 #: ../fdroidserver/common.py
 msgid "can not parse scrlib spec (not a string): '{}'"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
-msgid "can't open '%(filename)s': %(error)s"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "can't open non-https url: '{};"
+msgid "can't open '%s': %s"
 msgstr ""
 
 #: ../fdroidserver/build.py
@@ -2132,11 +2113,13 @@ msgstr ""
 msgid "cannot find required srclibs: \"{path}\""
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "cannot have multiple subparser arguments"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "cannot merge actions - two groups are named %r"
 msgstr ""
@@ -2150,25 +2133,30 @@ msgstr ""
 msgid "cloning {url}"
 msgstr ""
 
+#: ../fdroidserver/deploy.py
+msgid "command to execute, either 'init' or 'update'"
+msgstr ""
+
 #: ../fdroidserver/__main__.py
 msgid "commands from plugin modules:"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "complex"
+msgstr ""
+
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "conflicting option string: %s"
 msgid_plural "conflicting option strings: %s"
 msgstr[0] ""
 msgstr[1] ""
 
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "conflicting subparser alias: %s"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "conflicting subparser: %s"
+#: ../fdroidserver/nightly.py
+#, python-brace-format
+msgid "copying {apkfilename} into {path}"
 msgstr ""
 
 #: ../fdroidserver/metadata.py
@@ -2177,11 +2165,11 @@ msgid "could not parse '{path}'"
 msgstr ""
 
 #: ../fdroidserver/common.py
-msgid "could not parse srclib spec (no name specified): '{}'"
+msgid "could not parse srclib spec (no ref specified): '{}'"
 msgstr ""
 
 #: ../fdroidserver/common.py
-msgid "could not parse srclib spec (no ref specified): '{}'"
+msgid "could not parse srclib spec (too many '@' signs): '{}'"
 msgstr ""
 
 #: ../fdroidserver/nightly.py
@@ -2189,18 +2177,14 @@ msgstr ""
 msgid "created {path}"
 msgstr ""
 
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "current version is newer: old vercode={old}, new vercode={new}"
-msgstr ""
-
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "deleting: repo/{apkfilename}"
 msgstr ""
 
-#: ../fdroidserver/scanner.py
-msgid "dependency file without lock"
+#: ../fdroidserver/common.py
+#, python-brace-format
+msgid "deployed build logs to '{path}'"
 msgstr ""
 
 #: ../fdroidserver/common.py
@@ -2208,48 +2192,59 @@ msgstr ""
 msgid "deployed process log {path} to {dest}"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "dest= is required for options like %r"
 msgstr ""
 
-#: ../fdroidserver/scanner.py
-msgid "downloading '{}'"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "downloading scanner signatures from '{}' failed"
-msgstr ""
-
 #: ../fdroidserver/scanner.py
 msgid "executable binary, possibly code"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "expected %s argument"
 msgid_plural "expected %s arguments"
 msgstr[0] ""
 msgstr[1] ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "expected at least one argument"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "expected at most one argument"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "expected one argument"
 msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroidserver/common.py
+#, python-brace-format
+msgid "failed deploying build logs to '{path}'"
+msgstr ""
+
+#: ../fdroid
+msgid "fdroid [-h|--help|--version] <command> [<args>]"
+msgstr ""
+
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "fdroid [<command>] [-h|--help|--version|<args>]"
 msgstr ""
 
-#: ../fdroidserver/scanner.py
-msgid "fetch the latest version of signatures from the web"
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "floating-point"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+msgid "force errors to be warnings, or ignore"
 msgstr ""
 
 #: ../fdroidserver/metadata.py
@@ -2264,7 +2259,8 @@ msgstr ""
 msgid "gzip file archive"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "ignored explicit argument %r"
 msgstr ""
@@ -2273,39 +2269,35 @@ msgstr ""
 msgid "index-v1 must have a signature, use `fdroid signindex` to create it!"
 msgstr ""
 
-#: ../fdroidserver/index.py
-msgid "index-v2 must have a signature, use `fdroid signindex` to create it!"
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "integer"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "invalid %(type)s value: %(value)r"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "invalid choice: %(value)r (choose from %(choices)s)"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "invalid conflict_resolution value: %r"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "invalid option string %(option)r: must start with a character %(prefix_chars)r"
 msgstr ""
 
-#: ../fdroidserver/common.py
-msgid "ipfs_cid not found, skipping CIDv1 generation"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "latest build recipe is newer: old vercode={old}, new vercode={new}"
-msgstr ""
-
 #: ../fdroidserver/deploy.py
 #, python-brace-format
 msgid "local_copy_dir does not end with \"fdroid\", perhaps you meant: \"{path}\""
@@ -2324,20 +2316,11 @@ msgstr ""
 msgid "mirror '%s' does not end with 'fdroid'!"
 msgstr ""
 
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "mirrors set twice, in config.yml and {path}!"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "mutually exclusive arguments must be optional"
 msgstr ""
 
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "next {name} cache update due in {time}"
-msgstr ""
-
 #: ../fdroidserver/mirror.py
 #, python-brace-format
 msgid "no \"icon\" in {appid}"
@@ -2347,35 +2330,97 @@ msgstr ""
 msgid "no APK supplied"
 msgstr ""
 
-#: ../fdroidserver/checkupdates.py
-msgid "no version information found"
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, python-format
+msgid "no such option: %s"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: ../fdroid ../fdroidserver/__main__.py
+msgid "no version info found!"
+msgstr ""
+
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "not allowed with argument %s"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "one of the arguments %s is required"
 msgstr ""
 
-#: ../fdroidserver/common.py ../fdroidserver/index.py
+#: ../fdroidserver/index.py ../fdroidserver/common.py
 msgid "only accepts strings, lists, and tuples"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
-#, fuzzy
-msgid "options"
-msgstr "%prog [opciones]"
+#: ../fdroidserver/install.py
+#, python-format
+msgid "option %s: If you really want to install all the signed apps, use --all"
+msgstr ""
+
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, python-format
+msgid "option %s: invalid %s value: %r"
+msgstr ""
+
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, python-format
+msgid "option %s: invalid choice: %r (choose from %s)"
+msgstr ""
+
+#: /usr/lib/python3.5/getopt.py /usr/lib/python3.6/getopt.py
+#: /usr/lib/python3.7/getopt.py
+#, python-format
+msgid "option -%s not recognized"
+msgstr ""
+
+#: /usr/lib/python3.5/getopt.py /usr/lib/python3.6/getopt.py
+#: /usr/lib/python3.7/getopt.py
+#, python-format
+msgid "option -%s requires argument"
+msgstr ""
+
+#: /usr/lib/python3.5/getopt.py /usr/lib/python3.6/getopt.py
+#: /usr/lib/python3.7/getopt.py
+#, python-format
+msgid "option --%s must not have an argument"
+msgstr ""
+
+#: /usr/lib/python3.5/getopt.py /usr/lib/python3.6/getopt.py
+#: /usr/lib/python3.7/getopt.py
+#, python-format
+msgid "option --%s not a unique prefix"
+msgstr ""
+
+#: /usr/lib/python3.5/getopt.py /usr/lib/python3.6/getopt.py
+#: /usr/lib/python3.7/getopt.py
+#, python-format
+msgid "option --%s not recognized"
+msgstr ""
+
+#: /usr/lib/python3.5/getopt.py /usr/lib/python3.6/getopt.py
+#: /usr/lib/python3.7/getopt.py
+#, python-format
+msgid "option --%s requires argument"
+msgstr ""
+
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
+msgid "optional arguments"
+msgstr ""
 
 #: ../fdroidserver/nightly.py
 #, python-brace-format
 msgid "overwriting existing {path}"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "positional arguments"
 msgstr ""
 
@@ -2384,53 +2429,42 @@ msgstr ""
 msgid "process log deploy {path} to {dest} failed!"
 msgstr ""
 
-#: ../fdroidserver/build.py
-msgid "reference binary missing signature"
-msgstr ""
-
 #: ../fdroidserver/signatures.py
 #, python-brace-format
 msgid "refuse downloading via insecure HTTP connection (use HTTPS or specify --no-https-check): {apkfilename}"
 msgstr ""
 
+#: ../fdroidserver/signatures.py
+#, python-brace-format
+msgid "refuse downloading via insecure http connection (use https or specify --no-https-check): {apkfilename}"
+msgstr ""
+
 #: ../fdroidserver/index.py
 #, python-format
-msgid "repo_icon \"repo/icons/%s\" does not exist, generating placeholder."
+msgid "repo_icon %s does not exist, generating placeholder."
 msgstr ""
 
-#: ../fdroidserver/common.py
-msgid "repo_url needs to end with /repo"
+#: ../fdroidserver/metadata.py
+msgid "ruamel.yaml not installed, can not write metadata."
 msgstr ""
 
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "rsync is missing or broken: {error}"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "s3cmd sync indexes {path} to {url} and delete"
 msgstr ""
 
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "s3cmd syncs indexes from {path} to {url} and deletes removed"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "scanner cache is malformed! You can clear it with: '{clear}'"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "serverwebroot: path does not end with \"fdroid\", perhaps you meant one of these:"
-msgstr ""
-
 #: ../fdroidserver/scanner.py
 msgid "shared library"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "show program's version number and exit"
+msgstr ""
+
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.5/optparse.py
+#: /usr/lib/python3.6/argparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/argparse.py /usr/lib/python3.7/optparse.py
 msgid "show this help message and exit"
 msgstr ""
 
@@ -2459,31 +2493,31 @@ msgstr ""
 msgid "static library"
 msgstr ""
 
-#: ../fdroidserver/build.py
+#: ../fdroidserver/common.py
 #, python-brace-format
-msgid "supplied reference binary has allowed signer {signer}"
+msgid "supplied timestamp value '{timestamp}' is not a unix timestamp"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "the following arguments are required: %s"
 msgstr ""
 
-#: ../fdroidserver/install.py
-msgid "true"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "unexpected option string: %s"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "unknown parser %(parser_name)r (choices: %(choices)s)"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "unrecognized arguments: %s"
 msgstr ""
@@ -2493,11 +2527,16 @@ msgstr ""
 msgid "unsafe permissions on '{config_file}' (should be 0600)!"
 msgstr ""
 
-#: ../fdroidserver/__main__.py /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py ../fdroid
+#: /usr/lib/python3.7/argparse.py ../fdroidserver/__main__.py
 msgid "usage: "
 msgstr ""
 
-#: ../fdroidserver/deploy.py
+#: ../fdroid
+msgid "usage: fdroid [-h|--help|--version] <command> [<args>]"
+msgstr ""
+
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "using Apache libcloud to sync with {url}"
 msgstr ""
@@ -2506,8 +2545,8 @@ msgstr ""
 msgid "virustotal.com is rate limiting, waiting to retry..."
 msgstr ""
 
-#: ../fdroidserver/install.py
-msgid "yes"
+#: ../fdroidserver/update.py
+msgid "wiki support is deprecated and will be removed in the next release!"
 msgstr ""
 
 #: ../fdroidserver/publish.py
@@ -2522,19 +2561,31 @@ msgstr[1] ""
 msgid "{apkfilename} ({appid}) has no metadata!"
 msgstr ""
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
+#: ../fdroidserver/update.py
+#, python-brace-format
+msgid "{apkfilename} has multiple {name} files, looks like Master Key exploit!"
+msgstr ""
+
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "{apkfilename}'s AndroidManifest.xml has a bad date: "
 msgstr ""
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "{appid} does not have a name! Using application ID instead."
 msgstr ""
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
+#: ../fdroidserver/update.py
+#, python-brace-format
+msgid "{appid} does not have a name! Using package name instead."
+msgstr ""
+
+#: ../fdroidserver/update.py
+#, python-brace-format
+msgid "{appid} from {path} is not a valid Android Package Name!"
+msgstr ""
+
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "{appid} from {path} is not a valid Android application ID!"
@@ -2545,16 +2596,12 @@ msgstr ""
 msgid "{appid} from {path} is not a valid Java Package Name!"
 msgstr ""
 
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{appid} has both APKs and files: {files}"
-msgstr ""
-
 #: ../fdroidserver/mirror.py
 #, python-brace-format
 msgid "{appid} is missing {name}"
 msgstr ""
 
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "{appid}: Unknown extlib {path} in build '{versionName}'"
@@ -2582,7 +2629,7 @@ msgstr ""
 
 #: ../fdroidserver/metadata.py
 #, python-brace-format
-msgid "{build_flag} must be list or string, found: {value}"
+msgid "{field} not terminated in {name}"
 msgstr ""
 
 #: ../fdroidserver/metadata.py
@@ -2592,15 +2639,10 @@ msgstr ""
 
 #: ../fdroidserver/update.py
 #, python-brace-format
-msgid "{name} \"{section}/icons/{path}\" does not exist! Check \"config.yml\"."
+msgid "{name} \"{path}\" does not exist! Correct it in config.py."
 msgstr ""
 
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{path1} is a duplicate of {path2}, remove one!"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 #, python-brace-format
 msgid "{path} already exists, ignoring import results!"
 msgstr ""
@@ -2615,36 +2657,6 @@ msgstr ""
 msgid "{path} has bad file signature \"{pattern}\", possible Janus exploit!"
 msgstr ""
 
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "{path} has been flagged by virustotal {count} times:"
-msgstr ""
-
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "{path} has the wrong fingerprint ({fingerprint})!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "{path} is not \"key: value\" dict, but a {datatype}!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "{path} is not a standard config file!"
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "{path} is not list, but a {datatype}!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "{path} is not {expected_type}, but a {datatype}!"
-msgstr ""
-
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "{path} is zero size!"
@@ -2655,22 +2667,12 @@ msgstr ""
 msgid "{path} more than 200MB, manually upload: {url}"
 msgstr ""
 
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "{path}: \"{code}\" is not a valid ISO_3166-1 alpha-2 country code!"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{path}: {error}"
-msgstr ""
-
 #: ../fdroidserver/mirror.py
 #, python-brace-format
 msgid "{url} does not end with \"fdroid\", check the URL path!"
 msgstr ""
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/common.py
 #, python-brace-format
 msgid "{url} does not start with \"http\"!"
 msgstr ""
diff --git a/locale/eu/LC_MESSAGES/fdroidserver.po b/locale/eu/LC_MESSAGES/fdroidserver.po
deleted file mode 100644
index 4cb555c2..00000000
--- a/locale/eu/LC_MESSAGES/fdroidserver.po
+++ /dev/null
@@ -1,2681 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# This file is put in the public domain.
-# Gontzal Manuel Pujana Onaindia <thadahdenyse@gmail.com>, 2020.
-msgid ""
-msgstr ""
-"Project-Id-Version: fdroidserver 2.0a0-62-gc63c4b3d\n"
-"Report-Msgid-Bugs-To: https://gitlab.com/fdroid/fdroidserver/issues\n"
-"POT-Creation-Date: 2025-06-25 09:52+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: Automatically generated\n"
-"Language-Team: none\n"
-"Language: eu\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=n != 1;\n"
-
-#: ../fdroidserver/nightly.py
-msgid ""
-"\n"
-"SSH public key to be used as deploy key:"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-#, python-brace-format
-msgid ""
-"\n"
-"{path} encoded for the DEBUG_KEYSTORE secret variable:"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-format
-msgid "\"%s/\" has no matching metadata file!"
-msgstr ""
-
-#: ../fdroidserver/index.py
-msgid "\"isPrimary\" key should not be added to mirrors!"
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "\"local_copy_dir\" {path} does not exist!"
-msgstr ""
-
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "\"{apkfilename}\" is already installed on {dev}."
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "\"{path}\" contains recent {name} ({version})"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "\"{path}\" exists but s3cmd is not installed!"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "\"{path}\" is not a supported file format (use: metadata/*.yml)"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "\"{path}\" is signed by a key that is not allowed:"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
-#, python-brace-format
-msgid "\"{url}\" is not a valid URL!"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "%(prog)s: error: %(message)s\n"
-msgstr ""
-
-#: ../fdroidserver/publish.py
-#, python-format
-msgid "%d APKs failed to be signed or verified!"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-format
-msgid "%d problems found"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "%r is not callable"
-msgstr ""
-
-#: ../fdroidserver/signindex.py
-#, python-format
-msgid "%s did not produce a dict!"
-msgstr ""
-
-#: ../fdroidserver/signindex.py
-#, python-format
-msgid "%s has bad SHA-256: %s"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-format
-msgid "%s is not an accepted build field"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "'keypass' not found in config.yml!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "'keystore' is NONE and 'smartcardoptions' is blank!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "'keystore' not found in config.yml!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "'keystorepass' not found in config.yml!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "'repo_keyalias' not found in config.yml!"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-msgid "'required' is an invalid argument for positionals"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "'sdk_path' not set in config.yml!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "'{aapt}' is too old, fdroid requires build-tools-{version} or newer!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "'{path}' failed to execute!"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "'{path}' has invalid format, it should be a dictionary!"
-msgstr ""
-
-#: ../fdroidserver/lint.py ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "'{value}' is not a valid {field} in {appid}. Regex pattern: {pattern}"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "'{value}' is not a valid {field}, should be {pattern}"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "--merge-request only runs on a single appid!"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "...checkupdate failed for {appid} : {error}"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-msgid ".__call__() not defined"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "/issues is missing"
-msgstr ""
-
-#: ../fdroidserver/mirror.py
-msgid "A URL is required as an argument!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "APK signatures have different certificates in {path}:"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Add PGP signatures using GnuPG for packages in repo"
-msgstr ""
-
-#: ../fdroidserver/update.py
-msgid "Add a repo signing key to an unsigned repo"
-msgstr ""
-
-#: ../fdroidserver/update.py
-msgid "Add skeleton metadata files for APKs that are missing them"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Adding new repo for only {name}"
-msgstr ""
-
-#: ../fdroidserver/init.py
-msgid "Alias of the repo signing key in the keystore"
-msgstr ""
-
-#: ../fdroidserver/build.py
-msgid "AllowedAPKSigningKeys missing but reference binary supplied"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
-msgid "Allows a different revision (or git branch) to be specified for the initial import"
-msgstr ""
-
-#: ../fdroidserver/mirror.py
-msgid "Also mirror the full archive section"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Also warn about formatting issues, like rewritemeta -l"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "Android AAR library"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "Android APK file"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "Android DEX code"
-msgstr ""
-
-#: ../fdroidserver/init.py
-#, python-brace-format
-msgid "Android SDK not found at {path}!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Android SDK path '{path}' does not exist!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Android SDK path '{path}' is not a directory!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Android SDK tool {cmd} not found!"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "App has Binaries but does not have corresponding AllowedAPKSigningKeys to pin certificate."
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "App has NoSourceSince or ArchivePolicy \"0 versions\" or 0 but AutoUpdateMode or UpdateCheckMode are not None"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "App is in '{repo}' but has a link to {url}"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "App version has binary but does not have corresponding AllowedAPKSigningKeys to pin certificate."
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Appending .git is not necessary"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Archiving {apkfilename} with invalid signature!"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "AutoUpdateMode with UpdateCheckMode: HTTP must have a pattern."
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "Automatic no to all prompts."
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "Automatic yes to all prompts."
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "Bad entry type \"{mirrortype}\" in mirrors config: {mirror}"
-msgstr ""
-
-#: ../fdroidserver/mirror.py
-msgid "Base URL to mirror, can include the index signing key using the query string: ?fingerprint="
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Branch '{branch}' used as commit in build '{versionName}'"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Branch '{branch}' used as commit in srclib '{srclib}'"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Broken symlink: {path}"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Build a package from source"
-msgstr ""
-
-#: ../fdroidserver/build.py
-msgid "Build all applications available"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Build generated by `fdroid import` - remove disable line once ready"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "Build metadata git repo has uncommited changes!"
-msgstr ""
-
-#: ../fdroidserver/build.py
-msgid "Build only the latest version of each package"
-msgstr ""
-
-#: ../fdroidserver/init.py
-#, python-format
-msgid "Built repo based in \"%s\" with this config:"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "Can't auto-update app with no CurrentVersionCode"
-msgstr ""
-
-#: ../fdroidserver/build.py
-msgid "Can't build due to {} error while scanning"
-msgid_plural "Can't build due to {} errors while scanning"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Cannot read {path}: {error}"
-msgstr ""
-
-#: ../fdroidserver/rewritemeta.py
-#, python-brace-format
-msgid "Cannot rewrite \"{path}\""
-msgstr ""
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
-#: ../fdroidserver/lint.py
-#, python-format
-msgid "Categories '%s' is not valid"
-msgstr ""
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
-#: ../fdroidserver/lint.py
-msgid "Categories are not set"
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "Category \"{category}\" defined but not used for any apps!"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Check for updates to applications"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Checking archiving for {appid} - apks:{integer}, keepversions:{keep}, archapks:{arch}"
-msgstr ""
-
-#: ../fdroidserver/update.py
-msgid "Clean update - don't uses caches, reprocess all APKs"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Color the log output"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
-msgid "Comma separated list of categories."
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-#, python-format
-msgid "Command '%s' not recognised.\n"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "Commit changes"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "Commit changes, push, then make a merge request"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Conflicting \"{field}\" definitions between .yml and localized files:"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Conflicting arguments: '--verbose' and '--quiet' can not be specified at the same time."
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Could not find '{command}' on your system"
-msgstr ""
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/import_subcommand.py
-msgid "Could not find latest version code"
-msgstr ""
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
-#: ../fdroidserver/import_subcommand.py
-msgid "Could not find latest version name"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Could not find {path} to remove it"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Could not open APK {path} for analysis: "
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Could not parse size \"{size}\", wrong type \"{type}\""
-msgstr ""
-
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/import_subcommand.py
-msgid "Couldn't find Application ID"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "Couldn't find any version information"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "Couldn't find package ID"
-msgstr ""
-
-#: ../fdroidserver/update.py
-msgid "Cowardily refusing to overwrite existing signing key setup!"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Created new container \"{name}\""
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Creating \"{path}\" for configuring s3cmd."
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Creating empty {config_file}"
-msgstr ""
-
-#: ../fdroidserver/publish.py
-msgid "Creating log directory"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Creating new S3 bucket: {url}"
-msgstr ""
-
-#: ../fdroidserver/publish.py
-msgid "Creating output directory"
-msgstr ""
-
-#: ../fdroidserver/index.py
-msgid "Creating signed index with this key (SHA256):"
-msgstr ""
-
-#: ../fdroidserver/publish.py ../fdroidserver/verify.py
-msgid "Creating temporary directory"
-msgstr ""
-
-#: ../fdroidserver/index.py
-msgid "Creating unsigned index in preparation for signing"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "CurrentVersionCode {cv} is less than oldest build entry {versionCode}"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-msgid "DEBUG_KEYSTORE is not set or the value is incomplete"
-msgstr ""
-
-#: ../fdroidserver/update.py
-msgid "Delete APKs and/or OBBs without metadata from the repo"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Deleting archive, repo is too big ({size} max {limit})"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Deleting git-mirror history, repo is too big ({size} max {limit})"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Deleting unknown file: {path}"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-format
-msgid "Description '%s' is just the app's summary"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Description has a duplicate line"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Description of length {length} is over the {limit} char limit"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Did you mean config/{name}.yml?"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Did you mean {code}?"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
-msgid "Do not add 'disable:' to the generated build entries"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-msgid "Do not deploy the new files to the repo"
-msgstr ""
-
-#: ../fdroidserver/mirror.py
-#, python-brace-format
-msgid "Do not include \"{path}\" in URL!"
-msgstr ""
-
-#: ../fdroidserver/init.py
-msgid "Do not prompt for Android SDK path, just fail"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-msgid "Do not remove the private keys generated from the keystore"
-msgstr ""
-
-#: ../fdroidserver/build.py
-msgid "Don't create a source tarball, useful when testing a build"
-msgstr ""
-
-#: ../fdroidserver/build.py
-msgid "Don't refresh the repository, useful when testing a build with no internet connection"
-msgstr ""
-
-#: ../fdroidserver/deploy.py ../fdroidserver/nightly.py
-msgid "Don't use rsync checksums"
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "Download F-Droid.apk using mirrors that leak less to the network"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Download complete mirrors of small repos"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Downloading the repository already failed once, not trying again."
-msgstr ""
-
-#: ../fdroidserver/verify.py
-#, python-brace-format
-msgid "Downloading {url} failed. {error}"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Duplicate Anti-Feature declaration at {path} was ignored!"
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-format
-msgid "Duplicate entry \"%s\" in mirrors config!"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Duplicate link in '{field}': {url}"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-format
-msgid "ERROR: %(message)s"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "ERROR: The \"server\" subcommand has been removed, use \"deploy\"!"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-msgid "ERROR: unsupported CI type, patches welcome!"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-#, python-format
-msgid "ERROR: unsupported git host \"%s\", patches welcome!"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "ERROR: {key} in {path} is not \"archive\" or \"repo\"!"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "ERROR: {key} not a valid key!"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "ERROR: {key}'s value should be of type {t}!"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "ERROR: {key}:{subkey} in {path} is not in allowed keys: {allowed_keys}!"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-#, python-brace-format
-msgid "Encoding is set to '{enc}' fdroid might run into encoding issues. Please set it to 'UTF-8' for best results."
-msgstr ""
-
-#: ../fdroidserver/init.py
-#, python-format
-msgid ""
-"Enter the path to the Android SDK (%s) here:\n"
-"> "
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Environment variable {var} from {configname} is not set!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Environment variable {{env: {var}}} is not set!"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "Error deploying 'github_releases', {} not present. (You might need to run `fdroid update` first.)"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
-msgid "Error while getting repo address"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "Exit with a non-zero code if problems were found"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Extract application metadata from a source repository"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Extract signatures from APKs"
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "F-Droid.apk could not be downloaded from any known source!"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Failed copying {path}: {error}"
-msgstr ""
-
-#: ../fdroidserver/signatures.py
-#, python-brace-format
-msgid "Failed fetching signatures for '{apkfilename}': {error}"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Failed reading {path}: {error}"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Failed resizing {path}: {error}"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Failed to create S3 bucket: {url}"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Failed to get APK information, deleting {path}"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Failed to get APK information, skipping {path}"
-msgstr ""
-
-#: ../fdroidserver/update.py
-msgid "Failed to get APK signing key fingerprint"
-msgstr ""
-
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "Failed to install '{apkfilename}' on {dev}: {error}"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Failed to sign application"
-msgstr ""
-
-#: ../fdroidserver/build.py
-#, python-brace-format
-msgid "Fetched buildserverid from VM: {buildserverid}"
-msgstr ""
-
-#: ../fdroidserver/signatures.py
-#, python-brace-format
-msgid "Fetched signatures for '{apkfilename}' -> '{sigdir}'"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "File disappeared while processing it: {path}"
-msgstr ""
-
-#: ../fdroidserver/build.py ../fdroidserver/install.py
-#: ../fdroidserver/rewritemeta.py ../fdroidserver/scanner.py
-#: ../fdroidserver/update.py
-msgid "Finished"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Forbidden HTML tags"
-msgstr ""
-
-#: ../fdroidserver/build.py
-msgid "Force build of disabled apps, and carries on regardless of scan problems. Only allowed in test mode."
-msgstr ""
-
-#: ../fdroidserver/build.py
-#, python-brace-format
-msgid "Force halting build after {0} sec timeout!"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "Force scan of disabled apps and builds."
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Found \"{path}\" graphic without metadata for app \"{name}\"!"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Found bad funding file \"{path}\" for \"{name}\":"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Found invalid appids in arguments"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Found invalid versionCodes for some apps"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Found multiple JAR Signature Block Files in {path}"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Found multiple Signer Certificates!"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Found multiple metadata files for {appid}"
-msgstr ""
-
-#: ../fdroidserver/index.py
-msgid "Found multiple signing certificates for repository."
-msgstr ""
-
-#: ../fdroidserver/index.py
-msgid "Found no signing certificates for repository."
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-format
-msgid "Found non-file at %s"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Found {apkfilename} at {url}"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Found {count} problems in {filename}"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Found {count} warnings in {filename}"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Generated skeleton metadata for {appid}"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-format
-msgid "Git checkout of '%s' failed"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Git clean failed"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Git fetch failed"
-msgstr ""
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/common.py
-#, python-format
-msgid "Git remote set-head failed: \"%s\""
-msgstr ""
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/common.py
-msgid "Git reset failed"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Git submodule deinit failed"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Git submodule sync failed"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Git submodule update failed"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "HTTPS must be used with Subversion URLs!"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "If a git mirror gets to big, allow the archive to be deleted"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "If this upload fails, try manually uploading to {url}"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Ignoring '{field}' in '{metapath}' metadata because it is deprecated."
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-format
-msgid "Ignoring FUNDING.yml entry longer than 2048: %s"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-format
-msgid "Ignoring bad element in manifest: %s"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Ignoring deprecated {oldfile}, use {newfile}!"
-msgstr ""
-
-#: ../fdroidserver/index.py
-msgid "Ignoring package without metadata: "
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Ignoring stale cache data for {apkfilename}"
-msgstr ""
-
-#: ../fdroidserver/update.py
-msgid "Include APKs that are signed with disabled algorithms like MD5"
-msgstr ""
-
-#: ../fdroidserver/mirror.py
-msgid "Include the PGP signature .asc files in the mirror"
-msgstr ""
-
-#: ../fdroidserver/mirror.py
-msgid "Include the build logs in the mirror"
-msgstr ""
-
-#: ../fdroidserver/mirror.py
-msgid "Include the source tarballs in the mirror"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-format
-msgid "Including metadata from %s@%s"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Including metadata from {path}"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Initialising submodules"
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "Install all signed applications available"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Install built packages on devices"
-msgstr ""
-
-#: ../fdroidserver/install.py
-#, python-format
-msgid "Installing %s..."
-msgstr ""
-
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "Installing '{apkfilename}' on {dev}..."
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Interact with the repo HTTP server"
-msgstr ""
-
-#: ../fdroidserver/update.py
-msgid "Invalid APK"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "Invalid AutoUpdateMode: {mode}"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "Invalid UpdateCheckMode: {mode}"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "Invalid VercodeOperation: {field}"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Invalid VercodeOperation: {invalid_ops}"
-msgstr ""
-
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Invalid application ID {appid}"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Invalid bulleted list"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-format
-msgid "Invalid name for published file: %s"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Invalid ndk: entry in build: \"{ndk}\""
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Invalid redirect to non-HTTPS: {before} -> {after} "
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Invalid scrlib metadata: '{file}' does not exist"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Invalid srclib metadata: could not parse '{file}'"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Invalid srclib metadata: unknown key '{key}' in '{file}'"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "JAR signature failed to verify: {path}"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "JAR signature verified: {path}"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "Java JAR file"
-msgstr ""
-
-#: ../fdroidserver/mirror.py ../fdroidserver/publish.py
-#: ../fdroidserver/update.py
-msgid "Java JDK not found! Install in standard location or set java_paths!"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "Java compiled class"
-msgstr ""
-
-#: ../fdroidserver/signindex.py
-msgid "Java jarsigner not found! Install in standard location or set java_paths!"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Javascript in HTML src attributes"
-msgstr ""
-
-#: ../fdroidserver/build.py
-#, python-brace-format
-msgid "Keeping failed build \"{apkfilename}\""
-msgstr ""
-
-#: ../fdroidserver/init.py
-msgid "Keystore for signing key:\t"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Known debug key is used in AllowedAPKSigningKeys: "
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Last used commit '{commit}' looks like a tag, but UpdateCheckMode is '{ucm}'"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Liberapay donation methods belong in the Liberapay: field"
-msgstr ""
-
-#: ../fdroidserver/rewritemeta.py
-msgid "List files that would be reformatted (dry run)"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Locale included in f-droid.org URL"
-msgstr ""
-
-#: ../fdroidserver/build.py
-msgid "Make the build stop on exceptions"
-msgstr ""
-
-#: ../fdroidserver/index.py
-msgid "Malformed repository mirrors."
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "Malformed serverwebroot line:"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-format
-msgid "Max recursion depth in ZIP file reached: %s"
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "Mirror config for {url} contains \"isPrimary\" key!"
-msgstr ""
-
-#: ../fdroidserver/mirror.py
-msgid "Mirror the full repo and archive, all file types."
-msgstr ""
-
-#: ../fdroidserver/gpgsign.py
-msgid "Missing output directory"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-msgid "Moving Anti-Features declarations to localized files:"
-msgstr ""
-
-#: ../fdroidserver/index.py
-msgid "Neither \"repo_pubkey\" nor \"keystorepass\" set in config.yml"
-msgstr ""
-
-#: ../fdroidserver/verify.py
-#, python-format
-msgid "No APK for package: %s"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "No Android SDK found!"
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "No attached devices found"
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "No devices found for `adb install`! Please plug one in."
-msgstr ""
-
-#: ../fdroidserver/index.py
-msgid "No fingerprint in URL."
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "No git submodules available"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
-msgid "No gradle project could be found. Specify --subdir?"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
-msgid "No information found."
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "No matching tags found"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "No minimum SDK version found in {0}, using default (3)."
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "No need to specify that the app is Free Software"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "No need to specify that the app is for Android"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "No option set! Edit your config.yml to set at least one of these:"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "No packages specified"
-msgstr ""
-
-#: ../fdroidserver/install.py
-#, python-format
-msgid "No signed APK available for %s"
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "No signed output directory - nothing to do"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "No signing certificates found in {path}"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-format
-msgid "No such package: %s"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "No such versionCode {versionCode} for app {appid}"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "No tags found"
-msgstr ""
-
-#: ../fdroidserver/publish.py ../fdroidserver/verify.py
-msgid "No unsigned directory - nothing to do"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "No version information could be found."
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Not a valid size definition: \"{}\""
-msgstr ""
-
-#: ../fdroidserver/signindex.py
-msgid "Nothing to do"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "Nothing to do for {appid}."
-msgstr ""
-
-#: ../fdroidserver/init.py
-msgid "Now set these in config.yml:"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "OBB file has newer versionCode({integer}) than any APK:"
-msgstr ""
-
-#: ../fdroidserver/update.py
-msgid "OBB filename must start with \"main.\" or \"patch.\":"
-msgstr ""
-
-#: ../fdroidserver/update.py
-msgid "OBB's packagename does not match a supported APK:"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "Offline machine, skipping git mirror generation until `fdroid deploy`"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "One of the 'github_releases' config items is missing the 'packageNames' value. skipping ..."
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "One of the 'github_releases' config items is missing the 'projectUrl' value. skipping ..."
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "One of the 'github_releases' config items is missing the 'token' value. skipping ..."
-msgstr ""
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Only PNG and JPEG are supported for graphics, found: {path}"
-msgstr ""
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/common.py
-msgid "Only accepts a single key \"env\""
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "Only process apps with auto-updates"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "OpenCollective donation methods belong in the OpenCollective: field"
-msgstr ""
-
-#: ../fdroidserver/verify.py
-msgid "Output JSON report to file named after APK."
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "Output JSON to stdout."
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py ../fdroidserver/gpgsign.py
-#: ../fdroidserver/publish.py ../fdroidserver/signindex.py
-#: ../fdroidserver/update.py
-msgid "Outputting JSON"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
-msgid "Overall license of the project."
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "Overriding blank versionName in {apkfilename} from metadata: {version}"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
-#, python-brace-format
-msgid "Package \"{appid}\" already exists"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Parsing manifest at '{path}'"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Password required with username"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
-msgid "Path to main Android project subdirectory, if not in root."
-msgstr ""
-
-#: ../fdroidserver/init.py
-msgid "Path to the Android SDK (sometimes set in ANDROID_HOME)"
-msgstr ""
-
-#: ../fdroidserver/btlog.py
-msgid "Path to the git repo to use as the log"
-msgstr ""
-
-#: ../fdroidserver/init.py
-msgid "Path to the keystore for the repo signing key"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-msgid "Print the secret variable to the terminal for easy copy/paste"
-msgstr ""
-
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "Privacy mode was enabled based on your locale ({country_code})."
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-format
-msgid "Problem with ZIP file: %s, error %s"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Problem with xml at '{path}'"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "Process auto-updates"
-msgstr ""
-
-#: ../fdroidserver/publish.py ../fdroidserver/update.py
-#, python-brace-format
-msgid "Processing {apkfilename}"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Processing {appid}"
-msgstr ""
-
-#: ../fdroidserver/update.py
-msgid "Produce human-readable XML/JSON for index files"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
-msgid "Project URL to import from."
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Punctuation should be avoided"
-msgstr ""
-
-#: ../fdroidserver/btlog.py
-msgid "Push the log to this git remote repository"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Pushing binary transparency log to {url}"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "Pushing to remote server failed!"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Pushing to {url}"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Quickly start a new repository"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Read all the metadata files and exit"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Reading '{config_file}'"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Reading packageName/versionCode/versionName failed, APK invalid: '{apkfilename}'"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Reading packageName/versionCode/versionName failed,APK invalid: '{apkfilename}'"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Reading {apkfilename} from cache"
-msgstr ""
-
-#: ../fdroidserver/build.py
-msgid "Refresh and cache scanner rules and signatures from the network"
-msgstr ""
-
-#: ../fdroidserver/publish.py
-#, python-brace-format
-msgid "Refusing to sign '{path}', file exists in both {dir1} and {dir2} folder."
-msgstr ""
-
-#: ../fdroidserver/verify.py
-msgid "Remove source tarball and any APKs if successfully verified."
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Removing specified files"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Removing {path}\""
-msgstr ""
-
-#: ../fdroidserver/update.py
-msgid "Rename APK files that do not match package.name_123.apk"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "RepoType {type} is deprecated, please switch to git."
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-#, python-brace-format
-msgid "Resigning {apkfilename} with provided debug.keystore"
-msgstr ""
-
-#: ../fdroidserver/update.py
-msgid "Resize all the icons exceeding the max pixel size and exit"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Restrict output to warnings and errors"
-msgstr ""
-
-#: ../fdroidserver/net.py
-#, python-format
-msgid "Retrying failed download: %s"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Rewrite all the metadata files"
-msgstr ""
-
-#: ../fdroidserver/rewritemeta.py
-#, python-brace-format
-msgid "Rewriting '{appid}'"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "Run on git repo that has uncommitted changes"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-#, python-brace-format
-msgid "Run over {cibase} to find -debug.apk. and skip repo_basedir {repo_basedir}"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Run rewritemeta to fix formatting"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "Running first pass with MD5 checking disabled"
-msgstr ""
-
-#: ../fdroidserver/mirror.py
-#, python-brace-format
-msgid "Running wget in {path}"
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "SHA-256 of {url} does not match entry!"
-msgstr ""
-
-#: ../fdroidserver/build.py
-msgid "Scan the resulting APK(s) for known non-free classes."
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Scan the source code of a package"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Scanner found {count} problems in {apk}"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Scanner found {count} problems in {appid}:"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Scanner found {count} problems in {appid}:{versionCode}:"
-msgstr ""
-
-#: ../fdroidserver/build.py
-msgid "Scanner found {} problem"
-msgid_plural "Scanner found {} problems"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../fdroidserver/scanner.py
-msgid "Scanning APK for extra signing blocks."
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "Scanning APK with dexdump for known non-free classes."
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Set NDK {release} ({version}) up"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Set clock to that time using:"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-msgid "Set maximum releases in repo before older ones are archived"
-msgstr ""
-
-#: ../fdroidserver/build.py
-#, python-brace-format
-msgid "Set open file limit to {integer}"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Set up an app build for a nightly build repo"
-msgstr ""
-
-#: ../fdroidserver/build.py
-msgid "Setting open file limit failed: "
-msgstr ""
-
-#: ../fdroidserver/build.py
-#, python-brace-format
-msgid "Setting {0} sec timeout for this build"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Sign and place packages in the repo"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Sign indexes created using update --nosign"
-msgstr ""
-
-#: ../fdroidserver/build.py
-msgid "Skip scanning the source code for binaries and other problems"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Skipping '{apkfilename}' with invalid signature!"
-msgstr ""
-
-#: ../fdroidserver/deploy.py ../fdroidserver/index.py
-#, python-format
-msgid "Skipping GitLab Pages mirror because the repo is too large (>%.2fGB)!"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Skipping index generation for {appid}"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Skipping {apkfilename} with invalid signature!"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Skipping {appid}: disabled"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "Specify a local folder to sync the repo to"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "Specify an identity file to provide to SSH for rsyncing"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-msgid "Specify which debug keystore file to use."
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Spew out even more information than normal"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-#, python-brace-format
-msgid "Stripping mystery signature from {apkfilename}"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-format
-msgid "Summary '%s' is just the app's name"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Summary of length {length} is over the {limit} char limit"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "System clock is older than date in {path}!"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "Tags update mode only works for git, hg, bzr and git-svn repositories currently"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "Tags update mode used in git-svn, but the repo was not set up with tags"
-msgstr ""
-
-#: ../fdroidserver/build.py
-msgid "Test mode - put output in the tmp directory only, and always build, even if the output already exists."
-msgstr ""
-
-#: ../fdroidserver/index.py
-msgid "The \"qrcode\" Python package is not installed (e.g. apt-get install python3-qrcode)!"
-msgstr ""
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "The OBB version code must come after \"{name}.\":"
-msgstr ""
-
-#: ../fdroidserver/btlog.py
-msgid "The base URL for the repo to log (default: https://f-droid.org)"
-msgstr ""
-
-#: ../fdroidserver/mirror.py
-msgid "The directory to write the mirror to"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-msgid "The file to be included in the repo (path or glob)"
-msgstr ""
-
-#: ../fdroidserver/index.py
-msgid "The repository's fingerprint does not match."
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "The root dir for local_copy_dir \"{path}\" does not exist!"
-msgstr ""
-
-#: ../fdroidserver/publish.py
-msgid "There is a keyalias collision - publishing halted"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "These are the apps that have been archived from the main repo."
-msgstr ""
-
-#: ../fdroidserver/mirror.py
-msgid "This command should never be used to mirror f-droid.org! A full copy requires more than 600GB."
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "This is a repository of apps to be used with F-Droid. Applications in this repository are either official binaries built by the original application developers, or are binaries built from source by the admin of f-droid.org using the tools on https://gitlab.com/fdroid."
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
-#, python-format
-msgid "This repo already has local metadata: %s"
-msgstr ""
-
-#: ../fdroidserver/init.py
-#, python-format
-msgid ""
-"To complete the setup, add your APKs to \"%s\"\n"
-"then run \"fdroid update -c; fdroid update\".  You might also want to edit\n"
-"\"config.yml\" to set the URL, repo name, and more.  You should also set up\n"
-"a signing key (a temporary one might have been automatically generated).\n"
-"\n"
-"For more info: https://f-droid.org/docs/Setup_an_F-Droid_App_Repo\n"
-"and https://f-droid.org/docs/Signing_Process"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "To use awsbucket, awssecretkey and awsaccesskeyid must also be set in config.yml!"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "To use rclone, rclone_config and awsbucket must be set in config.yml!"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "URL must start with https:// or http://"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "URL shorteners should not be used"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "URL {url} in Description: {error}"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Unexpected license tag \"{}\"! Only use FSF or OSI approved tags from https://spdx.org/license-list"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Unexpected license tag \"{}\"! Only use license tags configured in your config file"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Unknown entry {key} in {configname}"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Unknown exception found!"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Unknown file '{filename}' in build '{versionName}'"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-format
-msgid "Unknown metadata format: %s"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Unknown metadata format: {path} (use: *.yml)"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Unknown version of aapt, might cause problems: "
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Unnecessary leading space"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Unnecessary trailing space"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Unrecognised app field '{fieldname}' in '{path}'"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Unrecognised build flag '{build_flag}' in '{path}'"
-msgstr ""
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Unsupported file type \"{extension}\" for repo graphic"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Unsupported graphics file found: {path}"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-format
-msgid "Unused extlib at %s"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-format
-msgid "Unused file at %s"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-format
-msgid "Unused scandelete path: %s"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-format
-msgid "Unused scanignore path: %s"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Update repo information for new packages"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Update the binary transparency log for a URL"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "UpdateCheckData has invalid URL: {url}"
-msgstr ""
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "UpdateCheckData must match the version code as integer (\\d or [0-9]): {codeex}"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "UpdateCheckData must use HTTPS URL: {url}"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "UpdateCheckData not a valid URL: {url}"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "UpdateCheckMode is set but it looks like checkupdates hasn't been run yet."
-msgstr ""
-
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/lint.py
-msgid "UpdateCheckName is set to the known application ID, it can be removed"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Uploading {apkfilename} to androidobservatory.org"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Uploading {apkfilename} to virustotal"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Use /HEAD instead of /master or /main to point at a file in the default branch"
-msgstr ""
-
-#: ../fdroidserver/update.py
-msgid "Use `fdroid update -c` to create it."
-msgstr ""
-
-#: ../fdroidserver/build.py
-msgid "Use build server"
-msgstr ""
-
-#: ../fdroidserver/update.py
-msgid "Use date from APK instead of current time for newly added APKs"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Using \"{path}\" for configuring s3cmd."
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Using \"{path}\" for syncing with remote storage."
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Using APK Signature v2"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Using APK Signature v3"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Using JAR Signature"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Using Java's jarsigner, not recommended for verifying APKs! Use apksigner"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Using blank dictionary instead of contents of {path}!"
-msgstr ""
-
-#: ../fdroidserver/init.py
-#, python-brace-format
-msgid "Using existing keystore \"{path}\""
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Using rclone to sync with: {url}"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Using s3cmd to sync with: {url}"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Valid commands are:"
-msgstr ""
-
-#: ../fdroidserver/verify.py
-msgid "Verify against locally cached copy rather than redownloading."
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Verify the integrity of downloaded packages"
-msgstr ""
-
-#: ../fdroidserver/index.py
-msgid "Verifying index signature:"
-msgstr ""
-
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "Verifying package {path} with apksigner."
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "VirusTotal API key cannot upload files larger than 32MB, use {url} to upload {path}."
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-msgid "WARNING: only public git repos are supported!"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Warn about possible metadata errors"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "WebAssembly binary file"
-msgstr ""
-
-#: ../fdroidserver/update.py
-msgid "When configured for signed indexes, create only unsigned indexes at this stage"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "When linting the entire repository yamllint is disabled by default. This option forces yamllint regardless."
-msgstr ""
-
-#: ../fdroidserver/publish.py
-msgid "When signing or verifying fails, exit with an error code."
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "Would you like to download and install F-Droid.apk via adb? (YES/no)"
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "Would you like to download the app(s) from f-droid.org? (YES/no)"
-msgstr ""
-
-#: ../fdroidserver/init.py
-msgid "X.509 'Distinguished Name' used when generating keys"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "You can use ANDROID_HOME to set the path to your SDK, i.e.:"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "ZIP file archive"
-msgstr ""
-
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "adb reports {serial} is \"{status}\"!"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-#, python-brace-format
-msgid "adding IdentityFile to {path}"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "adding to {name}: {path}"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "ambiguous option: %(option)s could match %(matches)s"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "apksigner in build-tools;{version} passes APKs with invalid v3 signatures, ignoring."
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "apksigner not found! Cannot sign or verify modern APKs"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "apksigner not found, it's required for signing!"
-msgstr ""
-
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/checkupdates.py ../fdroidserver/lint.py
-#: ../fdroidserver/rewritemeta.py
-msgid "application ID of file to operate on"
-msgstr ""
-
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/build.py ../fdroidserver/install.py
-#: ../fdroidserver/publish.py ../fdroidserver/scanner.py
-#: ../fdroidserver/verify.py
-msgid "application ID with optional versionCode in the form APPID[:VERCODE]"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "archive_url needs to end with /archive"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "argument \"-\" with mode %r"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "argument %(argument_name)s: %(message)s"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-msgid "attempting bare SSH connection to test deploy key:"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "can not parse scrlib spec (not a string): '{}'"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "can't open '%(filename)s': %(error)s"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "can't open non-https url: '{};"
-msgstr ""
-
-#: ../fdroidserver/build.py
-#, python-brace-format
-msgid "cannot find required srclibs: \"{path}\""
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-msgid "cannot have multiple subparser arguments"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "cannot merge actions - two groups are named %r"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-msgid "cannot publish update, did you set the deploy key?"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-#, python-brace-format
-msgid "cloning {url}"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "commands from plugin modules:"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "conflicting option string: %s"
-msgid_plural "conflicting option strings: %s"
-msgstr[0] ""
-msgstr[1] ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "conflicting subparser alias: %s"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "conflicting subparser: %s"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "could not parse '{path}'"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "could not parse srclib spec (no name specified): '{}'"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "could not parse srclib spec (no ref specified): '{}'"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-#, python-brace-format
-msgid "created {path}"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "current version is newer: old vercode={old}, new vercode={new}"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "deleting: repo/{apkfilename}"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "dependency file without lock"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "deployed process log {path} to {dest}"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "dest= is required for options like %r"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "downloading '{}'"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "downloading scanner signatures from '{}' failed"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "executable binary, possibly code"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "expected %s argument"
-msgid_plural "expected %s arguments"
-msgstr[0] ""
-msgstr[1] ""
-
-#: /usr/lib/python3.11/argparse.py
-msgid "expected at least one argument"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-msgid "expected at most one argument"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-msgid "expected one argument"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "fdroid [<command>] [-h|--help|--version|<args>]"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "fetch the latest version of signatures from the web"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-msgid "force metadata errors (default) to be warnings, or to be ignored."
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "git svn clone failed"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "gzip file archive"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "ignored explicit argument %r"
-msgstr ""
-
-#: ../fdroidserver/index.py
-msgid "index-v1 must have a signature, use `fdroid signindex` to create it!"
-msgstr ""
-
-#: ../fdroidserver/index.py
-msgid "index-v2 must have a signature, use `fdroid signindex` to create it!"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "invalid %(type)s value: %(value)r"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "invalid choice: %(value)r (choose from %(choices)s)"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "invalid conflict_resolution value: %r"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "invalid option string %(option)r: must start with a character %(prefix_chars)r"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "ipfs_cid not found, skipping CIDv1 generation"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "latest build recipe is newer: old vercode={old}, new vercode={new}"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "local_copy_dir does not end with \"fdroid\", perhaps you meant: \"{path}\""
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "local_copy_dir must be an absolute path!"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "local_copy_dir must be directory, not a file!"
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-format
-msgid "mirror '%s' does not end with 'fdroid'!"
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "mirrors set twice, in config.yml and {path}!"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-msgid "mutually exclusive arguments must be optional"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "next {name} cache update due in {time}"
-msgstr ""
-
-#: ../fdroidserver/mirror.py
-#, python-brace-format
-msgid "no \"icon\" in {appid}"
-msgstr ""
-
-#: ../fdroidserver/signatures.py
-msgid "no APK supplied"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "no version information found"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "not allowed with argument %s"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "one of the arguments %s is required"
-msgstr ""
-
-#: ../fdroidserver/common.py ../fdroidserver/index.py
-msgid "only accepts strings, lists, and tuples"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-msgid "options"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-#, python-brace-format
-msgid "overwriting existing {path}"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-msgid "positional arguments"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "process log deploy {path} to {dest} failed!"
-msgstr ""
-
-#: ../fdroidserver/build.py
-msgid "reference binary missing signature"
-msgstr ""
-
-#: ../fdroidserver/signatures.py
-#, python-brace-format
-msgid "refuse downloading via insecure HTTP connection (use HTTPS or specify --no-https-check): {apkfilename}"
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-format
-msgid "repo_icon \"repo/icons/%s\" does not exist, generating placeholder."
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "repo_url needs to end with /repo"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "rsync is missing or broken: {error}"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "s3cmd sync indexes {path} to {url} and delete"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "s3cmd syncs indexes from {path} to {url} and deletes removed"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "scanner cache is malformed! You can clear it with: '{clear}'"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "serverwebroot: path does not end with \"fdroid\", perhaps you meant one of these:"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "shared library"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-msgid "show this help message and exit"
-msgstr ""
-
-#: ../fdroidserver/signatures.py
-msgid "signed APK, either a file-path or HTTPS URL."
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "skip deploying full build logs: log content is empty"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "skip deploying full build logs: not enabled in config"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "skipping source tarball: {path}"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "srclibs missing name and/or @"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "static library"
-msgstr ""
-
-#: ../fdroidserver/build.py
-#, python-brace-format
-msgid "supplied reference binary has allowed signer {signer}"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "the following arguments are required: %s"
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "true"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "unexpected option string: %s"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "unknown parser %(parser_name)r (choices: %(choices)s)"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "unrecognized arguments: %s"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "unsafe permissions on '{config_file}' (should be 0600)!"
-msgstr ""
-
-#: ../fdroidserver/__main__.py /usr/lib/python3.11/argparse.py
-msgid "usage: "
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "using Apache libcloud to sync with {url}"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "virustotal.com is rate limiting, waiting to retry..."
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "yes"
-msgstr ""
-
-#: ../fdroidserver/publish.py
-#, python-brace-format
-msgid "{0} app, {1} key aliases"
-msgid_plural "{0} apps, {1} key aliases"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{apkfilename} ({appid}) has no metadata!"
-msgstr ""
-
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{apkfilename}'s AndroidManifest.xml has a bad date: "
-msgstr ""
-
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{appid} does not have a name! Using application ID instead."
-msgstr ""
-
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{appid} from {path} is not a valid Android application ID!"
-msgstr ""
-
-#: ../fdroidserver/metadata.py ../fdroidserver/update.py
-#, python-brace-format
-msgid "{appid} from {path} is not a valid Java Package Name!"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{appid} has both APKs and files: {files}"
-msgstr ""
-
-#: ../fdroidserver/mirror.py
-#, python-brace-format
-msgid "{appid} is missing {name}"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "{appid}: Unknown extlib {path} in build '{versionName}'"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "{appid}: no builds specified, running on current source state"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "{appid}: {field} must be a '{type}', but it is a '{fieldtype}!'"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "{appid}: {field} must be a '{type}', but it is a '{fieldtype}'!"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "{build_flag} must be an integer, found: {value}"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "{build_flag} must be list or string, found: {value}"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "{file} is blank or corrupt!"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{name} \"{section}/icons/{path}\" does not exist! Check \"config.yml\"."
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{path1} is a duplicate of {path2}, remove one!"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
-#, python-brace-format
-msgid "{path} already exists, ignoring import results!"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-#, python-brace-format
-msgid "{path} does not exist!  Create it by running:"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{path} has bad file signature \"{pattern}\", possible Janus exploit!"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "{path} has been flagged by virustotal {count} times:"
-msgstr ""
-
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "{path} has the wrong fingerprint ({fingerprint})!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "{path} is not \"key: value\" dict, but a {datatype}!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "{path} is not a standard config file!"
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "{path} is not list, but a {datatype}!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "{path} is not {expected_type}, but a {datatype}!"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{path} is zero size!"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "{path} more than 200MB, manually upload: {url}"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "{path}: \"{code}\" is not a valid ISO_3166-1 alpha-2 country code!"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{path}: {error}"
-msgstr ""
-
-#: ../fdroidserver/mirror.py
-#, python-brace-format
-msgid "{url} does not end with \"fdroid\", check the URL path!"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
-#, python-brace-format
-msgid "{url} does not start with \"http\"!"
-msgstr ""
-
-#: ../fdroidserver/build.py
-msgid "{} build failed"
-msgid_plural "{} builds failed"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../fdroidserver/build.py
-msgid "{} build succeeded"
-msgid_plural "{} builds succeeded"
-msgstr[0] ""
-msgstr[1] ""
diff --git a/locale/fa/LC_MESSAGES/fdroidserver.po b/locale/fa/LC_MESSAGES/fdroidserver.po
index ff34a457..2aeb2d91 100644
--- a/locale/fa/LC_MESSAGES/fdroidserver.po
+++ b/locale/fa/LC_MESSAGES/fdroidserver.po
@@ -2,22 +2,36 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # Mostafa Ahangarha <ahangarha@gmail.com>, 2020.
-# Danial Behzadi <dani.behzi@ubuntu.com>, 2021, 2024.
-# HM <goodlinuxuser@chmail.ir>, 2023.
 msgid ""
 msgstr ""
 "Project-Id-Version: fdroidserver 0.9\n"
 "Report-Msgid-Bugs-To: https://gitlab.com/fdroid/fdroidserver/issues\n"
-"POT-Creation-Date: 2025-06-25 09:52+0200\n"
-"PO-Revision-Date: 2024-11-26 15:16+0000\n"
-"Last-Translator: Danial Behzadi <dani.behzi@ubuntu.com>\n"
+"POT-Creation-Date: 2020-10-21 18:05+0200\n"
+"PO-Revision-Date: 2020-10-06 08:26+0000\n"
+"Last-Translator: Mostafa Ahangarha <ahangarha@gmail.com>\n"
 "Language-Team: Persian <https://hosted.weblate.org/projects/f-droid/fdroidserver/fa/>\n"
 "Language: fa\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Generator: Weblate 5.9-dev\n"
+"X-Generator: Weblate 4.3-dev\n"
+
+#: ../fdroidserver/common.py
+msgid ""
+"\n"
+"        This is a repository of apps to be used with FDroid. Applications in this\n"
+"        repository are either official binaries built by the original application\n"
+"        developers, or are binaries built from source by f-droid.org using the\n"
+"        tools on https://gitlab.com/fdroid.\n"
+"        "
+msgstr ""
+
+#: ../fdroidserver/nightly.py
+msgid ""
+"\n"
+"SSH Public Key to be used as Deploy Key:"
+msgstr ""
 
 #: ../fdroidserver/nightly.py
 msgid ""
@@ -37,163 +51,184 @@ msgstr ""
 msgid "\"%s/\" has no matching metadata file!"
 msgstr ""
 
-#: ../fdroidserver/index.py
-msgid "\"isPrimary\" key should not be added to mirrors!"
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "\"local_copy_dir\" {path} does not exist!"
-msgstr "{path} ‏local_copy_dir وجود ندارد!"
-
 #: ../fdroidserver/install.py
 #, python-brace-format
 msgid "\"{apkfilename}\" is already installed on {dev}."
-msgstr "{apkfilename} از پیش روی {dev} نصب شده."
+msgstr ""
+
+#: ../fdroidserver/update.py
+#, python-brace-format
+msgid "\"{path}\" contains outdated {name} ({version})"
+msgstr ""
 
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "\"{path}\" contains recent {name} ({version})"
 msgstr ""
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "\"{path}\" exists but s3cmd is not installed!"
-msgstr "\"{path}\" وجود دارد ولی s3cmd نصب نیست!"
+msgstr ""
 
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "\"{path}\" is not a supported file format (use: metadata/*.yml)"
-msgstr "{path} قالب پروندهٔ پشتیبانی شده‌ای نیست (استفاده: ‪metadata/*.yml‬)"
+msgstr ""
 
-#: ../fdroidserver/update.py
+#: ../fdroidserver/metadata.py
 #, python-brace-format
-msgid "\"{path}\" is signed by a key that is not allowed:"
-msgstr "{path} به دست کلیدی که مجاز نیست امضا شده:"
+msgid "\"{path}\" is not an accepted format, convert to: {formats}"
+msgstr ""
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/common.py
 #, python-brace-format
 msgid "\"{url}\" is not a valid URL!"
-msgstr "{url} نشانی معتبری نیست!"
+msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, python-format
+msgid "%(option)s option requires %(number)d argument"
+msgid_plural "%(option)s option requires %(number)d arguments"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../fdroidserver/mirror.py
+#, python-format
+msgid "%(prog)s [options] url"
+msgstr ""
+
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "%(prog)s: error: %(message)s\n"
 msgstr "%(prog)s: خطا: %(message)s\n"
 
-#: ../fdroidserver/publish.py
-#, python-format
-msgid "%d APKs failed to be signed or verified!"
-msgstr ""
-
 #: ../fdroidserver/scanner.py
 #, python-format
 msgid "%d problems found"
-msgstr "%d مشکل پیدا شد"
+msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "%prog [options]"
+msgstr "کاوش کردن"
+
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "%r is not callable"
-msgstr "‏%r قابل فراخوانی نیست"
-
-#: ../fdroidserver/signindex.py
-#, python-format
-msgid "%s did not produce a dict!"
-msgstr ""
-
-#: ../fdroidserver/signindex.py
-#, python-format
-msgid "%s has bad SHA-256: %s"
-msgstr ""
+msgstr "‏%r قابل صدا زدن نیست"
 
 #: ../fdroidserver/lint.py
 #, python-format
 msgid "%s is not an accepted build field"
 msgstr ""
 
-#: ../fdroidserver/common.py
-msgid "'keypass' not found in config.yml!"
-msgstr "keypass در config.yml پیدا نشد!"
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, python-format
+msgid "%s option does not take a value"
+msgstr ""
+
+#: ../fdroidserver/index.py ../fdroidserver/common.py
+msgid "'keypass' not found in config.py!"
+msgstr ""
 
 #: ../fdroidserver/common.py
 msgid "'keystore' is NONE and 'smartcardoptions' is blank!"
 msgstr ""
 
-#: ../fdroidserver/common.py
-msgid "'keystore' not found in config.yml!"
-msgstr "keystore در config.yml پیدا نشد!"
+#: ../fdroidserver/index.py ../fdroidserver/common.py
+msgid "'keystore' not found in config.py!"
+msgstr ""
 
-#: ../fdroidserver/common.py
-msgid "'keystorepass' not found in config.yml!"
-msgstr "keystorepass در config.yml پیدا نشد!"
+#: ../fdroidserver/index.py ../fdroidserver/common.py
+msgid "'keystorepass' not found in config.py!"
+msgstr ""
 
-#: ../fdroidserver/common.py
-msgid "'repo_keyalias' not found in config.yml!"
-msgstr "repo_keyalias در config.yml پیدا نشد!"
+#: ../fdroidserver/index.py ../fdroidserver/common.py
+msgid "'repo_keyalias' not found in config.py!"
+msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "'required' is an invalid argument for positionals"
-msgstr "required آرگومانی نامعتبر برای موقعیتی‌هاست"
+msgstr ""
 
 #: ../fdroidserver/common.py
-msgid "'sdk_path' not set in config.yml!"
-msgstr "sdk_path در config.yml تنظیم نشده!"
+msgid "'sdk_path' not set in 'config.py'!"
+msgstr ""
+
+#. Translators: "build-tools" is the file name of a package from
+#. Google, it is part of the Android SDK. So it probably shouldn't be
+#. translated or transliterated.
+#: ../fdroidserver/common.py
+#, python-brace-format
+msgid "'{aapt}' is too old, fdroid requires build-tools-23.0.0 or newer!"
+msgstr ""
 
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "'{aapt}' is too old, fdroid requires build-tools-{version} or newer!"
-msgstr "'{aapt}' بیش از حد قدیمی است. اف‌دروید به build- tools-{version} یا جدیدتر نیاز دارد!"
+msgstr ""
+
+#: ../fdroidserver/install.py
+#, python-brace-format
+msgid "'{apkfilename}' is already installed on {dev}."
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "'{field}' in {linedesc} is obsolete, see docs for current fields:"
+msgstr ""
+
+#: ../fdroidserver/common.py
+#, python-brace-format
+msgid "'{field}' will be in random order! Use () or [] brackets if order is important!"
+msgstr ""
 
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "'{path}' failed to execute!"
-msgstr "اجرای {path} شکست خورد!"
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "'{path}' has invalid format, it should be a dictionary!"
 msgstr ""
 
-#: ../fdroidserver/lint.py ../fdroidserver/metadata.py
+#: ../fdroidserver/metadata.py
 #, python-brace-format
 msgid "'{value}' is not a valid {field} in {appid}. Regex pattern: {pattern}"
 msgstr ""
 
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "'{value}' is not a valid {field}, should be {pattern}"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "--merge-request only runs on a single appid!"
-msgstr ""
-
 #: ../fdroidserver/checkupdates.py
 #, python-brace-format
 msgid "...checkupdate failed for {appid} : {error}"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid ".__call__() not defined"
-msgstr "‪.__call__()‬ تعریف نشده است"
+msgstr ".__call__() تعریف نشده است"
+
+#: ../fdroidserver/metadata.py
+msgid ".fdroid.txt is not supported!  Convert to .fdroid.yml or .fdroid.json."
+msgstr ""
 
 #: ../fdroidserver/lint.py
 msgid "/issues is missing"
-msgstr "‪/issues‬ موجود نیست"
+msgstr ""
 
 #: ../fdroidserver/mirror.py
 msgid "A URL is required as an argument!"
 msgstr ""
 
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "APK signatures have different certificates in {path}:"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Add PGP signatures using GnuPG for packages in repo"
 msgstr ""
 
+#: ../fdroid ../fdroidserver/__main__.py
+msgid "Add a new application from its source code"
+msgstr "برنامه جدیدی را از کد منبع‌اش اضافه می‌کند"
+
 #: ../fdroidserver/update.py
 msgid "Add a repo signing key to an unsigned repo"
 msgstr ""
@@ -211,11 +246,7 @@ msgstr ""
 msgid "Alias of the repo signing key in the keystore"
 msgstr ""
 
-#: ../fdroidserver/build.py
-msgid "AllowedAPKSigningKeys missing but reference binary supplied"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "Allows a different revision (or git branch) to be specified for the initial import"
 msgstr ""
 
@@ -229,19 +260,23 @@ msgstr ""
 
 #: ../fdroidserver/scanner.py
 msgid "Android AAR library"
-msgstr "کتابخانهٔ AAR اندروید"
+msgstr ""
 
 #: ../fdroidserver/scanner.py
 msgid "Android APK file"
-msgstr "پروندهٔ APK اندروید"
+msgstr ""
 
 #: ../fdroidserver/scanner.py
 msgid "Android DEX code"
-msgstr "کد DEX اندروید"
+msgstr ""
 
-#: ../fdroidserver/init.py
+#: ../fdroidserver/common.py ../fdroidserver/build.py
 #, python-brace-format
-msgid "Android SDK not found at {path}!"
+msgid "Android SDK '{path}' does not have '{dirname}' installed!"
+msgstr ""
+
+#: ../fdroidserver/common.py
+msgid "Android SDK not found!"
 msgstr ""
 
 #: ../fdroidserver/common.py
@@ -254,17 +289,16 @@ msgstr ""
 msgid "Android SDK path '{path}' is not a directory!"
 msgstr ""
 
+#. Translators: "build-tools" is the file name of a package from
+#. Google, it is part of the Android SDK. So it probably shouldn't be
+#. translated or transliterated.
 #: ../fdroidserver/common.py
 #, python-brace-format
-msgid "Android SDK tool {cmd} not found!"
+msgid "Android build-tools path '{path}' does not exist!"
 msgstr ""
 
-#: ../fdroidserver/lint.py
-msgid "App has Binaries but does not have corresponding AllowedAPKSigningKeys to pin certificate."
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "App has NoSourceSince or ArchivePolicy \"0 versions\" or 0 but AutoUpdateMode or UpdateCheckMode are not None"
+#: ../fdroidserver/update.py
+msgid "AndroidManifest.xml has no date"
 msgstr ""
 
 #: ../fdroidserver/lint.py
@@ -272,10 +306,6 @@ msgstr ""
 msgid "App is in '{repo}' but has a link to {url}"
 msgstr ""
 
-#: ../fdroidserver/lint.py
-msgid "App version has binary but does not have corresponding AllowedAPKSigningKeys to pin certificate."
-msgstr ""
-
 #: ../fdroidserver/lint.py
 msgid "Appending .git is not necessary"
 msgstr ""
@@ -285,27 +315,11 @@ msgstr ""
 msgid "Archiving {apkfilename} with invalid signature!"
 msgstr ""
 
-#: ../fdroidserver/lint.py
-msgid "AutoUpdateMode with UpdateCheckMode: HTTP must have a pattern."
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "Automatic no to all prompts."
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "Automatic yes to all prompts."
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "Bad entry type \"{mirrortype}\" in mirrors config: {mirror}"
-msgstr ""
-
 #: ../fdroidserver/mirror.py
 msgid "Base URL to mirror, can include the index signing key using the query string: ?fingerprint="
 msgstr ""
 
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "Branch '{branch}' used as commit in build '{versionName}'"
@@ -319,11 +333,11 @@ msgstr ""
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Broken symlink: {path}"
-msgstr "پیوند نمادین خراب: {path}"
+msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Build a package from source"
-msgstr "ساخت بسته از کد مبدأ"
+msgstr "بسته‌ای را از کد منبع می‌سازد"
 
 #: ../fdroidserver/build.py
 msgid "Build all applications available"
@@ -341,84 +355,92 @@ msgstr ""
 msgid "Build only the latest version of each package"
 msgstr ""
 
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Build should have comma-separated versionName and versionCode, not \"{value}\", in {linedesc}"
+msgstr ""
+
 #: ../fdroidserver/init.py
 #, python-format
 msgid "Built repo based in \"%s\" with this config:"
 msgstr ""
 
-#: ../fdroidserver/checkupdates.py
-msgid "Can't auto-update app with no CurrentVersionCode"
-msgstr ""
-
 #: ../fdroidserver/build.py
 msgid "Can't build due to {} error while scanning"
 msgid_plural "Can't build due to {} errors while scanning"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../fdroidserver/common.py
-#, fuzzy, python-brace-format
-msgid "Cannot read {path}: {error}"
-msgstr "{path}: {error}"
+#: ../fdroidserver/vmtools.py
+#, python-brace-format
+msgid "Cannot read \"{path}\"!"
+msgstr ""
+
+#. Translators: https://developer.android.com/studio/build/application-id
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Cannot resolve application ID {appid}"
+msgstr ""
 
 #: ../fdroidserver/rewritemeta.py
 #, python-brace-format
 msgid "Cannot rewrite \"{path}\""
-msgstr "نمی‌توان {path} را بازنویسی کرد"
+msgstr ""
+
+#: ../fdroidserver/rewritemeta.py
+msgid "Cannot use --list and --to at the same time"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Cannot write \"{path}\", not an accepted format, use: {formats}"
+msgstr ""
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
 #: ../fdroidserver/lint.py
 #, python-format
 msgid "Categories '%s' is not valid"
 msgstr ""
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
 #: ../fdroidserver/lint.py
 msgid "Categories are not set"
 msgstr ""
 
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "Category \"{category}\" defined but not used for any apps!"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Check for updates to applications"
-msgstr "بررسی برای به‌روز رسانی‌های برنامه‌ها"
+msgstr "به‌روزرسانی‌ها برای برنامه‌ها را بررسی می‌کند"
 
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Checking archiving for {appid} - apks:{integer}, keepversions:{keep}, archapks:{arch}"
 msgstr ""
 
+#: ../fdroidserver/dscanner.py
+msgid "Clean after all scans have finished"
+msgstr ""
+
+#: ../fdroidserver/dscanner.py
+msgid "Clean before the scans start and rebuild the container"
+msgstr ""
+
+#: ../fdroidserver/dscanner.py
+msgid "Clean up all containers and then exit"
+msgstr ""
+
 #: ../fdroidserver/update.py
 msgid "Clean update - don't uses caches, reprocess all APKs"
 msgstr ""
 
-#: ../fdroidserver/common.py
-msgid "Color the log output"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "Comma separated list of categories."
 msgstr ""
 
-#: ../fdroidserver/__main__.py
-#, python-format
+#: ../fdroid ../fdroidserver/__main__.py
+#, c-format, python-format
 msgid "Command '%s' not recognised.\n"
 msgstr "فرمان «%s» شناسایی نشد.\n"
 
 #: ../fdroidserver/checkupdates.py
 msgid "Commit changes"
-msgstr "ثبت دگرگونی‌ها"
-
-#: ../fdroidserver/checkupdates.py
-msgid "Commit changes, push, then make a merge request"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Conflicting \"{field}\" definitions between .yml and localized files:"
 msgstr ""
 
 #: ../fdroidserver/__main__.py
@@ -430,13 +452,11 @@ msgstr ""
 msgid "Could not find '{command}' on your system"
 msgstr ""
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "Could not find latest version code"
 msgstr ""
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "Could not find latest version name"
 msgstr ""
 
@@ -446,8 +466,7 @@ msgid "Could not find {path} to remove it"
 msgstr ""
 
 #: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Could not open APK {path} for analysis: "
+msgid "Could not open apk file for analysis"
 msgstr ""
 
 #: ../fdroidserver/common.py
@@ -455,16 +474,22 @@ msgstr ""
 msgid "Could not parse size \"{size}\", wrong type \"{type}\""
 msgstr ""
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/import_subcommand.py
+#. Translators: https://developer.android.com/studio/build/application-id
+#: ../fdroidserver/import.py
 msgid "Couldn't find Application ID"
 msgstr ""
 
-#: ../fdroidserver/checkupdates.py
-msgid "Couldn't find any version information"
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
+#: ../fdroidserver/import.py
+msgid "Couldn't find latest version code"
 msgstr ""
 
-#: ../fdroidserver/checkupdates.py
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
+#: ../fdroidserver/import.py
+msgid "Couldn't find latest version name"
+msgstr ""
+
+#: ../fdroidserver/import.py
 msgid "Couldn't find package ID"
 msgstr ""
 
@@ -472,41 +497,45 @@ msgstr ""
 msgid "Cowardily refusing to overwrite existing signing key setup!"
 msgstr ""
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/update.py
+msgid "Create a repo signing key in a keystore"
+msgstr ""
+
+#: ../fdroidserver/update.py
+msgid "Create skeleton metadata files that are missing"
+msgstr "پرونده‌های فراداده اسکلت را که موجود نیستند می‌سازد"
+
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Created new container \"{name}\""
 msgstr ""
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Creating \"{path}\" for configuring s3cmd."
 msgstr ""
 
-#: ../fdroidserver/common.py
-#, fuzzy, python-brace-format
-msgid "Creating empty {config_file}"
-msgstr "خواندن {config_file}"
-
 #: ../fdroidserver/publish.py
 msgid "Creating log directory"
-msgstr "ایجاد کردن شاخهٔ log"
+msgstr ""
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Creating new S3 bucket: {url}"
 msgstr ""
 
 #: ../fdroidserver/publish.py
 msgid "Creating output directory"
-msgstr "ایجاد کردن شاخهٔ output"
+msgstr ""
 
 #: ../fdroidserver/index.py
 msgid "Creating signed index with this key (SHA256):"
 msgstr ""
 
-#: ../fdroidserver/publish.py ../fdroidserver/verify.py
+#: ../fdroidserver/import.py ../fdroidserver/verify.py
+#: ../fdroidserver/publish.py
 msgid "Creating temporary directory"
-msgstr "ایجاد کردن شاخهٔ temporary"
+msgstr ""
 
 #: ../fdroidserver/index.py
 msgid "Creating unsigned index in preparation for signing"
@@ -523,7 +552,7 @@ msgstr ""
 
 #: ../fdroidserver/update.py
 msgid "Delete APKs and/or OBBs without metadata from the repo"
-msgstr "حذف APKها و یا OBBهای بدون فراداده از مخزن"
+msgstr "پرونده‌های APK و یا OBB فاقد فراداده را از مخزن پاک می‌کند"
 
 #: ../fdroidserver/deploy.py
 #, python-brace-format
@@ -550,21 +579,16 @@ msgid "Description has a duplicate line"
 msgstr ""
 
 #: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Description of length {length} is over the {limit} char limit"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Did you mean config/{name}.yml?"
+#, python-format
+msgid "Description has a list (%s) but it isn't bulleted (*) nor numbered (#)"
 msgstr ""
 
 #: ../fdroidserver/lint.py
 #, python-brace-format
-msgid "Did you mean {code}?"
+msgid "Description of length {length} is over the {limit} char limit"
 msgstr ""
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "Do not add 'disable:' to the generated build entries"
 msgstr ""
 
@@ -589,20 +613,25 @@ msgstr ""
 msgid "Don't create a source tarball, useful when testing a build"
 msgstr ""
 
+#: ../fdroidserver/stats.py
+msgid "Don't do anything logs-related"
+msgstr ""
+
 #: ../fdroidserver/build.py
 msgid "Don't refresh the repository, useful when testing a build with no internet connection"
 msgstr ""
 
 #: ../fdroidserver/deploy.py ../fdroidserver/nightly.py
+#: ../fdroidserver/upload.py
 msgid "Don't use rsync checksums"
 msgstr ""
 
-#: ../fdroidserver/install.py
-msgid "Download F-Droid.apk using mirrors that leak less to the network"
+#: ../fdroid ../fdroidserver/__main__.py
+msgid "Download complete mirrors of small repos"
 msgstr ""
 
-#: ../fdroidserver/__main__.py
-msgid "Download complete mirrors of small repos"
+#: ../fdroidserver/stats.py
+msgid "Download logs we don't have"
 msgstr ""
 
 #: ../fdroidserver/common.py
@@ -616,12 +645,7 @@ msgstr ""
 
 #: ../fdroidserver/metadata.py
 #, python-brace-format
-msgid "Duplicate Anti-Feature declaration at {path} was ignored!"
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-format
-msgid "Duplicate entry \"%s\" in mirrors config!"
+msgid "Duplicate build recipe found for versionCode {versionCode} in {linedesc}"
 msgstr ""
 
 #: ../fdroidserver/lint.py
@@ -629,42 +653,27 @@ msgstr ""
 msgid "Duplicate link in '{field}': {url}"
 msgstr ""
 
-#: ../fdroidserver/common.py
-#, python-format
-msgid "ERROR: %(message)s"
-msgstr "خطا: %(message)s"
+#: ../fdroid
+msgid "Dynamically scan APKs post build"
+msgstr ""
 
 #: ../fdroidserver/__main__.py
 msgid "ERROR: The \"server\" subcommand has been removed, use \"deploy\"!"
 msgstr ""
 
+#: ../fdroidserver/mirror.py
+msgid ""
+"ERROR: this command should never be used to mirror f-droid.org!\n"
+"A full mirror of f-droid.org requires more than 200GB."
+msgstr ""
+
 #: ../fdroidserver/nightly.py
 msgid "ERROR: unsupported CI type, patches welcome!"
 msgstr ""
 
-#: ../fdroidserver/nightly.py
-#, python-format
-msgid "ERROR: unsupported git host \"%s\", patches welcome!"
-msgstr ""
-
-#: ../fdroidserver/lint.py
+#: ../fdroidserver/metadata.py
 #, python-brace-format
-msgid "ERROR: {key} in {path} is not \"archive\" or \"repo\"!"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "ERROR: {key} not a valid key!"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "ERROR: {key}'s value should be of type {t}!"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "ERROR: {key}:{subkey} in {path} is not in allowed keys: {allowed_keys}!"
+msgid "Empty build flag at {linedesc}"
 msgstr ""
 
 #: ../fdroidserver/__main__.py
@@ -679,40 +688,20 @@ msgid ""
 "> "
 msgstr ""
 
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Environment variable {var} from {configname} is not set!"
+#: ../fdroidserver/deploy.py ../fdroidserver/checkupdates.py
+#: ../fdroidserver/upload.py
+#, python-format
+msgid "Error while attempting to publish log: %s"
 msgstr ""
 
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Environment variable {{env: {var}}} is not set!"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "Error deploying 'github_releases', {} not present. (You might need to run `fdroid update` first.)"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py ../fdroidserver/common.py
 msgid "Error while getting repo address"
 msgstr ""
 
-#: ../fdroidserver/scanner.py
-msgid "Exit with a non-zero code if problems were found"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Extract application metadata from a source repository"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Extract signatures from APKs"
 msgstr ""
 
-#: ../fdroidserver/install.py
-msgid "F-Droid.apk could not be downloaded from any known source!"
-msgstr ""
-
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Failed copying {path}: {error}"
@@ -733,23 +722,27 @@ msgstr ""
 msgid "Failed resizing {path}: {error}"
 msgstr ""
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/publish.py
+msgid "Failed to align application"
+msgstr ""
+
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Failed to create S3 bucket: {url}"
 msgstr ""
 
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Failed to get APK information, deleting {path}"
+#: ../fdroidserver/common.py
+msgid "Failed to get APK manifest information"
 msgstr ""
 
 #: ../fdroidserver/update.py
 #, python-brace-format
-msgid "Failed to get APK information, skipping {path}"
+msgid "Failed to get apk information, deleting {path}"
 msgstr ""
 
 #: ../fdroidserver/update.py
-msgid "Failed to get APK signing key fingerprint"
+#, python-brace-format
+msgid "Failed to get apk information, skipping {path}"
 msgstr ""
 
 #: ../fdroidserver/install.py
@@ -757,10 +750,14 @@ msgstr ""
 msgid "Failed to install '{apkfilename}' on {dev}: {error}"
 msgstr ""
 
-#: ../fdroidserver/common.py
+#: ../fdroidserver/publish.py ../fdroidserver/common.py
 msgid "Failed to sign application"
 msgstr ""
 
+#: ../fdroidserver/common.py
+msgid "Failed to zipalign application"
+msgstr ""
+
 #: ../fdroidserver/build.py
 #, python-brace-format
 msgid "Fetched buildserverid from VM: {buildserverid}"
@@ -776,15 +773,24 @@ msgstr ""
 msgid "File disappeared while processing it: {path}"
 msgstr ""
 
-#: ../fdroidserver/build.py ../fdroidserver/install.py
-#: ../fdroidserver/rewritemeta.py ../fdroidserver/scanner.py
-#: ../fdroidserver/update.py
+#: ../fdroidserver/verify.py ../fdroidserver/stats.py ../fdroidserver/update.py
+#: ../fdroidserver/rewritemeta.py ../fdroidserver/build.py
+#: ../fdroidserver/checkupdates.py ../fdroidserver/scanner.py
+#: ../fdroidserver/install.py
 msgid "Finished"
-msgstr "پایان یافته"
+msgstr ""
+
+#: ../fdroidserver/lint.py
+msgid "Flattr donation methods belong in the FlattrID flag"
+msgstr ""
+
+#: ../fdroidserver/lint.py
+msgid "Flattr donation methods belong in the FlattrID: field"
+msgstr ""
 
 #: ../fdroidserver/lint.py
 msgid "Forbidden HTML tags"
-msgstr "برچسب‌های HTML ممنوعه"
+msgstr ""
 
 #: ../fdroidserver/build.py
 msgid "Force build of disabled apps, and carries on regardless of scan problems. Only allowed in test mode."
@@ -813,6 +819,7 @@ msgstr ""
 msgid "Found invalid appids in arguments"
 msgstr ""
 
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
 #: ../fdroidserver/common.py
 msgid "Found invalid versionCodes for some apps"
 msgstr ""
@@ -822,10 +829,6 @@ msgstr ""
 msgid "Found multiple JAR Signature Block Files in {path}"
 msgstr ""
 
-#: ../fdroidserver/common.py
-msgid "Found multiple Signer Certificates!"
-msgstr ""
-
 #: ../fdroidserver/metadata.py
 #, python-brace-format
 msgid "Found multiple metadata files for {appid}"
@@ -835,6 +838,11 @@ msgstr ""
 msgid "Found multiple signing certificates for repository."
 msgstr ""
 
+#: ../fdroidserver/update.py
+#, python-brace-format
+msgid "Found multiple signing certificates in {path}"
+msgstr ""
+
 #: ../fdroidserver/index.py
 msgid "Found no signing certificates for repository."
 msgstr ""
@@ -849,16 +857,6 @@ msgstr ""
 msgid "Found {apkfilename} at {url}"
 msgstr ""
 
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Found {count} problems in {filename}"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Found {count} warnings in {filename}"
-msgstr ""
-
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Generated skeleton metadata for {appid}"
@@ -871,25 +869,23 @@ msgstr ""
 
 #: ../fdroidserver/common.py
 msgid "Git clean failed"
-msgstr "پاک سازی گیت شکست خورد"
+msgstr ""
 
 #: ../fdroidserver/common.py
 msgid "Git fetch failed"
-msgstr "واکشی گیت شکست خورد"
+msgstr ""
+
+#: ../fdroidserver/common.py
+msgid "Git remote set-head failed"
+msgstr ""
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
 #: ../fdroidserver/common.py
 #, python-format
 msgid "Git remote set-head failed: \"%s\""
 msgstr ""
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
 #: ../fdroidserver/common.py
 msgid "Git reset failed"
-msgstr "بازنشانی گیت شکست خورد"
-
-#: ../fdroidserver/common.py
-msgid "Git submodule deinit failed"
 msgstr ""
 
 #: ../fdroidserver/common.py
@@ -923,16 +919,6 @@ msgstr ""
 msgid "Ignoring FUNDING.yml entry longer than 2048: %s"
 msgstr ""
 
-#: ../fdroidserver/update.py
-#, python-format
-msgid "Ignoring bad element in manifest: %s"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Ignoring deprecated {oldfile}, use {newfile}!"
-msgstr ""
-
 #: ../fdroidserver/index.py
 msgid "Ignoring package without metadata: "
 msgstr ""
@@ -942,6 +928,11 @@ msgstr ""
 msgid "Ignoring stale cache data for {apkfilename}"
 msgstr ""
 
+#: ../fdroidserver/rewritemeta.py
+#, python-brace-format
+msgid "Ignoring {ext} file at '{path}'"
+msgstr ""
+
 #: ../fdroidserver/update.py
 msgid "Include APKs that are signed with disabled algorithms like MD5"
 msgstr ""
@@ -958,75 +949,92 @@ msgstr ""
 msgid "Include the source tarballs in the mirror"
 msgstr ""
 
-#: ../fdroidserver/metadata.py
-#, python-format
-msgid "Including metadata from %s@%s"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Including metadata from {path}"
-msgstr ""
-
 #: ../fdroidserver/common.py
 msgid "Initialising submodules"
-msgstr "مقداردهی نخستین زیرپیمانه‌ها"
+msgstr ""
 
 #: ../fdroidserver/install.py
 msgid "Install all signed applications available"
 msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Install built packages on devices"
-msgstr "نصب بسته های ساخته روی افزاره‌ها"
+msgstr ""
 
 #: ../fdroidserver/install.py
 #, python-format
 msgid "Installing %s..."
-msgstr "نصب کردن %s…"
+msgstr ""
+
+#: ../fdroidserver/install.py
+#, python-format
+msgid "Installing %s…"
+msgstr ""
 
 #: ../fdroidserver/install.py
 #, python-brace-format
 msgid "Installing '{apkfilename}' on {dev}..."
 msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroidserver/install.py
+#, python-brace-format
+msgid "Installing '{apkfilename}' on {dev}…"
+msgstr ""
+
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Interact with the repo HTTP server"
-msgstr "تعامل با کارساز HTTP مخزن"
+msgstr ""
 
 #: ../fdroidserver/update.py
 msgid "Invalid APK"
-msgstr "APK نامعتبر"
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "Invalid AutoUpdateMode: {mode}"
 msgstr ""
 
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "Invalid UpdateCheckMode: {mode}"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
+#: ../fdroidserver/lint.py ../fdroidserver/checkupdates.py
 #, python-brace-format
 msgid "Invalid VercodeOperation: {field}"
-msgstr "VercodeOperation نامعتبر: {field}"
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Invalid VercodeOperation: {invalid_ops}"
 msgstr ""
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "Invalid application ID {appid}"
 msgstr ""
 
+#: ../fdroidserver/metadata.py
+#, python-format
+msgid "Invalid boolean '%s'"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Invalid build flag at {line} in {linedesc}"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Invalid build format: {value} in {name}"
+msgstr ""
+
 #: ../fdroidserver/lint.py
 msgid "Invalid bulleted list"
-msgstr "سیاههٔ گلوله‌ای نامعتبر"
+msgstr ""
+
+#: ../fdroidserver/lint.py
+#, python-format
+msgid "Invalid license tag \"%s\"! Use only tags from https://spdx.org/license-list"
+msgstr ""
+
+#: ../fdroidserver/lint.py
+msgid "Invalid link - use [http://foo.bar Link title] or [http://foo.bar]"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+#, python-format
+msgid "Invalid metadata in %s:%d"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+msgid "Invalid metadata in: "
+msgstr ""
 
 #: ../fdroidserver/common.py
 #, python-format
@@ -1035,7 +1043,7 @@ msgstr ""
 
 #: ../fdroidserver/common.py
 #, python-brace-format
-msgid "Invalid ndk: entry in build: \"{ndk}\""
+msgid "Invalid package name {0}"
 msgstr ""
 
 #: ../fdroidserver/common.py
@@ -1058,6 +1066,11 @@ msgstr ""
 msgid "Invalid srclib metadata: unknown key '{key}' in '{file}'"
 msgstr ""
 
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Invalid versionCode: \"{versionCode}\" is not an integer!"
+msgstr ""
+
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "JAR signature failed to verify: {path}"
@@ -1070,16 +1083,16 @@ msgstr ""
 
 #: ../fdroidserver/scanner.py
 msgid "Java JAR file"
-msgstr "پروندهٔ JAR جاوا"
+msgstr ""
 
-#: ../fdroidserver/mirror.py ../fdroidserver/publish.py
-#: ../fdroidserver/update.py
+#: ../fdroidserver/publish.py ../fdroidserver/update.py
+#: ../fdroidserver/mirror.py
 msgid "Java JDK not found! Install in standard location or set java_paths!"
 msgstr ""
 
 #: ../fdroidserver/scanner.py
 msgid "Java compiled class"
-msgstr "کلاس ترجمه شدهٔ جاوا"
+msgstr ""
 
 #: ../fdroidserver/signindex.py
 msgid "Java jarsigner not found! Install in standard location or set java_paths!"
@@ -1089,19 +1102,10 @@ msgstr ""
 msgid "Javascript in HTML src attributes"
 msgstr ""
 
-#: ../fdroidserver/build.py
-#, python-brace-format
-msgid "Keeping failed build \"{apkfilename}\""
-msgstr ""
-
 #: ../fdroidserver/init.py
 msgid "Keystore for signing key:\t"
 msgstr ""
 
-#: ../fdroidserver/lint.py
-msgid "Known debug key is used in AllowedAPKSigningKeys: "
-msgstr ""
-
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "Last used commit '{commit}' looks like a tag, but UpdateCheckMode is '{ucm}'"
@@ -1111,8 +1115,12 @@ msgstr ""
 msgid "Liberapay donation methods belong in the Liberapay: field"
 msgstr ""
 
+#: ../fdroidserver/lint.py
+msgid "Liberapay donation methods belong in the LiberapayID flag"
+msgstr ""
+
 #: ../fdroidserver/rewritemeta.py
-msgid "List files that would be reformatted (dry run)"
+msgid "List files that would be reformatted"
 msgstr ""
 
 #: ../fdroidserver/lint.py
@@ -1125,20 +1133,10 @@ msgstr ""
 
 #: ../fdroidserver/index.py
 msgid "Malformed repository mirrors."
-msgstr "آینه‌های مخزن بدریخت."
+msgstr ""
 
 #: ../fdroidserver/deploy.py
 msgid "Malformed serverwebroot line:"
-msgstr "خط ریشهٔ وب کارساز بدریخت:"
-
-#: ../fdroidserver/scanner.py
-#, python-format
-msgid "Max recursion depth in ZIP file reached: %s"
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "Mirror config for {url} contains \"isPrimary\" key!"
 msgstr ""
 
 #: ../fdroidserver/mirror.py
@@ -1147,31 +1145,32 @@ msgstr ""
 
 #: ../fdroidserver/gpgsign.py
 msgid "Missing output directory"
-msgstr "شاخهٔ output نیست"
-
-#: ../fdroidserver/metadata.py
-msgid "Moving Anti-Features declarations to localized files:"
 msgstr ""
 
-#: ../fdroidserver/index.py
-msgid "Neither \"repo_pubkey\" nor \"keystorepass\" set in config.yml"
-msgstr ""
-
-#: ../fdroidserver/verify.py
+#: ../fdroidserver/lint.py
 #, python-format
-msgid "No APK for package: %s"
+msgid "Name '%s' is just the auto name - remove it"
+msgstr ""
+
+#: ../fdroidserver/common.py
+msgid "No 'config.py' found, using defaults."
 msgstr ""
 
 #: ../fdroidserver/common.py
 msgid "No Android SDK found!"
 msgstr ""
 
+#: ../fdroidserver/import.py
+msgid "No android or kivy project could be found. Specify --subdir?"
+msgstr ""
+
 #: ../fdroidserver/install.py
 msgid "No attached devices found"
 msgstr ""
 
-#: ../fdroidserver/install.py
-msgid "No devices found for `adb install`! Please plug one in."
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "No commit specified for {versionName} in {linedesc}"
 msgstr ""
 
 #: ../fdroidserver/index.py
@@ -1182,21 +1181,12 @@ msgstr ""
 msgid "No git submodules available"
 msgstr ""
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "No gradle project could be found. Specify --subdir?"
 msgstr ""
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py ../fdroidserver/common.py
 msgid "No information found."
-msgstr "هیچ طّلاعاتی وجود ندارد."
-
-#: ../fdroidserver/checkupdates.py
-msgid "No matching tags found"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "No minimum SDK version found in {0}, using default (3)."
 msgstr ""
 
 #: ../fdroidserver/lint.py
@@ -1208,23 +1198,23 @@ msgid "No need to specify that the app is for Android"
 msgstr ""
 
 #: ../fdroidserver/deploy.py
-msgid "No option set! Edit your config.yml to set at least one of these:"
+msgid "No option set! Edit your config.py to set at least one of these:"
 msgstr ""
 
 #: ../fdroidserver/common.py
 msgid "No packages specified"
-msgstr "هیچ بسته‌ای مشخّص نشده"
+msgstr ""
 
 #: ../fdroidserver/install.py
 #, python-format
-msgid "No signed APK available for %s"
+msgid "No signed apk available for %s"
 msgstr ""
 
 #: ../fdroidserver/install.py
 msgid "No signed output directory - nothing to do"
 msgstr ""
 
-#: ../fdroidserver/common.py
+#: ../fdroidserver/update.py ../fdroidserver/common.py
 #, python-brace-format
 msgid "No signing certificates found in {path}"
 msgstr ""
@@ -1234,30 +1224,23 @@ msgstr ""
 msgid "No such package: %s"
 msgstr ""
 
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "No such versionCode {versionCode} for app {appid}"
 msgstr ""
 
-#: ../fdroidserver/checkupdates.py
-msgid "No tags found"
-msgstr ""
-
-#: ../fdroidserver/publish.py ../fdroidserver/verify.py
+#: ../fdroidserver/verify.py ../fdroidserver/publish.py
 msgid "No unsigned directory - nothing to do"
 msgstr ""
 
-#: ../fdroidserver/__main__.py
-msgid "No version information could be found."
-msgstr ""
-
 #: ../fdroidserver/common.py
 msgid "Not a valid size definition: \"{}\""
 msgstr ""
 
 #: ../fdroidserver/signindex.py
 msgid "Nothing to do"
-msgstr "کاری برای انجام نیست"
+msgstr ""
 
 #: ../fdroidserver/checkupdates.py
 #, python-brace-format
@@ -1265,9 +1248,10 @@ msgid "Nothing to do for {appid}."
 msgstr ""
 
 #: ../fdroidserver/init.py
-msgid "Now set these in config.yml:"
+msgid "Now set these in config.py:"
 msgstr ""
 
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "OBB file has newer versionCode({integer}) than any APK:"
@@ -1285,27 +1269,22 @@ msgstr ""
 msgid "Offline machine, skipping git mirror generation until `fdroid deploy`"
 msgstr ""
 
-#: ../fdroidserver/deploy.py
-msgid "One of the 'github_releases' config items is missing the 'packageNames' value. skipping ..."
+#: ../fdroidserver/common.py
+#, python-brace-format
+msgid "Old APK signature failed to verify: {path}"
 msgstr ""
 
-#: ../fdroidserver/deploy.py
-msgid "One of the 'github_releases' config items is missing the 'projectUrl' value. skipping ..."
+#: ../fdroid ../fdroidserver/__main__.py
+msgid "Old, deprecated name for fdroid deploy"
 msgstr ""
 
-#: ../fdroidserver/deploy.py
-msgid "One of the 'github_releases' config items is missing the 'token' value. skipping ..."
-msgstr ""
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Only PNG and JPEG are supported for graphics, found: {path}"
 msgstr ""
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/common.py
-msgid "Only accepts a single key \"env\""
+#: ../fdroidserver/checkupdates.py
+msgid "Only print differences with the Play Store"
 msgstr ""
 
 #: ../fdroidserver/checkupdates.py
@@ -1316,6 +1295,11 @@ msgstr ""
 msgid "OpenCollective donation methods belong in the OpenCollective: field"
 msgstr ""
 
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "Options"
+msgstr "انتخاب‌ها"
+
 #: ../fdroidserver/verify.py
 msgid "Output JSON report to file named after APK."
 msgstr ""
@@ -1324,22 +1308,26 @@ msgstr ""
 msgid "Output JSON to stdout."
 msgstr ""
 
-#: ../fdroidserver/checkupdates.py ../fdroidserver/gpgsign.py
-#: ../fdroidserver/publish.py ../fdroidserver/signindex.py
-#: ../fdroidserver/update.py
+#: ../fdroidserver/gpgsign.py ../fdroidserver/publish.py
+#: ../fdroidserver/update.py ../fdroidserver/signindex.py
+#: ../fdroidserver/checkupdates.py
 msgid "Outputting JSON"
-msgstr "خروجی دادن JSON"
+msgstr ""
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "Overall license of the project."
 msgstr ""
 
+#: ../fdroidserver/dscanner.py
+msgid "Override path for repo APKs (default: ./repo)"
+msgstr ""
+
 #: ../fdroidserver/index.py
 #, python-brace-format
 msgid "Overriding blank versionName in {apkfilename} from metadata: {version}"
 msgstr ""
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 #, python-brace-format
 msgid "Package \"{appid}\" already exists"
 msgstr ""
@@ -1353,10 +1341,13 @@ msgstr ""
 msgid "Password required with username"
 msgstr ""
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "Path to main Android project subdirectory, if not in root."
 msgstr ""
 
+msgid "Path to main android project subdirectory, if not in root."
+msgstr ""
+
 #: ../fdroidserver/init.py
 msgid "Path to the Android SDK (sometimes set in ANDROID_HOME)"
 msgstr ""
@@ -1369,18 +1360,20 @@ msgstr ""
 msgid "Path to the keystore for the repo signing key"
 msgstr ""
 
+#: ../fdroidserver/dscanner.py
+msgid "Prepare Drozer to run a scan"
+msgstr ""
+
+msgid "Prepare drozer to run a scan"
+msgstr ""
+
 #: ../fdroidserver/nightly.py
 msgid "Print the secret variable to the terminal for easy copy/paste"
 msgstr ""
 
-#: ../fdroidserver/install.py
+#: ../fdroidserver/metadata.py
 #, python-brace-format
-msgid "Privacy mode was enabled based on your locale ({country_code})."
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-format
-msgid "Problem with ZIP file: %s, error %s"
+msgid "Problem with description of {appid}: {error}"
 msgstr ""
 
 #: ../fdroidserver/common.py
@@ -1390,23 +1383,27 @@ msgstr ""
 
 #: ../fdroidserver/checkupdates.py
 msgid "Process auto-updates"
-msgstr "پردازش به‌روز رسانی‌های خودکار"
+msgstr ""
 
 #: ../fdroidserver/publish.py ../fdroidserver/update.py
 #, python-brace-format
 msgid "Processing {apkfilename}"
-msgstr "پردازش {apkfilename}"
+msgstr ""
 
 #: ../fdroidserver/checkupdates.py ../fdroidserver/scanner.py
 #, python-brace-format
 msgid "Processing {appid}"
-msgstr "پردازش {appid}"
+msgstr ""
 
 #: ../fdroidserver/update.py
 msgid "Produce human-readable XML/JSON for index files"
 msgstr ""
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/update.py
+msgid "Produce human-readable index.xml"
+msgstr ""
+
+#: ../fdroidserver/import.py
 msgid "Project URL to import from."
 msgstr ""
 
@@ -1418,41 +1415,39 @@ msgstr ""
 msgid "Push the log to this git remote repository"
 msgstr ""
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Pushing binary transparency log to {url}"
 msgstr ""
 
-#: ../fdroidserver/deploy.py
-msgid "Pushing to remote server failed!"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Pushing to {url}"
-msgstr "فرستادن به {url}"
+msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Quickly start a new repository"
-msgstr "آغاز سریع مخزنی جدید"
+msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Read all the metadata files and exit"
 msgstr ""
 
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "Reading '{config_file}'"
-msgstr "خواندن {config_file}"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Reading packageName/versionCode/versionName failed, APK invalid: '{apkfilename}'"
 msgstr ""
 
 #: ../fdroidserver/common.py
 #, python-brace-format
-msgid "Reading packageName/versionCode/versionName failed,APK invalid: '{apkfilename}'"
+msgid "Reading minSdkVersion failed: \"{apkfilename}\""
+msgstr ""
+
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
+#. https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
+#: ../fdroidserver/common.py
+#, python-brace-format
+msgid "Reading packageName/versionCode/versionName failed, APK invalid: '{apkfilename}'"
 msgstr ""
 
 #: ../fdroidserver/update.py
@@ -1460,35 +1455,24 @@ msgstr ""
 msgid "Reading {apkfilename} from cache"
 msgstr ""
 
-#: ../fdroidserver/build.py
-msgid "Refresh and cache scanner rules and signatures from the network"
-msgstr ""
-
-#: ../fdroidserver/publish.py
-#, python-brace-format
-msgid "Refusing to sign '{path}', file exists in both {dir1} and {dir2} folder."
-msgstr ""
-
-#: ../fdroidserver/verify.py
-msgid "Remove source tarball and any APKs if successfully verified."
+#: ../fdroidserver/stats.py
+msgid "Recalculate aggregate stats - use when changes have been made that would invalidate old cached data."
 msgstr ""
 
 #: ../fdroidserver/common.py
 msgid "Removing specified files"
-msgstr "برداشتن پرونده‌های مشخّص"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Removing {path}\""
-msgstr "برداشتن {path}"
+msgstr ""
 
 #: ../fdroidserver/update.py
 msgid "Rename APK files that do not match package.name_123.apk"
 msgstr ""
 
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "RepoType {type} is deprecated, please switch to git."
+#: ../fdroidserver/update.py
+msgid "Report on build data status"
+msgstr ""
+
+#: ../fdroidserver/build.py
+msgid "Reset and create a brand new build server, even if the existing one appears to be ok."
 msgstr ""
 
 #: ../fdroidserver/nightly.py
@@ -1504,34 +1488,33 @@ msgstr ""
 msgid "Restrict output to warnings and errors"
 msgstr ""
 
-#: ../fdroidserver/net.py
-#, python-format
-msgid "Retrying failed download: %s"
+#: ../fdroid ../fdroidserver/__main__.py
+msgid "Rewrite all the metadata files"
 msgstr ""
 
-#: ../fdroidserver/__main__.py
-msgid "Rewrite all the metadata files"
+#: ../fdroidserver/rewritemeta.py
+msgid "Rewrite to a specific format: "
 msgstr ""
 
 #: ../fdroidserver/rewritemeta.py
 #, python-brace-format
 msgid "Rewriting '{appid}'"
-msgstr "بازنویسی {appid}"
+msgstr ""
+
+#: ../fdroidserver/rewritemeta.py
+#, python-brace-format
+msgid "Rewriting '{appid}' to '{path}'"
+msgstr ""
 
 #: ../fdroidserver/checkupdates.py
 msgid "Run on git repo that has uncommitted changes"
 msgstr ""
 
-#: ../fdroidserver/nightly.py
-#, python-brace-format
-msgid "Run over {cibase} to find -debug.apk. and skip repo_basedir {repo_basedir}"
-msgstr ""
-
 #: ../fdroidserver/lint.py
 msgid "Run rewritemeta to fix formatting"
 msgstr ""
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 msgid "Running first pass with MD5 checking disabled"
 msgstr ""
 
@@ -1540,24 +1523,18 @@ msgstr ""
 msgid "Running wget in {path}"
 msgstr ""
 
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "SHA-256 of {url} does not match entry!"
+#: ../fdroidserver/dscanner.py
+msgid "Scan only the latest version of each package"
 msgstr ""
 
 #: ../fdroidserver/build.py
 msgid "Scan the resulting APK(s) for known non-free classes."
 msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Scan the source code of a package"
 msgstr ""
 
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Scanner found {count} problems in {apk}"
-msgstr ""
-
 #: ../fdroidserver/scanner.py
 #, python-brace-format
 msgid "Scanner found {count} problems in {appid}:"
@@ -1574,19 +1551,6 @@ msgid_plural "Scanner found {} problems"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../fdroidserver/scanner.py
-msgid "Scanning APK for extra signing blocks."
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "Scanning APK with dexdump for known non-free classes."
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Set NDK {release} ({version}) up"
-msgstr ""
-
 #: ../fdroidserver/common.py
 msgid "Set clock to that time using:"
 msgstr ""
@@ -1600,7 +1564,7 @@ msgstr ""
 msgid "Set open file limit to {integer}"
 msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Set up an app build for a nightly build repo"
 msgstr ""
 
@@ -1613,11 +1577,18 @@ msgstr ""
 msgid "Setting {0} sec timeout for this build"
 msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroidserver/build.py
+msgid "Setup an emulator, install the APK on it and perform a Drozer scan"
+msgstr ""
+
+msgid "Setup an emulator, install the apk on it and perform a drozer scan"
+msgstr ""
+
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Sign and place packages in the repo"
 msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Sign indexes created using update --nosign"
 msgstr ""
 
@@ -1630,11 +1601,6 @@ msgstr ""
 msgid "Skipping '{apkfilename}' with invalid signature!"
 msgstr ""
 
-#: ../fdroidserver/deploy.py ../fdroidserver/index.py
-#, python-format
-msgid "Skipping GitLab Pages mirror because the repo is too large (>%.2fGB)!"
-msgstr ""
-
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Skipping index generation for {appid}"
@@ -1648,16 +1614,25 @@ msgstr ""
 #: ../fdroidserver/scanner.py
 #, python-brace-format
 msgid "Skipping {appid}: disabled"
-msgstr "پرش از {appid}: از کار افتاده"
+msgstr ""
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/scanner.py
+#, python-brace-format
+msgid "Skipping {appid}: no builds specified"
+msgstr ""
+
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 msgid "Specify a local folder to sync the repo to"
 msgstr ""
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 msgid "Specify an identity file to provide to SSH for rsyncing"
 msgstr ""
 
+#: ../fdroidserver/build.py
+msgid "Specify that we're running on the build server"
+msgstr ""
+
 #: ../fdroidserver/nightly.py
 msgid "Specify which debug keystore file to use."
 msgstr ""
@@ -1666,6 +1641,11 @@ msgstr ""
 msgid "Spew out even more information than normal"
 msgstr ""
 
+#: ../fdroidserver/nightly.py
+#, python-brace-format
+msgid "Striping mystery signature from {apkfilename}"
+msgstr ""
+
 #: ../fdroidserver/nightly.py
 #, python-brace-format
 msgid "Stripping mystery signature from {apkfilename}"
@@ -1686,22 +1666,10 @@ msgstr ""
 msgid "System clock is older than date in {path}!"
 msgstr ""
 
-#: ../fdroidserver/checkupdates.py
-msgid "Tags update mode only works for git, hg, bzr and git-svn repositories currently"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "Tags update mode used in git-svn, but the repo was not set up with tags"
-msgstr ""
-
 #: ../fdroidserver/build.py
 msgid "Test mode - put output in the tmp directory only, and always build, even if the output already exists."
 msgstr ""
 
-#: ../fdroidserver/index.py
-msgid "The \"qrcode\" Python package is not installed (e.g. apt-get install python3-qrcode)!"
-msgstr ""
-
 #. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
 #: ../fdroidserver/update.py
 #, python-brace-format
@@ -1720,10 +1688,18 @@ msgstr ""
 msgid "The file to be included in the repo (path or glob)"
 msgstr ""
 
+#: ../fdroidserver/deploy.py
+msgid "The only commands currently supported are 'init' and 'update'"
+msgstr ""
+
 #: ../fdroidserver/index.py
 msgid "The repository's fingerprint does not match."
 msgstr ""
 
+#: ../fdroidserver/common.py
+msgid "The repository's index could not be verified."
+msgstr ""
+
 #: ../fdroidserver/deploy.py
 #, python-brace-format
 msgid "The root dir for local_copy_dir \"{path}\" does not exist!"
@@ -1737,37 +1713,13 @@ msgstr ""
 msgid "These are the apps that have been archived from the main repo."
 msgstr ""
 
-#: ../fdroidserver/mirror.py
-msgid "This command should never be used to mirror f-droid.org! A full copy requires more than 600GB."
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "This is a repository of apps to be used with F-Droid. Applications in this repository are either official binaries built by the original application developers, or are binaries built from source by the admin of f-droid.org using the tools on https://gitlab.com/fdroid."
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 #, python-format
 msgid "This repo already has local metadata: %s"
 msgstr ""
 
-#: ../fdroidserver/init.py
-#, python-format
-msgid ""
-"To complete the setup, add your APKs to \"%s\"\n"
-"then run \"fdroid update -c; fdroid update\".  You might also want to edit\n"
-"\"config.yml\" to set the URL, repo name, and more.  You should also set up\n"
-"a signing key (a temporary one might have been automatically generated).\n"
-"\n"
-"For more info: https://f-droid.org/docs/Setup_an_F-Droid_App_Repo\n"
-"and https://f-droid.org/docs/Signing_Process"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "To use awsbucket, awssecretkey and awsaccesskeyid must also be set in config.yml!"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "To use rclone, rclone_config and awsbucket must be set in config.yml!"
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
+msgid "To use awsbucket, awssecretkey and awsaccesskeyid must also be set in config.py!"
 msgstr ""
 
 #: ../fdroidserver/lint.py
@@ -1778,6 +1730,10 @@ msgstr ""
 msgid "URL shorteners should not be used"
 msgstr ""
 
+#: ../fdroidserver/metadata.py
+msgid "URL title is just the URL, use brackets: [URL]"
+msgstr ""
+
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "URL {url} in Description: {error}"
@@ -1791,15 +1747,16 @@ msgstr ""
 msgid "Unexpected license tag \"{}\"! Only use license tags configured in your config file"
 msgstr ""
 
-#: ../fdroidserver/common.py
+#: ../fdroidserver/metadata.py
 #, python-brace-format
-msgid "Unknown entry {key} in {configname}"
+msgid "Unexpected text on same line as {field} in {linedesc}"
 msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Unknown exception found!"
-msgstr "استثنایی ناشناخته پیدا شد!"
+msgstr "خطای ناشناخته‌ای یافت شد!"
 
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "Unknown file '{filename}' in build '{versionName}'"
@@ -1810,6 +1767,11 @@ msgstr ""
 msgid "Unknown metadata format: %s"
 msgstr ""
 
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Unknown metadata format: {path}"
+msgstr ""
+
 #: ../fdroidserver/metadata.py
 #, python-brace-format
 msgid "Unknown metadata format: {path} (use: *.yml)"
@@ -1819,25 +1781,37 @@ msgstr ""
 msgid "Unknown version of aapt, might cause problems: "
 msgstr ""
 
+#: ../fdroidserver/lint.py
+msgid "Unlinkified link - use [http://foo.bar Link title] or [http://foo.bar]"
+msgstr ""
+
 #: ../fdroidserver/lint.py
 msgid "Unnecessary leading space"
-msgstr "فضای پیشین نالازم"
+msgstr ""
 
 #: ../fdroidserver/lint.py
 msgid "Unnecessary trailing space"
-msgstr "فضای پسین نالازم"
+msgstr ""
 
 #: ../fdroidserver/metadata.py
 #, python-brace-format
 msgid "Unrecognised app field '{fieldname}' in '{path}'"
 msgstr ""
 
+#: ../fdroidserver/metadata.py
+msgid "Unrecognised app field: "
+msgstr ""
+
 #: ../fdroidserver/metadata.py
 #, python-brace-format
 msgid "Unrecognised build flag '{build_flag}' in '{path}'"
 msgstr ""
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Unrecognised field '{field}' in {linedesc}"
+msgstr ""
+
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Unsupported file type \"{extension}\" for repo graphic"
@@ -1848,6 +1822,29 @@ msgstr ""
 msgid "Unsupported graphics file found: {path}"
 msgstr ""
 
+#: ../fdroidserver/rewritemeta.py
+#, python-brace-format
+msgid "Unsupported metadata format, use: --to [{supported}]"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+msgid "Unterminated ]"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+msgid "Unterminated ]]"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Unterminated build in {name}"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Unterminated continuation in {name}"
+msgstr ""
+
 #: ../fdroidserver/lint.py
 #, python-format
 msgid "Unused extlib at %s"
@@ -1868,25 +1865,27 @@ msgstr ""
 msgid "Unused scanignore path: %s"
 msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Update repo information for new packages"
 msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Update the binary transparency log for a URL"
 msgstr ""
 
+#: ../fdroid ../fdroidserver/__main__.py
+msgid "Update the stats of the repo"
+msgstr ""
+
+#: ../fdroidserver/update.py ../fdroidserver/build.py
+msgid "Update the wiki"
+msgstr ""
+
 #: ../fdroidserver/checkupdates.py
 #, python-brace-format
 msgid "UpdateCheckData has invalid URL: {url}"
 msgstr ""
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "UpdateCheckData must match the version code as integer (\\d or [0-9]): {codeex}"
-msgstr ""
-
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "UpdateCheckData must use HTTPS URL: {url}"
@@ -1898,10 +1897,14 @@ msgid "UpdateCheckData not a valid URL: {url}"
 msgstr ""
 
 #: ../fdroidserver/lint.py
-msgid "UpdateCheckMode is set but it looks like checkupdates hasn't been run yet."
+msgid "UpdateCheckMode is set but it looks like checkupdates hasn't been run yet"
+msgstr ""
+
+#. Translators: https://developer.android.com/studio/build/application-id
+#: ../fdroidserver/lint.py
+msgid "UpdateCheckName is set to the known application ID - it can be removed"
 msgstr ""
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
 #: ../fdroidserver/lint.py
 msgid "UpdateCheckName is set to the known application ID, it can be removed"
 msgstr ""
@@ -1916,8 +1919,19 @@ msgstr ""
 msgid "Uploading {apkfilename} to virustotal"
 msgstr ""
 
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "Usage"
+msgstr "مصرف"
+
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, python-format
+msgid "Usage: %s\n"
+msgstr "مصرف: %s\n"
+
 #: ../fdroidserver/lint.py
-msgid "Use /HEAD instead of /master or /main to point at a file in the default branch"
+msgid "Use /HEAD instead of /master to point at a file in the default branch"
 msgstr ""
 
 #: ../fdroidserver/update.py
@@ -1926,20 +1940,18 @@ msgstr ""
 
 #: ../fdroidserver/build.py
 msgid "Use build server"
-msgstr "استفاده از کارساز ساخت"
+msgstr ""
 
 #: ../fdroidserver/update.py
 msgid "Use date from APK instead of current time for newly added APKs"
 msgstr ""
 
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Using \"{path}\" for configuring s3cmd."
+msgid "Use date from apk instead of current time for newly added apks"
 msgstr ""
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
-msgid "Using \"{path}\" for syncing with remote storage."
+msgid "Using \"{path}\" for configuring s3cmd."
 msgstr ""
 
 #: ../fdroidserver/common.py
@@ -1950,17 +1962,13 @@ msgstr ""
 msgid "Using APK Signature v3"
 msgstr ""
 
-#: ../fdroidserver/common.py
-msgid "Using JAR Signature"
-msgstr ""
-
 #: ../fdroidserver/common.py
 msgid "Using Java's jarsigner, not recommended for verifying APKs! Use apksigner"
 msgstr ""
 
-#: ../fdroidserver/metadata.py
+#: ../fdroidserver/common.py
 #, python-brace-format
-msgid "Using blank dictionary instead of contents of {path}!"
+msgid "Using androguard from \"{path}\""
 msgstr ""
 
 #: ../fdroidserver/init.py
@@ -1968,17 +1976,12 @@ msgstr ""
 msgid "Using existing keystore \"{path}\""
 msgstr ""
 
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Using rclone to sync with: {url}"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Using s3cmd to sync with: {url}"
 msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Valid commands are:"
 msgstr "فرمان‌های معتبر عبارت‌اند از:"
 
@@ -1986,17 +1989,12 @@ msgstr "فرمان‌های معتبر عبارت‌اند از:"
 msgid "Verify against locally cached copy rather than redownloading."
 msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Verify the integrity of downloaded packages"
 msgstr ""
 
 #: ../fdroidserver/index.py
 msgid "Verifying index signature:"
-msgstr "تأیید کردن امضای نمایه:"
-
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "Verifying package {path} with apksigner."
 msgstr ""
 
 #: ../fdroidserver/deploy.py
@@ -2004,18 +2002,10 @@ msgstr ""
 msgid "VirusTotal API key cannot upload files larger than 32MB, use {url} to upload {path}."
 msgstr ""
 
-#: ../fdroidserver/nightly.py
-msgid "WARNING: only public git repos are supported!"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Warn about possible metadata errors"
 msgstr ""
 
-#: ../fdroidserver/scanner.py
-msgid "WebAssembly binary file"
-msgstr ""
-
 #: ../fdroidserver/update.py
 msgid "When configured for signed indexes, create only unsigned indexes at this stage"
 msgstr ""
@@ -2024,16 +2014,7 @@ msgstr ""
 msgid "When linting the entire repository yamllint is disabled by default. This option forces yamllint regardless."
 msgstr ""
 
-#: ../fdroidserver/publish.py
-msgid "When signing or verifying fails, exit with an error code."
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "Would you like to download and install F-Droid.apk via adb? (YES/no)"
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "Would you like to download the app(s) from f-droid.org? (YES/no)"
+msgid "X.509 'Distiguished Name' used when generating keys"
 msgstr ""
 
 #: ../fdroidserver/init.py
@@ -2046,11 +2027,6 @@ msgstr ""
 
 #: ../fdroidserver/scanner.py
 msgid "ZIP file archive"
-msgstr "بایگانی پروندهٔ ZIP"
-
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "adb reports {serial} is \"{status}\"!"
 msgstr ""
 
 #: ../fdroidserver/nightly.py
@@ -2063,66 +2039,70 @@ msgstr ""
 msgid "adding to {name}: {path}"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "ambiguous option: %(option)s could match %(matches)s"
 msgstr ""
 
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "apksigner in build-tools;{version} passes APKs with invalid v3 signatures, ignoring."
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "apksigner not found! Cannot sign or verify modern APKs"
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, python-format
+msgid "ambiguous option: %s (%s?)"
 msgstr ""
 
 #: ../fdroidserver/common.py
 msgid "apksigner not found, it's required for signing!"
 msgstr ""
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/checkupdates.py ../fdroidserver/lint.py
-#: ../fdroidserver/rewritemeta.py
+#: ../fdroidserver/lint.py ../fdroidserver/rewritemeta.py
+#: ../fdroidserver/checkupdates.py
 msgid "application ID of file to operate on"
 msgstr ""
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/build.py ../fdroidserver/install.py
-#: ../fdroidserver/publish.py ../fdroidserver/scanner.py
-#: ../fdroidserver/verify.py
+#: ../fdroidserver/verify.py ../fdroidserver/publish.py
+#: ../fdroidserver/build.py ../fdroidserver/scanner.py
+#: ../fdroidserver/install.py
 msgid "application ID with optional versionCode in the form APPID[:VERCODE]"
 msgstr ""
 
-#: ../fdroidserver/common.py
-msgid "archive_url needs to end with /archive"
+#: ../fdroidserver/lint.py ../fdroidserver/rewritemeta.py
+msgid "applicationId in the form APPID"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: ../fdroidserver/checkupdates.py
+msgid "applicationId to check for updates"
+msgstr ""
+
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
+#: ../fdroidserver/verify.py ../fdroidserver/publish.py
+#: ../fdroidserver/dscanner.py ../fdroidserver/build.py
+#: ../fdroidserver/scanner.py ../fdroidserver/install.py
+msgid "applicationId with optional versionCode in the form APPID[:VERCODE]"
+msgstr ""
+
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "argument \"-\" with mode %r"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "argument %(argument_name)s: %(message)s"
-msgstr ""
-
 #: ../fdroidserver/nightly.py
 msgid "attempting bare SSH connection to test deploy key:"
 msgstr ""
 
+#: ../fdroidserver/nightly.py
+msgid "attempting bare ssh connection to test deploy key:"
+msgstr ""
+
 #: ../fdroidserver/common.py
 msgid "can not parse scrlib spec (not a string): '{}'"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
-msgid "can't open '%(filename)s': %(error)s"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "can't open non-https url: '{};"
+msgid "can't open '%s': %s"
 msgstr ""
 
 #: ../fdroidserver/build.py
@@ -2130,11 +2110,13 @@ msgstr ""
 msgid "cannot find required srclibs: \"{path}\""
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "cannot have multiple subparser arguments"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "cannot merge actions - two groups are named %r"
 msgstr ""
@@ -2146,27 +2128,32 @@ msgstr ""
 #: ../fdroidserver/nightly.py
 #, python-brace-format
 msgid "cloning {url}"
-msgstr "شبیه‌سازی {url}"
+msgstr ""
+
+#: ../fdroidserver/deploy.py
+msgid "command to execute, either 'init' or 'update'"
+msgstr ""
 
 #: ../fdroidserver/__main__.py
 msgid "commands from plugin modules:"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "complex"
+msgstr ""
+
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "conflicting option string: %s"
 msgid_plural "conflicting option strings: %s"
 msgstr[0] ""
 msgstr[1] ""
 
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "conflicting subparser alias: %s"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "conflicting subparser: %s"
+#: ../fdroidserver/nightly.py
+#, python-brace-format
+msgid "copying {apkfilename} into {path}"
 msgstr ""
 
 #: ../fdroidserver/metadata.py
@@ -2175,30 +2162,26 @@ msgid "could not parse '{path}'"
 msgstr ""
 
 #: ../fdroidserver/common.py
-msgid "could not parse srclib spec (no name specified): '{}'"
+msgid "could not parse srclib spec (no ref specified): '{}'"
 msgstr ""
 
 #: ../fdroidserver/common.py
-msgid "could not parse srclib spec (no ref specified): '{}'"
+msgid "could not parse srclib spec (too many '@' signs): '{}'"
 msgstr ""
 
 #: ../fdroidserver/nightly.py
 #, python-brace-format
 msgid "created {path}"
-msgstr "{path} را ایجاد کرد"
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "current version is newer: old vercode={old}, new vercode={new}"
 msgstr ""
 
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "deleting: repo/{apkfilename}"
-msgstr "حذف کردن: ‪repo/{apkfilename}‬"
+msgstr ""
 
-#: ../fdroidserver/scanner.py
-msgid "dependency file without lock"
+#: ../fdroidserver/common.py
+#, python-brace-format
+msgid "deployed build logs to '{path}'"
 msgstr ""
 
 #: ../fdroidserver/common.py
@@ -2206,48 +2189,59 @@ msgstr ""
 msgid "deployed process log {path} to {dest}"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "dest= is required for options like %r"
 msgstr ""
 
-#: ../fdroidserver/scanner.py
-msgid "downloading '{}'"
-msgstr "بار گرفتن «{}»"
-
-#: ../fdroidserver/scanner.py
-msgid "downloading scanner signatures from '{}' failed"
-msgstr ""
-
 #: ../fdroidserver/scanner.py
 msgid "executable binary, possibly code"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "expected %s argument"
 msgid_plural "expected %s arguments"
-msgstr[0] "انتظار %s آرگومان می‌رفت"
-msgstr[1] "انتظار %s آرگومان می‌رفت"
+msgstr[0] ""
+msgstr[1] ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "expected at least one argument"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "expected at most one argument"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "expected one argument"
-msgstr "انتظار آرگومان می‌رفت"
+msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroidserver/common.py
+#, python-brace-format
+msgid "failed deploying build logs to '{path}'"
+msgstr ""
+
+#: ../fdroid
+msgid "fdroid [-h|--help|--version] <command> [<args>]"
+msgstr ""
+
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "fdroid [<command>] [-h|--help|--version|<args>]"
-msgstr "fdroid [<command>] [-h|--help|--version|<args>]"
+msgstr ""
 
-#: ../fdroidserver/scanner.py
-msgid "fetch the latest version of signatures from the web"
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "floating-point"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+msgid "force errors to be warnings, or ignore"
 msgstr ""
 
 #: ../fdroidserver/metadata.py
@@ -2260,9 +2254,10 @@ msgstr ""
 
 #: ../fdroidserver/scanner.py
 msgid "gzip file archive"
-msgstr "بایگانی پروندهٔ gzip"
+msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "ignored explicit argument %r"
 msgstr ""
@@ -2271,39 +2266,35 @@ msgstr ""
 msgid "index-v1 must have a signature, use `fdroid signindex` to create it!"
 msgstr ""
 
-#: ../fdroidserver/index.py
-msgid "index-v2 must have a signature, use `fdroid signindex` to create it!"
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "integer"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "invalid %(type)s value: %(value)r"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "invalid choice: %(value)r (choose from %(choices)s)"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "invalid conflict_resolution value: %r"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "invalid option string %(option)r: must start with a character %(prefix_chars)r"
 msgstr ""
 
-#: ../fdroidserver/common.py
-msgid "ipfs_cid not found, skipping CIDv1 generation"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "latest build recipe is newer: old vercode={old}, new vercode={new}"
-msgstr ""
-
 #: ../fdroidserver/deploy.py
 #, python-brace-format
 msgid "local_copy_dir does not end with \"fdroid\", perhaps you meant: \"{path}\""
@@ -2322,20 +2313,11 @@ msgstr ""
 msgid "mirror '%s' does not end with 'fdroid'!"
 msgstr ""
 
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "mirrors set twice, in config.yml and {path}!"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "mutually exclusive arguments must be optional"
 msgstr ""
 
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "next {name} cache update due in {time}"
-msgstr ""
-
 #: ../fdroidserver/mirror.py
 #, python-brace-format
 msgid "no \"icon\" in {appid}"
@@ -2343,93 +2325,145 @@ msgstr ""
 
 #: ../fdroidserver/signatures.py
 msgid "no APK supplied"
-msgstr "هیج APKای داده نشده"
-
-#: ../fdroidserver/checkupdates.py
-msgid "no version information found"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, python-format
+msgid "no such option: %s"
+msgstr ""
+
+#: ../fdroid ../fdroidserver/__main__.py
+msgid "no version info found!"
+msgstr ""
+
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "not allowed with argument %s"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "one of the arguments %s is required"
 msgstr ""
 
-#: ../fdroidserver/common.py ../fdroidserver/index.py
+#: ../fdroidserver/index.py ../fdroidserver/common.py
 msgid "only accepts strings, lists, and tuples"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
-msgid "options"
-msgstr "گزینه‌ها"
+#: ../fdroidserver/install.py
+#, python-format
+msgid "option %s: If you really want to install all the signed apps, use --all"
+msgstr ""
+
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, python-format
+msgid "option %s: invalid %s value: %r"
+msgstr ""
+
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, python-format
+msgid "option %s: invalid choice: %r (choose from %s)"
+msgstr ""
+
+#: /usr/lib/python3.5/getopt.py /usr/lib/python3.6/getopt.py
+#: /usr/lib/python3.7/getopt.py
+#, python-format
+msgid "option -%s not recognized"
+msgstr "گزینه -%s شناسایی نشد"
+
+#: /usr/lib/python3.5/getopt.py /usr/lib/python3.6/getopt.py
+#: /usr/lib/python3.7/getopt.py
+#, python-format
+msgid "option -%s requires argument"
+msgstr "گزینه -%s نیازمند آرگومان است"
+
+#: /usr/lib/python3.5/getopt.py /usr/lib/python3.6/getopt.py
+#: /usr/lib/python3.7/getopt.py
+#, python-format
+msgid "option --%s must not have an argument"
+msgstr ""
+
+#: /usr/lib/python3.5/getopt.py /usr/lib/python3.6/getopt.py
+#: /usr/lib/python3.7/getopt.py
+#, python-format
+msgid "option --%s not a unique prefix"
+msgstr ""
+
+#: /usr/lib/python3.5/getopt.py /usr/lib/python3.6/getopt.py
+#: /usr/lib/python3.7/getopt.py
+#, python-format
+msgid "option --%s not recognized"
+msgstr "گزینه --%s شناسایی نشد"
+
+#: /usr/lib/python3.5/getopt.py /usr/lib/python3.6/getopt.py
+#: /usr/lib/python3.7/getopt.py
+#, python-format
+msgid "option --%s requires argument"
+msgstr ""
+
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
+msgid "optional arguments"
+msgstr "آرگومان‌های اختیاری"
 
 #: ../fdroidserver/nightly.py
 #, python-brace-format
 msgid "overwriting existing {path}"
-msgstr "پایمالی {path} موجود"
+msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "positional arguments"
-msgstr "آرگومان‌های موقعیتی"
+msgstr ""
 
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "process log deploy {path} to {dest} failed!"
 msgstr ""
 
-#: ../fdroidserver/build.py
-msgid "reference binary missing signature"
-msgstr ""
-
 #: ../fdroidserver/signatures.py
 #, python-brace-format
 msgid "refuse downloading via insecure HTTP connection (use HTTPS or specify --no-https-check): {apkfilename}"
 msgstr ""
 
+#: ../fdroidserver/signatures.py
+#, python-brace-format
+msgid "refuse downloading via insecure http connection (use https or specify --no-https-check): {apkfilename}"
+msgstr ""
+
 #: ../fdroidserver/index.py
 #, python-format
-msgid "repo_icon \"repo/icons/%s\" does not exist, generating placeholder."
+msgid "repo_icon %s does not exist, generating placeholder."
 msgstr ""
 
-#: ../fdroidserver/common.py
-msgid "repo_url needs to end with /repo"
+#: ../fdroidserver/metadata.py
+msgid "ruamel.yaml not installed, can not write metadata."
 msgstr ""
 
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "rsync is missing or broken: {error}"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "s3cmd sync indexes {path} to {url} and delete"
 msgstr ""
 
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "s3cmd syncs indexes from {path} to {url} and deletes removed"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "scanner cache is malformed! You can clear it with: '{clear}'"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "serverwebroot: path does not end with \"fdroid\", perhaps you meant one of these:"
-msgstr ""
-
 #: ../fdroidserver/scanner.py
 msgid "shared library"
-msgstr "کتابخانهٔ اشتراکی"
+msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "show program's version number and exit"
+msgstr "نسخه برنامه را نمایش داده و خارج می‌شود"
+
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.5/optparse.py
+#: /usr/lib/python3.6/argparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/argparse.py /usr/lib/python3.7/optparse.py
 msgid "show this help message and exit"
-msgstr "نمایش این پیام راهنما و خروج"
+msgstr "این پیام راهنما را نمایش داده و خارج می‌شود"
 
 #: ../fdroidserver/signatures.py
 msgid "signed APK, either a file-path or HTTPS URL."
@@ -2454,47 +2488,52 @@ msgstr ""
 
 #: ../fdroidserver/scanner.py
 msgid "static library"
-msgstr "کتابخانهٔ ایستا"
-
-#: ../fdroidserver/build.py
-#, python-brace-format
-msgid "supplied reference binary has allowed signer {signer}"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: ../fdroidserver/common.py
+#, python-brace-format
+msgid "supplied timestamp value '{timestamp}' is not a unix timestamp"
+msgstr ""
+
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "the following arguments are required: %s"
 msgstr ""
 
-#: ../fdroidserver/install.py
-msgid "true"
-msgstr "درست"
-
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "unexpected option string: %s"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "unknown parser %(parser_name)r (choices: %(choices)s)"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "unrecognized arguments: %s"
-msgstr "آرگومان‌های ناشناخته: %s"
+msgstr ""
 
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "unsafe permissions on '{config_file}' (should be 0600)!"
 msgstr ""
 
-#: ../fdroidserver/__main__.py /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py ../fdroid
+#: /usr/lib/python3.7/argparse.py ../fdroidserver/__main__.py
 msgid "usage: "
-msgstr "استفاده: "
+msgstr "مصرف: "
 
-#: ../fdroidserver/deploy.py
+#: ../fdroid
+msgid "usage: fdroid [-h|--help|--version] <command> [<args>]"
+msgstr "استفاده: fdroid [-h|--help|--version] <command> [<args>]"
+
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "using Apache libcloud to sync with {url}"
 msgstr ""
@@ -2503,9 +2542,9 @@ msgstr ""
 msgid "virustotal.com is rate limiting, waiting to retry..."
 msgstr ""
 
-#: ../fdroidserver/install.py
-msgid "yes"
-msgstr "بله"
+#: ../fdroidserver/update.py
+msgid "wiki support is deprecated and will be removed in the next release!"
+msgstr ""
 
 #: ../fdroidserver/publish.py
 #, python-brace-format
@@ -2519,19 +2558,31 @@ msgstr[1] ""
 msgid "{apkfilename} ({appid}) has no metadata!"
 msgstr ""
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
+#: ../fdroidserver/update.py
+#, python-brace-format
+msgid "{apkfilename} has multiple {name} files, looks like Master Key exploit!"
+msgstr ""
+
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "{apkfilename}'s AndroidManifest.xml has a bad date: "
 msgstr ""
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "{appid} does not have a name! Using application ID instead."
 msgstr ""
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
+#: ../fdroidserver/update.py
+#, python-brace-format
+msgid "{appid} does not have a name! Using package name instead."
+msgstr ""
+
+#: ../fdroidserver/update.py
+#, python-brace-format
+msgid "{appid} from {path} is not a valid Android Package Name!"
+msgstr ""
+
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "{appid} from {path} is not a valid Android application ID!"
@@ -2542,16 +2593,12 @@ msgstr ""
 msgid "{appid} from {path} is not a valid Java Package Name!"
 msgstr ""
 
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{appid} has both APKs and files: {files}"
-msgstr ""
-
 #: ../fdroidserver/mirror.py
 #, python-brace-format
 msgid "{appid} is missing {name}"
 msgstr ""
 
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "{appid}: Unknown extlib {path} in build '{versionName}'"
@@ -2579,7 +2626,7 @@ msgstr ""
 
 #: ../fdroidserver/metadata.py
 #, python-brace-format
-msgid "{build_flag} must be list or string, found: {value}"
+msgid "{field} not terminated in {name}"
 msgstr ""
 
 #: ../fdroidserver/metadata.py
@@ -2589,15 +2636,10 @@ msgstr ""
 
 #: ../fdroidserver/update.py
 #, python-brace-format
-msgid "{name} \"{section}/icons/{path}\" does not exist! Check \"config.yml\"."
+msgid "{name} \"{path}\" does not exist! Correct it in config.py."
 msgstr ""
 
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{path1} is a duplicate of {path2}, remove one!"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 #, python-brace-format
 msgid "{path} already exists, ignoring import results!"
 msgstr ""
@@ -2612,36 +2654,6 @@ msgstr ""
 msgid "{path} has bad file signature \"{pattern}\", possible Janus exploit!"
 msgstr ""
 
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "{path} has been flagged by virustotal {count} times:"
-msgstr ""
-
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "{path} has the wrong fingerprint ({fingerprint})!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "{path} is not \"key: value\" dict, but a {datatype}!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "{path} is not a standard config file!"
-msgstr "{path} پروندهٔ پیکربندی استانداردی نیست!"
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "{path} is not list, but a {datatype}!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "{path} is not {expected_type}, but a {datatype}!"
-msgstr ""
-
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "{path} is zero size!"
@@ -2652,22 +2664,12 @@ msgstr ""
 msgid "{path} more than 200MB, manually upload: {url}"
 msgstr ""
 
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "{path}: \"{code}\" is not a valid ISO_3166-1 alpha-2 country code!"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{path}: {error}"
-msgstr "{path}: {error}"
-
 #: ../fdroidserver/mirror.py
 #, python-brace-format
 msgid "{url} does not end with \"fdroid\", check the URL path!"
 msgstr ""
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/common.py
 #, python-brace-format
 msgid "{url} does not start with \"http\"!"
 msgstr ""
@@ -2675,11 +2677,11 @@ msgstr ""
 #: ../fdroidserver/build.py
 msgid "{} build failed"
 msgid_plural "{} builds failed"
-msgstr[0] "{} ساخت شکست خورد"
-msgstr[1] "{} ساخت شکست خوردند"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../fdroidserver/build.py
 msgid "{} build succeeded"
 msgid_plural "{} builds succeeded"
-msgstr[0] "{} ساخت موفّق شد"
-msgstr[1] "{} ساخت موفّق شدند"
+msgstr[0] ""
+msgstr[1] ""
diff --git a/locale/fdroidserver.pot b/locale/fdroidserver.pot
index 486f290d..ee8e533c 100644
--- a/locale/fdroidserver.pot
+++ b/locale/fdroidserver.pot
@@ -5,9 +5,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: fdroidserver 2.4.2-3-gdcb804f7\n"
+"Project-Id-Version: fdroidserver 2.0a0-62-gc63c4b3d\n"
 "Report-Msgid-Bugs-To: https://gitlab.com/fdroid/fdroidserver/issues\n"
-"POT-Creation-Date: 2025-06-25 09:52+0200\n"
+"POT-Creation-Date: 2020-10-21 18:05+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,6 +17,22 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
+#: ../fdroidserver/common.py
+msgid ""
+"\n"
+"        This is a repository of apps to be used with FDroid. Applications in this\n"
+"        repository are either official binaries built by the original application\n"
+"        developers, or are binaries built from source by f-droid.org using the\n"
+"        tools on https://gitlab.com/fdroid.\n"
+"        "
+msgstr ""
+
+#: ../fdroidserver/nightly.py
+msgid ""
+"\n"
+"SSH Public Key to be used as Deploy Key:"
+msgstr ""
+
 #: ../fdroidserver/nightly.py
 msgid ""
 "\n"
@@ -35,26 +51,22 @@ msgstr ""
 msgid "\"%s/\" has no matching metadata file!"
 msgstr ""
 
-#: ../fdroidserver/index.py
-msgid "\"isPrimary\" key should not be added to mirrors!"
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "\"local_copy_dir\" {path} does not exist!"
-msgstr ""
-
 #: ../fdroidserver/install.py
 #, python-brace-format
 msgid "\"{apkfilename}\" is already installed on {dev}."
 msgstr ""
 
+#: ../fdroidserver/update.py
+#, python-brace-format
+msgid "\"{path}\" contains outdated {name} ({version})"
+msgstr ""
+
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "\"{path}\" contains recent {name} ({version})"
 msgstr ""
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "\"{path}\" exists but s3cmd is not installed!"
 msgstr ""
@@ -64,24 +76,33 @@ msgstr ""
 msgid "\"{path}\" is not a supported file format (use: metadata/*.yml)"
 msgstr ""
 
-#: ../fdroidserver/update.py
+#: ../fdroidserver/metadata.py
 #, python-brace-format
-msgid "\"{path}\" is signed by a key that is not allowed:"
+msgid "\"{path}\" is not an accepted format, convert to: {formats}"
 msgstr ""
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/common.py
 #, python-brace-format
 msgid "\"{url}\" is not a valid URL!"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
 #, python-format
-msgid "%(prog)s: error: %(message)s\n"
+msgid "%(option)s option requires %(number)d argument"
+msgid_plural "%(option)s option requires %(number)d arguments"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../fdroidserver/mirror.py
+#, python-format
+msgid "%(prog)s [options] url"
 msgstr ""
 
-#: ../fdroidserver/publish.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
-msgid "%d APKs failed to be signed or verified!"
+msgid "%(prog)s: error: %(message)s\n"
 msgstr ""
 
 #: ../fdroidserver/scanner.py
@@ -89,52 +110,63 @@ msgstr ""
 msgid "%d problems found"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "%prog [options]"
+msgstr ""
+
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "%r is not callable"
 msgstr ""
 
-#: ../fdroidserver/signindex.py
-#, python-format
-msgid "%s did not produce a dict!"
-msgstr ""
-
-#: ../fdroidserver/signindex.py
-#, python-format
-msgid "%s has bad SHA-256: %s"
-msgstr ""
-
 #: ../fdroidserver/lint.py
 #, python-format
 msgid "%s is not an accepted build field"
 msgstr ""
 
-#: ../fdroidserver/common.py
-msgid "'keypass' not found in config.yml!"
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, python-format
+msgid "%s option does not take a value"
+msgstr ""
+
+#: ../fdroidserver/index.py ../fdroidserver/common.py
+msgid "'keypass' not found in config.py!"
 msgstr ""
 
 #: ../fdroidserver/common.py
 msgid "'keystore' is NONE and 'smartcardoptions' is blank!"
 msgstr ""
 
-#: ../fdroidserver/common.py
-msgid "'keystore' not found in config.yml!"
+#: ../fdroidserver/index.py ../fdroidserver/common.py
+msgid "'keystore' not found in config.py!"
 msgstr ""
 
-#: ../fdroidserver/common.py
-msgid "'keystorepass' not found in config.yml!"
+#: ../fdroidserver/index.py ../fdroidserver/common.py
+msgid "'keystorepass' not found in config.py!"
 msgstr ""
 
-#: ../fdroidserver/common.py
-msgid "'repo_keyalias' not found in config.yml!"
+#: ../fdroidserver/index.py ../fdroidserver/common.py
+msgid "'repo_keyalias' not found in config.py!"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "'required' is an invalid argument for positionals"
 msgstr ""
 
 #: ../fdroidserver/common.py
-msgid "'sdk_path' not set in config.yml!"
+msgid "'sdk_path' not set in 'config.py'!"
+msgstr ""
+
+#. Translators: "build-tools" is the file name of a package from
+#. Google, it is part of the Android SDK. So it probably shouldn't be
+#. translated or transliterated.
+#: ../fdroidserver/common.py
+#, python-brace-format
+msgid "'{aapt}' is too old, fdroid requires build-tools-23.0.0 or newer!"
 msgstr ""
 
 #: ../fdroidserver/common.py
@@ -142,6 +174,21 @@ msgstr ""
 msgid "'{aapt}' is too old, fdroid requires build-tools-{version} or newer!"
 msgstr ""
 
+#: ../fdroidserver/install.py
+#, python-brace-format
+msgid "'{apkfilename}' is already installed on {dev}."
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "'{field}' in {linedesc} is obsolete, see docs for current fields:"
+msgstr ""
+
+#: ../fdroidserver/common.py
+#, python-brace-format
+msgid "'{field}' will be in random order! Use () or [] brackets if order is important!"
+msgstr ""
+
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "'{path}' failed to execute!"
@@ -149,32 +196,23 @@ msgstr ""
 
 #: ../fdroidserver/metadata.py
 #, python-brace-format
-msgid "'{path}' has invalid format, it should be a dictionary!"
-msgstr ""
-
-#: ../fdroidserver/lint.py ../fdroidserver/metadata.py
-#, python-brace-format
 msgid "'{value}' is not a valid {field} in {appid}. Regex pattern: {pattern}"
 msgstr ""
 
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "'{value}' is not a valid {field}, should be {pattern}"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "--merge-request only runs on a single appid!"
-msgstr ""
-
 #: ../fdroidserver/checkupdates.py
 #, python-brace-format
 msgid "...checkupdate failed for {appid} : {error}"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid ".__call__() not defined"
 msgstr ""
 
+#: ../fdroidserver/metadata.py
+msgid ".fdroid.txt is not supported!  Convert to .fdroid.yml or .fdroid.json."
+msgstr ""
+
 #: ../fdroidserver/lint.py
 msgid "/issues is missing"
 msgstr ""
@@ -183,13 +221,12 @@ msgstr ""
 msgid "A URL is required as an argument!"
 msgstr ""
 
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "APK signatures have different certificates in {path}:"
+#: ../fdroid ../fdroidserver/__main__.py
+msgid "Add PGP signatures using GnuPG for packages in repo"
 msgstr ""
 
-#: ../fdroidserver/__main__.py
-msgid "Add PGP signatures using GnuPG for packages in repo"
+#: ../fdroid ../fdroidserver/__main__.py
+msgid "Add a new application from its source code"
 msgstr ""
 
 #: ../fdroidserver/update.py
@@ -209,11 +246,7 @@ msgstr ""
 msgid "Alias of the repo signing key in the keystore"
 msgstr ""
 
-#: ../fdroidserver/build.py
-msgid "AllowedAPKSigningKeys missing but reference binary supplied"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "Allows a different revision (or git branch) to be specified for the initial import"
 msgstr ""
 
@@ -237,9 +270,13 @@ msgstr ""
 msgid "Android DEX code"
 msgstr ""
 
-#: ../fdroidserver/init.py
+#: ../fdroidserver/common.py ../fdroidserver/build.py
 #, python-brace-format
-msgid "Android SDK not found at {path}!"
+msgid "Android SDK '{path}' does not have '{dirname}' installed!"
+msgstr ""
+
+#: ../fdroidserver/common.py
+msgid "Android SDK not found!"
 msgstr ""
 
 #: ../fdroidserver/common.py
@@ -252,17 +289,16 @@ msgstr ""
 msgid "Android SDK path '{path}' is not a directory!"
 msgstr ""
 
+#. Translators: "build-tools" is the file name of a package from
+#. Google, it is part of the Android SDK. So it probably shouldn't be
+#. translated or transliterated.
 #: ../fdroidserver/common.py
 #, python-brace-format
-msgid "Android SDK tool {cmd} not found!"
+msgid "Android build-tools path '{path}' does not exist!"
 msgstr ""
 
-#: ../fdroidserver/lint.py
-msgid "App has Binaries but does not have corresponding AllowedAPKSigningKeys to pin certificate."
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "App has NoSourceSince or ArchivePolicy \"0 versions\" or 0 but AutoUpdateMode or UpdateCheckMode are not None"
+#: ../fdroidserver/update.py
+msgid "AndroidManifest.xml has no date"
 msgstr ""
 
 #: ../fdroidserver/lint.py
@@ -270,10 +306,6 @@ msgstr ""
 msgid "App is in '{repo}' but has a link to {url}"
 msgstr ""
 
-#: ../fdroidserver/lint.py
-msgid "App version has binary but does not have corresponding AllowedAPKSigningKeys to pin certificate."
-msgstr ""
-
 #: ../fdroidserver/lint.py
 msgid "Appending .git is not necessary"
 msgstr ""
@@ -283,27 +315,11 @@ msgstr ""
 msgid "Archiving {apkfilename} with invalid signature!"
 msgstr ""
 
-#: ../fdroidserver/lint.py
-msgid "AutoUpdateMode with UpdateCheckMode: HTTP must have a pattern."
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "Automatic no to all prompts."
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "Automatic yes to all prompts."
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "Bad entry type \"{mirrortype}\" in mirrors config: {mirror}"
-msgstr ""
-
 #: ../fdroidserver/mirror.py
 msgid "Base URL to mirror, can include the index signing key using the query string: ?fingerprint="
 msgstr ""
 
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "Branch '{branch}' used as commit in build '{versionName}'"
@@ -319,7 +335,7 @@ msgstr ""
 msgid "Broken symlink: {path}"
 msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Build a package from source"
 msgstr ""
 
@@ -339,24 +355,31 @@ msgstr ""
 msgid "Build only the latest version of each package"
 msgstr ""
 
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Build should have comma-separated versionName and versionCode, not \"{value}\", in {linedesc}"
+msgstr ""
+
 #: ../fdroidserver/init.py
 #, python-format
 msgid "Built repo based in \"%s\" with this config:"
 msgstr ""
 
-#: ../fdroidserver/checkupdates.py
-msgid "Can't auto-update app with no CurrentVersionCode"
-msgstr ""
-
 #: ../fdroidserver/build.py
 msgid "Can't build due to {} error while scanning"
 msgid_plural "Can't build due to {} errors while scanning"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../fdroidserver/common.py
+#: ../fdroidserver/vmtools.py
 #, python-brace-format
-msgid "Cannot read {path}: {error}"
+msgid "Cannot read \"{path}\"!"
+msgstr ""
+
+#. Translators: https://developer.android.com/studio/build/application-id
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Cannot resolve application ID {appid}"
 msgstr ""
 
 #: ../fdroidserver/rewritemeta.py
@@ -364,23 +387,25 @@ msgstr ""
 msgid "Cannot rewrite \"{path}\""
 msgstr ""
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
+#: ../fdroidserver/rewritemeta.py
+msgid "Cannot use --list and --to at the same time"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Cannot write \"{path}\", not an accepted format, use: {formats}"
+msgstr ""
+
 #: ../fdroidserver/lint.py
 #, python-format
 msgid "Categories '%s' is not valid"
 msgstr ""
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
 #: ../fdroidserver/lint.py
 msgid "Categories are not set"
 msgstr ""
 
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "Category \"{category}\" defined but not used for any apps!"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Check for updates to applications"
 msgstr ""
 
@@ -389,20 +414,28 @@ msgstr ""
 msgid "Checking archiving for {appid} - apks:{integer}, keepversions:{keep}, archapks:{arch}"
 msgstr ""
 
+#: ../fdroidserver/dscanner.py
+msgid "Clean after all scans have finished"
+msgstr ""
+
+#: ../fdroidserver/dscanner.py
+msgid "Clean before the scans start and rebuild the container"
+msgstr ""
+
+#: ../fdroidserver/dscanner.py
+msgid "Clean up all containers and then exit"
+msgstr ""
+
 #: ../fdroidserver/update.py
 msgid "Clean update - don't uses caches, reprocess all APKs"
 msgstr ""
 
-#: ../fdroidserver/common.py
-msgid "Color the log output"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "Comma separated list of categories."
 msgstr ""
 
-#: ../fdroidserver/__main__.py
-#, python-format
+#: ../fdroid ../fdroidserver/__main__.py
+#, c-format, python-format
 msgid "Command '%s' not recognised.\n"
 msgstr ""
 
@@ -410,15 +443,6 @@ msgstr ""
 msgid "Commit changes"
 msgstr ""
 
-#: ../fdroidserver/checkupdates.py
-msgid "Commit changes, push, then make a merge request"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Conflicting \"{field}\" definitions between .yml and localized files:"
-msgstr ""
-
 #: ../fdroidserver/__main__.py
 msgid "Conflicting arguments: '--verbose' and '--quiet' can not be specified at the same time."
 msgstr ""
@@ -428,13 +452,11 @@ msgstr ""
 msgid "Could not find '{command}' on your system"
 msgstr ""
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "Could not find latest version code"
 msgstr ""
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "Could not find latest version name"
 msgstr ""
 
@@ -444,8 +466,7 @@ msgid "Could not find {path} to remove it"
 msgstr ""
 
 #: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Could not open APK {path} for analysis: "
+msgid "Could not open apk file for analysis"
 msgstr ""
 
 #: ../fdroidserver/common.py
@@ -453,16 +474,22 @@ msgstr ""
 msgid "Could not parse size \"{size}\", wrong type \"{type}\""
 msgstr ""
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/import_subcommand.py
+#. Translators: https://developer.android.com/studio/build/application-id
+#: ../fdroidserver/import.py
 msgid "Couldn't find Application ID"
 msgstr ""
 
-#: ../fdroidserver/checkupdates.py
-msgid "Couldn't find any version information"
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
+#: ../fdroidserver/import.py
+msgid "Couldn't find latest version code"
 msgstr ""
 
-#: ../fdroidserver/checkupdates.py
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
+#: ../fdroidserver/import.py
+msgid "Couldn't find latest version name"
+msgstr ""
+
+#: ../fdroidserver/import.py
 msgid "Couldn't find package ID"
 msgstr ""
 
@@ -470,26 +497,29 @@ msgstr ""
 msgid "Cowardily refusing to overwrite existing signing key setup!"
 msgstr ""
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/update.py
+msgid "Create a repo signing key in a keystore"
+msgstr ""
+
+#: ../fdroidserver/update.py
+msgid "Create skeleton metadata files that are missing"
+msgstr ""
+
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Created new container \"{name}\""
 msgstr ""
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Creating \"{path}\" for configuring s3cmd."
 msgstr ""
 
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Creating empty {config_file}"
-msgstr ""
-
 #: ../fdroidserver/publish.py
 msgid "Creating log directory"
 msgstr ""
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Creating new S3 bucket: {url}"
 msgstr ""
@@ -502,7 +532,8 @@ msgstr ""
 msgid "Creating signed index with this key (SHA256):"
 msgstr ""
 
-#: ../fdroidserver/publish.py ../fdroidserver/verify.py
+#: ../fdroidserver/import.py ../fdroidserver/verify.py
+#: ../fdroidserver/publish.py
 msgid "Creating temporary directory"
 msgstr ""
 
@@ -548,21 +579,16 @@ msgid "Description has a duplicate line"
 msgstr ""
 
 #: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Description of length {length} is over the {limit} char limit"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Did you mean config/{name}.yml?"
+#, python-format
+msgid "Description has a list (%s) but it isn't bulleted (*) nor numbered (#)"
 msgstr ""
 
 #: ../fdroidserver/lint.py
 #, python-brace-format
-msgid "Did you mean {code}?"
+msgid "Description of length {length} is over the {limit} char limit"
 msgstr ""
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "Do not add 'disable:' to the generated build entries"
 msgstr ""
 
@@ -587,20 +613,25 @@ msgstr ""
 msgid "Don't create a source tarball, useful when testing a build"
 msgstr ""
 
+#: ../fdroidserver/stats.py
+msgid "Don't do anything logs-related"
+msgstr ""
+
 #: ../fdroidserver/build.py
 msgid "Don't refresh the repository, useful when testing a build with no internet connection"
 msgstr ""
 
 #: ../fdroidserver/deploy.py ../fdroidserver/nightly.py
+#: ../fdroidserver/upload.py
 msgid "Don't use rsync checksums"
 msgstr ""
 
-#: ../fdroidserver/install.py
-msgid "Download F-Droid.apk using mirrors that leak less to the network"
+#: ../fdroid ../fdroidserver/__main__.py
+msgid "Download complete mirrors of small repos"
 msgstr ""
 
-#: ../fdroidserver/__main__.py
-msgid "Download complete mirrors of small repos"
+#: ../fdroidserver/stats.py
+msgid "Download logs we don't have"
 msgstr ""
 
 #: ../fdroidserver/common.py
@@ -614,12 +645,7 @@ msgstr ""
 
 #: ../fdroidserver/metadata.py
 #, python-brace-format
-msgid "Duplicate Anti-Feature declaration at {path} was ignored!"
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-format
-msgid "Duplicate entry \"%s\" in mirrors config!"
+msgid "Duplicate build recipe found for versionCode {versionCode} in {linedesc}"
 msgstr ""
 
 #: ../fdroidserver/lint.py
@@ -627,42 +653,27 @@ msgstr ""
 msgid "Duplicate link in '{field}': {url}"
 msgstr ""
 
-#: ../fdroidserver/common.py
-#, python-format
-msgid "ERROR: %(message)s"
+#: ../fdroid
+msgid "Dynamically scan APKs post build"
 msgstr ""
 
 #: ../fdroidserver/__main__.py
 msgid "ERROR: The \"server\" subcommand has been removed, use \"deploy\"!"
 msgstr ""
 
+#: ../fdroidserver/mirror.py
+msgid ""
+"ERROR: this command should never be used to mirror f-droid.org!\n"
+"A full mirror of f-droid.org requires more than 200GB."
+msgstr ""
+
 #: ../fdroidserver/nightly.py
 msgid "ERROR: unsupported CI type, patches welcome!"
 msgstr ""
 
-#: ../fdroidserver/nightly.py
-#, python-format
-msgid "ERROR: unsupported git host \"%s\", patches welcome!"
-msgstr ""
-
-#: ../fdroidserver/lint.py
+#: ../fdroidserver/metadata.py
 #, python-brace-format
-msgid "ERROR: {key} in {path} is not \"archive\" or \"repo\"!"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "ERROR: {key} not a valid key!"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "ERROR: {key}'s value should be of type {t}!"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "ERROR: {key}:{subkey} in {path} is not in allowed keys: {allowed_keys}!"
+msgid "Empty build flag at {linedesc}"
 msgstr ""
 
 #: ../fdroidserver/__main__.py
@@ -677,40 +688,20 @@ msgid ""
 "> "
 msgstr ""
 
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Environment variable {var} from {configname} is not set!"
+#: ../fdroidserver/deploy.py ../fdroidserver/checkupdates.py
+#: ../fdroidserver/upload.py
+#, python-format
+msgid "Error while attempting to publish log: %s"
 msgstr ""
 
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Environment variable {{env: {var}}} is not set!"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "Error deploying 'github_releases', {} not present. (You might need to run `fdroid update` first.)"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py ../fdroidserver/common.py
 msgid "Error while getting repo address"
 msgstr ""
 
-#: ../fdroidserver/scanner.py
-msgid "Exit with a non-zero code if problems were found"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Extract application metadata from a source repository"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Extract signatures from APKs"
 msgstr ""
 
-#: ../fdroidserver/install.py
-msgid "F-Droid.apk could not be downloaded from any known source!"
-msgstr ""
-
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Failed copying {path}: {error}"
@@ -731,23 +722,27 @@ msgstr ""
 msgid "Failed resizing {path}: {error}"
 msgstr ""
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/publish.py
+msgid "Failed to align application"
+msgstr ""
+
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Failed to create S3 bucket: {url}"
 msgstr ""
 
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Failed to get APK information, deleting {path}"
+#: ../fdroidserver/common.py
+msgid "Failed to get APK manifest information"
 msgstr ""
 
 #: ../fdroidserver/update.py
 #, python-brace-format
-msgid "Failed to get APK information, skipping {path}"
+msgid "Failed to get apk information, deleting {path}"
 msgstr ""
 
 #: ../fdroidserver/update.py
-msgid "Failed to get APK signing key fingerprint"
+#, python-brace-format
+msgid "Failed to get apk information, skipping {path}"
 msgstr ""
 
 #: ../fdroidserver/install.py
@@ -755,10 +750,14 @@ msgstr ""
 msgid "Failed to install '{apkfilename}' on {dev}: {error}"
 msgstr ""
 
-#: ../fdroidserver/common.py
+#: ../fdroidserver/publish.py ../fdroidserver/common.py
 msgid "Failed to sign application"
 msgstr ""
 
+#: ../fdroidserver/common.py
+msgid "Failed to zipalign application"
+msgstr ""
+
 #: ../fdroidserver/build.py
 #, python-brace-format
 msgid "Fetched buildserverid from VM: {buildserverid}"
@@ -774,12 +773,21 @@ msgstr ""
 msgid "File disappeared while processing it: {path}"
 msgstr ""
 
-#: ../fdroidserver/build.py ../fdroidserver/install.py
-#: ../fdroidserver/rewritemeta.py ../fdroidserver/scanner.py
-#: ../fdroidserver/update.py
+#: ../fdroidserver/verify.py ../fdroidserver/stats.py ../fdroidserver/update.py
+#: ../fdroidserver/rewritemeta.py ../fdroidserver/build.py
+#: ../fdroidserver/checkupdates.py ../fdroidserver/scanner.py
+#: ../fdroidserver/install.py
 msgid "Finished"
 msgstr ""
 
+#: ../fdroidserver/lint.py
+msgid "Flattr donation methods belong in the FlattrID flag"
+msgstr ""
+
+#: ../fdroidserver/lint.py
+msgid "Flattr donation methods belong in the FlattrID: field"
+msgstr ""
+
 #: ../fdroidserver/lint.py
 msgid "Forbidden HTML tags"
 msgstr ""
@@ -811,6 +819,7 @@ msgstr ""
 msgid "Found invalid appids in arguments"
 msgstr ""
 
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
 #: ../fdroidserver/common.py
 msgid "Found invalid versionCodes for some apps"
 msgstr ""
@@ -820,10 +829,6 @@ msgstr ""
 msgid "Found multiple JAR Signature Block Files in {path}"
 msgstr ""
 
-#: ../fdroidserver/common.py
-msgid "Found multiple Signer Certificates!"
-msgstr ""
-
 #: ../fdroidserver/metadata.py
 #, python-brace-format
 msgid "Found multiple metadata files for {appid}"
@@ -833,6 +838,11 @@ msgstr ""
 msgid "Found multiple signing certificates for repository."
 msgstr ""
 
+#: ../fdroidserver/update.py
+#, python-brace-format
+msgid "Found multiple signing certificates in {path}"
+msgstr ""
+
 #: ../fdroidserver/index.py
 msgid "Found no signing certificates for repository."
 msgstr ""
@@ -847,16 +857,6 @@ msgstr ""
 msgid "Found {apkfilename} at {url}"
 msgstr ""
 
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Found {count} problems in {filename}"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Found {count} warnings in {filename}"
-msgstr ""
-
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Generated skeleton metadata for {appid}"
@@ -875,21 +875,19 @@ msgstr ""
 msgid "Git fetch failed"
 msgstr ""
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
+#: ../fdroidserver/common.py
+msgid "Git remote set-head failed"
+msgstr ""
+
 #: ../fdroidserver/common.py
 #, python-format
 msgid "Git remote set-head failed: \"%s\""
 msgstr ""
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
 #: ../fdroidserver/common.py
 msgid "Git reset failed"
 msgstr ""
 
-#: ../fdroidserver/common.py
-msgid "Git submodule deinit failed"
-msgstr ""
-
 #: ../fdroidserver/common.py
 msgid "Git submodule sync failed"
 msgstr ""
@@ -921,16 +919,6 @@ msgstr ""
 msgid "Ignoring FUNDING.yml entry longer than 2048: %s"
 msgstr ""
 
-#: ../fdroidserver/update.py
-#, python-format
-msgid "Ignoring bad element in manifest: %s"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Ignoring deprecated {oldfile}, use {newfile}!"
-msgstr ""
-
 #: ../fdroidserver/index.py
 msgid "Ignoring package without metadata: "
 msgstr ""
@@ -940,6 +928,11 @@ msgstr ""
 msgid "Ignoring stale cache data for {apkfilename}"
 msgstr ""
 
+#: ../fdroidserver/rewritemeta.py
+#, python-brace-format
+msgid "Ignoring {ext} file at '{path}'"
+msgstr ""
+
 #: ../fdroidserver/update.py
 msgid "Include APKs that are signed with disabled algorithms like MD5"
 msgstr ""
@@ -956,16 +949,6 @@ msgstr ""
 msgid "Include the source tarballs in the mirror"
 msgstr ""
 
-#: ../fdroidserver/metadata.py
-#, python-format
-msgid "Including metadata from %s@%s"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Including metadata from {path}"
-msgstr ""
-
 #: ../fdroidserver/common.py
 msgid "Initialising submodules"
 msgstr ""
@@ -974,7 +957,7 @@ msgstr ""
 msgid "Install all signed applications available"
 msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Install built packages on devices"
 msgstr ""
 
@@ -983,12 +966,22 @@ msgstr ""
 msgid "Installing %s..."
 msgstr ""
 
+#: ../fdroidserver/install.py
+#, python-format
+msgid "Installing %s…"
+msgstr ""
+
 #: ../fdroidserver/install.py
 #, python-brace-format
 msgid "Installing '{apkfilename}' on {dev}..."
 msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroidserver/install.py
+#, python-brace-format
+msgid "Installing '{apkfilename}' on {dev}…"
+msgstr ""
+
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Interact with the repo HTTP server"
 msgstr ""
 
@@ -996,36 +989,53 @@ msgstr ""
 msgid "Invalid APK"
 msgstr ""
 
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "Invalid AutoUpdateMode: {mode}"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "Invalid UpdateCheckMode: {mode}"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
+#: ../fdroidserver/lint.py ../fdroidserver/checkupdates.py
 #, python-brace-format
 msgid "Invalid VercodeOperation: {field}"
 msgstr ""
 
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Invalid VercodeOperation: {invalid_ops}"
-msgstr ""
-
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "Invalid application ID {appid}"
 msgstr ""
 
+#: ../fdroidserver/metadata.py
+#, python-format
+msgid "Invalid boolean '%s'"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Invalid build flag at {line} in {linedesc}"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Invalid build format: {value} in {name}"
+msgstr ""
+
 #: ../fdroidserver/lint.py
 msgid "Invalid bulleted list"
 msgstr ""
 
+#: ../fdroidserver/lint.py
+#, python-format
+msgid "Invalid license tag \"%s\"! Use only tags from https://spdx.org/license-list"
+msgstr ""
+
+#: ../fdroidserver/lint.py
+msgid "Invalid link - use [http://foo.bar Link title] or [http://foo.bar]"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+#, python-format
+msgid "Invalid metadata in %s:%d"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+msgid "Invalid metadata in: "
+msgstr ""
+
 #: ../fdroidserver/common.py
 #, python-format
 msgid "Invalid name for published file: %s"
@@ -1033,7 +1043,7 @@ msgstr ""
 
 #: ../fdroidserver/common.py
 #, python-brace-format
-msgid "Invalid ndk: entry in build: \"{ndk}\""
+msgid "Invalid package name {0}"
 msgstr ""
 
 #: ../fdroidserver/common.py
@@ -1056,6 +1066,11 @@ msgstr ""
 msgid "Invalid srclib metadata: unknown key '{key}' in '{file}'"
 msgstr ""
 
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Invalid versionCode: \"{versionCode}\" is not an integer!"
+msgstr ""
+
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "JAR signature failed to verify: {path}"
@@ -1070,8 +1085,8 @@ msgstr ""
 msgid "Java JAR file"
 msgstr ""
 
-#: ../fdroidserver/mirror.py ../fdroidserver/publish.py
-#: ../fdroidserver/update.py
+#: ../fdroidserver/publish.py ../fdroidserver/update.py
+#: ../fdroidserver/mirror.py
 msgid "Java JDK not found! Install in standard location or set java_paths!"
 msgstr ""
 
@@ -1087,19 +1102,10 @@ msgstr ""
 msgid "Javascript in HTML src attributes"
 msgstr ""
 
-#: ../fdroidserver/build.py
-#, python-brace-format
-msgid "Keeping failed build \"{apkfilename}\""
-msgstr ""
-
 #: ../fdroidserver/init.py
 msgid "Keystore for signing key:\t"
 msgstr ""
 
-#: ../fdroidserver/lint.py
-msgid "Known debug key is used in AllowedAPKSigningKeys: "
-msgstr ""
-
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "Last used commit '{commit}' looks like a tag, but UpdateCheckMode is '{ucm}'"
@@ -1109,8 +1115,12 @@ msgstr ""
 msgid "Liberapay donation methods belong in the Liberapay: field"
 msgstr ""
 
+#: ../fdroidserver/lint.py
+msgid "Liberapay donation methods belong in the LiberapayID flag"
+msgstr ""
+
 #: ../fdroidserver/rewritemeta.py
-msgid "List files that would be reformatted (dry run)"
+msgid "List files that would be reformatted"
 msgstr ""
 
 #: ../fdroidserver/lint.py
@@ -1129,16 +1139,6 @@ msgstr ""
 msgid "Malformed serverwebroot line:"
 msgstr ""
 
-#: ../fdroidserver/scanner.py
-#, python-format
-msgid "Max recursion depth in ZIP file reached: %s"
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "Mirror config for {url} contains \"isPrimary\" key!"
-msgstr ""
-
 #: ../fdroidserver/mirror.py
 msgid "Mirror the full repo and archive, all file types."
 msgstr ""
@@ -1147,29 +1147,30 @@ msgstr ""
 msgid "Missing output directory"
 msgstr ""
 
-#: ../fdroidserver/metadata.py
-msgid "Moving Anti-Features declarations to localized files:"
-msgstr ""
-
-#: ../fdroidserver/index.py
-msgid "Neither \"repo_pubkey\" nor \"keystorepass\" set in config.yml"
-msgstr ""
-
-#: ../fdroidserver/verify.py
+#: ../fdroidserver/lint.py
 #, python-format
-msgid "No APK for package: %s"
+msgid "Name '%s' is just the auto name - remove it"
+msgstr ""
+
+#: ../fdroidserver/common.py
+msgid "No 'config.py' found, using defaults."
 msgstr ""
 
 #: ../fdroidserver/common.py
 msgid "No Android SDK found!"
 msgstr ""
 
+#: ../fdroidserver/import.py
+msgid "No android or kivy project could be found. Specify --subdir?"
+msgstr ""
+
 #: ../fdroidserver/install.py
 msgid "No attached devices found"
 msgstr ""
 
-#: ../fdroidserver/install.py
-msgid "No devices found for `adb install`! Please plug one in."
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "No commit specified for {versionName} in {linedesc}"
 msgstr ""
 
 #: ../fdroidserver/index.py
@@ -1180,23 +1181,14 @@ msgstr ""
 msgid "No git submodules available"
 msgstr ""
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "No gradle project could be found. Specify --subdir?"
 msgstr ""
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py ../fdroidserver/common.py
 msgid "No information found."
 msgstr ""
 
-#: ../fdroidserver/checkupdates.py
-msgid "No matching tags found"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "No minimum SDK version found in {0}, using default (3)."
-msgstr ""
-
 #: ../fdroidserver/lint.py
 msgid "No need to specify that the app is Free Software"
 msgstr ""
@@ -1206,7 +1198,7 @@ msgid "No need to specify that the app is for Android"
 msgstr ""
 
 #: ../fdroidserver/deploy.py
-msgid "No option set! Edit your config.yml to set at least one of these:"
+msgid "No option set! Edit your config.py to set at least one of these:"
 msgstr ""
 
 #: ../fdroidserver/common.py
@@ -1215,14 +1207,14 @@ msgstr ""
 
 #: ../fdroidserver/install.py
 #, python-format
-msgid "No signed APK available for %s"
+msgid "No signed apk available for %s"
 msgstr ""
 
 #: ../fdroidserver/install.py
 msgid "No signed output directory - nothing to do"
 msgstr ""
 
-#: ../fdroidserver/common.py
+#: ../fdroidserver/update.py ../fdroidserver/common.py
 #, python-brace-format
 msgid "No signing certificates found in {path}"
 msgstr ""
@@ -1232,23 +1224,16 @@ msgstr ""
 msgid "No such package: %s"
 msgstr ""
 
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "No such versionCode {versionCode} for app {appid}"
 msgstr ""
 
-#: ../fdroidserver/checkupdates.py
-msgid "No tags found"
-msgstr ""
-
-#: ../fdroidserver/publish.py ../fdroidserver/verify.py
+#: ../fdroidserver/verify.py ../fdroidserver/publish.py
 msgid "No unsigned directory - nothing to do"
 msgstr ""
 
-#: ../fdroidserver/__main__.py
-msgid "No version information could be found."
-msgstr ""
-
 #: ../fdroidserver/common.py
 msgid "Not a valid size definition: \"{}\""
 msgstr ""
@@ -1263,9 +1248,10 @@ msgid "Nothing to do for {appid}."
 msgstr ""
 
 #: ../fdroidserver/init.py
-msgid "Now set these in config.yml:"
+msgid "Now set these in config.py:"
 msgstr ""
 
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "OBB file has newer versionCode({integer}) than any APK:"
@@ -1283,27 +1269,22 @@ msgstr ""
 msgid "Offline machine, skipping git mirror generation until `fdroid deploy`"
 msgstr ""
 
-#: ../fdroidserver/deploy.py
-msgid "One of the 'github_releases' config items is missing the 'packageNames' value. skipping ..."
+#: ../fdroidserver/common.py
+#, python-brace-format
+msgid "Old APK signature failed to verify: {path}"
 msgstr ""
 
-#: ../fdroidserver/deploy.py
-msgid "One of the 'github_releases' config items is missing the 'projectUrl' value. skipping ..."
+#: ../fdroid ../fdroidserver/__main__.py
+msgid "Old, deprecated name for fdroid deploy"
 msgstr ""
 
-#: ../fdroidserver/deploy.py
-msgid "One of the 'github_releases' config items is missing the 'token' value. skipping ..."
-msgstr ""
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Only PNG and JPEG are supported for graphics, found: {path}"
 msgstr ""
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/common.py
-msgid "Only accepts a single key \"env\""
+#: ../fdroidserver/checkupdates.py
+msgid "Only print differences with the Play Store"
 msgstr ""
 
 #: ../fdroidserver/checkupdates.py
@@ -1314,6 +1295,11 @@ msgstr ""
 msgid "OpenCollective donation methods belong in the OpenCollective: field"
 msgstr ""
 
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "Options"
+msgstr ""
+
 #: ../fdroidserver/verify.py
 msgid "Output JSON report to file named after APK."
 msgstr ""
@@ -1322,22 +1308,26 @@ msgstr ""
 msgid "Output JSON to stdout."
 msgstr ""
 
-#: ../fdroidserver/checkupdates.py ../fdroidserver/gpgsign.py
-#: ../fdroidserver/publish.py ../fdroidserver/signindex.py
-#: ../fdroidserver/update.py
+#: ../fdroidserver/gpgsign.py ../fdroidserver/publish.py
+#: ../fdroidserver/update.py ../fdroidserver/signindex.py
+#: ../fdroidserver/checkupdates.py
 msgid "Outputting JSON"
 msgstr ""
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "Overall license of the project."
 msgstr ""
 
+#: ../fdroidserver/dscanner.py
+msgid "Override path for repo APKs (default: ./repo)"
+msgstr ""
+
 #: ../fdroidserver/index.py
 #, python-brace-format
 msgid "Overriding blank versionName in {apkfilename} from metadata: {version}"
 msgstr ""
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 #, python-brace-format
 msgid "Package \"{appid}\" already exists"
 msgstr ""
@@ -1351,10 +1341,13 @@ msgstr ""
 msgid "Password required with username"
 msgstr ""
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "Path to main Android project subdirectory, if not in root."
 msgstr ""
 
+msgid "Path to main android project subdirectory, if not in root."
+msgstr ""
+
 #: ../fdroidserver/init.py
 msgid "Path to the Android SDK (sometimes set in ANDROID_HOME)"
 msgstr ""
@@ -1367,18 +1360,20 @@ msgstr ""
 msgid "Path to the keystore for the repo signing key"
 msgstr ""
 
+#: ../fdroidserver/dscanner.py
+msgid "Prepare Drozer to run a scan"
+msgstr ""
+
+msgid "Prepare drozer to run a scan"
+msgstr ""
+
 #: ../fdroidserver/nightly.py
 msgid "Print the secret variable to the terminal for easy copy/paste"
 msgstr ""
 
-#: ../fdroidserver/install.py
+#: ../fdroidserver/metadata.py
 #, python-brace-format
-msgid "Privacy mode was enabled based on your locale ({country_code})."
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-format
-msgid "Problem with ZIP file: %s, error %s"
+msgid "Problem with description of {appid}: {error}"
 msgstr ""
 
 #: ../fdroidserver/common.py
@@ -1404,7 +1399,11 @@ msgstr ""
 msgid "Produce human-readable XML/JSON for index files"
 msgstr ""
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/update.py
+msgid "Produce human-readable index.xml"
+msgstr ""
+
+#: ../fdroidserver/import.py
 msgid "Project URL to import from."
 msgstr ""
 
@@ -1416,25 +1415,21 @@ msgstr ""
 msgid "Push the log to this git remote repository"
 msgstr ""
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Pushing binary transparency log to {url}"
 msgstr ""
 
-#: ../fdroidserver/deploy.py
-msgid "Pushing to remote server failed!"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Pushing to {url}"
 msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Quickly start a new repository"
 msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Read all the metadata files and exit"
 msgstr ""
 
@@ -1445,12 +1440,14 @@ msgstr ""
 
 #: ../fdroidserver/common.py
 #, python-brace-format
-msgid "Reading packageName/versionCode/versionName failed, APK invalid: '{apkfilename}'"
+msgid "Reading minSdkVersion failed: \"{apkfilename}\""
 msgstr ""
 
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
+#. https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
 #: ../fdroidserver/common.py
 #, python-brace-format
-msgid "Reading packageName/versionCode/versionName failed,APK invalid: '{apkfilename}'"
+msgid "Reading packageName/versionCode/versionName failed, APK invalid: '{apkfilename}'"
 msgstr ""
 
 #: ../fdroidserver/update.py
@@ -1458,35 +1455,24 @@ msgstr ""
 msgid "Reading {apkfilename} from cache"
 msgstr ""
 
-#: ../fdroidserver/build.py
-msgid "Refresh and cache scanner rules and signatures from the network"
-msgstr ""
-
-#: ../fdroidserver/publish.py
-#, python-brace-format
-msgid "Refusing to sign '{path}', file exists in both {dir1} and {dir2} folder."
-msgstr ""
-
-#: ../fdroidserver/verify.py
-msgid "Remove source tarball and any APKs if successfully verified."
+#: ../fdroidserver/stats.py
+msgid "Recalculate aggregate stats - use when changes have been made that would invalidate old cached data."
 msgstr ""
 
 #: ../fdroidserver/common.py
 msgid "Removing specified files"
 msgstr ""
 
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Removing {path}\""
-msgstr ""
-
 #: ../fdroidserver/update.py
 msgid "Rename APK files that do not match package.name_123.apk"
 msgstr ""
 
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "RepoType {type} is deprecated, please switch to git."
+#: ../fdroidserver/update.py
+msgid "Report on build data status"
+msgstr ""
+
+#: ../fdroidserver/build.py
+msgid "Reset and create a brand new build server, even if the existing one appears to be ok."
 msgstr ""
 
 #: ../fdroidserver/nightly.py
@@ -1502,13 +1488,12 @@ msgstr ""
 msgid "Restrict output to warnings and errors"
 msgstr ""
 
-#: ../fdroidserver/net.py
-#, python-format
-msgid "Retrying failed download: %s"
+#: ../fdroid ../fdroidserver/__main__.py
+msgid "Rewrite all the metadata files"
 msgstr ""
 
-#: ../fdroidserver/__main__.py
-msgid "Rewrite all the metadata files"
+#: ../fdroidserver/rewritemeta.py
+msgid "Rewrite to a specific format: "
 msgstr ""
 
 #: ../fdroidserver/rewritemeta.py
@@ -1516,20 +1501,20 @@ msgstr ""
 msgid "Rewriting '{appid}'"
 msgstr ""
 
-#: ../fdroidserver/checkupdates.py
-msgid "Run on git repo that has uncommitted changes"
+#: ../fdroidserver/rewritemeta.py
+#, python-brace-format
+msgid "Rewriting '{appid}' to '{path}'"
 msgstr ""
 
-#: ../fdroidserver/nightly.py
-#, python-brace-format
-msgid "Run over {cibase} to find -debug.apk. and skip repo_basedir {repo_basedir}"
+#: ../fdroidserver/checkupdates.py
+msgid "Run on git repo that has uncommitted changes"
 msgstr ""
 
 #: ../fdroidserver/lint.py
 msgid "Run rewritemeta to fix formatting"
 msgstr ""
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 msgid "Running first pass with MD5 checking disabled"
 msgstr ""
 
@@ -1538,24 +1523,18 @@ msgstr ""
 msgid "Running wget in {path}"
 msgstr ""
 
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "SHA-256 of {url} does not match entry!"
+#: ../fdroidserver/dscanner.py
+msgid "Scan only the latest version of each package"
 msgstr ""
 
 #: ../fdroidserver/build.py
 msgid "Scan the resulting APK(s) for known non-free classes."
 msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Scan the source code of a package"
 msgstr ""
 
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Scanner found {count} problems in {apk}"
-msgstr ""
-
 #: ../fdroidserver/scanner.py
 #, python-brace-format
 msgid "Scanner found {count} problems in {appid}:"
@@ -1572,19 +1551,6 @@ msgid_plural "Scanner found {} problems"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../fdroidserver/scanner.py
-msgid "Scanning APK for extra signing blocks."
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "Scanning APK with dexdump for known non-free classes."
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Set NDK {release} ({version}) up"
-msgstr ""
-
 #: ../fdroidserver/common.py
 msgid "Set clock to that time using:"
 msgstr ""
@@ -1598,7 +1564,7 @@ msgstr ""
 msgid "Set open file limit to {integer}"
 msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Set up an app build for a nightly build repo"
 msgstr ""
 
@@ -1611,11 +1577,18 @@ msgstr ""
 msgid "Setting {0} sec timeout for this build"
 msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroidserver/build.py
+msgid "Setup an emulator, install the APK on it and perform a Drozer scan"
+msgstr ""
+
+msgid "Setup an emulator, install the apk on it and perform a drozer scan"
+msgstr ""
+
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Sign and place packages in the repo"
 msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Sign indexes created using update --nosign"
 msgstr ""
 
@@ -1628,11 +1601,6 @@ msgstr ""
 msgid "Skipping '{apkfilename}' with invalid signature!"
 msgstr ""
 
-#: ../fdroidserver/deploy.py ../fdroidserver/index.py
-#, python-format
-msgid "Skipping GitLab Pages mirror because the repo is too large (>%.2fGB)!"
-msgstr ""
-
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Skipping index generation for {appid}"
@@ -1648,14 +1616,23 @@ msgstr ""
 msgid "Skipping {appid}: disabled"
 msgstr ""
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/scanner.py
+#, python-brace-format
+msgid "Skipping {appid}: no builds specified"
+msgstr ""
+
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 msgid "Specify a local folder to sync the repo to"
 msgstr ""
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 msgid "Specify an identity file to provide to SSH for rsyncing"
 msgstr ""
 
+#: ../fdroidserver/build.py
+msgid "Specify that we're running on the build server"
+msgstr ""
+
 #: ../fdroidserver/nightly.py
 msgid "Specify which debug keystore file to use."
 msgstr ""
@@ -1664,6 +1641,11 @@ msgstr ""
 msgid "Spew out even more information than normal"
 msgstr ""
 
+#: ../fdroidserver/nightly.py
+#, python-brace-format
+msgid "Striping mystery signature from {apkfilename}"
+msgstr ""
+
 #: ../fdroidserver/nightly.py
 #, python-brace-format
 msgid "Stripping mystery signature from {apkfilename}"
@@ -1684,22 +1666,10 @@ msgstr ""
 msgid "System clock is older than date in {path}!"
 msgstr ""
 
-#: ../fdroidserver/checkupdates.py
-msgid "Tags update mode only works for git, hg, bzr and git-svn repositories currently"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "Tags update mode used in git-svn, but the repo was not set up with tags"
-msgstr ""
-
 #: ../fdroidserver/build.py
 msgid "Test mode - put output in the tmp directory only, and always build, even if the output already exists."
 msgstr ""
 
-#: ../fdroidserver/index.py
-msgid "The \"qrcode\" Python package is not installed (e.g. apt-get install python3-qrcode)!"
-msgstr ""
-
 #. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
 #: ../fdroidserver/update.py
 #, python-brace-format
@@ -1718,10 +1688,18 @@ msgstr ""
 msgid "The file to be included in the repo (path or glob)"
 msgstr ""
 
+#: ../fdroidserver/deploy.py
+msgid "The only commands currently supported are 'init' and 'update'"
+msgstr ""
+
 #: ../fdroidserver/index.py
 msgid "The repository's fingerprint does not match."
 msgstr ""
 
+#: ../fdroidserver/common.py
+msgid "The repository's index could not be verified."
+msgstr ""
+
 #: ../fdroidserver/deploy.py
 #, python-brace-format
 msgid "The root dir for local_copy_dir \"{path}\" does not exist!"
@@ -1735,37 +1713,13 @@ msgstr ""
 msgid "These are the apps that have been archived from the main repo."
 msgstr ""
 
-#: ../fdroidserver/mirror.py
-msgid "This command should never be used to mirror f-droid.org! A full copy requires more than 600GB."
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "This is a repository of apps to be used with F-Droid. Applications in this repository are either official binaries built by the original application developers, or are binaries built from source by the admin of f-droid.org using the tools on https://gitlab.com/fdroid."
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 #, python-format
 msgid "This repo already has local metadata: %s"
 msgstr ""
 
-#: ../fdroidserver/init.py
-#, python-format
-msgid ""
-"To complete the setup, add your APKs to \"%s\"\n"
-"then run \"fdroid update -c; fdroid update\".  You might also want to edit\n"
-"\"config.yml\" to set the URL, repo name, and more.  You should also set up\n"
-"a signing key (a temporary one might have been automatically generated).\n"
-"\n"
-"For more info: https://f-droid.org/docs/Setup_an_F-Droid_App_Repo\n"
-"and https://f-droid.org/docs/Signing_Process"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "To use awsbucket, awssecretkey and awsaccesskeyid must also be set in config.yml!"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "To use rclone, rclone_config and awsbucket must be set in config.yml!"
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
+msgid "To use awsbucket, awssecretkey and awsaccesskeyid must also be set in config.py!"
 msgstr ""
 
 #: ../fdroidserver/lint.py
@@ -1776,6 +1730,10 @@ msgstr ""
 msgid "URL shorteners should not be used"
 msgstr ""
 
+#: ../fdroidserver/metadata.py
+msgid "URL title is just the URL, use brackets: [URL]"
+msgstr ""
+
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "URL {url} in Description: {error}"
@@ -1789,15 +1747,16 @@ msgstr ""
 msgid "Unexpected license tag \"{}\"! Only use license tags configured in your config file"
 msgstr ""
 
-#: ../fdroidserver/common.py
+#: ../fdroidserver/metadata.py
 #, python-brace-format
-msgid "Unknown entry {key} in {configname}"
+msgid "Unexpected text on same line as {field} in {linedesc}"
 msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Unknown exception found!"
 msgstr ""
 
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "Unknown file '{filename}' in build '{versionName}'"
@@ -1808,6 +1767,11 @@ msgstr ""
 msgid "Unknown metadata format: %s"
 msgstr ""
 
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Unknown metadata format: {path}"
+msgstr ""
+
 #: ../fdroidserver/metadata.py
 #, python-brace-format
 msgid "Unknown metadata format: {path} (use: *.yml)"
@@ -1817,6 +1781,10 @@ msgstr ""
 msgid "Unknown version of aapt, might cause problems: "
 msgstr ""
 
+#: ../fdroidserver/lint.py
+msgid "Unlinkified link - use [http://foo.bar Link title] or [http://foo.bar]"
+msgstr ""
+
 #: ../fdroidserver/lint.py
 msgid "Unnecessary leading space"
 msgstr ""
@@ -1830,12 +1798,20 @@ msgstr ""
 msgid "Unrecognised app field '{fieldname}' in '{path}'"
 msgstr ""
 
+#: ../fdroidserver/metadata.py
+msgid "Unrecognised app field: "
+msgstr ""
+
 #: ../fdroidserver/metadata.py
 #, python-brace-format
 msgid "Unrecognised build flag '{build_flag}' in '{path}'"
 msgstr ""
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Unrecognised field '{field}' in {linedesc}"
+msgstr ""
+
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Unsupported file type \"{extension}\" for repo graphic"
@@ -1846,6 +1822,29 @@ msgstr ""
 msgid "Unsupported graphics file found: {path}"
 msgstr ""
 
+#: ../fdroidserver/rewritemeta.py
+#, python-brace-format
+msgid "Unsupported metadata format, use: --to [{supported}]"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+msgid "Unterminated ]"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+msgid "Unterminated ]]"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Unterminated build in {name}"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Unterminated continuation in {name}"
+msgstr ""
+
 #: ../fdroidserver/lint.py
 #, python-format
 msgid "Unused extlib at %s"
@@ -1866,25 +1865,27 @@ msgstr ""
 msgid "Unused scanignore path: %s"
 msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Update repo information for new packages"
 msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Update the binary transparency log for a URL"
 msgstr ""
 
+#: ../fdroid ../fdroidserver/__main__.py
+msgid "Update the stats of the repo"
+msgstr ""
+
+#: ../fdroidserver/update.py ../fdroidserver/build.py
+msgid "Update the wiki"
+msgstr ""
+
 #: ../fdroidserver/checkupdates.py
 #, python-brace-format
 msgid "UpdateCheckData has invalid URL: {url}"
 msgstr ""
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "UpdateCheckData must match the version code as integer (\\d or [0-9]): {codeex}"
-msgstr ""
-
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "UpdateCheckData must use HTTPS URL: {url}"
@@ -1896,10 +1897,14 @@ msgid "UpdateCheckData not a valid URL: {url}"
 msgstr ""
 
 #: ../fdroidserver/lint.py
-msgid "UpdateCheckMode is set but it looks like checkupdates hasn't been run yet."
+msgid "UpdateCheckMode is set but it looks like checkupdates hasn't been run yet"
+msgstr ""
+
+#. Translators: https://developer.android.com/studio/build/application-id
+#: ../fdroidserver/lint.py
+msgid "UpdateCheckName is set to the known application ID - it can be removed"
 msgstr ""
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
 #: ../fdroidserver/lint.py
 msgid "UpdateCheckName is set to the known application ID, it can be removed"
 msgstr ""
@@ -1914,8 +1919,19 @@ msgstr ""
 msgid "Uploading {apkfilename} to virustotal"
 msgstr ""
 
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "Usage"
+msgstr ""
+
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, python-format
+msgid "Usage: %s\n"
+msgstr ""
+
 #: ../fdroidserver/lint.py
-msgid "Use /HEAD instead of /master or /main to point at a file in the default branch"
+msgid "Use /HEAD instead of /master to point at a file in the default branch"
 msgstr ""
 
 #: ../fdroidserver/update.py
@@ -1930,14 +1946,12 @@ msgstr ""
 msgid "Use date from APK instead of current time for newly added APKs"
 msgstr ""
 
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Using \"{path}\" for configuring s3cmd."
+msgid "Use date from apk instead of current time for newly added apks"
 msgstr ""
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
-msgid "Using \"{path}\" for syncing with remote storage."
+msgid "Using \"{path}\" for configuring s3cmd."
 msgstr ""
 
 #: ../fdroidserver/common.py
@@ -1948,17 +1962,13 @@ msgstr ""
 msgid "Using APK Signature v3"
 msgstr ""
 
-#: ../fdroidserver/common.py
-msgid "Using JAR Signature"
-msgstr ""
-
 #: ../fdroidserver/common.py
 msgid "Using Java's jarsigner, not recommended for verifying APKs! Use apksigner"
 msgstr ""
 
-#: ../fdroidserver/metadata.py
+#: ../fdroidserver/common.py
 #, python-brace-format
-msgid "Using blank dictionary instead of contents of {path}!"
+msgid "Using androguard from \"{path}\""
 msgstr ""
 
 #: ../fdroidserver/init.py
@@ -1966,17 +1976,12 @@ msgstr ""
 msgid "Using existing keystore \"{path}\""
 msgstr ""
 
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Using rclone to sync with: {url}"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Using s3cmd to sync with: {url}"
 msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Valid commands are:"
 msgstr ""
 
@@ -1984,7 +1989,7 @@ msgstr ""
 msgid "Verify against locally cached copy rather than redownloading."
 msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Verify the integrity of downloaded packages"
 msgstr ""
 
@@ -1992,28 +1997,15 @@ msgstr ""
 msgid "Verifying index signature:"
 msgstr ""
 
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "Verifying package {path} with apksigner."
-msgstr ""
-
 #: ../fdroidserver/deploy.py
 #, python-brace-format
 msgid "VirusTotal API key cannot upload files larger than 32MB, use {url} to upload {path}."
 msgstr ""
 
-#: ../fdroidserver/nightly.py
-msgid "WARNING: only public git repos are supported!"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Warn about possible metadata errors"
 msgstr ""
 
-#: ../fdroidserver/scanner.py
-msgid "WebAssembly binary file"
-msgstr ""
-
 #: ../fdroidserver/update.py
 msgid "When configured for signed indexes, create only unsigned indexes at this stage"
 msgstr ""
@@ -2022,16 +2014,7 @@ msgstr ""
 msgid "When linting the entire repository yamllint is disabled by default. This option forces yamllint regardless."
 msgstr ""
 
-#: ../fdroidserver/publish.py
-msgid "When signing or verifying fails, exit with an error code."
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "Would you like to download and install F-Droid.apk via adb? (YES/no)"
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "Would you like to download the app(s) from f-droid.org? (YES/no)"
+msgid "X.509 'Distiguished Name' used when generating keys"
 msgstr ""
 
 #: ../fdroidserver/init.py
@@ -2046,11 +2029,6 @@ msgstr ""
 msgid "ZIP file archive"
 msgstr ""
 
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "adb reports {serial} is \"{status}\"!"
-msgstr ""
-
 #: ../fdroidserver/nightly.py
 #, python-brace-format
 msgid "adding IdentityFile to {path}"
@@ -2061,66 +2039,70 @@ msgstr ""
 msgid "adding to {name}: {path}"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "ambiguous option: %(option)s could match %(matches)s"
 msgstr ""
 
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "apksigner in build-tools;{version} passes APKs with invalid v3 signatures, ignoring."
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "apksigner not found! Cannot sign or verify modern APKs"
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, python-format
+msgid "ambiguous option: %s (%s?)"
 msgstr ""
 
 #: ../fdroidserver/common.py
 msgid "apksigner not found, it's required for signing!"
 msgstr ""
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/checkupdates.py ../fdroidserver/lint.py
-#: ../fdroidserver/rewritemeta.py
+#: ../fdroidserver/lint.py ../fdroidserver/rewritemeta.py
+#: ../fdroidserver/checkupdates.py
 msgid "application ID of file to operate on"
 msgstr ""
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/build.py ../fdroidserver/install.py
-#: ../fdroidserver/publish.py ../fdroidserver/scanner.py
-#: ../fdroidserver/verify.py
+#: ../fdroidserver/verify.py ../fdroidserver/publish.py
+#: ../fdroidserver/build.py ../fdroidserver/scanner.py
+#: ../fdroidserver/install.py
 msgid "application ID with optional versionCode in the form APPID[:VERCODE]"
 msgstr ""
 
-#: ../fdroidserver/common.py
-msgid "archive_url needs to end with /archive"
+#: ../fdroidserver/lint.py ../fdroidserver/rewritemeta.py
+msgid "applicationId in the form APPID"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: ../fdroidserver/checkupdates.py
+msgid "applicationId to check for updates"
+msgstr ""
+
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
+#: ../fdroidserver/verify.py ../fdroidserver/publish.py
+#: ../fdroidserver/dscanner.py ../fdroidserver/build.py
+#: ../fdroidserver/scanner.py ../fdroidserver/install.py
+msgid "applicationId with optional versionCode in the form APPID[:VERCODE]"
+msgstr ""
+
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "argument \"-\" with mode %r"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "argument %(argument_name)s: %(message)s"
-msgstr ""
-
 #: ../fdroidserver/nightly.py
 msgid "attempting bare SSH connection to test deploy key:"
 msgstr ""
 
+#: ../fdroidserver/nightly.py
+msgid "attempting bare ssh connection to test deploy key:"
+msgstr ""
+
 #: ../fdroidserver/common.py
 msgid "can not parse scrlib spec (not a string): '{}'"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
-msgid "can't open '%(filename)s': %(error)s"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "can't open non-https url: '{};"
+msgid "can't open '%s': %s"
 msgstr ""
 
 #: ../fdroidserver/build.py
@@ -2128,11 +2110,13 @@ msgstr ""
 msgid "cannot find required srclibs: \"{path}\""
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "cannot have multiple subparser arguments"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "cannot merge actions - two groups are named %r"
 msgstr ""
@@ -2146,25 +2130,30 @@ msgstr ""
 msgid "cloning {url}"
 msgstr ""
 
+#: ../fdroidserver/deploy.py
+msgid "command to execute, either 'init' or 'update'"
+msgstr ""
+
 #: ../fdroidserver/__main__.py
 msgid "commands from plugin modules:"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "complex"
+msgstr ""
+
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "conflicting option string: %s"
 msgid_plural "conflicting option strings: %s"
 msgstr[0] ""
 msgstr[1] ""
 
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "conflicting subparser alias: %s"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "conflicting subparser: %s"
+#: ../fdroidserver/nightly.py
+#, python-brace-format
+msgid "copying {apkfilename} into {path}"
 msgstr ""
 
 #: ../fdroidserver/metadata.py
@@ -2173,11 +2162,11 @@ msgid "could not parse '{path}'"
 msgstr ""
 
 #: ../fdroidserver/common.py
-msgid "could not parse srclib spec (no name specified): '{}'"
+msgid "could not parse srclib spec (no ref specified): '{}'"
 msgstr ""
 
 #: ../fdroidserver/common.py
-msgid "could not parse srclib spec (no ref specified): '{}'"
+msgid "could not parse srclib spec (too many '@' signs): '{}'"
 msgstr ""
 
 #: ../fdroidserver/nightly.py
@@ -2185,18 +2174,14 @@ msgstr ""
 msgid "created {path}"
 msgstr ""
 
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "current version is newer: old vercode={old}, new vercode={new}"
-msgstr ""
-
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "deleting: repo/{apkfilename}"
 msgstr ""
 
-#: ../fdroidserver/scanner.py
-msgid "dependency file without lock"
+#: ../fdroidserver/common.py
+#, python-brace-format
+msgid "deployed build logs to '{path}'"
 msgstr ""
 
 #: ../fdroidserver/common.py
@@ -2204,48 +2189,59 @@ msgstr ""
 msgid "deployed process log {path} to {dest}"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "dest= is required for options like %r"
 msgstr ""
 
-#: ../fdroidserver/scanner.py
-msgid "downloading '{}'"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "downloading scanner signatures from '{}' failed"
-msgstr ""
-
 #: ../fdroidserver/scanner.py
 msgid "executable binary, possibly code"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "expected %s argument"
 msgid_plural "expected %s arguments"
 msgstr[0] ""
 msgstr[1] ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "expected at least one argument"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "expected at most one argument"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "expected one argument"
 msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroidserver/common.py
+#, python-brace-format
+msgid "failed deploying build logs to '{path}'"
+msgstr ""
+
+#: ../fdroid
+msgid "fdroid [-h|--help|--version] <command> [<args>]"
+msgstr ""
+
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "fdroid [<command>] [-h|--help|--version|<args>]"
 msgstr ""
 
-#: ../fdroidserver/scanner.py
-msgid "fetch the latest version of signatures from the web"
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "floating-point"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+msgid "force errors to be warnings, or ignore"
 msgstr ""
 
 #: ../fdroidserver/metadata.py
@@ -2260,7 +2256,8 @@ msgstr ""
 msgid "gzip file archive"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "ignored explicit argument %r"
 msgstr ""
@@ -2269,39 +2266,35 @@ msgstr ""
 msgid "index-v1 must have a signature, use `fdroid signindex` to create it!"
 msgstr ""
 
-#: ../fdroidserver/index.py
-msgid "index-v2 must have a signature, use `fdroid signindex` to create it!"
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "integer"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "invalid %(type)s value: %(value)r"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "invalid choice: %(value)r (choose from %(choices)s)"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "invalid conflict_resolution value: %r"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "invalid option string %(option)r: must start with a character %(prefix_chars)r"
 msgstr ""
 
-#: ../fdroidserver/common.py
-msgid "ipfs_cid not found, skipping CIDv1 generation"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "latest build recipe is newer: old vercode={old}, new vercode={new}"
-msgstr ""
-
 #: ../fdroidserver/deploy.py
 #, python-brace-format
 msgid "local_copy_dir does not end with \"fdroid\", perhaps you meant: \"{path}\""
@@ -2320,20 +2313,11 @@ msgstr ""
 msgid "mirror '%s' does not end with 'fdroid'!"
 msgstr ""
 
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "mirrors set twice, in config.yml and {path}!"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "mutually exclusive arguments must be optional"
 msgstr ""
 
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "next {name} cache update due in {time}"
-msgstr ""
-
 #: ../fdroidserver/mirror.py
 #, python-brace-format
 msgid "no \"icon\" in {appid}"
@@ -2343,26 +2327,88 @@ msgstr ""
 msgid "no APK supplied"
 msgstr ""
 
-#: ../fdroidserver/checkupdates.py
-msgid "no version information found"
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, python-format
+msgid "no such option: %s"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: ../fdroid ../fdroidserver/__main__.py
+msgid "no version info found!"
+msgstr ""
+
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "not allowed with argument %s"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "one of the arguments %s is required"
 msgstr ""
 
-#: ../fdroidserver/common.py ../fdroidserver/index.py
+#: ../fdroidserver/index.py ../fdroidserver/common.py
 msgid "only accepts strings, lists, and tuples"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
-msgid "options"
+#: ../fdroidserver/install.py
+#, python-format
+msgid "option %s: If you really want to install all the signed apps, use --all"
+msgstr ""
+
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, python-format
+msgid "option %s: invalid %s value: %r"
+msgstr ""
+
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, python-format
+msgid "option %s: invalid choice: %r (choose from %s)"
+msgstr ""
+
+#: /usr/lib/python3.5/getopt.py /usr/lib/python3.6/getopt.py
+#: /usr/lib/python3.7/getopt.py
+#, python-format
+msgid "option -%s not recognized"
+msgstr ""
+
+#: /usr/lib/python3.5/getopt.py /usr/lib/python3.6/getopt.py
+#: /usr/lib/python3.7/getopt.py
+#, python-format
+msgid "option -%s requires argument"
+msgstr ""
+
+#: /usr/lib/python3.5/getopt.py /usr/lib/python3.6/getopt.py
+#: /usr/lib/python3.7/getopt.py
+#, python-format
+msgid "option --%s must not have an argument"
+msgstr ""
+
+#: /usr/lib/python3.5/getopt.py /usr/lib/python3.6/getopt.py
+#: /usr/lib/python3.7/getopt.py
+#, python-format
+msgid "option --%s not a unique prefix"
+msgstr ""
+
+#: /usr/lib/python3.5/getopt.py /usr/lib/python3.6/getopt.py
+#: /usr/lib/python3.7/getopt.py
+#, python-format
+msgid "option --%s not recognized"
+msgstr ""
+
+#: /usr/lib/python3.5/getopt.py /usr/lib/python3.6/getopt.py
+#: /usr/lib/python3.7/getopt.py
+#, python-format
+msgid "option --%s requires argument"
+msgstr ""
+
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
+msgid "optional arguments"
 msgstr ""
 
 #: ../fdroidserver/nightly.py
@@ -2370,7 +2416,8 @@ msgstr ""
 msgid "overwriting existing {path}"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "positional arguments"
 msgstr ""
 
@@ -2379,53 +2426,42 @@ msgstr ""
 msgid "process log deploy {path} to {dest} failed!"
 msgstr ""
 
-#: ../fdroidserver/build.py
-msgid "reference binary missing signature"
-msgstr ""
-
 #: ../fdroidserver/signatures.py
 #, python-brace-format
 msgid "refuse downloading via insecure HTTP connection (use HTTPS or specify --no-https-check): {apkfilename}"
 msgstr ""
 
+#: ../fdroidserver/signatures.py
+#, python-brace-format
+msgid "refuse downloading via insecure http connection (use https or specify --no-https-check): {apkfilename}"
+msgstr ""
+
 #: ../fdroidserver/index.py
 #, python-format
-msgid "repo_icon \"repo/icons/%s\" does not exist, generating placeholder."
+msgid "repo_icon %s does not exist, generating placeholder."
 msgstr ""
 
-#: ../fdroidserver/common.py
-msgid "repo_url needs to end with /repo"
+#: ../fdroidserver/metadata.py
+msgid "ruamel.yaml not installed, can not write metadata."
 msgstr ""
 
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "rsync is missing or broken: {error}"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "s3cmd sync indexes {path} to {url} and delete"
 msgstr ""
 
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "s3cmd syncs indexes from {path} to {url} and deletes removed"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "scanner cache is malformed! You can clear it with: '{clear}'"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "serverwebroot: path does not end with \"fdroid\", perhaps you meant one of these:"
-msgstr ""
-
 #: ../fdroidserver/scanner.py
 msgid "shared library"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "show program's version number and exit"
+msgstr ""
+
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.5/optparse.py
+#: /usr/lib/python3.6/argparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/argparse.py /usr/lib/python3.7/optparse.py
 msgid "show this help message and exit"
 msgstr ""
 
@@ -2454,31 +2490,31 @@ msgstr ""
 msgid "static library"
 msgstr ""
 
-#: ../fdroidserver/build.py
+#: ../fdroidserver/common.py
 #, python-brace-format
-msgid "supplied reference binary has allowed signer {signer}"
+msgid "supplied timestamp value '{timestamp}' is not a unix timestamp"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "the following arguments are required: %s"
 msgstr ""
 
-#: ../fdroidserver/install.py
-msgid "true"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "unexpected option string: %s"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "unknown parser %(parser_name)r (choices: %(choices)s)"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "unrecognized arguments: %s"
 msgstr ""
@@ -2488,11 +2524,16 @@ msgstr ""
 msgid "unsafe permissions on '{config_file}' (should be 0600)!"
 msgstr ""
 
-#: ../fdroidserver/__main__.py /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py ../fdroid
+#: /usr/lib/python3.7/argparse.py ../fdroidserver/__main__.py
 msgid "usage: "
 msgstr ""
 
-#: ../fdroidserver/deploy.py
+#: ../fdroid
+msgid "usage: fdroid [-h|--help|--version] <command> [<args>]"
+msgstr ""
+
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "using Apache libcloud to sync with {url}"
 msgstr ""
@@ -2501,8 +2542,8 @@ msgstr ""
 msgid "virustotal.com is rate limiting, waiting to retry..."
 msgstr ""
 
-#: ../fdroidserver/install.py
-msgid "yes"
+#: ../fdroidserver/update.py
+msgid "wiki support is deprecated and will be removed in the next release!"
 msgstr ""
 
 #: ../fdroidserver/publish.py
@@ -2517,19 +2558,31 @@ msgstr[1] ""
 msgid "{apkfilename} ({appid}) has no metadata!"
 msgstr ""
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
+#: ../fdroidserver/update.py
+#, python-brace-format
+msgid "{apkfilename} has multiple {name} files, looks like Master Key exploit!"
+msgstr ""
+
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "{apkfilename}'s AndroidManifest.xml has a bad date: "
 msgstr ""
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "{appid} does not have a name! Using application ID instead."
 msgstr ""
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
+#: ../fdroidserver/update.py
+#, python-brace-format
+msgid "{appid} does not have a name! Using package name instead."
+msgstr ""
+
+#: ../fdroidserver/update.py
+#, python-brace-format
+msgid "{appid} from {path} is not a valid Android Package Name!"
+msgstr ""
+
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "{appid} from {path} is not a valid Android application ID!"
@@ -2540,16 +2593,12 @@ msgstr ""
 msgid "{appid} from {path} is not a valid Java Package Name!"
 msgstr ""
 
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{appid} has both APKs and files: {files}"
-msgstr ""
-
 #: ../fdroidserver/mirror.py
 #, python-brace-format
 msgid "{appid} is missing {name}"
 msgstr ""
 
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "{appid}: Unknown extlib {path} in build '{versionName}'"
@@ -2577,7 +2626,7 @@ msgstr ""
 
 #: ../fdroidserver/metadata.py
 #, python-brace-format
-msgid "{build_flag} must be list or string, found: {value}"
+msgid "{field} not terminated in {name}"
 msgstr ""
 
 #: ../fdroidserver/metadata.py
@@ -2587,15 +2636,10 @@ msgstr ""
 
 #: ../fdroidserver/update.py
 #, python-brace-format
-msgid "{name} \"{section}/icons/{path}\" does not exist! Check \"config.yml\"."
+msgid "{name} \"{path}\" does not exist! Correct it in config.py."
 msgstr ""
 
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{path1} is a duplicate of {path2}, remove one!"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 #, python-brace-format
 msgid "{path} already exists, ignoring import results!"
 msgstr ""
@@ -2610,36 +2654,6 @@ msgstr ""
 msgid "{path} has bad file signature \"{pattern}\", possible Janus exploit!"
 msgstr ""
 
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "{path} has been flagged by virustotal {count} times:"
-msgstr ""
-
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "{path} has the wrong fingerprint ({fingerprint})!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "{path} is not \"key: value\" dict, but a {datatype}!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "{path} is not a standard config file!"
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "{path} is not list, but a {datatype}!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "{path} is not {expected_type}, but a {datatype}!"
-msgstr ""
-
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "{path} is zero size!"
@@ -2650,22 +2664,12 @@ msgstr ""
 msgid "{path} more than 200MB, manually upload: {url}"
 msgstr ""
 
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "{path}: \"{code}\" is not a valid ISO_3166-1 alpha-2 country code!"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{path}: {error}"
-msgstr ""
-
 #: ../fdroidserver/mirror.py
 #, python-brace-format
 msgid "{url} does not end with \"fdroid\", check the URL path!"
 msgstr ""
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/common.py
 #, python-brace-format
 msgid "{url} does not start with \"http\"!"
 msgstr ""
diff --git a/locale/fi/LC_MESSAGES/fdroidserver.po b/locale/fi/LC_MESSAGES/fdroidserver.po
deleted file mode 100644
index 31803e83..00000000
--- a/locale/fi/LC_MESSAGES/fdroidserver.po
+++ /dev/null
@@ -1,2684 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# This file is put in the public domain.
-# A <ville.mourujarvi@hostedweblate.mail.kapsi.fi>, 2020.
-# Kaantaja <ufdbvgoljrjkrkyyub@ianvvn.com>, 2021.
-# Ricky Tigg <ricky.tigg@gmail.com>, 2025.
-msgid ""
-msgstr ""
-"Project-Id-Version: fdroidserver 2.0a0-62-gc63c4b3d\n"
-"Report-Msgid-Bugs-To: https://gitlab.com/fdroid/fdroidserver/issues\n"
-"POT-Creation-Date: 2025-06-25 09:52+0200\n"
-"PO-Revision-Date: 2025-01-31 14:19+0000\n"
-"Last-Translator: Ricky Tigg <ricky.tigg@gmail.com>\n"
-"Language-Team: Finnish <https://hosted.weblate.org/projects/f-droid/fdroidserver/fi/>\n"
-"Language: fi\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 5.10-dev\n"
-
-#: ../fdroidserver/nightly.py
-msgid ""
-"\n"
-"SSH public key to be used as deploy key:"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-#, python-brace-format
-msgid ""
-"\n"
-"{path} encoded for the DEBUG_KEYSTORE secret variable:"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-format
-msgid "\"%s/\" has no matching metadata file!"
-msgstr ""
-
-#: ../fdroidserver/index.py
-msgid "\"isPrimary\" key should not be added to mirrors!"
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "\"local_copy_dir\" {path} does not exist!"
-msgstr ""
-
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "\"{apkfilename}\" is already installed on {dev}."
-msgstr "\"{apkfilename}\" on jo asennettu kohteeseen {dev}."
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "\"{path}\" contains recent {name} ({version})"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "\"{path}\" exists but s3cmd is not installed!"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "\"{path}\" is not a supported file format (use: metadata/*.yml)"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "\"{path}\" is signed by a key that is not allowed:"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
-#, python-brace-format
-msgid "\"{url}\" is not a valid URL!"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "%(prog)s: error: %(message)s\n"
-msgstr ""
-
-#: ../fdroidserver/publish.py
-#, python-format
-msgid "%d APKs failed to be signed or verified!"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-format
-msgid "%d problems found"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "%r is not callable"
-msgstr ""
-
-#: ../fdroidserver/signindex.py
-#, python-format
-msgid "%s did not produce a dict!"
-msgstr ""
-
-#: ../fdroidserver/signindex.py
-#, python-format
-msgid "%s has bad SHA-256: %s"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-format
-msgid "%s is not an accepted build field"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "'keypass' not found in config.yml!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "'keystore' is NONE and 'smartcardoptions' is blank!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "'keystore' not found in config.yml!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "'keystorepass' not found in config.yml!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "'repo_keyalias' not found in config.yml!"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-msgid "'required' is an invalid argument for positionals"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "'sdk_path' not set in config.yml!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "'{aapt}' is too old, fdroid requires build-tools-{version} or newer!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "'{path}' failed to execute!"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "'{path}' has invalid format, it should be a dictionary!"
-msgstr ""
-
-#: ../fdroidserver/lint.py ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "'{value}' is not a valid {field} in {appid}. Regex pattern: {pattern}"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "'{value}' is not a valid {field}, should be {pattern}"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "--merge-request only runs on a single appid!"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "...checkupdate failed for {appid} : {error}"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-msgid ".__call__() not defined"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "/issues is missing"
-msgstr ""
-
-#: ../fdroidserver/mirror.py
-msgid "A URL is required as an argument!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "APK signatures have different certificates in {path}:"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Add PGP signatures using GnuPG for packages in repo"
-msgstr ""
-
-#: ../fdroidserver/update.py
-msgid "Add a repo signing key to an unsigned repo"
-msgstr ""
-
-#: ../fdroidserver/update.py
-msgid "Add skeleton metadata files for APKs that are missing them"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Adding new repo for only {name}"
-msgstr ""
-
-#: ../fdroidserver/init.py
-msgid "Alias of the repo signing key in the keystore"
-msgstr ""
-
-#: ../fdroidserver/build.py
-msgid "AllowedAPKSigningKeys missing but reference binary supplied"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
-msgid "Allows a different revision (or git branch) to be specified for the initial import"
-msgstr ""
-
-#: ../fdroidserver/mirror.py
-msgid "Also mirror the full archive section"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Also warn about formatting issues, like rewritemeta -l"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "Android AAR library"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "Android APK file"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "Android DEX code"
-msgstr ""
-
-#: ../fdroidserver/init.py
-#, python-brace-format
-msgid "Android SDK not found at {path}!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Android SDK path '{path}' does not exist!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Android SDK path '{path}' is not a directory!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Android SDK tool {cmd} not found!"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "App has Binaries but does not have corresponding AllowedAPKSigningKeys to pin certificate."
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "App has NoSourceSince or ArchivePolicy \"0 versions\" or 0 but AutoUpdateMode or UpdateCheckMode are not None"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "App is in '{repo}' but has a link to {url}"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "App version has binary but does not have corresponding AllowedAPKSigningKeys to pin certificate."
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Appending .git is not necessary"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Archiving {apkfilename} with invalid signature!"
-msgstr "Arkistoidaan {apkfilename} virheellisellä allekirjoituksella!"
-
-#: ../fdroidserver/lint.py
-msgid "AutoUpdateMode with UpdateCheckMode: HTTP must have a pattern."
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "Automatic no to all prompts."
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "Automatic yes to all prompts."
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "Bad entry type \"{mirrortype}\" in mirrors config: {mirror}"
-msgstr ""
-
-#: ../fdroidserver/mirror.py
-msgid "Base URL to mirror, can include the index signing key using the query string: ?fingerprint="
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Branch '{branch}' used as commit in build '{versionName}'"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Branch '{branch}' used as commit in srclib '{srclib}'"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Broken symlink: {path}"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Build a package from source"
-msgstr ""
-
-#: ../fdroidserver/build.py
-msgid "Build all applications available"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Build generated by `fdroid import` - remove disable line once ready"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "Build metadata git repo has uncommited changes!"
-msgstr ""
-
-#: ../fdroidserver/build.py
-msgid "Build only the latest version of each package"
-msgstr ""
-
-#: ../fdroidserver/init.py
-#, python-format
-msgid "Built repo based in \"%s\" with this config:"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "Can't auto-update app with no CurrentVersionCode"
-msgstr ""
-
-#: ../fdroidserver/build.py
-msgid "Can't build due to {} error while scanning"
-msgid_plural "Can't build due to {} errors while scanning"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Cannot read {path}: {error}"
-msgstr ""
-
-#: ../fdroidserver/rewritemeta.py
-#, python-brace-format
-msgid "Cannot rewrite \"{path}\""
-msgstr ""
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
-#: ../fdroidserver/lint.py
-#, python-format
-msgid "Categories '%s' is not valid"
-msgstr ""
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
-#: ../fdroidserver/lint.py
-msgid "Categories are not set"
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "Category \"{category}\" defined but not used for any apps!"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Check for updates to applications"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Checking archiving for {appid} - apks:{integer}, keepversions:{keep}, archapks:{arch}"
-msgstr ""
-
-#: ../fdroidserver/update.py
-msgid "Clean update - don't uses caches, reprocess all APKs"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Color the log output"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
-msgid "Comma separated list of categories."
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-#, python-format
-msgid "Command '%s' not recognised.\n"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "Commit changes"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "Commit changes, push, then make a merge request"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Conflicting \"{field}\" definitions between .yml and localized files:"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Conflicting arguments: '--verbose' and '--quiet' can not be specified at the same time."
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Could not find '{command}' on your system"
-msgstr ""
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/import_subcommand.py
-msgid "Could not find latest version code"
-msgstr ""
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
-#: ../fdroidserver/import_subcommand.py
-msgid "Could not find latest version name"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Could not find {path} to remove it"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Could not open APK {path} for analysis: "
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Could not parse size \"{size}\", wrong type \"{type}\""
-msgstr ""
-
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/import_subcommand.py
-msgid "Couldn't find Application ID"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "Couldn't find any version information"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "Couldn't find package ID"
-msgstr ""
-
-#: ../fdroidserver/update.py
-msgid "Cowardily refusing to overwrite existing signing key setup!"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Created new container \"{name}\""
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Creating \"{path}\" for configuring s3cmd."
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Creating empty {config_file}"
-msgstr ""
-
-#: ../fdroidserver/publish.py
-msgid "Creating log directory"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Creating new S3 bucket: {url}"
-msgstr ""
-
-#: ../fdroidserver/publish.py
-msgid "Creating output directory"
-msgstr ""
-
-#: ../fdroidserver/index.py
-msgid "Creating signed index with this key (SHA256):"
-msgstr ""
-
-#: ../fdroidserver/publish.py ../fdroidserver/verify.py
-msgid "Creating temporary directory"
-msgstr ""
-
-#: ../fdroidserver/index.py
-msgid "Creating unsigned index in preparation for signing"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "CurrentVersionCode {cv} is less than oldest build entry {versionCode}"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-msgid "DEBUG_KEYSTORE is not set or the value is incomplete"
-msgstr ""
-
-#: ../fdroidserver/update.py
-msgid "Delete APKs and/or OBBs without metadata from the repo"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Deleting archive, repo is too big ({size} max {limit})"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Deleting git-mirror history, repo is too big ({size} max {limit})"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Deleting unknown file: {path}"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-format
-msgid "Description '%s' is just the app's summary"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Description has a duplicate line"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Description of length {length} is over the {limit} char limit"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Did you mean config/{name}.yml?"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Did you mean {code}?"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
-msgid "Do not add 'disable:' to the generated build entries"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-msgid "Do not deploy the new files to the repo"
-msgstr ""
-
-#: ../fdroidserver/mirror.py
-#, python-brace-format
-msgid "Do not include \"{path}\" in URL!"
-msgstr ""
-
-#: ../fdroidserver/init.py
-msgid "Do not prompt for Android SDK path, just fail"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-msgid "Do not remove the private keys generated from the keystore"
-msgstr ""
-
-#: ../fdroidserver/build.py
-msgid "Don't create a source tarball, useful when testing a build"
-msgstr ""
-
-#: ../fdroidserver/build.py
-msgid "Don't refresh the repository, useful when testing a build with no internet connection"
-msgstr ""
-
-#: ../fdroidserver/deploy.py ../fdroidserver/nightly.py
-msgid "Don't use rsync checksums"
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "Download F-Droid.apk using mirrors that leak less to the network"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Download complete mirrors of small repos"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Downloading the repository already failed once, not trying again."
-msgstr ""
-
-#: ../fdroidserver/verify.py
-#, python-brace-format
-msgid "Downloading {url} failed. {error}"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Duplicate Anti-Feature declaration at {path} was ignored!"
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-format
-msgid "Duplicate entry \"%s\" in mirrors config!"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Duplicate link in '{field}': {url}"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-format
-msgid "ERROR: %(message)s"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "ERROR: The \"server\" subcommand has been removed, use \"deploy\"!"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-msgid "ERROR: unsupported CI type, patches welcome!"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-#, python-format
-msgid "ERROR: unsupported git host \"%s\", patches welcome!"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "ERROR: {key} in {path} is not \"archive\" or \"repo\"!"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "ERROR: {key} not a valid key!"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "ERROR: {key}'s value should be of type {t}!"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "ERROR: {key}:{subkey} in {path} is not in allowed keys: {allowed_keys}!"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-#, python-brace-format
-msgid "Encoding is set to '{enc}' fdroid might run into encoding issues. Please set it to 'UTF-8' for best results."
-msgstr ""
-
-#: ../fdroidserver/init.py
-#, python-format
-msgid ""
-"Enter the path to the Android SDK (%s) here:\n"
-"> "
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Environment variable {var} from {configname} is not set!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Environment variable {{env: {var}}} is not set!"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "Error deploying 'github_releases', {} not present. (You might need to run `fdroid update` first.)"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
-msgid "Error while getting repo address"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "Exit with a non-zero code if problems were found"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Extract application metadata from a source repository"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Extract signatures from APKs"
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "F-Droid.apk could not be downloaded from any known source!"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Failed copying {path}: {error}"
-msgstr ""
-
-#: ../fdroidserver/signatures.py
-#, python-brace-format
-msgid "Failed fetching signatures for '{apkfilename}': {error}"
-msgstr "Allekirjoitusten nouto '{apkfilename}':lle epäonnistui: {error}"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Failed reading {path}: {error}"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Failed resizing {path}: {error}"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Failed to create S3 bucket: {url}"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Failed to get APK information, deleting {path}"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Failed to get APK information, skipping {path}"
-msgstr ""
-
-#: ../fdroidserver/update.py
-msgid "Failed to get APK signing key fingerprint"
-msgstr ""
-
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "Failed to install '{apkfilename}' on {dev}: {error}"
-msgstr "'{apkfilename}':n asentaminen kohteelle {dev} epäonnistui: {error}"
-
-#: ../fdroidserver/common.py
-msgid "Failed to sign application"
-msgstr ""
-
-#: ../fdroidserver/build.py
-#, python-brace-format
-msgid "Fetched buildserverid from VM: {buildserverid}"
-msgstr ""
-
-#: ../fdroidserver/signatures.py
-#, python-brace-format
-msgid "Fetched signatures for '{apkfilename}' -> '{sigdir}'"
-msgstr "Haetut allekirjoitukset kohteelle '{apkfilename}' -> '{sigdir}'"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "File disappeared while processing it: {path}"
-msgstr ""
-
-#: ../fdroidserver/build.py ../fdroidserver/install.py
-#: ../fdroidserver/rewritemeta.py ../fdroidserver/scanner.py
-#: ../fdroidserver/update.py
-msgid "Finished"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Forbidden HTML tags"
-msgstr ""
-
-#: ../fdroidserver/build.py
-msgid "Force build of disabled apps, and carries on regardless of scan problems. Only allowed in test mode."
-msgstr ""
-
-#: ../fdroidserver/build.py
-#, python-brace-format
-msgid "Force halting build after {0} sec timeout!"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "Force scan of disabled apps and builds."
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Found \"{path}\" graphic without metadata for app \"{name}\"!"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Found bad funding file \"{path}\" for \"{name}\":"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Found invalid appids in arguments"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Found invalid versionCodes for some apps"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Found multiple JAR Signature Block Files in {path}"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Found multiple Signer Certificates!"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Found multiple metadata files for {appid}"
-msgstr ""
-
-#: ../fdroidserver/index.py
-msgid "Found multiple signing certificates for repository."
-msgstr ""
-
-#: ../fdroidserver/index.py
-msgid "Found no signing certificates for repository."
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-format
-msgid "Found non-file at %s"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Found {apkfilename} at {url}"
-msgstr "{apkfilename} löytyi {url}:lla"
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Found {count} problems in {filename}"
-msgstr "Löytyi {count} ongelmaa {filename}:ssa"
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Found {count} warnings in {filename}"
-msgstr "Löytyi {count} varoitusta {filename}:ssa"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Generated skeleton metadata for {appid}"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-format
-msgid "Git checkout of '%s' failed"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Git clean failed"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Git fetch failed"
-msgstr ""
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/common.py
-#, python-format
-msgid "Git remote set-head failed: \"%s\""
-msgstr ""
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/common.py
-msgid "Git reset failed"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Git submodule deinit failed"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Git submodule sync failed"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Git submodule update failed"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "HTTPS must be used with Subversion URLs!"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "If a git mirror gets to big, allow the archive to be deleted"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "If this upload fails, try manually uploading to {url}"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Ignoring '{field}' in '{metapath}' metadata because it is deprecated."
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-format
-msgid "Ignoring FUNDING.yml entry longer than 2048: %s"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-format
-msgid "Ignoring bad element in manifest: %s"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Ignoring deprecated {oldfile}, use {newfile}!"
-msgstr ""
-
-#: ../fdroidserver/index.py
-msgid "Ignoring package without metadata: "
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Ignoring stale cache data for {apkfilename}"
-msgstr "Ohitetaan vanhentuneet välimuistitiedot kohteelle {apkfilename}"
-
-#: ../fdroidserver/update.py
-msgid "Include APKs that are signed with disabled algorithms like MD5"
-msgstr ""
-
-#: ../fdroidserver/mirror.py
-msgid "Include the PGP signature .asc files in the mirror"
-msgstr ""
-
-#: ../fdroidserver/mirror.py
-msgid "Include the build logs in the mirror"
-msgstr ""
-
-#: ../fdroidserver/mirror.py
-msgid "Include the source tarballs in the mirror"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-format
-msgid "Including metadata from %s@%s"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Including metadata from {path}"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Initialising submodules"
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "Install all signed applications available"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Install built packages on devices"
-msgstr ""
-
-#: ../fdroidserver/install.py
-#, python-format
-msgid "Installing %s..."
-msgstr ""
-
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "Installing '{apkfilename}' on {dev}..."
-msgstr "Asennetaan '{apkfilename}' kohteelle {dev}..."
-
-#: ../fdroidserver/__main__.py
-msgid "Interact with the repo HTTP server"
-msgstr ""
-
-#: ../fdroidserver/update.py
-msgid "Invalid APK"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "Invalid AutoUpdateMode: {mode}"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "Invalid UpdateCheckMode: {mode}"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "Invalid VercodeOperation: {field}"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Invalid VercodeOperation: {invalid_ops}"
-msgstr ""
-
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Invalid application ID {appid}"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Invalid bulleted list"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-format
-msgid "Invalid name for published file: %s"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Invalid ndk: entry in build: \"{ndk}\""
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Invalid redirect to non-HTTPS: {before} -> {after} "
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Invalid scrlib metadata: '{file}' does not exist"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Invalid srclib metadata: could not parse '{file}'"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Invalid srclib metadata: unknown key '{key}' in '{file}'"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "JAR signature failed to verify: {path}"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "JAR signature verified: {path}"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "Java JAR file"
-msgstr ""
-
-#: ../fdroidserver/mirror.py ../fdroidserver/publish.py
-#: ../fdroidserver/update.py
-msgid "Java JDK not found! Install in standard location or set java_paths!"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "Java compiled class"
-msgstr ""
-
-#: ../fdroidserver/signindex.py
-msgid "Java jarsigner not found! Install in standard location or set java_paths!"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Javascript in HTML src attributes"
-msgstr ""
-
-#: ../fdroidserver/build.py
-#, python-brace-format
-msgid "Keeping failed build \"{apkfilename}\""
-msgstr "Säilytetään epäonnistunut koonti \"{apkfilename}\""
-
-#: ../fdroidserver/init.py
-msgid "Keystore for signing key:\t"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Known debug key is used in AllowedAPKSigningKeys: "
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Last used commit '{commit}' looks like a tag, but UpdateCheckMode is '{ucm}'"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Liberapay donation methods belong in the Liberapay: field"
-msgstr ""
-
-#: ../fdroidserver/rewritemeta.py
-msgid "List files that would be reformatted (dry run)"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Locale included in f-droid.org URL"
-msgstr ""
-
-#: ../fdroidserver/build.py
-msgid "Make the build stop on exceptions"
-msgstr ""
-
-#: ../fdroidserver/index.py
-msgid "Malformed repository mirrors."
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "Malformed serverwebroot line:"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-format
-msgid "Max recursion depth in ZIP file reached: %s"
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "Mirror config for {url} contains \"isPrimary\" key!"
-msgstr ""
-
-#: ../fdroidserver/mirror.py
-msgid "Mirror the full repo and archive, all file types."
-msgstr ""
-
-#: ../fdroidserver/gpgsign.py
-msgid "Missing output directory"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-msgid "Moving Anti-Features declarations to localized files:"
-msgstr ""
-
-#: ../fdroidserver/index.py
-msgid "Neither \"repo_pubkey\" nor \"keystorepass\" set in config.yml"
-msgstr ""
-
-#: ../fdroidserver/verify.py
-#, python-format
-msgid "No APK for package: %s"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "No Android SDK found!"
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "No attached devices found"
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "No devices found for `adb install`! Please plug one in."
-msgstr ""
-
-#: ../fdroidserver/index.py
-msgid "No fingerprint in URL."
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "No git submodules available"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
-msgid "No gradle project could be found. Specify --subdir?"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
-msgid "No information found."
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "No matching tags found"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "No minimum SDK version found in {0}, using default (3)."
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "No need to specify that the app is Free Software"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "No need to specify that the app is for Android"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "No option set! Edit your config.yml to set at least one of these:"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "No packages specified"
-msgstr ""
-
-#: ../fdroidserver/install.py
-#, python-format
-msgid "No signed APK available for %s"
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "No signed output directory - nothing to do"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "No signing certificates found in {path}"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-format
-msgid "No such package: %s"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "No such versionCode {versionCode} for app {appid}"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "No tags found"
-msgstr ""
-
-#: ../fdroidserver/publish.py ../fdroidserver/verify.py
-msgid "No unsigned directory - nothing to do"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "No version information could be found."
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Not a valid size definition: \"{}\""
-msgstr ""
-
-#: ../fdroidserver/signindex.py
-msgid "Nothing to do"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "Nothing to do for {appid}."
-msgstr ""
-
-#: ../fdroidserver/init.py
-msgid "Now set these in config.yml:"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "OBB file has newer versionCode({integer}) than any APK:"
-msgstr ""
-
-#: ../fdroidserver/update.py
-msgid "OBB filename must start with \"main.\" or \"patch.\":"
-msgstr "OBB-tiedoston nimen alussa on oltava \"main\". tai \"patch\".:"
-
-#: ../fdroidserver/update.py
-msgid "OBB's packagename does not match a supported APK:"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "Offline machine, skipping git mirror generation until `fdroid deploy`"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "One of the 'github_releases' config items is missing the 'packageNames' value. skipping ..."
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "One of the 'github_releases' config items is missing the 'projectUrl' value. skipping ..."
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "One of the 'github_releases' config items is missing the 'token' value. skipping ..."
-msgstr ""
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Only PNG and JPEG are supported for graphics, found: {path}"
-msgstr ""
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/common.py
-msgid "Only accepts a single key \"env\""
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "Only process apps with auto-updates"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "OpenCollective donation methods belong in the OpenCollective: field"
-msgstr ""
-
-#: ../fdroidserver/verify.py
-msgid "Output JSON report to file named after APK."
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "Output JSON to stdout."
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py ../fdroidserver/gpgsign.py
-#: ../fdroidserver/publish.py ../fdroidserver/signindex.py
-#: ../fdroidserver/update.py
-msgid "Outputting JSON"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
-msgid "Overall license of the project."
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "Overriding blank versionName in {apkfilename} from metadata: {version}"
-msgstr "Tyhjän versionName:n ohittaminen kohteessa {apkfilename} metatiedoista: {version}"
-
-#: ../fdroidserver/import_subcommand.py
-#, python-brace-format
-msgid "Package \"{appid}\" already exists"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Parsing manifest at '{path}'"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Password required with username"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
-msgid "Path to main Android project subdirectory, if not in root."
-msgstr ""
-
-#: ../fdroidserver/init.py
-msgid "Path to the Android SDK (sometimes set in ANDROID_HOME)"
-msgstr ""
-
-#: ../fdroidserver/btlog.py
-msgid "Path to the git repo to use as the log"
-msgstr ""
-
-#: ../fdroidserver/init.py
-msgid "Path to the keystore for the repo signing key"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-msgid "Print the secret variable to the terminal for easy copy/paste"
-msgstr ""
-
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "Privacy mode was enabled based on your locale ({country_code})."
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-format
-msgid "Problem with ZIP file: %s, error %s"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Problem with xml at '{path}'"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "Process auto-updates"
-msgstr ""
-
-#: ../fdroidserver/publish.py ../fdroidserver/update.py
-#, python-brace-format
-msgid "Processing {apkfilename}"
-msgstr "Käsitellään {apkfilename}"
-
-#: ../fdroidserver/checkupdates.py ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Processing {appid}"
-msgstr ""
-
-#: ../fdroidserver/update.py
-msgid "Produce human-readable XML/JSON for index files"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
-msgid "Project URL to import from."
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Punctuation should be avoided"
-msgstr ""
-
-#: ../fdroidserver/btlog.py
-msgid "Push the log to this git remote repository"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Pushing binary transparency log to {url}"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "Pushing to remote server failed!"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Pushing to {url}"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Quickly start a new repository"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Read all the metadata files and exit"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Reading '{config_file}'"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Reading packageName/versionCode/versionName failed, APK invalid: '{apkfilename}'"
-msgstr "Kohteen packageName/versionCode/versionName lukeminen epäonnistui, APK virheellinen: '{apkfilename}'"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Reading packageName/versionCode/versionName failed,APK invalid: '{apkfilename}'"
-msgstr "Kohteen packageName/versionCode/versionName lukeminen epäonnistui, APK virheellinen: '{apkfilename}'"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Reading {apkfilename} from cache"
-msgstr "Luetaan {apkfilename} välimuistista"
-
-#: ../fdroidserver/build.py
-msgid "Refresh and cache scanner rules and signatures from the network"
-msgstr ""
-
-#: ../fdroidserver/publish.py
-#, python-brace-format
-msgid "Refusing to sign '{path}', file exists in both {dir1} and {dir2} folder."
-msgstr ""
-
-#: ../fdroidserver/verify.py
-msgid "Remove source tarball and any APKs if successfully verified."
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Removing specified files"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Removing {path}\""
-msgstr ""
-
-#: ../fdroidserver/update.py
-msgid "Rename APK files that do not match package.name_123.apk"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "RepoType {type} is deprecated, please switch to git."
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-#, python-brace-format
-msgid "Resigning {apkfilename} with provided debug.keystore"
-msgstr "Allekirjoitetaan {apkfilename} uudelleen toimitetulla debug.keystore:lla"
-
-#: ../fdroidserver/update.py
-msgid "Resize all the icons exceeding the max pixel size and exit"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Restrict output to warnings and errors"
-msgstr ""
-
-#: ../fdroidserver/net.py
-#, python-format
-msgid "Retrying failed download: %s"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Rewrite all the metadata files"
-msgstr ""
-
-#: ../fdroidserver/rewritemeta.py
-#, python-brace-format
-msgid "Rewriting '{appid}'"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "Run on git repo that has uncommitted changes"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-#, python-brace-format
-msgid "Run over {cibase} to find -debug.apk. and skip repo_basedir {repo_basedir}"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Run rewritemeta to fix formatting"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "Running first pass with MD5 checking disabled"
-msgstr ""
-
-#: ../fdroidserver/mirror.py
-#, python-brace-format
-msgid "Running wget in {path}"
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "SHA-256 of {url} does not match entry!"
-msgstr ""
-
-#: ../fdroidserver/build.py
-msgid "Scan the resulting APK(s) for known non-free classes."
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Scan the source code of a package"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Scanner found {count} problems in {apk}"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Scanner found {count} problems in {appid}:"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Scanner found {count} problems in {appid}:{versionCode}:"
-msgstr ""
-
-#: ../fdroidserver/build.py
-msgid "Scanner found {} problem"
-msgid_plural "Scanner found {} problems"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../fdroidserver/scanner.py
-msgid "Scanning APK for extra signing blocks."
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "Scanning APK with dexdump for known non-free classes."
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Set NDK {release} ({version}) up"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Set clock to that time using:"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-msgid "Set maximum releases in repo before older ones are archived"
-msgstr ""
-
-#: ../fdroidserver/build.py
-#, python-brace-format
-msgid "Set open file limit to {integer}"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Set up an app build for a nightly build repo"
-msgstr ""
-
-#: ../fdroidserver/build.py
-msgid "Setting open file limit failed: "
-msgstr ""
-
-#: ../fdroidserver/build.py
-#, python-brace-format
-msgid "Setting {0} sec timeout for this build"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Sign and place packages in the repo"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Sign indexes created using update --nosign"
-msgstr ""
-
-#: ../fdroidserver/build.py
-msgid "Skip scanning the source code for binaries and other problems"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Skipping '{apkfilename}' with invalid signature!"
-msgstr "Ohitetaan '{apkfilename}' virheellisellä allekirjoituksella!"
-
-#: ../fdroidserver/deploy.py ../fdroidserver/index.py
-#, python-format
-msgid "Skipping GitLab Pages mirror because the repo is too large (>%.2fGB)!"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Skipping index generation for {appid}"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Skipping {apkfilename} with invalid signature!"
-msgstr "Ohitetaan {apkfilename} virheellisellä allekirjoituksella!"
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Skipping {appid}: disabled"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "Specify a local folder to sync the repo to"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "Specify an identity file to provide to SSH for rsyncing"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-msgid "Specify which debug keystore file to use."
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Spew out even more information than normal"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-#, python-brace-format
-msgid "Stripping mystery signature from {apkfilename}"
-msgstr "Salaperäisen allekirjoituksen poistaminen kohteesta {apkfilename}"
-
-#: ../fdroidserver/lint.py
-#, python-format
-msgid "Summary '%s' is just the app's name"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Summary of length {length} is over the {limit} char limit"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "System clock is older than date in {path}!"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "Tags update mode only works for git, hg, bzr and git-svn repositories currently"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "Tags update mode used in git-svn, but the repo was not set up with tags"
-msgstr ""
-
-#: ../fdroidserver/build.py
-msgid "Test mode - put output in the tmp directory only, and always build, even if the output already exists."
-msgstr ""
-
-#: ../fdroidserver/index.py
-msgid "The \"qrcode\" Python package is not installed (e.g. apt-get install python3-qrcode)!"
-msgstr ""
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "The OBB version code must come after \"{name}.\":"
-msgstr ""
-
-#: ../fdroidserver/btlog.py
-msgid "The base URL for the repo to log (default: https://f-droid.org)"
-msgstr ""
-
-#: ../fdroidserver/mirror.py
-msgid "The directory to write the mirror to"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-msgid "The file to be included in the repo (path or glob)"
-msgstr ""
-
-#: ../fdroidserver/index.py
-msgid "The repository's fingerprint does not match."
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "The root dir for local_copy_dir \"{path}\" does not exist!"
-msgstr ""
-
-#: ../fdroidserver/publish.py
-msgid "There is a keyalias collision - publishing halted"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "These are the apps that have been archived from the main repo."
-msgstr ""
-
-#: ../fdroidserver/mirror.py
-msgid "This command should never be used to mirror f-droid.org! A full copy requires more than 600GB."
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "This is a repository of apps to be used with F-Droid. Applications in this repository are either official binaries built by the original application developers, or are binaries built from source by the admin of f-droid.org using the tools on https://gitlab.com/fdroid."
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
-#, python-format
-msgid "This repo already has local metadata: %s"
-msgstr ""
-
-#: ../fdroidserver/init.py
-#, python-format
-msgid ""
-"To complete the setup, add your APKs to \"%s\"\n"
-"then run \"fdroid update -c; fdroid update\".  You might also want to edit\n"
-"\"config.yml\" to set the URL, repo name, and more.  You should also set up\n"
-"a signing key (a temporary one might have been automatically generated).\n"
-"\n"
-"For more info: https://f-droid.org/docs/Setup_an_F-Droid_App_Repo\n"
-"and https://f-droid.org/docs/Signing_Process"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "To use awsbucket, awssecretkey and awsaccesskeyid must also be set in config.yml!"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "To use rclone, rclone_config and awsbucket must be set in config.yml!"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "URL must start with https:// or http://"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "URL shorteners should not be used"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "URL {url} in Description: {error}"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Unexpected license tag \"{}\"! Only use FSF or OSI approved tags from https://spdx.org/license-list"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Unexpected license tag \"{}\"! Only use license tags configured in your config file"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Unknown entry {key} in {configname}"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Unknown exception found!"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Unknown file '{filename}' in build '{versionName}'"
-msgstr "Tuntematon tiedosto '{filename}' koonnissa '{versionName}'"
-
-#: ../fdroidserver/metadata.py
-#, python-format
-msgid "Unknown metadata format: %s"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Unknown metadata format: {path} (use: *.yml)"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Unknown version of aapt, might cause problems: "
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Unnecessary leading space"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Unnecessary trailing space"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Unrecognised app field '{fieldname}' in '{path}'"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Unrecognised build flag '{build_flag}' in '{path}'"
-msgstr ""
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Unsupported file type \"{extension}\" for repo graphic"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Unsupported graphics file found: {path}"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-format
-msgid "Unused extlib at %s"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-format
-msgid "Unused file at %s"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-format
-msgid "Unused scandelete path: %s"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-format
-msgid "Unused scanignore path: %s"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Update repo information for new packages"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Update the binary transparency log for a URL"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "UpdateCheckData has invalid URL: {url}"
-msgstr ""
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "UpdateCheckData must match the version code as integer (\\d or [0-9]): {codeex}"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "UpdateCheckData must use HTTPS URL: {url}"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "UpdateCheckData not a valid URL: {url}"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "UpdateCheckMode is set but it looks like checkupdates hasn't been run yet."
-msgstr ""
-
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/lint.py
-msgid "UpdateCheckName is set to the known application ID, it can be removed"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Uploading {apkfilename} to androidobservatory.org"
-msgstr "Ulosladataan {apkfilename}:a osoitteeseen androidobservatory.org"
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Uploading {apkfilename} to virustotal"
-msgstr "Ulosladataan {apkfilename} virustotaliin"
-
-#: ../fdroidserver/lint.py
-msgid "Use /HEAD instead of /master or /main to point at a file in the default branch"
-msgstr ""
-
-#: ../fdroidserver/update.py
-msgid "Use `fdroid update -c` to create it."
-msgstr ""
-
-#: ../fdroidserver/build.py
-msgid "Use build server"
-msgstr ""
-
-#: ../fdroidserver/update.py
-msgid "Use date from APK instead of current time for newly added APKs"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Using \"{path}\" for configuring s3cmd."
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Using \"{path}\" for syncing with remote storage."
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Using APK Signature v2"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Using APK Signature v3"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Using JAR Signature"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Using Java's jarsigner, not recommended for verifying APKs! Use apksigner"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Using blank dictionary instead of contents of {path}!"
-msgstr ""
-
-#: ../fdroidserver/init.py
-#, python-brace-format
-msgid "Using existing keystore \"{path}\""
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Using rclone to sync with: {url}"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Using s3cmd to sync with: {url}"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Valid commands are:"
-msgstr ""
-
-#: ../fdroidserver/verify.py
-msgid "Verify against locally cached copy rather than redownloading."
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Verify the integrity of downloaded packages"
-msgstr ""
-
-#: ../fdroidserver/index.py
-msgid "Verifying index signature:"
-msgstr ""
-
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "Verifying package {path} with apksigner."
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "VirusTotal API key cannot upload files larger than 32MB, use {url} to upload {path}."
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-msgid "WARNING: only public git repos are supported!"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Warn about possible metadata errors"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "WebAssembly binary file"
-msgstr ""
-
-#: ../fdroidserver/update.py
-msgid "When configured for signed indexes, create only unsigned indexes at this stage"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "When linting the entire repository yamllint is disabled by default. This option forces yamllint regardless."
-msgstr ""
-
-#: ../fdroidserver/publish.py
-msgid "When signing or verifying fails, exit with an error code."
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "Would you like to download and install F-Droid.apk via adb? (YES/no)"
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "Would you like to download the app(s) from f-droid.org? (YES/no)"
-msgstr ""
-
-#: ../fdroidserver/init.py
-msgid "X.509 'Distinguished Name' used when generating keys"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "You can use ANDROID_HOME to set the path to your SDK, i.e.:"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "ZIP file archive"
-msgstr ""
-
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "adb reports {serial} is \"{status}\"!"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-#, python-brace-format
-msgid "adding IdentityFile to {path}"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "adding to {name}: {path}"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "ambiguous option: %(option)s could match %(matches)s"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "apksigner in build-tools;{version} passes APKs with invalid v3 signatures, ignoring."
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "apksigner not found! Cannot sign or verify modern APKs"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "apksigner not found, it's required for signing!"
-msgstr ""
-
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/checkupdates.py ../fdroidserver/lint.py
-#: ../fdroidserver/rewritemeta.py
-msgid "application ID of file to operate on"
-msgstr ""
-
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/build.py ../fdroidserver/install.py
-#: ../fdroidserver/publish.py ../fdroidserver/scanner.py
-#: ../fdroidserver/verify.py
-msgid "application ID with optional versionCode in the form APPID[:VERCODE]"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "archive_url needs to end with /archive"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "argument \"-\" with mode %r"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "argument %(argument_name)s: %(message)s"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-msgid "attempting bare SSH connection to test deploy key:"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "can not parse scrlib spec (not a string): '{}'"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "can't open '%(filename)s': %(error)s"
-msgstr "%(filename)s:a ei voi avata: %(error)s"
-
-#: ../fdroidserver/scanner.py
-msgid "can't open non-https url: '{};"
-msgstr ""
-
-#: ../fdroidserver/build.py
-#, python-brace-format
-msgid "cannot find required srclibs: \"{path}\""
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-msgid "cannot have multiple subparser arguments"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "cannot merge actions - two groups are named %r"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-msgid "cannot publish update, did you set the deploy key?"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-#, python-brace-format
-msgid "cloning {url}"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "commands from plugin modules:"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "conflicting option string: %s"
-msgid_plural "conflicting option strings: %s"
-msgstr[0] ""
-msgstr[1] ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "conflicting subparser alias: %s"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "conflicting subparser: %s"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "could not parse '{path}'"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "could not parse srclib spec (no name specified): '{}'"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "could not parse srclib spec (no ref specified): '{}'"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-#, python-brace-format
-msgid "created {path}"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "current version is newer: old vercode={old}, new vercode={new}"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "deleting: repo/{apkfilename}"
-msgstr "Poistetaan: repo/{apkfilename}"
-
-#: ../fdroidserver/scanner.py
-msgid "dependency file without lock"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "deployed process log {path} to {dest}"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "dest= is required for options like %r"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "downloading '{}'"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "downloading scanner signatures from '{}' failed"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "executable binary, possibly code"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "expected %s argument"
-msgid_plural "expected %s arguments"
-msgstr[0] ""
-msgstr[1] ""
-
-#: /usr/lib/python3.11/argparse.py
-msgid "expected at least one argument"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-msgid "expected at most one argument"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-msgid "expected one argument"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "fdroid [<command>] [-h|--help|--version|<args>]"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "fetch the latest version of signatures from the web"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-msgid "force metadata errors (default) to be warnings, or to be ignored."
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "git svn clone failed"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "gzip file archive"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "ignored explicit argument %r"
-msgstr ""
-
-#: ../fdroidserver/index.py
-msgid "index-v1 must have a signature, use `fdroid signindex` to create it!"
-msgstr ""
-
-#: ../fdroidserver/index.py
-msgid "index-v2 must have a signature, use `fdroid signindex` to create it!"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "invalid %(type)s value: %(value)r"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "invalid choice: %(value)r (choose from %(choices)s)"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "invalid conflict_resolution value: %r"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "invalid option string %(option)r: must start with a character %(prefix_chars)r"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "ipfs_cid not found, skipping CIDv1 generation"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "latest build recipe is newer: old vercode={old}, new vercode={new}"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "local_copy_dir does not end with \"fdroid\", perhaps you meant: \"{path}\""
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "local_copy_dir must be an absolute path!"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "local_copy_dir must be directory, not a file!"
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-format
-msgid "mirror '%s' does not end with 'fdroid'!"
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "mirrors set twice, in config.yml and {path}!"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-msgid "mutually exclusive arguments must be optional"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "next {name} cache update due in {time}"
-msgstr ""
-
-#: ../fdroidserver/mirror.py
-#, python-brace-format
-msgid "no \"icon\" in {appid}"
-msgstr ""
-
-#: ../fdroidserver/signatures.py
-msgid "no APK supplied"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "no version information found"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "not allowed with argument %s"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "one of the arguments %s is required"
-msgstr ""
-
-#: ../fdroidserver/common.py ../fdroidserver/index.py
-msgid "only accepts strings, lists, and tuples"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-msgid "options"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-#, python-brace-format
-msgid "overwriting existing {path}"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-msgid "positional arguments"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "process log deploy {path} to {dest} failed!"
-msgstr ""
-
-#: ../fdroidserver/build.py
-msgid "reference binary missing signature"
-msgstr ""
-
-#: ../fdroidserver/signatures.py
-#, python-brace-format
-msgid "refuse downloading via insecure HTTP connection (use HTTPS or specify --no-https-check): {apkfilename}"
-msgstr "kieltäydy lataamisesta suojaamattoman HTTP-yhteyden kautta; käytä HTTPS:a tai määritä '--no-https-check': {apkfilename}"
-
-#: ../fdroidserver/index.py
-#, python-format
-msgid "repo_icon \"repo/icons/%s\" does not exist, generating placeholder."
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "repo_url needs to end with /repo"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "rsync is missing or broken: {error}"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "s3cmd sync indexes {path} to {url} and delete"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "s3cmd syncs indexes from {path} to {url} and deletes removed"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "scanner cache is malformed! You can clear it with: '{clear}'"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "serverwebroot: path does not end with \"fdroid\", perhaps you meant one of these:"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "shared library"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-msgid "show this help message and exit"
-msgstr ""
-
-#: ../fdroidserver/signatures.py
-msgid "signed APK, either a file-path or HTTPS URL."
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "skip deploying full build logs: log content is empty"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "skip deploying full build logs: not enabled in config"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "skipping source tarball: {path}"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "srclibs missing name and/or @"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "static library"
-msgstr ""
-
-#: ../fdroidserver/build.py
-#, python-brace-format
-msgid "supplied reference binary has allowed signer {signer}"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "the following arguments are required: %s"
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "true"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "unexpected option string: %s"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "unknown parser %(parser_name)r (choices: %(choices)s)"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "unrecognized arguments: %s"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "unsafe permissions on '{config_file}' (should be 0600)!"
-msgstr ""
-
-#: ../fdroidserver/__main__.py /usr/lib/python3.11/argparse.py
-msgid "usage: "
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "using Apache libcloud to sync with {url}"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "virustotal.com is rate limiting, waiting to retry..."
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "yes"
-msgstr ""
-
-#: ../fdroidserver/publish.py
-#, python-brace-format
-msgid "{0} app, {1} key aliases"
-msgid_plural "{0} apps, {1} key aliases"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{apkfilename} ({appid}) has no metadata!"
-msgstr "{apkfilename}:lla ({appid}) ei ole metatietoja!"
-
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{apkfilename}'s AndroidManifest.xml has a bad date: "
-msgstr "{apkfilename}:n AndroidManifest.xml:ssa on väärä päivämäärä: "
-
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{appid} does not have a name! Using application ID instead."
-msgstr ""
-
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{appid} from {path} is not a valid Android application ID!"
-msgstr ""
-
-#: ../fdroidserver/metadata.py ../fdroidserver/update.py
-#, python-brace-format
-msgid "{appid} from {path} is not a valid Java Package Name!"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{appid} has both APKs and files: {files}"
-msgstr ""
-
-#: ../fdroidserver/mirror.py
-#, python-brace-format
-msgid "{appid} is missing {name}"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "{appid}: Unknown extlib {path} in build '{versionName}'"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "{appid}: no builds specified, running on current source state"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "{appid}: {field} must be a '{type}', but it is a '{fieldtype}!'"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "{appid}: {field} must be a '{type}', but it is a '{fieldtype}'!"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "{build_flag} must be an integer, found: {value}"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "{build_flag} must be list or string, found: {value}"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "{file} is blank or corrupt!"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{name} \"{section}/icons/{path}\" does not exist! Check \"config.yml\"."
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{path1} is a duplicate of {path2}, remove one!"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
-#, python-brace-format
-msgid "{path} already exists, ignoring import results!"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-#, python-brace-format
-msgid "{path} does not exist!  Create it by running:"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{path} has bad file signature \"{pattern}\", possible Janus exploit!"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "{path} has been flagged by virustotal {count} times:"
-msgstr ""
-
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "{path} has the wrong fingerprint ({fingerprint})!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "{path} is not \"key: value\" dict, but a {datatype}!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "{path} is not a standard config file!"
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "{path} is not list, but a {datatype}!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "{path} is not {expected_type}, but a {datatype}!"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{path} is zero size!"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "{path} more than 200MB, manually upload: {url}"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "{path}: \"{code}\" is not a valid ISO_3166-1 alpha-2 country code!"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{path}: {error}"
-msgstr ""
-
-#: ../fdroidserver/mirror.py
-#, python-brace-format
-msgid "{url} does not end with \"fdroid\", check the URL path!"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
-#, python-brace-format
-msgid "{url} does not start with \"http\"!"
-msgstr ""
-
-#: ../fdroidserver/build.py
-msgid "{} build failed"
-msgid_plural "{} builds failed"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../fdroidserver/build.py
-msgid "{} build succeeded"
-msgid_plural "{} builds succeeded"
-msgstr[0] ""
-msgstr[1] ""
diff --git a/locale/fr/LC_MESSAGES/fdroidserver.po b/locale/fr/LC_MESSAGES/fdroidserver.po
index d65abe95..9a64bb35 100644
--- a/locale/fr/LC_MESSAGES/fdroidserver.po
+++ b/locale/fr/LC_MESSAGES/fdroidserver.po
@@ -2,13 +2,13 @@
 # Copyright (C) YEAR Free Software Foundation, Inc.
 # Julien Gontier <emeuraudeman@protonmail.com>, 2020.
 # anonymous <noreply@weblate.org>, 2020.
-# Hans-Christoph Steiner <hans@guardianproject.info>, 2020, 2021, 2024.
+# Hans-Christoph Steiner <hans@guardianproject.info>, 2020.
 # Jeannette L <j.lavoie@net-c.ca>, 2020.
 # Nathan <bonnemainsnathan@gmail.com>, 2020.
 # Virgile L. <virgilelefevre313@gmail.com>, 2020.
 # Lucas Brizzi <lucas.brizzi@hotmail.fr>, 2020.
 # Jose <mail.jose.n@gmail.com>, 2020.
-# DGO <d@geon.fr>, 2020, 2021.
+# DGO <d@geon.fr>, 2020.
 # Yannick A. <yannick.armand@protonmail.com>, 2020.
 # Renaud Perrai <renaud.perrai@protonmail.com>, 2020.
 # rational <rationaldecay@gmail.com>, 2020.
@@ -16,47 +16,44 @@
 # Alexandre Hô <xandrex_weblate@m4x.org>, 2020.
 # Yldun <contact@norcet.info>, 2020.
 # Renaud Perrai <contact@renaudperrai.fr>, 2020.
-# Éfrit <efrit@posteo.net>, 2021.
-# hilariousperson <gobelpepite+github@gmail.com>, 2021.
-# Madeorsk <madeorsk@protonmail.com>, 2021.
-# Adrien le Maire <adrien@alemaire.be>, 2021.
-# gub <gub.gub@laposte.net>, 2021, 2023.
-# ButterflyOfFire <ButterflyOfFire@protonmail.com>, 2021, 2022, 2023.
-# Vincent Finance <linuxmario@linuxmario.net>, 2021.
-# Gavy <gavy@protonmail.com>, 2021.
-# lilim <lionel@les-miquelots.net>, 2021.
-# Jaxom <jaxom+weblate@tchack.xyz>, 2021.
-# booteille <booteille@protonmail.com>, 2021, 2022.
-# translator <yasinoc375@advew.com>, 2021.
-# translator <kvb@tuta.io>, 2022.
-# Julien Maulny <julien.maulny@protonmail.com>, 2022.
-# Translator <kvb@tuta.io>, 2022, 2023.
-# Ldm Public <ldmpub@gmail.com>, 2022, 2023, 2024.
-# TopFox <Arnaud.Savary@etu.unige.ch>, 2022.
-# John Donne <akheron@zaclys.net>, 2022, 2023.
-# Deleted User <noreply+22825@weblate.org>, 2023.
-# Christopher Forzy <christopher.forzy@ecomail.fr>, 2024.
-# Phantomwise <phantomwise67@protonmail.com>, 2024.
-# Sylvain Pichon <service@spichon.fr>, 2024.
-# Sylvain Pichon <Sp_@users.noreply.hosted.weblate.org>, 2024.
-# Lzebulon <lzebulon@crans.org>, 2024.
-# Armand Camponovo <contact@camarm.dev>, 2024.
-# Lula Bye <translate.cylinder716@passinbox.com>, 2025.
-# Laurent FAVOLE <laurentfavole03@gmail.com>, 2025.
 msgid ""
 msgstr ""
 "Project-Id-Version: fdroidserver 0.9\n"
 "Report-Msgid-Bugs-To: https://gitlab.com/fdroid/fdroidserver/issues\n"
-"POT-Creation-Date: 2025-06-25 09:52+0200\n"
-"PO-Revision-Date: 2025-04-11 17:20+0000\n"
-"Last-Translator: Laurent FAVOLE <laurentfavole03@gmail.com>\n"
+"POT-Creation-Date: 2020-10-21 18:05+0200\n"
+"PO-Revision-Date: 2020-10-08 15:24+0000\n"
+"Last-Translator: Renaud Perrai <contact@renaudperrai.fr>\n"
 "Language-Team: French <https://hosted.weblate.org/projects/f-droid/fdroidserver/fr/>\n"
 "Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Generator: Weblate 5.11-dev\n"
+"X-Generator: Weblate 4.3-dev\n"
+
+#: ../fdroidserver/common.py
+msgid ""
+"\n"
+"        This is a repository of apps to be used with FDroid. Applications in this\n"
+"        repository are either official binaries built by the original application\n"
+"        developers, or are binaries built from source by f-droid.org using the\n"
+"        tools on https://gitlab.com/fdroid.\n"
+"        "
+msgstr ""
+"\n"
+"        Ceci est un dépôt d’applications à utiliser avec FDroid. Les applications publiées\n"
+"        dans ce dépôt sont soit celles compilées par les développeurs\n"
+"        de ces applications, soit celles compilées par f-droid.org à partir des\n"
+"        sources en utilisant les outils disponibles sur https://gitlab.com/fdroid.\n"
+"        "
+
+#: ../fdroidserver/nightly.py
+msgid ""
+"\n"
+"SSH Public Key to be used as Deploy Key:"
+msgstr ""
+"\n"
+"Clé Publique SSH à utiliser comme Clé de Déploiement :"
 
 #: ../fdroidserver/nightly.py
 msgid ""
@@ -64,7 +61,7 @@ msgid ""
 "SSH public key to be used as deploy key:"
 msgstr ""
 "\n"
-"Clé SSH publique à utiliser comme clé de déploiement :"
+"Clé publique SSH à utiliser comme clé de déploiement :"
 
 #: ../fdroidserver/nightly.py
 #, python-brace-format
@@ -80,26 +77,22 @@ msgstr ""
 msgid "\"%s/\" has no matching metadata file!"
 msgstr "\"%s/\" n'a pas de fichier de métadonnées correspondant !"
 
-#: ../fdroidserver/index.py
-msgid "\"isPrimary\" key should not be added to mirrors!"
-msgstr "La clé \"isPrimary\" ne devrait pas être ajoutée aux miroirs !"
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "\"local_copy_dir\" {path} does not exist!"
-msgstr "Le dossier racine pour « local_copy_dir » {path} n’existe pas !"
-
 #: ../fdroidserver/install.py
 #, python-brace-format
 msgid "\"{apkfilename}\" is already installed on {dev}."
 msgstr "«{apkfilename}» est déjà installé sur {dev}."
 
+#: ../fdroidserver/update.py
+#, python-brace-format
+msgid "\"{path}\" contains outdated {name} ({version})"
+msgstr "\"{path}\" contient {name} obsolète ({version})"
+
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "\"{path}\" contains recent {name} ({version})"
 msgstr "\"{path}\" contient le récent {name} ({version})"
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "\"{path}\" exists but s3cmd is not installed!"
 msgstr "\"{path}\" existe mais s3cmd n'est pas installé !"
@@ -107,86 +100,121 @@ msgstr "\"{path}\" existe mais s3cmd n'est pas installé !"
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "\"{path}\" is not a supported file format (use: metadata/*.yml)"
-msgstr "Le format du ficher \"{path}\" n'est pas supporté (utiliser : metadata/*.yml)"
+msgstr "\"{path}\" n'est pas un format autorisé (utiliser : metadata/*.yml)"
 
-#: ../fdroidserver/update.py
+#: ../fdroidserver/metadata.py
 #, python-brace-format
-msgid "\"{path}\" is signed by a key that is not allowed:"
-msgstr "\"{path}\" est signé par une clé qui n'est pas autorisée :"
+msgid "\"{path}\" is not an accepted format, convert to: {formats}"
+msgstr "\"{path}\" n'est pas un format autorisé, convertir en : {formats}"
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/common.py
 #, python-brace-format
 msgid "\"{url}\" is not a valid URL!"
 msgstr "\"{url}\" n'est pas une URL valide !"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, python-format
+msgid "%(option)s option requires %(number)d argument"
+msgid_plural "%(option)s option requires %(number)d arguments"
+msgstr[0] "L'option %(option)s requiert %(number)d argument"
+msgstr[1] "L'option %(option)s requiert %(number)d arguments"
+
+#: ../fdroidserver/mirror.py
+#, python-format
+msgid "%(prog)s [options] url"
+msgstr "%(prog)s [options] url"
+
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "%(prog)s: error: %(message)s\n"
 msgstr "%(prog)s : erreur : %(message)s\n"
 
-#: ../fdroidserver/publish.py
-#, python-format
-msgid "%d APKs failed to be signed or verified!"
-msgstr "Les APK %d n'ont pas pu être signés ou vérifiés !"
-
 #: ../fdroidserver/scanner.py
 #, python-format
 msgid "%d problems found"
 msgstr "%d problèmes trouvés"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "%prog [options]"
+msgstr "%prog [options]"
+
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "%r is not callable"
 msgstr "%r n’est pas appelable"
 
-#: ../fdroidserver/signindex.py
-#, python-format
-msgid "%s did not produce a dict!"
-msgstr "%s ne produit pas de dict !"
-
-#: ../fdroidserver/signindex.py
-#, python-format
-msgid "%s has bad SHA-256: %s"
-msgstr "%s a un mauvais SHA-256 : %s"
-
 #: ../fdroidserver/lint.py
 #, python-format
 msgid "%s is not an accepted build field"
 msgstr "%s n'est pas un champ de construction acceptable"
 
-#: ../fdroidserver/common.py
-msgid "'keypass' not found in config.yml!"
-msgstr "'keypass' non trouvé dans config.yml !"
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, python-format
+msgid "%s option does not take a value"
+msgstr "l'option %s ne prend pas de valeur"
+
+#: ../fdroidserver/index.py ../fdroidserver/common.py
+msgid "'keypass' not found in config.py!"
+msgstr "'keypass' non trouvé dans config.py !"
 
 #: ../fdroidserver/common.py
 msgid "'keystore' is NONE and 'smartcardoptions' is blank!"
 msgstr "'keystore' n'est pas utilisé et 'smartcardoptions' est vide !"
 
-#: ../fdroidserver/common.py
-msgid "'keystore' not found in config.yml!"
-msgstr "'keystore' non trouvé dans config.yml !"
+#: ../fdroidserver/index.py ../fdroidserver/common.py
+msgid "'keystore' not found in config.py!"
+msgstr "'keystore' non trouvé dans config.py !"
 
-#: ../fdroidserver/common.py
-msgid "'keystorepass' not found in config.yml!"
-msgstr "'keystorepass' non trouvé dans config.yml !"
+#: ../fdroidserver/index.py ../fdroidserver/common.py
+msgid "'keystorepass' not found in config.py!"
+msgstr "'keystorepass' non trouvé dans config.py !"
 
-#: ../fdroidserver/common.py
-msgid "'repo_keyalias' not found in config.yml!"
-msgstr "'repo_keyalias' non trouvé dans config.yml !"
+#: ../fdroidserver/index.py ../fdroidserver/common.py
+msgid "'repo_keyalias' not found in config.py!"
+msgstr "'repo_keyalias' non trouvé dans config.py !"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "'required' is an invalid argument for positionals"
 msgstr "'required' est invalide comme argument positionnel"
 
 #: ../fdroidserver/common.py
-msgid "'sdk_path' not set in config.yml!"
-msgstr "'sdk_path' n'est pas configuré dans 'config.yml' !"
+msgid "'sdk_path' not set in 'config.py'!"
+msgstr "'sdk_path' n'est pas configuré dans 'config.py' !"
+
+#. Translators: "build-tools" is the file name of a package from
+#. Google, it is part of the Android SDK. So it probably shouldn't be
+#. translated or transliterated.
+#: ../fdroidserver/common.py
+#, python-brace-format
+msgid "'{aapt}' is too old, fdroid requires build-tools-23.0.0 or newer!"
+msgstr "'{aapt}' est obsolète, fdroid requiert build-tools-23.0.0 ou plus !"
 
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "'{aapt}' is too old, fdroid requires build-tools-{version} or newer!"
 msgstr "'{aapt}' est obsolète, fdroid requiert build-tools-{version} ou plus !"
 
+#: ../fdroidserver/install.py
+#, python-brace-format
+msgid "'{apkfilename}' is already installed on {dev}."
+msgstr "'{apkfilename}' est déjà installé sur '{dev}'."
+
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "'{field}' in {linedesc} is obsolete, see docs for current fields:"
+msgstr "'{field}' dans {linedesc} est obselète, regarder la documentation pour ces champs :"
+
+#: ../fdroidserver/common.py
+#, python-brace-format
+msgid "'{field}' will be in random order! Use () or [] brackets if order is important!"
+msgstr "'{field}' sera ordonné aléatoirement ! Utilisez des parenthèses () ou des crochets [] si l'ordre est important !"
+
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "'{path}' failed to execute!"
@@ -194,32 +222,23 @@ msgstr "'{path}' n'a pas pu être exécuté !"
 
 #: ../fdroidserver/metadata.py
 #, python-brace-format
-msgid "'{path}' has invalid format, it should be a dictionary!"
-msgstr "Le format de '{path}' est incorrect, il devrait s'agir d’un dictionnaire !"
-
-#: ../fdroidserver/lint.py ../fdroidserver/metadata.py
-#, python-brace-format
 msgid "'{value}' is not a valid {field} in {appid}. Regex pattern: {pattern}"
 msgstr "'{value}' n'est pas un(e) {field} valide dans {appid}. Motif regex : {pattern}"
 
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "'{value}' is not a valid {field}, should be {pattern}"
-msgstr "'{value}' n'est pas un(e) {field} valide et devrait être {pattern}"
-
-#: ../fdroidserver/checkupdates.py
-msgid "--merge-request only runs on a single appid!"
-msgstr "--merge-request fonctionne seulement sur un unique appid !"
-
 #: ../fdroidserver/checkupdates.py
 #, python-brace-format
 msgid "...checkupdate failed for {appid} : {error}"
 msgstr "...checkupdate a échoué pour {appid} : {error}"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid ".__call__() not defined"
 msgstr ".__call__() n'est pas défini"
 
+#: ../fdroidserver/metadata.py
+msgid ".fdroid.txt is not supported!  Convert to .fdroid.yml or .fdroid.json."
+msgstr ".fdroid.txt n'est pas supporté ! Convertissez en .fdroid.yml ou .fdroid.json."
+
 #: ../fdroidserver/lint.py
 msgid "/issues is missing"
 msgstr "/issues est manquant"
@@ -228,15 +247,14 @@ msgstr "/issues est manquant"
 msgid "A URL is required as an argument!"
 msgstr "Une URL est requise en argument !"
 
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "APK signatures have different certificates in {path}:"
-msgstr "Les signatures des APK ont des certificats différents dans {path} :"
-
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Add PGP signatures using GnuPG for packages in repo"
 msgstr "Ajouter des signatures PGP avec GnuPG pour les paquets dans le dépôt"
 
+#: ../fdroid ../fdroidserver/__main__.py
+msgid "Add a new application from its source code"
+msgstr "Ajouter une nouvelle application depuis son code source"
+
 #: ../fdroidserver/update.py
 msgid "Add a repo signing key to an unsigned repo"
 msgstr "Ajout d'une clé de signature de dépôt à un dépôt non signé"
@@ -254,11 +272,7 @@ msgstr "Ajout d'un nouveau dépôt pour seulement {name}"
 msgid "Alias of the repo signing key in the keystore"
 msgstr "Alias de la clé de signature du dépôt dans le trousseau"
 
-#: ../fdroidserver/build.py
-msgid "AllowedAPKSigningKeys missing but reference binary supplied"
-msgstr "AllowedAPKSigningKeys est manquante mais des références binaires sont indiquées"
-
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "Allows a different revision (or git branch) to be specified for the initial import"
 msgstr "Autoriser une version différente (ou branche git) a être spécifiée pour l'import initial"
 
@@ -282,10 +296,14 @@ msgstr "Fichier Android APK"
 msgid "Android DEX code"
 msgstr "Code Android DEX"
 
-#: ../fdroidserver/init.py
+#: ../fdroidserver/common.py ../fdroidserver/build.py
 #, python-brace-format
-msgid "Android SDK not found at {path}!"
-msgstr "SDK Android introuvable dans {path} !"
+msgid "Android SDK '{path}' does not have '{dirname}' installed!"
+msgstr "Le SDK Android '{path}' n'a pas '{dirname}' installé !"
+
+#: ../fdroidserver/common.py
+msgid "Android SDK not found!"
+msgstr "SDK Android introuvable !"
 
 #: ../fdroidserver/common.py
 #, python-brace-format
@@ -297,28 +315,23 @@ msgstr "Le SDK Android '{path}' n’existe pas !"
 msgid "Android SDK path '{path}' is not a directory!"
 msgstr "Le chemin du SDK Android '{path}' n'est pas un dossier !"
 
+#. Translators: "build-tools" is the file name of a package from
+#. Google, it is part of the Android SDK. So it probably shouldn't be
+#. translated or transliterated.
 #: ../fdroidserver/common.py
 #, python-brace-format
-msgid "Android SDK tool {cmd} not found!"
-msgstr "L'outil SDK Android {cmd} n'a pas été trouvé !"
+msgid "Android build-tools path '{path}' does not exist!"
+msgstr "Le chemin d'Android build-tools '{path}' n'existe pas !"
 
-#: ../fdroidserver/lint.py
-msgid "App has Binaries but does not have corresponding AllowedAPKSigningKeys to pin certificate."
-msgstr "L’application possède des fichiers binaires mais n'a pas les AllowedAPKSigningKeys correspondantes pour épingler le certificat."
-
-#: ../fdroidserver/lint.py
-msgid "App has NoSourceSince or ArchivePolicy \"0 versions\" or 0 but AutoUpdateMode or UpdateCheckMode are not None"
-msgstr "L'application a NoSourceSince ou ArchivePolicy à « 0 version » mais AutoUpdateMode ou UpdateCheckMode ne valent pas None"
+#: ../fdroidserver/update.py
+msgid "AndroidManifest.xml has no date"
+msgstr "AndroidManifest.xml n'a pas de date"
 
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "App is in '{repo}' but has a link to {url}"
 msgstr "L'application est dans '{repo}' mais a un lien vers {url}"
 
-#: ../fdroidserver/lint.py
-msgid "App version has binary but does not have corresponding AllowedAPKSigningKeys to pin certificate."
-msgstr "Des versions de l’application possède des fichiers binaires mais n'ont pas les AllowedAPKSigningKeys correspondantes pour épingler le certificat."
-
 #: ../fdroidserver/lint.py
 msgid "Appending .git is not necessary"
 msgstr "Il n'est pas nécessaire d'ajouter .git"
@@ -328,27 +341,11 @@ msgstr "Il n'est pas nécessaire d'ajouter .git"
 msgid "Archiving {apkfilename} with invalid signature!"
 msgstr "Archivage de {apkfilename} avec une signature invalide !"
 
-#: ../fdroidserver/lint.py
-msgid "AutoUpdateMode with UpdateCheckMode: HTTP must have a pattern."
-msgstr "AutoUpdateMode avec UpdateCheckMode : HTTP doit avoir un modèle."
-
-#: ../fdroidserver/install.py
-msgid "Automatic no to all prompts."
-msgstr "Répondre automatiquement Non à toutes les demandes."
-
-#: ../fdroidserver/install.py
-msgid "Automatic yes to all prompts."
-msgstr "Répondre automatiquement Oui à toutes les demandes."
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "Bad entry type \"{mirrortype}\" in mirrors config: {mirror}"
-msgstr "Mauvais type d'entrée \"{mirrortype}\" dans le paramétrage des miroirs : {mirror}"
-
 #: ../fdroidserver/mirror.py
 msgid "Base URL to mirror, can include the index signing key using the query string: ?fingerprint="
 msgstr "URL de base à mirorer, peut inclure la clef de signature d'index à l'aide de la chaîne de requête : ?fingerprint="
 
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "Branch '{branch}' used as commit in build '{versionName}'"
@@ -357,14 +354,14 @@ msgstr "Branche « {branch} » utilisée comme commit dans le build « {versionN
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "Branch '{branch}' used as commit in srclib '{srclib}'"
-msgstr "Branche '{branch}' utilisée comme commit dans srclib '{srclib}'"
+msgstr "La branche « {branch} » est utilisée comme commit dans srclib « {srclib} »"
 
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Broken symlink: {path}"
 msgstr "Lien symbolique cassé : {path}"
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Build a package from source"
 msgstr "Construire un paquet depuis les sources"
 
@@ -374,7 +371,7 @@ msgstr "Compiler toutes les applications disponibles"
 
 #: ../fdroidserver/lint.py
 msgid "Build generated by `fdroid import` - remove disable line once ready"
-msgstr "Build généré par `fdroid import` — supprimer la ligne désactivée une fois prêt"
+msgstr "Build généré par `fdroid import` - supprimer la ligne désactivée une fois prêt"
 
 #: ../fdroidserver/checkupdates.py
 msgid "Build metadata git repo has uncommited changes!"
@@ -384,70 +381,87 @@ msgstr "Le dépôt git des métadonnées de build a des changements non sauvegar
 msgid "Build only the latest version of each package"
 msgstr "Compiler uniquement la dernière version de chaque paquet"
 
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Build should have comma-separated versionName and versionCode, not \"{value}\", in {linedesc}"
+msgstr "Le build devrait avoir un versionName et un versionCode séparés par des virgules, et non pas \"{value}\", dans {linedesc}"
+
 #: ../fdroidserver/init.py
 #, python-format
 msgid "Built repo based in \"%s\" with this config:"
 msgstr "Dépôt du build basé sur \"%s\" avec cette config :"
 
-#: ../fdroidserver/checkupdates.py
-msgid "Can't auto-update app with no CurrentVersionCode"
-msgstr "Impossible de mettre à jour l'application automatiquement sans \"CurrentVersionCode\""
-
 #: ../fdroidserver/build.py
 msgid "Can't build due to {} error while scanning"
 msgid_plural "Can't build due to {} errors while scanning"
 msgstr[0] "Build impossible à cause de l'erreur lors de l'analyse"
 msgstr[1] "Build impossible à cause des {} erreurs lors de l'analyse"
 
-#: ../fdroidserver/common.py
+#: ../fdroidserver/vmtools.py
+#, python-brace-format
+msgid "Cannot read \"{path}\"!"
+msgstr "Impossible de lire \"{path}\" !"
+
+#. Translators: https://developer.android.com/studio/build/application-id
+#: ../fdroidserver/metadata.py
 #, fuzzy, python-brace-format
-msgid "Cannot read {path}: {error}"
-msgstr "Erreur de lecture {path} : {error}"
+msgid "Cannot resolve application ID {appid}"
+msgstr "Impossible de résoudre l'identifiant de l'application {appid}"
 
 #: ../fdroidserver/rewritemeta.py
 #, python-brace-format
 msgid "Cannot rewrite \"{path}\""
 msgstr "Impossible d'écrire sur \"{path}\""
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
+#: ../fdroidserver/rewritemeta.py
+msgid "Cannot use --list and --to at the same time"
+msgstr "Impossible d'utiliser --list et --to en même temps"
+
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Cannot write \"{path}\", not an accepted format, use: {formats}"
+msgstr "Impossible d'écrire \"{path}\", le format n'est pas accepté. Merci d'utiliser : {formats}"
+
 #: ../fdroidserver/lint.py
 #, python-format
 msgid "Categories '%s' is not valid"
-msgstr "Catégories « %s » invalides"
+msgstr "Catégorie « %s » invalide"
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
 #: ../fdroidserver/lint.py
 msgid "Categories are not set"
 msgstr "Catégories non définies"
 
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "Category \"{category}\" defined but not used for any apps!"
-msgstr "La catégorie « {category} » est définie mais n'est utilisée par aucune application !"
-
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Check for updates to applications"
 msgstr "Vérifier les mises à jour pour les applications"
 
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Checking archiving for {appid} - apks:{integer}, keepversions:{keep}, archapks:{arch}"
-msgstr "Vérification de l'archivage pour {appid} — apks : {integer}, keepversions : {keep}, archapks : {arch}"
+msgstr "Vérification de l'archivage pour {appid} - apks : {integer}, keepversions : {keep}, archapks : {arch}"
+
+#: ../fdroidserver/dscanner.py
+msgid "Clean after all scans have finished"
+msgstr "Nettoyer après la fin de tous les scans"
+
+#: ../fdroidserver/dscanner.py
+msgid "Clean before the scans start and rebuild the container"
+msgstr "Nettoyer avant le début des scans et recréer le container"
+
+#: ../fdroidserver/dscanner.py
+msgid "Clean up all containers and then exit"
+msgstr "Vider tous les conteneurs puis sortir"
 
 #: ../fdroidserver/update.py
 msgid "Clean update - don't uses caches, reprocess all APKs"
-msgstr "Mise à jour propre — n'utilise pas les caches, traite à nouveau tous les APKs"
+msgstr "Mise à jour propre - n'utilise pas les caches, traite à nouveau tous les APKs"
 
-#: ../fdroidserver/common.py
-msgid "Color the log output"
-msgstr "Colorer l'affichage des journaux"
-
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "Comma separated list of categories."
 msgstr "Liste de catégories séparées par des virgules."
 
-#: ../fdroidserver/__main__.py
-#, python-format
+#: ../fdroid ../fdroidserver/__main__.py
+#, c-format, python-format
 msgid "Command '%s' not recognised.\n"
 msgstr "La commande '%s' n'est pas reconnue.\n"
 
@@ -455,15 +469,6 @@ msgstr "La commande '%s' n'est pas reconnue.\n"
 msgid "Commit changes"
 msgstr "Sauvegarder les changements (commit)"
 
-#: ../fdroidserver/checkupdates.py
-msgid "Commit changes, push, then make a merge request"
-msgstr "Sauvegarder les changements, les pousser sur le dépôt et faire une demande d'intégration"
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Conflicting \"{field}\" definitions between .yml and localized files:"
-msgstr "Conflit des définitions « {field} » entre les fichiers .yml et ceux traduits :"
-
 #: ../fdroidserver/__main__.py
 msgid "Conflicting arguments: '--verbose' and '--quiet' can not be specified at the same time."
 msgstr "Conflit d'arguments : '--verbose' et '--quiet' ne peuvent être choisis en même temps."
@@ -473,13 +478,11 @@ msgstr "Conflit d'arguments : '--verbose' et '--quiet' ne peuvent être choisis
 msgid "Could not find '{command}' on your system"
 msgstr "Impossible de trouver '{command}' sur votre système"
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "Could not find latest version code"
 msgstr "Impossible de trouver la dernière version du code"
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "Could not find latest version name"
 msgstr "Impossible de trouver le nom de la dernière version"
 
@@ -489,25 +492,30 @@ msgid "Could not find {path} to remove it"
 msgstr "Chemin {path} introuvable pour sa suppression"
 
 #: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Could not open APK {path} for analysis: "
-msgstr "Impossible d'ouvrir le fichier APK {path} pour analyse : "
+msgid "Could not open apk file for analysis"
+msgstr "Impossible d'ouvrir le fichier apk pour analyse"
 
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "Could not parse size \"{size}\", wrong type \"{type}\""
 msgstr "Impossible de récupérer la taille \"{size}\", mauvais type \"{type}\""
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/import_subcommand.py
+#. Translators: https://developer.android.com/studio/build/application-id
+#: ../fdroidserver/import.py
 msgid "Couldn't find Application ID"
 msgstr "Impossible de trouver l'ID de l'application"
 
-#: ../fdroidserver/checkupdates.py
-msgid "Couldn't find any version information"
-msgstr "Impossible de trouver des informations sur la version"
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
+#: ../fdroidserver/import.py
+msgid "Couldn't find latest version code"
+msgstr "Impossible de trouver la dernière version du code"
 
-#: ../fdroidserver/checkupdates.py
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
+#: ../fdroidserver/import.py
+msgid "Couldn't find latest version name"
+msgstr "Impossible de trouver le nom de la dernière version"
+
+#: ../fdroidserver/import.py
 msgid "Couldn't find package ID"
 msgstr "Impossible de trouver l'ID du paquet"
 
@@ -515,26 +523,29 @@ msgstr "Impossible de trouver l'ID du paquet"
 msgid "Cowardily refusing to overwrite existing signing key setup!"
 msgstr "Je refuse de remplacer la configuration existante des clés de signature !"
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/update.py
+msgid "Create a repo signing key in a keystore"
+msgstr "Créer une clé de signature de dépôt dans un gestionnaire de clés"
+
+#: ../fdroidserver/update.py
+msgid "Create skeleton metadata files that are missing"
+msgstr "Créer les métadonnées de base manquantes"
+
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Created new container \"{name}\""
 msgstr "Nouveau container « {name} » créé"
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Creating \"{path}\" for configuring s3cmd."
 msgstr "Création de « {path} » pour configurer s3cmd."
 
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Creating empty {config_file}"
-msgstr "Création d'un fichier {config_file} vide"
-
 #: ../fdroidserver/publish.py
 msgid "Creating log directory"
 msgstr "Création du répertoire des logs"
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Creating new S3 bucket: {url}"
 msgstr "Création d'un nouveau bucket S3 : {url}"
@@ -547,7 +558,8 @@ msgstr "Création du répertoire de sortie"
 msgid "Creating signed index with this key (SHA256):"
 msgstr "Création d'un index signé avec la clé (SHA256) :"
 
-#: ../fdroidserver/publish.py ../fdroidserver/verify.py
+#: ../fdroidserver/import.py ../fdroidserver/verify.py
+#: ../fdroidserver/publish.py
 msgid "Creating temporary directory"
 msgstr "Création du répertoire temporaire"
 
@@ -592,22 +604,17 @@ msgstr "Description de '%s' n'est qu'un résumé de l'application"
 msgid "Description has a duplicate line"
 msgstr "Ligne dupliquée dans la description"
 
+#: ../fdroidserver/lint.py
+#, python-format
+msgid "Description has a list (%s) but it isn't bulleted (*) nor numbered (#)"
+msgstr "La description contient une liste (%s) mais ce n'est ni une liste à puces (*) ni une liste numérotée (#)"
+
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "Description of length {length} is over the {limit} char limit"
 msgstr "La longueur de la description {length} dépasser la limite du nombre de caractères autorisés {limit}"
 
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Did you mean config/{name}.yml?"
-msgstr "Vouliez-vous dire config/{name}.yml ?"
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Did you mean {code}?"
-msgstr "Vouliez-vous dire {code} ?"
-
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "Do not add 'disable:' to the generated build entries"
 msgstr "Ne pas ajouter \"disable:\" aux entrées générées"
 
@@ -632,22 +639,27 @@ msgstr "Ne pas supprimer les clés privées générées par le keystore"
 msgid "Don't create a source tarball, useful when testing a build"
 msgstr "Ne pas créer un tarball avec les sources, utile pour tester un build"
 
+#: ../fdroidserver/stats.py
+msgid "Don't do anything logs-related"
+msgstr "Ne pas toucher aux journaux d'applications (logs)"
+
 #: ../fdroidserver/build.py
 msgid "Don't refresh the repository, useful when testing a build with no internet connection"
 msgstr "Ne pas rafraîchir le dépôt, utile pour tester un build sans connexion internet"
 
 #: ../fdroidserver/deploy.py ../fdroidserver/nightly.py
+#: ../fdroidserver/upload.py
 msgid "Don't use rsync checksums"
 msgstr "Ne pas utiliser les sommes de contrôle rsync"
 
-#: ../fdroidserver/install.py
-msgid "Download F-Droid.apk using mirrors that leak less to the network"
-msgstr "Téléchager F-Droid.apk en utilisant des miroirs avec moins de fuites réseaux"
-
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Download complete mirrors of small repos"
 msgstr "Télécharger une image complète des petits dépôts"
 
+#: ../fdroidserver/stats.py
+msgid "Download logs we don't have"
+msgstr "Télécharger les journaux que n'avons pas"
+
 #: ../fdroidserver/common.py
 msgid "Downloading the repository already failed once, not trying again."
 msgstr "Le téléchargement du référentiel a déjà échoué une fois, ne pas réessayer."
@@ -659,56 +671,38 @@ msgstr "Échec lors du téléchargement de {url}. {error}"
 
 #: ../fdroidserver/metadata.py
 #, python-brace-format
-msgid "Duplicate Anti-Feature declaration at {path} was ignored!"
-msgstr "La double déclaration d'une antifonction dans {path} a été ignorée !"
-
-#: ../fdroidserver/index.py
-#, python-format
-msgid "Duplicate entry \"%s\" in mirrors config!"
-msgstr "Entrée doublon \"%s\" dans le paramétrage des miroirs !"
+msgid "Duplicate build recipe found for versionCode {versionCode} in {linedesc}"
+msgstr "Instruction de build dupliquée pour versionCode {versionCode} dans {linedesc}"
 
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "Duplicate link in '{field}': {url}"
 msgstr "Lien dupliqué dans « {field} » : {url}"
 
-#: ../fdroidserver/common.py
-#, python-format
-msgid "ERROR: %(message)s"
-msgstr "ERREUR : %(message)s"
+#: ../fdroid
+msgid "Dynamically scan APKs post build"
+msgstr "Analyser dynamiquement les APKs après compilation"
 
 #: ../fdroidserver/__main__.py
 msgid "ERROR: The \"server\" subcommand has been removed, use \"deploy\"!"
-msgstr "ERREUR : La sous-commande \"server\" a été supprimée, utilisez plutôt \"deploy\" !"
+msgstr ""
+
+#: ../fdroidserver/mirror.py
+msgid ""
+"ERROR: this command should never be used to mirror f-droid.org!\n"
+"A full mirror of f-droid.org requires more than 200GB."
+msgstr ""
+"ERREUR : cette commande ne devrait jamais être utilisée pour copier f-droid.org !\n"
+"Une copie de f-droid.org occupe plus de 200GB."
 
 #: ../fdroidserver/nightly.py
 msgid "ERROR: unsupported CI type, patches welcome!"
 msgstr "ERREUR : type de CI non supporté, les corrections sont bienvenues !"
 
-#: ../fdroidserver/nightly.py
-#, python-format
-msgid "ERROR: unsupported git host \"%s\", patches welcome!"
-msgstr "ERREUR : hébergeur git « %s » non supporté, les corrections sont les bienvenues !"
-
-#: ../fdroidserver/lint.py
+#: ../fdroidserver/metadata.py
 #, python-brace-format
-msgid "ERROR: {key} in {path} is not \"archive\" or \"repo\"!"
-msgstr "ERREUR : {key} dans {path} n'est pas \"archive\" ou \"repo\"."
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "ERROR: {key} not a valid key!"
-msgstr "ERREUR : {key} n'est pas une clé valide !"
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "ERROR: {key}'s value should be of type {t}!"
-msgstr "ERREUR : la valeur de {key} devrait être du type {t} !"
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "ERROR: {key}:{subkey} in {path} is not in allowed keys: {allowed_keys}!"
-msgstr "ERREUR : {key} :{subkey} dans {path} n'est pas une clé valide parmi : {allowed_keys}."
+msgid "Empty build flag at {linedesc}"
+msgstr "Drapeau de construction vide à {linedesc}"
 
 #: ../fdroidserver/__main__.py
 #, python-brace-format
@@ -724,40 +718,20 @@ msgstr ""
 "Entrez le chemin du SDK Android (%s1) :\n"
 "> "
 
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Environment variable {var} from {configname} is not set!"
-msgstr "La variable d'environnent {var} de {configname} n'est pas configurée !"
+#: ../fdroidserver/deploy.py ../fdroidserver/checkupdates.py
+#: ../fdroidserver/upload.py
+#, python-format
+msgid "Error while attempting to publish log: %s"
+msgstr "Erreur lors de la publication du journal : %s"
 
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Environment variable {{env: {var}}} is not set!"
-msgstr "La variable d'environnement {{env: {var}}} n'est pas configurée !"
-
-#: ../fdroidserver/deploy.py
-msgid "Error deploying 'github_releases', {} not present. (You might need to run `fdroid update` first.)"
-msgstr "Erreur lors du déploiement 'github_releases' : {} est absent (vous devriez peut-être d'abord lancer `fdroid update`)."
-
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py ../fdroidserver/common.py
 msgid "Error while getting repo address"
 msgstr "Erreur lors de l'obtention de l'adresse du dépôt"
 
-#: ../fdroidserver/scanner.py
-msgid "Exit with a non-zero code if problems were found"
-msgstr "Quitter avec un code différent de zéro si des problèmes ont été détectés"
-
-#: ../fdroidserver/__main__.py
-msgid "Extract application metadata from a source repository"
-msgstr "Extraire les métadonnées de l'application depuis un dépôt source"
-
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Extract signatures from APKs"
 msgstr "Extraction des signatures à partir des APKs"
 
-#: ../fdroidserver/install.py
-msgid "F-Droid.apk could not be downloaded from any known source!"
-msgstr "F-Droid.apk ne peut pas être téléchargé depuis les source connues !"
-
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Failed copying {path}: {error}"
@@ -776,36 +750,44 @@ msgstr "Erreur de lecture {path} : {error}"
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Failed resizing {path}: {error}"
-msgstr "Impossible de redimensionner {path} : {error}"
+msgstr "Échec au redimensionement de {path} : {error}"
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/publish.py
+msgid "Failed to align application"
+msgstr "Impossible d'aligner les applications"
+
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Failed to create S3 bucket: {url}"
 msgstr "La création du S3 Bucket a échoué : {url}"
 
+#: ../fdroidserver/common.py
+msgid "Failed to get APK manifest information"
+msgstr "Échoument lors de la récupération de l'information manifest de l'APK"
+
 #: ../fdroidserver/update.py
 #, python-brace-format
-msgid "Failed to get APK information, deleting {path}"
+msgid "Failed to get apk information, deleting {path}"
 msgstr "Impossible d'obtenir les informations de l'APK, suppression {path}"
 
 #: ../fdroidserver/update.py
 #, python-brace-format
-msgid "Failed to get APK information, skipping {path}"
+msgid "Failed to get apk information, skipping {path}"
 msgstr "Échoument lors de la récupération des informations de l'APK, saut de {path}"
 
-#: ../fdroidserver/update.py
-msgid "Failed to get APK signing key fingerprint"
-msgstr "Échec de l’obtention de l’empreinte de la clé de signature de l’APK"
-
 #: ../fdroidserver/install.py
 #, python-brace-format
 msgid "Failed to install '{apkfilename}' on {dev}: {error}"
 msgstr "Impossible d'installer « {apkfilename} » sur {dev} : {error}"
 
-#: ../fdroidserver/common.py
+#: ../fdroidserver/publish.py ../fdroidserver/common.py
 msgid "Failed to sign application"
 msgstr "Erreur lors de la signature de l'application"
 
+#: ../fdroidserver/common.py
+msgid "Failed to zipalign application"
+msgstr "Impossible d'optimiser avec zipalign cette application"
+
 #: ../fdroidserver/build.py
 #, python-brace-format
 msgid "Fetched buildserverid from VM: {buildserverid}"
@@ -821,12 +803,21 @@ msgstr "Récupération de la signature pour '{apkfilename}' -> '{sigdir}'"
 msgid "File disappeared while processing it: {path}"
 msgstr "Le fichier a été supprimé au cours du traitement : {path}"
 
-#: ../fdroidserver/build.py ../fdroidserver/install.py
-#: ../fdroidserver/rewritemeta.py ../fdroidserver/scanner.py
-#: ../fdroidserver/update.py
+#: ../fdroidserver/verify.py ../fdroidserver/stats.py ../fdroidserver/update.py
+#: ../fdroidserver/rewritemeta.py ../fdroidserver/build.py
+#: ../fdroidserver/checkupdates.py ../fdroidserver/scanner.py
+#: ../fdroidserver/install.py
 msgid "Finished"
 msgstr "Terminé"
 
+#: ../fdroidserver/lint.py
+msgid "Flattr donation methods belong in the FlattrID flag"
+msgstr "La méthode de donnation Flattr reviens au flag FlatttrID"
+
+#: ../fdroidserver/lint.py
+msgid "Flattr donation methods belong in the FlattrID: field"
+msgstr "Les informations de dons via Flattr doivent être renseignées dans le champ FlattrID:"
+
 #: ../fdroidserver/lint.py
 msgid "Forbidden HTML tags"
 msgstr "Balises HTML interdites"
@@ -852,24 +843,21 @@ msgstr "« {path} » graphique trouvée sans métadonnées pour l'applicatio
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Found bad funding file \"{path}\" for \"{name}\":"
-msgstr "Mauvais fichier de financement « {path} » trouvé pour « {name} » :"
+msgstr ""
 
 #: ../fdroidserver/common.py
 msgid "Found invalid appids in arguments"
 msgstr "Appids invalide trouvée dans l'argument"
 
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
 #: ../fdroidserver/common.py
 msgid "Found invalid versionCodes for some apps"
 msgstr "Code de version invalide trouvée pour certaines application"
 
 #: ../fdroidserver/common.py
-#, python-brace-format
+#, fuzzy, python-brace-format
 msgid "Found multiple JAR Signature Block Files in {path}"
-msgstr "Plusieurs fichiers de bloc de signature JAR trouvé à {path}"
-
-#: ../fdroidserver/common.py
-msgid "Found multiple Signer Certificates!"
-msgstr "Plusieurs certificats de signatures ont été trouvés !"
+msgstr "Plusieurs certificats signées trouvée dans {path}"
 
 #: ../fdroidserver/metadata.py
 #, python-brace-format
@@ -880,6 +868,11 @@ msgstr "De multiples fichiers de métadonnées ont été trouvés pour {appid}"
 msgid "Found multiple signing certificates for repository."
 msgstr "Plusieurs certificats de signature ont étés trouvés pour le référentiel."
 
+#: ../fdroidserver/update.py
+#, python-brace-format
+msgid "Found multiple signing certificates in {path}"
+msgstr "Plusieurs certificats signées trouvée dans {path}"
+
 #: ../fdroidserver/index.py
 msgid "Found no signing certificates for repository."
 msgstr "Aucun certificat signée trouvée dans le dépot."
@@ -894,16 +887,6 @@ msgstr "Aucun fichier trouvée a %s"
 msgid "Found {apkfilename} at {url}"
 msgstr "{apkfilename} trouvé à {url}"
 
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Found {count} problems in {filename}"
-msgstr "{count} problèmes détectés dans {filename}"
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Found {count} warnings in {filename}"
-msgstr "{count} avertissements détectés dans {filename}"
-
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Generated skeleton metadata for {appid}"
@@ -922,21 +905,19 @@ msgstr "Nettoyage du Git échoué"
 msgid "Git fetch failed"
 msgstr "Recherche du Git échouée"
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
+#: ../fdroidserver/common.py
+msgid "Git remote set-head failed"
+msgstr "Set-head distant du Git à échouer"
+
 #: ../fdroidserver/common.py
 #, python-format
 msgid "Git remote set-head failed: \"%s\""
 msgstr "Impossible de définir la branche par défaut du Git distant : \"%s\""
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
 #: ../fdroidserver/common.py
 msgid "Git reset failed"
 msgstr "Reset de Git échouée"
 
-#: ../fdroidserver/common.py
-msgid "Git submodule deinit failed"
-msgstr "Échec du sous-module Git deinit"
-
 #: ../fdroidserver/common.py
 msgid "Git submodule sync failed"
 msgstr "Synchronisation du submodule Git échoué"
@@ -968,25 +949,20 @@ msgstr "Ignore '{field}' dans les métadonnées '{metapath}' parce que c'est dé
 msgid "Ignoring FUNDING.yml entry longer than 2048: %s"
 msgstr "Ignorer l'entrée FUNDING.yml supérieure à 2048 : %s"
 
-#: ../fdroidserver/update.py
-#, python-format
-msgid "Ignoring bad element in manifest: %s"
-msgstr "Un mauvais élément du manifest est ignoré : %s"
-
-#: ../fdroidserver/common.py
-#, fuzzy, python-brace-format
-msgid "Ignoring deprecated {oldfile}, use {newfile}!"
-msgstr "{oldfile} est obsolète et ignoré, {newfile} est utilisé !"
-
 #: ../fdroidserver/index.py
 msgid "Ignoring package without metadata: "
-msgstr "Paquet sans métadonnées ignoré : "
+msgstr "Ignorer le package sans métadonnées : "
 
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Ignoring stale cache data for {apkfilename}"
 msgstr "Ignorer les données de cache périmées pour {apkfilename}"
 
+#: ../fdroidserver/rewritemeta.py
+#, python-brace-format
+msgid "Ignoring {ext} file at '{path}'"
+msgstr "Ignorer le fichier {ext} à '{path}'"
+
 #: ../fdroidserver/update.py
 msgid "Include APKs that are signed with disabled algorithms like MD5"
 msgstr "Inclure des fichiers APK signés avec algorithmes désactivés comme MD5"
@@ -997,22 +973,12 @@ msgstr "Inclure au miroir les fichiers .asc de signature PGP"
 
 #: ../fdroidserver/mirror.py
 msgid "Include the build logs in the mirror"
-msgstr "Inclure les journaux de construction dans le miroir"
+msgstr ""
 
 #: ../fdroidserver/mirror.py
 msgid "Include the source tarballs in the mirror"
 msgstr "Inclure au miroir les tarballs de source"
 
-#: ../fdroidserver/metadata.py
-#, python-format
-msgid "Including metadata from %s@%s"
-msgstr "Inclure les métadonnées de %s@%s"
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Including metadata from {path}"
-msgstr "Inclure les métadonnées de {path}"
-
 #: ../fdroidserver/common.py
 msgid "Initialising submodules"
 msgstr "Initialisation des sous-modules"
@@ -1021,7 +987,7 @@ msgstr "Initialisation des sous-modules"
 msgid "Install all signed applications available"
 msgstr "Installer toutes les applications signées disponibles"
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Install built packages on devices"
 msgstr "Installer les paquets compilés sur le(s) périphérique(s)"
 
@@ -1030,12 +996,22 @@ msgstr "Installer les paquets compilés sur le(s) périphérique(s)"
 msgid "Installing %s..."
 msgstr "Installation de %s …"
 
+#: ../fdroidserver/install.py
+#, python-format
+msgid "Installing %s…"
+msgstr "Installation de %s …"
+
 #: ../fdroidserver/install.py
 #, python-brace-format
 msgid "Installing '{apkfilename}' on {dev}..."
 msgstr "Installation de '{apkfilename}' sur {dev}…"
 
-#: ../fdroidserver/__main__.py
+#: ../fdroidserver/install.py
+#, python-brace-format
+msgid "Installing '{apkfilename}' on {dev}…"
+msgstr "Installation de '{apkfilename}' sur {dev}…"
+
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Interact with the repo HTTP server"
 msgstr "Interagir avec le serveur HTTP du dépôt"
 
@@ -1043,36 +1019,53 @@ msgstr "Interagir avec le serveur HTTP du dépôt"
 msgid "Invalid APK"
 msgstr "APK invalide"
 
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "Invalid AutoUpdateMode: {mode}"
-msgstr "AutoUpdateMode non valide : {mode}"
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "Invalid UpdateCheckMode: {mode}"
-msgstr "UpdateCheckMode non valide : {mode}"
-
-#: ../fdroidserver/checkupdates.py
+#: ../fdroidserver/lint.py ../fdroidserver/checkupdates.py
 #, python-brace-format
 msgid "Invalid VercodeOperation: {field}"
 msgstr "VercodeOperation non valide : {field}"
 
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Invalid VercodeOperation: {invalid_ops}"
-msgstr "VercodeOperation non valide : {invalid_ops}"
-
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "Invalid application ID {appid}"
 msgstr "ID de l'application invalide {appid}"
 
+#: ../fdroidserver/metadata.py
+#, python-format
+msgid "Invalid boolean '%s'"
+msgstr "Booléen '%s' non valide"
+
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Invalid build flag at {line} in {linedesc}"
+msgstr "Indicateur de build non valide à {line} dans {linedesc}"
+
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Invalid build format: {value} in {name}"
+msgstr "Format de construction non valide : {value} dans {name}"
+
 #: ../fdroidserver/lint.py
 msgid "Invalid bulleted list"
 msgstr "Liste à puces non valide"
 
+#: ../fdroidserver/lint.py
+#, python-format
+msgid "Invalid license tag \"%s\"! Use only tags from https://spdx.org/license-list"
+msgstr "Balise de licence non valide \"%s\" ! Utilisez uniquement des balises de https ://spdx.org/license-list"
+
+#: ../fdroidserver/lint.py
+msgid "Invalid link - use [http://foo.bar Link title] or [http://foo.bar]"
+msgstr "Lien non valide - utilisez [http://foo.bar Link title] ou [http://foo.bar]"
+
+#: ../fdroidserver/metadata.py
+#, python-format
+msgid "Invalid metadata in %s:%d"
+msgstr "Métadonnées non valides dans %s:%d"
+
+#: ../fdroidserver/metadata.py
+msgid "Invalid metadata in: "
+msgstr "Métadonnées non valides dans : "
+
 #: ../fdroidserver/common.py
 #, python-format
 msgid "Invalid name for published file: %s"
@@ -1080,8 +1073,8 @@ msgstr "Nom non valide pour le fichier publié :%s"
 
 #: ../fdroidserver/common.py
 #, python-brace-format
-msgid "Invalid ndk: entry in build: \"{ndk}\""
-msgstr "Ndk non valide : entrée dans le build : « {ndk} »"
+msgid "Invalid package name {0}"
+msgstr "Nom de package non valide {0}"
 
 #: ../fdroidserver/common.py
 #, python-brace-format
@@ -1103,10 +1096,15 @@ msgstr "Métadonnée de scrlib invalide : '{file}' ne peut être analysé"
 msgid "Invalid srclib metadata: unknown key '{key}' in '{file}'"
 msgstr "Métadonnée de scrlib invalide : la clé '{key}' est inconnue dans '{file}'"
 
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Invalid versionCode: \"{versionCode}\" is not an integer!"
+msgstr "VersionCode non valide : \"{versionCode}\" n'est pas un entier !"
+
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "JAR signature failed to verify: {path}"
-msgstr "La signature JAR n'a pas pu vérifier :{path}"
+msgstr "La signature JAR n'a pas pu vérifier:{path}"
 
 #: ../fdroidserver/common.py
 #, python-brace-format
@@ -1117,8 +1115,8 @@ msgstr "Signature JAR vérifiée : {path}"
 msgid "Java JAR file"
 msgstr "Fichier Java JAR"
 
-#: ../fdroidserver/mirror.py ../fdroidserver/publish.py
-#: ../fdroidserver/update.py
+#: ../fdroidserver/publish.py ../fdroidserver/update.py
+#: ../fdroidserver/mirror.py
 msgid "Java JDK not found! Install in standard location or set java_paths!"
 msgstr "Java JDK introuvable ! Installez dans un emplacement standard ou définissez java_paths !"
 
@@ -1134,35 +1132,30 @@ msgstr "Java jarsigner introuvable ! Installez dans un emplacement standard ou
 msgid "Javascript in HTML src attributes"
 msgstr "Attributs Javascript trouvée dans HTML src"
 
-#: ../fdroidserver/build.py
-#, python-brace-format
-msgid "Keeping failed build \"{apkfilename}\""
-msgstr "Conserver la version ayant échoué « {apkfilename} »"
-
 #: ../fdroidserver/init.py
 msgid "Keystore for signing key:\t"
 msgstr "Stockage des clés signée :\t"
 
 #: ../fdroidserver/lint.py
-msgid "Known debug key is used in AllowedAPKSigningKeys: "
-msgstr "La clé de débogage connue est utilisé dans AllowedAPKSigningKeys : "
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
+#, fuzzy, python-brace-format
 msgid "Last used commit '{commit}' looks like a tag, but UpdateCheckMode is '{ucm}'"
-msgstr "Le dernier commit utilisé '{commit}' ressemble a une balise, mais le UpdateCheckMode est '{ucm}'"
+msgstr "Le dernier archivage utiliser '{commit}' ressemble a une balise, mais le Mode De Vérification Des Mise A Jour est '{ucm}'"
 
 #: ../fdroidserver/lint.py
 msgid "Liberapay donation methods belong in the Liberapay: field"
 msgstr "Les méthodes de don via Liberapay font partie de Liberapay : field"
 
+#: ../fdroidserver/lint.py
+msgid "Liberapay donation methods belong in the LiberapayID flag"
+msgstr "La méthode de donnation Liberapay appartien dans le flag LiberapayID"
+
 #: ../fdroidserver/rewritemeta.py
-msgid "List files that would be reformatted (dry run)"
-msgstr "Lister les fichiers qui seront reformater (test à blanc)"
+msgid "List files that would be reformatted"
+msgstr "Lister les fichiers qui seront reformater"
 
 #: ../fdroidserver/lint.py
 msgid "Locale included in f-droid.org URL"
-msgstr "Les paramètres de localisation sont inclus dans l'URL f-droid.org"
+msgstr "Les paramètres de lieu sont inclus dans f-droid.org URL"
 
 #: ../fdroidserver/build.py
 msgid "Make the build stop on exceptions"
@@ -1176,16 +1169,6 @@ msgstr "Mirroirs de dépot malformée."
 msgid "Malformed serverwebroot line:"
 msgstr "serverwebroot malformer en ligne :"
 
-#: ../fdroidserver/scanner.py
-#, python-format
-msgid "Max recursion depth in ZIP file reached: %s"
-msgstr "Profondeur maximale de récursivité dans le fichier ZIP atteinte : %s"
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "Mirror config for {url} contains \"isPrimary\" key!"
-msgstr "La configuration du miroir pour {url} contient la clé \"isPrimary\" !"
-
 #: ../fdroidserver/mirror.py
 msgid "Mirror the full repo and archive, all file types."
 msgstr "Cloner entièrement le repo et les archives, tous les fichiers."
@@ -1194,30 +1177,31 @@ msgstr "Cloner entièrement le repo et les archives, tous les fichiers."
 msgid "Missing output directory"
 msgstr "Répertoire de destination manquant"
 
-#: ../fdroidserver/metadata.py
-msgid "Moving Anti-Features declarations to localized files:"
-msgstr "Déplacement des déclarations des antifonctions vers les fichiers de traduction :"
-
-#: ../fdroidserver/index.py
-msgid "Neither \"repo_pubkey\" nor \"keystorepass\" set in config.yml"
-msgstr "Ni « repo_pubkey », ni « keystorepass » ne sont définis dans config.yml"
-
-#: ../fdroidserver/verify.py
+#: ../fdroidserver/lint.py
 #, python-format
-msgid "No APK for package: %s"
-msgstr "Aucun APK pour le paquet : %s"
+msgid "Name '%s' is just the auto name - remove it"
+msgstr "Le nom '%s' est just un nom générer - retirer le"
+
+#: ../fdroidserver/common.py
+msgid "No 'config.py' found, using defaults."
+msgstr "Aucun 'config.py' trouvée, utilisation des originales."
 
 #: ../fdroidserver/common.py
 msgid "No Android SDK found!"
 msgstr "Aucun SDK Android trouvée !"
 
+#: ../fdroidserver/import.py
+msgid "No android or kivy project could be found. Specify --subdir?"
+msgstr "Aucun projet android ou kivy n'a pu être trouver. Spécifiier --subdir ?"
+
 #: ../fdroidserver/install.py
 msgid "No attached devices found"
 msgstr "Aucun périphérique connecté trouvé"
 
-#: ../fdroidserver/install.py
-msgid "No devices found for `adb install`! Please plug one in."
-msgstr "Aucun appareil trouvé pour `adb install` ! Veuillez en branchez un."
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "No commit specified for {versionName} in {linedesc}"
+msgstr "Aucun archivage spécifier pour {versionName} dans {linedesc}"
 
 #: ../fdroidserver/index.py
 msgid "No fingerprint in URL."
@@ -1227,23 +1211,15 @@ msgstr "Aucune empreinte dans l'URL."
 msgid "No git submodules available"
 msgstr "Aucun sous-module git disponible"
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
+#, fuzzy
 msgid "No gradle project could be found. Specify --subdir?"
-msgstr "Aucun projet gradle n'a pu être trouvé. Spécifier --subdir ?"
+msgstr "Aucun projet android ou kivy n'a pu être trouver. Spécifiier --subdir ?"
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py ../fdroidserver/common.py
 msgid "No information found."
 msgstr "Aucune information trouvée."
 
-#: ../fdroidserver/checkupdates.py
-msgid "No matching tags found"
-msgstr "Aucune étiquette correspondante n’a été trouvée"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "No minimum SDK version found in {0}, using default (3)."
-msgstr "Aucune version minimale du SDK trouvée dans {0}, utilisation de la valeur par défaut (3)."
-
 #: ../fdroidserver/lint.py
 msgid "No need to specify that the app is Free Software"
 msgstr "Pas besoin de spécifier que l'application est un logiciel libre"
@@ -1253,48 +1229,41 @@ msgid "No need to specify that the app is for Android"
 msgstr "Pas besoin de spécifier que l'application est pour Android"
 
 #: ../fdroidserver/deploy.py
-msgid "No option set! Edit your config.yml to set at least one of these:"
-msgstr "Aucune option configurée ! Éditez votre config.yml pour définir au moins l'une d'entre elles :"
+msgid "No option set! Edit your config.py to set at least one of these:"
+msgstr "Aucune option configurer ! Éditer votre config.py pour le mettre au moins a l'un d'eux :"
 
 #: ../fdroidserver/common.py
 msgid "No packages specified"
-msgstr "Aucun paquet spécifié"
+msgstr "Aucun packet spécifier"
 
 #: ../fdroidserver/install.py
 #, python-format
-msgid "No signed APK available for %s"
-msgstr "Aucun APK signé disponible pour %s"
+msgid "No signed apk available for %s"
+msgstr "Aucun apk signée dispognible pour %s"
 
 #: ../fdroidserver/install.py
 msgid "No signed output directory - nothing to do"
-msgstr "Aucun répertoire de sortie signé — il n'y a rien à faire"
+msgstr "Aucun dossier de sortie signée - rien n'est a faire"
 
-#: ../fdroidserver/common.py
+#: ../fdroidserver/update.py ../fdroidserver/common.py
 #, python-brace-format
 msgid "No signing certificates found in {path}"
-msgstr "Aucun certificat signé trouvé dans {path}"
+msgstr "Aucun certificat signée trouvée dans {path}"
 
 #: ../fdroidserver/common.py
 #, python-format
 msgid "No such package: %s"
-msgstr "Ce paquet n'existe pas : %s"
+msgstr "Aucun packet comme sa : %s"
 
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "No such versionCode {versionCode} for app {appid}"
 msgstr "Aucun code de version {versionCode} pour l'application {appid}"
 
-#: ../fdroidserver/checkupdates.py
-msgid "No tags found"
-msgstr "Aucune étiquette trouvée"
-
-#: ../fdroidserver/publish.py ../fdroidserver/verify.py
+#: ../fdroidserver/verify.py ../fdroidserver/publish.py
 msgid "No unsigned directory - nothing to do"
-msgstr "Aucun dossier non signé — il n'y a rien à faire"
-
-#: ../fdroidserver/__main__.py
-msgid "No version information could be found."
-msgstr "Aucune information sur la version n’a été trouvée."
+msgstr "Aucun dossier signée - rien n'est a faire"
 
 #: ../fdroidserver/common.py
 msgid "Not a valid size definition: \"{}\""
@@ -1310,9 +1279,10 @@ msgid "Nothing to do for {appid}."
 msgstr "Rien à faire pour {appid}."
 
 #: ../fdroidserver/init.py
-msgid "Now set these in config.yml:"
-msgstr "Maintenant, définissez-les dans config.yml :"
+msgid "Now set these in config.py:"
+msgstr "Maintenant, définissez-les dans config.py :"
 
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "OBB file has newer versionCode({integer}) than any APK:"
@@ -1328,38 +1298,39 @@ msgstr "Le nom de paquet d'OBB ne correspond pas à un fichier APK pris en charg
 
 #: ../fdroidserver/deploy.py
 msgid "Offline machine, skipping git mirror generation until `fdroid deploy`"
-msgstr "Machine hors-ligne, la génération du miroir git est sautée jusqu'à `fdroid deploy`"
+msgstr ""
 
-#: ../fdroidserver/deploy.py
-msgid "One of the 'github_releases' config items is missing the 'packageNames' value. skipping ..."
-msgstr "L'un des éléments de configuration 'github_releases' ne contient pas la valeur 'packageNames'. ignoré..."
+#: ../fdroidserver/common.py
+#, python-brace-format
+msgid "Old APK signature failed to verify: {path}"
+msgstr "L'ancienne signature APK n'a pas pu être vérifiée : {path}"
 
-#: ../fdroidserver/deploy.py
-msgid "One of the 'github_releases' config items is missing the 'projectUrl' value. skipping ..."
-msgstr "L'un des éléments de configuration 'github_releases' ne contient pas la valeur 'projectUrl'. ignoré..."
+#: ../fdroid ../fdroidserver/__main__.py
+msgid "Old, deprecated name for fdroid deploy"
+msgstr "Ancien nom obsolète pour fdroid deploy"
 
-#: ../fdroidserver/deploy.py
-msgid "One of the 'github_releases' config items is missing the 'token' value. skipping ..."
-msgstr "L'un des éléments de configuration 'github_releases' ne contient pas la valeur 'token'. suivant ..."
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Only PNG and JPEG are supported for graphics, found: {path}"
 msgstr "Seuls les formats PNG et JPEG sont pris en charge pour les graphiques, trouvés : {path}"
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/common.py
-msgid "Only accepts a single key \"env\""
-msgstr "N'accepte qu'une seule clé \"env\""
+#: ../fdroidserver/checkupdates.py
+msgid "Only print differences with the Play Store"
+msgstr "Afficher uniquement les différences avec le Play Store"
 
 #: ../fdroidserver/checkupdates.py
 msgid "Only process apps with auto-updates"
 msgstr "Traiter uniquement les applications ayant des mises à jour automatiques"
 
 #: ../fdroidserver/lint.py
+#, fuzzy
 msgid "OpenCollective donation methods belong in the OpenCollective: field"
-msgstr "Les méthodes de donation OpenCollective vont dans le champ OpenCollective:"
+msgstr "La méthode de donnation Flattr reviens au flag FlatttrID"
+
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "Options"
+msgstr "Options"
 
 #: ../fdroidserver/verify.py
 msgid "Output JSON report to file named after APK."
@@ -1369,22 +1340,26 @@ msgstr "Générez un rapport JSON dans un fichier nommé d'après l'APK."
 msgid "Output JSON to stdout."
 msgstr "Sortie JSON vers stdout."
 
-#: ../fdroidserver/checkupdates.py ../fdroidserver/gpgsign.py
-#: ../fdroidserver/publish.py ../fdroidserver/signindex.py
-#: ../fdroidserver/update.py
+#: ../fdroidserver/gpgsign.py ../fdroidserver/publish.py
+#: ../fdroidserver/update.py ../fdroidserver/signindex.py
+#: ../fdroidserver/checkupdates.py
 msgid "Outputting JSON"
 msgstr "Sortie vers JSON"
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "Overall license of the project."
 msgstr "Licence globale du projet."
 
+#: ../fdroidserver/dscanner.py
+msgid "Override path for repo APKs (default: ./repo)"
+msgstr "Remplacer le chemin pour les fichiers APK de dépôt (par défaut : ./repo)"
+
 #: ../fdroidserver/index.py
 #, python-brace-format
 msgid "Overriding blank versionName in {apkfilename} from metadata: {version}"
 msgstr "Substitution du nom de version vide dans {apkfilename} des métadonnées : {version}"
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 #, python-brace-format
 msgid "Package \"{appid}\" already exists"
 msgstr "Le paquet \"{appid}\" existe déjà"
@@ -1398,10 +1373,13 @@ msgstr "Analyse du fichier manifeste sur « {path} »"
 msgid "Password required with username"
 msgstr "Mot de passe requis avec le nom d'utilisateur"
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "Path to main Android project subdirectory, if not in root."
 msgstr "Chemin d'accès au sous-répertoire principal du projet Android, si ce n'est pas dans le répertoire racine."
 
+msgid "Path to main android project subdirectory, if not in root."
+msgstr "Chemin d'accès au sous-répertoire principal du projet Android, si ce n'est pas dans le répertoire racine."
+
 #: ../fdroidserver/init.py
 msgid "Path to the Android SDK (sometimes set in ANDROID_HOME)"
 msgstr "Chemin vers le SDK Android (parfois défini dans ANDROID_HOME)"
@@ -1414,19 +1392,21 @@ msgstr "Chemin vers un dépôt git à utiliser comme journal"
 msgid "Path to the keystore for the repo signing key"
 msgstr "Chemin vers le keystore pour la clé de signature du dépôt"
 
+#: ../fdroidserver/dscanner.py
+msgid "Prepare Drozer to run a scan"
+msgstr "Préparer Drozer pour lancer une analyse"
+
+msgid "Prepare drozer to run a scan"
+msgstr "Préparer Drozer pour lancer un scanne"
+
 #: ../fdroidserver/nightly.py
 msgid "Print the secret variable to the terminal for easy copy/paste"
 msgstr "Afficher la variable secrète dans le terminal pour un copier/coller facilité"
 
-#: ../fdroidserver/install.py
+#: ../fdroidserver/metadata.py
 #, python-brace-format
-msgid "Privacy mode was enabled based on your locale ({country_code})."
-msgstr "Le mode de confidentialité a été activé, dû à votre localisation ({country_code})."
-
-#: ../fdroidserver/scanner.py
-#, python-format
-msgid "Problem with ZIP file: %s, error %s"
-msgstr "Problème avec le fichier ZIP : %s, erreur %s"
+msgid "Problem with description of {appid}: {error}"
+msgstr "Problème avec la description de {appid} : {error}"
 
 #: ../fdroidserver/common.py
 #, python-brace-format
@@ -1451,7 +1431,11 @@ msgstr "Traitement de {appid}"
 msgid "Produce human-readable XML/JSON for index files"
 msgstr "Produire des fichiers d'index XML ou JSON lisibles par un humain"
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/update.py
+msgid "Produce human-readable index.xml"
+msgstr "Produire un fichier index.xml lisible par un humain"
+
+#: ../fdroidserver/import.py
 msgid "Project URL to import from."
 msgstr "URL du projet à importer"
 
@@ -1463,25 +1447,21 @@ msgstr "La ponctuation doit être évitée"
 msgid "Push the log to this git remote repository"
 msgstr "Envoyer les logs dans ce dépôt git distant"
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Pushing binary transparency log to {url}"
 msgstr "Envoyer les logs de transparence de la compilation vers {url}"
 
-#: ../fdroidserver/deploy.py
-msgid "Pushing to remote server failed!"
-msgstr "L'envoie au serveur distant a échoué !"
-
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Pushing to {url}"
 msgstr "Envoyer vers {url}"
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Quickly start a new repository"
 msgstr "Démarrer un nouveau dépôt rapidement"
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Read all the metadata files and exit"
 msgstr "Lire toutes les métadonnées et quitter"
 
@@ -1492,12 +1472,14 @@ msgstr "Lecture de '{config_file}'"
 
 #: ../fdroidserver/common.py
 #, python-brace-format
-msgid "Reading packageName/versionCode/versionName failed, APK invalid: '{apkfilename}'"
-msgstr "La lecture de packageName/versionCode/versionName a échoué, APK invalide : '{apkfilename}'"
+msgid "Reading minSdkVersion failed: \"{apkfilename}\""
+msgstr "La lecture de minSdkVersion a échoué : \"{apkfilename}\""
 
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
+#. https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
 #: ../fdroidserver/common.py
 #, python-brace-format
-msgid "Reading packageName/versionCode/versionName failed,APK invalid: '{apkfilename}'"
+msgid "Reading packageName/versionCode/versionName failed, APK invalid: '{apkfilename}'"
 msgstr "La lecture de packageName/versionCode/versionName a échoué, APK invalide : '{apkfilename}'"
 
 #: ../fdroidserver/update.py
@@ -1505,36 +1487,25 @@ msgstr "La lecture de packageName/versionCode/versionName a échoué, APK invali
 msgid "Reading {apkfilename} from cache"
 msgstr "Lecture de {apkfilename} à partir du cache"
 
-#: ../fdroidserver/build.py
-msgid "Refresh and cache scanner rules and signatures from the network"
-msgstr "Actualisation et mise en cache des règles et signature à partir du réseau."
-
-#: ../fdroidserver/publish.py
-#, python-brace-format
-msgid "Refusing to sign '{path}', file exists in both {dir1} and {dir2} folder."
-msgstr "Signature de '{path}' refusée, le fichier existe à la fois dans les dossiers {dir1} et {dir2}."
-
-#: ../fdroidserver/verify.py
-msgid "Remove source tarball and any APKs if successfully verified."
-msgstr "Supprimer l'archive d'origine et les APKs si la vérification est effectuée avec succès."
+#: ../fdroidserver/stats.py
+msgid "Recalculate aggregate stats - use when changes have been made that would invalidate old cached data."
+msgstr "Recalculer les statistiques agrégées - à utiliser quand les modifications faites peuvent invalider les anciennes données en cache."
 
 #: ../fdroidserver/common.py
 msgid "Removing specified files"
 msgstr "Suppression des fichiers spécifiés"
 
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Removing {path}\""
-msgstr "Suppression de {path}\""
-
 #: ../fdroidserver/update.py
 msgid "Rename APK files that do not match package.name_123.apk"
 msgstr "Renomme les fichiers APK dont le nom ne ressemble pas à nom.paquet_123.apk"
 
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "RepoType {type} is deprecated, please switch to git."
-msgstr ""
+#: ../fdroidserver/update.py
+msgid "Report on build data status"
+msgstr "Rapport sur l'état des données de construction"
+
+#: ../fdroidserver/build.py
+msgid "Reset and create a brand new build server, even if the existing one appears to be ok."
+msgstr "Réinitialiser et créer un tout nouveau serveur de construction, même si le serveur existant semble correct."
 
 #: ../fdroidserver/nightly.py
 #, python-brace-format
@@ -1549,34 +1520,33 @@ msgstr "Redimensionner toutes les icônes excédant la taille maximale en pixels
 msgid "Restrict output to warnings and errors"
 msgstr "Limiter la sortie aux avertissements et aux erreurs"
 
-#: ../fdroidserver/net.py
-#, python-format
-msgid "Retrying failed download: %s"
-msgstr "Nouvel essai de téléchargement suite à échec : %s"
-
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Rewrite all the metadata files"
 msgstr "Réécrire toutes les métadonnées"
 
+#: ../fdroidserver/rewritemeta.py
+msgid "Rewrite to a specific format: "
+msgstr "Réécrire dans un format spécifique : "
+
 #: ../fdroidserver/rewritemeta.py
 #, python-brace-format
 msgid "Rewriting '{appid}'"
 msgstr "Réécriture de « {appid} »"
 
+#: ../fdroidserver/rewritemeta.py
+#, python-brace-format
+msgid "Rewriting '{appid}' to '{path}'"
+msgstr "Réécriture de '{appid}' dans '{path}'"
+
 #: ../fdroidserver/checkupdates.py
 msgid "Run on git repo that has uncommitted changes"
 msgstr "Exécuter sur le dépôt git qui a des modifications non validées"
 
-#: ../fdroidserver/nightly.py
-#, fuzzy, python-brace-format
-msgid "Run over {cibase} to find -debug.apk. and skip repo_basedir {repo_basedir}"
-msgstr "Lancer sur {cibase} pour trouver -debug.apk et passer repo_basedir {repo_basedir}"
-
 #: ../fdroidserver/lint.py
 msgid "Run rewritemeta to fix formatting"
 msgstr "Exécuter rewritemeta pour corriger le formatage"
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 msgid "Running first pass with MD5 checking disabled"
 msgstr "Exécution de la première passe avec la vérification MD5 désactivée"
 
@@ -1585,24 +1555,18 @@ msgstr "Exécution de la première passe avec la vérification MD5 désactivée"
 msgid "Running wget in {path}"
 msgstr "Exécution de wget dans {path}"
 
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "SHA-256 of {url} does not match entry!"
-msgstr "Le SHA-256 de {url} ne correspond pas à l'entrée !"
+#: ../fdroidserver/dscanner.py
+msgid "Scan only the latest version of each package"
+msgstr "Analyser seulement la dernière version de chaque paquet"
 
 #: ../fdroidserver/build.py
 msgid "Scan the resulting APK(s) for known non-free classes."
-msgstr "Analyse le(s) APK(s) généré(s) afin de trouver les classes connues comme non libres."
+msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Scan the source code of a package"
 msgstr "Scanner le code source d'un paquet"
 
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Scanner found {count} problems in {apk}"
-msgstr "Le scan a détecté {count} problèmes dans {apk}"
-
 #: ../fdroidserver/scanner.py
 #, python-brace-format
 msgid "Scanner found {count} problems in {appid}:"
@@ -1619,33 +1583,20 @@ msgid_plural "Scanner found {} problems"
 msgstr[0] "Le scanneur a trouvé {} problème"
 msgstr[1] "Le scanneur a trouvé {} problèmes"
 
-#: ../fdroidserver/scanner.py
-msgid "Scanning APK for extra signing blocks."
-msgstr "Analyse de l'APK à la recherche de signature de blocs supplémentaires."
-
-#: ../fdroidserver/scanner.py
-msgid "Scanning APK with dexdump for known non-free classes."
-msgstr "Analyse de l’APK avec dexdump pour les classes non libres connues."
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Set NDK {release} ({version}) up"
-msgstr "Installer NDK {release} ({version})"
-
 #: ../fdroidserver/common.py
 msgid "Set clock to that time using:"
 msgstr "Réglez l'horloge à cette heure à l'aide de :"
 
 #: ../fdroidserver/nightly.py
 msgid "Set maximum releases in repo before older ones are archived"
-msgstr "Régler le maximum de versions dans le dépôt avant que les plus anciennes soient archivées"
+msgstr ""
 
 #: ../fdroidserver/build.py
 #, python-brace-format
 msgid "Set open file limit to {integer}"
 msgstr "Définition de la limite de fichiers ouverts à {integer}"
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Set up an app build for a nightly build repo"
 msgstr "Programmer une compilation de l'application pour le dépôt des versions de test"
 
@@ -1656,30 +1607,33 @@ msgstr "Définir la limite d'échec du nombre de fichiers ouvert : "
 #: ../fdroidserver/build.py
 #, python-brace-format
 msgid "Setting {0} sec timeout for this build"
-msgstr "Définir une timeout de {0} secondes pour cette construction"
+msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroidserver/build.py
+#, fuzzy
+msgid "Setup an emulator, install the APK on it and perform a Drozer scan"
+msgstr "Installez un émulateur, installez l'APK dessus et effectuez un scan Drozer"
+
+msgid "Setup an emulator, install the apk on it and perform a drozer scan"
+msgstr ""
+
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Sign and place packages in the repo"
 msgstr "Signer et déplacer les paquets dans le dépôt"
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Sign indexes created using update --nosign"
 msgstr "Signer les indexes créés avec update --nosign"
 
 #: ../fdroidserver/build.py
 msgid "Skip scanning the source code for binaries and other problems"
-msgstr "Sauter le scan du code source pour des fichiers binaires et d'autres problèmes"
+msgstr ""
 
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Skipping '{apkfilename}' with invalid signature!"
 msgstr "Omission de '{apkfilename}' qui a une signature non valide !"
 
-#: ../fdroidserver/deploy.py ../fdroidserver/index.py
-#, python-format
-msgid "Skipping GitLab Pages mirror because the repo is too large (>%.2fGB)!"
-msgstr "Ignorer le miroir GitLab Pages car le dépôt est trop volumineux (>%.2fGB) !"
-
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Skipping index generation for {appid}"
@@ -1695,63 +1649,65 @@ msgstr "Omission de {apkfilename} qui a une signature non valide !"
 msgid "Skipping {appid}: disabled"
 msgstr "Omission de {appid} : désactivé"
 
-#: ../fdroidserver/deploy.py
-msgid "Specify a local folder to sync the repo to"
-msgstr "Spécifier un dossier local à synchroniser avec le dépôt"
+#: ../fdroidserver/scanner.py
+#, python-brace-format
+msgid "Skipping {appid}: no builds specified"
+msgstr ""
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
+msgid "Specify a local folder to sync the repo to"
+msgstr ""
+
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 msgid "Specify an identity file to provide to SSH for rsyncing"
-msgstr "Spécifier un fichier d'identité à fournir à SSH pour utiliser rsync"
+msgstr ""
+
+#: ../fdroidserver/build.py
+msgid "Specify that we're running on the build server"
+msgstr ""
 
 #: ../fdroidserver/nightly.py
 msgid "Specify which debug keystore file to use."
-msgstr "Spécifier le fichier de magasin de clés de débogage à utiliser."
+msgstr ""
 
 #: ../fdroidserver/common.py
 msgid "Spew out even more information than normal"
-msgstr "Fournir encore plus d'information que d'habitude"
+msgstr ""
 
 #: ../fdroidserver/nightly.py
 #, python-brace-format
+msgid "Striping mystery signature from {apkfilename}"
+msgstr ""
+
+#: ../fdroidserver/nightly.py
+#, fuzzy, python-brace-format
 msgid "Stripping mystery signature from {apkfilename}"
-msgstr "Ignorer la signature mystère de {apkfilename}"
+msgstr "Ignorer les données de cache périmées pour {apkfilename}"
 
 #: ../fdroidserver/lint.py
 #, python-format
 msgid "Summary '%s' is just the app's name"
-msgstr "Le résumé '%s' est juste le nom de l'application"
+msgstr ""
 
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "Summary of length {length} is over the {limit} char limit"
-msgstr "Le résumé de taille {length} est au-dessus de la limite de {limit} caractères"
+msgstr ""
 
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "System clock is older than date in {path}!"
-msgstr "L'horloge système est plus âgée que la date dans {path} !"
-
-#: ../fdroidserver/checkupdates.py
-msgid "Tags update mode only works for git, hg, bzr and git-svn repositories currently"
-msgstr "Le mode de mise à jour par étiquettes fonctionne seulement pour les dépôts git, hg, bzr et git-svn pour le moment"
-
-#: ../fdroidserver/checkupdates.py
-msgid "Tags update mode used in git-svn, but the repo was not set up with tags"
-msgstr "Le mode de mise à jour par étiquettes est utilisé dans git-svn, mais le dépôt n'était pas paramétré avec des étiquettes"
+msgstr ""
 
 #: ../fdroidserver/build.py
 msgid "Test mode - put output in the tmp directory only, and always build, even if the output already exists."
-msgstr "Mode test — mettre la sortie dans le dossier tmp uniquement et toujours compiler, même si la sortie existe déjà."
-
-#: ../fdroidserver/index.py
-msgid "The \"qrcode\" Python package is not installed (e.g. apt-get install python3-qrcode)!"
-msgstr "Le paquet Python \"qrcode\" n'est pas installé (p. ex. apt-get install python3-qrcode) !"
+msgstr ""
 
 #. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "The OBB version code must come after \"{name}.\":"
-msgstr "Le code de version OBB doit venir après \"{name}. :"
+msgstr ""
 
 #: ../fdroidserver/btlog.py
 msgid "The base URL for the repo to log (default: https://f-droid.org)"
@@ -1759,220 +1715,258 @@ msgstr "URL de base du dépôt à journaliser (par défaut : https://f-droid.org
 
 #: ../fdroidserver/mirror.py
 msgid "The directory to write the mirror to"
-msgstr "Le répertoire dans lequel écrire le miroir"
+msgstr ""
 
 #: ../fdroidserver/nightly.py
 msgid "The file to be included in the repo (path or glob)"
-msgstr "Le fichier à inclure dans le dépôt (chemin ou glob)"
+msgstr ""
+
+#: ../fdroidserver/deploy.py
+msgid "The only commands currently supported are 'init' and 'update'"
+msgstr "Les seules commandes disponibles actuellement sont 'init' et 'update'"
 
 #: ../fdroidserver/index.py
 msgid "The repository's fingerprint does not match."
-msgstr "L'empreinte du dépôt ne correspond pas."
+msgstr ""
+
+#: ../fdroidserver/common.py
+msgid "The repository's index could not be verified."
+msgstr ""
 
 #: ../fdroidserver/deploy.py
 #, python-brace-format
 msgid "The root dir for local_copy_dir \"{path}\" does not exist!"
-msgstr "Le dossier racine pour local_copy_dir \"{path}\" n'existe pas !"
+msgstr ""
 
 #: ../fdroidserver/publish.py
 msgid "There is a keyalias collision - publishing halted"
-msgstr "Il y a une collision de keyalias — publication interrompue"
+msgstr ""
 
 #: ../fdroidserver/common.py
 msgid "These are the apps that have been archived from the main repo."
-msgstr "Voici les applications qui ont été archivées à partir du dépôt principal."
+msgstr ""
 
-#: ../fdroidserver/mirror.py
-msgid "This command should never be used to mirror f-droid.org! A full copy requires more than 600GB."
-msgstr "Cette commande ne devrait jamais être utilisée pour copier f-droid.org ! Une copie occupe plus de 600GB."
-
-#: ../fdroidserver/common.py
-msgid "This is a repository of apps to be used with F-Droid. Applications in this repository are either official binaries built by the original application developers, or are binaries built from source by the admin of f-droid.org using the tools on https://gitlab.com/fdroid."
-msgstr "Ceci est un dépôt d’applications à utiliser avec FDroid. Les applications publiées dans ce dépôt sont soit les binaires officiels compilés par les développeurs de ces applications, soit celles compilées par f-droid.org à partir des sources en utilisant les outils disponibles sur https://gitlab.com/fdroid."
-
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 #, python-format
 msgid "This repo already has local metadata: %s"
-msgstr "Ce dépôt a déjà des méta-données locales : %s"
-
-#: ../fdroidserver/init.py
-#, python-format
-msgid ""
-"To complete the setup, add your APKs to \"%s\"\n"
-"then run \"fdroid update -c; fdroid update\".  You might also want to edit\n"
-"\"config.yml\" to set the URL, repo name, and more.  You should also set up\n"
-"a signing key (a temporary one might have been automatically generated).\n"
-"\n"
-"For more info: https://f-droid.org/docs/Setup_an_F-Droid_App_Repo\n"
-"and https://f-droid.org/docs/Signing_Process"
 msgstr ""
-"Pour terminer la configuration, ajoutez vos APK dans « %s ».\n"
-"Ensuite lancez « fdroid update -c ; fdroid update ».\n"
-"Pensez à modifier le fichier « config.yml »\n"
-"pour indiquer l'URL, le nom du dépôt et d'autres éléments.\n"
-"Vous devriez aussi paramétrer une clé de signature\n"
-"(une clé temporaire peut avoir été générée automatiquement).\n"
-"\n"
-"Plus d'informations sur : https://f-droid.org/fr/docs/Setup_an_F-Droid_App_Repo\n"
-"et https://f-droid.org/fr/docs/Signing_Process."
 
-#: ../fdroidserver/deploy.py
-msgid "To use awsbucket, awssecretkey and awsaccesskeyid must also be set in config.yml!"
-msgstr "Pour utiliser awsbucket, awssecretkey et awsaccesskeyid doivent aussi être configurées dans config.yml !"
-
-#: ../fdroidserver/deploy.py
-msgid "To use rclone, rclone_config and awsbucket must be set in config.yml!"
-msgstr "Pour utiliser rclone, rclone_config et awsbucket doivent être configurés dans config.yml."
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
+msgid "To use awsbucket, awssecretkey and awsaccesskeyid must also be set in config.py!"
+msgstr ""
 
 #: ../fdroidserver/lint.py
 msgid "URL must start with https:// or http://"
-msgstr "L'URL doit commencer par https:// ou http://"
+msgstr ""
 
 #: ../fdroidserver/lint.py
 msgid "URL shorteners should not be used"
-msgstr "Les raccourcisseurs d'URL ne doivent pas être utilisés"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+msgid "URL title is just the URL, use brackets: [URL]"
+msgstr ""
 
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "URL {url} in Description: {error}"
-msgstr "URL {url} en Description : {error}"
+msgstr ""
 
 #: ../fdroidserver/lint.py
+#, fuzzy
 msgid "Unexpected license tag \"{}\"! Only use FSF or OSI approved tags from https://spdx.org/license-list"
-msgstr "Balise de licence non valide \"{}\" ! Utilisez uniquement des balises approuvées par la FSF ou l'OSI de https://spdx.org/license-list"
+msgstr "Balise de licence non valide \"%s\" ! Utilisez uniquement des balises de https ://spdx.org/license-list"
 
 #: ../fdroidserver/lint.py
 msgid "Unexpected license tag \"{}\"! Only use license tags configured in your config file"
-msgstr "Balise de licence non valide \"{}\" ! Utilisez uniquement des balises de licence configurées dans votre fichier de configuration"
+msgstr ""
 
-#: ../fdroidserver/common.py
+#: ../fdroidserver/metadata.py
 #, python-brace-format
-msgid "Unknown entry {key} in {configname}"
-msgstr "Entrée {key} inconnue dans {configname}"
+msgid "Unexpected text on same line as {field} in {linedesc}"
+msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Unknown exception found!"
 msgstr "Exception inconnue détectée !"
 
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "Unknown file '{filename}' in build '{versionName}'"
-msgstr "Fichier '{filename}' inconnu dans la construction '{versionName}'"
+msgstr ""
 
 #: ../fdroidserver/metadata.py
 #, python-format
 msgid "Unknown metadata format: %s"
-msgstr "Format de méta-données inconnu : %s"
+msgstr ""
 
 #: ../fdroidserver/metadata.py
 #, python-brace-format
+msgid "Unknown metadata format: {path}"
+msgstr "Format de métadonnée inconnu : {path}"
+
+#: ../fdroidserver/metadata.py
+#, fuzzy, python-brace-format
 msgid "Unknown metadata format: {path} (use: *.yml)"
-msgstr "Format de méta-données inconnu : {path} (utilisez : *.yml)"
+msgstr "Format de métadonnée inconnu : {path}"
 
 #: ../fdroidserver/common.py
 msgid "Unknown version of aapt, might cause problems: "
-msgstr "Version inconnue de aapt, peut causer des problèmes : "
+msgstr ""
+
+#: ../fdroidserver/lint.py
+msgid "Unlinkified link - use [http://foo.bar Link title] or [http://foo.bar]"
+msgstr ""
 
 #: ../fdroidserver/lint.py
 msgid "Unnecessary leading space"
-msgstr "Espace inutile au début"
+msgstr ""
 
 #: ../fdroidserver/lint.py
 msgid "Unnecessary trailing space"
-msgstr "Espace inutile à la fin"
+msgstr ""
 
 #: ../fdroidserver/metadata.py
 #, python-brace-format
 msgid "Unrecognised app field '{fieldname}' in '{path}'"
-msgstr "Champ application non reconnu '{fieldname}' dans '{path}'"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+msgid "Unrecognised app field: "
+msgstr ""
 
 #: ../fdroidserver/metadata.py
 #, python-brace-format
 msgid "Unrecognised build flag '{build_flag}' in '{path}'"
-msgstr "Option de compilation '{build_flag}' non reconnue dans '{path}'"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Unrecognised field '{field}' in {linedesc}"
+msgstr ""
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Unsupported file type \"{extension}\" for repo graphic"
-msgstr "Type de fichier non pris en charge \"{extension}\" pour graphique de dépôt"
+msgstr ""
 
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Unsupported graphics file found: {path}"
-msgstr "Fichier graphique non pris en charge trouvé : {path}"
+msgstr ""
+
+#: ../fdroidserver/rewritemeta.py
+#, python-brace-format
+msgid "Unsupported metadata format, use: --to [{supported}]"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+msgid "Unterminated ]"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+msgid "Unterminated ]]"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Unterminated build in {name}"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Unterminated continuation in {name}"
+msgstr ""
 
 #: ../fdroidserver/lint.py
 #, python-format
 msgid "Unused extlib at %s"
-msgstr "Extlib non utilisée à %s"
+msgstr ""
 
 #: ../fdroidserver/lint.py
 #, python-format
 msgid "Unused file at %s"
-msgstr "Fichier non utilisé à %s"
+msgstr ""
 
 #: ../fdroidserver/scanner.py
 #, python-format
 msgid "Unused scandelete path: %s"
-msgstr "Chemin scandelete inutilisé : %s"
+msgstr ""
 
 #: ../fdroidserver/scanner.py
 #, python-format
 msgid "Unused scanignore path: %s"
-msgstr "Chemin scanignore inutilisé : %s"
+msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Update repo information for new packages"
 msgstr "Mettre à jour les données des dépôts pour les nouveaux paquets"
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Update the binary transparency log for a URL"
 msgstr "Mettre à jour le rapport de transparence des fichiers binaires pour une URL"
 
+#: ../fdroid ../fdroidserver/__main__.py
+msgid "Update the stats of the repo"
+msgstr "Mettre à jour les statistiques du dépôt"
+
+#: ../fdroidserver/update.py ../fdroidserver/build.py
+msgid "Update the wiki"
+msgstr "Mettre à jour le wiki"
+
 #: ../fdroidserver/checkupdates.py
 #, python-brace-format
 msgid "UpdateCheckData has invalid URL: {url}"
-msgstr "UpdateCheckData a une URL invalide : {url}"
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "UpdateCheckData must match the version code as integer (\\d or [0-9]): {codeex}"
-msgstr "UpdateCheckData doit correspondre au code de la version en nombre entier (\\d ou [0-9]) : {codeex}"
+msgstr ""
 
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "UpdateCheckData must use HTTPS URL: {url}"
-msgstr "UpdateCheckData doit utiliser une URL HTTPS : {url}"
+msgstr ""
 
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "UpdateCheckData not a valid URL: {url}"
-msgstr "UpdateCheckData URL non valide : {url}"
+msgstr ""
 
 #: ../fdroidserver/lint.py
-msgid "UpdateCheckMode is set but it looks like checkupdates hasn't been run yet."
-msgstr "UpdateCheckMode est configuré mais on dirait que checkupdates n'a pas encore été lancé."
+msgid "UpdateCheckMode is set but it looks like checkupdates hasn't been run yet"
+msgstr ""
+
+#. Translators: https://developer.android.com/studio/build/application-id
+#: ../fdroidserver/lint.py
+msgid "UpdateCheckName is set to the known application ID - it can be removed"
+msgstr ""
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
 #: ../fdroidserver/lint.py
 msgid "UpdateCheckName is set to the known application ID, it can be removed"
-msgstr "UpdateCheckName est défini sur l’ID d’application connu, il peut être supprimé"
+msgstr ""
 
 #: ../fdroidserver/deploy.py
 #, python-brace-format
 msgid "Uploading {apkfilename} to androidobservatory.org"
-msgstr "Téléversement de {apkfilename} vers androidobservatory.org"
+msgstr ""
 
 #: ../fdroidserver/deploy.py
-#, python-brace-format
+#, fuzzy, python-brace-format
 msgid "Uploading {apkfilename} to virustotal"
-msgstr "Téléversement de {apkfilename} vers virustotal"
+msgstr "Lecture de {apkfilename} à partir du cache"
+
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "Usage"
+msgstr "Usage"
+
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, python-format
+msgid "Usage: %s\n"
+msgstr "Usage : %s\n"
 
 #: ../fdroidserver/lint.py
-msgid "Use /HEAD instead of /master or /main to point at a file in the default branch"
-msgstr "Utiliser /HEAD plutôt que /master pour pointer vers un fichier dans la branche par défaut"
+msgid "Use /HEAD instead of /master to point at a file in the default branch"
+msgstr "Utiliser /HEAD plutôt que /master pour pointer un fichier dans la branche par défaut"
 
 #: ../fdroidserver/update.py
 msgid "Use `fdroid update -c` to create it."
@@ -1986,61 +1980,50 @@ msgstr "Utiliser le serveur de build"
 msgid "Use date from APK instead of current time for newly added APKs"
 msgstr "Utiliser la date de l'APK plutôt que la date courante pour les APKs nouvellement ajoutés"
 
-#: ../fdroidserver/deploy.py
+msgid "Use date from apk instead of current time for newly added apks"
+msgstr "Utiliser la date de l'APK plutôt que la date courante pour les APKs nouvellement ajoutés"
+
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Using \"{path}\" for configuring s3cmd."
 msgstr "Utiliser \"{path}\" pour configurer s3cmd."
 
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Using \"{path}\" for syncing with remote storage."
-msgstr "Utiliser \"{path}\" pour synchroniser avec un stockage distant."
-
 #: ../fdroidserver/common.py
 msgid "Using APK Signature v2"
-msgstr "Utilisation de la signature d'APK v2"
+msgstr ""
 
 #: ../fdroidserver/common.py
 msgid "Using APK Signature v3"
-msgstr "Utilisation de la signature d'APK v3"
-
-#: ../fdroidserver/common.py
-msgid "Using JAR Signature"
-msgstr "Utilisation de la signature JAR"
+msgstr ""
 
 #: ../fdroidserver/common.py
 msgid "Using Java's jarsigner, not recommended for verifying APKs! Use apksigner"
 msgstr "L'utilisation de l'utilitaire jarsigner de Java n'est pas recommandé pour vérifier les APKs ! Utiliser apksigner"
 
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Using blank dictionary instead of contents of {path}!"
-msgstr "Utilisation d'un dictionnaire vide plutôt que du contenu de {path} !"
+#: ../fdroidserver/common.py
+#, fuzzy, python-brace-format
+msgid "Using androguard from \"{path}\""
+msgstr "Utilise le trousseau existant \"{path}\""
 
 #: ../fdroidserver/init.py
 #, python-brace-format
 msgid "Using existing keystore \"{path}\""
 msgstr "Utilise le trousseau existant \"{path}\""
 
-#: ../fdroidserver/deploy.py
-#, fuzzy, python-brace-format
-msgid "Using rclone to sync with: {url}"
-msgstr "Utiliser rclone pour synchroniser avec : {url}"
-
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Using s3cmd to sync with: {url}"
-msgstr "Utiliser s3cmd pour synchroniser avec : {url}"
+msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Valid commands are:"
 msgstr "Les commandes valides sont les suivantes :"
 
 #: ../fdroidserver/verify.py
 msgid "Verify against locally cached copy rather than redownloading."
-msgstr "Vérifier dans le cache plutôt que de télécharger à nouveau."
+msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Verify the integrity of downloaded packages"
 msgstr "Vérifier l'intégrité des paquets téléchargés"
 
@@ -2048,47 +2031,25 @@ msgstr "Vérifier l'intégrité des paquets téléchargés"
 msgid "Verifying index signature:"
 msgstr "Vérification de la signature d'index :"
 
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "Verifying package {path} with apksigner."
-msgstr "Vérification du paquet {path} avec apksigner."
-
 #: ../fdroidserver/deploy.py
 #, python-brace-format
 msgid "VirusTotal API key cannot upload files larger than 32MB, use {url} to upload {path}."
-msgstr "L’API de VirusTotal ne permet pas d’envoyer des fichiers plus grands que 32Mo, utilisez {url} pour envoyer {path}."
-
-#: ../fdroidserver/nightly.py
-msgid "WARNING: only public git repos are supported!"
 msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Warn about possible metadata errors"
 msgstr "Avertir de possibles erreurs dans les métadonnées"
 
-#: ../fdroidserver/scanner.py
-msgid "WebAssembly binary file"
-msgstr "Fichier binaire WebAssembly"
-
 #: ../fdroidserver/update.py
 msgid "When configured for signed indexes, create only unsigned indexes at this stage"
-msgstr "Lorsqu'il est configuré pour les index signés, ne créez que des index non signés à ce stade"
+msgstr ""
 
 #: ../fdroidserver/lint.py
 msgid "When linting the entire repository yamllint is disabled by default. This option forces yamllint regardless."
-msgstr "Lors du linting, tout le dépôt yamllint est désactivé par défaut. Cette option force yamllint malgré tout."
+msgstr ""
 
-#: ../fdroidserver/publish.py
-msgid "When signing or verifying fails, exit with an error code."
-msgstr "En cas d'échec de la signature ou de la vérification, fermer en indiquant un code d'erreur."
-
-#: ../fdroidserver/install.py
-msgid "Would you like to download and install F-Droid.apk via adb? (YES/no)"
-msgstr "Souhaitez-vous télécharger et installer F-Droid.apk via adb ? (OUI/non)"
-
-#: ../fdroidserver/install.py
-msgid "Would you like to download the app(s) from f-droid.org? (YES/no)"
-msgstr "Souhaitez-vous télécharger le(s) application(s) depuis f-droid.org ? (OUI/non)"
+msgid "X.509 'Distiguished Name' used when generating keys"
+msgstr "X.509 'Nom distingué' utilisé lors de la génération des clés"
 
 #: ../fdroidserver/init.py
 msgid "X.509 'Distinguished Name' used when generating keys"
@@ -2100,12 +2061,7 @@ msgstr "Vous pouvez utiliser ANDROID_HOME pour définir le chemin de votre SDK,
 
 #: ../fdroidserver/scanner.py
 msgid "ZIP file archive"
-msgstr "Archive ZIP"
-
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "adb reports {serial} is \"{status}\"!"
-msgstr "adb reporte que {serial} est \"{status}\" !"
+msgstr ""
 
 #: ../fdroidserver/nightly.py
 #, python-brace-format
@@ -2117,192 +2073,213 @@ msgstr "ajoute IdentityFile à {path}"
 msgid "adding to {name}: {path}"
 msgstr "ajoute à {name} : {path}"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "ambiguous option: %(option)s could match %(matches)s"
 msgstr "option ambiguë : %(option)s peut correspondre à %(matches)s"
 
-#: ../fdroidserver/common.py
-#, fuzzy, python-brace-format
-msgid "apksigner in build-tools;{version} passes APKs with invalid v3 signatures, ignoring."
-msgstr "apksigner dans build-tools;{version} accepte les APKs avec des signatures v3 invalides, ignoré"
-
-#: ../fdroidserver/common.py
-msgid "apksigner not found! Cannot sign or verify modern APKs"
-msgstr "apksigner introuvable ! Impossible de signer ou de vérifier les APK modernes"
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, python-format
+msgid "ambiguous option: %s (%s?)"
+msgstr "option ambiguë : %s (%s?)"
 
 #: ../fdroidserver/common.py
 msgid "apksigner not found, it's required for signing!"
-msgstr "apksigner est introuvable, il est requis pour la signature !"
+msgstr ""
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/checkupdates.py ../fdroidserver/lint.py
-#: ../fdroidserver/rewritemeta.py
+#: ../fdroidserver/lint.py ../fdroidserver/rewritemeta.py
+#: ../fdroidserver/checkupdates.py
+#, fuzzy
 msgid "application ID of file to operate on"
-msgstr "applicationId du fichier à traiter"
+msgstr "applicationId pour vérifier les mises à jour"
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/build.py ../fdroidserver/install.py
-#: ../fdroidserver/publish.py ../fdroidserver/scanner.py
-#: ../fdroidserver/verify.py
+#: ../fdroidserver/verify.py ../fdroidserver/publish.py
+#: ../fdroidserver/build.py ../fdroidserver/scanner.py
+#: ../fdroidserver/install.py
+#, fuzzy
 msgid "application ID with optional versionCode in the form APPID[:VERCODE]"
-msgstr "ID d'application avec le versionCode optionnel sous la forme APPID[:VERCODE]"
+msgstr "applicationId avec le versionCode optionnel sous la forme APPID[:VERCODE]"
 
-#: ../fdroidserver/common.py
-msgid "archive_url needs to end with /archive"
-msgstr "archive_url doit se terminer par /archive"
+#: ../fdroidserver/lint.py ../fdroidserver/rewritemeta.py
+msgid "applicationId in the form APPID"
+msgstr "applicationId sous la forme de APPID"
 
-#: /usr/lib/python3.11/argparse.py
+#: ../fdroidserver/checkupdates.py
+msgid "applicationId to check for updates"
+msgstr "applicationId pour vérifier les mises à jour"
+
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
+#: ../fdroidserver/verify.py ../fdroidserver/publish.py
+#: ../fdroidserver/dscanner.py ../fdroidserver/build.py
+#: ../fdroidserver/scanner.py ../fdroidserver/install.py
+msgid "applicationId with optional versionCode in the form APPID[:VERCODE]"
+msgstr "applicationId avec le versionCode optionnel sous la forme APPID[:VERCODE]"
+
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "argument \"-\" with mode %r"
 msgstr "argument \"-\" avec le mode %r"
 
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "argument %(argument_name)s: %(message)s"
-msgstr "argument %(argument_name)s : %(message)s"
+#: ../fdroidserver/nightly.py
+#, fuzzy
+msgid "attempting bare SSH connection to test deploy key:"
+msgstr "tentative de connexion ssh simple pour tester la clé de déploiement :"
 
 #: ../fdroidserver/nightly.py
-msgid "attempting bare SSH connection to test deploy key:"
-msgstr "tentative de connexion SSH simple pour tester la clé de déploiement :"
+msgid "attempting bare ssh connection to test deploy key:"
+msgstr "tentative de connexion ssh simple pour tester la clé de déploiement :"
 
 #: ../fdroidserver/common.py
 msgid "can not parse scrlib spec (not a string): '{}'"
-msgstr "impossible d'analyser la spécification de scrlib (not a string) : '{}'"
+msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
-msgid "can't open '%(filename)s': %(error)s"
-msgstr "impossible d'ouvrir « %(filename)s » : %(error)s"
-
-#: ../fdroidserver/scanner.py
-msgid "can't open non-https url: '{};"
-msgstr "impossible d'ouvrir les url sans https : '{};"
+msgid "can't open '%s': %s"
+msgstr "Impossible d'ouvrir %s : %s"
 
 #: ../fdroidserver/build.py
 #, python-brace-format
 msgid "cannot find required srclibs: \"{path}\""
 msgstr "Impossible de trouver srclibs : \"{path}\""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "cannot have multiple subparser arguments"
-msgstr "Impossible d'avoir plusieurs arguments du sous-parseur"
+msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "cannot merge actions - two groups are named %r"
-msgstr "impossible de fusionner les actions — deux groupes sont nommés %r"
+msgstr ""
 
 #: ../fdroidserver/nightly.py
 msgid "cannot publish update, did you set the deploy key?"
-msgstr "impossible de publier la mise à jour, avez-vous affecté la clé de déploiement ?"
+msgstr ""
 
 #: ../fdroidserver/nightly.py
 #, python-brace-format
 msgid "cloning {url}"
-msgstr "clonage de {url}"
+msgstr ""
+
+#: ../fdroidserver/deploy.py
+msgid "command to execute, either 'init' or 'update'"
+msgstr "Commande à exécuter : 'init' ou 'update'"
 
 #: ../fdroidserver/__main__.py
 msgid "commands from plugin modules:"
-msgstr "commandes des modules d'extension :"
+msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "complex"
+msgstr ""
+
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "conflicting option string: %s"
 msgid_plural "conflicting option strings: %s"
-msgstr[0] "option en conflit : %s"
-msgstr[1] "options en conflit : %s"
+msgstr[0] ""
+msgstr[1] ""
 
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "conflicting subparser alias: %s"
-msgstr "conflit de l'alias subparser : %s"
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "conflicting subparser: %s"
-msgstr "conflit de subparser : %s"
+#: ../fdroidserver/nightly.py
+#, python-brace-format
+msgid "copying {apkfilename} into {path}"
+msgstr ""
 
 #: ../fdroidserver/metadata.py
 #, python-brace-format
 msgid "could not parse '{path}'"
-msgstr "impossible de lire '{path}'"
-
-#: ../fdroidserver/common.py
-msgid "could not parse srclib spec (no name specified): '{}'"
-msgstr "impossible d'analyser la spécification srclib (pas de nom spécifié) : '{}'"
+msgstr ""
 
 #: ../fdroidserver/common.py
 msgid "could not parse srclib spec (no ref specified): '{}'"
-msgstr "impossible d'analyser la spécification srclib (pas de référence spécifiée) : '{}'"
+msgstr ""
+
+#: ../fdroidserver/common.py
+msgid "could not parse srclib spec (too many '@' signs): '{}'"
+msgstr ""
 
 #: ../fdroidserver/nightly.py
 #, python-brace-format
 msgid "created {path}"
-msgstr "{path} a été créé"
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "current version is newer: old vercode={old}, new vercode={new}"
-msgstr "la version actuelle est plus récente : ancien vercode={old}, nouveau vercode={new}"
+msgstr ""
 
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "deleting: repo/{apkfilename}"
-msgstr "suppression : repo/{apkfilename}"
+msgstr ""
 
-#: ../fdroidserver/scanner.py
-msgid "dependency file without lock"
-msgstr "ficher de dépendance sans verrouillage"
+#: ../fdroidserver/common.py
+#, python-brace-format
+msgid "deployed build logs to '{path}'"
+msgstr ""
 
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "deployed process log {path} to {dest}"
-msgstr "journal du processus déployé de {path} vers {dest}"
+msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "dest= is required for options like %r"
-msgstr "dest= est obligatoire pour les options comme %r"
-
-#: ../fdroidserver/scanner.py
-msgid "downloading '{}'"
-msgstr "téléchargement de '{}'"
-
-#: ../fdroidserver/scanner.py
-msgid "downloading scanner signatures from '{}' failed"
-msgstr "le téléchargement de l'analyse des signatures de '{}' a échoué"
+msgstr ""
 
 #: ../fdroidserver/scanner.py
 msgid "executable binary, possibly code"
-msgstr "binaire exécutable, possiblement du code"
+msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "expected %s argument"
 msgid_plural "expected %s arguments"
-msgstr[0] "%s argument attendu"
-msgstr[1] "%s arguments attendus"
+msgstr[0] ""
+msgstr[1] ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "expected at least one argument"
-msgstr "au moins un argument est attendu"
+msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "expected at most one argument"
-msgstr "un seul argument au plus est attendu"
+msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "expected one argument"
-msgstr "un seul argument est attendu"
+msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroidserver/common.py
+#, python-brace-format
+msgid "failed deploying build logs to '{path}'"
+msgstr ""
+
+#: ../fdroid
+msgid "fdroid [-h|--help|--version] <command> [<args>]"
+msgstr "fdroid [-h|--help|--version] <commande> [<args>]"
+
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "fdroid [<command>] [-h|--help|--version|<args>]"
 msgstr "fdroid [<commande>] [-h|--help|--version|<args>]"
 
-#: ../fdroidserver/scanner.py
-msgid "fetch the latest version of signatures from the web"
-msgstr "recupération de la dernière version des signatures depuis le web"
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "floating-point"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+msgid "force errors to be warnings, or ignore"
+msgstr "forcer les erreurs en avertissement, ou les ignorer"
 
 #: ../fdroidserver/metadata.py
 msgid "force metadata errors (default) to be warnings, or to be ignored."
@@ -2310,53 +2287,50 @@ msgstr "forcer les erreurs (par défaut) sur les métadonnées à être des aver
 
 #: ../fdroidserver/common.py
 msgid "git svn clone failed"
-msgstr "git svn clone a échoué"
+msgstr ""
 
 #: ../fdroidserver/scanner.py
 msgid "gzip file archive"
-msgstr "archive GZIP"
+msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "ignored explicit argument %r"
-msgstr "argument explicite %r ignoré"
+msgstr ""
 
 #: ../fdroidserver/index.py
 msgid "index-v1 must have a signature, use `fdroid signindex` to create it!"
-msgstr "index-v1 doit avoir une signature, utilisez `fdroid signindex` pour la créer !"
+msgstr ""
 
-#: ../fdroidserver/index.py
-msgid "index-v2 must have a signature, use `fdroid signindex` to create it!"
-msgstr "index-v2 doit avoir une signature, utilisez `fdroid signindex` pour la créer !"
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "integer"
+msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "invalid %(type)s value: %(value)r"
-msgstr "valeur %(type)s non valide : %(value)r"
+msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "invalid choice: %(value)r (choose from %(choices)s)"
-msgstr "choix non valide : %(value)r (choisissez parmi %(choices)s)"
+msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "invalid conflict_resolution value: %r"
-msgstr "valeur de conflict_resolution invalide : %r"
+msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "invalid option string %(option)r: must start with a character %(prefix_chars)r"
-msgstr "chaîne d’option non valide %(option)r : doit commencer par un caractère %(prefix_chars)r"
-
-#: ../fdroidserver/common.py
-msgid "ipfs_cid not found, skipping CIDv1 generation"
-msgstr "ipfs_cid introuvable, omission de la génération de CIDv1"
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "latest build recipe is newer: old vercode={old}, new vercode={new}"
-msgstr "la recette de la dernière version est plus récente : ancien vercode={old}, nouveau vercode={new}"
+msgstr ""
 
 #: ../fdroidserver/deploy.py
 #, python-brace-format
@@ -2365,176 +2339,219 @@ msgstr "local_copy_dir ne semble pas se terminer avec \"fdroid\", peut être vou
 
 #: ../fdroidserver/deploy.py
 msgid "local_copy_dir must be an absolute path!"
-msgstr "local_copy_dir doit être un chemin absolu !"
+msgstr "local_copy_dir doir être un chemin absolut !"
 
 #: ../fdroidserver/deploy.py
 msgid "local_copy_dir must be directory, not a file!"
-msgstr "local_copy_dir doit être un dossier et non un fichier !"
+msgstr "local_copy_dir doit être absolument un dossier, pas un fichier !"
 
 #: ../fdroidserver/index.py
 #, python-format
 msgid "mirror '%s' does not end with 'fdroid'!"
-msgstr "le miroir «%s» ne se termine pas par «fdroid» !"
+msgstr ""
 
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "mirrors set twice, in config.yml and {path}!"
-msgstr "miroir configuré deux fois, dans config.yml et {path} !"
-
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "mutually exclusive arguments must be optional"
-msgstr "les arguments qui s'excluent mutuellement doivent être optionnels"
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "next {name} cache update due in {time}"
-msgstr "prochaine mise à jour du cache de {name} attendu dans {time}"
+msgstr ""
 
 #: ../fdroidserver/mirror.py
 #, python-brace-format
 msgid "no \"icon\" in {appid}"
-msgstr "aucune \"icon\" dans {appid}"
+msgstr ""
 
 #: ../fdroidserver/signatures.py
 msgid "no APK supplied"
-msgstr "aucun APK n’est fourni"
+msgstr ""
 
-#: ../fdroidserver/checkupdates.py
-msgid "no version information found"
-msgstr "aucune information sur la version n’a été trouvée"
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, python-format
+msgid "no such option: %s"
+msgstr "option inexistante : %s"
 
-#: /usr/lib/python3.11/argparse.py
+#: ../fdroid ../fdroidserver/__main__.py
+msgid "no version info found!"
+msgstr "aucun information de version n'a été trouvée !"
+
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "not allowed with argument %s"
-msgstr "non permis avec les arguments %s"
+msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "one of the arguments %s is required"
-msgstr "un des arguments %s est requis"
+msgstr ""
 
-#: ../fdroidserver/common.py ../fdroidserver/index.py
+#: ../fdroidserver/index.py ../fdroidserver/common.py
 msgid "only accepts strings, lists, and tuples"
-msgstr "accepte uniquement les chaînes de caractères, listes et tuples"
+msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
-msgid "options"
-msgstr "options"
+#: ../fdroidserver/install.py
+#, python-format
+msgid "option %s: If you really want to install all the signed apps, use --all"
+msgstr ""
+
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, python-format
+msgid "option %s: invalid %s value: %r"
+msgstr ""
+
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, python-format
+msgid "option %s: invalid choice: %r (choose from %s)"
+msgstr ""
+
+#: /usr/lib/python3.5/getopt.py /usr/lib/python3.6/getopt.py
+#: /usr/lib/python3.7/getopt.py
+#, python-format
+msgid "option -%s not recognized"
+msgstr "La commande '%s 1' n'est pas reconnue"
+
+#: /usr/lib/python3.5/getopt.py /usr/lib/python3.6/getopt.py
+#: /usr/lib/python3.7/getopt.py
+#, python-format
+msgid "option -%s requires argument"
+msgstr "L'option -%s requiert un argument"
+
+#: /usr/lib/python3.5/getopt.py /usr/lib/python3.6/getopt.py
+#: /usr/lib/python3.7/getopt.py
+#, python-format
+msgid "option --%s must not have an argument"
+msgstr "L'option %s ne doit pas avoir d'argument"
+
+#: /usr/lib/python3.5/getopt.py /usr/lib/python3.6/getopt.py
+#: /usr/lib/python3.7/getopt.py
+#, python-format
+msgid "option --%s not a unique prefix"
+msgstr "option --%s n'est pas un préfixe unique"
+
+#: /usr/lib/python3.5/getopt.py /usr/lib/python3.6/getopt.py
+#: /usr/lib/python3.7/getopt.py
+#, python-format
+msgid "option --%s not recognized"
+msgstr "Option --%s non reconnue"
+
+#: /usr/lib/python3.5/getopt.py /usr/lib/python3.6/getopt.py
+#: /usr/lib/python3.7/getopt.py
+#, python-format
+msgid "option --%s requires argument"
+msgstr "L'option %s requiert un argument"
+
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
+msgid "optional arguments"
+msgstr "arguments optionnels"
 
 #: ../fdroidserver/nightly.py
 #, python-brace-format
 msgid "overwriting existing {path}"
-msgstr "écrasement de {path} en cours"
+msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "positional arguments"
 msgstr "arguments de position"
 
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "process log deploy {path} to {dest} failed!"
-msgstr "le déploiement du journal du processus {path} vers {dest} a echoué !"
-
-#: ../fdroidserver/build.py
-msgid "reference binary missing signature"
-msgstr "signature manquante du fichier binaire de référence"
+msgstr ""
 
 #: ../fdroidserver/signatures.py
 #, python-brace-format
 msgid "refuse downloading via insecure HTTP connection (use HTTPS or specify --no-https-check): {apkfilename}"
-msgstr "refuser le téléchargement via une connexion HTTP non sécurisée (utilisez HTTPS ou précisez --no-https-check) : {apkfilename}"
+msgstr ""
+
+#: ../fdroidserver/signatures.py
+#, python-brace-format
+msgid "refuse downloading via insecure http connection (use https or specify --no-https-check): {apkfilename}"
+msgstr ""
 
 #: ../fdroidserver/index.py
 #, python-format
-msgid "repo_icon \"repo/icons/%s\" does not exist, generating placeholder."
-msgstr "repo_icon \"repo/icons/%s\" n'existe pas, génération d'une icône de substitution."
+msgid "repo_icon %s does not exist, generating placeholder."
+msgstr ""
 
-#: ../fdroidserver/common.py
-msgid "repo_url needs to end with /repo"
-msgstr "repo_url doit se terminer par /repo"
+#: ../fdroidserver/metadata.py
+msgid "ruamel.yaml not installed, can not write metadata."
+msgstr ""
 
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "rsync is missing or broken: {error}"
-msgstr "rsync n'est pas présent ou ne fonctionne pas : {error}"
-
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "s3cmd sync indexes {path} to {url} and delete"
-msgstr "s3cmd synchroniser les index de {path} vers {url} et les supprimer"
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "s3cmd syncs indexes from {path} to {url} and deletes removed"
-msgstr "s3cmd synchronise les index de {path} vers {url} et supprime ceux enlevés"
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "scanner cache is malformed! You can clear it with: '{clear}'"
-msgstr "l'analyse du cache est mal formée ! Vous pouvez le nettoyer avec : '{clear}'"
-
-#: ../fdroidserver/deploy.py
-msgid "serverwebroot: path does not end with \"fdroid\", perhaps you meant one of these:"
-msgstr "serverwebroot : le chemin ne se termine pas par \"fdroid\", peut-être voulez-vous dire :"
+msgstr ""
 
 #: ../fdroidserver/scanner.py
 msgid "shared library"
-msgstr "bibliothèque partagée"
+msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "show program's version number and exit"
+msgstr "afficher le numéro de version du programme et quitter"
+
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.5/optparse.py
+#: /usr/lib/python3.6/argparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/argparse.py /usr/lib/python3.7/optparse.py
 msgid "show this help message and exit"
 msgstr "afficher ce message d'aide et quitter"
 
 #: ../fdroidserver/signatures.py
 msgid "signed APK, either a file-path or HTTPS URL."
-msgstr "APK signé, soit un chemin de fichier ou une URL HTTPS."
+msgstr ""
 
 #: ../fdroidserver/common.py
 msgid "skip deploying full build logs: log content is empty"
-msgstr "passer le déploiement des journaux de compilation complets : le contenu du journal est vide"
+msgstr ""
 
 #: ../fdroidserver/common.py
 msgid "skip deploying full build logs: not enabled in config"
-msgstr "passer le déploiement des journaux de compilation complets : non activé dans la configuration"
+msgstr ""
 
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "skipping source tarball: {path}"
-msgstr "omission de la tarball de sources : {path}"
+msgstr ""
 
 #: ../fdroidserver/lint.py
 msgid "srclibs missing name and/or @"
-msgstr "les srclibs manquent un nom ou un @"
+msgstr ""
 
 #: ../fdroidserver/scanner.py
 msgid "static library"
-msgstr "librairie statique"
+msgstr ""
 
-#: ../fdroidserver/build.py
+#: ../fdroidserver/common.py
 #, python-brace-format
-msgid "supplied reference binary has allowed signer {signer}"
-msgstr "le fichier binaire de référence fourni a autorisé le signataire {signer}"
+msgid "supplied timestamp value '{timestamp}' is not a unix timestamp"
+msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "the following arguments are required: %s"
 msgstr "les arguments suivants sont requis %s"
 
-#: ../fdroidserver/install.py
-msgid "true"
-msgstr "vrai"
-
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "unexpected option string: %s"
 msgstr "chaîne d'option inattendue : %s"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "unknown parser %(parser_name)r (choices: %(choices)s)"
-msgstr "parser inconnu %(parser_name)r (choix : %(choices)s)"
+msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "unrecognized arguments: %s"
 msgstr "arguments non reconnu : %s"
@@ -2544,184 +2561,152 @@ msgstr "arguments non reconnu : %s"
 msgid "unsafe permissions on '{config_file}' (should be 0600)!"
 msgstr "permissions dangereuses sur '{config_file}' (doit être 0600) !"
 
-#: ../fdroidserver/__main__.py /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py ../fdroid
+#: /usr/lib/python3.7/argparse.py ../fdroidserver/__main__.py
 msgid "usage: "
 msgstr "usage : "
 
-#: ../fdroidserver/deploy.py
+#: ../fdroid
+msgid "usage: fdroid [-h|--help|--version] <command> [<args>]"
+msgstr "utilisation : fdroid [-h|--help|--version] <commande> [<args>]"
+
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "using Apache libcloud to sync with {url}"
 msgstr "utilisation de Apache libcloud pour syncronizer avec {url}"
 
 #: ../fdroidserver/deploy.py
 msgid "virustotal.com is rate limiting, waiting to retry..."
-msgstr "virustotal.com limite le nombre de requêtes, en attente avant de réessayer..."
+msgstr ""
 
-#: ../fdroidserver/install.py
-msgid "yes"
-msgstr "oui"
+#: ../fdroidserver/update.py
+msgid "wiki support is deprecated and will be removed in the next release!"
+msgstr ""
 
 #: ../fdroidserver/publish.py
 #, python-brace-format
 msgid "{0} app, {1} key aliases"
 msgid_plural "{0} apps, {1} key aliases"
-msgstr[0] "{0} appli, {1} alias de clé"
-msgstr[1] "{0} applis, {1} alias de clé"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "{apkfilename} ({appid}) has no metadata!"
-msgstr "{apkfilename} ({appid}) ne contient pas de métadonnées !"
+msgstr ""
+
+#: ../fdroidserver/update.py
+#, python-brace-format
+msgid "{apkfilename} has multiple {name} files, looks like Master Key exploit!"
+msgstr ""
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "{apkfilename}'s AndroidManifest.xml has a bad date: "
-msgstr "Le fichier AndroidManifest.xml de {apkfilename} possède une date incorrecte : "
+msgstr ""
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "{appid} does not have a name! Using application ID instead."
-msgstr "{appid} n’a pas de nom ! Utilisation de l’ID d’application à la place."
+msgstr ""
+
+#: ../fdroidserver/update.py
+#, python-brace-format
+msgid "{appid} does not have a name! Using package name instead."
+msgstr ""
+
+#: ../fdroidserver/update.py
+#, python-brace-format
+msgid "{appid} from {path} is not a valid Android Package Name!"
+msgstr ""
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "{appid} from {path} is not a valid Android application ID!"
-msgstr "{appid} de {path} n’est pas un ID d’application Android valide !"
+msgstr ""
 
 #: ../fdroidserver/metadata.py ../fdroidserver/update.py
 #, python-brace-format
 msgid "{appid} from {path} is not a valid Java Package Name!"
-msgstr "{appid} de {path} n’est pas un nom de paquet Java valide !"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{appid} has both APKs and files: {files}"
-msgstr "{appid} possède à la fois des APK et des fichiers : {files}"
+msgstr ""
 
 #: ../fdroidserver/mirror.py
 #, python-brace-format
 msgid "{appid} is missing {name}"
-msgstr "{appid} n'a pas de {name}"
+msgstr ""
 
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "{appid}: Unknown extlib {path} in build '{versionName}'"
-msgstr "{appid} : Bibliothèque externe (extlib) {path} inconnue dans la version '{versionName}'"
+msgstr ""
 
 #: ../fdroidserver/scanner.py
 #, python-brace-format
 msgid "{appid}: no builds specified, running on current source state"
-msgstr "{appid} : pas de versions spécifiées, s'exécute à partir de l'état présent du code source"
+msgstr ""
 
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "{appid}: {field} must be a '{type}', but it is a '{fieldtype}!'"
-msgstr "{appid} : {field} doit être de '{type}', mais est un '{fieldtype} !'"
+msgstr ""
 
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "{appid}: {field} must be a '{type}', but it is a '{fieldtype}'!"
-msgstr "{appid} : {field} doit être un '{type}', mais est un '{fieldtype}' !"
+msgstr ""
 
 #: ../fdroidserver/metadata.py
 #, python-brace-format
 msgid "{build_flag} must be an integer, found: {value}"
-msgstr "{build_flag} doit être un entier, valeur trouvée : {value}"
+msgstr ""
 
 #: ../fdroidserver/metadata.py
 #, python-brace-format
-msgid "{build_flag} must be list or string, found: {value}"
-msgstr "{build_flag} doit être une liste ou une chaîne de caractères, valeur trouvée : {value}"
+msgid "{field} not terminated in {name}"
+msgstr ""
 
 #: ../fdroidserver/metadata.py
 #, python-brace-format
 msgid "{file} is blank or corrupt!"
-msgstr "{file} est vide ou corrompu !"
+msgstr ""
 
 #: ../fdroidserver/update.py
 #, python-brace-format
-msgid "{name} \"{section}/icons/{path}\" does not exist! Check \"config.yml\"."
-msgstr "{name} \"{section}/icons/{path}\" n'existe pas ! Vérifiez \"config.yml\"."
+msgid "{name} \"{path}\" does not exist! Correct it in config.py."
+msgstr ""
 
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{path1} is a duplicate of {path2}, remove one!"
-msgstr "{path1} est un doublon de {path2}, supprimez-en un !"
-
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 #, python-brace-format
 msgid "{path} already exists, ignoring import results!"
-msgstr "{path} existe déjà, ignorance des résultats de l'importation !"
+msgstr ""
 
 #: ../fdroidserver/nightly.py
 #, python-brace-format
 msgid "{path} does not exist!  Create it by running:"
-msgstr "{path} n’existe pas ! Créez-le en exécutant :"
+msgstr ""
 
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "{path} has bad file signature \"{pattern}\", possible Janus exploit!"
-msgstr "{path} a une mauvaise signature de fichier \"{pattern}\", possibilité d'une faille Janus !"
-
-#: ../fdroidserver/deploy.py
-#, fuzzy, python-brace-format
-msgid "{path} has been flagged by virustotal {count} times:"
-msgstr "{path} a été signalé par virustotal {count} fois :"
-
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "{path} has the wrong fingerprint ({fingerprint})!"
-msgstr "{path} a la mauvaise empreinte ({fingerprint}) !"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "{path} is not \"key: value\" dict, but a {datatype}!"
-msgstr "{path} n'est pas un dictionnaire \"key: value\" mais un {datatype}."
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "{path} is not a standard config file!"
-msgstr "{path} n'est pas un fichier de configuration standard !"
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "{path} is not list, but a {datatype}!"
-msgstr "{path} n'est pas une liste mais un {datatype}."
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "{path} is not {expected_type}, but a {datatype}!"
-msgstr "{path} n'est pas un {expected_type}, mais un {datatype} !"
+msgstr ""
 
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "{path} is zero size!"
-msgstr "{path} a une taille nulle !"
+msgstr ""
 
 #: ../fdroidserver/deploy.py
 #, python-brace-format
 msgid "{path} more than 200MB, manually upload: {url}"
 msgstr "{path} supérieur à 200MB, envoi manuel : {url}"
 
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "{path}: \"{code}\" is not a valid ISO_3166-1 alpha-2 country code!"
-msgstr "{path} : \"{code}\" n'est pas un code de pays ISO_3166-1 alpha-2 valide !"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{path}: {error}"
-msgstr "{path} : {error}"
-
 #: ../fdroidserver/mirror.py
 #, python-brace-format
 msgid "{url} does not end with \"fdroid\", check the URL path!"
 msgstr "{url} ne fini pas par \"fdroid\", vérifiez l'URL !"
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/common.py
 #, python-brace-format
 msgid "{url} does not start with \"http\"!"
 msgstr "{url} ne commence pas par \"http\" !"
@@ -2737,3 +2722,34 @@ msgid "{} build succeeded"
 msgid_plural "{} builds succeeded"
 msgstr[0] "{} compilation réussie"
 msgstr[1] "{} compilations réussies"
+
+#, fuzzy
+#~ msgid "Add PGP signatures for packages in repo using GnuPG"
+#~ msgstr "Ajouter des signatures GPG pour les paquets dans le dépôt"
+
+#~ msgid "Add gpg signatures for packages in repo"
+#~ msgstr "Ajouter des signatures GPG pour les paquets dans le dépôt"
+
+#~ msgid "Android Build Tools path '{path}' does not exist!"
+#~ msgstr "Le chemin '{path}' pour Android Build Tools n'existe pas !"
+
+#~ msgid "Cannot find a packageName for {path}!"
+#~ msgstr "Impossible de trouver un packageName pour {path} !"
+
+#~ msgid "Cannot find an appid for {path}!"
+#~ msgstr "Impossible de trouver un appid pour {path} !"
+
+#~ msgid "Clean update - don't uses caches, reprocess all apks"
+#~ msgstr "Mise à jour propre - n'utilise pas les caches, ré-exécute tous les APKs"
+
+#~ msgid "Interactively ask about things that need updating."
+#~ msgstr "Demander de manière interactive les choses nécessitant une mise à jour."
+
+#~ msgid "Specify editor to use in interactive mode. Default "
+#~ msgstr "Définir l'éditeur à utiliser en mode interactif. Par défaut "
+
+#~ msgid "Specify editor to use in interactive mode. Default %s"
+#~ msgstr "Définir l'éditeur à utiliser en mode interactif. Par défaut %s"
+
+#~ msgid "Specify editor to use in interactive mode. Default is {path}"
+#~ msgstr "Définir l'éditeur à utiliser en mode interactif. {path} est utilisé par défaut"
diff --git a/locale/fy/LC_MESSAGES/fdroidserver.po b/locale/fy/LC_MESSAGES/fdroidserver.po
deleted file mode 100644
index 1f751485..00000000
--- a/locale/fy/LC_MESSAGES/fdroidserver.po
+++ /dev/null
@@ -1,2683 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# This file is put in the public domain.
-# Vancha March <tjipkevdh@gmail.com>, 2021.
-msgid ""
-msgstr ""
-"Project-Id-Version: fdroidserver 2.0\n"
-"Report-Msgid-Bugs-To: https://gitlab.com/fdroid/fdroidserver/issues\n"
-"POT-Creation-Date: 2025-06-25 09:52+0200\n"
-"PO-Revision-Date: 2021-07-01 15:29+0000\n"
-"Last-Translator: Vancha March <tjipkevdh@gmail.com>\n"
-"Language-Team: Frisian <https://hosted.weblate.org/projects/f-droid/fdroidserver/fy/>\n"
-"Language: fy\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 4.8-dev\n"
-
-#: ../fdroidserver/nightly.py
-msgid ""
-"\n"
-"SSH public key to be used as deploy key:"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-#, python-brace-format
-msgid ""
-"\n"
-"{path} encoded for the DEBUG_KEYSTORE secret variable:"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-format
-msgid "\"%s/\" has no matching metadata file!"
-msgstr ""
-
-#: ../fdroidserver/index.py
-msgid "\"isPrimary\" key should not be added to mirrors!"
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "\"local_copy_dir\" {path} does not exist!"
-msgstr ""
-
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "\"{apkfilename}\" is already installed on {dev}."
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "\"{path}\" contains recent {name} ({version})"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "\"{path}\" exists but s3cmd is not installed!"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "\"{path}\" is not a supported file format (use: metadata/*.yml)"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "\"{path}\" is signed by a key that is not allowed:"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
-#, python-brace-format
-msgid "\"{url}\" is not a valid URL!"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "%(prog)s: error: %(message)s\n"
-msgstr "%(prog)s: flater: %(message)s\n"
-
-#: ../fdroidserver/publish.py
-#, python-format
-msgid "%d APKs failed to be signed or verified!"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-format
-msgid "%d problems found"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "%r is not callable"
-msgstr "%r is net opropber"
-
-#: ../fdroidserver/signindex.py
-#, python-format
-msgid "%s did not produce a dict!"
-msgstr ""
-
-#: ../fdroidserver/signindex.py
-#, python-format
-msgid "%s has bad SHA-256: %s"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-format
-msgid "%s is not an accepted build field"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "'keypass' not found in config.yml!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "'keystore' is NONE and 'smartcardoptions' is blank!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "'keystore' not found in config.yml!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "'keystorepass' not found in config.yml!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "'repo_keyalias' not found in config.yml!"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-msgid "'required' is an invalid argument for positionals"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "'sdk_path' not set in config.yml!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "'{aapt}' is too old, fdroid requires build-tools-{version} or newer!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "'{path}' failed to execute!"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "'{path}' has invalid format, it should be a dictionary!"
-msgstr ""
-
-#: ../fdroidserver/lint.py ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "'{value}' is not a valid {field} in {appid}. Regex pattern: {pattern}"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "'{value}' is not a valid {field}, should be {pattern}"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "--merge-request only runs on a single appid!"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "...checkupdate failed for {appid} : {error}"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-msgid ".__call__() not defined"
-msgstr ".__call__() net definiearre"
-
-#: ../fdroidserver/lint.py
-msgid "/issues is missing"
-msgstr ""
-
-#: ../fdroidserver/mirror.py
-msgid "A URL is required as an argument!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "APK signatures have different certificates in {path}:"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Add PGP signatures using GnuPG for packages in repo"
-msgstr ""
-
-#: ../fdroidserver/update.py
-msgid "Add a repo signing key to an unsigned repo"
-msgstr ""
-
-#: ../fdroidserver/update.py
-msgid "Add skeleton metadata files for APKs that are missing them"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Adding new repo for only {name}"
-msgstr ""
-
-#: ../fdroidserver/init.py
-msgid "Alias of the repo signing key in the keystore"
-msgstr ""
-
-#: ../fdroidserver/build.py
-msgid "AllowedAPKSigningKeys missing but reference binary supplied"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
-msgid "Allows a different revision (or git branch) to be specified for the initial import"
-msgstr ""
-
-#: ../fdroidserver/mirror.py
-msgid "Also mirror the full archive section"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Also warn about formatting issues, like rewritemeta -l"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "Android AAR library"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "Android APK file"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "Android DEX code"
-msgstr ""
-
-#: ../fdroidserver/init.py
-#, python-brace-format
-msgid "Android SDK not found at {path}!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Android SDK path '{path}' does not exist!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Android SDK path '{path}' is not a directory!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Android SDK tool {cmd} not found!"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "App has Binaries but does not have corresponding AllowedAPKSigningKeys to pin certificate."
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "App has NoSourceSince or ArchivePolicy \"0 versions\" or 0 but AutoUpdateMode or UpdateCheckMode are not None"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "App is in '{repo}' but has a link to {url}"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "App version has binary but does not have corresponding AllowedAPKSigningKeys to pin certificate."
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Appending .git is not necessary"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Archiving {apkfilename} with invalid signature!"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "AutoUpdateMode with UpdateCheckMode: HTTP must have a pattern."
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "Automatic no to all prompts."
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "Automatic yes to all prompts."
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "Bad entry type \"{mirrortype}\" in mirrors config: {mirror}"
-msgstr ""
-
-#: ../fdroidserver/mirror.py
-msgid "Base URL to mirror, can include the index signing key using the query string: ?fingerprint="
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Branch '{branch}' used as commit in build '{versionName}'"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Branch '{branch}' used as commit in srclib '{srclib}'"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Broken symlink: {path}"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Build a package from source"
-msgstr "In pakket fan út de boarne opbouwe"
-
-#: ../fdroidserver/build.py
-msgid "Build all applications available"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Build generated by `fdroid import` - remove disable line once ready"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "Build metadata git repo has uncommited changes!"
-msgstr ""
-
-#: ../fdroidserver/build.py
-msgid "Build only the latest version of each package"
-msgstr ""
-
-#: ../fdroidserver/init.py
-#, python-format
-msgid "Built repo based in \"%s\" with this config:"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "Can't auto-update app with no CurrentVersionCode"
-msgstr ""
-
-#: ../fdroidserver/build.py
-msgid "Can't build due to {} error while scanning"
-msgid_plural "Can't build due to {} errors while scanning"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Cannot read {path}: {error}"
-msgstr ""
-
-#: ../fdroidserver/rewritemeta.py
-#, python-brace-format
-msgid "Cannot rewrite \"{path}\""
-msgstr ""
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
-#: ../fdroidserver/lint.py
-#, python-format
-msgid "Categories '%s' is not valid"
-msgstr ""
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
-#: ../fdroidserver/lint.py
-msgid "Categories are not set"
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "Category \"{category}\" defined but not used for any apps!"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Check for updates to applications"
-msgstr "Kontrolearje op fernijingen fan applikaasjes"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Checking archiving for {appid} - apks:{integer}, keepversions:{keep}, archapks:{arch}"
-msgstr ""
-
-#: ../fdroidserver/update.py
-msgid "Clean update - don't uses caches, reprocess all APKs"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Color the log output"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
-msgid "Comma separated list of categories."
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-#, python-format
-msgid "Command '%s' not recognised.\n"
-msgstr "Kommando '%s' net werkend.\n"
-
-#: ../fdroidserver/checkupdates.py
-msgid "Commit changes"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "Commit changes, push, then make a merge request"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Conflicting \"{field}\" definitions between .yml and localized files:"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Conflicting arguments: '--verbose' and '--quiet' can not be specified at the same time."
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Could not find '{command}' on your system"
-msgstr ""
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/import_subcommand.py
-msgid "Could not find latest version code"
-msgstr ""
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
-#: ../fdroidserver/import_subcommand.py
-msgid "Could not find latest version name"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Could not find {path} to remove it"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Could not open APK {path} for analysis: "
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Could not parse size \"{size}\", wrong type \"{type}\""
-msgstr ""
-
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/import_subcommand.py
-msgid "Couldn't find Application ID"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "Couldn't find any version information"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "Couldn't find package ID"
-msgstr ""
-
-#: ../fdroidserver/update.py
-msgid "Cowardily refusing to overwrite existing signing key setup!"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Created new container \"{name}\""
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Creating \"{path}\" for configuring s3cmd."
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Creating empty {config_file}"
-msgstr ""
-
-#: ../fdroidserver/publish.py
-msgid "Creating log directory"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Creating new S3 bucket: {url}"
-msgstr ""
-
-#: ../fdroidserver/publish.py
-msgid "Creating output directory"
-msgstr ""
-
-#: ../fdroidserver/index.py
-msgid "Creating signed index with this key (SHA256):"
-msgstr ""
-
-#: ../fdroidserver/publish.py ../fdroidserver/verify.py
-msgid "Creating temporary directory"
-msgstr ""
-
-#: ../fdroidserver/index.py
-msgid "Creating unsigned index in preparation for signing"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "CurrentVersionCode {cv} is less than oldest build entry {versionCode}"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-msgid "DEBUG_KEYSTORE is not set or the value is incomplete"
-msgstr ""
-
-#: ../fdroidserver/update.py
-msgid "Delete APKs and/or OBBs without metadata from the repo"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Deleting archive, repo is too big ({size} max {limit})"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Deleting git-mirror history, repo is too big ({size} max {limit})"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Deleting unknown file: {path}"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-format
-msgid "Description '%s' is just the app's summary"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Description has a duplicate line"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Description of length {length} is over the {limit} char limit"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Did you mean config/{name}.yml?"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Did you mean {code}?"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
-msgid "Do not add 'disable:' to the generated build entries"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-msgid "Do not deploy the new files to the repo"
-msgstr ""
-
-#: ../fdroidserver/mirror.py
-#, python-brace-format
-msgid "Do not include \"{path}\" in URL!"
-msgstr ""
-
-#: ../fdroidserver/init.py
-msgid "Do not prompt for Android SDK path, just fail"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-msgid "Do not remove the private keys generated from the keystore"
-msgstr ""
-
-#: ../fdroidserver/build.py
-msgid "Don't create a source tarball, useful when testing a build"
-msgstr ""
-
-#: ../fdroidserver/build.py
-msgid "Don't refresh the repository, useful when testing a build with no internet connection"
-msgstr ""
-
-#: ../fdroidserver/deploy.py ../fdroidserver/nightly.py
-msgid "Don't use rsync checksums"
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "Download F-Droid.apk using mirrors that leak less to the network"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Download complete mirrors of small repos"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Downloading the repository already failed once, not trying again."
-msgstr ""
-
-#: ../fdroidserver/verify.py
-#, python-brace-format
-msgid "Downloading {url} failed. {error}"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Duplicate Anti-Feature declaration at {path} was ignored!"
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-format
-msgid "Duplicate entry \"%s\" in mirrors config!"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Duplicate link in '{field}': {url}"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-format
-msgid "ERROR: %(message)s"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "ERROR: The \"server\" subcommand has been removed, use \"deploy\"!"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-msgid "ERROR: unsupported CI type, patches welcome!"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-#, python-format
-msgid "ERROR: unsupported git host \"%s\", patches welcome!"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "ERROR: {key} in {path} is not \"archive\" or \"repo\"!"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "ERROR: {key} not a valid key!"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "ERROR: {key}'s value should be of type {t}!"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "ERROR: {key}:{subkey} in {path} is not in allowed keys: {allowed_keys}!"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-#, python-brace-format
-msgid "Encoding is set to '{enc}' fdroid might run into encoding issues. Please set it to 'UTF-8' for best results."
-msgstr ""
-
-#: ../fdroidserver/init.py
-#, python-format
-msgid ""
-"Enter the path to the Android SDK (%s) here:\n"
-"> "
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Environment variable {var} from {configname} is not set!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Environment variable {{env: {var}}} is not set!"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "Error deploying 'github_releases', {} not present. (You might need to run `fdroid update` first.)"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
-msgid "Error while getting repo address"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "Exit with a non-zero code if problems were found"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Extract application metadata from a source repository"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Extract signatures from APKs"
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "F-Droid.apk could not be downloaded from any known source!"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Failed copying {path}: {error}"
-msgstr ""
-
-#: ../fdroidserver/signatures.py
-#, python-brace-format
-msgid "Failed fetching signatures for '{apkfilename}': {error}"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Failed reading {path}: {error}"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Failed resizing {path}: {error}"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Failed to create S3 bucket: {url}"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Failed to get APK information, deleting {path}"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Failed to get APK information, skipping {path}"
-msgstr ""
-
-#: ../fdroidserver/update.py
-msgid "Failed to get APK signing key fingerprint"
-msgstr ""
-
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "Failed to install '{apkfilename}' on {dev}: {error}"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Failed to sign application"
-msgstr ""
-
-#: ../fdroidserver/build.py
-#, python-brace-format
-msgid "Fetched buildserverid from VM: {buildserverid}"
-msgstr ""
-
-#: ../fdroidserver/signatures.py
-#, python-brace-format
-msgid "Fetched signatures for '{apkfilename}' -> '{sigdir}'"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "File disappeared while processing it: {path}"
-msgstr ""
-
-#: ../fdroidserver/build.py ../fdroidserver/install.py
-#: ../fdroidserver/rewritemeta.py ../fdroidserver/scanner.py
-#: ../fdroidserver/update.py
-msgid "Finished"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Forbidden HTML tags"
-msgstr ""
-
-#: ../fdroidserver/build.py
-msgid "Force build of disabled apps, and carries on regardless of scan problems. Only allowed in test mode."
-msgstr ""
-
-#: ../fdroidserver/build.py
-#, python-brace-format
-msgid "Force halting build after {0} sec timeout!"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "Force scan of disabled apps and builds."
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Found \"{path}\" graphic without metadata for app \"{name}\"!"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Found bad funding file \"{path}\" for \"{name}\":"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Found invalid appids in arguments"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Found invalid versionCodes for some apps"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Found multiple JAR Signature Block Files in {path}"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Found multiple Signer Certificates!"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Found multiple metadata files for {appid}"
-msgstr ""
-
-#: ../fdroidserver/index.py
-msgid "Found multiple signing certificates for repository."
-msgstr ""
-
-#: ../fdroidserver/index.py
-msgid "Found no signing certificates for repository."
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-format
-msgid "Found non-file at %s"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Found {apkfilename} at {url}"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Found {count} problems in {filename}"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Found {count} warnings in {filename}"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Generated skeleton metadata for {appid}"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-format
-msgid "Git checkout of '%s' failed"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Git clean failed"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Git fetch failed"
-msgstr ""
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/common.py
-#, python-format
-msgid "Git remote set-head failed: \"%s\""
-msgstr ""
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/common.py
-msgid "Git reset failed"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Git submodule deinit failed"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Git submodule sync failed"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Git submodule update failed"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "HTTPS must be used with Subversion URLs!"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "If a git mirror gets to big, allow the archive to be deleted"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "If this upload fails, try manually uploading to {url}"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Ignoring '{field}' in '{metapath}' metadata because it is deprecated."
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-format
-msgid "Ignoring FUNDING.yml entry longer than 2048: %s"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-format
-msgid "Ignoring bad element in manifest: %s"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Ignoring deprecated {oldfile}, use {newfile}!"
-msgstr ""
-
-#: ../fdroidserver/index.py
-msgid "Ignoring package without metadata: "
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Ignoring stale cache data for {apkfilename}"
-msgstr ""
-
-#: ../fdroidserver/update.py
-msgid "Include APKs that are signed with disabled algorithms like MD5"
-msgstr ""
-
-#: ../fdroidserver/mirror.py
-msgid "Include the PGP signature .asc files in the mirror"
-msgstr ""
-
-#: ../fdroidserver/mirror.py
-msgid "Include the build logs in the mirror"
-msgstr ""
-
-#: ../fdroidserver/mirror.py
-msgid "Include the source tarballs in the mirror"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-format
-msgid "Including metadata from %s@%s"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Including metadata from {path}"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Initialising submodules"
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "Install all signed applications available"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Install built packages on devices"
-msgstr ""
-
-#: ../fdroidserver/install.py
-#, python-format
-msgid "Installing %s..."
-msgstr ""
-
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "Installing '{apkfilename}' on {dev}..."
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Interact with the repo HTTP server"
-msgstr ""
-
-#: ../fdroidserver/update.py
-msgid "Invalid APK"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "Invalid AutoUpdateMode: {mode}"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "Invalid UpdateCheckMode: {mode}"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "Invalid VercodeOperation: {field}"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Invalid VercodeOperation: {invalid_ops}"
-msgstr ""
-
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Invalid application ID {appid}"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Invalid bulleted list"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-format
-msgid "Invalid name for published file: %s"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Invalid ndk: entry in build: \"{ndk}\""
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Invalid redirect to non-HTTPS: {before} -> {after} "
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Invalid scrlib metadata: '{file}' does not exist"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Invalid srclib metadata: could not parse '{file}'"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Invalid srclib metadata: unknown key '{key}' in '{file}'"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "JAR signature failed to verify: {path}"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "JAR signature verified: {path}"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "Java JAR file"
-msgstr ""
-
-#: ../fdroidserver/mirror.py ../fdroidserver/publish.py
-#: ../fdroidserver/update.py
-msgid "Java JDK not found! Install in standard location or set java_paths!"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "Java compiled class"
-msgstr ""
-
-#: ../fdroidserver/signindex.py
-msgid "Java jarsigner not found! Install in standard location or set java_paths!"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Javascript in HTML src attributes"
-msgstr ""
-
-#: ../fdroidserver/build.py
-#, python-brace-format
-msgid "Keeping failed build \"{apkfilename}\""
-msgstr ""
-
-#: ../fdroidserver/init.py
-msgid "Keystore for signing key:\t"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Known debug key is used in AllowedAPKSigningKeys: "
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Last used commit '{commit}' looks like a tag, but UpdateCheckMode is '{ucm}'"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Liberapay donation methods belong in the Liberapay: field"
-msgstr ""
-
-#: ../fdroidserver/rewritemeta.py
-msgid "List files that would be reformatted (dry run)"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Locale included in f-droid.org URL"
-msgstr ""
-
-#: ../fdroidserver/build.py
-msgid "Make the build stop on exceptions"
-msgstr ""
-
-#: ../fdroidserver/index.py
-msgid "Malformed repository mirrors."
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "Malformed serverwebroot line:"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-format
-msgid "Max recursion depth in ZIP file reached: %s"
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "Mirror config for {url} contains \"isPrimary\" key!"
-msgstr ""
-
-#: ../fdroidserver/mirror.py
-msgid "Mirror the full repo and archive, all file types."
-msgstr ""
-
-#: ../fdroidserver/gpgsign.py
-msgid "Missing output directory"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-msgid "Moving Anti-Features declarations to localized files:"
-msgstr ""
-
-#: ../fdroidserver/index.py
-msgid "Neither \"repo_pubkey\" nor \"keystorepass\" set in config.yml"
-msgstr ""
-
-#: ../fdroidserver/verify.py
-#, python-format
-msgid "No APK for package: %s"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "No Android SDK found!"
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "No attached devices found"
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "No devices found for `adb install`! Please plug one in."
-msgstr ""
-
-#: ../fdroidserver/index.py
-msgid "No fingerprint in URL."
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "No git submodules available"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
-msgid "No gradle project could be found. Specify --subdir?"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
-msgid "No information found."
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "No matching tags found"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "No minimum SDK version found in {0}, using default (3)."
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "No need to specify that the app is Free Software"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "No need to specify that the app is for Android"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "No option set! Edit your config.yml to set at least one of these:"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "No packages specified"
-msgstr ""
-
-#: ../fdroidserver/install.py
-#, python-format
-msgid "No signed APK available for %s"
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "No signed output directory - nothing to do"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "No signing certificates found in {path}"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-format
-msgid "No such package: %s"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "No such versionCode {versionCode} for app {appid}"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "No tags found"
-msgstr ""
-
-#: ../fdroidserver/publish.py ../fdroidserver/verify.py
-msgid "No unsigned directory - nothing to do"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "No version information could be found."
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Not a valid size definition: \"{}\""
-msgstr ""
-
-#: ../fdroidserver/signindex.py
-msgid "Nothing to do"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "Nothing to do for {appid}."
-msgstr ""
-
-#: ../fdroidserver/init.py
-msgid "Now set these in config.yml:"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "OBB file has newer versionCode({integer}) than any APK:"
-msgstr ""
-
-#: ../fdroidserver/update.py
-msgid "OBB filename must start with \"main.\" or \"patch.\":"
-msgstr ""
-
-#: ../fdroidserver/update.py
-msgid "OBB's packagename does not match a supported APK:"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "Offline machine, skipping git mirror generation until `fdroid deploy`"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "One of the 'github_releases' config items is missing the 'packageNames' value. skipping ..."
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "One of the 'github_releases' config items is missing the 'projectUrl' value. skipping ..."
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "One of the 'github_releases' config items is missing the 'token' value. skipping ..."
-msgstr ""
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Only PNG and JPEG are supported for graphics, found: {path}"
-msgstr ""
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/common.py
-msgid "Only accepts a single key \"env\""
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "Only process apps with auto-updates"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "OpenCollective donation methods belong in the OpenCollective: field"
-msgstr ""
-
-#: ../fdroidserver/verify.py
-msgid "Output JSON report to file named after APK."
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "Output JSON to stdout."
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py ../fdroidserver/gpgsign.py
-#: ../fdroidserver/publish.py ../fdroidserver/signindex.py
-#: ../fdroidserver/update.py
-msgid "Outputting JSON"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
-msgid "Overall license of the project."
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "Overriding blank versionName in {apkfilename} from metadata: {version}"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
-#, python-brace-format
-msgid "Package \"{appid}\" already exists"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Parsing manifest at '{path}'"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Password required with username"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
-msgid "Path to main Android project subdirectory, if not in root."
-msgstr ""
-
-#: ../fdroidserver/init.py
-msgid "Path to the Android SDK (sometimes set in ANDROID_HOME)"
-msgstr ""
-
-#: ../fdroidserver/btlog.py
-msgid "Path to the git repo to use as the log"
-msgstr ""
-
-#: ../fdroidserver/init.py
-msgid "Path to the keystore for the repo signing key"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-msgid "Print the secret variable to the terminal for easy copy/paste"
-msgstr ""
-
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "Privacy mode was enabled based on your locale ({country_code})."
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-format
-msgid "Problem with ZIP file: %s, error %s"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Problem with xml at '{path}'"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "Process auto-updates"
-msgstr ""
-
-#: ../fdroidserver/publish.py ../fdroidserver/update.py
-#, python-brace-format
-msgid "Processing {apkfilename}"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Processing {appid}"
-msgstr ""
-
-#: ../fdroidserver/update.py
-msgid "Produce human-readable XML/JSON for index files"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
-msgid "Project URL to import from."
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Punctuation should be avoided"
-msgstr ""
-
-#: ../fdroidserver/btlog.py
-msgid "Push the log to this git remote repository"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Pushing binary transparency log to {url}"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "Pushing to remote server failed!"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Pushing to {url}"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Quickly start a new repository"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Read all the metadata files and exit"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Reading '{config_file}'"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Reading packageName/versionCode/versionName failed, APK invalid: '{apkfilename}'"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Reading packageName/versionCode/versionName failed,APK invalid: '{apkfilename}'"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Reading {apkfilename} from cache"
-msgstr ""
-
-#: ../fdroidserver/build.py
-msgid "Refresh and cache scanner rules and signatures from the network"
-msgstr ""
-
-#: ../fdroidserver/publish.py
-#, python-brace-format
-msgid "Refusing to sign '{path}', file exists in both {dir1} and {dir2} folder."
-msgstr ""
-
-#: ../fdroidserver/verify.py
-msgid "Remove source tarball and any APKs if successfully verified."
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Removing specified files"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Removing {path}\""
-msgstr ""
-
-#: ../fdroidserver/update.py
-msgid "Rename APK files that do not match package.name_123.apk"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "RepoType {type} is deprecated, please switch to git."
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-#, python-brace-format
-msgid "Resigning {apkfilename} with provided debug.keystore"
-msgstr ""
-
-#: ../fdroidserver/update.py
-msgid "Resize all the icons exceeding the max pixel size and exit"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Restrict output to warnings and errors"
-msgstr ""
-
-#: ../fdroidserver/net.py
-#, python-format
-msgid "Retrying failed download: %s"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Rewrite all the metadata files"
-msgstr ""
-
-#: ../fdroidserver/rewritemeta.py
-#, python-brace-format
-msgid "Rewriting '{appid}'"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "Run on git repo that has uncommitted changes"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-#, python-brace-format
-msgid "Run over {cibase} to find -debug.apk. and skip repo_basedir {repo_basedir}"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Run rewritemeta to fix formatting"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "Running first pass with MD5 checking disabled"
-msgstr ""
-
-#: ../fdroidserver/mirror.py
-#, python-brace-format
-msgid "Running wget in {path}"
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "SHA-256 of {url} does not match entry!"
-msgstr ""
-
-#: ../fdroidserver/build.py
-msgid "Scan the resulting APK(s) for known non-free classes."
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Scan the source code of a package"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Scanner found {count} problems in {apk}"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Scanner found {count} problems in {appid}:"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Scanner found {count} problems in {appid}:{versionCode}:"
-msgstr ""
-
-#: ../fdroidserver/build.py
-msgid "Scanner found {} problem"
-msgid_plural "Scanner found {} problems"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../fdroidserver/scanner.py
-msgid "Scanning APK for extra signing blocks."
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "Scanning APK with dexdump for known non-free classes."
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Set NDK {release} ({version}) up"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Set clock to that time using:"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-msgid "Set maximum releases in repo before older ones are archived"
-msgstr ""
-
-#: ../fdroidserver/build.py
-#, python-brace-format
-msgid "Set open file limit to {integer}"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Set up an app build for a nightly build repo"
-msgstr ""
-
-#: ../fdroidserver/build.py
-msgid "Setting open file limit failed: "
-msgstr ""
-
-#: ../fdroidserver/build.py
-#, python-brace-format
-msgid "Setting {0} sec timeout for this build"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Sign and place packages in the repo"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Sign indexes created using update --nosign"
-msgstr ""
-
-#: ../fdroidserver/build.py
-msgid "Skip scanning the source code for binaries and other problems"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Skipping '{apkfilename}' with invalid signature!"
-msgstr ""
-
-#: ../fdroidserver/deploy.py ../fdroidserver/index.py
-#, python-format
-msgid "Skipping GitLab Pages mirror because the repo is too large (>%.2fGB)!"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Skipping index generation for {appid}"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Skipping {apkfilename} with invalid signature!"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Skipping {appid}: disabled"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "Specify a local folder to sync the repo to"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "Specify an identity file to provide to SSH for rsyncing"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-msgid "Specify which debug keystore file to use."
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Spew out even more information than normal"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-#, python-brace-format
-msgid "Stripping mystery signature from {apkfilename}"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-format
-msgid "Summary '%s' is just the app's name"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Summary of length {length} is over the {limit} char limit"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "System clock is older than date in {path}!"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "Tags update mode only works for git, hg, bzr and git-svn repositories currently"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "Tags update mode used in git-svn, but the repo was not set up with tags"
-msgstr ""
-
-#: ../fdroidserver/build.py
-msgid "Test mode - put output in the tmp directory only, and always build, even if the output already exists."
-msgstr ""
-
-#: ../fdroidserver/index.py
-msgid "The \"qrcode\" Python package is not installed (e.g. apt-get install python3-qrcode)!"
-msgstr ""
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "The OBB version code must come after \"{name}.\":"
-msgstr ""
-
-#: ../fdroidserver/btlog.py
-msgid "The base URL for the repo to log (default: https://f-droid.org)"
-msgstr ""
-
-#: ../fdroidserver/mirror.py
-msgid "The directory to write the mirror to"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-msgid "The file to be included in the repo (path or glob)"
-msgstr ""
-
-#: ../fdroidserver/index.py
-msgid "The repository's fingerprint does not match."
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "The root dir for local_copy_dir \"{path}\" does not exist!"
-msgstr ""
-
-#: ../fdroidserver/publish.py
-msgid "There is a keyalias collision - publishing halted"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "These are the apps that have been archived from the main repo."
-msgstr ""
-
-#: ../fdroidserver/mirror.py
-msgid "This command should never be used to mirror f-droid.org! A full copy requires more than 600GB."
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "This is a repository of apps to be used with F-Droid. Applications in this repository are either official binaries built by the original application developers, or are binaries built from source by the admin of f-droid.org using the tools on https://gitlab.com/fdroid."
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
-#, python-format
-msgid "This repo already has local metadata: %s"
-msgstr ""
-
-#: ../fdroidserver/init.py
-#, python-format
-msgid ""
-"To complete the setup, add your APKs to \"%s\"\n"
-"then run \"fdroid update -c; fdroid update\".  You might also want to edit\n"
-"\"config.yml\" to set the URL, repo name, and more.  You should also set up\n"
-"a signing key (a temporary one might have been automatically generated).\n"
-"\n"
-"For more info: https://f-droid.org/docs/Setup_an_F-Droid_App_Repo\n"
-"and https://f-droid.org/docs/Signing_Process"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "To use awsbucket, awssecretkey and awsaccesskeyid must also be set in config.yml!"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "To use rclone, rclone_config and awsbucket must be set in config.yml!"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "URL must start with https:// or http://"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "URL shorteners should not be used"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "URL {url} in Description: {error}"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Unexpected license tag \"{}\"! Only use FSF or OSI approved tags from https://spdx.org/license-list"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Unexpected license tag \"{}\"! Only use license tags configured in your config file"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Unknown entry {key} in {configname}"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Unknown exception found!"
-msgstr "Ûnbekende útsûndering fûn!"
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Unknown file '{filename}' in build '{versionName}'"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-format
-msgid "Unknown metadata format: %s"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Unknown metadata format: {path} (use: *.yml)"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Unknown version of aapt, might cause problems: "
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Unnecessary leading space"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Unnecessary trailing space"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Unrecognised app field '{fieldname}' in '{path}'"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Unrecognised build flag '{build_flag}' in '{path}'"
-msgstr ""
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Unsupported file type \"{extension}\" for repo graphic"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Unsupported graphics file found: {path}"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-format
-msgid "Unused extlib at %s"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-format
-msgid "Unused file at %s"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-format
-msgid "Unused scandelete path: %s"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-format
-msgid "Unused scanignore path: %s"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Update repo information for new packages"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Update the binary transparency log for a URL"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "UpdateCheckData has invalid URL: {url}"
-msgstr ""
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "UpdateCheckData must match the version code as integer (\\d or [0-9]): {codeex}"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "UpdateCheckData must use HTTPS URL: {url}"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "UpdateCheckData not a valid URL: {url}"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "UpdateCheckMode is set but it looks like checkupdates hasn't been run yet."
-msgstr ""
-
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/lint.py
-msgid "UpdateCheckName is set to the known application ID, it can be removed"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Uploading {apkfilename} to androidobservatory.org"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Uploading {apkfilename} to virustotal"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Use /HEAD instead of /master or /main to point at a file in the default branch"
-msgstr ""
-
-#: ../fdroidserver/update.py
-msgid "Use `fdroid update -c` to create it."
-msgstr ""
-
-#: ../fdroidserver/build.py
-msgid "Use build server"
-msgstr ""
-
-#: ../fdroidserver/update.py
-msgid "Use date from APK instead of current time for newly added APKs"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Using \"{path}\" for configuring s3cmd."
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Using \"{path}\" for syncing with remote storage."
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Using APK Signature v2"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Using APK Signature v3"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Using JAR Signature"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Using Java's jarsigner, not recommended for verifying APKs! Use apksigner"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Using blank dictionary instead of contents of {path}!"
-msgstr ""
-
-#: ../fdroidserver/init.py
-#, python-brace-format
-msgid "Using existing keystore \"{path}\""
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Using rclone to sync with: {url}"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Using s3cmd to sync with: {url}"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Valid commands are:"
-msgstr "Jildige kommando's binne:"
-
-#: ../fdroidserver/verify.py
-msgid "Verify against locally cached copy rather than redownloading."
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Verify the integrity of downloaded packages"
-msgstr ""
-
-#: ../fdroidserver/index.py
-msgid "Verifying index signature:"
-msgstr ""
-
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "Verifying package {path} with apksigner."
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "VirusTotal API key cannot upload files larger than 32MB, use {url} to upload {path}."
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-msgid "WARNING: only public git repos are supported!"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Warn about possible metadata errors"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "WebAssembly binary file"
-msgstr ""
-
-#: ../fdroidserver/update.py
-msgid "When configured for signed indexes, create only unsigned indexes at this stage"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "When linting the entire repository yamllint is disabled by default. This option forces yamllint regardless."
-msgstr ""
-
-#: ../fdroidserver/publish.py
-msgid "When signing or verifying fails, exit with an error code."
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "Would you like to download and install F-Droid.apk via adb? (YES/no)"
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "Would you like to download the app(s) from f-droid.org? (YES/no)"
-msgstr ""
-
-#: ../fdroidserver/init.py
-msgid "X.509 'Distinguished Name' used when generating keys"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "You can use ANDROID_HOME to set the path to your SDK, i.e.:"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "ZIP file archive"
-msgstr ""
-
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "adb reports {serial} is \"{status}\"!"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-#, python-brace-format
-msgid "adding IdentityFile to {path}"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "adding to {name}: {path}"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "ambiguous option: %(option)s could match %(matches)s"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "apksigner in build-tools;{version} passes APKs with invalid v3 signatures, ignoring."
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "apksigner not found! Cannot sign or verify modern APKs"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "apksigner not found, it's required for signing!"
-msgstr ""
-
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/checkupdates.py ../fdroidserver/lint.py
-#: ../fdroidserver/rewritemeta.py
-msgid "application ID of file to operate on"
-msgstr ""
-
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/build.py ../fdroidserver/install.py
-#: ../fdroidserver/publish.py ../fdroidserver/scanner.py
-#: ../fdroidserver/verify.py
-msgid "application ID with optional versionCode in the form APPID[:VERCODE]"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "archive_url needs to end with /archive"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "argument \"-\" with mode %r"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "argument %(argument_name)s: %(message)s"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-msgid "attempting bare SSH connection to test deploy key:"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "can not parse scrlib spec (not a string): '{}'"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "can't open '%(filename)s': %(error)s"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "can't open non-https url: '{};"
-msgstr ""
-
-#: ../fdroidserver/build.py
-#, python-brace-format
-msgid "cannot find required srclibs: \"{path}\""
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-msgid "cannot have multiple subparser arguments"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "cannot merge actions - two groups are named %r"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-msgid "cannot publish update, did you set the deploy key?"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-#, python-brace-format
-msgid "cloning {url}"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "commands from plugin modules:"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "conflicting option string: %s"
-msgid_plural "conflicting option strings: %s"
-msgstr[0] ""
-msgstr[1] ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "conflicting subparser alias: %s"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "conflicting subparser: %s"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "could not parse '{path}'"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "could not parse srclib spec (no name specified): '{}'"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "could not parse srclib spec (no ref specified): '{}'"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-#, python-brace-format
-msgid "created {path}"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "current version is newer: old vercode={old}, new vercode={new}"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "deleting: repo/{apkfilename}"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "dependency file without lock"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "deployed process log {path} to {dest}"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "dest= is required for options like %r"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "downloading '{}'"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "downloading scanner signatures from '{}' failed"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "executable binary, possibly code"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "expected %s argument"
-msgid_plural "expected %s arguments"
-msgstr[0] ""
-msgstr[1] ""
-
-#: /usr/lib/python3.11/argparse.py
-msgid "expected at least one argument"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-msgid "expected at most one argument"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-msgid "expected one argument"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "fdroid [<command>] [-h|--help|--version|<args>]"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "fetch the latest version of signatures from the web"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-msgid "force metadata errors (default) to be warnings, or to be ignored."
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "git svn clone failed"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "gzip file archive"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "ignored explicit argument %r"
-msgstr ""
-
-#: ../fdroidserver/index.py
-msgid "index-v1 must have a signature, use `fdroid signindex` to create it!"
-msgstr ""
-
-#: ../fdroidserver/index.py
-msgid "index-v2 must have a signature, use `fdroid signindex` to create it!"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "invalid %(type)s value: %(value)r"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "invalid choice: %(value)r (choose from %(choices)s)"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "invalid conflict_resolution value: %r"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "invalid option string %(option)r: must start with a character %(prefix_chars)r"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "ipfs_cid not found, skipping CIDv1 generation"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "latest build recipe is newer: old vercode={old}, new vercode={new}"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "local_copy_dir does not end with \"fdroid\", perhaps you meant: \"{path}\""
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "local_copy_dir must be an absolute path!"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "local_copy_dir must be directory, not a file!"
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-format
-msgid "mirror '%s' does not end with 'fdroid'!"
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "mirrors set twice, in config.yml and {path}!"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-msgid "mutually exclusive arguments must be optional"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "next {name} cache update due in {time}"
-msgstr ""
-
-#: ../fdroidserver/mirror.py
-#, python-brace-format
-msgid "no \"icon\" in {appid}"
-msgstr ""
-
-#: ../fdroidserver/signatures.py
-msgid "no APK supplied"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "no version information found"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "not allowed with argument %s"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "one of the arguments %s is required"
-msgstr ""
-
-#: ../fdroidserver/common.py ../fdroidserver/index.py
-msgid "only accepts strings, lists, and tuples"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, fuzzy
-msgid "options"
-msgstr "Opsjes"
-
-#: ../fdroidserver/nightly.py
-#, python-brace-format
-msgid "overwriting existing {path}"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-msgid "positional arguments"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "process log deploy {path} to {dest} failed!"
-msgstr ""
-
-#: ../fdroidserver/build.py
-msgid "reference binary missing signature"
-msgstr ""
-
-#: ../fdroidserver/signatures.py
-#, python-brace-format
-msgid "refuse downloading via insecure HTTP connection (use HTTPS or specify --no-https-check): {apkfilename}"
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-format
-msgid "repo_icon \"repo/icons/%s\" does not exist, generating placeholder."
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "repo_url needs to end with /repo"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "rsync is missing or broken: {error}"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "s3cmd sync indexes {path} to {url} and delete"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "s3cmd syncs indexes from {path} to {url} and deletes removed"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "scanner cache is malformed! You can clear it with: '{clear}'"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "serverwebroot: path does not end with \"fdroid\", perhaps you meant one of these:"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "shared library"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-msgid "show this help message and exit"
-msgstr "dit help berjocht sjen litte en ôfslute"
-
-#: ../fdroidserver/signatures.py
-msgid "signed APK, either a file-path or HTTPS URL."
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "skip deploying full build logs: log content is empty"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "skip deploying full build logs: not enabled in config"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "skipping source tarball: {path}"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "srclibs missing name and/or @"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "static library"
-msgstr ""
-
-#: ../fdroidserver/build.py
-#, python-brace-format
-msgid "supplied reference binary has allowed signer {signer}"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "the following arguments are required: %s"
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "true"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "unexpected option string: %s"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "unknown parser %(parser_name)r (choices: %(choices)s)"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "unrecognized arguments: %s"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "unsafe permissions on '{config_file}' (should be 0600)!"
-msgstr ""
-
-#: ../fdroidserver/__main__.py /usr/lib/python3.11/argparse.py
-msgid "usage: "
-msgstr "gebrûk: "
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "using Apache libcloud to sync with {url}"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "virustotal.com is rate limiting, waiting to retry..."
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "yes"
-msgstr ""
-
-#: ../fdroidserver/publish.py
-#, python-brace-format
-msgid "{0} app, {1} key aliases"
-msgid_plural "{0} apps, {1} key aliases"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{apkfilename} ({appid}) has no metadata!"
-msgstr ""
-
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{apkfilename}'s AndroidManifest.xml has a bad date: "
-msgstr ""
-
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{appid} does not have a name! Using application ID instead."
-msgstr ""
-
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{appid} from {path} is not a valid Android application ID!"
-msgstr ""
-
-#: ../fdroidserver/metadata.py ../fdroidserver/update.py
-#, python-brace-format
-msgid "{appid} from {path} is not a valid Java Package Name!"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{appid} has both APKs and files: {files}"
-msgstr ""
-
-#: ../fdroidserver/mirror.py
-#, python-brace-format
-msgid "{appid} is missing {name}"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "{appid}: Unknown extlib {path} in build '{versionName}'"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "{appid}: no builds specified, running on current source state"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "{appid}: {field} must be a '{type}', but it is a '{fieldtype}!'"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "{appid}: {field} must be a '{type}', but it is a '{fieldtype}'!"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "{build_flag} must be an integer, found: {value}"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "{build_flag} must be list or string, found: {value}"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "{file} is blank or corrupt!"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{name} \"{section}/icons/{path}\" does not exist! Check \"config.yml\"."
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{path1} is a duplicate of {path2}, remove one!"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
-#, python-brace-format
-msgid "{path} already exists, ignoring import results!"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-#, python-brace-format
-msgid "{path} does not exist!  Create it by running:"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{path} has bad file signature \"{pattern}\", possible Janus exploit!"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "{path} has been flagged by virustotal {count} times:"
-msgstr ""
-
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "{path} has the wrong fingerprint ({fingerprint})!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "{path} is not \"key: value\" dict, but a {datatype}!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "{path} is not a standard config file!"
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "{path} is not list, but a {datatype}!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "{path} is not {expected_type}, but a {datatype}!"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{path} is zero size!"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "{path} more than 200MB, manually upload: {url}"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "{path}: \"{code}\" is not a valid ISO_3166-1 alpha-2 country code!"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{path}: {error}"
-msgstr ""
-
-#: ../fdroidserver/mirror.py
-#, python-brace-format
-msgid "{url} does not end with \"fdroid\", check the URL path!"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
-#, python-brace-format
-msgid "{url} does not start with \"http\"!"
-msgstr ""
-
-#: ../fdroidserver/build.py
-msgid "{} build failed"
-msgid_plural "{} builds failed"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../fdroidserver/build.py
-msgid "{} build succeeded"
-msgid_plural "{} builds succeeded"
-msgstr[0] ""
-msgstr[1] ""
diff --git a/locale/ga/LC_MESSAGES/fdroidserver.po b/locale/ga/LC_MESSAGES/fdroidserver.po
deleted file mode 100644
index b9916f78..00000000
--- a/locale/ga/LC_MESSAGES/fdroidserver.po
+++ /dev/null
@@ -1,2716 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# This file is put in the public domain.
-# Aindriú Mac Giolla Eoin <aindriu80@gmail.com>, 2024, 2025.
-msgid ""
-msgstr ""
-"Project-Id-Version: fdroidserver 2.3a1-162-gfbb3cc59\n"
-"Report-Msgid-Bugs-To: https://gitlab.com/fdroid/fdroidserver/issues\n"
-"POT-Creation-Date: 2025-06-25 09:52+0200\n"
-"PO-Revision-Date: 2025-03-27 19:35+0000\n"
-"Last-Translator: Aindriú Mac Giolla Eoin <aindriu80@gmail.com>\n"
-"Language-Team: Irish <https://hosted.weblate.org/projects/f-droid/fdroidserver/ga/>\n"
-"Language: ga\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=5; plural=n==1 ? 0 : n==2 ? 1 : (n>2 && n<7) ? 2 :(n>6 && n<11) ? 3 : 4;\n"
-"X-Generator: Weblate 5.11-dev\n"
-
-#: ../fdroidserver/nightly.py
-msgid ""
-"\n"
-"SSH public key to be used as deploy key:"
-msgstr ""
-"\n"
-"Eochair phoiblí SSH le húsáid mar eochair imlonnaithe:"
-
-#: ../fdroidserver/nightly.py
-#, python-brace-format
-msgid ""
-"\n"
-"{path} encoded for the DEBUG_KEYSTORE secret variable:"
-msgstr ""
-"\n"
-"{path} ionchódaithe don athróg rúnda DEBUG_KEYSTORE:"
-
-#: ../fdroidserver/lint.py
-#, python-format
-msgid "\"%s/\" has no matching metadata file!"
-msgstr "Níl aon chomhad meiteashonraí meaitseála ag \"%s/\"!"
-
-#: ../fdroidserver/index.py
-msgid "\"isPrimary\" key should not be added to mirrors!"
-msgstr "Níor cheart eochair \"isPrimary\" a chur le scátháin!"
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "\"local_copy_dir\" {path} does not exist!"
-msgstr "Níl \"local_copy_dir\" {path} ann!"
-
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "\"{apkfilename}\" is already installed on {dev}."
-msgstr "Tá \"{apkfilename}\" suiteáilte cheana féin ar {dev}."
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "\"{path}\" contains recent {name} ({version})"
-msgstr "Tá \"{path}\" le déanaí {name} ({version})"
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "\"{path}\" exists but s3cmd is not installed!"
-msgstr "Tá \"{path}\" ann ach níl s3cmd suiteáilte!"
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "\"{path}\" is not a supported file format (use: metadata/*.yml)"
-msgstr "Ní formáid comhaid tacaithe é \"{path}\" (úsáid: meiteashonraí/*.yml)"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "\"{path}\" is signed by a key that is not allowed:"
-msgstr "Tá \"{path}\" sínithe ag eochair nach bhfuil ceadaithe:"
-
-#: ../fdroidserver/import_subcommand.py
-#, python-brace-format
-msgid "\"{url}\" is not a valid URL!"
-msgstr "Ní URL bailí é \"{url}\"!"
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "%(prog)s: error: %(message)s\n"
-msgstr "%(prog)s: earráid: %(message)s\n"
-
-#: ../fdroidserver/publish.py
-#, python-format
-msgid "%d APKs failed to be signed or verified!"
-msgstr "Theip ar %d APKs a shíniú nó a fhíorú!"
-
-#: ../fdroidserver/scanner.py
-#, python-format
-msgid "%d problems found"
-msgstr "Aimsíodh %d fadhbanna"
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "%r is not callable"
-msgstr "Níl %r inghlaoite"
-
-#: ../fdroidserver/signindex.py
-#, python-format
-msgid "%s did not produce a dict!"
-msgstr "Níor tháirg %s deachtú!"
-
-#: ../fdroidserver/signindex.py
-#, python-format
-msgid "%s has bad SHA-256: %s"
-msgstr "Tá droch-SHA-256 ag %s: %s"
-
-#: ../fdroidserver/lint.py
-#, python-format
-msgid "%s is not an accepted build field"
-msgstr "Ní réimse tógála inghlactha é %s"
-
-#: ../fdroidserver/common.py
-msgid "'keypass' not found in config.yml!"
-msgstr "Níl 'Keypass' le fáil i config.yml!"
-
-#: ../fdroidserver/common.py
-msgid "'keystore' is NONE and 'smartcardoptions' is blank!"
-msgstr "Is é 'keystore' NONE agus tá 'smartcardoptions' bán!"
-
-#: ../fdroidserver/common.py
-msgid "'keystore' not found in config.yml!"
-msgstr "Níl 'keystore' le fáil i config.yml!"
-
-#: ../fdroidserver/common.py
-msgid "'keystorepass' not found in config.yml!"
-msgstr "Níl 'keystorepass' le fáil i config.yml!"
-
-#: ../fdroidserver/common.py
-msgid "'repo_keyalias' not found in config.yml!"
-msgstr "Níl 'repo_keyalias' le fáil sa config.yml!"
-
-#: /usr/lib/python3.11/argparse.py
-msgid "'required' is an invalid argument for positionals"
-msgstr "Is argóint neamhbhailí é 'riachtanach' do shuíomhanna"
-
-#: ../fdroidserver/common.py
-msgid "'sdk_path' not set in config.yml!"
-msgstr "Níl 'sdk_path' socraithe sa config.yml!"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "'{aapt}' is too old, fdroid requires build-tools-{version} or newer!"
-msgstr "Tá '{aapt}' ró-shean, éilíonn fdroid build-tools-{version} nó níos nuaí!"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "'{path}' failed to execute!"
-msgstr "Theip ar '{path}' a rith!"
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "'{path}' has invalid format, it should be a dictionary!"
-msgstr "Tá formáid neamhbhailí ag '{path}', ba chóir gur foclóir é!"
-
-#: ../fdroidserver/lint.py ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "'{value}' is not a valid {field} in {appid}. Regex pattern: {pattern}"
-msgstr "Ní '{value}' bailí {field} in {appid}. Patrún Regex: {pattern}"
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "'{value}' is not a valid {field}, should be {pattern}"
-msgstr "Ní '{field} bailí é '{value}', ba chóir go mbeadh {pattern}"
-
-#: ../fdroidserver/checkupdates.py
-msgid "--merge-request only runs on a single appid!"
-msgstr "Ní ritheann --merge-request ach ar aip amháin!"
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "...checkupdate failed for {appid} : {error}"
-msgstr "... theip ar checkupdate le haghaidh {appid} : {error}"
-
-#: /usr/lib/python3.11/argparse.py
-msgid ".__call__() not defined"
-msgstr ".__call__() gan sainmhíniú"
-
-#: ../fdroidserver/lint.py
-msgid "/issues is missing"
-msgstr "/tá saincheisteanna ar iarraidh"
-
-#: ../fdroidserver/mirror.py
-msgid "A URL is required as an argument!"
-msgstr "Tá URL ag teastáil mar argóint!"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "APK signatures have different certificates in {path}:"
-msgstr "Tá teastais éagsúla ag sínithe APK i {path}:"
-
-#: ../fdroidserver/__main__.py
-msgid "Add PGP signatures using GnuPG for packages in repo"
-msgstr "Cuir sínithe PGP leis ag baint úsáide as GnuPG le haghaidh pacáistí i repo"
-
-#: ../fdroidserver/update.py
-msgid "Add a repo signing key to an unsigned repo"
-msgstr "Cuir eochair sínithe repo le repo gan síniú"
-
-#: ../fdroidserver/update.py
-msgid "Add skeleton metadata files for APKs that are missing them"
-msgstr "Cuir comhaid mheiteashonraí cnámharlaigh le haghaidh APKs atá in easnamh orthu"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Adding new repo for only {name}"
-msgstr "Ag cur repo nua le haghaidh {name} amháin"
-
-#: ../fdroidserver/init.py
-msgid "Alias of the repo signing key in the keystore"
-msgstr "Ailias an eochair sínithe repo sa siopa eochrach"
-
-#: ../fdroidserver/build.py
-msgid "AllowedAPKSigningKeys missing but reference binary supplied"
-msgstr "AllowedAPKSigningKeys ar iarraidh ach tagairt dénártha soláthraithe"
-
-#: ../fdroidserver/import_subcommand.py
-msgid "Allows a different revision (or git branch) to be specified for the initial import"
-msgstr "Ceadaíonn sé seo athbhreithniú difriúil (nó brainse git) a shonrú le haghaidh na hiompórtála tosaigh"
-
-#: ../fdroidserver/mirror.py
-msgid "Also mirror the full archive section"
-msgstr "Chomh maith leis sin scáthánaigh rannóg iomlán na cartlainne"
-
-#: ../fdroidserver/lint.py
-msgid "Also warn about formatting issues, like rewritemeta -l"
-msgstr "Chomh maith leis sin rabhadh faoi shaincheisteanna formáidithe, cosúil le rewritemeta -l"
-
-#: ../fdroidserver/scanner.py
-msgid "Android AAR library"
-msgstr "Leabharlann Android AAR"
-
-#: ../fdroidserver/scanner.py
-msgid "Android APK file"
-msgstr "Comhad Android APK"
-
-#: ../fdroidserver/scanner.py
-msgid "Android DEX code"
-msgstr "Cód Android DEX"
-
-#: ../fdroidserver/init.py
-#, python-brace-format
-msgid "Android SDK not found at {path}!"
-msgstr "Android SDK gan fáil ag {path}!"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Android SDK path '{path}' does not exist!"
-msgstr "Níl cosán SDK Android '{path}' ann!"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Android SDK path '{path}' is not a directory!"
-msgstr "Ní eolaire é cosán SDK Android '{path}'!"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Android SDK tool {cmd} not found!"
-msgstr "Android SDK uirlis {cmd} gan aimsiú!"
-
-#: ../fdroidserver/lint.py
-msgid "App has Binaries but does not have corresponding AllowedAPKSigningKeys to pin certificate."
-msgstr "Tá Binaries ag app ach níl AllowedAPKSigningKeys comhfhreagrach aige chun deimhniú a phionnáil."
-
-#: ../fdroidserver/lint.py
-msgid "App has NoSourceSince or ArchivePolicy \"0 versions\" or 0 but AutoUpdateMode or UpdateCheckMode are not None"
-msgstr "Tá NoSourceSince nó ArchivePolicy \"leaganacha 0\" nó 0 ag an bhfeidhmchlár ach níl aon cheann ag AutoUpdateMode nó UpdateCheckMode"
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "App is in '{repo}' but has a link to {url}"
-msgstr "Tá an feidhmchlár in '{repo}' ach tá nasc aige le {url}"
-
-#: ../fdroidserver/lint.py
-msgid "App version has binary but does not have corresponding AllowedAPKSigningKeys to pin certificate."
-msgstr "Tá dénártha ag leagan app ach níl AllowedAPKSigningKeys comhfhreagrach aige chun deimhniú a phionnáil."
-
-#: ../fdroidserver/lint.py
-msgid "Appending .git is not necessary"
-msgstr "Ní gá .git a iarcheangal"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Archiving {apkfilename} with invalid signature!"
-msgstr "Cartlannú {apkfilename} le síniú neamhbhailí!"
-
-#: ../fdroidserver/lint.py
-msgid "AutoUpdateMode with UpdateCheckMode: HTTP must have a pattern."
-msgstr "AutoUpdateMode le UpdateCheckMode: Caithfidh patrún a bheith ag HTTP."
-
-#: ../fdroidserver/install.py
-msgid "Automatic no to all prompts."
-msgstr "Uimh uathoibríoch do gach leideanna."
-
-#: ../fdroidserver/install.py
-msgid "Automatic yes to all prompts."
-msgstr "Tá go huathoibríoch le gach leideanna."
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "Bad entry type \"{mirrortype}\" in mirrors config: {mirror}"
-msgstr "Drochchineál iontrála \"{mirrortype}\" i gcumraíocht scátháin: {mirror}"
-
-#: ../fdroidserver/mirror.py
-msgid "Base URL to mirror, can include the index signing key using the query string: ?fingerprint="
-msgstr "Bun-URL le scáthán, is féidir an eochair sínithe innéacs a áireamh ag baint úsáide as teaghrán an iarratais: ?fingerprint="
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Branch '{branch}' used as commit in build '{versionName}'"
-msgstr "Brainse '{branch}' a úsáidtear mar gheall ar thógáil '{versionName}'"
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Branch '{branch}' used as commit in srclib '{srclib}'"
-msgstr "Brainse '{branch}' a úsáidtear mar chimire sa srclib '{srclib}'"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Broken symlink: {path}"
-msgstr "Nasc siombalach briste: {path}"
-
-#: ../fdroidserver/__main__.py
-msgid "Build a package from source"
-msgstr "Tóg pacáiste ón bhfoinse"
-
-#: ../fdroidserver/build.py
-msgid "Build all applications available"
-msgstr "Tóg gach iarratas atá ar fáil"
-
-#: ../fdroidserver/lint.py
-msgid "Build generated by `fdroid import` - remove disable line once ready"
-msgstr "Tóg ginte ag 'iompórtáil fdroid' - bain líne dhíchumasaigh nuair atá sé réidh"
-
-#: ../fdroidserver/checkupdates.py
-msgid "Build metadata git repo has uncommited changes!"
-msgstr "Tóg meiteashonraí git repo Tá athruithe neamhchoitianta!"
-
-#: ../fdroidserver/build.py
-msgid "Build only the latest version of each package"
-msgstr "Ná tóg ach an leagan is déanaí de gach pacáiste"
-
-#: ../fdroidserver/init.py
-#, python-format
-msgid "Built repo based in \"%s\" with this config:"
-msgstr "Repo tógtha bunaithe i \"%s\" leis an gcumraíocht seo:"
-
-#: ../fdroidserver/checkupdates.py
-msgid "Can't auto-update app with no CurrentVersionCode"
-msgstr "Ní féidir feidhmchlár a nuashonrú go huathoibríoch gan aon CurrentVersionCode"
-
-#: ../fdroidserver/build.py
-msgid "Can't build due to {} error while scanning"
-msgid_plural "Can't build due to {} errors while scanning"
-msgstr[0] "Ní féidir tógáil de bharr earráid {} agus scanadh"
-msgstr[1] "Ní féidir tógáil de bharr {} earráidí agus an scanadh"
-msgstr[2] "Ní féidir tógáil de bharr {} earráidí agus an scanadh"
-msgstr[3] "Ní féidir tógáil de bharr {} earráidí agus an scanadh"
-msgstr[4] "Ní féidir tógáil de bharr {} earráidí agus an scanadh"
-
-#: ../fdroidserver/common.py
-#, fuzzy, python-brace-format
-msgid "Cannot read {path}: {error}"
-msgstr "Theip ar léamh {path}: {error}"
-
-#: ../fdroidserver/rewritemeta.py
-#, python-brace-format
-msgid "Cannot rewrite \"{path}\""
-msgstr "Ní féidir \"{path}\" a athscríobh"
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
-#: ../fdroidserver/lint.py
-#, python-format
-msgid "Categories '%s' is not valid"
-msgstr "Níl catagóirí '%s' bailí"
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
-#: ../fdroidserver/lint.py
-msgid "Categories are not set"
-msgstr "Níl catagóirí socraithe"
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "Category \"{category}\" defined but not used for any apps!"
-msgstr "Catagóir \"{category}\" sainithe ach nach n-úsáidtear le haghaidh aon apps!"
-
-#: ../fdroidserver/__main__.py
-msgid "Check for updates to applications"
-msgstr "Seiceáil le haghaidh nuashonruithe ar fheidhmchláir"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Checking archiving for {appid} - apks:{integer}, keepversions:{keep}, archapks:{arch}"
-msgstr "Ag seiceáil cartlannú le haghaidh {appid} - apks:{integer}, keepversions:{keep}, archapks:{arch}"
-
-#: ../fdroidserver/update.py
-msgid "Clean update - don't uses caches, reprocess all APKs"
-msgstr "Nuashonrú glan - ná húsáid taisce, athphróiseáil gach APKs"
-
-#: ../fdroidserver/common.py
-msgid "Color the log output"
-msgstr "Dathaigh an t-aschur loga"
-
-#: ../fdroidserver/import_subcommand.py
-msgid "Comma separated list of categories."
-msgstr "Camóga scartha liosta de chatagóirí."
-
-#: ../fdroidserver/__main__.py
-#, python-format
-msgid "Command '%s' not recognised.\n"
-msgstr "Níor aithníodh ordú '%s'.\n"
-
-#: ../fdroidserver/checkupdates.py
-msgid "Commit changes"
-msgstr "Cuir athruithe i bhfeidhm"
-
-#: ../fdroidserver/checkupdates.py
-msgid "Commit changes, push, then make a merge request"
-msgstr "Déan athruithe, brúigh, ansin déan iarratas cumaisc"
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Conflicting \"{field}\" definitions between .yml and localized files:"
-msgstr "Sainmhínithe contrártha \"{field}\" idir comhaid .yml agus logánaithe:"
-
-#: ../fdroidserver/__main__.py
-msgid "Conflicting arguments: '--verbose' and '--quiet' can not be specified at the same time."
-msgstr "Argóintí contrártha: ní féidir '--verbose' agus '--quiet' a shonrú ag an am céanna."
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Could not find '{command}' on your system"
-msgstr "Níorbh fhéidir '{command}' a aimsiú ar do chóras"
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/import_subcommand.py
-msgid "Could not find latest version code"
-msgstr "Níorbh fhéidir an cód leagain is déanaí a aimsiú"
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
-#: ../fdroidserver/import_subcommand.py
-msgid "Could not find latest version name"
-msgstr "Níorbh fhéidir ainm an leagain is déanaí a aimsiú"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Could not find {path} to remove it"
-msgstr "Níorbh fhéidir {path} a aimsiú chun é a bhaint"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Could not open APK {path} for analysis: "
-msgstr "Níorbh fhéidir APK {path} a oscailt le haghaidh anailíse: "
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Could not parse size \"{size}\", wrong type \"{type}\""
-msgstr "Níorbh fhéidir méid \"{size}\" a pharsáil, cineál mícheart \"{type}\""
-
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/import_subcommand.py
-msgid "Couldn't find Application ID"
-msgstr "Níorbh fhéidir aitheantas feidhmchláir a aimsiú"
-
-#: ../fdroidserver/checkupdates.py
-msgid "Couldn't find any version information"
-msgstr "Níorbh fhéidir aon eolas faoin leagan a aimsiú"
-
-#: ../fdroidserver/checkupdates.py
-msgid "Couldn't find package ID"
-msgstr "Níorbh fhéidir aitheantas an phacáiste a aimsiú"
-
-#: ../fdroidserver/update.py
-msgid "Cowardily refusing to overwrite existing signing key setup!"
-msgstr "Cowardily diúltú a overwrite thus eochair síniú atá ann cheana féin!"
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Created new container \"{name}\""
-msgstr "Cruthaíodh coimeádán nua \"{name}\""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Creating \"{path}\" for configuring s3cmd."
-msgstr "Ag cruthú \"{path}\" chun s3cmd a chumrú."
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Creating empty {config_file}"
-msgstr "{config_file} folamh á chruthú"
-
-#: ../fdroidserver/publish.py
-msgid "Creating log directory"
-msgstr "Comhadlann logála á cruthú"
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Creating new S3 bucket: {url}"
-msgstr "Buicéad nua S3 á chruthú: {url}"
-
-#: ../fdroidserver/publish.py
-msgid "Creating output directory"
-msgstr "Comhadlann aschurtha á cruthú"
-
-#: ../fdroidserver/index.py
-msgid "Creating signed index with this key (SHA256):"
-msgstr "Innéacs sínithe a chruthú leis an eochair seo (SHA256):"
-
-#: ../fdroidserver/publish.py ../fdroidserver/verify.py
-msgid "Creating temporary directory"
-msgstr "Comhadlann shealadach á cruthú"
-
-#: ../fdroidserver/index.py
-msgid "Creating unsigned index in preparation for signing"
-msgstr "Innéacs gan síniú a chruthú mar ullmhúchán do shíniú"
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "CurrentVersionCode {cv} is less than oldest build entry {versionCode}"
-msgstr "Tá CurrentVersionCode {cv} níos lú ná an iontráil tógála is sine {versionCode}"
-
-#: ../fdroidserver/nightly.py
-msgid "DEBUG_KEYSTORE is not set or the value is incomplete"
-msgstr "nach bhfuil DEBUG_KEYSTORE socraithe nó go bhfuil an luach neamhiomlán"
-
-#: ../fdroidserver/update.py
-msgid "Delete APKs and/or OBBs without metadata from the repo"
-msgstr "Scrios APKs agus/nó OBBanna gan meiteashonraí ón repo"
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Deleting archive, repo is too big ({size} max {limit})"
-msgstr "Cartlann á scriosadh, tá repo rómhór ({size} max {limit})"
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Deleting git-mirror history, repo is too big ({size} max {limit})"
-msgstr "Ag scriosadh stair git-scáthán, tá repo rómhór ({size} max {limit})"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Deleting unknown file: {path}"
-msgstr "Comhad anaithnid á scriosadh: {path}"
-
-#: ../fdroidserver/lint.py
-#, python-format
-msgid "Description '%s' is just the app's summary"
-msgstr "Níl sa chur síos ar '%s' ach achoimre an fheidhmchláir"
-
-#: ../fdroidserver/lint.py
-msgid "Description has a duplicate line"
-msgstr "Tá líne dhúbailte ag cur síos"
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Description of length {length} is over the {limit} char limit"
-msgstr "Tá cur síos ar fhad {length} os cionn na teorann char {limit}"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Did you mean config/{name}.yml?"
-msgstr "An raibh cumraíocht/{name}i gceist agat.yml?"
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Did you mean {code}?"
-msgstr "An raibh {code}i gceist agat?"
-
-#: ../fdroidserver/import_subcommand.py
-msgid "Do not add 'disable:' to the generated build entries"
-msgstr "Ná cuir 'díchumasaigh:' leis na hiontrálacha tógála ginte"
-
-#: ../fdroidserver/nightly.py
-msgid "Do not deploy the new files to the repo"
-msgstr "Ná húsáid na comhaid nua chuig an repo"
-
-#: ../fdroidserver/mirror.py
-#, python-brace-format
-msgid "Do not include \"{path}\" in URL!"
-msgstr "Ná cuir \"{path}\" san URL!"
-
-#: ../fdroidserver/init.py
-msgid "Do not prompt for Android SDK path, just fail"
-msgstr "Ná pras le haghaidh cosán SDK Android, ach teip"
-
-#: ../fdroidserver/nightly.py
-msgid "Do not remove the private keys generated from the keystore"
-msgstr "Ná bain na heochracha príobháideacha a ghintear ón siopa eochrach"
-
-#: ../fdroidserver/build.py
-msgid "Don't create a source tarball, useful when testing a build"
-msgstr "Ná chruthú tarball foinse, úsáideach nuair a thástáil a thógáil"
-
-#: ../fdroidserver/build.py
-msgid "Don't refresh the repository, useful when testing a build with no internet connection"
-msgstr "Ná athnuaigh an stór, úsáideach agus tú ag tástáil tógála gan aon nasc idirlín"
-
-#: ../fdroidserver/deploy.py ../fdroidserver/nightly.py
-msgid "Don't use rsync checksums"
-msgstr "Ná húsáid seiceálacha rsync"
-
-#: ../fdroidserver/install.py
-msgid "Download F-Droid.apk using mirrors that leak less to the network"
-msgstr "Íoslódáil F-Droid.apk ag baint úsáide as scátháin a sceitheann níos lú don líonra"
-
-#: ../fdroidserver/__main__.py
-msgid "Download complete mirrors of small repos"
-msgstr "Íoslódáil scátháin iomlána de repos beag"
-
-#: ../fdroidserver/common.py
-msgid "Downloading the repository already failed once, not trying again."
-msgstr "Theip ar an stór a íoslódáil cheana féin uair amháin, gan iarracht a dhéanamh arís."
-
-#: ../fdroidserver/verify.py
-#, python-brace-format
-msgid "Downloading {url} failed. {error}"
-msgstr "Níorbh fhéidir {url} a íosluchtú. {error}"
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Duplicate Anti-Feature declaration at {path} was ignored!"
-msgstr "Rinneadh neamhaird ar dhearbhú Dúblach Frith-Ghné ag {path}!"
-
-#: ../fdroidserver/index.py
-#, python-format
-msgid "Duplicate entry \"%s\" in mirrors config!"
-msgstr "Dúblach iontráil \"%s\" i gcumraíocht scátháin!"
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Duplicate link in '{field}': {url}"
-msgstr "Nasc dúblach i '{field}': {url}"
-
-#: ../fdroidserver/common.py
-#, python-format
-msgid "ERROR: %(message)s"
-msgstr "EARRÁID: %(message)s"
-
-#: ../fdroidserver/__main__.py
-msgid "ERROR: The \"server\" subcommand has been removed, use \"deploy\"!"
-msgstr "EARRÁID: Baineadh an fo-ordú \"freastalaí\", bain úsáid as \"imscaradh\"!"
-
-#: ../fdroidserver/nightly.py
-msgid "ERROR: unsupported CI type, patches welcome!"
-msgstr "EARRÁID: cineál CI gan tacaíocht, fáilte roimh phaistí!"
-
-#: ../fdroidserver/nightly.py
-#, python-format
-msgid "ERROR: unsupported git host \"%s\", patches welcome!"
-msgstr "EARRÁID: Óstríomhaire git gan tacaíocht \"%s\", fáilte roimh phaistí!"
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "ERROR: {key} in {path} is not \"archive\" or \"repo\"!"
-msgstr "EARRÁID: Níl {key} i {path} \"archive\" nó \"repo\"!"
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "ERROR: {key} not a valid key!"
-msgstr "EARRÁID: Ní eochair bhailí í {key}!"
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "ERROR: {key}'s value should be of type {t}!"
-msgstr "EARRÁID: Ba cheart gur de chineál {t} luach {key}!"
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "ERROR: {key}:{subkey} in {path} is not in allowed keys: {allowed_keys}!"
-msgstr "EARRÁID: {key}:{subkey} in {path} is not in allowed keys: {allowed_keys}!"
-
-#: ../fdroidserver/__main__.py
-#, python-brace-format
-msgid "Encoding is set to '{enc}' fdroid might run into encoding issues. Please set it to 'UTF-8' for best results."
-msgstr "Tá ionchódú socraithe chun '{enc}' d'fhéadfadh fdroid rith i saincheisteanna ionchódú. Socraigh é chuig 'UTF-8' chun na torthaí is fearr a fháil."
-
-#: ../fdroidserver/init.py
-#, python-format
-msgid ""
-"Enter the path to the Android SDK (%s) here:\n"
-"> "
-msgstr ""
-"Cuir isteach an chonair go dtí an SDK Android (%s) anseo:\n"
-"> "
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Environment variable {var} from {configname} is not set!"
-msgstr "Níl athróg timpeallachta {var} ó {configname} socraithe!"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Environment variable {{env: {var}}} is not set!"
-msgstr "Níl athróg timpeallachta {{env: {var}}} socraithe!"
-
-#: ../fdroidserver/deploy.py
-msgid "Error deploying 'github_releases', {} not present. (You might need to run `fdroid update` first.)"
-msgstr "Earráid agus 'github_releases' á úsáid, {} gan a bheith i láthair. (B'fhéidir go mbeidh ort 'nuashonrú fdroid' a rith ar dtús.)"
-
-#: ../fdroidserver/import_subcommand.py
-msgid "Error while getting repo address"
-msgstr "Earráid agus seoladh repo á fháil"
-
-#: ../fdroidserver/scanner.py
-msgid "Exit with a non-zero code if problems were found"
-msgstr "Scoir le cód neamh-nialasach má aimsíodh fadhbanna"
-
-#: ../fdroidserver/__main__.py
-msgid "Extract application metadata from a source repository"
-msgstr "Bain meiteashonraí feidhmchláir as stór foinseach"
-
-#: ../fdroidserver/__main__.py
-msgid "Extract signatures from APKs"
-msgstr "Sleachta sínithe ó APKs"
-
-#: ../fdroidserver/install.py
-msgid "F-Droid.apk could not be downloaded from any known source!"
-msgstr "Níorbh fhéidir F-Droid.apk a íoslódáil ó fhoinse aitheanta ar bith!"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Failed copying {path}: {error}"
-msgstr "Theip ar chóipeáil {path}: {error}"
-
-#: ../fdroidserver/signatures.py
-#, python-brace-format
-msgid "Failed fetching signatures for '{apkfilename}': {error}"
-msgstr "Theip ar shínithe a fháil le haghaidh '{apkfilename}': {error}"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Failed reading {path}: {error}"
-msgstr "Theip ar léamh {path}: {error}"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Failed resizing {path}: {error}"
-msgstr "Theip ar athrú {path}: {error}"
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Failed to create S3 bucket: {url}"
-msgstr "Theip ar bhuicéad S3 a chruthú: {url}"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Failed to get APK information, deleting {path}"
-msgstr "Theip ar fhaisnéis APK a fháil, ag scriosadh {path}"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Failed to get APK information, skipping {path}"
-msgstr "Theip ar fhaisnéis APK a fháil, gan bacadh le {path}"
-
-#: ../fdroidserver/update.py
-msgid "Failed to get APK signing key fingerprint"
-msgstr "Níorbh fhéidir méarlorg eochracha sínithe APK a fháil"
-
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "Failed to install '{apkfilename}' on {dev}: {error}"
-msgstr "Theip ar shuiteáil '{apkfilename}' ar {dev}: {error}"
-
-#: ../fdroidserver/common.py
-msgid "Failed to sign application"
-msgstr "Theip ar an bhfeidhmchlár a shíniú"
-
-#: ../fdroidserver/build.py
-#, python-brace-format
-msgid "Fetched buildserverid from VM: {buildserverid}"
-msgstr "Fetched buildserverid ó VM: {buildserverid}"
-
-#: ../fdroidserver/signatures.py
-#, python-brace-format
-msgid "Fetched signatures for '{apkfilename}' -> '{sigdir}'"
-msgstr "Sínithe faighte le haghaidh '{apkfilename}' -> '{sigdir}'"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "File disappeared while processing it: {path}"
-msgstr "D'imigh an comhad agus é á phróiseáil: {path}"
-
-#: ../fdroidserver/build.py ../fdroidserver/install.py
-#: ../fdroidserver/rewritemeta.py ../fdroidserver/scanner.py
-#: ../fdroidserver/update.py
-msgid "Finished"
-msgstr "Críochnaithe"
-
-#: ../fdroidserver/lint.py
-msgid "Forbidden HTML tags"
-msgstr "Clibeanna HTML toirmiscthe"
-
-#: ../fdroidserver/build.py
-msgid "Force build of disabled apps, and carries on regardless of scan problems. Only allowed in test mode."
-msgstr "Fórsa tógáil apps faoi mhíchumas, agus déanann sé beag beann ar fhadhbanna scanadh. Ní cheadaítear ach amháin i mód tástála."
-
-#: ../fdroidserver/build.py
-#, python-brace-format
-msgid "Force halting build after {0} sec timeout!"
-msgstr "Fórsa stopadh a thógáil tar éis {0} timeout sec!"
-
-#: ../fdroidserver/scanner.py
-msgid "Force scan of disabled apps and builds."
-msgstr "Fórsa scanadh apps faoi mhíchumas agus tógann."
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Found \"{path}\" graphic without metadata for app \"{name}\"!"
-msgstr "Aimsíodh grafach \"{path}\" gan meiteashonraí don fheidhmchlár \"{name}\"!"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Found bad funding file \"{path}\" for \"{name}\":"
-msgstr "Aimsíodh drochchomhad maoinithe \"{path}\" in ionad \"{name}\":"
-
-#: ../fdroidserver/common.py
-msgid "Found invalid appids in arguments"
-msgstr "Aimsíodh appids neamhbhailí in argóintí"
-
-#: ../fdroidserver/common.py
-msgid "Found invalid versionCodes for some apps"
-msgstr "Aimsíodh leagan neamhbhailíCodes for some apps"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Found multiple JAR Signature Block Files in {path}"
-msgstr "Aimsíodh ilchomhaid Bloc Sínithe JAR i {path}"
-
-#: ../fdroidserver/common.py
-msgid "Found multiple Signer Certificates!"
-msgstr "Aimsíodh il-Theastais Signer!"
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Found multiple metadata files for {appid}"
-msgstr "Aimsíodh ilchomhaid mheiteashonraí le haghaidh {appid}"
-
-#: ../fdroidserver/index.py
-msgid "Found multiple signing certificates for repository."
-msgstr "Aimsíodh ildeimhnithe sínithe don stór."
-
-#: ../fdroidserver/index.py
-msgid "Found no signing certificates for repository."
-msgstr "Níor aimsíodh aon deimhnithe sínithe don stór."
-
-#: ../fdroidserver/lint.py
-#, python-format
-msgid "Found non-file at %s"
-msgstr "Aimsíodh neamhchomhad ag %s"
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Found {apkfilename} at {url}"
-msgstr "Aimsíodh {apkfilename} ag {url}"
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Found {count} problems in {filename}"
-msgstr "Aimsíodh fadhbanna {count} i {filename}"
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Found {count} warnings in {filename}"
-msgstr "Aimsíodh rabhaidh {count} in {filename}"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Generated skeleton metadata for {appid}"
-msgstr "Meiteashonraí cnámharlaigh ginte le haghaidh {appid}"
-
-#: ../fdroidserver/common.py
-#, python-format
-msgid "Git checkout of '%s' failed"
-msgstr "Theip ar sheiceáil Git de '%s'"
-
-#: ../fdroidserver/common.py
-msgid "Git clean failed"
-msgstr "Theip ar Git glan"
-
-#: ../fdroidserver/common.py
-msgid "Git fetch failed"
-msgstr "Theip ar ghabháil Git"
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/common.py
-#, python-format
-msgid "Git remote set-head failed: \"%s\""
-msgstr "Theip ar cheann socraithe cianda Git: \"%s\""
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/common.py
-msgid "Git reset failed"
-msgstr "Theip ar athshocrú Git"
-
-#: ../fdroidserver/common.py
-msgid "Git submodule deinit failed"
-msgstr "Theip ar Git submodule deinit"
-
-#: ../fdroidserver/common.py
-msgid "Git submodule sync failed"
-msgstr "Theip ar shioncronú submodule Git"
-
-#: ../fdroidserver/common.py
-msgid "Git submodule update failed"
-msgstr "Theip ar nuashonrú submodule Git"
-
-#: ../fdroidserver/common.py
-msgid "HTTPS must be used with Subversion URLs!"
-msgstr "Ní mór HTTPS a úsáid le URLanna Subversion!"
-
-#: ../fdroidserver/deploy.py
-msgid "If a git mirror gets to big, allow the archive to be deleted"
-msgstr "Má éiríonn scáthán git mór, lig don chartlann a scriosadh"
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "If this upload fails, try manually uploading to {url}"
-msgstr "Má theipeann ar an uaslódáil seo, déan iarracht uaslódáil de láimh chuig {url}"
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Ignoring '{field}' in '{metapath}' metadata because it is deprecated."
-msgstr "Neamhaird a dhéanamh ar mheiteashonraí '{field}' i meiteashonraí '{metapath}' toisc go bhfuil sé dímheasta."
-
-#: ../fdroidserver/update.py
-#, python-format
-msgid "Ignoring FUNDING.yml entry longer than 2048: %s"
-msgstr "Gan neamhaird a dhéanamh FUNDING.yml iontráil níos faide ná 2048: %s"
-
-#: ../fdroidserver/update.py
-#, python-format
-msgid "Ignoring bad element in manifest: %s"
-msgstr "Neamhaird á déanamh ar dhrocheilimint sa léiriú: %s"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Ignoring deprecated {oldfile}, use {newfile}!"
-msgstr "Má dhéantar neamhaird de {oldfile}, úsáid {newfile}!"
-
-#: ../fdroidserver/index.py
-msgid "Ignoring package without metadata: "
-msgstr "Neamhaird a dhéanamh ar phacáiste gan mheiteashonraí: "
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Ignoring stale cache data for {apkfilename}"
-msgstr "Neamhaird a dhéanamh ar shonraí taisce stale le haghaidh {apkfilename}"
-
-#: ../fdroidserver/update.py
-msgid "Include APKs that are signed with disabled algorithms like MD5"
-msgstr "Cuir APKs san áireamh atá sínithe le halgartaim faoi mhíchumas cosúil le MD5"
-
-#: ../fdroidserver/mirror.py
-msgid "Include the PGP signature .asc files in the mirror"
-msgstr "Cuir na comhaid sínithe PGP .asc san áireamh sa scáthán"
-
-#: ../fdroidserver/mirror.py
-msgid "Include the build logs in the mirror"
-msgstr "Cuir na logaí tógála sa scáthán san áireamh"
-
-#: ../fdroidserver/mirror.py
-msgid "Include the source tarballs in the mirror"
-msgstr "Cuir na tarballs foinse sa scáthán"
-
-#: ../fdroidserver/metadata.py
-#, python-format
-msgid "Including metadata from %s@%s"
-msgstr "Meiteashonraí ó %s@%s san áireamh"
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Including metadata from {path}"
-msgstr "Meiteashonraí ó {path} san áireamh"
-
-#: ../fdroidserver/common.py
-msgid "Initialising submodules"
-msgstr "Fo-mhodúil a thúsú"
-
-#: ../fdroidserver/install.py
-msgid "Install all signed applications available"
-msgstr "Suiteáil gach feidhmchlár sínithe atá ar fáil"
-
-#: ../fdroidserver/__main__.py
-msgid "Install built packages on devices"
-msgstr "Suiteáil pacáistí tógtha ar ghléasanna"
-
-#: ../fdroidserver/install.py
-#, python-format
-msgid "Installing %s..."
-msgstr "%s á shuiteáil..."
-
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "Installing '{apkfilename}' on {dev}..."
-msgstr "Ag suiteáil '{apkfilename}' ar {dev}..."
-
-#: ../fdroidserver/__main__.py
-msgid "Interact with the repo HTTP server"
-msgstr "Idirghníomhú leis an bhfreastalaí repo HTTP"
-
-#: ../fdroidserver/update.py
-msgid "Invalid APK"
-msgstr "APK neamhbhailí"
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "Invalid AutoUpdateMode: {mode}"
-msgstr "AutoUpdateMode neamhbhailí: {mode}"
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "Invalid UpdateCheckMode: {mode}"
-msgstr "Nuashonrú NeamhbhailíCheckMode: {mode}"
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "Invalid VercodeOperation: {field}"
-msgstr "VercodeOperation neamhbhailí: {field}"
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Invalid VercodeOperation: {invalid_ops}"
-msgstr "VercodeOperation neamhbhailí: {invalid_ops}"
-
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Invalid application ID {appid}"
-msgstr "Aitheantas neamhbhailí feidhmchláir {appid}"
-
-#: ../fdroidserver/lint.py
-msgid "Invalid bulleted list"
-msgstr "Liosta neamhbhailí le hurchair"
-
-#: ../fdroidserver/common.py
-#, python-format
-msgid "Invalid name for published file: %s"
-msgstr "Ainm neamhbhailí ar chomhad foilsithe: %s"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Invalid ndk: entry in build: \"{ndk}\""
-msgstr "Invalid ndk: iontráil sa tógáil: \"{ndk}\""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Invalid redirect to non-HTTPS: {before} -> {after} "
-msgstr "Atreorú neamhbhailí chuig neamh-HTTPS: {before} -> {after} "
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Invalid scrlib metadata: '{file}' does not exist"
-msgstr "Meiteashonraí scrlib neamhbhailí: níl '{file}' ann"
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Invalid srclib metadata: could not parse '{file}'"
-msgstr "Meiteashonraí neamhbhailí srclib: níorbh fhéidir '{file}' a pharsáil"
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Invalid srclib metadata: unknown key '{key}' in '{file}'"
-msgstr "Meiteashonraí neamhbhailí srclic: eochair anaithnid '{key}' in '{file}'"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "JAR signature failed to verify: {path}"
-msgstr "Theip ar shíniú JAR a fhíorú: {path}"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "JAR signature verified: {path}"
-msgstr "Síniú JAR fíoraithe: {path}"
-
-#: ../fdroidserver/scanner.py
-msgid "Java JAR file"
-msgstr "Comhad Java JAR"
-
-#: ../fdroidserver/mirror.py ../fdroidserver/publish.py
-#: ../fdroidserver/update.py
-msgid "Java JDK not found! Install in standard location or set java_paths!"
-msgstr "Níor aimsíodh Java JDK! Suiteáil i suíomh caighdeánach nó socraigh java_paths!"
-
-#: ../fdroidserver/scanner.py
-msgid "Java compiled class"
-msgstr "Rang tiomsaithe Java"
-
-#: ../fdroidserver/signindex.py
-msgid "Java jarsigner not found! Install in standard location or set java_paths!"
-msgstr "Níor aimsíodh jarsigner Java! Suiteáil i suíomh caighdeánach nó socraigh java_paths!"
-
-#: ../fdroidserver/lint.py
-msgid "Javascript in HTML src attributes"
-msgstr "Javascript i html src tréithe"
-
-#: ../fdroidserver/build.py
-#, python-brace-format
-msgid "Keeping failed build \"{apkfilename}\""
-msgstr "Theip ar an tógáil \"{apkfilename}\" a choinneáil"
-
-#: ../fdroidserver/init.py
-msgid "Keystore for signing key:\t"
-msgstr "Keystore le haghaidh eochair sínithe:\t"
-
-#: ../fdroidserver/lint.py
-msgid "Known debug key is used in AllowedAPKSigningKeys: "
-msgstr "Úsáidtear eochair dífhabhtaithe aitheanta i AllowedAPKSigningKeys: "
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Last used commit '{commit}' looks like a tag, but UpdateCheckMode is '{ucm}'"
-msgstr "Breathnaíonn an tiomantas is déanaí a úsáidtear '{commit}' cosúil le clib, ach updateCheckMode is '{ucm}'"
-
-#: ../fdroidserver/lint.py
-msgid "Liberapay donation methods belong in the Liberapay: field"
-msgstr "Baineann modhanna síntiús Liberapay sa Liberapay: réimse"
-
-#: ../fdroidserver/rewritemeta.py
-msgid "List files that would be reformatted (dry run)"
-msgstr "Liostaigh comhaid a leasófaí (rith tirim)"
-
-#: ../fdroidserver/lint.py
-msgid "Locale included in f-droid.org URL"
-msgstr "Logchaighdeán san áireamh sa URL f-droid.org"
-
-#: ../fdroidserver/build.py
-msgid "Make the build stop on exceptions"
-msgstr "Déan an stad tógála ar eisceachtaí"
-
-#: ../fdroidserver/index.py
-msgid "Malformed repository mirrors."
-msgstr "Scátháin stór míchumtha."
-
-#: ../fdroidserver/deploy.py
-msgid "Malformed serverwebroot line:"
-msgstr "Líne freastalaí míchumthawebroot:"
-
-#: ../fdroidserver/scanner.py
-#, python-format
-msgid "Max recursion depth in ZIP file reached: %s"
-msgstr "Sroicheadh uasdoimhneacht athchúrsaithe sa chomhad ZIP: %s"
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "Mirror config for {url} contains \"isPrimary\" key!"
-msgstr "Tá eochair \"isPrimary\" i gcumraíocht scátháin do {url}!"
-
-#: ../fdroidserver/mirror.py
-msgid "Mirror the full repo and archive, all file types."
-msgstr "Scáthánaigh an repo iomlán agus cartlann, gach cineál comhaid."
-
-#: ../fdroidserver/gpgsign.py
-msgid "Missing output directory"
-msgstr "Comhadlann aschurtha ar iarraidh"
-
-#: ../fdroidserver/metadata.py
-msgid "Moving Anti-Features declarations to localized files:"
-msgstr "Dearbhuithe Frith-Gnéithe a bhogadh chuig comhaid logánaithe:"
-
-#: ../fdroidserver/index.py
-msgid "Neither \"repo_pubkey\" nor \"keystorepass\" set in config.yml"
-msgstr "Níl \"repo_pubkey\" ná \"keystorepass\" leagtha síos i config.yml"
-
-#: ../fdroidserver/verify.py
-#, python-format
-msgid "No APK for package: %s"
-msgstr "Gan APK don phacáiste: %s"
-
-#: ../fdroidserver/common.py
-msgid "No Android SDK found!"
-msgstr "Níor aimsíodh SDK Android!"
-
-#: ../fdroidserver/install.py
-msgid "No attached devices found"
-msgstr "Níor aimsíodh aon ghléas ceangailte"
-
-#: ../fdroidserver/install.py
-msgid "No devices found for `adb install`! Please plug one in."
-msgstr "Níor aimsíodh aon ghléas le haghaidh `adb install`! Cuir ceann isteach le do thoil."
-
-#: ../fdroidserver/index.py
-msgid "No fingerprint in URL."
-msgstr "Gan méarlorg in URL."
-
-#: ../fdroidserver/common.py
-msgid "No git submodules available"
-msgstr "Níl aon submodules git ar fáil"
-
-#: ../fdroidserver/import_subcommand.py
-msgid "No gradle project could be found. Specify --subdir?"
-msgstr "Ní raibh aon tionscadal grádaithe le fáil. Sonraigh --subdir?"
-
-#: ../fdroidserver/import_subcommand.py
-msgid "No information found."
-msgstr "Níor aimsíodh aon eolas."
-
-#: ../fdroidserver/checkupdates.py
-msgid "No matching tags found"
-msgstr "Níor aimsíodh clibeanna meaitseála"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "No minimum SDK version found in {0}, using default (3)."
-msgstr "Níor aimsíodh aon leagan SDK íosta i {0}, ag baint úsáide as réamhshocrú (3)."
-
-#: ../fdroidserver/lint.py
-msgid "No need to specify that the app is Free Software"
-msgstr "Ní gá a shonrú go bhfuil an app Bogearraí Saor in Aisce"
-
-#: ../fdroidserver/lint.py
-msgid "No need to specify that the app is for Android"
-msgstr "Ní gá a shonrú go bhfuil an aip le haghaidh Android"
-
-#: ../fdroidserver/deploy.py
-msgid "No option set! Edit your config.yml to set at least one of these:"
-msgstr "Níl aon rogha socraithe! Cuir do config.yml in eagar chun ceann amháin díobh seo ar a laghad a shocrú:"
-
-#: ../fdroidserver/common.py
-msgid "No packages specified"
-msgstr "Níor sonraíodh aon phacáistí"
-
-#: ../fdroidserver/install.py
-#, python-format
-msgid "No signed APK available for %s"
-msgstr "Níl APK sínithe ar fáil le haghaidh %s"
-
-#: ../fdroidserver/install.py
-msgid "No signed output directory - nothing to do"
-msgstr "Gan chomhadlann aschurtha sínithe - níl aon rud le déanamh"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "No signing certificates found in {path}"
-msgstr "Níor aimsíodh aon deimhnithe sínithe i {path}"
-
-#: ../fdroidserver/common.py
-#, python-format
-msgid "No such package: %s"
-msgstr "Gan a leithéid de phacáiste: %s"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "No such versionCode {versionCode} for app {appid}"
-msgstr "Níl a leithéid de versionCode {versionCode} for app {appid}"
-
-#: ../fdroidserver/checkupdates.py
-msgid "No tags found"
-msgstr "Níor aimsíodh clibeanna ar bith"
-
-#: ../fdroidserver/publish.py ../fdroidserver/verify.py
-msgid "No unsigned directory - nothing to do"
-msgstr "Gan chomhadlann gan síniú - níl aon rud le déanamh"
-
-#: ../fdroidserver/__main__.py
-msgid "No version information could be found."
-msgstr "Níorbh fhéidir aon eolas faoin leagan a aimsiú."
-
-#: ../fdroidserver/common.py
-msgid "Not a valid size definition: \"{}\""
-msgstr "Ní sainmhíniú bailí méide é: \"{}\""
-
-#: ../fdroidserver/signindex.py
-msgid "Nothing to do"
-msgstr "Faic le déanamh"
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "Nothing to do for {appid}."
-msgstr "Níl aon rud le déanamh le haghaidh {appid}."
-
-#: ../fdroidserver/init.py
-msgid "Now set these in config.yml:"
-msgstr "Anois leagtar iad seo i config.yml:"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "OBB file has newer versionCode({integer}) than any APK:"
-msgstr "Tá leagan níos nuaíCode({integer}) ag comhad OBB ná aon APK:"
-
-#: ../fdroidserver/update.py
-msgid "OBB filename must start with \"main.\" or \"patch.\":"
-msgstr "Ní mór ainm comhaid OBB tosú le \"príomh.\" nó \"paiste.\":"
-
-#: ../fdroidserver/update.py
-msgid "OBB's packagename does not match a supported APK:"
-msgstr "Ní mheaitseálann ainm pacáiste OBB APK tacaithe:"
-
-#: ../fdroidserver/deploy.py
-msgid "Offline machine, skipping git mirror generation until `fdroid deploy`"
-msgstr "Meaisín as líne, gan bacadh le giniúint scáthán git go dtí 'imscaradh fdroid'"
-
-#: ../fdroidserver/deploy.py
-msgid "One of the 'github_releases' config items is missing the 'packageNames' value. skipping ..."
-msgstr "Tá luach 'packageNames' in easnamh ar cheann de na míreanna cumraíochta 'github_releases'. gan bacadh ..."
-
-#: ../fdroidserver/deploy.py
-msgid "One of the 'github_releases' config items is missing the 'projectUrl' value. skipping ..."
-msgstr "Tá luach 'projectUrl' in easnamh ar cheann de na míreanna cumraíochta 'github_releases'. gan bacadh ..."
-
-#: ../fdroidserver/deploy.py
-msgid "One of the 'github_releases' config items is missing the 'token' value. skipping ..."
-msgstr "Tá an luach 'comhartha' in easnamh ar cheann de na míreanna cumraíochta 'github_releases'. gan bacadh ..."
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Only PNG and JPEG are supported for graphics, found: {path}"
-msgstr "Ní thacaítear ach le PNG agus JPEG le haghaidh grafaicí, le fáil: {path}"
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/common.py
-msgid "Only accepts a single key \"env\""
-msgstr "Ní ghlacann ach le \"env\" eochair amháin"
-
-#: ../fdroidserver/checkupdates.py
-msgid "Only process apps with auto-updates"
-msgstr "Ná próiseáil ach feidhmchláir le nuashonruithe uathoibríocha"
-
-#: ../fdroidserver/lint.py
-msgid "OpenCollective donation methods belong in the OpenCollective: field"
-msgstr "Baineann modhanna síntiús OpenCollective sa OpenCollective: réimse"
-
-#: ../fdroidserver/verify.py
-msgid "Output JSON report to file named after APK."
-msgstr "Aschuir tuarascáil JSON le comhad ainmnithe i ndiaidh APK."
-
-#: ../fdroidserver/scanner.py
-msgid "Output JSON to stdout."
-msgstr "Aschur JSON go dtí an gnáth-roinn."
-
-#: ../fdroidserver/checkupdates.py ../fdroidserver/gpgsign.py
-#: ../fdroidserver/publish.py ../fdroidserver/signindex.py
-#: ../fdroidserver/update.py
-msgid "Outputting JSON"
-msgstr "Aschur JSON"
-
-#: ../fdroidserver/import_subcommand.py
-msgid "Overall license of the project."
-msgstr "Ceadúnas foriomlán an tionscadail."
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "Overriding blank versionName in {apkfilename} from metadata: {version}"
-msgstr "Leagan bán sáraitheachName in {apkfilename} ó mheiteashonraí: {version}"
-
-#: ../fdroidserver/import_subcommand.py
-#, python-brace-format
-msgid "Package \"{appid}\" already exists"
-msgstr "Tá pacáiste \"{appid}\" ann cheana"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Parsing manifest at '{path}'"
-msgstr "Léiriú parsála ag '{path}'"
-
-#: ../fdroidserver/common.py
-msgid "Password required with username"
-msgstr "Pasfhocal de dhíth le hainm úsáideora"
-
-#: ../fdroidserver/import_subcommand.py
-msgid "Path to main Android project subdirectory, if not in root."
-msgstr "Conair chuig príomhchomhadlann tionscadail Android, más rud é nach bhfuil sé i bhfréamh."
-
-#: ../fdroidserver/init.py
-msgid "Path to the Android SDK (sometimes set in ANDROID_HOME)"
-msgstr "Conair chuig an SDK Android (uaireanta a leagtar i ANDROID_HOME)"
-
-#: ../fdroidserver/btlog.py
-msgid "Path to the git repo to use as the log"
-msgstr "Conair chuig an repo git le húsáid mar an logáil isteach"
-
-#: ../fdroidserver/init.py
-msgid "Path to the keystore for the repo signing key"
-msgstr "Conair chuig an siopa eochrach don eochair sínithe repo"
-
-#: ../fdroidserver/nightly.py
-msgid "Print the secret variable to the terminal for easy copy/paste"
-msgstr "Priontáil an athróg rúnda chuig an teirminéal le haghaidh cóip / greamaigh éasca"
-
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "Privacy mode was enabled based on your locale ({country_code})."
-msgstr "Cumasaíodh mód príobháideachta bunaithe ar do logán ({country_code})."
-
-#: ../fdroidserver/scanner.py
-#, python-format
-msgid "Problem with ZIP file: %s, error %s"
-msgstr "Fadhb le comhad ZIP: %s, earráid %s"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Problem with xml at '{path}'"
-msgstr "Fadhb le xml ag '{path}'"
-
-#: ../fdroidserver/checkupdates.py
-msgid "Process auto-updates"
-msgstr "Próiseas uath-nuashonruithe"
-
-#: ../fdroidserver/publish.py ../fdroidserver/update.py
-#, python-brace-format
-msgid "Processing {apkfilename}"
-msgstr "Próiseáil {apkfilename}"
-
-#: ../fdroidserver/checkupdates.py ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Processing {appid}"
-msgstr "Próiseáil {appid}"
-
-#: ../fdroidserver/update.py
-msgid "Produce human-readable XML/JSON for index files"
-msgstr "XML / JSON atá inléite ag an duine a tháirgeadh le haghaidh comhaid innéacs"
-
-#: ../fdroidserver/import_subcommand.py
-msgid "Project URL to import from."
-msgstr "URL an tionscadail le hiompórtáil uaidh."
-
-#: ../fdroidserver/lint.py
-msgid "Punctuation should be avoided"
-msgstr "Ba cheart poncaíocht a sheachaint"
-
-#: ../fdroidserver/btlog.py
-msgid "Push the log to this git remote repository"
-msgstr "Brúigh an logáil isteach sa stór cianda git seo"
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Pushing binary transparency log to {url}"
-msgstr "Ag brú loga trédhearcachta dénártha chuig {url}"
-
-#: ../fdroidserver/deploy.py
-msgid "Pushing to remote server failed!"
-msgstr "Theip ar bhrú chuig freastalaí cianda!"
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Pushing to {url}"
-msgstr "Ag brú go {url}"
-
-#: ../fdroidserver/__main__.py
-msgid "Quickly start a new repository"
-msgstr "Tosaigh stór nua go tapa"
-
-#: ../fdroidserver/__main__.py
-msgid "Read all the metadata files and exit"
-msgstr "Léigh na comhaid mheiteashonraí go léir agus scoir"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Reading '{config_file}'"
-msgstr "Ag léamh '{config_file}'"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Reading packageName/versionCode/versionName failed, APK invalid: '{apkfilename}'"
-msgstr "Pacáiste á léamhName/versionCode/versionName failed, APK invalid: '{apkfilename}'"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Reading packageName/versionCode/versionName failed,APK invalid: '{apkfilename}'"
-msgstr "Pacáiste á léamhName/versionCode/versionName failed,APK invalid: '{apkfilename}'"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Reading {apkfilename} from cache"
-msgstr "{apkfilename} á léamh ón taisce"
-
-#: ../fdroidserver/build.py
-msgid "Refresh and cache scanner rules and signatures from the network"
-msgstr "Athnuaigh agus cuir rialacha agus sínithe scanóirí taisce ón líonra"
-
-#: ../fdroidserver/publish.py
-#, python-brace-format
-msgid "Refusing to sign '{path}', file exists in both {dir1} and {dir2} folder."
-msgstr "Ag diúltú '{path}' a shíniú, tá an comhad san fhillteán {dir1} agus {dir2} araon."
-
-#: ../fdroidserver/verify.py
-msgid "Remove source tarball and any APKs if successfully verified."
-msgstr "Bain tarball foinse agus aon APKanna má fhíoraítear go rathúil é."
-
-#: ../fdroidserver/common.py
-msgid "Removing specified files"
-msgstr "Comhaid shonraithe á mbaint"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Removing {path}\""
-msgstr "Ag baint {path}\""
-
-#: ../fdroidserver/update.py
-msgid "Rename APK files that do not match package.name_123.apk"
-msgstr "Athainmnigh comhaid APK nach bhfuil comhoiriúnach package.name_123.apk"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "RepoType {type} is deprecated, please switch to git."
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-#, python-brace-format
-msgid "Resigning {apkfilename} with provided debug.keystore"
-msgstr "Ag éirí as {apkfilename} le debug.keystore ar fáil"
-
-#: ../fdroidserver/update.py
-msgid "Resize all the icons exceeding the max pixel size and exit"
-msgstr "Athraigh méid na ndeilbhíní go léir a sháraíonn an t-uasmhéid picteilín agus scoir"
-
-#: ../fdroidserver/common.py
-msgid "Restrict output to warnings and errors"
-msgstr "Cuir srian le haschur le rabhaidh agus earráidí"
-
-#: ../fdroidserver/net.py
-#, python-format
-msgid "Retrying failed download: %s"
-msgstr "Theip ar íosluchtú arís: %s"
-
-#: ../fdroidserver/__main__.py
-msgid "Rewrite all the metadata files"
-msgstr "Athscríobh na comhaid mheiteashonraí go léir"
-
-#: ../fdroidserver/rewritemeta.py
-#, python-brace-format
-msgid "Rewriting '{appid}'"
-msgstr "Athscríobh '{appid}'"
-
-#: ../fdroidserver/checkupdates.py
-msgid "Run on git repo that has uncommitted changes"
-msgstr "Rith ar repo git go bhfuil athruithe uncommitted"
-
-#: ../fdroidserver/nightly.py
-#, python-brace-format
-msgid "Run over {cibase} to find -debug.apk. and skip repo_basedir {repo_basedir}"
-msgstr "Rith thar {cibase} chun -debug.apk a aimsiú. agus scipeáil repo_basedir {repo_basedir}"
-
-#: ../fdroidserver/lint.py
-msgid "Run rewritemeta to fix formatting"
-msgstr "Rith rewritemeta chun formáidiú a shocrú"
-
-#: ../fdroidserver/deploy.py
-msgid "Running first pass with MD5 checking disabled"
-msgstr "Ag rith an chéad phas le MD5 seiceáil faoi mhíchumas"
-
-#: ../fdroidserver/mirror.py
-#, python-brace-format
-msgid "Running wget in {path}"
-msgstr "Ag rith wget in {path}"
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "SHA-256 of {url} does not match entry!"
-msgstr "Ní mheaitseálann SHA-256 de {url} iontráil!"
-
-#: ../fdroidserver/build.py
-msgid "Scan the resulting APK(s) for known non-free classes."
-msgstr "Scan an APK (í) mar thoradh air sin le haghaidh ranganna neamh-saor in aisce ar a dtugtar."
-
-#: ../fdroidserver/__main__.py
-msgid "Scan the source code of a package"
-msgstr "Scan cód foinse pacáiste"
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Scanner found {count} problems in {apk}"
-msgstr "Fuair scanóir fadhbanna {count} i {apk}"
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Scanner found {count} problems in {appid}:"
-msgstr "D'aimsigh scanóir fadhbanna {count} i {appid}:"
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Scanner found {count} problems in {appid}:{versionCode}:"
-msgstr "Fuair scanóir fadhbanna {count} in {appid}:{versionCode}:"
-
-#: ../fdroidserver/build.py
-msgid "Scanner found {} problem"
-msgid_plural "Scanner found {} problems"
-msgstr[0] "Aimsíodh {} fadhb leis an scanóir"
-msgstr[1] "Fuair an scanóir {} fadhbanna"
-msgstr[2] "Fuair an scanóir {} fadhbanna"
-msgstr[3] "Fuair an scanóir {} fadhbanna"
-msgstr[4] "Fuair an scanóir {} fadhbanna"
-
-#: ../fdroidserver/scanner.py
-msgid "Scanning APK for extra signing blocks."
-msgstr "Scanadh APK le haghaidh bloic sínithe breise."
-
-#: ../fdroidserver/scanner.py
-msgid "Scanning APK with dexdump for known non-free classes."
-msgstr "Scanadh APK le dexdump do ranganna neamh-saor in aisce ar a dtugtar."
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Set NDK {release} ({version}) up"
-msgstr "Socraigh NDK {release} ({version}) suas"
-
-#: ../fdroidserver/common.py
-msgid "Set clock to that time using:"
-msgstr "Socraigh clog go dtí an t-am sin ag baint úsáide as:"
-
-#: ../fdroidserver/nightly.py
-msgid "Set maximum releases in repo before older ones are archived"
-msgstr "Socraigh na heisiúintí uasta in repo sula gcuirtear na cinn níos sine i gcartlann"
-
-#: ../fdroidserver/build.py
-#, python-brace-format
-msgid "Set open file limit to {integer}"
-msgstr "Socraigh teorainn oscailte comhaid go {integer}"
-
-#: ../fdroidserver/__main__.py
-msgid "Set up an app build for a nightly build repo"
-msgstr "Socraigh tógáil app le haghaidh repo tógála oíche"
-
-#: ../fdroidserver/build.py
-msgid "Setting open file limit failed: "
-msgstr "Níorbh fhéidir teorainn oscailte comhaid a shocrú: "
-
-#: ../fdroidserver/build.py
-#, python-brace-format
-msgid "Setting {0} sec timeout for this build"
-msgstr "Am istigh soic {0} leagan síos don tógáil seo"
-
-#: ../fdroidserver/__main__.py
-msgid "Sign and place packages in the repo"
-msgstr "Sínigh agus cuir pacáistí sa repo"
-
-#: ../fdroidserver/__main__.py
-msgid "Sign indexes created using update --nosign"
-msgstr "Sínigh innéacsanna a cruthaíodh le nuashonrú --nosign"
-
-#: ../fdroidserver/build.py
-msgid "Skip scanning the source code for binaries and other problems"
-msgstr "Scipeáil scanadh an cód foinse do binaries agus fadhbanna eile"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Skipping '{apkfilename}' with invalid signature!"
-msgstr "Scipeáil '{apkfilename}' le síniú neamhbhailí!"
-
-#: ../fdroidserver/deploy.py ../fdroidserver/index.py
-#, python-format
-msgid "Skipping GitLab Pages mirror because the repo is too large (>%.2fGB)!"
-msgstr "Scáthán Leathanaigh GitLab á scipeáil toisc go bhfuil an repo ró-mhór (>%.2fGB)!"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Skipping index generation for {appid}"
-msgstr "Gan bacadh le giniúint innéacs le haghaidh {appid}"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Skipping {apkfilename} with invalid signature!"
-msgstr "Scipeáil {apkfilename} le síniú neamhbhailí!"
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Skipping {appid}: disabled"
-msgstr "Scipeáil {appid}: disabled"
-
-#: ../fdroidserver/deploy.py
-msgid "Specify a local folder to sync the repo to"
-msgstr "Sonraigh fillteán logánta chun an t-athshealbhú a shioncronú"
-
-#: ../fdroidserver/deploy.py
-msgid "Specify an identity file to provide to SSH for rsyncing"
-msgstr "Sonraigh comhad aitheantais le soláthar do SSH le haghaidh rsyncing"
-
-#: ../fdroidserver/nightly.py
-msgid "Specify which debug keystore file to use."
-msgstr "Sonraigh an comhad siopa eochrach dífhabhtaithe atá le húsáid."
-
-#: ../fdroidserver/common.py
-msgid "Spew out even more information than normal"
-msgstr "Spew amach níos mó eolais ná mar is gnách"
-
-#: ../fdroidserver/nightly.py
-#, python-brace-format
-msgid "Stripping mystery signature from {apkfilename}"
-msgstr "Síniú rúndiamhrach á stialladh ó {apkfilename}"
-
-#: ../fdroidserver/lint.py
-#, python-format
-msgid "Summary '%s' is just the app's name"
-msgstr "Achoimre níl i '%s' ach ainm an fheidhmchláir"
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Summary of length {length} is over the {limit} char limit"
-msgstr "Tá achoimre ar fhad {length} os cionn na teorann char {limit}"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "System clock is older than date in {path}!"
-msgstr "Tá clog an chórais níos sine ná an dáta i {path}!"
-
-#: ../fdroidserver/checkupdates.py
-msgid "Tags update mode only works for git, hg, bzr and git-svn repositories currently"
-msgstr "Ní oibríonn mód nuashonraithe clibeanna ach amháin le haghaidh stórtha git, hg, bzr agus git-svn faoi láthair"
-
-#: ../fdroidserver/checkupdates.py
-msgid "Tags update mode used in git-svn, but the repo was not set up with tags"
-msgstr "Clibeanna cothrom le dáta modh a úsáidtear i git-svn, ach ní raibh an repo ar bun le clibeanna"
-
-#: ../fdroidserver/build.py
-msgid "Test mode - put output in the tmp directory only, and always build, even if the output already exists."
-msgstr "Modh tástála - aschur a chur san eolaire tmp amháin, agus a thógáil i gcónaí, fiú má tá an t-aschur ann cheana féin."
-
-#: ../fdroidserver/index.py
-msgid "The \"qrcode\" Python package is not installed (e.g. apt-get install python3-qrcode)!"
-msgstr "Níl an pacáiste Python \"qrcode\" suiteáilte (m.sh. apt-get install python3-qrcode)!"
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "The OBB version code must come after \"{name}.\":"
-msgstr "Ní mór don chód leagan OBB teacht i ndiaidh \"{name}.\":"
-
-#: ../fdroidserver/btlog.py
-msgid "The base URL for the repo to log (default: https://f-droid.org)"
-msgstr "An URL bonn le haghaidh an repo a logáil (réamhshocrú: https://f-droid.org)"
-
-#: ../fdroidserver/mirror.py
-msgid "The directory to write the mirror to"
-msgstr "An chomhadlann chun an scáthán a scríobh chuig"
-
-#: ../fdroidserver/nightly.py
-msgid "The file to be included in the repo (path or glob)"
-msgstr "An comhad atá le cur san áireamh sa repo (cosán nó glob)"
-
-#: ../fdroidserver/index.py
-msgid "The repository's fingerprint does not match."
-msgstr "Ní mheaitseálann méarlorg an stóir."
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "The root dir for local_copy_dir \"{path}\" does not exist!"
-msgstr "Níl an dir fréimhe do local_copy_dir \"{path}\" ann!"
-
-#: ../fdroidserver/publish.py
-msgid "There is a keyalias collision - publishing halted"
-msgstr "Tá imbhualadh keyalias ann - cuireadh stop leis an bhfoilsitheoireacht"
-
-#: ../fdroidserver/common.py
-msgid "These are the apps that have been archived from the main repo."
-msgstr "Is iad seo na feidhmchláir atá curtha i gcartlann ón bpríomh-repo."
-
-#: ../fdroidserver/mirror.py
-msgid "This command should never be used to mirror f-droid.org! A full copy requires more than 600GB."
-msgstr "Níor chóir an t-ordú seo a úsáid riamh chun scáthán a dhéanamh ar f-droid.org! Éilíonn cóip iomlán níos mó ná 600GB."
-
-#: ../fdroidserver/common.py
-msgid "This is a repository of apps to be used with F-Droid. Applications in this repository are either official binaries built by the original application developers, or are binaries built from source by the admin of f-droid.org using the tools on https://gitlab.com/fdroid."
-msgstr "Is stór feidhmchlár é seo atá le húsáid le F-Droid. Tá iarratais sa stór ceachtar binaries oifigiúla tógtha ag na forbróirí iarratas bunaidh, nó tá binaries tógtha ó fhoinse ag an admin f-droid.org ag baint úsáide as na huirlisí ar https://gitlab.com/fdroid."
-
-#: ../fdroidserver/import_subcommand.py
-#, python-format
-msgid "This repo already has local metadata: %s"
-msgstr "Tá meiteashonraí logánta ag an athiarratas seo cheana: %s"
-
-#: ../fdroidserver/init.py
-#, python-format
-msgid ""
-"To complete the setup, add your APKs to \"%s\"\n"
-"then run \"fdroid update -c; fdroid update\".  You might also want to edit\n"
-"\"config.yml\" to set the URL, repo name, and more.  You should also set up\n"
-"a signing key (a temporary one might have been automatically generated).\n"
-"\n"
-"For more info: https://f-droid.org/docs/Setup_an_F-Droid_App_Repo\n"
-"and https://f-droid.org/docs/Signing_Process"
-msgstr ""
-"Chun an socrú a chríochnú, cuir do APKs le \"%s\"\n"
-"Ansin rith \"Nuashonrú FDROID -C; nuashonrú fdroid\".  B'fhéidir gur mhaith leat eagarthóireacht a dhéanamh freisin\n"
-"\"config.yml\" a shocrú ar an URL, ainm repo, agus níos mó.  Chomh maith leis sin, ba cheart duit\n"
-"eochair shínithe (d'fhéadfadh ceann sealadach a bheith ginte go huathoibríoch).\n"
-"\n"
-"Tuilleadh eolais: https://f-droid.org/docs/Setup_an_F-Droid_App_Repo\n"
-"agus https://f-droid.org/docs/Signing_Process"
-
-#: ../fdroidserver/deploy.py
-msgid "To use awsbucket, awssecretkey and awsaccesskeyid must also be set in config.yml!"
-msgstr "Chun awsbucket a úsáid, ní mór awssecretkey agus awsaccesskeyid a shocrú i config.yml freisin!"
-
-#: ../fdroidserver/deploy.py
-msgid "To use rclone, rclone_config and awsbucket must be set in config.yml!"
-msgstr "Chun rclone a úsáid, ní mór rclone_config agus awsbucket a shocrú i config.yml!"
-
-#: ../fdroidserver/lint.py
-msgid "URL must start with https:// or http://"
-msgstr "Ní mór URL tosú le https:// nó http://"
-
-#: ../fdroidserver/lint.py
-msgid "URL shorteners should not be used"
-msgstr "Níor chóir giorraithe URL a úsáid"
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "URL {url} in Description: {error}"
-msgstr "URL {url} in Description: {error}"
-
-#: ../fdroidserver/lint.py
-msgid "Unexpected license tag \"{}\"! Only use FSF or OSI approved tags from https://spdx.org/license-list"
-msgstr "Clib cheadúnais gan choinne \"{}\"! Ná húsáid ach clibeanna faofa FSF nó OSI ó https://spdx.org/license-list"
-
-#: ../fdroidserver/lint.py
-msgid "Unexpected license tag \"{}\"! Only use license tags configured in your config file"
-msgstr "Clib cheadúnais gan choinne \"{}\"! Ná húsáid ach clibeanna ceadúnais atá cumraithe i do chomhad cumraíochta"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Unknown entry {key} in {configname}"
-msgstr "Iontráil anaithnid {key} in {configname}"
-
-#: ../fdroidserver/__main__.py
-msgid "Unknown exception found!"
-msgstr "Aimsíodh eisceacht anaithnid!"
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Unknown file '{filename}' in build '{versionName}'"
-msgstr "Comhad anaithnid '{filename}' in build '{versionName}'"
-
-#: ../fdroidserver/metadata.py
-#, python-format
-msgid "Unknown metadata format: %s"
-msgstr "Formáid anaithnid mheiteashonraí: %s"
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Unknown metadata format: {path} (use: *.yml)"
-msgstr "Formáid mheiteashonraí anaithnid: {path} (úsáid: *.yml)"
-
-#: ../fdroidserver/common.py
-msgid "Unknown version of aapt, might cause problems: "
-msgstr "Leagan anaithnid de aapt, d'fhéadfadh fadhbanna a chruthú: "
-
-#: ../fdroidserver/lint.py
-msgid "Unnecessary leading space"
-msgstr "Spás tosaigh gan ghá"
-
-#: ../fdroidserver/lint.py
-msgid "Unnecessary trailing space"
-msgstr "Spás rianaithe gan ghá"
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Unrecognised app field '{fieldname}' in '{path}'"
-msgstr "Réimse app neamhaitheanta '{fieldname}' in '{path}'"
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Unrecognised build flag '{build_flag}' in '{path}'"
-msgstr "Bratach tógála neamhaitheanta '{build_flag}' in '{path}'"
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Unsupported file type \"{extension}\" for repo graphic"
-msgstr "Cineál comhaid gan tacaíocht \"{extension}\" le haghaidh grafach repo"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Unsupported graphics file found: {path}"
-msgstr "Aimsíodh comhad grafaicí gan tacaíocht: {path}"
-
-#: ../fdroidserver/lint.py
-#, python-format
-msgid "Unused extlib at %s"
-msgstr "Extlib neamhúsáidte ag %s"
-
-#: ../fdroidserver/lint.py
-#, python-format
-msgid "Unused file at %s"
-msgstr "Comhad neamhúsáidte ag %s"
-
-#: ../fdroidserver/scanner.py
-#, python-format
-msgid "Unused scandelete path: %s"
-msgstr "Conair scanta neamhúsáidte: %s"
-
-#: ../fdroidserver/scanner.py
-#, python-format
-msgid "Unused scanignore path: %s"
-msgstr "Conair scanignore neamhúsáidte: %s"
-
-#: ../fdroidserver/__main__.py
-msgid "Update repo information for new packages"
-msgstr "Nuashonraigh faisnéis maidir le pacáistí nua"
-
-#: ../fdroidserver/__main__.py
-msgid "Update the binary transparency log for a URL"
-msgstr "Nuashonraigh an logchomhad trédhearcachta dénártha le haghaidh URL"
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "UpdateCheckData has invalid URL: {url}"
-msgstr "Tá URL neamhbhailí ag UpdateCheckData: {url}"
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "UpdateCheckData must match the version code as integer (\\d or [0-9]): {codeex}"
-msgstr "Ní mór do UpdateCheckData an cód leagain a mheaitseáil mar slánuimhir (\\d nó [0-9]): {codeex}"
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "UpdateCheckData must use HTTPS URL: {url}"
-msgstr "Ní mór do UpdateCheckData URL HTTPS a úsáid: {url}"
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "UpdateCheckData not a valid URL: {url}"
-msgstr "UpdateCheckData ní URL bailí é: {url}"
-
-#: ../fdroidserver/lint.py
-msgid "UpdateCheckMode is set but it looks like checkupdates hasn't been run yet."
-msgstr "Tá UpdateCheckMode socraithe ach tá an chuma air nach bhfuil checkupdates rite fós."
-
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/lint.py
-msgid "UpdateCheckName is set to the known application ID, it can be removed"
-msgstr "UpdateCheckName is set to the known application ID, is féidir é a bhaint"
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Uploading {apkfilename} to androidobservatory.org"
-msgstr "{apkfilename} á uaslódáil chuig androidobservatory.org"
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Uploading {apkfilename} to virustotal"
-msgstr "{apkfilename} á uaslódáil chuig virustotal"
-
-#: ../fdroidserver/lint.py
-msgid "Use /HEAD instead of /master or /main to point at a file in the default branch"
-msgstr "Úsáid / HEAD in ionad / máistir nó / príomh go pointe ag comhad sa bhrainse réamhshocraithe"
-
-#: ../fdroidserver/update.py
-msgid "Use `fdroid update -c` to create it."
-msgstr "Bain úsáid as 'nuashonrú fdroid -c' chun é a chruthú."
-
-#: ../fdroidserver/build.py
-msgid "Use build server"
-msgstr "Úsáid freastalaí tógála"
-
-#: ../fdroidserver/update.py
-msgid "Use date from APK instead of current time for newly added APKs"
-msgstr "Dáta úsáide ó APK in ionad an ama reatha le haghaidh APKs nua-bhreise"
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Using \"{path}\" for configuring s3cmd."
-msgstr "Ag baint úsáide as \"{path}\" chun s3cmd a chumrú."
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Using \"{path}\" for syncing with remote storage."
-msgstr "Ag baint úsáide as \"{path}\" chun sioncronú le cianstóráil."
-
-#: ../fdroidserver/common.py
-msgid "Using APK Signature v2"
-msgstr "Ag baint úsáide as Síniú APK v2"
-
-#: ../fdroidserver/common.py
-msgid "Using APK Signature v3"
-msgstr "Ag baint úsáide as Síniú APK v3"
-
-#: ../fdroidserver/common.py
-msgid "Using JAR Signature"
-msgstr "Ag baint úsáide as Síniú JAR"
-
-#: ../fdroidserver/common.py
-msgid "Using Java's jarsigner, not recommended for verifying APKs! Use apksigner"
-msgstr "Ag baint úsáide as jarsigner Java, ní mholtar chun APKs a fhíorú! Úsáid apksigner"
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Using blank dictionary instead of contents of {path}!"
-msgstr "Ag baint úsáide as foclóir bán in ionad ábhar {path}!"
-
-#: ../fdroidserver/init.py
-#, python-brace-format
-msgid "Using existing keystore \"{path}\""
-msgstr "Ag baint úsáide as keystore atá ann cheana \"{path}\""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Using rclone to sync with: {url}"
-msgstr "Ag baint úsáide as rclone chun sioncronú le: {url}"
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Using s3cmd to sync with: {url}"
-msgstr "Ag baint úsáide as s3cmd chun sioncronú le: {url}"
-
-#: ../fdroidserver/__main__.py
-msgid "Valid commands are:"
-msgstr "Is iad na horduithe bailí ná:"
-
-#: ../fdroidserver/verify.py
-msgid "Verify against locally cached copy rather than redownloading."
-msgstr "Fíoraigh i gcoinne cóip atá i dtaisce go háitiúil seachas athluchtú."
-
-#: ../fdroidserver/__main__.py
-msgid "Verify the integrity of downloaded packages"
-msgstr "Fíoraigh sláine na bpacáistí íoslódáilte"
-
-#: ../fdroidserver/index.py
-msgid "Verifying index signature:"
-msgstr "Síniú an innéacs á fhíorú:"
-
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "Verifying package {path} with apksigner."
-msgstr "Pacáiste {path} á fhíorú le apksigner."
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "VirusTotal API key cannot upload files larger than 32MB, use {url} to upload {path}."
-msgstr "Ní féidir le heochair API VirusTotal comhaid níos mó ná 32MB a uaslódáil, úsáid {url} chun {path} a uaslódáil."
-
-#: ../fdroidserver/nightly.py
-msgid "WARNING: only public git repos are supported!"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Warn about possible metadata errors"
-msgstr "Tabhair rabhadh faoi earráidí meiteashonraí a d'fhéadfadh a bheith ann"
-
-#: ../fdroidserver/scanner.py
-msgid "WebAssembly binary file"
-msgstr "Comhad dénártha WebAssembly"
-
-#: ../fdroidserver/update.py
-msgid "When configured for signed indexes, create only unsigned indexes at this stage"
-msgstr "Nuair atá sé cumraithe le haghaidh innéacsanna sínithe, ná cruthaigh ach innéacsanna gan síniú ag an gcéim seo"
-
-#: ../fdroidserver/lint.py
-msgid "When linting the entire repository yamllint is disabled by default. This option forces yamllint regardless."
-msgstr "Nuair a linting an yamllint stór ar fad faoi mhíchumas de réir réamhshocraithe. Cuireann an rogha seo iallach ar yamllint beag beann."
-
-#: ../fdroidserver/publish.py
-msgid "When signing or verifying fails, exit with an error code."
-msgstr "Nuair a theipeann ar shíniú nó ar fhíorú, scoir le cód earráide."
-
-#: ../fdroidserver/install.py
-msgid "Would you like to download and install F-Droid.apk via adb? (YES/no)"
-msgstr "Ar mhaith leat F-Droid.apk a íoslódáil agus a shuiteáil trí adb? (TÁ/Níl)"
-
-#: ../fdroidserver/install.py
-msgid "Would you like to download the app(s) from f-droid.org? (YES/no)"
-msgstr "Ar mhaith leat na haipeanna/na haipeanna a íoslódáil ó f-droid.org? (TÁ/Níl)"
-
-#: ../fdroidserver/init.py
-msgid "X.509 'Distinguished Name' used when generating keys"
-msgstr "X.509 'Ainm Oirirce' a úsáidtear agus eochracha á nginiúint"
-
-#: ../fdroidserver/common.py
-msgid "You can use ANDROID_HOME to set the path to your SDK, i.e.:"
-msgstr "Is féidir leat ANDROID_HOME a úsáid chun an cosán a shocrú chuig do SDK, i.e.:"
-
-#: ../fdroidserver/scanner.py
-msgid "ZIP file archive"
-msgstr "Cartlann comhad ZIP"
-
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "adb reports {serial} is \"{status}\"!"
-msgstr "tuarascálacha adb {serial} is \"{status}\"!"
-
-#: ../fdroidserver/nightly.py
-#, python-brace-format
-msgid "adding IdentityFile to {path}"
-msgstr "IdentityFile á chur le {path}"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "adding to {name}: {path}"
-msgstr "ag cur le {name}: {path}"
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "ambiguous option: %(option)s could match %(matches)s"
-msgstr "Rogha dhébhríoch: D'fhéadfadh %(option)s %(matches)s a mheaitseáil"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "apksigner in build-tools;{version} passes APKs with invalid v3 signatures, ignoring."
-msgstr "apksigner in uirlisí tógála; Gabhann {version} APKanna le sínithe v3 neamhbhailí, gan aird a thabhairt."
-
-#: ../fdroidserver/common.py
-msgid "apksigner not found! Cannot sign or verify modern APKs"
-msgstr "apksigner gan aimsiú! Ní féidir APKs nua-aimseartha a shíniú nó a fhíorú"
-
-#: ../fdroidserver/common.py
-msgid "apksigner not found, it's required for signing!"
-msgstr "apksigner gan aimsiú, tá sé ag teastáil le síniú!"
-
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/checkupdates.py ../fdroidserver/lint.py
-#: ../fdroidserver/rewritemeta.py
-msgid "application ID of file to operate on"
-msgstr "aitheantas feidhmchláir an chomhaid le hoibriú air"
-
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/build.py ../fdroidserver/install.py
-#: ../fdroidserver/publish.py ../fdroidserver/scanner.py
-#: ../fdroidserver/verify.py
-msgid "application ID with optional versionCode in the form APPID[:VERCODE]"
-msgstr "ID iarratais le leagan roghnachCode san fhoirm APPID[:VERCODE]"
-
-#: ../fdroidserver/common.py
-msgid "archive_url needs to end with /archive"
-msgstr "Caithfidh archive_url deireadh a chur le /cartlann"
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "argument \"-\" with mode %r"
-msgstr "argóint \"-\" le mód %r"
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "argument %(argument_name)s: %(message)s"
-msgstr "argóint %(argument_name)s: %(message)s"
-
-#: ../fdroidserver/nightly.py
-msgid "attempting bare SSH connection to test deploy key:"
-msgstr "ag iarraidh nasc SSH lom chun eochair imscaradh tástála:"
-
-#: ../fdroidserver/common.py
-msgid "can not parse scrlib spec (not a string): '{}'"
-msgstr "ní féidir spec scrlib a pharsáil (ní teaghrán): '{}'"
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "can't open '%(filename)s': %(error)s"
-msgstr "ní féidir '%(filename)s' a oscailt: %(error)s"
-
-#: ../fdroidserver/scanner.py
-msgid "can't open non-https url: '{};"
-msgstr "ní féidir url neamh-https a oscailt: '{};"
-
-#: ../fdroidserver/build.py
-#, python-brace-format
-msgid "cannot find required srclibs: \"{path}\""
-msgstr "ní féidir srclibs riachtanacha a aimsiú: \"{path}\""
-
-#: /usr/lib/python3.11/argparse.py
-msgid "cannot have multiple subparser arguments"
-msgstr "ní féidir argóintí éagsúla subparser a bheith acu"
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "cannot merge actions - two groups are named %r"
-msgstr "ní féidir gníomhartha a chumasc - ainmnítear %r ar dhá ghrúpa"
-
-#: ../fdroidserver/nightly.py
-msgid "cannot publish update, did you set the deploy key?"
-msgstr "Ní féidir nuashonrú a fhoilsiú, ar shocraigh tú an eochair imlonnaithe?"
-
-#: ../fdroidserver/nightly.py
-#, python-brace-format
-msgid "cloning {url}"
-msgstr "clónáil {url}"
-
-#: ../fdroidserver/__main__.py
-msgid "commands from plugin modules:"
-msgstr "orduithe ó mhodúil bhreiseáin:"
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "conflicting option string: %s"
-msgid_plural "conflicting option strings: %s"
-msgstr[0] "teaghrán rogha contrártha: %s"
-msgstr[1] "teaghráin roghanna contrártha: %s"
-msgstr[2] "teaghráin roghanna contrártha: %s"
-msgstr[3] "teaghráin roghanna contrártha: %s"
-msgstr[4] "teaghráin roghanna contrártha: %s"
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "conflicting subparser alias: %s"
-msgstr "ailias fo-pharsála contrártha: %s"
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "conflicting subparser: %s"
-msgstr "fopharsálaí contrártha: %s"
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "could not parse '{path}'"
-msgstr "níorbh fhéidir '{path}' a pharsáil"
-
-#: ../fdroidserver/common.py
-msgid "could not parse srclib spec (no name specified): '{}'"
-msgstr "Níorbh fhéidir srclib spec a pharsáil (níor sonraíodh ainm ar bith): '{}'"
-
-#: ../fdroidserver/common.py
-msgid "could not parse srclib spec (no ref specified): '{}'"
-msgstr "Níorbh fhéidir srclib spec a pharsáil (níor sonraíodh tag): '{}'"
-
-#: ../fdroidserver/nightly.py
-#, python-brace-format
-msgid "created {path}"
-msgstr "cruthaíodh {path}"
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "current version is newer: old vercode={old}, new vercode={new}"
-msgstr "Tá an leagan reatha níos nuaí: sean-vercode={old}, vercode nua={new}"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "deleting: repo/{apkfilename}"
-msgstr "scriosadh: repo/{apkfilename}"
-
-#: ../fdroidserver/scanner.py
-msgid "dependency file without lock"
-msgstr "comhad spleáchais gan ghlas"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "deployed process log {path} to {dest}"
-msgstr "loga próiseas imlonnaithe {path} go {dest}"
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "dest= is required for options like %r"
-msgstr "dest= ag teastáil le haghaidh roghanna cosúil le %r"
-
-#: ../fdroidserver/scanner.py
-msgid "downloading '{}'"
-msgstr "'{}' á íosluchtú"
-
-#: ../fdroidserver/scanner.py
-msgid "downloading scanner signatures from '{}' failed"
-msgstr "Theip ar shínithe scanóirí a íosluchtú ó '{}'"
-
-#: ../fdroidserver/scanner.py
-msgid "executable binary, possibly code"
-msgstr "dénártha inrite, cód b'fhéidir"
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "expected %s argument"
-msgid_plural "expected %s arguments"
-msgstr[0] "bhíothas ag súil le argóint %s"
-msgstr[1] "bhíothas ag súil le %s argóint"
-msgstr[2] "bhíothas ag súil le %s argóint"
-msgstr[3] "bhíothas ag súil le %s argóint"
-msgstr[4] "bhíothas ag súil le %s argóint"
-
-#: /usr/lib/python3.11/argparse.py
-msgid "expected at least one argument"
-msgstr "bhíothas ag súil le hargóint amháin ar a laghad"
-
-#: /usr/lib/python3.11/argparse.py
-msgid "expected at most one argument"
-msgstr "bhíothas ag súil le hargóint amháin ar a mhéad"
-
-#: /usr/lib/python3.11/argparse.py
-msgid "expected one argument"
-msgstr "bhíothas ag súil le hargóint amháin"
-
-#: ../fdroidserver/__main__.py
-msgid "fdroid [<command>] [-h|--help|--version|<args>]"
-msgstr "fdroid [<command>] [-h|--help|--leagan|<args>]"
-
-#: ../fdroidserver/scanner.py
-msgid "fetch the latest version of signatures from the web"
-msgstr "Faigh an leagan is déanaí de shínithe ón ngréasán"
-
-#: ../fdroidserver/metadata.py
-msgid "force metadata errors (default) to be warnings, or to be ignored."
-msgstr "bhfeidhm earráidí meiteashonraí (réamhshocrú) a bheith ina rabhaidh, nó le neamhaird a dhéanamh orthu."
-
-#: ../fdroidserver/common.py
-msgid "git svn clone failed"
-msgstr "theip ar chlón git svn"
-
-#: ../fdroidserver/scanner.py
-msgid "gzip file archive"
-msgstr "Cartlann Comhad Gzip"
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "ignored explicit argument %r"
-msgstr "neamhaird ar argóint fhollasach %r"
-
-#: ../fdroidserver/index.py
-msgid "index-v1 must have a signature, use `fdroid signindex` to create it!"
-msgstr "Ní mór síniú a bheith ag Innéacs-V1, bain úsáid as 'FDROID Signindex' chun é a chruthú!"
-
-#: ../fdroidserver/index.py
-msgid "index-v2 must have a signature, use `fdroid signindex` to create it!"
-msgstr "Ní mór síniú a bheith ag Innéacs-V2, bain úsáid as 'FDROID Signindex' chun é a chruthú!"
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "invalid %(type)s value: %(value)r"
-msgstr "luach neamhbhailí %(type)s: %(value)r"
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "invalid choice: %(value)r (choose from %(choices)s)"
-msgstr "rogha neamhbhailí: %(value)r (roghnaigh ó %(choices)s)"
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "invalid conflict_resolution value: %r"
-msgstr "Luach conflict_resolution neamhbhailí:%r"
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "invalid option string %(option)r: must start with a character %(prefix_chars)r"
-msgstr "teaghrán neamhbhailí roghanna %(option)r: ní mór tosú le carachtar %(prefix_chars)r"
-
-#: ../fdroidserver/common.py
-msgid "ipfs_cid not found, skipping CIDv1 generation"
-msgstr "ipfs_cid gan aimsiú, gan bacadh le giniúint CIDv1"
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "latest build recipe is newer: old vercode={old}, new vercode={new}"
-msgstr "Tá an t-oideas tógála is déanaí níos nuaí: sean-vercode={old}, vercode nua={new}"
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "local_copy_dir does not end with \"fdroid\", perhaps you meant: \"{path}\""
-msgstr "Ní chríochnaíonn local_copy_dir le \"fdroid\", b'fhéidir gur chiallaigh tú: \"{path}\""
-
-#: ../fdroidserver/deploy.py
-msgid "local_copy_dir must be an absolute path!"
-msgstr "Caithfidh local_copy_dir a bheith ina cosán iomlán!"
-
-#: ../fdroidserver/deploy.py
-msgid "local_copy_dir must be directory, not a file!"
-msgstr "Ní mór local_copy_dir a bheith eolaire, ní comhad!"
-
-#: ../fdroidserver/index.py
-#, python-format
-msgid "mirror '%s' does not end with 'fdroid'!"
-msgstr "ní chríochnaíonn scáthán '%s' le 'fdroid'!"
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "mirrors set twice, in config.yml and {path}!"
-msgstr "scátháin leagtha faoi dhó, i config.yml agus {path}!"
-
-#: /usr/lib/python3.11/argparse.py
-msgid "mutually exclusive arguments must be optional"
-msgstr "ní mór argóintí comheisiacha a bheith roghnach"
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "next {name} cache update due in {time}"
-msgstr "an chéad nuashonrú taisce {name} eile dlite i {time}"
-
-#: ../fdroidserver/mirror.py
-#, python-brace-format
-msgid "no \"icon\" in {appid}"
-msgstr "níl \"icon\" in {appid}"
-
-#: ../fdroidserver/signatures.py
-msgid "no APK supplied"
-msgstr "níor soláthraíodh aon APK"
-
-#: ../fdroidserver/checkupdates.py
-msgid "no version information found"
-msgstr "Níor aimsíodh aon eolas leagain"
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "not allowed with argument %s"
-msgstr "ní cheadaítear le hargóint %s"
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "one of the arguments %s is required"
-msgstr "tá ceann de na hargóintí %s ag teastáil"
-
-#: ../fdroidserver/common.py ../fdroidserver/index.py
-msgid "only accepts strings, lists, and tuples"
-msgstr "ní ghlacann ach teaghráin, liostaí, agus tuples"
-
-#: /usr/lib/python3.11/argparse.py
-msgid "options"
-msgstr "roghanna"
-
-#: ../fdroidserver/nightly.py
-#, python-brace-format
-msgid "overwriting existing {path}"
-msgstr "overwriting atá ann cheana {path}"
-
-#: /usr/lib/python3.11/argparse.py
-msgid "positional arguments"
-msgstr "argóintí suímh"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "process log deploy {path} to {dest} failed!"
-msgstr "Theip ar logchomhad an phróisis {path} go {dest}!"
-
-#: ../fdroidserver/build.py
-msgid "reference binary missing signature"
-msgstr "tagairt dénártha síniú ar iarraidh"
-
-#: ../fdroidserver/signatures.py
-#, python-brace-format
-msgid "refuse downloading via insecure HTTP connection (use HTTPS or specify --no-https-check): {apkfilename}"
-msgstr "diúltú íoslódáil trí nasc HTTP neamhchinnte (úsáid HTTPS nó sonraigh --no-https-check): {apkfilename}"
-
-#: ../fdroidserver/index.py
-#, python-format
-msgid "repo_icon \"repo/icons/%s\" does not exist, generating placeholder."
-msgstr "repo_icon níl \"repo/icons/%s\" ann, rud a ghineann sealbhóir áite."
-
-#: ../fdroidserver/common.py
-msgid "repo_url needs to end with /repo"
-msgstr "Caithfidh repo_url deireadh a chur le / repo"
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "rsync is missing or broken: {error}"
-msgstr "rsync ar iarraidh nó briste: {error}"
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "s3cmd sync indexes {path} to {url} and delete"
-msgstr "innéacsanna sioncronaithe s3cmd {path} go {url} agus scrios"
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "s3cmd syncs indexes from {path} to {url} and deletes removed"
-msgstr "sioncrónaíonn s3cmd innéacsanna ó {path} go {url} agus scriosann sé bainte"
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "scanner cache is malformed! You can clear it with: '{clear}'"
-msgstr "tá taisce scanóir míchumtha! Is féidir leat é a ghlanadh le: '{clear}'"
-
-#: ../fdroidserver/deploy.py
-msgid "serverwebroot: path does not end with \"fdroid\", perhaps you meant one of these:"
-msgstr "serverwebroot: ní chríochnaíonn cosán le \"fdroid\", b'fhéidir gur chiallaigh tú ceann acu seo:"
-
-#: ../fdroidserver/scanner.py
-msgid "shared library"
-msgstr "leabharlann chomhroinnte"
-
-#: /usr/lib/python3.11/argparse.py
-msgid "show this help message and exit"
-msgstr "Taispeáin an teachtaireacht chabhrach seo agus scoir"
-
-#: ../fdroidserver/signatures.py
-msgid "signed APK, either a file-path or HTTPS URL."
-msgstr "APK sínithe, cosán comhaid nó URL HTTPS."
-
-#: ../fdroidserver/common.py
-msgid "skip deploying full build logs: log content is empty"
-msgstr "Ná bac le logaí tógála iomlána a úsáid: tá an t-ábhar logála folamh"
-
-#: ../fdroidserver/common.py
-msgid "skip deploying full build logs: not enabled in config"
-msgstr "Ná bac le logaí iomlána tógála a úsáid: níl sé cumasaithe sa chumraíocht"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "skipping source tarball: {path}"
-msgstr "tarball foinse scipeála: {path}"
-
-#: ../fdroidserver/lint.py
-msgid "srclibs missing name and/or @"
-msgstr "srclibs ainm ar iarraidh agus / nó @"
-
-#: ../fdroidserver/scanner.py
-msgid "static library"
-msgstr "Leabharlann statach"
-
-#: ../fdroidserver/build.py
-#, python-brace-format
-msgid "supplied reference binary has allowed signer {signer}"
-msgstr "tá dénártha tagartha soláthraithe ceadaithe signer {signer}"
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "the following arguments are required: %s"
-msgstr "Tá na hargóintí seo a leanas ag teastáil: %s"
-
-#: ../fdroidserver/install.py
-msgid "true"
-msgstr "fíor"
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "unexpected option string: %s"
-msgstr "teaghrán rogha gan choinne: %s"
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "unknown parser %(parser_name)r (choices: %(choices)s)"
-msgstr "parsálaí anaithnid %(parser_name)r (roghanna: %(choices)s)"
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "unrecognized arguments: %s"
-msgstr "argóintí neamhaitheanta: %s"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "unsafe permissions on '{config_file}' (should be 0600)!"
-msgstr "ceadanna neamhshábháilte ar '{config_file}' (ba chóir go mbeadh 0600)!"
-
-#: ../fdroidserver/__main__.py /usr/lib/python3.11/argparse.py
-msgid "usage: "
-msgstr "úsáid: "
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "using Apache libcloud to sync with {url}"
-msgstr "ag baint úsáide as Apache libcloud chun sioncronú le {url}"
-
-#: ../fdroidserver/deploy.py
-msgid "virustotal.com is rate limiting, waiting to retry..."
-msgstr "Tá virustotal.com ag teorannú ráta, ag fanacht le triail a bhaint as ..."
-
-#: ../fdroidserver/install.py
-msgid "yes"
-msgstr "tá"
-
-#: ../fdroidserver/publish.py
-#, python-brace-format
-msgid "{0} app, {1} key aliases"
-msgid_plural "{0} apps, {1} key aliases"
-msgstr[0] "{0} aip, {1} ailiasanna eochrach"
-msgstr[1] "{0} aippeanna, {1} ailiasanna eochrach"
-msgstr[2] "{0} aippeanna, {1} ailiasanna eochrach"
-msgstr[3] "{0} aippeanna, {1} ailiasanna eochrach"
-msgstr[4] "{0} aippeanna, {1} ailiasanna eochrach"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{apkfilename} ({appid}) has no metadata!"
-msgstr "{apkfilename} ({appid}) níl aon mheiteashonraí aige!"
-
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{apkfilename}'s AndroidManifest.xml has a bad date: "
-msgstr "Tá drochdháta ag AndroidManifest.xml {apkfilename}: "
-
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{appid} does not have a name! Using application ID instead."
-msgstr "Níl ainm ar {appid}! Ag baint úsáide as ID iarratais ina ionad."
-
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{appid} from {path} is not a valid Android application ID!"
-msgstr "Ní ID feidhmchlár Android bailí é {appid} ó {path}!"
-
-#: ../fdroidserver/metadata.py ../fdroidserver/update.py
-#, python-brace-format
-msgid "{appid} from {path} is not a valid Java Package Name!"
-msgstr "Ní Ainm Pacáiste Java bailí é {appid} ó {path}!"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{appid} has both APKs and files: {files}"
-msgstr "Tá APKs agus comhaid araon ag {appid}: {files}"
-
-#: ../fdroidserver/mirror.py
-#, python-brace-format
-msgid "{appid} is missing {name}"
-msgstr "Tá {appid} ar iarraidh {name}"
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "{appid}: Unknown extlib {path} in build '{versionName}'"
-msgstr "{appid}: Extlib {path} anaithnid i dtógáil '{versionName}'"
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "{appid}: no builds specified, running on current source state"
-msgstr "{appid}: níl aon tógáil sonraithe, ag rith ar staid na foinse reatha"
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "{appid}: {field} must be a '{type}', but it is a '{fieldtype}!'"
-msgstr "{appid}: Caithfidh {field} a bheith ina '{type}', ach is '{fieldtype}' é!'"
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "{appid}: {field} must be a '{type}', but it is a '{fieldtype}'!"
-msgstr "{appid}: Caithfidh {field} a bheith ina '{type}', ach is '{fieldtype}' é!"
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "{build_flag} must be an integer, found: {value}"
-msgstr "Ní mór {build_flag} a bheith ina slánuimhir, le fáil: {value}"
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "{build_flag} must be list or string, found: {value}"
-msgstr "Ní mór {build_flag} a bheith liosta nó teaghrán, le fáil: {value}"
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "{file} is blank or corrupt!"
-msgstr "Tá {file} bán nó truaillithe!"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{name} \"{section}/icons/{path}\" does not exist! Check \"config.yml\"."
-msgstr "{name} Níl \"{section}/icons/{path}\" ann! Seiceáil \"config.yml\"."
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{path1} is a duplicate of {path2}, remove one!"
-msgstr "Is dúblach é {path1} de {path2}, bain ceann amháin!"
-
-#: ../fdroidserver/import_subcommand.py
-#, python-brace-format
-msgid "{path} already exists, ignoring import results!"
-msgstr "Tá {path} ann cheana féin, gan aird ar thorthaí iompórtála!"
-
-#: ../fdroidserver/nightly.py
-#, python-brace-format
-msgid "{path} does not exist!  Create it by running:"
-msgstr "Níl {path} ann!  Cruthaigh é trí rith:"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{path} has bad file signature \"{pattern}\", possible Janus exploit!"
-msgstr "{path} Tá síniú comhad dona \"{pattern}\", is féidir Janus leas a bhaint as!"
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "{path} has been flagged by virustotal {count} times:"
-msgstr "{path} curtha faoi bhratach ag virustotal {count} times:"
-
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "{path} has the wrong fingerprint ({fingerprint})!"
-msgstr "Tá an méarloirg mícheart ag {path} ({fingerprint})!"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "{path} is not \"key: value\" dict, but a {datatype}!"
-msgstr "Níl {path} \"eochair: luach\" dict, ach {datatype}!"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "{path} is not a standard config file!"
-msgstr "Ní comhad cumraíochta caighdeánach é {path}!"
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "{path} is not list, but a {datatype}!"
-msgstr "Níl {path} liosta, ach {datatype}!"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "{path} is not {expected_type}, but a {datatype}!"
-msgstr "Níl {path} {expected_type}, ach {datatype}!"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{path} is zero size!"
-msgstr "Is é {path} méid nialasach!"
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "{path} more than 200MB, manually upload: {url}"
-msgstr "{path} níos mó ná 200MB, uaslódáil de láimh: {url}"
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "{path}: \"{code}\" is not a valid ISO_3166-1 alpha-2 country code!"
-msgstr "{path}: Ní cód tíre bailí ISO_3166-1 alfa-2 é \"{code}\"!"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{path}: {error}"
-msgstr "{path}: {error}"
-
-#: ../fdroidserver/mirror.py
-#, python-brace-format
-msgid "{url} does not end with \"fdroid\", check the URL path!"
-msgstr "Ní chríochnaíonn {url} le \"fdroid\", seiceáil an cosán URL!"
-
-#: ../fdroidserver/import_subcommand.py
-#, python-brace-format
-msgid "{url} does not start with \"http\"!"
-msgstr "Ní thosaíonn {url} le \"http\"!"
-
-#: ../fdroidserver/build.py
-msgid "{} build failed"
-msgid_plural "{} builds failed"
-msgstr[0] "Theip ar {} tógáil"
-msgstr[1] "Theip ar {} tógálacha"
-msgstr[2] "Theip ar {} tógálacha"
-msgstr[3] "Theip ar {} tógálacha"
-msgstr[4] "Theip ar {} tógálacha"
-
-#: ../fdroidserver/build.py
-msgid "{} build succeeded"
-msgid_plural "{} builds succeeded"
-msgstr[0] "D'éirigh le {} tógáil"
-msgstr[1] "D'éirigh le {} tógálacha"
-msgstr[2] "D'éirigh le {} tógálacha"
-msgstr[3] "D'éirigh le {} tógálacha"
-msgstr[4] "D'éirigh le {} tógálacha"
diff --git a/locale/he/LC_MESSAGES/fdroidserver.po b/locale/he/LC_MESSAGES/fdroidserver.po
deleted file mode 100644
index f9a3a7fd..00000000
--- a/locale/he/LC_MESSAGES/fdroidserver.po
+++ /dev/null
@@ -1,2669 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# This file is put in the public domain.
-# bobwww <noambro199@gmail.com>, 2022.
-# Yaron Shahrabani <sh.yaron@gmail.com>, 2022, 2023, 2024.
-msgid ""
-msgstr ""
-"Project-Id-Version: fdroidserver 2.1b0\n"
-"Report-Msgid-Bugs-To: https://gitlab.com/fdroid/fdroidserver/issues\n"
-"POT-Creation-Date: 2025-03-25 11:36+0100\n"
-"PO-Revision-Date: 2024-08-18 06:27+0000\n"
-"Last-Translator: Yaron Shahrabani <sh.yaron@gmail.com>\n"
-"Language-Team: Hebrew <https://hosted.weblate.org/projects/f-droid/fdroidserver/he/>\n"
-"Language: he\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=4; plural=(n == 1) ? 0 : ((n == 2) ? 1 : ((n > 10 && n % 10 == 0) ? 2 : 3));\n"
-"X-Generator: Weblate 5.7\n"
-
-#: ../fdroidserver/nightly.py
-msgid ""
-"\n"
-"SSH public key to be used as deploy key:"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-#, python-brace-format
-msgid ""
-"\n"
-"{path} encoded for the DEBUG_KEYSTORE secret variable:"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-format
-msgid "\"%s/\" has no matching metadata file!"
-msgstr ""
-
-#: ../fdroidserver/index.py
-msgid "\"isPrimary\" key should not be added to mirrors!"
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "\"local_copy_dir\" {path} does not exist!"
-msgstr ""
-
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "\"{apkfilename}\" is already installed on {dev}."
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "\"{path}\" contains recent {name} ({version})"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "\"{path}\" exists but s3cmd is not installed!"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "\"{path}\" is not a supported file format (use: metadata/*.yml)"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "\"{path}\" is signed by a key that is not allowed:"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
-#, python-brace-format
-msgid "\"{url}\" is not a valid URL!"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "%(prog)s: error: %(message)s\n"
-msgstr "%(prog)s: שגיאה: %(message)s\n"
-
-#: ../fdroidserver/publish.py
-#, python-format
-msgid "%d APKs failed to be signed or verified!"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-format
-msgid "%d problems found"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "%r is not callable"
-msgstr "אי אפשר לקרוא ל־%r"
-
-#: ../fdroidserver/signindex.py
-#, python-format
-msgid "%s did not produce a dict!"
-msgstr ""
-
-#: ../fdroidserver/signindex.py
-#, python-format
-msgid "%s has bad SHA-256: %s"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-format
-msgid "%s is not an accepted build field"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "'keypass' not found in config.yml!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "'keystore' is NONE and 'smartcardoptions' is blank!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "'keystore' not found in config.yml!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "'keystorepass' not found in config.yml!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "'repo_keyalias' not found in config.yml!"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-msgid "'required' is an invalid argument for positionals"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "'sdk_path' not set in config.yml!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "'{aapt}' is too old, fdroid requires build-tools-{version} or newer!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "'{path}' failed to execute!"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "'{path}' has invalid format, it should be a dictionary!"
-msgstr ""
-
-#: ../fdroidserver/lint.py ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "'{value}' is not a valid {field} in {appid}. Regex pattern: {pattern}"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "'{value}' is not a valid {field}, should be {pattern}"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "--merge-request only runs on a single appid!"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "...checkupdate failed for {appid} : {error}"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-msgid ".__call__() not defined"
-msgstr "‎.__call__()‎ לא מוגדר"
-
-#: ../fdroidserver/lint.py
-msgid "/issues is missing"
-msgstr ""
-
-#: ../fdroidserver/mirror.py
-msgid "A URL is required as an argument!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "APK signatures have different certificates in {path}:"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Add PGP signatures using GnuPG for packages in repo"
-msgstr ""
-
-#: ../fdroidserver/update.py
-msgid "Add a repo signing key to an unsigned repo"
-msgstr ""
-
-#: ../fdroidserver/update.py
-msgid "Add skeleton metadata files for APKs that are missing them"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Adding new repo for only {name}"
-msgstr ""
-
-#: ../fdroidserver/init.py
-msgid "Alias of the repo signing key in the keystore"
-msgstr ""
-
-#: ../fdroidserver/build.py
-msgid "AllowedAPKSigningKeys missing but reference binary supplied"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
-msgid "Allows a different revision (or git branch) to be specified for the initial import"
-msgstr ""
-
-#: ../fdroidserver/mirror.py
-msgid "Also mirror the full archive section"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Also warn about formatting issues, like rewritemeta -l"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "Android AAR library"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "Android APK file"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "Android DEX code"
-msgstr ""
-
-#: ../fdroidserver/init.py
-#, python-brace-format
-msgid "Android SDK not found at {path}!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Android SDK path '{path}' does not exist!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Android SDK path '{path}' is not a directory!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Android SDK tool {cmd} not found!"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "App has Binaries but does not have corresponding AllowedAPKSigningKeys to pin certificate."
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "App has NoSourceSince or ArchivePolicy \"0 versions\" or 0 but AutoUpdateMode or UpdateCheckMode are not None"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "App is in '{repo}' but has a link to {url}"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "App version has binary but does not have corresponding AllowedAPKSigningKeys to pin certificate."
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Appending .git is not necessary"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Archiving {apkfilename} with invalid signature!"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "AutoUpdateMode with UpdateCheckMode: HTTP must have a pattern."
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "Automatic no to all prompts."
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "Automatic yes to all prompts."
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "Bad entry type \"{mirrortype}\" in mirrors config: {mirror}"
-msgstr ""
-
-#: ../fdroidserver/mirror.py
-msgid "Base URL to mirror, can include the index signing key using the query string: ?fingerprint="
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Branch '{branch}' used as commit in build '{versionName}'"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Branch '{branch}' used as commit in srclib '{srclib}'"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Broken symlink: {path}"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Build a package from source"
-msgstr "בניית חבילה מקוד מקור"
-
-#: ../fdroidserver/build.py
-msgid "Build all applications available"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Build generated by `fdroid import` - remove disable line once ready"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "Build metadata git repo has uncommited changes!"
-msgstr ""
-
-#: ../fdroidserver/build.py
-msgid "Build only the latest version of each package"
-msgstr ""
-
-#: ../fdroidserver/init.py
-#, python-format
-msgid "Built repo based in \"%s\" with this config:"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "Can't auto-update app with no CurrentVersionCode"
-msgstr ""
-
-#: ../fdroidserver/build.py
-msgid "Can't build due to {} error while scanning"
-msgid_plural "Can't build due to {} errors while scanning"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../fdroidserver/rewritemeta.py
-#, python-brace-format
-msgid "Cannot rewrite \"{path}\""
-msgstr ""
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
-#: ../fdroidserver/lint.py
-#, python-format
-msgid "Categories '%s' is not valid"
-msgstr ""
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
-#: ../fdroidserver/lint.py
-msgid "Categories are not set"
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "Category \"{category}\" defined but not used for any apps!"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Check for updates to applications"
-msgstr "איתור עדכונים ליישומונים"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Checking archiving for {appid} - apks:{integer}, keepversions:{keep}, archapks:{arch}"
-msgstr ""
-
-#: ../fdroidserver/update.py
-msgid "Clean update - don't uses caches, reprocess all APKs"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Color the log output"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
-msgid "Comma separated list of categories."
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-#, python-format
-msgid "Command '%s' not recognised.\n"
-msgstr "הפקודה ‚%s’ אינה מוכרת.\n"
-
-#: ../fdroidserver/checkupdates.py
-msgid "Commit changes"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "Commit changes, push, then make a merge request"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Conflicting \"{field}\" definitions between .yml and localized files:"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Conflicting arguments: '--verbose' and '--quiet' can not be specified at the same time."
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Could not find '{command}' on your system"
-msgstr ""
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/import_subcommand.py
-msgid "Could not find latest version code"
-msgstr ""
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
-#: ../fdroidserver/import_subcommand.py
-msgid "Could not find latest version name"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Could not find {path} to remove it"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Could not open APK {path} for analysis: "
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Could not parse size \"{size}\", wrong type \"{type}\""
-msgstr ""
-
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/import_subcommand.py
-msgid "Couldn't find Application ID"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "Couldn't find any version information"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "Couldn't find package ID"
-msgstr ""
-
-#: ../fdroidserver/update.py
-msgid "Cowardily refusing to overwrite existing signing key setup!"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Created new container \"{name}\""
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Creating \"{path}\" for configuring s3cmd."
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Creating empty {config_file}"
-msgstr ""
-
-#: ../fdroidserver/publish.py
-msgid "Creating log directory"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Creating new S3 bucket: {url}"
-msgstr ""
-
-#: ../fdroidserver/publish.py
-msgid "Creating output directory"
-msgstr ""
-
-#: ../fdroidserver/index.py
-msgid "Creating signed index with this key (SHA256):"
-msgstr ""
-
-#: ../fdroidserver/publish.py ../fdroidserver/verify.py
-msgid "Creating temporary directory"
-msgstr ""
-
-#: ../fdroidserver/index.py
-msgid "Creating unsigned index in preparation for signing"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "CurrentVersionCode {cv} is less than oldest build entry {versionCode}"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-msgid "DEBUG_KEYSTORE is not set or the value is incomplete"
-msgstr ""
-
-#: ../fdroidserver/update.py
-msgid "Delete APKs and/or OBBs without metadata from the repo"
-msgstr "מחיקת קובצי APK ו/או OBB ללא נתוני העל מהמאגר"
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Deleting archive, repo is too big ({size} max {limit})"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Deleting git-mirror history, repo is too big ({size} max {limit})"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Deleting unknown file: {path}"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-format
-msgid "Description '%s' is just the app's summary"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Description has a duplicate line"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Description of length {length} is over the {limit} char limit"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Did you mean config/{name}.yml?"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Did you mean {code}?"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
-msgid "Do not add 'disable:' to the generated build entries"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-msgid "Do not deploy the new files to the repo"
-msgstr ""
-
-#: ../fdroidserver/mirror.py
-#, python-brace-format
-msgid "Do not include \"{path}\" in URL!"
-msgstr ""
-
-#: ../fdroidserver/init.py
-msgid "Do not prompt for Android SDK path, just fail"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-msgid "Do not remove the private keys generated from the keystore"
-msgstr ""
-
-#: ../fdroidserver/build.py
-msgid "Don't create a source tarball, useful when testing a build"
-msgstr ""
-
-#: ../fdroidserver/build.py
-msgid "Don't refresh the repository, useful when testing a build with no internet connection"
-msgstr ""
-
-#: ../fdroidserver/deploy.py ../fdroidserver/nightly.py
-msgid "Don't use rsync checksums"
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "Download F-Droid.apk using mirrors that leak less to the network"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Download complete mirrors of small repos"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Downloading the repository already failed once, not trying again."
-msgstr ""
-
-#: ../fdroidserver/verify.py
-#, python-brace-format
-msgid "Downloading {url} failed. {error}"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Duplicate Anti-Feature declaration at {path} was ignored!"
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-format
-msgid "Duplicate entry \"%s\" in mirrors config!"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Duplicate link in '{field}': {url}"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-format
-msgid "ERROR: %(message)s"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "ERROR: The \"server\" subcommand has been removed, use \"deploy\"!"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-msgid "ERROR: unsupported CI type, patches welcome!"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-#, python-format
-msgid "ERROR: unsupported git host \"%s\", patches welcome!"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "ERROR: {key} in {path} is not \"archive\" or \"repo\"!"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "ERROR: {key} not a valid key!"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "ERROR: {key}'s value should be of type {t}!"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "ERROR: {key}:{subkey} in {path} is not in allowed keys: {allowed_keys}!"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-#, python-brace-format
-msgid "Encoding is set to '{enc}' fdroid might run into encoding issues. Please set it to 'UTF-8' for best results."
-msgstr ""
-
-#: ../fdroidserver/init.py
-#, python-format
-msgid ""
-"Enter the path to the Android SDK (%s) here:\n"
-"> "
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Environment variable {var} from {configname} is not set!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Environment variable {{env: {var}}} is not set!"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "Error deploying 'github_releases', {} not present. (You might need to run `fdroid update` first.)"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
-msgid "Error while getting repo address"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "Exit with a non-zero code if problems were found"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Extract application metadata from a source repository"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Extract signatures from APKs"
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "F-Droid.apk could not be downloaded from any known source!"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Failed copying {path}: {error}"
-msgstr ""
-
-#: ../fdroidserver/signatures.py
-#, python-brace-format
-msgid "Failed fetching signatures for '{apkfilename}': {error}"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Failed reading {path}: {error}"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Failed resizing {path}: {error}"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Failed to create S3 bucket: {url}"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Failed to get APK information, deleting {path}"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Failed to get APK information, skipping {path}"
-msgstr ""
-
-#: ../fdroidserver/update.py
-msgid "Failed to get APK signing key fingerprint"
-msgstr ""
-
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "Failed to install '{apkfilename}' on {dev}: {error}"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Failed to sign application"
-msgstr ""
-
-#: ../fdroidserver/build.py
-#, python-brace-format
-msgid "Fetched buildserverid from VM: {buildserverid}"
-msgstr ""
-
-#: ../fdroidserver/signatures.py
-#, python-brace-format
-msgid "Fetched signatures for '{apkfilename}' -> '{sigdir}'"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "File disappeared while processing it: {path}"
-msgstr ""
-
-#: ../fdroidserver/build.py ../fdroidserver/install.py
-#: ../fdroidserver/rewritemeta.py ../fdroidserver/scanner.py
-#: ../fdroidserver/update.py
-msgid "Finished"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Forbidden HTML tags"
-msgstr ""
-
-#: ../fdroidserver/build.py
-msgid "Force build of disabled apps, and carries on regardless of scan problems. Only allowed in test mode."
-msgstr ""
-
-#: ../fdroidserver/build.py
-#, python-brace-format
-msgid "Force halting build after {0} sec timeout!"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "Force scan of disabled apps and builds."
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Found \"{path}\" graphic without metadata for app \"{name}\"!"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Found bad funding file \"{path}\" for \"{name}\":"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Found invalid appids in arguments"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Found invalid versionCodes for some apps"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Found multiple JAR Signature Block Files in {path}"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Found multiple Signer Certificates!"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Found multiple metadata files for {appid}"
-msgstr ""
-
-#: ../fdroidserver/index.py
-msgid "Found multiple signing certificates for repository."
-msgstr ""
-
-#: ../fdroidserver/index.py
-msgid "Found no signing certificates for repository."
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-format
-msgid "Found non-file at %s"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Found {apkfilename} at {url}"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Found {count} problems in {filename}"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Found {count} warnings in {filename}"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Generated skeleton metadata for {appid}"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-format
-msgid "Git checkout of '%s' failed"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Git clean failed"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Git fetch failed"
-msgstr ""
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/common.py
-#, python-format
-msgid "Git remote set-head failed: \"%s\""
-msgstr ""
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/common.py
-msgid "Git reset failed"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Git submodule deinit failed"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Git submodule sync failed"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Git submodule update failed"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "HTTPS must be used with Subversion URLs!"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "If a git mirror gets to big, allow the archive to be deleted"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "If this upload fails, try manually uploading to {url}"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Ignoring '{field}' in '{metapath}' metadata because it is deprecated."
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-format
-msgid "Ignoring FUNDING.yml entry longer than 2048: %s"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-format
-msgid "Ignoring bad element in manifest: %s"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Ignoring deprecated {oldfile}, use {newfile}!"
-msgstr ""
-
-#: ../fdroidserver/index.py
-msgid "Ignoring package without metadata: "
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Ignoring stale cache data for {apkfilename}"
-msgstr ""
-
-#: ../fdroidserver/update.py
-msgid "Include APKs that are signed with disabled algorithms like MD5"
-msgstr ""
-
-#: ../fdroidserver/mirror.py
-msgid "Include the PGP signature .asc files in the mirror"
-msgstr ""
-
-#: ../fdroidserver/mirror.py
-msgid "Include the build logs in the mirror"
-msgstr ""
-
-#: ../fdroidserver/mirror.py
-msgid "Include the source tarballs in the mirror"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-format
-msgid "Including metadata from %s@%s"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Including metadata from {path}"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Initialising submodules"
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "Install all signed applications available"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Install built packages on devices"
-msgstr "התקנת חבילות שנבנו על מכשירים"
-
-#: ../fdroidserver/install.py
-#, python-format
-msgid "Installing %s..."
-msgstr ""
-
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "Installing '{apkfilename}' on {dev}..."
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Interact with the repo HTTP server"
-msgstr "תפעול שרת ה־HTTP של המאגר"
-
-#: ../fdroidserver/update.py
-msgid "Invalid APK"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "Invalid AutoUpdateMode: {mode}"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "Invalid UpdateCheckMode: {mode}"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "Invalid VercodeOperation: {field}"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Invalid VercodeOperation: {invalid_ops}"
-msgstr ""
-
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Invalid application ID {appid}"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Invalid bulleted list"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-format
-msgid "Invalid name for published file: %s"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Invalid ndk: entry in build: \"{ndk}\""
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Invalid redirect to non-HTTPS: {before} -> {after} "
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Invalid scrlib metadata: '{file}' does not exist"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Invalid srclib metadata: could not parse '{file}'"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Invalid srclib metadata: unknown key '{key}' in '{file}'"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "JAR signature failed to verify: {path}"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "JAR signature verified: {path}"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "Java JAR file"
-msgstr ""
-
-#: ../fdroidserver/mirror.py ../fdroidserver/publish.py
-#: ../fdroidserver/update.py
-msgid "Java JDK not found! Install in standard location or set java_paths!"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "Java compiled class"
-msgstr ""
-
-#: ../fdroidserver/signindex.py
-msgid "Java jarsigner not found! Install in standard location or set java_paths!"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Javascript in HTML src attributes"
-msgstr ""
-
-#: ../fdroidserver/build.py
-#, python-brace-format
-msgid "Keeping failed build \"{apkfilename}\""
-msgstr ""
-
-#: ../fdroidserver/init.py
-msgid "Keystore for signing key:\t"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Known debug key is used in AllowedAPKSigningKeys: "
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Last used commit '{commit}' looks like a tag, but UpdateCheckMode is '{ucm}'"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Liberapay donation methods belong in the Liberapay: field"
-msgstr ""
-
-#: ../fdroidserver/rewritemeta.py
-msgid "List files that would be reformatted (dry run)"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Locale included in f-droid.org URL"
-msgstr ""
-
-#: ../fdroidserver/build.py
-msgid "Make the build stop on exceptions"
-msgstr ""
-
-#: ../fdroidserver/index.py
-msgid "Malformed repository mirrors."
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "Malformed serverwebroot line:"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-format
-msgid "Max recursion depth in ZIP file reached: %s"
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "Mirror config for {url} contains \"isPrimary\" key!"
-msgstr ""
-
-#: ../fdroidserver/mirror.py
-msgid "Mirror the full repo and archive, all file types."
-msgstr ""
-
-#: ../fdroidserver/gpgsign.py
-msgid "Missing output directory"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-msgid "Moving Anti-Features declarations to localized files:"
-msgstr ""
-
-#: ../fdroidserver/index.py
-msgid "Neither \"repo_pubkey\" nor \"keystorepass\" set in config.yml"
-msgstr ""
-
-#: ../fdroidserver/verify.py
-#, python-format
-msgid "No APK for package: %s"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "No Android SDK found!"
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "No attached devices found"
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "No devices found for `adb install`! Please plug one in."
-msgstr ""
-
-#: ../fdroidserver/index.py
-msgid "No fingerprint in URL."
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "No git submodules available"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
-msgid "No gradle project could be found. Specify --subdir?"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
-msgid "No information found."
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "No matching tags found"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "No minimum SDK version found in {0}, using default (3)."
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "No need to specify that the app is Free Software"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "No need to specify that the app is for Android"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "No option set! Edit your config.yml to set at least one of these:"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "No packages specified"
-msgstr ""
-
-#: ../fdroidserver/install.py
-#, python-format
-msgid "No signed APK available for %s"
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "No signed output directory - nothing to do"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "No signing certificates found in {path}"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-format
-msgid "No such package: %s"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "No such versionCode {versionCode} for app {appid}"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "No tags found"
-msgstr ""
-
-#: ../fdroidserver/publish.py ../fdroidserver/verify.py
-msgid "No unsigned directory - nothing to do"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "No version information could be found."
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Not a valid size definition: \"{}\""
-msgstr ""
-
-#: ../fdroidserver/signindex.py
-msgid "Nothing to do"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "Nothing to do for {appid}."
-msgstr ""
-
-#: ../fdroidserver/init.py
-msgid "Now set these in config.yml:"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "OBB file has newer versionCode({integer}) than any APK:"
-msgstr ""
-
-#: ../fdroidserver/update.py
-msgid "OBB filename must start with \"main.\" or \"patch.\":"
-msgstr ""
-
-#: ../fdroidserver/update.py
-msgid "OBB's packagename does not match a supported APK:"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "Offline machine, skipping git mirror generation until `fdroid deploy`"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "One of the 'github_releases' config items is missing the 'packageNames' value. skipping ..."
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "One of the 'github_releases' config items is missing the 'projectUrl' value. skipping ..."
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "One of the 'github_releases' config items is missing the 'token' value. skipping ..."
-msgstr ""
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Only PNG and JPEG are supported for graphics, found: {path}"
-msgstr ""
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/common.py
-msgid "Only accepts a single key \"env\""
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "Only process apps with auto-updates"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "OpenCollective donation methods belong in the OpenCollective: field"
-msgstr ""
-
-#: ../fdroidserver/verify.py
-msgid "Output JSON report to file named after APK."
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "Output JSON to stdout."
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py ../fdroidserver/gpgsign.py
-#: ../fdroidserver/publish.py ../fdroidserver/signindex.py
-#: ../fdroidserver/update.py
-msgid "Outputting JSON"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
-msgid "Overall license of the project."
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "Overriding blank versionName in {apkfilename} from metadata: {version}"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
-#, python-brace-format
-msgid "Package \"{appid}\" already exists"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Parsing manifest at '{path}'"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Password required with username"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
-msgid "Path to main Android project subdirectory, if not in root."
-msgstr ""
-
-#: ../fdroidserver/init.py
-msgid "Path to the Android SDK (sometimes set in ANDROID_HOME)"
-msgstr ""
-
-#: ../fdroidserver/btlog.py
-msgid "Path to the git repo to use as the log"
-msgstr ""
-
-#: ../fdroidserver/init.py
-msgid "Path to the keystore for the repo signing key"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-msgid "Print the secret variable to the terminal for easy copy/paste"
-msgstr ""
-
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "Privacy mode was enabled based on your locale ({country_code})."
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-format
-msgid "Problem with ZIP file: %s, error %s"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Problem with xml at '{path}'"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "Process auto-updates"
-msgstr ""
-
-#: ../fdroidserver/publish.py ../fdroidserver/update.py
-#, python-brace-format
-msgid "Processing {apkfilename}"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Processing {appid}"
-msgstr ""
-
-#: ../fdroidserver/update.py
-msgid "Produce human-readable XML/JSON for index files"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
-msgid "Project URL to import from."
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Punctuation should be avoided"
-msgstr ""
-
-#: ../fdroidserver/btlog.py
-msgid "Push the log to this git remote repository"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Pushing binary transparency log to {url}"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "Pushing to remote server failed!"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Pushing to {url}"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Quickly start a new repository"
-msgstr "פתיחת מאגר חדש במהירות"
-
-#: ../fdroidserver/__main__.py
-msgid "Read all the metadata files and exit"
-msgstr "לקרוא את כל קובצי נתוני העל ולצאת"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Reading '{config_file}'"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Reading packageName/versionCode/versionName failed, APK invalid: '{apkfilename}'"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Reading packageName/versionCode/versionName failed,APK invalid: '{apkfilename}'"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Reading {apkfilename} from cache"
-msgstr ""
-
-#: ../fdroidserver/build.py
-msgid "Refresh and cache scanner rules and signatures from the network"
-msgstr ""
-
-#: ../fdroidserver/publish.py
-#, python-brace-format
-msgid "Refusing to sign '{path}', file exists in both {dir1} and {dir2} folder."
-msgstr ""
-
-#: ../fdroidserver/verify.py
-msgid "Remove source tarball and any APKs if successfully verified."
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Removing specified files"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Removing {path}\""
-msgstr ""
-
-#: ../fdroidserver/update.py
-msgid "Rename APK files that do not match package.name_123.apk"
-msgstr "לשנות שמות של קובצי APK שאינם בתבנית package.name_123.apk"
-
-#: ../fdroidserver/nightly.py
-#, python-brace-format
-msgid "Resigning {apkfilename} with provided debug.keystore"
-msgstr ""
-
-#: ../fdroidserver/update.py
-msgid "Resize all the icons exceeding the max pixel size and exit"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Restrict output to warnings and errors"
-msgstr ""
-
-#: ../fdroidserver/net.py
-#, python-format
-msgid "Retrying failed download: %s"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Rewrite all the metadata files"
-msgstr "לשכתב את כל קובצי נתוני העל"
-
-#: ../fdroidserver/rewritemeta.py
-#, python-brace-format
-msgid "Rewriting '{appid}'"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "Run on git repo that has uncommitted changes"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-#, python-brace-format
-msgid "Run over {cibase} to find -debug.apk. and skip repo_basedir {repo_basedir}"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Run rewritemeta to fix formatting"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "Running first pass with MD5 checking disabled"
-msgstr ""
-
-#: ../fdroidserver/mirror.py
-#, python-brace-format
-msgid "Running wget in {path}"
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "SHA-256 of {url} does not match entry!"
-msgstr ""
-
-#: ../fdroidserver/build.py
-msgid "Scan the resulting APK(s) for known non-free classes."
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Scan the source code of a package"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Scanner found {count} problems in {apk}"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Scanner found {count} problems in {appid}:"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Scanner found {count} problems in {appid}:{versionCode}:"
-msgstr ""
-
-#: ../fdroidserver/build.py
-msgid "Scanner found {} problem"
-msgid_plural "Scanner found {} problems"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../fdroidserver/scanner.py
-msgid "Scanning APK for extra signing blocks."
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "Scanning APK with dexdump for known non-free classes."
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Set NDK {release} ({version}) up"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Set clock to that time using:"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-msgid "Set maximum releases in repo before older ones are archived"
-msgstr ""
-
-#: ../fdroidserver/build.py
-#, python-brace-format
-msgid "Set open file limit to {integer}"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Set up an app build for a nightly build repo"
-msgstr ""
-
-#: ../fdroidserver/build.py
-msgid "Setting open file limit failed: "
-msgstr ""
-
-#: ../fdroidserver/build.py
-#, python-brace-format
-msgid "Setting {0} sec timeout for this build"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Sign and place packages in the repo"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Sign indexes created using update --nosign"
-msgstr ""
-
-#: ../fdroidserver/build.py
-msgid "Skip scanning the source code for binaries and other problems"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Skipping '{apkfilename}' with invalid signature!"
-msgstr ""
-
-#: ../fdroidserver/deploy.py ../fdroidserver/index.py
-#, python-format
-msgid "Skipping GitLab Pages mirror because the repo is too large (>%.2fGB)!"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Skipping index generation for {appid}"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Skipping {apkfilename} with invalid signature!"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Skipping {appid}: disabled"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "Specify a local folder to sync the repo to"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "Specify an identity file to provide to SSH for rsyncing"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-msgid "Specify which debug keystore file to use."
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Spew out even more information than normal"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-#, python-brace-format
-msgid "Stripping mystery signature from {apkfilename}"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-format
-msgid "Summary '%s' is just the app's name"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Summary of length {length} is over the {limit} char limit"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "System clock is older than date in {path}!"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "Tags update mode only works for git, hg, bzr and git-svn repositories currently"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "Tags update mode used in git-svn, but the repo was not set up with tags"
-msgstr ""
-
-#: ../fdroidserver/build.py
-msgid "Test mode - put output in the tmp directory only, and always build, even if the output already exists."
-msgstr ""
-
-#: ../fdroidserver/index.py
-msgid "The \"qrcode\" Python package is not installed (e.g. apt-get install python3-qrcode)!"
-msgstr ""
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "The OBB version code must come after \"{name}.\":"
-msgstr ""
-
-#: ../fdroidserver/btlog.py
-msgid "The base URL for the repo to log (default: https://f-droid.org)"
-msgstr ""
-
-#: ../fdroidserver/mirror.py
-msgid "The directory to write the mirror to"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-msgid "The file to be included in the repo (path or glob)"
-msgstr ""
-
-#: ../fdroidserver/index.py
-msgid "The repository's fingerprint does not match."
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "The root dir for local_copy_dir \"{path}\" does not exist!"
-msgstr ""
-
-#: ../fdroidserver/publish.py
-msgid "There is a keyalias collision - publishing halted"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "These are the apps that have been archived from the main repo."
-msgstr ""
-
-#: ../fdroidserver/mirror.py
-msgid "This command should never be used to mirror f-droid.org! A full copy requires more than 600GB."
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "This is a repository of apps to be used with F-Droid. Applications in this repository are either official binaries built by the original application developers, or are binaries built from source by the admin of f-droid.org using the tools on https://gitlab.com/fdroid."
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
-#, python-format
-msgid "This repo already has local metadata: %s"
-msgstr ""
-
-#: ../fdroidserver/init.py
-#, python-format
-msgid ""
-"To complete the setup, add your APKs to \"%s\"\n"
-"then run \"fdroid update -c; fdroid update\".  You might also want to edit\n"
-"\"config.yml\" to set the URL, repo name, and more.  You should also set up\n"
-"a signing key (a temporary one might have been automatically generated).\n"
-"\n"
-"For more info: https://f-droid.org/docs/Setup_an_F-Droid_App_Repo\n"
-"and https://f-droid.org/docs/Signing_Process"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "To use awsbucket, awssecretkey and awsaccesskeyid must also be set in config.yml!"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "To use rclone, rclone_config and awsbucket must be set in config.yml!"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "URL must start with https:// or http://"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "URL shorteners should not be used"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "URL {url} in Description: {error}"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Unexpected license tag \"{}\"! Only use FSF or OSI approved tags from https://spdx.org/license-list"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Unexpected license tag \"{}\"! Only use license tags configured in your config file"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Unknown entry {key} in {configname}"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Unknown exception found!"
-msgstr "אירעה חריגה לא מוכרת!"
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Unknown file '{filename}' in build '{versionName}'"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-format
-msgid "Unknown metadata format: %s"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Unknown metadata format: {path} (use: *.yml)"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Unknown version of aapt, might cause problems: "
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Unnecessary leading space"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Unnecessary trailing space"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Unrecognised app field '{fieldname}' in '{path}'"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Unrecognised build flag '{build_flag}' in '{path}'"
-msgstr ""
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Unsupported file type \"{extension}\" for repo graphic"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Unsupported graphics file found: {path}"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-format
-msgid "Unused extlib at %s"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-format
-msgid "Unused file at %s"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-format
-msgid "Unused scandelete path: %s"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-format
-msgid "Unused scanignore path: %s"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Update repo information for new packages"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Update the binary transparency log for a URL"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "UpdateCheckData has invalid URL: {url}"
-msgstr ""
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "UpdateCheckData must match the version code as integer (\\d or [0-9]): {codeex}"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "UpdateCheckData must use HTTPS URL: {url}"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "UpdateCheckData not a valid URL: {url}"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "UpdateCheckMode is set but it looks like checkupdates hasn't been run yet."
-msgstr ""
-
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/lint.py
-msgid "UpdateCheckName is set to the known application ID, it can be removed"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Uploading {apkfilename} to androidobservatory.org"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Uploading {apkfilename} to virustotal"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Use /HEAD instead of /master or /main to point at a file in the default branch"
-msgstr ""
-
-#: ../fdroidserver/update.py
-msgid "Use `fdroid update -c` to create it."
-msgstr ""
-
-#: ../fdroidserver/build.py
-msgid "Use build server"
-msgstr ""
-
-#: ../fdroidserver/update.py
-msgid "Use date from APK instead of current time for newly added APKs"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Using \"{path}\" for configuring s3cmd."
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Using \"{path}\" for syncing with remote storage."
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Using APK Signature v2"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Using APK Signature v3"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Using JAR Signature"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Using Java's jarsigner, not recommended for verifying APKs! Use apksigner"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Using blank dictionary instead of contents of {path}!"
-msgstr ""
-
-#: ../fdroidserver/init.py
-#, python-brace-format
-msgid "Using existing keystore \"{path}\""
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Using rclone to sync with: {url}"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Using s3cmd to sync with: {url}"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Valid commands are:"
-msgstr "פקודות תקינות:"
-
-#: ../fdroidserver/verify.py
-msgid "Verify against locally cached copy rather than redownloading."
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Verify the integrity of downloaded packages"
-msgstr ""
-
-#: ../fdroidserver/index.py
-msgid "Verifying index signature:"
-msgstr ""
-
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "Verifying package {path} with apksigner."
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "VirusTotal API key cannot upload files larger than 32MB, use {url} to upload {path}."
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Warn about possible metadata errors"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "WebAssembly binary file"
-msgstr ""
-
-#: ../fdroidserver/update.py
-msgid "When configured for signed indexes, create only unsigned indexes at this stage"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "When linting the entire repository yamllint is disabled by default. This option forces yamllint regardless."
-msgstr ""
-
-#: ../fdroidserver/publish.py
-msgid "When signing or verifying fails, exit with an error code."
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "Would you like to download and install F-Droid.apk via adb? (YES/no)"
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "Would you like to download the app(s) from f-droid.org? (YES/no)"
-msgstr ""
-
-#: ../fdroidserver/init.py
-msgid "X.509 'Distinguished Name' used when generating keys"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "You can use ANDROID_HOME to set the path to your SDK, i.e.:"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "ZIP file archive"
-msgstr ""
-
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "adb reports {serial} is \"{status}\"!"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-#, python-brace-format
-msgid "adding IdentityFile to {path}"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "adding to {name}: {path}"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "ambiguous option: %(option)s could match %(matches)s"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "apksigner in build-tools;{version} passes APKs with invalid v3 signatures, ignoring."
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "apksigner not found! Cannot sign or verify modern APKs"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "apksigner not found, it's required for signing!"
-msgstr ""
-
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/checkupdates.py ../fdroidserver/lint.py
-#: ../fdroidserver/rewritemeta.py
-msgid "application ID of file to operate on"
-msgstr ""
-
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/build.py ../fdroidserver/install.py
-#: ../fdroidserver/publish.py ../fdroidserver/scanner.py
-#: ../fdroidserver/verify.py
-msgid "application ID with optional versionCode in the form APPID[:VERCODE]"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "archive_url needs to end with /archive"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "argument \"-\" with mode %r"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "argument %(argument_name)s: %(message)s"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-msgid "attempting bare SSH connection to test deploy key:"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "can not parse scrlib spec (not a string): '{}'"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "can't open '%(filename)s': %(error)s"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "can't open non-https url: '{};"
-msgstr ""
-
-#: ../fdroidserver/build.py
-#, python-brace-format
-msgid "cannot find required srclibs: \"{path}\""
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-msgid "cannot have multiple subparser arguments"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "cannot merge actions - two groups are named %r"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-msgid "cannot publish update, did you set the deploy key?"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-#, python-brace-format
-msgid "cloning {url}"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "commands from plugin modules:"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "conflicting option string: %s"
-msgid_plural "conflicting option strings: %s"
-msgstr[0] ""
-msgstr[1] ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "conflicting subparser alias: %s"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "conflicting subparser: %s"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "could not parse '{path}'"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "could not parse srclib spec (no name specified): '{}'"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "could not parse srclib spec (no ref specified): '{}'"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-#, python-brace-format
-msgid "created {path}"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "current version is newer: old vercode={old}, new vercode={new}"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "deleting: repo/{apkfilename}"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "dependency file without lock"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "deployed process log {path} to {dest}"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "dest= is required for options like %r"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "downloading '{}'"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "downloading scanner signatures from '{}' failed"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "executable binary, possibly code"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "expected %s argument"
-msgid_plural "expected %s arguments"
-msgstr[0] ""
-msgstr[1] ""
-
-#: /usr/lib/python3.11/argparse.py
-msgid "expected at least one argument"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-msgid "expected at most one argument"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-msgid "expected one argument"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "fdroid [<command>] [-h|--help|--version|<args>]"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "fetch the latest version of signatures from the web"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-msgid "force metadata errors (default) to be warnings, or to be ignored."
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "git svn clone failed"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "gzip file archive"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "ignored explicit argument %r"
-msgstr ""
-
-#: ../fdroidserver/index.py
-msgid "index-v1 must have a signature, use `fdroid signindex` to create it!"
-msgstr ""
-
-#: ../fdroidserver/index.py
-msgid "index-v2 must have a signature, use `fdroid signindex` to create it!"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "invalid %(type)s value: %(value)r"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "invalid choice: %(value)r (choose from %(choices)s)"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "invalid conflict_resolution value: %r"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "invalid option string %(option)r: must start with a character %(prefix_chars)r"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "ipfs_cid not found, skipping CIDv1 generation"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "latest build recipe is newer: old vercode={old}, new vercode={new}"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "local_copy_dir does not end with \"fdroid\", perhaps you meant: \"{path}\""
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "local_copy_dir must be an absolute path!"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "local_copy_dir must be directory, not a file!"
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-format
-msgid "mirror '%s' does not end with 'fdroid'!"
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "mirrors set twice, in config.yml and {path}!"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-msgid "mutually exclusive arguments must be optional"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "next {name} cache update due in {time}"
-msgstr ""
-
-#: ../fdroidserver/mirror.py
-#, python-brace-format
-msgid "no \"icon\" in {appid}"
-msgstr ""
-
-#: ../fdroidserver/signatures.py
-msgid "no APK supplied"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "no version information found"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "not allowed with argument %s"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "one of the arguments %s is required"
-msgstr ""
-
-#: ../fdroidserver/common.py ../fdroidserver/index.py
-msgid "only accepts strings, lists, and tuples"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-msgid "options"
-msgstr "אפשרויות"
-
-#: ../fdroidserver/nightly.py
-#, python-brace-format
-msgid "overwriting existing {path}"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-msgid "positional arguments"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "process log deploy {path} to {dest} failed!"
-msgstr ""
-
-#: ../fdroidserver/build.py
-msgid "reference binary missing signature"
-msgstr ""
-
-#: ../fdroidserver/signatures.py
-#, python-brace-format
-msgid "refuse downloading via insecure HTTP connection (use HTTPS or specify --no-https-check): {apkfilename}"
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-format
-msgid "repo_icon \"repo/icons/%s\" does not exist, generating placeholder."
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "repo_url needs to end with /repo"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "rsync is missing or broken: {error}"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "s3cmd sync indexes {path} to {url} and delete"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "s3cmd syncs indexes from {path} to {url} and deletes removed"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "scanner cache is malformed! You can clear it with: '{clear}'"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "serverwebroot: path does not end with \"fdroid\", perhaps you meant one of these:"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "shared library"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-msgid "show this help message and exit"
-msgstr "להציג את הודעת העזרה הזאת ולצאת"
-
-#: ../fdroidserver/signatures.py
-msgid "signed APK, either a file-path or HTTPS URL."
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "skip deploying full build logs: log content is empty"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "skip deploying full build logs: not enabled in config"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "skipping source tarball: {path}"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "srclibs missing name and/or @"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "static library"
-msgstr ""
-
-#: ../fdroidserver/build.py
-#, python-brace-format
-msgid "supplied reference binary has allowed signer {signer}"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "the following arguments are required: %s"
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "true"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "unexpected option string: %s"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "unknown parser %(parser_name)r (choices: %(choices)s)"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "unrecognized arguments: %s"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "unsafe permissions on '{config_file}' (should be 0600)!"
-msgstr ""
-
-#: ../fdroidserver/__main__.py /usr/lib/python3.11/argparse.py
-msgid "usage: "
-msgstr "שימוש: "
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "using Apache libcloud to sync with {url}"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "virustotal.com is rate limiting, waiting to retry..."
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "yes"
-msgstr ""
-
-#: ../fdroidserver/publish.py
-#, python-brace-format
-msgid "{0} app, {1} key aliases"
-msgid_plural "{0} apps, {1} key aliases"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{apkfilename} ({appid}) has no metadata!"
-msgstr ""
-
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{apkfilename}'s AndroidManifest.xml has a bad date: "
-msgstr ""
-
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{appid} does not have a name! Using application ID instead."
-msgstr ""
-
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{appid} from {path} is not a valid Android application ID!"
-msgstr ""
-
-#: ../fdroidserver/metadata.py ../fdroidserver/update.py
-#, python-brace-format
-msgid "{appid} from {path} is not a valid Java Package Name!"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{appid} has both APKs and files: {files}"
-msgstr ""
-
-#: ../fdroidserver/mirror.py
-#, python-brace-format
-msgid "{appid} is missing {name}"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "{appid}: Unknown extlib {path} in build '{versionName}'"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "{appid}: no builds specified, running on current source state"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "{appid}: {field} must be a '{type}', but it is a '{fieldtype}!'"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "{appid}: {field} must be a '{type}', but it is a '{fieldtype}'!"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "{build_flag} must be an integer, found: {value}"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "{build_flag} must be list or string, found: {value}"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "{file} is blank or corrupt!"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{name} \"{section}/icons/{path}\" does not exist! Check \"config.yml\"."
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{path1} is a duplicate of {path2}, remove one!"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
-#, python-brace-format
-msgid "{path} already exists, ignoring import results!"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-#, python-brace-format
-msgid "{path} does not exist!  Create it by running:"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{path} has bad file signature \"{pattern}\", possible Janus exploit!"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "{path} has been flagged by virustotal {count} times:"
-msgstr ""
-
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "{path} has the wrong fingerprint ({fingerprint})!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "{path} is not \"key: value\" dict, but a {datatype}!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "{path} is not a standard config file!"
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "{path} is not list, but a {datatype}!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "{path} is not {expected_type}, but a {datatype}!"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{path} is zero size!"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "{path} more than 200MB, manually upload: {url}"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "{path}: \"{code}\" is not a valid ISO_3166-1 alpha-2 country code!"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{path}: {error}"
-msgstr ""
-
-#: ../fdroidserver/mirror.py
-#, python-brace-format
-msgid "{url} does not end with \"fdroid\", check the URL path!"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
-#, python-brace-format
-msgid "{url} does not start with \"http\"!"
-msgstr ""
-
-#: ../fdroidserver/build.py
-msgid "{} build failed"
-msgid_plural "{} builds failed"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../fdroidserver/build.py
-msgid "{} build succeeded"
-msgid_plural "{} builds succeeded"
-msgstr[0] ""
-msgstr[1] ""
diff --git a/locale/hi/LC_MESSAGES/fdroidserver.po b/locale/hi/LC_MESSAGES/fdroidserver.po
deleted file mode 100644
index 58779021..00000000
--- a/locale/hi/LC_MESSAGES/fdroidserver.po
+++ /dev/null
@@ -1,2684 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# This file is put in the public domain.
-# Isrg Rajan <isrgrajan@outlook.com>, 2021.
-# Saurmandal <saurmandal@protonmail.com>, 2023.
-msgid ""
-msgstr ""
-"Project-Id-Version: fdroidserver 2.0a5-27-gf24eae0f\n"
-"Report-Msgid-Bugs-To: https://gitlab.com/fdroid/fdroidserver/issues\n"
-"POT-Creation-Date: 2025-06-25 09:52+0200\n"
-"PO-Revision-Date: 2023-02-22 11:24+0000\n"
-"Last-Translator: Saurmandal <saurmandal@protonmail.com>\n"
-"Language-Team: Hindi <https://hosted.weblate.org/projects/f-droid/fdroidserver/hi/>\n"
-"Language: hi\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Generator: Weblate 4.16-dev\n"
-
-#: ../fdroidserver/nightly.py
-msgid ""
-"\n"
-"SSH public key to be used as deploy key:"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-#, python-brace-format
-msgid ""
-"\n"
-"{path} encoded for the DEBUG_KEYSTORE secret variable:"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-format
-msgid "\"%s/\" has no matching metadata file!"
-msgstr ""
-
-#: ../fdroidserver/index.py
-msgid "\"isPrimary\" key should not be added to mirrors!"
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "\"local_copy_dir\" {path} does not exist!"
-msgstr ""
-
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "\"{apkfilename}\" is already installed on {dev}."
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "\"{path}\" contains recent {name} ({version})"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "\"{path}\" exists but s3cmd is not installed!"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "\"{path}\" is not a supported file format (use: metadata/*.yml)"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "\"{path}\" is signed by a key that is not allowed:"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
-#, python-brace-format
-msgid "\"{url}\" is not a valid URL!"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "%(prog)s: error: %(message)s\n"
-msgstr ""
-
-#: ../fdroidserver/publish.py
-#, python-format
-msgid "%d APKs failed to be signed or verified!"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-format
-msgid "%d problems found"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "%r is not callable"
-msgstr "%r कॉल करने योग्य नहीं है"
-
-#: ../fdroidserver/signindex.py
-#, python-format
-msgid "%s did not produce a dict!"
-msgstr ""
-
-#: ../fdroidserver/signindex.py
-#, python-format
-msgid "%s has bad SHA-256: %s"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-format
-msgid "%s is not an accepted build field"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "'keypass' not found in config.yml!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "'keystore' is NONE and 'smartcardoptions' is blank!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "'keystore' not found in config.yml!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "'keystorepass' not found in config.yml!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "'repo_keyalias' not found in config.yml!"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-msgid "'required' is an invalid argument for positionals"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "'sdk_path' not set in config.yml!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "'{aapt}' is too old, fdroid requires build-tools-{version} or newer!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "'{path}' failed to execute!"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "'{path}' has invalid format, it should be a dictionary!"
-msgstr ""
-
-#: ../fdroidserver/lint.py ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "'{value}' is not a valid {field} in {appid}. Regex pattern: {pattern}"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "'{value}' is not a valid {field}, should be {pattern}"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "--merge-request only runs on a single appid!"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "...checkupdate failed for {appid} : {error}"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-msgid ".__call__() not defined"
-msgstr ".__call__() परिभाषित नहीं"
-
-#: ../fdroidserver/lint.py
-msgid "/issues is missing"
-msgstr ""
-
-#: ../fdroidserver/mirror.py
-msgid "A URL is required as an argument!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "APK signatures have different certificates in {path}:"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Add PGP signatures using GnuPG for packages in repo"
-msgstr ""
-
-#: ../fdroidserver/update.py
-msgid "Add a repo signing key to an unsigned repo"
-msgstr ""
-
-#: ../fdroidserver/update.py
-msgid "Add skeleton metadata files for APKs that are missing them"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Adding new repo for only {name}"
-msgstr ""
-
-#: ../fdroidserver/init.py
-msgid "Alias of the repo signing key in the keystore"
-msgstr ""
-
-#: ../fdroidserver/build.py
-msgid "AllowedAPKSigningKeys missing but reference binary supplied"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
-msgid "Allows a different revision (or git branch) to be specified for the initial import"
-msgstr ""
-
-#: ../fdroidserver/mirror.py
-msgid "Also mirror the full archive section"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Also warn about formatting issues, like rewritemeta -l"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "Android AAR library"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "Android APK file"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "Android DEX code"
-msgstr ""
-
-#: ../fdroidserver/init.py
-#, python-brace-format
-msgid "Android SDK not found at {path}!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Android SDK path '{path}' does not exist!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Android SDK path '{path}' is not a directory!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Android SDK tool {cmd} not found!"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "App has Binaries but does not have corresponding AllowedAPKSigningKeys to pin certificate."
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "App has NoSourceSince or ArchivePolicy \"0 versions\" or 0 but AutoUpdateMode or UpdateCheckMode are not None"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "App is in '{repo}' but has a link to {url}"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "App version has binary but does not have corresponding AllowedAPKSigningKeys to pin certificate."
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Appending .git is not necessary"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Archiving {apkfilename} with invalid signature!"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "AutoUpdateMode with UpdateCheckMode: HTTP must have a pattern."
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "Automatic no to all prompts."
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "Automatic yes to all prompts."
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "Bad entry type \"{mirrortype}\" in mirrors config: {mirror}"
-msgstr ""
-
-#: ../fdroidserver/mirror.py
-msgid "Base URL to mirror, can include the index signing key using the query string: ?fingerprint="
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Branch '{branch}' used as commit in build '{versionName}'"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Branch '{branch}' used as commit in srclib '{srclib}'"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Broken symlink: {path}"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Build a package from source"
-msgstr "स्रोत से एक पैकेज बनाएँ"
-
-#: ../fdroidserver/build.py
-msgid "Build all applications available"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Build generated by `fdroid import` - remove disable line once ready"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "Build metadata git repo has uncommited changes!"
-msgstr ""
-
-#: ../fdroidserver/build.py
-msgid "Build only the latest version of each package"
-msgstr ""
-
-#: ../fdroidserver/init.py
-#, python-format
-msgid "Built repo based in \"%s\" with this config:"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "Can't auto-update app with no CurrentVersionCode"
-msgstr ""
-
-#: ../fdroidserver/build.py
-msgid "Can't build due to {} error while scanning"
-msgid_plural "Can't build due to {} errors while scanning"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Cannot read {path}: {error}"
-msgstr ""
-
-#: ../fdroidserver/rewritemeta.py
-#, python-brace-format
-msgid "Cannot rewrite \"{path}\""
-msgstr ""
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
-#: ../fdroidserver/lint.py
-#, python-format
-msgid "Categories '%s' is not valid"
-msgstr ""
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
-#: ../fdroidserver/lint.py
-msgid "Categories are not set"
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "Category \"{category}\" defined but not used for any apps!"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Check for updates to applications"
-msgstr "अनुप्रयोगों के अपडेट के लिए जाँच करें"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Checking archiving for {appid} - apks:{integer}, keepversions:{keep}, archapks:{arch}"
-msgstr ""
-
-#: ../fdroidserver/update.py
-msgid "Clean update - don't uses caches, reprocess all APKs"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Color the log output"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
-msgid "Comma separated list of categories."
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-#, python-format
-msgid "Command '%s' not recognised.\n"
-msgstr "कमांड '%s' पहचाना नहीं।\n"
-
-#: ../fdroidserver/checkupdates.py
-msgid "Commit changes"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "Commit changes, push, then make a merge request"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Conflicting \"{field}\" definitions between .yml and localized files:"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Conflicting arguments: '--verbose' and '--quiet' can not be specified at the same time."
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Could not find '{command}' on your system"
-msgstr ""
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/import_subcommand.py
-msgid "Could not find latest version code"
-msgstr ""
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
-#: ../fdroidserver/import_subcommand.py
-msgid "Could not find latest version name"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Could not find {path} to remove it"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Could not open APK {path} for analysis: "
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Could not parse size \"{size}\", wrong type \"{type}\""
-msgstr ""
-
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/import_subcommand.py
-msgid "Couldn't find Application ID"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "Couldn't find any version information"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "Couldn't find package ID"
-msgstr ""
-
-#: ../fdroidserver/update.py
-msgid "Cowardily refusing to overwrite existing signing key setup!"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Created new container \"{name}\""
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Creating \"{path}\" for configuring s3cmd."
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Creating empty {config_file}"
-msgstr ""
-
-#: ../fdroidserver/publish.py
-msgid "Creating log directory"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Creating new S3 bucket: {url}"
-msgstr ""
-
-#: ../fdroidserver/publish.py
-msgid "Creating output directory"
-msgstr ""
-
-#: ../fdroidserver/index.py
-msgid "Creating signed index with this key (SHA256):"
-msgstr ""
-
-#: ../fdroidserver/publish.py ../fdroidserver/verify.py
-msgid "Creating temporary directory"
-msgstr ""
-
-#: ../fdroidserver/index.py
-msgid "Creating unsigned index in preparation for signing"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "CurrentVersionCode {cv} is less than oldest build entry {versionCode}"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-msgid "DEBUG_KEYSTORE is not set or the value is incomplete"
-msgstr ""
-
-#: ../fdroidserver/update.py
-msgid "Delete APKs and/or OBBs without metadata from the repo"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Deleting archive, repo is too big ({size} max {limit})"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Deleting git-mirror history, repo is too big ({size} max {limit})"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Deleting unknown file: {path}"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-format
-msgid "Description '%s' is just the app's summary"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Description has a duplicate line"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Description of length {length} is over the {limit} char limit"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Did you mean config/{name}.yml?"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Did you mean {code}?"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
-msgid "Do not add 'disable:' to the generated build entries"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-msgid "Do not deploy the new files to the repo"
-msgstr ""
-
-#: ../fdroidserver/mirror.py
-#, python-brace-format
-msgid "Do not include \"{path}\" in URL!"
-msgstr ""
-
-#: ../fdroidserver/init.py
-msgid "Do not prompt for Android SDK path, just fail"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-msgid "Do not remove the private keys generated from the keystore"
-msgstr ""
-
-#: ../fdroidserver/build.py
-msgid "Don't create a source tarball, useful when testing a build"
-msgstr ""
-
-#: ../fdroidserver/build.py
-msgid "Don't refresh the repository, useful when testing a build with no internet connection"
-msgstr ""
-
-#: ../fdroidserver/deploy.py ../fdroidserver/nightly.py
-msgid "Don't use rsync checksums"
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "Download F-Droid.apk using mirrors that leak less to the network"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Download complete mirrors of small repos"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Downloading the repository already failed once, not trying again."
-msgstr ""
-
-#: ../fdroidserver/verify.py
-#, python-brace-format
-msgid "Downloading {url} failed. {error}"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Duplicate Anti-Feature declaration at {path} was ignored!"
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-format
-msgid "Duplicate entry \"%s\" in mirrors config!"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Duplicate link in '{field}': {url}"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-format
-msgid "ERROR: %(message)s"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "ERROR: The \"server\" subcommand has been removed, use \"deploy\"!"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-msgid "ERROR: unsupported CI type, patches welcome!"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-#, python-format
-msgid "ERROR: unsupported git host \"%s\", patches welcome!"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "ERROR: {key} in {path} is not \"archive\" or \"repo\"!"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "ERROR: {key} not a valid key!"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "ERROR: {key}'s value should be of type {t}!"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "ERROR: {key}:{subkey} in {path} is not in allowed keys: {allowed_keys}!"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-#, python-brace-format
-msgid "Encoding is set to '{enc}' fdroid might run into encoding issues. Please set it to 'UTF-8' for best results."
-msgstr ""
-
-#: ../fdroidserver/init.py
-#, python-format
-msgid ""
-"Enter the path to the Android SDK (%s) here:\n"
-"> "
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Environment variable {var} from {configname} is not set!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Environment variable {{env: {var}}} is not set!"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "Error deploying 'github_releases', {} not present. (You might need to run `fdroid update` first.)"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
-msgid "Error while getting repo address"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "Exit with a non-zero code if problems were found"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Extract application metadata from a source repository"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Extract signatures from APKs"
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "F-Droid.apk could not be downloaded from any known source!"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Failed copying {path}: {error}"
-msgstr ""
-
-#: ../fdroidserver/signatures.py
-#, python-brace-format
-msgid "Failed fetching signatures for '{apkfilename}': {error}"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Failed reading {path}: {error}"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Failed resizing {path}: {error}"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Failed to create S3 bucket: {url}"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Failed to get APK information, deleting {path}"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Failed to get APK information, skipping {path}"
-msgstr ""
-
-#: ../fdroidserver/update.py
-msgid "Failed to get APK signing key fingerprint"
-msgstr ""
-
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "Failed to install '{apkfilename}' on {dev}: {error}"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Failed to sign application"
-msgstr ""
-
-#: ../fdroidserver/build.py
-#, python-brace-format
-msgid "Fetched buildserverid from VM: {buildserverid}"
-msgstr ""
-
-#: ../fdroidserver/signatures.py
-#, python-brace-format
-msgid "Fetched signatures for '{apkfilename}' -> '{sigdir}'"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "File disappeared while processing it: {path}"
-msgstr ""
-
-#: ../fdroidserver/build.py ../fdroidserver/install.py
-#: ../fdroidserver/rewritemeta.py ../fdroidserver/scanner.py
-#: ../fdroidserver/update.py
-msgid "Finished"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Forbidden HTML tags"
-msgstr ""
-
-#: ../fdroidserver/build.py
-msgid "Force build of disabled apps, and carries on regardless of scan problems. Only allowed in test mode."
-msgstr ""
-
-#: ../fdroidserver/build.py
-#, python-brace-format
-msgid "Force halting build after {0} sec timeout!"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "Force scan of disabled apps and builds."
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Found \"{path}\" graphic without metadata for app \"{name}\"!"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Found bad funding file \"{path}\" for \"{name}\":"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Found invalid appids in arguments"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Found invalid versionCodes for some apps"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Found multiple JAR Signature Block Files in {path}"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Found multiple Signer Certificates!"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Found multiple metadata files for {appid}"
-msgstr ""
-
-#: ../fdroidserver/index.py
-msgid "Found multiple signing certificates for repository."
-msgstr ""
-
-#: ../fdroidserver/index.py
-msgid "Found no signing certificates for repository."
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-format
-msgid "Found non-file at %s"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Found {apkfilename} at {url}"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Found {count} problems in {filename}"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Found {count} warnings in {filename}"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Generated skeleton metadata for {appid}"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-format
-msgid "Git checkout of '%s' failed"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Git clean failed"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Git fetch failed"
-msgstr ""
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/common.py
-#, python-format
-msgid "Git remote set-head failed: \"%s\""
-msgstr ""
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/common.py
-msgid "Git reset failed"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Git submodule deinit failed"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Git submodule sync failed"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Git submodule update failed"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "HTTPS must be used with Subversion URLs!"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "If a git mirror gets to big, allow the archive to be deleted"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "If this upload fails, try manually uploading to {url}"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Ignoring '{field}' in '{metapath}' metadata because it is deprecated."
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-format
-msgid "Ignoring FUNDING.yml entry longer than 2048: %s"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-format
-msgid "Ignoring bad element in manifest: %s"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Ignoring deprecated {oldfile}, use {newfile}!"
-msgstr ""
-
-#: ../fdroidserver/index.py
-msgid "Ignoring package without metadata: "
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Ignoring stale cache data for {apkfilename}"
-msgstr ""
-
-#: ../fdroidserver/update.py
-msgid "Include APKs that are signed with disabled algorithms like MD5"
-msgstr ""
-
-#: ../fdroidserver/mirror.py
-msgid "Include the PGP signature .asc files in the mirror"
-msgstr ""
-
-#: ../fdroidserver/mirror.py
-msgid "Include the build logs in the mirror"
-msgstr ""
-
-#: ../fdroidserver/mirror.py
-msgid "Include the source tarballs in the mirror"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-format
-msgid "Including metadata from %s@%s"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Including metadata from {path}"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Initialising submodules"
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "Install all signed applications available"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Install built packages on devices"
-msgstr ""
-
-#: ../fdroidserver/install.py
-#, python-format
-msgid "Installing %s..."
-msgstr ""
-
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "Installing '{apkfilename}' on {dev}..."
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Interact with the repo HTTP server"
-msgstr ""
-
-#: ../fdroidserver/update.py
-msgid "Invalid APK"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "Invalid AutoUpdateMode: {mode}"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "Invalid UpdateCheckMode: {mode}"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "Invalid VercodeOperation: {field}"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Invalid VercodeOperation: {invalid_ops}"
-msgstr ""
-
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Invalid application ID {appid}"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Invalid bulleted list"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-format
-msgid "Invalid name for published file: %s"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Invalid ndk: entry in build: \"{ndk}\""
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Invalid redirect to non-HTTPS: {before} -> {after} "
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Invalid scrlib metadata: '{file}' does not exist"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Invalid srclib metadata: could not parse '{file}'"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Invalid srclib metadata: unknown key '{key}' in '{file}'"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "JAR signature failed to verify: {path}"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "JAR signature verified: {path}"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "Java JAR file"
-msgstr ""
-
-#: ../fdroidserver/mirror.py ../fdroidserver/publish.py
-#: ../fdroidserver/update.py
-msgid "Java JDK not found! Install in standard location or set java_paths!"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "Java compiled class"
-msgstr ""
-
-#: ../fdroidserver/signindex.py
-msgid "Java jarsigner not found! Install in standard location or set java_paths!"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Javascript in HTML src attributes"
-msgstr ""
-
-#: ../fdroidserver/build.py
-#, python-brace-format
-msgid "Keeping failed build \"{apkfilename}\""
-msgstr ""
-
-#: ../fdroidserver/init.py
-msgid "Keystore for signing key:\t"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Known debug key is used in AllowedAPKSigningKeys: "
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Last used commit '{commit}' looks like a tag, but UpdateCheckMode is '{ucm}'"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Liberapay donation methods belong in the Liberapay: field"
-msgstr ""
-
-#: ../fdroidserver/rewritemeta.py
-msgid "List files that would be reformatted (dry run)"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Locale included in f-droid.org URL"
-msgstr ""
-
-#: ../fdroidserver/build.py
-msgid "Make the build stop on exceptions"
-msgstr ""
-
-#: ../fdroidserver/index.py
-msgid "Malformed repository mirrors."
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "Malformed serverwebroot line:"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-format
-msgid "Max recursion depth in ZIP file reached: %s"
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "Mirror config for {url} contains \"isPrimary\" key!"
-msgstr ""
-
-#: ../fdroidserver/mirror.py
-msgid "Mirror the full repo and archive, all file types."
-msgstr ""
-
-#: ../fdroidserver/gpgsign.py
-msgid "Missing output directory"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-msgid "Moving Anti-Features declarations to localized files:"
-msgstr ""
-
-#: ../fdroidserver/index.py
-msgid "Neither \"repo_pubkey\" nor \"keystorepass\" set in config.yml"
-msgstr ""
-
-#: ../fdroidserver/verify.py
-#, python-format
-msgid "No APK for package: %s"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "No Android SDK found!"
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "No attached devices found"
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "No devices found for `adb install`! Please plug one in."
-msgstr ""
-
-#: ../fdroidserver/index.py
-msgid "No fingerprint in URL."
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "No git submodules available"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
-msgid "No gradle project could be found. Specify --subdir?"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
-msgid "No information found."
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "No matching tags found"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "No minimum SDK version found in {0}, using default (3)."
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "No need to specify that the app is Free Software"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "No need to specify that the app is for Android"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "No option set! Edit your config.yml to set at least one of these:"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "No packages specified"
-msgstr ""
-
-#: ../fdroidserver/install.py
-#, python-format
-msgid "No signed APK available for %s"
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "No signed output directory - nothing to do"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "No signing certificates found in {path}"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-format
-msgid "No such package: %s"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "No such versionCode {versionCode} for app {appid}"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "No tags found"
-msgstr ""
-
-#: ../fdroidserver/publish.py ../fdroidserver/verify.py
-msgid "No unsigned directory - nothing to do"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "No version information could be found."
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Not a valid size definition: \"{}\""
-msgstr ""
-
-#: ../fdroidserver/signindex.py
-msgid "Nothing to do"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "Nothing to do for {appid}."
-msgstr ""
-
-#: ../fdroidserver/init.py
-msgid "Now set these in config.yml:"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "OBB file has newer versionCode({integer}) than any APK:"
-msgstr ""
-
-#: ../fdroidserver/update.py
-msgid "OBB filename must start with \"main.\" or \"patch.\":"
-msgstr ""
-
-#: ../fdroidserver/update.py
-msgid "OBB's packagename does not match a supported APK:"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "Offline machine, skipping git mirror generation until `fdroid deploy`"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "One of the 'github_releases' config items is missing the 'packageNames' value. skipping ..."
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "One of the 'github_releases' config items is missing the 'projectUrl' value. skipping ..."
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "One of the 'github_releases' config items is missing the 'token' value. skipping ..."
-msgstr ""
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Only PNG and JPEG are supported for graphics, found: {path}"
-msgstr ""
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/common.py
-msgid "Only accepts a single key \"env\""
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "Only process apps with auto-updates"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "OpenCollective donation methods belong in the OpenCollective: field"
-msgstr ""
-
-#: ../fdroidserver/verify.py
-msgid "Output JSON report to file named after APK."
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "Output JSON to stdout."
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py ../fdroidserver/gpgsign.py
-#: ../fdroidserver/publish.py ../fdroidserver/signindex.py
-#: ../fdroidserver/update.py
-msgid "Outputting JSON"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
-msgid "Overall license of the project."
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "Overriding blank versionName in {apkfilename} from metadata: {version}"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
-#, python-brace-format
-msgid "Package \"{appid}\" already exists"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Parsing manifest at '{path}'"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Password required with username"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
-msgid "Path to main Android project subdirectory, if not in root."
-msgstr ""
-
-#: ../fdroidserver/init.py
-msgid "Path to the Android SDK (sometimes set in ANDROID_HOME)"
-msgstr ""
-
-#: ../fdroidserver/btlog.py
-msgid "Path to the git repo to use as the log"
-msgstr ""
-
-#: ../fdroidserver/init.py
-msgid "Path to the keystore for the repo signing key"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-msgid "Print the secret variable to the terminal for easy copy/paste"
-msgstr ""
-
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "Privacy mode was enabled based on your locale ({country_code})."
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-format
-msgid "Problem with ZIP file: %s, error %s"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Problem with xml at '{path}'"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "Process auto-updates"
-msgstr ""
-
-#: ../fdroidserver/publish.py ../fdroidserver/update.py
-#, python-brace-format
-msgid "Processing {apkfilename}"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Processing {appid}"
-msgstr ""
-
-#: ../fdroidserver/update.py
-msgid "Produce human-readable XML/JSON for index files"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
-msgid "Project URL to import from."
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Punctuation should be avoided"
-msgstr ""
-
-#: ../fdroidserver/btlog.py
-msgid "Push the log to this git remote repository"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Pushing binary transparency log to {url}"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "Pushing to remote server failed!"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Pushing to {url}"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Quickly start a new repository"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Read all the metadata files and exit"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Reading '{config_file}'"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Reading packageName/versionCode/versionName failed, APK invalid: '{apkfilename}'"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Reading packageName/versionCode/versionName failed,APK invalid: '{apkfilename}'"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Reading {apkfilename} from cache"
-msgstr ""
-
-#: ../fdroidserver/build.py
-msgid "Refresh and cache scanner rules and signatures from the network"
-msgstr ""
-
-#: ../fdroidserver/publish.py
-#, python-brace-format
-msgid "Refusing to sign '{path}', file exists in both {dir1} and {dir2} folder."
-msgstr ""
-
-#: ../fdroidserver/verify.py
-msgid "Remove source tarball and any APKs if successfully verified."
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Removing specified files"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Removing {path}\""
-msgstr ""
-
-#: ../fdroidserver/update.py
-msgid "Rename APK files that do not match package.name_123.apk"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "RepoType {type} is deprecated, please switch to git."
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-#, python-brace-format
-msgid "Resigning {apkfilename} with provided debug.keystore"
-msgstr ""
-
-#: ../fdroidserver/update.py
-msgid "Resize all the icons exceeding the max pixel size and exit"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Restrict output to warnings and errors"
-msgstr ""
-
-#: ../fdroidserver/net.py
-#, python-format
-msgid "Retrying failed download: %s"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Rewrite all the metadata files"
-msgstr ""
-
-#: ../fdroidserver/rewritemeta.py
-#, python-brace-format
-msgid "Rewriting '{appid}'"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "Run on git repo that has uncommitted changes"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-#, python-brace-format
-msgid "Run over {cibase} to find -debug.apk. and skip repo_basedir {repo_basedir}"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Run rewritemeta to fix formatting"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "Running first pass with MD5 checking disabled"
-msgstr ""
-
-#: ../fdroidserver/mirror.py
-#, python-brace-format
-msgid "Running wget in {path}"
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "SHA-256 of {url} does not match entry!"
-msgstr ""
-
-#: ../fdroidserver/build.py
-msgid "Scan the resulting APK(s) for known non-free classes."
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Scan the source code of a package"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Scanner found {count} problems in {apk}"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Scanner found {count} problems in {appid}:"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Scanner found {count} problems in {appid}:{versionCode}:"
-msgstr ""
-
-#: ../fdroidserver/build.py
-msgid "Scanner found {} problem"
-msgid_plural "Scanner found {} problems"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../fdroidserver/scanner.py
-msgid "Scanning APK for extra signing blocks."
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "Scanning APK with dexdump for known non-free classes."
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Set NDK {release} ({version}) up"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Set clock to that time using:"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-msgid "Set maximum releases in repo before older ones are archived"
-msgstr ""
-
-#: ../fdroidserver/build.py
-#, python-brace-format
-msgid "Set open file limit to {integer}"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Set up an app build for a nightly build repo"
-msgstr ""
-
-#: ../fdroidserver/build.py
-msgid "Setting open file limit failed: "
-msgstr ""
-
-#: ../fdroidserver/build.py
-#, python-brace-format
-msgid "Setting {0} sec timeout for this build"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Sign and place packages in the repo"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Sign indexes created using update --nosign"
-msgstr ""
-
-#: ../fdroidserver/build.py
-msgid "Skip scanning the source code for binaries and other problems"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Skipping '{apkfilename}' with invalid signature!"
-msgstr ""
-
-#: ../fdroidserver/deploy.py ../fdroidserver/index.py
-#, python-format
-msgid "Skipping GitLab Pages mirror because the repo is too large (>%.2fGB)!"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Skipping index generation for {appid}"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Skipping {apkfilename} with invalid signature!"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Skipping {appid}: disabled"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "Specify a local folder to sync the repo to"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "Specify an identity file to provide to SSH for rsyncing"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-msgid "Specify which debug keystore file to use."
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Spew out even more information than normal"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-#, python-brace-format
-msgid "Stripping mystery signature from {apkfilename}"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-format
-msgid "Summary '%s' is just the app's name"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Summary of length {length} is over the {limit} char limit"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "System clock is older than date in {path}!"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "Tags update mode only works for git, hg, bzr and git-svn repositories currently"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "Tags update mode used in git-svn, but the repo was not set up with tags"
-msgstr ""
-
-#: ../fdroidserver/build.py
-msgid "Test mode - put output in the tmp directory only, and always build, even if the output already exists."
-msgstr ""
-
-#: ../fdroidserver/index.py
-msgid "The \"qrcode\" Python package is not installed (e.g. apt-get install python3-qrcode)!"
-msgstr ""
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "The OBB version code must come after \"{name}.\":"
-msgstr ""
-
-#: ../fdroidserver/btlog.py
-msgid "The base URL for the repo to log (default: https://f-droid.org)"
-msgstr ""
-
-#: ../fdroidserver/mirror.py
-msgid "The directory to write the mirror to"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-msgid "The file to be included in the repo (path or glob)"
-msgstr ""
-
-#: ../fdroidserver/index.py
-msgid "The repository's fingerprint does not match."
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "The root dir for local_copy_dir \"{path}\" does not exist!"
-msgstr ""
-
-#: ../fdroidserver/publish.py
-msgid "There is a keyalias collision - publishing halted"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "These are the apps that have been archived from the main repo."
-msgstr ""
-
-#: ../fdroidserver/mirror.py
-msgid "This command should never be used to mirror f-droid.org! A full copy requires more than 600GB."
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "This is a repository of apps to be used with F-Droid. Applications in this repository are either official binaries built by the original application developers, or are binaries built from source by the admin of f-droid.org using the tools on https://gitlab.com/fdroid."
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
-#, python-format
-msgid "This repo already has local metadata: %s"
-msgstr ""
-
-#: ../fdroidserver/init.py
-#, python-format
-msgid ""
-"To complete the setup, add your APKs to \"%s\"\n"
-"then run \"fdroid update -c; fdroid update\".  You might also want to edit\n"
-"\"config.yml\" to set the URL, repo name, and more.  You should also set up\n"
-"a signing key (a temporary one might have been automatically generated).\n"
-"\n"
-"For more info: https://f-droid.org/docs/Setup_an_F-Droid_App_Repo\n"
-"and https://f-droid.org/docs/Signing_Process"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "To use awsbucket, awssecretkey and awsaccesskeyid must also be set in config.yml!"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "To use rclone, rclone_config and awsbucket must be set in config.yml!"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "URL must start with https:// or http://"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "URL shorteners should not be used"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "URL {url} in Description: {error}"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Unexpected license tag \"{}\"! Only use FSF or OSI approved tags from https://spdx.org/license-list"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Unexpected license tag \"{}\"! Only use license tags configured in your config file"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Unknown entry {key} in {configname}"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Unknown exception found!"
-msgstr "अज्ञात अपवाद मिला!"
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Unknown file '{filename}' in build '{versionName}'"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-format
-msgid "Unknown metadata format: %s"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Unknown metadata format: {path} (use: *.yml)"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Unknown version of aapt, might cause problems: "
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Unnecessary leading space"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Unnecessary trailing space"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Unrecognised app field '{fieldname}' in '{path}'"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Unrecognised build flag '{build_flag}' in '{path}'"
-msgstr ""
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Unsupported file type \"{extension}\" for repo graphic"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Unsupported graphics file found: {path}"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-format
-msgid "Unused extlib at %s"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-format
-msgid "Unused file at %s"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-format
-msgid "Unused scandelete path: %s"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-format
-msgid "Unused scanignore path: %s"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Update repo information for new packages"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Update the binary transparency log for a URL"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "UpdateCheckData has invalid URL: {url}"
-msgstr ""
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "UpdateCheckData must match the version code as integer (\\d or [0-9]): {codeex}"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "UpdateCheckData must use HTTPS URL: {url}"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "UpdateCheckData not a valid URL: {url}"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "UpdateCheckMode is set but it looks like checkupdates hasn't been run yet."
-msgstr ""
-
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/lint.py
-msgid "UpdateCheckName is set to the known application ID, it can be removed"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Uploading {apkfilename} to androidobservatory.org"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Uploading {apkfilename} to virustotal"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Use /HEAD instead of /master or /main to point at a file in the default branch"
-msgstr ""
-
-#: ../fdroidserver/update.py
-msgid "Use `fdroid update -c` to create it."
-msgstr ""
-
-#: ../fdroidserver/build.py
-msgid "Use build server"
-msgstr ""
-
-#: ../fdroidserver/update.py
-msgid "Use date from APK instead of current time for newly added APKs"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Using \"{path}\" for configuring s3cmd."
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Using \"{path}\" for syncing with remote storage."
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Using APK Signature v2"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Using APK Signature v3"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Using JAR Signature"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Using Java's jarsigner, not recommended for verifying APKs! Use apksigner"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Using blank dictionary instead of contents of {path}!"
-msgstr ""
-
-#: ../fdroidserver/init.py
-#, python-brace-format
-msgid "Using existing keystore \"{path}\""
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Using rclone to sync with: {url}"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Using s3cmd to sync with: {url}"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Valid commands are:"
-msgstr "मान्य कमांड्स हैं:"
-
-#: ../fdroidserver/verify.py
-msgid "Verify against locally cached copy rather than redownloading."
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Verify the integrity of downloaded packages"
-msgstr ""
-
-#: ../fdroidserver/index.py
-msgid "Verifying index signature:"
-msgstr ""
-
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "Verifying package {path} with apksigner."
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "VirusTotal API key cannot upload files larger than 32MB, use {url} to upload {path}."
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-msgid "WARNING: only public git repos are supported!"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Warn about possible metadata errors"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "WebAssembly binary file"
-msgstr ""
-
-#: ../fdroidserver/update.py
-msgid "When configured for signed indexes, create only unsigned indexes at this stage"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "When linting the entire repository yamllint is disabled by default. This option forces yamllint regardless."
-msgstr ""
-
-#: ../fdroidserver/publish.py
-msgid "When signing or verifying fails, exit with an error code."
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "Would you like to download and install F-Droid.apk via adb? (YES/no)"
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "Would you like to download the app(s) from f-droid.org? (YES/no)"
-msgstr ""
-
-#: ../fdroidserver/init.py
-msgid "X.509 'Distinguished Name' used when generating keys"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "You can use ANDROID_HOME to set the path to your SDK, i.e.:"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "ZIP file archive"
-msgstr ""
-
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "adb reports {serial} is \"{status}\"!"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-#, python-brace-format
-msgid "adding IdentityFile to {path}"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "adding to {name}: {path}"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "ambiguous option: %(option)s could match %(matches)s"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "apksigner in build-tools;{version} passes APKs with invalid v3 signatures, ignoring."
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "apksigner not found! Cannot sign or verify modern APKs"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "apksigner not found, it's required for signing!"
-msgstr ""
-
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/checkupdates.py ../fdroidserver/lint.py
-#: ../fdroidserver/rewritemeta.py
-msgid "application ID of file to operate on"
-msgstr ""
-
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/build.py ../fdroidserver/install.py
-#: ../fdroidserver/publish.py ../fdroidserver/scanner.py
-#: ../fdroidserver/verify.py
-msgid "application ID with optional versionCode in the form APPID[:VERCODE]"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "archive_url needs to end with /archive"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "argument \"-\" with mode %r"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "argument %(argument_name)s: %(message)s"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-msgid "attempting bare SSH connection to test deploy key:"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "can not parse scrlib spec (not a string): '{}'"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "can't open '%(filename)s': %(error)s"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "can't open non-https url: '{};"
-msgstr ""
-
-#: ../fdroidserver/build.py
-#, python-brace-format
-msgid "cannot find required srclibs: \"{path}\""
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-msgid "cannot have multiple subparser arguments"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "cannot merge actions - two groups are named %r"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-msgid "cannot publish update, did you set the deploy key?"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-#, python-brace-format
-msgid "cloning {url}"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "commands from plugin modules:"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "conflicting option string: %s"
-msgid_plural "conflicting option strings: %s"
-msgstr[0] ""
-msgstr[1] ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "conflicting subparser alias: %s"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "conflicting subparser: %s"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "could not parse '{path}'"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "could not parse srclib spec (no name specified): '{}'"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "could not parse srclib spec (no ref specified): '{}'"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-#, python-brace-format
-msgid "created {path}"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "current version is newer: old vercode={old}, new vercode={new}"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "deleting: repo/{apkfilename}"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "dependency file without lock"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "deployed process log {path} to {dest}"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "dest= is required for options like %r"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "downloading '{}'"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "downloading scanner signatures from '{}' failed"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "executable binary, possibly code"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "expected %s argument"
-msgid_plural "expected %s arguments"
-msgstr[0] ""
-msgstr[1] ""
-
-#: /usr/lib/python3.11/argparse.py
-msgid "expected at least one argument"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-msgid "expected at most one argument"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-msgid "expected one argument"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "fdroid [<command>] [-h|--help|--version|<args>]"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "fetch the latest version of signatures from the web"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-msgid "force metadata errors (default) to be warnings, or to be ignored."
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "git svn clone failed"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "gzip file archive"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "ignored explicit argument %r"
-msgstr ""
-
-#: ../fdroidserver/index.py
-msgid "index-v1 must have a signature, use `fdroid signindex` to create it!"
-msgstr ""
-
-#: ../fdroidserver/index.py
-msgid "index-v2 must have a signature, use `fdroid signindex` to create it!"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "invalid %(type)s value: %(value)r"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "invalid choice: %(value)r (choose from %(choices)s)"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "invalid conflict_resolution value: %r"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "invalid option string %(option)r: must start with a character %(prefix_chars)r"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "ipfs_cid not found, skipping CIDv1 generation"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "latest build recipe is newer: old vercode={old}, new vercode={new}"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "local_copy_dir does not end with \"fdroid\", perhaps you meant: \"{path}\""
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "local_copy_dir must be an absolute path!"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "local_copy_dir must be directory, not a file!"
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-format
-msgid "mirror '%s' does not end with 'fdroid'!"
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "mirrors set twice, in config.yml and {path}!"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-msgid "mutually exclusive arguments must be optional"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "next {name} cache update due in {time}"
-msgstr ""
-
-#: ../fdroidserver/mirror.py
-#, python-brace-format
-msgid "no \"icon\" in {appid}"
-msgstr ""
-
-#: ../fdroidserver/signatures.py
-msgid "no APK supplied"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "no version information found"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "not allowed with argument %s"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "one of the arguments %s is required"
-msgstr ""
-
-#: ../fdroidserver/common.py ../fdroidserver/index.py
-msgid "only accepts strings, lists, and tuples"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, fuzzy
-msgid "options"
-msgstr "विकल्प"
-
-#: ../fdroidserver/nightly.py
-#, python-brace-format
-msgid "overwriting existing {path}"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-msgid "positional arguments"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "process log deploy {path} to {dest} failed!"
-msgstr ""
-
-#: ../fdroidserver/build.py
-msgid "reference binary missing signature"
-msgstr ""
-
-#: ../fdroidserver/signatures.py
-#, python-brace-format
-msgid "refuse downloading via insecure HTTP connection (use HTTPS or specify --no-https-check): {apkfilename}"
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-format
-msgid "repo_icon \"repo/icons/%s\" does not exist, generating placeholder."
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "repo_url needs to end with /repo"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "rsync is missing or broken: {error}"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "s3cmd sync indexes {path} to {url} and delete"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "s3cmd syncs indexes from {path} to {url} and deletes removed"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "scanner cache is malformed! You can clear it with: '{clear}'"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "serverwebroot: path does not end with \"fdroid\", perhaps you meant one of these:"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "shared library"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-msgid "show this help message and exit"
-msgstr "यह मदद संदेश दिखाएं और बाहर निकलें"
-
-#: ../fdroidserver/signatures.py
-msgid "signed APK, either a file-path or HTTPS URL."
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "skip deploying full build logs: log content is empty"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "skip deploying full build logs: not enabled in config"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "skipping source tarball: {path}"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "srclibs missing name and/or @"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "static library"
-msgstr ""
-
-#: ../fdroidserver/build.py
-#, python-brace-format
-msgid "supplied reference binary has allowed signer {signer}"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "the following arguments are required: %s"
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "true"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "unexpected option string: %s"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "unknown parser %(parser_name)r (choices: %(choices)s)"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "unrecognized arguments: %s"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "unsafe permissions on '{config_file}' (should be 0600)!"
-msgstr ""
-
-#: ../fdroidserver/__main__.py /usr/lib/python3.11/argparse.py
-msgid "usage: "
-msgstr "प्रयोग: "
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "using Apache libcloud to sync with {url}"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "virustotal.com is rate limiting, waiting to retry..."
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "yes"
-msgstr ""
-
-#: ../fdroidserver/publish.py
-#, python-brace-format
-msgid "{0} app, {1} key aliases"
-msgid_plural "{0} apps, {1} key aliases"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{apkfilename} ({appid}) has no metadata!"
-msgstr ""
-
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{apkfilename}'s AndroidManifest.xml has a bad date: "
-msgstr ""
-
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{appid} does not have a name! Using application ID instead."
-msgstr ""
-
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{appid} from {path} is not a valid Android application ID!"
-msgstr ""
-
-#: ../fdroidserver/metadata.py ../fdroidserver/update.py
-#, python-brace-format
-msgid "{appid} from {path} is not a valid Java Package Name!"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{appid} has both APKs and files: {files}"
-msgstr ""
-
-#: ../fdroidserver/mirror.py
-#, python-brace-format
-msgid "{appid} is missing {name}"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "{appid}: Unknown extlib {path} in build '{versionName}'"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "{appid}: no builds specified, running on current source state"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "{appid}: {field} must be a '{type}', but it is a '{fieldtype}!'"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "{appid}: {field} must be a '{type}', but it is a '{fieldtype}'!"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "{build_flag} must be an integer, found: {value}"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "{build_flag} must be list or string, found: {value}"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "{file} is blank or corrupt!"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{name} \"{section}/icons/{path}\" does not exist! Check \"config.yml\"."
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{path1} is a duplicate of {path2}, remove one!"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
-#, python-brace-format
-msgid "{path} already exists, ignoring import results!"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-#, python-brace-format
-msgid "{path} does not exist!  Create it by running:"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{path} has bad file signature \"{pattern}\", possible Janus exploit!"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "{path} has been flagged by virustotal {count} times:"
-msgstr ""
-
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "{path} has the wrong fingerprint ({fingerprint})!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "{path} is not \"key: value\" dict, but a {datatype}!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "{path} is not a standard config file!"
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "{path} is not list, but a {datatype}!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "{path} is not {expected_type}, but a {datatype}!"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{path} is zero size!"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "{path} more than 200MB, manually upload: {url}"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "{path}: \"{code}\" is not a valid ISO_3166-1 alpha-2 country code!"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{path}: {error}"
-msgstr ""
-
-#: ../fdroidserver/mirror.py
-#, python-brace-format
-msgid "{url} does not end with \"fdroid\", check the URL path!"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
-#, python-brace-format
-msgid "{url} does not start with \"http\"!"
-msgstr ""
-
-#: ../fdroidserver/build.py
-msgid "{} build failed"
-msgid_plural "{} builds failed"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../fdroidserver/build.py
-msgid "{} build succeeded"
-msgid_plural "{} builds succeeded"
-msgstr[0] ""
-msgstr[1] ""
diff --git a/locale/hu/LC_MESSAGES/fdroidserver.po b/locale/hu/LC_MESSAGES/fdroidserver.po
index 6e232ead..a274970b 100644
--- a/locale/hu/LC_MESSAGES/fdroidserver.po
+++ b/locale/hu/LC_MESSAGES/fdroidserver.po
@@ -1,14 +1,13 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# Balázs Meskó <meskobalazs@mailbox.org>, 2020, 2021.
-# Hans-Christoph Steiner <hans@guardianproject.info>, 2020, 2021, 2022, 2024.
-# KissPandur <zoltankiss.web@gmail.com>, 2022.
+# Balázs Meskó <meskobalazs@mailbox.org>, 2020.
+# Hans-Christoph Steiner <hans@guardianproject.info>, 2020.
 msgid ""
 msgstr ""
 "Project-Id-Version: fdroidserver 1.0.6-70-g54bc858\n"
 "Report-Msgid-Bugs-To: https://gitlab.com/fdroid/fdroidserver/issues\n"
-"POT-Creation-Date: 2025-06-25 09:52+0200\n"
-"PO-Revision-Date: 2024-04-10 13:33+0000\n"
+"POT-Creation-Date: 2020-10-21 18:05+0200\n"
+"PO-Revision-Date: 2020-11-10 16:21+0000\n"
 "Last-Translator: Hans-Christoph Steiner <hans@guardianproject.info>\n"
 "Language-Team: Hungarian <https://hosted.weblate.org/projects/f-droid/fdroidserver/hu/>\n"
 "Language: hu\n"
@@ -16,11 +15,30 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 5.5-dev\n"
+"X-Generator: Weblate 4.4-dev\n"
+
+#: ../fdroidserver/common.py
+msgid ""
+"\n"
+"        This is a repository of apps to be used with FDroid. Applications in this\n"
+"        repository are either official binaries built by the original application\n"
+"        developers, or are binaries built from source by f-droid.org using the\n"
+"        tools on https://gitlab.com/fdroid.\n"
+"        "
+msgstr ""
 
 #: ../fdroidserver/nightly.py
 msgid ""
 "\n"
+"SSH Public Key to be used as Deploy Key:"
+msgstr ""
+"\n"
+"A telepítési kulcsként használandó nyilvános SSH-kulcs:"
+
+#: ../fdroidserver/nightly.py
+#, fuzzy
+msgid ""
+"\n"
 "SSH public key to be used as deploy key:"
 msgstr ""
 "\n"
@@ -40,26 +58,22 @@ msgstr ""
 msgid "\"%s/\" has no matching metadata file!"
 msgstr "A(z) „%s/” nem rendelkezik megfelelő metaadatfájllal."
 
-#: ../fdroidserver/index.py
-msgid "\"isPrimary\" key should not be added to mirrors!"
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "\"local_copy_dir\" {path} does not exist!"
-msgstr "\"local_copy_dir\" {path} nem létezik!"
-
 #: ../fdroidserver/install.py
-#, python-brace-format
+#, fuzzy, python-brace-format
 msgid "\"{apkfilename}\" is already installed on {dev}."
 msgstr "A(z) „{apkfilename}” már telepítve van ezen: {dev}."
 
+#: ../fdroidserver/update.py
+#, python-brace-format
+msgid "\"{path}\" contains outdated {name} ({version})"
+msgstr "A(z) „{path}” elavult {name} csomagot tartalmaz ({version})"
+
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "\"{path}\" contains recent {name} ({version})"
 msgstr "A(z) „{path}” friss {name} csomagot tartalmaz ({version})"
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "\"{path}\" exists but s3cmd is not installed!"
 msgstr "A(z) „{path}” létezik, de az s3cmd nincs telepítve."
@@ -69,117 +83,143 @@ msgstr "A(z) „{path}” létezik, de az s3cmd nincs telepítve."
 msgid "\"{path}\" is not a supported file format (use: metadata/*.yml)"
 msgstr "A(z) „{path}” nem egy elfogadott formátum, alakítsa át erre: metadata/*.yml"
 
-#: ../fdroidserver/update.py
+#: ../fdroidserver/metadata.py
 #, python-brace-format
-msgid "\"{path}\" is signed by a key that is not allowed:"
-msgstr "\"{path}\" kulccsal aláírt és így nem engedélyezett:"
+msgid "\"{path}\" is not an accepted format, convert to: {formats}"
+msgstr "A(z) „{path}” nem egy elfogadott formátum, alakítsa át erre: {formats}"
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/common.py
 #, python-brace-format
 msgid "\"{url}\" is not a valid URL!"
-msgstr "A(z) „{url}” nem érvényes URL!"
+msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, python-format
+msgid "%(option)s option requires %(number)d argument"
+msgid_plural "%(option)s option requires %(number)d arguments"
+msgstr[0] "a(z) %(option)s kapcsoló %(number)d argumentumot igényel"
+msgstr[1] "a(z) %(option)s kapcsoló %(number)d argumentumot igényel"
+
+#: ../fdroidserver/mirror.py
+#, python-format
+msgid "%(prog)s [options] url"
+msgstr "%(prog)s [kapcsolók] url"
+
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "%(prog)s: error: %(message)s\n"
 msgstr "%(prog)s: hiba: %(message)s\n"
 
-#: ../fdroidserver/publish.py
-#, python-format
-msgid "%d APKs failed to be signed or verified!"
-msgstr ""
-
 #: ../fdroidserver/scanner.py
 #, python-format
 msgid "%d problems found"
 msgstr "%d probléma található"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "%prog [options]"
+msgstr "%prog [kapcsolók]"
+
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "%r is not callable"
-msgstr "A(z) %r nem hívható"
-
-#: ../fdroidserver/signindex.py
-#, python-format
-msgid "%s did not produce a dict!"
-msgstr ""
-
-#: ../fdroidserver/signindex.py
-#, python-format
-msgid "%s has bad SHA-256: %s"
-msgstr ""
+msgstr "a(z) %r nem hívható"
 
 #: ../fdroidserver/lint.py
 #, python-format
 msgid "%s is not an accepted build field"
 msgstr "A(z) %s nem elfogadott összeállítási mező"
 
-#: ../fdroidserver/common.py
-msgid "'keypass' not found in config.yml!"
-msgstr "A „keypass” nem található a config.yml fájlban."
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, python-format
+msgid "%s option does not take a value"
+msgstr "A(z) %s kapcsoló nem fogad értéket"
+
+#: ../fdroidserver/index.py ../fdroidserver/common.py
+msgid "'keypass' not found in config.py!"
+msgstr "A „keypass” nem található a config.py fájlban."
 
 #: ../fdroidserver/common.py
 msgid "'keystore' is NONE and 'smartcardoptions' is blank!"
-msgstr "A „keystore” értéke NONE és a „smartcardoptions” üres."
+msgstr ""
 
-#: ../fdroidserver/common.py
-msgid "'keystore' not found in config.yml!"
-msgstr "A „keystore” nem található a config.yml fájlban."
+#: ../fdroidserver/index.py ../fdroidserver/common.py
+msgid "'keystore' not found in config.py!"
+msgstr "A „keystore” nem található a config.py fájlban."
 
-#: ../fdroidserver/common.py
-msgid "'keystorepass' not found in config.yml!"
-msgstr "A „keystorepass” nem található a config.yml fájlban."
+#: ../fdroidserver/index.py ../fdroidserver/common.py
+msgid "'keystorepass' not found in config.py!"
+msgstr "A „keystorepass” nem található a config.py fájlban."
 
-#: ../fdroidserver/common.py
-msgid "'repo_keyalias' not found in config.yml!"
-msgstr "A „repo_keyalias” nem található a config.yml fájlban."
+#: ../fdroidserver/index.py ../fdroidserver/common.py
+msgid "'repo_keyalias' not found in config.py!"
+msgstr "A „repo_keyalias” nem található a config.py fájlban."
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "'required' is an invalid argument for positionals"
-msgstr "A „required” argumentum érvénytelen argumentum pozicionális paraméterek esetén"
+msgstr ""
 
 #: ../fdroidserver/common.py
-msgid "'sdk_path' not set in config.yml!"
-msgstr "Az „sdk_path” nincs megadva a „config.yml” fájlban."
+msgid "'sdk_path' not set in 'config.py'!"
+msgstr "Az „sdk_path” nincs megadva a „config.py” fájlban."
+
+#. Translators: "build-tools" is the file name of a package from
+#. Google, it is part of the Android SDK. So it probably shouldn't be
+#. translated or transliterated.
+#: ../fdroidserver/common.py
+#, python-brace-format
+msgid "'{aapt}' is too old, fdroid requires build-tools-23.0.0 or newer!"
+msgstr "Az „{aapt}” túl régi, az fdroidhoz build-tools-23.0.0 vagy újabb szükséges."
 
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "'{aapt}' is too old, fdroid requires build-tools-{version} or newer!"
 msgstr "Az „{aapt}” túl régi, az fdroidhoz build-tools-{version} vagy újabb szükséges."
 
+#: ../fdroidserver/install.py
+#, python-brace-format
+msgid "'{apkfilename}' is already installed on {dev}."
+msgstr "A(z) „{apkfilename}” már telepítve van ezen: {dev}."
+
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "'{field}' in {linedesc} is obsolete, see docs for current fields:"
+msgstr ""
+
+#: ../fdroidserver/common.py
+#, python-brace-format
+msgid "'{field}' will be in random order! Use () or [] brackets if order is important!"
+msgstr "A(z) „{field}” véletlenszerű sorrendben lesz. Használjon () vagy [] zárójeleket, ha fontos a sorrend."
+
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "'{path}' failed to execute!"
-msgstr "A(z) „{path}” végrehajtása sikertelen."
+msgstr "A(z) „{path}” végrehajtása meghiúsult."
 
 #: ../fdroidserver/metadata.py
 #, python-brace-format
-msgid "'{path}' has invalid format, it should be a dictionary!"
-msgstr ""
-
-#: ../fdroidserver/lint.py ../fdroidserver/metadata.py
-#, python-brace-format
 msgid "'{value}' is not a valid {field} in {appid}. Regex pattern: {pattern}"
 msgstr "A(z) „{value}” nem érvényes {field} érték itt: {appid}. Regex minta: {pattern}"
 
-#: ../fdroidserver/metadata.py
-#, fuzzy, python-brace-format
-msgid "'{value}' is not a valid {field}, should be {pattern}"
-msgstr "A(z) „{value}” nem érvényes {field} érték itt: minta: {pattern}"
-
-#: ../fdroidserver/checkupdates.py
-msgid "--merge-request only runs on a single appid!"
-msgstr ""
-
 #: ../fdroidserver/checkupdates.py
 #, python-brace-format
 msgid "...checkupdate failed for {appid} : {error}"
 msgstr "…checkupdate sikertelen ennél: {appid} : {error}"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid ".__call__() not defined"
 msgstr ".__call__() nincs definiálva"
 
+#: ../fdroidserver/metadata.py
+msgid ".fdroid.txt is not supported!  Convert to .fdroid.yml or .fdroid.json."
+msgstr "Az .fdroid.txt nem támogatott. Alakítsa .fdroid.yml vagy .fdroid.json fájllá."
+
 #: ../fdroidserver/lint.py
 msgid "/issues is missing"
 msgstr "a /issues hiányzik"
@@ -188,15 +228,14 @@ msgstr "a /issues hiányzik"
 msgid "A URL is required as an argument!"
 msgstr "Az URL argumentumként megadása szükséges."
 
-#: ../fdroidserver/common.py
-#, fuzzy, python-brace-format
-msgid "APK signatures have different certificates in {path}:"
-msgstr "Nem található aláíró-tanúsítvány itt: {path}"
-
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Add PGP signatures using GnuPG for packages in repo"
 msgstr "PGP aláírások hozzáadása GnuPG segítségével a tároló csomagjaihoz"
 
+#: ../fdroid ../fdroidserver/__main__.py
+msgid "Add a new application from its source code"
+msgstr "Új alkalmazás hozzáadása a forráskódjából"
+
 #: ../fdroidserver/update.py
 msgid "Add a repo signing key to an unsigned repo"
 msgstr "Tároló aláírási kulcs hozzáadása a nem aláírt tárolóhoz"
@@ -208,473 +247,446 @@ msgstr "Metaadatfájl-vázak hozzáadása azon APK-khoz, melyeknél hiányoznak"
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Adding new repo for only {name}"
-msgstr "Új tároló hozzáadása csak a következő miatt: {name}"
+msgstr ""
 
 #: ../fdroidserver/init.py
 msgid "Alias of the repo signing key in the keystore"
-msgstr "A tároló aláírókulcsának álneve a kulcstárolóban"
-
-#: ../fdroidserver/build.py
-msgid "AllowedAPKSigningKeys missing but reference binary supplied"
 msgstr ""
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "Allows a different revision (or git branch) to be specified for the initial import"
-msgstr "Lehetővé teszi, hogy különböző verziót (vagy git ágat) adjon meg a kezdeti importáláshoz"
+msgstr ""
 
 #: ../fdroidserver/mirror.py
 msgid "Also mirror the full archive section"
-msgstr "Letükrözi a teljes archívum szakaszt is"
+msgstr ""
 
 #: ../fdroidserver/lint.py
 msgid "Also warn about formatting issues, like rewritemeta -l"
-msgstr "Figyelmeztet a formázási problémákra is, mint a „rewritemeta -l”"
+msgstr ""
 
 #: ../fdroidserver/scanner.py
 msgid "Android AAR library"
-msgstr "Android AAR programkönyvtár"
+msgstr ""
 
 #: ../fdroidserver/scanner.py
 msgid "Android APK file"
-msgstr "Android APK-fájl"
+msgstr ""
 
 #: ../fdroidserver/scanner.py
 msgid "Android DEX code"
-msgstr "Android DEX kód"
+msgstr ""
 
-#: ../fdroidserver/init.py
+#: ../fdroidserver/common.py ../fdroidserver/build.py
 #, python-brace-format
-msgid "Android SDK not found at {path}!"
-msgstr "Az Android SDK nem található itt: {path}!"
+msgid "Android SDK '{path}' does not have '{dirname}' installed!"
+msgstr ""
+
+#: ../fdroidserver/common.py
+msgid "Android SDK not found!"
+msgstr ""
 
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "Android SDK path '{path}' does not exist!"
-msgstr "A(z) „{path}” Android SDK elérési út nem található!"
+msgstr ""
 
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "Android SDK path '{path}' is not a directory!"
-msgstr "A(z) „{path}” Android SDK elérési út nem könyvtár!"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Android SDK tool {cmd} not found!"
-msgstr "A(z) „{cmd}” Android SDK eszköz megtalálva!"
-
-#: ../fdroidserver/lint.py
-msgid "App has Binaries but does not have corresponding AllowedAPKSigningKeys to pin certificate."
 msgstr ""
 
-#: ../fdroidserver/lint.py
-msgid "App has NoSourceSince or ArchivePolicy \"0 versions\" or 0 but AutoUpdateMode or UpdateCheckMode are not None"
+#. Translators: "build-tools" is the file name of a package from
+#. Google, it is part of the Android SDK. So it probably shouldn't be
+#. translated or transliterated.
+#: ../fdroidserver/common.py
+#, python-brace-format
+msgid "Android build-tools path '{path}' does not exist!"
+msgstr ""
+
+#: ../fdroidserver/update.py
+msgid "AndroidManifest.xml has no date"
 msgstr ""
 
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "App is in '{repo}' but has a link to {url}"
-msgstr "Az alkalmazás a(z) „{repo}” tárolóban található, de erre hivatkozik: {url}"
-
-#: ../fdroidserver/lint.py
-msgid "App version has binary but does not have corresponding AllowedAPKSigningKeys to pin certificate."
 msgstr ""
 
 #: ../fdroidserver/lint.py
 msgid "Appending .git is not necessary"
-msgstr "A .git hozzáfűzése nem szükséges"
+msgstr ""
 
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Archiving {apkfilename} with invalid signature!"
-msgstr "Az érvénytelen aláírású {apkfilename} archiválása!"
-
-#: ../fdroidserver/lint.py
-msgid "AutoUpdateMode with UpdateCheckMode: HTTP must have a pattern."
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "Automatic no to all prompts."
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "Automatic yes to all prompts."
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "Bad entry type \"{mirrortype}\" in mirrors config: {mirror}"
 msgstr ""
 
 #: ../fdroidserver/mirror.py
 msgid "Base URL to mirror, can include the index signing key using the query string: ?fingerprint="
-msgstr "A tükrözendő alap URL, tartalmazhatja az index aláírókulcsát a lekérdezésben: ?fingerprint="
+msgstr ""
 
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "Branch '{branch}' used as commit in build '{versionName}'"
-msgstr "A(z) „{branch}” ág véglegesítésként használva a(z) „{versionName}” összeállításnál"
+msgstr ""
 
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "Branch '{branch}' used as commit in srclib '{srclib}'"
-msgstr "A(z) „{branch}” ág véglegesítésként használva a(z) „{srclib}” srclibnél"
+msgstr ""
 
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Broken symlink: {path}"
-msgstr "Törött szimbolikus link: {path}"
+msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Build a package from source"
 msgstr "Csomag összeállítása forrásból"
 
 #: ../fdroidserver/build.py
 msgid "Build all applications available"
-msgstr "Az összes elérhető alkalmazás összeállítása"
+msgstr ""
 
 #: ../fdroidserver/lint.py
 msgid "Build generated by `fdroid import` - remove disable line once ready"
-msgstr "Az összeállítást az „fdroid import” állította elő – törölje a letiltási sort, ha végzett"
+msgstr ""
 
 #: ../fdroidserver/checkupdates.py
 msgid "Build metadata git repo has uncommited changes!"
-msgstr "A metaadatok git tárolójában nem véglegesített változások találhatók!"
+msgstr ""
 
 #: ../fdroidserver/build.py
 msgid "Build only the latest version of each package"
-msgstr "Csak a csomagok legújabb verziójának összeállítása"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Build should have comma-separated versionName and versionCode, not \"{value}\", in {linedesc}"
+msgstr ""
 
 #: ../fdroidserver/init.py
 #, python-format
 msgid "Built repo based in \"%s\" with this config:"
-msgstr "A tároló összeállítva itt: „%s”, ezzel a konfigurációval:"
-
-#: ../fdroidserver/checkupdates.py
-msgid "Can't auto-update app with no CurrentVersionCode"
 msgstr ""
 
 #: ../fdroidserver/build.py
 msgid "Can't build due to {} error while scanning"
 msgid_plural "Can't build due to {} errors while scanning"
-msgstr[0] "Nem lehet összeállítani, mert {} hiba történt az átvizsgáláskor"
-msgstr[1] "Nem lehet összeállítani, mert {} hiba történt az átvizsgáláskor"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../fdroidserver/common.py
-#, fuzzy, python-brace-format
-msgid "Cannot read {path}: {error}"
-msgstr "A(z) {path} olvasása sikertelen: {error}"
+#: ../fdroidserver/vmtools.py
+#, python-brace-format
+msgid "Cannot read \"{path}\"!"
+msgstr ""
+
+#. Translators: https://developer.android.com/studio/build/application-id
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Cannot resolve application ID {appid}"
+msgstr ""
 
 #: ../fdroidserver/rewritemeta.py
 #, python-brace-format
 msgid "Cannot rewrite \"{path}\""
-msgstr "A(z) „{path}” nem írható újra"
+msgstr ""
+
+#: ../fdroidserver/rewritemeta.py
+msgid "Cannot use --list and --to at the same time"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Cannot write \"{path}\", not an accepted format, use: {formats}"
+msgstr ""
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
 #: ../fdroidserver/lint.py
 #, python-format
 msgid "Categories '%s' is not valid"
-msgstr "A(z) „%s” kategória érvénytelen"
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
-#: ../fdroidserver/lint.py
-msgid "Categories are not set"
-msgstr "A kategóriák nincsenek megadva"
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "Category \"{category}\" defined but not used for any apps!"
 msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroidserver/lint.py
+msgid "Categories are not set"
+msgstr ""
+
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Check for updates to applications"
 msgstr "Alkalmazásfrissítések keresése"
 
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Checking archiving for {appid} - apks:{integer}, keepversions:{keep}, archapks:{arch}"
-msgstr "Archiválás ellenőrzése ennél: {appid} – apks:{integer}, keepversions:{keep}, archapks:{arch}"
+msgstr ""
+
+#: ../fdroidserver/dscanner.py
+msgid "Clean after all scans have finished"
+msgstr ""
+
+#: ../fdroidserver/dscanner.py
+msgid "Clean before the scans start and rebuild the container"
+msgstr ""
+
+#: ../fdroidserver/dscanner.py
+msgid "Clean up all containers and then exit"
+msgstr ""
 
 #: ../fdroidserver/update.py
 msgid "Clean update - don't uses caches, reprocess all APKs"
-msgstr "Tiszta frissítés – nem használ gyorsítótárat, minden APK-k újra feldolgoz"
-
-#: ../fdroidserver/common.py
-msgid "Color the log output"
 msgstr ""
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "Comma separated list of categories."
-msgstr "Kategóriák vesszőkkel elválasztott listája."
+msgstr ""
 
-#: ../fdroidserver/__main__.py
-#, python-format
+#: ../fdroid ../fdroidserver/__main__.py
+#, c-format, python-format
 msgid "Command '%s' not recognised.\n"
 msgstr "A(z) „%s” nem ismerhető fel.\n"
 
 #: ../fdroidserver/checkupdates.py
 msgid "Commit changes"
-msgstr "Változások véglegesítése"
-
-#: ../fdroidserver/checkupdates.py
-msgid "Commit changes, push, then make a merge request"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Conflicting \"{field}\" definitions between .yml and localized files:"
 msgstr ""
 
 #: ../fdroidserver/__main__.py
 msgid "Conflicting arguments: '--verbose' and '--quiet' can not be specified at the same time."
-msgstr "Ütköző argumentumok: a „--verbose” és a „--quite” kapcsolók együtt nem adhatók meg."
+msgstr ""
 
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "Could not find '{command}' on your system"
-msgstr "A(z) „{command}” nem található a rendszeren"
+msgstr ""
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "Could not find latest version code"
-msgstr "A legfrissebb verzió kódja nem található"
+msgstr ""
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "Could not find latest version name"
-msgstr "A legfrissebb verzió neve nem található"
+msgstr ""
 
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Could not find {path} to remove it"
-msgstr "A(z) {path} eltávolítandó fájl nem található"
+msgstr ""
 
 #: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Could not open APK {path} for analysis: "
-msgstr "A(z) {path} APK nem nyitható meg az elemzéshez: "
+msgid "Could not open apk file for analysis"
+msgstr ""
 
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "Could not parse size \"{size}\", wrong type \"{type}\""
-msgstr "A(z) „{size}” méret nem dolgozható fel, hibás „{type}” típus"
+msgstr ""
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/import_subcommand.py
+#. Translators: https://developer.android.com/studio/build/application-id
+#: ../fdroidserver/import.py
 msgid "Couldn't find Application ID"
-msgstr "Az alkalmazásazonosító nem található"
+msgstr ""
 
-#: ../fdroidserver/checkupdates.py
-#, fuzzy
-msgid "Couldn't find any version information"
-msgstr "A legfrissebb verzió neve nem található"
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
+#: ../fdroidserver/import.py
+msgid "Couldn't find latest version code"
+msgstr ""
 
-#: ../fdroidserver/checkupdates.py
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
+#: ../fdroidserver/import.py
+msgid "Couldn't find latest version name"
+msgstr ""
+
+#: ../fdroidserver/import.py
 msgid "Couldn't find package ID"
-msgstr "A csomagazonosító nem található"
+msgstr ""
 
 #: ../fdroidserver/update.py
 msgid "Cowardily refusing to overwrite existing signing key setup!"
-msgstr "A meglévő aláírókulcs-beállítás felülírása megtagadva!"
+msgstr ""
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/update.py
+msgid "Create a repo signing key in a keystore"
+msgstr ""
+
+#: ../fdroidserver/update.py
+msgid "Create skeleton metadata files that are missing"
+msgstr "Hiányzó metaadatfájl-vázak létrehozása"
+
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Created new container \"{name}\""
-msgstr "Új „{name}” konténer létrehozva"
+msgstr ""
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Creating \"{path}\" for configuring s3cmd."
-msgstr "„{path}” létrehozása a s3cmd beállításához."
-
-#: ../fdroidserver/common.py
-#, fuzzy, python-brace-format
-msgid "Creating empty {config_file}"
-msgstr "„{config_file}” olvasása"
+msgstr ""
 
 #: ../fdroidserver/publish.py
 msgid "Creating log directory"
-msgstr "Naplókönyvtár létrehozása"
+msgstr ""
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Creating new S3 bucket: {url}"
-msgstr "Új S3 vödör létrehozása: {url}"
+msgstr ""
 
 #: ../fdroidserver/publish.py
 msgid "Creating output directory"
-msgstr "Kimeneti könyvtár létrehozása"
+msgstr ""
 
 #: ../fdroidserver/index.py
 msgid "Creating signed index with this key (SHA256):"
-msgstr "Aláírt index létrehozása ezzel a kulccsal (SHA256):"
+msgstr ""
 
-#: ../fdroidserver/publish.py ../fdroidserver/verify.py
+#: ../fdroidserver/import.py ../fdroidserver/verify.py
+#: ../fdroidserver/publish.py
 msgid "Creating temporary directory"
-msgstr "Ideiglenes könyvtár létrehozása"
+msgstr ""
 
 #: ../fdroidserver/index.py
 msgid "Creating unsigned index in preparation for signing"
-msgstr "Nem aláírt index létrehozása az aláírás előkészítéséhez"
+msgstr ""
 
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "CurrentVersionCode {cv} is less than oldest build entry {versionCode}"
-msgstr "A CurrentVersionCode ({cv}) kisebb, mint a legrégebbi összeállítási bejegyzés: {versionCode}"
+msgstr ""
 
 #: ../fdroidserver/nightly.py
 msgid "DEBUG_KEYSTORE is not set or the value is incomplete"
-msgstr "A DEBUG_KEYSTORE nincs beállítva, vagy az értéke nem teljes"
+msgstr ""
 
 #: ../fdroidserver/update.py
 msgid "Delete APKs and/or OBBs without metadata from the repo"
-msgstr "Minden metaadat nélküli APK- és OBB-fájl törlése a tárolóból"
+msgstr "Minden metaadat nélküli APK és OBB fájl törlése a tárolóból"
 
 #: ../fdroidserver/deploy.py
 #, python-brace-format
 msgid "Deleting archive, repo is too big ({size} max {limit})"
-msgstr "Archívum törlése, a tároló túl nagy ({size}, korlát: {limit})"
+msgstr ""
 
 #: ../fdroidserver/deploy.py
 #, python-brace-format
 msgid "Deleting git-mirror history, repo is too big ({size} max {limit})"
-msgstr "A git-mirror előzményeinek törlése, a tároló túl nagy ({size}, korlát: {limit})"
+msgstr ""
 
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Deleting unknown file: {path}"
-msgstr "Ismeretlen fájl törlése: {path}"
+msgstr ""
 
 #: ../fdroidserver/lint.py
 #, python-format
 msgid "Description '%s' is just the app's summary"
-msgstr "A(z) „%s” leírás csak az alkalmazás összegzése"
+msgstr ""
 
 #: ../fdroidserver/lint.py
 msgid "Description has a duplicate line"
-msgstr "A leírás ismételt sorokat tartalmaz"
+msgstr ""
+
+#: ../fdroidserver/lint.py
+#, python-format
+msgid "Description has a list (%s) but it isn't bulleted (*) nor numbered (#)"
+msgstr ""
 
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "Description of length {length} is over the {limit} char limit"
-msgstr "A leírás {length} karakteres hossza több, mint a {limit} karakteres korlát"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Did you mean config/{name}.yml?"
 msgstr ""
 
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Did you mean {code}?"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "Do not add 'disable:' to the generated build entries"
-msgstr "Ne adja a hozzá a „disable:” szöveget az előállított összeállítási elemekhez"
+msgstr ""
 
 #: ../fdroidserver/nightly.py
 msgid "Do not deploy the new files to the repo"
-msgstr "Ne telepítse az új fájlokat a tárolóba"
+msgstr ""
 
 #: ../fdroidserver/mirror.py
 #, python-brace-format
 msgid "Do not include \"{path}\" in URL!"
-msgstr "Ne adja hozzá a(z) „{path}” elérési utat az URL-hez!"
+msgstr ""
 
 #: ../fdroidserver/init.py
 msgid "Do not prompt for Android SDK path, just fail"
-msgstr "Ne kérdezze meg az Android SDK elérési utat, csak álljon le sikertelenül"
+msgstr ""
 
 #: ../fdroidserver/nightly.py
 msgid "Do not remove the private keys generated from the keystore"
-msgstr "Ne távolítsa el a kulcstárolóból előállított privát kulcsokat"
+msgstr ""
 
 #: ../fdroidserver/build.py
 msgid "Don't create a source tarball, useful when testing a build"
-msgstr "Ne hozzon létre forráscsomagot, ez egy összeállítás tesztelésekor hasznos"
+msgstr ""
+
+#: ../fdroidserver/stats.py
+msgid "Don't do anything logs-related"
+msgstr ""
 
 #: ../fdroidserver/build.py
 msgid "Don't refresh the repository, useful when testing a build with no internet connection"
-msgstr "Ne frissítse a tárolót, hasznos ha internetkapcsolat nélkül tesztel egy összeállítást"
-
-#: ../fdroidserver/deploy.py ../fdroidserver/nightly.py
-msgid "Don't use rsync checksums"
-msgstr "Ne használja az rsync ellenőrzőösszegeit"
-
-#: ../fdroidserver/install.py
-msgid "Download F-Droid.apk using mirrors that leak less to the network"
 msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroidserver/deploy.py ../fdroidserver/nightly.py
+#: ../fdroidserver/upload.py
+msgid "Don't use rsync checksums"
+msgstr ""
+
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Download complete mirrors of small repos"
-msgstr "Kis tárolók teljes tükrének letöltése"
+msgstr ""
+
+#: ../fdroidserver/stats.py
+msgid "Download logs we don't have"
+msgstr ""
 
 #: ../fdroidserver/common.py
 msgid "Downloading the repository already failed once, not trying again."
-msgstr "A tároló letöltése már egyszer sikertelen volt, nem próbálja meg újra."
+msgstr ""
 
 #: ../fdroidserver/verify.py
 #, python-brace-format
 msgid "Downloading {url} failed. {error}"
-msgstr "A(z) {url} letöltése sikertelen. {error}"
+msgstr ""
 
 #: ../fdroidserver/metadata.py
 #, python-brace-format
-msgid "Duplicate Anti-Feature declaration at {path} was ignored!"
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-format
-msgid "Duplicate entry \"%s\" in mirrors config!"
+msgid "Duplicate build recipe found for versionCode {versionCode} in {linedesc}"
 msgstr ""
 
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "Duplicate link in '{field}': {url}"
-msgstr "Ismételt hivatkozás a(z) „{field}” mezőben: {url}"
-
-#: ../fdroidserver/common.py
-#, python-format
-msgid "ERROR: %(message)s"
 msgstr ""
 
+#: ../fdroid
+msgid "Dynamically scan APKs post build"
+msgstr "APK-k dinamikus átvizsgálása összeállítás után"
+
 #: ../fdroidserver/__main__.py
 msgid "ERROR: The \"server\" subcommand has been removed, use \"deploy\"!"
-msgstr "HIBA: A „server” alparancs eltávolításra került, használja ezt: „deploy”!"
+msgstr ""
+
+#: ../fdroidserver/mirror.py
+msgid ""
+"ERROR: this command should never be used to mirror f-droid.org!\n"
+"A full mirror of f-droid.org requires more than 200GB."
+msgstr ""
 
 #: ../fdroidserver/nightly.py
 msgid "ERROR: unsupported CI type, patches welcome!"
-msgstr "HIBA: nem támogatott CI típus, foltokat szívesen fogadunk!"
-
-#: ../fdroidserver/nightly.py
-#, python-format
-msgid "ERROR: unsupported git host \"%s\", patches welcome!"
 msgstr ""
 
-#: ../fdroidserver/lint.py
+#: ../fdroidserver/metadata.py
 #, python-brace-format
-msgid "ERROR: {key} in {path} is not \"archive\" or \"repo\"!"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "ERROR: {key} not a valid key!"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "ERROR: {key}'s value should be of type {t}!"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "ERROR: {key}:{subkey} in {path} is not in allowed keys: {allowed_keys}!"
+msgid "Empty build flag at {linedesc}"
 msgstr ""
 
 #: ../fdroidserver/__main__.py
 #, python-brace-format
 msgid "Encoding is set to '{enc}' fdroid might run into encoding issues. Please set it to 'UTF-8' for best results."
-msgstr "A karakterkódolás beállítása „{enc}”, az fdroid kódolási problémákba futhat. A legjobb eredmény érdekében használjon „UTF-8” kódolást."
+msgstr ""
 
 #: ../fdroidserver/init.py
 #, python-format
@@ -682,996 +694,952 @@ msgid ""
 "Enter the path to the Android SDK (%s) here:\n"
 "> "
 msgstr ""
-"Adja meg az Android SDK (%s) elérési útját itt:\n"
-"> "
 
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Environment variable {var} from {configname} is not set!"
-msgstr "A(z) {configname} konfigurációból származó {var} környezeti változó nincs beállítva!"
-
-#: ../fdroidserver/common.py
-#, fuzzy, python-brace-format
-msgid "Environment variable {{env: {var}}} is not set!"
-msgstr "A(z) {configname} konfigurációból származó {var} környezeti változó nincs beállítva!"
-
-#: ../fdroidserver/deploy.py
-msgid "Error deploying 'github_releases', {} not present. (You might need to run `fdroid update` first.)"
+#: ../fdroidserver/deploy.py ../fdroidserver/checkupdates.py
+#: ../fdroidserver/upload.py
+#, python-format
+msgid "Error while attempting to publish log: %s"
 msgstr ""
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py ../fdroidserver/common.py
 msgid "Error while getting repo address"
-msgstr "Hiba történt a tároló címének lekérésekor"
-
-#: ../fdroidserver/scanner.py
-msgid "Exit with a non-zero code if problems were found"
 msgstr ""
 
-#: ../fdroidserver/__main__.py
-msgid "Extract application metadata from a source repository"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Extract signatures from APKs"
-msgstr "Aláírások kinyerése az APK-kból"
-
-#: ../fdroidserver/install.py
-msgid "F-Droid.apk could not be downloaded from any known source!"
 msgstr ""
 
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Failed copying {path}: {error}"
-msgstr "A(z) {path} másolása sikertelen: {error}"
+msgstr ""
 
 #: ../fdroidserver/signatures.py
 #, python-brace-format
 msgid "Failed fetching signatures for '{apkfilename}': {error}"
-msgstr "A(z) „{apkfilename}” aláírásainak összegyűjtése sikertelen: {error}"
+msgstr ""
 
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Failed reading {path}: {error}"
-msgstr "A(z) {path} olvasása sikertelen: {error}"
+msgstr ""
 
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Failed resizing {path}: {error}"
-msgstr "A(z) {path} átméretezése sikertelen: {error}"
+msgstr ""
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/publish.py
+msgid "Failed to align application"
+msgstr ""
+
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Failed to create S3 bucket: {url}"
-msgstr "Az S3 vödör létrehozása sikertelen: {url}"
+msgstr ""
+
+#: ../fdroidserver/common.py
+msgid "Failed to get APK manifest information"
+msgstr ""
 
 #: ../fdroidserver/update.py
 #, python-brace-format
-msgid "Failed to get APK information, deleting {path}"
-msgstr "Az APK információk lekérése sikertelen, a(z) {path} törlése"
+msgid "Failed to get apk information, deleting {path}"
+msgstr ""
 
 #: ../fdroidserver/update.py
 #, python-brace-format
-msgid "Failed to get APK information, skipping {path}"
-msgstr "Az APK információk lekérése sikertelen, a(z) {path} kihagyása"
-
-#: ../fdroidserver/update.py
-#, fuzzy
-msgid "Failed to get APK signing key fingerprint"
-msgstr "Az APK leíró információk lekérése sikertelen"
+msgid "Failed to get apk information, skipping {path}"
+msgstr ""
 
 #: ../fdroidserver/install.py
 #, python-brace-format
 msgid "Failed to install '{apkfilename}' on {dev}: {error}"
-msgstr "A(z) „{apkfilename}” telepítése a(z) {dev} eszközön sikertelen: {error}"
+msgstr ""
+
+#: ../fdroidserver/publish.py ../fdroidserver/common.py
+msgid "Failed to sign application"
+msgstr ""
 
 #: ../fdroidserver/common.py
-msgid "Failed to sign application"
-msgstr "Az alkalmazás aláírása sikertelen"
+msgid "Failed to zipalign application"
+msgstr ""
 
 #: ../fdroidserver/build.py
 #, python-brace-format
 msgid "Fetched buildserverid from VM: {buildserverid}"
-msgstr "A virtuális géptől lekért buildserverid: {buildserverid}"
+msgstr ""
 
 #: ../fdroidserver/signatures.py
 #, python-brace-format
 msgid "Fetched signatures for '{apkfilename}' -> '{sigdir}'"
-msgstr "A(z) „{apkfilename}” APK aláírásai lekérve -> „{sigdir}”"
+msgstr ""
 
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "File disappeared while processing it: {path}"
-msgstr "A fájl feldolgozás közben eltűnt: {path}"
+msgstr ""
 
-#: ../fdroidserver/build.py ../fdroidserver/install.py
-#: ../fdroidserver/rewritemeta.py ../fdroidserver/scanner.py
-#: ../fdroidserver/update.py
+#: ../fdroidserver/verify.py ../fdroidserver/stats.py ../fdroidserver/update.py
+#: ../fdroidserver/rewritemeta.py ../fdroidserver/build.py
+#: ../fdroidserver/checkupdates.py ../fdroidserver/scanner.py
+#: ../fdroidserver/install.py
 msgid "Finished"
-msgstr "Befejezve"
+msgstr ""
+
+#: ../fdroidserver/lint.py
+msgid "Flattr donation methods belong in the FlattrID flag"
+msgstr ""
+
+#: ../fdroidserver/lint.py
+msgid "Flattr donation methods belong in the FlattrID: field"
+msgstr ""
 
 #: ../fdroidserver/lint.py
 msgid "Forbidden HTML tags"
-msgstr "Tiltott HTML címkék"
+msgstr ""
 
 #: ../fdroidserver/build.py
 msgid "Force build of disabled apps, and carries on regardless of scan problems. Only allowed in test mode."
-msgstr "Letiltott alkalmazások összeállításának kényszerítése, és folytatás az átvizsgálási problémáktól függetlenül. Csak teszt módban engedélyezett."
+msgstr ""
 
 #: ../fdroidserver/build.py
 #, python-brace-format
 msgid "Force halting build after {0} sec timeout!"
-msgstr "Összeállítás kényszerített leállítása {0} másodperces időtúllépés után."
+msgstr ""
 
 #: ../fdroidserver/scanner.py
 msgid "Force scan of disabled apps and builds."
-msgstr "Letiltott alkalmazások és összeállítások átvizsgálásának kényszerítése."
+msgstr ""
 
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Found \"{path}\" graphic without metadata for app \"{name}\"!"
-msgstr "Metaadatok nélküli „{path}” grafika található a(z) „{name}” alkalmazásnál."
+msgstr ""
 
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Found bad funding file \"{path}\" for \"{name}\":"
-msgstr "Hibás „{path}” finanszírozási fájl található a(z) „{name}” alkalmazásnál:"
+msgstr ""
 
 #: ../fdroidserver/common.py
 msgid "Found invalid appids in arguments"
-msgstr "Érvénytelen alkalmazásazonosítók találhatók az argumentumokban"
+msgstr ""
 
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
 #: ../fdroidserver/common.py
 msgid "Found invalid versionCodes for some apps"
-msgstr "Egyes alkalmazásoknál érvénytelen versionCode paraméterek találhatók"
+msgstr ""
 
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "Found multiple JAR Signature Block Files in {path}"
-msgstr "Több JAR aláírásblokkfájl található itt: {path}"
-
-#: ../fdroidserver/common.py
-#, fuzzy
-msgid "Found multiple Signer Certificates!"
-msgstr "Több aláíró-tanúsítvány található a tárolóhoz."
+msgstr ""
 
 #: ../fdroidserver/metadata.py
 #, python-brace-format
 msgid "Found multiple metadata files for {appid}"
-msgstr "Több metaadatfájl található ennél: {appid}"
+msgstr ""
 
 #: ../fdroidserver/index.py
 msgid "Found multiple signing certificates for repository."
-msgstr "Több aláíró-tanúsítvány található a tárolóhoz."
+msgstr ""
+
+#: ../fdroidserver/update.py
+#, python-brace-format
+msgid "Found multiple signing certificates in {path}"
+msgstr ""
 
 #: ../fdroidserver/index.py
 msgid "Found no signing certificates for repository."
-msgstr "Nem található aláíró-tanúsítvány a tárolóhoz."
+msgstr ""
 
 #: ../fdroidserver/lint.py
 #, python-format
 msgid "Found non-file at %s"
-msgstr "Nem fájl található itt: %s"
+msgstr ""
 
 #: ../fdroidserver/deploy.py
 #, python-brace-format
 msgid "Found {apkfilename} at {url}"
-msgstr "{apkfilename} található itt: {url}"
-
-#: ../fdroidserver/scanner.py
-#, fuzzy, python-brace-format
-msgid "Found {count} problems in {filename}"
-msgstr "Az átvizsgáló {count} problémát talált a(z) „{filename}” alkalmazásban"
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Found {count} warnings in {filename}"
 msgstr ""
 
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Generated skeleton metadata for {appid}"
-msgstr "Metaadatváz előállítva ehhez: {appid}"
+msgstr ""
 
 #: ../fdroidserver/common.py
 #, python-format
 msgid "Git checkout of '%s' failed"
-msgstr "A(z) „%s” git ágra váltás sikertelen"
+msgstr ""
 
 #: ../fdroidserver/common.py
 msgid "Git clean failed"
-msgstr "A git tisztítás sikertelen"
+msgstr ""
 
 #: ../fdroidserver/common.py
 msgid "Git fetch failed"
-msgstr "A git lekérés sikertelen"
+msgstr ""
+
+#: ../fdroidserver/common.py
+msgid "Git remote set-head failed"
+msgstr ""
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
 #: ../fdroidserver/common.py
 #, python-format
 msgid "Git remote set-head failed: \"%s\""
-msgstr "A git távoli fej beállítás sikertelen: „%s”"
+msgstr ""
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
 #: ../fdroidserver/common.py
 msgid "Git reset failed"
-msgstr "A git helyreállítás sikertelen"
-
-#: ../fdroidserver/common.py
-#, fuzzy
-msgid "Git submodule deinit failed"
-msgstr "A git almodul frissítése sikertelen"
+msgstr ""
 
 #: ../fdroidserver/common.py
 msgid "Git submodule sync failed"
-msgstr "A git almodul szinkronizációs sikertelen"
+msgstr ""
 
 #: ../fdroidserver/common.py
 msgid "Git submodule update failed"
-msgstr "A git almodul frissítése sikertelen"
+msgstr ""
 
 #: ../fdroidserver/common.py
 msgid "HTTPS must be used with Subversion URLs!"
-msgstr "HTTPS-t kell használni a Subversion URL-ekhez!"
+msgstr ""
 
 #: ../fdroidserver/deploy.py
 msgid "If a git mirror gets to big, allow the archive to be deleted"
-msgstr "Ha egy tükör túl naggyá válik, akkor engedélyezze az archívum törlését"
+msgstr ""
 
 #: ../fdroidserver/deploy.py
 #, python-brace-format
 msgid "If this upload fails, try manually uploading to {url}"
-msgstr "Ha a feltöltés sikertelen, próbálja meg kézzel feltölteni ide: {url}"
+msgstr ""
 
 #: ../fdroidserver/metadata.py
 #, python-brace-format
 msgid "Ignoring '{field}' in '{metapath}' metadata because it is deprecated."
-msgstr "A(z) „{field}” mellőzése a(z) „{metapath}” metaadatokban, mert elavult."
+msgstr ""
 
 #: ../fdroidserver/update.py
 #, python-format
 msgid "Ignoring FUNDING.yml entry longer than 2048: %s"
-msgstr "A 2048-nál hosszabb FUNDING.yml bejegyzés figyelmen kívül hagyása: %s"
-
-#: ../fdroidserver/update.py
-#, python-format
-msgid "Ignoring bad element in manifest: %s"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Ignoring deprecated {oldfile}, use {newfile}!"
 msgstr ""
 
 #: ../fdroidserver/index.py
 msgid "Ignoring package without metadata: "
-msgstr "A metaadatok nélküli csomag figyelmen kívül hagyása: "
+msgstr ""
 
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Ignoring stale cache data for {apkfilename}"
-msgstr "A(z) {apkfilename} elévült gyorsítótáradatainak figyelmen kívül hagyása"
+msgstr ""
+
+#: ../fdroidserver/rewritemeta.py
+#, python-brace-format
+msgid "Ignoring {ext} file at '{path}'"
+msgstr ""
 
 #: ../fdroidserver/update.py
 msgid "Include APKs that are signed with disabled algorithms like MD5"
-msgstr "A letiltott algoritmusokkal (például MD5) aláírt APK-k belevétele"
+msgstr ""
 
 #: ../fdroidserver/mirror.py
 msgid "Include the PGP signature .asc files in the mirror"
-msgstr "A PGP-aláírást tartalmazó .asc fájlok belevétele a tükörbe"
+msgstr ""
 
 #: ../fdroidserver/mirror.py
 msgid "Include the build logs in the mirror"
-msgstr "Az összeállítási napló belevétele a tükörbe"
+msgstr ""
 
 #: ../fdroidserver/mirror.py
 msgid "Include the source tarballs in the mirror"
-msgstr "A forráscsomagok belevétele a tükörbe"
-
-#: ../fdroidserver/metadata.py
-#, python-format
-msgid "Including metadata from %s@%s"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Including metadata from {path}"
 msgstr ""
 
 #: ../fdroidserver/common.py
 msgid "Initialising submodules"
-msgstr "Almodulok előkészítése"
+msgstr ""
 
 #: ../fdroidserver/install.py
 msgid "Install all signed applications available"
-msgstr "Összes aláírt alkalmazás telepítése"
+msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Install built packages on devices"
 msgstr "Összeállított csomagok telepítése az eszközökre"
 
 #: ../fdroidserver/install.py
 #, python-format
 msgid "Installing %s..."
-msgstr "%s telepítése…"
+msgstr ""
+
+#: ../fdroidserver/install.py
+#, python-format
+msgid "Installing %s…"
+msgstr ""
 
 #: ../fdroidserver/install.py
 #, python-brace-format
 msgid "Installing '{apkfilename}' on {dev}..."
-msgstr "A(z) „{apkfilename}” telepítése ezen: {dev}…"
+msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroidserver/install.py
+#, python-brace-format
+msgid "Installing '{apkfilename}' on {dev}…"
+msgstr ""
+
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Interact with the repo HTTP server"
 msgstr "Interakció a tároló HTTP kiszolgálójával"
 
 #: ../fdroidserver/update.py
 msgid "Invalid APK"
-msgstr "Érvénytelen APK"
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "Invalid AutoUpdateMode: {mode}"
 msgstr ""
 
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "Invalid UpdateCheckMode: {mode}"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
+#: ../fdroidserver/lint.py ../fdroidserver/checkupdates.py
 #, python-brace-format
 msgid "Invalid VercodeOperation: {field}"
-msgstr "Érvénytelen VercodeOperation: {field}"
+msgstr ""
 
-#: ../fdroidserver/lint.py
-#, fuzzy, python-brace-format
-msgid "Invalid VercodeOperation: {invalid_ops}"
-msgstr "Érvénytelen VercodeOperation: {invalid_ops}"
-
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "Invalid application ID {appid}"
-msgstr "Érvénytelen alkalmazásazonosító: {appid}"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+#, python-format
+msgid "Invalid boolean '%s'"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Invalid build flag at {line} in {linedesc}"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Invalid build format: {value} in {name}"
+msgstr ""
 
 #: ../fdroidserver/lint.py
 msgid "Invalid bulleted list"
-msgstr "Érvénytelen felsorolás"
+msgstr ""
+
+#: ../fdroidserver/lint.py
+#, python-format
+msgid "Invalid license tag \"%s\"! Use only tags from https://spdx.org/license-list"
+msgstr ""
+
+#: ../fdroidserver/lint.py
+msgid "Invalid link - use [http://foo.bar Link title] or [http://foo.bar]"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+#, python-format
+msgid "Invalid metadata in %s:%d"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+msgid "Invalid metadata in: "
+msgstr ""
 
 #: ../fdroidserver/common.py
 #, python-format
 msgid "Invalid name for published file: %s"
-msgstr "Érvénytelen név a közzétett fájlnak: %s"
+msgstr ""
 
 #: ../fdroidserver/common.py
 #, python-brace-format
-msgid "Invalid ndk: entry in build: \"{ndk}\""
+msgid "Invalid package name {0}"
 msgstr ""
 
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "Invalid redirect to non-HTTPS: {before} -> {after} "
-msgstr "Érvénytelen átirányítás nem HTTPS oldalra: {before} -> {after} "
+msgstr ""
 
 #: ../fdroidserver/metadata.py
-#, python-brace-format
+#, fuzzy, python-brace-format
 msgid "Invalid scrlib metadata: '{file}' does not exist"
-msgstr "Érvénytelen srclib metaadatok: a(z) „{file}” nem létezik"
+msgstr "Összes metaadatfájl felolvasása és kilépés"
 
 #: ../fdroidserver/metadata.py
 #, python-brace-format
 msgid "Invalid srclib metadata: could not parse '{file}'"
-msgstr "Érvénytelen srclib metaadatok: a(z) „{file}” nem dolgozható fel"
+msgstr ""
 
 #: ../fdroidserver/metadata.py
 #, python-brace-format
 msgid "Invalid srclib metadata: unknown key '{key}' in '{file}'"
-msgstr "Érvénytelen srclib metaadatok: ismeretlen „{key}” kulcs itt: „{file}”"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Invalid versionCode: \"{versionCode}\" is not an integer!"
+msgstr ""
 
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "JAR signature failed to verify: {path}"
-msgstr "A JAR aláírásának ellenőrzése sikertelen: {path}"
+msgstr ""
 
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "JAR signature verified: {path}"
-msgstr "A JAR aláírása ellenőrizve: {path}"
+msgstr ""
 
 #: ../fdroidserver/scanner.py
 msgid "Java JAR file"
-msgstr "Java JAR-fájl"
+msgstr ""
 
-#: ../fdroidserver/mirror.py ../fdroidserver/publish.py
-#: ../fdroidserver/update.py
+#: ../fdroidserver/publish.py ../fdroidserver/update.py
+#: ../fdroidserver/mirror.py
 msgid "Java JDK not found! Install in standard location or set java_paths!"
-msgstr "A Java JDK nem található. Telepítse szabványos helyre, vagy adja meg a java_paths változókat!"
+msgstr ""
 
 #: ../fdroidserver/scanner.py
 msgid "Java compiled class"
-msgstr "Legfordított Java osztály"
+msgstr ""
 
 #: ../fdroidserver/signindex.py
 msgid "Java jarsigner not found! Install in standard location or set java_paths!"
-msgstr "A Java „jarsigner” nem található. Telepítse szabványos helyre, vagy adja meg a java_paths változókat!"
+msgstr ""
 
 #: ../fdroidserver/lint.py
 msgid "Javascript in HTML src attributes"
-msgstr "JavaScript a HTML src attribútumokban"
-
-#: ../fdroidserver/build.py
-#, fuzzy, python-brace-format
-msgid "Keeping failed build \"{apkfilename}\""
-msgstr "A minSdkVersion olvasása sikertelen: „{apkfilename}”"
+msgstr ""
 
 #: ../fdroidserver/init.py
 msgid "Keystore for signing key:\t"
-msgstr "Kulcstároló az aláírókulcshoz:\t"
-
-#: ../fdroidserver/lint.py
-msgid "Known debug key is used in AllowedAPKSigningKeys: "
 msgstr ""
 
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "Last used commit '{commit}' looks like a tag, but UpdateCheckMode is '{ucm}'"
-msgstr "A legutóbb használt „{commit}” véglegesítés címkének tűnik, de az UpdateCheckMode „{ucm}”"
+msgstr ""
 
 #: ../fdroidserver/lint.py
 msgid "Liberapay donation methods belong in the Liberapay: field"
-msgstr "A Liberapay adományozási módok a Liberapay: mezőbe tartoznak"
+msgstr ""
+
+#: ../fdroidserver/lint.py
+msgid "Liberapay donation methods belong in the LiberapayID flag"
+msgstr ""
 
 #: ../fdroidserver/rewritemeta.py
-#, fuzzy
-msgid "List files that would be reformatted (dry run)"
-msgstr "Az újra formázásra kerülendő fájlok felsorolása"
+msgid "List files that would be reformatted"
+msgstr ""
 
 #: ../fdroidserver/lint.py
 msgid "Locale included in f-droid.org URL"
-msgstr "A területi beállítás szerepel az f-droid.org URL-ben"
+msgstr ""
 
 #: ../fdroidserver/build.py
 msgid "Make the build stop on exceptions"
-msgstr "Az összeállítás álljon meg a kivételeknél"
-
-#: ../fdroidserver/index.py
-msgid "Malformed repository mirrors."
-msgstr "Rosszul formázott tárolótükrök."
-
-#: ../fdroidserver/deploy.py
-msgid "Malformed serverwebroot line:"
-msgstr "Rosszul formázott serverwebroot sor:"
-
-#: ../fdroidserver/scanner.py
-#, python-format
-msgid "Max recursion depth in ZIP file reached: %s"
 msgstr ""
 
 #: ../fdroidserver/index.py
-#, python-brace-format
-msgid "Mirror config for {url} contains \"isPrimary\" key!"
+msgid "Malformed repository mirrors."
+msgstr ""
+
+#: ../fdroidserver/deploy.py
+msgid "Malformed serverwebroot line:"
 msgstr ""
 
 #: ../fdroidserver/mirror.py
 msgid "Mirror the full repo and archive, all file types."
-msgstr "A teljes tároló és archívum tükrözés, minden fájltípussal."
+msgstr ""
 
 #: ../fdroidserver/gpgsign.py
 msgid "Missing output directory"
-msgstr "Hiányzó kimeneti könyvtár"
-
-#: ../fdroidserver/metadata.py
-msgid "Moving Anti-Features declarations to localized files:"
 msgstr ""
 
-#: ../fdroidserver/index.py
-msgid "Neither \"repo_pubkey\" nor \"keystorepass\" set in config.yml"
+#: ../fdroidserver/lint.py
+#, python-format
+msgid "Name '%s' is just the auto name - remove it"
 msgstr ""
 
-#: ../fdroidserver/verify.py
-#, fuzzy, python-format
-msgid "No APK for package: %s"
-msgstr "Nincs ilyen csomag: %s"
+#: ../fdroidserver/common.py
+msgid "No 'config.py' found, using defaults."
+msgstr ""
 
 #: ../fdroidserver/common.py
 msgid "No Android SDK found!"
-msgstr "Nem található Android SDK!"
+msgstr ""
+
+#: ../fdroidserver/import.py
+msgid "No android or kivy project could be found. Specify --subdir?"
+msgstr ""
 
 #: ../fdroidserver/install.py
 msgid "No attached devices found"
-msgstr "Nem található csatolt eszköz"
+msgstr ""
 
-#: ../fdroidserver/install.py
-msgid "No devices found for `adb install`! Please plug one in."
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "No commit specified for {versionName} in {linedesc}"
 msgstr ""
 
 #: ../fdroidserver/index.py
 msgid "No fingerprint in URL."
-msgstr "Nincs ujjlenyomat az URL-ben."
+msgstr ""
 
 #: ../fdroidserver/common.py
 msgid "No git submodules available"
-msgstr "Nem érhetők el git almodulok"
-
-#: ../fdroidserver/import_subcommand.py
-msgid "No gradle project could be found. Specify --subdir?"
-msgstr "Nem található gradle projekt. Megad --subdir argumentumot?"
-
-#: ../fdroidserver/import_subcommand.py
-msgid "No information found."
-msgstr "Nem található információ."
-
-#: ../fdroidserver/checkupdates.py
-msgid "No matching tags found"
 msgstr ""
 
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "No minimum SDK version found in {0}, using default (3)."
+#: ../fdroidserver/import.py
+msgid "No gradle project could be found. Specify --subdir?"
+msgstr ""
+
+#: ../fdroidserver/import.py ../fdroidserver/common.py
+msgid "No information found."
 msgstr ""
 
 #: ../fdroidserver/lint.py
 msgid "No need to specify that the app is Free Software"
-msgstr "Nem kell megadnia, hogy az alkalmazás szabad szoftver"
+msgstr ""
 
 #: ../fdroidserver/lint.py
 msgid "No need to specify that the app is for Android"
-msgstr "Nem kell megadnia, hogy az alkalmazás androidos"
+msgstr ""
 
 #: ../fdroidserver/deploy.py
-msgid "No option set! Edit your config.yml to set at least one of these:"
-msgstr "Nincs beállítás megadva. Szerkessze a config.yml fájlt, hogy ezek közül legalább egyet megadjon:"
+msgid "No option set! Edit your config.py to set at least one of these:"
+msgstr ""
 
 #: ../fdroidserver/common.py
 msgid "No packages specified"
-msgstr "Nincs csomag megadva"
+msgstr ""
 
 #: ../fdroidserver/install.py
 #, python-format
-msgid "No signed APK available for %s"
-msgstr "Nem érhetők el aláírt APK-k ehhez: %s"
+msgid "No signed apk available for %s"
+msgstr ""
 
 #: ../fdroidserver/install.py
 msgid "No signed output directory - nothing to do"
-msgstr "Nincs aláírt kimeneti könyvtár – nincs teendő"
+msgstr ""
 
-#: ../fdroidserver/common.py
+#: ../fdroidserver/update.py ../fdroidserver/common.py
 #, python-brace-format
 msgid "No signing certificates found in {path}"
-msgstr "Nem található aláíró-tanúsítvány itt: {path}"
+msgstr ""
 
 #: ../fdroidserver/common.py
 #, python-format
 msgid "No such package: %s"
-msgstr "Nincs ilyen csomag: %s"
+msgstr ""
 
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "No such versionCode {versionCode} for app {appid}"
-msgstr "Nincs {versionCode} versionCode a(z) {appid} alkalmazáshoz"
+msgstr ""
 
-#: ../fdroidserver/checkupdates.py
-#, fuzzy
-msgid "No tags found"
-msgstr "Nem található csatolt eszköz"
-
-#: ../fdroidserver/publish.py ../fdroidserver/verify.py
+#: ../fdroidserver/verify.py ../fdroidserver/publish.py
 msgid "No unsigned directory - nothing to do"
-msgstr "Nincs aláíratlan könyvtár – nincs teendő"
-
-#: ../fdroidserver/__main__.py
-#, fuzzy
-msgid "No version information could be found."
-msgstr "Nem található információ."
+msgstr ""
 
 #: ../fdroidserver/common.py
 msgid "Not a valid size definition: \"{}\""
-msgstr "Nem érvényes méretmegadás: „{}”"
+msgstr ""
 
 #: ../fdroidserver/signindex.py
 msgid "Nothing to do"
-msgstr "Nincs teendő"
+msgstr ""
 
 #: ../fdroidserver/checkupdates.py
 #, python-brace-format
 msgid "Nothing to do for {appid}."
-msgstr "Nincs teendő a(z) {appid} alkalmazásnál."
+msgstr ""
 
 #: ../fdroidserver/init.py
-msgid "Now set these in config.yml:"
-msgstr "Most adja meg ezeket a config.yml fájlban:"
+msgid "Now set these in config.py:"
+msgstr ""
 
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "OBB file has newer versionCode({integer}) than any APK:"
-msgstr "Az OBB-fájlnak újabb versionCode értéke ({integer}) van, mint bármelyik APK-nak:"
+msgstr ""
 
 #: ../fdroidserver/update.py
 msgid "OBB filename must start with \"main.\" or \"patch.\":"
-msgstr "Az OBB-fájl nevének „main.” vagy „patch.” szöveggel kell kezdődnie:"
+msgstr ""
 
 #: ../fdroidserver/update.py
 msgid "OBB's packagename does not match a supported APK:"
-msgstr "Az OBB csomagneve nem egyezik egyik támogatott APK-val sem:"
+msgstr ""
 
 #: ../fdroidserver/deploy.py
 msgid "Offline machine, skipping git mirror generation until `fdroid deploy`"
-msgstr "Offline gép, git tükör előállításának kihagyása az „fdroid deploy” kiadásáig"
-
-#: ../fdroidserver/deploy.py
-msgid "One of the 'github_releases' config items is missing the 'packageNames' value. skipping ..."
 msgstr ""
 
-#: ../fdroidserver/deploy.py
-msgid "One of the 'github_releases' config items is missing the 'projectUrl' value. skipping ..."
+#: ../fdroidserver/common.py
+#, python-brace-format
+msgid "Old APK signature failed to verify: {path}"
 msgstr ""
 
-#: ../fdroidserver/deploy.py
-msgid "One of the 'github_releases' config items is missing the 'token' value. skipping ..."
+#: ../fdroid ../fdroidserver/__main__.py
+msgid "Old, deprecated name for fdroid deploy"
 msgstr ""
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Only PNG and JPEG are supported for graphics, found: {path}"
-msgstr "A grafikáknál csak PNG és JPEG formátum támogatott, ez található: {path}"
+msgstr ""
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/common.py
-msgid "Only accepts a single key \"env\""
+#: ../fdroidserver/checkupdates.py
+msgid "Only print differences with the Play Store"
 msgstr ""
 
 #: ../fdroidserver/checkupdates.py
 msgid "Only process apps with auto-updates"
-msgstr "Csak az automatikus frissítésekkel rendelkező alkalmazások feldolgozása"
+msgstr ""
 
 #: ../fdroidserver/lint.py
 msgid "OpenCollective donation methods belong in the OpenCollective: field"
-msgstr "Az OpenCollective adományozási módok a OpenCollective: mezőbe tartoznak"
+msgstr ""
+
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "Options"
+msgstr "Beállítások"
 
 #: ../fdroidserver/verify.py
 msgid "Output JSON report to file named after APK."
-msgstr "A JSON jelentés kiírása egy APK után elnevezett fájlba."
+msgstr ""
 
 #: ../fdroidserver/scanner.py
 msgid "Output JSON to stdout."
-msgstr "A JSON kiírása a szabványos kimenetre."
+msgstr ""
 
-#: ../fdroidserver/checkupdates.py ../fdroidserver/gpgsign.py
-#: ../fdroidserver/publish.py ../fdroidserver/signindex.py
-#: ../fdroidserver/update.py
+#: ../fdroidserver/gpgsign.py ../fdroidserver/publish.py
+#: ../fdroidserver/update.py ../fdroidserver/signindex.py
+#: ../fdroidserver/checkupdates.py
 msgid "Outputting JSON"
-msgstr "JSON kiírása"
+msgstr ""
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "Overall license of the project."
-msgstr "Az egész projekt átfogó licence."
+msgstr ""
+
+#: ../fdroidserver/dscanner.py
+msgid "Override path for repo APKs (default: ./repo)"
+msgstr ""
 
 #: ../fdroidserver/index.py
 #, python-brace-format
 msgid "Overriding blank versionName in {apkfilename} from metadata: {version}"
-msgstr "Az üres versionName felülírása a(z) {apkfilename} fájlban a metaadatokból: {version}"
+msgstr ""
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 #, python-brace-format
 msgid "Package \"{appid}\" already exists"
-msgstr "A(z) „{appid}” csomag már létezik"
+msgstr ""
 
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "Parsing manifest at '{path}'"
-msgstr "A(z) „{path}” helyen lévő leírófájl feldolgozása"
+msgstr ""
 
 #: ../fdroidserver/common.py
 msgid "Password required with username"
-msgstr "Jelszó szükséges a felhasználónévvel"
+msgstr ""
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "Path to main Android project subdirectory, if not in root."
-msgstr "A fő androidos projekt alkönyvtár elérési útja, ha nem a gyökér."
+msgstr ""
+
+msgid "Path to main android project subdirectory, if not in root."
+msgstr ""
 
 #: ../fdroidserver/init.py
 msgid "Path to the Android SDK (sometimes set in ANDROID_HOME)"
-msgstr "Az Android SDK elérési útja (néha az ANDROID_HOME-ban van megadva)"
+msgstr ""
 
 #: ../fdroidserver/btlog.py
 msgid "Path to the git repo to use as the log"
-msgstr "A naplóként használandó git tároló elérési útja"
+msgstr ""
 
 #: ../fdroidserver/init.py
 msgid "Path to the keystore for the repo signing key"
-msgstr "A tároló aláírókulcsához használt kulcstároló elérési útja"
+msgstr ""
+
+#: ../fdroidserver/dscanner.py
+msgid "Prepare Drozer to run a scan"
+msgstr ""
+
+msgid "Prepare drozer to run a scan"
+msgstr ""
 
 #: ../fdroidserver/nightly.py
 msgid "Print the secret variable to the terminal for easy copy/paste"
-msgstr "A titkos változó kiírása a terminálba a könnyű másolás és beillesztés érdekében"
-
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "Privacy mode was enabled based on your locale ({country_code})."
 msgstr ""
 
-#: ../fdroidserver/scanner.py
-#, python-format
-msgid "Problem with ZIP file: %s, error %s"
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Problem with description of {appid}: {error}"
 msgstr ""
 
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "Problem with xml at '{path}'"
-msgstr "Probléma az itt lévő XML-lel: „{path}”"
+msgstr ""
 
 #: ../fdroidserver/checkupdates.py
 msgid "Process auto-updates"
-msgstr "Automatikus frissítések feldolgozása"
+msgstr ""
 
 #: ../fdroidserver/publish.py ../fdroidserver/update.py
 #, python-brace-format
 msgid "Processing {apkfilename}"
-msgstr "{apkfilename} feldolgozása"
+msgstr ""
 
 #: ../fdroidserver/checkupdates.py ../fdroidserver/scanner.py
 #, python-brace-format
 msgid "Processing {appid}"
-msgstr "{appid} feldolgozása"
+msgstr ""
 
 #: ../fdroidserver/update.py
 msgid "Produce human-readable XML/JSON for index files"
-msgstr "Ember számára olvasható XML/JSON fájlok készítése indexfájlként"
+msgstr ""
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/update.py
+msgid "Produce human-readable index.xml"
+msgstr "Ember számára olvasható index.xml előállítása"
+
+#: ../fdroidserver/import.py
 msgid "Project URL to import from."
-msgstr "Importálási forrásként használandó projekt URL."
+msgstr ""
 
 #: ../fdroidserver/lint.py
 msgid "Punctuation should be avoided"
-msgstr "A központozást kerülni kell"
+msgstr ""
 
 #: ../fdroidserver/btlog.py
 msgid "Push the log to this git remote repository"
-msgstr "A napló beküldése ebbe a távoli git tárolóba"
+msgstr ""
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Pushing binary transparency log to {url}"
-msgstr "A bináris átláthatósági napló beküldése ide: {url}"
+msgstr ""
 
-#: ../fdroidserver/deploy.py
-#, fuzzy
-msgid "Pushing to remote server failed!"
-msgstr "A git távoli fej beállítás sikertelen: „%s”"
-
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Pushing to {url}"
-msgstr "Beküldés ide: {url}"
+msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Quickly start a new repository"
 msgstr "Új tároló gyors elindítása"
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Read all the metadata files and exit"
 msgstr "Összes metaadatfájl felolvasása és kilépés"
 
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "Reading '{config_file}'"
-msgstr "„{config_file}” olvasása"
+msgstr ""
 
 #: ../fdroidserver/common.py
 #, python-brace-format
-msgid "Reading packageName/versionCode/versionName failed, APK invalid: '{apkfilename}'"
-msgstr "A packageName/versionCode/versionName olvasása sikertelen, az APK érvénytelen: „{apkfilename}”"
+msgid "Reading minSdkVersion failed: \"{apkfilename}\""
+msgstr ""
 
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
+#. https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
 #: ../fdroidserver/common.py
-#, fuzzy, python-brace-format
-msgid "Reading packageName/versionCode/versionName failed,APK invalid: '{apkfilename}'"
-msgstr "A packageName/versionCode/versionName olvasása sikertelen, az APK érvénytelen: „{apkfilename}”"
+#, python-brace-format
+msgid "Reading packageName/versionCode/versionName failed, APK invalid: '{apkfilename}'"
+msgstr ""
 
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Reading {apkfilename} from cache"
-msgstr "A(z) {apkfilename} olvasása gyorsítótárból"
-
-#: ../fdroidserver/build.py
-msgid "Refresh and cache scanner rules and signatures from the network"
 msgstr ""
 
-#: ../fdroidserver/publish.py
-#, python-brace-format
-msgid "Refusing to sign '{path}', file exists in both {dir1} and {dir2} folder."
-msgstr ""
-
-#: ../fdroidserver/verify.py
-msgid "Remove source tarball and any APKs if successfully verified."
+#: ../fdroidserver/stats.py
+msgid "Recalculate aggregate stats - use when changes have been made that would invalidate old cached data."
 msgstr ""
 
 #: ../fdroidserver/common.py
 msgid "Removing specified files"
-msgstr "Megadott fájlok eltávolítása"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Removing {path}\""
 msgstr ""
 
 #: ../fdroidserver/update.py
 msgid "Rename APK files that do not match package.name_123.apk"
 msgstr "Azon APK fájlok átnevezése, melyek nem illeszkednek a csomag.név_123.apk mintára"
 
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "RepoType {type} is deprecated, please switch to git."
+#: ../fdroidserver/update.py
+msgid "Report on build data status"
+msgstr ""
+
+#: ../fdroidserver/build.py
+msgid "Reset and create a brand new build server, even if the existing one appears to be ok."
 msgstr ""
 
 #: ../fdroidserver/nightly.py
 #, python-brace-format
 msgid "Resigning {apkfilename} with provided debug.keystore"
-msgstr "A(z) {apkfilename} újra aláírása a megadott debug.keystore segítségével"
+msgstr ""
 
 #: ../fdroidserver/update.py
 msgid "Resize all the icons exceeding the max pixel size and exit"
-msgstr "A legnagyobb képpontméretet meghaladó összes ikon átméretezése, és kilépés"
+msgstr ""
 
 #: ../fdroidserver/common.py
 msgid "Restrict output to warnings and errors"
-msgstr "A kimenet figyelmeztetésekre és hibákra korlátozása"
-
-#: ../fdroidserver/net.py
-#, python-format
-msgid "Retrying failed download: %s"
 msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Rewrite all the metadata files"
 msgstr "Összes metaadatfájl újraírása"
 
+#: ../fdroidserver/rewritemeta.py
+msgid "Rewrite to a specific format: "
+msgstr ""
+
 #: ../fdroidserver/rewritemeta.py
 #, python-brace-format
 msgid "Rewriting '{appid}'"
-msgstr "„{appid}” újraírása"
+msgstr ""
+
+#: ../fdroidserver/rewritemeta.py
+#, python-brace-format
+msgid "Rewriting '{appid}' to '{path}'"
+msgstr ""
 
 #: ../fdroidserver/checkupdates.py
 msgid "Run on git repo that has uncommitted changes"
-msgstr "Futtatás azon a git tárolón, amelyben nem véglegesített változtatások vannak"
-
-#: ../fdroidserver/nightly.py
-#, python-brace-format
-msgid "Run over {cibase} to find -debug.apk. and skip repo_basedir {repo_basedir}"
 msgstr ""
 
 #: ../fdroidserver/lint.py
 msgid "Run rewritemeta to fix formatting"
-msgstr "A rewritemeta futtatása a formázás javításához"
+msgstr ""
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 msgid "Running first pass with MD5 checking disabled"
-msgstr "Az MD5 ellenőrzés első menetének futtatása letiltva"
+msgstr ""
 
 #: ../fdroidserver/mirror.py
 #, python-brace-format
 msgid "Running wget in {path}"
-msgstr "A wget futtatása itt: {path}"
+msgstr ""
 
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "SHA-256 of {url} does not match entry!"
+#: ../fdroidserver/dscanner.py
+msgid "Scan only the latest version of each package"
 msgstr ""
 
 #: ../fdroidserver/build.py
 msgid "Scan the resulting APK(s) for known non-free classes."
-msgstr "Az elkészült APK-k átvizsgálása ismert nem szabad osztályokat keresve."
+msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Scan the source code of a package"
 msgstr "A csomag forráskódjának átvizsgálása"
 
-#: ../fdroidserver/scanner.py
-#, fuzzy, python-brace-format
-msgid "Scanner found {count} problems in {apk}"
-msgstr "Az átvizsgáló {count} problémát talált a(z) „{apk}” alkalmazásban"
-
 #: ../fdroidserver/scanner.py
 #, python-brace-format
 msgid "Scanner found {count} problems in {appid}:"
-msgstr "Az átvizsgáló {count} problémát talált a(z) „{appid}” alkalmazásban:"
+msgstr ""
 
 #: ../fdroidserver/scanner.py
 #, python-brace-format
 msgid "Scanner found {count} problems in {appid}:{versionCode}:"
-msgstr "Az átvizsgáló {count} problémát talált a(z) „{appid}:{versionCode}” alkalmazásban:"
+msgstr ""
 
 #: ../fdroidserver/build.py
 msgid "Scanner found {} problem"
 msgid_plural "Scanner found {} problems"
-msgstr[0] "Az átvizsgáló {count} problémát talált"
-msgstr[1] "Az átvizsgáló {count} problémát talált"
-
-#: ../fdroidserver/scanner.py
-msgid "Scanning APK for extra signing blocks."
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, fuzzy
-msgid "Scanning APK with dexdump for known non-free classes."
-msgstr "Az elkészült APK-k átvizsgálása ismert nem szabad osztályokat keresve."
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Set NDK {release} ({version}) up"
-msgstr ""
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../fdroidserver/common.py
 msgid "Set clock to that time using:"
-msgstr "Óra beállítása ara az időre a következővel:"
+msgstr ""
 
 #: ../fdroidserver/nightly.py
 msgid "Set maximum releases in repo before older ones are archived"
-msgstr "A tárolókban szereplő kiadások számának legnagyobb száma, mielőtt a régebbieket archiválni kezdi"
+msgstr ""
 
 #: ../fdroidserver/build.py
 #, python-brace-format
 msgid "Set open file limit to {integer}"
-msgstr "A nyitott fájlok korlátjának beállítása erre: {integer}"
+msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Set up an app build for a nightly build repo"
 msgstr ""
 
 #: ../fdroidserver/build.py
 msgid "Setting open file limit failed: "
-msgstr "A nyitott fájlok korlátjának beállítása sikertelen: "
+msgstr ""
 
 #: ../fdroidserver/build.py
 #, python-brace-format
 msgid "Setting {0} sec timeout for this build"
-msgstr "{0} másodperces időtúllépés beállítása ehhez az összeállításhoz"
+msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroidserver/build.py
+msgid "Setup an emulator, install the APK on it and perform a Drozer scan"
+msgstr ""
+
+msgid "Setup an emulator, install the apk on it and perform a drozer scan"
+msgstr ""
+
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Sign and place packages in the repo"
 msgstr "Aláírás és csomagok tárolóba helyezése"
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Sign indexes created using update --nosign"
 msgstr "Az update --nosign paranccsal készült indexek aláírása"
 
 #: ../fdroidserver/build.py
 msgid "Skip scanning the source code for binaries and other problems"
-msgstr "A forráskód binárisok és egyéb problémák miatti átvizsgálásának kihagyása"
+msgstr ""
 
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Skipping '{apkfilename}' with invalid signature!"
-msgstr "Az érvénytelen aláírású „{apkfilename}” kihagyása!"
-
-#: ../fdroidserver/deploy.py ../fdroidserver/index.py
-#, python-format
-msgid "Skipping GitLab Pages mirror because the repo is too large (>%.2fGB)!"
 msgstr ""
 
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Skipping index generation for {appid}"
-msgstr "A(z) „{appid}” indexelőállításának kihagyása"
+msgstr ""
 
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Skipping {apkfilename} with invalid signature!"
-msgstr "Az érvénytelen aláírású {apkfilename} kihagyása!"
+msgstr ""
 
 #: ../fdroidserver/scanner.py
 #, python-brace-format
 msgid "Skipping {appid}: disabled"
-msgstr "{appid} kihagyása: letiltott"
+msgstr ""
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/scanner.py
+#, python-brace-format
+msgid "Skipping {appid}: no builds specified"
+msgstr ""
+
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 msgid "Specify a local folder to sync the repo to"
 msgstr ""
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 msgid "Specify an identity file to provide to SSH for rsyncing"
 msgstr ""
 
+#: ../fdroidserver/build.py
+msgid "Specify that we're running on the build server"
+msgstr ""
+
 #: ../fdroidserver/nightly.py
 msgid "Specify which debug keystore file to use."
 msgstr ""
@@ -1680,6 +1648,11 @@ msgstr ""
 msgid "Spew out even more information than normal"
 msgstr ""
 
+#: ../fdroidserver/nightly.py
+#, python-brace-format
+msgid "Striping mystery signature from {apkfilename}"
+msgstr ""
+
 #: ../fdroidserver/nightly.py
 #, python-brace-format
 msgid "Stripping mystery signature from {apkfilename}"
@@ -1700,22 +1673,10 @@ msgstr ""
 msgid "System clock is older than date in {path}!"
 msgstr ""
 
-#: ../fdroidserver/checkupdates.py
-msgid "Tags update mode only works for git, hg, bzr and git-svn repositories currently"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "Tags update mode used in git-svn, but the repo was not set up with tags"
-msgstr ""
-
 #: ../fdroidserver/build.py
 msgid "Test mode - put output in the tmp directory only, and always build, even if the output already exists."
 msgstr ""
 
-#: ../fdroidserver/index.py
-msgid "The \"qrcode\" Python package is not installed (e.g. apt-get install python3-qrcode)!"
-msgstr ""
-
 #. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
 #: ../fdroidserver/update.py
 #, python-brace-format
@@ -1734,10 +1695,18 @@ msgstr ""
 msgid "The file to be included in the repo (path or glob)"
 msgstr ""
 
+#: ../fdroidserver/deploy.py
+msgid "The only commands currently supported are 'init' and 'update'"
+msgstr ""
+
 #: ../fdroidserver/index.py
 msgid "The repository's fingerprint does not match."
 msgstr ""
 
+#: ../fdroidserver/common.py
+msgid "The repository's index could not be verified."
+msgstr ""
+
 #: ../fdroidserver/deploy.py
 #, python-brace-format
 msgid "The root dir for local_copy_dir \"{path}\" does not exist!"
@@ -1751,40 +1720,13 @@ msgstr ""
 msgid "These are the apps that have been archived from the main repo."
 msgstr ""
 
-#: ../fdroidserver/mirror.py
-#, fuzzy
-msgid "This command should never be used to mirror f-droid.org! A full copy requires more than 600GB."
-msgstr ""
-"HIBA: a parancsot sose használja az f-droid.org tükrözéséhez.\n"
-"Az f-droid.org teljes tükrözéséhez több mint 200 GB tárhely szükséges."
-
-#: ../fdroidserver/common.py
-msgid "This is a repository of apps to be used with F-Droid. Applications in this repository are either official binaries built by the original application developers, or are binaries built from source by the admin of f-droid.org using the tools on https://gitlab.com/fdroid."
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 #, python-format
 msgid "This repo already has local metadata: %s"
 msgstr ""
 
-#: ../fdroidserver/init.py
-#, python-format
-msgid ""
-"To complete the setup, add your APKs to \"%s\"\n"
-"then run \"fdroid update -c; fdroid update\".  You might also want to edit\n"
-"\"config.yml\" to set the URL, repo name, and more.  You should also set up\n"
-"a signing key (a temporary one might have been automatically generated).\n"
-"\n"
-"For more info: https://f-droid.org/docs/Setup_an_F-Droid_App_Repo\n"
-"and https://f-droid.org/docs/Signing_Process"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "To use awsbucket, awssecretkey and awsaccesskeyid must also be set in config.yml!"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "To use rclone, rclone_config and awsbucket must be set in config.yml!"
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
+msgid "To use awsbucket, awssecretkey and awsaccesskeyid must also be set in config.py!"
 msgstr ""
 
 #: ../fdroidserver/lint.py
@@ -1795,6 +1737,10 @@ msgstr ""
 msgid "URL shorteners should not be used"
 msgstr ""
 
+#: ../fdroidserver/metadata.py
+msgid "URL title is just the URL, use brackets: [URL]"
+msgstr ""
+
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "URL {url} in Description: {error}"
@@ -1808,15 +1754,16 @@ msgstr ""
 msgid "Unexpected license tag \"{}\"! Only use license tags configured in your config file"
 msgstr ""
 
-#: ../fdroidserver/common.py
+#: ../fdroidserver/metadata.py
 #, python-brace-format
-msgid "Unknown entry {key} in {configname}"
+msgid "Unexpected text on same line as {field} in {linedesc}"
 msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Unknown exception found!"
 msgstr "Ismeretlen kivétel észlelve!"
 
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "Unknown file '{filename}' in build '{versionName}'"
@@ -1827,6 +1774,11 @@ msgstr ""
 msgid "Unknown metadata format: %s"
 msgstr ""
 
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Unknown metadata format: {path}"
+msgstr ""
+
 #: ../fdroidserver/metadata.py
 #, python-brace-format
 msgid "Unknown metadata format: {path} (use: *.yml)"
@@ -1836,6 +1788,10 @@ msgstr ""
 msgid "Unknown version of aapt, might cause problems: "
 msgstr ""
 
+#: ../fdroidserver/lint.py
+msgid "Unlinkified link - use [http://foo.bar Link title] or [http://foo.bar]"
+msgstr ""
+
 #: ../fdroidserver/lint.py
 msgid "Unnecessary leading space"
 msgstr ""
@@ -1849,12 +1805,20 @@ msgstr ""
 msgid "Unrecognised app field '{fieldname}' in '{path}'"
 msgstr ""
 
+#: ../fdroidserver/metadata.py
+msgid "Unrecognised app field: "
+msgstr ""
+
 #: ../fdroidserver/metadata.py
 #, python-brace-format
 msgid "Unrecognised build flag '{build_flag}' in '{path}'"
 msgstr ""
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Unrecognised field '{field}' in {linedesc}"
+msgstr ""
+
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Unsupported file type \"{extension}\" for repo graphic"
@@ -1865,6 +1829,29 @@ msgstr ""
 msgid "Unsupported graphics file found: {path}"
 msgstr ""
 
+#: ../fdroidserver/rewritemeta.py
+#, python-brace-format
+msgid "Unsupported metadata format, use: --to [{supported}]"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+msgid "Unterminated ]"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+msgid "Unterminated ]]"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Unterminated build in {name}"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Unterminated continuation in {name}"
+msgstr ""
+
 #: ../fdroidserver/lint.py
 #, python-format
 msgid "Unused extlib at %s"
@@ -1885,25 +1872,27 @@ msgstr ""
 msgid "Unused scanignore path: %s"
 msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Update repo information for new packages"
 msgstr "Tárolóinformációk frissítése az új csomagoknál"
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Update the binary transparency log for a URL"
 msgstr "A bináris átláthatósági napló frissítése az URL-nél"
 
+#: ../fdroid ../fdroidserver/__main__.py
+msgid "Update the stats of the repo"
+msgstr "A tároló statisztikáinak frissítése"
+
+#: ../fdroidserver/update.py ../fdroidserver/build.py
+msgid "Update the wiki"
+msgstr ""
+
 #: ../fdroidserver/checkupdates.py
 #, python-brace-format
 msgid "UpdateCheckData has invalid URL: {url}"
 msgstr ""
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "UpdateCheckData must match the version code as integer (\\d or [0-9]): {codeex}"
-msgstr ""
-
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "UpdateCheckData must use HTTPS URL: {url}"
@@ -1915,10 +1904,14 @@ msgid "UpdateCheckData not a valid URL: {url}"
 msgstr ""
 
 #: ../fdroidserver/lint.py
-msgid "UpdateCheckMode is set but it looks like checkupdates hasn't been run yet."
+msgid "UpdateCheckMode is set but it looks like checkupdates hasn't been run yet"
+msgstr ""
+
+#. Translators: https://developer.android.com/studio/build/application-id
+#: ../fdroidserver/lint.py
+msgid "UpdateCheckName is set to the known application ID - it can be removed"
 msgstr ""
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
 #: ../fdroidserver/lint.py
 msgid "UpdateCheckName is set to the known application ID, it can be removed"
 msgstr ""
@@ -1933,8 +1926,19 @@ msgstr ""
 msgid "Uploading {apkfilename} to virustotal"
 msgstr ""
 
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "Usage"
+msgstr "Használat"
+
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, python-format
+msgid "Usage: %s\n"
+msgstr "Használat: %s\n"
+
 #: ../fdroidserver/lint.py
-msgid "Use /HEAD instead of /master or /main to point at a file in the default branch"
+msgid "Use /HEAD instead of /master to point at a file in the default branch"
 msgstr ""
 
 #: ../fdroidserver/update.py
@@ -1949,14 +1953,12 @@ msgstr ""
 msgid "Use date from APK instead of current time for newly added APKs"
 msgstr ""
 
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Using \"{path}\" for configuring s3cmd."
+msgid "Use date from apk instead of current time for newly added apks"
 msgstr ""
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
-msgid "Using \"{path}\" for syncing with remote storage."
+msgid "Using \"{path}\" for configuring s3cmd."
 msgstr ""
 
 #: ../fdroidserver/common.py
@@ -1967,17 +1969,13 @@ msgstr ""
 msgid "Using APK Signature v3"
 msgstr ""
 
-#: ../fdroidserver/common.py
-msgid "Using JAR Signature"
-msgstr ""
-
 #: ../fdroidserver/common.py
 msgid "Using Java's jarsigner, not recommended for verifying APKs! Use apksigner"
 msgstr ""
 
-#: ../fdroidserver/metadata.py
+#: ../fdroidserver/common.py
 #, python-brace-format
-msgid "Using blank dictionary instead of contents of {path}!"
+msgid "Using androguard from \"{path}\""
 msgstr ""
 
 #: ../fdroidserver/init.py
@@ -1985,17 +1983,12 @@ msgstr ""
 msgid "Using existing keystore \"{path}\""
 msgstr ""
 
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Using rclone to sync with: {url}"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Using s3cmd to sync with: {url}"
 msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Valid commands are:"
 msgstr "Az érvényes parancsok:"
 
@@ -2003,7 +1996,7 @@ msgstr "Az érvényes parancsok:"
 msgid "Verify against locally cached copy rather than redownloading."
 msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Verify the integrity of downloaded packages"
 msgstr "Ellenőrizze a letöltött csomagok érintetlenségét"
 
@@ -2011,28 +2004,15 @@ msgstr "Ellenőrizze a letöltött csomagok érintetlenségét"
 msgid "Verifying index signature:"
 msgstr ""
 
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "Verifying package {path} with apksigner."
-msgstr ""
-
 #: ../fdroidserver/deploy.py
 #, python-brace-format
 msgid "VirusTotal API key cannot upload files larger than 32MB, use {url} to upload {path}."
 msgstr ""
 
-#: ../fdroidserver/nightly.py
-msgid "WARNING: only public git repos are supported!"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Warn about possible metadata errors"
 msgstr "Figyelmeztetés a lehetséges metaadat-hibákról"
 
-#: ../fdroidserver/scanner.py
-msgid "WebAssembly binary file"
-msgstr ""
-
 #: ../fdroidserver/update.py
 msgid "When configured for signed indexes, create only unsigned indexes at this stage"
 msgstr ""
@@ -2041,16 +2021,7 @@ msgstr ""
 msgid "When linting the entire repository yamllint is disabled by default. This option forces yamllint regardless."
 msgstr ""
 
-#: ../fdroidserver/publish.py
-msgid "When signing or verifying fails, exit with an error code."
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "Would you like to download and install F-Droid.apk via adb? (YES/no)"
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "Would you like to download the app(s) from f-droid.org? (YES/no)"
+msgid "X.509 'Distiguished Name' used when generating keys"
 msgstr ""
 
 #: ../fdroidserver/init.py
@@ -2065,11 +2036,6 @@ msgstr ""
 msgid "ZIP file archive"
 msgstr ""
 
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "adb reports {serial} is \"{status}\"!"
-msgstr ""
-
 #: ../fdroidserver/nightly.py
 #, python-brace-format
 msgid "adding IdentityFile to {path}"
@@ -2080,78 +2046,84 @@ msgstr ""
 msgid "adding to {name}: {path}"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "ambiguous option: %(option)s could match %(matches)s"
 msgstr "nem egyértelmű kapcsoló: %(option)s, ezekre illeszkedhet: %(matches)s"
 
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "apksigner in build-tools;{version} passes APKs with invalid v3 signatures, ignoring."
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "apksigner not found! Cannot sign or verify modern APKs"
-msgstr ""
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, python-format
+msgid "ambiguous option: %s (%s?)"
+msgstr "nem egyértelmű kapcsoló: %s (%s?)"
 
 #: ../fdroidserver/common.py
 msgid "apksigner not found, it's required for signing!"
 msgstr ""
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/checkupdates.py ../fdroidserver/lint.py
-#: ../fdroidserver/rewritemeta.py
+#: ../fdroidserver/lint.py ../fdroidserver/rewritemeta.py
+#: ../fdroidserver/checkupdates.py
 msgid "application ID of file to operate on"
 msgstr ""
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/build.py ../fdroidserver/install.py
-#: ../fdroidserver/publish.py ../fdroidserver/scanner.py
-#: ../fdroidserver/verify.py
+#: ../fdroidserver/verify.py ../fdroidserver/publish.py
+#: ../fdroidserver/build.py ../fdroidserver/scanner.py
+#: ../fdroidserver/install.py
 msgid "application ID with optional versionCode in the form APPID[:VERCODE]"
 msgstr ""
 
-#: ../fdroidserver/common.py
-msgid "archive_url needs to end with /archive"
+#: ../fdroidserver/lint.py ../fdroidserver/rewritemeta.py
+msgid "applicationId in the form APPID"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: ../fdroidserver/checkupdates.py
+msgid "applicationId to check for updates"
+msgstr ""
+
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
+#: ../fdroidserver/verify.py ../fdroidserver/publish.py
+#: ../fdroidserver/dscanner.py ../fdroidserver/build.py
+#: ../fdroidserver/scanner.py ../fdroidserver/install.py
+msgid "applicationId with optional versionCode in the form APPID[:VERCODE]"
+msgstr ""
+
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "argument \"-\" with mode %r"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "argument %(argument_name)s: %(message)s"
-msgstr ""
-
 #: ../fdroidserver/nightly.py
 msgid "attempting bare SSH connection to test deploy key:"
 msgstr ""
 
+#: ../fdroidserver/nightly.py
+msgid "attempting bare ssh connection to test deploy key:"
+msgstr ""
+
 #: ../fdroidserver/common.py
 msgid "can not parse scrlib spec (not a string): '{}'"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
-msgid "can't open '%(filename)s': %(error)s"
-msgstr "„%(filename)s” nem nyitható meg: %(error)s"
-
-#: ../fdroidserver/scanner.py
-msgid "can't open non-https url: '{};"
-msgstr ""
+msgid "can't open '%s': %s"
+msgstr "„%s” nem nyitható meg: %s"
 
 #: ../fdroidserver/build.py
 #, python-brace-format
 msgid "cannot find required srclibs: \"{path}\""
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "cannot have multiple subparser arguments"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "cannot merge actions - two groups are named %r"
 msgstr ""
@@ -2165,25 +2137,30 @@ msgstr ""
 msgid "cloning {url}"
 msgstr ""
 
+#: ../fdroidserver/deploy.py
+msgid "command to execute, either 'init' or 'update'"
+msgstr ""
+
 #: ../fdroidserver/__main__.py
 msgid "commands from plugin modules:"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "complex"
+msgstr ""
+
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "conflicting option string: %s"
 msgid_plural "conflicting option strings: %s"
 msgstr[0] ""
 msgstr[1] ""
 
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "conflicting subparser alias: %s"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "conflicting subparser: %s"
+#: ../fdroidserver/nightly.py
+#, python-brace-format
+msgid "copying {apkfilename} into {path}"
 msgstr ""
 
 #: ../fdroidserver/metadata.py
@@ -2192,11 +2169,11 @@ msgid "could not parse '{path}'"
 msgstr ""
 
 #: ../fdroidserver/common.py
-msgid "could not parse srclib spec (no name specified): '{}'"
+msgid "could not parse srclib spec (no ref specified): '{}'"
 msgstr ""
 
 #: ../fdroidserver/common.py
-msgid "could not parse srclib spec (no ref specified): '{}'"
+msgid "could not parse srclib spec (too many '@' signs): '{}'"
 msgstr ""
 
 #: ../fdroidserver/nightly.py
@@ -2204,18 +2181,14 @@ msgstr ""
 msgid "created {path}"
 msgstr ""
 
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "current version is newer: old vercode={old}, new vercode={new}"
-msgstr ""
-
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "deleting: repo/{apkfilename}"
 msgstr ""
 
-#: ../fdroidserver/scanner.py
-msgid "dependency file without lock"
+#: ../fdroidserver/common.py
+#, python-brace-format
+msgid "deployed build logs to '{path}'"
 msgstr ""
 
 #: ../fdroidserver/common.py
@@ -2223,48 +2196,59 @@ msgstr ""
 msgid "deployed process log {path} to {dest}"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "dest= is required for options like %r"
 msgstr ""
 
-#: ../fdroidserver/scanner.py
-msgid "downloading '{}'"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "downloading scanner signatures from '{}' failed"
-msgstr ""
-
 #: ../fdroidserver/scanner.py
 msgid "executable binary, possibly code"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "expected %s argument"
 msgid_plural "expected %s arguments"
 msgstr[0] ""
 msgstr[1] ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "expected at least one argument"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "expected at most one argument"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "expected one argument"
 msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroidserver/common.py
+#, python-brace-format
+msgid "failed deploying build logs to '{path}'"
+msgstr ""
+
+#: ../fdroid
+msgid "fdroid [-h|--help|--version] <command> [<args>]"
+msgstr "fdroid [-h|--help|--version] <parancs> [<argumentumok>]"
+
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "fdroid [<command>] [-h|--help|--version|<args>]"
 msgstr "fdroid [<parancs>] [-h|--help|--version|<argumentumok>]"
 
-#: ../fdroidserver/scanner.py
-msgid "fetch the latest version of signatures from the web"
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "floating-point"
+msgstr "lebegőpontos"
+
+#: ../fdroidserver/metadata.py
+msgid "force errors to be warnings, or ignore"
 msgstr ""
 
 #: ../fdroidserver/metadata.py
@@ -2279,7 +2263,8 @@ msgstr "git svn klónozás meghiúsult"
 msgid "gzip file archive"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "ignored explicit argument %r"
 msgstr "a(z) %r. explicit argumentum mellőzése"
@@ -2288,40 +2273,35 @@ msgstr "a(z) %r. explicit argumentum mellőzése"
 msgid "index-v1 must have a signature, use `fdroid signindex` to create it!"
 msgstr "az index-v1-nek kell legyen aláírása, használja az „fdroid signindex” parancsot a létrehozásához."
 
-#: ../fdroidserver/index.py
-#, fuzzy
-msgid "index-v2 must have a signature, use `fdroid signindex` to create it!"
-msgstr "az index-v1-nek kell legyen aláírása, használja az `fdroid signindex` parancsot a létrehozásához!"
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "integer"
+msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "invalid %(type)s value: %(value)r"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "invalid choice: %(value)r (choose from %(choices)s)"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "invalid conflict_resolution value: %r"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "invalid option string %(option)r: must start with a character %(prefix_chars)r"
 msgstr ""
 
-#: ../fdroidserver/common.py
-msgid "ipfs_cid not found, skipping CIDv1 generation"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "latest build recipe is newer: old vercode={old}, new vercode={new}"
-msgstr ""
-
 #: ../fdroidserver/deploy.py
 #, python-brace-format
 msgid "local_copy_dir does not end with \"fdroid\", perhaps you meant: \"{path}\""
@@ -2340,20 +2320,11 @@ msgstr ""
 msgid "mirror '%s' does not end with 'fdroid'!"
 msgstr ""
 
-#: ../fdroidserver/index.py
-#, fuzzy, python-brace-format
-msgid "mirrors set twice, in config.yml and {path}!"
-msgstr "Most adja meg ezeket a config.yml fájlban:"
-
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "mutually exclusive arguments must be optional"
 msgstr ""
 
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "next {name} cache update due in {time}"
-msgstr ""
-
 #: ../fdroidserver/mirror.py
 #, python-brace-format
 msgid "no \"icon\" in {appid}"
@@ -2363,90 +2334,141 @@ msgstr ""
 msgid "no APK supplied"
 msgstr ""
 
-#: ../fdroidserver/checkupdates.py
-msgid "no version information found"
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, python-format
+msgid "no such option: %s"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: ../fdroid ../fdroidserver/__main__.py
+msgid "no version info found!"
+msgstr ""
+
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "not allowed with argument %s"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "one of the arguments %s is required"
 msgstr ""
 
-#: ../fdroidserver/common.py ../fdroidserver/index.py
+#: ../fdroidserver/index.py ../fdroidserver/common.py
 msgid "only accepts strings, lists, and tuples"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
-#, fuzzy
-msgid "options"
-msgstr "Beállítások"
+#: ../fdroidserver/install.py
+#, python-format
+msgid "option %s: If you really want to install all the signed apps, use --all"
+msgstr ""
+
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, python-format
+msgid "option %s: invalid %s value: %r"
+msgstr ""
+
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, python-format
+msgid "option %s: invalid choice: %r (choose from %s)"
+msgstr ""
+
+#: /usr/lib/python3.5/getopt.py /usr/lib/python3.6/getopt.py
+#: /usr/lib/python3.7/getopt.py
+#, python-format
+msgid "option -%s not recognized"
+msgstr "a(z) -%s kapcsoló nem ismert"
+
+#: /usr/lib/python3.5/getopt.py /usr/lib/python3.6/getopt.py
+#: /usr/lib/python3.7/getopt.py
+#, python-format
+msgid "option -%s requires argument"
+msgstr "a(z) -%s kapcsolóhoz argumentum szükséges"
+
+#: /usr/lib/python3.5/getopt.py /usr/lib/python3.6/getopt.py
+#: /usr/lib/python3.7/getopt.py
+#, python-format
+msgid "option --%s must not have an argument"
+msgstr ""
+
+#: /usr/lib/python3.5/getopt.py /usr/lib/python3.6/getopt.py
+#: /usr/lib/python3.7/getopt.py
+#, python-format
+msgid "option --%s not a unique prefix"
+msgstr ""
+
+#: /usr/lib/python3.5/getopt.py /usr/lib/python3.6/getopt.py
+#: /usr/lib/python3.7/getopt.py
+#, python-format
+msgid "option --%s not recognized"
+msgstr "a(z) --%s kapcsoló nem ismert"
+
+#: /usr/lib/python3.5/getopt.py /usr/lib/python3.6/getopt.py
+#: /usr/lib/python3.7/getopt.py
+#, python-format
+msgid "option --%s requires argument"
+msgstr ""
+
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
+msgid "optional arguments"
+msgstr "nem kötelező argumentumok"
 
 #: ../fdroidserver/nightly.py
 #, python-brace-format
 msgid "overwriting existing {path}"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "positional arguments"
-msgstr "pozicionális argumentumok"
+msgstr ""
 
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "process log deploy {path} to {dest} failed!"
 msgstr ""
 
-#: ../fdroidserver/build.py
-msgid "reference binary missing signature"
-msgstr ""
-
 #: ../fdroidserver/signatures.py
 #, python-brace-format
 msgid "refuse downloading via insecure HTTP connection (use HTTPS or specify --no-https-check): {apkfilename}"
 msgstr ""
 
+#: ../fdroidserver/signatures.py
+#, python-brace-format
+msgid "refuse downloading via insecure http connection (use https or specify --no-https-check): {apkfilename}"
+msgstr ""
+
 #: ../fdroidserver/index.py
 #, python-format
-msgid "repo_icon \"repo/icons/%s\" does not exist, generating placeholder."
+msgid "repo_icon %s does not exist, generating placeholder."
 msgstr ""
 
-#: ../fdroidserver/common.py
-msgid "repo_url needs to end with /repo"
+#: ../fdroidserver/metadata.py
+msgid "ruamel.yaml not installed, can not write metadata."
 msgstr ""
 
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "rsync is missing or broken: {error}"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "s3cmd sync indexes {path} to {url} and delete"
 msgstr ""
 
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "s3cmd syncs indexes from {path} to {url} and deletes removed"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "scanner cache is malformed! You can clear it with: '{clear}'"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "serverwebroot: path does not end with \"fdroid\", perhaps you meant one of these:"
-msgstr ""
-
 #: ../fdroidserver/scanner.py
 msgid "shared library"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "show program's version number and exit"
+msgstr "a programverzió megjelenítése és kilépés"
+
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.5/optparse.py
+#: /usr/lib/python3.6/argparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/argparse.py /usr/lib/python3.7/optparse.py
 msgid "show this help message and exit"
 msgstr "ezen üzenet kiírása és kilépés"
 
@@ -2475,45 +2497,50 @@ msgstr ""
 msgid "static library"
 msgstr ""
 
-#: ../fdroidserver/build.py
+#: ../fdroidserver/common.py
 #, python-brace-format
-msgid "supplied reference binary has allowed signer {signer}"
+msgid "supplied timestamp value '{timestamp}' is not a unix timestamp"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "the following arguments are required: %s"
-msgstr "a következő argumentumok szükségesek: %s"
-
-#: ../fdroidserver/install.py
-msgid "true"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "unexpected option string: %s"
-msgstr "váratlan kapcsoló karakterlánc: %s"
+msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "unknown parser %(parser_name)r (choices: %(choices)s)"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "unrecognized arguments: %s"
-msgstr "nem felismert argumentumok: %s"
+msgstr ""
 
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "unsafe permissions on '{config_file}' (should be 0600)!"
-msgstr "nem biztonságos jogosultságok ennél: „{config_file}” (0600-nak kellene lennie)!"
+msgstr ""
 
-#: ../fdroidserver/__main__.py /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py ../fdroid
+#: /usr/lib/python3.7/argparse.py ../fdroidserver/__main__.py
 msgid "usage: "
 msgstr "használat: "
 
-#: ../fdroidserver/deploy.py
+#: ../fdroid
+msgid "usage: fdroid [-h|--help|--version] <command> [<args>]"
+msgstr "használat: fdroid [-h|--help|--version] <parancs> [<argumentumok>]"
+
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "using Apache libcloud to sync with {url}"
 msgstr ""
@@ -2522,8 +2549,8 @@ msgstr ""
 msgid "virustotal.com is rate limiting, waiting to retry..."
 msgstr ""
 
-#: ../fdroidserver/install.py
-msgid "yes"
+#: ../fdroidserver/update.py
+msgid "wiki support is deprecated and will be removed in the next release!"
 msgstr ""
 
 #: ../fdroidserver/publish.py
@@ -2538,19 +2565,31 @@ msgstr[1] ""
 msgid "{apkfilename} ({appid}) has no metadata!"
 msgstr ""
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
+#: ../fdroidserver/update.py
+#, python-brace-format
+msgid "{apkfilename} has multiple {name} files, looks like Master Key exploit!"
+msgstr ""
+
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "{apkfilename}'s AndroidManifest.xml has a bad date: "
 msgstr ""
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "{appid} does not have a name! Using application ID instead."
 msgstr ""
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
+#: ../fdroidserver/update.py
+#, python-brace-format
+msgid "{appid} does not have a name! Using package name instead."
+msgstr ""
+
+#: ../fdroidserver/update.py
+#, python-brace-format
+msgid "{appid} from {path} is not a valid Android Package Name!"
+msgstr ""
+
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "{appid} from {path} is not a valid Android application ID!"
@@ -2561,16 +2600,12 @@ msgstr ""
 msgid "{appid} from {path} is not a valid Java Package Name!"
 msgstr ""
 
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{appid} has both APKs and files: {files}"
-msgstr ""
-
 #: ../fdroidserver/mirror.py
 #, python-brace-format
 msgid "{appid} is missing {name}"
 msgstr ""
 
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "{appid}: Unknown extlib {path} in build '{versionName}'"
@@ -2598,7 +2633,7 @@ msgstr ""
 
 #: ../fdroidserver/metadata.py
 #, python-brace-format
-msgid "{build_flag} must be list or string, found: {value}"
+msgid "{field} not terminated in {name}"
 msgstr ""
 
 #: ../fdroidserver/metadata.py
@@ -2608,15 +2643,10 @@ msgstr ""
 
 #: ../fdroidserver/update.py
 #, python-brace-format
-msgid "{name} \"{section}/icons/{path}\" does not exist! Check \"config.yml\"."
+msgid "{name} \"{path}\" does not exist! Correct it in config.py."
 msgstr ""
 
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{path1} is a duplicate of {path2}, remove one!"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 #, python-brace-format
 msgid "{path} already exists, ignoring import results!"
 msgstr ""
@@ -2631,36 +2661,6 @@ msgstr ""
 msgid "{path} has bad file signature \"{pattern}\", possible Janus exploit!"
 msgstr ""
 
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "{path} has been flagged by virustotal {count} times:"
-msgstr ""
-
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "{path} has the wrong fingerprint ({fingerprint})!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "{path} is not \"key: value\" dict, but a {datatype}!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, fuzzy, python-brace-format
-msgid "{path} is not a standard config file!"
-msgstr "Az „sdk_path” nincs megadva a „config.yml” fájlban."
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "{path} is not list, but a {datatype}!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "{path} is not {expected_type}, but a {datatype}!"
-msgstr ""
-
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "{path} is zero size!"
@@ -2671,22 +2671,12 @@ msgstr ""
 msgid "{path} more than 200MB, manually upload: {url}"
 msgstr ""
 
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "{path}: \"{code}\" is not a valid ISO_3166-1 alpha-2 country code!"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, fuzzy, python-brace-format
-msgid "{path}: {error}"
-msgstr "A(z) {path} másolása sikertelen: {error}"
-
 #: ../fdroidserver/mirror.py
 #, python-brace-format
 msgid "{url} does not end with \"fdroid\", check the URL path!"
 msgstr ""
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/common.py
 #, python-brace-format
 msgid "{url} does not start with \"http\"!"
 msgstr ""
diff --git a/locale/id/LC_MESSAGES/fdroidserver.po b/locale/id/LC_MESSAGES/fdroidserver.po
index 86e4a246..8cd4c205 100644
--- a/locale/id/LC_MESSAGES/fdroidserver.po
+++ b/locale/id/LC_MESSAGES/fdroidserver.po
@@ -1,31 +1,42 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# signz signotorez <signotorez@gmail.com>, 2020, 2021.
-# Reza Almanda <rezaalmanda27@gmail.com>, 2021.
-# whenwesober <naomi16i_1298q@cikuh.com>, 2021.
-# Doctorredits_here <alkaf.alkaf2018@tutamail.com>, 2024.
+# signz signotorez <signotorez@gmail.com>, 2020.
 msgid ""
 msgstr ""
 "Project-Id-Version: fdroidserver 1.1-680-ge1d3de71\n"
 "Report-Msgid-Bugs-To: https://gitlab.com/fdroid/fdroidserver/issues\n"
-"POT-Creation-Date: 2025-03-25 11:36+0100\n"
-"PO-Revision-Date: 2024-10-04 04:26+0000\n"
-"Last-Translator: Doctorredits_here <alkaf.alkaf2018@tutamail.com>\n"
+"POT-Creation-Date: 2020-10-21 18:05+0200\n"
+"PO-Revision-Date: 2020-10-06 08:26+0000\n"
+"Last-Translator: signz signotorez <signotorez@gmail.com>\n"
 "Language-Team: Indonesian <https://hosted.weblate.org/projects/f-droid/fdroidserver/id/>\n"
 "Language: id\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Weblate 5.8-dev\n"
+"X-Generator: Weblate 4.3-dev\n"
+
+#: ../fdroidserver/common.py
+msgid ""
+"\n"
+"        This is a repository of apps to be used with FDroid. Applications in this\n"
+"        repository are either official binaries built by the original application\n"
+"        developers, or are binaries built from source by f-droid.org using the\n"
+"        tools on https://gitlab.com/fdroid.\n"
+"        "
+msgstr ""
+
+#: ../fdroidserver/nightly.py
+msgid ""
+"\n"
+"SSH Public Key to be used as Deploy Key:"
+msgstr ""
 
 #: ../fdroidserver/nightly.py
 msgid ""
 "\n"
 "SSH public key to be used as deploy key:"
 msgstr ""
-"\n"
-"Kunci Publik SSH yang akan digunakan sebagai Kunci Deploy:"
 
 #: ../fdroidserver/nightly.py
 #, python-brace-format
@@ -33,120 +44,148 @@ msgid ""
 "\n"
 "{path} encoded for the DEBUG_KEYSTORE secret variable:"
 msgstr ""
-"\n"
-"{path} dienkode untuk variabel rahasia DEBUG_KEYSTORE:"
 
 #: ../fdroidserver/lint.py
 #, python-format
 msgid "\"%s/\" has no matching metadata file!"
 msgstr "\"%s/\" tidak ada kesesuaian pada berkas metadata!"
 
-#: ../fdroidserver/index.py
-msgid "\"isPrimary\" key should not be added to mirrors!"
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "\"local_copy_dir\" {path} does not exist!"
-msgstr "\"local_copy_dir\" {path} tidak ada!"
-
 #: ../fdroidserver/install.py
 #, python-brace-format
 msgid "\"{apkfilename}\" is already installed on {dev}."
 msgstr "\"{apkfilename}\" sudah terpasang pada {dev}."
 
+#: ../fdroidserver/update.py
+#, python-brace-format
+msgid "\"{path}\" contains outdated {name} ({version})"
+msgstr "\"{path}\" berisi {name}({version}) kadaluarsa"
+
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "\"{path}\" contains recent {name} ({version})"
 msgstr "\"{path}\" berisi {name}({version}) sekarang"
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "\"{path}\" exists but s3cmd is not installed!"
-msgstr "\"{path}\" ada tetapi s3cmd tidak terpasang!"
+msgstr ""
 
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "\"{path}\" is not a supported file format (use: metadata/*.yml)"
 msgstr "\"{path}\" format berkas tidak didukung (gunakan: metadata/*.yml)"
 
-#: ../fdroidserver/update.py
+#: ../fdroidserver/metadata.py
 #, python-brace-format
-msgid "\"{path}\" is signed by a key that is not allowed:"
-msgstr "\"{path}\" ditandatangani oleh kunci yang tidak diperbolehkan:"
+msgid "\"{path}\" is not an accepted format, convert to: {formats}"
+msgstr ""
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/common.py
 #, python-brace-format
 msgid "\"{url}\" is not a valid URL!"
 msgstr "\"{url}\" URL tudak valid!"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, python-format
+msgid "%(option)s option requires %(number)d argument"
+msgid_plural "%(option)s option requires %(number)d arguments"
+msgstr[0] "opsi %(option)s memerlukan argumen sebanyak %(number)d"
+
+#: ../fdroidserver/mirror.py
+#, python-format
+msgid "%(prog)s [options] url"
+msgstr "%(prog)s [opsi] url"
+
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "%(prog)s: error: %(message)s\n"
-msgstr "%(prog)s: galat: %(message)s\n"
-
-#: ../fdroidserver/publish.py
-#, python-format
-msgid "%d APKs failed to be signed or verified!"
-msgstr "%d APK gagal ditandatangani atau diverifikasi!"
+msgstr ""
 
 #: ../fdroidserver/scanner.py
 #, python-format
 msgid "%d problems found"
 msgstr "%d terdapat masalah"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "%prog [options]"
+msgstr ""
+
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "%r is not callable"
 msgstr "%r tidak bisa dipanggil"
 
-#: ../fdroidserver/signindex.py
-#, python-format
-msgid "%s did not produce a dict!"
-msgstr "%s terdapat sebuah kesalahan!"
-
-#: ../fdroidserver/signindex.py
-#, python-format
-msgid "%s has bad SHA-256: %s"
-msgstr "%s checksum yg dihitung untuk file tersebut tidak cocok dengan yang diharapkan %s"
-
 #: ../fdroidserver/lint.py
 #, python-format
 msgid "%s is not an accepted build field"
-msgstr "%s bukan bidang build yang diterima"
+msgstr ""
 
-#: ../fdroidserver/common.py
-msgid "'keypass' not found in config.yml!"
-msgstr "'keypass' tidak ditemukan dalam config.yml!"
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, python-format
+msgid "%s option does not take a value"
+msgstr ""
+
+#: ../fdroidserver/index.py ../fdroidserver/common.py
+msgid "'keypass' not found in config.py!"
+msgstr "'keypass' tidak ditemukan dalam config.py!"
 
 #: ../fdroidserver/common.py
 msgid "'keystore' is NONE and 'smartcardoptions' is blank!"
-msgstr "'keystore' adalah NONE dan 'smartcardoptions' kosong!"
+msgstr ""
 
-#: ../fdroidserver/common.py
-msgid "'keystore' not found in config.yml!"
-msgstr "'keystore' tidak ditemukan dalam config.yml!"
+#: ../fdroidserver/index.py ../fdroidserver/common.py
+msgid "'keystore' not found in config.py!"
+msgstr "'keystore' tidak ditemukan dalam config.py!"
 
-#: ../fdroidserver/common.py
-msgid "'keystorepass' not found in config.yml!"
-msgstr "'keystorepass' tidak ditemukan dalam config.yml!"
+#: ../fdroidserver/index.py ../fdroidserver/common.py
+msgid "'keystorepass' not found in config.py!"
+msgstr "'keystorepass' tidak ditemukan dalam config.py!"
 
-#: ../fdroidserver/common.py
-msgid "'repo_keyalias' not found in config.yml!"
-msgstr "'repo_keyalias' tidak ditemukan dalam config.yml!"
+#: ../fdroidserver/index.py ../fdroidserver/common.py
+msgid "'repo_keyalias' not found in config.py!"
+msgstr "'repo_keyalias' tidak ditemukan dalam config.py!"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "'required' is an invalid argument for positionals"
-msgstr "'diperlukan' adalah argumen yang tidak valid untuk posisi"
+msgstr ""
 
 #: ../fdroidserver/common.py
-msgid "'sdk_path' not set in config.yml!"
-msgstr "'sdk_path' belum diatur di config.yml!"
+msgid "'sdk_path' not set in 'config.py'!"
+msgstr ""
+
+#. Translators: "build-tools" is the file name of a package from
+#. Google, it is part of the Android SDK. So it probably shouldn't be
+#. translated or transliterated.
+#: ../fdroidserver/common.py
+#, python-brace-format
+msgid "'{aapt}' is too old, fdroid requires build-tools-23.0.0 or newer!"
+msgstr ""
 
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "'{aapt}' is too old, fdroid requires build-tools-{version} or newer!"
-msgstr "'{aapt}' terlalu usang, fdroid memerlukan build-tools-{version} atau yang lebih baru!"
+msgstr ""
+
+#: ../fdroidserver/install.py
+#, python-brace-format
+msgid "'{apkfilename}' is already installed on {dev}."
+msgstr "'{apkfilename}' sudah terpasang di {dev}."
+
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "'{field}' in {linedesc} is obsolete, see docs for current fields:"
+msgstr ""
+
+#: ../fdroidserver/common.py
+#, python-brace-format
+msgid "'{field}' will be in random order! Use () or [] brackets if order is important!"
+msgstr ""
 
 #: ../fdroidserver/common.py
 #, python-brace-format
@@ -155,56 +194,46 @@ msgstr "'{path}' gagal dieksekusi!"
 
 #: ../fdroidserver/metadata.py
 #, python-brace-format
-msgid "'{path}' has invalid format, it should be a dictionary!"
-msgstr "'{path}' memiliki format yang tidak valid, seharusnya kamus!"
-
-#: ../fdroidserver/lint.py ../fdroidserver/metadata.py
-#, python-brace-format
 msgid "'{value}' is not a valid {field} in {appid}. Regex pattern: {pattern}"
 msgstr "'{value}' tidak valid pada {field} dalam {appid}. Pakem regex: {pattern}"
 
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "'{value}' is not a valid {field}, should be {pattern}"
-msgstr "'{value}' bukan {field} yang valid, seharusnya {pattern}"
-
-#: ../fdroidserver/checkupdates.py
-msgid "--merge-request only runs on a single appid!"
-msgstr ""
-
 #: ../fdroidserver/checkupdates.py
 #, python-brace-format
 msgid "...checkupdate failed for {appid} : {error}"
-msgstr "...checkupdate gagal untuk {appid} : {error}"
+msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid ".__call__() not defined"
 msgstr ".__call__() tidak didefinisikan"
 
+#: ../fdroidserver/metadata.py
+msgid ".fdroid.txt is not supported!  Convert to .fdroid.yml or .fdroid.json."
+msgstr ".fdroid.txt tudak didukung!  Konfersi ke .fdroid.yml atau .fdroid.json."
+
 #: ../fdroidserver/lint.py
 msgid "/issues is missing"
-msgstr "/issues tidak ada"
+msgstr ""
 
 #: ../fdroidserver/mirror.py
 msgid "A URL is required as an argument!"
 msgstr "URL diperlukan sebagai argumen!"
 
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "APK signatures have different certificates in {path}:"
-msgstr "Tanda tangan APK memiliki sertifikat berbeda di {path}:"
-
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Add PGP signatures using GnuPG for packages in repo"
-msgstr "Tambah tanda tangan PGP menggunakan GnuPG untuk paket di repo"
+msgstr ""
+
+#: ../fdroid ../fdroidserver/__main__.py
+msgid "Add a new application from its source code"
+msgstr "Tambah aplikasi baru dari kode sumbernya"
 
 #: ../fdroidserver/update.py
 msgid "Add a repo signing key to an unsigned repo"
-msgstr "Tambahkan sebuah kunci penandatangan repo ke repo yang tidak ditandatangani"
+msgstr ""
 
 #: ../fdroidserver/update.py
 msgid "Add skeleton metadata files for APKs that are missing them"
-msgstr "Tambahkan file metadata kerangka untuk APK yang tidak memilikinya"
+msgstr ""
 
 #: ../fdroidserver/update.py
 #, python-brace-format
@@ -213,73 +242,68 @@ msgstr "Menambahkan repo baru hanya untuk {name}"
 
 #: ../fdroidserver/init.py
 msgid "Alias of the repo signing key in the keystore"
-msgstr "Alias kunci penandatanganan repo di keystore"
+msgstr ""
 
-#: ../fdroidserver/build.py
-msgid "AllowedAPKSigningKeys missing but reference binary supplied"
-msgstr "AllowedAPKSigningKeys hilang tetapi biner referensi disediakan"
-
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "Allows a different revision (or git branch) to be specified for the initial import"
-msgstr "Mengizinkan revisi berbeda (atau cabang git) ditentukan untuk impor awal"
+msgstr ""
 
 #: ../fdroidserver/mirror.py
 msgid "Also mirror the full archive section"
-msgstr "Juga cerminkan bagian arsip lengkap"
+msgstr ""
 
 #: ../fdroidserver/lint.py
 msgid "Also warn about formatting issues, like rewritemeta -l"
-msgstr "Juga peringatkan tentang masalah pemformatan, seperti rewritemeta -l"
+msgstr ""
 
 #: ../fdroidserver/scanner.py
 msgid "Android AAR library"
-msgstr "Perpustakaan AAR Android"
+msgstr ""
 
 #: ../fdroidserver/scanner.py
 msgid "Android APK file"
-msgstr "Android APK file"
+msgstr ""
 
 #: ../fdroidserver/scanner.py
 msgid "Android DEX code"
-msgstr "format file Android DEX"
+msgstr ""
 
-#: ../fdroidserver/init.py
+#: ../fdroidserver/common.py ../fdroidserver/build.py
 #, python-brace-format
-msgid "Android SDK not found at {path}!"
-msgstr "Android SDK tidak ditemukan di {path}!"
+msgid "Android SDK '{path}' does not have '{dirname}' installed!"
+msgstr ""
+
+#: ../fdroidserver/common.py
+msgid "Android SDK not found!"
+msgstr ""
 
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "Android SDK path '{path}' does not exist!"
-msgstr "Jalur Android SDK '{path}' tidak ada!"
+msgstr ""
 
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "Android SDK path '{path}' is not a directory!"
-msgstr "Jalur Android SDK '{path}' bukan direktori!"
+msgstr ""
 
+#. Translators: "build-tools" is the file name of a package from
+#. Google, it is part of the Android SDK. So it probably shouldn't be
+#. translated or transliterated.
 #: ../fdroidserver/common.py
 #, python-brace-format
-msgid "Android SDK tool {cmd} not found!"
-msgstr "Alat Android SDK {cmd} tidak ditemukan!"
+msgid "Android build-tools path '{path}' does not exist!"
+msgstr ""
 
-#: ../fdroidserver/lint.py
-msgid "App has Binaries but does not have corresponding AllowedAPKSigningKeys to pin certificate."
-msgstr "Aplikasi memiliki Biner tetapi tidak memiliki AllowedAPKSigningKeys yang sesuai untuk menyematkan sertifikat."
-
-#: ../fdroidserver/lint.py
-msgid "App has NoSourceSince or ArchivePolicy \"0 versions\" or 0 but AutoUpdateMode or UpdateCheckMode are not None"
-msgstr "Aplikasi memiliki NoSource Since atau ArchivePolicy \"0 versi\" atau 0 tetapi AutoUpdateMode atau UpdateCheckMode bukan Tidak Ada"
+#: ../fdroidserver/update.py
+msgid "AndroidManifest.xml has no date"
+msgstr ""
 
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "App is in '{repo}' but has a link to {url}"
 msgstr ""
 
-#: ../fdroidserver/lint.py
-msgid "App version has binary but does not have corresponding AllowedAPKSigningKeys to pin certificate."
-msgstr ""
-
 #: ../fdroidserver/lint.py
 msgid "Appending .git is not necessary"
 msgstr ""
@@ -289,27 +313,11 @@ msgstr ""
 msgid "Archiving {apkfilename} with invalid signature!"
 msgstr ""
 
-#: ../fdroidserver/lint.py
-msgid "AutoUpdateMode with UpdateCheckMode: HTTP must have a pattern."
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "Automatic no to all prompts."
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "Automatic yes to all prompts."
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "Bad entry type \"{mirrortype}\" in mirrors config: {mirror}"
-msgstr ""
-
 #: ../fdroidserver/mirror.py
 msgid "Base URL to mirror, can include the index signing key using the query string: ?fingerprint="
 msgstr ""
 
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "Branch '{branch}' used as commit in build '{versionName}'"
@@ -325,9 +333,9 @@ msgstr ""
 msgid "Broken symlink: {path}"
 msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Build a package from source"
-msgstr "Bangun paket dari sumber"
+msgstr ""
 
 #: ../fdroidserver/build.py
 msgid "Build all applications available"
@@ -345,42 +353,56 @@ msgstr ""
 msgid "Build only the latest version of each package"
 msgstr ""
 
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Build should have comma-separated versionName and versionCode, not \"{value}\", in {linedesc}"
+msgstr ""
+
 #: ../fdroidserver/init.py
 #, python-format
 msgid "Built repo based in \"%s\" with this config:"
 msgstr ""
 
-#: ../fdroidserver/checkupdates.py
-msgid "Can't auto-update app with no CurrentVersionCode"
-msgstr ""
-
 #: ../fdroidserver/build.py
 msgid "Can't build due to {} error while scanning"
 msgid_plural "Can't build due to {} errors while scanning"
 msgstr[0] ""
 
+#: ../fdroidserver/vmtools.py
+#, python-brace-format
+msgid "Cannot read \"{path}\"!"
+msgstr ""
+
+#. Translators: https://developer.android.com/studio/build/application-id
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Cannot resolve application ID {appid}"
+msgstr ""
+
 #: ../fdroidserver/rewritemeta.py
 #, python-brace-format
 msgid "Cannot rewrite \"{path}\""
 msgstr ""
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
+#: ../fdroidserver/rewritemeta.py
+msgid "Cannot use --list and --to at the same time"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Cannot write \"{path}\", not an accepted format, use: {formats}"
+msgstr ""
+
 #: ../fdroidserver/lint.py
 #, python-format
 msgid "Categories '%s' is not valid"
 msgstr ""
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
 #: ../fdroidserver/lint.py
 msgid "Categories are not set"
 msgstr ""
 
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "Category \"{category}\" defined but not used for any apps!"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Check for updates to applications"
 msgstr "Periksa pembaruan pada aplikasi"
 
@@ -389,20 +411,28 @@ msgstr "Periksa pembaruan pada aplikasi"
 msgid "Checking archiving for {appid} - apks:{integer}, keepversions:{keep}, archapks:{arch}"
 msgstr ""
 
+#: ../fdroidserver/dscanner.py
+msgid "Clean after all scans have finished"
+msgstr ""
+
+#: ../fdroidserver/dscanner.py
+msgid "Clean before the scans start and rebuild the container"
+msgstr ""
+
+#: ../fdroidserver/dscanner.py
+msgid "Clean up all containers and then exit"
+msgstr ""
+
 #: ../fdroidserver/update.py
 msgid "Clean update - don't uses caches, reprocess all APKs"
 msgstr ""
 
-#: ../fdroidserver/common.py
-msgid "Color the log output"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "Comma separated list of categories."
 msgstr ""
 
-#: ../fdroidserver/__main__.py
-#, python-format
+#: ../fdroid ../fdroidserver/__main__.py
+#, c-format, python-format
 msgid "Command '%s' not recognised.\n"
 msgstr "Perintah '%s' tidak dikenal.\n"
 
@@ -410,15 +440,6 @@ msgstr "Perintah '%s' tidak dikenal.\n"
 msgid "Commit changes"
 msgstr ""
 
-#: ../fdroidserver/checkupdates.py
-msgid "Commit changes, push, then make a merge request"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Conflicting \"{field}\" definitions between .yml and localized files:"
-msgstr ""
-
 #: ../fdroidserver/__main__.py
 msgid "Conflicting arguments: '--verbose' and '--quiet' can not be specified at the same time."
 msgstr ""
@@ -428,13 +449,11 @@ msgstr ""
 msgid "Could not find '{command}' on your system"
 msgstr ""
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "Could not find latest version code"
 msgstr ""
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "Could not find latest version name"
 msgstr ""
 
@@ -444,8 +463,7 @@ msgid "Could not find {path} to remove it"
 msgstr ""
 
 #: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Could not open APK {path} for analysis: "
+msgid "Could not open apk file for analysis"
 msgstr ""
 
 #: ../fdroidserver/common.py
@@ -453,16 +471,22 @@ msgstr ""
 msgid "Could not parse size \"{size}\", wrong type \"{type}\""
 msgstr ""
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/import_subcommand.py
+#. Translators: https://developer.android.com/studio/build/application-id
+#: ../fdroidserver/import.py
 msgid "Couldn't find Application ID"
 msgstr ""
 
-#: ../fdroidserver/checkupdates.py
-msgid "Couldn't find any version information"
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
+#: ../fdroidserver/import.py
+msgid "Couldn't find latest version code"
 msgstr ""
 
-#: ../fdroidserver/checkupdates.py
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
+#: ../fdroidserver/import.py
+msgid "Couldn't find latest version name"
+msgstr ""
+
+#: ../fdroidserver/import.py
 msgid "Couldn't find package ID"
 msgstr ""
 
@@ -470,26 +494,29 @@ msgstr ""
 msgid "Cowardily refusing to overwrite existing signing key setup!"
 msgstr ""
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/update.py
+msgid "Create a repo signing key in a keystore"
+msgstr ""
+
+#: ../fdroidserver/update.py
+msgid "Create skeleton metadata files that are missing"
+msgstr "Membuat kerangka berkas metadata yang hilang"
+
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Created new container \"{name}\""
 msgstr ""
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Creating \"{path}\" for configuring s3cmd."
 msgstr ""
 
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Creating empty {config_file}"
-msgstr ""
-
 #: ../fdroidserver/publish.py
 msgid "Creating log directory"
 msgstr ""
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Creating new S3 bucket: {url}"
 msgstr ""
@@ -502,7 +529,8 @@ msgstr ""
 msgid "Creating signed index with this key (SHA256):"
 msgstr ""
 
-#: ../fdroidserver/publish.py ../fdroidserver/verify.py
+#: ../fdroidserver/import.py ../fdroidserver/verify.py
+#: ../fdroidserver/publish.py
 msgid "Creating temporary directory"
 msgstr ""
 
@@ -548,21 +576,16 @@ msgid "Description has a duplicate line"
 msgstr ""
 
 #: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Description of length {length} is over the {limit} char limit"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Did you mean config/{name}.yml?"
+#, python-format
+msgid "Description has a list (%s) but it isn't bulleted (*) nor numbered (#)"
 msgstr ""
 
 #: ../fdroidserver/lint.py
 #, python-brace-format
-msgid "Did you mean {code}?"
+msgid "Description of length {length} is over the {limit} char limit"
 msgstr ""
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "Do not add 'disable:' to the generated build entries"
 msgstr ""
 
@@ -587,20 +610,25 @@ msgstr ""
 msgid "Don't create a source tarball, useful when testing a build"
 msgstr ""
 
+#: ../fdroidserver/stats.py
+msgid "Don't do anything logs-related"
+msgstr ""
+
 #: ../fdroidserver/build.py
 msgid "Don't refresh the repository, useful when testing a build with no internet connection"
 msgstr ""
 
 #: ../fdroidserver/deploy.py ../fdroidserver/nightly.py
+#: ../fdroidserver/upload.py
 msgid "Don't use rsync checksums"
 msgstr ""
 
-#: ../fdroidserver/install.py
-msgid "Download F-Droid.apk using mirrors that leak less to the network"
+#: ../fdroid ../fdroidserver/__main__.py
+msgid "Download complete mirrors of small repos"
 msgstr ""
 
-#: ../fdroidserver/__main__.py
-msgid "Download complete mirrors of small repos"
+#: ../fdroidserver/stats.py
+msgid "Download logs we don't have"
 msgstr ""
 
 #: ../fdroidserver/common.py
@@ -614,12 +642,7 @@ msgstr ""
 
 #: ../fdroidserver/metadata.py
 #, python-brace-format
-msgid "Duplicate Anti-Feature declaration at {path} was ignored!"
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-format
-msgid "Duplicate entry \"%s\" in mirrors config!"
+msgid "Duplicate build recipe found for versionCode {versionCode} in {linedesc}"
 msgstr ""
 
 #: ../fdroidserver/lint.py
@@ -627,42 +650,27 @@ msgstr ""
 msgid "Duplicate link in '{field}': {url}"
 msgstr ""
 
-#: ../fdroidserver/common.py
-#, python-format
-msgid "ERROR: %(message)s"
+#: ../fdroid
+msgid "Dynamically scan APKs post build"
 msgstr ""
 
 #: ../fdroidserver/__main__.py
 msgid "ERROR: The \"server\" subcommand has been removed, use \"deploy\"!"
 msgstr ""
 
+#: ../fdroidserver/mirror.py
+msgid ""
+"ERROR: this command should never be used to mirror f-droid.org!\n"
+"A full mirror of f-droid.org requires more than 200GB."
+msgstr ""
+
 #: ../fdroidserver/nightly.py
 msgid "ERROR: unsupported CI type, patches welcome!"
 msgstr ""
 
-#: ../fdroidserver/nightly.py
-#, python-format
-msgid "ERROR: unsupported git host \"%s\", patches welcome!"
-msgstr ""
-
-#: ../fdroidserver/lint.py
+#: ../fdroidserver/metadata.py
 #, python-brace-format
-msgid "ERROR: {key} in {path} is not \"archive\" or \"repo\"!"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "ERROR: {key} not a valid key!"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "ERROR: {key}'s value should be of type {t}!"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "ERROR: {key}:{subkey} in {path} is not in allowed keys: {allowed_keys}!"
+msgid "Empty build flag at {linedesc}"
 msgstr ""
 
 #: ../fdroidserver/__main__.py
@@ -677,40 +685,20 @@ msgid ""
 "> "
 msgstr ""
 
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Environment variable {var} from {configname} is not set!"
+#: ../fdroidserver/deploy.py ../fdroidserver/checkupdates.py
+#: ../fdroidserver/upload.py
+#, python-format
+msgid "Error while attempting to publish log: %s"
 msgstr ""
 
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Environment variable {{env: {var}}} is not set!"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "Error deploying 'github_releases', {} not present. (You might need to run `fdroid update` first.)"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py ../fdroidserver/common.py
 msgid "Error while getting repo address"
 msgstr ""
 
-#: ../fdroidserver/scanner.py
-msgid "Exit with a non-zero code if problems were found"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Extract application metadata from a source repository"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Extract signatures from APKs"
 msgstr ""
 
-#: ../fdroidserver/install.py
-msgid "F-Droid.apk could not be downloaded from any known source!"
-msgstr ""
-
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Failed copying {path}: {error}"
@@ -731,23 +719,27 @@ msgstr ""
 msgid "Failed resizing {path}: {error}"
 msgstr ""
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/publish.py
+msgid "Failed to align application"
+msgstr ""
+
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Failed to create S3 bucket: {url}"
 msgstr ""
 
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Failed to get APK information, deleting {path}"
+#: ../fdroidserver/common.py
+msgid "Failed to get APK manifest information"
 msgstr ""
 
 #: ../fdroidserver/update.py
 #, python-brace-format
-msgid "Failed to get APK information, skipping {path}"
+msgid "Failed to get apk information, deleting {path}"
 msgstr ""
 
 #: ../fdroidserver/update.py
-msgid "Failed to get APK signing key fingerprint"
+#, python-brace-format
+msgid "Failed to get apk information, skipping {path}"
 msgstr ""
 
 #: ../fdroidserver/install.py
@@ -755,10 +747,14 @@ msgstr ""
 msgid "Failed to install '{apkfilename}' on {dev}: {error}"
 msgstr ""
 
-#: ../fdroidserver/common.py
+#: ../fdroidserver/publish.py ../fdroidserver/common.py
 msgid "Failed to sign application"
 msgstr ""
 
+#: ../fdroidserver/common.py
+msgid "Failed to zipalign application"
+msgstr ""
+
 #: ../fdroidserver/build.py
 #, python-brace-format
 msgid "Fetched buildserverid from VM: {buildserverid}"
@@ -774,12 +770,21 @@ msgstr ""
 msgid "File disappeared while processing it: {path}"
 msgstr ""
 
-#: ../fdroidserver/build.py ../fdroidserver/install.py
-#: ../fdroidserver/rewritemeta.py ../fdroidserver/scanner.py
-#: ../fdroidserver/update.py
+#: ../fdroidserver/verify.py ../fdroidserver/stats.py ../fdroidserver/update.py
+#: ../fdroidserver/rewritemeta.py ../fdroidserver/build.py
+#: ../fdroidserver/checkupdates.py ../fdroidserver/scanner.py
+#: ../fdroidserver/install.py
 msgid "Finished"
 msgstr ""
 
+#: ../fdroidserver/lint.py
+msgid "Flattr donation methods belong in the FlattrID flag"
+msgstr ""
+
+#: ../fdroidserver/lint.py
+msgid "Flattr donation methods belong in the FlattrID: field"
+msgstr ""
+
 #: ../fdroidserver/lint.py
 msgid "Forbidden HTML tags"
 msgstr ""
@@ -811,6 +816,7 @@ msgstr ""
 msgid "Found invalid appids in arguments"
 msgstr ""
 
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
 #: ../fdroidserver/common.py
 msgid "Found invalid versionCodes for some apps"
 msgstr ""
@@ -820,10 +826,6 @@ msgstr ""
 msgid "Found multiple JAR Signature Block Files in {path}"
 msgstr ""
 
-#: ../fdroidserver/common.py
-msgid "Found multiple Signer Certificates!"
-msgstr ""
-
 #: ../fdroidserver/metadata.py
 #, python-brace-format
 msgid "Found multiple metadata files for {appid}"
@@ -833,6 +835,11 @@ msgstr ""
 msgid "Found multiple signing certificates for repository."
 msgstr ""
 
+#: ../fdroidserver/update.py
+#, python-brace-format
+msgid "Found multiple signing certificates in {path}"
+msgstr ""
+
 #: ../fdroidserver/index.py
 msgid "Found no signing certificates for repository."
 msgstr ""
@@ -847,16 +854,6 @@ msgstr ""
 msgid "Found {apkfilename} at {url}"
 msgstr ""
 
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Found {count} problems in {filename}"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Found {count} warnings in {filename}"
-msgstr ""
-
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Generated skeleton metadata for {appid}"
@@ -875,21 +872,19 @@ msgstr ""
 msgid "Git fetch failed"
 msgstr ""
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
+#: ../fdroidserver/common.py
+msgid "Git remote set-head failed"
+msgstr ""
+
 #: ../fdroidserver/common.py
 #, python-format
 msgid "Git remote set-head failed: \"%s\""
 msgstr ""
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
 #: ../fdroidserver/common.py
 msgid "Git reset failed"
 msgstr ""
 
-#: ../fdroidserver/common.py
-msgid "Git submodule deinit failed"
-msgstr ""
-
 #: ../fdroidserver/common.py
 msgid "Git submodule sync failed"
 msgstr ""
@@ -921,16 +916,6 @@ msgstr ""
 msgid "Ignoring FUNDING.yml entry longer than 2048: %s"
 msgstr ""
 
-#: ../fdroidserver/update.py
-#, python-format
-msgid "Ignoring bad element in manifest: %s"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Ignoring deprecated {oldfile}, use {newfile}!"
-msgstr ""
-
 #: ../fdroidserver/index.py
 msgid "Ignoring package without metadata: "
 msgstr ""
@@ -940,6 +925,11 @@ msgstr ""
 msgid "Ignoring stale cache data for {apkfilename}"
 msgstr ""
 
+#: ../fdroidserver/rewritemeta.py
+#, python-brace-format
+msgid "Ignoring {ext} file at '{path}'"
+msgstr ""
+
 #: ../fdroidserver/update.py
 msgid "Include APKs that are signed with disabled algorithms like MD5"
 msgstr ""
@@ -956,16 +946,6 @@ msgstr ""
 msgid "Include the source tarballs in the mirror"
 msgstr ""
 
-#: ../fdroidserver/metadata.py
-#, python-format
-msgid "Including metadata from %s@%s"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Including metadata from {path}"
-msgstr ""
-
 #: ../fdroidserver/common.py
 msgid "Initialising submodules"
 msgstr ""
@@ -974,21 +954,31 @@ msgstr ""
 msgid "Install all signed applications available"
 msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Install built packages on devices"
-msgstr "Instal paket bawaan di perangkat"
+msgstr ""
 
 #: ../fdroidserver/install.py
 #, python-format
 msgid "Installing %s..."
 msgstr ""
 
+#: ../fdroidserver/install.py
+#, python-format
+msgid "Installing %s…"
+msgstr ""
+
 #: ../fdroidserver/install.py
 #, python-brace-format
 msgid "Installing '{apkfilename}' on {dev}..."
 msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroidserver/install.py
+#, python-brace-format
+msgid "Installing '{apkfilename}' on {dev}…"
+msgstr ""
+
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Interact with the repo HTTP server"
 msgstr "Interaksi dengan server repo HTTP"
 
@@ -996,36 +986,53 @@ msgstr "Interaksi dengan server repo HTTP"
 msgid "Invalid APK"
 msgstr ""
 
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "Invalid AutoUpdateMode: {mode}"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "Invalid UpdateCheckMode: {mode}"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
+#: ../fdroidserver/lint.py ../fdroidserver/checkupdates.py
 #, python-brace-format
 msgid "Invalid VercodeOperation: {field}"
 msgstr ""
 
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Invalid VercodeOperation: {invalid_ops}"
-msgstr ""
-
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "Invalid application ID {appid}"
 msgstr ""
 
+#: ../fdroidserver/metadata.py
+#, python-format
+msgid "Invalid boolean '%s'"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Invalid build flag at {line} in {linedesc}"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Invalid build format: {value} in {name}"
+msgstr ""
+
 #: ../fdroidserver/lint.py
 msgid "Invalid bulleted list"
 msgstr ""
 
+#: ../fdroidserver/lint.py
+#, python-format
+msgid "Invalid license tag \"%s\"! Use only tags from https://spdx.org/license-list"
+msgstr ""
+
+#: ../fdroidserver/lint.py
+msgid "Invalid link - use [http://foo.bar Link title] or [http://foo.bar]"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+#, python-format
+msgid "Invalid metadata in %s:%d"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+msgid "Invalid metadata in: "
+msgstr ""
+
 #: ../fdroidserver/common.py
 #, python-format
 msgid "Invalid name for published file: %s"
@@ -1033,7 +1040,7 @@ msgstr ""
 
 #: ../fdroidserver/common.py
 #, python-brace-format
-msgid "Invalid ndk: entry in build: \"{ndk}\""
+msgid "Invalid package name {0}"
 msgstr ""
 
 #: ../fdroidserver/common.py
@@ -1056,6 +1063,11 @@ msgstr ""
 msgid "Invalid srclib metadata: unknown key '{key}' in '{file}'"
 msgstr ""
 
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Invalid versionCode: \"{versionCode}\" is not an integer!"
+msgstr ""
+
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "JAR signature failed to verify: {path}"
@@ -1070,8 +1082,8 @@ msgstr ""
 msgid "Java JAR file"
 msgstr ""
 
-#: ../fdroidserver/mirror.py ../fdroidserver/publish.py
-#: ../fdroidserver/update.py
+#: ../fdroidserver/publish.py ../fdroidserver/update.py
+#: ../fdroidserver/mirror.py
 msgid "Java JDK not found! Install in standard location or set java_paths!"
 msgstr ""
 
@@ -1087,19 +1099,10 @@ msgstr ""
 msgid "Javascript in HTML src attributes"
 msgstr ""
 
-#: ../fdroidserver/build.py
-#, python-brace-format
-msgid "Keeping failed build \"{apkfilename}\""
-msgstr ""
-
 #: ../fdroidserver/init.py
 msgid "Keystore for signing key:\t"
 msgstr ""
 
-#: ../fdroidserver/lint.py
-msgid "Known debug key is used in AllowedAPKSigningKeys: "
-msgstr ""
-
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "Last used commit '{commit}' looks like a tag, but UpdateCheckMode is '{ucm}'"
@@ -1109,8 +1112,12 @@ msgstr ""
 msgid "Liberapay donation methods belong in the Liberapay: field"
 msgstr ""
 
+#: ../fdroidserver/lint.py
+msgid "Liberapay donation methods belong in the LiberapayID flag"
+msgstr ""
+
 #: ../fdroidserver/rewritemeta.py
-msgid "List files that would be reformatted (dry run)"
+msgid "List files that would be reformatted"
 msgstr ""
 
 #: ../fdroidserver/lint.py
@@ -1129,16 +1136,6 @@ msgstr ""
 msgid "Malformed serverwebroot line:"
 msgstr ""
 
-#: ../fdroidserver/scanner.py
-#, python-format
-msgid "Max recursion depth in ZIP file reached: %s"
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "Mirror config for {url} contains \"isPrimary\" key!"
-msgstr ""
-
 #: ../fdroidserver/mirror.py
 msgid "Mirror the full repo and archive, all file types."
 msgstr ""
@@ -1147,29 +1144,30 @@ msgstr ""
 msgid "Missing output directory"
 msgstr ""
 
-#: ../fdroidserver/metadata.py
-msgid "Moving Anti-Features declarations to localized files:"
-msgstr ""
-
-#: ../fdroidserver/index.py
-msgid "Neither \"repo_pubkey\" nor \"keystorepass\" set in config.yml"
-msgstr ""
-
-#: ../fdroidserver/verify.py
+#: ../fdroidserver/lint.py
 #, python-format
-msgid "No APK for package: %s"
+msgid "Name '%s' is just the auto name - remove it"
+msgstr ""
+
+#: ../fdroidserver/common.py
+msgid "No 'config.py' found, using defaults."
 msgstr ""
 
 #: ../fdroidserver/common.py
 msgid "No Android SDK found!"
 msgstr ""
 
+#: ../fdroidserver/import.py
+msgid "No android or kivy project could be found. Specify --subdir?"
+msgstr ""
+
 #: ../fdroidserver/install.py
 msgid "No attached devices found"
 msgstr ""
 
-#: ../fdroidserver/install.py
-msgid "No devices found for `adb install`! Please plug one in."
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "No commit specified for {versionName} in {linedesc}"
 msgstr ""
 
 #: ../fdroidserver/index.py
@@ -1180,23 +1178,14 @@ msgstr ""
 msgid "No git submodules available"
 msgstr ""
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "No gradle project could be found. Specify --subdir?"
 msgstr ""
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py ../fdroidserver/common.py
 msgid "No information found."
 msgstr ""
 
-#: ../fdroidserver/checkupdates.py
-msgid "No matching tags found"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "No minimum SDK version found in {0}, using default (3)."
-msgstr ""
-
 #: ../fdroidserver/lint.py
 msgid "No need to specify that the app is Free Software"
 msgstr ""
@@ -1206,7 +1195,7 @@ msgid "No need to specify that the app is for Android"
 msgstr ""
 
 #: ../fdroidserver/deploy.py
-msgid "No option set! Edit your config.yml to set at least one of these:"
+msgid "No option set! Edit your config.py to set at least one of these:"
 msgstr ""
 
 #: ../fdroidserver/common.py
@@ -1215,14 +1204,14 @@ msgstr ""
 
 #: ../fdroidserver/install.py
 #, python-format
-msgid "No signed APK available for %s"
+msgid "No signed apk available for %s"
 msgstr ""
 
 #: ../fdroidserver/install.py
 msgid "No signed output directory - nothing to do"
 msgstr ""
 
-#: ../fdroidserver/common.py
+#: ../fdroidserver/update.py ../fdroidserver/common.py
 #, python-brace-format
 msgid "No signing certificates found in {path}"
 msgstr ""
@@ -1232,23 +1221,16 @@ msgstr ""
 msgid "No such package: %s"
 msgstr ""
 
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "No such versionCode {versionCode} for app {appid}"
 msgstr ""
 
-#: ../fdroidserver/checkupdates.py
-msgid "No tags found"
-msgstr ""
-
-#: ../fdroidserver/publish.py ../fdroidserver/verify.py
+#: ../fdroidserver/verify.py ../fdroidserver/publish.py
 msgid "No unsigned directory - nothing to do"
 msgstr ""
 
-#: ../fdroidserver/__main__.py
-msgid "No version information could be found."
-msgstr ""
-
 #: ../fdroidserver/common.py
 msgid "Not a valid size definition: \"{}\""
 msgstr ""
@@ -1263,9 +1245,10 @@ msgid "Nothing to do for {appid}."
 msgstr ""
 
 #: ../fdroidserver/init.py
-msgid "Now set these in config.yml:"
+msgid "Now set these in config.py:"
 msgstr ""
 
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "OBB file has newer versionCode({integer}) than any APK:"
@@ -1283,27 +1266,22 @@ msgstr ""
 msgid "Offline machine, skipping git mirror generation until `fdroid deploy`"
 msgstr ""
 
-#: ../fdroidserver/deploy.py
-msgid "One of the 'github_releases' config items is missing the 'packageNames' value. skipping ..."
+#: ../fdroidserver/common.py
+#, python-brace-format
+msgid "Old APK signature failed to verify: {path}"
 msgstr ""
 
-#: ../fdroidserver/deploy.py
-msgid "One of the 'github_releases' config items is missing the 'projectUrl' value. skipping ..."
+#: ../fdroid ../fdroidserver/__main__.py
+msgid "Old, deprecated name for fdroid deploy"
 msgstr ""
 
-#: ../fdroidserver/deploy.py
-msgid "One of the 'github_releases' config items is missing the 'token' value. skipping ..."
-msgstr ""
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Only PNG and JPEG are supported for graphics, found: {path}"
 msgstr ""
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/common.py
-msgid "Only accepts a single key \"env\""
+#: ../fdroidserver/checkupdates.py
+msgid "Only print differences with the Play Store"
 msgstr ""
 
 #: ../fdroidserver/checkupdates.py
@@ -1314,6 +1292,11 @@ msgstr ""
 msgid "OpenCollective donation methods belong in the OpenCollective: field"
 msgstr ""
 
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "Options"
+msgstr "Opsi"
+
 #: ../fdroidserver/verify.py
 msgid "Output JSON report to file named after APK."
 msgstr ""
@@ -1322,22 +1305,26 @@ msgstr ""
 msgid "Output JSON to stdout."
 msgstr ""
 
-#: ../fdroidserver/checkupdates.py ../fdroidserver/gpgsign.py
-#: ../fdroidserver/publish.py ../fdroidserver/signindex.py
-#: ../fdroidserver/update.py
+#: ../fdroidserver/gpgsign.py ../fdroidserver/publish.py
+#: ../fdroidserver/update.py ../fdroidserver/signindex.py
+#: ../fdroidserver/checkupdates.py
 msgid "Outputting JSON"
 msgstr ""
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "Overall license of the project."
 msgstr ""
 
+#: ../fdroidserver/dscanner.py
+msgid "Override path for repo APKs (default: ./repo)"
+msgstr ""
+
 #: ../fdroidserver/index.py
 #, python-brace-format
 msgid "Overriding blank versionName in {apkfilename} from metadata: {version}"
 msgstr ""
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 #, python-brace-format
 msgid "Package \"{appid}\" already exists"
 msgstr ""
@@ -1351,10 +1338,13 @@ msgstr ""
 msgid "Password required with username"
 msgstr ""
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "Path to main Android project subdirectory, if not in root."
 msgstr ""
 
+msgid "Path to main android project subdirectory, if not in root."
+msgstr ""
+
 #: ../fdroidserver/init.py
 msgid "Path to the Android SDK (sometimes set in ANDROID_HOME)"
 msgstr ""
@@ -1367,18 +1357,20 @@ msgstr ""
 msgid "Path to the keystore for the repo signing key"
 msgstr ""
 
+#: ../fdroidserver/dscanner.py
+msgid "Prepare Drozer to run a scan"
+msgstr ""
+
+msgid "Prepare drozer to run a scan"
+msgstr ""
+
 #: ../fdroidserver/nightly.py
 msgid "Print the secret variable to the terminal for easy copy/paste"
 msgstr ""
 
-#: ../fdroidserver/install.py
+#: ../fdroidserver/metadata.py
 #, python-brace-format
-msgid "Privacy mode was enabled based on your locale ({country_code})."
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-format
-msgid "Problem with ZIP file: %s, error %s"
+msgid "Problem with description of {appid}: {error}"
 msgstr ""
 
 #: ../fdroidserver/common.py
@@ -1404,7 +1396,11 @@ msgstr ""
 msgid "Produce human-readable XML/JSON for index files"
 msgstr ""
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/update.py
+msgid "Produce human-readable index.xml"
+msgstr ""
+
+#: ../fdroidserver/import.py
 msgid "Project URL to import from."
 msgstr ""
 
@@ -1416,25 +1412,21 @@ msgstr ""
 msgid "Push the log to this git remote repository"
 msgstr ""
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Pushing binary transparency log to {url}"
 msgstr ""
 
-#: ../fdroidserver/deploy.py
-msgid "Pushing to remote server failed!"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Pushing to {url}"
 msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Quickly start a new repository"
 msgstr "Mulai repositori baru secepatnya"
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Read all the metadata files and exit"
 msgstr "Baca semuanberkas metadata dan keluar"
 
@@ -1445,12 +1437,14 @@ msgstr ""
 
 #: ../fdroidserver/common.py
 #, python-brace-format
-msgid "Reading packageName/versionCode/versionName failed, APK invalid: '{apkfilename}'"
+msgid "Reading minSdkVersion failed: \"{apkfilename}\""
 msgstr ""
 
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
+#. https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
 #: ../fdroidserver/common.py
 #, python-brace-format
-msgid "Reading packageName/versionCode/versionName failed,APK invalid: '{apkfilename}'"
+msgid "Reading packageName/versionCode/versionName failed, APK invalid: '{apkfilename}'"
 msgstr ""
 
 #: ../fdroidserver/update.py
@@ -1458,32 +1452,26 @@ msgstr ""
 msgid "Reading {apkfilename} from cache"
 msgstr ""
 
-#: ../fdroidserver/build.py
-msgid "Refresh and cache scanner rules and signatures from the network"
-msgstr ""
-
-#: ../fdroidserver/publish.py
-#, python-brace-format
-msgid "Refusing to sign '{path}', file exists in both {dir1} and {dir2} folder."
-msgstr ""
-
-#: ../fdroidserver/verify.py
-msgid "Remove source tarball and any APKs if successfully verified."
+#: ../fdroidserver/stats.py
+msgid "Recalculate aggregate stats - use when changes have been made that would invalidate old cached data."
 msgstr ""
 
 #: ../fdroidserver/common.py
 msgid "Removing specified files"
 msgstr ""
 
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Removing {path}\""
-msgstr ""
-
 #: ../fdroidserver/update.py
 msgid "Rename APK files that do not match package.name_123.apk"
 msgstr "Ubah nama berkas APK yang tidak sesuai dengan package.nama_123.apk"
 
+#: ../fdroidserver/update.py
+msgid "Report on build data status"
+msgstr ""
+
+#: ../fdroidserver/build.py
+msgid "Reset and create a brand new build server, even if the existing one appears to be ok."
+msgstr ""
+
 #: ../fdroidserver/nightly.py
 #, python-brace-format
 msgid "Resigning {apkfilename} with provided debug.keystore"
@@ -1497,34 +1485,33 @@ msgstr ""
 msgid "Restrict output to warnings and errors"
 msgstr ""
 
-#: ../fdroidserver/net.py
-#, python-format
-msgid "Retrying failed download: %s"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Rewrite all the metadata files"
 msgstr "Tulis ulang semua berkas metadata"
 
+#: ../fdroidserver/rewritemeta.py
+msgid "Rewrite to a specific format: "
+msgstr ""
+
 #: ../fdroidserver/rewritemeta.py
 #, python-brace-format
 msgid "Rewriting '{appid}'"
 msgstr ""
 
-#: ../fdroidserver/checkupdates.py
-msgid "Run on git repo that has uncommitted changes"
+#: ../fdroidserver/rewritemeta.py
+#, python-brace-format
+msgid "Rewriting '{appid}' to '{path}'"
 msgstr ""
 
-#: ../fdroidserver/nightly.py
-#, python-brace-format
-msgid "Run over {cibase} to find -debug.apk. and skip repo_basedir {repo_basedir}"
+#: ../fdroidserver/checkupdates.py
+msgid "Run on git repo that has uncommitted changes"
 msgstr ""
 
 #: ../fdroidserver/lint.py
 msgid "Run rewritemeta to fix formatting"
 msgstr ""
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 msgid "Running first pass with MD5 checking disabled"
 msgstr ""
 
@@ -1533,24 +1520,18 @@ msgstr ""
 msgid "Running wget in {path}"
 msgstr ""
 
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "SHA-256 of {url} does not match entry!"
+#: ../fdroidserver/dscanner.py
+msgid "Scan only the latest version of each package"
 msgstr ""
 
 #: ../fdroidserver/build.py
 msgid "Scan the resulting APK(s) for known non-free classes."
 msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Scan the source code of a package"
 msgstr "Pindai sumber berkas paket"
 
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Scanner found {count} problems in {apk}"
-msgstr ""
-
 #: ../fdroidserver/scanner.py
 #, python-brace-format
 msgid "Scanner found {count} problems in {appid}:"
@@ -1566,19 +1547,6 @@ msgid "Scanner found {} problem"
 msgid_plural "Scanner found {} problems"
 msgstr[0] ""
 
-#: ../fdroidserver/scanner.py
-msgid "Scanning APK for extra signing blocks."
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "Scanning APK with dexdump for known non-free classes."
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Set NDK {release} ({version}) up"
-msgstr ""
-
 #: ../fdroidserver/common.py
 msgid "Set clock to that time using:"
 msgstr ""
@@ -1592,7 +1560,7 @@ msgstr ""
 msgid "Set open file limit to {integer}"
 msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Set up an app build for a nightly build repo"
 msgstr ""
 
@@ -1605,13 +1573,20 @@ msgstr ""
 msgid "Setting {0} sec timeout for this build"
 msgstr ""
 
-#: ../fdroidserver/__main__.py
-msgid "Sign and place packages in the repo"
-msgstr "Tandai dan tempatkan paket ke dalam repo"
+#: ../fdroidserver/build.py
+msgid "Setup an emulator, install the APK on it and perform a Drozer scan"
+msgstr ""
 
-#: ../fdroidserver/__main__.py
+msgid "Setup an emulator, install the apk on it and perform a drozer scan"
+msgstr ""
+
+#: ../fdroid ../fdroidserver/__main__.py
+msgid "Sign and place packages in the repo"
+msgstr ""
+
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Sign indexes created using update --nosign"
-msgstr "Tanda tangani indeks yang dibuat menggunakan update --nosign"
+msgstr ""
 
 #: ../fdroidserver/build.py
 msgid "Skip scanning the source code for binaries and other problems"
@@ -1622,11 +1597,6 @@ msgstr ""
 msgid "Skipping '{apkfilename}' with invalid signature!"
 msgstr ""
 
-#: ../fdroidserver/deploy.py ../fdroidserver/index.py
-#, python-format
-msgid "Skipping GitLab Pages mirror because the repo is too large (>%.2fGB)!"
-msgstr ""
-
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Skipping index generation for {appid}"
@@ -1642,14 +1612,23 @@ msgstr ""
 msgid "Skipping {appid}: disabled"
 msgstr ""
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/scanner.py
+#, python-brace-format
+msgid "Skipping {appid}: no builds specified"
+msgstr ""
+
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 msgid "Specify a local folder to sync the repo to"
 msgstr ""
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 msgid "Specify an identity file to provide to SSH for rsyncing"
 msgstr ""
 
+#: ../fdroidserver/build.py
+msgid "Specify that we're running on the build server"
+msgstr ""
+
 #: ../fdroidserver/nightly.py
 msgid "Specify which debug keystore file to use."
 msgstr ""
@@ -1658,6 +1637,11 @@ msgstr ""
 msgid "Spew out even more information than normal"
 msgstr ""
 
+#: ../fdroidserver/nightly.py
+#, python-brace-format
+msgid "Striping mystery signature from {apkfilename}"
+msgstr ""
+
 #: ../fdroidserver/nightly.py
 #, python-brace-format
 msgid "Stripping mystery signature from {apkfilename}"
@@ -1678,22 +1662,10 @@ msgstr ""
 msgid "System clock is older than date in {path}!"
 msgstr ""
 
-#: ../fdroidserver/checkupdates.py
-msgid "Tags update mode only works for git, hg, bzr and git-svn repositories currently"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "Tags update mode used in git-svn, but the repo was not set up with tags"
-msgstr ""
-
 #: ../fdroidserver/build.py
 msgid "Test mode - put output in the tmp directory only, and always build, even if the output already exists."
 msgstr ""
 
-#: ../fdroidserver/index.py
-msgid "The \"qrcode\" Python package is not installed (e.g. apt-get install python3-qrcode)!"
-msgstr ""
-
 #. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
 #: ../fdroidserver/update.py
 #, python-brace-format
@@ -1712,10 +1684,18 @@ msgstr ""
 msgid "The file to be included in the repo (path or glob)"
 msgstr ""
 
+#: ../fdroidserver/deploy.py
+msgid "The only commands currently supported are 'init' and 'update'"
+msgstr ""
+
 #: ../fdroidserver/index.py
 msgid "The repository's fingerprint does not match."
 msgstr ""
 
+#: ../fdroidserver/common.py
+msgid "The repository's index could not be verified."
+msgstr ""
+
 #: ../fdroidserver/deploy.py
 #, python-brace-format
 msgid "The root dir for local_copy_dir \"{path}\" does not exist!"
@@ -1729,37 +1709,13 @@ msgstr ""
 msgid "These are the apps that have been archived from the main repo."
 msgstr ""
 
-#: ../fdroidserver/mirror.py
-msgid "This command should never be used to mirror f-droid.org! A full copy requires more than 600GB."
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "This is a repository of apps to be used with F-Droid. Applications in this repository are either official binaries built by the original application developers, or are binaries built from source by the admin of f-droid.org using the tools on https://gitlab.com/fdroid."
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 #, python-format
 msgid "This repo already has local metadata: %s"
 msgstr ""
 
-#: ../fdroidserver/init.py
-#, python-format
-msgid ""
-"To complete the setup, add your APKs to \"%s\"\n"
-"then run \"fdroid update -c; fdroid update\".  You might also want to edit\n"
-"\"config.yml\" to set the URL, repo name, and more.  You should also set up\n"
-"a signing key (a temporary one might have been automatically generated).\n"
-"\n"
-"For more info: https://f-droid.org/docs/Setup_an_F-Droid_App_Repo\n"
-"and https://f-droid.org/docs/Signing_Process"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "To use awsbucket, awssecretkey and awsaccesskeyid must also be set in config.yml!"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "To use rclone, rclone_config and awsbucket must be set in config.yml!"
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
+msgid "To use awsbucket, awssecretkey and awsaccesskeyid must also be set in config.py!"
 msgstr ""
 
 #: ../fdroidserver/lint.py
@@ -1770,6 +1726,10 @@ msgstr ""
 msgid "URL shorteners should not be used"
 msgstr ""
 
+#: ../fdroidserver/metadata.py
+msgid "URL title is just the URL, use brackets: [URL]"
+msgstr ""
+
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "URL {url} in Description: {error}"
@@ -1783,15 +1743,16 @@ msgstr ""
 msgid "Unexpected license tag \"{}\"! Only use license tags configured in your config file"
 msgstr ""
 
-#: ../fdroidserver/common.py
+#: ../fdroidserver/metadata.py
 #, python-brace-format
-msgid "Unknown entry {key} in {configname}"
+msgid "Unexpected text on same line as {field} in {linedesc}"
 msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Unknown exception found!"
 msgstr "Eksepsi tidak ditemukan!"
 
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "Unknown file '{filename}' in build '{versionName}'"
@@ -1802,6 +1763,11 @@ msgstr ""
 msgid "Unknown metadata format: %s"
 msgstr ""
 
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Unknown metadata format: {path}"
+msgstr ""
+
 #: ../fdroidserver/metadata.py
 #, python-brace-format
 msgid "Unknown metadata format: {path} (use: *.yml)"
@@ -1811,6 +1777,10 @@ msgstr ""
 msgid "Unknown version of aapt, might cause problems: "
 msgstr ""
 
+#: ../fdroidserver/lint.py
+msgid "Unlinkified link - use [http://foo.bar Link title] or [http://foo.bar]"
+msgstr ""
+
 #: ../fdroidserver/lint.py
 msgid "Unnecessary leading space"
 msgstr ""
@@ -1824,12 +1794,20 @@ msgstr ""
 msgid "Unrecognised app field '{fieldname}' in '{path}'"
 msgstr ""
 
+#: ../fdroidserver/metadata.py
+msgid "Unrecognised app field: "
+msgstr ""
+
 #: ../fdroidserver/metadata.py
 #, python-brace-format
 msgid "Unrecognised build flag '{build_flag}' in '{path}'"
 msgstr ""
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Unrecognised field '{field}' in {linedesc}"
+msgstr ""
+
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Unsupported file type \"{extension}\" for repo graphic"
@@ -1840,6 +1818,29 @@ msgstr ""
 msgid "Unsupported graphics file found: {path}"
 msgstr ""
 
+#: ../fdroidserver/rewritemeta.py
+#, python-brace-format
+msgid "Unsupported metadata format, use: --to [{supported}]"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+msgid "Unterminated ]"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+msgid "Unterminated ]]"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Unterminated build in {name}"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Unterminated continuation in {name}"
+msgstr ""
+
 #: ../fdroidserver/lint.py
 #, python-format
 msgid "Unused extlib at %s"
@@ -1860,25 +1861,27 @@ msgstr ""
 msgid "Unused scanignore path: %s"
 msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Update repo information for new packages"
 msgstr "Perbarui informasi repo untuk paket yang baru"
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Update the binary transparency log for a URL"
 msgstr "Perbarui log transparansi biner untuk URL"
 
+#: ../fdroid ../fdroidserver/__main__.py
+msgid "Update the stats of the repo"
+msgstr "Perbarui status repo"
+
+#: ../fdroidserver/update.py ../fdroidserver/build.py
+msgid "Update the wiki"
+msgstr ""
+
 #: ../fdroidserver/checkupdates.py
 #, python-brace-format
 msgid "UpdateCheckData has invalid URL: {url}"
 msgstr ""
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "UpdateCheckData must match the version code as integer (\\d or [0-9]): {codeex}"
-msgstr ""
-
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "UpdateCheckData must use HTTPS URL: {url}"
@@ -1890,10 +1893,14 @@ msgid "UpdateCheckData not a valid URL: {url}"
 msgstr ""
 
 #: ../fdroidserver/lint.py
-msgid "UpdateCheckMode is set but it looks like checkupdates hasn't been run yet."
+msgid "UpdateCheckMode is set but it looks like checkupdates hasn't been run yet"
+msgstr ""
+
+#. Translators: https://developer.android.com/studio/build/application-id
+#: ../fdroidserver/lint.py
+msgid "UpdateCheckName is set to the known application ID - it can be removed"
 msgstr ""
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
 #: ../fdroidserver/lint.py
 msgid "UpdateCheckName is set to the known application ID, it can be removed"
 msgstr ""
@@ -1908,8 +1915,19 @@ msgstr ""
 msgid "Uploading {apkfilename} to virustotal"
 msgstr ""
 
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "Usage"
+msgstr "Penggunaan"
+
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, python-format
+msgid "Usage: %s\n"
+msgstr "Penggunaan: %s\n"
+
 #: ../fdroidserver/lint.py
-msgid "Use /HEAD instead of /master or /main to point at a file in the default branch"
+msgid "Use /HEAD instead of /master to point at a file in the default branch"
 msgstr ""
 
 #: ../fdroidserver/update.py
@@ -1924,14 +1942,12 @@ msgstr ""
 msgid "Use date from APK instead of current time for newly added APKs"
 msgstr ""
 
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Using \"{path}\" for configuring s3cmd."
+msgid "Use date from apk instead of current time for newly added apks"
 msgstr ""
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
-msgid "Using \"{path}\" for syncing with remote storage."
+msgid "Using \"{path}\" for configuring s3cmd."
 msgstr ""
 
 #: ../fdroidserver/common.py
@@ -1942,17 +1958,13 @@ msgstr ""
 msgid "Using APK Signature v3"
 msgstr ""
 
-#: ../fdroidserver/common.py
-msgid "Using JAR Signature"
-msgstr ""
-
 #: ../fdroidserver/common.py
 msgid "Using Java's jarsigner, not recommended for verifying APKs! Use apksigner"
 msgstr ""
 
-#: ../fdroidserver/metadata.py
+#: ../fdroidserver/common.py
 #, python-brace-format
-msgid "Using blank dictionary instead of contents of {path}!"
+msgid "Using androguard from \"{path}\""
 msgstr ""
 
 #: ../fdroidserver/init.py
@@ -1960,17 +1972,12 @@ msgstr ""
 msgid "Using existing keystore \"{path}\""
 msgstr ""
 
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Using rclone to sync with: {url}"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Using s3cmd to sync with: {url}"
 msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Valid commands are:"
 msgstr "Perintah yang benar adalah:"
 
@@ -1978,7 +1985,7 @@ msgstr "Perintah yang benar adalah:"
 msgid "Verify against locally cached copy rather than redownloading."
 msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Verify the integrity of downloaded packages"
 msgstr "Verifikasi integritas paket yang didownload"
 
@@ -1986,24 +1993,15 @@ msgstr "Verifikasi integritas paket yang didownload"
 msgid "Verifying index signature:"
 msgstr ""
 
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "Verifying package {path} with apksigner."
-msgstr ""
-
 #: ../fdroidserver/deploy.py
 #, python-brace-format
 msgid "VirusTotal API key cannot upload files larger than 32MB, use {url} to upload {path}."
 msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Warn about possible metadata errors"
 msgstr "Peringatkan mengenai kemungkinan error pada metadata"
 
-#: ../fdroidserver/scanner.py
-msgid "WebAssembly binary file"
-msgstr ""
-
 #: ../fdroidserver/update.py
 msgid "When configured for signed indexes, create only unsigned indexes at this stage"
 msgstr ""
@@ -2012,16 +2010,7 @@ msgstr ""
 msgid "When linting the entire repository yamllint is disabled by default. This option forces yamllint regardless."
 msgstr ""
 
-#: ../fdroidserver/publish.py
-msgid "When signing or verifying fails, exit with an error code."
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "Would you like to download and install F-Droid.apk via adb? (YES/no)"
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "Would you like to download the app(s) from f-droid.org? (YES/no)"
+msgid "X.509 'Distiguished Name' used when generating keys"
 msgstr ""
 
 #: ../fdroidserver/init.py
@@ -2036,11 +2025,6 @@ msgstr ""
 msgid "ZIP file archive"
 msgstr ""
 
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "adb reports {serial} is \"{status}\"!"
-msgstr ""
-
 #: ../fdroidserver/nightly.py
 #, python-brace-format
 msgid "adding IdentityFile to {path}"
@@ -2051,78 +2035,84 @@ msgstr ""
 msgid "adding to {name}: {path}"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "ambiguous option: %(option)s could match %(matches)s"
 msgstr "opsi ambigu: %(option)s bisa sesuai dengan %(matches)s"
 
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "apksigner in build-tools;{version} passes APKs with invalid v3 signatures, ignoring."
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "apksigner not found! Cannot sign or verify modern APKs"
-msgstr ""
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, python-format
+msgid "ambiguous option: %s (%s?)"
+msgstr "opsi ambigu: %s (%s?)"
 
 #: ../fdroidserver/common.py
 msgid "apksigner not found, it's required for signing!"
 msgstr ""
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/checkupdates.py ../fdroidserver/lint.py
-#: ../fdroidserver/rewritemeta.py
+#: ../fdroidserver/lint.py ../fdroidserver/rewritemeta.py
+#: ../fdroidserver/checkupdates.py
 msgid "application ID of file to operate on"
 msgstr ""
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/build.py ../fdroidserver/install.py
-#: ../fdroidserver/publish.py ../fdroidserver/scanner.py
-#: ../fdroidserver/verify.py
+#: ../fdroidserver/verify.py ../fdroidserver/publish.py
+#: ../fdroidserver/build.py ../fdroidserver/scanner.py
+#: ../fdroidserver/install.py
 msgid "application ID with optional versionCode in the form APPID[:VERCODE]"
 msgstr ""
 
-#: ../fdroidserver/common.py
-msgid "archive_url needs to end with /archive"
+#: ../fdroidserver/lint.py ../fdroidserver/rewritemeta.py
+msgid "applicationId in the form APPID"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: ../fdroidserver/checkupdates.py
+msgid "applicationId to check for updates"
+msgstr ""
+
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
+#: ../fdroidserver/verify.py ../fdroidserver/publish.py
+#: ../fdroidserver/dscanner.py ../fdroidserver/build.py
+#: ../fdroidserver/scanner.py ../fdroidserver/install.py
+msgid "applicationId with optional versionCode in the form APPID[:VERCODE]"
+msgstr ""
+
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "argument \"-\" with mode %r"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "argument %(argument_name)s: %(message)s"
-msgstr ""
-
 #: ../fdroidserver/nightly.py
 msgid "attempting bare SSH connection to test deploy key:"
 msgstr ""
 
+#: ../fdroidserver/nightly.py
+msgid "attempting bare ssh connection to test deploy key:"
+msgstr ""
+
 #: ../fdroidserver/common.py
 msgid "can not parse scrlib spec (not a string): '{}'"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
-msgid "can't open '%(filename)s': %(error)s"
-msgstr "tidak bisa dibuka '%(filename)s': %(error)s"
-
-#: ../fdroidserver/scanner.py
-msgid "can't open non-https url: '{};"
-msgstr ""
+msgid "can't open '%s': %s"
+msgstr "tidak bisa dibuka '%s': %s"
 
 #: ../fdroidserver/build.py
 #, python-brace-format
 msgid "cannot find required srclibs: \"{path}\""
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "cannot have multiple subparser arguments"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "cannot merge actions - two groups are named %r"
 msgstr ""
@@ -2136,24 +2126,29 @@ msgstr ""
 msgid "cloning {url}"
 msgstr ""
 
+#: ../fdroidserver/deploy.py
+msgid "command to execute, either 'init' or 'update'"
+msgstr ""
+
 #: ../fdroidserver/__main__.py
 msgid "commands from plugin modules:"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "complex"
+msgstr ""
+
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "conflicting option string: %s"
 msgid_plural "conflicting option strings: %s"
 msgstr[0] ""
 
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "conflicting subparser alias: %s"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "conflicting subparser: %s"
+#: ../fdroidserver/nightly.py
+#, python-brace-format
+msgid "copying {apkfilename} into {path}"
 msgstr ""
 
 #: ../fdroidserver/metadata.py
@@ -2162,11 +2157,11 @@ msgid "could not parse '{path}'"
 msgstr ""
 
 #: ../fdroidserver/common.py
-msgid "could not parse srclib spec (no name specified): '{}'"
+msgid "could not parse srclib spec (no ref specified): '{}'"
 msgstr ""
 
 #: ../fdroidserver/common.py
-msgid "could not parse srclib spec (no ref specified): '{}'"
+msgid "could not parse srclib spec (too many '@' signs): '{}'"
 msgstr ""
 
 #: ../fdroidserver/nightly.py
@@ -2174,18 +2169,14 @@ msgstr ""
 msgid "created {path}"
 msgstr ""
 
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "current version is newer: old vercode={old}, new vercode={new}"
-msgstr ""
-
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "deleting: repo/{apkfilename}"
 msgstr ""
 
-#: ../fdroidserver/scanner.py
-msgid "dependency file without lock"
+#: ../fdroidserver/common.py
+#, python-brace-format
+msgid "deployed build logs to '{path}'"
 msgstr ""
 
 #: ../fdroidserver/common.py
@@ -2193,49 +2184,60 @@ msgstr ""
 msgid "deployed process log {path} to {dest}"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "dest= is required for options like %r"
 msgstr ""
 
-#: ../fdroidserver/scanner.py
-msgid "downloading '{}'"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "downloading scanner signatures from '{}' failed"
-msgstr ""
-
 #: ../fdroidserver/scanner.py
 msgid "executable binary, possibly code"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "expected %s argument"
 msgid_plural "expected %s arguments"
 msgstr[0] ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "expected at least one argument"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "expected at most one argument"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "expected one argument"
 msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroidserver/common.py
+#, python-brace-format
+msgid "failed deploying build logs to '{path}'"
+msgstr ""
+
+#: ../fdroid
+msgid "fdroid [-h|--help|--version] <command> [<args>]"
+msgstr ""
+
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "fdroid [<command>] [-h|--help|--version|<args>]"
 msgstr ""
 
-#: ../fdroidserver/scanner.py
-msgid "fetch the latest version of signatures from the web"
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "floating-point"
 msgstr ""
 
+#: ../fdroidserver/metadata.py
+msgid "force errors to be warnings, or ignore"
+msgstr "paksa untuk mengingatkan adanya error, atau hiraukan"
+
 #: ../fdroidserver/metadata.py
 msgid "force metadata errors (default) to be warnings, or to be ignored."
 msgstr ""
@@ -2248,7 +2250,8 @@ msgstr ""
 msgid "gzip file archive"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "ignored explicit argument %r"
 msgstr ""
@@ -2257,39 +2260,35 @@ msgstr ""
 msgid "index-v1 must have a signature, use `fdroid signindex` to create it!"
 msgstr ""
 
-#: ../fdroidserver/index.py
-msgid "index-v2 must have a signature, use `fdroid signindex` to create it!"
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "integer"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "invalid %(type)s value: %(value)r"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "invalid choice: %(value)r (choose from %(choices)s)"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "invalid conflict_resolution value: %r"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "invalid option string %(option)r: must start with a character %(prefix_chars)r"
 msgstr ""
 
-#: ../fdroidserver/common.py
-msgid "ipfs_cid not found, skipping CIDv1 generation"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "latest build recipe is newer: old vercode={old}, new vercode={new}"
-msgstr ""
-
 #: ../fdroidserver/deploy.py
 #, python-brace-format
 msgid "local_copy_dir does not end with \"fdroid\", perhaps you meant: \"{path}\""
@@ -2308,20 +2307,11 @@ msgstr ""
 msgid "mirror '%s' does not end with 'fdroid'!"
 msgstr ""
 
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "mirrors set twice, in config.yml and {path}!"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "mutually exclusive arguments must be optional"
 msgstr ""
 
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "next {name} cache update due in {time}"
-msgstr ""
-
 #: ../fdroidserver/mirror.py
 #, python-brace-format
 msgid "no \"icon\" in {appid}"
@@ -2331,90 +2321,141 @@ msgstr ""
 msgid "no APK supplied"
 msgstr ""
 
-#: ../fdroidserver/checkupdates.py
-msgid "no version information found"
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, python-format
+msgid "no such option: %s"
+msgstr "tidak ada opsi: %s"
+
+#: ../fdroid ../fdroidserver/__main__.py
+msgid "no version info found!"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "not allowed with argument %s"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "one of the arguments %s is required"
 msgstr ""
 
-#: ../fdroidserver/common.py ../fdroidserver/index.py
+#: ../fdroidserver/index.py ../fdroidserver/common.py
 msgid "only accepts strings, lists, and tuples"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
-#, fuzzy
-msgid "options"
-msgstr "Opsi"
+#: ../fdroidserver/install.py
+#, python-format
+msgid "option %s: If you really want to install all the signed apps, use --all"
+msgstr ""
+
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, python-format
+msgid "option %s: invalid %s value: %r"
+msgstr ""
+
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, python-format
+msgid "option %s: invalid choice: %r (choose from %s)"
+msgstr ""
+
+#: /usr/lib/python3.5/getopt.py /usr/lib/python3.6/getopt.py
+#: /usr/lib/python3.7/getopt.py
+#, python-format
+msgid "option -%s not recognized"
+msgstr "opsi -%s tidak dikenal"
+
+#: /usr/lib/python3.5/getopt.py /usr/lib/python3.6/getopt.py
+#: /usr/lib/python3.7/getopt.py
+#, python-format
+msgid "option -%s requires argument"
+msgstr "opsi -%s memerlukan argumen"
+
+#: /usr/lib/python3.5/getopt.py /usr/lib/python3.6/getopt.py
+#: /usr/lib/python3.7/getopt.py
+#, python-format
+msgid "option --%s must not have an argument"
+msgstr ""
+
+#: /usr/lib/python3.5/getopt.py /usr/lib/python3.6/getopt.py
+#: /usr/lib/python3.7/getopt.py
+#, python-format
+msgid "option --%s not a unique prefix"
+msgstr "opsi --%s bukan prefiks unik"
+
+#: /usr/lib/python3.5/getopt.py /usr/lib/python3.6/getopt.py
+#: /usr/lib/python3.7/getopt.py
+#, python-format
+msgid "option --%s not recognized"
+msgstr "opsi --%s tidak dikenal"
+
+#: /usr/lib/python3.5/getopt.py /usr/lib/python3.6/getopt.py
+#: /usr/lib/python3.7/getopt.py
+#, python-format
+msgid "option --%s requires argument"
+msgstr "opsi --%s memerlukan argumen"
+
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
+msgid "optional arguments"
+msgstr "argumen opsional"
 
 #: ../fdroidserver/nightly.py
 #, python-brace-format
 msgid "overwriting existing {path}"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "positional arguments"
-msgstr "argumen posisi"
+msgstr ""
 
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "process log deploy {path} to {dest} failed!"
 msgstr ""
 
-#: ../fdroidserver/build.py
-msgid "reference binary missing signature"
-msgstr ""
-
 #: ../fdroidserver/signatures.py
 #, python-brace-format
 msgid "refuse downloading via insecure HTTP connection (use HTTPS or specify --no-https-check): {apkfilename}"
 msgstr ""
 
+#: ../fdroidserver/signatures.py
+#, python-brace-format
+msgid "refuse downloading via insecure http connection (use https or specify --no-https-check): {apkfilename}"
+msgstr ""
+
 #: ../fdroidserver/index.py
 #, python-format
-msgid "repo_icon \"repo/icons/%s\" does not exist, generating placeholder."
+msgid "repo_icon %s does not exist, generating placeholder."
 msgstr ""
 
-#: ../fdroidserver/common.py
-msgid "repo_url needs to end with /repo"
+#: ../fdroidserver/metadata.py
+msgid "ruamel.yaml not installed, can not write metadata."
 msgstr ""
 
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "rsync is missing or broken: {error}"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "s3cmd sync indexes {path} to {url} and delete"
 msgstr ""
 
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "s3cmd syncs indexes from {path} to {url} and deletes removed"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "scanner cache is malformed! You can clear it with: '{clear}'"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "serverwebroot: path does not end with \"fdroid\", perhaps you meant one of these:"
-msgstr ""
-
 #: ../fdroidserver/scanner.py
 msgid "shared library"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "show program's version number and exit"
+msgstr "menampilkan nomor versi program dan keluar"
+
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.5/optparse.py
+#: /usr/lib/python3.6/argparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/argparse.py /usr/lib/python3.7/optparse.py
 msgid "show this help message and exit"
 msgstr "menampilkan bantuan ini dan keluar"
 
@@ -2443,31 +2484,31 @@ msgstr ""
 msgid "static library"
 msgstr ""
 
-#: ../fdroidserver/build.py
+#: ../fdroidserver/common.py
 #, python-brace-format
-msgid "supplied reference binary has allowed signer {signer}"
+msgid "supplied timestamp value '{timestamp}' is not a unix timestamp"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "the following arguments are required: %s"
 msgstr "argumen berikut ini diperlukan: %s"
 
-#: ../fdroidserver/install.py
-msgid "true"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "unexpected option string: %s"
-msgstr "string opsi tak terduga: %s"
+msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "unknown parser %(parser_name)r (choices: %(choices)s)"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "unrecognized arguments: %s"
 msgstr "argumen tidak dikenal: %s"
@@ -2477,11 +2518,16 @@ msgstr "argumen tidak dikenal: %s"
 msgid "unsafe permissions on '{config_file}' (should be 0600)!"
 msgstr "izin tidak aman pada '{config_file}' (seharusnya 0600)!"
 
-#: ../fdroidserver/__main__.py /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py ../fdroid
+#: /usr/lib/python3.7/argparse.py ../fdroidserver/__main__.py
 msgid "usage: "
 msgstr "penggunaan: "
 
-#: ../fdroidserver/deploy.py
+#: ../fdroid
+msgid "usage: fdroid [-h|--help|--version] <command> [<args>]"
+msgstr "penggunaan: fdroid [-h|--help|--version] <perintah> [<argumen>]"
+
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "using Apache libcloud to sync with {url}"
 msgstr ""
@@ -2490,8 +2536,8 @@ msgstr ""
 msgid "virustotal.com is rate limiting, waiting to retry..."
 msgstr ""
 
-#: ../fdroidserver/install.py
-msgid "yes"
+#: ../fdroidserver/update.py
+msgid "wiki support is deprecated and will be removed in the next release!"
 msgstr ""
 
 #: ../fdroidserver/publish.py
@@ -2505,19 +2551,31 @@ msgstr[0] ""
 msgid "{apkfilename} ({appid}) has no metadata!"
 msgstr ""
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
+#: ../fdroidserver/update.py
+#, python-brace-format
+msgid "{apkfilename} has multiple {name} files, looks like Master Key exploit!"
+msgstr ""
+
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "{apkfilename}'s AndroidManifest.xml has a bad date: "
 msgstr ""
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "{appid} does not have a name! Using application ID instead."
 msgstr ""
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
+#: ../fdroidserver/update.py
+#, python-brace-format
+msgid "{appid} does not have a name! Using package name instead."
+msgstr ""
+
+#: ../fdroidserver/update.py
+#, python-brace-format
+msgid "{appid} from {path} is not a valid Android Package Name!"
+msgstr ""
+
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "{appid} from {path} is not a valid Android application ID!"
@@ -2528,16 +2586,12 @@ msgstr ""
 msgid "{appid} from {path} is not a valid Java Package Name!"
 msgstr ""
 
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{appid} has both APKs and files: {files}"
-msgstr ""
-
 #: ../fdroidserver/mirror.py
 #, python-brace-format
 msgid "{appid} is missing {name}"
 msgstr ""
 
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "{appid}: Unknown extlib {path} in build '{versionName}'"
@@ -2565,7 +2619,7 @@ msgstr ""
 
 #: ../fdroidserver/metadata.py
 #, python-brace-format
-msgid "{build_flag} must be list or string, found: {value}"
+msgid "{field} not terminated in {name}"
 msgstr ""
 
 #: ../fdroidserver/metadata.py
@@ -2575,15 +2629,10 @@ msgstr ""
 
 #: ../fdroidserver/update.py
 #, python-brace-format
-msgid "{name} \"{section}/icons/{path}\" does not exist! Check \"config.yml\"."
+msgid "{name} \"{path}\" does not exist! Correct it in config.py."
 msgstr ""
 
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{path1} is a duplicate of {path2}, remove one!"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 #, python-brace-format
 msgid "{path} already exists, ignoring import results!"
 msgstr ""
@@ -2598,36 +2647,6 @@ msgstr ""
 msgid "{path} has bad file signature \"{pattern}\", possible Janus exploit!"
 msgstr ""
 
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "{path} has been flagged by virustotal {count} times:"
-msgstr ""
-
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "{path} has the wrong fingerprint ({fingerprint})!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "{path} is not \"key: value\" dict, but a {datatype}!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, fuzzy, python-brace-format
-msgid "{path} is not a standard config file!"
-msgstr "'sdk_path' belum diatur di config.yml!"
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "{path} is not list, but a {datatype}!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "{path} is not {expected_type}, but a {datatype}!"
-msgstr ""
-
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "{path} is zero size!"
@@ -2638,22 +2657,12 @@ msgstr ""
 msgid "{path} more than 200MB, manually upload: {url}"
 msgstr ""
 
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "{path}: \"{code}\" is not a valid ISO_3166-1 alpha-2 country code!"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{path}: {error}"
-msgstr ""
-
 #: ../fdroidserver/mirror.py
 #, python-brace-format
 msgid "{url} does not end with \"fdroid\", check the URL path!"
 msgstr ""
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/common.py
 #, python-brace-format
 msgid "{url} does not start with \"http\"!"
 msgstr ""
diff --git a/locale/it/LC_MESSAGES/fdroidserver.po b/locale/it/LC_MESSAGES/fdroidserver.po
index 5117e2d4..cc3d4a79 100644
--- a/locale/it/LC_MESSAGES/fdroidserver.po
+++ b/locale/it/LC_MESSAGES/fdroidserver.po
@@ -1,37 +1,48 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# random r <epsilin@yopmail.com>, 2020, 2022, 2023.
+# random r <epsilin@yopmail.com>, 2020.
 # Luca Zambarda <luke.zambarda@gmail.com>, 2020.
-# IvanDan <ivandanza@gmail.com>, 2020, 2021.
+# IvanDan <ivandanza@gmail.com>, 2020.
 # Massimiliano Caniparoli <massic80@gmail.com>, 2020.
-# x <hardwired1.0@protonmail.com>, 2020, 2021.
-# Hans-Christoph Steiner <hans@guardianproject.info>, 2020, 2024.
-# Francesco Saltori <francescosaltori@gmail.com>, 2020.
-# Francesco Esposito <email@francescoesposito.org>, 2021.
-# mondstern <mondstern@snopyta.org>, 2021.
-# Frankie McEyes <mceyes@protonmail.com>, 2022.
-# Antonello Pirina <fardeledge@tutanota.com>, 2022.
-# Pixel-Tux <luis.pardus@gmail.com>, 2023.
-# Davide Neri <davnerix@gmail.com>, 2023.
-# Mirko Di <mirko@mirkodi.eu>, 2023.
-# coronabond <coronabond@airmail.cc>, 2023.
-# Random <random-r@users.noreply.hosted.weblate.org>, 2023, 2024.
-# Champ0999 <champ0999@users.noreply.hosted.weblate.org>, 2025.
 msgid ""
 msgstr ""
 "Project-Id-Version: fdroidserver 0.9\n"
 "Report-Msgid-Bugs-To: https://gitlab.com/fdroid/fdroidserver/issues\n"
-"POT-Creation-Date: 2025-06-25 09:52+0200\n"
-"PO-Revision-Date: 2025-03-20 16:21+0000\n"
-"Last-Translator: Champ0999 <champ0999@users.noreply.hosted.weblate.org>\n"
+"POT-Creation-Date: 2020-10-21 18:05+0200\n"
+"PO-Revision-Date: 2020-10-15 17:12+0000\n"
+"Last-Translator: IvanDan <ivandanza@gmail.com>\n"
 "Language-Team: Italian <https://hosted.weblate.org/projects/f-droid/fdroidserver/it/>\n"
 "Language: it\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 5.11-dev\n"
+"X-Generator: Weblate 4.3-dev\n"
+
+#: ../fdroidserver/common.py
+msgid ""
+"\n"
+"        This is a repository of apps to be used with FDroid. Applications in this\n"
+"        repository are either official binaries built by the original application\n"
+"        developers, or are binaries built from source by f-droid.org using the\n"
+"        tools on https://gitlab.com/fdroid.\n"
+"        "
+msgstr ""
+"\n"
+"        Questo è un repository di app da  usare con FDroid. Le applicazioni in questo\n"
+"        repository sono binari ufficiali compilati dagli sviluppatori originali \n"
+"        dell'applicazione, oppure sono binari compilati dai sorgenti da f-droid.org\n"
+"         usando i tool su https://gitlab.com/fdroid.\n"
+"        "
+
+#: ../fdroidserver/nightly.py
+msgid ""
+"\n"
+"SSH Public Key to be used as Deploy Key:"
+msgstr ""
+"\n"
+"Chiave pubblica SSH da usare come chiave di deploy:"
 
 #: ../fdroidserver/nightly.py
 msgid ""
@@ -53,28 +64,24 @@ msgstr ""
 #: ../fdroidserver/lint.py
 #, python-format
 msgid "\"%s/\" has no matching metadata file!"
-msgstr "\"%s/\" non ha un file di metadati corrispondente!"
-
-#: ../fdroidserver/index.py
-msgid "\"isPrimary\" key should not be added to mirrors!"
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "\"local_copy_dir\" {path} does not exist!"
-msgstr "La directory principale per \"local_copy_dir\" {path} non esiste!"
+msgstr "\"%s/\" non ha un file di metadata corrispondente!"
 
 #: ../fdroidserver/install.py
 #, python-brace-format
 msgid "\"{apkfilename}\" is already installed on {dev}."
 msgstr "\"{apkfilename}\" è già installato su {dev}."
 
+#: ../fdroidserver/update.py
+#, python-brace-format
+msgid "\"{path}\" contains outdated {name} ({version})"
+msgstr "\"{path}\" contiene {name} obsoleto ({version})"
+
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "\"{path}\" contains recent {name} ({version})"
 msgstr "\"{path}\" contiene {name} recente ({version})"
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "\"{path}\" exists but s3cmd is not installed!"
 msgstr "\"{path}\" esiste ma s3cmd non è installato!"
@@ -84,84 +91,119 @@ msgstr "\"{path}\" esiste ma s3cmd non è installato!"
 msgid "\"{path}\" is not a supported file format (use: metadata/*.yml)"
 msgstr "\"{path}\" non è un formato accettato (usa: metadata/*.yml)"
 
-#: ../fdroidserver/update.py
+#: ../fdroidserver/metadata.py
 #, python-brace-format
-msgid "\"{path}\" is signed by a key that is not allowed:"
-msgstr "\"{path}\" è firmato da una chiave non autorizzata:"
+msgid "\"{path}\" is not an accepted format, convert to: {formats}"
+msgstr "\"{path}\" non è un formato accettato, convertire a: {formats}"
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/common.py
 #, python-brace-format
 msgid "\"{url}\" is not a valid URL!"
 msgstr "\"{url}\" non è un URL valido!"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, python-format
+msgid "%(option)s option requires %(number)d argument"
+msgid_plural "%(option)s option requires %(number)d arguments"
+msgstr[0] "l'opzione %(option)s richiede l'argomento %(number)d"
+msgstr[1] "l'opzione %(option)s richiede gli argomenti %(number)d"
+
+#: ../fdroidserver/mirror.py
+#, python-format
+msgid "%(prog)s [options] url"
+msgstr "%(prog)s [options] url"
+
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "%(prog)s: error: %(message)s\n"
 msgstr "%(prog)s: errore: %(message)s\n"
 
-#: ../fdroidserver/publish.py
-#, python-format
-msgid "%d APKs failed to be signed or verified!"
-msgstr ""
-
 #: ../fdroidserver/scanner.py
 #, python-format
 msgid "%d problems found"
 msgstr "trovati %d problemi"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "%prog [options]"
+msgstr "%prog [opzioni]"
+
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "%r is not callable"
 msgstr "%r non è richiamabile"
 
-#: ../fdroidserver/signindex.py
-#, python-format
-msgid "%s did not produce a dict!"
-msgstr "%s non ha prodotto un dict!"
-
-#: ../fdroidserver/signindex.py
-#, python-format
-msgid "%s has bad SHA-256: %s"
-msgstr "%s ha un SHA-256 errato: %s"
-
 #: ../fdroidserver/lint.py
 #, python-format
 msgid "%s is not an accepted build field"
 msgstr "%s non è un campo di build accettato"
 
-#: ../fdroidserver/common.py
-msgid "'keypass' not found in config.yml!"
-msgstr "\"keypass\" non trovato in config.yml!"
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, python-format
+msgid "%s option does not take a value"
+msgstr "l'opzione %s non accetta un valore"
+
+#: ../fdroidserver/index.py ../fdroidserver/common.py
+msgid "'keypass' not found in config.py!"
+msgstr "\"keypass\" non trovato in config.py!"
 
 #: ../fdroidserver/common.py
 msgid "'keystore' is NONE and 'smartcardoptions' is blank!"
-msgstr "'keystore' è NONE e 'smartcardoptions' è vuoto!"
+msgstr ""
 
-#: ../fdroidserver/common.py
-msgid "'keystore' not found in config.yml!"
-msgstr "\"keystore\" non trovato in config.yml!"
+#: ../fdroidserver/index.py ../fdroidserver/common.py
+msgid "'keystore' not found in config.py!"
+msgstr "\"keystore\" non trovato in config.py!"
 
-#: ../fdroidserver/common.py
-msgid "'keystorepass' not found in config.yml!"
-msgstr "\"keystorepass\" non trovato in config.yml!"
+#: ../fdroidserver/index.py ../fdroidserver/common.py
+msgid "'keystorepass' not found in config.py!"
+msgstr "\"keystorepass\" non trovato in config.py!"
 
-#: ../fdroidserver/common.py
-msgid "'repo_keyalias' not found in config.yml!"
-msgstr "\"repo_keyalias\" non trovato in config.yml!"
+#: ../fdroidserver/index.py ../fdroidserver/common.py
+msgid "'repo_keyalias' not found in config.py!"
+msgstr "\"repo_keyalias\" non trovato in config.py!"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "'required' is an invalid argument for positionals"
 msgstr "\"required\" è un argomento invalido per i posizionali"
 
 #: ../fdroidserver/common.py
-msgid "'sdk_path' not set in config.yml!"
-msgstr "\"sdk_path\" non impostato in config.yml!"
+msgid "'sdk_path' not set in 'config.py'!"
+msgstr "\"sdk_path\" non impostato in \"config.py\"!"
+
+#. Translators: "build-tools" is the file name of a package from
+#. Google, it is part of the Android SDK. So it probably shouldn't be
+#. translated or transliterated.
+#: ../fdroidserver/common.py
+#, python-brace-format
+msgid "'{aapt}' is too old, fdroid requires build-tools-23.0.0 or newer!"
+msgstr "\"{aapt}\" è troppo vecchio, fdroid richiede build-tools-23.0.0 o più recente!"
 
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "'{aapt}' is too old, fdroid requires build-tools-{version} or newer!"
 msgstr "'{aapt}' è troppo vecchio, fdroid richiede build-tools-{version} o più recente!"
 
+#: ../fdroidserver/install.py
+#, python-brace-format
+msgid "'{apkfilename}' is already installed on {dev}."
+msgstr "\"{apkfilename}\" è già installato su {dev}."
+
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "'{field}' in {linedesc} is obsolete, see docs for current fields:"
+msgstr "'{field}' in {linedesc} è obsoleto, leggi la documentazione per i campi attuali:"
+
+#: ../fdroidserver/common.py
+#, python-brace-format
+msgid "'{field}' will be in random order! Use () or [] brackets if order is important!"
+msgstr "\"{field}\" sarà in ordine casuale! Usa le parentesi () o [] se l'ordine è importante!"
+
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "'{path}' failed to execute!"
@@ -169,32 +211,23 @@ msgstr "Esecuzione di \"{path}\" fallita!"
 
 #: ../fdroidserver/metadata.py
 #, python-brace-format
-msgid "'{path}' has invalid format, it should be a dictionary!"
-msgstr "'{path}' ha un formato non valido, dovrebbe essere un dizionario!"
-
-#: ../fdroidserver/lint.py ../fdroidserver/metadata.py
-#, python-brace-format
 msgid "'{value}' is not a valid {field} in {appid}. Regex pattern: {pattern}"
 msgstr "\"{value}\" non è un {field} valido in {appid}. Espressione regolare: {pattern}"
 
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "'{value}' is not a valid {field}, should be {pattern}"
-msgstr "\"{value}\" non è un {field} valido, dovrebbe essere {pattern}"
-
-#: ../fdroidserver/checkupdates.py
-msgid "--merge-request only runs on a single appid!"
-msgstr ""
-
 #: ../fdroidserver/checkupdates.py
 #, python-brace-format
 msgid "...checkupdate failed for {appid} : {error}"
 msgstr "...checkupdate fallito per {appid}:{error}"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid ".__call__() not defined"
 msgstr ".__call__() non definita"
 
+#: ../fdroidserver/metadata.py
+msgid ".fdroid.txt is not supported!  Convert to .fdroid.yml or .fdroid.json."
+msgstr ".fdroid.txt non è supportato!  Converti in .fdroid.yml o .fdroid.json."
+
 #: ../fdroidserver/lint.py
 msgid "/issues is missing"
 msgstr "/issues è mancante"
@@ -203,15 +236,14 @@ msgstr "/issues è mancante"
 msgid "A URL is required as an argument!"
 msgstr "È richiesto un URL come argomento!"
 
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "APK signatures have different certificates in {path}:"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Add PGP signatures using GnuPG for packages in repo"
 msgstr "Aggiungi firme PGP con GnuPG per i pacchetti in un repository"
 
+#: ../fdroid ../fdroidserver/__main__.py
+msgid "Add a new application from its source code"
+msgstr "Aggiungi una nuova applicazione dal suo codice sorgente"
+
 #: ../fdroidserver/update.py
 msgid "Add a repo signing key to an unsigned repo"
 msgstr "Aggiungi una chiave di firma ad un repository non firmato"
@@ -229,11 +261,7 @@ msgstr "Aggiungendo un repository solo per {name}"
 msgid "Alias of the repo signing key in the keystore"
 msgstr "Alias della chiave di firma del repository nel keystore"
 
-#: ../fdroidserver/build.py
-msgid "AllowedAPKSigningKeys missing but reference binary supplied"
-msgstr "AllowedAPKSigningKeys mancante ma il riferimento binario è stato fornito"
-
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "Allows a different revision (or git branch) to be specified for the initial import"
 msgstr "Permetti di specificare una revisione (o branch git) diversa per l'importazione iniziale"
 
@@ -247,20 +275,24 @@ msgstr "Avvisa anche dei problemi di formattazione, come rewritemeta -l"
 
 #: ../fdroidserver/scanner.py
 msgid "Android AAR library"
-msgstr "Libreria Android AAR"
+msgstr ""
 
 #: ../fdroidserver/scanner.py
 msgid "Android APK file"
-msgstr "File APK per Android"
+msgstr ""
 
 #: ../fdroidserver/scanner.py
 msgid "Android DEX code"
 msgstr "Codice DEX Android"
 
-#: ../fdroidserver/init.py
+#: ../fdroidserver/common.py ../fdroidserver/build.py
 #, python-brace-format
-msgid "Android SDK not found at {path}!"
-msgstr "Android SDK non trovato in {path}!"
+msgid "Android SDK '{path}' does not have '{dirname}' installed!"
+msgstr "\"{path}\" dell'Android SDK non ha \"{dirname}\" installato!"
+
+#: ../fdroidserver/common.py
+msgid "Android SDK not found!"
+msgstr "Android SDK non trovato!"
 
 #: ../fdroidserver/common.py
 #, python-brace-format
@@ -272,29 +304,23 @@ msgstr "Il path di Android SDK \"{path}\" non esiste!"
 msgid "Android SDK path '{path}' is not a directory!"
 msgstr "Il path di Android SDK \"{path}\" non è una directory!"
 
+#. Translators: "build-tools" is the file name of a package from
+#. Google, it is part of the Android SDK. So it probably shouldn't be
+#. translated or transliterated.
 #: ../fdroidserver/common.py
 #, python-brace-format
-msgid "Android SDK tool {cmd} not found!"
-msgstr "Strumento Android SDK {cmd} non trovato!"
+msgid "Android build-tools path '{path}' does not exist!"
+msgstr "Il path di Android build-tools \"{path}\" non esiste!"
 
-#: ../fdroidserver/lint.py
-msgid "App has Binaries but does not have corresponding AllowedAPKSigningKeys to pin certificate."
-msgstr "L'app ha Binaries ma non ha AllowedAPKSigningKeys corrispondente per fissare il certificato."
-
-#: ../fdroidserver/lint.py
-#, fuzzy
-msgid "App has NoSourceSince or ArchivePolicy \"0 versions\" or 0 but AutoUpdateMode or UpdateCheckMode are not None"
-msgstr "L'app ha NoSourceSince o ArchivePolicy \"0 versioni\" ma AutoUpdateMode o UpdateCheckMode non sono None"
+#: ../fdroidserver/update.py
+msgid "AndroidManifest.xml has no date"
+msgstr "AndroidManifest.xml non ha una data"
 
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "App is in '{repo}' but has a link to {url}"
 msgstr "L'app è in \"{repo}\" ma ha un collegamento a {url}"
 
-#: ../fdroidserver/lint.py
-msgid "App version has binary but does not have corresponding AllowedAPKSigningKeys to pin certificate."
-msgstr "La versione dell'app ha il file binario ma non ha un AllowedAPKSigningKeys corrispondente per fissare il certificato."
-
 #: ../fdroidserver/lint.py
 msgid "Appending .git is not necessary"
 msgstr "Non è necessario aggiungere \".git\""
@@ -304,27 +330,11 @@ msgstr "Non è necessario aggiungere \".git\""
 msgid "Archiving {apkfilename} with invalid signature!"
 msgstr "Archiviando {apkfilename} con una firma invalida!"
 
-#: ../fdroidserver/lint.py
-msgid "AutoUpdateMode with UpdateCheckMode: HTTP must have a pattern."
-msgstr "AutoUpdateMode con UpdateCheckMode: HTTP deve avere uno schema."
-
-#: ../fdroidserver/install.py
-msgid "Automatic no to all prompts."
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "Automatic yes to all prompts."
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "Bad entry type \"{mirrortype}\" in mirrors config: {mirror}"
-msgstr "Tipo di voce \"{mirrortype}\" errato nella configurazione dei mirror: {mirror}"
-
 #: ../fdroidserver/mirror.py
 msgid "Base URL to mirror, can include the index signing key using the query string: ?fingerprint="
 msgstr "Indirizzo URL base per il mirror, può includere la chiave di firma dell'indice utilizzando la query string: ?fingerprint="
 
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "Branch '{branch}' used as commit in build '{versionName}'"
@@ -338,9 +348,9 @@ msgstr "Branch \"{branch}\" usata come commit in srclib \"{srclib}\""
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Broken symlink: {path}"
-msgstr "Collegamento simbolico orfano: {path}"
+msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Build a package from source"
 msgstr "Costruisci un pacchetto dai sorgenti"
 
@@ -354,76 +364,93 @@ msgstr "Build generata da \"froid import\" - rimuovi disable line quando ha fini
 
 #: ../fdroidserver/checkupdates.py
 msgid "Build metadata git repo has uncommited changes!"
-msgstr "Il repository git dei metadati di compilazione ha modifiche non autorizzate!"
+msgstr ""
 
 #: ../fdroidserver/build.py
 msgid "Build only the latest version of each package"
 msgstr "Costruisci solo l'ultima versione di ciascun pacchetto"
 
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Build should have comma-separated versionName and versionCode, not \"{value}\", in {linedesc}"
+msgstr "La build dovrebbe avere versionName e versionCode separati da una virgola in {linedesc}, non \"{value}\""
+
 #: ../fdroidserver/init.py
 #, python-format
 msgid "Built repo based in \"%s\" with this config:"
 msgstr "Costruito il repository in \"%s\" con questa configurazione:"
 
-#: ../fdroidserver/checkupdates.py
-msgid "Can't auto-update app with no CurrentVersionCode"
-msgstr "Impossibile aggiornare automaticamente app prive del CurrentVersionCode"
-
 #: ../fdroidserver/build.py
 msgid "Can't build due to {} error while scanning"
 msgid_plural "Can't build due to {} errors while scanning"
 msgstr[0] "Impossibile costruire a causa di un errore con {} durante la scansione"
 msgstr[1] "Impossibile costruire a causa di errori con {} durante la scansione"
 
-#: ../fdroidserver/common.py
-#, fuzzy, python-brace-format
-msgid "Cannot read {path}: {error}"
-msgstr "Impossibile leggere {path}: {error}"
+#: ../fdroidserver/vmtools.py
+#, python-brace-format
+msgid "Cannot read \"{path}\"!"
+msgstr "Impossibile leggere \"{path}\"!"
+
+#. Translators: https://developer.android.com/studio/build/application-id
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Cannot resolve application ID {appid}"
+msgstr "Impossibile trovare l’ID dell’applicazione {appid}"
 
 #: ../fdroidserver/rewritemeta.py
 #, python-brace-format
 msgid "Cannot rewrite \"{path}\""
 msgstr "Impossibile riscrivere \"{path}\""
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
+#: ../fdroidserver/rewritemeta.py
+msgid "Cannot use --list and --to at the same time"
+msgstr "Impossibile usare --list e --to contemporaneamente"
+
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Cannot write \"{path}\", not an accepted format, use: {formats}"
+msgstr "Impossibile scrivere su \"{path}\", formato non accettato, usare: {formats}"
+
 #: ../fdroidserver/lint.py
 #, python-format
 msgid "Categories '%s' is not valid"
 msgstr "La categoria \"%s\" non è valida"
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
 #: ../fdroidserver/lint.py
 msgid "Categories are not set"
 msgstr "Le categorie non sono impostate"
 
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "Category \"{category}\" defined but not used for any apps!"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Check for updates to applications"
 msgstr "Cerca gli aggiornamenti delle applicazioni"
 
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Checking archiving for {appid} - apks:{integer}, keepversions:{keep}, archapks:{arch}"
-msgstr "Controllo dell'archiviazione per {appid} - apks:{integer}, keepversions:{keep}, archapks:{arch}"
+msgstr "Controllando l'archiviazione per {appid} - apk:{integer}, keepversions:{keep}, archapks:{arch}"
+
+#: ../fdroidserver/dscanner.py
+msgid "Clean after all scans have finished"
+msgstr "Pulisci dopo aver terminato le scansioni"
+
+#: ../fdroidserver/dscanner.py
+msgid "Clean before the scans start and rebuild the container"
+msgstr "Pulisci prima delle scansioni e ricostruisci il container"
+
+#: ../fdroidserver/dscanner.py
+msgid "Clean up all containers and then exit"
+msgstr "Pulisci tutti i container ed esci"
 
 #: ../fdroidserver/update.py
 msgid "Clean update - don't uses caches, reprocess all APKs"
 msgstr "Aggiornamento pulito - non usa cache, riprocessa tutti gli APK"
 
-#: ../fdroidserver/common.py
-msgid "Color the log output"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "Comma separated list of categories."
 msgstr "Lista di categorie separate da una virgola."
 
-#: ../fdroidserver/__main__.py
-#, python-format
+#: ../fdroid ../fdroidserver/__main__.py
+#, c-format, python-format
 msgid "Command '%s' not recognised.\n"
 msgstr "Comando \"%s\" non riconosciuto.\n"
 
@@ -431,15 +458,6 @@ msgstr "Comando \"%s\" non riconosciuto.\n"
 msgid "Commit changes"
 msgstr "Cambiamenti del commit"
 
-#: ../fdroidserver/checkupdates.py
-msgid "Commit changes, push, then make a merge request"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Conflicting \"{field}\" definitions between .yml and localized files:"
-msgstr "Definizioni \"{field}\" in conflitto tra .yml e file localizzati:"
-
 #: ../fdroidserver/__main__.py
 msgid "Conflicting arguments: '--verbose' and '--quiet' can not be specified at the same time."
 msgstr "Argomenti in conflitto: '--verbose' e '--quiet' non possono essere specificati contemporaneamente."
@@ -449,15 +467,15 @@ msgstr "Argomenti in conflitto: '--verbose' e '--quiet' non possono essere speci
 msgid "Could not find '{command}' on your system"
 msgstr "Impossibile trovare \"{command}\" sul tuo sistema"
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
+#, fuzzy
 msgid "Could not find latest version code"
-msgstr "Impossibile trovare il codice della versione più recente"
+msgstr "Impossibile trovare il codice dell'ultima versione"
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
+#, fuzzy
 msgid "Could not find latest version name"
-msgstr "Impossibile trovare il nome della versione più recente"
+msgstr "Impossibile trovare il nome dell'ultima versione"
 
 #: ../fdroidserver/update.py
 #, python-brace-format
@@ -465,25 +483,31 @@ msgid "Could not find {path} to remove it"
 msgstr "Impossibile trovare {path} da rimuovere"
 
 #: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Could not open APK {path} for analysis: "
-msgstr "Impossibile aprire il file APK {path} per l'analisi: "
+msgid "Could not open apk file for analysis"
+msgstr "Impossibile aprire il file apk per l'analisi"
 
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "Could not parse size \"{size}\", wrong type \"{type}\""
-msgstr "Impossibile analizzare la dimensione \"{size}\", tipo sbagliato \"{type}\""
+msgstr ""
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/import_subcommand.py
+#. Translators: https://developer.android.com/studio/build/application-id
+#: ../fdroidserver/import.py
+#, fuzzy
 msgid "Couldn't find Application ID"
-msgstr "Impossibile trovare l'ID dell'applicazione"
+msgstr "Impossibile trovare l'ID del pacchetto"
 
-#: ../fdroidserver/checkupdates.py
-msgid "Couldn't find any version information"
-msgstr "Impossibile trovare informazioni sulla versione"
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
+#: ../fdroidserver/import.py
+msgid "Couldn't find latest version code"
+msgstr "Impossibile trovare il codice dell'ultima versione"
 
-#: ../fdroidserver/checkupdates.py
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
+#: ../fdroidserver/import.py
+msgid "Couldn't find latest version name"
+msgstr "Impossibile trovare il nome dell'ultima versione"
+
+#: ../fdroidserver/import.py
 msgid "Couldn't find package ID"
 msgstr "Impossibile trovare l'ID del pacchetto"
 
@@ -491,26 +515,29 @@ msgstr "Impossibile trovare l'ID del pacchetto"
 msgid "Cowardily refusing to overwrite existing signing key setup!"
 msgstr "Mi rifiuto di sovrascrivere il setup della chiave di firma già esistente!"
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/update.py
+msgid "Create a repo signing key in a keystore"
+msgstr "Crea una chiave di firma del repository in un keystore"
+
+#: ../fdroidserver/update.py
+msgid "Create skeleton metadata files that are missing"
+msgstr "Crea i file scheletro di metadata che mancano"
+
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Created new container \"{name}\""
 msgstr "Nuovo container \"{name}\" creato"
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Creating \"{path}\" for configuring s3cmd."
 msgstr "Creazione \"{path}\" per configurazione s3cmd."
 
-#: ../fdroidserver/common.py
-#, fuzzy, python-brace-format
-msgid "Creating empty {config_file}"
-msgstr "Lettura di '{config_file}'"
-
 #: ../fdroidserver/publish.py
 msgid "Creating log directory"
 msgstr "Creazione della directory dei log"
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Creating new S3 bucket: {url}"
 msgstr "Creazione di un nuovo bucket S3: {url}"
@@ -523,7 +550,8 @@ msgstr "Creazione della directory di output"
 msgid "Creating signed index with this key (SHA256):"
 msgstr "Creazione di un indice firmato con questa chiave (SHA256):"
 
-#: ../fdroidserver/publish.py ../fdroidserver/verify.py
+#: ../fdroidserver/import.py ../fdroidserver/verify.py
+#: ../fdroidserver/publish.py
 msgid "Creating temporary directory"
 msgstr "Creazione della directory temporanea"
 
@@ -534,7 +562,7 @@ msgstr "Creazione dell'indice non firmato in preparazione della firma"
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "CurrentVersionCode {cv} is less than oldest build entry {versionCode}"
-msgstr "CurrentVersionCode {cv} è inferiore alla voce di build più vecchia {versionCode}"
+msgstr ""
 
 #: ../fdroidserver/nightly.py
 msgid "DEBUG_KEYSTORE is not set or the value is incomplete"
@@ -542,17 +570,17 @@ msgstr "DEBUG_KEYSTORE non impostato o il valore è incompleto"
 
 #: ../fdroidserver/update.py
 msgid "Delete APKs and/or OBBs without metadata from the repo"
-msgstr "Cancella gli APK e/o OBB senza metadati dal repository"
+msgstr "Cancella gli APK e/o OBB senza metadata dal repository"
 
 #: ../fdroidserver/deploy.py
 #, python-brace-format
 msgid "Deleting archive, repo is too big ({size} max {limit})"
-msgstr "Eliminazione dell'archivio, il repository è troppo grande ({size} max {limit})"
+msgstr ""
 
 #: ../fdroidserver/deploy.py
 #, python-brace-format
 msgid "Deleting git-mirror history, repo is too big ({size} max {limit})"
-msgstr "Eliminazione della cronologia git-mirror, il repository è troppo grande ({size} max {limit})"
+msgstr ""
 
 #: ../fdroidserver/update.py
 #, python-brace-format
@@ -568,24 +596,19 @@ msgstr "La descrizione \"%s\" è solo il riassunto dell'app"
 msgid "Description has a duplicate line"
 msgstr "La descrizione ha una riga duplicata"
 
+#: ../fdroidserver/lint.py
+#, python-format
+msgid "Description has a list (%s) but it isn't bulleted (*) nor numbered (#)"
+msgstr "La descrizione ha un elenco (%s) ma non è puntato (*) né numerato (#)"
+
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "Description of length {length} is over the {limit} char limit"
 msgstr "La descrizione di lunghezza {length} supera il limite di {limit} caratteri"
 
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Did you mean config/{name}.yml?"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Did you mean {code}?"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "Do not add 'disable:' to the generated build entries"
-msgstr "Non aggiungere 'disable:' alle voci di compilazione generate"
+msgstr ""
 
 #: ../fdroidserver/nightly.py
 msgid "Do not deploy the new files to the repo"
@@ -608,21 +631,26 @@ msgstr "Non rimuovere le chiavi private generate dal keystore"
 msgid "Don't create a source tarball, useful when testing a build"
 msgstr "Non creare un tarball sorgente, utile per testare una build"
 
+#: ../fdroidserver/stats.py
+msgid "Don't do anything logs-related"
+msgstr "Non fare niente sui log"
+
 #: ../fdroidserver/build.py
 msgid "Don't refresh the repository, useful when testing a build with no internet connection"
 msgstr "Non aggiornare il repository, utile per testare una build offline"
 
 #: ../fdroidserver/deploy.py ../fdroidserver/nightly.py
+#: ../fdroidserver/upload.py
 msgid "Don't use rsync checksums"
 msgstr "Non usare checksum rsync"
 
-#: ../fdroidserver/install.py
-msgid "Download F-Droid.apk using mirrors that leak less to the network"
+#: ../fdroid ../fdroidserver/__main__.py
+msgid "Download complete mirrors of small repos"
 msgstr ""
 
-#: ../fdroidserver/__main__.py
-msgid "Download complete mirrors of small repos"
-msgstr "Scarica mirror completi di piccoli repository"
+#: ../fdroidserver/stats.py
+msgid "Download logs we don't have"
+msgstr "Scarica registri che non abbiamo"
 
 #: ../fdroidserver/common.py
 msgid "Downloading the repository already failed once, not trying again."
@@ -635,61 +663,43 @@ msgstr "Scaricamento di {url} fallito. {error}"
 
 #: ../fdroidserver/metadata.py
 #, python-brace-format
-msgid "Duplicate Anti-Feature declaration at {path} was ignored!"
-msgstr "La dichiarazione di Anti-Feature duplicata in {path} è stata ignorata!"
-
-#: ../fdroidserver/index.py
-#, python-format
-msgid "Duplicate entry \"%s\" in mirrors config!"
-msgstr "Voce \"%s\" duplicata nella configurazione dei mirror!"
+msgid "Duplicate build recipe found for versionCode {versionCode} in {linedesc}"
+msgstr "Trovata ricetta di costruzione duplicata per versionCode {versionCode} in {linedesc}"
 
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "Duplicate link in '{field}': {url}"
 msgstr "Link duplicato in '{field}': {url}"
 
-#: ../fdroidserver/common.py
-#, python-format
-msgid "ERROR: %(message)s"
-msgstr "ERRORE: %(message)s"
+#: ../fdroid
+msgid "Dynamically scan APKs post build"
+msgstr "Scansiona gli APK dinamicamente dopo la costruzione"
 
 #: ../fdroidserver/__main__.py
 msgid "ERROR: The \"server\" subcommand has been removed, use \"deploy\"!"
-msgstr "ERRORE: il sottocomando \"server\" è stato rimosso, usa \"deploy\"!"
+msgstr ""
+
+#: ../fdroidserver/mirror.py
+msgid ""
+"ERROR: this command should never be used to mirror f-droid.org!\n"
+"A full mirror of f-droid.org requires more than 200GB."
+msgstr ""
+"ERRORE: questo comando non deve mai essere utilizzato per il mirror f-droid.org!\n"
+"L’intero mirror di f-droid.org richiede più di 200GB."
 
 #: ../fdroidserver/nightly.py
 msgid "ERROR: unsupported CI type, patches welcome!"
-msgstr "ERRORE: tipo di CI non supportato, le patch sono benvenute!"
-
-#: ../fdroidserver/nightly.py
-#, python-format
-msgid "ERROR: unsupported git host \"%s\", patches welcome!"
-msgstr "ERRORE: host git \"%s\" non supportato, le patch sono benvenute!"
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "ERROR: {key} in {path} is not \"archive\" or \"repo\"!"
 msgstr ""
 
-#: ../fdroidserver/lint.py
+#: ../fdroidserver/metadata.py
 #, python-brace-format
-msgid "ERROR: {key} not a valid key!"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "ERROR: {key}'s value should be of type {t}!"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "ERROR: {key}:{subkey} in {path} is not in allowed keys: {allowed_keys}!"
-msgstr ""
+msgid "Empty build flag at {linedesc}"
+msgstr "Flag build vuoto a {linedesc}"
 
 #: ../fdroidserver/__main__.py
 #, python-brace-format
 msgid "Encoding is set to '{enc}' fdroid might run into encoding issues. Please set it to 'UTF-8' for best results."
-msgstr "La codifica è impostata su \"{enc}\" fdroid potrebbe incorrere in problemi di codifica. Impostalo su \"UTF-8\" per ottenere i migliori risultati."
+msgstr ""
 
 #: ../fdroidserver/init.py
 #, python-format
@@ -700,44 +710,24 @@ msgstr ""
 "Inserisci qui il percorso dell'Android SDK (%s):\n"
 "> "
 
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Environment variable {var} from {configname} is not set!"
-msgstr "La variabile d'ambiente {var} da {configname} non è impostata!"
+#: ../fdroidserver/deploy.py ../fdroidserver/checkupdates.py
+#: ../fdroidserver/upload.py
+#, python-format
+msgid "Error while attempting to publish log: %s"
+msgstr "Errore tentando di pubblicare il log: %s"
 
-#: ../fdroidserver/common.py
-#, fuzzy, python-brace-format
-msgid "Environment variable {{env: {var}}} is not set!"
-msgstr "La variabile d'ambiente {var} da {configname} non è impostata!"
-
-#: ../fdroidserver/deploy.py
-msgid "Error deploying 'github_releases', {} not present. (You might need to run `fdroid update` first.)"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py ../fdroidserver/common.py
 msgid "Error while getting repo address"
 msgstr "Errore nell'ottenere l'indirizzo del repo"
 
-#: ../fdroidserver/scanner.py
-msgid "Exit with a non-zero code if problems were found"
-msgstr "Esci con un codice diverso da zero se sono stati rilevati problemi"
-
-#: ../fdroidserver/__main__.py
-msgid "Extract application metadata from a source repository"
-msgstr "Estrarre i metadati dell'applicazione da una repository di origine"
-
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Extract signatures from APKs"
 msgstr "Estrai le firme dagli APK"
 
-#: ../fdroidserver/install.py
-msgid "F-Droid.apk could not be downloaded from any known source!"
-msgstr ""
-
 #: ../fdroidserver/update.py
-#, python-brace-format
+#, fuzzy, python-brace-format
 msgid "Failed copying {path}: {error}"
-msgstr "Copia non riuscita {path}: {error}"
+msgstr "Impossibile leggere {path}: {error}"
 
 #: ../fdroidserver/signatures.py
 #, python-brace-format
@@ -754,265 +744,266 @@ msgstr "Impossibile leggere {path}: {error}"
 msgid "Failed resizing {path}: {error}"
 msgstr "Impossibile ridimensionare {path}: {error}"
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/publish.py
+msgid "Failed to align application"
+msgstr "Impossibile allineare l’applicazione"
+
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Failed to create S3 bucket: {url}"
 msgstr "Impossibile creare il bucket S3: {url}"
 
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Failed to get APK information, deleting {path}"
-msgstr "Impossibile ottenere informazioni dell’APK, eliminando {path}"
+#: ../fdroidserver/common.py
+msgid "Failed to get APK manifest information"
+msgstr "Impossibile ottenere informazioni del manifest dell’APK"
 
 #: ../fdroidserver/update.py
 #, python-brace-format
-msgid "Failed to get APK information, skipping {path}"
-msgstr "Impossibile ottenere informazioni dell’APK, saltando {path}"
+msgid "Failed to get apk information, deleting {path}"
+msgstr "Impossibile ottenere informazioni dell’apk, eliminando {path}"
 
 #: ../fdroidserver/update.py
-msgid "Failed to get APK signing key fingerprint"
-msgstr "Impossibile ottenere l'impronta digitale della chiave di firma del pacchetto APK"
+#, python-brace-format
+msgid "Failed to get apk information, skipping {path}"
+msgstr "Impossibile ottenere informazioni dell’apk, saltando {path}"
 
 #: ../fdroidserver/install.py
 #, python-brace-format
 msgid "Failed to install '{apkfilename}' on {dev}: {error}"
 msgstr "Impossibile installare '{apkfilename}' su {dev}: {error}"
 
-#: ../fdroidserver/common.py
+#: ../fdroidserver/publish.py ../fdroidserver/common.py
 msgid "Failed to sign application"
-msgstr "Impossibile firmare l'applicazione"
+msgstr ""
+
+#: ../fdroidserver/common.py
+msgid "Failed to zipalign application"
+msgstr ""
 
 #: ../fdroidserver/build.py
 #, python-brace-format
 msgid "Fetched buildserverid from VM: {buildserverid}"
-msgstr "Buildserverid recuperato dalla VM: {buildserverid}"
+msgstr ""
 
 #: ../fdroidserver/signatures.py
 #, python-brace-format
 msgid "Fetched signatures for '{apkfilename}' -> '{sigdir}'"
-msgstr "Firme recuperate per \"{apkfilename}\" -> \"{sigdir}\""
+msgstr ""
 
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "File disappeared while processing it: {path}"
-msgstr "Il file è scomparso durante l'elaborazione: {path}"
+msgstr ""
 
-#: ../fdroidserver/build.py ../fdroidserver/install.py
-#: ../fdroidserver/rewritemeta.py ../fdroidserver/scanner.py
-#: ../fdroidserver/update.py
+#: ../fdroidserver/verify.py ../fdroidserver/stats.py ../fdroidserver/update.py
+#: ../fdroidserver/rewritemeta.py ../fdroidserver/build.py
+#: ../fdroidserver/checkupdates.py ../fdroidserver/scanner.py
+#: ../fdroidserver/install.py
 msgid "Finished"
-msgstr "Finito"
+msgstr ""
+
+#: ../fdroidserver/lint.py
+msgid "Flattr donation methods belong in the FlattrID flag"
+msgstr ""
+
+#: ../fdroidserver/lint.py
+msgid "Flattr donation methods belong in the FlattrID: field"
+msgstr ""
 
 #: ../fdroidserver/lint.py
 msgid "Forbidden HTML tags"
-msgstr "Tag HTML vietati"
+msgstr ""
 
 #: ../fdroidserver/build.py
 msgid "Force build of disabled apps, and carries on regardless of scan problems. Only allowed in test mode."
-msgstr "Forza la compilazione delle app disabilitate e prosegui indipendentemente dai problemi di scansione. Consentito solo in modalità test."
+msgstr ""
 
 #: ../fdroidserver/build.py
 #, python-brace-format
 msgid "Force halting build after {0} sec timeout!"
-msgstr "Forza l'arresto della compilazione dopo il timeout di {0} sec!"
+msgstr ""
 
 #: ../fdroidserver/scanner.py
 msgid "Force scan of disabled apps and builds."
-msgstr "Forza la scansione di app e build disabilitate."
+msgstr ""
 
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Found \"{path}\" graphic without metadata for app \"{name}\"!"
-msgstr "Trovato l'elemento grafico \"{path}\" senza metadati per l'app \"{name}\"!"
+msgstr ""
 
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Found bad funding file \"{path}\" for \"{name}\":"
-msgstr "Trovato file di finanziamento non valido \"{path}\" per \"{name}\":"
+msgstr ""
 
 #: ../fdroidserver/common.py
 msgid "Found invalid appids in arguments"
-msgstr "Trovati appid non validi negli argomenti"
+msgstr ""
 
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
 #: ../fdroidserver/common.py
 msgid "Found invalid versionCodes for some apps"
-msgstr "Trovati codici di versione non validi per alcune app"
+msgstr ""
 
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "Found multiple JAR Signature Block Files in {path}"
-msgstr "Trovati più file di blocco della firma JAR in {path}"
-
-#: ../fdroidserver/common.py
-msgid "Found multiple Signer Certificates!"
-msgstr "Trovati più certificati di firma per il repository!"
+msgstr ""
 
 #: ../fdroidserver/metadata.py
 #, python-brace-format
 msgid "Found multiple metadata files for {appid}"
-msgstr "Trovati più file di metadati per {appid}"
+msgstr ""
 
 #: ../fdroidserver/index.py
 msgid "Found multiple signing certificates for repository."
-msgstr "Trovati più certificati di firma per il repository."
+msgstr ""
+
+#: ../fdroidserver/update.py
+#, python-brace-format
+msgid "Found multiple signing certificates in {path}"
+msgstr ""
 
 #: ../fdroidserver/index.py
 msgid "Found no signing certificates for repository."
-msgstr "Nessun certificato di firma trovato per il repository."
+msgstr ""
 
 #: ../fdroidserver/lint.py
 #, python-format
 msgid "Found non-file at %s"
-msgstr "Trovato non-file in %s"
+msgstr ""
 
 #: ../fdroidserver/deploy.py
 #, python-brace-format
 msgid "Found {apkfilename} at {url}"
-msgstr "Trovato {apkfilename} in {url}"
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Found {count} problems in {filename}"
-msgstr "Trovati {count} problemi in {filename}"
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Found {count} warnings in {filename}"
-msgstr "Trovati {count} avvisi in {filename}"
+msgstr ""
 
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Generated skeleton metadata for {appid}"
-msgstr "Metadati dello scheletro generati per {appid}"
+msgstr ""
 
 #: ../fdroidserver/common.py
 #, python-format
 msgid "Git checkout of '%s' failed"
-msgstr "Checkout Git di \"%s\" non riuscito"
+msgstr ""
 
 #: ../fdroidserver/common.py
 msgid "Git clean failed"
-msgstr "Git clean non riuscito"
+msgstr ""
 
 #: ../fdroidserver/common.py
 msgid "Git fetch failed"
-msgstr "Recupero Git non riuscito"
+msgstr ""
+
+#: ../fdroidserver/common.py
+msgid "Git remote set-head failed"
+msgstr ""
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
 #: ../fdroidserver/common.py
 #, python-format
 msgid "Git remote set-head failed: \"%s\""
-msgstr "Set-head remoto Git non riuscito: \"%s\""
+msgstr ""
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
 #: ../fdroidserver/common.py
 msgid "Git reset failed"
-msgstr "Ripristino Git non riuscito"
-
-#: ../fdroidserver/common.py
-#, fuzzy
-msgid "Git submodule deinit failed"
-msgstr "Aggiornamento del sottomodulo Git non riuscito"
+msgstr ""
 
 #: ../fdroidserver/common.py
 msgid "Git submodule sync failed"
-msgstr "Sincronizzazione del sottomodulo Git non riuscita"
+msgstr ""
 
 #: ../fdroidserver/common.py
 msgid "Git submodule update failed"
-msgstr "Aggiornamento del sottomodulo Git non riuscito"
+msgstr ""
 
 #: ../fdroidserver/common.py
 msgid "HTTPS must be used with Subversion URLs!"
-msgstr "HTTPS deve essere utilizzato con gli URL Subversion!"
+msgstr ""
 
 #: ../fdroidserver/deploy.py
 msgid "If a git mirror gets to big, allow the archive to be deleted"
-msgstr "Se un mirror git diventa troppo grande, consenti l'eliminazione dell'archivio"
+msgstr ""
 
 #: ../fdroidserver/deploy.py
 #, python-brace-format
 msgid "If this upload fails, try manually uploading to {url}"
-msgstr "Se il caricamento non riesce, prova a caricare manualmente su {url}"
+msgstr ""
 
 #: ../fdroidserver/metadata.py
 #, python-brace-format
 msgid "Ignoring '{field}' in '{metapath}' metadata because it is deprecated."
-msgstr "Ignorando i metadati '{field}' in '{metapath}' perché obsoleti."
+msgstr ""
 
 #: ../fdroidserver/update.py
 #, python-format
 msgid "Ignoring FUNDING.yml entry longer than 2048: %s"
-msgstr "Ignorando la voce FUNDING.yml più lunga di 2048: %s"
-
-#: ../fdroidserver/update.py
-#, python-format
-msgid "Ignoring bad element in manifest: %s"
-msgstr "Ignorato elemento errato nel manifest: %s"
-
-#: ../fdroidserver/common.py
-#, fuzzy, python-brace-format
-msgid "Ignoring deprecated {oldfile}, use {newfile}!"
-msgstr "{oldfile} è deprecato, usa {newfile}"
+msgstr ""
 
 #: ../fdroidserver/index.py
 msgid "Ignoring package without metadata: "
-msgstr "Ignorare il pacchetto senza metadati: "
+msgstr ""
 
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Ignoring stale cache data for {apkfilename}"
-msgstr "Ignorare i dati della cache obsoleti per {apkfilename}"
+msgstr ""
+
+#: ../fdroidserver/rewritemeta.py
+#, python-brace-format
+msgid "Ignoring {ext} file at '{path}'"
+msgstr ""
 
 #: ../fdroidserver/update.py
 msgid "Include APKs that are signed with disabled algorithms like MD5"
-msgstr "Includere gli APK firmati con algoritmi disabilitati come MD5"
+msgstr ""
 
 #: ../fdroidserver/mirror.py
 msgid "Include the PGP signature .asc files in the mirror"
-msgstr "Includere i file .asc della firma PGP nel mirror"
+msgstr ""
 
 #: ../fdroidserver/mirror.py
 msgid "Include the build logs in the mirror"
-msgstr "Includere i log di build nel mirror"
+msgstr ""
 
 #: ../fdroidserver/mirror.py
 msgid "Include the source tarballs in the mirror"
-msgstr "Includere i tarball dei sorgenti nel mirror"
-
-#: ../fdroidserver/metadata.py
-#, python-format
-msgid "Including metadata from %s@%s"
-msgstr "Includo metadati da %s@%s"
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Including metadata from {path}"
-msgstr "Includo metadati da {path}"
+msgstr ""
 
 #: ../fdroidserver/common.py
 msgid "Initialising submodules"
-msgstr "Inizializzazione dei sottomoduli"
+msgstr ""
 
 #: ../fdroidserver/install.py
 msgid "Install all signed applications available"
-msgstr "Installa tutte le applicazioni firmate disponibili"
+msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Install built packages on devices"
 msgstr "Installa i pacchetti costruiti su dispositivi"
 
 #: ../fdroidserver/install.py
 #, python-format
 msgid "Installing %s..."
-msgstr "Installando %s..."
+msgstr ""
+
+#: ../fdroidserver/install.py
+#, python-format
+msgid "Installing %s…"
+msgstr ""
 
 #: ../fdroidserver/install.py
 #, python-brace-format
 msgid "Installing '{apkfilename}' on {dev}..."
 msgstr "Installazione di '{apkfilename}' su {dev}..."
 
-#: ../fdroidserver/__main__.py
+#: ../fdroidserver/install.py
+#, python-brace-format
+msgid "Installing '{apkfilename}' on {dev}…"
+msgstr ""
+
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Interact with the repo HTTP server"
 msgstr "Interagisci col server HTTP del repository"
 
@@ -1020,50 +1011,67 @@ msgstr "Interagisci col server HTTP del repository"
 msgid "Invalid APK"
 msgstr "APK non valido"
 
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "Invalid AutoUpdateMode: {mode}"
-msgstr "Modalità di aggiornamento automatico non valida: {mode}"
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "Invalid UpdateCheckMode: {mode}"
-msgstr "Modalità di controllo aggiornamento non valida: {mode}"
-
-#: ../fdroidserver/checkupdates.py
+#: ../fdroidserver/lint.py ../fdroidserver/checkupdates.py
 #, python-brace-format
 msgid "Invalid VercodeOperation: {field}"
-msgstr "VercodeOperation non valido: {field}"
+msgstr ""
 
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Invalid VercodeOperation: {invalid_ops}"
-msgstr "VercodeOperation non valido: {invalid_ops}"
-
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "Invalid application ID {appid}"
-msgstr "ID applicazione non valida {appid}"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+#, python-format
+msgid "Invalid boolean '%s'"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Invalid build flag at {line} in {linedesc}"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Invalid build format: {value} in {name}"
+msgstr ""
 
 #: ../fdroidserver/lint.py
 msgid "Invalid bulleted list"
-msgstr "Elenco puntato non valido"
+msgstr ""
+
+#: ../fdroidserver/lint.py
+#, python-format
+msgid "Invalid license tag \"%s\"! Use only tags from https://spdx.org/license-list"
+msgstr ""
+
+#: ../fdroidserver/lint.py
+msgid "Invalid link - use [http://foo.bar Link title] or [http://foo.bar]"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+#, python-format
+msgid "Invalid metadata in %s:%d"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+msgid "Invalid metadata in: "
+msgstr ""
 
 #: ../fdroidserver/common.py
 #, python-format
 msgid "Invalid name for published file: %s"
-msgstr "Nome non valido per il file pubblicato: %s"
+msgstr ""
 
 #: ../fdroidserver/common.py
 #, python-brace-format
-msgid "Invalid ndk: entry in build: \"{ndk}\""
-msgstr "nkd non valido: entry nella compilazione: \"{ndk}\""
+msgid "Invalid package name {0}"
+msgstr ""
 
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "Invalid redirect to non-HTTPS: {before} -> {after} "
-msgstr "Reindirizzamento non valido a non HTTPS: {before} -> {after} "
+msgstr ""
 
 #: ../fdroidserver/metadata.py
 #, python-brace-format
@@ -1073,445 +1081,420 @@ msgstr "Metadati scrlib non validi: '{file}' non esiste"
 #: ../fdroidserver/metadata.py
 #, python-brace-format
 msgid "Invalid srclib metadata: could not parse '{file}'"
-msgstr "Metadati srclib non validi: impossibile analizzare '{file}'"
+msgstr ""
 
 #: ../fdroidserver/metadata.py
 #, python-brace-format
 msgid "Invalid srclib metadata: unknown key '{key}' in '{file}'"
-msgstr "Metadati srclib non validi: chiave sconosciuta '{key}' in '{file}'"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Invalid versionCode: \"{versionCode}\" is not an integer!"
+msgstr ""
 
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "JAR signature failed to verify: {path}"
-msgstr "Impossibile verificare la firma JAR: {path}"
+msgstr ""
 
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "JAR signature verified: {path}"
-msgstr "Firma JAR verificata: {path}"
+msgstr ""
 
 #: ../fdroidserver/scanner.py
 msgid "Java JAR file"
-msgstr "File JAR Java"
+msgstr ""
 
-#: ../fdroidserver/mirror.py ../fdroidserver/publish.py
-#: ../fdroidserver/update.py
+#: ../fdroidserver/publish.py ../fdroidserver/update.py
+#: ../fdroidserver/mirror.py
 msgid "Java JDK not found! Install in standard location or set java_paths!"
-msgstr "Java JDK non trovato! Installa nella posizione standard o imposta java_paths!"
+msgstr ""
 
 #: ../fdroidserver/scanner.py
 msgid "Java compiled class"
-msgstr "Classe compilata in Java"
+msgstr ""
 
 #: ../fdroidserver/signindex.py
 msgid "Java jarsigner not found! Install in standard location or set java_paths!"
-msgstr "Java jarsigner non trovato! Installa nella posizione standard o imposta java_paths!"
+msgstr ""
 
 #: ../fdroidserver/lint.py
 msgid "Javascript in HTML src attributes"
-msgstr "Javascript negli attributi HTML src"
-
-#: ../fdroidserver/build.py
-#, python-brace-format
-msgid "Keeping failed build \"{apkfilename}\""
-msgstr "Mantenimento della build fallita \"{apkfilename}\""
+msgstr ""
 
 #: ../fdroidserver/init.py
 msgid "Keystore for signing key:\t"
-msgstr "Keystore per la firma della chiave:\t"
-
-#: ../fdroidserver/lint.py
-msgid "Known debug key is used in AllowedAPKSigningKeys: "
 msgstr ""
 
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "Last used commit '{commit}' looks like a tag, but UpdateCheckMode is '{ucm}'"
-msgstr "L'ultimo commit utilizzato '{commit}' sembra un tag, ma UpdateCheckMode è '{ucm}'"
+msgstr ""
 
 #: ../fdroidserver/lint.py
 msgid "Liberapay donation methods belong in the Liberapay: field"
-msgstr "I metodi di donazione di Liberapay appartengono al campo Liberapay"
+msgstr ""
+
+#: ../fdroidserver/lint.py
+msgid "Liberapay donation methods belong in the LiberapayID flag"
+msgstr ""
 
 #: ../fdroidserver/rewritemeta.py
-msgid "List files that would be reformatted (dry run)"
-msgstr "Elenca i file che verrebbero riformattati (simulazione)"
+msgid "List files that would be reformatted"
+msgstr ""
 
 #: ../fdroidserver/lint.py
 msgid "Locale included in f-droid.org URL"
-msgstr "Locale incluso in f-droid.org URL"
+msgstr ""
 
 #: ../fdroidserver/build.py
 msgid "Make the build stop on exceptions"
-msgstr "Interrompere la compilazione sulle eccezioni"
+msgstr ""
 
 #: ../fdroidserver/index.py
 msgid "Malformed repository mirrors."
-msgstr "Mirror del repository malformati."
+msgstr ""
 
 #: ../fdroidserver/deploy.py
 msgid "Malformed serverwebroot line:"
-msgstr "Riga del serverwebroot malformata:"
-
-#: ../fdroidserver/scanner.py
-#, python-format
-msgid "Max recursion depth in ZIP file reached: %s"
-msgstr "Raggiunta la massima profondità di ricorsione nel file ZIP: %s"
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "Mirror config for {url} contains \"isPrimary\" key!"
 msgstr ""
 
 #: ../fdroidserver/mirror.py
 msgid "Mirror the full repo and archive, all file types."
-msgstr "Rispecchiare il repository completo e l'archivio, tutti i tipi di file."
+msgstr ""
 
 #: ../fdroidserver/gpgsign.py
 msgid "Missing output directory"
-msgstr "Directory di output mancante"
+msgstr ""
 
-#: ../fdroidserver/metadata.py
-msgid "Moving Anti-Features declarations to localized files:"
-msgstr "Spostamento delle dichiarazioni di Anti-Features nei file localizzati:"
-
-#: ../fdroidserver/index.py
-msgid "Neither \"repo_pubkey\" nor \"keystorepass\" set in config.yml"
-msgstr "Né \"repo_pubkey\" o \"keystorepass\" sono stati impostati in config.yml"
-
-#: ../fdroidserver/verify.py
+#: ../fdroidserver/lint.py
 #, python-format
-msgid "No APK for package: %s"
-msgstr "Nessun APK per il pacchetto: %s"
+msgid "Name '%s' is just the auto name - remove it"
+msgstr ""
+
+#: ../fdroidserver/common.py
+msgid "No 'config.py' found, using defaults."
+msgstr ""
 
 #: ../fdroidserver/common.py
 msgid "No Android SDK found!"
 msgstr "Android SDK non trovato!"
 
+#: ../fdroidserver/import.py
+msgid "No android or kivy project could be found. Specify --subdir?"
+msgstr ""
+
 #: ../fdroidserver/install.py
 msgid "No attached devices found"
 msgstr "Nessun dispositivo collegato trovato"
 
-#: ../fdroidserver/install.py
-msgid "No devices found for `adb install`! Please plug one in."
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "No commit specified for {versionName} in {linedesc}"
 msgstr ""
 
 #: ../fdroidserver/index.py
 msgid "No fingerprint in URL."
-msgstr "Nessuna impronta digitale nell'URL."
+msgstr ""
 
 #: ../fdroidserver/common.py
 msgid "No git submodules available"
-msgstr "Nessun sottomodulo git disponibile"
+msgstr ""
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "No gradle project could be found. Specify --subdir?"
-msgstr "Nessun progetto gradle è stato trovato. Specificare --subdir?"
+msgstr ""
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py ../fdroidserver/common.py
 msgid "No information found."
 msgstr "Nessun informazione trovata."
 
-#: ../fdroidserver/checkupdates.py
-msgid "No matching tags found"
-msgstr "Nessuna etichetta corrispondente trovata"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "No minimum SDK version found in {0}, using default (3)."
-msgstr "Nessuna versione minima dell'SDK trovata in {0}, viene usata la predefinita (3)."
-
 #: ../fdroidserver/lint.py
 msgid "No need to specify that the app is Free Software"
-msgstr "Non è necessario specificare che l'app è un Software Libero"
+msgstr ""
 
 #: ../fdroidserver/lint.py
 msgid "No need to specify that the app is for Android"
 msgstr "Non c'è bisogno di specificare che l'applicazione è per Android"
 
 #: ../fdroidserver/deploy.py
-msgid "No option set! Edit your config.yml to set at least one of these:"
-msgstr "Nessuna opzione impostata! Modifica il tuo config.yml per impostare almeno uno di questi:"
+msgid "No option set! Edit your config.py to set at least one of these:"
+msgstr ""
 
 #: ../fdroidserver/common.py
 msgid "No packages specified"
-msgstr "Nessun pacchetto specificato"
+msgstr ""
 
 #: ../fdroidserver/install.py
 #, python-format
-msgid "No signed APK available for %s"
-msgstr "Nessun APK firmato disponibile per %s"
+msgid "No signed apk available for %s"
+msgstr ""
 
 #: ../fdroidserver/install.py
 msgid "No signed output directory - nothing to do"
-msgstr "Nessuna directory di output firmata - niente da fare"
+msgstr ""
 
-#: ../fdroidserver/common.py
+#: ../fdroidserver/update.py ../fdroidserver/common.py
 #, python-brace-format
 msgid "No signing certificates found in {path}"
-msgstr "Nessun certificato di firma trovato in {path}"
+msgstr ""
 
 #: ../fdroidserver/common.py
 #, python-format
 msgid "No such package: %s"
-msgstr "Nessun pacchetto di questo tipo: %s"
+msgstr ""
 
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "No such versionCode {versionCode} for app {appid}"
-msgstr "Nessun versionCode di questo tipo {versionCode} per l'app {appid}"
+msgstr ""
 
-#: ../fdroidserver/checkupdates.py
-msgid "No tags found"
-msgstr "Nessuna etichetta trovata"
-
-#: ../fdroidserver/publish.py ../fdroidserver/verify.py
+#: ../fdroidserver/verify.py ../fdroidserver/publish.py
 msgid "No unsigned directory - nothing to do"
-msgstr "Nessuna directory non firmata - niente da fare"
-
-#: ../fdroidserver/__main__.py
-msgid "No version information could be found."
-msgstr "Nessuna informazione sulla versione trovata."
+msgstr ""
 
 #: ../fdroidserver/common.py
 msgid "Not a valid size definition: \"{}\""
-msgstr "Definizione di dimensione non valida: \"{}\""
+msgstr ""
 
 #: ../fdroidserver/signindex.py
 msgid "Nothing to do"
-msgstr "Niente da fare"
+msgstr ""
 
 #: ../fdroidserver/checkupdates.py
 #, python-brace-format
 msgid "Nothing to do for {appid}."
-msgstr "Niente da fare per {appid}."
+msgstr ""
 
 #: ../fdroidserver/init.py
-msgid "Now set these in config.yml:"
-msgstr "Ora imposta i seguenti campi in config.yml:"
+msgid "Now set these in config.py:"
+msgstr "Ora imposta i seguenti campi in config.py:"
 
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "OBB file has newer versionCode({integer}) than any APK:"
-msgstr "Il file OBB ha un versionCode più recente ({integer}) di qualsiasi APK:"
+msgstr ""
 
 #: ../fdroidserver/update.py
 msgid "OBB filename must start with \"main.\" or \"patch.\":"
-msgstr "Il nome del file OBB deve iniziare con \"main.\" o \"patch.\":"
+msgstr ""
 
 #: ../fdroidserver/update.py
 msgid "OBB's packagename does not match a supported APK:"
-msgstr "Il nome del pacchetto di OBB non corrisponde a un APK supportato:"
+msgstr ""
 
 #: ../fdroidserver/deploy.py
 msgid "Offline machine, skipping git mirror generation until `fdroid deploy`"
-msgstr "Macchina offline, saltando la generazione del mirror git fino a quando `fdroid deploy`"
-
-#: ../fdroidserver/deploy.py
-msgid "One of the 'github_releases' config items is missing the 'packageNames' value. skipping ..."
 msgstr ""
 
-#: ../fdroidserver/deploy.py
-msgid "One of the 'github_releases' config items is missing the 'projectUrl' value. skipping ..."
+#: ../fdroidserver/common.py
+#, python-brace-format
+msgid "Old APK signature failed to verify: {path}"
 msgstr ""
 
-#: ../fdroidserver/deploy.py
-msgid "One of the 'github_releases' config items is missing the 'token' value. skipping ..."
+#: ../fdroid ../fdroidserver/__main__.py
+msgid "Old, deprecated name for fdroid deploy"
 msgstr ""
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Only PNG and JPEG are supported for graphics, found: {path}"
-msgstr "Solo PNG e JPEG sono supportati per la grafica, trovati: {path}"
+msgstr ""
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/common.py
-msgid "Only accepts a single key \"env\""
+#: ../fdroidserver/checkupdates.py
+msgid "Only print differences with the Play Store"
 msgstr ""
 
 #: ../fdroidserver/checkupdates.py
 msgid "Only process apps with auto-updates"
-msgstr "Elabora solo app con aggiornamenti automatici"
+msgstr ""
 
 #: ../fdroidserver/lint.py
 msgid "OpenCollective donation methods belong in the OpenCollective: field"
-msgstr "I metodi di donazione di OpenCollective appartengono al campo OpenCollective"
+msgstr ""
+
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "Options"
+msgstr "Opzioni"
 
 #: ../fdroidserver/verify.py
 msgid "Output JSON report to file named after APK."
-msgstr "Rapporto di uscita JSON al file chiamato dopo APK."
+msgstr ""
 
 #: ../fdroidserver/scanner.py
 msgid "Output JSON to stdout."
-msgstr "Invia l'output del JSON allo stdout."
+msgstr ""
 
-#: ../fdroidserver/checkupdates.py ../fdroidserver/gpgsign.py
-#: ../fdroidserver/publish.py ../fdroidserver/signindex.py
-#: ../fdroidserver/update.py
+#: ../fdroidserver/gpgsign.py ../fdroidserver/publish.py
+#: ../fdroidserver/update.py ../fdroidserver/signindex.py
+#: ../fdroidserver/checkupdates.py
 msgid "Outputting JSON"
-msgstr "Output di JSON"
+msgstr ""
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "Overall license of the project."
-msgstr "Licenza generale del progetto."
+msgstr ""
+
+#: ../fdroidserver/dscanner.py
+msgid "Override path for repo APKs (default: ./repo)"
+msgstr ""
 
 #: ../fdroidserver/index.py
 #, python-brace-format
 msgid "Overriding blank versionName in {apkfilename} from metadata: {version}"
-msgstr "Sostituzione di versionName vuoto in {apkfilename} dai metadati: {version}"
+msgstr ""
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 #, python-brace-format
 msgid "Package \"{appid}\" already exists"
-msgstr "Pacchetto \"{appid}\" già esistente"
+msgstr ""
 
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "Parsing manifest at '{path}'"
-msgstr "Analisi del manifesto in '{path}'"
+msgstr ""
 
 #: ../fdroidserver/common.py
 msgid "Password required with username"
-msgstr "Password richiesta con nome utente"
+msgstr ""
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "Path to main Android project subdirectory, if not in root."
-msgstr "Percorso alla sottodirectory principale del progetto Android, se non in root."
+msgstr ""
+
+msgid "Path to main android project subdirectory, if not in root."
+msgstr ""
 
 #: ../fdroidserver/init.py
 msgid "Path to the Android SDK (sometimes set in ANDROID_HOME)"
-msgstr "Percorso per l'SDK Android (a volte impostato in ANDROID_HOME)"
+msgstr ""
 
 #: ../fdroidserver/btlog.py
 msgid "Path to the git repo to use as the log"
-msgstr "Percorso del repository git da utilizzare come registro"
+msgstr ""
 
 #: ../fdroidserver/init.py
 msgid "Path to the keystore for the repo signing key"
-msgstr "Percorso del keystore per la chiave di firma del repository"
+msgstr ""
+
+#: ../fdroidserver/dscanner.py
+msgid "Prepare Drozer to run a scan"
+msgstr ""
+
+msgid "Prepare drozer to run a scan"
+msgstr "Preparare drozer per eseguire una scansione"
 
 #: ../fdroidserver/nightly.py
 msgid "Print the secret variable to the terminal for easy copy/paste"
-msgstr "Stampa la variabile segreta sul terminale per un facile copia/incolla"
-
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "Privacy mode was enabled based on your locale ({country_code})."
 msgstr ""
 
-#: ../fdroidserver/scanner.py
-#, python-format
-msgid "Problem with ZIP file: %s, error %s"
-msgstr "Problema con il file ZIP: %s, errore %s"
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Problem with description of {appid}: {error}"
+msgstr ""
 
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "Problem with xml at '{path}'"
-msgstr "Problema con xml in '{path}'"
+msgstr ""
 
 #: ../fdroidserver/checkupdates.py
 msgid "Process auto-updates"
-msgstr "Elabora gli aggiornamenti automatici"
+msgstr ""
 
 #: ../fdroidserver/publish.py ../fdroidserver/update.py
 #, python-brace-format
 msgid "Processing {apkfilename}"
-msgstr "Elaborazione di {apkfilename}"
+msgstr ""
 
 #: ../fdroidserver/checkupdates.py ../fdroidserver/scanner.py
 #, python-brace-format
 msgid "Processing {appid}"
-msgstr "Elaborazione di {appid}"
+msgstr ""
 
 #: ../fdroidserver/update.py
 msgid "Produce human-readable XML/JSON for index files"
-msgstr "Produci XML/JSON leggibili dagli utenti per i file di indice"
+msgstr ""
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/update.py
+msgid "Produce human-readable index.xml"
+msgstr "Produci un index.xml leggibile"
+
+#: ../fdroidserver/import.py
 msgid "Project URL to import from."
-msgstr "URL del progetto da cui importare."
+msgstr ""
 
 #: ../fdroidserver/lint.py
 msgid "Punctuation should be avoided"
-msgstr "La punteggiatura dovrebbe essere evitata"
+msgstr ""
 
 #: ../fdroidserver/btlog.py
 msgid "Push the log to this git remote repository"
-msgstr "Esegui il push del log in questo repository git remoto"
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Pushing binary transparency log to {url}"
-msgstr "Invio del log di trasparenza binaria su {url}"
-
-#: ../fdroidserver/deploy.py
-msgid "Pushing to remote server failed!"
 msgstr ""
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
+#, python-brace-format
+msgid "Pushing binary transparency log to {url}"
+msgstr ""
+
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Pushing to {url}"
-msgstr "Spingere a {url}"
+msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Quickly start a new repository"
 msgstr "Crea velocemente un nuovo repository"
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Read all the metadata files and exit"
-msgstr "Leggi tutti i file di metadati ed esci"
+msgstr "Leggi tutti i file di metadata ed esci"
 
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "Reading '{config_file}'"
-msgstr "Lettura di '{config_file}'"
+msgstr ""
 
+#: ../fdroidserver/common.py
+#, python-brace-format
+msgid "Reading minSdkVersion failed: \"{apkfilename}\""
+msgstr ""
+
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
+#. https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "Reading packageName/versionCode/versionName failed, APK invalid: '{apkfilename}'"
-msgstr "Lettura di packageName/versionCode/ ersionName non riuscita, APK non valido: '{apkfilename}'"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Reading packageName/versionCode/versionName failed,APK invalid: '{apkfilename}'"
-msgstr "Lettura di packageName/versionCode/versionName non riuscita, APK non valido: '{apkfilename}'"
+msgstr ""
 
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Reading {apkfilename} from cache"
-msgstr "Lettura di {apkfilename} dalla cache"
-
-#: ../fdroidserver/build.py
-#, fuzzy
-msgid "Refresh and cache scanner rules and signatures from the network"
-msgstr "recupera l'ultima versione delle firme dal web"
-
-#: ../fdroidserver/publish.py
-#, python-brace-format
-msgid "Refusing to sign '{path}', file exists in both {dir1} and {dir2} folder."
 msgstr ""
 
-#: ../fdroidserver/verify.py
-msgid "Remove source tarball and any APKs if successfully verified."
+#: ../fdroidserver/stats.py
+msgid "Recalculate aggregate stats - use when changes have been made that would invalidate old cached data."
 msgstr ""
 
 #: ../fdroidserver/common.py
 msgid "Removing specified files"
-msgstr "Rimozione dei file specificati"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Removing {path}\""
-msgstr "Rimozione di {path}\""
+msgstr ""
 
 #: ../fdroidserver/update.py
 msgid "Rename APK files that do not match package.name_123.apk"
 msgstr "Rinomina i file APK che non corrispondono a package.name_123.apk"
 
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "RepoType {type} is deprecated, please switch to git."
+#: ../fdroidserver/update.py
+msgid "Report on build data status"
+msgstr ""
+
+#: ../fdroidserver/build.py
+msgid "Reset and create a brand new build server, even if the existing one appears to be ok."
 msgstr ""
 
 #: ../fdroidserver/nightly.py
@@ -1521,173 +1504,169 @@ msgstr "Firmando di nuovo {apkfilename} con il debug.keystore fornito"
 
 #: ../fdroidserver/update.py
 msgid "Resize all the icons exceeding the max pixel size and exit"
-msgstr "Ridimensiona tutte le icone che superano la dimensione massima dei pixel ed esci"
+msgstr ""
 
 #: ../fdroidserver/common.py
 msgid "Restrict output to warnings and errors"
-msgstr "Limita l'output ad avvisi ed errori"
-
-#: ../fdroidserver/net.py
-#, python-format
-msgid "Retrying failed download: %s"
 msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Rewrite all the metadata files"
-msgstr "Riscrivi tutti i file di metadati"
+msgstr "Riscrivi tutti i file di metadata"
+
+#: ../fdroidserver/rewritemeta.py
+msgid "Rewrite to a specific format: "
+msgstr ""
 
 #: ../fdroidserver/rewritemeta.py
 #, python-brace-format
 msgid "Rewriting '{appid}'"
-msgstr "Riscrittura di \"{appid}\""
+msgstr ""
+
+#: ../fdroidserver/rewritemeta.py
+#, python-brace-format
+msgid "Rewriting '{appid}' to '{path}'"
+msgstr ""
 
 #: ../fdroidserver/checkupdates.py
 msgid "Run on git repo that has uncommitted changes"
-msgstr "Esegui su repository git con modifiche non salvate"
-
-#: ../fdroidserver/nightly.py
-#, python-brace-format
-msgid "Run over {cibase} to find -debug.apk. and skip repo_basedir {repo_basedir}"
 msgstr ""
 
 #: ../fdroidserver/lint.py
 msgid "Run rewritemeta to fix formatting"
-msgstr "Esegui rewritemeta per correggere la formattazione"
+msgstr ""
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 msgid "Running first pass with MD5 checking disabled"
-msgstr "Esecuzione del primo passaggio con controllo MD5 disabilitato"
+msgstr ""
 
 #: ../fdroidserver/mirror.py
 #, python-brace-format
 msgid "Running wget in {path}"
-msgstr "Esecuzione di wget in {path}"
+msgstr ""
 
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "SHA-256 of {url} does not match entry!"
-msgstr "Lo SHA-256 di {url} non corrisponde alla voce!"
+#: ../fdroidserver/dscanner.py
+msgid "Scan only the latest version of each package"
+msgstr ""
 
 #: ../fdroidserver/build.py
 msgid "Scan the resulting APK(s) for known non-free classes."
-msgstr "Scansiona gli APK risultanti per le classi non libere note."
+msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Scan the source code of a package"
 msgstr "Scansiona il codice sorgente di un pacchetto"
 
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Scanner found {count} problems in {apk}"
-msgstr "Lo scanner ha trovato {count} problemi in {apk}"
-
 #: ../fdroidserver/scanner.py
 #, python-brace-format
 msgid "Scanner found {count} problems in {appid}:"
-msgstr "Scanner trovato {count} problemi in {appid}:"
+msgstr ""
 
 #: ../fdroidserver/scanner.py
 #, python-brace-format
 msgid "Scanner found {count} problems in {appid}:{versionCode}:"
-msgstr "Scanner trovato {count} problemi in {appid}: {versionCode}:"
+msgstr ""
 
 #: ../fdroidserver/build.py
 msgid "Scanner found {} problem"
 msgid_plural "Scanner found {} problems"
-msgstr[0] "Scanner trovato {} problema"
-msgstr[1] "Scanner trovato {} problemi"
-
-#: ../fdroidserver/scanner.py
-msgid "Scanning APK for extra signing blocks."
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "Scanning APK with dexdump for known non-free classes."
-msgstr "Scansiona gli APK con apkanalyzer per le classi note non libere."
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Set NDK {release} ({version}) up"
-msgstr "Impostare NDK {release} ({version})"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../fdroidserver/common.py
 msgid "Set clock to that time using:"
-msgstr "Imposta l'orologio a quell'ora usando:"
+msgstr ""
 
 #: ../fdroidserver/nightly.py
 msgid "Set maximum releases in repo before older ones are archived"
-msgstr "Imposta le versioni massime in repo prima che quelle più vecchie vengano archiviate"
+msgstr ""
 
 #: ../fdroidserver/build.py
 #, python-brace-format
 msgid "Set open file limit to {integer}"
-msgstr "Imposta il limite di file aperto su {integer}"
+msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Set up an app build for a nightly build repo"
-msgstr "Impostare una build di app per un repository di build notturno"
+msgstr ""
 
 #: ../fdroidserver/build.py
 msgid "Setting open file limit failed: "
-msgstr "Impostazione del limite di file aperto non riuscita: "
+msgstr ""
 
 #: ../fdroidserver/build.py
 #, python-brace-format
 msgid "Setting {0} sec timeout for this build"
-msgstr "Impostazione del timeout {0} sec per questa build"
+msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroidserver/build.py
+msgid "Setup an emulator, install the APK on it and perform a Drozer scan"
+msgstr ""
+
+msgid "Setup an emulator, install the apk on it and perform a drozer scan"
+msgstr ""
+
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Sign and place packages in the repo"
 msgstr "Firma e metti i pacchetti nel repository"
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Sign indexes created using update --nosign"
 msgstr "Firma gli indici creati con update --nosign"
 
 #: ../fdroidserver/build.py
 msgid "Skip scanning the source code for binaries and other problems"
-msgstr "Salta la scansione del codice sorgente per i binari e altri problemi"
+msgstr ""
 
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Skipping '{apkfilename}' with invalid signature!"
-msgstr "Saltare '{apkfilename} con firma non valida!"
-
-#: ../fdroidserver/deploy.py ../fdroidserver/index.py
-#, python-format
-msgid "Skipping GitLab Pages mirror because the repo is too large (>%.2fGB)!"
-msgstr "Saltando il mirror di GitLab Pages perché la repo è troppo grande (>%.2fGB)!"
+msgstr ""
 
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Skipping index generation for {appid}"
-msgstr "Saltare la generazione dell'indice per {appid}"
+msgstr ""
 
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Skipping {apkfilename} with invalid signature!"
-msgstr "Saltare {apkfilename} con firma non valida!"
+msgstr ""
 
 #: ../fdroidserver/scanner.py
 #, python-brace-format
 msgid "Skipping {appid}: disabled"
-msgstr "Saltare {appid}: disabilitato"
+msgstr ""
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/scanner.py
+#, python-brace-format
+msgid "Skipping {appid}: no builds specified"
+msgstr ""
+
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 msgid "Specify a local folder to sync the repo to"
-msgstr "Specificare una cartella locale in cui sincronizzare il repository"
+msgstr ""
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 msgid "Specify an identity file to provide to SSH for rsyncing"
-msgstr "Specificare un file di identità da fornire a SSH per rsyncing"
+msgstr ""
+
+#: ../fdroidserver/build.py
+msgid "Specify that we're running on the build server"
+msgstr ""
 
 #: ../fdroidserver/nightly.py
 msgid "Specify which debug keystore file to use."
-msgstr "Specificare quale file keystore di debug utilizzare."
+msgstr ""
 
 #: ../fdroidserver/common.py
 msgid "Spew out even more information than normal"
-msgstr "Vomitare ancora più informazioni del normale"
+msgstr ""
+
+#: ../fdroidserver/nightly.py
+#, python-brace-format
+msgid "Striping mystery signature from {apkfilename}"
+msgstr ""
 
 #: ../fdroidserver/nightly.py
 #, python-brace-format
@@ -1697,593 +1676,595 @@ msgstr "Riduzione della firma misteriosa da {apkfilename}"
 #: ../fdroidserver/lint.py
 #, python-format
 msgid "Summary '%s' is just the app's name"
-msgstr "Riepilogo \"%s\" è solo il nome dell'app"
+msgstr ""
 
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "Summary of length {length} is over the {limit} char limit"
-msgstr "Riepilogo di length {length} supera il limite di caratteri {limit}"
+msgstr ""
 
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "System clock is older than date in {path}!"
-msgstr "L'orologio di sistema è più vecchio della data in {path}!"
-
-#: ../fdroidserver/checkupdates.py
-msgid "Tags update mode only works for git, hg, bzr and git-svn repositories currently"
-msgstr "La modalità di aggiornamento dei tag attualmente funziona solo per i repository git, hg, bzr e git-svn"
-
-#: ../fdroidserver/checkupdates.py
-msgid "Tags update mode used in git-svn, but the repo was not set up with tags"
-msgstr "Modalità di aggiornamento dei tag utilizzata in git-svn, ma il repo non è stato configurato con i tag"
+msgstr ""
 
 #: ../fdroidserver/build.py
 msgid "Test mode - put output in the tmp directory only, and always build, even if the output already exists."
-msgstr "Modalità test - mette l'output solo nella directory tmp, e costruisce sempre, anche se l'output esiste già."
-
-#: ../fdroidserver/index.py
-msgid "The \"qrcode\" Python package is not installed (e.g. apt-get install python3-qrcode)!"
 msgstr ""
 
 #. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "The OBB version code must come after \"{name}.\":"
-msgstr "Il codice della versione OBB deve venire dopo \"{name}\":"
+msgstr ""
 
 #: ../fdroidserver/btlog.py
 msgid "The base URL for the repo to log (default: https://f-droid.org)"
-msgstr "L'URL di base per il repo da registrare (predefinito: https://f-droid.org)"
+msgstr ""
 
 #: ../fdroidserver/mirror.py
 msgid "The directory to write the mirror to"
-msgstr "La directory in cui scrivere il mirror"
+msgstr ""
 
 #: ../fdroidserver/nightly.py
 msgid "The file to be included in the repo (path or glob)"
-msgstr "Il file da includere nel repo (percorso o glob)"
+msgstr ""
+
+#: ../fdroidserver/deploy.py
+msgid "The only commands currently supported are 'init' and 'update'"
+msgstr ""
 
 #: ../fdroidserver/index.py
 msgid "The repository's fingerprint does not match."
-msgstr "L'impronta digitale del repository non corrisponde."
+msgstr ""
+
+#: ../fdroidserver/common.py
+msgid "The repository's index could not be verified."
+msgstr ""
 
 #: ../fdroidserver/deploy.py
 #, python-brace-format
 msgid "The root dir for local_copy_dir \"{path}\" does not exist!"
-msgstr "La directory principale per local_copy_dir \"{path}\" non esiste!"
+msgstr ""
 
 #: ../fdroidserver/publish.py
 msgid "There is a keyalias collision - publishing halted"
-msgstr "C'è una collisione keyalias - pubblicazione interrotta"
+msgstr ""
 
 #: ../fdroidserver/common.py
 msgid "These are the apps that have been archived from the main repo."
-msgstr "Queste sono le applicazioni che sono state archiviate dal repo principale."
+msgstr ""
 
-#: ../fdroidserver/mirror.py
-#, fuzzy
-msgid "This command should never be used to mirror f-droid.org! A full copy requires more than 600GB."
-msgstr "Questo comando non deve mai essere utilizzato per il mirror f-droid.org! L’intero mirror richiede più di 600GB."
-
-#: ../fdroidserver/common.py
-msgid "This is a repository of apps to be used with F-Droid. Applications in this repository are either official binaries built by the original application developers, or are binaries built from source by the admin of f-droid.org using the tools on https://gitlab.com/fdroid."
-msgstr "Questo è un repository di applicazioni da utilizzare con F-Droid. Le applicazioni in questo repository sono o binari ufficiali compilati dagli sviluppatori dell'applicazione originale, o sono binari compilati dai sorgenti dall'amministratore di f-droid.org usando gli strumenti su https://gitlab.com/fdroid."
-
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 #, python-format
 msgid "This repo already has local metadata: %s"
-msgstr "Questo repo ha già metadati locali: %s"
-
-#: ../fdroidserver/init.py
-#, python-format
-msgid ""
-"To complete the setup, add your APKs to \"%s\"\n"
-"then run \"fdroid update -c; fdroid update\".  You might also want to edit\n"
-"\"config.yml\" to set the URL, repo name, and more.  You should also set up\n"
-"a signing key (a temporary one might have been automatically generated).\n"
-"\n"
-"For more info: https://f-droid.org/docs/Setup_an_F-Droid_App_Repo\n"
-"and https://f-droid.org/docs/Signing_Process"
 msgstr ""
-"Per completare la configurazione, aggiungi i tuoi APKs a \"%s\",\n"
-"poi esegui \"fdroid update -c; fdroid update\".  Puoi anche modificare\n"
-"\"config.yml\" per impostare URL, nome del repo e altro.  Dovresti anche creare\n"
-"una chiave di firma (ne può essere stata generata una temporanea in automatico).\n"
-"\n"
-"Per altre info: https://f-droid.org/docs/Setup_an_F-Droid_App_Repo\n"
-"e https://f-droid.org/docs/Signing_Process"
 
-#: ../fdroidserver/deploy.py
-msgid "To use awsbucket, awssecretkey and awsaccesskeyid must also be set in config.yml!"
-msgstr "Per usare awsbucket, awssecretkey e awsaccesskeyid devono essere impostati anche in config.yml!"
-
-#: ../fdroidserver/deploy.py
-#, fuzzy
-msgid "To use rclone, rclone_config and awsbucket must be set in config.yml!"
-msgstr "Per usare awsbucket, awssecretkey e awsaccesskeyid devono essere impostati anche in config.yml!"
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
+msgid "To use awsbucket, awssecretkey and awsaccesskeyid must also be set in config.py!"
+msgstr ""
 
 #: ../fdroidserver/lint.py
 msgid "URL must start with https:// or http://"
-msgstr "L'URL deve iniziare con https:// o http://"
+msgstr ""
 
 #: ../fdroidserver/lint.py
 msgid "URL shorteners should not be used"
-msgstr "Gli accorciatori di URL non dovrebbero essere usati"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+msgid "URL title is just the URL, use brackets: [URL]"
+msgstr ""
 
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "URL {url} in Description: {error}"
-msgstr "URL {url} in Descrizione: {error}"
+msgstr ""
 
 #: ../fdroidserver/lint.py
 msgid "Unexpected license tag \"{}\"! Only use FSF or OSI approved tags from https://spdx.org/license-list"
-msgstr "Tag di licenza inaspettato \"{}\"! Usare solo tag approvati da FSF o OSI da https://spdx.org/license-list"
+msgstr ""
 
 #: ../fdroidserver/lint.py
 msgid "Unexpected license tag \"{}\"! Only use license tags configured in your config file"
-msgstr "Tag di licenza inaspettato \"{}\"! Usa solo i tag di licenza configurati nel tuo file di configurazione"
+msgstr ""
 
-#: ../fdroidserver/common.py
+#: ../fdroidserver/metadata.py
 #, python-brace-format
-msgid "Unknown entry {key} in {configname}"
-msgstr "Voce sconosciuta {key} in {configname}"
+msgid "Unexpected text on same line as {field} in {linedesc}"
+msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Unknown exception found!"
 msgstr "Eccezione sconosciuta trovata!"
 
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "Unknown file '{filename}' in build '{versionName}'"
-msgstr "File sconosciuto '{filename}' nella build '{versionName}'"
+msgstr ""
 
 #: ../fdroidserver/metadata.py
 #, python-format
 msgid "Unknown metadata format: %s"
-msgstr "Formato di metadati sconosciuto: %s"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Unknown metadata format: {path}"
+msgstr ""
 
 #: ../fdroidserver/metadata.py
 #, python-brace-format
 msgid "Unknown metadata format: {path} (use: *.yml)"
-msgstr "Formato dei metadati sconosciuto: {path} (usa: *.yml)"
+msgstr ""
 
 #: ../fdroidserver/common.py
 msgid "Unknown version of aapt, might cause problems: "
-msgstr "Versione sconosciuta di aapt, potrebbe causare problemi: "
+msgstr ""
+
+#: ../fdroidserver/lint.py
+msgid "Unlinkified link - use [http://foo.bar Link title] or [http://foo.bar]"
+msgstr ""
 
 #: ../fdroidserver/lint.py
 msgid "Unnecessary leading space"
-msgstr "Spazio iniziale non necessario"
+msgstr ""
 
 #: ../fdroidserver/lint.py
 msgid "Unnecessary trailing space"
-msgstr "Spazio finale non necessario"
+msgstr ""
 
 #: ../fdroidserver/metadata.py
 #, python-brace-format
 msgid "Unrecognised app field '{fieldname}' in '{path}'"
-msgstr "Campo dell'app non riconosciuto '{fieldname}' in '{path}'"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+msgid "Unrecognised app field: "
+msgstr ""
 
 #: ../fdroidserver/metadata.py
 #, python-brace-format
 msgid "Unrecognised build flag '{build_flag}' in '{path}'"
-msgstr "Flag di costruzione non riconosciuto '{build_flag}' in '{path}'"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Unrecognised field '{field}' in {linedesc}"
+msgstr ""
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Unsupported file type \"{extension}\" for repo graphic"
-msgstr "Tipo di file non supportato \"{extension}\" per la grafica del repo"
+msgstr ""
 
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Unsupported graphics file found: {path}"
-msgstr "Trovato un file grafico non supportato: {path}"
+msgstr ""
+
+#: ../fdroidserver/rewritemeta.py
+#, python-brace-format
+msgid "Unsupported metadata format, use: --to [{supported}]"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+msgid "Unterminated ]"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+msgid "Unterminated ]]"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Unterminated build in {name}"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Unterminated continuation in {name}"
+msgstr ""
 
 #: ../fdroidserver/lint.py
 #, python-format
 msgid "Unused extlib at %s"
-msgstr "Extlib inutilizzata a %s"
+msgstr ""
 
 #: ../fdroidserver/lint.py
 #, python-format
 msgid "Unused file at %s"
-msgstr "File inutilizzato a %s"
+msgstr ""
 
 #: ../fdroidserver/scanner.py
 #, python-format
 msgid "Unused scandelete path: %s"
-msgstr "Percorso scandelete non utilizzato: %s"
+msgstr ""
 
 #: ../fdroidserver/scanner.py
 #, python-format
 msgid "Unused scanignore path: %s"
-msgstr "Percorso scanignore non utilizzato: %s"
+msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Update repo information for new packages"
 msgstr "Aggiorna le informazioni del repository coi nuovi pacchetti"
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Update the binary transparency log for a URL"
 msgstr "Aggiorna il log di trasparenza binario con un nuovo URL"
 
+#: ../fdroid ../fdroidserver/__main__.py
+msgid "Update the stats of the repo"
+msgstr "Aggiorna le statistiche del repo"
+
+#: ../fdroidserver/update.py ../fdroidserver/build.py
+msgid "Update the wiki"
+msgstr ""
+
 #: ../fdroidserver/checkupdates.py
 #, python-brace-format
 msgid "UpdateCheckData has invalid URL: {url}"
-msgstr "UpdateCheckData ha un URL non valido: {url}"
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "UpdateCheckData must match the version code as integer (\\d or [0-9]): {codeex}"
-msgstr "UpdateCheckData deve corrispondere al codice di versione come intero (\\d o [0-9]): {codeex}"
+msgstr ""
 
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "UpdateCheckData must use HTTPS URL: {url}"
-msgstr "UpdateCheckData deve usare l'URL HTTPS: {url}"
+msgstr ""
 
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "UpdateCheckData not a valid URL: {url}"
-msgstr "UpdateCheckData non è un URL valido: {url}"
+msgstr ""
 
 #: ../fdroidserver/lint.py
-msgid "UpdateCheckMode is set but it looks like checkupdates hasn't been run yet."
-msgstr "UpdateCheckMode impostato ma sembra che checkupdates non sia ancora stato eseguito."
+msgid "UpdateCheckMode is set but it looks like checkupdates hasn't been run yet"
+msgstr ""
+
+#. Translators: https://developer.android.com/studio/build/application-id
+#: ../fdroidserver/lint.py
+msgid "UpdateCheckName is set to the known application ID - it can be removed"
+msgstr ""
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
 #: ../fdroidserver/lint.py
 msgid "UpdateCheckName is set to the known application ID, it can be removed"
-msgstr "UpdateCheckName è impostato sull'ID dell'applicazione nota, può essere rimosso"
+msgstr ""
 
 #: ../fdroidserver/deploy.py
 #, python-brace-format
 msgid "Uploading {apkfilename} to androidobservatory.org"
-msgstr "Caricamento di {apkfilename} su androidobservatory.org"
+msgstr ""
 
 #: ../fdroidserver/deploy.py
 #, python-brace-format
 msgid "Uploading {apkfilename} to virustotal"
-msgstr "Caricamento di {apkfilename} su virustotal"
+msgstr ""
+
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "Usage"
+msgstr "Utilizzo"
+
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, python-format
+msgid "Usage: %s\n"
+msgstr "Utilizzo: %s\n"
 
 #: ../fdroidserver/lint.py
-#, fuzzy
-msgid "Use /HEAD instead of /master or /main to point at a file in the default branch"
-msgstr "Usare /HEAD invece di /master per puntare a un file nel ramo predefinito"
+msgid "Use /HEAD instead of /master to point at a file in the default branch"
+msgstr ""
 
 #: ../fdroidserver/update.py
 msgid "Use `fdroid update -c` to create it."
-msgstr "Usa `fdroid update -c` per crearlo."
+msgstr ""
 
 #: ../fdroidserver/build.py
 msgid "Use build server"
-msgstr "Utilizzare il build server"
+msgstr ""
 
 #: ../fdroidserver/update.py
 msgid "Use date from APK instead of current time for newly added APKs"
-msgstr "Usa la data dell'APK invece dell'ora corrente per gli APK aggiunti di recente"
+msgstr ""
 
-#: ../fdroidserver/deploy.py
+msgid "Use date from apk instead of current time for newly added apks"
+msgstr ""
+
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Using \"{path}\" for configuring s3cmd."
-msgstr "Usare \"{path}\" per configurare s3cmd."
-
-#: ../fdroidserver/deploy.py
-#, fuzzy, python-brace-format
-msgid "Using \"{path}\" for syncing with remote storage."
-msgstr "Usare \"{path}\" per configurare s3cmd."
+msgstr ""
 
 #: ../fdroidserver/common.py
 msgid "Using APK Signature v2"
-msgstr "Usare la firma APK v2"
+msgstr ""
 
 #: ../fdroidserver/common.py
 msgid "Using APK Signature v3"
-msgstr "Usare la firma APK v3"
-
-#: ../fdroidserver/common.py
-#, fuzzy
-msgid "Using JAR Signature"
-msgstr "Usare la firma APK v2"
+msgstr ""
 
 #: ../fdroidserver/common.py
 msgid "Using Java's jarsigner, not recommended for verifying APKs! Use apksigner"
-msgstr "Utilizzando jarsigner di Java, non raccomandato per verificare APK! Utilizzare apksigner"
+msgstr ""
 
-#: ../fdroidserver/metadata.py
+#: ../fdroidserver/common.py
 #, python-brace-format
-msgid "Using blank dictionary instead of contents of {path}!"
-msgstr "Utilizzo di un dizionario vuoto al posto del contenuto di {path}!"
+msgid "Using androguard from \"{path}\""
+msgstr ""
 
 #: ../fdroidserver/init.py
 #, python-brace-format
 msgid "Using existing keystore \"{path}\""
-msgstr "Utilizzando il keystore esistente \"{path}\""
+msgstr ""
 
-#: ../fdroidserver/deploy.py
-#, fuzzy, python-brace-format
-msgid "Using rclone to sync with: {url}"
-msgstr "Utilizzando s3cmd per sincronizzare con: {url}"
-
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Using s3cmd to sync with: {url}"
 msgstr "Utilizzando s3cmd per sincronizzare con: {url}"
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Valid commands are:"
 msgstr "I comandi validi sono:"
 
 #: ../fdroidserver/verify.py
 msgid "Verify against locally cached copy rather than redownloading."
-msgstr "Anziché scaricare di nuovo, verifica con la copia memorizata nella cache locale."
+msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Verify the integrity of downloaded packages"
 msgstr "Verifica l'integrità dei pacchetti scaricati"
 
 #: ../fdroidserver/index.py
 msgid "Verifying index signature:"
-msgstr "Verifica della firma dell'indice:"
-
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "Verifying package {path} with apksigner."
 msgstr ""
 
 #: ../fdroidserver/deploy.py
 #, python-brace-format
 msgid "VirusTotal API key cannot upload files larger than 32MB, use {url} to upload {path}."
-msgstr "La chiave API di VirusTotal non può caricare file più grandi di 32MB, usa {url} per caricare {path}."
-
-#: ../fdroidserver/nightly.py
-msgid "WARNING: only public git repos are supported!"
 msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Warn about possible metadata errors"
-msgstr "Avvisa riguardo possibili errori nei metadati"
-
-#: ../fdroidserver/scanner.py
-msgid "WebAssembly binary file"
-msgstr ""
+msgstr "Avvisa riguardo possibili errori metadata"
 
 #: ../fdroidserver/update.py
 msgid "When configured for signed indexes, create only unsigned indexes at this stage"
-msgstr "Se configurato per indici firmati, crea solo indici senza segno in questa fase"
+msgstr ""
 
 #: ../fdroidserver/lint.py
 msgid "When linting the entire repository yamllint is disabled by default. This option forces yamllint regardless."
-msgstr "Quando linting l'intero repository yamllint è disabilitato per impostazione predefinita. Questa opzione costringe yamllint a prescindere."
-
-#: ../fdroidserver/publish.py
-msgid "When signing or verifying fails, exit with an error code."
 msgstr ""
 
-#: ../fdroidserver/install.py
-msgid "Would you like to download and install F-Droid.apk via adb? (YES/no)"
-msgstr "Vuoi scaricare e installare F-Droid.apk tramite adb? (SÌ/no)"
-
-#: ../fdroidserver/install.py
-msgid "Would you like to download the app(s) from f-droid.org? (YES/no)"
+msgid "X.509 'Distiguished Name' used when generating keys"
 msgstr ""
 
 #: ../fdroidserver/init.py
 msgid "X.509 'Distinguished Name' used when generating keys"
-msgstr "X.509 'Distinguished Name' usato quando si generano le chiavi"
+msgstr ""
 
 #: ../fdroidserver/common.py
 msgid "You can use ANDROID_HOME to set the path to your SDK, i.e.:"
-msgstr "Potete usare ANDROID_HOME per impostare il percorso del vostro SDK, cioè:"
+msgstr ""
 
 #: ../fdroidserver/scanner.py
 msgid "ZIP file archive"
-msgstr "Archivio di file ZIP"
-
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "adb reports {serial} is \"{status}\"!"
 msgstr ""
 
 #: ../fdroidserver/nightly.py
 #, python-brace-format
 msgid "adding IdentityFile to {path}"
-msgstr "aggiungendo IdentityFile a {path}"
+msgstr ""
 
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "adding to {name}: {path}"
-msgstr "aggiungendo a {name}: {path}"
+msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "ambiguous option: %(option)s could match %(matches)s"
 msgstr "opzione ambigua: %(option)s potrebbe corrispondere a %(matches)s"
 
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "apksigner in build-tools;{version} passes APKs with invalid v3 signatures, ignoring."
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "apksigner not found! Cannot sign or verify modern APKs"
-msgstr "apksigner non trovato! Impossibile firmare o verificare gli APK moderni"
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, python-format
+msgid "ambiguous option: %s (%s?)"
+msgstr "opzione ambigua: %s (%s?)"
 
 #: ../fdroidserver/common.py
 msgid "apksigner not found, it's required for signing!"
-msgstr "apksigner non trovato, è necessario per la firma!"
+msgstr ""
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/checkupdates.py ../fdroidserver/lint.py
-#: ../fdroidserver/rewritemeta.py
+#: ../fdroidserver/lint.py ../fdroidserver/rewritemeta.py
+#: ../fdroidserver/checkupdates.py
 msgid "application ID of file to operate on"
-msgstr "ID dell'applicazione del file su cui operare"
+msgstr ""
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/build.py ../fdroidserver/install.py
-#: ../fdroidserver/publish.py ../fdroidserver/scanner.py
-#: ../fdroidserver/verify.py
+#: ../fdroidserver/verify.py ../fdroidserver/publish.py
+#: ../fdroidserver/build.py ../fdroidserver/scanner.py
+#: ../fdroidserver/install.py
 msgid "application ID with optional versionCode in the form APPID[:VERCODE]"
-msgstr "ID dell'applicazione con versionCode opzionale nella forma APPID[:VERCODE]"
+msgstr ""
 
-#: ../fdroidserver/common.py
-msgid "archive_url needs to end with /archive"
-msgstr "archive_url deve terminare con /archive"
+#: ../fdroidserver/lint.py ../fdroidserver/rewritemeta.py
+msgid "applicationId in the form APPID"
+msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: ../fdroidserver/checkupdates.py
+msgid "applicationId to check for updates"
+msgstr ""
+
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
+#: ../fdroidserver/verify.py ../fdroidserver/publish.py
+#: ../fdroidserver/dscanner.py ../fdroidserver/build.py
+#: ../fdroidserver/scanner.py ../fdroidserver/install.py
+msgid "applicationId with optional versionCode in the form APPID[:VERCODE]"
+msgstr ""
+
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "argument \"-\" with mode %r"
-msgstr "argomento \" -\" con la modalità %r"
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "argument %(argument_name)s: %(message)s"
-msgstr "argomento %(argument_name)s: %(message)s"
+msgstr ""
 
 #: ../fdroidserver/nightly.py
 msgid "attempting bare SSH connection to test deploy key:"
-msgstr "tentativo di connessione SSH nuda per testare la chiave di distribuzione:"
+msgstr ""
+
+#: ../fdroidserver/nightly.py
+msgid "attempting bare ssh connection to test deploy key:"
+msgstr ""
 
 #: ../fdroidserver/common.py
 msgid "can not parse scrlib spec (not a string): '{}'"
-msgstr "impossibile analizzare le specifiche scrlib (non una stringa): '{}'"
+msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
-msgid "can't open '%(filename)s': %(error)s"
-msgstr "impossibile aprire '%(filename)s': %(error)s"
-
-#: ../fdroidserver/scanner.py
-msgid "can't open non-https url: '{};"
-msgstr "impossibile aprire l'url non-https: '{};"
+msgid "can't open '%s': %s"
+msgstr "impossibile aprire \"%s\": %s"
 
 #: ../fdroidserver/build.py
 #, python-brace-format
 msgid "cannot find required srclibs: \"{path}\""
 msgstr "impossibile trovare srclibs richiesto: \"{path}\""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "cannot have multiple subparser arguments"
-msgstr "impossibile avere più argomenti subparser"
+msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "cannot merge actions - two groups are named %r"
-msgstr "impossibile unire le azioni : due gruppi sono denominati %r"
+msgstr ""
 
 #: ../fdroidserver/nightly.py
 msgid "cannot publish update, did you set the deploy key?"
-msgstr "non può pubblicare l'aggiornamento, avete impostato la chiave di distribuzione?"
+msgstr ""
 
 #: ../fdroidserver/nightly.py
 #, python-brace-format
 msgid "cloning {url}"
-msgstr "clonazione {url}"
+msgstr ""
+
+#: ../fdroidserver/deploy.py
+msgid "command to execute, either 'init' or 'update'"
+msgstr ""
 
 #: ../fdroidserver/__main__.py
 msgid "commands from plugin modules:"
-msgstr "dai moduli dei plugin:"
+msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "complex"
+msgstr ""
+
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "conflicting option string: %s"
 msgid_plural "conflicting option strings: %s"
-msgstr[0] "stringa di opzioni in conflitto: %s"
-msgstr[1] "stringhe di opzioni in conflitto: %s"
+msgstr[0] ""
+msgstr[1] ""
 
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "conflicting subparser alias: %s"
-msgstr "alias subparser in conflitto: %s"
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "conflicting subparser: %s"
-msgstr "subparser in conflitto: %s"
+#: ../fdroidserver/nightly.py
+#, python-brace-format
+msgid "copying {apkfilename} into {path}"
+msgstr ""
 
 #: ../fdroidserver/metadata.py
 #, python-brace-format
 msgid "could not parse '{path}'"
-msgstr "non ha potuto analizzare '{path}'"
-
-#: ../fdroidserver/common.py
-#, fuzzy
-msgid "could not parse srclib spec (no name specified): '{}'"
-msgstr "non ha potuto analizzare la specifica srclib (nessun riferimento specificato): '{}'"
+msgstr ""
 
 #: ../fdroidserver/common.py
 msgid "could not parse srclib spec (no ref specified): '{}'"
-msgstr "non ha potuto analizzare la specifica srclib (nessun riferimento specificato): '{}'"
+msgstr ""
+
+#: ../fdroidserver/common.py
+msgid "could not parse srclib spec (too many '@' signs): '{}'"
+msgstr ""
 
 #: ../fdroidserver/nightly.py
 #, python-brace-format
 msgid "created {path}"
-msgstr "creato {path}"
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "current version is newer: old vercode={old}, new vercode={new}"
-msgstr "la versione attuale è più recente: old vercode={old}, new vercode={new}"
+msgstr ""
 
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "deleting: repo/{apkfilename}"
-msgstr "cancellazione: repo/{apkfilename}"
+msgstr ""
 
-#: ../fdroidserver/scanner.py
-msgid "dependency file without lock"
+#: ../fdroidserver/common.py
+#, python-brace-format
+msgid "deployed build logs to '{path}'"
 msgstr ""
 
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "deployed process log {path} to {dest}"
-msgstr "log di processo distribuito {path} a {dest}"
+msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "dest= is required for options like %r"
-msgstr "dest= è richiesto per opzioni come %r"
-
-#: ../fdroidserver/scanner.py
-msgid "downloading '{}'"
-msgstr "scaricando '{}'"
-
-#: ../fdroidserver/scanner.py
-msgid "downloading scanner signatures from '{}' failed"
-msgstr "scaricamento delle firme dello scanner da '{}' fallito"
+msgstr ""
 
 #: ../fdroidserver/scanner.py
 msgid "executable binary, possibly code"
-msgstr "binario eseguibile, eventualmente codice"
+msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "expected %s argument"
 msgid_plural "expected %s arguments"
-msgstr[0] "atteso %s argomento"
-msgstr[1] "atteso %s argomenti"
+msgstr[0] ""
+msgstr[1] ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "expected at least one argument"
-msgstr "si aspettava almeno un argomento"
+msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "expected at most one argument"
-msgstr "atteso al massimo un argomento"
+msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "expected one argument"
-msgstr "atteso un argomento"
+msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroidserver/common.py
+#, python-brace-format
+msgid "failed deploying build logs to '{path}'"
+msgstr ""
+
+#: ../fdroid
+msgid "fdroid [-h|--help|--version] <command> [<args>]"
+msgstr ""
+
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "fdroid [<command>] [-h|--help|--version|<args>]"
 msgstr "fdroid [<command>] [-h|--help|--version|<args>]"
 
-#: ../fdroidserver/scanner.py
-msgid "fetch the latest version of signatures from the web"
-msgstr "recupera l'ultima versione delle firme dal web"
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "floating-point"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+msgid "force errors to be warnings, or ignore"
+msgstr "forza gli errori ad essere avvisi, o ignora"
 
 #: ../fdroidserver/metadata.py
 msgid "force metadata errors (default) to be warnings, or to be ignored."
@@ -2291,53 +2272,50 @@ msgstr "forza gli errori di metadati (predefinito) come avvisi, o da ignorare."
 
 #: ../fdroidserver/common.py
 msgid "git svn clone failed"
-msgstr "git svn clone fallito"
+msgstr ""
 
 #: ../fdroidserver/scanner.py
 msgid "gzip file archive"
-msgstr "archivio file gzip"
+msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "ignored explicit argument %r"
-msgstr "ignorava l'argomento esplicito %r"
+msgstr ""
 
 #: ../fdroidserver/index.py
 msgid "index-v1 must have a signature, use `fdroid signindex` to create it!"
-msgstr "index-v1 deve avere una firma, usa `fdroid signindex` per crearla!"
+msgstr ""
 
-#: ../fdroidserver/index.py
-msgid "index-v2 must have a signature, use `fdroid signindex` to create it!"
-msgstr "index-v2 deve avere una firma, usa `fdroid signindex` per crearla!"
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "integer"
+msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "invalid %(type)s value: %(value)r"
-msgstr "valore %(type)s non valido: %(value)r"
+msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "invalid choice: %(value)r (choose from %(choices)s)"
-msgstr "scelta non valida: %(value)r (scegliere tra %(choices)s)"
+msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "invalid conflict_resolution value: %r"
-msgstr "valore di risoluzione dei conflitti non valido: %r"
+msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "invalid option string %(option)r: must start with a character %(prefix_chars)r"
-msgstr "stringa di opzioni non valida %(option)r: deve iniziare con un carattere %(prefix_chars)r"
-
-#: ../fdroidserver/common.py
-msgid "ipfs_cid not found, skipping CIDv1 generation"
-msgstr "ipfs_cid non trovato, salto la generazione di CIDv1"
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "latest build recipe is newer: old vercode={old}, new vercode={new}"
-msgstr "l'ultima ricetta di compilazione è più recente: vecchio vercode={old}, nuovo vercode={new}"
+msgstr ""
 
 #: ../fdroidserver/deploy.py
 #, python-brace-format
@@ -2355,167 +2333,210 @@ msgstr "local_copy_dir deve essere una cartella, non un file!"
 #: ../fdroidserver/index.py
 #, python-format
 msgid "mirror '%s' does not end with 'fdroid'!"
-msgstr "il mirror '%s' non finisce con 'fdroid'!"
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "mirrors set twice, in config.yml and {path}!"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "mutually exclusive arguments must be optional"
-msgstr "gli argomenti che si escludono a vicenda devono essere opzionali"
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "next {name} cache update due in {time}"
-msgstr "prossimo aggiornamento cache {name} tra {time}"
+msgstr ""
 
 #: ../fdroidserver/mirror.py
 #, python-brace-format
 msgid "no \"icon\" in {appid}"
-msgstr "nessuna \"icona\" in {appid}"
+msgstr ""
 
 #: ../fdroidserver/signatures.py
 msgid "no APK supplied"
-msgstr "nessun APK fornito"
+msgstr ""
 
-#: ../fdroidserver/checkupdates.py
-msgid "no version information found"
-msgstr "nessuna informazione sulla versione trovata"
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, python-format
+msgid "no such option: %s"
+msgstr "opzione inesistente: %s"
 
-#: /usr/lib/python3.11/argparse.py
+#: ../fdroid ../fdroidserver/__main__.py
+msgid "no version info found!"
+msgstr "nessuna informazione sulla versione è stata trovata!"
+
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "not allowed with argument %s"
-msgstr "non consentito con argomento %s"
+msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "one of the arguments %s is required"
-msgstr "uno degli argomenti %s è richiesto"
+msgstr ""
 
-#: ../fdroidserver/common.py ../fdroidserver/index.py
+#: ../fdroidserver/index.py ../fdroidserver/common.py
 msgid "only accepts strings, lists, and tuples"
-msgstr "accetta solo stringhe, liste e tuple"
+msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
-msgid "options"
-msgstr "opzioni"
+#: ../fdroidserver/install.py
+#, python-format
+msgid "option %s: If you really want to install all the signed apps, use --all"
+msgstr ""
+
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, python-format
+msgid "option %s: invalid %s value: %r"
+msgstr ""
+
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, python-format
+msgid "option %s: invalid choice: %r (choose from %s)"
+msgstr ""
+
+#: /usr/lib/python3.5/getopt.py /usr/lib/python3.6/getopt.py
+#: /usr/lib/python3.7/getopt.py
+#, python-format
+msgid "option -%s not recognized"
+msgstr "opzione -%s non riconosciuta"
+
+#: /usr/lib/python3.5/getopt.py /usr/lib/python3.6/getopt.py
+#: /usr/lib/python3.7/getopt.py
+#, python-format
+msgid "option -%s requires argument"
+msgstr "l'opzione -%s richiede degli argomenti"
+
+#: /usr/lib/python3.5/getopt.py /usr/lib/python3.6/getopt.py
+#: /usr/lib/python3.7/getopt.py
+#, python-format
+msgid "option --%s must not have an argument"
+msgstr "l'opzione --%s non deve avere argomenti"
+
+#: /usr/lib/python3.5/getopt.py /usr/lib/python3.6/getopt.py
+#: /usr/lib/python3.7/getopt.py
+#, python-format
+msgid "option --%s not a unique prefix"
+msgstr "l'opzione --%s non ha un prefisso univoco"
+
+#: /usr/lib/python3.5/getopt.py /usr/lib/python3.6/getopt.py
+#: /usr/lib/python3.7/getopt.py
+#, python-format
+msgid "option --%s not recognized"
+msgstr "opzione --%s non riconosciuta"
+
+#: /usr/lib/python3.5/getopt.py /usr/lib/python3.6/getopt.py
+#: /usr/lib/python3.7/getopt.py
+#, python-format
+msgid "option --%s requires argument"
+msgstr "l'opzione --%s richiede un argomento"
+
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
+msgid "optional arguments"
+msgstr "argomenti facoltativi"
 
 #: ../fdroidserver/nightly.py
 #, python-brace-format
 msgid "overwriting existing {path}"
-msgstr "sovrascrivendo il {path} esistente"
+msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "positional arguments"
 msgstr "argomenti posizionali"
 
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "process log deploy {path} to {dest} failed!"
-msgstr "processo log deploy {path} a {dest} fallito!"
-
-#: ../fdroidserver/build.py
-msgid "reference binary missing signature"
-msgstr "binario di riferimento senza firma"
+msgstr ""
 
 #: ../fdroidserver/signatures.py
 #, python-brace-format
 msgid "refuse downloading via insecure HTTP connection (use HTTPS or specify --no-https-check): {apkfilename}"
-msgstr "rifiuta il download tramite connessione HTTP insicura (usa HTTPS o specifica --no-https-check): {apkfilename}"
+msgstr ""
+
+#: ../fdroidserver/signatures.py
+#, python-brace-format
+msgid "refuse downloading via insecure http connection (use https or specify --no-https-check): {apkfilename}"
+msgstr ""
 
 #: ../fdroidserver/index.py
 #, python-format
-msgid "repo_icon \"repo/icons/%s\" does not exist, generating placeholder."
-msgstr "repo_icon \"repo/icons/%s\" non esiste, genera un segnaposto."
+msgid "repo_icon %s does not exist, generating placeholder."
+msgstr ""
 
-#: ../fdroidserver/common.py
-msgid "repo_url needs to end with /repo"
-msgstr "Il repo_url deve terminare con /repo"
+#: ../fdroidserver/metadata.py
+msgid "ruamel.yaml not installed, can not write metadata."
+msgstr ""
 
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "rsync is missing or broken: {error}"
-msgstr "rsync è assente o non funziona: {error}"
-
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "s3cmd sync indexes {path} to {url} and delete"
-msgstr "s3cmd sincronizza gli indici {path} con {url} e cancella"
-
-#: ../fdroidserver/deploy.py
-#, fuzzy, python-brace-format
-msgid "s3cmd syncs indexes from {path} to {url} and deletes removed"
-msgstr "s3cmd sincronizza gli indici {path} con {url} e cancella"
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "scanner cache is malformed! You can clear it with: '{clear}'"
-msgstr "la cache dello scanner è malformata! Puoi svuotarla con: '{clear}'"
-
-#: ../fdroidserver/deploy.py
-msgid "serverwebroot: path does not end with \"fdroid\", perhaps you meant one of these:"
 msgstr ""
 
 #: ../fdroidserver/scanner.py
 msgid "shared library"
-msgstr "libreria condivisa"
+msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "show program's version number and exit"
+msgstr "mostra il numero di versione del programma ed esci"
+
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.5/optparse.py
+#: /usr/lib/python3.6/argparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/argparse.py /usr/lib/python3.7/optparse.py
 msgid "show this help message and exit"
 msgstr "mostra questo messaggio di aiuto ed esci"
 
 #: ../fdroidserver/signatures.py
 msgid "signed APK, either a file-path or HTTPS URL."
-msgstr "APK firmato, un percorso di file o un URL HTTPS."
+msgstr ""
 
 #: ../fdroidserver/common.py
 msgid "skip deploying full build logs: log content is empty"
-msgstr "saltare la distribuzione dei log di compilazione completi: il contenuto del log è vuoto"
+msgstr ""
 
 #: ../fdroidserver/common.py
 msgid "skip deploying full build logs: not enabled in config"
-msgstr "saltare la distribuzione dei log di compilazione completi: non abilitato nella configurazione"
+msgstr ""
 
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "skipping source tarball: {path}"
-msgstr "saltare il tarball di origine: {path}"
+msgstr ""
 
 #: ../fdroidserver/lint.py
 msgid "srclibs missing name and/or @"
-msgstr "srclibs manca il nome e/o @"
+msgstr ""
 
 #: ../fdroidserver/scanner.py
 msgid "static library"
-msgstr "libreria statica"
+msgstr ""
 
-#: ../fdroidserver/build.py
+#: ../fdroidserver/common.py
 #, python-brace-format
-msgid "supplied reference binary has allowed signer {signer}"
-msgstr "il binario di riferimento fornito ha il firmatario autorizzato {signer}"
+msgid "supplied timestamp value '{timestamp}' is not a unix timestamp"
+msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "the following arguments are required: %s"
 msgstr "i seguenti argomenti sono obbligatori: %s"
 
-#: ../fdroidserver/install.py
-msgid "true"
-msgstr "vero"
-
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "unexpected option string: %s"
 msgstr "stringa di opzioni inaspettata: %s"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "unknown parser %(parser_name)r (choices: %(choices)s)"
-msgstr "parser sconosciuto %(parser_name)r (scelte: %(choices)s)"
+msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "unrecognized arguments: %s"
 msgstr "argomenti sconosciuti: %s"
@@ -2525,196 +2546,173 @@ msgstr "argomenti sconosciuti: %s"
 msgid "unsafe permissions on '{config_file}' (should be 0600)!"
 msgstr "permessi su \"{config_file}\" insicuri (dovrebbero essere 0600)!"
 
-#: ../fdroidserver/__main__.py /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py ../fdroid
+#: /usr/lib/python3.7/argparse.py ../fdroidserver/__main__.py
 msgid "usage: "
 msgstr "utilizzo: "
 
-#: ../fdroidserver/deploy.py
+#: ../fdroid
+msgid "usage: fdroid [-h|--help|--version] <command> [<args>]"
+msgstr "utilizzo: fdroid [-h|--help|--version] <comando> [<argomenti>]"
+
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "using Apache libcloud to sync with {url}"
 msgstr "utilizzando Apache libcloud per sincronizzare con {url}"
 
 #: ../fdroidserver/deploy.py
 msgid "virustotal.com is rate limiting, waiting to retry..."
-msgstr "virustotal.com sta limitando il tasso, in attesa di riprovare..."
+msgstr ""
 
-#: ../fdroidserver/install.py
-msgid "yes"
-msgstr "sì"
+#: ../fdroidserver/update.py
+msgid "wiki support is deprecated and will be removed in the next release!"
+msgstr ""
 
 #: ../fdroidserver/publish.py
 #, python-brace-format
 msgid "{0} app, {1} key aliases"
 msgid_plural "{0} apps, {1} key aliases"
-msgstr[0] "{0} app, {1} alias chiave"
-msgstr[1] "{0} applicazioni, {1} alias chiave"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "{apkfilename} ({appid}) has no metadata!"
-msgstr "{apkfilename} ({appid}) non ha metadati!"
+msgstr ""
+
+#: ../fdroidserver/update.py
+#, python-brace-format
+msgid "{apkfilename} has multiple {name} files, looks like Master Key exploit!"
+msgstr ""
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "{apkfilename}'s AndroidManifest.xml has a bad date: "
 msgstr "L'AndroidManifest.xml di {apkfilename} ha una data non corretta: "
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "{appid} does not have a name! Using application ID instead."
-msgstr "{appid} non ha un nome! Usa invece l'ID dell'applicazione."
+msgstr ""
+
+#: ../fdroidserver/update.py
+#, python-brace-format
+msgid "{appid} does not have a name! Using package name instead."
+msgstr ""
+
+#: ../fdroidserver/update.py
+#, python-brace-format
+msgid "{appid} from {path} is not a valid Android Package Name!"
+msgstr ""
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "{appid} from {path} is not a valid Android application ID!"
-msgstr "{appid} da {path} non è un ID di applicazione Android valido!"
+msgstr ""
 
 #: ../fdroidserver/metadata.py ../fdroidserver/update.py
 #, python-brace-format
 msgid "{appid} from {path} is not a valid Java Package Name!"
-msgstr "{appid} da {path} non è un nome di pacchetto Java valido!"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{appid} has both APKs and files: {files}"
-msgstr "{appid} ha sia APK che file: {files}"
+msgstr ""
 
 #: ../fdroidserver/mirror.py
 #, python-brace-format
 msgid "{appid} is missing {name}"
-msgstr "{appid} manca {name}"
+msgstr ""
 
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "{appid}: Unknown extlib {path} in build '{versionName}'"
-msgstr "{appid}: extlib sconosciuto {path} nella build '{versionName}'"
+msgstr ""
 
 #: ../fdroidserver/scanner.py
 #, python-brace-format
 msgid "{appid}: no builds specified, running on current source state"
-msgstr "{appid}: nessuna build specificata, in esecuzione sullo stato sorgente corrente"
+msgstr ""
 
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "{appid}: {field} must be a '{type}', but it is a '{fieldtype}!'"
-msgstr "{appid}:{field} deve essere un '{type}', ma è un '{fieldtype}!'"
+msgstr ""
 
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "{appid}: {field} must be a '{type}', but it is a '{fieldtype}'!"
-msgstr "{appid}: {field} deve essere un '{type}', ma è un '{fieldtype}'!"
+msgstr ""
 
 #: ../fdroidserver/metadata.py
 #, python-brace-format
 msgid "{build_flag} must be an integer, found: {value}"
-msgstr "{build_flag} deve essere un intero, trovato: {value}"
+msgstr ""
 
 #: ../fdroidserver/metadata.py
 #, python-brace-format
-msgid "{build_flag} must be list or string, found: {value}"
-msgstr "{build_flag} deve essere una lista o una stringa, trovato: {value}"
+msgid "{field} not terminated in {name}"
+msgstr ""
 
 #: ../fdroidserver/metadata.py
 #, python-brace-format
 msgid "{file} is blank or corrupt!"
-msgstr "{file} è vuoto o corrotto!"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{name} \"{section}/icons/{path}\" does not exist! Check \"config.yml\"."
-msgstr "{name} \"{section}/icons/{path}\" non esiste! Controlla \"config.yml\"."
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{path1} is a duplicate of {path2}, remove one!"
 msgstr ""
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/update.py
+#, python-brace-format
+msgid "{name} \"{path}\" does not exist! Correct it in config.py."
+msgstr ""
+
+#: ../fdroidserver/import.py
 #, python-brace-format
 msgid "{path} already exists, ignoring import results!"
-msgstr "{path} esiste già, ignorando i risultati dell'importazione!"
+msgstr ""
 
 #: ../fdroidserver/nightly.py
 #, python-brace-format
 msgid "{path} does not exist!  Create it by running:"
-msgstr "{path} non esiste!  Crealo eseguendo:"
+msgstr ""
 
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "{path} has bad file signature \"{pattern}\", possible Janus exploit!"
-msgstr "{path} ha una cattiva firma di file \"{pattern}\", possibile exploit di Janus!"
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "{path} has been flagged by virustotal {count} times:"
-msgstr ""
-
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "{path} has the wrong fingerprint ({fingerprint})!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "{path} is not \"key: value\" dict, but a {datatype}!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "{path} is not a standard config file!"
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "{path} is not list, but a {datatype}!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "{path} is not {expected_type}, but a {datatype}!"
 msgstr ""
 
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "{path} is zero size!"
-msgstr "{path} è di dimensioni zero!"
+msgstr ""
 
 #: ../fdroidserver/deploy.py
 #, python-brace-format
 msgid "{path} more than 200MB, manually upload: {url}"
-msgstr "{path} più di 200MB, caricare manualmente: {url}"
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "{path}: \"{code}\" is not a valid ISO_3166-1 alpha-2 country code!"
 msgstr ""
 
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{path}: {error}"
-msgstr "{path}: {error}"
-
 #: ../fdroidserver/mirror.py
 #, python-brace-format
 msgid "{url} does not end with \"fdroid\", check the URL path!"
-msgstr "{url} non finisce con \"fdroid\", controlla il percorso dell'URL!"
+msgstr ""
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/common.py
 #, python-brace-format
 msgid "{url} does not start with \"http\"!"
-msgstr "{url} non inizia con \"http\"!"
+msgstr ""
 
 #: ../fdroidserver/build.py
 msgid "{} build failed"
 msgid_plural "{} builds failed"
-msgstr[0] "{} costruzione fallita"
-msgstr[1] "{} le costruzioni sono fallite"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../fdroidserver/build.py
 msgid "{} build succeeded"
 msgid_plural "{} builds succeeded"
-msgstr[0] "{} costruzione riuscita"
-msgstr[1] "{} costruisce con successo"
+msgstr[0] ""
+msgstr[1] ""
+
+#~ msgid "Cannot find a packageName for {path}!"
+#~ msgstr "Impossibile trovare un packageName per {path}!"
+
+#~ msgid "Cannot find an appid for {path}!"
+#~ msgstr "Impossibile trovare un appid per {path}!"
+
+#~ msgid "Interactively ask about things that need updating."
+#~ msgstr "Chiedi interattivamente riguardo a ciò che deve essere aggiornato."
diff --git a/locale/ja/LC_MESSAGES/fdroidserver.po b/locale/ja/LC_MESSAGES/fdroidserver.po
index 50dd832d..d2465585 100644
--- a/locale/ja/LC_MESSAGES/fdroidserver.po
+++ b/locale/ja/LC_MESSAGES/fdroidserver.po
@@ -1,31 +1,42 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
 # Hinaloe <hina@hinaloe.net>, 2020.
-# Suguru Hirahara <shirahara@users.noreply.hosted.weblate.org>, 2024.
-# "Shuuji TAKAHASHI (shuuji3)" <shuuji3@gmail.com>, 2024.
-# Liner Seven <linour7gmekiblo@gmail.com>, 2024, 2025.
 msgid ""
 msgstr ""
 "Project-Id-Version: fdroidserver 0.8-224-g4b0ade7\n"
 "Report-Msgid-Bugs-To: https://gitlab.com/fdroid/fdroidserver/issues\n"
-"POT-Creation-Date: 2025-06-25 09:52+0200\n"
-"PO-Revision-Date: 2025-04-30 04:07+0000\n"
-"Last-Translator: Liner Seven <linour7gmekiblo@gmail.com>\n"
+"POT-Creation-Date: 2020-10-21 18:05+0200\n"
+"PO-Revision-Date: 2020-09-02 16:10+0000\n"
+"Last-Translator: Hinaloe <hina@hinaloe.net>\n"
 "Language-Team: Japanese <https://hosted.weblate.org/projects/f-droid/fdroidserver/ja/>\n"
 "Language: ja\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Weblate 5.12-dev\n"
+"X-Generator: Weblate 4.3-dev\n"
+
+#: ../fdroidserver/common.py
+msgid ""
+"\n"
+"        This is a repository of apps to be used with FDroid. Applications in this\n"
+"        repository are either official binaries built by the original application\n"
+"        developers, or are binaries built from source by f-droid.org using the\n"
+"        tools on https://gitlab.com/fdroid.\n"
+"        "
+msgstr ""
+
+#: ../fdroidserver/nightly.py
+msgid ""
+"\n"
+"SSH Public Key to be used as Deploy Key:"
+msgstr ""
 
 #: ../fdroidserver/nightly.py
 msgid ""
 "\n"
 "SSH public key to be used as deploy key:"
 msgstr ""
-"\n"
-"設定用の鍵として使用されるSSHの公開鍵："
 
 #: ../fdroidserver/nightly.py
 #, python-brace-format
@@ -33,647 +44,639 @@ msgid ""
 "\n"
 "{path} encoded for the DEBUG_KEYSTORE secret variable:"
 msgstr ""
-"\n"
-"DEBUG_KEYSTOREの秘密の変数にエンコードされる{path}："
 
 #: ../fdroidserver/lint.py
 #, python-format
 msgid "\"%s/\" has no matching metadata file!"
-msgstr "「\"%s/」に合致するメタデータのファイルはありません！"
-
-#: ../fdroidserver/index.py
-msgid "\"isPrimary\" key should not be added to mirrors!"
-msgstr "\"isPrimary\" キーはミラーに追加すべきではありません！"
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "\"local_copy_dir\" {path} does not exist!"
-msgstr "\"local_copy_dir\" {path} は存在しません！"
+msgstr ""
 
 #: ../fdroidserver/install.py
-#, python-brace-format
+#, fuzzy, python-brace-format
 msgid "\"{apkfilename}\" is already installed on {dev}."
-msgstr "「{apkfilename}」はすでに{dev}にインストールされています。"
+msgstr "'{apkfilename}'はすでに{dev}にインストールされています。"
+
+#: ../fdroidserver/update.py
+#, python-brace-format
+msgid "\"{path}\" contains outdated {name} ({version})"
+msgstr ""
 
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "\"{path}\" contains recent {name} ({version})"
-msgstr "「{path}」には最近の{name}（{version}）が含まれています"
+msgstr ""
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "\"{path}\" exists but s3cmd is not installed!"
-msgstr "「{path}」は存在しますがs3cmdがインストールされていません！"
+msgstr ""
 
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "\"{path}\" is not a supported file format (use: metadata/*.yml)"
-msgstr "「{path}」はサポートされているファイルフォーマットではありません（metadata/*.ymlを使用してください）"
+msgstr ""
 
-#: ../fdroidserver/update.py
+#: ../fdroidserver/metadata.py
 #, python-brace-format
-msgid "\"{path}\" is signed by a key that is not allowed:"
-msgstr "「{path}」は許可されていない鍵で署名されています："
+msgid "\"{path}\" is not an accepted format, convert to: {formats}"
+msgstr ""
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/common.py
 #, python-brace-format
 msgid "\"{url}\" is not a valid URL!"
-msgstr "「{url}」は正しいURLではありません！"
+msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, python-format
+msgid "%(option)s option requires %(number)d argument"
+msgid_plural "%(option)s option requires %(number)d arguments"
+msgstr[0] ""
+
+#: ../fdroidserver/mirror.py
+#, python-format
+msgid "%(prog)s [options] url"
+msgstr ""
+
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "%(prog)s: error: %(message)s\n"
-msgstr "%(prog)s: エラー: %(message)s\n"
-
-#: ../fdroidserver/publish.py
-#, python-format
-msgid "%d APKs failed to be signed or verified!"
-msgstr "%d個のAPKが署名されておらず検証できませんでした！"
+msgstr ""
 
 #: ../fdroidserver/scanner.py
 #, python-format
 msgid "%d problems found"
 msgstr "%d個の問題が見つかりました"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "%prog [options]"
+msgstr ""
+
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "%r is not callable"
-msgstr "%rは呼び出せません"
-
-#: ../fdroidserver/signindex.py
-#, python-format
-msgid "%s did not produce a dict!"
-msgstr "%sは辞書を生成しませんでした！"
-
-#: ../fdroidserver/signindex.py
-#, python-format
-msgid "%s has bad SHA-256: %s"
-msgstr "%sのSHA-256は誤っています：%s"
+msgstr ""
 
 #: ../fdroidserver/lint.py
 #, python-format
 msgid "%s is not an accepted build field"
-msgstr "%sは承認されたビルドフィールドではありません"
+msgstr ""
 
-#: ../fdroidserver/common.py
-msgid "'keypass' not found in config.yml!"
-msgstr "「keypass」がconfig.ymlにありません！"
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, python-format
+msgid "%s option does not take a value"
+msgstr ""
+
+#: ../fdroidserver/index.py ../fdroidserver/common.py
+msgid "'keypass' not found in config.py!"
+msgstr ""
 
 #: ../fdroidserver/common.py
 msgid "'keystore' is NONE and 'smartcardoptions' is blank!"
-msgstr "「keystore」がありません。また「smartcardoptions」が空です！"
+msgstr ""
 
-#: ../fdroidserver/common.py
-msgid "'keystore' not found in config.yml!"
-msgstr "「keystore」がconfig.ymlにありません！"
+#: ../fdroidserver/index.py ../fdroidserver/common.py
+msgid "'keystore' not found in config.py!"
+msgstr ""
 
-#: ../fdroidserver/common.py
-msgid "'keystorepass' not found in config.yml!"
-msgstr "「keystorepass」がconfig.ymlにありません！"
+#: ../fdroidserver/index.py ../fdroidserver/common.py
+msgid "'keystorepass' not found in config.py!"
+msgstr ""
 
-#: ../fdroidserver/common.py
-msgid "'repo_keyalias' not found in config.yml!"
-msgstr "「repo_keyalias」がconfig.ymlにありません！"
+#: ../fdroidserver/index.py ../fdroidserver/common.py
+msgid "'repo_keyalias' not found in config.py!"
+msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "'required' is an invalid argument for positionals"
-msgstr "「required」は位置についての引数としては正しくありません"
+msgstr ""
 
 #: ../fdroidserver/common.py
-msgid "'sdk_path' not set in config.yml!"
-msgstr "「sdk_path」がconfig.ymlで設定されていません！"
+msgid "'sdk_path' not set in 'config.py'!"
+msgstr ""
+
+#. Translators: "build-tools" is the file name of a package from
+#. Google, it is part of the Android SDK. So it probably shouldn't be
+#. translated or transliterated.
+#: ../fdroidserver/common.py
+#, python-brace-format
+msgid "'{aapt}' is too old, fdroid requires build-tools-23.0.0 or newer!"
+msgstr "'{aapt}' は古すぎます、froid は build-tools-23.0.0 またはそれ以降が必要です！"
 
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "'{aapt}' is too old, fdroid requires build-tools-{version} or newer!"
-msgstr "「{aapt}」は古すぎます。fdroidはbuild-tools-{version}またはそれ以降が必要です！"
+msgstr "'{aapt}' は古すぎます、froid は build-tools-{version} またはそれ以降が必要です！"
+
+#: ../fdroidserver/install.py
+#, python-brace-format
+msgid "'{apkfilename}' is already installed on {dev}."
+msgstr "'{apkfilename}'はすでに{dev}にインストールされています。"
+
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "'{field}' in {linedesc} is obsolete, see docs for current fields:"
+msgstr ""
+
+#: ../fdroidserver/common.py
+#, python-brace-format
+msgid "'{field}' will be in random order! Use () or [] brackets if order is important!"
+msgstr ""
 
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "'{path}' failed to execute!"
-msgstr "「{path}」を実行できませんでした！"
+msgstr ""
 
 #: ../fdroidserver/metadata.py
 #, python-brace-format
-msgid "'{path}' has invalid format, it should be a dictionary!"
-msgstr "「{path}」は正しいフォーマットではありません。辞書を指定してください！"
-
-#: ../fdroidserver/lint.py ../fdroidserver/metadata.py
-#, python-brace-format
 msgid "'{value}' is not a valid {field} in {appid}. Regex pattern: {pattern}"
-msgstr "「{value}」は {appid}の正しい{field}ではありません。正規表現のパターンは {pattern}"
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "'{value}' is not a valid {field}, should be {pattern}"
-msgstr "「{value}」は正しい{field}ではありません。{pattern}としてください"
-
-#: ../fdroidserver/checkupdates.py
-msgid "--merge-request only runs on a single appid!"
-msgstr "--merge-requestは単一のappidでのみ実行されます！"
+msgstr ""
 
 #: ../fdroidserver/checkupdates.py
 #, python-brace-format
 msgid "...checkupdate failed for {appid} : {error}"
-msgstr "…{appid}についてcheckupdateを実行できませんでした：{error}"
+msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid ".__call__() not defined"
-msgstr ".__call__() は定義されていません"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+msgid ".fdroid.txt is not supported!  Convert to .fdroid.yml or .fdroid.json."
+msgstr ""
 
 #: ../fdroidserver/lint.py
 msgid "/issues is missing"
-msgstr "/issuesがありません"
+msgstr ""
 
 #: ../fdroidserver/mirror.py
 msgid "A URL is required as an argument!"
-msgstr "URLを引数として指定してください！"
+msgstr ""
 
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "APK signatures have different certificates in {path}:"
-msgstr "APKの署名には{path}で異なる証明書があります："
-
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Add PGP signatures using GnuPG for packages in repo"
-msgstr "リポジトリのパッケージにGnuPGを使用してPGP署名を追加"
+msgstr ""
+
+#: ../fdroid ../fdroidserver/__main__.py
+msgid "Add a new application from its source code"
+msgstr ""
 
 #: ../fdroidserver/update.py
 msgid "Add a repo signing key to an unsigned repo"
-msgstr "署名されていないリポジトリに、リポジトリの署名鍵を追加"
+msgstr ""
 
 #: ../fdroidserver/update.py
 msgid "Add skeleton metadata files for APKs that are missing them"
-msgstr "メタデータが存在しないAPKにテンプレートのメタデータを追加"
+msgstr ""
 
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Adding new repo for only {name}"
-msgstr "{name}にのみ新しいリポジトリを追加"
+msgstr ""
 
 #: ../fdroidserver/init.py
 msgid "Alias of the repo signing key in the keystore"
-msgstr "キーストアのリポジトリの署名鍵のエイリアス"
+msgstr ""
 
-#: ../fdroidserver/build.py
-msgid "AllowedAPKSigningKeys missing but reference binary supplied"
-msgstr "AllowedAPKSigningKeysが指定されていませんが、参照用バイナリーは指定されています"
-
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "Allows a different revision (or git branch) to be specified for the initial import"
-msgstr "最初のインポートの際に異なるリビジョン（またはgitのブランチ）を指定することを許可"
+msgstr ""
 
 #: ../fdroidserver/mirror.py
 msgid "Also mirror the full archive section"
-msgstr "完全なアーカイブのセクションもミラーリング"
+msgstr ""
 
 #: ../fdroidserver/lint.py
 msgid "Also warn about formatting issues, like rewritemeta -l"
-msgstr "フォーマット上の問題についてもrewritemeta -lのように警告"
+msgstr ""
 
 #: ../fdroidserver/scanner.py
 msgid "Android AAR library"
-msgstr "AndroidのAARライブラリー"
+msgstr ""
 
 #: ../fdroidserver/scanner.py
 msgid "Android APK file"
-msgstr "AndroidのAPKファイル"
+msgstr ""
 
 #: ../fdroidserver/scanner.py
 msgid "Android DEX code"
-msgstr "AndroidのDEXコード"
+msgstr ""
 
-#: ../fdroidserver/init.py
+#: ../fdroidserver/common.py ../fdroidserver/build.py
 #, python-brace-format
-msgid "Android SDK not found at {path}!"
-msgstr "AndroidのSDKが{path}で見つかりません！"
+msgid "Android SDK '{path}' does not have '{dirname}' installed!"
+msgstr ""
+
+#: ../fdroidserver/common.py
+msgid "Android SDK not found!"
+msgstr ""
 
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "Android SDK path '{path}' does not exist!"
-msgstr "AndroidのSDKのパス「{path}」がありません！"
+msgstr ""
 
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "Android SDK path '{path}' is not a directory!"
 msgstr "Android SDK パス '{path}' はディレクトリではありません！"
 
+#. Translators: "build-tools" is the file name of a package from
+#. Google, it is part of the Android SDK. So it probably shouldn't be
+#. translated or transliterated.
 #: ../fdroidserver/common.py
 #, python-brace-format
-msgid "Android SDK tool {cmd} not found!"
-msgstr "AndroidのSDKツール {cmd} が見つかりません！"
+msgid "Android build-tools path '{path}' does not exist!"
+msgstr ""
 
-#: ../fdroidserver/lint.py
-msgid "App has Binaries but does not have corresponding AllowedAPKSigningKeys to pin certificate."
-msgstr "アプリにはバイナリーがありますが、それに対応する、証明書の固定用のAllowedAPKSigningKeysがありません。"
-
-#: ../fdroidserver/lint.py
-msgid "App has NoSourceSince or ArchivePolicy \"0 versions\" or 0 but AutoUpdateMode or UpdateCheckMode are not None"
-msgstr "アプリにNoSourceSinceまたは、\"0 versions\"か0のArchivePolicyが設定されていますが、AutoUpdateModeまたはUpdateCheckModeはNoneに設定されていません"
+#: ../fdroidserver/update.py
+msgid "AndroidManifest.xml has no date"
+msgstr ""
 
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "App is in '{repo}' but has a link to {url}"
-msgstr "アプリは「{repo}」にありますが{url}へのリンクが指定されています"
-
-#: ../fdroidserver/lint.py
-msgid "App version has binary but does not have corresponding AllowedAPKSigningKeys to pin certificate."
-msgstr "アプリのバージョンにはバイナリーがありますが、それに対応する、証明書の固定用のAllowedAPKSigningKeysがありません。"
+msgstr ""
 
 #: ../fdroidserver/lint.py
 msgid "Appending .git is not necessary"
-msgstr ".gitを最初に置く必要はありません"
+msgstr ""
 
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Archiving {apkfilename} with invalid signature!"
-msgstr "{apkfilename}のアーカイブの署名が正しくありません！"
-
-#: ../fdroidserver/lint.py
-msgid "AutoUpdateMode with UpdateCheckMode: HTTP must have a pattern."
-msgstr "UpdateCheckModeが有効になっているAutoUpdateMode：HTTPにパターンを設定してください。"
-
-#: ../fdroidserver/install.py
-msgid "Automatic no to all prompts."
-msgstr "すべてのプロンプトに対して自動的にnoを選択します。"
-
-#: ../fdroidserver/install.py
-msgid "Automatic yes to all prompts."
-msgstr "すべてのプロンプトに対して自動的にyesを選択します。"
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "Bad entry type \"{mirrortype}\" in mirrors config: {mirror}"
-msgstr "正しくないエントリーの種類「{mirrortype}」がミラーの設定ファイルの中にあります：{mirror}"
+msgstr ""
 
 #: ../fdroidserver/mirror.py
 msgid "Base URL to mirror, can include the index signing key using the query string: ?fingerprint="
-msgstr "ミラーのベースURLにはクエリーの文字列 ?fingerprint= を使ってインデックスの署名鍵を含めることができます。"
+msgstr ""
 
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "Branch '{branch}' used as commit in build '{versionName}'"
-msgstr "ブランチ「{branch}」が「{versionName}」のビルドのcommitとして使用されました"
+msgstr ""
 
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "Branch '{branch}' used as commit in srclib '{srclib}'"
-msgstr "ブランチ「{branch}」がsrclib「{srclib}」のcommitとして使用されました"
+msgstr ""
 
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Broken symlink: {path}"
-msgstr "symlinkが壊れています：{path}"
+msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Build a package from source"
-msgstr "パッケージをソースコードからビルド"
+msgstr ""
 
 #: ../fdroidserver/build.py
 msgid "Build all applications available"
-msgstr "利用できる全てのアプリケーションをビルド"
+msgstr ""
 
 #: ../fdroidserver/lint.py
 msgid "Build generated by `fdroid import` - remove disable line once ready"
-msgstr "ビルドが`fdroid import`により生成されました - 準備ができたら無効にする行を削除してください"
+msgstr ""
 
 #: ../fdroidserver/checkupdates.py
 msgid "Build metadata git repo has uncommited changes!"
-msgstr "ビルドのメタデータのgitリポジトリにcommitされていない変更があります！"
+msgstr ""
 
 #: ../fdroidserver/build.py
 msgid "Build only the latest version of each package"
-msgstr "各パッケージの最新バージョンのみをビルド"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Build should have comma-separated versionName and versionCode, not \"{value}\", in {linedesc}"
+msgstr ""
 
 #: ../fdroidserver/init.py
 #, python-format
 msgid "Built repo based in \"%s\" with this config:"
-msgstr "「%s」に基づきこの設定でリポジトリをビルドしました："
-
-#: ../fdroidserver/checkupdates.py
-msgid "Can't auto-update app with no CurrentVersionCode"
-msgstr "CurrentVersionCodeが指定されていないアプリを自動更新することはできません"
+msgstr ""
 
 #: ../fdroidserver/build.py
 msgid "Can't build due to {} error while scanning"
 msgid_plural "Can't build due to {} errors while scanning"
-msgstr[0] "スキャン時に{}個のエラーが発生したためビルドできません"
+msgstr[0] ""
 
-#: ../fdroidserver/common.py
-#, fuzzy, python-brace-format
-msgid "Cannot read {path}: {error}"
-msgstr "{path}を読み込めませんでした：{error}"
+#: ../fdroidserver/vmtools.py
+#, python-brace-format
+msgid "Cannot read \"{path}\"!"
+msgstr ""
+
+#. Translators: https://developer.android.com/studio/build/application-id
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Cannot resolve application ID {appid}"
+msgstr ""
 
 #: ../fdroidserver/rewritemeta.py
 #, python-brace-format
 msgid "Cannot rewrite \"{path}\""
-msgstr "「{path}」を書き換えられません"
+msgstr ""
+
+#: ../fdroidserver/rewritemeta.py
+msgid "Cannot use --list and --to at the same time"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Cannot write \"{path}\", not an accepted format, use: {formats}"
+msgstr ""
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
 #: ../fdroidserver/lint.py
 #, python-format
 msgid "Categories '%s' is not valid"
-msgstr "「%s」のカテゴリーは正しくありません"
+msgstr ""
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
 #: ../fdroidserver/lint.py
 msgid "Categories are not set"
-msgstr "カテゴリーが設定されていません"
+msgstr ""
 
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "Category \"{category}\" defined but not used for any apps!"
-msgstr "カテゴリーの「{category}」が規定されていますが、どのアプリによっても使用されていません！"
-
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Check for updates to applications"
-msgstr "アプリケーションの更新を確認"
+msgstr ""
 
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Checking archiving for {appid} - apks:{integer}, keepversions:{keep}, archapks:{arch}"
-msgstr "{appid}のアーカイブをチェックしています - apks:{integer}, keepversions:{keep}, archapks:{arch}"
+msgstr ""
+
+#: ../fdroidserver/dscanner.py
+msgid "Clean after all scans have finished"
+msgstr ""
+
+#: ../fdroidserver/dscanner.py
+msgid "Clean before the scans start and rebuild the container"
+msgstr ""
+
+#: ../fdroidserver/dscanner.py
+msgid "Clean up all containers and then exit"
+msgstr ""
 
 #: ../fdroidserver/update.py
 msgid "Clean update - don't uses caches, reprocess all APKs"
-msgstr "クリーンアップデート - キャッシュを使用せず、全てのAPKの再処理を行います"
+msgstr ""
 
-#: ../fdroidserver/common.py
-msgid "Color the log output"
-msgstr "ログ出力に色を付ける"
-
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "Comma separated list of categories."
-msgstr "コンマで区切られたカテゴリーの一覧。"
+msgstr ""
 
-#: ../fdroidserver/__main__.py
-#, python-format
+#: ../fdroid ../fdroidserver/__main__.py
+#, c-format, python-format
 msgid "Command '%s' not recognised.\n"
-msgstr "コマンド '%s' は認識されません。\n"
+msgstr ""
 
 #: ../fdroidserver/checkupdates.py
 msgid "Commit changes"
-msgstr "変更をcommit"
-
-#: ../fdroidserver/checkupdates.py
-msgid "Commit changes, push, then make a merge request"
-msgstr "変更をコミット、プッシュしてから、マージリクエストを作成してください"
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Conflicting \"{field}\" definitions between .yml and localized files:"
-msgstr "「{field}」の定義が.ymlと翻訳済の間で矛盾しています："
+msgstr ""
 
 #: ../fdroidserver/__main__.py
 msgid "Conflicting arguments: '--verbose' and '--quiet' can not be specified at the same time."
-msgstr "引数が矛盾しています：「--verbose」と「--quiet」を同時に設定することはできません。"
+msgstr ""
 
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "Could not find '{command}' on your system"
-msgstr "システム上で「{command}」が見つかりませんでした"
+msgstr ""
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "Could not find latest version code"
-msgstr "最新のバージョンコードが見つかりませんでした"
+msgstr ""
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "Could not find latest version name"
-msgstr "最新のバージョン名が見つかりませんでした"
+msgstr ""
 
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Could not find {path} to remove it"
-msgstr "削除するパス {path} が見つかりませんでした"
+msgstr ""
 
 #: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Could not open APK {path} for analysis: "
-msgstr "分析用にAPK {path} を開くことができませんでした: "
+msgid "Could not open apk file for analysis"
+msgstr ""
 
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "Could not parse size \"{size}\", wrong type \"{type}\""
-msgstr "サイズ「{size}」をパースできませんでした。種類「{type}」が正しくありません"
+msgstr ""
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/import_subcommand.py
+#. Translators: https://developer.android.com/studio/build/application-id
+#: ../fdroidserver/import.py
 msgid "Couldn't find Application ID"
-msgstr "アプリケーションIDが見つかりませんでした"
+msgstr ""
 
-#: ../fdroidserver/checkupdates.py
-msgid "Couldn't find any version information"
-msgstr "バージョン情報が見つかりませんでした"
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
+#: ../fdroidserver/import.py
+msgid "Couldn't find latest version code"
+msgstr ""
 
-#: ../fdroidserver/checkupdates.py
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
+#: ../fdroidserver/import.py
+msgid "Couldn't find latest version name"
+msgstr ""
+
+#: ../fdroidserver/import.py
 msgid "Couldn't find package ID"
-msgstr "パッケージIDが見つかりませんでした"
+msgstr ""
 
 #: ../fdroidserver/update.py
 msgid "Cowardily refusing to overwrite existing signing key setup!"
-msgstr "既存の署名鍵の設定の上書きは行いません！"
+msgstr ""
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/update.py
+msgid "Create a repo signing key in a keystore"
+msgstr ""
+
+#: ../fdroidserver/update.py
+msgid "Create skeleton metadata files that are missing"
+msgstr ""
+
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Created new container \"{name}\""
-msgstr "新しいコンテナー「{name}」を作成しました"
+msgstr ""
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Creating \"{path}\" for configuring s3cmd."
-msgstr "s3cmdの設定用に「{path}」を作成します。"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Creating empty {config_file}"
-msgstr "素の {config_file} を作成"
+msgstr ""
 
 #: ../fdroidserver/publish.py
 msgid "Creating log directory"
-msgstr "ログ用のディレクトリーを作成します"
+msgstr ""
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Creating new S3 bucket: {url}"
-msgstr "新しいS3のバケットを作成しています：{url}"
+msgstr ""
 
 #: ../fdroidserver/publish.py
 msgid "Creating output directory"
-msgstr "出力用のディレクトリを作成します"
+msgstr ""
 
 #: ../fdroidserver/index.py
 msgid "Creating signed index with this key (SHA256):"
-msgstr "この鍵（SHA256）で署名済のインデックスを作成します："
+msgstr ""
 
-#: ../fdroidserver/publish.py ../fdroidserver/verify.py
+#: ../fdroidserver/import.py ../fdroidserver/verify.py
+#: ../fdroidserver/publish.py
 msgid "Creating temporary directory"
-msgstr "一時ファイル用ディレクトリーを作成します"
+msgstr ""
 
 #: ../fdroidserver/index.py
 msgid "Creating unsigned index in preparation for signing"
-msgstr "署名されていないインデックスを署名用に準備します"
+msgstr ""
 
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "CurrentVersionCode {cv} is less than oldest build entry {versionCode}"
-msgstr "CurrentVersionCode {cv} が最も古いビルドのエントリーの{versionCode}よりも小さいです"
+msgstr ""
 
 #: ../fdroidserver/nightly.py
 msgid "DEBUG_KEYSTORE is not set or the value is incomplete"
-msgstr "DEBUG_KEYSTOREが設定されていないか値が不完全です"
+msgstr ""
 
 #: ../fdroidserver/update.py
 msgid "Delete APKs and/or OBBs without metadata from the repo"
-msgstr "メタデータの無いAPKとOBBをリポジトリから削除"
+msgstr ""
 
 #: ../fdroidserver/deploy.py
 #, python-brace-format
 msgid "Deleting archive, repo is too big ({size} max {limit})"
-msgstr "アーカイブを削除しています。リポジトリが大きすぎます（{size} 最大{limit}）"
+msgstr ""
 
 #: ../fdroidserver/deploy.py
 #, python-brace-format
 msgid "Deleting git-mirror history, repo is too big ({size} max {limit})"
-msgstr "git-mirrorの履歴を削除しています。リポジトリが大きすぎます（{size} 最大{limit}）"
+msgstr ""
 
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Deleting unknown file: {path}"
-msgstr "不明なファイルを削除します：{path}"
+msgstr ""
 
 #: ../fdroidserver/lint.py
 #, python-format
 msgid "Description '%s' is just the app's summary"
-msgstr "説明文「%s」がアプリの要約と同一です"
+msgstr ""
 
 #: ../fdroidserver/lint.py
 msgid "Description has a duplicate line"
-msgstr "説明文に重複する行があります"
+msgstr ""
+
+#: ../fdroidserver/lint.py
+#, python-format
+msgid "Description has a list (%s) but it isn't bulleted (*) nor numbered (#)"
+msgstr ""
 
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "Description of length {length} is over the {limit} char limit"
-msgstr "説明文の長さは{length}ですが、最大の文字数は{limit}です"
+msgstr ""
 
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Did you mean config/{name}.yml?"
-msgstr "config/{name}.ymlではないでしょうか？"
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Did you mean {code}?"
-msgstr "{code}ではないでしょうか？"
-
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "Do not add 'disable:' to the generated build entries"
-msgstr "生成したビルドのエントリーに「disable:」を追加しない"
+msgstr ""
 
 #: ../fdroidserver/nightly.py
 msgid "Do not deploy the new files to the repo"
-msgstr "新しいファイルをリポジトリに設定しない"
+msgstr ""
 
 #: ../fdroidserver/mirror.py
 #, python-brace-format
 msgid "Do not include \"{path}\" in URL!"
-msgstr "「{path}」をURLに含めないでください！"
+msgstr ""
 
 #: ../fdroidserver/init.py
 msgid "Do not prompt for Android SDK path, just fail"
-msgstr "AndroidのSDKのパスを確認せず、単に終了"
+msgstr ""
 
 #: ../fdroidserver/nightly.py
 msgid "Do not remove the private keys generated from the keystore"
-msgstr "キーストアから生成した秘密鍵を削除しない"
+msgstr ""
 
 #: ../fdroidserver/build.py
 msgid "Don't create a source tarball, useful when testing a build"
-msgstr "ソースのtarballを作成しない。ビルドのテスト時に便利です"
+msgstr ""
+
+#: ../fdroidserver/stats.py
+msgid "Don't do anything logs-related"
+msgstr ""
 
 #: ../fdroidserver/build.py
 msgid "Don't refresh the repository, useful when testing a build with no internet connection"
-msgstr "リポジトリを更新しない。インターネットに接続していないときにビルドをテストする際に便利です"
+msgstr ""
 
 #: ../fdroidserver/deploy.py ../fdroidserver/nightly.py
+#: ../fdroidserver/upload.py
 msgid "Don't use rsync checksums"
-msgstr "rsyncのチェックサムを使用しない"
+msgstr ""
 
-#: ../fdroidserver/install.py
-msgid "Download F-Droid.apk using mirrors that leak less to the network"
-msgstr "ネットワークへの情報漏洩が少ないミラーを使用してF-Droid.apkをダウンロードする"
-
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Download complete mirrors of small repos"
-msgstr "小さいリポジトリのミラーを完全にダウンロード"
+msgstr ""
+
+#: ../fdroidserver/stats.py
+msgid "Download logs we don't have"
+msgstr ""
 
 #: ../fdroidserver/common.py
 msgid "Downloading the repository already failed once, not trying again."
-msgstr "リポジトリのダウンロードは既に一度失敗しているので、再試行は行いません。"
+msgstr ""
 
 #: ../fdroidserver/verify.py
 #, python-brace-format
 msgid "Downloading {url} failed. {error}"
-msgstr "{url}をダウンロードできませんでした。{error}"
+msgstr ""
 
 #: ../fdroidserver/metadata.py
 #, python-brace-format
-msgid "Duplicate Anti-Feature declaration at {path} was ignored!"
-msgstr "{path}での好ましくない機能に関する重複した宣言は無視されました！"
-
-#: ../fdroidserver/index.py
-#, python-format
-msgid "Duplicate entry \"%s\" in mirrors config!"
-msgstr "ミラーの設定に重複するエントリー「%s」があります！"
+msgid "Duplicate build recipe found for versionCode {versionCode} in {linedesc}"
+msgstr ""
 
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "Duplicate link in '{field}': {url}"
-msgstr "「{field}」のリンクが重複しています：{url}"
+msgstr ""
 
-#: ../fdroidserver/common.py
-#, python-format
-msgid "ERROR: %(message)s"
-msgstr "エラー：%(message)s"
+#: ../fdroid
+msgid "Dynamically scan APKs post build"
+msgstr ""
 
 #: ../fdroidserver/__main__.py
 msgid "ERROR: The \"server\" subcommand has been removed, use \"deploy\"!"
-msgstr "エラー：「server」のサブコマンドは削除されました。「deploy」を使用してください！"
+msgstr ""
+
+#: ../fdroidserver/mirror.py
+msgid ""
+"ERROR: this command should never be used to mirror f-droid.org!\n"
+"A full mirror of f-droid.org requires more than 200GB."
+msgstr ""
 
 #: ../fdroidserver/nightly.py
 msgid "ERROR: unsupported CI type, patches welcome!"
-msgstr "エラー：サポートされていない種類のCIです。パッチを歓迎します！"
+msgstr ""
 
-#: ../fdroidserver/nightly.py
-#, python-format
-msgid "ERROR: unsupported git host \"%s\", patches welcome!"
-msgstr "エラー：サポートされていないgitのホスト「%s」です。パッチを歓迎します！"
-
-#: ../fdroidserver/lint.py
+#: ../fdroidserver/metadata.py
 #, python-brace-format
-msgid "ERROR: {key} in {path} is not \"archive\" or \"repo\"!"
-msgstr "エラー：{path}の{key}は「archive」でも「repo」でもありません！"
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "ERROR: {key} not a valid key!"
-msgstr "エラー：{key} が無効な値です！"
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "ERROR: {key}'s value should be of type {t}!"
-msgstr "エラー：{key} の値は {t} 型でなければいけません！"
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "ERROR: {key}:{subkey} in {path} is not in allowed keys: {allowed_keys}!"
-msgstr "エラー: {path}の{key}:{subkey}は許可されている鍵 {allowed_keys} の中にありません！"
+msgid "Empty build flag at {linedesc}"
+msgstr ""
 
 #: ../fdroidserver/__main__.py
 #, python-brace-format
 msgid "Encoding is set to '{enc}' fdroid might run into encoding issues. Please set it to 'UTF-8' for best results."
-msgstr "エンコーディングは「{enc}」に設定されています。fdroidでエンコードに関する問題が生じる可能性があります。最良の結果のために「UTF-8」に設定してください。"
+msgstr ""
 
 #: ../fdroidserver/init.py
 #, python-format
@@ -681,1637 +684,1610 @@ msgid ""
 "Enter the path to the Android SDK (%s) here:\n"
 "> "
 msgstr ""
-"ここにAndroidのSDK（%s）のパスを入力してください：\n"
-"> "
 
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Environment variable {var} from {configname} is not set!"
-msgstr "{configname}の環境変数 {var} が設定されていません！"
+#: ../fdroidserver/deploy.py ../fdroidserver/checkupdates.py
+#: ../fdroidserver/upload.py
+#, python-format
+msgid "Error while attempting to publish log: %s"
+msgstr ""
 
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Environment variable {{env: {var}}} is not set!"
-msgstr "環境変数{{env: {var}}}が未設定です！"
-
-#: ../fdroidserver/deploy.py
-msgid "Error deploying 'github_releases', {} not present. (You might need to run `fdroid update` first.)"
-msgstr "「github_releases」を設定する際にエラーが発生しました。{}がありません（まず`fdroid update`を実行する必要があるかもしれません）。"
-
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py ../fdroidserver/common.py
 msgid "Error while getting repo address"
-msgstr "リポジトリのアドレスを取得する際にエラーが発生しました"
+msgstr ""
 
-#: ../fdroidserver/scanner.py
-msgid "Exit with a non-zero code if problems were found"
-msgstr "問題が発生した場合に0以外のコードを出力して終了"
-
-#: ../fdroidserver/__main__.py
-msgid "Extract application metadata from a source repository"
-msgstr "ソースリポジトリからアプリケーションのメタデータを抽出"
-
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Extract signatures from APKs"
-msgstr "APKから署名を抽出"
-
-#: ../fdroidserver/install.py
-msgid "F-Droid.apk could not be downloaded from any known source!"
-msgstr "既知のソースからF-Droid.apkをダウンロードできませんでした！"
+msgstr ""
 
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Failed copying {path}: {error}"
-msgstr "{path}をコピーできませんでした：{error}"
+msgstr ""
 
 #: ../fdroidserver/signatures.py
 #, python-brace-format
 msgid "Failed fetching signatures for '{apkfilename}': {error}"
-msgstr "「{apkfilename}」の署名を取得できませんでした：{error}"
+msgstr ""
 
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Failed reading {path}: {error}"
-msgstr "{path}を読み込めませんでした：{error}"
+msgstr ""
 
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Failed resizing {path}: {error}"
-msgstr "{path}のサイズを変更できませんでした：{error}"
+msgstr ""
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/publish.py
+msgid "Failed to align application"
+msgstr ""
+
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Failed to create S3 bucket: {url}"
-msgstr "S3のバケットを作成できませんでした：{url}"
+msgstr ""
+
+#: ../fdroidserver/common.py
+msgid "Failed to get APK manifest information"
+msgstr ""
 
 #: ../fdroidserver/update.py
 #, python-brace-format
-msgid "Failed to get APK information, deleting {path}"
-msgstr "APKの情報を取得できませんでした。{path}を削除します"
+msgid "Failed to get apk information, deleting {path}"
+msgstr ""
 
 #: ../fdroidserver/update.py
 #, python-brace-format
-msgid "Failed to get APK information, skipping {path}"
-msgstr "APKの情報を取得できませんでした。{path}をスキップします"
-
-#: ../fdroidserver/update.py
-msgid "Failed to get APK signing key fingerprint"
-msgstr "APKの署名鍵のフィンガープリントを取得できませんでした"
+msgid "Failed to get apk information, skipping {path}"
+msgstr ""
 
 #: ../fdroidserver/install.py
 #, python-brace-format
 msgid "Failed to install '{apkfilename}' on {dev}: {error}"
-msgstr "「{apkfilename}」を{dev}にインストールできませんでした：{error}"
+msgstr ""
+
+#: ../fdroidserver/publish.py ../fdroidserver/common.py
+msgid "Failed to sign application"
+msgstr ""
 
 #: ../fdroidserver/common.py
-msgid "Failed to sign application"
-msgstr "アプリケーションに署名できませんでした"
+msgid "Failed to zipalign application"
+msgstr ""
 
 #: ../fdroidserver/build.py
 #, python-brace-format
 msgid "Fetched buildserverid from VM: {buildserverid}"
-msgstr "buildserveridをVMから取得しました：{buildserverid}"
+msgstr ""
 
 #: ../fdroidserver/signatures.py
 #, python-brace-format
 msgid "Fetched signatures for '{apkfilename}' -> '{sigdir}'"
-msgstr "「{apkfilename}」→「{sigdir}」の署名鍵を取得しました"
+msgstr ""
 
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "File disappeared while processing it: {path}"
-msgstr "ファイルが処理中に消去されました：{path}"
+msgstr ""
 
-#: ../fdroidserver/build.py ../fdroidserver/install.py
-#: ../fdroidserver/rewritemeta.py ../fdroidserver/scanner.py
-#: ../fdroidserver/update.py
+#: ../fdroidserver/verify.py ../fdroidserver/stats.py ../fdroidserver/update.py
+#: ../fdroidserver/rewritemeta.py ../fdroidserver/build.py
+#: ../fdroidserver/checkupdates.py ../fdroidserver/scanner.py
+#: ../fdroidserver/install.py
 msgid "Finished"
-msgstr "終了"
+msgstr ""
+
+#: ../fdroidserver/lint.py
+msgid "Flattr donation methods belong in the FlattrID flag"
+msgstr ""
+
+#: ../fdroidserver/lint.py
+msgid "Flattr donation methods belong in the FlattrID: field"
+msgstr ""
 
 #: ../fdroidserver/lint.py
 msgid "Forbidden HTML tags"
-msgstr "禁止されているHTMLのタグ"
+msgstr ""
 
 #: ../fdroidserver/build.py
 msgid "Force build of disabled apps, and carries on regardless of scan problems. Only allowed in test mode."
-msgstr "無効に設定されているアプリのビルドを強制し、スキャンの問題にかかわらず実行。テストモードでのみ許可。"
+msgstr ""
 
 #: ../fdroidserver/build.py
 #, python-brace-format
 msgid "Force halting build after {0} sec timeout!"
-msgstr "{0}秒のタイムアウトの後でビルドを強制的に停止します！"
+msgstr ""
 
 #: ../fdroidserver/scanner.py
 msgid "Force scan of disabled apps and builds."
-msgstr "無効に設定されているアプリとビルドを強制的にスキャン。"
+msgstr ""
 
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Found \"{path}\" graphic without metadata for app \"{name}\"!"
-msgstr "アプリ「{name}」のメタデータなしに「{path}\"」のグラフィックを発見しました！"
+msgstr ""
 
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Found bad funding file \"{path}\" for \"{name}\":"
-msgstr "「{name}」の不正な調達用ファイル「{path}」が見つかりました："
+msgstr ""
 
 #: ../fdroidserver/common.py
 msgid "Found invalid appids in arguments"
-msgstr "引数に不正なappidがあります"
+msgstr ""
 
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
 #: ../fdroidserver/common.py
 msgid "Found invalid versionCodes for some apps"
-msgstr "いくつかのアプリのバージョンコードが正しくありません"
+msgstr ""
 
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "Found multiple JAR Signature Block Files in {path}"
-msgstr "複数のJAR署名ブロックファイルが{path}で見つかりました"
-
-#: ../fdroidserver/common.py
-msgid "Found multiple Signer Certificates!"
-msgstr "署名者の複数の証明書が見つかりました！"
+msgstr ""
 
 #: ../fdroidserver/metadata.py
 #, python-brace-format
 msgid "Found multiple metadata files for {appid}"
-msgstr "{appid}に複数のメタデータのファイルが見つかりました"
+msgstr ""
 
 #: ../fdroidserver/index.py
 msgid "Found multiple signing certificates for repository."
-msgstr "リポジトリの署名用の証明書が複数見つかりました。"
+msgstr ""
+
+#: ../fdroidserver/update.py
+#, python-brace-format
+msgid "Found multiple signing certificates in {path}"
+msgstr ""
 
 #: ../fdroidserver/index.py
 msgid "Found no signing certificates for repository."
-msgstr "リポジトリの署名用の証明書が見つかりませんでした。"
+msgstr ""
 
 #: ../fdroidserver/lint.py
 #, python-format
 msgid "Found non-file at %s"
-msgstr "%sで不正なファイルが見つかりました"
+msgstr ""
 
 #: ../fdroidserver/deploy.py
 #, python-brace-format
 msgid "Found {apkfilename} at {url}"
-msgstr "{apkfilename}が{url}で見つかりました"
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Found {count} problems in {filename}"
-msgstr "{filename}で{count}個の問題が見つかりました"
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Found {count} warnings in {filename}"
-msgstr "{filename}で{count}個の警告が見つかりました"
+msgstr ""
 
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Generated skeleton metadata for {appid}"
-msgstr "{appid}用に空のメタデータを生成しました"
+msgstr ""
 
 #: ../fdroidserver/common.py
 #, python-format
 msgid "Git checkout of '%s' failed"
-msgstr "Gitで「%s」のcheckoutを実行できませんでした"
+msgstr ""
 
 #: ../fdroidserver/common.py
 msgid "Git clean failed"
-msgstr "Git cleanを実行できませんでした"
+msgstr ""
 
 #: ../fdroidserver/common.py
 msgid "Git fetch failed"
-msgstr "Git fetchを実行できませんでした"
+msgstr ""
+
+#: ../fdroidserver/common.py
+msgid "Git remote set-head failed"
+msgstr ""
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
 #: ../fdroidserver/common.py
 #, python-format
 msgid "Git remote set-head failed: \"%s\""
-msgstr "Git remoteでset-headを実行できませんでした：\"%s\""
+msgstr ""
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
 #: ../fdroidserver/common.py
 msgid "Git reset failed"
-msgstr "Git resetを実行できませんでした"
-
-#: ../fdroidserver/common.py
-msgid "Git submodule deinit failed"
-msgstr "Git submodule deinitを実行できませんでした"
+msgstr ""
 
 #: ../fdroidserver/common.py
 msgid "Git submodule sync failed"
-msgstr "Git submodule syncを実行できませんでした"
+msgstr ""
 
 #: ../fdroidserver/common.py
 msgid "Git submodule update failed"
-msgstr "Git submodule updateを実行できませんでした"
+msgstr ""
 
 #: ../fdroidserver/common.py
 msgid "HTTPS must be used with Subversion URLs!"
-msgstr "SubversionのURLにはHTTPSを使用してください！"
+msgstr ""
 
 #: ../fdroidserver/deploy.py
 msgid "If a git mirror gets to big, allow the archive to be deleted"
-msgstr "gitのミラーが大きくなった場合に、アーカイブの削除を許可"
+msgstr ""
 
 #: ../fdroidserver/deploy.py
 #, python-brace-format
 msgid "If this upload fails, try manually uploading to {url}"
-msgstr "このアップロードを行えなかった場合は、手動で{url}にアップロードしてみてください"
+msgstr ""
 
 #: ../fdroidserver/metadata.py
 #, python-brace-format
 msgid "Ignoring '{field}' in '{metapath}' metadata because it is deprecated."
-msgstr "「{metapath}」の「{field}」のメタデータは非推奨となったため、無視します。"
+msgstr ""
 
 #: ../fdroidserver/update.py
 #, python-format
 msgid "Ignoring FUNDING.yml entry longer than 2048: %s"
-msgstr "2024より長いFUNDING.ymlは無視します：%s"
-
-#: ../fdroidserver/update.py
-#, python-format
-msgid "Ignoring bad element in manifest: %s"
-msgstr "manifestの正しくない要素を無視します：%s"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Ignoring deprecated {oldfile}, use {newfile}!"
-msgstr "{oldfile}は非推奨です。{newfile}を使用してください！"
+msgstr ""
 
 #: ../fdroidserver/index.py
 msgid "Ignoring package without metadata: "
-msgstr "メタデータのないパッケージは無視します： "
+msgstr ""
 
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Ignoring stale cache data for {apkfilename}"
-msgstr "{apkfilename}の古いキャッシュデータを無視"
+msgstr ""
+
+#: ../fdroidserver/rewritemeta.py
+#, python-brace-format
+msgid "Ignoring {ext} file at '{path}'"
+msgstr ""
 
 #: ../fdroidserver/update.py
 msgid "Include APKs that are signed with disabled algorithms like MD5"
-msgstr "MD5などの無効に設定されているアルゴリズムで署名されているAPKを含める"
+msgstr ""
 
 #: ../fdroidserver/mirror.py
 msgid "Include the PGP signature .asc files in the mirror"
-msgstr "ミラーのPGP署名の .ascファイルを含める"
+msgstr ""
 
 #: ../fdroidserver/mirror.py
 msgid "Include the build logs in the mirror"
-msgstr "ミラーのビルド時のログを含める"
+msgstr ""
 
 #: ../fdroidserver/mirror.py
 msgid "Include the source tarballs in the mirror"
-msgstr "ミラーのソースコードのtarballを含める"
-
-#: ../fdroidserver/metadata.py
-#, python-format
-msgid "Including metadata from %s@%s"
-msgstr "%s@%sのメタデータを含める"
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Including metadata from {path}"
-msgstr "{path}のメタデータを含める"
+msgstr ""
 
 #: ../fdroidserver/common.py
 msgid "Initialising submodules"
-msgstr "submoduleを初期化しています"
+msgstr ""
 
 #: ../fdroidserver/install.py
 msgid "Install all signed applications available"
-msgstr "署名済で利用できる全てのアプリケーションをインストール"
+msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Install built packages on devices"
-msgstr "ビルドしたパッケージを端末にインストール"
+msgstr ""
 
 #: ../fdroidserver/install.py
 #, python-format
 msgid "Installing %s..."
-msgstr "%sをインストールしています…"
+msgstr ""
+
+#: ../fdroidserver/install.py
+#, python-format
+msgid "Installing %s…"
+msgstr ""
 
 #: ../fdroidserver/install.py
 #, python-brace-format
 msgid "Installing '{apkfilename}' on {dev}..."
-msgstr "{dev}に「{apkfilename}」をインストールしています…"
+msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroidserver/install.py
+#, python-brace-format
+msgid "Installing '{apkfilename}' on {dev}…"
+msgstr ""
+
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Interact with the repo HTTP server"
-msgstr "リポジトリのHTTPサーバーと通信"
+msgstr ""
 
 #: ../fdroidserver/update.py
 msgid "Invalid APK"
-msgstr "不正なAPKです"
+msgstr ""
 
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "Invalid AutoUpdateMode: {mode}"
-msgstr "不正なAutoUpdateModeです：{mode}"
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "Invalid UpdateCheckMode: {mode}"
-msgstr "不正なUpdateCheckModeです：{mode}"
-
-#: ../fdroidserver/checkupdates.py
+#: ../fdroidserver/lint.py ../fdroidserver/checkupdates.py
 #, python-brace-format
 msgid "Invalid VercodeOperation: {field}"
-msgstr "不正なVercodeOperationです：{field}"
+msgstr ""
 
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Invalid VercodeOperation: {invalid_ops}"
-msgstr "不正なVercodeOperationです：{invalid_ops}"
-
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "Invalid application ID {appid}"
-msgstr "不正なアプリケーションIDです {appid}"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+#, python-format
+msgid "Invalid boolean '%s'"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Invalid build flag at {line} in {linedesc}"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Invalid build format: {value} in {name}"
+msgstr ""
 
 #: ../fdroidserver/lint.py
 msgid "Invalid bulleted list"
-msgstr "不正な箇条書きリストです"
+msgstr ""
+
+#: ../fdroidserver/lint.py
+#, python-format
+msgid "Invalid license tag \"%s\"! Use only tags from https://spdx.org/license-list"
+msgstr ""
+
+#: ../fdroidserver/lint.py
+msgid "Invalid link - use [http://foo.bar Link title] or [http://foo.bar]"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+#, python-format
+msgid "Invalid metadata in %s:%d"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+msgid "Invalid metadata in: "
+msgstr ""
 
 #: ../fdroidserver/common.py
 #, python-format
 msgid "Invalid name for published file: %s"
-msgstr "公開済のファイルの不正な名前です：%s"
+msgstr ""
 
 #: ../fdroidserver/common.py
 #, python-brace-format
-msgid "Invalid ndk: entry in build: \"{ndk}\""
-msgstr "不正なndkです：ビルドのエントリー：「{ndk}」"
+msgid "Invalid package name {0}"
+msgstr ""
 
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "Invalid redirect to non-HTTPS: {before} -> {after} "
-msgstr "非HTTPSへの不正なリダイレクトです：{before} → {after} "
+msgstr ""
 
 #: ../fdroidserver/metadata.py
 #, python-brace-format
 msgid "Invalid scrlib metadata: '{file}' does not exist"
-msgstr "不正なscrlibのメタデータです：「{file}」はありません"
+msgstr ""
 
 #: ../fdroidserver/metadata.py
 #, python-brace-format
 msgid "Invalid srclib metadata: could not parse '{file}'"
-msgstr "不正なscrlibのメタデータです：「{file}」をパースできませんでした"
+msgstr ""
 
 #: ../fdroidserver/metadata.py
 #, python-brace-format
 msgid "Invalid srclib metadata: unknown key '{key}' in '{file}'"
-msgstr "不正なscrlibのメタデータです：「{file}」の「{key}」は不明な鍵です"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Invalid versionCode: \"{versionCode}\" is not an integer!"
+msgstr ""
 
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "JAR signature failed to verify: {path}"
-msgstr "JAR署名を検証できませんでした：{path}"
+msgstr ""
 
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "JAR signature verified: {path}"
-msgstr "JAR署名を検証しました：{path}"
+msgstr ""
 
 #: ../fdroidserver/scanner.py
 msgid "Java JAR file"
-msgstr "JavaのJARファイル"
+msgstr ""
 
-#: ../fdroidserver/mirror.py ../fdroidserver/publish.py
-#: ../fdroidserver/update.py
+#: ../fdroidserver/publish.py ../fdroidserver/update.py
+#: ../fdroidserver/mirror.py
 msgid "Java JDK not found! Install in standard location or set java_paths!"
-msgstr "JavaのJDKが見つかりませんでした！標準的な場所にインストールするかjava_pathsを指定してください！"
+msgstr ""
 
 #: ../fdroidserver/scanner.py
 msgid "Java compiled class"
-msgstr "Javaのコンパイル済のクラス"
+msgstr ""
 
 #: ../fdroidserver/signindex.py
 msgid "Java jarsigner not found! Install in standard location or set java_paths!"
-msgstr "Javaのjarsignerが見つかりませんでした！標準的な場所にインストールするかjava_pathsを指定してください！"
+msgstr ""
 
 #: ../fdroidserver/lint.py
 msgid "Javascript in HTML src attributes"
-msgstr "HTMLのsrc属性におけるJavaScript"
-
-#: ../fdroidserver/build.py
-#, python-brace-format
-msgid "Keeping failed build \"{apkfilename}\""
-msgstr "「{apkfilename}」の失敗したビルドを保存"
+msgstr ""
 
 #: ../fdroidserver/init.py
 msgid "Keystore for signing key:\t"
-msgstr "署名鍵用のキーストア:\t"
-
-#: ../fdroidserver/lint.py
-msgid "Known debug key is used in AllowedAPKSigningKeys: "
-msgstr "既知のデバッグ鍵がAllowedAPKSigningKeysで使われています： "
+msgstr ""
 
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "Last used commit '{commit}' looks like a tag, but UpdateCheckMode is '{ucm}'"
-msgstr "最後に使用されたcommit「{commit}」はタグのようですが、UpdateCheckModeは「{ucm}」です"
+msgstr ""
 
 #: ../fdroidserver/lint.py
 msgid "Liberapay donation methods belong in the Liberapay: field"
-msgstr "Liberapayによる寄付の方法は、Liberapay: フィールドに属します"
+msgstr ""
+
+#: ../fdroidserver/lint.py
+msgid "Liberapay donation methods belong in the LiberapayID flag"
+msgstr ""
 
 #: ../fdroidserver/rewritemeta.py
-msgid "List files that would be reformatted (dry run)"
-msgstr "再フォーマットされるファイルのリスト（テスト）"
+msgid "List files that would be reformatted"
+msgstr ""
 
 #: ../fdroidserver/lint.py
 msgid "Locale included in f-droid.org URL"
-msgstr "ロケールはf-droid.orgのURLに含まれます"
+msgstr ""
 
 #: ../fdroidserver/build.py
 msgid "Make the build stop on exceptions"
-msgstr "例外発生時にビルドを停止"
+msgstr ""
 
 #: ../fdroidserver/index.py
 msgid "Malformed repository mirrors."
-msgstr "リポジトリのミラーの形式が不正です。"
+msgstr ""
 
 #: ../fdroidserver/deploy.py
 msgid "Malformed serverwebroot line:"
-msgstr "serverwebrootの行の形式が不正です："
-
-#: ../fdroidserver/scanner.py
-#, python-format
-msgid "Max recursion depth in ZIP file reached: %s"
-msgstr "ZIPファイルの最大の再帰階層に到達しました：%s"
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "Mirror config for {url} contains \"isPrimary\" key!"
-msgstr "{url} のミラー設定に \"isPrimary\" キーが含まれています！"
+msgstr ""
 
 #: ../fdroidserver/mirror.py
 msgid "Mirror the full repo and archive, all file types."
-msgstr "完全なリポジトリとアーカイブ、全てのファイルの種類のミラーリング。"
+msgstr ""
 
 #: ../fdroidserver/gpgsign.py
 msgid "Missing output directory"
-msgstr "出力用ディレクトリーがありません"
+msgstr ""
 
-#: ../fdroidserver/metadata.py
-msgid "Moving Anti-Features declarations to localized files:"
-msgstr "好ましくない機能の宣言を翻訳済のファイルに移動します："
-
-#: ../fdroidserver/index.py
-msgid "Neither \"repo_pubkey\" nor \"keystorepass\" set in config.yml"
-msgstr "「repo_pubkey」と「keystorepass」のいずれもconfig.ymlで設定されていません"
-
-#: ../fdroidserver/verify.py
+#: ../fdroidserver/lint.py
 #, python-format
-msgid "No APK for package: %s"
-msgstr "パッケージのAPKがありません：%s"
+msgid "Name '%s' is just the auto name - remove it"
+msgstr ""
+
+#: ../fdroidserver/common.py
+msgid "No 'config.py' found, using defaults."
+msgstr ""
 
 #: ../fdroidserver/common.py
 msgid "No Android SDK found!"
-msgstr "AndroidのSDKが見つかりません！"
+msgstr ""
+
+#: ../fdroidserver/import.py
+msgid "No android or kivy project could be found. Specify --subdir?"
+msgstr ""
 
 #: ../fdroidserver/install.py
 msgid "No attached devices found"
-msgstr "接続している端末が見つかりません"
+msgstr ""
 
-#: ../fdroidserver/install.py
-msgid "No devices found for `adb install`! Please plug one in."
-msgstr "`adb install`を実行するデバイスが見つかりません！デバイスを接続してください。"
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "No commit specified for {versionName} in {linedesc}"
+msgstr ""
 
 #: ../fdroidserver/index.py
 msgid "No fingerprint in URL."
-msgstr "URLにフィンガープリントがありません。"
+msgstr ""
 
 #: ../fdroidserver/common.py
 msgid "No git submodules available"
-msgstr "利用できるgitのサブモジュールがありません"
+msgstr ""
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "No gradle project could be found. Specify --subdir?"
-msgstr "gradleプロジェクトが見つかりませんでした。--subdirを指定しますか？"
+msgstr ""
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py ../fdroidserver/common.py
 msgid "No information found."
-msgstr "情報が見つかりません。"
-
-#: ../fdroidserver/checkupdates.py
-msgid "No matching tags found"
-msgstr "一致するタグが見つかりません"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "No minimum SDK version found in {0}, using default (3)."
-msgstr "SDKの最小バージョンが{0}で見つかりません。既定 (3) を使用します。"
+msgstr ""
 
 #: ../fdroidserver/lint.py
 msgid "No need to specify that the app is Free Software"
-msgstr "アプリが自由ソフトウェアであることを指定する必要はありません"
+msgstr ""
 
 #: ../fdroidserver/lint.py
 msgid "No need to specify that the app is for Android"
-msgstr "アプリがAndroid向けであることを指定する必要はありません"
+msgstr ""
 
 #: ../fdroidserver/deploy.py
-msgid "No option set! Edit your config.yml to set at least one of these:"
-msgstr "オプションが設定されていません！config.ymlを編集して、以下の少なくとも1つを設定してください。"
+msgid "No option set! Edit your config.py to set at least one of these:"
+msgstr ""
 
 #: ../fdroidserver/common.py
 msgid "No packages specified"
-msgstr "パッケージが指定されていません"
+msgstr ""
 
 #: ../fdroidserver/install.py
 #, python-format
-msgid "No signed APK available for %s"
-msgstr "利用できる%sの署名済のAPKがありません"
+msgid "No signed apk available for %s"
+msgstr ""
 
 #: ../fdroidserver/install.py
 msgid "No signed output directory - nothing to do"
-msgstr "署名済の出力用ディレクトリーがありません - 何も実行しません"
+msgstr ""
 
-#: ../fdroidserver/common.py
+#: ../fdroidserver/update.py ../fdroidserver/common.py
 #, python-brace-format
 msgid "No signing certificates found in {path}"
-msgstr "{path}で署名用の証明書が見つかりません"
+msgstr ""
 
 #: ../fdroidserver/common.py
 #, python-format
 msgid "No such package: %s"
-msgstr "そのようなパッケージはありません：%s"
+msgstr ""
 
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "No such versionCode {versionCode} for app {appid}"
-msgstr "アプリ {appid} にそのようなバージョンコード {versionCode} はありません"
+msgstr ""
 
-#: ../fdroidserver/checkupdates.py
-msgid "No tags found"
-msgstr "タグが見つかりません"
-
-#: ../fdroidserver/publish.py ../fdroidserver/verify.py
+#: ../fdroidserver/verify.py ../fdroidserver/publish.py
 msgid "No unsigned directory - nothing to do"
-msgstr "署名されていないディレクトリーがありません - 何も実行しません"
-
-#: ../fdroidserver/__main__.py
-msgid "No version information could be found."
-msgstr "バージョンの情報が見つかりませんでした。"
+msgstr ""
 
 #: ../fdroidserver/common.py
 msgid "Not a valid size definition: \"{}\""
-msgstr "正しいサイズの定義ではありません：「{}」"
+msgstr ""
 
 #: ../fdroidserver/signindex.py
 msgid "Nothing to do"
-msgstr "何も実行しません"
+msgstr ""
 
 #: ../fdroidserver/checkupdates.py
 #, python-brace-format
 msgid "Nothing to do for {appid}."
-msgstr "{appid}について実行することは何もありません。"
+msgstr ""
 
 #: ../fdroidserver/init.py
-msgid "Now set these in config.yml:"
-msgstr "これらをconfig.ymlに設定してください："
+msgid "Now set these in config.py:"
+msgstr ""
 
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "OBB file has newer versionCode({integer}) than any APK:"
-msgstr "OBBのファイルはどのAPKよりも新しいバージョンコード（{integer}）を備えています："
+msgstr ""
 
 #: ../fdroidserver/update.py
 msgid "OBB filename must start with \"main.\" or \"patch.\":"
-msgstr "OBBのファイル名は「main.」または「patch.」から始まる必要があります："
+msgstr ""
 
 #: ../fdroidserver/update.py
 msgid "OBB's packagename does not match a supported APK:"
-msgstr "OBBのパッケージ名はサポートしているAPKと一致しません："
+msgstr ""
 
 #: ../fdroidserver/deploy.py
 msgid "Offline machine, skipping git mirror generation until `fdroid deploy`"
-msgstr "オフラインのマシンです。`fdroid deploy` を実行するまでgitのミラーの生成はスキップします"
+msgstr ""
 
-#: ../fdroidserver/deploy.py
-msgid "One of the 'github_releases' config items is missing the 'packageNames' value. skipping ..."
-msgstr "「github_releases」の設定項目の1つに「packageNames」の値が設定されていません。スキップします…"
+#: ../fdroidserver/common.py
+#, python-brace-format
+msgid "Old APK signature failed to verify: {path}"
+msgstr ""
 
-#: ../fdroidserver/deploy.py
-msgid "One of the 'github_releases' config items is missing the 'projectUrl' value. skipping ..."
-msgstr "「github_releases」の設定項目の1つに「projectUrl」の値が設定されていません。スキップします…"
+#: ../fdroid ../fdroidserver/__main__.py
+msgid "Old, deprecated name for fdroid deploy"
+msgstr ""
 
-#: ../fdroidserver/deploy.py
-msgid "One of the 'github_releases' config items is missing the 'token' value. skipping ..."
-msgstr "「github_releases」の設定項目の1つに「token」の値が設定されていません。スキップします…"
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Only PNG and JPEG are supported for graphics, found: {path}"
-msgstr "画像にはPNGとJPEGのみをサポートします。これが見つかりました：{path}"
+msgstr ""
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/common.py
-msgid "Only accepts a single key \"env\""
-msgstr "単一キー \"env\" のみを受け付けます"
+#: ../fdroidserver/checkupdates.py
+msgid "Only print differences with the Play Store"
+msgstr ""
 
 #: ../fdroidserver/checkupdates.py
 msgid "Only process apps with auto-updates"
-msgstr "自動アップデートのアプリのみを処理"
+msgstr ""
 
 #: ../fdroidserver/lint.py
 msgid "OpenCollective donation methods belong in the OpenCollective: field"
-msgstr "OpenCollectiveの寄付の方法はOpenCollective: フィールドに属します"
+msgstr ""
+
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "Options"
+msgstr ""
 
 #: ../fdroidserver/verify.py
 msgid "Output JSON report to file named after APK."
-msgstr "APKに従った名前のファイルでJSONのレポートを出力。"
+msgstr ""
 
 #: ../fdroidserver/scanner.py
 msgid "Output JSON to stdout."
-msgstr "標準出力にJSONを出力。"
+msgstr ""
 
-#: ../fdroidserver/checkupdates.py ../fdroidserver/gpgsign.py
-#: ../fdroidserver/publish.py ../fdroidserver/signindex.py
-#: ../fdroidserver/update.py
+#: ../fdroidserver/gpgsign.py ../fdroidserver/publish.py
+#: ../fdroidserver/update.py ../fdroidserver/signindex.py
+#: ../fdroidserver/checkupdates.py
 msgid "Outputting JSON"
-msgstr "JSONを出力"
+msgstr ""
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "Overall license of the project."
-msgstr "プロジェクト全体のライセンス。"
+msgstr ""
+
+#: ../fdroidserver/dscanner.py
+msgid "Override path for repo APKs (default: ./repo)"
+msgstr ""
 
 #: ../fdroidserver/index.py
 #, python-brace-format
 msgid "Overriding blank versionName in {apkfilename} from metadata: {version}"
-msgstr "{apkfilename}の空のバージョン名をメタデータで指定：{version}"
+msgstr ""
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 #, python-brace-format
 msgid "Package \"{appid}\" already exists"
-msgstr "パッケージ「{appid}」は既に存在します"
+msgstr ""
 
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "Parsing manifest at '{path}'"
-msgstr "「{path}」のmanifestをパースしています"
+msgstr ""
 
 #: ../fdroidserver/common.py
 msgid "Password required with username"
-msgstr "パスワードはユーザー名が必要です"
+msgstr ""
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "Path to main Android project subdirectory, if not in root."
-msgstr "主なAndroidのプロジェクトのサブディレクトリーへのパス（ルートにない場合）。"
+msgstr ""
+
+msgid "Path to main android project subdirectory, if not in root."
+msgstr ""
 
 #: ../fdroidserver/init.py
 msgid "Path to the Android SDK (sometimes set in ANDROID_HOME)"
-msgstr "AndroidのSDKへのパス（ANDROID_HOMEで設定されている場合があります）"
+msgstr ""
 
 #: ../fdroidserver/btlog.py
 msgid "Path to the git repo to use as the log"
-msgstr "ログとして使用するgitのリポジトリへのパス"
+msgstr ""
 
 #: ../fdroidserver/init.py
 msgid "Path to the keystore for the repo signing key"
-msgstr "リポジトリの署名鍵のキーストアへのパス"
+msgstr ""
+
+#: ../fdroidserver/dscanner.py
+msgid "Prepare Drozer to run a scan"
+msgstr ""
+
+msgid "Prepare drozer to run a scan"
+msgstr ""
 
 #: ../fdroidserver/nightly.py
 msgid "Print the secret variable to the terminal for easy copy/paste"
-msgstr "簡単にコピー、ペーストできるように秘密の変数をターミナルに出力"
+msgstr ""
 
-#: ../fdroidserver/install.py
+#: ../fdroidserver/metadata.py
 #, python-brace-format
-msgid "Privacy mode was enabled based on your locale ({country_code})."
-msgstr "ロケール（{country_code}）に基づいてプライバシー モードが有効になりました。"
-
-#: ../fdroidserver/scanner.py
-#, python-format
-msgid "Problem with ZIP file: %s, error %s"
-msgstr "ZIPファイルに問題が見つかりました：%s、エラー %s"
+msgid "Problem with description of {appid}: {error}"
+msgstr ""
 
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "Problem with xml at '{path}'"
-msgstr "「{path}」のxmlに問題が見つかりました"
+msgstr ""
 
 #: ../fdroidserver/checkupdates.py
 msgid "Process auto-updates"
-msgstr "自動更新を実行"
+msgstr ""
 
 #: ../fdroidserver/publish.py ../fdroidserver/update.py
 #, python-brace-format
 msgid "Processing {apkfilename}"
-msgstr "{apkfilename}を処理"
+msgstr ""
 
 #: ../fdroidserver/checkupdates.py ../fdroidserver/scanner.py
 #, python-brace-format
 msgid "Processing {appid}"
-msgstr "{appid}を処理"
+msgstr ""
 
 #: ../fdroidserver/update.py
 msgid "Produce human-readable XML/JSON for index files"
-msgstr "インデックスファイルに可読性があるXMLまたはJSONを出力"
+msgstr ""
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/update.py
+msgid "Produce human-readable index.xml"
+msgstr ""
+
+#: ../fdroidserver/import.py
 msgid "Project URL to import from."
-msgstr "プロジェクトのインポート元のURL。"
+msgstr ""
 
 #: ../fdroidserver/lint.py
 msgid "Punctuation should be avoided"
-msgstr "句読点は使うべきではありません"
+msgstr ""
 
 #: ../fdroidserver/btlog.py
 msgid "Push the log to this git remote repository"
-msgstr "ログをこのgit remoteリポジトリに送信"
+msgstr ""
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Pushing binary transparency log to {url}"
-msgstr "バイナリーの透明性のログを{url}に送信"
+msgstr ""
 
-#: ../fdroidserver/deploy.py
-msgid "Pushing to remote server failed!"
-msgstr "遠隔サーバーに送信できませんでした！"
-
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Pushing to {url}"
-msgstr "{url}に送信"
+msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Quickly start a new repository"
-msgstr "新しいリポジトリをすぐに開始"
+msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Read all the metadata files and exit"
-msgstr "メタデータの全てのファイルを読み込んで終了"
+msgstr ""
 
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "Reading '{config_file}'"
-msgstr "「{config_file}」を読み込みます"
+msgstr ""
 
+#: ../fdroidserver/common.py
+#, python-brace-format
+msgid "Reading minSdkVersion failed: \"{apkfilename}\""
+msgstr ""
+
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
+#. https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "Reading packageName/versionCode/versionName failed, APK invalid: '{apkfilename}'"
-msgstr "packageName/versionCode/versionNameを読み込めませんでした。不正なAPKです：「{apkfilename}」"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Reading packageName/versionCode/versionName failed,APK invalid: '{apkfilename}'"
-msgstr "packageName/versionCode/versionNameを読み込めませんでした。不正なAPKです：「{apkfilename}」"
+msgstr ""
 
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Reading {apkfilename} from cache"
-msgstr "{apkfilename}をキャッシュから読み込みます"
+msgstr ""
 
-#: ../fdroidserver/build.py
-msgid "Refresh and cache scanner rules and signatures from the network"
-msgstr "スキャナーのルールと署名をネットワークから取得して更新し、キャッシュ"
-
-#: ../fdroidserver/publish.py
-#, python-brace-format
-msgid "Refusing to sign '{path}', file exists in both {dir1} and {dir2} folder."
-msgstr "{dir1} と {dir2} のどちらにもファイルが存在するため、'{path}'への署名は拒否されました。"
-
-#: ../fdroidserver/verify.py
-msgid "Remove source tarball and any APKs if successfully verified."
-msgstr "検証成功時にソースのTAR・APKを削除する。"
+#: ../fdroidserver/stats.py
+msgid "Recalculate aggregate stats - use when changes have been made that would invalidate old cached data."
+msgstr ""
 
 #: ../fdroidserver/common.py
 msgid "Removing specified files"
-msgstr "指定されたファイルを削除"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Removing {path}\""
-msgstr "{path} を削除"
+msgstr ""
 
 #: ../fdroidserver/update.py
 msgid "Rename APK files that do not match package.name_123.apk"
-msgstr "package.name_123.apkに合致しないAPKファイルの名前を変更"
+msgstr ""
 
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "RepoType {type} is deprecated, please switch to git."
+#: ../fdroidserver/update.py
+msgid "Report on build data status"
+msgstr ""
+
+#: ../fdroidserver/build.py
+msgid "Reset and create a brand new build server, even if the existing one appears to be ok."
 msgstr ""
 
 #: ../fdroidserver/nightly.py
 #, python-brace-format
 msgid "Resigning {apkfilename} with provided debug.keystore"
-msgstr "指定したdebug.keystoreで{apkfilename}を再度署名"
+msgstr ""
 
 #: ../fdroidserver/update.py
 msgid "Resize all the icons exceeding the max pixel size and exit"
-msgstr "最大のピクセルの大きさを超えている全てのアイコンのサイズを変更して終了"
+msgstr ""
 
 #: ../fdroidserver/common.py
 msgid "Restrict output to warnings and errors"
-msgstr "警告とエラーのみを出力"
+msgstr ""
 
-#: ../fdroidserver/net.py
-#, python-format
-msgid "Retrying failed download: %s"
-msgstr "失敗したダウンロードを再試行しています: %s"
-
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Rewrite all the metadata files"
-msgstr "メタデータの全てのファイルを書き換える"
+msgstr ""
+
+#: ../fdroidserver/rewritemeta.py
+msgid "Rewrite to a specific format: "
+msgstr ""
 
 #: ../fdroidserver/rewritemeta.py
 #, python-brace-format
 msgid "Rewriting '{appid}'"
-msgstr "「{appid}」を書き換えています"
+msgstr ""
+
+#: ../fdroidserver/rewritemeta.py
+#, python-brace-format
+msgid "Rewriting '{appid}' to '{path}'"
+msgstr ""
 
 #: ../fdroidserver/checkupdates.py
 msgid "Run on git repo that has uncommitted changes"
-msgstr "commitされていない変更があるgitのリポジトリで実行"
-
-#: ../fdroidserver/nightly.py
-#, python-brace-format
-msgid "Run over {cibase} to find -debug.apk. and skip repo_basedir {repo_basedir}"
-msgstr "{cibase}で-debug.apkを検索し、repo_basedir {repo_basedir} をスキップ"
+msgstr ""
 
 #: ../fdroidserver/lint.py
 msgid "Run rewritemeta to fix formatting"
-msgstr "rewritemetaを実行してフォーマットを修正"
+msgstr ""
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 msgid "Running first pass with MD5 checking disabled"
-msgstr "MD5のチェックを無効にして最初のチェックを実行しています"
+msgstr ""
 
 #: ../fdroidserver/mirror.py
 #, python-brace-format
 msgid "Running wget in {path}"
-msgstr "{path}でwgetを実行しています"
+msgstr ""
 
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "SHA-256 of {url} does not match entry!"
-msgstr "{url}のSHA-256がエントリーと合致しません！"
+#: ../fdroidserver/dscanner.py
+msgid "Scan only the latest version of each package"
+msgstr ""
 
 #: ../fdroidserver/build.py
 msgid "Scan the resulting APK(s) for known non-free classes."
-msgstr "既知の不自由なクラスが無いかどうか、残っているAPKをスキャンして確認。"
+msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Scan the source code of a package"
-msgstr "パッケージのソースコードを読み込む"
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Scanner found {count} problems in {apk}"
-msgstr "スキャナーは{apk}に{count}個の問題を発見しました"
+msgstr ""
 
 #: ../fdroidserver/scanner.py
 #, python-brace-format
 msgid "Scanner found {count} problems in {appid}:"
-msgstr "スキャナーは{appid}に{count}個の問題を発見しました："
+msgstr ""
 
 #: ../fdroidserver/scanner.py
 #, python-brace-format
 msgid "Scanner found {count} problems in {appid}:{versionCode}:"
-msgstr "スキャナーは{appid}：{versionCode}に{count}個の問題を発見しました："
+msgstr ""
 
 #: ../fdroidserver/build.py
 msgid "Scanner found {} problem"
 msgid_plural "Scanner found {} problems"
-msgstr[0] "スキャナーは{}個の問題を発見しました"
-
-#: ../fdroidserver/scanner.py
-msgid "Scanning APK for extra signing blocks."
-msgstr "追加の署名ブロックがないかAPKをスキャンしています。"
-
-#: ../fdroidserver/scanner.py
-msgid "Scanning APK with dexdump for known non-free classes."
-msgstr "既知の不自由なクラスが無いかどうか、APKをdexdumpでスキャンして確認。"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Set NDK {release} ({version}) up"
-msgstr "NDK {release}（{version}）を設定"
+msgstr[0] ""
 
 #: ../fdroidserver/common.py
 msgid "Set clock to that time using:"
-msgstr "以下を実行して時計の時間を合わせてください。"
+msgstr ""
 
 #: ../fdroidserver/nightly.py
 msgid "Set maximum releases in repo before older ones are archived"
-msgstr "アーカイブを開始するまでのリポジトリ内でのリリースの最大数を設定"
+msgstr ""
 
 #: ../fdroidserver/build.py
 #, python-brace-format
 msgid "Set open file limit to {integer}"
-msgstr "開くファイルの制限を{integer}に設定"
+msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Set up an app build for a nightly build repo"
-msgstr "ナイトリービルドのリポジトリ向けにアプリのビルドを設定"
+msgstr ""
 
 #: ../fdroidserver/build.py
 msgid "Setting open file limit failed: "
-msgstr "開くファイルの制限を設定できませんでした： "
+msgstr ""
 
 #: ../fdroidserver/build.py
 #, python-brace-format
 msgid "Setting {0} sec timeout for this build"
-msgstr "このビルドがタイムアウトになるまでの時間を{0}秒に設定しています"
+msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroidserver/build.py
+msgid "Setup an emulator, install the APK on it and perform a Drozer scan"
+msgstr ""
+
+msgid "Setup an emulator, install the apk on it and perform a drozer scan"
+msgstr ""
+
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Sign and place packages in the repo"
-msgstr "パッケージに署名してリポジトリに設置"
+msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Sign indexes created using update --nosign"
-msgstr "「update --nosign」で作成したインデックスに署名"
+msgstr ""
 
 #: ../fdroidserver/build.py
 msgid "Skip scanning the source code for binaries and other problems"
-msgstr "バイナリーやその他の問題が無いかどうかに関するソースコードのスキャンをスキップ"
+msgstr ""
 
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Skipping '{apkfilename}' with invalid signature!"
-msgstr "正しくない署名がある「{apkfilename}」をスキップします！"
-
-#: ../fdroidserver/deploy.py ../fdroidserver/index.py
-#, python-format
-msgid "Skipping GitLab Pages mirror because the repo is too large (>%.2fGB)!"
-msgstr "リポジトリが大きすぎるため（>%.2fGB）GitLab Pagesのミラーリングをスキップします！"
+msgstr ""
 
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Skipping index generation for {appid}"
-msgstr "{appid}のインデックスの作成をスキップします"
+msgstr ""
 
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Skipping {apkfilename} with invalid signature!"
-msgstr "正しくない署名がある{apkfilename}をスキップします！"
+msgstr ""
 
 #: ../fdroidserver/scanner.py
 #, python-brace-format
 msgid "Skipping {appid}: disabled"
-msgstr "{appid}をスキップ：無効に設定されています"
+msgstr ""
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/scanner.py
+#, python-brace-format
+msgid "Skipping {appid}: no builds specified"
+msgstr ""
+
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 msgid "Specify a local folder to sync the repo to"
-msgstr "リポジトリを同期するローカルのフォルダーを指定"
+msgstr ""
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 msgid "Specify an identity file to provide to SSH for rsyncing"
-msgstr "rsyncを行う際にSSHに指定するIDファイルを指定"
+msgstr ""
+
+#: ../fdroidserver/build.py
+msgid "Specify that we're running on the build server"
+msgstr ""
 
 #: ../fdroidserver/nightly.py
 msgid "Specify which debug keystore file to use."
-msgstr "使用するデバッグ用キーストアファイルを指定。"
+msgstr ""
 
 #: ../fdroidserver/common.py
 msgid "Spew out even more information than normal"
-msgstr "通常より多くの情報を出力"
+msgstr ""
+
+#: ../fdroidserver/nightly.py
+#, python-brace-format
+msgid "Striping mystery signature from {apkfilename}"
+msgstr ""
 
 #: ../fdroidserver/nightly.py
 #, python-brace-format
 msgid "Stripping mystery signature from {apkfilename}"
-msgstr "{apkfilename}から不明な署名を削除します"
+msgstr ""
 
 #: ../fdroidserver/lint.py
 #, python-format
 msgid "Summary '%s' is just the app's name"
-msgstr "要約文「%s」 がアプリの名前と同一です"
+msgstr ""
 
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "Summary of length {length} is over the {limit} char limit"
-msgstr "要約の長さは{length}ですが、最大の文字数は{limit}です"
+msgstr ""
 
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "System clock is older than date in {path}!"
-msgstr "システムの時刻が{path}の日付よりも古いです！"
-
-#: ../fdroidserver/checkupdates.py
-msgid "Tags update mode only works for git, hg, bzr and git-svn repositories currently"
-msgstr "現在、タグのアップデートはgit、hg、bzr、git-svnのリポジトリでのみ機能します"
-
-#: ../fdroidserver/checkupdates.py
-msgid "Tags update mode used in git-svn, but the repo was not set up with tags"
-msgstr "タグのアップデートモードがgit-svnで使用されましたが、リポジトリはタグを使用するように設定されていませんでした"
+msgstr ""
 
 #: ../fdroidserver/build.py
 msgid "Test mode - put output in the tmp directory only, and always build, even if the output already exists."
-msgstr "テストモード - 既に出力が存在する場合でも、一時ディレクトリーに出力し、常にビルドを行います。"
-
-#: ../fdroidserver/index.py
-msgid "The \"qrcode\" Python package is not installed (e.g. apt-get install python3-qrcode)!"
-msgstr "\"qrcode\"のPythonパッケージが未導入です( 例えば apt-get install python3-qrcode します)！"
+msgstr ""
 
 #. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "The OBB version code must come after \"{name}.\":"
-msgstr "OBBのバージョンコードは「{name}」の後に設定してください："
+msgstr ""
 
 #: ../fdroidserver/btlog.py
 msgid "The base URL for the repo to log (default: https://f-droid.org)"
-msgstr "ログを記録するリポジトリのベースとなるURL（既定：https://f-droid.org）"
+msgstr ""
 
 #: ../fdroidserver/mirror.py
 msgid "The directory to write the mirror to"
-msgstr "ミラーを書き込むディレクトリー"
+msgstr ""
 
 #: ../fdroidserver/nightly.py
 msgid "The file to be included in the repo (path or glob)"
-msgstr "リポジトリに含めるファイル（パスまたはglob）"
+msgstr ""
+
+#: ../fdroidserver/deploy.py
+msgid "The only commands currently supported are 'init' and 'update'"
+msgstr ""
 
 #: ../fdroidserver/index.py
 msgid "The repository's fingerprint does not match."
-msgstr "リポジトリのフィンガープリントが合致しません。"
+msgstr ""
+
+#: ../fdroidserver/common.py
+msgid "The repository's index could not be verified."
+msgstr ""
 
 #: ../fdroidserver/deploy.py
 #, python-brace-format
 msgid "The root dir for local_copy_dir \"{path}\" does not exist!"
-msgstr "Local_copy_dir \"{path}\" のルートディレクトリーは存在しません！"
+msgstr ""
 
 #: ../fdroidserver/publish.py
 msgid "There is a keyalias collision - publishing halted"
-msgstr "キーエイリアスが衝突しています - 公開作業は中止しました"
+msgstr ""
 
 #: ../fdroidserver/common.py
 msgid "These are the apps that have been archived from the main repo."
-msgstr "これらは、メインリポジトリからアーカイブされたアプリです。"
+msgstr ""
 
-#: ../fdroidserver/mirror.py
-msgid "This command should never be used to mirror f-droid.org! A full copy requires more than 600GB."
-msgstr "このコマンドで f-droid.org のミラーリングを行わないでください！完全なコピーには600GB以上が必要となります。"
-
-#: ../fdroidserver/common.py
-msgid "This is a repository of apps to be used with F-Droid. Applications in this repository are either official binaries built by the original application developers, or are binaries built from source by the admin of f-droid.org using the tools on https://gitlab.com/fdroid."
-msgstr "これは、F-Droidで使用できるアプリのリポジトリです。 このリポジトリのアプリケーションは、元のアプリケーション開発者によってビルドされた公式のバイナリーか、またはf-droid.orgの管理者によってソースコードからhttps://gitlab.com/fdroidのツールを使ってビルドされたバイナリーのどちらかです。"
-
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 #, python-format
 msgid "This repo already has local metadata: %s"
-msgstr "このリポジトリにはローカルのメタデータがあります：%s"
-
-#: ../fdroidserver/init.py
-#, python-format
-msgid ""
-"To complete the setup, add your APKs to \"%s\"\n"
-"then run \"fdroid update -c; fdroid update\".  You might also want to edit\n"
-"\"config.yml\" to set the URL, repo name, and more.  You should also set up\n"
-"a signing key (a temporary one might have been automatically generated).\n"
-"\n"
-"For more info: https://f-droid.org/docs/Setup_an_F-Droid_App_Repo\n"
-"and https://f-droid.org/docs/Signing_Process"
 msgstr ""
-"設定を完了するには、APKを「%s」に追加してから\n"
-"「fdroid update -c; fdroid update」を実行してください。その際には、\n"
-"「config.yml」を編集して、URL、リポジトリの名前などを設定してください。\n"
-"また、署名用の鍵も併せて設定することを推奨します（一時的な署名鍵が自動的に生成されている可能性があります）。\n"
-"\n"
-"詳細については、https://f-droid.org/docs/Setup_an_F-Droid_App_Repo\n"
-"または https://f-droid.org/docs/Signing_Process をご覧ください。"
 
-#: ../fdroidserver/deploy.py
-msgid "To use awsbucket, awssecretkey and awsaccesskeyid must also be set in config.yml!"
-msgstr "awsbucketwを使うには、awssecretkeyとawsaccesskeyidをconfig.ymlに設定する必要があります！"
-
-#: ../fdroidserver/deploy.py
-msgid "To use rclone, rclone_config and awsbucket must be set in config.yml!"
-msgstr "rcloneを使用するには、rclone_configとawsbucketをconfig.ymlに設定する必要があります！"
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
+msgid "To use awsbucket, awssecretkey and awsaccesskeyid must also be set in config.py!"
+msgstr ""
 
 #: ../fdroidserver/lint.py
 msgid "URL must start with https:// or http://"
-msgstr "URLは https:// または http:// から始まる必要があります"
+msgstr ""
 
 #: ../fdroidserver/lint.py
 msgid "URL shorteners should not be used"
-msgstr "URL短縮ソフトウェアは使用しないでください"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+msgid "URL title is just the URL, use brackets: [URL]"
+msgstr ""
 
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "URL {url} in Description: {error}"
-msgstr "説明文にあるURL {url}：{error}"
+msgstr ""
 
 #: ../fdroidserver/lint.py
 msgid "Unexpected license tag \"{}\"! Only use FSF or OSI approved tags from https://spdx.org/license-list"
-msgstr "予期されていないライセンスタグ「{}」です！https://spdx.org/license-list から、FSFまたはOSIにより認証されたタグのみを使用してください"
+msgstr ""
 
 #: ../fdroidserver/lint.py
 msgid "Unexpected license tag \"{}\"! Only use license tags configured in your config file"
-msgstr "予期しないライセンスタグ「{}」です！設定ファイルで設定されたライセンスタグのみを使用してください"
+msgstr ""
 
-#: ../fdroidserver/common.py
+#: ../fdroidserver/metadata.py
 #, python-brace-format
-msgid "Unknown entry {key} in {configname}"
-msgstr "{configname}の不明なエントリー {key} です"
+msgid "Unexpected text on same line as {field} in {linedesc}"
+msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Unknown exception found!"
-msgstr "不明な例外が発生しました！"
+msgstr ""
 
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "Unknown file '{filename}' in build '{versionName}'"
-msgstr "ビルド「{versionName}」の不明なファイル「{filename}」"
+msgstr ""
 
 #: ../fdroidserver/metadata.py
 #, python-format
 msgid "Unknown metadata format: %s"
-msgstr "メタデータのフォーマットが不明です：%s"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Unknown metadata format: {path}"
+msgstr ""
 
 #: ../fdroidserver/metadata.py
 #, python-brace-format
 msgid "Unknown metadata format: {path} (use: *.yml)"
-msgstr "メタデータのフォーマットが不明です：{path}（*.ymlを使ってください）"
+msgstr ""
 
 #: ../fdroidserver/common.py
 msgid "Unknown version of aapt, might cause problems: "
-msgstr "aaptのバージョンが不明です。問題が生じる可能性があります： "
+msgstr ""
+
+#: ../fdroidserver/lint.py
+msgid "Unlinkified link - use [http://foo.bar Link title] or [http://foo.bar]"
+msgstr ""
 
 #: ../fdroidserver/lint.py
 msgid "Unnecessary leading space"
-msgstr "不要なスペースが先頭にあります"
+msgstr ""
 
 #: ../fdroidserver/lint.py
 msgid "Unnecessary trailing space"
-msgstr "不要なスペースが末尾にあります"
+msgstr ""
 
 #: ../fdroidserver/metadata.py
 #, python-brace-format
 msgid "Unrecognised app field '{fieldname}' in '{path}'"
-msgstr "「{path}」に未認識のアプリのフィールド「{fieldname}」があります"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+msgid "Unrecognised app field: "
+msgstr ""
 
 #: ../fdroidserver/metadata.py
 #, python-brace-format
 msgid "Unrecognised build flag '{build_flag}' in '{path}'"
-msgstr "認識されないビルド用のオプション「{build_flag}」が「{path}」にあります"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Unrecognised field '{field}' in {linedesc}"
+msgstr ""
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Unsupported file type \"{extension}\" for repo graphic"
-msgstr "リポジトリの画像にサポートされていないファイルの種類「{extension}」が使用されています"
+msgstr ""
 
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Unsupported graphics file found: {path}"
-msgstr "サポートされていない画像ファイルが見つかりました：{path}"
+msgstr ""
+
+#: ../fdroidserver/rewritemeta.py
+#, python-brace-format
+msgid "Unsupported metadata format, use: --to [{supported}]"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+msgid "Unterminated ]"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+msgid "Unterminated ]]"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Unterminated build in {name}"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Unterminated continuation in {name}"
+msgstr ""
 
 #: ../fdroidserver/lint.py
 #, python-format
 msgid "Unused extlib at %s"
-msgstr "使われていないextlibが%sにあります"
+msgstr ""
 
 #: ../fdroidserver/lint.py
 #, python-format
 msgid "Unused file at %s"
-msgstr "使われていないファイルが%sにあります"
+msgstr ""
 
 #: ../fdroidserver/scanner.py
 #, python-format
 msgid "Unused scandelete path: %s"
-msgstr "使われていないscandeleteのパス：%s"
+msgstr ""
 
 #: ../fdroidserver/scanner.py
 #, python-format
 msgid "Unused scanignore path: %s"
-msgstr "使われていないscanignoreのパス：%s"
+msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Update repo information for new packages"
-msgstr "新しいパッケージに関するリポジトリの情報を更新"
+msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Update the binary transparency log for a URL"
-msgstr "URLに関するバイナリーの透明性のログを更新"
+msgstr ""
+
+#: ../fdroid ../fdroidserver/__main__.py
+msgid "Update the stats of the repo"
+msgstr ""
+
+#: ../fdroidserver/update.py ../fdroidserver/build.py
+msgid "Update the wiki"
+msgstr ""
 
 #: ../fdroidserver/checkupdates.py
 #, python-brace-format
 msgid "UpdateCheckData has invalid URL: {url}"
-msgstr "UpdateCheckDataのURLが正しくありません：{url}"
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "UpdateCheckData must match the version code as integer (\\d or [0-9]): {codeex}"
-msgstr "UpdateCheckDataは整数（\\d または [0-9]）のバージョンコードに合致する必要があります：{codeex}"
+msgstr ""
 
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "UpdateCheckData must use HTTPS URL: {url}"
-msgstr "UpdateCheckDataにはHTTPSのURLを指定してください：{url}"
+msgstr ""
 
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "UpdateCheckData not a valid URL: {url}"
-msgstr "UpdateCheckDataは正しいURLではありません：{url}"
+msgstr ""
 
 #: ../fdroidserver/lint.py
-msgid "UpdateCheckMode is set but it looks like checkupdates hasn't been run yet."
-msgstr "UpdateCheckModeが設定されていますがcheckupdatesがまだ実行されていないようです。"
+msgid "UpdateCheckMode is set but it looks like checkupdates hasn't been run yet"
+msgstr ""
+
+#. Translators: https://developer.android.com/studio/build/application-id
+#: ../fdroidserver/lint.py
+msgid "UpdateCheckName is set to the known application ID - it can be removed"
+msgstr ""
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
 #: ../fdroidserver/lint.py
 msgid "UpdateCheckName is set to the known application ID, it can be removed"
-msgstr "UpdateCheckNameが既知のアプリケーションIDに設定されています。これは削除できます"
+msgstr ""
 
 #: ../fdroidserver/deploy.py
 #, python-brace-format
 msgid "Uploading {apkfilename} to androidobservatory.org"
-msgstr "{apkfilename}をandroidobservatory.orgにアップロードしています"
+msgstr ""
 
 #: ../fdroidserver/deploy.py
 #, python-brace-format
 msgid "Uploading {apkfilename} to virustotal"
-msgstr "{apkfilename}をvirustotalにアップロードしています"
+msgstr ""
+
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "Usage"
+msgstr ""
+
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, python-format
+msgid "Usage: %s\n"
+msgstr ""
 
 #: ../fdroidserver/lint.py
-msgid "Use /HEAD instead of /master or /main to point at a file in the default branch"
-msgstr "既定のブランチでファイルを指定する際に /master または /main の代わりに /HEADを使用"
+msgid "Use /HEAD instead of /master to point at a file in the default branch"
+msgstr ""
 
 #: ../fdroidserver/update.py
 msgid "Use `fdroid update -c` to create it."
-msgstr "`fdroid update -c`で作成。"
+msgstr ""
 
 #: ../fdroidserver/build.py
 msgid "Use build server"
-msgstr "ビルド用サーバーを使用"
+msgstr ""
 
 #: ../fdroidserver/update.py
 msgid "Use date from APK instead of current time for newly added APKs"
-msgstr "現在の時間の代わりにAPKの時間を、新しく追加されたAPKに使用"
+msgstr ""
 
-#: ../fdroidserver/deploy.py
+msgid "Use date from apk instead of current time for newly added apks"
+msgstr ""
+
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Using \"{path}\" for configuring s3cmd."
-msgstr "「{path}」をs3cmdの設定に使用。"
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Using \"{path}\" for syncing with remote storage."
-msgstr "「{path}」を遠隔ストレージとの同期に使用。"
+msgstr ""
 
 #: ../fdroidserver/common.py
 msgid "Using APK Signature v2"
-msgstr "APK署名バージョン2を使用"
+msgstr ""
 
 #: ../fdroidserver/common.py
 msgid "Using APK Signature v3"
-msgstr "APK署名バージョン3を使用"
-
-#: ../fdroidserver/common.py
-msgid "Using JAR Signature"
-msgstr "JAR署名を使用"
+msgstr ""
 
 #: ../fdroidserver/common.py
 msgid "Using Java's jarsigner, not recommended for verifying APKs! Use apksigner"
-msgstr "JavaのjarsignerでAPKを検証することは推奨されません！apksignerを使ってください"
+msgstr ""
 
-#: ../fdroidserver/metadata.py
+#: ../fdroidserver/common.py
 #, python-brace-format
-msgid "Using blank dictionary instead of contents of {path}!"
-msgstr "{path}の内容の代わりに空の辞書を使用します！"
+msgid "Using androguard from \"{path}\""
+msgstr ""
 
 #: ../fdroidserver/init.py
 #, python-brace-format
 msgid "Using existing keystore \"{path}\""
-msgstr "\"{path}\"にある既存のキーストアを使用"
+msgstr ""
 
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Using rclone to sync with: {url}"
-msgstr "Rcloneを使って {url} と同期"
-
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Using s3cmd to sync with: {url}"
-msgstr "s3cmdを使って {url} と同期"
+msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Valid commands are:"
-msgstr "正しいコマンドは以下の通りです。"
+msgstr ""
 
 #: ../fdroidserver/verify.py
 msgid "Verify against locally cached copy rather than redownloading."
-msgstr "再ダウンロードする代わりにローカルにキャッシュ済のコピーで検証。"
+msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Verify the integrity of downloaded packages"
-msgstr "ダウンロードしたパッケージの一貫性を検証"
+msgstr ""
 
 #: ../fdroidserver/index.py
 msgid "Verifying index signature:"
-msgstr "インデックスの署名を検証："
-
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "Verifying package {path} with apksigner."
-msgstr "apksignerを使用してパッケージ{path}を検証しています。"
+msgstr ""
 
 #: ../fdroidserver/deploy.py
 #, python-brace-format
 msgid "VirusTotal API key cannot upload files larger than 32MB, use {url} to upload {path}."
-msgstr "VirusTotalのAPI鍵は32メガバイトより大きいファイルをアップロードできません。{url}から{path}をアップロードしてください。"
-
-#: ../fdroidserver/nightly.py
-msgid "WARNING: only public git repos are supported!"
 msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Warn about possible metadata errors"
-msgstr "潜在的なメタデータのエラーに関して警告"
-
-#: ../fdroidserver/scanner.py
-msgid "WebAssembly binary file"
-msgstr "WebAssemblyバイナリ ファイル"
+msgstr ""
 
 #: ../fdroidserver/update.py
 msgid "When configured for signed indexes, create only unsigned indexes at this stage"
-msgstr "署名済のインデックスに関して設定されている場合、この段階では署名されていないインデックスのみを作成します"
+msgstr ""
 
 #: ../fdroidserver/lint.py
 msgid "When linting the entire repository yamllint is disabled by default. This option forces yamllint regardless."
-msgstr "リポジトリ全体をチェックする際、yamllintは既定で無効に設定されます。このオプションを使うと、yamllintを強制的に実行します。"
+msgstr ""
 
-#: ../fdroidserver/publish.py
-msgid "When signing or verifying fails, exit with an error code."
-msgstr "署名または検証ができなかった場合、エラーコードを出力して終了します。"
-
-#: ../fdroidserver/install.py
-msgid "Would you like to download and install F-Droid.apk via adb? (YES/no)"
-msgstr "adb経由でF-Droid.apkをダウンロードしてインストールしますか？（YES/no）"
-
-#: ../fdroidserver/install.py
-msgid "Would you like to download the app(s) from f-droid.org? (YES/no)"
-msgstr "f-droid.orgからアプリをダウンロードしますか？（YES/no）"
+msgid "X.509 'Distiguished Name' used when generating keys"
+msgstr ""
 
 #: ../fdroidserver/init.py
 msgid "X.509 'Distinguished Name' used when generating keys"
-msgstr "鍵の生成時に使用する X.509 'Distinguished Name'"
+msgstr ""
 
 #: ../fdroidserver/common.py
 msgid "You can use ANDROID_HOME to set the path to your SDK, i.e.:"
-msgstr "以下のようにANDROID_HOMEでSDKへのパスを設定できます。"
+msgstr ""
 
 #: ../fdroidserver/scanner.py
 msgid "ZIP file archive"
-msgstr "ZIPファイルアーカイブ"
-
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "adb reports {serial} is \"{status}\"!"
-msgstr "adbは、{serial}が「{status}」であると報告しています！"
+msgstr ""
 
 #: ../fdroidserver/nightly.py
 #, python-brace-format
 msgid "adding IdentityFile to {path}"
-msgstr "IdentityFileを{path}に追加"
+msgstr ""
 
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "adding to {name}: {path}"
-msgstr "{name}: {path} に追加"
+msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "ambiguous option: %(option)s could match %(matches)s"
-msgstr "オプションが曖昧です。%(option)sは%(matches)sに一致しませんでした"
+msgstr ""
 
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "apksigner in build-tools;{version} passes APKs with invalid v3 signatures, ignoring."
-msgstr "ビルドツール群のapkサイナー;{version}は、無効なv3署名がなされたAPKを無視します。"
-
-#: ../fdroidserver/common.py
-msgid "apksigner not found! Cannot sign or verify modern APKs"
-msgstr "apksignerが見つかりません！最近のAPKに署名を行ったり検証したりすることはできません"
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, python-format
+msgid "ambiguous option: %s (%s?)"
+msgstr ""
 
 #: ../fdroidserver/common.py
 msgid "apksigner not found, it's required for signing!"
-msgstr "apksignerが見つかりません。署名を行うには必要です！"
+msgstr ""
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/checkupdates.py ../fdroidserver/lint.py
-#: ../fdroidserver/rewritemeta.py
+#: ../fdroidserver/lint.py ../fdroidserver/rewritemeta.py
+#: ../fdroidserver/checkupdates.py
 msgid "application ID of file to operate on"
-msgstr "実行用のファイルのアプリケーションID"
+msgstr ""
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/build.py ../fdroidserver/install.py
-#: ../fdroidserver/publish.py ../fdroidserver/scanner.py
-#: ../fdroidserver/verify.py
+#: ../fdroidserver/verify.py ../fdroidserver/publish.py
+#: ../fdroidserver/build.py ../fdroidserver/scanner.py
+#: ../fdroidserver/install.py
 msgid "application ID with optional versionCode in the form APPID[:VERCODE]"
-msgstr "APPID[:VERCODE] 形式でversionCodeを指定した（オプション）アプリケーションID"
+msgstr ""
 
-#: ../fdroidserver/common.py
-msgid "archive_url needs to end with /archive"
-msgstr "archive_url は /archive で終了する必要があります"
+#: ../fdroidserver/lint.py ../fdroidserver/rewritemeta.py
+msgid "applicationId in the form APPID"
+msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: ../fdroidserver/checkupdates.py
+msgid "applicationId to check for updates"
+msgstr ""
+
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
+#: ../fdroidserver/verify.py ../fdroidserver/publish.py
+#: ../fdroidserver/dscanner.py ../fdroidserver/build.py
+#: ../fdroidserver/scanner.py ../fdroidserver/install.py
+msgid "applicationId with optional versionCode in the form APPID[:VERCODE]"
+msgstr ""
+
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "argument \"-\" with mode %r"
-msgstr "モード %r の引数 \"-\""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "argument %(argument_name)s: %(message)s"
-msgstr "引数 %(argument_name)s：%(message)s"
+msgstr ""
 
 #: ../fdroidserver/nightly.py
 msgid "attempting bare SSH connection to test deploy key:"
-msgstr "SSH接続でデプロイ用の鍵をテストします。"
+msgstr ""
+
+#: ../fdroidserver/nightly.py
+msgid "attempting bare ssh connection to test deploy key:"
+msgstr ""
 
 #: ../fdroidserver/common.py
 msgid "can not parse scrlib spec (not a string): '{}'"
-msgstr "srclibの規定をパースできません（文字列ではありません）：'{}'"
+msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
-msgid "can't open '%(filename)s': %(error)s"
-msgstr "「%(filename)s」を開けません：%(error)s"
-
-#: ../fdroidserver/scanner.py
-msgid "can't open non-https url: '{};"
-msgstr "HTTPSでないURLは開けません：'{};"
+msgid "can't open '%s': %s"
+msgstr ""
 
 #: ../fdroidserver/build.py
 #, python-brace-format
 msgid "cannot find required srclibs: \"{path}\""
-msgstr "必要なsrclibsが見つかりません：「{path}」"
+msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "cannot have multiple subparser arguments"
-msgstr "サブパーサーの複数の引数を指定することはできません"
+msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "cannot merge actions - two groups are named %r"
-msgstr "アクションをマージできません - 2つのグループが%rと名付けられています"
+msgstr ""
 
 #: ../fdroidserver/nightly.py
 msgid "cannot publish update, did you set the deploy key?"
-msgstr "更新を公開できません。デプロイ用の鍵を設定しましたか？"
+msgstr ""
 
 #: ../fdroidserver/nightly.py
 #, python-brace-format
 msgid "cloning {url}"
-msgstr "{url}のcloneを行います"
+msgstr ""
+
+#: ../fdroidserver/deploy.py
+msgid "command to execute, either 'init' or 'update'"
+msgstr ""
 
 #: ../fdroidserver/__main__.py
 msgid "commands from plugin modules:"
-msgstr "プラグインモジュールのコマンド："
+msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "complex"
+msgstr ""
+
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "conflicting option string: %s"
 msgid_plural "conflicting option strings: %s"
-msgstr[0] "オプションの文字列が矛盾しています：%s"
+msgstr[0] ""
 
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "conflicting subparser alias: %s"
-msgstr "矛盾するサブパーサーのエイリアス：%s"
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "conflicting subparser: %s"
-msgstr "サブパーサーが矛盾しています：%s"
+#: ../fdroidserver/nightly.py
+#, python-brace-format
+msgid "copying {apkfilename} into {path}"
+msgstr ""
 
 #: ../fdroidserver/metadata.py
 #, python-brace-format
 msgid "could not parse '{path}'"
-msgstr "「{path}」をパースできませんでした"
-
-#: ../fdroidserver/common.py
-msgid "could not parse srclib spec (no name specified): '{}'"
-msgstr "srclibの規定をパースできませんでした（名前が指定されていません）：'{}'"
+msgstr ""
 
 #: ../fdroidserver/common.py
 msgid "could not parse srclib spec (no ref specified): '{}'"
-msgstr "srclibの規定をパースできませんでした（refが指定されていません）：'{}'"
+msgstr ""
+
+#: ../fdroidserver/common.py
+msgid "could not parse srclib spec (too many '@' signs): '{}'"
+msgstr ""
 
 #: ../fdroidserver/nightly.py
 #, python-brace-format
 msgid "created {path}"
-msgstr "{path}を作成しました"
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "current version is newer: old vercode={old}, new vercode={new}"
-msgstr "現在のバージョンの方が新しいです：以前のvercode={old}、新しいvercode={new}"
+msgstr ""
 
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "deleting: repo/{apkfilename}"
-msgstr "削除しています：repo/{apkfilename}"
+msgstr ""
 
-#: ../fdroidserver/scanner.py
-msgid "dependency file without lock"
-msgstr "ロックの存在しない依存ファイル"
+#: ../fdroidserver/common.py
+#, python-brace-format
+msgid "deployed build logs to '{path}'"
+msgstr ""
 
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "deployed process log {path} to {dest}"
-msgstr "{path}の処理ログを{dest}に設定しました"
+msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "dest= is required for options like %r"
-msgstr "%rなどのオプションにはdest= が必要です"
-
-#: ../fdroidserver/scanner.py
-msgid "downloading '{}'"
-msgstr "'{}'をダウンロードしています"
-
-#: ../fdroidserver/scanner.py
-msgid "downloading scanner signatures from '{}' failed"
-msgstr "スキャナーの署名を'{}'からダウンロードできませんでした"
+msgstr ""
 
 #: ../fdroidserver/scanner.py
 msgid "executable binary, possibly code"
-msgstr "実行可能なバイナリー、おそらくコードです"
+msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "expected %s argument"
 msgid_plural "expected %s arguments"
-msgstr[0] "%s個の引数が必要"
+msgstr[0] ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "expected at least one argument"
-msgstr "1つ以上の引数が必要です"
+msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "expected at most one argument"
-msgstr "多くても1つの引数が必要です"
+msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "expected one argument"
-msgstr "1つの引数が必要です"
+msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroidserver/common.py
+#, python-brace-format
+msgid "failed deploying build logs to '{path}'"
+msgstr ""
+
+#: ../fdroid
+msgid "fdroid [-h|--help|--version] <command> [<args>]"
+msgstr ""
+
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "fdroid [<command>] [-h|--help|--version|<args>]"
-msgstr "fdroid [<command>] [-h|--help|--version|<args>]"
+msgstr ""
 
-#: ../fdroidserver/scanner.py
-msgid "fetch the latest version of signatures from the web"
-msgstr "ウェブから署名の最新のバージョンを取得"
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "floating-point"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+msgid "force errors to be warnings, or ignore"
+msgstr ""
 
 #: ../fdroidserver/metadata.py
 msgid "force metadata errors (default) to be warnings, or to be ignored."
-msgstr "メタデータのエラー（既定）を警告として扱うよう強制するか、無視するよう強制。"
+msgstr ""
 
 #: ../fdroidserver/common.py
 msgid "git svn clone failed"
-msgstr "git svn clone を実行できませんでした"
+msgstr ""
 
 #: ../fdroidserver/scanner.py
 msgid "gzip file archive"
-msgstr "gzipファイルアーカイブ"
+msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "ignored explicit argument %r"
-msgstr "明示的な引数 %r を無視しました"
+msgstr ""
 
 #: ../fdroidserver/index.py
 msgid "index-v1 must have a signature, use `fdroid signindex` to create it!"
-msgstr "index-v1には署名が必要です。`fdroid signindex`で署名を作成してください！"
+msgstr ""
 
-#: ../fdroidserver/index.py
-msgid "index-v2 must have a signature, use `fdroid signindex` to create it!"
-msgstr "index-v2には署名が必要です。`fdroid signindex`で署名を作成してください！"
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "integer"
+msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "invalid %(type)s value: %(value)r"
-msgstr "%(type)sの値が不正です：%(value)r"
+msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "invalid choice: %(value)r (choose from %(choices)s)"
-msgstr "不正な選択です：%(value)r（%(choices)sから選択してください）"
+msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "invalid conflict_resolution value: %r"
-msgstr "conflict_resolutionの値が不正です：%r"
+msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "invalid option string %(option)r: must start with a character %(prefix_chars)r"
-msgstr "%(option)rは不正なオプションの文字列です：%(prefix_chars)rで始まる必要があります"
-
-#: ../fdroidserver/common.py
-msgid "ipfs_cid not found, skipping CIDv1 generation"
-msgstr "ipfs_cid が見つかりません。CIDv1の生成をスキップします"
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "latest build recipe is newer: old vercode={old}, new vercode={new}"
-msgstr "直近のビルドの仕様書の方が新しいです：以前のvercode={old}、新しいvercode={new}"
+msgstr ""
 
 #: ../fdroidserver/deploy.py
 #, python-brace-format
@@ -2320,372 +2296,383 @@ msgstr "local_copy_dir は「froid」で終わっていません、もしかし
 
 #: ../fdroidserver/deploy.py
 msgid "local_copy_dir must be an absolute path!"
-msgstr "local_copy_dir には絶対パスを指定してください！"
+msgstr "local_copy_dir は絶対パスの必要があります！"
 
 #: ../fdroidserver/deploy.py
 msgid "local_copy_dir must be directory, not a file!"
-msgstr "local_copy_dir にはファイルではなくディレクトリーを指定してください！"
+msgstr "local_copy_dir はファイルではなくディレクトリにする必要があります！"
 
 #: ../fdroidserver/index.py
 #, python-format
 msgid "mirror '%s' does not end with 'fdroid'!"
-msgstr "ミラー「%s」は「fdroid」で終わっていません！"
+msgstr ""
 
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "mirrors set twice, in config.yml and {path}!"
-msgstr "config.ymlと{path}で2回ミラーが設定されています！"
-
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "mutually exclusive arguments must be optional"
-msgstr "相互に排他的な引数はオプションとしてください"
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "next {name} cache update due in {time}"
-msgstr "次の{name}キャッシュの更新まで{time}"
+msgstr ""
 
 #: ../fdroidserver/mirror.py
 #, python-brace-format
 msgid "no \"icon\" in {appid}"
-msgstr "{appid}に「アイコン」がありません"
+msgstr ""
 
 #: ../fdroidserver/signatures.py
 msgid "no APK supplied"
-msgstr "APKが指定されていません"
+msgstr ""
 
-#: ../fdroidserver/checkupdates.py
-msgid "no version information found"
-msgstr "バージョンの情報が見つかりません"
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, python-format
+msgid "no such option: %s"
+msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: ../fdroid ../fdroidserver/__main__.py
+msgid "no version info found!"
+msgstr ""
+
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "not allowed with argument %s"
-msgstr "引数 %s は許可されていません"
+msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "one of the arguments %s is required"
-msgstr "引数 %s の1つが必要です"
+msgstr ""
 
-#: ../fdroidserver/common.py ../fdroidserver/index.py
+#: ../fdroidserver/index.py ../fdroidserver/common.py
 msgid "only accepts strings, lists, and tuples"
-msgstr "文字列、リスト、タプルのみが許可"
+msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
-msgid "options"
-msgstr "オプション"
+#: ../fdroidserver/install.py
+#, python-format
+msgid "option %s: If you really want to install all the signed apps, use --all"
+msgstr ""
+
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, python-format
+msgid "option %s: invalid %s value: %r"
+msgstr ""
+
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, python-format
+msgid "option %s: invalid choice: %r (choose from %s)"
+msgstr ""
+
+#: /usr/lib/python3.5/getopt.py /usr/lib/python3.6/getopt.py
+#: /usr/lib/python3.7/getopt.py
+#, python-format
+msgid "option -%s not recognized"
+msgstr ""
+
+#: /usr/lib/python3.5/getopt.py /usr/lib/python3.6/getopt.py
+#: /usr/lib/python3.7/getopt.py
+#, python-format
+msgid "option -%s requires argument"
+msgstr ""
+
+#: /usr/lib/python3.5/getopt.py /usr/lib/python3.6/getopt.py
+#: /usr/lib/python3.7/getopt.py
+#, python-format
+msgid "option --%s must not have an argument"
+msgstr ""
+
+#: /usr/lib/python3.5/getopt.py /usr/lib/python3.6/getopt.py
+#: /usr/lib/python3.7/getopt.py
+#, python-format
+msgid "option --%s not a unique prefix"
+msgstr ""
+
+#: /usr/lib/python3.5/getopt.py /usr/lib/python3.6/getopt.py
+#: /usr/lib/python3.7/getopt.py
+#, python-format
+msgid "option --%s not recognized"
+msgstr ""
+
+#: /usr/lib/python3.5/getopt.py /usr/lib/python3.6/getopt.py
+#: /usr/lib/python3.7/getopt.py
+#, python-format
+msgid "option --%s requires argument"
+msgstr ""
+
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
+msgid "optional arguments"
+msgstr ""
 
 #: ../fdroidserver/nightly.py
 #, python-brace-format
 msgid "overwriting existing {path}"
-msgstr "既存の{path}を上書きします"
+msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "positional arguments"
-msgstr "位置に関する引数"
+msgstr ""
 
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "process log deploy {path} to {dest} failed!"
-msgstr "{path}の処理ログを{dest}に設定できませんでした！"
-
-#: ../fdroidserver/build.py
-msgid "reference binary missing signature"
-msgstr "参照バイナリーに署名がありません"
+msgstr ""
 
 #: ../fdroidserver/signatures.py
 #, python-brace-format
 msgid "refuse downloading via insecure HTTP connection (use HTTPS or specify --no-https-check): {apkfilename}"
-msgstr "安全でないHTTP接続によるダウンロードを拒否（HTTPSを使うか--no-https-checkを指定してください）：{apkfilename}"
+msgstr ""
+
+#: ../fdroidserver/signatures.py
+#, python-brace-format
+msgid "refuse downloading via insecure http connection (use https or specify --no-https-check): {apkfilename}"
+msgstr ""
 
 #: ../fdroidserver/index.py
 #, python-format
-msgid "repo_icon \"repo/icons/%s\" does not exist, generating placeholder."
-msgstr "repo_icon \"repo/icons/%s\"が存在しません。プレースホルダーを生成します。"
+msgid "repo_icon %s does not exist, generating placeholder."
+msgstr ""
 
-#: ../fdroidserver/common.py
-msgid "repo_url needs to end with /repo"
-msgstr "repo_urlは/repoで終わる必要があります"
+#: ../fdroidserver/metadata.py
+msgid "ruamel.yaml not installed, can not write metadata."
+msgstr ""
 
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "rsync is missing or broken: {error}"
-msgstr "rsyncが無いか壊れています：{error}"
-
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "s3cmd sync indexes {path} to {url} and delete"
-msgstr "s3cmdは{path}のインデックスを{url}に同期して削除"
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "s3cmd syncs indexes from {path} to {url} and deletes removed"
-msgstr "s3cmdは{path}から{url}へインデックスを同期し、消去されたインデックスを削除します"
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "scanner cache is malformed! You can clear it with: '{clear}'"
-msgstr "スキャナーのキャッシュの形式が正しくありません！「{clear}」で消去してください"
-
-#: ../fdroidserver/deploy.py
-msgid "serverwebroot: path does not end with \"fdroid\", perhaps you meant one of these:"
-msgstr "serverwebroot: パスが「fdroid」で終わっていません。もしかして："
+msgstr ""
 
 #: ../fdroidserver/scanner.py
 msgid "shared library"
-msgstr "共有ライブラリー"
+msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "show program's version number and exit"
+msgstr ""
+
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.5/optparse.py
+#: /usr/lib/python3.6/argparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/argparse.py /usr/lib/python3.7/optparse.py
 msgid "show this help message and exit"
-msgstr "このヘルプメッセージを表示して終了"
+msgstr ""
 
 #: ../fdroidserver/signatures.py
 msgid "signed APK, either a file-path or HTTPS URL."
-msgstr "サイン済みのAPK。ファイルのパスかHTTPSのURL。"
+msgstr ""
 
 #: ../fdroidserver/common.py
 msgid "skip deploying full build logs: log content is empty"
-msgstr "完全なビルドログの設置をスキップ：ログの中身はありません"
+msgstr ""
 
 #: ../fdroidserver/common.py
 msgid "skip deploying full build logs: not enabled in config"
-msgstr "完全なビルドログの設置をスキップ：設定で有効にされていません"
+msgstr ""
 
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "skipping source tarball: {path}"
-msgstr "ソースコードのtarballをスキップします：{path}"
+msgstr ""
 
 #: ../fdroidserver/lint.py
 msgid "srclibs missing name and/or @"
-msgstr "srclibsに名前と「@」がありません"
+msgstr ""
 
 #: ../fdroidserver/scanner.py
 msgid "static library"
-msgstr "静的ライブラリー"
+msgstr ""
 
-#: ../fdroidserver/build.py
+#: ../fdroidserver/common.py
 #, python-brace-format
-msgid "supplied reference binary has allowed signer {signer}"
-msgstr "指定された参照バイナリーには許可された署名者 {signer} がいます"
+msgid "supplied timestamp value '{timestamp}' is not a unix timestamp"
+msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "the following arguments are required: %s"
-msgstr "次の引数が必要です：%s"
+msgstr ""
 
-#: ../fdroidserver/install.py
-msgid "true"
-msgstr "true"
-
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "unexpected option string: %s"
-msgstr "予期しないオプションの文字列です：%s"
+msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "unknown parser %(parser_name)r (choices: %(choices)s)"
-msgstr "不明なパーサー %(parser_name)r（選択肢：%(choices)s）"
+msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "unrecognized arguments: %s"
-msgstr "認識されない引数です：%s"
+msgstr ""
 
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "unsafe permissions on '{config_file}' (should be 0600)!"
-msgstr "「{config_file}」のパーミッションが安全ではありません（0600に設定すべきです）！"
+msgstr ""
 
-#: ../fdroidserver/__main__.py /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py ../fdroid
+#: /usr/lib/python3.7/argparse.py ../fdroidserver/__main__.py
 msgid "usage: "
-msgstr "使い方: "
+msgstr ""
 
-#: ../fdroidserver/deploy.py
+#: ../fdroid
+msgid "usage: fdroid [-h|--help|--version] <command> [<args>]"
+msgstr ""
+
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "using Apache libcloud to sync with {url}"
-msgstr "Apache libcloudを使って{url}と同期"
+msgstr ""
 
 #: ../fdroidserver/deploy.py
 msgid "virustotal.com is rate limiting, waiting to retry..."
-msgstr "virustotal.comはレート制限を行っています。再試行を待機しています…"
+msgstr ""
 
-#: ../fdroidserver/install.py
-msgid "yes"
-msgstr "yes"
+#: ../fdroidserver/update.py
+msgid "wiki support is deprecated and will be removed in the next release!"
+msgstr ""
 
 #: ../fdroidserver/publish.py
 #, python-brace-format
 msgid "{0} app, {1} key aliases"
 msgid_plural "{0} apps, {1} key aliases"
-msgstr[0] "{0}個のアプリ、{1}個の鍵のエイリアス"
+msgstr[0] ""
 
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "{apkfilename} ({appid}) has no metadata!"
-msgstr "{apkfilename}（{appid}）にメタデータがありません！"
+msgstr ""
+
+#: ../fdroidserver/update.py
+#, python-brace-format
+msgid "{apkfilename} has multiple {name} files, looks like Master Key exploit!"
+msgstr ""
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "{apkfilename}'s AndroidManifest.xml has a bad date: "
-msgstr "{apkfilename}のAndroidManifest.xmlの日付が正しくありません： "
+msgstr ""
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "{appid} does not have a name! Using application ID instead."
-msgstr "{appid}には名前が設定されていません！アプリケーションIDを代わりに使用します。"
+msgstr ""
+
+#: ../fdroidserver/update.py
+#, python-brace-format
+msgid "{appid} does not have a name! Using package name instead."
+msgstr ""
+
+#: ../fdroidserver/update.py
+#, python-brace-format
+msgid "{appid} from {path} is not a valid Android Package Name!"
+msgstr ""
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "{appid} from {path} is not a valid Android application ID!"
-msgstr "{path}の{appid}は正しいAndroidのアプリケーションIDではありません！"
+msgstr ""
 
 #: ../fdroidserver/metadata.py ../fdroidserver/update.py
 #, python-brace-format
 msgid "{appid} from {path} is not a valid Java Package Name!"
-msgstr "{path}の{appid}は正しいJavaパッケージの名前ではありません！"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{appid} has both APKs and files: {files}"
-msgstr "{appid}にはAPKとファイルの両方があります：{files}"
+msgstr ""
 
 #: ../fdroidserver/mirror.py
 #, python-brace-format
 msgid "{appid} is missing {name}"
-msgstr "{appid}には{name}がありません"
+msgstr ""
 
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "{appid}: Unknown extlib {path} in build '{versionName}'"
-msgstr "{appid}：ビルド「{versionName}」のextlib {path}は不明です"
+msgstr ""
 
 #: ../fdroidserver/scanner.py
 #, python-brace-format
 msgid "{appid}: no builds specified, running on current source state"
-msgstr "{appid}：ビルドが指定されていません。現在のソースコードに基づき実行します"
+msgstr ""
 
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "{appid}: {field} must be a '{type}', but it is a '{fieldtype}!'"
-msgstr "{appid}：{field}には「{fieldtype}」ではなく「{type}」を指定してください！"
+msgstr ""
 
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "{appid}: {field} must be a '{type}', but it is a '{fieldtype}'!"
-msgstr "{appid}：{field}には「{fieldtype}」ではなく「{type}」を指定してください！"
+msgstr ""
 
 #: ../fdroidserver/metadata.py
 #, python-brace-format
 msgid "{build_flag} must be an integer, found: {value}"
-msgstr "{build_flag}には整数を指定してください。{value}が見つかりました"
+msgstr ""
 
 #: ../fdroidserver/metadata.py
 #, python-brace-format
-msgid "{build_flag} must be list or string, found: {value}"
-msgstr "{build_flag}にはリストまたは文字列を指定してください。指定された値：{value}"
+msgid "{field} not terminated in {name}"
+msgstr ""
 
 #: ../fdroidserver/metadata.py
 #, python-brace-format
 msgid "{file} is blank or corrupt!"
-msgstr "{file}は空か壊れています！"
+msgstr ""
 
 #: ../fdroidserver/update.py
 #, python-brace-format
-msgid "{name} \"{section}/icons/{path}\" does not exist! Check \"config.yml\"."
-msgstr "{name}「{section}/icons/{path}」がありません！「config.yml」を確認してください。"
+msgid "{name} \"{path}\" does not exist! Correct it in config.py."
+msgstr ""
 
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{path1} is a duplicate of {path2}, remove one!"
-msgstr "{path1} は {path2} と重複しています、片方を除外してください！"
-
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 #, python-brace-format
 msgid "{path} already exists, ignoring import results!"
-msgstr "{path}は既に存在します。インポートの結果は無視します！"
+msgstr ""
 
 #: ../fdroidserver/nightly.py
 #, python-brace-format
 msgid "{path} does not exist!  Create it by running:"
-msgstr "{path}がありません！以下を実行して作成してください。"
+msgstr ""
 
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "{path} has bad file signature \"{pattern}\", possible Janus exploit!"
-msgstr "{path}のファイル署名「{pattern}」は正しくありません。Janusの脆弱性による可能性があります！"
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "{path} has been flagged by virustotal {count} times:"
-msgstr "{path}はvirustotalにより{count}回マークされました。"
-
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "{path} has the wrong fingerprint ({fingerprint})!"
-msgstr "{path}のフィンガープリント（{fingerprint}）が間違っています！"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "{path} is not \"key: value\" dict, but a {datatype}!"
-msgstr "{path}は{datatype}です。「キー:値」の辞書ではありません！"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "{path} is not a standard config file!"
-msgstr "{path}は標準の設定ファイルではありません！"
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "{path} is not list, but a {datatype}!"
-msgstr "{path}は{datatype}です。リストではありません！"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "{path} is not {expected_type}, but a {datatype}!"
-msgstr "{path}は{datatype}です。{expected_type}ではありません！"
+msgstr ""
 
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "{path} is zero size!"
-msgstr "{path}の大きさは0です！"
+msgstr ""
 
 #: ../fdroidserver/deploy.py
 #, python-brace-format
 msgid "{path} more than 200MB, manually upload: {url}"
-msgstr "{path}は200MB以上です。手動で{url}にアップロードしてください"
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "{path}: \"{code}\" is not a valid ISO_3166-1 alpha-2 country code!"
-msgstr "{path}：「{code}」は有効なISO_3166-1 alpha-2の国コードではありません！"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{path}: {error}"
-msgstr "{path}：{error}"
+msgstr ""
 
 #: ../fdroidserver/mirror.py
 #, python-brace-format
 msgid "{url} does not end with \"fdroid\", check the URL path!"
-msgstr "{url}が「fdroid」で終わっていません。URLパスを確認してください！"
+msgstr ""
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/common.py
 #, python-brace-format
 msgid "{url} does not start with \"http\"!"
-msgstr "{url}は「http」で始まっていません！"
+msgstr ""
 
 #: ../fdroidserver/build.py
 msgid "{} build failed"
 msgid_plural "{} builds failed"
-msgstr[0] "{}個のビルドを行えませんでした"
+msgstr[0] ""
 
 #: ../fdroidserver/build.py
 msgid "{} build succeeded"
 msgid_plural "{} builds succeeded"
-msgstr[0] "{}個のビルドを行いました"
+msgstr[0] ""
diff --git a/locale/kab/LC_MESSAGES/fdroidserver.po b/locale/kab/LC_MESSAGES/fdroidserver.po
index 121b58f0..fd9fd2e3 100644
--- a/locale/kab/LC_MESSAGES/fdroidserver.po
+++ b/locale/kab/LC_MESSAGES/fdroidserver.po
@@ -1,22 +1,37 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Free Software Foundation, Inc.
-# Hans-Christoph Steiner <hans@guardianproject.info>, 2020, 2021.
+# Hans-Christoph Steiner <hans@guardianproject.info>, 2020.
 # Kahina Messaoudi <messaoudikahina02@gmail.com>, 2020.
-# R_SACI <rgebbid@gmail.com>, 2021.
 msgid ""
 msgstr ""
 "Project-Id-Version: fdroidserver 0.9\n"
 "Report-Msgid-Bugs-To: https://gitlab.com/fdroid/fdroidserver/issues\n"
-"POT-Creation-Date: 2025-06-25 09:52+0200\n"
-"PO-Revision-Date: 2021-01-15 13:25+0000\n"
-"Last-Translator: R_SACI <rgebbid@gmail.com>\n"
+"POT-Creation-Date: 2020-10-21 18:05+0200\n"
+"PO-Revision-Date: 2020-10-06 08:26+0000\n"
+"Last-Translator: Kahina Messaoudi <messaoudikahina02@gmail.com>\n"
 "Language-Team: Kabyle <https://hosted.weblate.org/projects/f-droid/fdroidserver/kab/>\n"
 "Language: kab\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 4.5-dev\n"
+"X-Generator: Weblate 4.3-dev\n"
+
+#: ../fdroidserver/common.py
+msgid ""
+"\n"
+"        This is a repository of apps to be used with FDroid. Applications in this\n"
+"        repository are either official binaries built by the original application\n"
+"        developers, or are binaries built from source by f-droid.org using the\n"
+"        tools on https://gitlab.com/fdroid.\n"
+"        "
+msgstr ""
+
+#: ../fdroidserver/nightly.py
+msgid ""
+"\n"
+"SSH Public Key to be used as Deploy Key:"
+msgstr ""
 
 #: ../fdroidserver/nightly.py
 msgid ""
@@ -36,26 +51,22 @@ msgstr ""
 msgid "\"%s/\" has no matching metadata file!"
 msgstr ""
 
-#: ../fdroidserver/index.py
-msgid "\"isPrimary\" key should not be added to mirrors!"
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "\"local_copy_dir\" {path} does not exist!"
-msgstr ""
-
 #: ../fdroidserver/install.py
-#, python-brace-format
+#, fuzzy, python-brace-format
 msgid "\"{apkfilename}\" is already installed on {dev}."
-msgstr "\"{apkfilename}\" yebded yakan ɣef {dev}."
+msgstr "'{apkfilename}' yebded yakan ɣef {dev}."
+
+#: ../fdroidserver/update.py
+#, python-brace-format
+msgid "\"{path}\" contains outdated {name} ({version})"
+msgstr ""
 
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "\"{path}\" contains recent {name} ({version})"
 msgstr ""
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "\"{path}\" exists but s3cmd is not installed!"
 msgstr ""
@@ -65,24 +76,33 @@ msgstr ""
 msgid "\"{path}\" is not a supported file format (use: metadata/*.yml)"
 msgstr ""
 
-#: ../fdroidserver/update.py
+#: ../fdroidserver/metadata.py
 #, python-brace-format
-msgid "\"{path}\" is signed by a key that is not allowed:"
+msgid "\"{path}\" is not an accepted format, convert to: {formats}"
 msgstr ""
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/common.py
 #, python-brace-format
 msgid "\"{url}\" is not a valid URL!"
 msgstr "\"{url}\" mačči d aseɣwen URL ameɣtu!"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, python-format
+msgid "%(option)s option requires %(number)d argument"
+msgid_plural "%(option)s option requires %(number)d arguments"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../fdroidserver/mirror.py
+#, python-format
+msgid "%(prog)s [options] url"
+msgstr ""
+
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "%(prog)s: error: %(message)s\n"
-msgstr "%(prog)s: tuccḍa: %(message)s\n"
-
-#: ../fdroidserver/publish.py
-#, python-format
-msgid "%d APKs failed to be signed or verified!"
 msgstr ""
 
 #: ../fdroidserver/scanner.py
@@ -90,59 +110,85 @@ msgstr ""
 msgid "%d problems found"
 msgstr "%d n wuguren ttwafen"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "%prog [options]"
+msgstr ""
+
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "%r is not callable"
 msgstr ""
 
-#: ../fdroidserver/signindex.py
-#, python-format
-msgid "%s did not produce a dict!"
-msgstr ""
-
-#: ../fdroidserver/signindex.py
-#, python-format
-msgid "%s has bad SHA-256: %s"
-msgstr ""
-
 #: ../fdroidserver/lint.py
 #, python-format
 msgid "%s is not an accepted build field"
 msgstr ""
 
-#: ../fdroidserver/common.py
-msgid "'keypass' not found in config.yml!"
-msgstr "'keypass' ulac-it di config.yml!"
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, python-format
+msgid "%s option does not take a value"
+msgstr ""
+
+#: ../fdroidserver/index.py ../fdroidserver/common.py
+msgid "'keypass' not found in config.py!"
+msgstr "'keypass' ulac-it di config.py!"
 
 #: ../fdroidserver/common.py
 msgid "'keystore' is NONE and 'smartcardoptions' is blank!"
 msgstr ""
 
-#: ../fdroidserver/common.py
-msgid "'keystore' not found in config.yml!"
-msgstr "'keystore' ulac-it di config.yml!"
+#: ../fdroidserver/index.py ../fdroidserver/common.py
+msgid "'keystore' not found in config.py!"
+msgstr "'keystore' ulac-it di config.py!"
 
-#: ../fdroidserver/common.py
-msgid "'keystorepass' not found in config.yml!"
-msgstr "'keystorepass' ulac-it di config.yml!"
+#: ../fdroidserver/index.py ../fdroidserver/common.py
+msgid "'keystorepass' not found in config.py!"
+msgstr "'keystorepass' ulac-it di config.py!"
 
-#: ../fdroidserver/common.py
-msgid "'repo_keyalias' not found in config.yml!"
-msgstr "'repo_keyalias' ulac-it deg config.yml!"
+#: ../fdroidserver/index.py ../fdroidserver/common.py
+msgid "'repo_keyalias' not found in config.py!"
+msgstr "'repo_keyalias' ulac-it deg config.py!"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "'required' is an invalid argument for positionals"
 msgstr "'required' d taɣiret ur iṣeḥḥan ara i usideg"
 
 #: ../fdroidserver/common.py
-msgid "'sdk_path' not set in config.yml!"
-msgstr "'sdk_path' ur yettwasbadu ara 'config.yml'!"
+msgid "'sdk_path' not set in 'config.py'!"
+msgstr "'sdk_path' ur yettwasbadu ara 'config.py'!"
+
+#. Translators: "build-tools" is the file name of a package from
+#. Google, it is part of the Android SDK. So it probably shouldn't be
+#. translated or transliterated.
+#: ../fdroidserver/common.py
+#, python-brace-format
+msgid "'{aapt}' is too old, fdroid requires build-tools-23.0.0 or newer!"
+msgstr "'{aapt}' d aqbuṛ, fdroid yesra build-tools-23.0.0 neɣ amaynut!"
 
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "'{aapt}' is too old, fdroid requires build-tools-{version} or newer!"
 msgstr "'{aapt}' d aqbuṛ, fdroid yesra build-tools-{version} neɣ amaynut!"
 
+#: ../fdroidserver/install.py
+#, python-brace-format
+msgid "'{apkfilename}' is already installed on {dev}."
+msgstr "'{apkfilename}' yebded yakan ɣef {dev}."
+
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "'{field}' in {linedesc} is obsolete, see docs for current fields:"
+msgstr ""
+
+#: ../fdroidserver/common.py
+#, python-brace-format
+msgid "'{field}' will be in random order! Use () or [] brackets if order is important!"
+msgstr "'{field}' ad yili s usmizzwer agacuran ! Seqdec () neɣ tuccar [] ma yella ilaq usmizzwer!"
+
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "'{path}' failed to execute!"
@@ -150,32 +196,23 @@ msgstr "'{path}' ur izmir ara ad yettwaselkem!"
 
 #: ../fdroidserver/metadata.py
 #, python-brace-format
-msgid "'{path}' has invalid format, it should be a dictionary!"
-msgstr ""
-
-#: ../fdroidserver/lint.py ../fdroidserver/metadata.py
-#, python-brace-format
 msgid "'{value}' is not a valid {field} in {appid}. Regex pattern: {pattern}"
 msgstr ""
 
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "'{value}' is not a valid {field}, should be {pattern}"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "--merge-request only runs on a single appid!"
-msgstr ""
-
 #: ../fdroidserver/checkupdates.py
 #, python-brace-format
 msgid "...checkupdate failed for {appid} : {error}"
 msgstr "...anadi n ileqman ur yeddi ara i {appid} : {error}"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid ".__call__() not defined"
 msgstr ".__call__() ur yettwasbadu ara"
 
+#: ../fdroidserver/metadata.py
+msgid ".fdroid.txt is not supported!  Convert to .fdroid.yml or .fdroid.json."
+msgstr ""
+
 #: ../fdroidserver/lint.py
 msgid "/issues is missing"
 msgstr ""
@@ -184,13 +221,12 @@ msgstr ""
 msgid "A URL is required as an argument!"
 msgstr ""
 
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "APK signatures have different certificates in {path}:"
+#: ../fdroid ../fdroidserver/__main__.py
+msgid "Add PGP signatures using GnuPG for packages in repo"
 msgstr ""
 
-#: ../fdroidserver/__main__.py
-msgid "Add PGP signatures using GnuPG for packages in repo"
+#: ../fdroid ../fdroidserver/__main__.py
+msgid "Add a new application from its source code"
 msgstr ""
 
 #: ../fdroidserver/update.py
@@ -210,11 +246,7 @@ msgstr ""
 msgid "Alias of the repo signing key in the keystore"
 msgstr ""
 
-#: ../fdroidserver/build.py
-msgid "AllowedAPKSigningKeys missing but reference binary supplied"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "Allows a different revision (or git branch) to be specified for the initial import"
 msgstr ""
 
@@ -238,9 +270,13 @@ msgstr ""
 msgid "Android DEX code"
 msgstr ""
 
-#: ../fdroidserver/init.py
+#: ../fdroidserver/common.py ../fdroidserver/build.py
 #, python-brace-format
-msgid "Android SDK not found at {path}!"
+msgid "Android SDK '{path}' does not have '{dirname}' installed!"
+msgstr ""
+
+#: ../fdroidserver/common.py
+msgid "Android SDK not found!"
 msgstr ""
 
 #: ../fdroidserver/common.py
@@ -253,17 +289,16 @@ msgstr ""
 msgid "Android SDK path '{path}' is not a directory!"
 msgstr ""
 
+#. Translators: "build-tools" is the file name of a package from
+#. Google, it is part of the Android SDK. So it probably shouldn't be
+#. translated or transliterated.
 #: ../fdroidserver/common.py
 #, python-brace-format
-msgid "Android SDK tool {cmd} not found!"
+msgid "Android build-tools path '{path}' does not exist!"
 msgstr ""
 
-#: ../fdroidserver/lint.py
-msgid "App has Binaries but does not have corresponding AllowedAPKSigningKeys to pin certificate."
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "App has NoSourceSince or ArchivePolicy \"0 versions\" or 0 but AutoUpdateMode or UpdateCheckMode are not None"
+#: ../fdroidserver/update.py
+msgid "AndroidManifest.xml has no date"
 msgstr ""
 
 #: ../fdroidserver/lint.py
@@ -271,10 +306,6 @@ msgstr ""
 msgid "App is in '{repo}' but has a link to {url}"
 msgstr ""
 
-#: ../fdroidserver/lint.py
-msgid "App version has binary but does not have corresponding AllowedAPKSigningKeys to pin certificate."
-msgstr ""
-
 #: ../fdroidserver/lint.py
 msgid "Appending .git is not necessary"
 msgstr ""
@@ -284,27 +315,11 @@ msgstr ""
 msgid "Archiving {apkfilename} with invalid signature!"
 msgstr ""
 
-#: ../fdroidserver/lint.py
-msgid "AutoUpdateMode with UpdateCheckMode: HTTP must have a pattern."
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "Automatic no to all prompts."
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "Automatic yes to all prompts."
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "Bad entry type \"{mirrortype}\" in mirrors config: {mirror}"
-msgstr ""
-
 #: ../fdroidserver/mirror.py
 msgid "Base URL to mirror, can include the index signing key using the query string: ?fingerprint="
 msgstr ""
 
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "Branch '{branch}' used as commit in build '{versionName}'"
@@ -320,7 +335,7 @@ msgstr ""
 msgid "Broken symlink: {path}"
 msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Build a package from source"
 msgstr ""
 
@@ -340,24 +355,31 @@ msgstr ""
 msgid "Build only the latest version of each package"
 msgstr ""
 
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Build should have comma-separated versionName and versionCode, not \"{value}\", in {linedesc}"
+msgstr ""
+
 #: ../fdroidserver/init.py
 #, python-format
 msgid "Built repo based in \"%s\" with this config:"
 msgstr ""
 
-#: ../fdroidserver/checkupdates.py
-msgid "Can't auto-update app with no CurrentVersionCode"
-msgstr ""
-
 #: ../fdroidserver/build.py
 msgid "Can't build due to {} error while scanning"
 msgid_plural "Can't build due to {} errors while scanning"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../fdroidserver/common.py
+#: ../fdroidserver/vmtools.py
 #, python-brace-format
-msgid "Cannot read {path}: {error}"
+msgid "Cannot read \"{path}\"!"
+msgstr "ur izmir ara ad iɣer \"{path}\"!"
+
+#. Translators: https://developer.android.com/studio/build/application-id
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Cannot resolve application ID {appid}"
 msgstr ""
 
 #: ../fdroidserver/rewritemeta.py
@@ -365,23 +387,25 @@ msgstr ""
 msgid "Cannot rewrite \"{path}\""
 msgstr ""
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
+#: ../fdroidserver/rewritemeta.py
+msgid "Cannot use --list and --to at the same time"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Cannot write \"{path}\", not an accepted format, use: {formats}"
+msgstr ""
+
 #: ../fdroidserver/lint.py
 #, python-format
 msgid "Categories '%s' is not valid"
 msgstr ""
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
 #: ../fdroidserver/lint.py
 msgid "Categories are not set"
 msgstr ""
 
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "Category \"{category}\" defined but not used for any apps!"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Check for updates to applications"
 msgstr ""
 
@@ -390,36 +414,35 @@ msgstr ""
 msgid "Checking archiving for {appid} - apks:{integer}, keepversions:{keep}, archapks:{arch}"
 msgstr ""
 
+#: ../fdroidserver/dscanner.py
+msgid "Clean after all scans have finished"
+msgstr ""
+
+#: ../fdroidserver/dscanner.py
+msgid "Clean before the scans start and rebuild the container"
+msgstr ""
+
+#: ../fdroidserver/dscanner.py
+msgid "Clean up all containers and then exit"
+msgstr ""
+
 #: ../fdroidserver/update.py
 msgid "Clean update - don't uses caches, reprocess all APKs"
 msgstr ""
 
-#: ../fdroidserver/common.py
-msgid "Color the log output"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "Comma separated list of categories."
 msgstr "Tabdart n taggayin i yebḍan s ticcert."
 
-#: ../fdroidserver/__main__.py
-#, python-format
+#: ../fdroid ../fdroidserver/__main__.py
+#, c-format, python-format
 msgid "Command '%s' not recognised.\n"
-msgstr "Taladna '%s' ur tettwassen ara.\n"
+msgstr ""
 
 #: ../fdroidserver/checkupdates.py
 msgid "Commit changes"
 msgstr "Azen ibeddilen"
 
-#: ../fdroidserver/checkupdates.py
-msgid "Commit changes, push, then make a merge request"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Conflicting \"{field}\" definitions between .yml and localized files:"
-msgstr ""
-
 #: ../fdroidserver/__main__.py
 msgid "Conflicting arguments: '--verbose' and '--quiet' can not be specified at the same time."
 msgstr ""
@@ -429,13 +452,11 @@ msgstr ""
 msgid "Could not find '{command}' on your system"
 msgstr "D awezɣi tifin n '{command}' deg unagraw-ik.im"
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "Could not find latest version code"
 msgstr ""
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "Could not find latest version name"
 msgstr "Ur izmir ara ad d-yaf isem n lqem aneggaru"
 
@@ -445,26 +466,30 @@ msgid "Could not find {path} to remove it"
 msgstr ""
 
 #: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Could not open APK {path} for analysis: "
-msgstr "Ur yezmir ara ad d-yeldi afaylu APK {path} i tesleḍt: "
+msgid "Could not open apk file for analysis"
+msgstr "Ur yezmir ara a d-ildi afaylu apk i tesleḍt"
 
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "Could not parse size \"{size}\", wrong type \"{type}\""
 msgstr ""
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/import_subcommand.py
+#. Translators: https://developer.android.com/studio/build/application-id
+#: ../fdroidserver/import.py
 msgid "Couldn't find Application ID"
 msgstr ""
 
-#: ../fdroidserver/checkupdates.py
-#, fuzzy
-msgid "Couldn't find any version information"
-msgstr "Ur izmir ara ad d-yaf isem n lqem aneggaru"
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
+#: ../fdroidserver/import.py
+msgid "Couldn't find latest version code"
+msgstr ""
 
-#: ../fdroidserver/checkupdates.py
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
+#: ../fdroidserver/import.py
+msgid "Couldn't find latest version name"
+msgstr ""
+
+#: ../fdroidserver/import.py
 msgid "Couldn't find package ID"
 msgstr ""
 
@@ -472,26 +497,29 @@ msgstr ""
 msgid "Cowardily refusing to overwrite existing signing key setup!"
 msgstr ""
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/update.py
+msgid "Create a repo signing key in a keystore"
+msgstr ""
+
+#: ../fdroidserver/update.py
+msgid "Create skeleton metadata files that are missing"
+msgstr ""
+
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Created new container \"{name}\""
 msgstr "Anagbar amaynut yettwarnan \"{name}\""
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Creating \"{path}\" for configuring s3cmd."
 msgstr ""
 
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Creating empty {config_file}"
-msgstr ""
-
 #: ../fdroidserver/publish.py
 msgid "Creating log directory"
 msgstr ""
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Creating new S3 bucket: {url}"
 msgstr ""
@@ -504,7 +532,8 @@ msgstr ""
 msgid "Creating signed index with this key (SHA256):"
 msgstr ""
 
-#: ../fdroidserver/publish.py ../fdroidserver/verify.py
+#: ../fdroidserver/import.py ../fdroidserver/verify.py
+#: ../fdroidserver/publish.py
 msgid "Creating temporary directory"
 msgstr ""
 
@@ -550,21 +579,16 @@ msgid "Description has a duplicate line"
 msgstr ""
 
 #: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Description of length {length} is over the {limit} char limit"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Did you mean config/{name}.yml?"
+#, python-format
+msgid "Description has a list (%s) but it isn't bulleted (*) nor numbered (#)"
 msgstr ""
 
 #: ../fdroidserver/lint.py
 #, python-brace-format
-msgid "Did you mean {code}?"
+msgid "Description of length {length} is over the {limit} char limit"
 msgstr ""
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "Do not add 'disable:' to the generated build entries"
 msgstr ""
 
@@ -589,20 +613,25 @@ msgstr ""
 msgid "Don't create a source tarball, useful when testing a build"
 msgstr ""
 
+#: ../fdroidserver/stats.py
+msgid "Don't do anything logs-related"
+msgstr ""
+
 #: ../fdroidserver/build.py
 msgid "Don't refresh the repository, useful when testing a build with no internet connection"
 msgstr ""
 
 #: ../fdroidserver/deploy.py ../fdroidserver/nightly.py
+#: ../fdroidserver/upload.py
 msgid "Don't use rsync checksums"
 msgstr ""
 
-#: ../fdroidserver/install.py
-msgid "Download F-Droid.apk using mirrors that leak less to the network"
+#: ../fdroid ../fdroidserver/__main__.py
+msgid "Download complete mirrors of small repos"
 msgstr ""
 
-#: ../fdroidserver/__main__.py
-msgid "Download complete mirrors of small repos"
+#: ../fdroidserver/stats.py
+msgid "Download logs we don't have"
 msgstr ""
 
 #: ../fdroidserver/common.py
@@ -616,12 +645,7 @@ msgstr ""
 
 #: ../fdroidserver/metadata.py
 #, python-brace-format
-msgid "Duplicate Anti-Feature declaration at {path} was ignored!"
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-format
-msgid "Duplicate entry \"%s\" in mirrors config!"
+msgid "Duplicate build recipe found for versionCode {versionCode} in {linedesc}"
 msgstr ""
 
 #: ../fdroidserver/lint.py
@@ -629,42 +653,27 @@ msgstr ""
 msgid "Duplicate link in '{field}': {url}"
 msgstr ""
 
-#: ../fdroidserver/common.py
-#, python-format
-msgid "ERROR: %(message)s"
+#: ../fdroid
+msgid "Dynamically scan APKs post build"
 msgstr ""
 
 #: ../fdroidserver/__main__.py
 msgid "ERROR: The \"server\" subcommand has been removed, use \"deploy\"!"
 msgstr ""
 
+#: ../fdroidserver/mirror.py
+msgid ""
+"ERROR: this command should never be used to mirror f-droid.org!\n"
+"A full mirror of f-droid.org requires more than 200GB."
+msgstr ""
+
 #: ../fdroidserver/nightly.py
 msgid "ERROR: unsupported CI type, patches welcome!"
 msgstr ""
 
-#: ../fdroidserver/nightly.py
-#, python-format
-msgid "ERROR: unsupported git host \"%s\", patches welcome!"
-msgstr ""
-
-#: ../fdroidserver/lint.py
+#: ../fdroidserver/metadata.py
 #, python-brace-format
-msgid "ERROR: {key} in {path} is not \"archive\" or \"repo\"!"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "ERROR: {key} not a valid key!"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "ERROR: {key}'s value should be of type {t}!"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "ERROR: {key}:{subkey} in {path} is not in allowed keys: {allowed_keys}!"
+msgid "Empty build flag at {linedesc}"
 msgstr ""
 
 #: ../fdroidserver/__main__.py
@@ -679,40 +688,20 @@ msgid ""
 "> "
 msgstr ""
 
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Environment variable {var} from {configname} is not set!"
+#: ../fdroidserver/deploy.py ../fdroidserver/checkupdates.py
+#: ../fdroidserver/upload.py
+#, python-format
+msgid "Error while attempting to publish log: %s"
 msgstr ""
 
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Environment variable {{env: {var}}} is not set!"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "Error deploying 'github_releases', {} not present. (You might need to run `fdroid update` first.)"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py ../fdroidserver/common.py
 msgid "Error while getting repo address"
 msgstr ""
 
-#: ../fdroidserver/scanner.py
-msgid "Exit with a non-zero code if problems were found"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Extract application metadata from a source repository"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Extract signatures from APKs"
 msgstr "Izmal-nniḍen sɣur APKs"
 
-#: ../fdroidserver/install.py
-msgid "F-Droid.apk could not be downloaded from any known source!"
-msgstr ""
-
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Failed copying {path}: {error}"
@@ -733,23 +722,27 @@ msgstr ""
 msgid "Failed resizing {path}: {error}"
 msgstr ""
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/publish.py
+msgid "Failed to align application"
+msgstr "Areyyec n usnas ur yeddi ara"
+
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Failed to create S3 bucket: {url}"
 msgstr ""
 
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Failed to get APK information, deleting {path}"
+#: ../fdroidserver/common.py
+msgid "Failed to get APK manifest information"
 msgstr ""
 
 #: ../fdroidserver/update.py
 #, python-brace-format
-msgid "Failed to get APK information, skipping {path}"
+msgid "Failed to get apk information, deleting {path}"
 msgstr ""
 
 #: ../fdroidserver/update.py
-msgid "Failed to get APK signing key fingerprint"
+#, python-brace-format
+msgid "Failed to get apk information, skipping {path}"
 msgstr ""
 
 #: ../fdroidserver/install.py
@@ -757,10 +750,14 @@ msgstr ""
 msgid "Failed to install '{apkfilename}' on {dev}: {error}"
 msgstr ""
 
-#: ../fdroidserver/common.py
+#: ../fdroidserver/publish.py ../fdroidserver/common.py
 msgid "Failed to sign application"
 msgstr "Azmal n usnas ur yeddi ara"
 
+#: ../fdroidserver/common.py
+msgid "Failed to zipalign application"
+msgstr ""
+
 #: ../fdroidserver/build.py
 #, python-brace-format
 msgid "Fetched buildserverid from VM: {buildserverid}"
@@ -776,12 +773,21 @@ msgstr ""
 msgid "File disappeared while processing it: {path}"
 msgstr ""
 
-#: ../fdroidserver/build.py ../fdroidserver/install.py
-#: ../fdroidserver/rewritemeta.py ../fdroidserver/scanner.py
-#: ../fdroidserver/update.py
+#: ../fdroidserver/verify.py ../fdroidserver/stats.py ../fdroidserver/update.py
+#: ../fdroidserver/rewritemeta.py ../fdroidserver/build.py
+#: ../fdroidserver/checkupdates.py ../fdroidserver/scanner.py
+#: ../fdroidserver/install.py
 msgid "Finished"
 msgstr "Immed"
 
+#: ../fdroidserver/lint.py
+msgid "Flattr donation methods belong in the FlattrID flag"
+msgstr ""
+
+#: ../fdroidserver/lint.py
+msgid "Flattr donation methods belong in the FlattrID: field"
+msgstr ""
+
 #: ../fdroidserver/lint.py
 msgid "Forbidden HTML tags"
 msgstr "Ticraḍ HTML yettwagedlen"
@@ -813,6 +819,7 @@ msgstr ""
 msgid "Found invalid appids in arguments"
 msgstr ""
 
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
 #: ../fdroidserver/common.py
 msgid "Found invalid versionCodes for some apps"
 msgstr ""
@@ -822,10 +829,6 @@ msgstr ""
 msgid "Found multiple JAR Signature Block Files in {path}"
 msgstr ""
 
-#: ../fdroidserver/common.py
-msgid "Found multiple Signer Certificates!"
-msgstr ""
-
 #: ../fdroidserver/metadata.py
 #, python-brace-format
 msgid "Found multiple metadata files for {appid}"
@@ -835,6 +838,11 @@ msgstr ""
 msgid "Found multiple signing certificates for repository."
 msgstr ""
 
+#: ../fdroidserver/update.py
+#, python-brace-format
+msgid "Found multiple signing certificates in {path}"
+msgstr ""
+
 #: ../fdroidserver/index.py
 msgid "Found no signing certificates for repository."
 msgstr ""
@@ -849,16 +857,6 @@ msgstr ""
 msgid "Found {apkfilename} at {url}"
 msgstr ""
 
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Found {count} problems in {filename}"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Found {count} warnings in {filename}"
-msgstr ""
-
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Generated skeleton metadata for {appid}"
@@ -877,22 +875,19 @@ msgstr "Asfaḍ Git yecceḍ"
 msgid "Git fetch failed"
 msgstr ""
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
+#: ../fdroidserver/common.py
+msgid "Git remote set-head failed"
+msgstr ""
+
 #: ../fdroidserver/common.py
 #, python-format
 msgid "Git remote set-head failed: \"%s\""
 msgstr ""
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
 #: ../fdroidserver/common.py
 msgid "Git reset failed"
 msgstr ""
 
-#: ../fdroidserver/common.py
-#, fuzzy
-msgid "Git submodule deinit failed"
-msgstr "Asfaḍ Git yecceḍ"
-
 #: ../fdroidserver/common.py
 msgid "Git submodule sync failed"
 msgstr ""
@@ -924,16 +919,6 @@ msgstr ""
 msgid "Ignoring FUNDING.yml entry longer than 2048: %s"
 msgstr ""
 
-#: ../fdroidserver/update.py
-#, python-format
-msgid "Ignoring bad element in manifest: %s"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Ignoring deprecated {oldfile}, use {newfile}!"
-msgstr ""
-
 #: ../fdroidserver/index.py
 msgid "Ignoring package without metadata: "
 msgstr ""
@@ -943,6 +928,11 @@ msgstr ""
 msgid "Ignoring stale cache data for {apkfilename}"
 msgstr ""
 
+#: ../fdroidserver/rewritemeta.py
+#, python-brace-format
+msgid "Ignoring {ext} file at '{path}'"
+msgstr ""
+
 #: ../fdroidserver/update.py
 msgid "Include APKs that are signed with disabled algorithms like MD5"
 msgstr ""
@@ -959,16 +949,6 @@ msgstr ""
 msgid "Include the source tarballs in the mirror"
 msgstr ""
 
-#: ../fdroidserver/metadata.py
-#, python-format
-msgid "Including metadata from %s@%s"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, fuzzy, python-brace-format
-msgid "Including metadata from {path}"
-msgstr "Amasal n yidfersefka d arussim: {path}"
-
 #: ../fdroidserver/common.py
 msgid "Initialising submodules"
 msgstr ""
@@ -977,21 +957,31 @@ msgstr ""
 msgid "Install all signed applications available"
 msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Install built packages on devices"
 msgstr ""
 
 #: ../fdroidserver/install.py
-#, python-format
+#, fuzzy, python-format
 msgid "Installing %s..."
 msgstr "Asbeddi n %s…"
 
+#: ../fdroidserver/install.py
+#, python-format
+msgid "Installing %s…"
+msgstr "Asbeddi n %s…"
+
 #: ../fdroidserver/install.py
 #, python-brace-format
 msgid "Installing '{apkfilename}' on {dev}..."
 msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroidserver/install.py
+#, python-brace-format
+msgid "Installing '{apkfilename}' on {dev}…"
+msgstr "Asebded n '{apkfilename}' deg {dev}…"
+
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Interact with the repo HTTP server"
 msgstr ""
 
@@ -999,36 +989,53 @@ msgstr ""
 msgid "Invalid APK"
 msgstr ""
 
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "Invalid AutoUpdateMode: {mode}"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "Invalid UpdateCheckMode: {mode}"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
+#: ../fdroidserver/lint.py ../fdroidserver/checkupdates.py
 #, python-brace-format
 msgid "Invalid VercodeOperation: {field}"
 msgstr ""
 
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Invalid VercodeOperation: {invalid_ops}"
+#: ../fdroidserver/common.py
+#, fuzzy, python-brace-format
+msgid "Invalid application ID {appid}"
+msgstr "ulac \"tignit\" deg {appid}"
+
+#: ../fdroidserver/metadata.py
+#, python-format
+msgid "Invalid boolean '%s'"
 msgstr ""
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/common.py
+#: ../fdroidserver/metadata.py
 #, python-brace-format
-msgid "Invalid application ID {appid}"
-msgstr "Asulay n usnas d arameɣtu {appid}"
+msgid "Invalid build flag at {line} in {linedesc}"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Invalid build format: {value} in {name}"
+msgstr ""
 
 #: ../fdroidserver/lint.py
 msgid "Invalid bulleted list"
 msgstr "Tabdart s tneqqiḍin tarameɣtut"
 
+#: ../fdroidserver/lint.py
+#, python-format
+msgid "Invalid license tag \"%s\"! Use only tags from https://spdx.org/license-list"
+msgstr ""
+
+#: ../fdroidserver/lint.py
+msgid "Invalid link - use [http://foo.bar Link title] or [http://foo.bar]"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+#, python-format
+msgid "Invalid metadata in %s:%d"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+msgid "Invalid metadata in: "
+msgstr ""
+
 #: ../fdroidserver/common.py
 #, python-format
 msgid "Invalid name for published file: %s"
@@ -1036,7 +1043,7 @@ msgstr ""
 
 #: ../fdroidserver/common.py
 #, python-brace-format
-msgid "Invalid ndk: entry in build: \"{ndk}\""
+msgid "Invalid package name {0}"
 msgstr ""
 
 #: ../fdroidserver/common.py
@@ -1059,6 +1066,11 @@ msgstr ""
 msgid "Invalid srclib metadata: unknown key '{key}' in '{file}'"
 msgstr ""
 
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Invalid versionCode: \"{versionCode}\" is not an integer!"
+msgstr ""
+
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "JAR signature failed to verify: {path}"
@@ -1073,8 +1085,8 @@ msgstr ""
 msgid "Java JAR file"
 msgstr "Afaylu Java JAR"
 
-#: ../fdroidserver/mirror.py ../fdroidserver/publish.py
-#: ../fdroidserver/update.py
+#: ../fdroidserver/publish.py ../fdroidserver/update.py
+#: ../fdroidserver/mirror.py
 msgid "Java JDK not found! Install in standard location or set java_paths!"
 msgstr ""
 
@@ -1090,19 +1102,10 @@ msgstr ""
 msgid "Javascript in HTML src attributes"
 msgstr ""
 
-#: ../fdroidserver/build.py
-#, python-brace-format
-msgid "Keeping failed build \"{apkfilename}\""
-msgstr ""
-
 #: ../fdroidserver/init.py
 msgid "Keystore for signing key:\t"
 msgstr ""
 
-#: ../fdroidserver/lint.py
-msgid "Known debug key is used in AllowedAPKSigningKeys: "
-msgstr ""
-
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "Last used commit '{commit}' looks like a tag, but UpdateCheckMode is '{ucm}'"
@@ -1112,8 +1115,12 @@ msgstr ""
 msgid "Liberapay donation methods belong in the Liberapay: field"
 msgstr ""
 
+#: ../fdroidserver/lint.py
+msgid "Liberapay donation methods belong in the LiberapayID flag"
+msgstr ""
+
 #: ../fdroidserver/rewritemeta.py
-msgid "List files that would be reformatted (dry run)"
+msgid "List files that would be reformatted"
 msgstr ""
 
 #: ../fdroidserver/lint.py
@@ -1132,16 +1139,6 @@ msgstr ""
 msgid "Malformed serverwebroot line:"
 msgstr ""
 
-#: ../fdroidserver/scanner.py
-#, python-format
-msgid "Max recursion depth in ZIP file reached: %s"
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "Mirror config for {url} contains \"isPrimary\" key!"
-msgstr ""
-
 #: ../fdroidserver/mirror.py
 msgid "Mirror the full repo and archive, all file types."
 msgstr ""
@@ -1150,29 +1147,30 @@ msgstr ""
 msgid "Missing output directory"
 msgstr ""
 
-#: ../fdroidserver/metadata.py
-msgid "Moving Anti-Features declarations to localized files:"
-msgstr ""
-
-#: ../fdroidserver/index.py
-msgid "Neither \"repo_pubkey\" nor \"keystorepass\" set in config.yml"
-msgstr ""
-
-#: ../fdroidserver/verify.py
+#: ../fdroidserver/lint.py
 #, python-format
-msgid "No APK for package: %s"
+msgid "Name '%s' is just the auto name - remove it"
+msgstr "Isem '%s' d isem awurman kan - kkes-it"
+
+#: ../fdroidserver/common.py
+msgid "No 'config.py' found, using defaults."
 msgstr ""
 
 #: ../fdroidserver/common.py
 msgid "No Android SDK found!"
 msgstr ""
 
+#: ../fdroidserver/import.py
+msgid "No android or kivy project could be found. Specify --subdir?"
+msgstr ""
+
 #: ../fdroidserver/install.py
 msgid "No attached devices found"
 msgstr ""
 
-#: ../fdroidserver/install.py
-msgid "No devices found for `adb install`! Please plug one in."
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "No commit specified for {versionName} in {linedesc}"
 msgstr ""
 
 #: ../fdroidserver/index.py
@@ -1183,23 +1181,14 @@ msgstr ""
 msgid "No git submodules available"
 msgstr ""
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "No gradle project could be found. Specify --subdir?"
 msgstr ""
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py ../fdroidserver/common.py
 msgid "No information found."
 msgstr ""
 
-#: ../fdroidserver/checkupdates.py
-msgid "No matching tags found"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "No minimum SDK version found in {0}, using default (3)."
-msgstr ""
-
 #: ../fdroidserver/lint.py
 msgid "No need to specify that the app is Free Software"
 msgstr ""
@@ -1209,7 +1198,7 @@ msgid "No need to specify that the app is for Android"
 msgstr ""
 
 #: ../fdroidserver/deploy.py
-msgid "No option set! Edit your config.yml to set at least one of these:"
+msgid "No option set! Edit your config.py to set at least one of these:"
 msgstr ""
 
 #: ../fdroidserver/common.py
@@ -1218,14 +1207,14 @@ msgstr ""
 
 #: ../fdroidserver/install.py
 #, python-format
-msgid "No signed APK available for %s"
+msgid "No signed apk available for %s"
 msgstr ""
 
 #: ../fdroidserver/install.py
 msgid "No signed output directory - nothing to do"
 msgstr ""
 
-#: ../fdroidserver/common.py
+#: ../fdroidserver/update.py ../fdroidserver/common.py
 #, python-brace-format
 msgid "No signing certificates found in {path}"
 msgstr ""
@@ -1235,23 +1224,16 @@ msgstr ""
 msgid "No such package: %s"
 msgstr ""
 
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "No such versionCode {versionCode} for app {appid}"
 msgstr ""
 
-#: ../fdroidserver/checkupdates.py
-msgid "No tags found"
-msgstr ""
-
-#: ../fdroidserver/publish.py ../fdroidserver/verify.py
+#: ../fdroidserver/verify.py ../fdroidserver/publish.py
 msgid "No unsigned directory - nothing to do"
 msgstr ""
 
-#: ../fdroidserver/__main__.py
-msgid "No version information could be found."
-msgstr ""
-
 #: ../fdroidserver/common.py
 msgid "Not a valid size definition: \"{}\""
 msgstr ""
@@ -1266,9 +1248,10 @@ msgid "Nothing to do for {appid}."
 msgstr ""
 
 #: ../fdroidserver/init.py
-msgid "Now set these in config.yml:"
+msgid "Now set these in config.py:"
 msgstr ""
 
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "OBB file has newer versionCode({integer}) than any APK:"
@@ -1286,27 +1269,22 @@ msgstr ""
 msgid "Offline machine, skipping git mirror generation until `fdroid deploy`"
 msgstr ""
 
-#: ../fdroidserver/deploy.py
-msgid "One of the 'github_releases' config items is missing the 'packageNames' value. skipping ..."
+#: ../fdroidserver/common.py
+#, python-brace-format
+msgid "Old APK signature failed to verify: {path}"
 msgstr ""
 
-#: ../fdroidserver/deploy.py
-msgid "One of the 'github_releases' config items is missing the 'projectUrl' value. skipping ..."
+#: ../fdroid ../fdroidserver/__main__.py
+msgid "Old, deprecated name for fdroid deploy"
 msgstr ""
 
-#: ../fdroidserver/deploy.py
-msgid "One of the 'github_releases' config items is missing the 'token' value. skipping ..."
-msgstr ""
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Only PNG and JPEG are supported for graphics, found: {path}"
 msgstr ""
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/common.py
-msgid "Only accepts a single key \"env\""
+#: ../fdroidserver/checkupdates.py
+msgid "Only print differences with the Play Store"
 msgstr ""
 
 #: ../fdroidserver/checkupdates.py
@@ -1317,6 +1295,11 @@ msgstr ""
 msgid "OpenCollective donation methods belong in the OpenCollective: field"
 msgstr ""
 
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "Options"
+msgstr "Iɣewwaren"
+
 #: ../fdroidserver/verify.py
 msgid "Output JSON report to file named after APK."
 msgstr ""
@@ -1325,22 +1308,26 @@ msgstr ""
 msgid "Output JSON to stdout."
 msgstr ""
 
-#: ../fdroidserver/checkupdates.py ../fdroidserver/gpgsign.py
-#: ../fdroidserver/publish.py ../fdroidserver/signindex.py
-#: ../fdroidserver/update.py
+#: ../fdroidserver/gpgsign.py ../fdroidserver/publish.py
+#: ../fdroidserver/update.py ../fdroidserver/signindex.py
+#: ../fdroidserver/checkupdates.py
 msgid "Outputting JSON"
 msgstr ""
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "Overall license of the project."
 msgstr ""
 
+#: ../fdroidserver/dscanner.py
+msgid "Override path for repo APKs (default: ./repo)"
+msgstr ""
+
 #: ../fdroidserver/index.py
 #, python-brace-format
 msgid "Overriding blank versionName in {apkfilename} from metadata: {version}"
 msgstr ""
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 #, python-brace-format
 msgid "Package \"{appid}\" already exists"
 msgstr ""
@@ -1354,10 +1341,13 @@ msgstr ""
 msgid "Password required with username"
 msgstr ""
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "Path to main Android project subdirectory, if not in root."
 msgstr ""
 
+msgid "Path to main android project subdirectory, if not in root."
+msgstr ""
+
 #: ../fdroidserver/init.py
 msgid "Path to the Android SDK (sometimes set in ANDROID_HOME)"
 msgstr ""
@@ -1370,19 +1360,21 @@ msgstr ""
 msgid "Path to the keystore for the repo signing key"
 msgstr ""
 
+#: ../fdroidserver/dscanner.py
+msgid "Prepare Drozer to run a scan"
+msgstr ""
+
+msgid "Prepare drozer to run a scan"
+msgstr ""
+
 #: ../fdroidserver/nightly.py
 msgid "Print the secret variable to the terminal for easy copy/paste"
 msgstr ""
 
-#: ../fdroidserver/install.py
+#: ../fdroidserver/metadata.py
 #, python-brace-format
-msgid "Privacy mode was enabled based on your locale ({country_code})."
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-format
-msgid "Problem with ZIP file: %s, error %s"
-msgstr ""
+msgid "Problem with description of {appid}: {error}"
+msgstr "Ugur deg uglam n {appid}: {error}"
 
 #: ../fdroidserver/common.py
 #, python-brace-format
@@ -1407,7 +1399,11 @@ msgstr "Asesfer n {appid}"
 msgid "Produce human-readable XML/JSON for index files"
 msgstr ""
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/update.py
+msgid "Produce human-readable index.xml"
+msgstr ""
+
+#: ../fdroidserver/import.py
 msgid "Project URL to import from."
 msgstr ""
 
@@ -1419,25 +1415,21 @@ msgstr ""
 msgid "Push the log to this git remote repository"
 msgstr ""
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Pushing binary transparency log to {url}"
 msgstr ""
 
-#: ../fdroidserver/deploy.py
-msgid "Pushing to remote server failed!"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Pushing to {url}"
 msgstr "Adegger ɣer {url}"
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Quickly start a new repository"
 msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Read all the metadata files and exit"
 msgstr ""
 
@@ -1448,12 +1440,14 @@ msgstr ""
 
 #: ../fdroidserver/common.py
 #, python-brace-format
-msgid "Reading packageName/versionCode/versionName failed, APK invalid: '{apkfilename}'"
+msgid "Reading minSdkVersion failed: \"{apkfilename}\""
 msgstr ""
 
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
+#. https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
 #: ../fdroidserver/common.py
 #, python-brace-format
-msgid "Reading packageName/versionCode/versionName failed,APK invalid: '{apkfilename}'"
+msgid "Reading packageName/versionCode/versionName failed, APK invalid: '{apkfilename}'"
 msgstr ""
 
 #: ../fdroidserver/update.py
@@ -1461,35 +1455,24 @@ msgstr ""
 msgid "Reading {apkfilename} from cache"
 msgstr ""
 
-#: ../fdroidserver/build.py
-msgid "Refresh and cache scanner rules and signatures from the network"
-msgstr ""
-
-#: ../fdroidserver/publish.py
-#, python-brace-format
-msgid "Refusing to sign '{path}', file exists in both {dir1} and {dir2} folder."
-msgstr ""
-
-#: ../fdroidserver/verify.py
-msgid "Remove source tarball and any APKs if successfully verified."
+#: ../fdroidserver/stats.py
+msgid "Recalculate aggregate stats - use when changes have been made that would invalidate old cached data."
 msgstr ""
 
 #: ../fdroidserver/common.py
 msgid "Removing specified files"
 msgstr ""
 
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Removing {path}\""
-msgstr ""
-
 #: ../fdroidserver/update.py
 msgid "Rename APK files that do not match package.name_123.apk"
 msgstr ""
 
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "RepoType {type} is deprecated, please switch to git."
+#: ../fdroidserver/update.py
+msgid "Report on build data status"
+msgstr ""
+
+#: ../fdroidserver/build.py
+msgid "Reset and create a brand new build server, even if the existing one appears to be ok."
 msgstr ""
 
 #: ../fdroidserver/nightly.py
@@ -1505,13 +1488,12 @@ msgstr ""
 msgid "Restrict output to warnings and errors"
 msgstr ""
 
-#: ../fdroidserver/net.py
-#, python-format
-msgid "Retrying failed download: %s"
+#: ../fdroid ../fdroidserver/__main__.py
+msgid "Rewrite all the metadata files"
 msgstr ""
 
-#: ../fdroidserver/__main__.py
-msgid "Rewrite all the metadata files"
+#: ../fdroidserver/rewritemeta.py
+msgid "Rewrite to a specific format: "
 msgstr ""
 
 #: ../fdroidserver/rewritemeta.py
@@ -1519,20 +1501,20 @@ msgstr ""
 msgid "Rewriting '{appid}'"
 msgstr ""
 
-#: ../fdroidserver/checkupdates.py
-msgid "Run on git repo that has uncommitted changes"
+#: ../fdroidserver/rewritemeta.py
+#, python-brace-format
+msgid "Rewriting '{appid}' to '{path}'"
 msgstr ""
 
-#: ../fdroidserver/nightly.py
-#, python-brace-format
-msgid "Run over {cibase} to find -debug.apk. and skip repo_basedir {repo_basedir}"
+#: ../fdroidserver/checkupdates.py
+msgid "Run on git repo that has uncommitted changes"
 msgstr ""
 
 #: ../fdroidserver/lint.py
 msgid "Run rewritemeta to fix formatting"
 msgstr ""
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 msgid "Running first pass with MD5 checking disabled"
 msgstr ""
 
@@ -1541,24 +1523,18 @@ msgstr ""
 msgid "Running wget in {path}"
 msgstr ""
 
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "SHA-256 of {url} does not match entry!"
+#: ../fdroidserver/dscanner.py
+msgid "Scan only the latest version of each package"
 msgstr ""
 
 #: ../fdroidserver/build.py
 msgid "Scan the resulting APK(s) for known non-free classes."
 msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Scan the source code of a package"
 msgstr ""
 
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Scanner found {count} problems in {apk}"
-msgstr ""
-
 #: ../fdroidserver/scanner.py
 #, python-brace-format
 msgid "Scanner found {count} problems in {appid}:"
@@ -1575,19 +1551,6 @@ msgid_plural "Scanner found {} problems"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../fdroidserver/scanner.py
-msgid "Scanning APK for extra signing blocks."
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "Scanning APK with dexdump for known non-free classes."
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Set NDK {release} ({version}) up"
-msgstr ""
-
 #: ../fdroidserver/common.py
 msgid "Set clock to that time using:"
 msgstr ""
@@ -1601,7 +1564,7 @@ msgstr ""
 msgid "Set open file limit to {integer}"
 msgstr "Sbadu talast n ufaylu yeldin ɣer {integer}"
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Set up an app build for a nightly build repo"
 msgstr ""
 
@@ -1614,11 +1577,18 @@ msgstr ""
 msgid "Setting {0} sec timeout for this build"
 msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroidserver/build.py
+msgid "Setup an emulator, install the APK on it and perform a Drozer scan"
+msgstr ""
+
+msgid "Setup an emulator, install the apk on it and perform a drozer scan"
+msgstr ""
+
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Sign and place packages in the repo"
 msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Sign indexes created using update --nosign"
 msgstr ""
 
@@ -1631,11 +1601,6 @@ msgstr ""
 msgid "Skipping '{apkfilename}' with invalid signature!"
 msgstr ""
 
-#: ../fdroidserver/deploy.py ../fdroidserver/index.py
-#, python-format
-msgid "Skipping GitLab Pages mirror because the repo is too large (>%.2fGB)!"
-msgstr ""
-
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Skipping index generation for {appid}"
@@ -1651,14 +1616,23 @@ msgstr ""
 msgid "Skipping {appid}: disabled"
 msgstr ""
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/scanner.py
+#, python-brace-format
+msgid "Skipping {appid}: no builds specified"
+msgstr ""
+
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 msgid "Specify a local folder to sync the repo to"
 msgstr ""
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 msgid "Specify an identity file to provide to SSH for rsyncing"
 msgstr ""
 
+#: ../fdroidserver/build.py
+msgid "Specify that we're running on the build server"
+msgstr ""
+
 #: ../fdroidserver/nightly.py
 msgid "Specify which debug keystore file to use."
 msgstr ""
@@ -1667,6 +1641,11 @@ msgstr ""
 msgid "Spew out even more information than normal"
 msgstr ""
 
+#: ../fdroidserver/nightly.py
+#, python-brace-format
+msgid "Striping mystery signature from {apkfilename}"
+msgstr ""
+
 #: ../fdroidserver/nightly.py
 #, python-brace-format
 msgid "Stripping mystery signature from {apkfilename}"
@@ -1687,22 +1666,10 @@ msgstr ""
 msgid "System clock is older than date in {path}!"
 msgstr ""
 
-#: ../fdroidserver/checkupdates.py
-msgid "Tags update mode only works for git, hg, bzr and git-svn repositories currently"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "Tags update mode used in git-svn, but the repo was not set up with tags"
-msgstr ""
-
 #: ../fdroidserver/build.py
 msgid "Test mode - put output in the tmp directory only, and always build, even if the output already exists."
 msgstr ""
 
-#: ../fdroidserver/index.py
-msgid "The \"qrcode\" Python package is not installed (e.g. apt-get install python3-qrcode)!"
-msgstr ""
-
 #. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
 #: ../fdroidserver/update.py
 #, python-brace-format
@@ -1721,10 +1688,18 @@ msgstr ""
 msgid "The file to be included in the repo (path or glob)"
 msgstr ""
 
+#: ../fdroidserver/deploy.py
+msgid "The only commands currently supported are 'init' and 'update'"
+msgstr ""
+
 #: ../fdroidserver/index.py
 msgid "The repository's fingerprint does not match."
 msgstr ""
 
+#: ../fdroidserver/common.py
+msgid "The repository's index could not be verified."
+msgstr ""
+
 #: ../fdroidserver/deploy.py
 #, python-brace-format
 msgid "The root dir for local_copy_dir \"{path}\" does not exist!"
@@ -1738,37 +1713,13 @@ msgstr ""
 msgid "These are the apps that have been archived from the main repo."
 msgstr ""
 
-#: ../fdroidserver/mirror.py
-msgid "This command should never be used to mirror f-droid.org! A full copy requires more than 600GB."
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "This is a repository of apps to be used with F-Droid. Applications in this repository are either official binaries built by the original application developers, or are binaries built from source by the admin of f-droid.org using the tools on https://gitlab.com/fdroid."
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 #, python-format
 msgid "This repo already has local metadata: %s"
 msgstr ""
 
-#: ../fdroidserver/init.py
-#, python-format
-msgid ""
-"To complete the setup, add your APKs to \"%s\"\n"
-"then run \"fdroid update -c; fdroid update\".  You might also want to edit\n"
-"\"config.yml\" to set the URL, repo name, and more.  You should also set up\n"
-"a signing key (a temporary one might have been automatically generated).\n"
-"\n"
-"For more info: https://f-droid.org/docs/Setup_an_F-Droid_App_Repo\n"
-"and https://f-droid.org/docs/Signing_Process"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "To use awsbucket, awssecretkey and awsaccesskeyid must also be set in config.yml!"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "To use rclone, rclone_config and awsbucket must be set in config.yml!"
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
+msgid "To use awsbucket, awssecretkey and awsaccesskeyid must also be set in config.py!"
 msgstr ""
 
 #: ../fdroidserver/lint.py
@@ -1779,6 +1730,10 @@ msgstr ""
 msgid "URL shorteners should not be used"
 msgstr ""
 
+#: ../fdroidserver/metadata.py
+msgid "URL title is just the URL, use brackets: [URL]"
+msgstr ""
+
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "URL {url} in Description: {error}"
@@ -1792,15 +1747,16 @@ msgstr ""
 msgid "Unexpected license tag \"{}\"! Only use license tags configured in your config file"
 msgstr ""
 
-#: ../fdroidserver/common.py
+#: ../fdroidserver/metadata.py
 #, python-brace-format
-msgid "Unknown entry {key} in {configname}"
+msgid "Unexpected text on same line as {field} in {linedesc}"
 msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Unknown exception found!"
-msgstr "Tettwaf tsureft d tarussint!"
+msgstr ""
 
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "Unknown file '{filename}' in build '{versionName}'"
@@ -1811,6 +1767,11 @@ msgstr ""
 msgid "Unknown metadata format: %s"
 msgstr ""
 
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Unknown metadata format: {path}"
+msgstr "Amasal n yidfersefka d arussim: {path}"
+
 #: ../fdroidserver/metadata.py
 #, python-brace-format
 msgid "Unknown metadata format: {path} (use: *.yml)"
@@ -1820,6 +1781,10 @@ msgstr ""
 msgid "Unknown version of aapt, might cause problems: "
 msgstr ""
 
+#: ../fdroidserver/lint.py
+msgid "Unlinkified link - use [http://foo.bar Link title] or [http://foo.bar]"
+msgstr ""
+
 #: ../fdroidserver/lint.py
 msgid "Unnecessary leading space"
 msgstr ""
@@ -1833,12 +1798,20 @@ msgstr ""
 msgid "Unrecognised app field '{fieldname}' in '{path}'"
 msgstr ""
 
+#: ../fdroidserver/metadata.py
+msgid "Unrecognised app field: "
+msgstr ""
+
 #: ../fdroidserver/metadata.py
 #, python-brace-format
 msgid "Unrecognised build flag '{build_flag}' in '{path}'"
 msgstr ""
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Unrecognised field '{field}' in {linedesc}"
+msgstr ""
+
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Unsupported file type \"{extension}\" for repo graphic"
@@ -1849,6 +1822,29 @@ msgstr ""
 msgid "Unsupported graphics file found: {path}"
 msgstr ""
 
+#: ../fdroidserver/rewritemeta.py
+#, python-brace-format
+msgid "Unsupported metadata format, use: --to [{supported}]"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+msgid "Unterminated ]"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+msgid "Unterminated ]]"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Unterminated build in {name}"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Unterminated continuation in {name}"
+msgstr ""
+
 #: ../fdroidserver/lint.py
 #, python-format
 msgid "Unused extlib at %s"
@@ -1869,25 +1865,27 @@ msgstr ""
 msgid "Unused scanignore path: %s"
 msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Update repo information for new packages"
 msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Update the binary transparency log for a URL"
 msgstr ""
 
+#: ../fdroid ../fdroidserver/__main__.py
+msgid "Update the stats of the repo"
+msgstr "Leqqem tidaddanin n ukufi"
+
+#: ../fdroidserver/update.py ../fdroidserver/build.py
+msgid "Update the wiki"
+msgstr "Leqqem awiki"
+
 #: ../fdroidserver/checkupdates.py
 #, python-brace-format
 msgid "UpdateCheckData has invalid URL: {url}"
 msgstr ""
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "UpdateCheckData must match the version code as integer (\\d or [0-9]): {codeex}"
-msgstr ""
-
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "UpdateCheckData must use HTTPS URL: {url}"
@@ -1899,10 +1897,14 @@ msgid "UpdateCheckData not a valid URL: {url}"
 msgstr ""
 
 #: ../fdroidserver/lint.py
-msgid "UpdateCheckMode is set but it looks like checkupdates hasn't been run yet."
+msgid "UpdateCheckMode is set but it looks like checkupdates hasn't been run yet"
+msgstr ""
+
+#. Translators: https://developer.android.com/studio/build/application-id
+#: ../fdroidserver/lint.py
+msgid "UpdateCheckName is set to the known application ID - it can be removed"
 msgstr ""
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
 #: ../fdroidserver/lint.py
 msgid "UpdateCheckName is set to the known application ID, it can be removed"
 msgstr ""
@@ -1917,8 +1919,19 @@ msgstr ""
 msgid "Uploading {apkfilename} to virustotal"
 msgstr ""
 
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "Usage"
+msgstr "Aseqdec"
+
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, python-format
+msgid "Usage: %s\n"
+msgstr ""
+
 #: ../fdroidserver/lint.py
-msgid "Use /HEAD instead of /master or /main to point at a file in the default branch"
+msgid "Use /HEAD instead of /master to point at a file in the default branch"
 msgstr ""
 
 #: ../fdroidserver/update.py
@@ -1933,14 +1946,12 @@ msgstr ""
 msgid "Use date from APK instead of current time for newly added APKs"
 msgstr ""
 
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Using \"{path}\" for configuring s3cmd."
+msgid "Use date from apk instead of current time for newly added apks"
 msgstr ""
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
-msgid "Using \"{path}\" for syncing with remote storage."
+msgid "Using \"{path}\" for configuring s3cmd."
 msgstr ""
 
 #: ../fdroidserver/common.py
@@ -1951,17 +1962,13 @@ msgstr ""
 msgid "Using APK Signature v3"
 msgstr ""
 
-#: ../fdroidserver/common.py
-msgid "Using JAR Signature"
-msgstr ""
-
 #: ../fdroidserver/common.py
 msgid "Using Java's jarsigner, not recommended for verifying APKs! Use apksigner"
 msgstr ""
 
-#: ../fdroidserver/metadata.py
+#: ../fdroidserver/common.py
 #, python-brace-format
-msgid "Using blank dictionary instead of contents of {path}!"
+msgid "Using androguard from \"{path}\""
 msgstr ""
 
 #: ../fdroidserver/init.py
@@ -1969,17 +1976,12 @@ msgstr ""
 msgid "Using existing keystore \"{path}\""
 msgstr "Aseqdec n tqeffalt n uḥraz \"{path}\""
 
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Using rclone to sync with: {url}"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Using s3cmd to sync with: {url}"
 msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Valid commands are:"
 msgstr "Tiludna timeɣta d ti:"
 
@@ -1987,7 +1989,7 @@ msgstr "Tiludna timeɣta d ti:"
 msgid "Verify against locally cached copy rather than redownloading."
 msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Verify the integrity of downloaded packages"
 msgstr "Senqed timmad n yikemmusen yettwasadren"
 
@@ -1995,28 +1997,15 @@ msgstr "Senqed timmad n yikemmusen yettwasadren"
 msgid "Verifying index signature:"
 msgstr ""
 
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "Verifying package {path} with apksigner."
-msgstr ""
-
 #: ../fdroidserver/deploy.py
 #, python-brace-format
 msgid "VirusTotal API key cannot upload files larger than 32MB, use {url} to upload {path}."
 msgstr ""
 
-#: ../fdroidserver/nightly.py
-msgid "WARNING: only public git repos are supported!"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Warn about possible metadata errors"
 msgstr ""
 
-#: ../fdroidserver/scanner.py
-msgid "WebAssembly binary file"
-msgstr ""
-
 #: ../fdroidserver/update.py
 msgid "When configured for signed indexes, create only unsigned indexes at this stage"
 msgstr ""
@@ -2025,16 +2014,7 @@ msgstr ""
 msgid "When linting the entire repository yamllint is disabled by default. This option forces yamllint regardless."
 msgstr ""
 
-#: ../fdroidserver/publish.py
-msgid "When signing or verifying fails, exit with an error code."
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "Would you like to download and install F-Droid.apk via adb? (YES/no)"
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "Would you like to download the app(s) from f-droid.org? (YES/no)"
+msgid "X.509 'Distiguished Name' used when generating keys"
 msgstr ""
 
 #: ../fdroidserver/init.py
@@ -2049,11 +2029,6 @@ msgstr ""
 msgid "ZIP file archive"
 msgstr ""
 
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "adb reports {serial} is \"{status}\"!"
-msgstr ""
-
 #: ../fdroidserver/nightly.py
 #, python-brace-format
 msgid "adding IdentityFile to {path}"
@@ -2062,68 +2037,72 @@ msgstr "timerniwt n ufaylu n tmagit ɣer {path}"
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "adding to {name}: {path}"
-msgstr "timerniwt ɣer {name}: {path}"
+msgstr "timerniwt ɣer  {name}: {path}"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "ambiguous option: %(option)s could match %(matches)s"
 msgstr ""
 
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "apksigner in build-tools;{version} passes APKs with invalid v3 signatures, ignoring."
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "apksigner not found! Cannot sign or verify modern APKs"
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, python-format
+msgid "ambiguous option: %s (%s?)"
 msgstr ""
 
 #: ../fdroidserver/common.py
 msgid "apksigner not found, it's required for signing!"
 msgstr ""
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/checkupdates.py ../fdroidserver/lint.py
-#: ../fdroidserver/rewritemeta.py
+#: ../fdroidserver/lint.py ../fdroidserver/rewritemeta.py
+#: ../fdroidserver/checkupdates.py
 msgid "application ID of file to operate on"
 msgstr ""
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/build.py ../fdroidserver/install.py
-#: ../fdroidserver/publish.py ../fdroidserver/scanner.py
-#: ../fdroidserver/verify.py
+#: ../fdroidserver/verify.py ../fdroidserver/publish.py
+#: ../fdroidserver/build.py ../fdroidserver/scanner.py
+#: ../fdroidserver/install.py
 msgid "application ID with optional versionCode in the form APPID[:VERCODE]"
 msgstr ""
 
-#: ../fdroidserver/common.py
-msgid "archive_url needs to end with /archive"
+#: ../fdroidserver/lint.py ../fdroidserver/rewritemeta.py
+msgid "applicationId in the form APPID"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: ../fdroidserver/checkupdates.py
+msgid "applicationId to check for updates"
+msgstr ""
+
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
+#: ../fdroidserver/verify.py ../fdroidserver/publish.py
+#: ../fdroidserver/dscanner.py ../fdroidserver/build.py
+#: ../fdroidserver/scanner.py ../fdroidserver/install.py
+msgid "applicationId with optional versionCode in the form APPID[:VERCODE]"
+msgstr ""
+
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "argument \"-\" with mode %r"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "argument %(argument_name)s: %(message)s"
-msgstr ""
-
 #: ../fdroidserver/nightly.py
 msgid "attempting bare SSH connection to test deploy key:"
 msgstr ""
 
+#: ../fdroidserver/nightly.py
+msgid "attempting bare ssh connection to test deploy key:"
+msgstr ""
+
 #: ../fdroidserver/common.py
 msgid "can not parse scrlib spec (not a string): '{}'"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
-msgid "can't open '%(filename)s': %(error)s"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "can't open non-https url: '{};"
+msgid "can't open '%s': %s"
 msgstr ""
 
 #: ../fdroidserver/build.py
@@ -2131,11 +2110,13 @@ msgstr ""
 msgid "cannot find required srclibs: \"{path}\""
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "cannot have multiple subparser arguments"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "cannot merge actions - two groups are named %r"
 msgstr ""
@@ -2149,25 +2130,30 @@ msgstr ""
 msgid "cloning {url}"
 msgstr ""
 
+#: ../fdroidserver/deploy.py
+msgid "command to execute, either 'init' or 'update'"
+msgstr ""
+
 #: ../fdroidserver/__main__.py
 msgid "commands from plugin modules:"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "complex"
+msgstr ""
+
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "conflicting option string: %s"
 msgid_plural "conflicting option strings: %s"
 msgstr[0] ""
 msgstr[1] ""
 
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "conflicting subparser alias: %s"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "conflicting subparser: %s"
+#: ../fdroidserver/nightly.py
+#, python-brace-format
+msgid "copying {apkfilename} into {path}"
 msgstr ""
 
 #: ../fdroidserver/metadata.py
@@ -2176,11 +2162,11 @@ msgid "could not parse '{path}'"
 msgstr ""
 
 #: ../fdroidserver/common.py
-msgid "could not parse srclib spec (no name specified): '{}'"
+msgid "could not parse srclib spec (no ref specified): '{}'"
 msgstr ""
 
 #: ../fdroidserver/common.py
-msgid "could not parse srclib spec (no ref specified): '{}'"
+msgid "could not parse srclib spec (too many '@' signs): '{}'"
 msgstr ""
 
 #: ../fdroidserver/nightly.py
@@ -2188,18 +2174,14 @@ msgstr ""
 msgid "created {path}"
 msgstr ""
 
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "current version is newer: old vercode={old}, new vercode={new}"
-msgstr ""
-
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "deleting: repo/{apkfilename}"
 msgstr ""
 
-#: ../fdroidserver/scanner.py
-msgid "dependency file without lock"
+#: ../fdroidserver/common.py
+#, python-brace-format
+msgid "deployed build logs to '{path}'"
 msgstr ""
 
 #: ../fdroidserver/common.py
@@ -2207,48 +2189,59 @@ msgstr ""
 msgid "deployed process log {path} to {dest}"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "dest= is required for options like %r"
 msgstr ""
 
-#: ../fdroidserver/scanner.py
-msgid "downloading '{}'"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "downloading scanner signatures from '{}' failed"
-msgstr ""
-
 #: ../fdroidserver/scanner.py
 msgid "executable binary, possibly code"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "expected %s argument"
 msgid_plural "expected %s arguments"
 msgstr[0] ""
 msgstr[1] ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "expected at least one argument"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "expected at most one argument"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "expected one argument"
 msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroidserver/common.py
+#, python-brace-format
+msgid "failed deploying build logs to '{path}'"
+msgstr ""
+
+#: ../fdroid
+msgid "fdroid [-h|--help|--version] <command> [<args>]"
+msgstr ""
+
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "fdroid [<command>] [-h|--help|--version|<args>]"
 msgstr "fdroid [<command>] [-h|--tallelt|--lqem|<args>]"
 
-#: ../fdroidserver/scanner.py
-msgid "fetch the latest version of signatures from the web"
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "floating-point"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+msgid "force errors to be warnings, or ignore"
 msgstr ""
 
 #: ../fdroidserver/metadata.py
@@ -2263,7 +2256,8 @@ msgstr ""
 msgid "gzip file archive"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "ignored explicit argument %r"
 msgstr ""
@@ -2272,39 +2266,35 @@ msgstr ""
 msgid "index-v1 must have a signature, use `fdroid signindex` to create it!"
 msgstr ""
 
-#: ../fdroidserver/index.py
-msgid "index-v2 must have a signature, use `fdroid signindex` to create it!"
-msgstr ""
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "integer"
+msgstr "amḍan ummid"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "invalid %(type)s value: %(value)r"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "invalid choice: %(value)r (choose from %(choices)s)"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "invalid conflict_resolution value: %r"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "invalid option string %(option)r: must start with a character %(prefix_chars)r"
 msgstr ""
 
-#: ../fdroidserver/common.py
-msgid "ipfs_cid not found, skipping CIDv1 generation"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "latest build recipe is newer: old vercode={old}, new vercode={new}"
-msgstr ""
-
 #: ../fdroidserver/deploy.py
 #, python-brace-format
 msgid "local_copy_dir does not end with \"fdroid\", perhaps you meant: \"{path}\""
@@ -2323,20 +2313,11 @@ msgstr ""
 msgid "mirror '%s' does not end with 'fdroid'!"
 msgstr ""
 
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "mirrors set twice, in config.yml and {path}!"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "mutually exclusive arguments must be optional"
 msgstr ""
 
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "next {name} cache update due in {time}"
-msgstr ""
-
 #: ../fdroidserver/mirror.py
 #, python-brace-format
 msgid "no \"icon\" in {appid}"
@@ -2346,35 +2327,97 @@ msgstr "ulac \"tignit\" deg {appid}"
 msgid "no APK supplied"
 msgstr ""
 
-#: ../fdroidserver/checkupdates.py
-msgid "no version information found"
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, python-format
+msgid "no such option: %s"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: ../fdroid ../fdroidserver/__main__.py
+msgid "no version info found!"
+msgstr ""
+
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "not allowed with argument %s"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "one of the arguments %s is required"
 msgstr ""
 
-#: ../fdroidserver/common.py ../fdroidserver/index.py
+#: ../fdroidserver/index.py ../fdroidserver/common.py
 msgid "only accepts strings, lists, and tuples"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
-#, fuzzy
-msgid "options"
-msgstr "Tixtiṛiyin"
+#: ../fdroidserver/install.py
+#, python-format
+msgid "option %s: If you really want to install all the signed apps, use --all"
+msgstr ""
+
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, python-format
+msgid "option %s: invalid %s value: %r"
+msgstr ""
+
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, python-format
+msgid "option %s: invalid choice: %r (choose from %s)"
+msgstr ""
+
+#: /usr/lib/python3.5/getopt.py /usr/lib/python3.6/getopt.py
+#: /usr/lib/python3.7/getopt.py
+#, python-format
+msgid "option -%s not recognized"
+msgstr ""
+
+#: /usr/lib/python3.5/getopt.py /usr/lib/python3.6/getopt.py
+#: /usr/lib/python3.7/getopt.py
+#, python-format
+msgid "option -%s requires argument"
+msgstr ""
+
+#: /usr/lib/python3.5/getopt.py /usr/lib/python3.6/getopt.py
+#: /usr/lib/python3.7/getopt.py
+#, python-format
+msgid "option --%s must not have an argument"
+msgstr "aɣewwar --%s yessefk ad yesεu tiɣiret"
+
+#: /usr/lib/python3.5/getopt.py /usr/lib/python3.6/getopt.py
+#: /usr/lib/python3.7/getopt.py
+#, python-format
+msgid "option --%s not a unique prefix"
+msgstr ""
+
+#: /usr/lib/python3.5/getopt.py /usr/lib/python3.6/getopt.py
+#: /usr/lib/python3.7/getopt.py
+#, python-format
+msgid "option --%s not recognized"
+msgstr ""
+
+#: /usr/lib/python3.5/getopt.py /usr/lib/python3.6/getopt.py
+#: /usr/lib/python3.7/getopt.py
+#, python-format
+msgid "option --%s requires argument"
+msgstr ""
+
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
+msgid "optional arguments"
+msgstr ""
 
 #: ../fdroidserver/nightly.py
 #, python-brace-format
 msgid "overwriting existing {path}"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "positional arguments"
 msgstr ""
 
@@ -2383,53 +2426,42 @@ msgstr ""
 msgid "process log deploy {path} to {dest} failed!"
 msgstr ""
 
-#: ../fdroidserver/build.py
-msgid "reference binary missing signature"
-msgstr ""
-
 #: ../fdroidserver/signatures.py
 #, python-brace-format
 msgid "refuse downloading via insecure HTTP connection (use HTTPS or specify --no-https-check): {apkfilename}"
 msgstr ""
 
+#: ../fdroidserver/signatures.py
+#, python-brace-format
+msgid "refuse downloading via insecure http connection (use https or specify --no-https-check): {apkfilename}"
+msgstr ""
+
 #: ../fdroidserver/index.py
 #, python-format
-msgid "repo_icon \"repo/icons/%s\" does not exist, generating placeholder."
+msgid "repo_icon %s does not exist, generating placeholder."
 msgstr ""
 
-#: ../fdroidserver/common.py
-msgid "repo_url needs to end with /repo"
+#: ../fdroidserver/metadata.py
+msgid "ruamel.yaml not installed, can not write metadata."
 msgstr ""
 
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "rsync is missing or broken: {error}"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "s3cmd sync indexes {path} to {url} and delete"
 msgstr ""
 
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "s3cmd syncs indexes from {path} to {url} and deletes removed"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "scanner cache is malformed! You can clear it with: '{clear}'"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "serverwebroot: path does not end with \"fdroid\", perhaps you meant one of these:"
-msgstr ""
-
 #: ../fdroidserver/scanner.py
 msgid "shared library"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "show program's version number and exit"
+msgstr ""
+
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.5/optparse.py
+#: /usr/lib/python3.6/argparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/argparse.py /usr/lib/python3.7/optparse.py
 msgid "show this help message and exit"
 msgstr ""
 
@@ -2458,31 +2490,31 @@ msgstr ""
 msgid "static library"
 msgstr "tamkerḍit n tdaddanin"
 
-#: ../fdroidserver/build.py
+#: ../fdroidserver/common.py
 #, python-brace-format
-msgid "supplied reference binary has allowed signer {signer}"
+msgid "supplied timestamp value '{timestamp}' is not a unix timestamp"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "the following arguments are required: %s"
 msgstr ""
 
-#: ../fdroidserver/install.py
-msgid "true"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "unexpected option string: %s"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "unknown parser %(parser_name)r (choices: %(choices)s)"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "unrecognized arguments: %s"
 msgstr ""
@@ -2492,11 +2524,16 @@ msgstr ""
 msgid "unsafe permissions on '{config_file}' (should be 0600)!"
 msgstr ""
 
-#: ../fdroidserver/__main__.py /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py ../fdroid
+#: /usr/lib/python3.7/argparse.py ../fdroidserver/__main__.py
 msgid "usage: "
 msgstr "aqseqdac: "
 
-#: ../fdroidserver/deploy.py
+#: ../fdroid
+msgid "usage: fdroid [-h|--help|--version] <command> [<args>]"
+msgstr ""
+
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "using Apache libcloud to sync with {url}"
 msgstr ""
@@ -2505,8 +2542,8 @@ msgstr ""
 msgid "virustotal.com is rate limiting, waiting to retry..."
 msgstr ""
 
-#: ../fdroidserver/install.py
-msgid "yes"
+#: ../fdroidserver/update.py
+msgid "wiki support is deprecated and will be removed in the next release!"
 msgstr ""
 
 #: ../fdroidserver/publish.py
@@ -2521,19 +2558,31 @@ msgstr[1] ""
 msgid "{apkfilename} ({appid}) has no metadata!"
 msgstr ""
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
+#: ../fdroidserver/update.py
+#, python-brace-format
+msgid "{apkfilename} has multiple {name} files, looks like Master Key exploit!"
+msgstr ""
+
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "{apkfilename}'s AndroidManifest.xml has a bad date: "
 msgstr ""
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "{appid} does not have a name! Using application ID instead."
 msgstr ""
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
+#: ../fdroidserver/update.py
+#, python-brace-format
+msgid "{appid} does not have a name! Using package name instead."
+msgstr ""
+
+#: ../fdroidserver/update.py
+#, python-brace-format
+msgid "{appid} from {path} is not a valid Android Package Name!"
+msgstr ""
+
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "{appid} from {path} is not a valid Android application ID!"
@@ -2544,16 +2593,12 @@ msgstr ""
 msgid "{appid} from {path} is not a valid Java Package Name!"
 msgstr ""
 
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{appid} has both APKs and files: {files}"
-msgstr ""
-
 #: ../fdroidserver/mirror.py
 #, python-brace-format
 msgid "{appid} is missing {name}"
 msgstr ""
 
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "{appid}: Unknown extlib {path} in build '{versionName}'"
@@ -2581,7 +2626,7 @@ msgstr ""
 
 #: ../fdroidserver/metadata.py
 #, python-brace-format
-msgid "{build_flag} must be list or string, found: {value}"
+msgid "{field} not terminated in {name}"
 msgstr ""
 
 #: ../fdroidserver/metadata.py
@@ -2591,15 +2636,10 @@ msgstr ""
 
 #: ../fdroidserver/update.py
 #, python-brace-format
-msgid "{name} \"{section}/icons/{path}\" does not exist! Check \"config.yml\"."
+msgid "{name} \"{path}\" does not exist! Correct it in config.py."
 msgstr ""
 
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{path1} is a duplicate of {path2}, remove one!"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 #, python-brace-format
 msgid "{path} already exists, ignoring import results!"
 msgstr ""
@@ -2614,36 +2654,6 @@ msgstr "{path} ur yelli ara! Rnu-t s uselkem:"
 msgid "{path} has bad file signature \"{pattern}\", possible Janus exploit!"
 msgstr ""
 
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "{path} has been flagged by virustotal {count} times:"
-msgstr ""
-
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "{path} has the wrong fingerprint ({fingerprint})!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "{path} is not \"key: value\" dict, but a {datatype}!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, fuzzy, python-brace-format
-msgid "{path} is not a standard config file!"
-msgstr "'sdk_path' ur yettwasbadu ara 'config.yml'!"
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "{path} is not list, but a {datatype}!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "{path} is not {expected_type}, but a {datatype}!"
-msgstr ""
-
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "{path} is zero size!"
@@ -2654,22 +2664,12 @@ msgstr ""
 msgid "{path} more than 200MB, manually upload: {url}"
 msgstr ""
 
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "{path}: \"{code}\" is not a valid ISO_3166-1 alpha-2 country code!"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{path}: {error}"
-msgstr ""
-
 #: ../fdroidserver/mirror.py
 #, python-brace-format
 msgid "{url} does not end with \"fdroid\", check the URL path!"
 msgstr ""
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/common.py
 #, python-brace-format
 msgid "{url} does not start with \"http\"!"
 msgstr ""
diff --git a/locale/ko/LC_MESSAGES/fdroidserver.po b/locale/ko/LC_MESSAGES/fdroidserver.po
index cb546be1..b8c6c8b3 100644
--- a/locale/ko/LC_MESSAGES/fdroidserver.po
+++ b/locale/ko/LC_MESSAGES/fdroidserver.po
@@ -1,26 +1,43 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# Hans-Christoph Steiner <hans@guardianproject.info>, 2020, 2021, 2022, 2024.
-# Myeongjin Lee <aranet100@gmail.com>, 2021.
-# Cxnfl1ct <wind0wso2o2@naver.com>, 2024.
+# Hans-Christoph Steiner <hans@guardianproject.info>, 2020.
 msgid ""
 msgstr ""
 "Project-Id-Version: fdroidserver 0.8-135-g16dd6d28\n"
 "Report-Msgid-Bugs-To: https://gitlab.com/fdroid/fdroidserver/issues\n"
-"POT-Creation-Date: 2025-06-25 09:52+0200\n"
-"PO-Revision-Date: 2024-09-06 14:57+0000\n"
-"Last-Translator: Cxnfl1ct <wind0wso2o2@naver.com>\n"
+"POT-Creation-Date: 2020-10-21 18:05+0200\n"
+"PO-Revision-Date: 2020-11-10 16:20+0000\n"
+"Last-Translator: Hans-Christoph Steiner <hans@guardianproject.info>\n"
 "Language-Team: Korean <https://hosted.weblate.org/projects/f-droid/fdroidserver/ko/>\n"
 "Language: ko\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Weblate 5.8-dev\n"
+"X-Generator: Weblate 4.4-dev\n"
+
+#: ../fdroidserver/common.py
+msgid ""
+"\n"
+"        This is a repository of apps to be used with FDroid. Applications in this\n"
+"        repository are either official binaries built by the original application\n"
+"        developers, or are binaries built from source by f-droid.org using the\n"
+"        tools on https://gitlab.com/fdroid.\n"
+"        "
+msgstr ""
 
 #: ../fdroidserver/nightly.py
 msgid ""
 "\n"
+"SSH Public Key to be used as Deploy Key:"
+msgstr ""
+"\n"
+"배포 키로 사용될 SSH 공개 키:"
+
+#: ../fdroidserver/nightly.py
+#, fuzzy
+msgid ""
+"\n"
 "SSH public key to be used as deploy key:"
 msgstr ""
 "\n"
@@ -40,26 +57,22 @@ msgstr ""
 msgid "\"%s/\" has no matching metadata file!"
 msgstr "\"%s/\"에 일치하는 메타데이터 파일이 없습니다!"
 
-#: ../fdroidserver/index.py
-msgid "\"isPrimary\" key should not be added to mirrors!"
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, fuzzy, python-brace-format
-msgid "\"local_copy_dir\" {path} does not exist!"
-msgstr "Android SDK 경로 '{path}'는 존재하지 않습니다!"
-
 #: ../fdroidserver/install.py
-#, python-brace-format
+#, fuzzy, python-brace-format
 msgid "\"{apkfilename}\" is already installed on {dev}."
-msgstr "\"{apkfilename}\"는 이미 {dev}에 설치되어 있습니다."
+msgstr "'{apkfilename}'는 이미 {dev}에 설치되어 있습니다."
+
+#: ../fdroidserver/update.py
+#, python-brace-format
+msgid "\"{path}\" contains outdated {name} ({version})"
+msgstr "\"{path}\"는 오래된 {name} ({version})를 포함합니다"
 
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "\"{path}\" contains recent {name} ({version})"
 msgstr "\"{path}\"는 최근 {name} ({version})를 포함합니다"
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "\"{path}\" exists but s3cmd is not installed!"
 msgstr "\"{path}\"는 존재하지만 s3cmd는 설치되어 있지 않습니다!"
@@ -69,84 +82,118 @@ msgstr "\"{path}\"는 존재하지만 s3cmd는 설치되어 있지 않습니다!
 msgid "\"{path}\" is not a supported file format (use: metadata/*.yml)"
 msgstr ""
 
-#: ../fdroidserver/update.py
+#: ../fdroidserver/metadata.py
 #, python-brace-format
-msgid "\"{path}\" is signed by a key that is not allowed:"
+msgid "\"{path}\" is not an accepted format, convert to: {formats}"
 msgstr ""
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/common.py
 #, python-brace-format
 msgid "\"{url}\" is not a valid URL!"
-msgstr "\"{url}\"은 올바른 URL이 아닙니다!"
+msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, python-format
+msgid "%(option)s option requires %(number)d argument"
+msgid_plural "%(option)s option requires %(number)d arguments"
+msgstr[0] "%(option)s 옵션은 %(number)d 인자가 필요합니다"
+
+#: ../fdroidserver/mirror.py
+#, python-format
+msgid "%(prog)s [options] url"
+msgstr "%(prog)s [옵션] url"
+
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "%(prog)s: error: %(message)s\n"
 msgstr "%(prog)s: 오류: %(message)s\n"
 
-#: ../fdroidserver/publish.py
-#, python-format
-msgid "%d APKs failed to be signed or verified!"
-msgstr ""
-
 #: ../fdroidserver/scanner.py
 #, python-format
 msgid "%d problems found"
 msgstr "문제 %d개를 찾음"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "%prog [options]"
+msgstr "%prog [옵션]"
+
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "%r is not callable"
 msgstr "%r는 호출할 수 없습니다"
 
-#: ../fdroidserver/signindex.py
-#, python-format
-msgid "%s did not produce a dict!"
-msgstr ""
-
-#: ../fdroidserver/signindex.py
-#, python-format
-msgid "%s has bad SHA-256: %s"
-msgstr ""
-
 #: ../fdroidserver/lint.py
 #, python-format
 msgid "%s is not an accepted build field"
 msgstr "%s는 빌드 필드 값으로 허용되지 않습니다"
 
-#: ../fdroidserver/common.py
-msgid "'keypass' not found in config.yml!"
-msgstr "'keypass'를 config.yml에서 찾을 수 없습니다!"
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, python-format
+msgid "%s option does not take a value"
+msgstr "%s 옵션은 값을 받지 않습니다"
+
+#: ../fdroidserver/index.py ../fdroidserver/common.py
+msgid "'keypass' not found in config.py!"
+msgstr "'keypass'를 config.py에서 찾을 수 없습니다!"
 
 #: ../fdroidserver/common.py
 msgid "'keystore' is NONE and 'smartcardoptions' is blank!"
-msgstr "'keystore'이 없고 'smartcardoptions'가 비어 있습니다!"
+msgstr ""
 
-#: ../fdroidserver/common.py
-msgid "'keystore' not found in config.yml!"
-msgstr "'keystore'를 config.yml에서 찾을 수 없습니다!"
+#: ../fdroidserver/index.py ../fdroidserver/common.py
+msgid "'keystore' not found in config.py!"
+msgstr "'keystore'를 config.py에서 찾을 수 없습니다!"
 
-#: ../fdroidserver/common.py
-msgid "'keystorepass' not found in config.yml!"
-msgstr "'keystorepass'를 config.yml에서 찾을 수 없습니다!"
+#: ../fdroidserver/index.py ../fdroidserver/common.py
+msgid "'keystorepass' not found in config.py!"
+msgstr "'keystorepass'를 config.py에서 찾을 수 없습니다!"
 
-#: ../fdroidserver/common.py
-msgid "'repo_keyalias' not found in config.yml!"
-msgstr "'repo_keyalias'를 config.yml에서 찾을 수 없습니다!"
+#: ../fdroidserver/index.py ../fdroidserver/common.py
+msgid "'repo_keyalias' not found in config.py!"
+msgstr "'repo_keyalias'를 config.py에서 찾을 수 없습니다!"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "'required' is an invalid argument for positionals"
 msgstr "'required'는 고정적을 위한 잘못된 인수입니다"
 
 #: ../fdroidserver/common.py
-msgid "'sdk_path' not set in config.yml!"
-msgstr "'sdk_path'가 config.yml에서 설정되어 있지 않습니다!"
+msgid "'sdk_path' not set in 'config.py'!"
+msgstr "'sdk_path'를 'config.py'에서 설정할 수 없습니다!"
+
+#. Translators: "build-tools" is the file name of a package from
+#. Google, it is part of the Android SDK. So it probably shouldn't be
+#. translated or transliterated.
+#: ../fdroidserver/common.py
+#, python-brace-format
+msgid "'{aapt}' is too old, fdroid requires build-tools-23.0.0 or newer!"
+msgstr "'{aapt}'는 너무 오래되었습니다, fdroid는 build-tools-23.0.0 이후가 필요합니다!"
 
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "'{aapt}' is too old, fdroid requires build-tools-{version} or newer!"
 msgstr "'{aapt}'는 너무 오래되었습니다, fdroid는 build-tools-{version} 이후가 필요합니다!"
 
+#: ../fdroidserver/install.py
+#, python-brace-format
+msgid "'{apkfilename}' is already installed on {dev}."
+msgstr "'{apkfilename}'는 이미 {dev}에 설치되어 있습니다."
+
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "'{field}' in {linedesc} is obsolete, see docs for current fields:"
+msgstr ""
+
+#: ../fdroidserver/common.py
+#, python-brace-format
+msgid "'{field}' will be in random order! Use () or [] brackets if order is important!"
+msgstr "'{field}'는 순서가 무작위로 변합니다! 순서가 중요하면 괄호 ()나 대괄호 []를 사용하세요!"
+
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "'{path}' failed to execute!"
@@ -154,32 +201,23 @@ msgstr "'{path}'를 실행하는 데 실패했습니다!"
 
 #: ../fdroidserver/metadata.py
 #, python-brace-format
-msgid "'{path}' has invalid format, it should be a dictionary!"
-msgstr ""
-
-#: ../fdroidserver/lint.py ../fdroidserver/metadata.py
-#, python-brace-format
 msgid "'{value}' is not a valid {field} in {appid}. Regex pattern: {pattern}"
 msgstr "'{value}'는 {appid}에서 올바른 {field}가 아닙니다. 정규식 패턴: {pattern}"
 
-#: ../fdroidserver/metadata.py
-#, fuzzy, python-brace-format
-msgid "'{value}' is not a valid {field}, should be {pattern}"
-msgstr "'{value}'에서 올바른 {field}가 아닙니다. 정규식 패턴: {pattern}"
-
-#: ../fdroidserver/checkupdates.py
-msgid "--merge-request only runs on a single appid!"
-msgstr ""
-
 #: ../fdroidserver/checkupdates.py
 #, python-brace-format
 msgid "...checkupdate failed for {appid} : {error}"
 msgstr "...{appid}를 위한 checkupdate가 실패됨 : {error}"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid ".__call__() not defined"
 msgstr ".__call__()이 정의되지 않음"
 
+#: ../fdroidserver/metadata.py
+msgid ".fdroid.txt is not supported!  Convert to .fdroid.yml or .fdroid.json."
+msgstr ".fdroid.txt는 지원되지 않습니다!  .fdroid.yml 또는 .fdroid.json으로 변환하세요."
+
 #: ../fdroidserver/lint.py
 msgid "/issues is missing"
 msgstr "/이슈가 없습니다"
@@ -188,15 +226,14 @@ msgstr "/이슈가 없습니다"
 msgid "A URL is required as an argument!"
 msgstr "URL은 인수로서 필요합니다!"
 
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "APK signatures have different certificates in {path}:"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Add PGP signatures using GnuPG for packages in repo"
 msgstr "저장소의 패키지를 위해 GnuPG를 사용하여 PGP 서명을 추가합니다"
 
+#: ../fdroid ../fdroidserver/__main__.py
+msgid "Add a new application from its source code"
+msgstr "새 애플리케이션의 소스 코드로부터 그것을 추가합니다"
+
 #: ../fdroidserver/update.py
 msgid "Add a repo signing key to an unsigned repo"
 msgstr "서명되지 않은 저장소에 저장소 서명 키를 추가합니다"
@@ -214,11 +251,7 @@ msgstr "{name}를 위해서만 새 저장소를 추가하기"
 msgid "Alias of the repo signing key in the keystore"
 msgstr "키스토어에서 저장소 서명 키의 별칭"
 
-#: ../fdroidserver/build.py
-msgid "AllowedAPKSigningKeys missing but reference binary supplied"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "Allows a different revision (or git branch) to be specified for the initial import"
 msgstr ""
 
@@ -239,13 +272,18 @@ msgid "Android APK file"
 msgstr ""
 
 #: ../fdroidserver/scanner.py
+#, fuzzy
 msgid "Android DEX code"
-msgstr ""
+msgstr "Android SDK를 찾을 수 없습니다!"
 
-#: ../fdroidserver/init.py
+#: ../fdroidserver/common.py ../fdroidserver/build.py
 #, python-brace-format
-msgid "Android SDK not found at {path}!"
-msgstr "{path}에서 Android SDK를 찾을 수 없습니다!"
+msgid "Android SDK '{path}' does not have '{dirname}' installed!"
+msgstr "Android SDK '{path}'는 설치된 '{dirname}'가 없습니다!"
+
+#: ../fdroidserver/common.py
+msgid "Android SDK not found!"
+msgstr "Android SDK를 찾을 수 없습니다!"
 
 #: ../fdroidserver/common.py
 #, python-brace-format
@@ -257,28 +295,23 @@ msgstr "Android SDK 경로 '{path}'는 존재하지 않습니다!"
 msgid "Android SDK path '{path}' is not a directory!"
 msgstr "Android SDK 경로 '{path}'는 디렉터리가 아닙니다!"
 
+#. Translators: "build-tools" is the file name of a package from
+#. Google, it is part of the Android SDK. So it probably shouldn't be
+#. translated or transliterated.
 #: ../fdroidserver/common.py
 #, python-brace-format
-msgid "Android SDK tool {cmd} not found!"
-msgstr ""
+msgid "Android build-tools path '{path}' does not exist!"
+msgstr "Android 빌드 도구 경로 '{path}'는 존재하지 않습니다!"
 
-#: ../fdroidserver/lint.py
-msgid "App has Binaries but does not have corresponding AllowedAPKSigningKeys to pin certificate."
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "App has NoSourceSince or ArchivePolicy \"0 versions\" or 0 but AutoUpdateMode or UpdateCheckMode are not None"
-msgstr ""
+#: ../fdroidserver/update.py
+msgid "AndroidManifest.xml has no date"
+msgstr "AndroidManifest.xml에 날짜가 없습니다"
 
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "App is in '{repo}' but has a link to {url}"
 msgstr "앱은 '{repo}'에 있지만 {url}로의 연결이 있습니다"
 
-#: ../fdroidserver/lint.py
-msgid "App version has binary but does not have corresponding AllowedAPKSigningKeys to pin certificate."
-msgstr ""
-
 #: ../fdroidserver/lint.py
 msgid "Appending .git is not necessary"
 msgstr ".git 추가가 필요하지 않습니다"
@@ -288,27 +321,11 @@ msgstr ".git 추가가 필요하지 않습니다"
 msgid "Archiving {apkfilename} with invalid signature!"
 msgstr "올바르지 않은 서명으로 {apkfilename}를 보존 중입니다!"
 
-#: ../fdroidserver/lint.py
-msgid "AutoUpdateMode with UpdateCheckMode: HTTP must have a pattern."
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "Automatic no to all prompts."
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "Automatic yes to all prompts."
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "Bad entry type \"{mirrortype}\" in mirrors config: {mirror}"
-msgstr ""
-
 #: ../fdroidserver/mirror.py
 msgid "Base URL to mirror, can include the index signing key using the query string: ?fingerprint="
 msgstr ""
 
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "Branch '{branch}' used as commit in build '{versionName}'"
@@ -324,7 +341,7 @@ msgstr "브랜치 '{branch}'는 srclib '{srclib}'에서 커밋으로 사용됩
 msgid "Broken symlink: {path}"
 msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Build a package from source"
 msgstr "소스로부터 패키지를 빌드합니다"
 
@@ -344,47 +361,56 @@ msgstr ""
 msgid "Build only the latest version of each package"
 msgstr ""
 
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Build should have comma-separated versionName and versionCode, not \"{value}\", in {linedesc}"
+msgstr ""
+
 #: ../fdroidserver/init.py
 #, python-format
 msgid "Built repo based in \"%s\" with this config:"
 msgstr ""
 
-#: ../fdroidserver/checkupdates.py
-msgid "Can't auto-update app with no CurrentVersionCode"
-msgstr ""
-
 #: ../fdroidserver/build.py
 msgid "Can't build due to {} error while scanning"
 msgid_plural "Can't build due to {} errors while scanning"
 msgstr[0] ""
 
-#: ../fdroidserver/common.py
+#: ../fdroidserver/vmtools.py
 #, python-brace-format
-msgid "Cannot read {path}: {error}"
-msgstr ""
+msgid "Cannot read \"{path}\"!"
+msgstr "\"{path}\"를 읽을 수 없습니다!"
+
+#. Translators: https://developer.android.com/studio/build/application-id
+#: ../fdroidserver/metadata.py
+#, fuzzy, python-brace-format
+msgid "Cannot resolve application ID {appid}"
+msgstr "앱 id {appid}를 해결할 수 없습니다"
 
 #: ../fdroidserver/rewritemeta.py
-#, python-brace-format
+#, fuzzy, python-brace-format
 msgid "Cannot rewrite \"{path}\""
+msgstr "\"{path}\"를 읽을 수 없습니다!"
+
+#: ../fdroidserver/rewritemeta.py
+msgid "Cannot use --list and --to at the same time"
+msgstr "--list 와 --to는 동시에 사용할 수 없습니다"
+
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Cannot write \"{path}\", not an accepted format, use: {formats}"
 msgstr ""
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
 #: ../fdroidserver/lint.py
 #, python-format
 msgid "Categories '%s' is not valid"
 msgstr "카테고리 '%s'는 올바르지 않습니다"
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
 #: ../fdroidserver/lint.py
 msgid "Categories are not set"
 msgstr "카테고리가 설정되어 있지 않습니다"
 
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "Category \"{category}\" defined but not used for any apps!"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Check for updates to applications"
 msgstr "애플리케이션으로의 업데이트를 확인합니다"
 
@@ -393,20 +419,28 @@ msgstr "애플리케이션으로의 업데이트를 확인합니다"
 msgid "Checking archiving for {appid} - apks:{integer}, keepversions:{keep}, archapks:{arch}"
 msgstr ""
 
+#: ../fdroidserver/dscanner.py
+msgid "Clean after all scans have finished"
+msgstr ""
+
+#: ../fdroidserver/dscanner.py
+msgid "Clean before the scans start and rebuild the container"
+msgstr ""
+
+#: ../fdroidserver/dscanner.py
+msgid "Clean up all containers and then exit"
+msgstr ""
+
 #: ../fdroidserver/update.py
 msgid "Clean update - don't uses caches, reprocess all APKs"
 msgstr ""
 
-#: ../fdroidserver/common.py
-msgid "Color the log output"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "Comma separated list of categories."
 msgstr ""
 
-#: ../fdroidserver/__main__.py
-#, python-format
+#: ../fdroid ../fdroidserver/__main__.py
+#, c-format, python-format
 msgid "Command '%s' not recognised.\n"
 msgstr "명령 '%s'은 인식되지 않습니다.\n"
 
@@ -414,15 +448,6 @@ msgstr "명령 '%s'은 인식되지 않습니다.\n"
 msgid "Commit changes"
 msgstr "번경사항 커밋"
 
-#: ../fdroidserver/checkupdates.py
-msgid "Commit changes, push, then make a merge request"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Conflicting \"{field}\" definitions between .yml and localized files:"
-msgstr ""
-
 #: ../fdroidserver/__main__.py
 msgid "Conflicting arguments: '--verbose' and '--quiet' can not be specified at the same time."
 msgstr ""
@@ -432,13 +457,11 @@ msgstr ""
 msgid "Could not find '{command}' on your system"
 msgstr ""
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "Could not find latest version code"
 msgstr ""
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "Could not find latest version name"
 msgstr ""
 
@@ -448,8 +471,7 @@ msgid "Could not find {path} to remove it"
 msgstr ""
 
 #: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Could not open APK {path} for analysis: "
+msgid "Could not open apk file for analysis"
 msgstr ""
 
 #: ../fdroidserver/common.py
@@ -457,16 +479,22 @@ msgstr ""
 msgid "Could not parse size \"{size}\", wrong type \"{type}\""
 msgstr ""
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/import_subcommand.py
+#. Translators: https://developer.android.com/studio/build/application-id
+#: ../fdroidserver/import.py
 msgid "Couldn't find Application ID"
 msgstr ""
 
-#: ../fdroidserver/checkupdates.py
-msgid "Couldn't find any version information"
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
+#: ../fdroidserver/import.py
+msgid "Couldn't find latest version code"
 msgstr ""
 
-#: ../fdroidserver/checkupdates.py
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
+#: ../fdroidserver/import.py
+msgid "Couldn't find latest version name"
+msgstr ""
+
+#: ../fdroidserver/import.py
 msgid "Couldn't find package ID"
 msgstr ""
 
@@ -474,26 +502,29 @@ msgstr ""
 msgid "Cowardily refusing to overwrite existing signing key setup!"
 msgstr ""
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/update.py
+msgid "Create a repo signing key in a keystore"
+msgstr ""
+
+#: ../fdroidserver/update.py
+msgid "Create skeleton metadata files that are missing"
+msgstr "누락된 skeleton 메타데이터 파일을 만듭니다"
+
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Created new container \"{name}\""
 msgstr ""
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Creating \"{path}\" for configuring s3cmd."
 msgstr ""
 
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Creating empty {config_file}"
-msgstr ""
-
 #: ../fdroidserver/publish.py
 msgid "Creating log directory"
 msgstr "기록 디렉터리 만들기"
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Creating new S3 bucket: {url}"
 msgstr ""
@@ -506,7 +537,8 @@ msgstr "출력 디렉터리 만들기"
 msgid "Creating signed index with this key (SHA256):"
 msgstr ""
 
-#: ../fdroidserver/publish.py ../fdroidserver/verify.py
+#: ../fdroidserver/import.py ../fdroidserver/verify.py
+#: ../fdroidserver/publish.py
 msgid "Creating temporary directory"
 msgstr "임시 디렉터리 만들기"
 
@@ -552,21 +584,16 @@ msgid "Description has a duplicate line"
 msgstr ""
 
 #: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Description of length {length} is over the {limit} char limit"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Did you mean config/{name}.yml?"
+#, python-format
+msgid "Description has a list (%s) but it isn't bulleted (*) nor numbered (#)"
 msgstr ""
 
 #: ../fdroidserver/lint.py
 #, python-brace-format
-msgid "Did you mean {code}?"
+msgid "Description of length {length} is over the {limit} char limit"
 msgstr ""
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "Do not add 'disable:' to the generated build entries"
 msgstr ""
 
@@ -591,20 +618,25 @@ msgstr ""
 msgid "Don't create a source tarball, useful when testing a build"
 msgstr ""
 
+#: ../fdroidserver/stats.py
+msgid "Don't do anything logs-related"
+msgstr ""
+
 #: ../fdroidserver/build.py
 msgid "Don't refresh the repository, useful when testing a build with no internet connection"
 msgstr ""
 
 #: ../fdroidserver/deploy.py ../fdroidserver/nightly.py
+#: ../fdroidserver/upload.py
 msgid "Don't use rsync checksums"
 msgstr ""
 
-#: ../fdroidserver/install.py
-msgid "Download F-Droid.apk using mirrors that leak less to the network"
+#: ../fdroid ../fdroidserver/__main__.py
+msgid "Download complete mirrors of small repos"
 msgstr ""
 
-#: ../fdroidserver/__main__.py
-msgid "Download complete mirrors of small repos"
+#: ../fdroidserver/stats.py
+msgid "Download logs we don't have"
 msgstr ""
 
 #: ../fdroidserver/common.py
@@ -618,12 +650,7 @@ msgstr ""
 
 #: ../fdroidserver/metadata.py
 #, python-brace-format
-msgid "Duplicate Anti-Feature declaration at {path} was ignored!"
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-format
-msgid "Duplicate entry \"%s\" in mirrors config!"
+msgid "Duplicate build recipe found for versionCode {versionCode} in {linedesc}"
 msgstr ""
 
 #: ../fdroidserver/lint.py
@@ -631,42 +658,27 @@ msgstr ""
 msgid "Duplicate link in '{field}': {url}"
 msgstr ""
 
-#: ../fdroidserver/common.py
-#, python-format
-msgid "ERROR: %(message)s"
-msgstr ""
+#: ../fdroid
+msgid "Dynamically scan APKs post build"
+msgstr "동적으로 APK 게시 빌드를 스캔합니다"
 
 #: ../fdroidserver/__main__.py
 msgid "ERROR: The \"server\" subcommand has been removed, use \"deploy\"!"
 msgstr ""
 
+#: ../fdroidserver/mirror.py
+msgid ""
+"ERROR: this command should never be used to mirror f-droid.org!\n"
+"A full mirror of f-droid.org requires more than 200GB."
+msgstr ""
+
 #: ../fdroidserver/nightly.py
 msgid "ERROR: unsupported CI type, patches welcome!"
 msgstr ""
 
-#: ../fdroidserver/nightly.py
-#, python-format
-msgid "ERROR: unsupported git host \"%s\", patches welcome!"
-msgstr ""
-
-#: ../fdroidserver/lint.py
+#: ../fdroidserver/metadata.py
 #, python-brace-format
-msgid "ERROR: {key} in {path} is not \"archive\" or \"repo\"!"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "ERROR: {key} not a valid key!"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "ERROR: {key}'s value should be of type {t}!"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "ERROR: {key}:{subkey} in {path} is not in allowed keys: {allowed_keys}!"
+msgid "Empty build flag at {linedesc}"
 msgstr ""
 
 #: ../fdroidserver/__main__.py
@@ -681,40 +693,20 @@ msgid ""
 "> "
 msgstr ""
 
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Environment variable {var} from {configname} is not set!"
+#: ../fdroidserver/deploy.py ../fdroidserver/checkupdates.py
+#: ../fdroidserver/upload.py
+#, python-format
+msgid "Error while attempting to publish log: %s"
 msgstr ""
 
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Environment variable {{env: {var}}} is not set!"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "Error deploying 'github_releases', {} not present. (You might need to run `fdroid update` first.)"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py ../fdroidserver/common.py
 msgid "Error while getting repo address"
 msgstr ""
 
-#: ../fdroidserver/scanner.py
-msgid "Exit with a non-zero code if problems were found"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Extract application metadata from a source repository"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Extract signatures from APKs"
 msgstr ""
 
-#: ../fdroidserver/install.py
-msgid "F-Droid.apk could not be downloaded from any known source!"
-msgstr ""
-
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Failed copying {path}: {error}"
@@ -735,23 +727,27 @@ msgstr ""
 msgid "Failed resizing {path}: {error}"
 msgstr ""
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/publish.py
+msgid "Failed to align application"
+msgstr ""
+
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Failed to create S3 bucket: {url}"
 msgstr ""
 
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Failed to get APK information, deleting {path}"
+#: ../fdroidserver/common.py
+msgid "Failed to get APK manifest information"
 msgstr ""
 
 #: ../fdroidserver/update.py
 #, python-brace-format
-msgid "Failed to get APK information, skipping {path}"
+msgid "Failed to get apk information, deleting {path}"
 msgstr ""
 
 #: ../fdroidserver/update.py
-msgid "Failed to get APK signing key fingerprint"
+#, python-brace-format
+msgid "Failed to get apk information, skipping {path}"
 msgstr ""
 
 #: ../fdroidserver/install.py
@@ -759,10 +755,14 @@ msgstr ""
 msgid "Failed to install '{apkfilename}' on {dev}: {error}"
 msgstr ""
 
-#: ../fdroidserver/common.py
+#: ../fdroidserver/publish.py ../fdroidserver/common.py
 msgid "Failed to sign application"
 msgstr ""
 
+#: ../fdroidserver/common.py
+msgid "Failed to zipalign application"
+msgstr ""
+
 #: ../fdroidserver/build.py
 #, python-brace-format
 msgid "Fetched buildserverid from VM: {buildserverid}"
@@ -778,12 +778,21 @@ msgstr ""
 msgid "File disappeared while processing it: {path}"
 msgstr ""
 
-#: ../fdroidserver/build.py ../fdroidserver/install.py
-#: ../fdroidserver/rewritemeta.py ../fdroidserver/scanner.py
-#: ../fdroidserver/update.py
+#: ../fdroidserver/verify.py ../fdroidserver/stats.py ../fdroidserver/update.py
+#: ../fdroidserver/rewritemeta.py ../fdroidserver/build.py
+#: ../fdroidserver/checkupdates.py ../fdroidserver/scanner.py
+#: ../fdroidserver/install.py
 msgid "Finished"
 msgstr "마침"
 
+#: ../fdroidserver/lint.py
+msgid "Flattr donation methods belong in the FlattrID flag"
+msgstr ""
+
+#: ../fdroidserver/lint.py
+msgid "Flattr donation methods belong in the FlattrID: field"
+msgstr ""
+
 #: ../fdroidserver/lint.py
 msgid "Forbidden HTML tags"
 msgstr ""
@@ -815,6 +824,7 @@ msgstr ""
 msgid "Found invalid appids in arguments"
 msgstr ""
 
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
 #: ../fdroidserver/common.py
 msgid "Found invalid versionCodes for some apps"
 msgstr ""
@@ -824,10 +834,6 @@ msgstr ""
 msgid "Found multiple JAR Signature Block Files in {path}"
 msgstr ""
 
-#: ../fdroidserver/common.py
-msgid "Found multiple Signer Certificates!"
-msgstr ""
-
 #: ../fdroidserver/metadata.py
 #, python-brace-format
 msgid "Found multiple metadata files for {appid}"
@@ -837,6 +843,11 @@ msgstr ""
 msgid "Found multiple signing certificates for repository."
 msgstr ""
 
+#: ../fdroidserver/update.py
+#, python-brace-format
+msgid "Found multiple signing certificates in {path}"
+msgstr ""
+
 #: ../fdroidserver/index.py
 msgid "Found no signing certificates for repository."
 msgstr ""
@@ -851,16 +862,6 @@ msgstr ""
 msgid "Found {apkfilename} at {url}"
 msgstr ""
 
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Found {count} problems in {filename}"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Found {count} warnings in {filename}"
-msgstr ""
-
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Generated skeleton metadata for {appid}"
@@ -879,22 +880,19 @@ msgstr ""
 msgid "Git fetch failed"
 msgstr ""
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
+#: ../fdroidserver/common.py
+msgid "Git remote set-head failed"
+msgstr ""
+
 #: ../fdroidserver/common.py
 #, python-format
 msgid "Git remote set-head failed: \"%s\""
 msgstr ""
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
 #: ../fdroidserver/common.py
 msgid "Git reset failed"
 msgstr ""
 
-#: ../fdroidserver/common.py
-#, fuzzy
-msgid "Git submodule deinit failed"
-msgstr "git svn 복제에 실패됨"
-
 #: ../fdroidserver/common.py
 msgid "Git submodule sync failed"
 msgstr ""
@@ -926,16 +924,6 @@ msgstr ""
 msgid "Ignoring FUNDING.yml entry longer than 2048: %s"
 msgstr ""
 
-#: ../fdroidserver/update.py
-#, python-format
-msgid "Ignoring bad element in manifest: %s"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Ignoring deprecated {oldfile}, use {newfile}!"
-msgstr ""
-
 #: ../fdroidserver/index.py
 msgid "Ignoring package without metadata: "
 msgstr ""
@@ -945,6 +933,11 @@ msgstr ""
 msgid "Ignoring stale cache data for {apkfilename}"
 msgstr ""
 
+#: ../fdroidserver/rewritemeta.py
+#, python-brace-format
+msgid "Ignoring {ext} file at '{path}'"
+msgstr ""
+
 #: ../fdroidserver/update.py
 msgid "Include APKs that are signed with disabled algorithms like MD5"
 msgstr ""
@@ -961,16 +954,6 @@ msgstr ""
 msgid "Include the source tarballs in the mirror"
 msgstr ""
 
-#: ../fdroidserver/metadata.py
-#, python-format
-msgid "Including metadata from %s@%s"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Including metadata from {path}"
-msgstr ""
-
 #: ../fdroidserver/common.py
 msgid "Initialising submodules"
 msgstr "하위 모듈을 초기 설정 중"
@@ -979,21 +962,31 @@ msgstr "하위 모듈을 초기 설정 중"
 msgid "Install all signed applications available"
 msgstr "사용 가능한 모든 서명된 애플리케이션 설치"
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Install built packages on devices"
 msgstr "기기에 내장된 패키지 설치"
 
 #: ../fdroidserver/install.py
-#, python-format
+#, fuzzy, python-format
 msgid "Installing %s..."
 msgstr "%s 설치 중…"
 
 #: ../fdroidserver/install.py
-#, python-brace-format
-msgid "Installing '{apkfilename}' on {dev}..."
-msgstr "{dev}에서 '{apkfilename}' 설치 중..."
+#, python-format
+msgid "Installing %s…"
+msgstr "%s 설치 중…"
 
-#: ../fdroidserver/__main__.py
+#: ../fdroidserver/install.py
+#, fuzzy, python-brace-format
+msgid "Installing '{apkfilename}' on {dev}..."
+msgstr "{dev}에서 '{apkfilename}' 설치 중…"
+
+#: ../fdroidserver/install.py
+#, python-brace-format
+msgid "Installing '{apkfilename}' on {dev}…"
+msgstr "{dev}에서 '{apkfilename}' 설치 중…"
+
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Interact with the repo HTTP server"
 msgstr "저장소 HTTP 서버와의 상호 작용"
 
@@ -1001,36 +994,53 @@ msgstr "저장소 HTTP 서버와의 상호 작용"
 msgid "Invalid APK"
 msgstr "올바르지 않은 APK"
 
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "Invalid AutoUpdateMode: {mode}"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "Invalid UpdateCheckMode: {mode}"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
+#: ../fdroidserver/lint.py ../fdroidserver/checkupdates.py
 #, python-brace-format
 msgid "Invalid VercodeOperation: {field}"
 msgstr "잘못된 Vercode연산: {field}"
 
-#: ../fdroidserver/lint.py
-#, fuzzy, python-brace-format
-msgid "Invalid VercodeOperation: {invalid_ops}"
-msgstr "잘못된 VercodeOperation연산: {invalid_ops}"
-
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "Invalid application ID {appid}"
 msgstr ""
 
+#: ../fdroidserver/metadata.py
+#, python-format
+msgid "Invalid boolean '%s'"
+msgstr "올바르지 않은 부울 '%s'"
+
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Invalid build flag at {line} in {linedesc}"
+msgstr "{linedesc}의 {line}에서 잘못된 빌드 플래그"
+
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Invalid build format: {value} in {name}"
+msgstr "잘못된 빌드 형식: {name}에서 {value}"
+
 #: ../fdroidserver/lint.py
 msgid "Invalid bulleted list"
 msgstr "잘못된 글머리 기호 목록"
 
+#: ../fdroidserver/lint.py
+#, python-format
+msgid "Invalid license tag \"%s\"! Use only tags from https://spdx.org/license-list"
+msgstr "잘못된 라이선스 태그 \"%s\"! https://spdx.org/license-list 에서의 태그만을 사용하세요"
+
+#: ../fdroidserver/lint.py
+msgid "Invalid link - use [http://foo.bar Link title] or [http://foo.bar]"
+msgstr "잘못된 링크 - [http://foo.bar 링크 제목] 또는 [http://foo.bar]를 사용하세요"
+
+#: ../fdroidserver/metadata.py
+#, python-format
+msgid "Invalid metadata in %s:%d"
+msgstr "%s:%d에서 잘못된 메타데이터"
+
+#: ../fdroidserver/metadata.py
+msgid "Invalid metadata in: "
+msgstr "다음 안에서 잘못된 메타데이터: "
+
 #: ../fdroidserver/common.py
 #, python-format
 msgid "Invalid name for published file: %s"
@@ -1038,8 +1048,8 @@ msgstr "게시된 파일을 위한 잘못된 이름: %s"
 
 #: ../fdroidserver/common.py
 #, python-brace-format
-msgid "Invalid ndk: entry in build: \"{ndk}\""
-msgstr ""
+msgid "Invalid package name {0}"
+msgstr "잘못된 패키지 이름 {0}"
 
 #: ../fdroidserver/common.py
 #, python-brace-format
@@ -1061,6 +1071,11 @@ msgstr ""
 msgid "Invalid srclib metadata: unknown key '{key}' in '{file}'"
 msgstr ""
 
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Invalid versionCode: \"{versionCode}\" is not an integer!"
+msgstr "잘못된 versionCode: \"{versionCode}\"은 정수가 아닙니다!"
+
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "JAR signature failed to verify: {path}"
@@ -1075,8 +1090,8 @@ msgstr ""
 msgid "Java JAR file"
 msgstr ""
 
-#: ../fdroidserver/mirror.py ../fdroidserver/publish.py
-#: ../fdroidserver/update.py
+#: ../fdroidserver/publish.py ../fdroidserver/update.py
+#: ../fdroidserver/mirror.py
 msgid "Java JDK not found! Install in standard location or set java_paths!"
 msgstr ""
 
@@ -1092,19 +1107,10 @@ msgstr ""
 msgid "Javascript in HTML src attributes"
 msgstr ""
 
-#: ../fdroidserver/build.py
-#, fuzzy, python-brace-format
-msgid "Keeping failed build \"{apkfilename}\""
-msgstr "삭제 중: repo/{apkfilename}"
-
 #: ../fdroidserver/init.py
 msgid "Keystore for signing key:\t"
 msgstr "서명 키를 위한 키저장소:\t"
 
-#: ../fdroidserver/lint.py
-msgid "Known debug key is used in AllowedAPKSigningKeys: "
-msgstr ""
-
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "Last used commit '{commit}' looks like a tag, but UpdateCheckMode is '{ucm}'"
@@ -1114,8 +1120,12 @@ msgstr ""
 msgid "Liberapay donation methods belong in the Liberapay: field"
 msgstr ""
 
+#: ../fdroidserver/lint.py
+msgid "Liberapay donation methods belong in the LiberapayID flag"
+msgstr ""
+
 #: ../fdroidserver/rewritemeta.py
-msgid "List files that would be reformatted (dry run)"
+msgid "List files that would be reformatted"
 msgstr ""
 
 #: ../fdroidserver/lint.py
@@ -1134,16 +1144,6 @@ msgstr ""
 msgid "Malformed serverwebroot line:"
 msgstr ""
 
-#: ../fdroidserver/scanner.py
-#, python-format
-msgid "Max recursion depth in ZIP file reached: %s"
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "Mirror config for {url} contains \"isPrimary\" key!"
-msgstr ""
-
 #: ../fdroidserver/mirror.py
 msgid "Mirror the full repo and archive, all file types."
 msgstr ""
@@ -1152,29 +1152,30 @@ msgstr ""
 msgid "Missing output directory"
 msgstr ""
 
-#: ../fdroidserver/metadata.py
-msgid "Moving Anti-Features declarations to localized files:"
-msgstr ""
-
-#: ../fdroidserver/index.py
-msgid "Neither \"repo_pubkey\" nor \"keystorepass\" set in config.yml"
-msgstr ""
-
-#: ../fdroidserver/verify.py
+#: ../fdroidserver/lint.py
 #, python-format
-msgid "No APK for package: %s"
+msgid "Name '%s' is just the auto name - remove it"
+msgstr ""
+
+#: ../fdroidserver/common.py
+msgid "No 'config.py' found, using defaults."
 msgstr ""
 
 #: ../fdroidserver/common.py
 msgid "No Android SDK found!"
 msgstr ""
 
+#: ../fdroidserver/import.py
+msgid "No android or kivy project could be found. Specify --subdir?"
+msgstr ""
+
 #: ../fdroidserver/install.py
 msgid "No attached devices found"
 msgstr ""
 
-#: ../fdroidserver/install.py
-msgid "No devices found for `adb install`! Please plug one in."
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "No commit specified for {versionName} in {linedesc}"
 msgstr ""
 
 #: ../fdroidserver/index.py
@@ -1185,23 +1186,14 @@ msgstr ""
 msgid "No git submodules available"
 msgstr ""
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "No gradle project could be found. Specify --subdir?"
 msgstr ""
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py ../fdroidserver/common.py
 msgid "No information found."
 msgstr ""
 
-#: ../fdroidserver/checkupdates.py
-msgid "No matching tags found"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "No minimum SDK version found in {0}, using default (3)."
-msgstr ""
-
 #: ../fdroidserver/lint.py
 msgid "No need to specify that the app is Free Software"
 msgstr ""
@@ -1211,7 +1203,7 @@ msgid "No need to specify that the app is for Android"
 msgstr ""
 
 #: ../fdroidserver/deploy.py
-msgid "No option set! Edit your config.yml to set at least one of these:"
+msgid "No option set! Edit your config.py to set at least one of these:"
 msgstr ""
 
 #: ../fdroidserver/common.py
@@ -1220,14 +1212,14 @@ msgstr ""
 
 #: ../fdroidserver/install.py
 #, python-format
-msgid "No signed APK available for %s"
+msgid "No signed apk available for %s"
 msgstr ""
 
 #: ../fdroidserver/install.py
 msgid "No signed output directory - nothing to do"
 msgstr ""
 
-#: ../fdroidserver/common.py
+#: ../fdroidserver/update.py ../fdroidserver/common.py
 #, python-brace-format
 msgid "No signing certificates found in {path}"
 msgstr ""
@@ -1237,24 +1229,16 @@ msgstr ""
 msgid "No such package: %s"
 msgstr ""
 
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "No such versionCode {versionCode} for app {appid}"
 msgstr ""
 
-#: ../fdroidserver/checkupdates.py
-msgid "No tags found"
-msgstr ""
-
-#: ../fdroidserver/publish.py ../fdroidserver/verify.py
+#: ../fdroidserver/verify.py ../fdroidserver/publish.py
 msgid "No unsigned directory - nothing to do"
 msgstr ""
 
-#: ../fdroidserver/__main__.py
-#, fuzzy
-msgid "No version information could be found."
-msgstr "버전 정보를 찾지 못했습니다"
-
 #: ../fdroidserver/common.py
 msgid "Not a valid size definition: \"{}\""
 msgstr ""
@@ -1269,9 +1253,10 @@ msgid "Nothing to do for {appid}."
 msgstr ""
 
 #: ../fdroidserver/init.py
-msgid "Now set these in config.yml:"
+msgid "Now set these in config.py:"
 msgstr ""
 
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "OBB file has newer versionCode({integer}) than any APK:"
@@ -1289,27 +1274,22 @@ msgstr ""
 msgid "Offline machine, skipping git mirror generation until `fdroid deploy`"
 msgstr ""
 
-#: ../fdroidserver/deploy.py
-msgid "One of the 'github_releases' config items is missing the 'packageNames' value. skipping ..."
+#: ../fdroidserver/common.py
+#, python-brace-format
+msgid "Old APK signature failed to verify: {path}"
 msgstr ""
 
-#: ../fdroidserver/deploy.py
-msgid "One of the 'github_releases' config items is missing the 'projectUrl' value. skipping ..."
+#: ../fdroid ../fdroidserver/__main__.py
+msgid "Old, deprecated name for fdroid deploy"
 msgstr ""
 
-#: ../fdroidserver/deploy.py
-msgid "One of the 'github_releases' config items is missing the 'token' value. skipping ..."
-msgstr ""
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Only PNG and JPEG are supported for graphics, found: {path}"
 msgstr "PNG와 JPEG만 그래픽을 위해 지원됩니다, 찾았습니다: {path}"
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/common.py
-msgid "Only accepts a single key \"env\""
+#: ../fdroidserver/checkupdates.py
+msgid "Only print differences with the Play Store"
 msgstr ""
 
 #: ../fdroidserver/checkupdates.py
@@ -1320,6 +1300,11 @@ msgstr ""
 msgid "OpenCollective donation methods belong in the OpenCollective: field"
 msgstr ""
 
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "Options"
+msgstr "옵션"
+
 #: ../fdroidserver/verify.py
 msgid "Output JSON report to file named after APK."
 msgstr ""
@@ -1328,22 +1313,26 @@ msgstr ""
 msgid "Output JSON to stdout."
 msgstr ""
 
-#: ../fdroidserver/checkupdates.py ../fdroidserver/gpgsign.py
-#: ../fdroidserver/publish.py ../fdroidserver/signindex.py
-#: ../fdroidserver/update.py
+#: ../fdroidserver/gpgsign.py ../fdroidserver/publish.py
+#: ../fdroidserver/update.py ../fdroidserver/signindex.py
+#: ../fdroidserver/checkupdates.py
 msgid "Outputting JSON"
 msgstr ""
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "Overall license of the project."
 msgstr ""
 
+#: ../fdroidserver/dscanner.py
+msgid "Override path for repo APKs (default: ./repo)"
+msgstr "저장소 APK를 위한 경로 재정의 (기본값: ./repo)"
+
 #: ../fdroidserver/index.py
 #, python-brace-format
 msgid "Overriding blank versionName in {apkfilename} from metadata: {version}"
 msgstr ""
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 #, python-brace-format
 msgid "Package \"{appid}\" already exists"
 msgstr ""
@@ -1357,10 +1346,13 @@ msgstr ""
 msgid "Password required with username"
 msgstr ""
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "Path to main Android project subdirectory, if not in root."
 msgstr ""
 
+msgid "Path to main android project subdirectory, if not in root."
+msgstr ""
+
 #: ../fdroidserver/init.py
 msgid "Path to the Android SDK (sometimes set in ANDROID_HOME)"
 msgstr ""
@@ -1373,18 +1365,20 @@ msgstr ""
 msgid "Path to the keystore for the repo signing key"
 msgstr ""
 
+#: ../fdroidserver/dscanner.py
+msgid "Prepare Drozer to run a scan"
+msgstr ""
+
+msgid "Prepare drozer to run a scan"
+msgstr ""
+
 #: ../fdroidserver/nightly.py
 msgid "Print the secret variable to the terminal for easy copy/paste"
 msgstr ""
 
-#: ../fdroidserver/install.py
+#: ../fdroidserver/metadata.py
 #, python-brace-format
-msgid "Privacy mode was enabled based on your locale ({country_code})."
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-format
-msgid "Problem with ZIP file: %s, error %s"
+msgid "Problem with description of {appid}: {error}"
 msgstr ""
 
 #: ../fdroidserver/common.py
@@ -1410,7 +1404,11 @@ msgstr ""
 msgid "Produce human-readable XML/JSON for index files"
 msgstr "사람이 읽을 수 있는 색인 파일을 위한 XML/JSON을 생산합니다"
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/update.py
+msgid "Produce human-readable index.xml"
+msgstr "사람이 읽을 수 있는 index.xml을 생산합니다"
+
+#: ../fdroidserver/import.py
 msgid "Project URL to import from."
 msgstr ""
 
@@ -1422,25 +1420,21 @@ msgstr ""
 msgid "Push the log to this git remote repository"
 msgstr ""
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Pushing binary transparency log to {url}"
 msgstr ""
 
-#: ../fdroidserver/deploy.py
-msgid "Pushing to remote server failed!"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Pushing to {url}"
 msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Quickly start a new repository"
 msgstr "새 저장소를 빠르게 시작합니다"
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Read all the metadata files and exit"
 msgstr "모든 메타데이터 파일을 읽고 종료합니다"
 
@@ -1451,12 +1445,14 @@ msgstr ""
 
 #: ../fdroidserver/common.py
 #, python-brace-format
-msgid "Reading packageName/versionCode/versionName failed, APK invalid: '{apkfilename}'"
+msgid "Reading minSdkVersion failed: \"{apkfilename}\""
 msgstr ""
 
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
+#. https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
 #: ../fdroidserver/common.py
 #, python-brace-format
-msgid "Reading packageName/versionCode/versionName failed,APK invalid: '{apkfilename}'"
+msgid "Reading packageName/versionCode/versionName failed, APK invalid: '{apkfilename}'"
 msgstr ""
 
 #: ../fdroidserver/update.py
@@ -1464,35 +1460,24 @@ msgstr ""
 msgid "Reading {apkfilename} from cache"
 msgstr ""
 
-#: ../fdroidserver/build.py
-msgid "Refresh and cache scanner rules and signatures from the network"
-msgstr ""
-
-#: ../fdroidserver/publish.py
-#, python-brace-format
-msgid "Refusing to sign '{path}', file exists in both {dir1} and {dir2} folder."
-msgstr ""
-
-#: ../fdroidserver/verify.py
-msgid "Remove source tarball and any APKs if successfully verified."
-msgstr ""
+#: ../fdroidserver/stats.py
+msgid "Recalculate aggregate stats - use when changes have been made that would invalidate old cached data."
+msgstr "집계 통계 재계산 - 오래된 캐시된 데이터를 무효로 하는 변경사항이 있을 때 사용합니다."
 
 #: ../fdroidserver/common.py
 msgid "Removing specified files"
 msgstr ""
 
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Removing {path}\""
-msgstr ""
-
 #: ../fdroidserver/update.py
 msgid "Rename APK files that do not match package.name_123.apk"
 msgstr "package.name_123.apk와 일치하지 않는 APK 파일의 이름을 바꿉니다"
 
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "RepoType {type} is deprecated, please switch to git."
+#: ../fdroidserver/update.py
+msgid "Report on build data status"
+msgstr ""
+
+#: ../fdroidserver/build.py
+msgid "Reset and create a brand new build server, even if the existing one appears to be ok."
 msgstr ""
 
 #: ../fdroidserver/nightly.py
@@ -1508,34 +1493,33 @@ msgstr ""
 msgid "Restrict output to warnings and errors"
 msgstr ""
 
-#: ../fdroidserver/net.py
-#, python-format
-msgid "Retrying failed download: %s"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Rewrite all the metadata files"
 msgstr "모든 메타데이터 파일을 다시 씁니다"
 
+#: ../fdroidserver/rewritemeta.py
+msgid "Rewrite to a specific format: "
+msgstr ""
+
 #: ../fdroidserver/rewritemeta.py
 #, python-brace-format
 msgid "Rewriting '{appid}'"
 msgstr ""
 
-#: ../fdroidserver/checkupdates.py
-msgid "Run on git repo that has uncommitted changes"
+#: ../fdroidserver/rewritemeta.py
+#, python-brace-format
+msgid "Rewriting '{appid}' to '{path}'"
 msgstr ""
 
-#: ../fdroidserver/nightly.py
-#, python-brace-format
-msgid "Run over {cibase} to find -debug.apk. and skip repo_basedir {repo_basedir}"
+#: ../fdroidserver/checkupdates.py
+msgid "Run on git repo that has uncommitted changes"
 msgstr ""
 
 #: ../fdroidserver/lint.py
 msgid "Run rewritemeta to fix formatting"
 msgstr ""
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 msgid "Running first pass with MD5 checking disabled"
 msgstr ""
 
@@ -1544,24 +1528,18 @@ msgstr ""
 msgid "Running wget in {path}"
 msgstr ""
 
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "SHA-256 of {url} does not match entry!"
+#: ../fdroidserver/dscanner.py
+msgid "Scan only the latest version of each package"
 msgstr ""
 
 #: ../fdroidserver/build.py
 msgid "Scan the resulting APK(s) for known non-free classes."
 msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Scan the source code of a package"
 msgstr "패키지의 소스 코드를 스캔합니다"
 
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Scanner found {count} problems in {apk}"
-msgstr ""
-
 #: ../fdroidserver/scanner.py
 #, python-brace-format
 msgid "Scanner found {count} problems in {appid}:"
@@ -1577,19 +1555,6 @@ msgid "Scanner found {} problem"
 msgid_plural "Scanner found {} problems"
 msgstr[0] ""
 
-#: ../fdroidserver/scanner.py
-msgid "Scanning APK for extra signing blocks."
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "Scanning APK with dexdump for known non-free classes."
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Set NDK {release} ({version}) up"
-msgstr ""
-
 #: ../fdroidserver/common.py
 msgid "Set clock to that time using:"
 msgstr ""
@@ -1603,7 +1568,7 @@ msgstr ""
 msgid "Set open file limit to {integer}"
 msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Set up an app build for a nightly build repo"
 msgstr ""
 
@@ -1616,11 +1581,18 @@ msgstr ""
 msgid "Setting {0} sec timeout for this build"
 msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroidserver/build.py
+msgid "Setup an emulator, install the APK on it and perform a Drozer scan"
+msgstr ""
+
+msgid "Setup an emulator, install the apk on it and perform a drozer scan"
+msgstr ""
+
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Sign and place packages in the repo"
 msgstr "저장소에서 패키지를 서명하고 배치합니다"
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Sign indexes created using update --nosign"
 msgstr "update --nosign을 사용하여 만들어진 색인을 서명합니다"
 
@@ -1633,11 +1605,6 @@ msgstr ""
 msgid "Skipping '{apkfilename}' with invalid signature!"
 msgstr ""
 
-#: ../fdroidserver/deploy.py ../fdroidserver/index.py
-#, python-format
-msgid "Skipping GitLab Pages mirror because the repo is too large (>%.2fGB)!"
-msgstr ""
-
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Skipping index generation for {appid}"
@@ -1653,14 +1620,23 @@ msgstr ""
 msgid "Skipping {appid}: disabled"
 msgstr ""
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/scanner.py
+#, python-brace-format
+msgid "Skipping {appid}: no builds specified"
+msgstr ""
+
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 msgid "Specify a local folder to sync the repo to"
 msgstr ""
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 msgid "Specify an identity file to provide to SSH for rsyncing"
 msgstr ""
 
+#: ../fdroidserver/build.py
+msgid "Specify that we're running on the build server"
+msgstr ""
+
 #: ../fdroidserver/nightly.py
 msgid "Specify which debug keystore file to use."
 msgstr ""
@@ -1669,6 +1645,11 @@ msgstr ""
 msgid "Spew out even more information than normal"
 msgstr ""
 
+#: ../fdroidserver/nightly.py
+#, python-brace-format
+msgid "Striping mystery signature from {apkfilename}"
+msgstr ""
+
 #: ../fdroidserver/nightly.py
 #, python-brace-format
 msgid "Stripping mystery signature from {apkfilename}"
@@ -1689,22 +1670,10 @@ msgstr ""
 msgid "System clock is older than date in {path}!"
 msgstr ""
 
-#: ../fdroidserver/checkupdates.py
-msgid "Tags update mode only works for git, hg, bzr and git-svn repositories currently"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "Tags update mode used in git-svn, but the repo was not set up with tags"
-msgstr ""
-
 #: ../fdroidserver/build.py
 msgid "Test mode - put output in the tmp directory only, and always build, even if the output already exists."
 msgstr ""
 
-#: ../fdroidserver/index.py
-msgid "The \"qrcode\" Python package is not installed (e.g. apt-get install python3-qrcode)!"
-msgstr ""
-
 #. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
 #: ../fdroidserver/update.py
 #, python-brace-format
@@ -1723,10 +1692,18 @@ msgstr ""
 msgid "The file to be included in the repo (path or glob)"
 msgstr ""
 
+#: ../fdroidserver/deploy.py
+msgid "The only commands currently supported are 'init' and 'update'"
+msgstr ""
+
 #: ../fdroidserver/index.py
 msgid "The repository's fingerprint does not match."
 msgstr ""
 
+#: ../fdroidserver/common.py
+msgid "The repository's index could not be verified."
+msgstr ""
+
 #: ../fdroidserver/deploy.py
 #, python-brace-format
 msgid "The root dir for local_copy_dir \"{path}\" does not exist!"
@@ -1740,37 +1717,13 @@ msgstr ""
 msgid "These are the apps that have been archived from the main repo."
 msgstr ""
 
-#: ../fdroidserver/mirror.py
-msgid "This command should never be used to mirror f-droid.org! A full copy requires more than 600GB."
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "This is a repository of apps to be used with F-Droid. Applications in this repository are either official binaries built by the original application developers, or are binaries built from source by the admin of f-droid.org using the tools on https://gitlab.com/fdroid."
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 #, python-format
 msgid "This repo already has local metadata: %s"
 msgstr ""
 
-#: ../fdroidserver/init.py
-#, python-format
-msgid ""
-"To complete the setup, add your APKs to \"%s\"\n"
-"then run \"fdroid update -c; fdroid update\".  You might also want to edit\n"
-"\"config.yml\" to set the URL, repo name, and more.  You should also set up\n"
-"a signing key (a temporary one might have been automatically generated).\n"
-"\n"
-"For more info: https://f-droid.org/docs/Setup_an_F-Droid_App_Repo\n"
-"and https://f-droid.org/docs/Signing_Process"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "To use awsbucket, awssecretkey and awsaccesskeyid must also be set in config.yml!"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "To use rclone, rclone_config and awsbucket must be set in config.yml!"
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
+msgid "To use awsbucket, awssecretkey and awsaccesskeyid must also be set in config.py!"
 msgstr ""
 
 #: ../fdroidserver/lint.py
@@ -1781,28 +1734,34 @@ msgstr ""
 msgid "URL shorteners should not be used"
 msgstr ""
 
+#: ../fdroidserver/metadata.py
+msgid "URL title is just the URL, use brackets: [URL]"
+msgstr ""
+
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "URL {url} in Description: {error}"
 msgstr ""
 
 #: ../fdroidserver/lint.py
+#, fuzzy
 msgid "Unexpected license tag \"{}\"! Only use FSF or OSI approved tags from https://spdx.org/license-list"
-msgstr "잘못된 라이선스 태그 \"{}\"! https://spdx.org/license-list 에서 FSF 또는 OSI에서 승인된 태그만을 사용하세요"
+msgstr "잘못된 라이선스 태그 \"%s\"! https://spdx.org/license-list 에서의 태그만을 사용하세요"
 
 #: ../fdroidserver/lint.py
 msgid "Unexpected license tag \"{}\"! Only use license tags configured in your config file"
 msgstr ""
 
-#: ../fdroidserver/common.py
+#: ../fdroidserver/metadata.py
 #, python-brace-format
-msgid "Unknown entry {key} in {configname}"
+msgid "Unexpected text on same line as {field} in {linedesc}"
 msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Unknown exception found!"
 msgstr "알 수 없는 예외가 찾아졌습니다!"
 
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "Unknown file '{filename}' in build '{versionName}'"
@@ -1815,13 +1774,22 @@ msgstr "알 수 없는 메타데이터 형식: %s"
 
 #: ../fdroidserver/metadata.py
 #, python-brace-format
+msgid "Unknown metadata format: {path}"
+msgstr "알 수 없는 메타데이터 형식: {path}"
+
+#: ../fdroidserver/metadata.py
+#, fuzzy, python-brace-format
 msgid "Unknown metadata format: {path} (use: *.yml)"
-msgstr "알 수 없는 메타데이터 형식: {path} (사용: *.yml)"
+msgstr "알 수 없는 메타데이터 형식: {path}"
 
 #: ../fdroidserver/common.py
 msgid "Unknown version of aapt, might cause problems: "
 msgstr ""
 
+#: ../fdroidserver/lint.py
+msgid "Unlinkified link - use [http://foo.bar Link title] or [http://foo.bar]"
+msgstr ""
+
 #: ../fdroidserver/lint.py
 msgid "Unnecessary leading space"
 msgstr ""
@@ -1835,12 +1803,20 @@ msgstr ""
 msgid "Unrecognised app field '{fieldname}' in '{path}'"
 msgstr ""
 
+#: ../fdroidserver/metadata.py
+msgid "Unrecognised app field: "
+msgstr ""
+
 #: ../fdroidserver/metadata.py
 #, python-brace-format
 msgid "Unrecognised build flag '{build_flag}' in '{path}'"
 msgstr ""
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Unrecognised field '{field}' in {linedesc}"
+msgstr ""
+
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Unsupported file type \"{extension}\" for repo graphic"
@@ -1851,6 +1827,29 @@ msgstr "저장소 그래픽을 위한 파일 형식 \"{extension}\"가 지원되
 msgid "Unsupported graphics file found: {path}"
 msgstr "지원되지 않는 그래픽 파일을 찾았습니다: {path}"
 
+#: ../fdroidserver/rewritemeta.py
+#, python-brace-format
+msgid "Unsupported metadata format, use: --to [{supported}]"
+msgstr "지원되지 않는 메타데이터 형식, 사용: --to [{supported}]"
+
+#: ../fdroidserver/metadata.py
+msgid "Unterminated ]"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+msgid "Unterminated ]]"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Unterminated build in {name}"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Unterminated continuation in {name}"
+msgstr ""
+
 #: ../fdroidserver/lint.py
 #, python-format
 msgid "Unused extlib at %s"
@@ -1862,34 +1861,36 @@ msgid "Unused file at %s"
 msgstr "%s에서 사용되지 않은 파일"
 
 #: ../fdroidserver/scanner.py
-#, python-format
+#, fuzzy, python-format
 msgid "Unused scandelete path: %s"
-msgstr "사용되지 않은 스캔삭제 경로: %s"
+msgstr "%s에서 사용되지 않은 파일"
 
 #: ../fdroidserver/scanner.py
-#, python-format
+#, fuzzy, python-format
 msgid "Unused scanignore path: %s"
-msgstr "사용되지 않은 스캔삭제 경로: %s"
+msgstr "%s에서 사용되지 않은 파일"
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Update repo information for new packages"
 msgstr "새 패키지를 위한 저장소 정보를 업데이트합니다"
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Update the binary transparency log for a URL"
 msgstr "URL을 위한 바이너리 투명성 기록을 업데이트합니다"
 
+#: ../fdroid ../fdroidserver/__main__.py
+msgid "Update the stats of the repo"
+msgstr "저장소의 통계를 업데이트"
+
+#: ../fdroidserver/update.py ../fdroidserver/build.py
+msgid "Update the wiki"
+msgstr "위키를 업데이트합니다"
+
 #: ../fdroidserver/checkupdates.py
 #, python-brace-format
 msgid "UpdateCheckData has invalid URL: {url}"
 msgstr "UpdateCheckData에 올바르지 않은 URL이 있습니다: {url}"
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "UpdateCheckData must match the version code as integer (\\d or [0-9]): {codeex}"
-msgstr ""
-
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "UpdateCheckData must use HTTPS URL: {url}"
@@ -1901,10 +1902,14 @@ msgid "UpdateCheckData not a valid URL: {url}"
 msgstr "UpdateCheckData는 올바른 URL이 아닙니다: {url}"
 
 #: ../fdroidserver/lint.py
-msgid "UpdateCheckMode is set but it looks like checkupdates hasn't been run yet."
+msgid "UpdateCheckMode is set but it looks like checkupdates hasn't been run yet"
+msgstr ""
+
+#. Translators: https://developer.android.com/studio/build/application-id
+#: ../fdroidserver/lint.py
+msgid "UpdateCheckName is set to the known application ID - it can be removed"
 msgstr ""
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
 #: ../fdroidserver/lint.py
 msgid "UpdateCheckName is set to the known application ID, it can be removed"
 msgstr ""
@@ -1919,8 +1924,19 @@ msgstr ""
 msgid "Uploading {apkfilename} to virustotal"
 msgstr ""
 
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "Usage"
+msgstr "사용법"
+
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, python-format
+msgid "Usage: %s\n"
+msgstr "사용법: %s\n"
+
 #: ../fdroidserver/lint.py
-msgid "Use /HEAD instead of /master or /main to point at a file in the default branch"
+msgid "Use /HEAD instead of /master to point at a file in the default branch"
 msgstr ""
 
 #: ../fdroidserver/update.py
@@ -1935,16 +1951,14 @@ msgstr "빌드 서버를 사용합니다"
 msgid "Use date from APK instead of current time for newly added APKs"
 msgstr "새로 추가된 APK를 위해 현재 시간 대신에 APK에서의 날짜를 사용합니다"
 
-#: ../fdroidserver/deploy.py
+msgid "Use date from apk instead of current time for newly added apks"
+msgstr "새로 추가된 apk를 위해 현재 시간 대신에 apk에서의 날짜를 사용합니다"
+
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Using \"{path}\" for configuring s3cmd."
 msgstr "s3cmd를 구성하기 위해 \"{path}\" 사용."
 
-#: ../fdroidserver/deploy.py
-#, fuzzy, python-brace-format
-msgid "Using \"{path}\" for syncing with remote storage."
-msgstr "s3cmd를 구성하기 위해 \"{path}\" 사용."
-
 #: ../fdroidserver/common.py
 msgid "Using APK Signature v2"
 msgstr ""
@@ -1953,35 +1967,26 @@ msgstr ""
 msgid "Using APK Signature v3"
 msgstr ""
 
-#: ../fdroidserver/common.py
-msgid "Using JAR Signature"
-msgstr ""
-
 #: ../fdroidserver/common.py
 msgid "Using Java's jarsigner, not recommended for verifying APKs! Use apksigner"
 msgstr "Java의 jarsigner를 사용하여, APK를 검증하는 것은 권장되지 않습니다! apksigner를 사용하세요"
 
-#: ../fdroidserver/metadata.py
+#: ../fdroidserver/common.py
 #, python-brace-format
-msgid "Using blank dictionary instead of contents of {path}!"
-msgstr ""
+msgid "Using androguard from \"{path}\""
+msgstr "\"{path}\"에서 androguard를 사용 중"
 
 #: ../fdroidserver/init.py
 #, python-brace-format
 msgid "Using existing keystore \"{path}\""
 msgstr "기존 키스토어 \"{path}\"를 사용 중"
 
-#: ../fdroidserver/deploy.py
-#, fuzzy, python-brace-format
-msgid "Using rclone to sync with: {url}"
-msgstr "다음과 동기화하는 데 s3cmd 사용: {url}"
-
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Using s3cmd to sync with: {url}"
 msgstr "다음과 동기화하는 데 s3cmd 사용: {url}"
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Valid commands are:"
 msgstr "올바른 명령은:"
 
@@ -1989,7 +1994,7 @@ msgstr "올바른 명령은:"
 msgid "Verify against locally cached copy rather than redownloading."
 msgstr "로컬에 캐시된 복사본을 다시 다운로드하는 대신에 검증합니다."
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Verify the integrity of downloaded packages"
 msgstr "다운로드된 패키지의 무결성 확인"
 
@@ -1997,28 +2002,15 @@ msgstr "다운로드된 패키지의 무결성 확인"
 msgid "Verifying index signature:"
 msgstr "색인 서명을 검증 중:"
 
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "Verifying package {path} with apksigner."
-msgstr ""
-
 #: ../fdroidserver/deploy.py
 #, python-brace-format
 msgid "VirusTotal API key cannot upload files larger than 32MB, use {url} to upload {path}."
 msgstr ""
 
-#: ../fdroidserver/nightly.py
-msgid "WARNING: only public git repos are supported!"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Warn about possible metadata errors"
 msgstr "가능한 메타데이터 오류에 대해 경고합니다"
 
-#: ../fdroidserver/scanner.py
-msgid "WebAssembly binary file"
-msgstr ""
-
 #: ../fdroidserver/update.py
 msgid "When configured for signed indexes, create only unsigned indexes at this stage"
 msgstr ""
@@ -2027,16 +2019,7 @@ msgstr ""
 msgid "When linting the entire repository yamllint is disabled by default. This option forces yamllint regardless."
 msgstr ""
 
-#: ../fdroidserver/publish.py
-msgid "When signing or verifying fails, exit with an error code."
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "Would you like to download and install F-Droid.apk via adb? (YES/no)"
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "Would you like to download the app(s) from f-droid.org? (YES/no)"
+msgid "X.509 'Distiguished Name' used when generating keys"
 msgstr ""
 
 #: ../fdroidserver/init.py
@@ -2051,11 +2034,6 @@ msgstr "당신은 당신의 SDK에 경로를 설정하기 위해 ANDROID_HOME을
 msgid "ZIP file archive"
 msgstr ""
 
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "adb reports {serial} is \"{status}\"!"
-msgstr ""
-
 #: ../fdroidserver/nightly.py
 #, python-brace-format
 msgid "adding IdentityFile to {path}"
@@ -2066,78 +2044,86 @@ msgstr "{path}에 IdentityFile을 추가 중"
 msgid "adding to {name}: {path}"
 msgstr "{name}에 추가 중: {path}"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "ambiguous option: %(option)s could match %(matches)s"
 msgstr "모호한 옵션: %(option)s은 %(matches)s와 일치했을 수 있습니다"
 
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "apksigner in build-tools;{version} passes APKs with invalid v3 signatures, ignoring."
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "apksigner not found! Cannot sign or verify modern APKs"
-msgstr ""
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, python-format
+msgid "ambiguous option: %s (%s?)"
+msgstr "모호한 옵션: %s (%s?)"
 
 #: ../fdroidserver/common.py
 msgid "apksigner not found, it's required for signing!"
 msgstr ""
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/checkupdates.py ../fdroidserver/lint.py
-#: ../fdroidserver/rewritemeta.py
+#: ../fdroidserver/lint.py ../fdroidserver/rewritemeta.py
+#: ../fdroidserver/checkupdates.py
+#, fuzzy
 msgid "application ID of file to operate on"
-msgstr "작업할 파일의 애플리케이션 ID"
+msgstr "업데이트를 확인할 applicationId"
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/build.py ../fdroidserver/install.py
-#: ../fdroidserver/publish.py ../fdroidserver/scanner.py
-#: ../fdroidserver/verify.py
+#: ../fdroidserver/verify.py ../fdroidserver/publish.py
+#: ../fdroidserver/build.py ../fdroidserver/scanner.py
+#: ../fdroidserver/install.py
+#, fuzzy
 msgid "application ID with optional versionCode in the form APPID[:VERCODE]"
-msgstr "양식 APPID[:VERCODE]에서 선택적인 versionCode로 된 애플리케이션 ID"
+msgstr "양식 APPID[:VERCODE]에서 선택적인 versionCode로 된 applicationId"
 
-#: ../fdroidserver/common.py
-msgid "archive_url needs to end with /archive"
-msgstr ""
+#: ../fdroidserver/lint.py ../fdroidserver/rewritemeta.py
+msgid "applicationId in the form APPID"
+msgstr "양식 APPID의 applicationId"
 
-#: /usr/lib/python3.11/argparse.py
+#: ../fdroidserver/checkupdates.py
+msgid "applicationId to check for updates"
+msgstr "업데이트를 확인할 applicationId"
+
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
+#: ../fdroidserver/verify.py ../fdroidserver/publish.py
+#: ../fdroidserver/dscanner.py ../fdroidserver/build.py
+#: ../fdroidserver/scanner.py ../fdroidserver/install.py
+msgid "applicationId with optional versionCode in the form APPID[:VERCODE]"
+msgstr "양식 APPID[:VERCODE]에서 선택적인 versionCode로 된 applicationId"
+
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "argument \"-\" with mode %r"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "argument %(argument_name)s: %(message)s"
-msgstr ""
-
 #: ../fdroidserver/nightly.py
 msgid "attempting bare SSH connection to test deploy key:"
 msgstr ""
 
+#: ../fdroidserver/nightly.py
+msgid "attempting bare ssh connection to test deploy key:"
+msgstr ""
+
 #: ../fdroidserver/common.py
 msgid "can not parse scrlib spec (not a string): '{}'"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
-msgid "can't open '%(filename)s': %(error)s"
-msgstr "'%(filename)s'를 열 수 없습니다: %(error)s"
-
-#: ../fdroidserver/scanner.py
-msgid "can't open non-https url: '{};"
-msgstr ""
+msgid "can't open '%s': %s"
+msgstr "'%s'를 열 수 없습니다: %s"
 
 #: ../fdroidserver/build.py
-#, python-brace-format
+#, fuzzy, python-brace-format
 msgid "cannot find required srclibs: \"{path}\""
-msgstr ""
+msgstr "{path}를 위한 appid를 찾을 수 없습니다!"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "cannot have multiple subparser arguments"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "cannot merge actions - two groups are named %r"
 msgstr "작동을 병합할 수 없습니다 - 두 그룹은 %r로 이름지어져 있습니다"
@@ -2151,25 +2137,30 @@ msgstr ""
 msgid "cloning {url}"
 msgstr "{url}를 복제 중"
 
+#: ../fdroidserver/deploy.py
+msgid "command to execute, either 'init' or 'update'"
+msgstr "실행할 명령, 'init' 또는 'update' 중 하나"
+
 #: ../fdroidserver/__main__.py
 msgid "commands from plugin modules:"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "complex"
+msgstr "복잡"
+
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "conflicting option string: %s"
 msgid_plural "conflicting option strings: %s"
 msgstr[0] "충돌하는 옵션 문자열: %s"
 
-#: /usr/lib/python3.11/argparse.py
-#, fuzzy, python-format
-msgid "conflicting subparser alias: %s"
-msgstr "충돌하는 옵션 문자열: %s"
-
-#: /usr/lib/python3.11/argparse.py
-#, fuzzy, python-format
-msgid "conflicting subparser: %s"
-msgstr "충돌하는 옵션 문자열: %s"
+#: ../fdroidserver/nightly.py
+#, python-brace-format
+msgid "copying {apkfilename} into {path}"
+msgstr "{path} 안으로 {apkfilename}을 복사 중"
 
 #: ../fdroidserver/metadata.py
 #, python-brace-format
@@ -2177,11 +2168,11 @@ msgid "could not parse '{path}'"
 msgstr ""
 
 #: ../fdroidserver/common.py
-msgid "could not parse srclib spec (no name specified): '{}'"
+msgid "could not parse srclib spec (no ref specified): '{}'"
 msgstr ""
 
 #: ../fdroidserver/common.py
-msgid "could not parse srclib spec (no ref specified): '{}'"
+msgid "could not parse srclib spec (too many '@' signs): '{}'"
 msgstr ""
 
 #: ../fdroidserver/nightly.py
@@ -2189,18 +2180,14 @@ msgstr ""
 msgid "created {path}"
 msgstr "{path}가 만들어짐"
 
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "current version is newer: old vercode={old}, new vercode={new}"
-msgstr ""
-
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "deleting: repo/{apkfilename}"
 msgstr "삭제 중: repo/{apkfilename}"
 
-#: ../fdroidserver/scanner.py
-msgid "dependency file without lock"
+#: ../fdroidserver/common.py
+#, python-brace-format
+msgid "deployed build logs to '{path}'"
 msgstr ""
 
 #: ../fdroidserver/common.py
@@ -2208,48 +2195,59 @@ msgstr ""
 msgid "deployed process log {path} to {dest}"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "dest= is required for options like %r"
 msgstr "dest=는 %r과 같은 옵션을 위해 필요합니다"
 
-#: ../fdroidserver/scanner.py
-msgid "downloading '{}'"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "downloading scanner signatures from '{}' failed"
-msgstr ""
-
 #: ../fdroidserver/scanner.py
 msgid "executable binary, possibly code"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "expected %s argument"
 msgid_plural "expected %s arguments"
 msgstr[0] ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "expected at least one argument"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "expected at most one argument"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "expected one argument"
 msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroidserver/common.py
+#, python-brace-format
+msgid "failed deploying build logs to '{path}'"
+msgstr ""
+
+#: ../fdroid
+msgid "fdroid [-h|--help|--version] <command> [<args>]"
+msgstr "fdroid [-h|--help|--version] <명령> [<인수>]"
+
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "fdroid [<command>] [-h|--help|--version|<args>]"
 msgstr "fdroid [<명령>] [-h|--help|--version|<인수>]"
 
-#: ../fdroidserver/scanner.py
-msgid "fetch the latest version of signatures from the web"
-msgstr ""
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "floating-point"
+msgstr "부동소수점"
+
+#: ../fdroidserver/metadata.py
+msgid "force errors to be warnings, or ignore"
+msgstr "경고하거나 무시할 강제 오류"
 
 #: ../fdroidserver/metadata.py
 msgid "force metadata errors (default) to be warnings, or to be ignored."
@@ -2263,7 +2261,8 @@ msgstr "git svn 복제에 실패됨"
 msgid "gzip file archive"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "ignored explicit argument %r"
 msgstr ""
@@ -2272,40 +2271,35 @@ msgstr ""
 msgid "index-v1 must have a signature, use `fdroid signindex` to create it!"
 msgstr "index-v1은 서명이 있어야 합니다, 그것을 만드려면 `fdroid signindex`를 사용하세요!"
 
-#: ../fdroidserver/index.py
-#, fuzzy
-msgid "index-v2 must have a signature, use `fdroid signindex` to create it!"
-msgstr "index-v1은 서명이 있어야 합니다, 그것을 만드려면 `fdroid signindex`를 사용하세요!"
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "integer"
+msgstr "정수"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "invalid %(type)s value: %(value)r"
 msgstr "올바르지 않은 %(type)s 값: %(value)r"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "invalid choice: %(value)r (choose from %(choices)s)"
 msgstr "올바르지 않은 선택: %(value)r (%(choices)s에서 선택하세요)"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "invalid conflict_resolution value: %r"
 msgstr "올바르지 않은 conflict_resolution 값: %r"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "invalid option string %(option)r: must start with a character %(prefix_chars)r"
 msgstr "올바르지 않은 옵션 문자열 %(option)r: 문자 %(prefix_chars)r로 시작해야 합니다"
 
-#: ../fdroidserver/common.py
-msgid "ipfs_cid not found, skipping CIDv1 generation"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "latest build recipe is newer: old vercode={old}, new vercode={new}"
-msgstr ""
-
 #: ../fdroidserver/deploy.py
 #, python-brace-format
 msgid "local_copy_dir does not end with \"fdroid\", perhaps you meant: \"{path}\""
@@ -2324,20 +2318,11 @@ msgstr "local_copy_dir는 파일이 아니라, 디렉터리여야 합니다!"
 msgid "mirror '%s' does not end with 'fdroid'!"
 msgstr "미러 '%s'는 'fdroid'로 끝나지 않습니다!"
 
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "mirrors set twice, in config.yml and {path}!"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "mutually exclusive arguments must be optional"
 msgstr ""
 
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "next {name} cache update due in {time}"
-msgstr ""
-
 #: ../fdroidserver/mirror.py
 #, python-brace-format
 msgid "no \"icon\" in {appid}"
@@ -2347,35 +2332,97 @@ msgstr "{appid}에 \"icon\"이 없습니다"
 msgid "no APK supplied"
 msgstr "제공된 APK가 없습니다"
 
-#: ../fdroidserver/checkupdates.py
-msgid "no version information found"
-msgstr "버전 정보를 찾지 못했습니다"
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, python-format
+msgid "no such option: %s"
+msgstr "이러한 옵션이 없습니다: %s"
 
-#: /usr/lib/python3.11/argparse.py
+#: ../fdroid ../fdroidserver/__main__.py
+msgid "no version info found!"
+msgstr "버전 정보를 찾지 못했습니다!"
+
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "not allowed with argument %s"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "one of the arguments %s is required"
 msgstr ""
 
-#: ../fdroidserver/common.py ../fdroidserver/index.py
+#: ../fdroidserver/index.py ../fdroidserver/common.py
 msgid "only accepts strings, lists, and tuples"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
-#, fuzzy
-msgid "options"
-msgstr "옵션"
+#: ../fdroidserver/install.py
+#, python-format
+msgid "option %s: If you really want to install all the signed apps, use --all"
+msgstr "옵션 %s: 당신이 정말 모든 서명된 앱을 설치하기를 원한다면, --all을 사용하세요"
+
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, python-format
+msgid "option %s: invalid %s value: %r"
+msgstr "옵션 %s: 올바르지 않은 %s 값: %r"
+
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, python-format
+msgid "option %s: invalid choice: %r (choose from %s)"
+msgstr "옵션 %s: 올바르지 않은 선택: %r (%s에서 선택하세요)"
+
+#: /usr/lib/python3.5/getopt.py /usr/lib/python3.6/getopt.py
+#: /usr/lib/python3.7/getopt.py
+#, python-format
+msgid "option -%s not recognized"
+msgstr "옵션 -%s은 인식되지 않습니다"
+
+#: /usr/lib/python3.5/getopt.py /usr/lib/python3.6/getopt.py
+#: /usr/lib/python3.7/getopt.py
+#, python-format
+msgid "option -%s requires argument"
+msgstr "옵션 -%s은 인수가 필요합니다"
+
+#: /usr/lib/python3.5/getopt.py /usr/lib/python3.6/getopt.py
+#: /usr/lib/python3.7/getopt.py
+#, python-format
+msgid "option --%s must not have an argument"
+msgstr "옵션 --%s은 인수를 가지지 않아야 합니다"
+
+#: /usr/lib/python3.5/getopt.py /usr/lib/python3.6/getopt.py
+#: /usr/lib/python3.7/getopt.py
+#, python-format
+msgid "option --%s not a unique prefix"
+msgstr "옵션 --%s는 고유한 접두어가 아닙니다"
+
+#: /usr/lib/python3.5/getopt.py /usr/lib/python3.6/getopt.py
+#: /usr/lib/python3.7/getopt.py
+#, python-format
+msgid "option --%s not recognized"
+msgstr "옵션 --%s은 인식되지 않습니다"
+
+#: /usr/lib/python3.5/getopt.py /usr/lib/python3.6/getopt.py
+#: /usr/lib/python3.7/getopt.py
+#, python-format
+msgid "option --%s requires argument"
+msgstr "옵션 --%s은 인수가 필요합니다"
+
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
+msgid "optional arguments"
+msgstr "선택적 인수"
 
 #: ../fdroidserver/nightly.py
 #, python-brace-format
 msgid "overwriting existing {path}"
 msgstr "기존 {path}를 덮어쓰는 중"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "positional arguments"
 msgstr "고정적 인수"
 
@@ -2384,53 +2431,42 @@ msgstr "고정적 인수"
 msgid "process log deploy {path} to {dest} failed!"
 msgstr ""
 
-#: ../fdroidserver/build.py
-msgid "reference binary missing signature"
-msgstr ""
-
 #: ../fdroidserver/signatures.py
 #, python-brace-format
 msgid "refuse downloading via insecure HTTP connection (use HTTPS or specify --no-https-check): {apkfilename}"
 msgstr ""
 
+#: ../fdroidserver/signatures.py
+#, python-brace-format
+msgid "refuse downloading via insecure http connection (use https or specify --no-https-check): {apkfilename}"
+msgstr ""
+
 #: ../fdroidserver/index.py
 #, python-format
-msgid "repo_icon \"repo/icons/%s\" does not exist, generating placeholder."
+msgid "repo_icon %s does not exist, generating placeholder."
 msgstr ""
 
-#: ../fdroidserver/common.py
-msgid "repo_url needs to end with /repo"
+#: ../fdroidserver/metadata.py
+msgid "ruamel.yaml not installed, can not write metadata."
 msgstr ""
 
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "rsync is missing or broken: {error}"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "s3cmd sync indexes {path} to {url} and delete"
 msgstr "s3cmd 동기화는 {url}로 {path}를 색인하고 삭제합나다"
 
-#: ../fdroidserver/deploy.py
-#, fuzzy, python-brace-format
-msgid "s3cmd syncs indexes from {path} to {url} and deletes removed"
-msgstr "s3cmd 동기화는 {url}로 {path}를 색인하고 삭제합나다"
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "scanner cache is malformed! You can clear it with: '{clear}'"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "serverwebroot: path does not end with \"fdroid\", perhaps you meant one of these:"
-msgstr ""
-
 #: ../fdroidserver/scanner.py
 msgid "shared library"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "show program's version number and exit"
+msgstr "프로그램의 버전 번호를 보여주고 종료합니다"
+
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.5/optparse.py
+#: /usr/lib/python3.6/argparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/argparse.py /usr/lib/python3.7/optparse.py
 msgid "show this help message and exit"
 msgstr "이 도움말 메시지를 보여주고 종료합니다"
 
@@ -2459,31 +2495,31 @@ msgstr "srclibs 없는 이름 및/또는 @"
 msgid "static library"
 msgstr ""
 
-#: ../fdroidserver/build.py
+#: ../fdroidserver/common.py
 #, python-brace-format
-msgid "supplied reference binary has allowed signer {signer}"
-msgstr ""
+msgid "supplied timestamp value '{timestamp}' is not a unix timestamp"
+msgstr "제공된 타임스탬프 값 '{timestamp}'는 유닉스 타임스탬프가 아닙니다"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "the following arguments are required: %s"
 msgstr "다음 인수들이 필요합니다: %s"
 
-#: ../fdroidserver/install.py
-msgid "true"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "unexpected option string: %s"
 msgstr "예기치 않은 옵션 문자열: %s"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "unknown parser %(parser_name)r (choices: %(choices)s)"
 msgstr "알 수 없는 파서 %(parser_name)r (선택: %(choices)s)"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "unrecognized arguments: %s"
 msgstr "인식할 수 없는 인수: %s"
@@ -2493,11 +2529,16 @@ msgstr "인식할 수 없는 인수: %s"
 msgid "unsafe permissions on '{config_file}' (should be 0600)!"
 msgstr "'{config_file}'에 안전하지 않은 권한 (0600이어야 합니다)!"
 
-#: ../fdroidserver/__main__.py /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py ../fdroid
+#: /usr/lib/python3.7/argparse.py ../fdroidserver/__main__.py
 msgid "usage: "
 msgstr "사용법: "
 
-#: ../fdroidserver/deploy.py
+#: ../fdroid
+msgid "usage: fdroid [-h|--help|--version] <command> [<args>]"
+msgstr "사용법: fdroid [-h|--help|--version] <명령> [<인수>]"
+
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "using Apache libcloud to sync with {url}"
 msgstr ""
@@ -2506,8 +2547,8 @@ msgstr ""
 msgid "virustotal.com is rate limiting, waiting to retry..."
 msgstr ""
 
-#: ../fdroidserver/install.py
-msgid "yes"
+#: ../fdroidserver/update.py
+msgid "wiki support is deprecated and will be removed in the next release!"
 msgstr ""
 
 #: ../fdroidserver/publish.py
@@ -2521,19 +2562,31 @@ msgstr[0] "앱 {0}개, 키 별칭 {1}개"
 msgid "{apkfilename} ({appid}) has no metadata!"
 msgstr "{apkfilename} ({appid})에 메타데이터가 없습니다!"
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
+#: ../fdroidserver/update.py
+#, python-brace-format
+msgid "{apkfilename} has multiple {name} files, looks like Master Key exploit!"
+msgstr ""
+
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "{apkfilename}'s AndroidManifest.xml has a bad date: "
 msgstr "{apkfilename}의 AndroidManifest.xml에 잘못된 날짜가 있습니다: "
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
+#: ../fdroidserver/update.py
+#, fuzzy, python-brace-format
+msgid "{appid} does not have a name! Using application ID instead."
+msgstr "{appid}는 이름을 가지지 않습니다! 대신 패키지 이름 사용."
+
 #: ../fdroidserver/update.py
 #, python-brace-format
-msgid "{appid} does not have a name! Using application ID instead."
-msgstr "{appid}는 이름을 가지지 않습니다! 대신 애플리케이션 ID를 사용."
+msgid "{appid} does not have a name! Using package name instead."
+msgstr "{appid}는 이름을 가지지 않습니다! 대신 패키지 이름 사용."
+
+#: ../fdroidserver/update.py
+#, python-brace-format
+msgid "{appid} from {path} is not a valid Android Package Name!"
+msgstr ""
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "{appid} from {path} is not a valid Android application ID!"
@@ -2544,16 +2597,12 @@ msgstr ""
 msgid "{appid} from {path} is not a valid Java Package Name!"
 msgstr ""
 
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{appid} has both APKs and files: {files}"
-msgstr ""
-
 #: ../fdroidserver/mirror.py
 #, python-brace-format
 msgid "{appid} is missing {name}"
 msgstr "{appid}는 없는 {name}입니다"
 
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "{appid}: Unknown extlib {path} in build '{versionName}'"
@@ -2581,7 +2630,7 @@ msgstr ""
 
 #: ../fdroidserver/metadata.py
 #, python-brace-format
-msgid "{build_flag} must be list or string, found: {value}"
+msgid "{field} not terminated in {name}"
 msgstr ""
 
 #: ../fdroidserver/metadata.py
@@ -2591,15 +2640,10 @@ msgstr ""
 
 #: ../fdroidserver/update.py
 #, python-brace-format
-msgid "{name} \"{section}/icons/{path}\" does not exist! Check \"config.yml\"."
-msgstr "{name} \"{section}/icons/{path}\"는 존재하지 않습니다! \"config.yml\"을 확인하세요."
+msgid "{name} \"{path}\" does not exist! Correct it in config.py."
+msgstr "{name} \"{path}\"는 존재하지 않습니다! config.py에서 그것을 고치세요."
 
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{path1} is a duplicate of {path2}, remove one!"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 #, python-brace-format
 msgid "{path} already exists, ignoring import results!"
 msgstr ""
@@ -2614,36 +2658,6 @@ msgstr "{path}는 존재하지 않습니다!  실행하여 그것을 만드세
 msgid "{path} has bad file signature \"{pattern}\", possible Janus exploit!"
 msgstr ""
 
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "{path} has been flagged by virustotal {count} times:"
-msgstr ""
-
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "{path} has the wrong fingerprint ({fingerprint})!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "{path} is not \"key: value\" dict, but a {datatype}!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, fuzzy, python-brace-format
-msgid "{path} is not a standard config file!"
-msgstr "'sdk_path'가 config.yml에서 설정되어 있지 않습니다!"
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "{path} is not list, but a {datatype}!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "{path} is not {expected_type}, but a {datatype}!"
-msgstr ""
-
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "{path} is zero size!"
@@ -2654,25 +2668,15 @@ msgstr "{path}는 영 크기입니다!"
 msgid "{path} more than 200MB, manually upload: {url}"
 msgstr ""
 
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "{path}: \"{code}\" is not a valid ISO_3166-1 alpha-2 country code!"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{path}: {error}"
-msgstr ""
-
 #: ../fdroidserver/mirror.py
 #, python-brace-format
 msgid "{url} does not end with \"fdroid\", check the URL path!"
 msgstr "{url}는 \"fdroid\"로 끝나지 않습니다, URL 경로를 확인하세요!"
 
-#: ../fdroidserver/import_subcommand.py
-#, python-brace-format
+#: ../fdroidserver/common.py
+#, fuzzy, python-brace-format
 msgid "{url} does not start with \"http\"!"
-msgstr "{url}는 \"http\"로 시작하지 않습니다!"
+msgstr "{url}는 \"fdroid\"로 끝나지 않습니다, URL 경로를 확인하세요!"
 
 #: ../fdroidserver/build.py
 msgid "{} build failed"
@@ -2683,3 +2687,12 @@ msgstr[0] "{} 빌드 실패됨"
 msgid "{} build succeeded"
 msgid_plural "{} builds succeeded"
 msgstr[0] "{} 빌드 성공됨"
+
+#~ msgid "Add gpg signatures for packages in repo"
+#~ msgstr "저장소에서 패키지에 gpg 서명을 추가합니다"
+
+#~ msgid "Cannot find a packageName for {path}!"
+#~ msgstr "{path}를 위한 packageName을 찾을 수 없습니다!"
+
+#~ msgid "Cannot find an appid for {path}!"
+#~ msgstr "{path}를 위한 appid를 찾을 수 없습니다!"
diff --git a/locale/lv/LC_MESSAGES/fdroidserver.po b/locale/lv/LC_MESSAGES/fdroidserver.po
deleted file mode 100644
index 28da8f9b..00000000
--- a/locale/lv/LC_MESSAGES/fdroidserver.po
+++ /dev/null
@@ -1,2669 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# This file is put in the public domain.
-# "Coool (github.com/Coool)" <coool@mail.lv>, 2024.
-# Edgars Andersons <Edgars+Weblate@gaitenis.id.lv>, 2024, 2025.
-msgid ""
-msgstr ""
-"Project-Id-Version: fdroidserver 2.3a1\n"
-"Report-Msgid-Bugs-To: https://gitlab.com/fdroid/fdroidserver/issues\n"
-"POT-Creation-Date: 2025-03-25 11:36+0100\n"
-"PO-Revision-Date: 2025-03-21 08:46+0000\n"
-"Last-Translator: Edgars Andersons <Edgars+Weblate@gaitenis.id.lv>\n"
-"Language-Team: Latvian <https://hosted.weblate.org/projects/f-droid/fdroidserver/lv/>\n"
-"Language: lv\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n % 10 == 0 || n % 100 >= 11 && n % 100 <= 19) ? 0 : ((n % 10 == 1 && n % 100 != 11) ? 1 : 2);\n"
-"X-Generator: Weblate 5.11-dev\n"
-
-#: ../fdroidserver/nightly.py
-msgid ""
-"\n"
-"SSH public key to be used as deploy key:"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-#, python-brace-format
-msgid ""
-"\n"
-"{path} encoded for the DEBUG_KEYSTORE secret variable:"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-format
-msgid "\"%s/\" has no matching metadata file!"
-msgstr ""
-
-#: ../fdroidserver/index.py
-msgid "\"isPrimary\" key should not be added to mirrors!"
-msgstr "Atslēgu \"isPrimary\" nevajadzētu pievienot spoguļglabātavām."
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "\"local_copy_dir\" {path} does not exist!"
-msgstr ""
-
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "\"{apkfilename}\" is already installed on {dev}."
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "\"{path}\" contains recent {name} ({version})"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "\"{path}\" exists but s3cmd is not installed!"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "\"{path}\" is not a supported file format (use: metadata/*.yml)"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "\"{path}\" is signed by a key that is not allowed:"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
-#, python-brace-format
-msgid "\"{url}\" is not a valid URL!"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "%(prog)s: error: %(message)s\n"
-msgstr "%(prog)s: kļūda: %(message)s\n"
-
-#: ../fdroidserver/publish.py
-#, python-format
-msgid "%d APKs failed to be signed or verified!"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-format
-msgid "%d problems found"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "%r is not callable"
-msgstr ""
-
-#: ../fdroidserver/signindex.py
-#, python-format
-msgid "%s did not produce a dict!"
-msgstr ""
-
-#: ../fdroidserver/signindex.py
-#, python-format
-msgid "%s has bad SHA-256: %s"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-format
-msgid "%s is not an accepted build field"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "'keypass' not found in config.yml!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "'keystore' is NONE and 'smartcardoptions' is blank!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "'keystore' not found in config.yml!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "'keystorepass' not found in config.yml!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "'repo_keyalias' not found in config.yml!"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-msgid "'required' is an invalid argument for positionals"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "'sdk_path' not set in config.yml!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "'{aapt}' is too old, fdroid requires build-tools-{version} or newer!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "'{path}' failed to execute!"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "'{path}' has invalid format, it should be a dictionary!"
-msgstr ""
-
-#: ../fdroidserver/lint.py ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "'{value}' is not a valid {field} in {appid}. Regex pattern: {pattern}"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "'{value}' is not a valid {field}, should be {pattern}"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "--merge-request only runs on a single appid!"
-msgstr "--merge-request darbojas tikai ar vienu appid."
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "...checkupdate failed for {appid} : {error}"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-msgid ".__call__() not defined"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "/issues is missing"
-msgstr ""
-
-#: ../fdroidserver/mirror.py
-msgid "A URL is required as an argument!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "APK signatures have different certificates in {path}:"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Add PGP signatures using GnuPG for packages in repo"
-msgstr ""
-
-#: ../fdroidserver/update.py
-msgid "Add a repo signing key to an unsigned repo"
-msgstr ""
-
-#: ../fdroidserver/update.py
-msgid "Add skeleton metadata files for APKs that are missing them"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Adding new repo for only {name}"
-msgstr ""
-
-#: ../fdroidserver/init.py
-msgid "Alias of the repo signing key in the keystore"
-msgstr ""
-
-#: ../fdroidserver/build.py
-msgid "AllowedAPKSigningKeys missing but reference binary supplied"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
-msgid "Allows a different revision (or git branch) to be specified for the initial import"
-msgstr ""
-
-#: ../fdroidserver/mirror.py
-msgid "Also mirror the full archive section"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Also warn about formatting issues, like rewritemeta -l"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "Android AAR library"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "Android APK file"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "Android DEX code"
-msgstr ""
-
-#: ../fdroidserver/init.py
-#, python-brace-format
-msgid "Android SDK not found at {path}!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Android SDK path '{path}' does not exist!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Android SDK path '{path}' is not a directory!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Android SDK tool {cmd} not found!"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "App has Binaries but does not have corresponding AllowedAPKSigningKeys to pin certificate."
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "App has NoSourceSince or ArchivePolicy \"0 versions\" or 0 but AutoUpdateMode or UpdateCheckMode are not None"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "App is in '{repo}' but has a link to {url}"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "App version has binary but does not have corresponding AllowedAPKSigningKeys to pin certificate."
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Appending .git is not necessary"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Archiving {apkfilename} with invalid signature!"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "AutoUpdateMode with UpdateCheckMode: HTTP must have a pattern."
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "Automatic no to all prompts."
-msgstr "Visām uzvednēm automātiski atbildēt ar \"Nē\"."
-
-#: ../fdroidserver/install.py
-msgid "Automatic yes to all prompts."
-msgstr "Visām uzvednēm automātiski atbildēt ar \"Jā\"."
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "Bad entry type \"{mirrortype}\" in mirrors config: {mirror}"
-msgstr ""
-
-#: ../fdroidserver/mirror.py
-msgid "Base URL to mirror, can include the index signing key using the query string: ?fingerprint="
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Branch '{branch}' used as commit in build '{versionName}'"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Branch '{branch}' used as commit in srclib '{srclib}'"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Broken symlink: {path}"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Build a package from source"
-msgstr ""
-
-#: ../fdroidserver/build.py
-msgid "Build all applications available"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Build generated by `fdroid import` - remove disable line once ready"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "Build metadata git repo has uncommited changes!"
-msgstr ""
-
-#: ../fdroidserver/build.py
-msgid "Build only the latest version of each package"
-msgstr ""
-
-#: ../fdroidserver/init.py
-#, python-format
-msgid "Built repo based in \"%s\" with this config:"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "Can't auto-update app with no CurrentVersionCode"
-msgstr ""
-
-#: ../fdroidserver/build.py
-msgid "Can't build due to {} error while scanning"
-msgid_plural "Can't build due to {} errors while scanning"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../fdroidserver/rewritemeta.py
-#, python-brace-format
-msgid "Cannot rewrite \"{path}\""
-msgstr ""
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
-#: ../fdroidserver/lint.py
-#, python-format
-msgid "Categories '%s' is not valid"
-msgstr ""
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
-#: ../fdroidserver/lint.py
-msgid "Categories are not set"
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "Category \"{category}\" defined but not used for any apps!"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Check for updates to applications"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Checking archiving for {appid} - apks:{integer}, keepversions:{keep}, archapks:{arch}"
-msgstr ""
-
-#: ../fdroidserver/update.py
-msgid "Clean update - don't uses caches, reprocess all APKs"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Color the log output"
-msgstr "Iekrāsot žurnāla izvadi"
-
-#: ../fdroidserver/import_subcommand.py
-msgid "Comma separated list of categories."
-msgstr "Ar komatu atdalītu kategoriju saraksts."
-
-#: ../fdroidserver/__main__.py
-#, python-format
-msgid "Command '%s' not recognised.\n"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "Commit changes"
-msgstr "Iesūtīt izmaiņas"
-
-#: ../fdroidserver/checkupdates.py
-msgid "Commit changes, push, then make a merge request"
-msgstr "Jāiesūta izmaiņas, jāaizgādā tās, tad jāizveido izmaiņu pieprasījums"
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Conflicting \"{field}\" definitions between .yml and localized files:"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Conflicting arguments: '--verbose' and '--quiet' can not be specified at the same time."
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Could not find '{command}' on your system"
-msgstr ""
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/import_subcommand.py
-msgid "Could not find latest version code"
-msgstr ""
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
-#: ../fdroidserver/import_subcommand.py
-msgid "Could not find latest version name"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Could not find {path} to remove it"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Could not open APK {path} for analysis: "
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Could not parse size \"{size}\", wrong type \"{type}\""
-msgstr ""
-
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/import_subcommand.py
-msgid "Couldn't find Application ID"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "Couldn't find any version information"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "Couldn't find package ID"
-msgstr ""
-
-#: ../fdroidserver/update.py
-msgid "Cowardily refusing to overwrite existing signing key setup!"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Created new container \"{name}\""
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Creating \"{path}\" for configuring s3cmd."
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Creating empty {config_file}"
-msgstr "Izveido tukšu {config_file}"
-
-#: ../fdroidserver/publish.py
-msgid "Creating log directory"
-msgstr "Izveido žurnālu mapi"
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Creating new S3 bucket: {url}"
-msgstr "Izveido jaunu S3 kŗājumu: {url}"
-
-#: ../fdroidserver/publish.py
-msgid "Creating output directory"
-msgstr "Izveido izvades mapi"
-
-#: ../fdroidserver/index.py
-msgid "Creating signed index with this key (SHA256):"
-msgstr "Izveido parakstītu indeksu ar šo atslēgu (SHA256):"
-
-#: ../fdroidserver/publish.py ../fdroidserver/verify.py
-msgid "Creating temporary directory"
-msgstr "Izveido pagaidu mapi"
-
-#: ../fdroidserver/index.py
-msgid "Creating unsigned index in preparation for signing"
-msgstr "Izveido neparakstītu indeksu, lai sagatavotos parakstīšanai"
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "CurrentVersionCode {cv} is less than oldest build entry {versionCode}"
-msgstr "CurrentVersionCode {cv} ir mazāks par vecāko būvējuma ierakstu {versionCode}"
-
-#: ../fdroidserver/nightly.py
-msgid "DEBUG_KEYSTORE is not set or the value is incomplete"
-msgstr "DEBUG_KEYSTORE nav iestatīts vai vērtība ir nepilnīga"
-
-#: ../fdroidserver/update.py
-msgid "Delete APKs and/or OBBs without metadata from the repo"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Deleting archive, repo is too big ({size} max {limit})"
-msgstr "Izdzēš arhīvu, glabātava ir pārāk liela ({size}; pieļaujamais izmērs ir {limit})"
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Deleting git-mirror history, repo is too big ({size} max {limit})"
-msgstr "Izdzēš git-mirror vēsturi, glabātava ir pārāk liela ({size}; pieļaujamais izmērs ir {limit})"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Deleting unknown file: {path}"
-msgstr "Izdzēš nezināmu datni: {path}"
-
-#: ../fdroidserver/lint.py
-#, python-format
-msgid "Description '%s' is just the app's summary"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Description has a duplicate line"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Description of length {length} is over the {limit} char limit"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Did you mean config/{name}.yml?"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Did you mean {code}?"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
-msgid "Do not add 'disable:' to the generated build entries"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-msgid "Do not deploy the new files to the repo"
-msgstr ""
-
-#: ../fdroidserver/mirror.py
-#, python-brace-format
-msgid "Do not include \"{path}\" in URL!"
-msgstr ""
-
-#: ../fdroidserver/init.py
-msgid "Do not prompt for Android SDK path, just fail"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-msgid "Do not remove the private keys generated from the keystore"
-msgstr ""
-
-#: ../fdroidserver/build.py
-msgid "Don't create a source tarball, useful when testing a build"
-msgstr ""
-
-#: ../fdroidserver/build.py
-msgid "Don't refresh the repository, useful when testing a build with no internet connection"
-msgstr ""
-
-#: ../fdroidserver/deploy.py ../fdroidserver/nightly.py
-msgid "Don't use rsync checksums"
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "Download F-Droid.apk using mirrors that leak less to the network"
-msgstr "Lejupielādēt F-Droid.apk no spoguļserveriem, kas tīklā nopludina mazāk"
-
-#: ../fdroidserver/__main__.py
-msgid "Download complete mirrors of small repos"
-msgstr "Lejupielādēt pilnīgu mazu glabātavu spoguļojumu"
-
-#: ../fdroidserver/common.py
-msgid "Downloading the repository already failed once, not trying again."
-msgstr "Glabātavas lejupielāde jau vienreiz neizdevās, tas atkārtoti netiks mēģināts."
-
-#: ../fdroidserver/verify.py
-#, python-brace-format
-msgid "Downloading {url} failed. {error}"
-msgstr "{url} lejupielāde neizdevās. {error}"
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Duplicate Anti-Feature declaration at {path} was ignored!"
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-format
-msgid "Duplicate entry \"%s\" in mirrors config!"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Duplicate link in '{field}': {url}"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-format
-msgid "ERROR: %(message)s"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "ERROR: The \"server\" subcommand has been removed, use \"deploy\"!"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-msgid "ERROR: unsupported CI type, patches welcome!"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-#, python-format
-msgid "ERROR: unsupported git host \"%s\", patches welcome!"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "ERROR: {key} in {path} is not \"archive\" or \"repo\"!"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "ERROR: {key} not a valid key!"
-msgstr "KĻŪDA: {key} nav derīga atslēga."
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "ERROR: {key}'s value should be of type {t}!"
-msgstr "KĻŪDA: {key} vērtībai vajadzētu būt ar veidu \"{t}\"."
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "ERROR: {key}:{subkey} in {path} is not in allowed keys: {allowed_keys}!"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-#, python-brace-format
-msgid "Encoding is set to '{enc}' fdroid might run into encoding issues. Please set it to 'UTF-8' for best results."
-msgstr ""
-
-#: ../fdroidserver/init.py
-#, python-format
-msgid ""
-"Enter the path to the Android SDK (%s) here:\n"
-"> "
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Environment variable {var} from {configname} is not set!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Environment variable {{env: {var}}} is not set!"
-msgstr "Vides mainīgais {{env: {var}}} nav iestatīts."
-
-#: ../fdroidserver/deploy.py
-msgid "Error deploying 'github_releases', {} not present. (You might need to run `fdroid update` first.)"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
-msgid "Error while getting repo address"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "Exit with a non-zero code if problems were found"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Extract application metadata from a source repository"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Extract signatures from APKs"
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "F-Droid.apk could not be downloaded from any known source!"
-msgstr "F-Droid.apk nevarēja lejupielādēt ne no viena zināmā avota."
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Failed copying {path}: {error}"
-msgstr ""
-
-#: ../fdroidserver/signatures.py
-#, python-brace-format
-msgid "Failed fetching signatures for '{apkfilename}': {error}"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Failed reading {path}: {error}"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Failed resizing {path}: {error}"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Failed to create S3 bucket: {url}"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Failed to get APK information, deleting {path}"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Failed to get APK information, skipping {path}"
-msgstr ""
-
-#: ../fdroidserver/update.py
-msgid "Failed to get APK signing key fingerprint"
-msgstr ""
-
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "Failed to install '{apkfilename}' on {dev}: {error}"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Failed to sign application"
-msgstr ""
-
-#: ../fdroidserver/build.py
-#, python-brace-format
-msgid "Fetched buildserverid from VM: {buildserverid}"
-msgstr ""
-
-#: ../fdroidserver/signatures.py
-#, python-brace-format
-msgid "Fetched signatures for '{apkfilename}' -> '{sigdir}'"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "File disappeared while processing it: {path}"
-msgstr ""
-
-#: ../fdroidserver/build.py ../fdroidserver/install.py
-#: ../fdroidserver/rewritemeta.py ../fdroidserver/scanner.py
-#: ../fdroidserver/update.py
-msgid "Finished"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Forbidden HTML tags"
-msgstr ""
-
-#: ../fdroidserver/build.py
-msgid "Force build of disabled apps, and carries on regardless of scan problems. Only allowed in test mode."
-msgstr ""
-
-#: ../fdroidserver/build.py
-#, python-brace-format
-msgid "Force halting build after {0} sec timeout!"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "Force scan of disabled apps and builds."
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Found \"{path}\" graphic without metadata for app \"{name}\"!"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Found bad funding file \"{path}\" for \"{name}\":"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Found invalid appids in arguments"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Found invalid versionCodes for some apps"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Found multiple JAR Signature Block Files in {path}"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Found multiple Signer Certificates!"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Found multiple metadata files for {appid}"
-msgstr ""
-
-#: ../fdroidserver/index.py
-msgid "Found multiple signing certificates for repository."
-msgstr ""
-
-#: ../fdroidserver/index.py
-msgid "Found no signing certificates for repository."
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-format
-msgid "Found non-file at %s"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Found {apkfilename} at {url}"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Found {count} problems in {filename}"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Found {count} warnings in {filename}"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Generated skeleton metadata for {appid}"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-format
-msgid "Git checkout of '%s' failed"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Git clean failed"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Git fetch failed"
-msgstr ""
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/common.py
-#, python-format
-msgid "Git remote set-head failed: \"%s\""
-msgstr ""
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/common.py
-msgid "Git reset failed"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Git submodule deinit failed"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Git submodule sync failed"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Git submodule update failed"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "HTTPS must be used with Subversion URLs!"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "If a git mirror gets to big, allow the archive to be deleted"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "If this upload fails, try manually uploading to {url}"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Ignoring '{field}' in '{metapath}' metadata because it is deprecated."
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-format
-msgid "Ignoring FUNDING.yml entry longer than 2048: %s"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-format
-msgid "Ignoring bad element in manifest: %s"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Ignoring deprecated {oldfile}, use {newfile}!"
-msgstr "Neņem vērā novecojušo {oldfile}, jāizmanto {newfile}."
-
-#: ../fdroidserver/index.py
-msgid "Ignoring package without metadata: "
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Ignoring stale cache data for {apkfilename}"
-msgstr ""
-
-#: ../fdroidserver/update.py
-msgid "Include APKs that are signed with disabled algorithms like MD5"
-msgstr ""
-
-#: ../fdroidserver/mirror.py
-msgid "Include the PGP signature .asc files in the mirror"
-msgstr ""
-
-#: ../fdroidserver/mirror.py
-msgid "Include the build logs in the mirror"
-msgstr ""
-
-#: ../fdroidserver/mirror.py
-msgid "Include the source tarballs in the mirror"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-format
-msgid "Including metadata from %s@%s"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Including metadata from {path}"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Initialising submodules"
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "Install all signed applications available"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Install built packages on devices"
-msgstr ""
-
-#: ../fdroidserver/install.py
-#, python-format
-msgid "Installing %s..."
-msgstr ""
-
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "Installing '{apkfilename}' on {dev}..."
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Interact with the repo HTTP server"
-msgstr ""
-
-#: ../fdroidserver/update.py
-msgid "Invalid APK"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "Invalid AutoUpdateMode: {mode}"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "Invalid UpdateCheckMode: {mode}"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "Invalid VercodeOperation: {field}"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Invalid VercodeOperation: {invalid_ops}"
-msgstr ""
-
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Invalid application ID {appid}"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Invalid bulleted list"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-format
-msgid "Invalid name for published file: %s"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Invalid ndk: entry in build: \"{ndk}\""
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Invalid redirect to non-HTTPS: {before} -> {after} "
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Invalid scrlib metadata: '{file}' does not exist"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Invalid srclib metadata: could not parse '{file}'"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Invalid srclib metadata: unknown key '{key}' in '{file}'"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "JAR signature failed to verify: {path}"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "JAR signature verified: {path}"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "Java JAR file"
-msgstr ""
-
-#: ../fdroidserver/mirror.py ../fdroidserver/publish.py
-#: ../fdroidserver/update.py
-msgid "Java JDK not found! Install in standard location or set java_paths!"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "Java compiled class"
-msgstr ""
-
-#: ../fdroidserver/signindex.py
-msgid "Java jarsigner not found! Install in standard location or set java_paths!"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Javascript in HTML src attributes"
-msgstr ""
-
-#: ../fdroidserver/build.py
-#, python-brace-format
-msgid "Keeping failed build \"{apkfilename}\""
-msgstr ""
-
-#: ../fdroidserver/init.py
-msgid "Keystore for signing key:\t"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Known debug key is used in AllowedAPKSigningKeys: "
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Last used commit '{commit}' looks like a tag, but UpdateCheckMode is '{ucm}'"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Liberapay donation methods belong in the Liberapay: field"
-msgstr ""
-
-#: ../fdroidserver/rewritemeta.py
-msgid "List files that would be reformatted (dry run)"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Locale included in f-droid.org URL"
-msgstr ""
-
-#: ../fdroidserver/build.py
-msgid "Make the build stop on exceptions"
-msgstr ""
-
-#: ../fdroidserver/index.py
-msgid "Malformed repository mirrors."
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "Malformed serverwebroot line:"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-format
-msgid "Max recursion depth in ZIP file reached: %s"
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "Mirror config for {url} contains \"isPrimary\" key!"
-msgstr "Spoguļglabātavas konfigurācija {url} satur \"isPrimary\" key."
-
-#: ../fdroidserver/mirror.py
-msgid "Mirror the full repo and archive, all file types."
-msgstr ""
-
-#: ../fdroidserver/gpgsign.py
-msgid "Missing output directory"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-msgid "Moving Anti-Features declarations to localized files:"
-msgstr ""
-
-#: ../fdroidserver/index.py
-msgid "Neither \"repo_pubkey\" nor \"keystorepass\" set in config.yml"
-msgstr ""
-
-#: ../fdroidserver/verify.py
-#, python-format
-msgid "No APK for package: %s"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "No Android SDK found!"
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "No attached devices found"
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "No devices found for `adb install`! Please plug one in."
-msgstr "Netika atrasta neviena ierīce, kurā izpildīt `adb install`. Lūgums piespraust kādu."
-
-#: ../fdroidserver/index.py
-msgid "No fingerprint in URL."
-msgstr "URL nesatur pirkstu nospiedumu."
-
-#: ../fdroidserver/common.py
-msgid "No git submodules available"
-msgstr "Nav pieejams neviens git apakšmodulis"
-
-#: ../fdroidserver/import_subcommand.py
-msgid "No gradle project could be found. Specify --subdir?"
-msgstr "Nevarēja atrast nevienu gradle projektu. Norādīt --subdir?"
-
-#: ../fdroidserver/import_subcommand.py
-msgid "No information found."
-msgstr "Informācija netika atrasta."
-
-#: ../fdroidserver/checkupdates.py
-msgid "No matching tags found"
-msgstr "Netika atrastas atbilstošas birkas"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "No minimum SDK version found in {0}, using default (3)."
-msgstr "{0} netika atrasta zemākā pieļaujamā SDK versija, izmanto noklusējumu (3)."
-
-#: ../fdroidserver/lint.py
-msgid "No need to specify that the app is Free Software"
-msgstr "Nav nepieciešams norādīt, ka lietotne ir brīva programmatūra"
-
-#: ../fdroidserver/lint.py
-msgid "No need to specify that the app is for Android"
-msgstr "Nav nepieciešams norādīt, ka lietotne ir paredzēta Android"
-
-#: ../fdroidserver/deploy.py
-msgid "No option set! Edit your config.yml to set at least one of these:"
-msgstr "Nav iestatīta neviena iespēja. Jālabo config.yml, lai iestatītu vismaz vienu no šiem:"
-
-#: ../fdroidserver/common.py
-msgid "No packages specified"
-msgstr "Nav norādīta neviena pakotne"
-
-#: ../fdroidserver/install.py
-#, python-format
-msgid "No signed APK available for %s"
-msgstr "%s nav pieejams neviens parakstīts APK"
-
-#: ../fdroidserver/install.py
-msgid "No signed output directory - nothing to do"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "No signing certificates found in {path}"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-format
-msgid "No such package: %s"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "No such versionCode {versionCode} for app {appid}"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "No tags found"
-msgstr ""
-
-#: ../fdroidserver/publish.py ../fdroidserver/verify.py
-msgid "No unsigned directory - nothing to do"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "No version information could be found."
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Not a valid size definition: \"{}\""
-msgstr ""
-
-#: ../fdroidserver/signindex.py
-msgid "Nothing to do"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "Nothing to do for {appid}."
-msgstr ""
-
-#: ../fdroidserver/init.py
-msgid "Now set these in config.yml:"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "OBB file has newer versionCode({integer}) than any APK:"
-msgstr ""
-
-#: ../fdroidserver/update.py
-msgid "OBB filename must start with \"main.\" or \"patch.\":"
-msgstr ""
-
-#: ../fdroidserver/update.py
-msgid "OBB's packagename does not match a supported APK:"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "Offline machine, skipping git mirror generation until `fdroid deploy`"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "One of the 'github_releases' config items is missing the 'packageNames' value. skipping ..."
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "One of the 'github_releases' config items is missing the 'projectUrl' value. skipping ..."
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "One of the 'github_releases' config items is missing the 'token' value. skipping ..."
-msgstr ""
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Only PNG and JPEG are supported for graphics, found: {path}"
-msgstr ""
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/common.py
-msgid "Only accepts a single key \"env\""
-msgstr "Pieņem tikai vienas atslēgas \"env\""
-
-#: ../fdroidserver/checkupdates.py
-msgid "Only process apps with auto-updates"
-msgstr "Apstrādāt tikai lietotnes ar automātiskajiem atjauninājumiem"
-
-#: ../fdroidserver/lint.py
-msgid "OpenCollective donation methods belong in the OpenCollective: field"
-msgstr ""
-
-#: ../fdroidserver/verify.py
-msgid "Output JSON report to file named after APK."
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "Output JSON to stdout."
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py ../fdroidserver/gpgsign.py
-#: ../fdroidserver/publish.py ../fdroidserver/signindex.py
-#: ../fdroidserver/update.py
-msgid "Outputting JSON"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
-msgid "Overall license of the project."
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "Overriding blank versionName in {apkfilename} from metadata: {version}"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
-#, python-brace-format
-msgid "Package \"{appid}\" already exists"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Parsing manifest at '{path}'"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Password required with username"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
-msgid "Path to main Android project subdirectory, if not in root."
-msgstr ""
-
-#: ../fdroidserver/init.py
-msgid "Path to the Android SDK (sometimes set in ANDROID_HOME)"
-msgstr ""
-
-#: ../fdroidserver/btlog.py
-msgid "Path to the git repo to use as the log"
-msgstr ""
-
-#: ../fdroidserver/init.py
-msgid "Path to the keystore for the repo signing key"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-msgid "Print the secret variable to the terminal for easy copy/paste"
-msgstr ""
-
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "Privacy mode was enabled based on your locale ({country_code})."
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-format
-msgid "Problem with ZIP file: %s, error %s"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Problem with xml at '{path}'"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "Process auto-updates"
-msgstr ""
-
-#: ../fdroidserver/publish.py ../fdroidserver/update.py
-#, python-brace-format
-msgid "Processing {apkfilename}"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Processing {appid}"
-msgstr ""
-
-#: ../fdroidserver/update.py
-msgid "Produce human-readable XML/JSON for index files"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
-msgid "Project URL to import from."
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Punctuation should be avoided"
-msgstr ""
-
-#: ../fdroidserver/btlog.py
-msgid "Push the log to this git remote repository"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Pushing binary transparency log to {url}"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "Pushing to remote server failed!"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Pushing to {url}"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Quickly start a new repository"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Read all the metadata files and exit"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Reading '{config_file}'"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Reading packageName/versionCode/versionName failed, APK invalid: '{apkfilename}'"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Reading packageName/versionCode/versionName failed,APK invalid: '{apkfilename}'"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Reading {apkfilename} from cache"
-msgstr ""
-
-#: ../fdroidserver/build.py
-msgid "Refresh and cache scanner rules and signatures from the network"
-msgstr ""
-
-#: ../fdroidserver/publish.py
-#, python-brace-format
-msgid "Refusing to sign '{path}', file exists in both {dir1} and {dir2} folder."
-msgstr ""
-
-#: ../fdroidserver/verify.py
-msgid "Remove source tarball and any APKs if successfully verified."
-msgstr "Noņemt avota arhīvu un jebkādus APK, ja sekmīgi apliecināta."
-
-#: ../fdroidserver/common.py
-msgid "Removing specified files"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Removing {path}\""
-msgstr ""
-
-#: ../fdroidserver/update.py
-msgid "Rename APK files that do not match package.name_123.apk"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-#, python-brace-format
-msgid "Resigning {apkfilename} with provided debug.keystore"
-msgstr ""
-
-#: ../fdroidserver/update.py
-msgid "Resize all the icons exceeding the max pixel size and exit"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Restrict output to warnings and errors"
-msgstr ""
-
-#: ../fdroidserver/net.py
-#, python-format
-msgid "Retrying failed download: %s"
-msgstr "Atkārtoti mēģina neizdevušos lejupielādi: %s"
-
-#: ../fdroidserver/__main__.py
-msgid "Rewrite all the metadata files"
-msgstr ""
-
-#: ../fdroidserver/rewritemeta.py
-#, python-brace-format
-msgid "Rewriting '{appid}'"
-msgstr "Pārraksta \"{appid}\""
-
-#: ../fdroidserver/checkupdates.py
-msgid "Run on git repo that has uncommitted changes"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-#, python-brace-format
-msgid "Run over {cibase} to find -debug.apk. and skip repo_basedir {repo_basedir}"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Run rewritemeta to fix formatting"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "Running first pass with MD5 checking disabled"
-msgstr ""
-
-#: ../fdroidserver/mirror.py
-#, python-brace-format
-msgid "Running wget in {path}"
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "SHA-256 of {url} does not match entry!"
-msgstr ""
-
-#: ../fdroidserver/build.py
-msgid "Scan the resulting APK(s) for known non-free classes."
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Scan the source code of a package"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Scanner found {count} problems in {apk}"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Scanner found {count} problems in {appid}:"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Scanner found {count} problems in {appid}:{versionCode}:"
-msgstr ""
-
-#: ../fdroidserver/build.py
-msgid "Scanner found {} problem"
-msgid_plural "Scanner found {} problems"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../fdroidserver/scanner.py
-msgid "Scanning APK for extra signing blocks."
-msgstr "Caurskata APK, vai ir papildu paraksta bloki."
-
-#: ../fdroidserver/scanner.py
-msgid "Scanning APK with dexdump for known non-free classes."
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Set NDK {release} ({version}) up"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Set clock to that time using:"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-msgid "Set maximum releases in repo before older ones are archived"
-msgstr ""
-
-#: ../fdroidserver/build.py
-#, python-brace-format
-msgid "Set open file limit to {integer}"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Set up an app build for a nightly build repo"
-msgstr ""
-
-#: ../fdroidserver/build.py
-msgid "Setting open file limit failed: "
-msgstr ""
-
-#: ../fdroidserver/build.py
-#, python-brace-format
-msgid "Setting {0} sec timeout for this build"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Sign and place packages in the repo"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Sign indexes created using update --nosign"
-msgstr ""
-
-#: ../fdroidserver/build.py
-msgid "Skip scanning the source code for binaries and other problems"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Skipping '{apkfilename}' with invalid signature!"
-msgstr ""
-
-#: ../fdroidserver/deploy.py ../fdroidserver/index.py
-#, python-format
-msgid "Skipping GitLab Pages mirror because the repo is too large (>%.2fGB)!"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Skipping index generation for {appid}"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Skipping {apkfilename} with invalid signature!"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Skipping {appid}: disabled"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "Specify a local folder to sync the repo to"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "Specify an identity file to provide to SSH for rsyncing"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-msgid "Specify which debug keystore file to use."
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Spew out even more information than normal"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-#, python-brace-format
-msgid "Stripping mystery signature from {apkfilename}"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-format
-msgid "Summary '%s' is just the app's name"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Summary of length {length} is over the {limit} char limit"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "System clock is older than date in {path}!"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "Tags update mode only works for git, hg, bzr and git-svn repositories currently"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "Tags update mode used in git-svn, but the repo was not set up with tags"
-msgstr ""
-
-#: ../fdroidserver/build.py
-msgid "Test mode - put output in the tmp directory only, and always build, even if the output already exists."
-msgstr ""
-
-#: ../fdroidserver/index.py
-msgid "The \"qrcode\" Python package is not installed (e.g. apt-get install python3-qrcode)!"
-msgstr "Python pakotne \"qrcode\" nav uzstādīta (piemēram, `apt-get install python3-qrcode`)."
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "The OBB version code must come after \"{name}.\":"
-msgstr ""
-
-#: ../fdroidserver/btlog.py
-msgid "The base URL for the repo to log (default: https://f-droid.org)"
-msgstr ""
-
-#: ../fdroidserver/mirror.py
-msgid "The directory to write the mirror to"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-msgid "The file to be included in the repo (path or glob)"
-msgstr ""
-
-#: ../fdroidserver/index.py
-msgid "The repository's fingerprint does not match."
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "The root dir for local_copy_dir \"{path}\" does not exist!"
-msgstr ""
-
-#: ../fdroidserver/publish.py
-msgid "There is a keyalias collision - publishing halted"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "These are the apps that have been archived from the main repo."
-msgstr ""
-
-#: ../fdroidserver/mirror.py
-msgid "This command should never be used to mirror f-droid.org! A full copy requires more than 600GB."
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "This is a repository of apps to be used with F-Droid. Applications in this repository are either official binaries built by the original application developers, or are binaries built from source by the admin of f-droid.org using the tools on https://gitlab.com/fdroid."
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
-#, python-format
-msgid "This repo already has local metadata: %s"
-msgstr ""
-
-#: ../fdroidserver/init.py
-#, python-format
-msgid ""
-"To complete the setup, add your APKs to \"%s\"\n"
-"then run \"fdroid update -c; fdroid update\".  You might also want to edit\n"
-"\"config.yml\" to set the URL, repo name, and more.  You should also set up\n"
-"a signing key (a temporary one might have been automatically generated).\n"
-"\n"
-"For more info: https://f-droid.org/docs/Setup_an_F-Droid_App_Repo\n"
-"and https://f-droid.org/docs/Signing_Process"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "To use awsbucket, awssecretkey and awsaccesskeyid must also be set in config.yml!"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "To use rclone, rclone_config and awsbucket must be set in config.yml!"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "URL must start with https:// or http://"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "URL shorteners should not be used"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "URL {url} in Description: {error}"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Unexpected license tag \"{}\"! Only use FSF or OSI approved tags from https://spdx.org/license-list"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Unexpected license tag \"{}\"! Only use license tags configured in your config file"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Unknown entry {key} in {configname}"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Unknown exception found!"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Unknown file '{filename}' in build '{versionName}'"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-format
-msgid "Unknown metadata format: %s"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Unknown metadata format: {path} (use: *.yml)"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Unknown version of aapt, might cause problems: "
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Unnecessary leading space"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Unnecessary trailing space"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Unrecognised app field '{fieldname}' in '{path}'"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Unrecognised build flag '{build_flag}' in '{path}'"
-msgstr ""
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Unsupported file type \"{extension}\" for repo graphic"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Unsupported graphics file found: {path}"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-format
-msgid "Unused extlib at %s"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-format
-msgid "Unused file at %s"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-format
-msgid "Unused scandelete path: %s"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-format
-msgid "Unused scanignore path: %s"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Update repo information for new packages"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Update the binary transparency log for a URL"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "UpdateCheckData has invalid URL: {url}"
-msgstr ""
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "UpdateCheckData must match the version code as integer (\\d or [0-9]): {codeex}"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "UpdateCheckData must use HTTPS URL: {url}"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "UpdateCheckData not a valid URL: {url}"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "UpdateCheckMode is set but it looks like checkupdates hasn't been run yet."
-msgstr ""
-
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/lint.py
-msgid "UpdateCheckName is set to the known application ID, it can be removed"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Uploading {apkfilename} to androidobservatory.org"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Uploading {apkfilename} to virustotal"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Use /HEAD instead of /master or /main to point at a file in the default branch"
-msgstr ""
-
-#: ../fdroidserver/update.py
-msgid "Use `fdroid update -c` to create it."
-msgstr ""
-
-#: ../fdroidserver/build.py
-msgid "Use build server"
-msgstr ""
-
-#: ../fdroidserver/update.py
-msgid "Use date from APK instead of current time for newly added APKs"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Using \"{path}\" for configuring s3cmd."
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Using \"{path}\" for syncing with remote storage."
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Using APK Signature v2"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Using APK Signature v3"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Using JAR Signature"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Using Java's jarsigner, not recommended for verifying APKs! Use apksigner"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Using blank dictionary instead of contents of {path}!"
-msgstr ""
-
-#: ../fdroidserver/init.py
-#, python-brace-format
-msgid "Using existing keystore \"{path}\""
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Using rclone to sync with: {url}"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Using s3cmd to sync with: {url}"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Valid commands are:"
-msgstr ""
-
-#: ../fdroidserver/verify.py
-msgid "Verify against locally cached copy rather than redownloading."
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Verify the integrity of downloaded packages"
-msgstr ""
-
-#: ../fdroidserver/index.py
-msgid "Verifying index signature:"
-msgstr ""
-
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "Verifying package {path} with apksigner."
-msgstr "Pārbauda pakotni {path} ar apksigner."
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "VirusTotal API key cannot upload files larger than 32MB, use {url} to upload {path}."
-msgstr "VirusTotal API atslēga nevar augšupielādēt datnes, kas ir lielākas par 32 MB. Jāizmanto {url}, lai augšupielādētu {path}."
-
-#: ../fdroidserver/__main__.py
-msgid "Warn about possible metadata errors"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "WebAssembly binary file"
-msgstr "WebAssebly binārā datne"
-
-#: ../fdroidserver/update.py
-msgid "When configured for signed indexes, create only unsigned indexes at this stage"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "When linting the entire repository yamllint is disabled by default. This option forces yamllint regardless."
-msgstr ""
-
-#: ../fdroidserver/publish.py
-msgid "When signing or verifying fails, exit with an error code."
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "Would you like to download and install F-Droid.apk via adb? (YES/no)"
-msgstr "Vai lejupielādēt un uzstādīt F-Droid.apk ar adb? (YES/no)"
-
-#: ../fdroidserver/install.py
-msgid "Would you like to download the app(s) from f-droid.org? (YES/no)"
-msgstr "Vai lejupielādēt lietotni(es) no f-drodi.org? (YES/no)"
-
-#: ../fdroidserver/init.py
-msgid "X.509 'Distinguished Name' used when generating keys"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "You can use ANDROID_HOME to set the path to your SDK, i.e.:"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "ZIP file archive"
-msgstr ""
-
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "adb reports {serial} is \"{status}\"!"
-msgstr "adb ziņo, ka {serial} ir \"{status}\"."
-
-#: ../fdroidserver/nightly.py
-#, python-brace-format
-msgid "adding IdentityFile to {path}"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "adding to {name}: {path}"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "ambiguous option: %(option)s could match %(matches)s"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "apksigner in build-tools;{version} passes APKs with invalid v3 signatures, ignoring."
-msgstr "apksigner būvēšanas rīkos {version} izlaiž APK ar nederīgiem v3 parakstiem, neņem vērā."
-
-#: ../fdroidserver/common.py
-msgid "apksigner not found! Cannot sign or verify modern APKs"
-msgstr "apksigner nav atrasts. Nevar parakstīt vai apliecināt mūsdienīgus APK"
-
-#: ../fdroidserver/common.py
-msgid "apksigner not found, it's required for signing!"
-msgstr "apksigner nav atrasts, tas ir nepieciešams parakstīšanai."
-
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/checkupdates.py ../fdroidserver/lint.py
-#: ../fdroidserver/rewritemeta.py
-msgid "application ID of file to operate on"
-msgstr ""
-
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/build.py ../fdroidserver/install.py
-#: ../fdroidserver/publish.py ../fdroidserver/scanner.py
-#: ../fdroidserver/verify.py
-msgid "application ID with optional versionCode in the form APPID[:VERCODE]"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "archive_url needs to end with /archive"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "argument \"-\" with mode %r"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "argument %(argument_name)s: %(message)s"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-msgid "attempting bare SSH connection to test deploy key:"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "can not parse scrlib spec (not a string): '{}'"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "can't open '%(filename)s': %(error)s"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "can't open non-https url: '{};"
-msgstr ""
-
-#: ../fdroidserver/build.py
-#, python-brace-format
-msgid "cannot find required srclibs: \"{path}\""
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-msgid "cannot have multiple subparser arguments"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "cannot merge actions - two groups are named %r"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-msgid "cannot publish update, did you set the deploy key?"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-#, python-brace-format
-msgid "cloning {url}"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "commands from plugin modules:"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "conflicting option string: %s"
-msgid_plural "conflicting option strings: %s"
-msgstr[0] ""
-msgstr[1] ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "conflicting subparser alias: %s"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "conflicting subparser: %s"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "could not parse '{path}'"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "could not parse srclib spec (no name specified): '{}'"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "could not parse srclib spec (no ref specified): '{}'"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-#, python-brace-format
-msgid "created {path}"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "current version is newer: old vercode={old}, new vercode={new}"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "deleting: repo/{apkfilename}"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "dependency file without lock"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "deployed process log {path} to {dest}"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "dest= is required for options like %r"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "downloading '{}'"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "downloading scanner signatures from '{}' failed"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "executable binary, possibly code"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "expected %s argument"
-msgid_plural "expected %s arguments"
-msgstr[0] ""
-msgstr[1] ""
-
-#: /usr/lib/python3.11/argparse.py
-msgid "expected at least one argument"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-msgid "expected at most one argument"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-msgid "expected one argument"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "fdroid [<command>] [-h|--help|--version|<args>]"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "fetch the latest version of signatures from the web"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-msgid "force metadata errors (default) to be warnings, or to be ignored."
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "git svn clone failed"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "gzip file archive"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "ignored explicit argument %r"
-msgstr ""
-
-#: ../fdroidserver/index.py
-msgid "index-v1 must have a signature, use `fdroid signindex` to create it!"
-msgstr ""
-
-#: ../fdroidserver/index.py
-msgid "index-v2 must have a signature, use `fdroid signindex` to create it!"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "invalid %(type)s value: %(value)r"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "invalid choice: %(value)r (choose from %(choices)s)"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "invalid conflict_resolution value: %r"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "invalid option string %(option)r: must start with a character %(prefix_chars)r"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "ipfs_cid not found, skipping CIDv1 generation"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "latest build recipe is newer: old vercode={old}, new vercode={new}"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "local_copy_dir does not end with \"fdroid\", perhaps you meant: \"{path}\""
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "local_copy_dir must be an absolute path!"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "local_copy_dir must be directory, not a file!"
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-format
-msgid "mirror '%s' does not end with 'fdroid'!"
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "mirrors set twice, in config.yml and {path}!"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-msgid "mutually exclusive arguments must be optional"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "next {name} cache update due in {time}"
-msgstr ""
-
-#: ../fdroidserver/mirror.py
-#, python-brace-format
-msgid "no \"icon\" in {appid}"
-msgstr ""
-
-#: ../fdroidserver/signatures.py
-msgid "no APK supplied"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "no version information found"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "not allowed with argument %s"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "one of the arguments %s is required"
-msgstr ""
-
-#: ../fdroidserver/common.py ../fdroidserver/index.py
-msgid "only accepts strings, lists, and tuples"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-msgid "options"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-#, python-brace-format
-msgid "overwriting existing {path}"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-msgid "positional arguments"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "process log deploy {path} to {dest} failed!"
-msgstr ""
-
-#: ../fdroidserver/build.py
-msgid "reference binary missing signature"
-msgstr ""
-
-#: ../fdroidserver/signatures.py
-#, python-brace-format
-msgid "refuse downloading via insecure HTTP connection (use HTTPS or specify --no-https-check): {apkfilename}"
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-format
-msgid "repo_icon \"repo/icons/%s\" does not exist, generating placeholder."
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "repo_url needs to end with /repo"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "rsync is missing or broken: {error}"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "s3cmd sync indexes {path} to {url} and delete"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "s3cmd syncs indexes from {path} to {url} and deletes removed"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "scanner cache is malformed! You can clear it with: '{clear}'"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "serverwebroot: path does not end with \"fdroid\", perhaps you meant one of these:"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "shared library"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-msgid "show this help message and exit"
-msgstr ""
-
-#: ../fdroidserver/signatures.py
-msgid "signed APK, either a file-path or HTTPS URL."
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "skip deploying full build logs: log content is empty"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "skip deploying full build logs: not enabled in config"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "skipping source tarball: {path}"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "srclibs missing name and/or @"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "static library"
-msgstr ""
-
-#: ../fdroidserver/build.py
-#, python-brace-format
-msgid "supplied reference binary has allowed signer {signer}"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "the following arguments are required: %s"
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "true"
-msgstr "patiess"
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "unexpected option string: %s"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "unknown parser %(parser_name)r (choices: %(choices)s)"
-msgstr "nezināms parsētājs %(parser_name)r (izvēles: %(choices)s)"
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "unrecognized arguments: %s"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "unsafe permissions on '{config_file}' (should be 0600)!"
-msgstr ""
-
-#: ../fdroidserver/__main__.py /usr/lib/python3.11/argparse.py
-msgid "usage: "
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "using Apache libcloud to sync with {url}"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "virustotal.com is rate limiting, waiting to retry..."
-msgstr "virustotal.com ierobežo pieprasījumus, gaida, lai mēģinātu atkārtoti..."
-
-#: ../fdroidserver/install.py
-msgid "yes"
-msgstr "jā"
-
-#: ../fdroidserver/publish.py
-#, python-brace-format
-msgid "{0} app, {1} key aliases"
-msgid_plural "{0} apps, {1} key aliases"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{apkfilename} ({appid}) has no metadata!"
-msgstr ""
-
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{apkfilename}'s AndroidManifest.xml has a bad date: "
-msgstr ""
-
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{appid} does not have a name! Using application ID instead."
-msgstr ""
-
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{appid} from {path} is not a valid Android application ID!"
-msgstr ""
-
-#: ../fdroidserver/metadata.py ../fdroidserver/update.py
-#, python-brace-format
-msgid "{appid} from {path} is not a valid Java Package Name!"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{appid} has both APKs and files: {files}"
-msgstr ""
-
-#: ../fdroidserver/mirror.py
-#, python-brace-format
-msgid "{appid} is missing {name}"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "{appid}: Unknown extlib {path} in build '{versionName}'"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "{appid}: no builds specified, running on current source state"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "{appid}: {field} must be a '{type}', but it is a '{fieldtype}!'"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "{appid}: {field} must be a '{type}', but it is a '{fieldtype}'!"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "{build_flag} must be an integer, found: {value}"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "{build_flag} must be list or string, found: {value}"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "{file} is blank or corrupt!"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{name} \"{section}/icons/{path}\" does not exist! Check \"config.yml\"."
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{path1} is a duplicate of {path2}, remove one!"
-msgstr "{path1} ir tāds pats kā {path2}, viens no tiem ir jānoņem."
-
-#: ../fdroidserver/import_subcommand.py
-#, python-brace-format
-msgid "{path} already exists, ignoring import results!"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-#, python-brace-format
-msgid "{path} does not exist!  Create it by running:"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{path} has bad file signature \"{pattern}\", possible Janus exploit!"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "{path} has been flagged by virustotal {count} times:"
-msgstr ""
-
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "{path} has the wrong fingerprint ({fingerprint})!"
-msgstr "{path} ir nepareizs pirkstu nospiedums ({fingerprint})."
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "{path} is not \"key: value\" dict, but a {datatype}!"
-msgstr "{path} nav \"atslēga: vērtība\" vārdnīca, bet gan {datatype}."
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "{path} is not a standard config file!"
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "{path} is not list, but a {datatype}!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "{path} is not {expected_type}, but a {datatype}!"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{path} is zero size!"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "{path} more than 200MB, manually upload: {url}"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "{path}: \"{code}\" is not a valid ISO_3166-1 alpha-2 country code!"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{path}: {error}"
-msgstr ""
-
-#: ../fdroidserver/mirror.py
-#, python-brace-format
-msgid "{url} does not end with \"fdroid\", check the URL path!"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
-#, python-brace-format
-msgid "{url} does not start with \"http\"!"
-msgstr ""
-
-#: ../fdroidserver/build.py
-msgid "{} build failed"
-msgid_plural "{} builds failed"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../fdroidserver/build.py
-msgid "{} build succeeded"
-msgid_plural "{} builds succeeded"
-msgstr[0] ""
-msgstr[1] ""
diff --git a/locale/ml/LC_MESSAGES/fdroidserver.po b/locale/ml/LC_MESSAGES/fdroidserver.po
index 1a4cc764..e711a5ea 100644
--- a/locale/ml/LC_MESSAGES/fdroidserver.po
+++ b/locale/ml/LC_MESSAGES/fdroidserver.po
@@ -1,31 +1,42 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# Coding Otaku <contact@codingotaku.com>, 2021.
-# Abhiram <abhiram@skiff.com>, 2022.
-# abe1242 <abmdn1242@gmail.com>, 2023.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: fdroidserver 1.0.6-70-g54bc858\n"
 "Report-Msgid-Bugs-To: https://gitlab.com/fdroid/fdroidserver/issues\n"
-"POT-Creation-Date: 2025-06-25 09:52+0200\n"
-"PO-Revision-Date: 2023-06-23 14:52+0000\n"
-"Last-Translator: abe1242 <abmdn1242@gmail.com>\n"
-"Language-Team: Malayalam <https://hosted.weblate.org/projects/f-droid/fdroidserver/ml/>\n"
+"POT-Creation-Date: 2020-10-21 18:05+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
 "Language: ml\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 4.18.1\n"
+
+#: ../fdroidserver/common.py
+msgid ""
+"\n"
+"        This is a repository of apps to be used with FDroid. Applications in this\n"
+"        repository are either official binaries built by the original application\n"
+"        developers, or are binaries built from source by f-droid.org using the\n"
+"        tools on https://gitlab.com/fdroid.\n"
+"        "
+msgstr ""
+
+#: ../fdroidserver/nightly.py
+msgid ""
+"\n"
+"SSH Public Key to be used as Deploy Key:"
+msgstr ""
 
 #: ../fdroidserver/nightly.py
-#, fuzzy
 msgid ""
 "\n"
 "SSH public key to be used as deploy key:"
 msgstr ""
-"\n"
-"വിന്യാസ കീയായി ഉപയോഗിക്കുന്നതിനുള്ള SSH പബ്ലിക് കീ:"
 
 #: ../fdroidserver/nightly.py
 #, python-brace-format
@@ -37,15 +48,6 @@ msgstr ""
 #: ../fdroidserver/lint.py
 #, python-format
 msgid "\"%s/\" has no matching metadata file!"
-msgstr "\"%s/\" ന് ചേരുന്ന മെറ്റാഡേറ്റ ഫയൽ ലഭ്യമല്ല!"
-
-#: ../fdroidserver/index.py
-msgid "\"isPrimary\" key should not be added to mirrors!"
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "\"local_copy_dir\" {path} does not exist!"
 msgstr ""
 
 #: ../fdroidserver/install.py
@@ -53,12 +55,17 @@ msgstr ""
 msgid "\"{apkfilename}\" is already installed on {dev}."
 msgstr ""
 
+#: ../fdroidserver/update.py
+#, python-brace-format
+msgid "\"{path}\" contains outdated {name} ({version})"
+msgstr ""
+
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "\"{path}\" contains recent {name} ({version})"
 msgstr ""
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "\"{path}\" exists but s3cmd is not installed!"
 msgstr ""
@@ -68,77 +75,97 @@ msgstr ""
 msgid "\"{path}\" is not a supported file format (use: metadata/*.yml)"
 msgstr ""
 
-#: ../fdroidserver/update.py
+#: ../fdroidserver/metadata.py
 #, python-brace-format
-msgid "\"{path}\" is signed by a key that is not allowed:"
+msgid "\"{path}\" is not an accepted format, convert to: {formats}"
 msgstr ""
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/common.py
 #, python-brace-format
 msgid "\"{url}\" is not a valid URL!"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
 #, python-format
-msgid "%(prog)s: error: %(message)s\n"
+msgid "%(option)s option requires %(number)d argument"
+msgid_plural "%(option)s option requires %(number)d arguments"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../fdroidserver/mirror.py
+#, python-format
+msgid "%(prog)s [options] url"
 msgstr ""
 
-#: ../fdroidserver/publish.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
-msgid "%d APKs failed to be signed or verified!"
+msgid "%(prog)s: error: %(message)s\n"
 msgstr ""
 
 #: ../fdroidserver/scanner.py
 #, python-format
 msgid "%d problems found"
-msgstr "%d പ്രശ്നങ്ങൾ കണ്ടുപിടിച്ചു"
+msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "%prog [options]"
+msgstr ""
+
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "%r is not callable"
 msgstr ""
 
-#: ../fdroidserver/signindex.py
-#, python-format
-msgid "%s did not produce a dict!"
-msgstr ""
-
-#: ../fdroidserver/signindex.py
-#, python-format
-msgid "%s has bad SHA-256: %s"
-msgstr ""
-
 #: ../fdroidserver/lint.py
 #, python-format
 msgid "%s is not an accepted build field"
 msgstr ""
 
-#: ../fdroidserver/common.py
-msgid "'keypass' not found in config.yml!"
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, python-format
+msgid "%s option does not take a value"
+msgstr ""
+
+#: ../fdroidserver/index.py ../fdroidserver/common.py
+msgid "'keypass' not found in config.py!"
 msgstr ""
 
 #: ../fdroidserver/common.py
 msgid "'keystore' is NONE and 'smartcardoptions' is blank!"
 msgstr ""
 
-#: ../fdroidserver/common.py
-msgid "'keystore' not found in config.yml!"
-msgstr "config.yml ൽ 'keystore' കാണപ്പെടുന്നില്ല!"
-
-#: ../fdroidserver/common.py
-msgid "'keystorepass' not found in config.yml!"
-msgstr "config.yml ൽ 'keystorepass' കാണപ്പെടുന്നില്ല!"
-
-#: ../fdroidserver/common.py
-msgid "'repo_keyalias' not found in config.yml!"
+#: ../fdroidserver/index.py ../fdroidserver/common.py
+msgid "'keystore' not found in config.py!"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: ../fdroidserver/index.py ../fdroidserver/common.py
+msgid "'keystorepass' not found in config.py!"
+msgstr ""
+
+#: ../fdroidserver/index.py ../fdroidserver/common.py
+msgid "'repo_keyalias' not found in config.py!"
+msgstr ""
+
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "'required' is an invalid argument for positionals"
 msgstr ""
 
 #: ../fdroidserver/common.py
-msgid "'sdk_path' not set in config.yml!"
+msgid "'sdk_path' not set in 'config.py'!"
+msgstr ""
+
+#. Translators: "build-tools" is the file name of a package from
+#. Google, it is part of the Android SDK. So it probably shouldn't be
+#. translated or transliterated.
+#: ../fdroidserver/common.py
+#, python-brace-format
+msgid "'{aapt}' is too old, fdroid requires build-tools-23.0.0 or newer!"
 msgstr ""
 
 #: ../fdroidserver/common.py
@@ -146,6 +173,21 @@ msgstr ""
 msgid "'{aapt}' is too old, fdroid requires build-tools-{version} or newer!"
 msgstr ""
 
+#: ../fdroidserver/install.py
+#, python-brace-format
+msgid "'{apkfilename}' is already installed on {dev}."
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "'{field}' in {linedesc} is obsolete, see docs for current fields:"
+msgstr ""
+
+#: ../fdroidserver/common.py
+#, python-brace-format
+msgid "'{field}' will be in random order! Use () or [] brackets if order is important!"
+msgstr ""
+
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "'{path}' failed to execute!"
@@ -153,32 +195,23 @@ msgstr ""
 
 #: ../fdroidserver/metadata.py
 #, python-brace-format
-msgid "'{path}' has invalid format, it should be a dictionary!"
-msgstr ""
-
-#: ../fdroidserver/lint.py ../fdroidserver/metadata.py
-#, python-brace-format
 msgid "'{value}' is not a valid {field} in {appid}. Regex pattern: {pattern}"
 msgstr ""
 
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "'{value}' is not a valid {field}, should be {pattern}"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "--merge-request only runs on a single appid!"
-msgstr ""
-
 #: ../fdroidserver/checkupdates.py
 #, python-brace-format
 msgid "...checkupdate failed for {appid} : {error}"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid ".__call__() not defined"
 msgstr ""
 
+#: ../fdroidserver/metadata.py
+msgid ".fdroid.txt is not supported!  Convert to .fdroid.yml or .fdroid.json."
+msgstr ""
+
 #: ../fdroidserver/lint.py
 msgid "/issues is missing"
 msgstr ""
@@ -187,13 +220,12 @@ msgstr ""
 msgid "A URL is required as an argument!"
 msgstr ""
 
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "APK signatures have different certificates in {path}:"
+#: ../fdroid ../fdroidserver/__main__.py
+msgid "Add PGP signatures using GnuPG for packages in repo"
 msgstr ""
 
-#: ../fdroidserver/__main__.py
-msgid "Add PGP signatures using GnuPG for packages in repo"
+#: ../fdroid ../fdroidserver/__main__.py
+msgid "Add a new application from its source code"
 msgstr ""
 
 #: ../fdroidserver/update.py
@@ -213,11 +245,7 @@ msgstr ""
 msgid "Alias of the repo signing key in the keystore"
 msgstr ""
 
-#: ../fdroidserver/build.py
-msgid "AllowedAPKSigningKeys missing but reference binary supplied"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "Allows a different revision (or git branch) to be specified for the initial import"
 msgstr ""
 
@@ -241,9 +269,13 @@ msgstr ""
 msgid "Android DEX code"
 msgstr ""
 
-#: ../fdroidserver/init.py
+#: ../fdroidserver/common.py ../fdroidserver/build.py
 #, python-brace-format
-msgid "Android SDK not found at {path}!"
+msgid "Android SDK '{path}' does not have '{dirname}' installed!"
+msgstr ""
+
+#: ../fdroidserver/common.py
+msgid "Android SDK not found!"
 msgstr ""
 
 #: ../fdroidserver/common.py
@@ -256,17 +288,16 @@ msgstr ""
 msgid "Android SDK path '{path}' is not a directory!"
 msgstr ""
 
+#. Translators: "build-tools" is the file name of a package from
+#. Google, it is part of the Android SDK. So it probably shouldn't be
+#. translated or transliterated.
 #: ../fdroidserver/common.py
 #, python-brace-format
-msgid "Android SDK tool {cmd} not found!"
+msgid "Android build-tools path '{path}' does not exist!"
 msgstr ""
 
-#: ../fdroidserver/lint.py
-msgid "App has Binaries but does not have corresponding AllowedAPKSigningKeys to pin certificate."
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "App has NoSourceSince or ArchivePolicy \"0 versions\" or 0 but AutoUpdateMode or UpdateCheckMode are not None"
+#: ../fdroidserver/update.py
+msgid "AndroidManifest.xml has no date"
 msgstr ""
 
 #: ../fdroidserver/lint.py
@@ -274,10 +305,6 @@ msgstr ""
 msgid "App is in '{repo}' but has a link to {url}"
 msgstr ""
 
-#: ../fdroidserver/lint.py
-msgid "App version has binary but does not have corresponding AllowedAPKSigningKeys to pin certificate."
-msgstr ""
-
 #: ../fdroidserver/lint.py
 msgid "Appending .git is not necessary"
 msgstr ""
@@ -287,27 +314,11 @@ msgstr ""
 msgid "Archiving {apkfilename} with invalid signature!"
 msgstr ""
 
-#: ../fdroidserver/lint.py
-msgid "AutoUpdateMode with UpdateCheckMode: HTTP must have a pattern."
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "Automatic no to all prompts."
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "Automatic yes to all prompts."
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "Bad entry type \"{mirrortype}\" in mirrors config: {mirror}"
-msgstr ""
-
 #: ../fdroidserver/mirror.py
 msgid "Base URL to mirror, can include the index signing key using the query string: ?fingerprint="
 msgstr ""
 
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "Branch '{branch}' used as commit in build '{versionName}'"
@@ -323,7 +334,7 @@ msgstr ""
 msgid "Broken symlink: {path}"
 msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Build a package from source"
 msgstr ""
 
@@ -343,24 +354,31 @@ msgstr ""
 msgid "Build only the latest version of each package"
 msgstr ""
 
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Build should have comma-separated versionName and versionCode, not \"{value}\", in {linedesc}"
+msgstr ""
+
 #: ../fdroidserver/init.py
 #, python-format
 msgid "Built repo based in \"%s\" with this config:"
 msgstr ""
 
-#: ../fdroidserver/checkupdates.py
-msgid "Can't auto-update app with no CurrentVersionCode"
-msgstr ""
-
 #: ../fdroidserver/build.py
 msgid "Can't build due to {} error while scanning"
 msgid_plural "Can't build due to {} errors while scanning"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../fdroidserver/common.py
+#: ../fdroidserver/vmtools.py
 #, python-brace-format
-msgid "Cannot read {path}: {error}"
+msgid "Cannot read \"{path}\"!"
+msgstr ""
+
+#. Translators: https://developer.android.com/studio/build/application-id
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Cannot resolve application ID {appid}"
 msgstr ""
 
 #: ../fdroidserver/rewritemeta.py
@@ -368,23 +386,25 @@ msgstr ""
 msgid "Cannot rewrite \"{path}\""
 msgstr ""
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
+#: ../fdroidserver/rewritemeta.py
+msgid "Cannot use --list and --to at the same time"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Cannot write \"{path}\", not an accepted format, use: {formats}"
+msgstr ""
+
 #: ../fdroidserver/lint.py
 #, python-format
 msgid "Categories '%s' is not valid"
 msgstr ""
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
 #: ../fdroidserver/lint.py
 msgid "Categories are not set"
 msgstr ""
 
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "Category \"{category}\" defined but not used for any apps!"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Check for updates to applications"
 msgstr ""
 
@@ -393,20 +413,28 @@ msgstr ""
 msgid "Checking archiving for {appid} - apks:{integer}, keepversions:{keep}, archapks:{arch}"
 msgstr ""
 
+#: ../fdroidserver/dscanner.py
+msgid "Clean after all scans have finished"
+msgstr ""
+
+#: ../fdroidserver/dscanner.py
+msgid "Clean before the scans start and rebuild the container"
+msgstr ""
+
+#: ../fdroidserver/dscanner.py
+msgid "Clean up all containers and then exit"
+msgstr ""
+
 #: ../fdroidserver/update.py
 msgid "Clean update - don't uses caches, reprocess all APKs"
 msgstr ""
 
-#: ../fdroidserver/common.py
-msgid "Color the log output"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "Comma separated list of categories."
 msgstr ""
 
-#: ../fdroidserver/__main__.py
-#, python-format
+#: ../fdroid ../fdroidserver/__main__.py
+#, c-format, python-format
 msgid "Command '%s' not recognised.\n"
 msgstr ""
 
@@ -414,15 +442,6 @@ msgstr ""
 msgid "Commit changes"
 msgstr ""
 
-#: ../fdroidserver/checkupdates.py
-msgid "Commit changes, push, then make a merge request"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Conflicting \"{field}\" definitions between .yml and localized files:"
-msgstr ""
-
 #: ../fdroidserver/__main__.py
 msgid "Conflicting arguments: '--verbose' and '--quiet' can not be specified at the same time."
 msgstr ""
@@ -432,13 +451,11 @@ msgstr ""
 msgid "Could not find '{command}' on your system"
 msgstr ""
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "Could not find latest version code"
 msgstr ""
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "Could not find latest version name"
 msgstr ""
 
@@ -448,8 +465,7 @@ msgid "Could not find {path} to remove it"
 msgstr ""
 
 #: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Could not open APK {path} for analysis: "
+msgid "Could not open apk file for analysis"
 msgstr ""
 
 #: ../fdroidserver/common.py
@@ -457,16 +473,22 @@ msgstr ""
 msgid "Could not parse size \"{size}\", wrong type \"{type}\""
 msgstr ""
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/import_subcommand.py
+#. Translators: https://developer.android.com/studio/build/application-id
+#: ../fdroidserver/import.py
 msgid "Couldn't find Application ID"
 msgstr ""
 
-#: ../fdroidserver/checkupdates.py
-msgid "Couldn't find any version information"
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
+#: ../fdroidserver/import.py
+msgid "Couldn't find latest version code"
 msgstr ""
 
-#: ../fdroidserver/checkupdates.py
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
+#: ../fdroidserver/import.py
+msgid "Couldn't find latest version name"
+msgstr ""
+
+#: ../fdroidserver/import.py
 msgid "Couldn't find package ID"
 msgstr ""
 
@@ -474,26 +496,29 @@ msgstr ""
 msgid "Cowardily refusing to overwrite existing signing key setup!"
 msgstr ""
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/update.py
+msgid "Create a repo signing key in a keystore"
+msgstr ""
+
+#: ../fdroidserver/update.py
+msgid "Create skeleton metadata files that are missing"
+msgstr ""
+
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Created new container \"{name}\""
 msgstr ""
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Creating \"{path}\" for configuring s3cmd."
 msgstr ""
 
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Creating empty {config_file}"
-msgstr ""
-
 #: ../fdroidserver/publish.py
 msgid "Creating log directory"
 msgstr ""
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Creating new S3 bucket: {url}"
 msgstr ""
@@ -506,7 +531,8 @@ msgstr ""
 msgid "Creating signed index with this key (SHA256):"
 msgstr ""
 
-#: ../fdroidserver/publish.py ../fdroidserver/verify.py
+#: ../fdroidserver/import.py ../fdroidserver/verify.py
+#: ../fdroidserver/publish.py
 msgid "Creating temporary directory"
 msgstr ""
 
@@ -552,21 +578,16 @@ msgid "Description has a duplicate line"
 msgstr ""
 
 #: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Description of length {length} is over the {limit} char limit"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Did you mean config/{name}.yml?"
+#, python-format
+msgid "Description has a list (%s) but it isn't bulleted (*) nor numbered (#)"
 msgstr ""
 
 #: ../fdroidserver/lint.py
 #, python-brace-format
-msgid "Did you mean {code}?"
+msgid "Description of length {length} is over the {limit} char limit"
 msgstr ""
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "Do not add 'disable:' to the generated build entries"
 msgstr ""
 
@@ -591,20 +612,25 @@ msgstr ""
 msgid "Don't create a source tarball, useful when testing a build"
 msgstr ""
 
+#: ../fdroidserver/stats.py
+msgid "Don't do anything logs-related"
+msgstr ""
+
 #: ../fdroidserver/build.py
 msgid "Don't refresh the repository, useful when testing a build with no internet connection"
 msgstr ""
 
 #: ../fdroidserver/deploy.py ../fdroidserver/nightly.py
+#: ../fdroidserver/upload.py
 msgid "Don't use rsync checksums"
 msgstr ""
 
-#: ../fdroidserver/install.py
-msgid "Download F-Droid.apk using mirrors that leak less to the network"
+#: ../fdroid ../fdroidserver/__main__.py
+msgid "Download complete mirrors of small repos"
 msgstr ""
 
-#: ../fdroidserver/__main__.py
-msgid "Download complete mirrors of small repos"
+#: ../fdroidserver/stats.py
+msgid "Download logs we don't have"
 msgstr ""
 
 #: ../fdroidserver/common.py
@@ -618,12 +644,7 @@ msgstr ""
 
 #: ../fdroidserver/metadata.py
 #, python-brace-format
-msgid "Duplicate Anti-Feature declaration at {path} was ignored!"
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-format
-msgid "Duplicate entry \"%s\" in mirrors config!"
+msgid "Duplicate build recipe found for versionCode {versionCode} in {linedesc}"
 msgstr ""
 
 #: ../fdroidserver/lint.py
@@ -631,42 +652,27 @@ msgstr ""
 msgid "Duplicate link in '{field}': {url}"
 msgstr ""
 
-#: ../fdroidserver/common.py
-#, python-format
-msgid "ERROR: %(message)s"
+#: ../fdroid
+msgid "Dynamically scan APKs post build"
 msgstr ""
 
 #: ../fdroidserver/__main__.py
 msgid "ERROR: The \"server\" subcommand has been removed, use \"deploy\"!"
 msgstr ""
 
+#: ../fdroidserver/mirror.py
+msgid ""
+"ERROR: this command should never be used to mirror f-droid.org!\n"
+"A full mirror of f-droid.org requires more than 200GB."
+msgstr ""
+
 #: ../fdroidserver/nightly.py
 msgid "ERROR: unsupported CI type, patches welcome!"
 msgstr ""
 
-#: ../fdroidserver/nightly.py
-#, python-format
-msgid "ERROR: unsupported git host \"%s\", patches welcome!"
-msgstr ""
-
-#: ../fdroidserver/lint.py
+#: ../fdroidserver/metadata.py
 #, python-brace-format
-msgid "ERROR: {key} in {path} is not \"archive\" or \"repo\"!"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "ERROR: {key} not a valid key!"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "ERROR: {key}'s value should be of type {t}!"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "ERROR: {key}:{subkey} in {path} is not in allowed keys: {allowed_keys}!"
+msgid "Empty build flag at {linedesc}"
 msgstr ""
 
 #: ../fdroidserver/__main__.py
@@ -681,40 +687,20 @@ msgid ""
 "> "
 msgstr ""
 
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Environment variable {var} from {configname} is not set!"
+#: ../fdroidserver/deploy.py ../fdroidserver/checkupdates.py
+#: ../fdroidserver/upload.py
+#, python-format
+msgid "Error while attempting to publish log: %s"
 msgstr ""
 
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Environment variable {{env: {var}}} is not set!"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "Error deploying 'github_releases', {} not present. (You might need to run `fdroid update` first.)"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py ../fdroidserver/common.py
 msgid "Error while getting repo address"
 msgstr ""
 
-#: ../fdroidserver/scanner.py
-msgid "Exit with a non-zero code if problems were found"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Extract application metadata from a source repository"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Extract signatures from APKs"
 msgstr ""
 
-#: ../fdroidserver/install.py
-msgid "F-Droid.apk could not be downloaded from any known source!"
-msgstr ""
-
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Failed copying {path}: {error}"
@@ -735,23 +721,27 @@ msgstr ""
 msgid "Failed resizing {path}: {error}"
 msgstr ""
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/publish.py
+msgid "Failed to align application"
+msgstr ""
+
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Failed to create S3 bucket: {url}"
 msgstr ""
 
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Failed to get APK information, deleting {path}"
+#: ../fdroidserver/common.py
+msgid "Failed to get APK manifest information"
 msgstr ""
 
 #: ../fdroidserver/update.py
 #, python-brace-format
-msgid "Failed to get APK information, skipping {path}"
+msgid "Failed to get apk information, deleting {path}"
 msgstr ""
 
 #: ../fdroidserver/update.py
-msgid "Failed to get APK signing key fingerprint"
+#, python-brace-format
+msgid "Failed to get apk information, skipping {path}"
 msgstr ""
 
 #: ../fdroidserver/install.py
@@ -759,10 +749,14 @@ msgstr ""
 msgid "Failed to install '{apkfilename}' on {dev}: {error}"
 msgstr ""
 
-#: ../fdroidserver/common.py
+#: ../fdroidserver/publish.py ../fdroidserver/common.py
 msgid "Failed to sign application"
 msgstr ""
 
+#: ../fdroidserver/common.py
+msgid "Failed to zipalign application"
+msgstr ""
+
 #: ../fdroidserver/build.py
 #, python-brace-format
 msgid "Fetched buildserverid from VM: {buildserverid}"
@@ -778,12 +772,21 @@ msgstr ""
 msgid "File disappeared while processing it: {path}"
 msgstr ""
 
-#: ../fdroidserver/build.py ../fdroidserver/install.py
-#: ../fdroidserver/rewritemeta.py ../fdroidserver/scanner.py
-#: ../fdroidserver/update.py
+#: ../fdroidserver/verify.py ../fdroidserver/stats.py ../fdroidserver/update.py
+#: ../fdroidserver/rewritemeta.py ../fdroidserver/build.py
+#: ../fdroidserver/checkupdates.py ../fdroidserver/scanner.py
+#: ../fdroidserver/install.py
 msgid "Finished"
 msgstr ""
 
+#: ../fdroidserver/lint.py
+msgid "Flattr donation methods belong in the FlattrID flag"
+msgstr ""
+
+#: ../fdroidserver/lint.py
+msgid "Flattr donation methods belong in the FlattrID: field"
+msgstr ""
+
 #: ../fdroidserver/lint.py
 msgid "Forbidden HTML tags"
 msgstr ""
@@ -815,6 +818,7 @@ msgstr ""
 msgid "Found invalid appids in arguments"
 msgstr ""
 
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
 #: ../fdroidserver/common.py
 msgid "Found invalid versionCodes for some apps"
 msgstr ""
@@ -824,10 +828,6 @@ msgstr ""
 msgid "Found multiple JAR Signature Block Files in {path}"
 msgstr ""
 
-#: ../fdroidserver/common.py
-msgid "Found multiple Signer Certificates!"
-msgstr ""
-
 #: ../fdroidserver/metadata.py
 #, python-brace-format
 msgid "Found multiple metadata files for {appid}"
@@ -837,6 +837,11 @@ msgstr ""
 msgid "Found multiple signing certificates for repository."
 msgstr ""
 
+#: ../fdroidserver/update.py
+#, python-brace-format
+msgid "Found multiple signing certificates in {path}"
+msgstr ""
+
 #: ../fdroidserver/index.py
 msgid "Found no signing certificates for repository."
 msgstr ""
@@ -851,16 +856,6 @@ msgstr ""
 msgid "Found {apkfilename} at {url}"
 msgstr ""
 
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Found {count} problems in {filename}"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Found {count} warnings in {filename}"
-msgstr ""
-
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Generated skeleton metadata for {appid}"
@@ -879,21 +874,19 @@ msgstr ""
 msgid "Git fetch failed"
 msgstr ""
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
+#: ../fdroidserver/common.py
+msgid "Git remote set-head failed"
+msgstr ""
+
 #: ../fdroidserver/common.py
 #, python-format
 msgid "Git remote set-head failed: \"%s\""
 msgstr ""
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
 #: ../fdroidserver/common.py
 msgid "Git reset failed"
 msgstr ""
 
-#: ../fdroidserver/common.py
-msgid "Git submodule deinit failed"
-msgstr ""
-
 #: ../fdroidserver/common.py
 msgid "Git submodule sync failed"
 msgstr ""
@@ -925,16 +918,6 @@ msgstr ""
 msgid "Ignoring FUNDING.yml entry longer than 2048: %s"
 msgstr ""
 
-#: ../fdroidserver/update.py
-#, python-format
-msgid "Ignoring bad element in manifest: %s"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Ignoring deprecated {oldfile}, use {newfile}!"
-msgstr ""
-
 #: ../fdroidserver/index.py
 msgid "Ignoring package without metadata: "
 msgstr ""
@@ -944,6 +927,11 @@ msgstr ""
 msgid "Ignoring stale cache data for {apkfilename}"
 msgstr ""
 
+#: ../fdroidserver/rewritemeta.py
+#, python-brace-format
+msgid "Ignoring {ext} file at '{path}'"
+msgstr ""
+
 #: ../fdroidserver/update.py
 msgid "Include APKs that are signed with disabled algorithms like MD5"
 msgstr ""
@@ -960,16 +948,6 @@ msgstr ""
 msgid "Include the source tarballs in the mirror"
 msgstr ""
 
-#: ../fdroidserver/metadata.py
-#, python-format
-msgid "Including metadata from %s@%s"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Including metadata from {path}"
-msgstr ""
-
 #: ../fdroidserver/common.py
 msgid "Initialising submodules"
 msgstr ""
@@ -978,7 +956,7 @@ msgstr ""
 msgid "Install all signed applications available"
 msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Install built packages on devices"
 msgstr ""
 
@@ -987,12 +965,22 @@ msgstr ""
 msgid "Installing %s..."
 msgstr ""
 
+#: ../fdroidserver/install.py
+#, python-format
+msgid "Installing %s…"
+msgstr ""
+
 #: ../fdroidserver/install.py
 #, python-brace-format
 msgid "Installing '{apkfilename}' on {dev}..."
 msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroidserver/install.py
+#, python-brace-format
+msgid "Installing '{apkfilename}' on {dev}…"
+msgstr ""
+
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Interact with the repo HTTP server"
 msgstr ""
 
@@ -1000,36 +988,53 @@ msgstr ""
 msgid "Invalid APK"
 msgstr ""
 
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "Invalid AutoUpdateMode: {mode}"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "Invalid UpdateCheckMode: {mode}"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
+#: ../fdroidserver/lint.py ../fdroidserver/checkupdates.py
 #, python-brace-format
 msgid "Invalid VercodeOperation: {field}"
 msgstr ""
 
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Invalid VercodeOperation: {invalid_ops}"
-msgstr ""
-
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "Invalid application ID {appid}"
 msgstr ""
 
+#: ../fdroidserver/metadata.py
+#, python-format
+msgid "Invalid boolean '%s'"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Invalid build flag at {line} in {linedesc}"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Invalid build format: {value} in {name}"
+msgstr ""
+
 #: ../fdroidserver/lint.py
 msgid "Invalid bulleted list"
 msgstr ""
 
+#: ../fdroidserver/lint.py
+#, python-format
+msgid "Invalid license tag \"%s\"! Use only tags from https://spdx.org/license-list"
+msgstr ""
+
+#: ../fdroidserver/lint.py
+msgid "Invalid link - use [http://foo.bar Link title] or [http://foo.bar]"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+#, python-format
+msgid "Invalid metadata in %s:%d"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+msgid "Invalid metadata in: "
+msgstr ""
+
 #: ../fdroidserver/common.py
 #, python-format
 msgid "Invalid name for published file: %s"
@@ -1037,7 +1042,7 @@ msgstr ""
 
 #: ../fdroidserver/common.py
 #, python-brace-format
-msgid "Invalid ndk: entry in build: \"{ndk}\""
+msgid "Invalid package name {0}"
 msgstr ""
 
 #: ../fdroidserver/common.py
@@ -1060,6 +1065,11 @@ msgstr ""
 msgid "Invalid srclib metadata: unknown key '{key}' in '{file}'"
 msgstr ""
 
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Invalid versionCode: \"{versionCode}\" is not an integer!"
+msgstr ""
+
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "JAR signature failed to verify: {path}"
@@ -1074,8 +1084,8 @@ msgstr ""
 msgid "Java JAR file"
 msgstr ""
 
-#: ../fdroidserver/mirror.py ../fdroidserver/publish.py
-#: ../fdroidserver/update.py
+#: ../fdroidserver/publish.py ../fdroidserver/update.py
+#: ../fdroidserver/mirror.py
 msgid "Java JDK not found! Install in standard location or set java_paths!"
 msgstr ""
 
@@ -1091,19 +1101,10 @@ msgstr ""
 msgid "Javascript in HTML src attributes"
 msgstr ""
 
-#: ../fdroidserver/build.py
-#, python-brace-format
-msgid "Keeping failed build \"{apkfilename}\""
-msgstr ""
-
 #: ../fdroidserver/init.py
 msgid "Keystore for signing key:\t"
 msgstr ""
 
-#: ../fdroidserver/lint.py
-msgid "Known debug key is used in AllowedAPKSigningKeys: "
-msgstr ""
-
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "Last used commit '{commit}' looks like a tag, but UpdateCheckMode is '{ucm}'"
@@ -1113,8 +1114,12 @@ msgstr ""
 msgid "Liberapay donation methods belong in the Liberapay: field"
 msgstr ""
 
+#: ../fdroidserver/lint.py
+msgid "Liberapay donation methods belong in the LiberapayID flag"
+msgstr ""
+
 #: ../fdroidserver/rewritemeta.py
-msgid "List files that would be reformatted (dry run)"
+msgid "List files that would be reformatted"
 msgstr ""
 
 #: ../fdroidserver/lint.py
@@ -1133,16 +1138,6 @@ msgstr ""
 msgid "Malformed serverwebroot line:"
 msgstr ""
 
-#: ../fdroidserver/scanner.py
-#, python-format
-msgid "Max recursion depth in ZIP file reached: %s"
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "Mirror config for {url} contains \"isPrimary\" key!"
-msgstr ""
-
 #: ../fdroidserver/mirror.py
 msgid "Mirror the full repo and archive, all file types."
 msgstr ""
@@ -1151,29 +1146,30 @@ msgstr ""
 msgid "Missing output directory"
 msgstr ""
 
-#: ../fdroidserver/metadata.py
-msgid "Moving Anti-Features declarations to localized files:"
-msgstr ""
-
-#: ../fdroidserver/index.py
-msgid "Neither \"repo_pubkey\" nor \"keystorepass\" set in config.yml"
-msgstr ""
-
-#: ../fdroidserver/verify.py
+#: ../fdroidserver/lint.py
 #, python-format
-msgid "No APK for package: %s"
+msgid "Name '%s' is just the auto name - remove it"
+msgstr ""
+
+#: ../fdroidserver/common.py
+msgid "No 'config.py' found, using defaults."
 msgstr ""
 
 #: ../fdroidserver/common.py
 msgid "No Android SDK found!"
 msgstr ""
 
+#: ../fdroidserver/import.py
+msgid "No android or kivy project could be found. Specify --subdir?"
+msgstr ""
+
 #: ../fdroidserver/install.py
 msgid "No attached devices found"
 msgstr ""
 
-#: ../fdroidserver/install.py
-msgid "No devices found for `adb install`! Please plug one in."
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "No commit specified for {versionName} in {linedesc}"
 msgstr ""
 
 #: ../fdroidserver/index.py
@@ -1184,23 +1180,14 @@ msgstr ""
 msgid "No git submodules available"
 msgstr ""
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "No gradle project could be found. Specify --subdir?"
 msgstr ""
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py ../fdroidserver/common.py
 msgid "No information found."
 msgstr ""
 
-#: ../fdroidserver/checkupdates.py
-msgid "No matching tags found"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "No minimum SDK version found in {0}, using default (3)."
-msgstr ""
-
 #: ../fdroidserver/lint.py
 msgid "No need to specify that the app is Free Software"
 msgstr ""
@@ -1210,7 +1197,7 @@ msgid "No need to specify that the app is for Android"
 msgstr ""
 
 #: ../fdroidserver/deploy.py
-msgid "No option set! Edit your config.yml to set at least one of these:"
+msgid "No option set! Edit your config.py to set at least one of these:"
 msgstr ""
 
 #: ../fdroidserver/common.py
@@ -1219,14 +1206,14 @@ msgstr ""
 
 #: ../fdroidserver/install.py
 #, python-format
-msgid "No signed APK available for %s"
+msgid "No signed apk available for %s"
 msgstr ""
 
 #: ../fdroidserver/install.py
 msgid "No signed output directory - nothing to do"
 msgstr ""
 
-#: ../fdroidserver/common.py
+#: ../fdroidserver/update.py ../fdroidserver/common.py
 #, python-brace-format
 msgid "No signing certificates found in {path}"
 msgstr ""
@@ -1236,23 +1223,16 @@ msgstr ""
 msgid "No such package: %s"
 msgstr ""
 
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "No such versionCode {versionCode} for app {appid}"
 msgstr ""
 
-#: ../fdroidserver/checkupdates.py
-msgid "No tags found"
-msgstr ""
-
-#: ../fdroidserver/publish.py ../fdroidserver/verify.py
+#: ../fdroidserver/verify.py ../fdroidserver/publish.py
 msgid "No unsigned directory - nothing to do"
 msgstr ""
 
-#: ../fdroidserver/__main__.py
-msgid "No version information could be found."
-msgstr ""
-
 #: ../fdroidserver/common.py
 msgid "Not a valid size definition: \"{}\""
 msgstr ""
@@ -1267,9 +1247,10 @@ msgid "Nothing to do for {appid}."
 msgstr ""
 
 #: ../fdroidserver/init.py
-msgid "Now set these in config.yml:"
+msgid "Now set these in config.py:"
 msgstr ""
 
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "OBB file has newer versionCode({integer}) than any APK:"
@@ -1287,27 +1268,22 @@ msgstr ""
 msgid "Offline machine, skipping git mirror generation until `fdroid deploy`"
 msgstr ""
 
-#: ../fdroidserver/deploy.py
-msgid "One of the 'github_releases' config items is missing the 'packageNames' value. skipping ..."
+#: ../fdroidserver/common.py
+#, python-brace-format
+msgid "Old APK signature failed to verify: {path}"
 msgstr ""
 
-#: ../fdroidserver/deploy.py
-msgid "One of the 'github_releases' config items is missing the 'projectUrl' value. skipping ..."
+#: ../fdroid ../fdroidserver/__main__.py
+msgid "Old, deprecated name for fdroid deploy"
 msgstr ""
 
-#: ../fdroidserver/deploy.py
-msgid "One of the 'github_releases' config items is missing the 'token' value. skipping ..."
-msgstr ""
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Only PNG and JPEG are supported for graphics, found: {path}"
 msgstr ""
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/common.py
-msgid "Only accepts a single key \"env\""
+#: ../fdroidserver/checkupdates.py
+msgid "Only print differences with the Play Store"
 msgstr ""
 
 #: ../fdroidserver/checkupdates.py
@@ -1318,6 +1294,11 @@ msgstr ""
 msgid "OpenCollective donation methods belong in the OpenCollective: field"
 msgstr ""
 
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "Options"
+msgstr ""
+
 #: ../fdroidserver/verify.py
 msgid "Output JSON report to file named after APK."
 msgstr ""
@@ -1326,22 +1307,26 @@ msgstr ""
 msgid "Output JSON to stdout."
 msgstr ""
 
-#: ../fdroidserver/checkupdates.py ../fdroidserver/gpgsign.py
-#: ../fdroidserver/publish.py ../fdroidserver/signindex.py
-#: ../fdroidserver/update.py
+#: ../fdroidserver/gpgsign.py ../fdroidserver/publish.py
+#: ../fdroidserver/update.py ../fdroidserver/signindex.py
+#: ../fdroidserver/checkupdates.py
 msgid "Outputting JSON"
 msgstr ""
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "Overall license of the project."
 msgstr ""
 
+#: ../fdroidserver/dscanner.py
+msgid "Override path for repo APKs (default: ./repo)"
+msgstr ""
+
 #: ../fdroidserver/index.py
 #, python-brace-format
 msgid "Overriding blank versionName in {apkfilename} from metadata: {version}"
 msgstr ""
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 #, python-brace-format
 msgid "Package \"{appid}\" already exists"
 msgstr ""
@@ -1355,10 +1340,13 @@ msgstr ""
 msgid "Password required with username"
 msgstr ""
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "Path to main Android project subdirectory, if not in root."
 msgstr ""
 
+msgid "Path to main android project subdirectory, if not in root."
+msgstr ""
+
 #: ../fdroidserver/init.py
 msgid "Path to the Android SDK (sometimes set in ANDROID_HOME)"
 msgstr ""
@@ -1371,18 +1359,20 @@ msgstr ""
 msgid "Path to the keystore for the repo signing key"
 msgstr ""
 
+#: ../fdroidserver/dscanner.py
+msgid "Prepare Drozer to run a scan"
+msgstr ""
+
+msgid "Prepare drozer to run a scan"
+msgstr ""
+
 #: ../fdroidserver/nightly.py
 msgid "Print the secret variable to the terminal for easy copy/paste"
 msgstr ""
 
-#: ../fdroidserver/install.py
+#: ../fdroidserver/metadata.py
 #, python-brace-format
-msgid "Privacy mode was enabled based on your locale ({country_code})."
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-format
-msgid "Problem with ZIP file: %s, error %s"
+msgid "Problem with description of {appid}: {error}"
 msgstr ""
 
 #: ../fdroidserver/common.py
@@ -1408,7 +1398,11 @@ msgstr ""
 msgid "Produce human-readable XML/JSON for index files"
 msgstr ""
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/update.py
+msgid "Produce human-readable index.xml"
+msgstr ""
+
+#: ../fdroidserver/import.py
 msgid "Project URL to import from."
 msgstr ""
 
@@ -1420,25 +1414,21 @@ msgstr ""
 msgid "Push the log to this git remote repository"
 msgstr ""
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Pushing binary transparency log to {url}"
 msgstr ""
 
-#: ../fdroidserver/deploy.py
-msgid "Pushing to remote server failed!"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Pushing to {url}"
 msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Quickly start a new repository"
 msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Read all the metadata files and exit"
 msgstr ""
 
@@ -1449,12 +1439,14 @@ msgstr ""
 
 #: ../fdroidserver/common.py
 #, python-brace-format
-msgid "Reading packageName/versionCode/versionName failed, APK invalid: '{apkfilename}'"
+msgid "Reading minSdkVersion failed: \"{apkfilename}\""
 msgstr ""
 
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
+#. https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
 #: ../fdroidserver/common.py
 #, python-brace-format
-msgid "Reading packageName/versionCode/versionName failed,APK invalid: '{apkfilename}'"
+msgid "Reading packageName/versionCode/versionName failed, APK invalid: '{apkfilename}'"
 msgstr ""
 
 #: ../fdroidserver/update.py
@@ -1462,35 +1454,24 @@ msgstr ""
 msgid "Reading {apkfilename} from cache"
 msgstr ""
 
-#: ../fdroidserver/build.py
-msgid "Refresh and cache scanner rules and signatures from the network"
-msgstr ""
-
-#: ../fdroidserver/publish.py
-#, python-brace-format
-msgid "Refusing to sign '{path}', file exists in both {dir1} and {dir2} folder."
-msgstr ""
-
-#: ../fdroidserver/verify.py
-msgid "Remove source tarball and any APKs if successfully verified."
+#: ../fdroidserver/stats.py
+msgid "Recalculate aggregate stats - use when changes have been made that would invalidate old cached data."
 msgstr ""
 
 #: ../fdroidserver/common.py
 msgid "Removing specified files"
 msgstr ""
 
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Removing {path}\""
-msgstr ""
-
 #: ../fdroidserver/update.py
 msgid "Rename APK files that do not match package.name_123.apk"
 msgstr ""
 
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "RepoType {type} is deprecated, please switch to git."
+#: ../fdroidserver/update.py
+msgid "Report on build data status"
+msgstr ""
+
+#: ../fdroidserver/build.py
+msgid "Reset and create a brand new build server, even if the existing one appears to be ok."
 msgstr ""
 
 #: ../fdroidserver/nightly.py
@@ -1506,13 +1487,12 @@ msgstr ""
 msgid "Restrict output to warnings and errors"
 msgstr ""
 
-#: ../fdroidserver/net.py
-#, python-format
-msgid "Retrying failed download: %s"
+#: ../fdroid ../fdroidserver/__main__.py
+msgid "Rewrite all the metadata files"
 msgstr ""
 
-#: ../fdroidserver/__main__.py
-msgid "Rewrite all the metadata files"
+#: ../fdroidserver/rewritemeta.py
+msgid "Rewrite to a specific format: "
 msgstr ""
 
 #: ../fdroidserver/rewritemeta.py
@@ -1520,20 +1500,20 @@ msgstr ""
 msgid "Rewriting '{appid}'"
 msgstr ""
 
-#: ../fdroidserver/checkupdates.py
-msgid "Run on git repo that has uncommitted changes"
+#: ../fdroidserver/rewritemeta.py
+#, python-brace-format
+msgid "Rewriting '{appid}' to '{path}'"
 msgstr ""
 
-#: ../fdroidserver/nightly.py
-#, python-brace-format
-msgid "Run over {cibase} to find -debug.apk. and skip repo_basedir {repo_basedir}"
+#: ../fdroidserver/checkupdates.py
+msgid "Run on git repo that has uncommitted changes"
 msgstr ""
 
 #: ../fdroidserver/lint.py
 msgid "Run rewritemeta to fix formatting"
 msgstr ""
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 msgid "Running first pass with MD5 checking disabled"
 msgstr ""
 
@@ -1542,24 +1522,18 @@ msgstr ""
 msgid "Running wget in {path}"
 msgstr ""
 
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "SHA-256 of {url} does not match entry!"
+#: ../fdroidserver/dscanner.py
+msgid "Scan only the latest version of each package"
 msgstr ""
 
 #: ../fdroidserver/build.py
 msgid "Scan the resulting APK(s) for known non-free classes."
 msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Scan the source code of a package"
 msgstr ""
 
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Scanner found {count} problems in {apk}"
-msgstr ""
-
 #: ../fdroidserver/scanner.py
 #, python-brace-format
 msgid "Scanner found {count} problems in {appid}:"
@@ -1576,19 +1550,6 @@ msgid_plural "Scanner found {} problems"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../fdroidserver/scanner.py
-msgid "Scanning APK for extra signing blocks."
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "Scanning APK with dexdump for known non-free classes."
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Set NDK {release} ({version}) up"
-msgstr ""
-
 #: ../fdroidserver/common.py
 msgid "Set clock to that time using:"
 msgstr ""
@@ -1602,7 +1563,7 @@ msgstr ""
 msgid "Set open file limit to {integer}"
 msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Set up an app build for a nightly build repo"
 msgstr ""
 
@@ -1615,11 +1576,18 @@ msgstr ""
 msgid "Setting {0} sec timeout for this build"
 msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroidserver/build.py
+msgid "Setup an emulator, install the APK on it and perform a Drozer scan"
+msgstr ""
+
+msgid "Setup an emulator, install the apk on it and perform a drozer scan"
+msgstr ""
+
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Sign and place packages in the repo"
 msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Sign indexes created using update --nosign"
 msgstr ""
 
@@ -1632,11 +1600,6 @@ msgstr ""
 msgid "Skipping '{apkfilename}' with invalid signature!"
 msgstr ""
 
-#: ../fdroidserver/deploy.py ../fdroidserver/index.py
-#, python-format
-msgid "Skipping GitLab Pages mirror because the repo is too large (>%.2fGB)!"
-msgstr ""
-
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Skipping index generation for {appid}"
@@ -1652,14 +1615,23 @@ msgstr ""
 msgid "Skipping {appid}: disabled"
 msgstr ""
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/scanner.py
+#, python-brace-format
+msgid "Skipping {appid}: no builds specified"
+msgstr ""
+
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 msgid "Specify a local folder to sync the repo to"
 msgstr ""
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 msgid "Specify an identity file to provide to SSH for rsyncing"
 msgstr ""
 
+#: ../fdroidserver/build.py
+msgid "Specify that we're running on the build server"
+msgstr ""
+
 #: ../fdroidserver/nightly.py
 msgid "Specify which debug keystore file to use."
 msgstr ""
@@ -1668,6 +1640,11 @@ msgstr ""
 msgid "Spew out even more information than normal"
 msgstr ""
 
+#: ../fdroidserver/nightly.py
+#, python-brace-format
+msgid "Striping mystery signature from {apkfilename}"
+msgstr ""
+
 #: ../fdroidserver/nightly.py
 #, python-brace-format
 msgid "Stripping mystery signature from {apkfilename}"
@@ -1688,22 +1665,10 @@ msgstr ""
 msgid "System clock is older than date in {path}!"
 msgstr ""
 
-#: ../fdroidserver/checkupdates.py
-msgid "Tags update mode only works for git, hg, bzr and git-svn repositories currently"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "Tags update mode used in git-svn, but the repo was not set up with tags"
-msgstr ""
-
 #: ../fdroidserver/build.py
 msgid "Test mode - put output in the tmp directory only, and always build, even if the output already exists."
 msgstr ""
 
-#: ../fdroidserver/index.py
-msgid "The \"qrcode\" Python package is not installed (e.g. apt-get install python3-qrcode)!"
-msgstr ""
-
 #. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
 #: ../fdroidserver/update.py
 #, python-brace-format
@@ -1722,10 +1687,18 @@ msgstr ""
 msgid "The file to be included in the repo (path or glob)"
 msgstr ""
 
+#: ../fdroidserver/deploy.py
+msgid "The only commands currently supported are 'init' and 'update'"
+msgstr ""
+
 #: ../fdroidserver/index.py
 msgid "The repository's fingerprint does not match."
 msgstr ""
 
+#: ../fdroidserver/common.py
+msgid "The repository's index could not be verified."
+msgstr ""
+
 #: ../fdroidserver/deploy.py
 #, python-brace-format
 msgid "The root dir for local_copy_dir \"{path}\" does not exist!"
@@ -1739,40 +1712,13 @@ msgstr ""
 msgid "These are the apps that have been archived from the main repo."
 msgstr ""
 
-#: ../fdroidserver/mirror.py
-msgid "This command should never be used to mirror f-droid.org! A full copy requires more than 600GB."
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "This is a repository of apps to be used with F-Droid. Applications in this repository are either official binaries built by the original application developers, or are binaries built from source by the admin of f-droid.org using the tools on https://gitlab.com/fdroid."
-msgstr ""
-"F-Droid നൊപ്പം ഉപയോഗിക്കേണ്ട അപ്ലിക്കേഷനുകളുടെ ഒരു ശേഖരമാണ്. ഇതിലെ അപ്ലിക്കേഷനുകൾ ഒന്നുകിൽ ആപ്ലിക്കേഷൻ നിർമാതാക്കൾ നിർമ്മിച്ച ഔദ്യോഗിക ബൈനറികളുടെ ശേഖരമോ,\n"
-"അല്ലെങ്കിൽ f-droid.org ന്റെ അഡ്മിൻ\n"
-"https://gitlab.com/fdroid- ലെ ഉപകരണങ്ങൾ ഉപയോഗിച്ച് ഉറവിടത്തിൽ നിന്ന് നിർമ്മിച്ച ബൈനറികളോ ആണ് ."
-
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 #, python-format
 msgid "This repo already has local metadata: %s"
 msgstr ""
 
-#: ../fdroidserver/init.py
-#, python-format
-msgid ""
-"To complete the setup, add your APKs to \"%s\"\n"
-"then run \"fdroid update -c; fdroid update\".  You might also want to edit\n"
-"\"config.yml\" to set the URL, repo name, and more.  You should also set up\n"
-"a signing key (a temporary one might have been automatically generated).\n"
-"\n"
-"For more info: https://f-droid.org/docs/Setup_an_F-Droid_App_Repo\n"
-"and https://f-droid.org/docs/Signing_Process"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "To use awsbucket, awssecretkey and awsaccesskeyid must also be set in config.yml!"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "To use rclone, rclone_config and awsbucket must be set in config.yml!"
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
+msgid "To use awsbucket, awssecretkey and awsaccesskeyid must also be set in config.py!"
 msgstr ""
 
 #: ../fdroidserver/lint.py
@@ -1783,6 +1729,10 @@ msgstr ""
 msgid "URL shorteners should not be used"
 msgstr ""
 
+#: ../fdroidserver/metadata.py
+msgid "URL title is just the URL, use brackets: [URL]"
+msgstr ""
+
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "URL {url} in Description: {error}"
@@ -1796,15 +1746,16 @@ msgstr ""
 msgid "Unexpected license tag \"{}\"! Only use license tags configured in your config file"
 msgstr ""
 
-#: ../fdroidserver/common.py
+#: ../fdroidserver/metadata.py
 #, python-brace-format
-msgid "Unknown entry {key} in {configname}"
+msgid "Unexpected text on same line as {field} in {linedesc}"
 msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Unknown exception found!"
 msgstr ""
 
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "Unknown file '{filename}' in build '{versionName}'"
@@ -1815,6 +1766,11 @@ msgstr ""
 msgid "Unknown metadata format: %s"
 msgstr ""
 
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Unknown metadata format: {path}"
+msgstr ""
+
 #: ../fdroidserver/metadata.py
 #, python-brace-format
 msgid "Unknown metadata format: {path} (use: *.yml)"
@@ -1824,6 +1780,10 @@ msgstr ""
 msgid "Unknown version of aapt, might cause problems: "
 msgstr ""
 
+#: ../fdroidserver/lint.py
+msgid "Unlinkified link - use [http://foo.bar Link title] or [http://foo.bar]"
+msgstr ""
+
 #: ../fdroidserver/lint.py
 msgid "Unnecessary leading space"
 msgstr ""
@@ -1837,12 +1797,20 @@ msgstr ""
 msgid "Unrecognised app field '{fieldname}' in '{path}'"
 msgstr ""
 
+#: ../fdroidserver/metadata.py
+msgid "Unrecognised app field: "
+msgstr ""
+
 #: ../fdroidserver/metadata.py
 #, python-brace-format
 msgid "Unrecognised build flag '{build_flag}' in '{path}'"
 msgstr ""
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Unrecognised field '{field}' in {linedesc}"
+msgstr ""
+
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Unsupported file type \"{extension}\" for repo graphic"
@@ -1853,6 +1821,29 @@ msgstr ""
 msgid "Unsupported graphics file found: {path}"
 msgstr ""
 
+#: ../fdroidserver/rewritemeta.py
+#, python-brace-format
+msgid "Unsupported metadata format, use: --to [{supported}]"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+msgid "Unterminated ]"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+msgid "Unterminated ]]"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Unterminated build in {name}"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Unterminated continuation in {name}"
+msgstr ""
+
 #: ../fdroidserver/lint.py
 #, python-format
 msgid "Unused extlib at %s"
@@ -1873,25 +1864,27 @@ msgstr ""
 msgid "Unused scanignore path: %s"
 msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Update repo information for new packages"
 msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Update the binary transparency log for a URL"
 msgstr ""
 
+#: ../fdroid ../fdroidserver/__main__.py
+msgid "Update the stats of the repo"
+msgstr ""
+
+#: ../fdroidserver/update.py ../fdroidserver/build.py
+msgid "Update the wiki"
+msgstr ""
+
 #: ../fdroidserver/checkupdates.py
 #, python-brace-format
 msgid "UpdateCheckData has invalid URL: {url}"
 msgstr ""
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "UpdateCheckData must match the version code as integer (\\d or [0-9]): {codeex}"
-msgstr ""
-
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "UpdateCheckData must use HTTPS URL: {url}"
@@ -1903,10 +1896,14 @@ msgid "UpdateCheckData not a valid URL: {url}"
 msgstr ""
 
 #: ../fdroidserver/lint.py
-msgid "UpdateCheckMode is set but it looks like checkupdates hasn't been run yet."
+msgid "UpdateCheckMode is set but it looks like checkupdates hasn't been run yet"
+msgstr ""
+
+#. Translators: https://developer.android.com/studio/build/application-id
+#: ../fdroidserver/lint.py
+msgid "UpdateCheckName is set to the known application ID - it can be removed"
 msgstr ""
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
 #: ../fdroidserver/lint.py
 msgid "UpdateCheckName is set to the known application ID, it can be removed"
 msgstr ""
@@ -1921,8 +1918,19 @@ msgstr ""
 msgid "Uploading {apkfilename} to virustotal"
 msgstr ""
 
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "Usage"
+msgstr ""
+
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, python-format
+msgid "Usage: %s\n"
+msgstr ""
+
 #: ../fdroidserver/lint.py
-msgid "Use /HEAD instead of /master or /main to point at a file in the default branch"
+msgid "Use /HEAD instead of /master to point at a file in the default branch"
 msgstr ""
 
 #: ../fdroidserver/update.py
@@ -1937,14 +1945,12 @@ msgstr ""
 msgid "Use date from APK instead of current time for newly added APKs"
 msgstr ""
 
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Using \"{path}\" for configuring s3cmd."
+msgid "Use date from apk instead of current time for newly added apks"
 msgstr ""
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
-msgid "Using \"{path}\" for syncing with remote storage."
+msgid "Using \"{path}\" for configuring s3cmd."
 msgstr ""
 
 #: ../fdroidserver/common.py
@@ -1955,17 +1961,13 @@ msgstr ""
 msgid "Using APK Signature v3"
 msgstr ""
 
-#: ../fdroidserver/common.py
-msgid "Using JAR Signature"
-msgstr ""
-
 #: ../fdroidserver/common.py
 msgid "Using Java's jarsigner, not recommended for verifying APKs! Use apksigner"
 msgstr ""
 
-#: ../fdroidserver/metadata.py
+#: ../fdroidserver/common.py
 #, python-brace-format
-msgid "Using blank dictionary instead of contents of {path}!"
+msgid "Using androguard from \"{path}\""
 msgstr ""
 
 #: ../fdroidserver/init.py
@@ -1973,17 +1975,12 @@ msgstr ""
 msgid "Using existing keystore \"{path}\""
 msgstr ""
 
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Using rclone to sync with: {url}"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Using s3cmd to sync with: {url}"
 msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Valid commands are:"
 msgstr ""
 
@@ -1991,7 +1988,7 @@ msgstr ""
 msgid "Verify against locally cached copy rather than redownloading."
 msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Verify the integrity of downloaded packages"
 msgstr ""
 
@@ -1999,28 +1996,15 @@ msgstr ""
 msgid "Verifying index signature:"
 msgstr ""
 
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "Verifying package {path} with apksigner."
-msgstr ""
-
 #: ../fdroidserver/deploy.py
 #, python-brace-format
 msgid "VirusTotal API key cannot upload files larger than 32MB, use {url} to upload {path}."
 msgstr ""
 
-#: ../fdroidserver/nightly.py
-msgid "WARNING: only public git repos are supported!"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Warn about possible metadata errors"
 msgstr ""
 
-#: ../fdroidserver/scanner.py
-msgid "WebAssembly binary file"
-msgstr ""
-
 #: ../fdroidserver/update.py
 msgid "When configured for signed indexes, create only unsigned indexes at this stage"
 msgstr ""
@@ -2029,16 +2013,7 @@ msgstr ""
 msgid "When linting the entire repository yamllint is disabled by default. This option forces yamllint regardless."
 msgstr ""
 
-#: ../fdroidserver/publish.py
-msgid "When signing or verifying fails, exit with an error code."
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "Would you like to download and install F-Droid.apk via adb? (YES/no)"
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "Would you like to download the app(s) from f-droid.org? (YES/no)"
+msgid "X.509 'Distiguished Name' used when generating keys"
 msgstr ""
 
 #: ../fdroidserver/init.py
@@ -2053,11 +2028,6 @@ msgstr ""
 msgid "ZIP file archive"
 msgstr ""
 
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "adb reports {serial} is \"{status}\"!"
-msgstr ""
-
 #: ../fdroidserver/nightly.py
 #, python-brace-format
 msgid "adding IdentityFile to {path}"
@@ -2068,66 +2038,70 @@ msgstr ""
 msgid "adding to {name}: {path}"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "ambiguous option: %(option)s could match %(matches)s"
 msgstr ""
 
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "apksigner in build-tools;{version} passes APKs with invalid v3 signatures, ignoring."
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "apksigner not found! Cannot sign or verify modern APKs"
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, python-format
+msgid "ambiguous option: %s (%s?)"
 msgstr ""
 
 #: ../fdroidserver/common.py
 msgid "apksigner not found, it's required for signing!"
 msgstr ""
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/checkupdates.py ../fdroidserver/lint.py
-#: ../fdroidserver/rewritemeta.py
+#: ../fdroidserver/lint.py ../fdroidserver/rewritemeta.py
+#: ../fdroidserver/checkupdates.py
 msgid "application ID of file to operate on"
 msgstr ""
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/build.py ../fdroidserver/install.py
-#: ../fdroidserver/publish.py ../fdroidserver/scanner.py
-#: ../fdroidserver/verify.py
+#: ../fdroidserver/verify.py ../fdroidserver/publish.py
+#: ../fdroidserver/build.py ../fdroidserver/scanner.py
+#: ../fdroidserver/install.py
 msgid "application ID with optional versionCode in the form APPID[:VERCODE]"
 msgstr ""
 
-#: ../fdroidserver/common.py
-msgid "archive_url needs to end with /archive"
+#: ../fdroidserver/lint.py ../fdroidserver/rewritemeta.py
+msgid "applicationId in the form APPID"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: ../fdroidserver/checkupdates.py
+msgid "applicationId to check for updates"
+msgstr ""
+
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
+#: ../fdroidserver/verify.py ../fdroidserver/publish.py
+#: ../fdroidserver/dscanner.py ../fdroidserver/build.py
+#: ../fdroidserver/scanner.py ../fdroidserver/install.py
+msgid "applicationId with optional versionCode in the form APPID[:VERCODE]"
+msgstr ""
+
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "argument \"-\" with mode %r"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "argument %(argument_name)s: %(message)s"
-msgstr ""
-
 #: ../fdroidserver/nightly.py
 msgid "attempting bare SSH connection to test deploy key:"
 msgstr ""
 
+#: ../fdroidserver/nightly.py
+msgid "attempting bare ssh connection to test deploy key:"
+msgstr ""
+
 #: ../fdroidserver/common.py
 msgid "can not parse scrlib spec (not a string): '{}'"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
-msgid "can't open '%(filename)s': %(error)s"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "can't open non-https url: '{};"
+msgid "can't open '%s': %s"
 msgstr ""
 
 #: ../fdroidserver/build.py
@@ -2135,11 +2109,13 @@ msgstr ""
 msgid "cannot find required srclibs: \"{path}\""
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "cannot have multiple subparser arguments"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "cannot merge actions - two groups are named %r"
 msgstr ""
@@ -2153,25 +2129,30 @@ msgstr ""
 msgid "cloning {url}"
 msgstr ""
 
+#: ../fdroidserver/deploy.py
+msgid "command to execute, either 'init' or 'update'"
+msgstr ""
+
 #: ../fdroidserver/__main__.py
 msgid "commands from plugin modules:"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "complex"
+msgstr ""
+
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "conflicting option string: %s"
 msgid_plural "conflicting option strings: %s"
 msgstr[0] ""
 msgstr[1] ""
 
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "conflicting subparser alias: %s"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "conflicting subparser: %s"
+#: ../fdroidserver/nightly.py
+#, python-brace-format
+msgid "copying {apkfilename} into {path}"
 msgstr ""
 
 #: ../fdroidserver/metadata.py
@@ -2180,11 +2161,11 @@ msgid "could not parse '{path}'"
 msgstr ""
 
 #: ../fdroidserver/common.py
-msgid "could not parse srclib spec (no name specified): '{}'"
+msgid "could not parse srclib spec (no ref specified): '{}'"
 msgstr ""
 
 #: ../fdroidserver/common.py
-msgid "could not parse srclib spec (no ref specified): '{}'"
+msgid "could not parse srclib spec (too many '@' signs): '{}'"
 msgstr ""
 
 #: ../fdroidserver/nightly.py
@@ -2192,18 +2173,14 @@ msgstr ""
 msgid "created {path}"
 msgstr ""
 
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "current version is newer: old vercode={old}, new vercode={new}"
-msgstr ""
-
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "deleting: repo/{apkfilename}"
 msgstr ""
 
-#: ../fdroidserver/scanner.py
-msgid "dependency file without lock"
+#: ../fdroidserver/common.py
+#, python-brace-format
+msgid "deployed build logs to '{path}'"
 msgstr ""
 
 #: ../fdroidserver/common.py
@@ -2211,48 +2188,59 @@ msgstr ""
 msgid "deployed process log {path} to {dest}"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "dest= is required for options like %r"
 msgstr ""
 
-#: ../fdroidserver/scanner.py
-msgid "downloading '{}'"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "downloading scanner signatures from '{}' failed"
-msgstr ""
-
 #: ../fdroidserver/scanner.py
 msgid "executable binary, possibly code"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "expected %s argument"
 msgid_plural "expected %s arguments"
 msgstr[0] ""
 msgstr[1] ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "expected at least one argument"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "expected at most one argument"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "expected one argument"
 msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroidserver/common.py
+#, python-brace-format
+msgid "failed deploying build logs to '{path}'"
+msgstr ""
+
+#: ../fdroid
+msgid "fdroid [-h|--help|--version] <command> [<args>]"
+msgstr ""
+
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "fdroid [<command>] [-h|--help|--version|<args>]"
 msgstr ""
 
-#: ../fdroidserver/scanner.py
-msgid "fetch the latest version of signatures from the web"
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "floating-point"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+msgid "force errors to be warnings, or ignore"
 msgstr ""
 
 #: ../fdroidserver/metadata.py
@@ -2267,7 +2255,8 @@ msgstr ""
 msgid "gzip file archive"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "ignored explicit argument %r"
 msgstr ""
@@ -2276,39 +2265,35 @@ msgstr ""
 msgid "index-v1 must have a signature, use `fdroid signindex` to create it!"
 msgstr ""
 
-#: ../fdroidserver/index.py
-msgid "index-v2 must have a signature, use `fdroid signindex` to create it!"
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "integer"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "invalid %(type)s value: %(value)r"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "invalid choice: %(value)r (choose from %(choices)s)"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "invalid conflict_resolution value: %r"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "invalid option string %(option)r: must start with a character %(prefix_chars)r"
 msgstr ""
 
-#: ../fdroidserver/common.py
-msgid "ipfs_cid not found, skipping CIDv1 generation"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "latest build recipe is newer: old vercode={old}, new vercode={new}"
-msgstr ""
-
 #: ../fdroidserver/deploy.py
 #, python-brace-format
 msgid "local_copy_dir does not end with \"fdroid\", perhaps you meant: \"{path}\""
@@ -2327,20 +2312,11 @@ msgstr ""
 msgid "mirror '%s' does not end with 'fdroid'!"
 msgstr ""
 
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "mirrors set twice, in config.yml and {path}!"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "mutually exclusive arguments must be optional"
 msgstr ""
 
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "next {name} cache update due in {time}"
-msgstr ""
-
 #: ../fdroidserver/mirror.py
 #, python-brace-format
 msgid "no \"icon\" in {appid}"
@@ -2350,26 +2326,88 @@ msgstr ""
 msgid "no APK supplied"
 msgstr ""
 
-#: ../fdroidserver/checkupdates.py
-msgid "no version information found"
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, python-format
+msgid "no such option: %s"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: ../fdroid ../fdroidserver/__main__.py
+msgid "no version info found!"
+msgstr ""
+
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "not allowed with argument %s"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "one of the arguments %s is required"
 msgstr ""
 
-#: ../fdroidserver/common.py ../fdroidserver/index.py
+#: ../fdroidserver/index.py ../fdroidserver/common.py
 msgid "only accepts strings, lists, and tuples"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
-msgid "options"
+#: ../fdroidserver/install.py
+#, python-format
+msgid "option %s: If you really want to install all the signed apps, use --all"
+msgstr ""
+
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, python-format
+msgid "option %s: invalid %s value: %r"
+msgstr ""
+
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, python-format
+msgid "option %s: invalid choice: %r (choose from %s)"
+msgstr ""
+
+#: /usr/lib/python3.5/getopt.py /usr/lib/python3.6/getopt.py
+#: /usr/lib/python3.7/getopt.py
+#, python-format
+msgid "option -%s not recognized"
+msgstr ""
+
+#: /usr/lib/python3.5/getopt.py /usr/lib/python3.6/getopt.py
+#: /usr/lib/python3.7/getopt.py
+#, python-format
+msgid "option -%s requires argument"
+msgstr ""
+
+#: /usr/lib/python3.5/getopt.py /usr/lib/python3.6/getopt.py
+#: /usr/lib/python3.7/getopt.py
+#, python-format
+msgid "option --%s must not have an argument"
+msgstr ""
+
+#: /usr/lib/python3.5/getopt.py /usr/lib/python3.6/getopt.py
+#: /usr/lib/python3.7/getopt.py
+#, python-format
+msgid "option --%s not a unique prefix"
+msgstr ""
+
+#: /usr/lib/python3.5/getopt.py /usr/lib/python3.6/getopt.py
+#: /usr/lib/python3.7/getopt.py
+#, python-format
+msgid "option --%s not recognized"
+msgstr ""
+
+#: /usr/lib/python3.5/getopt.py /usr/lib/python3.6/getopt.py
+#: /usr/lib/python3.7/getopt.py
+#, python-format
+msgid "option --%s requires argument"
+msgstr ""
+
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
+msgid "optional arguments"
 msgstr ""
 
 #: ../fdroidserver/nightly.py
@@ -2377,7 +2415,8 @@ msgstr ""
 msgid "overwriting existing {path}"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "positional arguments"
 msgstr ""
 
@@ -2386,53 +2425,42 @@ msgstr ""
 msgid "process log deploy {path} to {dest} failed!"
 msgstr ""
 
-#: ../fdroidserver/build.py
-msgid "reference binary missing signature"
-msgstr ""
-
 #: ../fdroidserver/signatures.py
 #, python-brace-format
 msgid "refuse downloading via insecure HTTP connection (use HTTPS or specify --no-https-check): {apkfilename}"
 msgstr ""
 
+#: ../fdroidserver/signatures.py
+#, python-brace-format
+msgid "refuse downloading via insecure http connection (use https or specify --no-https-check): {apkfilename}"
+msgstr ""
+
 #: ../fdroidserver/index.py
 #, python-format
-msgid "repo_icon \"repo/icons/%s\" does not exist, generating placeholder."
+msgid "repo_icon %s does not exist, generating placeholder."
 msgstr ""
 
-#: ../fdroidserver/common.py
-msgid "repo_url needs to end with /repo"
+#: ../fdroidserver/metadata.py
+msgid "ruamel.yaml not installed, can not write metadata."
 msgstr ""
 
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "rsync is missing or broken: {error}"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "s3cmd sync indexes {path} to {url} and delete"
 msgstr ""
 
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "s3cmd syncs indexes from {path} to {url} and deletes removed"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "scanner cache is malformed! You can clear it with: '{clear}'"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "serverwebroot: path does not end with \"fdroid\", perhaps you meant one of these:"
-msgstr ""
-
 #: ../fdroidserver/scanner.py
 msgid "shared library"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "show program's version number and exit"
+msgstr ""
+
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.5/optparse.py
+#: /usr/lib/python3.6/argparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/argparse.py /usr/lib/python3.7/optparse.py
 msgid "show this help message and exit"
 msgstr ""
 
@@ -2461,31 +2489,31 @@ msgstr ""
 msgid "static library"
 msgstr ""
 
-#: ../fdroidserver/build.py
+#: ../fdroidserver/common.py
 #, python-brace-format
-msgid "supplied reference binary has allowed signer {signer}"
+msgid "supplied timestamp value '{timestamp}' is not a unix timestamp"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "the following arguments are required: %s"
 msgstr ""
 
-#: ../fdroidserver/install.py
-msgid "true"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "unexpected option string: %s"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "unknown parser %(parser_name)r (choices: %(choices)s)"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "unrecognized arguments: %s"
 msgstr ""
@@ -2495,11 +2523,16 @@ msgstr ""
 msgid "unsafe permissions on '{config_file}' (should be 0600)!"
 msgstr ""
 
-#: ../fdroidserver/__main__.py /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py ../fdroid
+#: /usr/lib/python3.7/argparse.py ../fdroidserver/__main__.py
 msgid "usage: "
 msgstr ""
 
-#: ../fdroidserver/deploy.py
+#: ../fdroid
+msgid "usage: fdroid [-h|--help|--version] <command> [<args>]"
+msgstr ""
+
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "using Apache libcloud to sync with {url}"
 msgstr ""
@@ -2508,8 +2541,8 @@ msgstr ""
 msgid "virustotal.com is rate limiting, waiting to retry..."
 msgstr ""
 
-#: ../fdroidserver/install.py
-msgid "yes"
+#: ../fdroidserver/update.py
+msgid "wiki support is deprecated and will be removed in the next release!"
 msgstr ""
 
 #: ../fdroidserver/publish.py
@@ -2524,19 +2557,31 @@ msgstr[1] ""
 msgid "{apkfilename} ({appid}) has no metadata!"
 msgstr ""
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
+#: ../fdroidserver/update.py
+#, python-brace-format
+msgid "{apkfilename} has multiple {name} files, looks like Master Key exploit!"
+msgstr ""
+
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "{apkfilename}'s AndroidManifest.xml has a bad date: "
 msgstr ""
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "{appid} does not have a name! Using application ID instead."
 msgstr ""
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
+#: ../fdroidserver/update.py
+#, python-brace-format
+msgid "{appid} does not have a name! Using package name instead."
+msgstr ""
+
+#: ../fdroidserver/update.py
+#, python-brace-format
+msgid "{appid} from {path} is not a valid Android Package Name!"
+msgstr ""
+
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "{appid} from {path} is not a valid Android application ID!"
@@ -2547,16 +2592,12 @@ msgstr ""
 msgid "{appid} from {path} is not a valid Java Package Name!"
 msgstr ""
 
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{appid} has both APKs and files: {files}"
-msgstr ""
-
 #: ../fdroidserver/mirror.py
 #, python-brace-format
 msgid "{appid} is missing {name}"
 msgstr ""
 
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "{appid}: Unknown extlib {path} in build '{versionName}'"
@@ -2584,7 +2625,7 @@ msgstr ""
 
 #: ../fdroidserver/metadata.py
 #, python-brace-format
-msgid "{build_flag} must be list or string, found: {value}"
+msgid "{field} not terminated in {name}"
 msgstr ""
 
 #: ../fdroidserver/metadata.py
@@ -2594,15 +2635,10 @@ msgstr ""
 
 #: ../fdroidserver/update.py
 #, python-brace-format
-msgid "{name} \"{section}/icons/{path}\" does not exist! Check \"config.yml\"."
+msgid "{name} \"{path}\" does not exist! Correct it in config.py."
 msgstr ""
 
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{path1} is a duplicate of {path2}, remove one!"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 #, python-brace-format
 msgid "{path} already exists, ignoring import results!"
 msgstr ""
@@ -2617,36 +2653,6 @@ msgstr ""
 msgid "{path} has bad file signature \"{pattern}\", possible Janus exploit!"
 msgstr ""
 
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "{path} has been flagged by virustotal {count} times:"
-msgstr ""
-
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "{path} has the wrong fingerprint ({fingerprint})!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "{path} is not \"key: value\" dict, but a {datatype}!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "{path} is not a standard config file!"
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "{path} is not list, but a {datatype}!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "{path} is not {expected_type}, but a {datatype}!"
-msgstr ""
-
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "{path} is zero size!"
@@ -2657,22 +2663,12 @@ msgstr ""
 msgid "{path} more than 200MB, manually upload: {url}"
 msgstr ""
 
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "{path}: \"{code}\" is not a valid ISO_3166-1 alpha-2 country code!"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{path}: {error}"
-msgstr ""
-
 #: ../fdroidserver/mirror.py
 #, python-brace-format
 msgid "{url} does not end with \"fdroid\", check the URL path!"
 msgstr ""
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/common.py
 #, python-brace-format
 msgid "{url} does not start with \"http\"!"
 msgstr ""
diff --git a/locale/nb_NO/LC_MESSAGES/fdroidserver.po b/locale/nb_NO/LC_MESSAGES/fdroidserver.po
index 8ba73029..d196989d 100644
--- a/locale/nb_NO/LC_MESSAGES/fdroidserver.po
+++ b/locale/nb_NO/LC_MESSAGES/fdroidserver.po
@@ -1,22 +1,40 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Free Software Foundation, Inc.
-# Allan Nordhøy <epost@anotheragency.no>, 2020, 2021, 2022.
-# Hans-Christoph Steiner <hans@guardianproject.info>, 2020, 2022.
-# mondstern <mondstern@snopyta.org>, 2021.
+# Allan Nordhøy <epost@anotheragency.no>, 2020.
+# Hans-Christoph Steiner <hans@guardianproject.info>, 2020.
 msgid ""
 msgstr ""
 "Project-Id-Version: fdroidserver 0.8-74-ga380b9f\n"
 "Report-Msgid-Bugs-To: https://gitlab.com/fdroid/fdroidserver/issues\n"
-"POT-Creation-Date: 2025-06-25 09:52+0200\n"
-"PO-Revision-Date: 2022-09-06 14:30+0000\n"
-"Last-Translator: Hans-Christoph Steiner <hans@guardianproject.info>\n"
+"POT-Creation-Date: 2020-10-21 18:05+0200\n"
+"PO-Revision-Date: 2020-10-14 09:28+0000\n"
+"Last-Translator: Allan Nordhøy <epost@anotheragency.no>\n"
 "Language-Team: Norwegian Bokmål <https://hosted.weblate.org/projects/f-droid/fdroidserver/nb_NO/>\n"
 "Language: nb_NO\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 4.14.1-dev\n"
+"X-Generator: Weblate 4.3-dev\n"
+
+#: ../fdroidserver/common.py
+msgid ""
+"\n"
+"        This is a repository of apps to be used with FDroid. Applications in this\n"
+"        repository are either official binaries built by the original application\n"
+"        developers, or are binaries built from source by f-droid.org using the\n"
+"        tools on https://gitlab.com/fdroid.\n"
+"        "
+msgstr ""
+
+#: ../fdroidserver/nightly.py
+#, fuzzy
+msgid ""
+"\n"
+"SSH Public Key to be used as Deploy Key:"
+msgstr ""
+"\n"
+"Offentlig SSH-nøkkel å bruke som utrullingsnøkkel:"
 
 #: ../fdroidserver/nightly.py
 #, fuzzy
@@ -41,26 +59,22 @@ msgstr ""
 msgid "\"%s/\" has no matching metadata file!"
 msgstr "\"%s/\" har ingen samsvarende metadatafil!"
 
-#: ../fdroidserver/index.py
-msgid "\"isPrimary\" key should not be added to mirrors!"
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, fuzzy, python-brace-format
-msgid "\"local_copy_dir\" {path} does not exist!"
-msgstr "Rotmappen for local_copy_dir \"{path}\" finnes ikke."
-
 #: ../fdroidserver/install.py
 #, fuzzy, python-brace-format
 msgid "\"{apkfilename}\" is already installed on {dev}."
 msgstr "'{apkfilename}' er allerede installert på {dev}."
 
+#: ../fdroidserver/update.py
+#, python-brace-format
+msgid "\"{path}\" contains outdated {name} ({version})"
+msgstr "\"{path}\" inneholder utdatert {name} ({version})"
+
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "\"{path}\" contains recent {name} ({version})"
 msgstr "\"{path}\" inneholder nylig {name} ({version})"
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "\"{path}\" exists but s3cmd is not installed!"
 msgstr "\"{path}\" finnes, men s3cmd er ikke installert!"
@@ -70,86 +84,120 @@ msgstr "\"{path}\" finnes, men s3cmd er ikke installert!"
 msgid "\"{path}\" is not a supported file format (use: metadata/*.yml)"
 msgstr "\"{path}\" er ikke et støttet filformat. (bruk: metadata/*.yml)"
 
-#: ../fdroidserver/update.py
+#: ../fdroidserver/metadata.py
 #, python-brace-format
-msgid "\"{path}\" is signed by a key that is not allowed:"
-msgstr ""
+msgid "\"{path}\" is not an accepted format, convert to: {formats}"
+msgstr "\"{path}\" er ikke et godtatt format, konverter til: {formats}"
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/common.py
 #, python-brace-format
 msgid "\"{url}\" is not a valid URL!"
 msgstr "\"{url}\" er ikke en gyldig nettadresse."
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, python-format
+msgid "%(option)s option requires %(number)d argument"
+msgid_plural "%(option)s option requires %(number)d arguments"
+msgstr[0] "%(option)s-valget krever %(number)d argument"
+msgstr[1] "%(option)s-valget krever %(number)d argumenter"
+
+#: ../fdroidserver/mirror.py
+#, python-format
+msgid "%(prog)s [options] url"
+msgstr "%(prog)s [valg] url"
+
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "%(prog)s: error: %(message)s\n"
 msgstr "%(prog)s: feil: %(message)s\n"
 
-#: ../fdroidserver/publish.py
-#, python-format
-msgid "%d APKs failed to be signed or verified!"
-msgstr ""
-
 #: ../fdroidserver/scanner.py
 #, python-format
 msgid "%d problems found"
 msgstr "%d problemer funnet"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "%prog [options]"
+msgstr "%prog [valg]"
+
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "%r is not callable"
 msgstr "%r kan ikke kalles"
 
-#: ../fdroidserver/signindex.py
-#, python-format
-msgid "%s did not produce a dict!"
-msgstr ""
-
-#: ../fdroidserver/signindex.py
-#, python-format
-msgid "%s has bad SHA-256: %s"
-msgstr ""
-
 #: ../fdroidserver/lint.py
 #, python-format
 msgid "%s is not an accepted build field"
 msgstr "%s er ikke et godtatt bygge-felt"
 
-#: ../fdroidserver/common.py
-msgid "'keypass' not found in config.yml!"
-msgstr "'keypass' ble ikke funnet i config.yml!"
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, python-format
+msgid "%s option does not take a value"
+msgstr "%s-valget tar ikke en verdi"
+
+#: ../fdroidserver/index.py ../fdroidserver/common.py
+msgid "'keypass' not found in config.py!"
+msgstr "'keypass' ble ikke funnet i config.py!"
 
 #: ../fdroidserver/common.py
 msgid "'keystore' is NONE and 'smartcardoptions' is blank!"
-msgstr "«keystore» er NONE og «smartcardoptions» er tom!"
+msgstr ""
 
-#: ../fdroidserver/common.py
-msgid "'keystore' not found in config.yml!"
-msgstr "'keystore' ble ikke funnet i config.yml!"
+#: ../fdroidserver/index.py ../fdroidserver/common.py
+msgid "'keystore' not found in config.py!"
+msgstr "'keystore' ble ikke funnet i config.py!"
 
-#: ../fdroidserver/common.py
-msgid "'keystorepass' not found in config.yml!"
-msgstr "'keystorepass' ble ikke funnet i config.yml!"
+#: ../fdroidserver/index.py ../fdroidserver/common.py
+msgid "'keystorepass' not found in config.py!"
+msgstr "'keystorepass' ble ikke funnet i config.py!"
 
-#: ../fdroidserver/common.py
-msgid "'repo_keyalias' not found in config.yml!"
-msgstr "'repo_keyalias' ble ikke funnet i config.yml!"
+#: ../fdroidserver/index.py ../fdroidserver/common.py
+msgid "'repo_keyalias' not found in config.py!"
+msgstr "'repo_keyalias' ble ikke funnet i config.py!"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, fuzzy
 msgid "'required' is an invalid argument for positionals"
 msgstr "'required' er et ugyldig argument for posisjonsinfo"
 
 #: ../fdroidserver/common.py
-#, fuzzy
-msgid "'sdk_path' not set in config.yml!"
-msgstr "'sdk_path' ble ikke funnet i config.yml!"
+msgid "'sdk_path' not set in 'config.py'!"
+msgstr "'sdk_path' ble ikke funnet i config.py!"
+
+#. Translators: "build-tools" is the file name of a package from
+#. Google, it is part of the Android SDK. So it probably shouldn't be
+#. translated or transliterated.
+#: ../fdroidserver/common.py
+#, fuzzy, python-brace-format
+msgid "'{aapt}' is too old, fdroid requires build-tools-23.0.0 or newer!"
+msgstr "'{aapt}' er for gammel, fdroid krever build-tools-23.0.0 eller nyere."
 
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "'{aapt}' is too old, fdroid requires build-tools-{version} or newer!"
 msgstr "'{aapt}' er for gammel, fdroid krever build-tools-{version} eller nyere."
 
+#: ../fdroidserver/install.py
+#, python-brace-format
+msgid "'{apkfilename}' is already installed on {dev}."
+msgstr "'{apkfilename}' er allerede installert på {dev}."
+
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "'{field}' in {linedesc} is obsolete, see docs for current fields:"
+msgstr "'{field}' i {linedesc} er foreldet, se dokumentasjon for gyldige felter:"
+
+#: ../fdroidserver/common.py
+#, python-brace-format
+msgid "'{field}' will be in random order! Use () or [] brackets if order is important!"
+msgstr "'{field}' vil bli utført i tilfeldig rekkefølge. Bruk () eller [] -parenteser hvis rekkefølgen er viktig."
+
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "'{path}' failed to execute!"
@@ -157,32 +205,23 @@ msgstr "\"{path}\" klarte ikke å kjøre."
 
 #: ../fdroidserver/metadata.py
 #, python-brace-format
-msgid "'{path}' has invalid format, it should be a dictionary!"
-msgstr ""
-
-#: ../fdroidserver/lint.py ../fdroidserver/metadata.py
-#, python-brace-format
 msgid "'{value}' is not a valid {field} in {appid}. Regex pattern: {pattern}"
 msgstr "\"{value}\" er ikke et gyldig {field} i {appid}. Mønster for regulært uttrykk: {pattern}"
 
-#: ../fdroidserver/metadata.py
-#, fuzzy, python-brace-format
-msgid "'{value}' is not a valid {field}, should be {pattern}"
-msgstr "\"{value}\" er ikke et gyldig {field} i {appid}. Mønster for regulært uttrykk: {pattern}"
-
-#: ../fdroidserver/checkupdates.py
-msgid "--merge-request only runs on a single appid!"
-msgstr ""
-
 #: ../fdroidserver/checkupdates.py
 #, fuzzy, python-brace-format
 msgid "...checkupdate failed for {appid} : {error}"
 msgstr "…oppdateringssjekk mislyktes for {appid}: {error}"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid ".__call__() not defined"
 msgstr ".__call__() udefinert"
 
+#: ../fdroidserver/metadata.py
+msgid ".fdroid.txt is not supported!  Convert to .fdroid.yml or .fdroid.json."
+msgstr ".fdroid.txt støttes ikke. Konverter til .fdroid.yml eller .fdroid.json."
+
 #: ../fdroidserver/lint.py
 msgid "/issues is missing"
 msgstr "/issues mangler"
@@ -192,15 +231,14 @@ msgstr "/issues mangler"
 msgid "A URL is required as an argument!"
 msgstr "valg -%s krever et argument"
 
-#: ../fdroidserver/common.py
-#, fuzzy, python-brace-format
-msgid "APK signatures have different certificates in {path}:"
-msgstr "Ingen signeringssertifikater funnet i {path}"
-
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Add PGP signatures using GnuPG for packages in repo"
 msgstr "Legg til PGP-signaturer for pakker i pakkebrønnen ved bruk av GnuPG"
 
+#: ../fdroid ../fdroidserver/__main__.py
+msgid "Add a new application from its source code"
+msgstr "Legg til et nytt program fra dets kildekode"
+
 #: ../fdroidserver/update.py
 msgid "Add a repo signing key to an unsigned repo"
 msgstr "Legg til pakkebrønnssigneringsnøkkel for usignert repo"
@@ -218,11 +256,7 @@ msgstr "Legger til ny pakkebrønn kun for {name}"
 msgid "Alias of the repo signing key in the keystore"
 msgstr "Alias for pakkebrønnssigneringsnøkkel i nøkkellageret"
 
-#: ../fdroidserver/build.py
-msgid "AllowedAPKSigningKeys missing but reference binary supplied"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "Allows a different revision (or git branch) to be specified for the initial import"
 msgstr "Tillater en annen revisjon (eller git-avgreining) å angis for igangsettende import"
 
@@ -247,10 +281,14 @@ msgstr "APK-fil for Android"
 msgid "Android DEX code"
 msgstr "Fant ingen Android-SDK."
 
-#: ../fdroidserver/init.py
+#: ../fdroidserver/common.py ../fdroidserver/build.py
 #, python-brace-format
-msgid "Android SDK not found at {path}!"
-msgstr "Fant ikke Android-SDK i {path}!"
+msgid "Android SDK '{path}' does not have '{dirname}' installed!"
+msgstr "Android-SDK '{path}' har ikke '{dirname}' installert."
+
+#: ../fdroidserver/common.py
+msgid "Android SDK not found!"
+msgstr "Fant ikke Android-SDK!"
 
 #: ../fdroidserver/common.py
 #, python-brace-format
@@ -262,28 +300,23 @@ msgstr "Sti for Android-SDK \"{path}\" finnes ikke."
 msgid "Android SDK path '{path}' is not a directory!"
 msgstr "Android SDK-stien '{path}' er ikke ei mappe."
 
+#. Translators: "build-tools" is the file name of a package from
+#. Google, it is part of the Android SDK. So it probably shouldn't be
+#. translated or transliterated.
 #: ../fdroidserver/common.py
-#, fuzzy, python-brace-format
-msgid "Android SDK tool {cmd} not found!"
-msgstr "Fant ikke Android-SDK-verktøyet {cmd}!"
+#, python-brace-format
+msgid "Android build-tools path '{path}' does not exist!"
+msgstr "Android build-tools -sti \"{path}\" finnes ikke."
 
-#: ../fdroidserver/lint.py
-msgid "App has Binaries but does not have corresponding AllowedAPKSigningKeys to pin certificate."
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "App has NoSourceSince or ArchivePolicy \"0 versions\" or 0 but AutoUpdateMode or UpdateCheckMode are not None"
-msgstr ""
+#: ../fdroidserver/update.py
+msgid "AndroidManifest.xml has no date"
+msgstr "AndroidManifest.xml mangler dato"
 
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "App is in '{repo}' but has a link to {url}"
 msgstr "Program finnes i '{repo}', men har en lenke til {url}"
 
-#: ../fdroidserver/lint.py
-msgid "App version has binary but does not have corresponding AllowedAPKSigningKeys to pin certificate."
-msgstr ""
-
 #: ../fdroidserver/lint.py
 msgid "Appending .git is not necessary"
 msgstr "Å legge til .git er ikke nødvendig"
@@ -293,27 +326,11 @@ msgstr "Å legge til .git er ikke nødvendig"
 msgid "Archiving {apkfilename} with invalid signature!"
 msgstr "Pakker {apkfilename} med ugyldig signatur."
 
-#: ../fdroidserver/lint.py
-msgid "AutoUpdateMode with UpdateCheckMode: HTTP must have a pattern."
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "Automatic no to all prompts."
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "Automatic yes to all prompts."
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "Bad entry type \"{mirrortype}\" in mirrors config: {mirror}"
-msgstr ""
-
 #: ../fdroidserver/mirror.py
 msgid "Base URL to mirror, can include the index signing key using the query string: ?fingerprint="
 msgstr "Grunnettadresse å speile, kan inkludere indekssigneringsnøkkelen ved bruk av spørreingsstrengen: ?fingerpring="
 
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "Branch '{branch}' used as commit in build '{versionName}'"
@@ -327,9 +344,9 @@ msgstr "Forgrening '{branch}' brukt som innsendelse i srclib '{srclib}'"
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Broken symlink: {path}"
-msgstr "Brutt symbolsk lenke: {path}"
+msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Build a package from source"
 msgstr "Bygg en pakke fra kildekode"
 
@@ -351,48 +368,57 @@ msgstr "Git-pakkebrønn for byggmetadata har uinnsendte endringer."
 msgid "Build only the latest version of each package"
 msgstr "Bygg kun seneste versjon av hver pakke"
 
+#: ../fdroidserver/metadata.py
+#, fuzzy, python-brace-format
+msgid "Build should have comma-separated versionName and versionCode, not \"{value}\", in {linedesc}"
+msgstr "Bygg skal ha kommainndelt versionName og versionCode, ikke \"{value}\", i {linedesc}"
+
 #: ../fdroidserver/init.py
 #, fuzzy, python-format
 msgid "Built repo based in \"%s\" with this config:"
 msgstr "Bygde pakkebrønn med base i \"%s\" med dette oppsettet:"
 
-#: ../fdroidserver/checkupdates.py
-msgid "Can't auto-update app with no CurrentVersionCode"
-msgstr "Kan ikke auto-uppgradere program som mangler «CurrentVersionCode»"
-
 #: ../fdroidserver/build.py
 msgid "Can't build due to {} error while scanning"
 msgid_plural "Can't build due to {} errors while scanning"
 msgstr[0] "Kan ikke bygge som følge av {} feil under skanning"
 msgstr[1] "Kan ikke bygge som følge av {} feiler under skanning"
 
-#: ../fdroidserver/common.py
+#: ../fdroidserver/vmtools.py
 #, fuzzy, python-brace-format
-msgid "Cannot read {path}: {error}"
-msgstr "Klarte ikke å lese {path}: {error}"
+msgid "Cannot read \"{path}\"!"
+msgstr "Kan ikke lese \"{path}\"."
+
+#. Translators: https://developer.android.com/studio/build/application-id
+#: ../fdroidserver/metadata.py
+#, fuzzy, python-brace-format
+msgid "Cannot resolve application ID {appid}"
+msgstr "Kan ikke fortolke program-ID {appid}"
 
 #: ../fdroidserver/rewritemeta.py
 #, fuzzy, python-brace-format
 msgid "Cannot rewrite \"{path}\""
 msgstr "Kan ikke lese \"{path}\"."
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
+#: ../fdroidserver/rewritemeta.py
+msgid "Cannot use --list and --to at the same time"
+msgstr "Kan ikke bruke --list og --to samtidig"
+
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Cannot write \"{path}\", not an accepted format, use: {formats}"
+msgstr "Kan ikke skrive \"{path}\", ikke et godkjent format, bruk: {formats}"
+
 #: ../fdroidserver/lint.py
 #, python-format
 msgid "Categories '%s' is not valid"
 msgstr "Kategorien '%s' er ikke gyldig"
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
 #: ../fdroidserver/lint.py
 msgid "Categories are not set"
 msgstr "Kategoreier ikke satt"
 
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "Category \"{category}\" defined but not used for any apps!"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Check for updates to applications"
 msgstr "Se etter programoppdateringer"
 
@@ -401,20 +427,28 @@ msgstr "Se etter programoppdateringer"
 msgid "Checking archiving for {appid} - apks:{integer}, keepversions:{keep}, archapks:{arch}"
 msgstr "Sjekker arkivering for {appid} - APK-er:{integer}, keepversions:{keep}, archapks:{arch}"
 
+#: ../fdroidserver/dscanner.py
+msgid "Clean after all scans have finished"
+msgstr "Rydd opp etter at alle skanninger er fullførte"
+
+#: ../fdroidserver/dscanner.py
+msgid "Clean before the scans start and rebuild the container"
+msgstr "Tøm før skanninger starter og bygg beholderen på ny"
+
+#: ../fdroidserver/dscanner.py
+msgid "Clean up all containers and then exit"
+msgstr "Tøm alle beholdere og avslutt"
+
 #: ../fdroidserver/update.py
 msgid "Clean update - don't uses caches, reprocess all APKs"
 msgstr "Ren oppdatering, ikke bruk hurtiglager, behandle alle APK-er på ny"
 
-#: ../fdroidserver/common.py
-msgid "Color the log output"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "Comma separated list of categories."
 msgstr "Kommainndelt liste over kategorier."
 
-#: ../fdroidserver/__main__.py
-#, python-format
+#: ../fdroid ../fdroidserver/__main__.py
+#, c-format, python-format
 msgid "Command '%s' not recognised.\n"
 msgstr "Kommandoen \"%s\" gjenkjennes ikke.\n"
 
@@ -422,15 +456,6 @@ msgstr "Kommandoen \"%s\" gjenkjennes ikke.\n"
 msgid "Commit changes"
 msgstr "Send inn endringer"
 
-#: ../fdroidserver/checkupdates.py
-msgid "Commit changes, push, then make a merge request"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Conflicting \"{field}\" definitions between .yml and localized files:"
-msgstr ""
-
 #: ../fdroidserver/__main__.py
 msgid "Conflicting arguments: '--verbose' and '--quiet' can not be specified at the same time."
 msgstr "Argumenter i konflikt: '--verbose' og '--quiet' kan ikke angis samtidig."
@@ -440,14 +465,12 @@ msgstr "Argumenter i konflikt: '--verbose' og '--quiet' kan ikke angis samtidig.
 msgid "Could not find '{command}' on your system"
 msgstr "Fant ikke \"{command}\" på ditt system"
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 #, fuzzy
 msgid "Could not find latest version code"
 msgstr "Fant ikke seneste versjonskode"
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 #, fuzzy
 msgid "Could not find latest version name"
 msgstr "Fant ikke seneste versjonsnavn"
@@ -458,27 +481,32 @@ msgid "Could not find {path} to remove it"
 msgstr "Fant ikke \"{path}\" for fjerning derav"
 
 #: ../fdroidserver/update.py
-#, fuzzy, python-brace-format
-msgid "Could not open APK {path} for analysis: "
-msgstr "Kunne ikke åpne APK {path} for analyse: "
+#, fuzzy
+msgid "Could not open apk file for analysis"
+msgstr "Kunne ikke åpne APK-fil for analyse"
 
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "Could not parse size \"{size}\", wrong type \"{type}\""
 msgstr "Kunne ikke fortolke størrelse \"{size}\", feil type \"{type}\""
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/import_subcommand.py
+#. Translators: https://developer.android.com/studio/build/application-id
+#: ../fdroidserver/import.py
 #, fuzzy
 msgid "Couldn't find Application ID"
 msgstr "Fant ikke pakke-ID"
 
-#: ../fdroidserver/checkupdates.py
-#, fuzzy
-msgid "Couldn't find any version information"
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
+#: ../fdroidserver/import.py
+msgid "Couldn't find latest version code"
+msgstr "Fant ikke seneste versjonskode"
+
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
+#: ../fdroidserver/import.py
+msgid "Couldn't find latest version name"
 msgstr "Fant ikke seneste versjonsnavn"
 
-#: ../fdroidserver/checkupdates.py
+#: ../fdroidserver/import.py
 msgid "Couldn't find package ID"
 msgstr "Fant ikke pakke-ID"
 
@@ -486,26 +514,29 @@ msgstr "Fant ikke pakke-ID"
 msgid "Cowardily refusing to overwrite existing signing key setup!"
 msgstr "Nekter feigt å overskrive eksisterende nøkkelsigneringsoppsett."
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/update.py
+msgid "Create a repo signing key in a keystore"
+msgstr "Opprett en nøkkelsigneringsnøkkel i et nøkkellager"
+
+#: ../fdroidserver/update.py
+msgid "Create skeleton metadata files that are missing"
+msgstr "Opprett skjelettmetadatafiler som mangler"
+
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Created new container \"{name}\""
 msgstr "Opprettet ny beholder \"{name}\""
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Creating \"{path}\" for configuring s3cmd."
 msgstr "Oppretter \"{path}\" for oppsett av s3cmd."
 
-#: ../fdroidserver/common.py
-#, fuzzy, python-brace-format
-msgid "Creating empty {config_file}"
-msgstr "Leser '{config_file}'"
-
 #: ../fdroidserver/publish.py
 msgid "Creating log directory"
 msgstr "Oppretter loggingsmappe"
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Creating new S3 bucket: {url}"
 msgstr "Oppretter ny S3-spann: {url}"
@@ -519,7 +550,8 @@ msgstr "Oppretter utdatamappe"
 msgid "Creating signed index with this key (SHA256):"
 msgstr "Oppretter signert indeks med denne nøkkelen (SHA-256):"
 
-#: ../fdroidserver/publish.py ../fdroidserver/verify.py
+#: ../fdroidserver/import.py ../fdroidserver/verify.py
+#: ../fdroidserver/publish.py
 msgid "Creating temporary directory"
 msgstr "Oppretter midlertidig mappe"
 
@@ -566,24 +598,19 @@ msgstr "Beskrivelsen \"%s\" er bare programsammendraget"
 msgid "Description has a duplicate line"
 msgstr "Beskrivelsen har repetert linje"
 
+#: ../fdroidserver/lint.py
+#, fuzzy, python-format
+msgid "Description has a list (%s) but it isn't bulleted (*) nor numbered (#)"
+msgstr "Beskrivelsen har en liste (%s), men er ikke punktvis (*) eller nummerert (#)"
+
 #: ../fdroidserver/lint.py
 #, fuzzy, python-brace-format
 msgid "Description of length {length} is over the {limit} char limit"
 msgstr "Beskrivelse av lengde {length} overstiger {limit} tegngrensen"
 
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Did you mean config/{name}.yml?"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Did you mean {code}?"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "Do not add 'disable:' to the generated build entries"
-msgstr "Ikke legg til «deaktivert:» blant genererte bygg"
+msgstr ""
 
 #: ../fdroidserver/nightly.py
 msgid "Do not deploy the new files to the repo"
@@ -607,23 +634,30 @@ msgstr "Ikke fjern de private nøklene generert fra nøkkellageret"
 msgid "Don't create a source tarball, useful when testing a build"
 msgstr "Ikke opprett en kildetjæreball, nyttig når et bygg skal testes"
 
+#: ../fdroidserver/stats.py
+#, fuzzy
+msgid "Don't do anything logs-related"
+msgstr "Ikke gjør noe relatert til logging"
+
 #: ../fdroidserver/build.py
 #, fuzzy
 msgid "Don't refresh the repository, useful when testing a build with no internet connection"
 msgstr "Ikke gjenoppfrisk pakkebrønnen, nyttig under testing av et bygg uten å ha internettilkobling"
 
 #: ../fdroidserver/deploy.py ../fdroidserver/nightly.py
+#: ../fdroidserver/upload.py
 msgid "Don't use rsync checksums"
 msgstr "Ikke bruk rsync-sjekksummer"
 
-#: ../fdroidserver/install.py
-msgid "Download F-Droid.apk using mirrors that leak less to the network"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Download complete mirrors of small repos"
 msgstr "Last ned fullstendige speilinger av små pakkebrønner"
 
+#: ../fdroidserver/stats.py
+#, fuzzy
+msgid "Download logs we don't have"
+msgstr "Last ned logger som ikke finnes lokalt"
+
 #: ../fdroidserver/common.py
 msgid "Downloading the repository already failed once, not trying again."
 msgstr "Nedlasting av pakkebrønn mislyktes én gang, prøver ikke igjen."
@@ -635,58 +669,40 @@ msgstr "Nedlasting av {url} mislyktes. {error}"
 
 #: ../fdroidserver/metadata.py
 #, python-brace-format
-msgid "Duplicate Anti-Feature declaration at {path} was ignored!"
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-format
-msgid "Duplicate entry \"%s\" in mirrors config!"
-msgstr ""
+msgid "Duplicate build recipe found for versionCode {versionCode} in {linedesc}"
+msgstr "Dobbeltbyggoppskrift funnet for versjonCode {versionCode} i {linedesc}."
 
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "Duplicate link in '{field}': {url}"
 msgstr "Dobbeltlenke i \"{field}\": {url}"
 
-#: ../fdroidserver/common.py
-#, python-format
-msgid "ERROR: %(message)s"
-msgstr ""
+#: ../fdroid
+msgid "Dynamically scan APKs post build"
+msgstr "Dynamisk skanne APKs postbygg"
 
 #: ../fdroidserver/__main__.py
-#, fuzzy
 msgid "ERROR: The \"server\" subcommand has been removed, use \"deploy\"!"
-msgstr "Feil: «server»-underkommandoen har blitt fjernet. Bruk «depoloy»."
+msgstr ""
+
+#: ../fdroidserver/mirror.py
+#, fuzzy
+msgid ""
+"ERROR: this command should never be used to mirror f-droid.org!\n"
+"A full mirror of f-droid.org requires more than 200GB."
+msgstr ""
+"Feil: Denne kommandoen bør aldri brukes til å speile f-droid.org.\n"
+"Et helt speil av f-droid.org krever mer enn 200GB."
 
 #: ../fdroidserver/nightly.py
 #, fuzzy
 msgid "ERROR: unsupported CI type, patches welcome!"
 msgstr "Feil: Ustøttet CI-type, feilrettinger er velkomne."
 
-#: ../fdroidserver/nightly.py
-#, python-format
-msgid "ERROR: unsupported git host \"%s\", patches welcome!"
-msgstr ""
-
-#: ../fdroidserver/lint.py
+#: ../fdroidserver/metadata.py
 #, python-brace-format
-msgid "ERROR: {key} in {path} is not \"archive\" or \"repo\"!"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "ERROR: {key} not a valid key!"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "ERROR: {key}'s value should be of type {t}!"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "ERROR: {key}:{subkey} in {path} is not in allowed keys: {allowed_keys}!"
-msgstr ""
+msgid "Empty build flag at {linedesc}"
+msgstr "Tomt byggflagg på {linedesc}"
 
 #: ../fdroidserver/__main__.py
 #, python-brace-format
@@ -702,41 +718,21 @@ msgstr ""
 "Skriv inn stien til Android SDK (%s) her:\n"
 "> "
 
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Environment variable {var} from {configname} is not set!"
-msgstr "Miljøvariabelen {var} fra {configname} er ikke satt!"
+#: ../fdroidserver/deploy.py ../fdroidserver/checkupdates.py
+#: ../fdroidserver/upload.py
+#, fuzzy, python-format
+msgid "Error while attempting to publish log: %s"
+msgstr "Kunne ikke offentliggjøre logg: %s"
 
-#: ../fdroidserver/common.py
-#, fuzzy, python-brace-format
-msgid "Environment variable {{env: {var}}} is not set!"
-msgstr "Miljøvariabelen {var} fra {configname} er ikke satt!"
-
-#: ../fdroidserver/deploy.py
-msgid "Error deploying 'github_releases', {} not present. (You might need to run `fdroid update` first.)"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py ../fdroidserver/common.py
 #, fuzzy
 msgid "Error while getting repo address"
 msgstr "Kunne ikke hente pakkebrønnsadresse"
 
-#: ../fdroidserver/scanner.py
-msgid "Exit with a non-zero code if problems were found"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Extract application metadata from a source repository"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Extract signatures from APKs"
 msgstr "Hent ut signaturer fra APK-er"
 
-#: ../fdroidserver/install.py
-msgid "F-Droid.apk could not be downloaded from any known source!"
-msgstr ""
-
 #: ../fdroidserver/update.py
 #, fuzzy, python-brace-format
 msgid "Failed copying {path}: {error}"
@@ -757,35 +753,45 @@ msgstr "Klarte ikke å lese {path}: {error}"
 msgid "Failed resizing {path}: {error}"
 msgstr "Klarte ikke å endre størrelse på {path}: {error}"
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/publish.py
+#, fuzzy
+msgid "Failed to align application"
+msgstr "Klarte ikke å justere program"
+
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Failed to create S3 bucket: {url}"
 msgstr "Klarte ikke å opprette S3-spann: {url}"
 
+#: ../fdroidserver/common.py
+#, fuzzy
+msgid "Failed to get APK manifest information"
+msgstr "Klarte ikke å hente APK-manifestinfo"
+
 #: ../fdroidserver/update.py
 #, fuzzy, python-brace-format
-msgid "Failed to get APK information, deleting {path}"
+msgid "Failed to get apk information, deleting {path}"
 msgstr "Klarte ikke å hente APK-info, sletter {path}"
 
 #: ../fdroidserver/update.py
 #, python-brace-format
-msgid "Failed to get APK information, skipping {path}"
+msgid "Failed to get apk information, skipping {path}"
 msgstr "Klarte ikke å hente APK-info, hopper over {path}"
 
-#: ../fdroidserver/update.py
-#, fuzzy
-msgid "Failed to get APK signing key fingerprint"
-msgstr "Klarte ikke å hente APK-manifestinfo"
-
 #: ../fdroidserver/install.py
 #, python-brace-format
 msgid "Failed to install '{apkfilename}' on {dev}: {error}"
 msgstr "Klarte ikke å installere '{apkfilename}' på {dev}: {error}"
 
-#: ../fdroidserver/common.py
+#: ../fdroidserver/publish.py ../fdroidserver/common.py
 msgid "Failed to sign application"
 msgstr "Klarte ikke å singere program"
 
+#: ../fdroidserver/common.py
+#, fuzzy
+msgid "Failed to zipalign application"
+msgstr "Klarte ikke å singere program"
+
 #: ../fdroidserver/build.py
 #, fuzzy, python-brace-format
 msgid "Fetched buildserverid from VM: {buildserverid}"
@@ -799,14 +805,24 @@ msgstr "Hentet signaturer for '{apkfilename}' → '{sigdir}'"
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "File disappeared while processing it: {path}"
-msgstr "En fil ble borte mens den ble behandlet: {path}"
+msgstr ""
 
-#: ../fdroidserver/build.py ../fdroidserver/install.py
-#: ../fdroidserver/rewritemeta.py ../fdroidserver/scanner.py
-#: ../fdroidserver/update.py
+#: ../fdroidserver/verify.py ../fdroidserver/stats.py ../fdroidserver/update.py
+#: ../fdroidserver/rewritemeta.py ../fdroidserver/build.py
+#: ../fdroidserver/checkupdates.py ../fdroidserver/scanner.py
+#: ../fdroidserver/install.py
 msgid "Finished"
 msgstr "Fullført"
 
+#: ../fdroidserver/lint.py
+msgid "Flattr donation methods belong in the FlattrID flag"
+msgstr "Flatter-donasjonsmetoder hører hjemme i FlattrID-flagget"
+
+#: ../fdroidserver/lint.py
+#, fuzzy
+msgid "Flattr donation methods belong in the FlattrID: field"
+msgstr "Flatter-donasjonsmetoder hører hjemme i FlattrID-flagget"
+
 #: ../fdroidserver/lint.py
 msgid "Forbidden HTML tags"
 msgstr "Forbudte HTML-tagger"
@@ -822,7 +838,7 @@ msgstr "Tving gjennom byggstans etter {0} sek. tidsavbrudd."
 
 #: ../fdroidserver/scanner.py
 msgid "Force scan of disabled apps and builds."
-msgstr "Påtving skanning av avskrudde programmer og bygg."
+msgstr ""
 
 #: ../fdroidserver/update.py
 #, fuzzy, python-brace-format
@@ -832,13 +848,14 @@ msgstr "Fant \"{path}\"-grafikk uten metadata for programmet \"{name}\"."
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Found bad funding file \"{path}\" for \"{name}\":"
-msgstr "Fant feilaktig kronerullingsfil «{path}» for «{name}»:"
+msgstr ""
 
 #: ../fdroidserver/common.py
 #, fuzzy
 msgid "Found invalid appids in arguments"
 msgstr "Fant ugyldige App-ID-er i argumenter"
 
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
 #: ../fdroidserver/common.py
 #, fuzzy
 msgid "Found invalid versionCodes for some apps"
@@ -849,11 +866,6 @@ msgstr "Noen programmer ble funnet å ha ugldige versionCodes"
 msgid "Found multiple JAR Signature Block Files in {path}"
 msgstr "Fant flere signeringssertifikater i {path}."
 
-#: ../fdroidserver/common.py
-#, fuzzy
-msgid "Found multiple Signer Certificates!"
-msgstr "Fant flere signeringssertifikater for pakkebrønn."
-
 #: ../fdroidserver/metadata.py
 #, python-brace-format
 msgid "Found multiple metadata files for {appid}"
@@ -863,6 +875,11 @@ msgstr "Fant flere metadatafiler for {appid}"
 msgid "Found multiple signing certificates for repository."
 msgstr "Fant flere signeringssertifikater for pakkebrønn."
 
+#: ../fdroidserver/update.py
+#, fuzzy, python-brace-format
+msgid "Found multiple signing certificates in {path}"
+msgstr "Fant flere signeringssertifikater i {path}."
+
 #: ../fdroidserver/index.py
 #, fuzzy
 msgid "Found no signing certificates for repository."
@@ -878,16 +895,6 @@ msgstr "Fant ikke-fil i %s"
 msgid "Found {apkfilename} at {url}"
 msgstr "Fant {apkfilename} i {url}"
 
-#: ../fdroidserver/scanner.py
-#, fuzzy, python-brace-format
-msgid "Found {count} problems in {filename}"
-msgstr "Skanner fant {count} problemer i {appid}:"
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Found {count} warnings in {filename}"
-msgstr ""
-
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Generated skeleton metadata for {appid}"
@@ -906,22 +913,20 @@ msgstr "Git-tømming mislyktes"
 msgid "Git fetch failed"
 msgstr "Git-innhenting mislyktes"
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
+#: ../fdroidserver/common.py
+#, fuzzy
+msgid "Git remote set-head failed"
+msgstr "Git set-head annensteds hen mislyktes"
+
 #: ../fdroidserver/common.py
 #, fuzzy, python-format
 msgid "Git remote set-head failed: \"%s\""
 msgstr "Git set-head annensteds hen mislyktes: «%s»"
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
 #: ../fdroidserver/common.py
 msgid "Git reset failed"
 msgstr "Git-tilbakestilling mislyktes"
 
-#: ../fdroidserver/common.py
-#, fuzzy
-msgid "Git submodule deinit failed"
-msgstr "Git-oppdatering av undermodul mislyktes"
-
 #: ../fdroidserver/common.py
 msgid "Git submodule sync failed"
 msgstr "Git-synkronisering av undermodul mislyktes"
@@ -935,35 +940,24 @@ msgid "HTTPS must be used with Subversion URLs!"
 msgstr "HTTPS må brukes sammen med Subversjon-nettadresser."
 
 #: ../fdroidserver/deploy.py
-#, fuzzy
 msgid "If a git mirror gets to big, allow the archive to be deleted"
-msgstr "Hvis en Git-avspeiling blir for stor, tillat sletting av arkivet"
+msgstr ""
 
 #: ../fdroidserver/deploy.py
 #, python-brace-format
 msgid "If this upload fails, try manually uploading to {url}"
-msgstr "Hvis opplasting mislykkes kan du prøve å laste opp manuelt til {url}"
+msgstr ""
 
 #: ../fdroidserver/metadata.py
 #, python-brace-format
 msgid "Ignoring '{field}' in '{metapath}' metadata because it is deprecated."
-msgstr "Ser bort fra «{field}» i «{metapath}» fordi det er er foreldet."
+msgstr ""
 
 #: ../fdroidserver/update.py
 #, python-format
 msgid "Ignoring FUNDING.yml entry longer than 2048: %s"
-msgstr "Ser bort fra FUNDING.yml-oppføring som er lengre enn 2048: %s"
-
-#: ../fdroidserver/update.py
-#, python-format
-msgid "Ignoring bad element in manifest: %s"
 msgstr ""
 
-#: ../fdroidserver/common.py
-#, fuzzy, python-brace-format
-msgid "Ignoring deprecated {oldfile}, use {newfile}!"
-msgstr "{oldfile} er avleggs, bruk {newfile}"
-
 #: ../fdroidserver/index.py
 msgid "Ignoring package without metadata: "
 msgstr "Ignorerte pakke uten metadata: "
@@ -973,32 +967,26 @@ msgstr "Ignorerte pakke uten metadata: "
 msgid "Ignoring stale cache data for {apkfilename}"
 msgstr "Ignorerer brakk hurtiglagringsdata for {apkfilename}."
 
+#: ../fdroidserver/rewritemeta.py
+#, fuzzy, python-brace-format
+msgid "Ignoring {ext} file at '{path}'"
+msgstr "Ignorerer {ext}-fil i \"{path}\""
+
 #: ../fdroidserver/update.py
 #, fuzzy
 msgid "Include APKs that are signed with disabled algorithms like MD5"
 msgstr "Inkluder APK-er som er signert med svartelistede algoritmer, som MD5"
 
 #: ../fdroidserver/mirror.py
-#, fuzzy
 msgid "Include the PGP signature .asc files in the mirror"
-msgstr "Inkluder .asc-filer for PGP-signaturen i avspeilingen"
+msgstr ""
 
 #: ../fdroidserver/mirror.py
 msgid "Include the build logs in the mirror"
-msgstr "Inkluder byggloggene i avspeilingen"
+msgstr ""
 
 #: ../fdroidserver/mirror.py
 msgid "Include the source tarballs in the mirror"
-msgstr "Inkluder kildetjæreballene i avspeilingen"
-
-#: ../fdroidserver/metadata.py
-#, python-format
-msgid "Including metadata from %s@%s"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Including metadata from {path}"
 msgstr ""
 
 #: ../fdroidserver/common.py
@@ -1010,7 +998,7 @@ msgstr "Igangsetter undermoduler"
 msgid "Install all signed applications available"
 msgstr "Installer alle tilgjengelige signerte programmer"
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Install built packages on devices"
 msgstr "Installer bygde pakker på enheter"
 
@@ -1019,12 +1007,22 @@ msgstr "Installer bygde pakker på enheter"
 msgid "Installing %s..."
 msgstr "Installerer %s…"
 
+#: ../fdroidserver/install.py
+#, python-format
+msgid "Installing %s…"
+msgstr "Installerer %s…"
+
 #: ../fdroidserver/install.py
 #, fuzzy, python-brace-format
 msgid "Installing '{apkfilename}' on {dev}..."
 msgstr "Installerer '{apkfilename}' på {dev}…"
 
-#: ../fdroidserver/__main__.py
+#: ../fdroidserver/install.py
+#, python-brace-format
+msgid "Installing '{apkfilename}' on {dev}…"
+msgstr "Installerer '{apkfilename}' på {dev}…"
+
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Interact with the repo HTTP server"
 msgstr "Interagere med repo HTTP-serveren"
 
@@ -1032,46 +1030,63 @@ msgstr "Interagere med repo HTTP-serveren"
 msgid "Invalid APK"
 msgstr "Ugyldig APK"
 
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "Invalid AutoUpdateMode: {mode}"
-msgstr "Ugyldig AutoUpdateMode: {mode}"
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "Invalid UpdateCheckMode: {mode}"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
+#: ../fdroidserver/lint.py ../fdroidserver/checkupdates.py
 #, python-brace-format
 msgid "Invalid VercodeOperation: {field}"
 msgstr "Ugyldig VercodeOperation: {field}"
 
-#: ../fdroidserver/lint.py
-#, fuzzy, python-brace-format
-msgid "Invalid VercodeOperation: {invalid_ops}"
-msgstr "Ugyldig VercodeOperation: {field}"
-
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "Invalid application ID {appid}"
 msgstr "Ugyldig program-ID {appid}"
 
+#: ../fdroidserver/metadata.py
+#, fuzzy, python-format
+msgid "Invalid boolean '%s'"
+msgstr "Ugyldig boolsk uttrykk \"%s\""
+
+#: ../fdroidserver/metadata.py
+#, fuzzy, python-brace-format
+msgid "Invalid build flag at {line} in {linedesc}"
+msgstr "Ugyldig byggflagg på {line} i {linedesc}"
+
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Invalid build format: {value} in {name}"
+msgstr "Ugyldig byggformat: {value} i {name}."
+
 #: ../fdroidserver/lint.py
 #, fuzzy
 msgid "Invalid bulleted list"
 msgstr "Ugyldig punktvis liste"
 
+#: ../fdroidserver/lint.py
+#, python-format
+msgid "Invalid license tag \"%s\"! Use only tags from https://spdx.org/license-list"
+msgstr "Ugyldig lisenstagg \"%s\". Kun bruk de som er å finne på https://spdx.org/license-list"
+
+#: ../fdroidserver/lint.py
+msgid "Invalid link - use [http://foo.bar Link title] or [http://foo.bar]"
+msgstr "Ugyldig lenke - bruk [http://foo.bar Lenketittel] eller [http://foo.bar]"
+
+#: ../fdroidserver/metadata.py
+#, python-format
+msgid "Invalid metadata in %s:%d"
+msgstr "Ugyldig metadata i %s:%d"
+
+#: ../fdroidserver/metadata.py
+msgid "Invalid metadata in: "
+msgstr "Ugyldig metadata i: "
+
 #: ../fdroidserver/common.py
 #, python-format
 msgid "Invalid name for published file: %s"
 msgstr "Ugyldig navn for publisert fil: %s"
 
 #: ../fdroidserver/common.py
-#, fuzzy, python-brace-format
-msgid "Invalid ndk: entry in build: \"{ndk}\""
-msgstr "Ugyldig NDK: oppføring i bygg: «{ndk}»"
+#, python-brace-format
+msgid "Invalid package name {0}"
+msgstr "Ugyldig pakkenavn {0}"
 
 #: ../fdroidserver/common.py
 #, fuzzy, python-brace-format
@@ -1086,12 +1101,17 @@ msgstr "Ugyldig scrlib-metadata: «{file}» finnes ikke"
 #: ../fdroidserver/metadata.py
 #, python-brace-format
 msgid "Invalid srclib metadata: could not parse '{file}'"
-msgstr "Ugyldig srclib-metadata: kunne ikke tolke «{file}»"
+msgstr ""
 
 #: ../fdroidserver/metadata.py
 #, python-brace-format
 msgid "Invalid srclib metadata: unknown key '{key}' in '{file}'"
-msgstr "Ugyldig srclib-metadata: ukjent nøkkel «{key}» i «{file}»"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+#, fuzzy, python-brace-format
+msgid "Invalid versionCode: \"{versionCode}\" is not an integer!"
+msgstr "Ugyldig versionCode: \"{versionCode}\" er ikke et heltall."
 
 #: ../fdroidserver/common.py
 #, fuzzy, python-brace-format
@@ -1107,8 +1127,8 @@ msgstr "JAR-signatur bekreftet: {path}"
 msgid "Java JAR file"
 msgstr "JAR-fil for Java"
 
-#: ../fdroidserver/mirror.py ../fdroidserver/publish.py
-#: ../fdroidserver/update.py
+#: ../fdroidserver/publish.py ../fdroidserver/update.py
+#: ../fdroidserver/mirror.py
 #, fuzzy
 msgid "Java JDK not found! Install in standard location or set java_paths!"
 msgstr "Fant ingen Java JDK. Installer på vanlig plass, eller sett java_paths."
@@ -1127,19 +1147,10 @@ msgstr "Fant ikke Java-jarsigner. Installer på vanlig plass, eller sett java_pa
 msgid "Javascript in HTML src attributes"
 msgstr "JavaScript i HTML -src-attributter"
 
-#: ../fdroidserver/build.py
-#, fuzzy, python-brace-format
-msgid "Keeping failed build \"{apkfilename}\""
-msgstr "Kunne ikke lese minSdkVersion: \"{apkfilename}\""
-
 #: ../fdroidserver/init.py
 msgid "Keystore for signing key:\t"
 msgstr "Nøkkellager for signeringsnøkkel:\t"
 
-#: ../fdroidserver/lint.py
-msgid "Known debug key is used in AllowedAPKSigningKeys: "
-msgstr ""
-
 #: ../fdroidserver/lint.py
 #, fuzzy, python-brace-format
 msgid "Last used commit '{commit}' looks like a tag, but UpdateCheckMode is '{ucm}'"
@@ -1150,9 +1161,12 @@ msgstr "Sist brukte innsendelse \"{commit}\" ser ut som en tagg, men oppdatering
 msgid "Liberapay donation methods belong in the Liberapay: field"
 msgstr "Flatter-donasjonsmetoder hører hjemme i FlattrID-flagget"
 
+#: ../fdroidserver/lint.py
+msgid "Liberapay donation methods belong in the LiberapayID flag"
+msgstr "Flatter-donasjonsmetoder hører hjemme i FlattrID-flagget"
+
 #: ../fdroidserver/rewritemeta.py
-#, fuzzy
-msgid "List files that would be reformatted (dry run)"
+msgid "List files that would be reformatted"
 msgstr "Liste over filer som ville blitt formatert"
 
 #: ../fdroidserver/lint.py
@@ -1173,16 +1187,6 @@ msgstr "Feilaktig innskrevne pakkebrønnsspeil."
 msgid "Malformed serverwebroot line:"
 msgstr "Feilaktig innskrevet serverwebroot-linje:"
 
-#: ../fdroidserver/scanner.py
-#, python-format
-msgid "Max recursion depth in ZIP file reached: %s"
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "Mirror config for {url} contains \"isPrimary\" key!"
-msgstr ""
-
 #: ../fdroidserver/mirror.py
 msgid "Mirror the full repo and archive, all file types."
 msgstr "Avspeil hele pakkebrønnen og arkivet, alle filtyper."
@@ -1191,30 +1195,31 @@ msgstr "Avspeil hele pakkebrønnen og arkivet, alle filtyper."
 msgid "Missing output directory"
 msgstr "Manglende utdatamappe"
 
-#: ../fdroidserver/metadata.py
-msgid "Moving Anti-Features declarations to localized files:"
-msgstr ""
-
-#: ../fdroidserver/index.py
-msgid "Neither \"repo_pubkey\" nor \"keystorepass\" set in config.yml"
-msgstr ""
-
-#: ../fdroidserver/verify.py
+#: ../fdroidserver/lint.py
 #, fuzzy, python-format
-msgid "No APK for package: %s"
-msgstr "Ingen slik pakke: %s"
+msgid "Name '%s' is just the auto name - remove it"
+msgstr "Navnet \"%s\" er kun det forvalgte navnet, fjern det."
+
+#: ../fdroidserver/common.py
+msgid "No 'config.py' found, using defaults."
+msgstr "Fant ingen 'config.py' , bruker forvalg."
 
 #: ../fdroidserver/common.py
 msgid "No Android SDK found!"
 msgstr "Fant ingen Android-SDK."
 
+#: ../fdroidserver/import.py
+msgid "No android or kivy project could be found. Specify --subdir?"
+msgstr "Fant inget Android- eller Kivy-prosjekt. Angi --subdir?"
+
 #: ../fdroidserver/install.py
 msgid "No attached devices found"
 msgstr "Fant ingen tilknyttede enheter"
 
-#: ../fdroidserver/install.py
-msgid "No devices found for `adb install`! Please plug one in."
-msgstr ""
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "No commit specified for {versionName} in {linedesc}"
+msgstr "Ingen innsendelse angitt for {versionName} i {linedesc}."
 
 #: ../fdroidserver/index.py
 msgid "No fingerprint in URL."
@@ -1225,25 +1230,15 @@ msgstr "Inget fingeravtrykk i nettadresse."
 msgid "No git submodules available"
 msgstr "Ingen Git-undermoduler tilgjengelige"
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 #, fuzzy
 msgid "No gradle project could be found. Specify --subdir?"
 msgstr "Fant inget Android- eller Kivy-prosjekt. Angi --subdir?"
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py ../fdroidserver/common.py
 msgid "No information found."
 msgstr "Ingen informasjon funnet."
 
-#: ../fdroidserver/checkupdates.py
-#, fuzzy
-msgid "No matching tags found"
-msgstr "Ingen informasjon funnet."
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "No minimum SDK version found in {0}, using default (3)."
-msgstr ""
-
 #: ../fdroidserver/lint.py
 msgid "No need to specify that the app is Free Software"
 msgstr "Inget behov for å spesifisere at programmet er fri programvare"
@@ -1253,8 +1248,8 @@ msgid "No need to specify that the app is for Android"
 msgstr "Inget behov for å spesifisere at programmet er for Android"
 
 #: ../fdroidserver/deploy.py
-msgid "No option set! Edit your config.yml to set at least one of these:"
-msgstr "Inget valg satt. Rediger din config.yml og sett minst én av disse:"
+msgid "No option set! Edit your config.py to set at least one of these:"
+msgstr "Inget valg satt. Rediger din config.py og sett minst én av disse:"
 
 #: ../fdroidserver/common.py
 msgid "No packages specified"
@@ -1262,14 +1257,14 @@ msgstr "Ingen pakker angitt"
 
 #: ../fdroidserver/install.py
 #, fuzzy, python-format
-msgid "No signed APK available for %s"
+msgid "No signed apk available for %s"
 msgstr "Ingen signert APK tilgjengelig for %s"
 
 #: ../fdroidserver/install.py
 msgid "No signed output directory - nothing to do"
 msgstr "Ingen signert utdatamappe - ingenting å gjøre"
 
-#: ../fdroidserver/common.py
+#: ../fdroidserver/update.py ../fdroidserver/common.py
 #, python-brace-format
 msgid "No signing certificates found in {path}"
 msgstr "Ingen signeringssertifikater funnet i {path}"
@@ -1279,28 +1274,19 @@ msgstr "Ingen signeringssertifikater funnet i {path}"
 msgid "No such package: %s"
 msgstr "Ingen slik pakke: %s"
 
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "No such versionCode {versionCode} for app {appid}"
 msgstr "Ingen slik versionCode {versionCode} for programmet {appid}"
 
-#: ../fdroidserver/checkupdates.py
-#, fuzzy
-msgid "No tags found"
-msgstr "Fant ingen tilknyttede enheter"
-
-#: ../fdroidserver/publish.py ../fdroidserver/verify.py
+#: ../fdroidserver/verify.py ../fdroidserver/publish.py
 msgid "No unsigned directory - nothing to do"
 msgstr "Ingen usignert mappe - ingenting å gjøre"
 
-#: ../fdroidserver/__main__.py
-#, fuzzy
-msgid "No version information could be found."
-msgstr "ingen versjonsinfo funnet!"
-
 #: ../fdroidserver/common.py
 msgid "Not a valid size definition: \"{}\""
-msgstr "Ikke en gyldig størrelsesdefinisjon: «{}»"
+msgstr ""
 
 #: ../fdroidserver/signindex.py
 msgid "Nothing to do"
@@ -1312,10 +1298,10 @@ msgid "Nothing to do for {appid}."
 msgstr "Ingenting å gjøre for {appid}."
 
 #: ../fdroidserver/init.py
-#, fuzzy
-msgid "Now set these in config.yml:"
-msgstr "Nå må du sette disse i config.yml:"
+msgid "Now set these in config.py:"
+msgstr ""
 
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
 #: ../fdroidserver/update.py
 #, fuzzy, python-brace-format
 msgid "OBB file has newer versionCode({integer}) than any APK:"
@@ -1330,32 +1316,27 @@ msgid "OBB's packagename does not match a supported APK:"
 msgstr "OBB-pakkenavn samsvarer ikke med noen støttet APK:"
 
 #: ../fdroidserver/deploy.py
-#, fuzzy
 msgid "Offline machine, skipping git mirror generation until `fdroid deploy`"
-msgstr "Frakoblet maskin. Hopper over Git-avspeilingsgenerering til «fdroid deploy»"
-
-#: ../fdroidserver/deploy.py
-msgid "One of the 'github_releases' config items is missing the 'packageNames' value. skipping ..."
 msgstr ""
 
-#: ../fdroidserver/deploy.py
-msgid "One of the 'github_releases' config items is missing the 'projectUrl' value. skipping ..."
-msgstr ""
+#: ../fdroidserver/common.py
+#, fuzzy, python-brace-format
+msgid "Old APK signature failed to verify: {path}"
+msgstr "Klarte ikke å bekrefte foreldet APK-signatur: {path}"
 
-#: ../fdroidserver/deploy.py
-msgid "One of the 'github_releases' config items is missing the 'token' value. skipping ..."
-msgstr ""
+#: ../fdroid ../fdroidserver/__main__.py
+#, fuzzy
+msgid "Old, deprecated name for fdroid deploy"
+msgstr "Gammelt, foreldet navn for fdroid-innsendelse"
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Only PNG and JPEG are supported for graphics, found: {path}"
 msgstr "Kun PNG og JPEG støttes for grafikk, fant: {path}"
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/common.py
-msgid "Only accepts a single key \"env\""
-msgstr ""
+#: ../fdroidserver/checkupdates.py
+msgid "Only print differences with the Play Store"
+msgstr "Kun skriv ut forskjeller vis-a-vis Play-butikken"
 
 #: ../fdroidserver/checkupdates.py
 #, fuzzy
@@ -1367,6 +1348,11 @@ msgstr "Behandle kun programmer som har auto-oppdateringer"
 msgid "OpenCollective donation methods belong in the OpenCollective: field"
 msgstr "Flatter-donasjonsmetoder hører hjemme i FlattrID-flagget"
 
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "Options"
+msgstr "Valg"
+
 #: ../fdroidserver/verify.py
 msgid "Output JSON report to file named after APK."
 msgstr "Skriv ut JSON-rapport til fil navngitt etter APK-en."
@@ -1375,26 +1361,29 @@ msgstr "Skriv ut JSON-rapport til fil navngitt etter APK-en."
 msgid "Output JSON to stdout."
 msgstr "Send utdata-JSON til stdout."
 
-#: ../fdroidserver/checkupdates.py ../fdroidserver/gpgsign.py
-#: ../fdroidserver/publish.py ../fdroidserver/signindex.py
-#: ../fdroidserver/update.py
-#, fuzzy
+#: ../fdroidserver/gpgsign.py ../fdroidserver/publish.py
+#: ../fdroidserver/update.py ../fdroidserver/signindex.py
+#: ../fdroidserver/checkupdates.py
 msgid "Outputting JSON"
-msgstr "Produserer JSON"
+msgstr ""
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "Overall license of the project."
 msgstr "Overnevnt lisens for prosjektet."
 
+#: ../fdroidserver/dscanner.py
+msgid "Override path for repo APKs (default: ./repo)"
+msgstr "Overskriv sti for pakkebrønns-APK-er (forvalg: ./repo)"
+
 #: ../fdroidserver/index.py
 #, python-brace-format
 msgid "Overriding blank versionName in {apkfilename} from metadata: {version}"
 msgstr "Overskriver blank versionName i {apkfilename} fra metadata: {version}."
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 #, python-brace-format
 msgid "Package \"{appid}\" already exists"
-msgstr "Pakken «{appid}» finnes allerede"
+msgstr ""
 
 #: ../fdroidserver/common.py
 #, fuzzy, python-brace-format
@@ -1405,11 +1394,15 @@ msgstr "Tolker manifest i \"{path}\"."
 msgid "Password required with username"
 msgstr "Passord påkrevd med brukernavn"
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 #, fuzzy
 msgid "Path to main Android project subdirectory, if not in root."
 msgstr "Sti til hovedundermappe for Androidprosjekt, hvis ikke i rot."
 
+#, fuzzy
+msgid "Path to main android project subdirectory, if not in root."
+msgstr "Sti til undermappe for hoved-Androidprosjekt, hvis ikke i rot."
+
 #: ../fdroidserver/init.py
 msgid "Path to the Android SDK (sometimes set in ANDROID_HOME)"
 msgstr "Sti til Android-SDK-en (noen ganger satt i ANDROID_HOME)"
@@ -1423,20 +1416,22 @@ msgstr "Sti til Git-pakkebrønn å bruke som logg"
 msgid "Path to the keystore for the repo signing key"
 msgstr "Sti til nøkkellager for pakkebrønnssigneringsnøkkel"
 
+#: ../fdroidserver/dscanner.py
+msgid "Prepare Drozer to run a scan"
+msgstr "Forbered Drozer på kjøring av skanning"
+
+msgid "Prepare drozer to run a scan"
+msgstr "Forbered Drozer på kjøring av skanning"
+
 #: ../fdroidserver/nightly.py
 #, fuzzy
 msgid "Print the secret variable to the terminal for easy copy/paste"
 msgstr "Skriv den hemmelige variabelen til terminalen for enkel kopiering/innliming."
 
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "Privacy mode was enabled based on your locale ({country_code})."
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-format
-msgid "Problem with ZIP file: %s, error %s"
-msgstr ""
+#: ../fdroidserver/metadata.py
+#, fuzzy, python-brace-format
+msgid "Problem with description of {appid}: {error}"
+msgstr "Problem med beskrivelse av {appid}: {error}"
 
 #: ../fdroidserver/common.py
 #, fuzzy, python-brace-format
@@ -1461,7 +1456,11 @@ msgstr "Behandler {appid}"
 msgid "Produce human-readable XML/JSON for index files"
 msgstr "Produser menneskelig lesbar XML/JSON for indeksfiler"
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/update.py
+msgid "Produce human-readable index.xml"
+msgstr "Produser menneskelig lesbar index.xml"
+
+#: ../fdroidserver/import.py
 msgid "Project URL to import from."
 msgstr "Prosjektnettadresse å importere fra."
 
@@ -1473,26 +1472,21 @@ msgstr "Tegnsetting bør unngås"
 msgid "Push the log to this git remote repository"
 msgstr "Dytt loggen til denne Git-pakkebrønnen annensteds hen"
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Pushing binary transparency log to {url}"
 msgstr "Dytter binærgjennomsiktighetslogg til {url}."
 
-#: ../fdroidserver/deploy.py
-#, fuzzy
-msgid "Pushing to remote server failed!"
-msgstr "Git set-head annensteds hen mislyktes: «%s»"
-
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Pushing to {url}"
 msgstr "Dytter til {url}."
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Quickly start a new repository"
 msgstr "Raskt starte et nytt lager"
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Read all the metadata files and exit"
 msgstr "Les alle metadatafilene og avslutt"
 
@@ -1501,51 +1495,44 @@ msgstr "Les alle metadatafilene og avslutt"
 msgid "Reading '{config_file}'"
 msgstr "Leser '{config_file}'"
 
+#: ../fdroidserver/common.py
+#, fuzzy, python-brace-format
+msgid "Reading minSdkVersion failed: \"{apkfilename}\""
+msgstr "Kunne ikke lese minSdkVersion: \"{apkfilename}\""
+
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
+#. https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "Reading packageName/versionCode/versionName failed, APK invalid: '{apkfilename}'"
 msgstr "Kunne ikke lese packageName/versionCode/versionName, APK ugyldig: \"{apkfilename}\""
 
-#: ../fdroidserver/common.py
-#, fuzzy, python-brace-format
-msgid "Reading packageName/versionCode/versionName failed,APK invalid: '{apkfilename}'"
-msgstr "Kunne ikke lese packageName/versionCode/versionName, APK ugyldig: \"{apkfilename}\""
-
 #: ../fdroidserver/update.py
 #, fuzzy, python-brace-format
 msgid "Reading {apkfilename} from cache"
 msgstr "Behandler {apkfilename}"
 
-#: ../fdroidserver/build.py
-msgid "Refresh and cache scanner rules and signatures from the network"
-msgstr ""
-
-#: ../fdroidserver/publish.py
-#, python-brace-format
-msgid "Refusing to sign '{path}', file exists in both {dir1} and {dir2} folder."
-msgstr ""
-
-#: ../fdroidserver/verify.py
-msgid "Remove source tarball and any APKs if successfully verified."
-msgstr ""
+#: ../fdroidserver/stats.py
+#, fuzzy
+msgid "Recalculate aggregate stats - use when changes have been made that would invalidate old cached data."
+msgstr "Rekalkuler resultatmengdestatistikk - bruk når endringer har blitt gjort som ville ha gjort gammel hurtiglagringsdata ugyldig."
 
 #: ../fdroidserver/common.py
 msgid "Removing specified files"
 msgstr "Fjerner angitte filer"
 
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Removing {path}\""
-msgstr "Fjerner {path}\""
-
 #: ../fdroidserver/update.py
 msgid "Rename APK files that do not match package.name_123.apk"
 msgstr "Gi nytt navn til APK-filer som ikke samsvarer med package.name_123.apk"
 
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "RepoType {type} is deprecated, please switch to git."
-msgstr ""
+#: ../fdroidserver/update.py
+msgid "Report on build data status"
+msgstr "Rapporter byggdatastatus"
+
+#: ../fdroidserver/build.py
+#, fuzzy
+msgid "Reset and create a brand new build server, even if the existing one appears to be ok."
+msgstr "Tilbakestill og opprett en helt ny byggtjener, selv når den eksisterende later til å være i orden."
 
 #: ../fdroidserver/nightly.py
 #, python-brace-format
@@ -1561,34 +1548,33 @@ msgstr "Endre størrelse på alle ikoner som overstiger maksimal pikselantall og
 msgid "Restrict output to warnings and errors"
 msgstr "Begrens utdata til advarsler og feil"
 
-#: ../fdroidserver/net.py
-#, python-format
-msgid "Retrying failed download: %s"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Rewrite all the metadata files"
 msgstr "Skriv om alle metadatafilene"
 
+#: ../fdroidserver/rewritemeta.py
+msgid "Rewrite to a specific format: "
+msgstr "Skriv om til et spesifikt format: "
+
 #: ../fdroidserver/rewritemeta.py
 #, fuzzy, python-brace-format
 msgid "Rewriting '{appid}'"
 msgstr "Skriver om \"{appid}\""
 
+#: ../fdroidserver/rewritemeta.py
+#, python-brace-format
+msgid "Rewriting '{appid}' to '{path}'"
+msgstr "Skriver om \"{appid}\" til \"{path}\""
+
 #: ../fdroidserver/checkupdates.py
 msgid "Run on git repo that has uncommitted changes"
 msgstr "Kjør på Git-pakkebrønn som har uinnsendte endringer"
 
-#: ../fdroidserver/nightly.py
-#, python-brace-format
-msgid "Run over {cibase} to find -debug.apk. and skip repo_basedir {repo_basedir}"
-msgstr ""
-
 #: ../fdroidserver/lint.py
 msgid "Run rewritemeta to fix formatting"
 msgstr "Kjør rewritemetadata for å fikse formatering"
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, fuzzy
 msgid "Running first pass with MD5 checking disabled"
 msgstr "Kjører første passering med MD5-sjekking avskrudd"
@@ -1598,24 +1584,18 @@ msgstr "Kjører første passering med MD5-sjekking avskrudd"
 msgid "Running wget in {path}"
 msgstr "Kjører wget i {path}."
 
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "SHA-256 of {url} does not match entry!"
-msgstr ""
+#: ../fdroidserver/dscanner.py
+msgid "Scan only the latest version of each package"
+msgstr "Skann kun siste versjon av hver pakke"
 
 #: ../fdroidserver/build.py
 msgid "Scan the resulting APK(s) for known non-free classes."
-msgstr "Skann resulterende APK(er) for kjente ufrie klasser."
+msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Scan the source code of a package"
 msgstr "Skann kildekoden til en pakke"
 
-#: ../fdroidserver/scanner.py
-#, fuzzy, python-brace-format
-msgid "Scanner found {count} problems in {apk}"
-msgstr "Skanner fant {count} problemer i {appid}:"
-
 #: ../fdroidserver/scanner.py
 #, fuzzy, python-brace-format
 msgid "Scanner found {count} problems in {appid}:"
@@ -1632,20 +1612,6 @@ msgid_plural "Scanner found {} problems"
 msgstr[0] "Skanner fant {} problem"
 msgstr[1] "Skanner fant {} problemer"
 
-#: ../fdroidserver/scanner.py
-msgid "Scanning APK for extra signing blocks."
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, fuzzy
-msgid "Scanning APK with dexdump for known non-free classes."
-msgstr "Skanner APK med APK Analyzer for kjente ikke-frie klasser."
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Set NDK {release} ({version}) up"
-msgstr ""
-
 #: ../fdroidserver/common.py
 msgid "Set clock to that time using:"
 msgstr "Sett klokke til sådan tid ved bruk av:"
@@ -1659,7 +1625,7 @@ msgstr ""
 msgid "Set open file limit to {integer}"
 msgstr "Sett åpen filgrense til {integer}"
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Set up an app build for a nightly build repo"
 msgstr "Sett opp programbygging for nattlig byggingspakkebrønn."
 
@@ -1673,11 +1639,20 @@ msgstr "Kunne ikke sette åpen filgrense: "
 msgid "Setting {0} sec timeout for this build"
 msgstr "Setter {0} sek. tidsavbrudd for dette bygget"
 
-#: ../fdroidserver/__main__.py
+#: ../fdroidserver/build.py
+#, fuzzy
+msgid "Setup an emulator, install the APK on it and perform a Drozer scan"
+msgstr "Sett opp en emulator, installer APK-en på den og utfør en Drozer-skanning"
+
+#, fuzzy
+msgid "Setup an emulator, install the apk on it and perform a drozer scan"
+msgstr "Sett opp en emulator, installer APK-en på den og utfør en Drozer-skanning"
+
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Sign and place packages in the repo"
 msgstr "Logg inn og legg til pakker i pakkebrønnen"
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Sign indexes created using update --nosign"
 msgstr "Signer indekser ved bruk av update --nosign"
 
@@ -1690,11 +1665,6 @@ msgstr "Hopp over skanning av kildekoden for binærfiler og andre problemer"
 msgid "Skipping '{apkfilename}' with invalid signature!"
 msgstr "Hopper over '{apkfilename}' med ugyldig signatur."
 
-#: ../fdroidserver/deploy.py ../fdroidserver/index.py
-#, fuzzy, python-format
-msgid "Skipping GitLab Pages mirror because the repo is too large (>%.2fGB)!"
-msgstr "Hopper over GitLab Pages-avspeiling fordi kodelageret er for stort (>%.2f GB)!"
-
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Skipping index generation for {appid}"
@@ -1710,15 +1680,24 @@ msgstr "Hopper over {apkfilename} med ugyldig signatur."
 msgid "Skipping {appid}: disabled"
 msgstr "Hopper over {appid}: Avskrudd"
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/scanner.py
+#, python-brace-format
+msgid "Skipping {appid}: no builds specified"
+msgstr "Hopper over {appid}: Ingen bygg angitt"
+
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 msgid "Specify a local folder to sync the repo to"
 msgstr "Angi ei lokal mappe å synkronisere pakkebrønnen til"
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, fuzzy
 msgid "Specify an identity file to provide to SSH for rsyncing"
 msgstr "Angi ei identitetsfil å tilby til SSH for rsync-ing"
 
+#: ../fdroidserver/build.py
+msgid "Specify that we're running on the build server"
+msgstr "Angi at kjøring utføres på byggtjeneren"
+
 #: ../fdroidserver/nightly.py
 msgid "Specify which debug keystore file to use."
 msgstr "Angi hvilken feilrettingsnøkkellagersfil som skal brukes."
@@ -1728,6 +1707,11 @@ msgstr "Angi hvilken feilrettingsnøkkellagersfil som skal brukes."
 msgid "Spew out even more information than normal"
 msgstr "Gulp opp enda mer info enn normalt"
 
+#: ../fdroidserver/nightly.py
+#, python-brace-format
+msgid "Striping mystery signature from {apkfilename}"
+msgstr "Stripper mystisk signatur fra {apkfilename}"
+
 #: ../fdroidserver/nightly.py
 #, fuzzy, python-brace-format
 msgid "Stripping mystery signature from {apkfilename}"
@@ -1748,22 +1732,10 @@ msgstr "Sammendrag av lengde {length} overstiger {limit} tegngrensen"
 msgid "System clock is older than date in {path}!"
 msgstr "Systemklokka er eldre enn datoen i {path}."
 
-#: ../fdroidserver/checkupdates.py
-msgid "Tags update mode only works for git, hg, bzr and git-svn repositories currently"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "Tags update mode used in git-svn, but the repo was not set up with tags"
-msgstr ""
-
 #: ../fdroidserver/build.py
 msgid "Test mode - put output in the tmp directory only, and always build, even if the output already exists."
 msgstr "Testmodus - putt utdata kun i tmp-mappe, og alltid bygg, selv når utdataen finnes allerede."
 
-#: ../fdroidserver/index.py
-msgid "The \"qrcode\" Python package is not installed (e.g. apt-get install python3-qrcode)!"
-msgstr ""
-
 #. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
 #: ../fdroidserver/update.py
 #, python-brace-format
@@ -1782,10 +1754,20 @@ msgstr "Mappen å skrive speilet til"
 msgid "The file to be included in the repo (path or glob)"
 msgstr "Filen å inkludere i pakkebrønnen (sti eller glob)."
 
+#: ../fdroidserver/deploy.py
+#, fuzzy
+msgid "The only commands currently supported are 'init' and 'update'"
+msgstr "De eneste kommandoene som støttes foreløpig er \"init\" og \"update\"."
+
 #: ../fdroidserver/index.py
 msgid "The repository's fingerprint does not match."
 msgstr "Pakkebrønnens fingeravtrykk samsvarer ikke."
 
+#: ../fdroidserver/common.py
+#, fuzzy
+msgid "The repository's index could not be verified."
+msgstr "Kunne ikke bekrefte pakkebrønnens indeks."
+
 #: ../fdroidserver/deploy.py
 #, fuzzy, python-brace-format
 msgid "The root dir for local_copy_dir \"{path}\" does not exist!"
@@ -1799,43 +1781,15 @@ msgstr "Nøkkelaliaskollisjon - offentliggjøring stanset"
 msgid "These are the apps that have been archived from the main repo."
 msgstr ""
 
-#: ../fdroidserver/mirror.py
-#, fuzzy
-msgid "This command should never be used to mirror f-droid.org! A full copy requires more than 600GB."
-msgstr ""
-"Feil: Denne kommandoen bør aldri brukes til å speile f-droid.org.\n"
-"Et helt speil av f-droid.org krever mer enn 200GB."
-
-#: ../fdroidserver/common.py
-msgid "This is a repository of apps to be used with F-Droid. Applications in this repository are either official binaries built by the original application developers, or are binaries built from source by the admin of f-droid.org using the tools on https://gitlab.com/fdroid."
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 #, python-format
 msgid "This repo already has local metadata: %s"
 msgstr "Denne pakkebrønnen har allerede lokal metadata: %s"
 
-#: ../fdroidserver/init.py
-#, python-format
-msgid ""
-"To complete the setup, add your APKs to \"%s\"\n"
-"then run \"fdroid update -c; fdroid update\".  You might also want to edit\n"
-"\"config.yml\" to set the URL, repo name, and more.  You should also set up\n"
-"a signing key (a temporary one might have been automatically generated).\n"
-"\n"
-"For more info: https://f-droid.org/docs/Setup_an_F-Droid_App_Repo\n"
-"and https://f-droid.org/docs/Signing_Process"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, fuzzy
-msgid "To use awsbucket, awssecretkey and awsaccesskeyid must also be set in config.yml!"
-msgstr "For å bruke AWS-spann, må \"awssecretkey\" og \"awsaccesskeyid\" også være satt i config.yml."
-
-#: ../fdroidserver/deploy.py
-#, fuzzy
-msgid "To use rclone, rclone_config and awsbucket must be set in config.yml!"
-msgstr "For å bruke AWS-spann, må \"awssecretkey\" og \"awsaccesskeyid\" også være satt i config.yml."
+msgid "To use awsbucket, awssecretkey and awsaccesskeyid must also be set in config.py!"
+msgstr "For å bruke AWS-spann, må \"awssecretkey\" og \"awsaccesskeyid\" også være satt i config.py."
 
 #: ../fdroidserver/lint.py
 msgid "URL must start with https:// or http://"
@@ -1846,6 +1800,10 @@ msgstr "Nettadressen må starte med https:// eller http://"
 msgid "URL shorteners should not be used"
 msgstr "Nettadresseforkortere skal ikke brukes"
 
+#: ../fdroidserver/metadata.py
+msgid "URL title is just the URL, use brackets: [URL]"
+msgstr "Nettadressetittel er kun nettadressen, bruk hakeparenteser: [Nettadresse]"
+
 #: ../fdroidserver/lint.py
 #, fuzzy, python-brace-format
 msgid "URL {url} in Description: {error}"
@@ -1860,15 +1818,16 @@ msgstr "Ugyldig lisenstagg \"%s\". Kun bruk de som er å finne på https://spdx.
 msgid "Unexpected license tag \"{}\"! Only use license tags configured in your config file"
 msgstr ""
 
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Unknown entry {key} in {configname}"
-msgstr ""
+#: ../fdroidserver/metadata.py
+#, fuzzy, python-brace-format
+msgid "Unexpected text on same line as {field} in {linedesc}"
+msgstr "Uventet tekst på samme linje som {field} i {linedesc}."
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Unknown exception found!"
 msgstr "Ukjent unntak møtt!"
 
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "Unknown file '{filename}' in build '{versionName}'"
@@ -1879,6 +1838,11 @@ msgstr "Ukjent fil \"{filename}\" i bygg \"{versionName}\"."
 msgid "Unknown metadata format: %s"
 msgstr "Ukjent metadataformat: %s"
 
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Unknown metadata format: {path}"
+msgstr "Ukjent metadataformat: {path}"
+
 #: ../fdroidserver/metadata.py
 #, fuzzy, python-brace-format
 msgid "Unknown metadata format: {path} (use: *.yml)"
@@ -1889,6 +1853,10 @@ msgstr "Ukjent metadataformat: {path}"
 msgid "Unknown version of aapt, might cause problems: "
 msgstr "Ukjent versjon av aapt, kan forårsake problemer: "
 
+#: ../fdroidserver/lint.py
+msgid "Unlinkified link - use [http://foo.bar Link title] or [http://foo.bar]"
+msgstr "Avlenket lenke - bruk [http://foo.bar Lenketittel] eller [http://foo.bar]"
+
 #: ../fdroidserver/lint.py
 msgid "Unnecessary leading space"
 msgstr "Unødvendig innledende mellomrom"
@@ -1902,12 +1870,20 @@ msgstr "Unødvendig etterfølgende mellomrom"
 msgid "Unrecognised app field '{fieldname}' in '{path}'"
 msgstr "Ugjenkjent felt «{fieldname}» i «{path}»"
 
+#: ../fdroidserver/metadata.py
+msgid "Unrecognised app field: "
+msgstr "Ugjenkjent programfelt: "
+
 #: ../fdroidserver/metadata.py
 #, python-brace-format
 msgid "Unrecognised build flag '{build_flag}' in '{path}'"
 msgstr "Ugjenkjent felt «{build_flag}» i «{path}»"
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Unrecognised field '{field}' in {linedesc}"
+msgstr "Ugjenkjent felt \"{field}\" i {linedesc}"
+
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Unsupported file type \"{extension}\" for repo graphic"
@@ -1918,6 +1894,29 @@ msgstr "Ustøttet filtype \"{extension}\" for pakkebrønnsgrafikk"
 msgid "Unsupported graphics file found: {path}"
 msgstr "Ustøttet grafikkfil funnet: {path}."
 
+#: ../fdroidserver/rewritemeta.py
+#, python-brace-format
+msgid "Unsupported metadata format, use: --to [{supported}]"
+msgstr "Ustøttet metadataformat, bruk: --to [{supported}]"
+
+#: ../fdroidserver/metadata.py
+msgid "Unterminated ]"
+msgstr "Uterminert ]"
+
+#: ../fdroidserver/metadata.py
+msgid "Unterminated ]]"
+msgstr "Uterminert ]]"
+
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Unterminated build in {name}"
+msgstr "Uterminert bygg i {name}."
+
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Unterminated continuation in {name}"
+msgstr "Uterminert fortsettelse i {name}."
+
 #: ../fdroidserver/lint.py
 #, fuzzy, python-format
 msgid "Unused extlib at %s"
@@ -1938,25 +1937,27 @@ msgstr "Ubrukt fil i %s"
 msgid "Unused scanignore path: %s"
 msgstr "Ubrukt fil i %s"
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Update repo information for new packages"
 msgstr "Oppdater repo informasjon for nye pakker"
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Update the binary transparency log for a URL"
 msgstr "Oppdater binær gjennomsiktighetslogg for en URL"
 
+#: ../fdroid ../fdroidserver/__main__.py
+msgid "Update the stats of the repo"
+msgstr "Oppdater pakkebrønnens status"
+
+#: ../fdroidserver/update.py ../fdroidserver/build.py
+msgid "Update the wiki"
+msgstr "Oppdater wiki-en"
+
 #: ../fdroidserver/checkupdates.py
 #, python-brace-format
 msgid "UpdateCheckData has invalid URL: {url}"
 msgstr "UpdateCheckData har ugyldig nettadresse: {url}"
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "UpdateCheckData must match the version code as integer (\\d or [0-9]): {codeex}"
-msgstr ""
-
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "UpdateCheckData must use HTTPS URL: {url}"
@@ -1968,10 +1969,15 @@ msgid "UpdateCheckData not a valid URL: {url}"
 msgstr "UpdateCheckData er ikke en gyldig nettadresse: {url}"
 
 #: ../fdroidserver/lint.py
-msgid "UpdateCheckMode is set but it looks like checkupdates hasn't been run yet."
-msgstr ""
+msgid "UpdateCheckMode is set but it looks like checkupdates hasn't been run yet"
+msgstr "UpdateCheckMode er satt, men det ser ut til at checkupdates ikke har blitt kjørt enda."
+
+#. Translators: https://developer.android.com/studio/build/application-id
+#: ../fdroidserver/lint.py
+#, fuzzy
+msgid "UpdateCheckName is set to the known application ID - it can be removed"
+msgstr "\"Update Check Name\" er satt til den kjente App-ID-en - den kan fjernes."
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
 #: ../fdroidserver/lint.py
 #, fuzzy
 msgid "UpdateCheckName is set to the known application ID, it can be removed"
@@ -1980,16 +1986,26 @@ msgstr "\"Update Check Name\" er satt til den kjente App-ID-en - den kan fjernes
 #: ../fdroidserver/deploy.py
 #, python-brace-format
 msgid "Uploading {apkfilename} to androidobservatory.org"
-msgstr "Laster opp {apkfilename} to androidobservatory.org"
+msgstr ""
 
 #: ../fdroidserver/deploy.py
 #, fuzzy, python-brace-format
 msgid "Uploading {apkfilename} to virustotal"
 msgstr "Behandler {apkfilename}"
 
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "Usage"
+msgstr "Bruk"
+
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, python-format
+msgid "Usage: %s\n"
+msgstr "Bruk: %s\n"
+
 #: ../fdroidserver/lint.py
-#, fuzzy
-msgid "Use /HEAD instead of /master or /main to point at a file in the default branch"
+msgid "Use /HEAD instead of /master to point at a file in the default branch"
 msgstr "Bruk /HEAD istedenfor /master for å peke til en fil i forvalgt forgrening"
 
 #: ../fdroidserver/update.py
@@ -2001,19 +2017,18 @@ msgid "Use build server"
 msgstr "Bruk byggtjener"
 
 #: ../fdroidserver/update.py
+#, fuzzy
 msgid "Use date from APK instead of current time for newly added APKs"
+msgstr "Bruk dato fra APK istedenfor nåværende tid for nylig tillagte APK-er."
+
+msgid "Use date from apk instead of current time for newly added apks"
 msgstr "Bruk dato fra APK istedenfor nåværende tid for nylig tillagte APK-er"
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Using \"{path}\" for configuring s3cmd."
 msgstr "Bruker \"{path}\" for oppsett av s3cmd."
 
-#: ../fdroidserver/deploy.py
-#, fuzzy, python-brace-format
-msgid "Using \"{path}\" for syncing with remote storage."
-msgstr "Bruker \"{path}\" for oppsett av s3cmd."
-
 #: ../fdroidserver/common.py
 #, fuzzy
 msgid "Using APK Signature v2"
@@ -2024,37 +2039,27 @@ msgstr "Bruker APK Signature v2"
 msgid "Using APK Signature v3"
 msgstr "Bruker APK Signature v3"
 
-#: ../fdroidserver/common.py
-#, fuzzy
-msgid "Using JAR Signature"
-msgstr "Bruker APK Signature v2"
-
 #: ../fdroidserver/common.py
 #, fuzzy
 msgid "Using Java's jarsigner, not recommended for verifying APKs! Use apksigner"
 msgstr "Bruker Java sin jarsigner, ikke anbefalt for bekreftelse av APK-er. Bruk apksigner."
 
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Using blank dictionary instead of contents of {path}!"
-msgstr ""
+#: ../fdroidserver/common.py
+#, fuzzy, python-brace-format
+msgid "Using androguard from \"{path}\""
+msgstr "Bruker Androguard fra \"{path}\""
 
 #: ../fdroidserver/init.py
 #, fuzzy, python-brace-format
 msgid "Using existing keystore \"{path}\""
 msgstr "Bruker eksisterende nøkkellager \"{path}\"."
 
-#: ../fdroidserver/deploy.py
-#, fuzzy, python-brace-format
-msgid "Using rclone to sync with: {url}"
-msgstr "Bruk s3cmd til å synkronisere med: {url}"
-
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Using s3cmd to sync with: {url}"
 msgstr "Bruk s3cmd til å synkronisere med: {url}"
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Valid commands are:"
 msgstr "Gyldige kommandoer er:"
 
@@ -2062,7 +2067,7 @@ msgstr "Gyldige kommandoer er:"
 msgid "Verify against locally cached copy rather than redownloading."
 msgstr "Bekreft mot lokalt hurtiglagret kopi snarere enn å laste ned på ny."
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Verify the integrity of downloaded packages"
 msgstr "Bekreft integriteten til nedlastede pakker"
 
@@ -2070,28 +2075,15 @@ msgstr "Bekreft integriteten til nedlastede pakker"
 msgid "Verifying index signature:"
 msgstr "Bekrefter indekssignatur:"
 
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "Verifying package {path} with apksigner."
-msgstr ""
-
 #: ../fdroidserver/deploy.py
-#, fuzzy, python-brace-format
+#, python-brace-format
 msgid "VirusTotal API key cannot upload files larger than 32MB, use {url} to upload {path}."
-msgstr "VirusTotal API-nøkkel kan ikke laste opp filer større enn 32 MB, bruk {url} for å laste opp {path}."
-
-#: ../fdroidserver/nightly.py
-msgid "WARNING: only public git repos are supported!"
 msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Warn about possible metadata errors"
 msgstr "Advar om mulige metadata-feil"
 
-#: ../fdroidserver/scanner.py
-msgid "WebAssembly binary file"
-msgstr ""
-
 #: ../fdroidserver/update.py
 #, fuzzy
 msgid "When configured for signed indexes, create only unsigned indexes at this stage"
@@ -2101,17 +2093,8 @@ msgstr "Når oppsatt for signerte indekser, vil kun usignerte indekser bli oppre
 msgid "When linting the entire repository yamllint is disabled by default. This option forces yamllint regardless."
 msgstr ""
 
-#: ../fdroidserver/publish.py
-msgid "When signing or verifying fails, exit with an error code."
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "Would you like to download and install F-Droid.apk via adb? (YES/no)"
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "Would you like to download the app(s) from f-droid.org? (YES/no)"
-msgstr ""
+msgid "X.509 'Distiguished Name' used when generating keys"
+msgstr "X.509 \"Entydig navn\" (DN) brukt ved generering av nøkler."
 
 #: ../fdroidserver/init.py
 msgid "X.509 'Distinguished Name' used when generating keys"
@@ -2126,11 +2109,6 @@ msgstr "Du kan bruke ANDROID_HOME til å sette stien til din SDK, f.eks:"
 msgid "ZIP file archive"
 msgstr "ZIP-filarkiv"
 
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "adb reports {serial} is \"{status}\"!"
-msgstr ""
-
 #: ../fdroidserver/nightly.py
 #, fuzzy, python-brace-format
 msgid "adding IdentityFile to {path}"
@@ -2141,82 +2119,89 @@ msgstr "legger til IdentityFile i {path}"
 msgid "adding to {name}: {path}"
 msgstr "legger til i {name}: {path}"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, fuzzy, python-format
 msgid "ambiguous option: %(option)s could match %(matches)s"
 msgstr "tvetydig valg: %(option)s kan passe overens med %(matches)s"
 
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "apksigner in build-tools;{version} passes APKs with invalid v3 signatures, ignoring."
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, fuzzy
-msgid "apksigner not found! Cannot sign or verify modern APKs"
-msgstr "fant ikke apksigner (som kreves for signering)."
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, python-format
+msgid "ambiguous option: %s (%s?)"
+msgstr "tvetydig valg: %s (%s?)"
 
 #: ../fdroidserver/common.py
 msgid "apksigner not found, it's required for signing!"
 msgstr "fant ikke apksigner (som kreves for signering)."
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/checkupdates.py ../fdroidserver/lint.py
-#: ../fdroidserver/rewritemeta.py
+#: ../fdroidserver/lint.py ../fdroidserver/rewritemeta.py
+#: ../fdroidserver/checkupdates.py
 #, fuzzy
 msgid "application ID of file to operate on"
 msgstr "App-ID å sjekke for oppdateringer"
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/build.py ../fdroidserver/install.py
-#: ../fdroidserver/publish.py ../fdroidserver/scanner.py
-#: ../fdroidserver/verify.py
+#: ../fdroidserver/verify.py ../fdroidserver/publish.py
+#: ../fdroidserver/build.py ../fdroidserver/scanner.py
+#: ../fdroidserver/install.py
 #, fuzzy
 msgid "application ID with optional versionCode in the form APPID[:VERCODE]"
 msgstr "App-ID med valgfri versionCode, i formen APPID[:VERCODE]"
 
-#: ../fdroidserver/common.py
-msgid "archive_url needs to end with /archive"
-msgstr ""
+#: ../fdroidserver/lint.py ../fdroidserver/rewritemeta.py
+#, fuzzy
+msgid "applicationId in the form APPID"
+msgstr "App-ID i formen \"APPID\""
 
-#: /usr/lib/python3.11/argparse.py
+#: ../fdroidserver/checkupdates.py
+msgid "applicationId to check for updates"
+msgstr "App-ID å sjekke for oppdateringer"
+
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
+#: ../fdroidserver/verify.py ../fdroidserver/publish.py
+#: ../fdroidserver/dscanner.py ../fdroidserver/build.py
+#: ../fdroidserver/scanner.py ../fdroidserver/install.py
+msgid "applicationId with optional versionCode in the form APPID[:VERCODE]"
+msgstr "App-ID med valgfri versionCode, i formen APPID[:VERCODE]"
+
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "argument \"-\" with mode %r"
 msgstr "argument \"-\" med modus %r"
 
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "argument %(argument_name)s: %(message)s"
-msgstr ""
-
 #: ../fdroidserver/nightly.py
 #, fuzzy
 msgid "attempting bare SSH connection to test deploy key:"
 msgstr "forsøker naken SSH-tilkobling for å teste utrullingsnøkkel:"
 
+#: ../fdroidserver/nightly.py
+#, fuzzy
+msgid "attempting bare ssh connection to test deploy key:"
+msgstr "forsøker naken SSH-tilkobling for å teste utrullingsnøkkel:"
+
 #: ../fdroidserver/common.py
 msgid "can not parse scrlib spec (not a string): '{}'"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
-msgid "can't open '%(filename)s': %(error)s"
-msgstr "kan ikke åpne '%(filename)s': %(error)s"
-
-#: ../fdroidserver/scanner.py
-msgid "can't open non-https url: '{};"
-msgstr ""
+msgid "can't open '%s': %s"
+msgstr "kan ikke åpne '%s': %s"
 
 #: ../fdroidserver/build.py
 #, fuzzy, python-brace-format
 msgid "cannot find required srclibs: \"{path}\""
 msgstr "Finner ikke AppID for {path}."
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "cannot have multiple subparser arguments"
 msgstr "kan ikke ha flere underfortolkningsargumenter"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "cannot merge actions - two groups are named %r"
 msgstr "kan ikke flette handlinger - to grupper heter %r"
@@ -2231,26 +2216,32 @@ msgstr "kan ikke offentliggjøre oppdatering, har du satt utrullingsnøkkelen?"
 msgid "cloning {url}"
 msgstr "kloner {url}"
 
+#: ../fdroidserver/deploy.py
+msgid "command to execute, either 'init' or 'update'"
+msgstr "kommando å kjøre, enten 'init' eller 'update'"
+
 #: ../fdroidserver/__main__.py
 msgid "commands from plugin modules:"
-msgstr "kommandoer fra programtilleggsmodulene:"
+msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, fuzzy
+msgid "complex"
+msgstr "kompleks"
+
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "conflicting option string: %s"
 msgid_plural "conflicting option strings: %s"
 msgstr[0] "konflikterende valgstreng: %s"
 msgstr[1] "konflikterende valgstrenger: %s"
 
-#: /usr/lib/python3.11/argparse.py
-#, fuzzy, python-format
-msgid "conflicting subparser alias: %s"
-msgstr "konflikterende valgstreng: %s"
-
-#: /usr/lib/python3.11/argparse.py
-#, fuzzy, python-format
-msgid "conflicting subparser: %s"
-msgstr "konflikterende valgstreng: %s"
+#: ../fdroidserver/nightly.py
+#, fuzzy, python-brace-format
+msgid "copying {apkfilename} into {path}"
+msgstr "kopierer {apkfilename} inn i {path}"
 
 #: ../fdroidserver/metadata.py
 #, python-brace-format
@@ -2258,11 +2249,11 @@ msgid "could not parse '{path}'"
 msgstr "kunne ikke tolke'{path}'"
 
 #: ../fdroidserver/common.py
-msgid "could not parse srclib spec (no name specified): '{}'"
+msgid "could not parse srclib spec (no ref specified): '{}'"
 msgstr ""
 
 #: ../fdroidserver/common.py
-msgid "could not parse srclib spec (no ref specified): '{}'"
+msgid "could not parse srclib spec (too many '@' signs): '{}'"
 msgstr ""
 
 #: ../fdroidserver/nightly.py
@@ -2270,71 +2261,77 @@ msgstr ""
 msgid "created {path}"
 msgstr "opprettet {path}"
 
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "current version is newer: old vercode={old}, new vercode={new}"
-msgstr ""
-
 #: ../fdroidserver/update.py
 #, fuzzy, python-brace-format
 msgid "deleting: repo/{apkfilename}"
 msgstr "Behandler {apkfilename}"
 
-#: ../fdroidserver/scanner.py
-msgid "dependency file without lock"
-msgstr ""
+#: ../fdroidserver/common.py
+#, fuzzy, python-brace-format
+msgid "deployed build logs to '{path}'"
+msgstr "utrullet bygglogger til \"{path}\""
 
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "deployed process log {path} to {dest}"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "dest= is required for options like %r"
 msgstr "dest= er påkrevd for valg som %r"
 
-#: ../fdroidserver/scanner.py
-#, fuzzy
-msgid "downloading '{}'"
-msgstr "Laster ned %s"
-
-#: ../fdroidserver/scanner.py
-#, fuzzy
-msgid "downloading scanner signatures from '{}' failed"
-msgstr "Stripper mystisk signatur fra {apkfilename}"
-
 #: ../fdroidserver/scanner.py
 msgid "executable binary, possibly code"
 msgstr "kjørbar binærfil, muligens kode"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "expected %s argument"
 msgid_plural "expected %s arguments"
 msgstr[0] "forventet %s argument"
 msgstr[1] "forventet %s argumenter"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "expected at least one argument"
 msgstr "forventet minst ett argument"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "expected at most one argument"
 msgstr "forventet på det meste ett argument"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "expected one argument"
 msgstr "forventet ett argument"
 
-#: ../fdroidserver/__main__.py
+#: ../fdroidserver/common.py
+#, fuzzy, python-brace-format
+msgid "failed deploying build logs to '{path}'"
+msgstr "klarte ikke å rulle ut bygglogger til \"{path}\""
+
+#: ../fdroid
+msgid "fdroid [-h|--help|--version] <command> [<args>]"
+msgstr "fdroid [-h|--help|--version] <kommando> [<argumenter>]"
+
+#: ../fdroid ../fdroidserver/__main__.py
 #, fuzzy
 msgid "fdroid [<command>] [-h|--help|--version|<args>]"
 msgstr "bruk: fdroid [-h|--help|--version] <kommando> [<argumenter>]"
 
-#: ../fdroidserver/scanner.py
-msgid "fetch the latest version of signatures from the web"
-msgstr ""
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, fuzzy
+msgid "floating-point"
+msgstr "flyttall"
+
+#: ../fdroidserver/metadata.py
+msgid "force errors to be warnings, or ignore"
+msgstr "tving feil til å bli advarsler, eller ignorer"
 
 #: ../fdroidserver/metadata.py
 #, fuzzy
@@ -2347,11 +2344,11 @@ msgid "git svn clone failed"
 msgstr "\"git svn clone\" mislyktes"
 
 #: ../fdroidserver/scanner.py
-#, fuzzy
 msgid "gzip file archive"
-msgstr ".gzip-filarkiv"
+msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, fuzzy, python-format
 msgid "ignored explicit argument %r"
 msgstr "ignorerte eksplisitt argument %r"
@@ -2360,40 +2357,35 @@ msgstr "ignorerte eksplisitt argument %r"
 msgid "index-v1 must have a signature, use `fdroid signindex` to create it!"
 msgstr "index-v1 må ha en signatur, bruk `fdroid signindex` for å opprette den."
 
-#: ../fdroidserver/index.py
-#, fuzzy
-msgid "index-v2 must have a signature, use `fdroid signindex` to create it!"
-msgstr "index-v1 må ha en signatur, bruk `fdroid signindex` for å opprette den."
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "integer"
+msgstr "heltall"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, fuzzy, python-format
 msgid "invalid %(type)s value: %(value)r"
 msgstr "ugydlig %(type)s verdi: %(value)r"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "invalid choice: %(value)r (choose from %(choices)s)"
 msgstr "ugyldig valg: %(value)r (velg fra %(choices)s)"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "invalid conflict_resolution value: %r"
 msgstr "ugyldig conflict_resolution-verdi: %r"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "invalid option string %(option)r: must start with a character %(prefix_chars)r"
 msgstr "Ugyldig valgstreng %(option)r: Må starte med et tegn %(prefix_chars)r"
 
-#: ../fdroidserver/common.py
-msgid "ipfs_cid not found, skipping CIDv1 generation"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "latest build recipe is newer: old vercode={old}, new vercode={new}"
-msgstr ""
-
 #: ../fdroidserver/deploy.py
 #, python-brace-format
 msgid "local_copy_dir does not end with \"fdroid\", perhaps you meant: \"{path}\""
@@ -2412,20 +2404,11 @@ msgstr "local_copy_dir må være ei mappe, ikke ei fil!"
 msgid "mirror '%s' does not end with 'fdroid'!"
 msgstr "speilet \"%s\" slutter ikke med \"fdroid\"."
 
-#: ../fdroidserver/index.py
-#, fuzzy, python-brace-format
-msgid "mirrors set twice, in config.yml and {path}!"
-msgstr "Nå må du sette disse i config.yml:"
-
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "mutually exclusive arguments must be optional"
 msgstr "gjensidig utelukkende argumenter må være valgfrie"
 
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "next {name} cache update due in {time}"
-msgstr ""
-
 #: ../fdroidserver/mirror.py
 #, fuzzy, python-brace-format
 msgid "no \"icon\" in {appid}"
@@ -2435,37 +2418,98 @@ msgstr "Behandler {appid}"
 msgid "no APK supplied"
 msgstr "ingen APK angitt"
 
-#: ../fdroidserver/checkupdates.py
-#, fuzzy
-msgid "no version information found"
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, python-format
+msgid "no such option: %s"
+msgstr "Inget slikt valg: %s"
+
+#: ../fdroid ../fdroidserver/__main__.py
+msgid "no version info found!"
 msgstr "ingen versjonsinfo funnet!"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, fuzzy, python-format
 msgid "not allowed with argument %s"
 msgstr "ikke tillatt med argument %s"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, fuzzy, python-format
 msgid "one of the arguments %s is required"
 msgstr "ett av argumentene %s kreves"
 
-#: ../fdroidserver/common.py ../fdroidserver/index.py
+#: ../fdroidserver/index.py ../fdroidserver/common.py
 #, fuzzy
 msgid "only accepts strings, lists, and tuples"
 msgstr "kun godta strenger, lister, og forekomster"
 
-#: /usr/lib/python3.11/argparse.py
-#, fuzzy
-msgid "options"
-msgstr "Valg"
+#: ../fdroidserver/install.py
+#, fuzzy, python-format
+msgid "option %s: If you really want to install all the signed apps, use --all"
+msgstr "valg %s: Hvis du virkelig ønsker å installere alle signerte programmer, bruk -all"
+
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, python-format
+msgid "option %s: invalid %s value: %r"
+msgstr "valg %s: ugyldig %s verdi: %r"
+
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, fuzzy, python-format
+msgid "option %s: invalid choice: %r (choose from %s)"
+msgstr "valg %s: ugyldig valg: %r (velg mellom %s)"
+
+#: /usr/lib/python3.5/getopt.py /usr/lib/python3.6/getopt.py
+#: /usr/lib/python3.7/getopt.py
+#, python-format
+msgid "option -%s not recognized"
+msgstr "Kommandoen \"-%s\" gjenkjennes ikke"
+
+#: /usr/lib/python3.5/getopt.py /usr/lib/python3.6/getopt.py
+#: /usr/lib/python3.7/getopt.py
+#, python-format
+msgid "option -%s requires argument"
+msgstr "valg -%s krever et argument"
+
+#: /usr/lib/python3.5/getopt.py /usr/lib/python3.6/getopt.py
+#: /usr/lib/python3.7/getopt.py
+#, fuzzy, python-format
+msgid "option --%s must not have an argument"
+msgstr "valget --%s kan ikke ha et argument"
+
+#: /usr/lib/python3.5/getopt.py /usr/lib/python3.6/getopt.py
+#: /usr/lib/python3.7/getopt.py
+#, fuzzy, python-format
+msgid "option --%s not a unique prefix"
+msgstr "valget --%s er ikke et unikt prefiks"
+
+#: /usr/lib/python3.5/getopt.py /usr/lib/python3.6/getopt.py
+#: /usr/lib/python3.7/getopt.py
+#, python-format
+msgid "option --%s not recognized"
+msgstr "Kommandoen \"--%s\" gjenkjennes ikke"
+
+#: /usr/lib/python3.5/getopt.py /usr/lib/python3.6/getopt.py
+#: /usr/lib/python3.7/getopt.py
+#, python-format
+msgid "option --%s requires argument"
+msgstr "valget --%s krever et argument"
+
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
+msgid "optional arguments"
+msgstr "valgfrie argumenter"
 
 #: ../fdroidserver/nightly.py
 #, python-brace-format
 msgid "overwriting existing {path}"
 msgstr "overskriver eksisterende {path}"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "positional arguments"
 msgstr "Posisjonelle argumenter"
 
@@ -2474,54 +2518,42 @@ msgstr "Posisjonelle argumenter"
 msgid "process log deploy {path} to {dest} failed!"
 msgstr ""
 
-#: ../fdroidserver/build.py
-msgid "reference binary missing signature"
-msgstr ""
-
 #: ../fdroidserver/signatures.py
 #, fuzzy, python-brace-format
 msgid "refuse downloading via insecure HTTP connection (use HTTPS or specify --no-https-check): {apkfilename}"
 msgstr "nekt nedlasting via usikker HTTP-tilkobling (bruk HTTPS eller angi --no-https-check): {apkfilename}"
 
+#: ../fdroidserver/signatures.py
+#, fuzzy, python-brace-format
+msgid "refuse downloading via insecure http connection (use https or specify --no-https-check): {apkfilename}"
+msgstr "nekt nedlasting via usikker HTTP-tilkobling (bruk HTTPS eller angi --no-https-check): {apkfilename}"
+
 #: ../fdroidserver/index.py
 #, python-format
-msgid "repo_icon \"repo/icons/%s\" does not exist, generating placeholder."
+msgid "repo_icon %s does not exist, generating placeholder."
 msgstr ""
 
-#: ../fdroidserver/common.py
-msgid "repo_url needs to end with /repo"
+#: ../fdroidserver/metadata.py
+msgid "ruamel.yaml not installed, can not write metadata."
 msgstr ""
 
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "rsync is missing or broken: {error}"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, fuzzy, python-brace-format
 msgid "s3cmd sync indexes {path} to {url} and delete"
 msgstr "s3cmd synkroniserer indekser {path} til {url} og sletter"
 
-#: ../fdroidserver/deploy.py
-#, fuzzy, python-brace-format
-msgid "s3cmd syncs indexes from {path} to {url} and deletes removed"
-msgstr "s3cmd synkroniserer indekser {path} til {url} og sletter"
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "scanner cache is malformed! You can clear it with: '{clear}'"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, fuzzy
-msgid "serverwebroot: path does not end with \"fdroid\", perhaps you meant one of these:"
-msgstr "local_copy_dir slutter ikke med \"fdroid\", kanskje du mente: \"{path}\""
-
 #: ../fdroidserver/scanner.py
 msgid "shared library"
 msgstr "delt bibliotek"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "show program's version number and exit"
+msgstr "vis programmets versjonsnummer og avslutt"
+
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.5/optparse.py
+#: /usr/lib/python3.6/argparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/argparse.py /usr/lib/python3.7/optparse.py
 msgid "show this help message and exit"
 msgstr "vis denne hjelpemeldingen og avslutt"
 
@@ -2553,31 +2585,31 @@ msgstr "srclibs mangler navn og/eller @"
 msgid "static library"
 msgstr "statisk bibliotek"
 
-#: ../fdroidserver/build.py
-#, python-brace-format
-msgid "supplied reference binary has allowed signer {signer}"
-msgstr ""
+#: ../fdroidserver/common.py
+#, fuzzy, python-brace-format
+msgid "supplied timestamp value '{timestamp}' is not a unix timestamp"
+msgstr "angitt tidsstempelverdi \"{timestamp}\" er ikke et Unix-tidsstempel"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "the following arguments are required: %s"
 msgstr "følgende argumenter kreves: %s"
 
-#: ../fdroidserver/install.py
-msgid "true"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "unexpected option string: %s"
 msgstr "uventet valgstreng: %s"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "unknown parser %(parser_name)r (choices: %(choices)s)"
 msgstr "ukjent fortolker %(parser_name)r (valg: %(choices)s)"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "unrecognized arguments: %s"
 msgstr "ugjengkjente argumenter: %s"
@@ -2587,11 +2619,16 @@ msgstr "ugjengkjente argumenter: %s"
 msgid "unsafe permissions on '{config_file}' (should be 0600)!"
 msgstr "utrygge tilganger for '{config_file}' (skal være 0600)!"
 
-#: ../fdroidserver/__main__.py /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py ../fdroid
+#: /usr/lib/python3.7/argparse.py ../fdroidserver/__main__.py
 msgid "usage: "
 msgstr "bruk: "
 
-#: ../fdroidserver/deploy.py
+#: ../fdroid
+msgid "usage: fdroid [-h|--help|--version] <command> [<args>]"
+msgstr "bruk: fdroid [-h|--help|--version] <kommando> [<argumenter>]"
+
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, fuzzy, python-brace-format
 msgid "using Apache libcloud to sync with {url}"
 msgstr "bruker Apache-libcloud for å synkronisere med {url}"
@@ -2600,8 +2637,8 @@ msgstr "bruker Apache-libcloud for å synkronisere med {url}"
 msgid "virustotal.com is rate limiting, waiting to retry..."
 msgstr ""
 
-#: ../fdroidserver/install.py
-msgid "yes"
+#: ../fdroidserver/update.py
+msgid "wiki support is deprecated and will be removed in the next release!"
 msgstr ""
 
 #: ../fdroidserver/publish.py
@@ -2616,19 +2653,31 @@ msgstr[1] "{0} programmer, {1} nøkkelalias"
 msgid "{apkfilename} ({appid}) has no metadata!"
 msgstr "{apkfilename} ({appid}) mangler metadata."
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
+#: ../fdroidserver/update.py
+#, fuzzy, python-brace-format
+msgid "{apkfilename} has multiple {name} files, looks like Master Key exploit!"
+msgstr "{apkfilename} har flere {name}-filer, ser ut til å være en hovednøkkelutnyttelse."
+
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "{apkfilename}'s AndroidManifest.xml has a bad date: "
 msgstr "{apkfilename} sin AndroidManifest.xml har en feilaktig dato: "
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
 #: ../fdroidserver/update.py
 #, fuzzy, python-brace-format
 msgid "{appid} does not have a name! Using application ID instead."
 msgstr "{appid} mangler navn. Bruker pakkenavn istedenfor."
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
+#: ../fdroidserver/update.py
+#, python-brace-format
+msgid "{appid} does not have a name! Using package name instead."
+msgstr "{appid} mangler navn. Bruker pakkenavn istedenfor."
+
+#: ../fdroidserver/update.py
+#, python-brace-format
+msgid "{appid} from {path} is not a valid Android Package Name!"
+msgstr "{appid} fra {path} er ikke et gyldig Android-pakkenavn!"
+
 #: ../fdroidserver/update.py
 #, fuzzy, python-brace-format
 msgid "{appid} from {path} is not a valid Android application ID!"
@@ -2639,16 +2688,12 @@ msgstr "{appid} fra {path} er ikke et gyldig Android-pakkenavn!"
 msgid "{appid} from {path} is not a valid Java Package Name!"
 msgstr "{appid} fra {path} er ikke et gyldig Java-pakkenavn!"
 
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{appid} has both APKs and files: {files}"
-msgstr "{appid} har både APK-er og filer: {files}"
-
 #: ../fdroidserver/mirror.py
 #, python-brace-format
 msgid "{appid} is missing {name}"
 msgstr "{appid} mangler {name}."
 
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
 #: ../fdroidserver/lint.py
 #, fuzzy, python-brace-format
 msgid "{appid}: Unknown extlib {path} in build '{versionName}'"
@@ -2675,9 +2720,9 @@ msgid "{build_flag} must be an integer, found: {value}"
 msgstr "{build_flag} må være et heltall, fant: {value}"
 
 #: ../fdroidserver/metadata.py
-#, fuzzy, python-brace-format
-msgid "{build_flag} must be list or string, found: {value}"
-msgstr "{build_flag} må være et heltall, fant: {value}"
+#, python-brace-format
+msgid "{field} not terminated in {name}"
+msgstr "{field} ikke terminert i {name}."
 
 #: ../fdroidserver/metadata.py
 #, python-brace-format
@@ -2686,15 +2731,10 @@ msgstr "{file} er tom eller skadet!"
 
 #: ../fdroidserver/update.py
 #, python-brace-format
-msgid "{name} \"{section}/icons/{path}\" does not exist! Check \"config.yml\"."
-msgstr "{name} «{section}/icons/{path}» finnes ikke. Rett det i config.yml."
+msgid "{name} \"{path}\" does not exist! Correct it in config.py."
+msgstr "{name} \"{path}\" finnes ikke. Rett det i config.py."
 
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{path1} is a duplicate of {path2}, remove one!"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 #, python-brace-format
 msgid "{path} already exists, ignoring import results!"
 msgstr "{path} finnes allerede, ignorerer importeringsresultater."
@@ -2709,36 +2749,6 @@ msgstr "{path} finnes ikke. Opprett den ved å kjøre:"
 msgid "{path} has bad file signature \"{pattern}\", possible Janus exploit!"
 msgstr "{path} har feilaktig filsignatur \"{pattern}\", mulig Janus-utnyttelse."
 
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "{path} has been flagged by virustotal {count} times:"
-msgstr ""
-
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "{path} has the wrong fingerprint ({fingerprint})!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "{path} is not \"key: value\" dict, but a {datatype}!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, fuzzy, python-brace-format
-msgid "{path} is not a standard config file!"
-msgstr "'sdk_path' ble ikke funnet i config.yml!"
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "{path} is not list, but a {datatype}!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "{path} is not {expected_type}, but a {datatype}!"
-msgstr ""
-
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "{path} is zero size!"
@@ -2749,22 +2759,12 @@ msgstr "{path} er null størrelse."
 msgid "{path} more than 200MB, manually upload: {url}"
 msgstr "{path} er mer enn 200MB, last opp manuelt: {url}"
 
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "{path}: \"{code}\" is not a valid ISO_3166-1 alpha-2 country code!"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, fuzzy, python-brace-format
-msgid "{path}: {error}"
-msgstr "Klarte ikke å lese {path}: {error}"
-
 #: ../fdroidserver/mirror.py
 #, fuzzy, python-brace-format
 msgid "{url} does not end with \"fdroid\", check the URL path!"
 msgstr "{url} slutter ikke med \"fdroid\", sjekk nettadressestien."
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/common.py
 #, fuzzy, python-brace-format
 msgid "{url} does not start with \"http\"!"
 msgstr "{url} slutter ikke med \"fdroid\", sjekk nettadressestien."
@@ -2780,3 +2780,14 @@ msgid "{} build succeeded"
 msgid_plural "{} builds succeeded"
 msgstr[0] "{} bygg fullført"
 msgstr[1] "{} bygg fullført"
+
+#~ msgid "Add PGP signatures for packages in repo using GnuPG"
+#~ msgstr "Legg til PGP-signaturer for pakker i pakkebrønnen ved bruk av GnuPG"
+
+#, fuzzy
+#~ msgid "Cannot find a packageName for {path}!"
+#~ msgstr "Fant ikke packageName for {path}."
+
+#, fuzzy
+#~ msgid "Cannot find an appid for {path}!"
+#~ msgstr "Finner ikke AppID for {path}."
diff --git a/locale/nl/LC_MESSAGES/fdroidserver.po b/locale/nl/LC_MESSAGES/fdroidserver.po
index f5dbfba0..541cd10c 100644
--- a/locale/nl/LC_MESSAGES/fdroidserver.po
+++ b/locale/nl/LC_MESSAGES/fdroidserver.po
@@ -1,31 +1,42 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
 # Bart Groeneveld <avi@bartavi.nl>, 2020.
-# privacysimp <contributions.pqy8k@aleeas.com>, 2021.
-# Stephan Paternotte <stephan@paternottes.net>, 2023.
-# Issa1553 <fairfull.playing@gmail.com>, 2024.
 msgid ""
 msgstr ""
 "Project-Id-Version: fdroidserver 1.1-680-ge1d3de71\n"
 "Report-Msgid-Bugs-To: https://gitlab.com/fdroid/fdroidserver/issues\n"
-"POT-Creation-Date: 2025-06-25 09:52+0200\n"
-"PO-Revision-Date: 2024-01-03 09:07+0000\n"
-"Last-Translator: Issa1553 <fairfull.playing@gmail.com>\n"
+"POT-Creation-Date: 2020-10-21 18:05+0200\n"
+"PO-Revision-Date: 2020-10-01 20:58+0000\n"
+"Last-Translator: Bart Groeneveld <avi@bartavi.nl>\n"
 "Language-Team: Dutch <https://hosted.weblate.org/projects/f-droid/fdroidserver/nl/>\n"
 "Language: nl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 5.4-dev\n"
+"X-Generator: Weblate 4.3-dev\n"
+
+#: ../fdroidserver/common.py
+msgid ""
+"\n"
+"        This is a repository of apps to be used with FDroid. Applications in this\n"
+"        repository are either official binaries built by the original application\n"
+"        developers, or are binaries built from source by f-droid.org using the\n"
+"        tools on https://gitlab.com/fdroid.\n"
+"        "
+msgstr ""
+
+#: ../fdroidserver/nightly.py
+msgid ""
+"\n"
+"SSH Public Key to be used as Deploy Key:"
+msgstr ""
 
 #: ../fdroidserver/nightly.py
 msgid ""
 "\n"
 "SSH public key to be used as deploy key:"
 msgstr ""
-"\n"
-"SSH openbare sleutel die gebruikt moet worden als inzetsleutel:"
 
 #: ../fdroidserver/nightly.py
 #, python-brace-format
@@ -33,284 +44,281 @@ msgid ""
 "\n"
 "{path} encoded for the DEBUG_KEYSTORE secret variable:"
 msgstr ""
-"\n"
-"{path} gecodeerd voor de DEBUG_KEYSTORE geheime variabele:"
 
 #: ../fdroidserver/lint.py
 #, python-format
 msgid "\"%s/\" has no matching metadata file!"
-msgstr "\"%s/\" heeft geen overeenkomend metadatabestand!"
-
-#: ../fdroidserver/index.py
-msgid "\"isPrimary\" key should not be added to mirrors!"
 msgstr ""
 
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "\"local_copy_dir\" {path} does not exist!"
-msgstr "\"local_copy_dir\" {path} bestaat niet!"
-
 #: ../fdroidserver/install.py
 #, python-brace-format
 msgid "\"{apkfilename}\" is already installed on {dev}."
-msgstr "\"{apkfilename}\" is al geïnstalleerd op {dev}."
+msgstr ""
+
+#: ../fdroidserver/update.py
+#, python-brace-format
+msgid "\"{path}\" contains outdated {name} ({version})"
+msgstr ""
 
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "\"{path}\" contains recent {name} ({version})"
-msgstr "\"{path}\" bevat recente {name} ({version})"
+msgstr ""
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "\"{path}\" exists but s3cmd is not installed!"
-msgstr "\"{path}\" bestaat maar s3cmd is niet geïnstalleerd!"
+msgstr ""
 
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "\"{path}\" is not a supported file format (use: metadata/*.yml)"
-msgstr "\"{path}\" is geen ondersteund bestandsformaat (gebruik: metadata/*.yml)"
+msgstr ""
 
-#: ../fdroidserver/update.py
+#: ../fdroidserver/metadata.py
 #, python-brace-format
-msgid "\"{path}\" is signed by a key that is not allowed:"
-msgstr "\"{path}\" is ondertekend door een sleutel die niet is toegestaan:"
+msgid "\"{path}\" is not an accepted format, convert to: {formats}"
+msgstr ""
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/common.py
 #, python-brace-format
 msgid "\"{url}\" is not a valid URL!"
-msgstr "\"{url}\" is geen geldige URL!"
+msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, python-format
+msgid "%(option)s option requires %(number)d argument"
+msgid_plural "%(option)s option requires %(number)d arguments"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../fdroidserver/mirror.py
+#, python-format
+msgid "%(prog)s [options] url"
+msgstr ""
+
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "%(prog)s: error: %(message)s\n"
 msgstr "%(prog)s: fout: %(message)s\n"
 
-#: ../fdroidserver/publish.py
-#, python-format
-msgid "%d APKs failed to be signed or verified!"
-msgstr ""
-
 #: ../fdroidserver/scanner.py
 #, python-format
 msgid "%d problems found"
-msgstr "%d problemen gevonden"
+msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "%prog [options]"
+msgstr "%prog [opties]"
+
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "%r is not callable"
 msgstr "%r kan niet aangeroepen worden"
 
-#: ../fdroidserver/signindex.py
-#, python-format
-msgid "%s did not produce a dict!"
-msgstr "%s heeft geen dictaat opgeleverd!"
-
-#: ../fdroidserver/signindex.py
-#, python-format
-msgid "%s has bad SHA-256: %s"
-msgstr "%s heeft slechte SHA-256: %s"
-
 #: ../fdroidserver/lint.py
 #, python-format
 msgid "%s is not an accepted build field"
-msgstr "%s is geen geaccepteerd build-veld"
+msgstr ""
 
-#: ../fdroidserver/common.py
-msgid "'keypass' not found in config.yml!"
-msgstr "'keypass' niet gevonden in config.yml!"
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, python-format
+msgid "%s option does not take a value"
+msgstr ""
+
+#: ../fdroidserver/index.py ../fdroidserver/common.py
+msgid "'keypass' not found in config.py!"
+msgstr ""
 
 #: ../fdroidserver/common.py
 msgid "'keystore' is NONE and 'smartcardoptions' is blank!"
-msgstr "'keystore' is GEEN en 'smartcardoptions' is leeg!"
+msgstr ""
 
-#: ../fdroidserver/common.py
-msgid "'keystore' not found in config.yml!"
-msgstr "'keystore' niet gevonden in config.yml!"
+#: ../fdroidserver/index.py ../fdroidserver/common.py
+msgid "'keystore' not found in config.py!"
+msgstr ""
 
-#: ../fdroidserver/common.py
-msgid "'keystorepass' not found in config.yml!"
-msgstr "'keystorepass' niet gevonden in config.yml!"
+#: ../fdroidserver/index.py ../fdroidserver/common.py
+msgid "'keystorepass' not found in config.py!"
+msgstr ""
 
-#: ../fdroidserver/common.py
-msgid "'repo_keyalias' not found in config.yml!"
-msgstr "'repo_keyalias' niet gevonden in config.yml!"
+#: ../fdroidserver/index.py ../fdroidserver/common.py
+msgid "'repo_keyalias' not found in config.py!"
+msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "'required' is an invalid argument for positionals"
-msgstr "'required' is een ongeldig argument voor positionelen"
+msgstr ""
 
 #: ../fdroidserver/common.py
-msgid "'sdk_path' not set in config.yml!"
-msgstr "'sdk_path' niet ingesteld in config.yml!"
+msgid "'sdk_path' not set in 'config.py'!"
+msgstr ""
+
+#. Translators: "build-tools" is the file name of a package from
+#. Google, it is part of the Android SDK. So it probably shouldn't be
+#. translated or transliterated.
+#: ../fdroidserver/common.py
+#, python-brace-format
+msgid "'{aapt}' is too old, fdroid requires build-tools-23.0.0 or newer!"
+msgstr ""
 
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "'{aapt}' is too old, fdroid requires build-tools-{version} or newer!"
-msgstr "{aapt}' is te oud, fdroid vereist build-tools-{version} of nieuwer!"
+msgstr ""
+
+#: ../fdroidserver/install.py
+#, python-brace-format
+msgid "'{apkfilename}' is already installed on {dev}."
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "'{field}' in {linedesc} is obsolete, see docs for current fields:"
+msgstr ""
+
+#: ../fdroidserver/common.py
+#, python-brace-format
+msgid "'{field}' will be in random order! Use () or [] brackets if order is important!"
+msgstr ""
 
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "'{path}' failed to execute!"
-msgstr "{path}' is niet uitgevoerd!"
+msgstr ""
 
 #: ../fdroidserver/metadata.py
 #, python-brace-format
-msgid "'{path}' has invalid format, it should be a dictionary!"
-msgstr "'{path}' heeft ongeldig formaat, het zou een woordenboek moeten zijn!"
-
-#: ../fdroidserver/lint.py ../fdroidserver/metadata.py
-#, python-brace-format
 msgid "'{value}' is not a valid {field} in {appid}. Regex pattern: {pattern}"
-msgstr "{value}' is geen geldig {field} in {appid}. Regex patroon: {pattern}"
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "'{value}' is not a valid {field}, should be {pattern}"
-msgstr "{value}' is geen geldig {field}, moet {pattern} zijn"
-
-#: ../fdroidserver/checkupdates.py
-msgid "--merge-request only runs on a single appid!"
 msgstr ""
 
 #: ../fdroidserver/checkupdates.py
 #, python-brace-format
 msgid "...checkupdate failed for {appid} : {error}"
-msgstr "...checkupdate mislukt voor {appid} : {error}"
+msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid ".__call__() not defined"
 msgstr ".__call__() niet gedefinieerd"
 
+#: ../fdroidserver/metadata.py
+msgid ".fdroid.txt is not supported!  Convert to .fdroid.yml or .fdroid.json."
+msgstr ""
+
 #: ../fdroidserver/lint.py
 msgid "/issues is missing"
-msgstr "/problemen ontbreekt"
+msgstr ""
 
 #: ../fdroidserver/mirror.py
 msgid "A URL is required as an argument!"
-msgstr "Een URL is vereist als argument!"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "APK signatures have different certificates in {path}:"
 msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Add PGP signatures using GnuPG for packages in repo"
-msgstr "PGP-handtekeningen toevoegen met GnuPG voor pakketten in repo"
+msgstr ""
+
+#: ../fdroid ../fdroidserver/__main__.py
+msgid "Add a new application from its source code"
+msgstr "Voeg een nieuwe toepassing toe vanuit broncode"
 
 #: ../fdroidserver/update.py
 msgid "Add a repo signing key to an unsigned repo"
-msgstr "Een repo-sleutel toevoegen aan een ongetekende repo"
+msgstr ""
 
 #: ../fdroidserver/update.py
 msgid "Add skeleton metadata files for APKs that are missing them"
-msgstr "Skelet-metagegevensbestanden toevoegen voor APK's die deze missen"
+msgstr ""
 
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Adding new repo for only {name}"
-msgstr "Nieuwe repo toevoegen voor alleen {name}"
+msgstr ""
 
 #: ../fdroidserver/init.py
 msgid "Alias of the repo signing key in the keystore"
-msgstr "Alias van de repo-sleutel in de sleutelbewaarplaats"
+msgstr ""
 
-#: ../fdroidserver/build.py
-msgid "AllowedAPKSigningKeys missing but reference binary supplied"
-msgstr "ToegestaneAPKOndertekenSleutels ontbreekt, maar referentiebinary is geleverd"
-
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "Allows a different revision (or git branch) to be specified for the initial import"
-msgstr "Staat toe dat een andere revisie (of git tak) wordt opgegeven voor de initiële import"
+msgstr ""
 
 #: ../fdroidserver/mirror.py
 msgid "Also mirror the full archive section"
-msgstr "Mirror ook het volledige archiefgedeelte"
+msgstr ""
 
 #: ../fdroidserver/lint.py
 msgid "Also warn about formatting issues, like rewritemeta -l"
-msgstr "Waarschuw ook voor opmaakproblemen, zoals herschrijfmeta -l"
+msgstr ""
 
 #: ../fdroidserver/scanner.py
 msgid "Android AAR library"
-msgstr "Android AAR-bibliotheek"
+msgstr ""
 
 #: ../fdroidserver/scanner.py
 msgid "Android APK file"
-msgstr "Android APK-bestand"
+msgstr ""
 
 #: ../fdroidserver/scanner.py
 msgid "Android DEX code"
-msgstr "Android DEX-code"
+msgstr ""
 
-#: ../fdroidserver/init.py
+#: ../fdroidserver/common.py ../fdroidserver/build.py
 #, python-brace-format
-msgid "Android SDK not found at {path}!"
-msgstr "Android SDK niet gevonden op {path}!"
+msgid "Android SDK '{path}' does not have '{dirname}' installed!"
+msgstr ""
+
+#: ../fdroidserver/common.py
+msgid "Android SDK not found!"
+msgstr ""
 
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "Android SDK path '{path}' does not exist!"
-msgstr "Android SDK-pad '{path}' bestaat niet!"
+msgstr ""
 
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "Android SDK path '{path}' is not a directory!"
-msgstr "Android SDK-pad '{path}' is geen map!"
+msgstr ""
 
+#. Translators: "build-tools" is the file name of a package from
+#. Google, it is part of the Android SDK. So it probably shouldn't be
+#. translated or transliterated.
 #: ../fdroidserver/common.py
 #, python-brace-format
-msgid "Android SDK tool {cmd} not found!"
-msgstr "Android SDK-tool {cmd} niet gevonden!"
+msgid "Android build-tools path '{path}' does not exist!"
+msgstr ""
 
-#: ../fdroidserver/lint.py
-msgid "App has Binaries but does not have corresponding AllowedAPKSigningKeys to pin certificate."
-msgstr "App heeft binaries maar heeft geen overeenkomstige ToegestaneAPKOndertekenSleutels om certificaat te pinnen."
-
-#: ../fdroidserver/lint.py
-#, fuzzy
-msgid "App has NoSourceSince or ArchivePolicy \"0 versions\" or 0 but AutoUpdateMode or UpdateCheckMode are not None"
-msgstr "App heeft GeenBronSinds of Archiefbeleid \"0 versies\" maar AutoUpdateModus of UpdateCheckModus zijn niet Geen"
+#: ../fdroidserver/update.py
+msgid "AndroidManifest.xml has no date"
+msgstr ""
 
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "App is in '{repo}' but has a link to {url}"
-msgstr "App staat in '{repo}' maar heeft een link naar {url}"
-
-#: ../fdroidserver/lint.py
-msgid "App version has binary but does not have corresponding AllowedAPKSigningKeys to pin certificate."
-msgstr "App-versie heeft een binaire versie maar heeft geen overeenkomstige ToegestaneAPKOndertekenSleutels om een certificaat vast te pinnen."
+msgstr ""
 
 #: ../fdroidserver/lint.py
 msgid "Appending .git is not necessary"
-msgstr "Het toevoegen van .git is niet nodig"
+msgstr ""
 
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Archiving {apkfilename} with invalid signature!"
-msgstr "Archivering {apkfilename} met ongeldige handtekening!"
-
-#: ../fdroidserver/lint.py
-msgid "AutoUpdateMode with UpdateCheckMode: HTTP must have a pattern."
-msgstr "AutoUpdateModus met UpdateCheckModus: HTTP moet een patroon hebben."
-
-#: ../fdroidserver/install.py
-msgid "Automatic no to all prompts."
 msgstr ""
 
-#: ../fdroidserver/install.py
-msgid "Automatic yes to all prompts."
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "Bad entry type \"{mirrortype}\" in mirrors config: {mirror}"
-msgstr "Slecht entry type \"{mirrortype}\" in spiegels configuratie: {mirror}"
-
 #: ../fdroidserver/mirror.py
 msgid "Base URL to mirror, can include the index signing key using the query string: ?fingerprint="
 msgstr ""
 
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "Branch '{branch}' used as commit in build '{versionName}'"
@@ -326,9 +334,10 @@ msgstr ""
 msgid "Broken symlink: {path}"
 msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
+#, fuzzy
 msgid "Build a package from source"
-msgstr "Pakket van broncode bouwen"
+msgstr "Bouw een pakket vanaf de bron"
 
 #: ../fdroidserver/build.py
 msgid "Build all applications available"
@@ -346,24 +355,31 @@ msgstr ""
 msgid "Build only the latest version of each package"
 msgstr ""
 
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Build should have comma-separated versionName and versionCode, not \"{value}\", in {linedesc}"
+msgstr ""
+
 #: ../fdroidserver/init.py
 #, python-format
 msgid "Built repo based in \"%s\" with this config:"
 msgstr ""
 
-#: ../fdroidserver/checkupdates.py
-msgid "Can't auto-update app with no CurrentVersionCode"
-msgstr ""
-
 #: ../fdroidserver/build.py
 msgid "Can't build due to {} error while scanning"
 msgid_plural "Can't build due to {} errors while scanning"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../fdroidserver/common.py
+#: ../fdroidserver/vmtools.py
 #, python-brace-format
-msgid "Cannot read {path}: {error}"
+msgid "Cannot read \"{path}\"!"
+msgstr ""
+
+#. Translators: https://developer.android.com/studio/build/application-id
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Cannot resolve application ID {appid}"
 msgstr ""
 
 #: ../fdroidserver/rewritemeta.py
@@ -371,45 +387,55 @@ msgstr ""
 msgid "Cannot rewrite \"{path}\""
 msgstr ""
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
+#: ../fdroidserver/rewritemeta.py
+msgid "Cannot use --list and --to at the same time"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Cannot write \"{path}\", not an accepted format, use: {formats}"
+msgstr ""
+
 #: ../fdroidserver/lint.py
 #, python-format
 msgid "Categories '%s' is not valid"
 msgstr ""
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
 #: ../fdroidserver/lint.py
 msgid "Categories are not set"
 msgstr ""
 
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "Category \"{category}\" defined but not used for any apps!"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Check for updates to applications"
-msgstr "Controleren op updates voor applicaties"
+msgstr ""
 
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Checking archiving for {appid} - apks:{integer}, keepversions:{keep}, archapks:{arch}"
 msgstr ""
 
+#: ../fdroidserver/dscanner.py
+msgid "Clean after all scans have finished"
+msgstr ""
+
+#: ../fdroidserver/dscanner.py
+msgid "Clean before the scans start and rebuild the container"
+msgstr ""
+
+#: ../fdroidserver/dscanner.py
+msgid "Clean up all containers and then exit"
+msgstr ""
+
 #: ../fdroidserver/update.py
 msgid "Clean update - don't uses caches, reprocess all APKs"
 msgstr ""
 
-#: ../fdroidserver/common.py
-msgid "Color the log output"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "Comma separated list of categories."
 msgstr ""
 
-#: ../fdroidserver/__main__.py
-#, python-format
+#: ../fdroid ../fdroidserver/__main__.py
+#, c-format, python-format
 msgid "Command '%s' not recognised.\n"
 msgstr "Opdracht '%s' wordt niet herkend.\n"
 
@@ -417,15 +443,6 @@ msgstr "Opdracht '%s' wordt niet herkend.\n"
 msgid "Commit changes"
 msgstr ""
 
-#: ../fdroidserver/checkupdates.py
-msgid "Commit changes, push, then make a merge request"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Conflicting \"{field}\" definitions between .yml and localized files:"
-msgstr ""
-
 #: ../fdroidserver/__main__.py
 msgid "Conflicting arguments: '--verbose' and '--quiet' can not be specified at the same time."
 msgstr ""
@@ -435,13 +452,11 @@ msgstr ""
 msgid "Could not find '{command}' on your system"
 msgstr ""
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "Could not find latest version code"
 msgstr ""
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "Could not find latest version name"
 msgstr ""
 
@@ -451,8 +466,7 @@ msgid "Could not find {path} to remove it"
 msgstr ""
 
 #: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Could not open APK {path} for analysis: "
+msgid "Could not open apk file for analysis"
 msgstr ""
 
 #: ../fdroidserver/common.py
@@ -460,16 +474,22 @@ msgstr ""
 msgid "Could not parse size \"{size}\", wrong type \"{type}\""
 msgstr ""
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/import_subcommand.py
+#. Translators: https://developer.android.com/studio/build/application-id
+#: ../fdroidserver/import.py
 msgid "Couldn't find Application ID"
 msgstr ""
 
-#: ../fdroidserver/checkupdates.py
-msgid "Couldn't find any version information"
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
+#: ../fdroidserver/import.py
+msgid "Couldn't find latest version code"
 msgstr ""
 
-#: ../fdroidserver/checkupdates.py
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
+#: ../fdroidserver/import.py
+msgid "Couldn't find latest version name"
+msgstr ""
+
+#: ../fdroidserver/import.py
 msgid "Couldn't find package ID"
 msgstr ""
 
@@ -477,26 +497,29 @@ msgstr ""
 msgid "Cowardily refusing to overwrite existing signing key setup!"
 msgstr ""
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/update.py
+msgid "Create a repo signing key in a keystore"
+msgstr ""
+
+#: ../fdroidserver/update.py
+msgid "Create skeleton metadata files that are missing"
+msgstr ""
+
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Created new container \"{name}\""
 msgstr ""
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Creating \"{path}\" for configuring s3cmd."
 msgstr ""
 
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Creating empty {config_file}"
-msgstr ""
-
 #: ../fdroidserver/publish.py
 msgid "Creating log directory"
 msgstr ""
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Creating new S3 bucket: {url}"
 msgstr ""
@@ -509,7 +532,8 @@ msgstr ""
 msgid "Creating signed index with this key (SHA256):"
 msgstr ""
 
-#: ../fdroidserver/publish.py ../fdroidserver/verify.py
+#: ../fdroidserver/import.py ../fdroidserver/verify.py
+#: ../fdroidserver/publish.py
 msgid "Creating temporary directory"
 msgstr ""
 
@@ -528,7 +552,7 @@ msgstr ""
 
 #: ../fdroidserver/update.py
 msgid "Delete APKs and/or OBBs without metadata from the repo"
-msgstr "APK's en/of OBB's zonder metadata uit de repo verwijderen"
+msgstr ""
 
 #: ../fdroidserver/deploy.py
 #, python-brace-format
@@ -555,21 +579,16 @@ msgid "Description has a duplicate line"
 msgstr ""
 
 #: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Description of length {length} is over the {limit} char limit"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Did you mean config/{name}.yml?"
+#, python-format
+msgid "Description has a list (%s) but it isn't bulleted (*) nor numbered (#)"
 msgstr ""
 
 #: ../fdroidserver/lint.py
 #, python-brace-format
-msgid "Did you mean {code}?"
+msgid "Description of length {length} is over the {limit} char limit"
 msgstr ""
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "Do not add 'disable:' to the generated build entries"
 msgstr ""
 
@@ -594,20 +613,25 @@ msgstr ""
 msgid "Don't create a source tarball, useful when testing a build"
 msgstr ""
 
+#: ../fdroidserver/stats.py
+msgid "Don't do anything logs-related"
+msgstr ""
+
 #: ../fdroidserver/build.py
 msgid "Don't refresh the repository, useful when testing a build with no internet connection"
 msgstr ""
 
 #: ../fdroidserver/deploy.py ../fdroidserver/nightly.py
+#: ../fdroidserver/upload.py
 msgid "Don't use rsync checksums"
 msgstr ""
 
-#: ../fdroidserver/install.py
-msgid "Download F-Droid.apk using mirrors that leak less to the network"
+#: ../fdroid ../fdroidserver/__main__.py
+msgid "Download complete mirrors of small repos"
 msgstr ""
 
-#: ../fdroidserver/__main__.py
-msgid "Download complete mirrors of small repos"
+#: ../fdroidserver/stats.py
+msgid "Download logs we don't have"
 msgstr ""
 
 #: ../fdroidserver/common.py
@@ -621,12 +645,7 @@ msgstr ""
 
 #: ../fdroidserver/metadata.py
 #, python-brace-format
-msgid "Duplicate Anti-Feature declaration at {path} was ignored!"
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-format
-msgid "Duplicate entry \"%s\" in mirrors config!"
+msgid "Duplicate build recipe found for versionCode {versionCode} in {linedesc}"
 msgstr ""
 
 #: ../fdroidserver/lint.py
@@ -634,42 +653,27 @@ msgstr ""
 msgid "Duplicate link in '{field}': {url}"
 msgstr ""
 
-#: ../fdroidserver/common.py
-#, python-format
-msgid "ERROR: %(message)s"
+#: ../fdroid
+msgid "Dynamically scan APKs post build"
 msgstr ""
 
 #: ../fdroidserver/__main__.py
 msgid "ERROR: The \"server\" subcommand has been removed, use \"deploy\"!"
 msgstr ""
 
+#: ../fdroidserver/mirror.py
+msgid ""
+"ERROR: this command should never be used to mirror f-droid.org!\n"
+"A full mirror of f-droid.org requires more than 200GB."
+msgstr ""
+
 #: ../fdroidserver/nightly.py
 msgid "ERROR: unsupported CI type, patches welcome!"
 msgstr ""
 
-#: ../fdroidserver/nightly.py
-#, python-format
-msgid "ERROR: unsupported git host \"%s\", patches welcome!"
-msgstr ""
-
-#: ../fdroidserver/lint.py
+#: ../fdroidserver/metadata.py
 #, python-brace-format
-msgid "ERROR: {key} in {path} is not \"archive\" or \"repo\"!"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "ERROR: {key} not a valid key!"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "ERROR: {key}'s value should be of type {t}!"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "ERROR: {key}:{subkey} in {path} is not in allowed keys: {allowed_keys}!"
+msgid "Empty build flag at {linedesc}"
 msgstr ""
 
 #: ../fdroidserver/__main__.py
@@ -684,40 +688,20 @@ msgid ""
 "> "
 msgstr ""
 
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Environment variable {var} from {configname} is not set!"
+#: ../fdroidserver/deploy.py ../fdroidserver/checkupdates.py
+#: ../fdroidserver/upload.py
+#, python-format
+msgid "Error while attempting to publish log: %s"
 msgstr ""
 
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Environment variable {{env: {var}}} is not set!"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "Error deploying 'github_releases', {} not present. (You might need to run `fdroid update` first.)"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py ../fdroidserver/common.py
 msgid "Error while getting repo address"
 msgstr ""
 
-#: ../fdroidserver/scanner.py
-msgid "Exit with a non-zero code if problems were found"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Extract application metadata from a source repository"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Extract signatures from APKs"
 msgstr ""
 
-#: ../fdroidserver/install.py
-msgid "F-Droid.apk could not be downloaded from any known source!"
-msgstr ""
-
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Failed copying {path}: {error}"
@@ -738,23 +722,27 @@ msgstr ""
 msgid "Failed resizing {path}: {error}"
 msgstr ""
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/publish.py
+msgid "Failed to align application"
+msgstr ""
+
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Failed to create S3 bucket: {url}"
 msgstr ""
 
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Failed to get APK information, deleting {path}"
+#: ../fdroidserver/common.py
+msgid "Failed to get APK manifest information"
 msgstr ""
 
 #: ../fdroidserver/update.py
 #, python-brace-format
-msgid "Failed to get APK information, skipping {path}"
+msgid "Failed to get apk information, deleting {path}"
 msgstr ""
 
 #: ../fdroidserver/update.py
-msgid "Failed to get APK signing key fingerprint"
+#, python-brace-format
+msgid "Failed to get apk information, skipping {path}"
 msgstr ""
 
 #: ../fdroidserver/install.py
@@ -762,10 +750,14 @@ msgstr ""
 msgid "Failed to install '{apkfilename}' on {dev}: {error}"
 msgstr ""
 
-#: ../fdroidserver/common.py
+#: ../fdroidserver/publish.py ../fdroidserver/common.py
 msgid "Failed to sign application"
 msgstr ""
 
+#: ../fdroidserver/common.py
+msgid "Failed to zipalign application"
+msgstr ""
+
 #: ../fdroidserver/build.py
 #, python-brace-format
 msgid "Fetched buildserverid from VM: {buildserverid}"
@@ -781,12 +773,21 @@ msgstr ""
 msgid "File disappeared while processing it: {path}"
 msgstr ""
 
-#: ../fdroidserver/build.py ../fdroidserver/install.py
-#: ../fdroidserver/rewritemeta.py ../fdroidserver/scanner.py
-#: ../fdroidserver/update.py
+#: ../fdroidserver/verify.py ../fdroidserver/stats.py ../fdroidserver/update.py
+#: ../fdroidserver/rewritemeta.py ../fdroidserver/build.py
+#: ../fdroidserver/checkupdates.py ../fdroidserver/scanner.py
+#: ../fdroidserver/install.py
 msgid "Finished"
 msgstr ""
 
+#: ../fdroidserver/lint.py
+msgid "Flattr donation methods belong in the FlattrID flag"
+msgstr ""
+
+#: ../fdroidserver/lint.py
+msgid "Flattr donation methods belong in the FlattrID: field"
+msgstr ""
+
 #: ../fdroidserver/lint.py
 msgid "Forbidden HTML tags"
 msgstr ""
@@ -818,6 +819,7 @@ msgstr ""
 msgid "Found invalid appids in arguments"
 msgstr ""
 
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
 #: ../fdroidserver/common.py
 msgid "Found invalid versionCodes for some apps"
 msgstr ""
@@ -827,10 +829,6 @@ msgstr ""
 msgid "Found multiple JAR Signature Block Files in {path}"
 msgstr ""
 
-#: ../fdroidserver/common.py
-msgid "Found multiple Signer Certificates!"
-msgstr ""
-
 #: ../fdroidserver/metadata.py
 #, python-brace-format
 msgid "Found multiple metadata files for {appid}"
@@ -840,6 +838,11 @@ msgstr ""
 msgid "Found multiple signing certificates for repository."
 msgstr ""
 
+#: ../fdroidserver/update.py
+#, python-brace-format
+msgid "Found multiple signing certificates in {path}"
+msgstr ""
+
 #: ../fdroidserver/index.py
 msgid "Found no signing certificates for repository."
 msgstr ""
@@ -854,16 +857,6 @@ msgstr ""
 msgid "Found {apkfilename} at {url}"
 msgstr ""
 
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Found {count} problems in {filename}"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Found {count} warnings in {filename}"
-msgstr ""
-
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Generated skeleton metadata for {appid}"
@@ -882,21 +875,19 @@ msgstr ""
 msgid "Git fetch failed"
 msgstr ""
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
+#: ../fdroidserver/common.py
+msgid "Git remote set-head failed"
+msgstr ""
+
 #: ../fdroidserver/common.py
 #, python-format
 msgid "Git remote set-head failed: \"%s\""
 msgstr ""
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
 #: ../fdroidserver/common.py
 msgid "Git reset failed"
 msgstr ""
 
-#: ../fdroidserver/common.py
-msgid "Git submodule deinit failed"
-msgstr ""
-
 #: ../fdroidserver/common.py
 msgid "Git submodule sync failed"
 msgstr ""
@@ -928,16 +919,6 @@ msgstr ""
 msgid "Ignoring FUNDING.yml entry longer than 2048: %s"
 msgstr ""
 
-#: ../fdroidserver/update.py
-#, python-format
-msgid "Ignoring bad element in manifest: %s"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Ignoring deprecated {oldfile}, use {newfile}!"
-msgstr ""
-
 #: ../fdroidserver/index.py
 msgid "Ignoring package without metadata: "
 msgstr ""
@@ -947,6 +928,11 @@ msgstr ""
 msgid "Ignoring stale cache data for {apkfilename}"
 msgstr ""
 
+#: ../fdroidserver/rewritemeta.py
+#, python-brace-format
+msgid "Ignoring {ext} file at '{path}'"
+msgstr ""
+
 #: ../fdroidserver/update.py
 msgid "Include APKs that are signed with disabled algorithms like MD5"
 msgstr ""
@@ -963,16 +949,6 @@ msgstr ""
 msgid "Include the source tarballs in the mirror"
 msgstr ""
 
-#: ../fdroidserver/metadata.py
-#, python-format
-msgid "Including metadata from %s@%s"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Including metadata from {path}"
-msgstr ""
-
 #: ../fdroidserver/common.py
 msgid "Initialising submodules"
 msgstr ""
@@ -981,58 +957,85 @@ msgstr ""
 msgid "Install all signed applications available"
 msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Install built packages on devices"
-msgstr "Gebouwde pakketten installeren op apparaten"
+msgstr ""
 
 #: ../fdroidserver/install.py
 #, python-format
 msgid "Installing %s..."
 msgstr ""
 
+#: ../fdroidserver/install.py
+#, python-format
+msgid "Installing %s…"
+msgstr ""
+
 #: ../fdroidserver/install.py
 #, python-brace-format
 msgid "Installing '{apkfilename}' on {dev}..."
 msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroidserver/install.py
+#, python-brace-format
+msgid "Installing '{apkfilename}' on {dev}…"
+msgstr ""
+
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Interact with the repo HTTP server"
-msgstr "Communiceren met de repo HTTP-server"
+msgstr ""
 
 #: ../fdroidserver/update.py
 msgid "Invalid APK"
 msgstr ""
 
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "Invalid AutoUpdateMode: {mode}"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "Invalid UpdateCheckMode: {mode}"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
+#: ../fdroidserver/lint.py ../fdroidserver/checkupdates.py
 #, python-brace-format
 msgid "Invalid VercodeOperation: {field}"
 msgstr ""
 
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Invalid VercodeOperation: {invalid_ops}"
-msgstr ""
-
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "Invalid application ID {appid}"
 msgstr ""
 
+#: ../fdroidserver/metadata.py
+#, python-format
+msgid "Invalid boolean '%s'"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Invalid build flag at {line} in {linedesc}"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Invalid build format: {value} in {name}"
+msgstr ""
+
 #: ../fdroidserver/lint.py
 msgid "Invalid bulleted list"
 msgstr ""
 
+#: ../fdroidserver/lint.py
+#, python-format
+msgid "Invalid license tag \"%s\"! Use only tags from https://spdx.org/license-list"
+msgstr ""
+
+#: ../fdroidserver/lint.py
+msgid "Invalid link - use [http://foo.bar Link title] or [http://foo.bar]"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+#, python-format
+msgid "Invalid metadata in %s:%d"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+msgid "Invalid metadata in: "
+msgstr ""
+
 #: ../fdroidserver/common.py
 #, python-format
 msgid "Invalid name for published file: %s"
@@ -1040,7 +1043,7 @@ msgstr ""
 
 #: ../fdroidserver/common.py
 #, python-brace-format
-msgid "Invalid ndk: entry in build: \"{ndk}\""
+msgid "Invalid package name {0}"
 msgstr ""
 
 #: ../fdroidserver/common.py
@@ -1063,6 +1066,11 @@ msgstr ""
 msgid "Invalid srclib metadata: unknown key '{key}' in '{file}'"
 msgstr ""
 
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Invalid versionCode: \"{versionCode}\" is not an integer!"
+msgstr ""
+
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "JAR signature failed to verify: {path}"
@@ -1077,8 +1085,8 @@ msgstr ""
 msgid "Java JAR file"
 msgstr ""
 
-#: ../fdroidserver/mirror.py ../fdroidserver/publish.py
-#: ../fdroidserver/update.py
+#: ../fdroidserver/publish.py ../fdroidserver/update.py
+#: ../fdroidserver/mirror.py
 msgid "Java JDK not found! Install in standard location or set java_paths!"
 msgstr ""
 
@@ -1094,19 +1102,10 @@ msgstr ""
 msgid "Javascript in HTML src attributes"
 msgstr ""
 
-#: ../fdroidserver/build.py
-#, python-brace-format
-msgid "Keeping failed build \"{apkfilename}\""
-msgstr ""
-
 #: ../fdroidserver/init.py
 msgid "Keystore for signing key:\t"
 msgstr ""
 
-#: ../fdroidserver/lint.py
-msgid "Known debug key is used in AllowedAPKSigningKeys: "
-msgstr ""
-
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "Last used commit '{commit}' looks like a tag, but UpdateCheckMode is '{ucm}'"
@@ -1116,8 +1115,12 @@ msgstr ""
 msgid "Liberapay donation methods belong in the Liberapay: field"
 msgstr ""
 
+#: ../fdroidserver/lint.py
+msgid "Liberapay donation methods belong in the LiberapayID flag"
+msgstr ""
+
 #: ../fdroidserver/rewritemeta.py
-msgid "List files that would be reformatted (dry run)"
+msgid "List files that would be reformatted"
 msgstr ""
 
 #: ../fdroidserver/lint.py
@@ -1136,16 +1139,6 @@ msgstr ""
 msgid "Malformed serverwebroot line:"
 msgstr ""
 
-#: ../fdroidserver/scanner.py
-#, python-format
-msgid "Max recursion depth in ZIP file reached: %s"
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "Mirror config for {url} contains \"isPrimary\" key!"
-msgstr ""
-
 #: ../fdroidserver/mirror.py
 msgid "Mirror the full repo and archive, all file types."
 msgstr ""
@@ -1154,29 +1147,30 @@ msgstr ""
 msgid "Missing output directory"
 msgstr ""
 
-#: ../fdroidserver/metadata.py
-msgid "Moving Anti-Features declarations to localized files:"
-msgstr ""
-
-#: ../fdroidserver/index.py
-msgid "Neither \"repo_pubkey\" nor \"keystorepass\" set in config.yml"
-msgstr ""
-
-#: ../fdroidserver/verify.py
+#: ../fdroidserver/lint.py
 #, python-format
-msgid "No APK for package: %s"
+msgid "Name '%s' is just the auto name - remove it"
+msgstr ""
+
+#: ../fdroidserver/common.py
+msgid "No 'config.py' found, using defaults."
 msgstr ""
 
 #: ../fdroidserver/common.py
 msgid "No Android SDK found!"
 msgstr ""
 
+#: ../fdroidserver/import.py
+msgid "No android or kivy project could be found. Specify --subdir?"
+msgstr ""
+
 #: ../fdroidserver/install.py
 msgid "No attached devices found"
 msgstr ""
 
-#: ../fdroidserver/install.py
-msgid "No devices found for `adb install`! Please plug one in."
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "No commit specified for {versionName} in {linedesc}"
 msgstr ""
 
 #: ../fdroidserver/index.py
@@ -1187,23 +1181,14 @@ msgstr ""
 msgid "No git submodules available"
 msgstr ""
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "No gradle project could be found. Specify --subdir?"
 msgstr ""
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py ../fdroidserver/common.py
 msgid "No information found."
 msgstr ""
 
-#: ../fdroidserver/checkupdates.py
-msgid "No matching tags found"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "No minimum SDK version found in {0}, using default (3)."
-msgstr ""
-
 #: ../fdroidserver/lint.py
 msgid "No need to specify that the app is Free Software"
 msgstr ""
@@ -1213,7 +1198,7 @@ msgid "No need to specify that the app is for Android"
 msgstr ""
 
 #: ../fdroidserver/deploy.py
-msgid "No option set! Edit your config.yml to set at least one of these:"
+msgid "No option set! Edit your config.py to set at least one of these:"
 msgstr ""
 
 #: ../fdroidserver/common.py
@@ -1222,14 +1207,14 @@ msgstr ""
 
 #: ../fdroidserver/install.py
 #, python-format
-msgid "No signed APK available for %s"
+msgid "No signed apk available for %s"
 msgstr ""
 
 #: ../fdroidserver/install.py
 msgid "No signed output directory - nothing to do"
 msgstr ""
 
-#: ../fdroidserver/common.py
+#: ../fdroidserver/update.py ../fdroidserver/common.py
 #, python-brace-format
 msgid "No signing certificates found in {path}"
 msgstr ""
@@ -1239,23 +1224,16 @@ msgstr ""
 msgid "No such package: %s"
 msgstr ""
 
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "No such versionCode {versionCode} for app {appid}"
 msgstr ""
 
-#: ../fdroidserver/checkupdates.py
-msgid "No tags found"
-msgstr ""
-
-#: ../fdroidserver/publish.py ../fdroidserver/verify.py
+#: ../fdroidserver/verify.py ../fdroidserver/publish.py
 msgid "No unsigned directory - nothing to do"
 msgstr ""
 
-#: ../fdroidserver/__main__.py
-msgid "No version information could be found."
-msgstr ""
-
 #: ../fdroidserver/common.py
 msgid "Not a valid size definition: \"{}\""
 msgstr ""
@@ -1270,9 +1248,10 @@ msgid "Nothing to do for {appid}."
 msgstr ""
 
 #: ../fdroidserver/init.py
-msgid "Now set these in config.yml:"
+msgid "Now set these in config.py:"
 msgstr ""
 
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "OBB file has newer versionCode({integer}) than any APK:"
@@ -1290,27 +1269,22 @@ msgstr ""
 msgid "Offline machine, skipping git mirror generation until `fdroid deploy`"
 msgstr ""
 
-#: ../fdroidserver/deploy.py
-msgid "One of the 'github_releases' config items is missing the 'packageNames' value. skipping ..."
+#: ../fdroidserver/common.py
+#, python-brace-format
+msgid "Old APK signature failed to verify: {path}"
 msgstr ""
 
-#: ../fdroidserver/deploy.py
-msgid "One of the 'github_releases' config items is missing the 'projectUrl' value. skipping ..."
+#: ../fdroid ../fdroidserver/__main__.py
+msgid "Old, deprecated name for fdroid deploy"
 msgstr ""
 
-#: ../fdroidserver/deploy.py
-msgid "One of the 'github_releases' config items is missing the 'token' value. skipping ..."
-msgstr ""
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Only PNG and JPEG are supported for graphics, found: {path}"
 msgstr ""
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/common.py
-msgid "Only accepts a single key \"env\""
+#: ../fdroidserver/checkupdates.py
+msgid "Only print differences with the Play Store"
 msgstr ""
 
 #: ../fdroidserver/checkupdates.py
@@ -1321,6 +1295,11 @@ msgstr ""
 msgid "OpenCollective donation methods belong in the OpenCollective: field"
 msgstr ""
 
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "Options"
+msgstr "Opties"
+
 #: ../fdroidserver/verify.py
 msgid "Output JSON report to file named after APK."
 msgstr ""
@@ -1329,22 +1308,26 @@ msgstr ""
 msgid "Output JSON to stdout."
 msgstr ""
 
-#: ../fdroidserver/checkupdates.py ../fdroidserver/gpgsign.py
-#: ../fdroidserver/publish.py ../fdroidserver/signindex.py
-#: ../fdroidserver/update.py
+#: ../fdroidserver/gpgsign.py ../fdroidserver/publish.py
+#: ../fdroidserver/update.py ../fdroidserver/signindex.py
+#: ../fdroidserver/checkupdates.py
 msgid "Outputting JSON"
 msgstr ""
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "Overall license of the project."
 msgstr ""
 
+#: ../fdroidserver/dscanner.py
+msgid "Override path for repo APKs (default: ./repo)"
+msgstr ""
+
 #: ../fdroidserver/index.py
 #, python-brace-format
 msgid "Overriding blank versionName in {apkfilename} from metadata: {version}"
 msgstr ""
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 #, python-brace-format
 msgid "Package \"{appid}\" already exists"
 msgstr ""
@@ -1358,10 +1341,13 @@ msgstr ""
 msgid "Password required with username"
 msgstr ""
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "Path to main Android project subdirectory, if not in root."
 msgstr ""
 
+msgid "Path to main android project subdirectory, if not in root."
+msgstr ""
+
 #: ../fdroidserver/init.py
 msgid "Path to the Android SDK (sometimes set in ANDROID_HOME)"
 msgstr ""
@@ -1374,18 +1360,20 @@ msgstr ""
 msgid "Path to the keystore for the repo signing key"
 msgstr ""
 
+#: ../fdroidserver/dscanner.py
+msgid "Prepare Drozer to run a scan"
+msgstr ""
+
+msgid "Prepare drozer to run a scan"
+msgstr ""
+
 #: ../fdroidserver/nightly.py
 msgid "Print the secret variable to the terminal for easy copy/paste"
 msgstr ""
 
-#: ../fdroidserver/install.py
+#: ../fdroidserver/metadata.py
 #, python-brace-format
-msgid "Privacy mode was enabled based on your locale ({country_code})."
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-format
-msgid "Problem with ZIP file: %s, error %s"
+msgid "Problem with description of {appid}: {error}"
 msgstr ""
 
 #: ../fdroidserver/common.py
@@ -1411,7 +1399,11 @@ msgstr ""
 msgid "Produce human-readable XML/JSON for index files"
 msgstr ""
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/update.py
+msgid "Produce human-readable index.xml"
+msgstr ""
+
+#: ../fdroidserver/import.py
 msgid "Project URL to import from."
 msgstr ""
 
@@ -1423,27 +1415,23 @@ msgstr ""
 msgid "Push the log to this git remote repository"
 msgstr ""
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Pushing binary transparency log to {url}"
 msgstr ""
 
-#: ../fdroidserver/deploy.py
-msgid "Pushing to remote server failed!"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Pushing to {url}"
 msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Quickly start a new repository"
-msgstr "Snel een nieuw databank starten"
+msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Read all the metadata files and exit"
-msgstr "Lees alle metagegevensbestanden en sluit af"
+msgstr ""
 
 #: ../fdroidserver/common.py
 #, python-brace-format
@@ -1452,12 +1440,14 @@ msgstr ""
 
 #: ../fdroidserver/common.py
 #, python-brace-format
-msgid "Reading packageName/versionCode/versionName failed, APK invalid: '{apkfilename}'"
+msgid "Reading minSdkVersion failed: \"{apkfilename}\""
 msgstr ""
 
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
+#. https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
 #: ../fdroidserver/common.py
 #, python-brace-format
-msgid "Reading packageName/versionCode/versionName failed,APK invalid: '{apkfilename}'"
+msgid "Reading packageName/versionCode/versionName failed, APK invalid: '{apkfilename}'"
 msgstr ""
 
 #: ../fdroidserver/update.py
@@ -1465,17 +1455,8 @@ msgstr ""
 msgid "Reading {apkfilename} from cache"
 msgstr ""
 
-#: ../fdroidserver/build.py
-msgid "Refresh and cache scanner rules and signatures from the network"
-msgstr ""
-
-#: ../fdroidserver/publish.py
-#, python-brace-format
-msgid "Refusing to sign '{path}', file exists in both {dir1} and {dir2} folder."
-msgstr ""
-
-#: ../fdroidserver/verify.py
-msgid "Remove source tarball and any APKs if successfully verified."
+#: ../fdroidserver/stats.py
+msgid "Recalculate aggregate stats - use when changes have been made that would invalidate old cached data."
 msgstr ""
 
 #: ../fdroidserver/common.py
@@ -1483,17 +1464,15 @@ msgid "Removing specified files"
 msgstr ""
 
 #: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Removing {path}\""
+msgid "Rename APK files that do not match package.name_123.apk"
 msgstr ""
 
 #: ../fdroidserver/update.py
-msgid "Rename APK files that do not match package.name_123.apk"
-msgstr "Hernoem APK-bestanden die niet overeenkomen met pakket.naam_123.apk"
+msgid "Report on build data status"
+msgstr ""
 
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "RepoType {type} is deprecated, please switch to git."
+#: ../fdroidserver/build.py
+msgid "Reset and create a brand new build server, even if the existing one appears to be ok."
 msgstr ""
 
 #: ../fdroidserver/nightly.py
@@ -1509,34 +1488,33 @@ msgstr ""
 msgid "Restrict output to warnings and errors"
 msgstr ""
 
-#: ../fdroidserver/net.py
-#, python-format
-msgid "Retrying failed download: %s"
+#: ../fdroid ../fdroidserver/__main__.py
+msgid "Rewrite all the metadata files"
 msgstr ""
 
-#: ../fdroidserver/__main__.py
-msgid "Rewrite all the metadata files"
-msgstr "Herschrijf alle metadatabestanden"
+#: ../fdroidserver/rewritemeta.py
+msgid "Rewrite to a specific format: "
+msgstr ""
 
 #: ../fdroidserver/rewritemeta.py
 #, python-brace-format
 msgid "Rewriting '{appid}'"
 msgstr ""
 
-#: ../fdroidserver/checkupdates.py
-msgid "Run on git repo that has uncommitted changes"
+#: ../fdroidserver/rewritemeta.py
+#, python-brace-format
+msgid "Rewriting '{appid}' to '{path}'"
 msgstr ""
 
-#: ../fdroidserver/nightly.py
-#, python-brace-format
-msgid "Run over {cibase} to find -debug.apk. and skip repo_basedir {repo_basedir}"
+#: ../fdroidserver/checkupdates.py
+msgid "Run on git repo that has uncommitted changes"
 msgstr ""
 
 #: ../fdroidserver/lint.py
 msgid "Run rewritemeta to fix formatting"
 msgstr ""
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 msgid "Running first pass with MD5 checking disabled"
 msgstr ""
 
@@ -1545,22 +1523,16 @@ msgstr ""
 msgid "Running wget in {path}"
 msgstr ""
 
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "SHA-256 of {url} does not match entry!"
+#: ../fdroidserver/dscanner.py
+msgid "Scan only the latest version of each package"
 msgstr ""
 
 #: ../fdroidserver/build.py
 msgid "Scan the resulting APK(s) for known non-free classes."
 msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Scan the source code of a package"
-msgstr "De broncode van een pakket scannen"
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Scanner found {count} problems in {apk}"
 msgstr ""
 
 #: ../fdroidserver/scanner.py
@@ -1579,19 +1551,6 @@ msgid_plural "Scanner found {} problems"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../fdroidserver/scanner.py
-msgid "Scanning APK for extra signing blocks."
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "Scanning APK with dexdump for known non-free classes."
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Set NDK {release} ({version}) up"
-msgstr ""
-
 #: ../fdroidserver/common.py
 msgid "Set clock to that time using:"
 msgstr ""
@@ -1605,7 +1564,7 @@ msgstr ""
 msgid "Set open file limit to {integer}"
 msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Set up an app build for a nightly build repo"
 msgstr ""
 
@@ -1618,13 +1577,20 @@ msgstr ""
 msgid "Setting {0} sec timeout for this build"
 msgstr ""
 
-#: ../fdroidserver/__main__.py
-msgid "Sign and place packages in the repo"
-msgstr "Pakketten ondertekenen en in de repo plaatsen"
+#: ../fdroidserver/build.py
+msgid "Setup an emulator, install the APK on it and perform a Drozer scan"
+msgstr ""
 
-#: ../fdroidserver/__main__.py
+msgid "Setup an emulator, install the apk on it and perform a drozer scan"
+msgstr ""
+
+#: ../fdroid ../fdroidserver/__main__.py
+msgid "Sign and place packages in the repo"
+msgstr ""
+
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Sign indexes created using update --nosign"
-msgstr "Onderteken indexen die zijn aangemaakt met update --nosign"
+msgstr ""
 
 #: ../fdroidserver/build.py
 msgid "Skip scanning the source code for binaries and other problems"
@@ -1635,11 +1601,6 @@ msgstr ""
 msgid "Skipping '{apkfilename}' with invalid signature!"
 msgstr ""
 
-#: ../fdroidserver/deploy.py ../fdroidserver/index.py
-#, python-format
-msgid "Skipping GitLab Pages mirror because the repo is too large (>%.2fGB)!"
-msgstr ""
-
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Skipping index generation for {appid}"
@@ -1655,14 +1616,23 @@ msgstr ""
 msgid "Skipping {appid}: disabled"
 msgstr ""
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/scanner.py
+#, python-brace-format
+msgid "Skipping {appid}: no builds specified"
+msgstr ""
+
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 msgid "Specify a local folder to sync the repo to"
 msgstr ""
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 msgid "Specify an identity file to provide to SSH for rsyncing"
 msgstr ""
 
+#: ../fdroidserver/build.py
+msgid "Specify that we're running on the build server"
+msgstr ""
+
 #: ../fdroidserver/nightly.py
 msgid "Specify which debug keystore file to use."
 msgstr ""
@@ -1671,6 +1641,11 @@ msgstr ""
 msgid "Spew out even more information than normal"
 msgstr ""
 
+#: ../fdroidserver/nightly.py
+#, python-brace-format
+msgid "Striping mystery signature from {apkfilename}"
+msgstr ""
+
 #: ../fdroidserver/nightly.py
 #, python-brace-format
 msgid "Stripping mystery signature from {apkfilename}"
@@ -1691,22 +1666,10 @@ msgstr ""
 msgid "System clock is older than date in {path}!"
 msgstr ""
 
-#: ../fdroidserver/checkupdates.py
-msgid "Tags update mode only works for git, hg, bzr and git-svn repositories currently"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "Tags update mode used in git-svn, but the repo was not set up with tags"
-msgstr ""
-
 #: ../fdroidserver/build.py
 msgid "Test mode - put output in the tmp directory only, and always build, even if the output already exists."
 msgstr ""
 
-#: ../fdroidserver/index.py
-msgid "The \"qrcode\" Python package is not installed (e.g. apt-get install python3-qrcode)!"
-msgstr ""
-
 #. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
 #: ../fdroidserver/update.py
 #, python-brace-format
@@ -1725,10 +1688,18 @@ msgstr ""
 msgid "The file to be included in the repo (path or glob)"
 msgstr ""
 
+#: ../fdroidserver/deploy.py
+msgid "The only commands currently supported are 'init' and 'update'"
+msgstr ""
+
 #: ../fdroidserver/index.py
 msgid "The repository's fingerprint does not match."
 msgstr ""
 
+#: ../fdroidserver/common.py
+msgid "The repository's index could not be verified."
+msgstr ""
+
 #: ../fdroidserver/deploy.py
 #, python-brace-format
 msgid "The root dir for local_copy_dir \"{path}\" does not exist!"
@@ -1742,37 +1713,13 @@ msgstr ""
 msgid "These are the apps that have been archived from the main repo."
 msgstr ""
 
-#: ../fdroidserver/mirror.py
-msgid "This command should never be used to mirror f-droid.org! A full copy requires more than 600GB."
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "This is a repository of apps to be used with F-Droid. Applications in this repository are either official binaries built by the original application developers, or are binaries built from source by the admin of f-droid.org using the tools on https://gitlab.com/fdroid."
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 #, python-format
 msgid "This repo already has local metadata: %s"
 msgstr ""
 
-#: ../fdroidserver/init.py
-#, python-format
-msgid ""
-"To complete the setup, add your APKs to \"%s\"\n"
-"then run \"fdroid update -c; fdroid update\".  You might also want to edit\n"
-"\"config.yml\" to set the URL, repo name, and more.  You should also set up\n"
-"a signing key (a temporary one might have been automatically generated).\n"
-"\n"
-"For more info: https://f-droid.org/docs/Setup_an_F-Droid_App_Repo\n"
-"and https://f-droid.org/docs/Signing_Process"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "To use awsbucket, awssecretkey and awsaccesskeyid must also be set in config.yml!"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "To use rclone, rclone_config and awsbucket must be set in config.yml!"
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
+msgid "To use awsbucket, awssecretkey and awsaccesskeyid must also be set in config.py!"
 msgstr ""
 
 #: ../fdroidserver/lint.py
@@ -1783,6 +1730,10 @@ msgstr ""
 msgid "URL shorteners should not be used"
 msgstr ""
 
+#: ../fdroidserver/metadata.py
+msgid "URL title is just the URL, use brackets: [URL]"
+msgstr ""
+
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "URL {url} in Description: {error}"
@@ -1796,15 +1747,16 @@ msgstr ""
 msgid "Unexpected license tag \"{}\"! Only use license tags configured in your config file"
 msgstr ""
 
-#: ../fdroidserver/common.py
+#: ../fdroidserver/metadata.py
 #, python-brace-format
-msgid "Unknown entry {key} in {configname}"
+msgid "Unexpected text on same line as {field} in {linedesc}"
 msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Unknown exception found!"
 msgstr "Onbekende uitzondering gevonden!"
 
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "Unknown file '{filename}' in build '{versionName}'"
@@ -1815,6 +1767,11 @@ msgstr ""
 msgid "Unknown metadata format: %s"
 msgstr ""
 
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Unknown metadata format: {path}"
+msgstr ""
+
 #: ../fdroidserver/metadata.py
 #, python-brace-format
 msgid "Unknown metadata format: {path} (use: *.yml)"
@@ -1824,6 +1781,10 @@ msgstr ""
 msgid "Unknown version of aapt, might cause problems: "
 msgstr ""
 
+#: ../fdroidserver/lint.py
+msgid "Unlinkified link - use [http://foo.bar Link title] or [http://foo.bar]"
+msgstr ""
+
 #: ../fdroidserver/lint.py
 msgid "Unnecessary leading space"
 msgstr ""
@@ -1837,12 +1798,20 @@ msgstr ""
 msgid "Unrecognised app field '{fieldname}' in '{path}'"
 msgstr ""
 
+#: ../fdroidserver/metadata.py
+msgid "Unrecognised app field: "
+msgstr ""
+
 #: ../fdroidserver/metadata.py
 #, python-brace-format
 msgid "Unrecognised build flag '{build_flag}' in '{path}'"
 msgstr ""
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Unrecognised field '{field}' in {linedesc}"
+msgstr ""
+
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Unsupported file type \"{extension}\" for repo graphic"
@@ -1853,6 +1822,29 @@ msgstr ""
 msgid "Unsupported graphics file found: {path}"
 msgstr ""
 
+#: ../fdroidserver/rewritemeta.py
+#, python-brace-format
+msgid "Unsupported metadata format, use: --to [{supported}]"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+msgid "Unterminated ]"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+msgid "Unterminated ]]"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Unterminated build in {name}"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Unterminated continuation in {name}"
+msgstr ""
+
 #: ../fdroidserver/lint.py
 #, python-format
 msgid "Unused extlib at %s"
@@ -1873,25 +1865,27 @@ msgstr ""
 msgid "Unused scanignore path: %s"
 msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Update repo information for new packages"
-msgstr "Repo informatie bijwerken voor nieuwe pakketten"
+msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Update the binary transparency log for a URL"
-msgstr "Het binaire transparantielogboek bijwerken voor een URL"
+msgstr ""
+
+#: ../fdroid ../fdroidserver/__main__.py
+msgid "Update the stats of the repo"
+msgstr ""
+
+#: ../fdroidserver/update.py ../fdroidserver/build.py
+msgid "Update the wiki"
+msgstr ""
 
 #: ../fdroidserver/checkupdates.py
 #, python-brace-format
 msgid "UpdateCheckData has invalid URL: {url}"
 msgstr ""
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "UpdateCheckData must match the version code as integer (\\d or [0-9]): {codeex}"
-msgstr ""
-
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "UpdateCheckData must use HTTPS URL: {url}"
@@ -1903,10 +1897,14 @@ msgid "UpdateCheckData not a valid URL: {url}"
 msgstr ""
 
 #: ../fdroidserver/lint.py
-msgid "UpdateCheckMode is set but it looks like checkupdates hasn't been run yet."
+msgid "UpdateCheckMode is set but it looks like checkupdates hasn't been run yet"
+msgstr ""
+
+#. Translators: https://developer.android.com/studio/build/application-id
+#: ../fdroidserver/lint.py
+msgid "UpdateCheckName is set to the known application ID - it can be removed"
 msgstr ""
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
 #: ../fdroidserver/lint.py
 msgid "UpdateCheckName is set to the known application ID, it can be removed"
 msgstr ""
@@ -1921,8 +1919,19 @@ msgstr ""
 msgid "Uploading {apkfilename} to virustotal"
 msgstr ""
 
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "Usage"
+msgstr "Gebruik"
+
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, python-format
+msgid "Usage: %s\n"
+msgstr "Gebruik: %s\n"
+
 #: ../fdroidserver/lint.py
-msgid "Use /HEAD instead of /master or /main to point at a file in the default branch"
+msgid "Use /HEAD instead of /master to point at a file in the default branch"
 msgstr ""
 
 #: ../fdroidserver/update.py
@@ -1937,14 +1946,12 @@ msgstr ""
 msgid "Use date from APK instead of current time for newly added APKs"
 msgstr ""
 
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Using \"{path}\" for configuring s3cmd."
+msgid "Use date from apk instead of current time for newly added apks"
 msgstr ""
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
-msgid "Using \"{path}\" for syncing with remote storage."
+msgid "Using \"{path}\" for configuring s3cmd."
 msgstr ""
 
 #: ../fdroidserver/common.py
@@ -1955,17 +1962,13 @@ msgstr ""
 msgid "Using APK Signature v3"
 msgstr ""
 
-#: ../fdroidserver/common.py
-msgid "Using JAR Signature"
-msgstr ""
-
 #: ../fdroidserver/common.py
 msgid "Using Java's jarsigner, not recommended for verifying APKs! Use apksigner"
 msgstr ""
 
-#: ../fdroidserver/metadata.py
+#: ../fdroidserver/common.py
 #, python-brace-format
-msgid "Using blank dictionary instead of contents of {path}!"
+msgid "Using androguard from \"{path}\""
 msgstr ""
 
 #: ../fdroidserver/init.py
@@ -1973,17 +1976,12 @@ msgstr ""
 msgid "Using existing keystore \"{path}\""
 msgstr ""
 
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Using rclone to sync with: {url}"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Using s3cmd to sync with: {url}"
 msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Valid commands are:"
 msgstr "Geldige opdrachten zijn:"
 
@@ -1991,34 +1989,21 @@ msgstr "Geldige opdrachten zijn:"
 msgid "Verify against locally cached copy rather than redownloading."
 msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Verify the integrity of downloaded packages"
-msgstr "De integriteit van gedownloade pakketten controleren"
+msgstr ""
 
 #: ../fdroidserver/index.py
 msgid "Verifying index signature:"
 msgstr ""
 
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "Verifying package {path} with apksigner."
-msgstr ""
-
 #: ../fdroidserver/deploy.py
 #, python-brace-format
 msgid "VirusTotal API key cannot upload files larger than 32MB, use {url} to upload {path}."
 msgstr ""
 
-#: ../fdroidserver/nightly.py
-msgid "WARNING: only public git repos are supported!"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Warn about possible metadata errors"
-msgstr "Waarschuwen voor mogelijke metadata fouten"
-
-#: ../fdroidserver/scanner.py
-msgid "WebAssembly binary file"
 msgstr ""
 
 #: ../fdroidserver/update.py
@@ -2029,16 +2014,7 @@ msgstr ""
 msgid "When linting the entire repository yamllint is disabled by default. This option forces yamllint regardless."
 msgstr ""
 
-#: ../fdroidserver/publish.py
-msgid "When signing or verifying fails, exit with an error code."
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "Would you like to download and install F-Droid.apk via adb? (YES/no)"
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "Would you like to download the app(s) from f-droid.org? (YES/no)"
+msgid "X.509 'Distiguished Name' used when generating keys"
 msgstr ""
 
 #: ../fdroidserver/init.py
@@ -2053,11 +2029,6 @@ msgstr ""
 msgid "ZIP file archive"
 msgstr ""
 
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "adb reports {serial} is \"{status}\"!"
-msgstr ""
-
 #: ../fdroidserver/nightly.py
 #, python-brace-format
 msgid "adding IdentityFile to {path}"
@@ -2068,66 +2039,70 @@ msgstr ""
 msgid "adding to {name}: {path}"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "ambiguous option: %(option)s could match %(matches)s"
-msgstr "dubbelzinnige optie: %(option)s kan overeenkomen met %(matches)s"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "apksigner in build-tools;{version} passes APKs with invalid v3 signatures, ignoring."
 msgstr ""
 
-#: ../fdroidserver/common.py
-msgid "apksigner not found! Cannot sign or verify modern APKs"
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, python-format
+msgid "ambiguous option: %s (%s?)"
 msgstr ""
 
 #: ../fdroidserver/common.py
 msgid "apksigner not found, it's required for signing!"
 msgstr ""
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/checkupdates.py ../fdroidserver/lint.py
-#: ../fdroidserver/rewritemeta.py
+#: ../fdroidserver/lint.py ../fdroidserver/rewritemeta.py
+#: ../fdroidserver/checkupdates.py
 msgid "application ID of file to operate on"
 msgstr ""
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/build.py ../fdroidserver/install.py
-#: ../fdroidserver/publish.py ../fdroidserver/scanner.py
-#: ../fdroidserver/verify.py
+#: ../fdroidserver/verify.py ../fdroidserver/publish.py
+#: ../fdroidserver/build.py ../fdroidserver/scanner.py
+#: ../fdroidserver/install.py
 msgid "application ID with optional versionCode in the form APPID[:VERCODE]"
 msgstr ""
 
-#: ../fdroidserver/common.py
-msgid "archive_url needs to end with /archive"
+#: ../fdroidserver/lint.py ../fdroidserver/rewritemeta.py
+msgid "applicationId in the form APPID"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: ../fdroidserver/checkupdates.py
+msgid "applicationId to check for updates"
+msgstr ""
+
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
+#: ../fdroidserver/verify.py ../fdroidserver/publish.py
+#: ../fdroidserver/dscanner.py ../fdroidserver/build.py
+#: ../fdroidserver/scanner.py ../fdroidserver/install.py
+msgid "applicationId with optional versionCode in the form APPID[:VERCODE]"
+msgstr ""
+
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "argument \"-\" with mode %r"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "argument %(argument_name)s: %(message)s"
-msgstr ""
-
 #: ../fdroidserver/nightly.py
 msgid "attempting bare SSH connection to test deploy key:"
 msgstr ""
 
+#: ../fdroidserver/nightly.py
+msgid "attempting bare ssh connection to test deploy key:"
+msgstr ""
+
 #: ../fdroidserver/common.py
 msgid "can not parse scrlib spec (not a string): '{}'"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
-msgid "can't open '%(filename)s': %(error)s"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "can't open non-https url: '{};"
+msgid "can't open '%s': %s"
 msgstr ""
 
 #: ../fdroidserver/build.py
@@ -2135,11 +2110,13 @@ msgstr ""
 msgid "cannot find required srclibs: \"{path}\""
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "cannot have multiple subparser arguments"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "cannot merge actions - two groups are named %r"
 msgstr ""
@@ -2153,25 +2130,30 @@ msgstr ""
 msgid "cloning {url}"
 msgstr ""
 
+#: ../fdroidserver/deploy.py
+msgid "command to execute, either 'init' or 'update'"
+msgstr ""
+
 #: ../fdroidserver/__main__.py
 msgid "commands from plugin modules:"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "complex"
+msgstr ""
+
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "conflicting option string: %s"
 msgid_plural "conflicting option strings: %s"
 msgstr[0] ""
 msgstr[1] ""
 
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "conflicting subparser alias: %s"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "conflicting subparser: %s"
+#: ../fdroidserver/nightly.py
+#, python-brace-format
+msgid "copying {apkfilename} into {path}"
 msgstr ""
 
 #: ../fdroidserver/metadata.py
@@ -2180,11 +2162,11 @@ msgid "could not parse '{path}'"
 msgstr ""
 
 #: ../fdroidserver/common.py
-msgid "could not parse srclib spec (no name specified): '{}'"
+msgid "could not parse srclib spec (no ref specified): '{}'"
 msgstr ""
 
 #: ../fdroidserver/common.py
-msgid "could not parse srclib spec (no ref specified): '{}'"
+msgid "could not parse srclib spec (too many '@' signs): '{}'"
 msgstr ""
 
 #: ../fdroidserver/nightly.py
@@ -2192,18 +2174,14 @@ msgstr ""
 msgid "created {path}"
 msgstr ""
 
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "current version is newer: old vercode={old}, new vercode={new}"
-msgstr ""
-
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "deleting: repo/{apkfilename}"
 msgstr ""
 
-#: ../fdroidserver/scanner.py
-msgid "dependency file without lock"
+#: ../fdroidserver/common.py
+#, python-brace-format
+msgid "deployed build logs to '{path}'"
 msgstr ""
 
 #: ../fdroidserver/common.py
@@ -2211,48 +2189,59 @@ msgstr ""
 msgid "deployed process log {path} to {dest}"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "dest= is required for options like %r"
 msgstr ""
 
-#: ../fdroidserver/scanner.py
-msgid "downloading '{}'"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "downloading scanner signatures from '{}' failed"
-msgstr ""
-
 #: ../fdroidserver/scanner.py
 msgid "executable binary, possibly code"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "expected %s argument"
 msgid_plural "expected %s arguments"
 msgstr[0] ""
 msgstr[1] ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "expected at least one argument"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "expected at most one argument"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "expected one argument"
 msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroidserver/common.py
+#, python-brace-format
+msgid "failed deploying build logs to '{path}'"
+msgstr ""
+
+#: ../fdroid
+msgid "fdroid [-h|--help|--version] <command> [<args>]"
+msgstr ""
+
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "fdroid [<command>] [-h|--help|--version|<args>]"
 msgstr ""
 
-#: ../fdroidserver/scanner.py
-msgid "fetch the latest version of signatures from the web"
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "floating-point"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+msgid "force errors to be warnings, or ignore"
 msgstr ""
 
 #: ../fdroidserver/metadata.py
@@ -2267,7 +2256,8 @@ msgstr ""
 msgid "gzip file archive"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "ignored explicit argument %r"
 msgstr ""
@@ -2276,39 +2266,35 @@ msgstr ""
 msgid "index-v1 must have a signature, use `fdroid signindex` to create it!"
 msgstr ""
 
-#: ../fdroidserver/index.py
-msgid "index-v2 must have a signature, use `fdroid signindex` to create it!"
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "integer"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "invalid %(type)s value: %(value)r"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "invalid choice: %(value)r (choose from %(choices)s)"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "invalid conflict_resolution value: %r"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "invalid option string %(option)r: must start with a character %(prefix_chars)r"
 msgstr ""
 
-#: ../fdroidserver/common.py
-msgid "ipfs_cid not found, skipping CIDv1 generation"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "latest build recipe is newer: old vercode={old}, new vercode={new}"
-msgstr ""
-
 #: ../fdroidserver/deploy.py
 #, python-brace-format
 msgid "local_copy_dir does not end with \"fdroid\", perhaps you meant: \"{path}\""
@@ -2327,20 +2313,11 @@ msgstr ""
 msgid "mirror '%s' does not end with 'fdroid'!"
 msgstr ""
 
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "mirrors set twice, in config.yml and {path}!"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "mutually exclusive arguments must be optional"
 msgstr ""
 
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "next {name} cache update due in {time}"
-msgstr ""
-
 #: ../fdroidserver/mirror.py
 #, python-brace-format
 msgid "no \"icon\" in {appid}"
@@ -2350,90 +2327,141 @@ msgstr ""
 msgid "no APK supplied"
 msgstr ""
 
-#: ../fdroidserver/checkupdates.py
-msgid "no version information found"
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, python-format
+msgid "no such option: %s"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: ../fdroid ../fdroidserver/__main__.py
+msgid "no version info found!"
+msgstr ""
+
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "not allowed with argument %s"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "one of the arguments %s is required"
 msgstr ""
 
-#: ../fdroidserver/common.py ../fdroidserver/index.py
+#: ../fdroidserver/index.py ../fdroidserver/common.py
 msgid "only accepts strings, lists, and tuples"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
-#, fuzzy
-msgid "options"
-msgstr "Opties"
+#: ../fdroidserver/install.py
+#, python-format
+msgid "option %s: If you really want to install all the signed apps, use --all"
+msgstr ""
+
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, python-format
+msgid "option %s: invalid %s value: %r"
+msgstr ""
+
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, python-format
+msgid "option %s: invalid choice: %r (choose from %s)"
+msgstr ""
+
+#: /usr/lib/python3.5/getopt.py /usr/lib/python3.6/getopt.py
+#: /usr/lib/python3.7/getopt.py
+#, python-format
+msgid "option -%s not recognized"
+msgstr "optie -%s wordt niet herkend"
+
+#: /usr/lib/python3.5/getopt.py /usr/lib/python3.6/getopt.py
+#: /usr/lib/python3.7/getopt.py
+#, python-format
+msgid "option -%s requires argument"
+msgstr "optie -%s vereist een argument"
+
+#: /usr/lib/python3.5/getopt.py /usr/lib/python3.6/getopt.py
+#: /usr/lib/python3.7/getopt.py
+#, python-format
+msgid "option --%s must not have an argument"
+msgstr ""
+
+#: /usr/lib/python3.5/getopt.py /usr/lib/python3.6/getopt.py
+#: /usr/lib/python3.7/getopt.py
+#, python-format
+msgid "option --%s not a unique prefix"
+msgstr ""
+
+#: /usr/lib/python3.5/getopt.py /usr/lib/python3.6/getopt.py
+#: /usr/lib/python3.7/getopt.py
+#, python-format
+msgid "option --%s not recognized"
+msgstr "optie --%s wordt niet herkend"
+
+#: /usr/lib/python3.5/getopt.py /usr/lib/python3.6/getopt.py
+#: /usr/lib/python3.7/getopt.py
+#, python-format
+msgid "option --%s requires argument"
+msgstr ""
+
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
+msgid "optional arguments"
+msgstr "optionele argumenten"
 
 #: ../fdroidserver/nightly.py
 #, python-brace-format
 msgid "overwriting existing {path}"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "positional arguments"
-msgstr "positionele argumenten"
+msgstr ""
 
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "process log deploy {path} to {dest} failed!"
 msgstr ""
 
-#: ../fdroidserver/build.py
-msgid "reference binary missing signature"
-msgstr ""
-
 #: ../fdroidserver/signatures.py
 #, python-brace-format
 msgid "refuse downloading via insecure HTTP connection (use HTTPS or specify --no-https-check): {apkfilename}"
 msgstr ""
 
+#: ../fdroidserver/signatures.py
+#, python-brace-format
+msgid "refuse downloading via insecure http connection (use https or specify --no-https-check): {apkfilename}"
+msgstr ""
+
 #: ../fdroidserver/index.py
 #, python-format
-msgid "repo_icon \"repo/icons/%s\" does not exist, generating placeholder."
+msgid "repo_icon %s does not exist, generating placeholder."
 msgstr ""
 
-#: ../fdroidserver/common.py
-msgid "repo_url needs to end with /repo"
+#: ../fdroidserver/metadata.py
+msgid "ruamel.yaml not installed, can not write metadata."
 msgstr ""
 
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "rsync is missing or broken: {error}"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "s3cmd sync indexes {path} to {url} and delete"
 msgstr ""
 
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "s3cmd syncs indexes from {path} to {url} and deletes removed"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "scanner cache is malformed! You can clear it with: '{clear}'"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "serverwebroot: path does not end with \"fdroid\", perhaps you meant one of these:"
-msgstr ""
-
 #: ../fdroidserver/scanner.py
 msgid "shared library"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "show program's version number and exit"
+msgstr "toon versienummer van programma en sluit af"
+
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.5/optparse.py
+#: /usr/lib/python3.6/argparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/argparse.py /usr/lib/python3.7/optparse.py
 msgid "show this help message and exit"
 msgstr "toon dit hulpbericht en sluit af"
 
@@ -2462,45 +2490,50 @@ msgstr ""
 msgid "static library"
 msgstr ""
 
-#: ../fdroidserver/build.py
+#: ../fdroidserver/common.py
 #, python-brace-format
-msgid "supplied reference binary has allowed signer {signer}"
+msgid "supplied timestamp value '{timestamp}' is not a unix timestamp"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "the following arguments are required: %s"
-msgstr "de volgende argumenten zijn vereist: %s"
-
-#: ../fdroidserver/install.py
-msgid "true"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "unexpected option string: %s"
-msgstr "onverwachte optiestring: %s"
+msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "unknown parser %(parser_name)r (choices: %(choices)s)"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "unrecognized arguments: %s"
-msgstr "onherkende argumenten: %s"
+msgstr ""
 
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "unsafe permissions on '{config_file}' (should be 0600)!"
-msgstr "Onveilige rechten op '{config_file}' (zou 0600 moeten zijn)!"
+msgstr ""
 
-#: ../fdroidserver/__main__.py /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py ../fdroid
+#: /usr/lib/python3.7/argparse.py ../fdroidserver/__main__.py
 msgid "usage: "
 msgstr "gebruik: "
 
-#: ../fdroidserver/deploy.py
+#: ../fdroid
+msgid "usage: fdroid [-h|--help|--version] <command> [<args>]"
+msgstr "gebruik: fdroid [-h|--help|--version] <opdracht> [<args>]"
+
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "using Apache libcloud to sync with {url}"
 msgstr ""
@@ -2509,8 +2542,8 @@ msgstr ""
 msgid "virustotal.com is rate limiting, waiting to retry..."
 msgstr ""
 
-#: ../fdroidserver/install.py
-msgid "yes"
+#: ../fdroidserver/update.py
+msgid "wiki support is deprecated and will be removed in the next release!"
 msgstr ""
 
 #: ../fdroidserver/publish.py
@@ -2525,19 +2558,31 @@ msgstr[1] ""
 msgid "{apkfilename} ({appid}) has no metadata!"
 msgstr ""
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
+#: ../fdroidserver/update.py
+#, python-brace-format
+msgid "{apkfilename} has multiple {name} files, looks like Master Key exploit!"
+msgstr ""
+
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "{apkfilename}'s AndroidManifest.xml has a bad date: "
 msgstr ""
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "{appid} does not have a name! Using application ID instead."
 msgstr ""
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
+#: ../fdroidserver/update.py
+#, python-brace-format
+msgid "{appid} does not have a name! Using package name instead."
+msgstr ""
+
+#: ../fdroidserver/update.py
+#, python-brace-format
+msgid "{appid} from {path} is not a valid Android Package Name!"
+msgstr ""
+
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "{appid} from {path} is not a valid Android application ID!"
@@ -2548,16 +2593,12 @@ msgstr ""
 msgid "{appid} from {path} is not a valid Java Package Name!"
 msgstr ""
 
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{appid} has both APKs and files: {files}"
-msgstr ""
-
 #: ../fdroidserver/mirror.py
 #, python-brace-format
 msgid "{appid} is missing {name}"
 msgstr ""
 
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "{appid}: Unknown extlib {path} in build '{versionName}'"
@@ -2585,7 +2626,7 @@ msgstr ""
 
 #: ../fdroidserver/metadata.py
 #, python-brace-format
-msgid "{build_flag} must be list or string, found: {value}"
+msgid "{field} not terminated in {name}"
 msgstr ""
 
 #: ../fdroidserver/metadata.py
@@ -2595,15 +2636,10 @@ msgstr ""
 
 #: ../fdroidserver/update.py
 #, python-brace-format
-msgid "{name} \"{section}/icons/{path}\" does not exist! Check \"config.yml\"."
+msgid "{name} \"{path}\" does not exist! Correct it in config.py."
 msgstr ""
 
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{path1} is a duplicate of {path2}, remove one!"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 #, python-brace-format
 msgid "{path} already exists, ignoring import results!"
 msgstr ""
@@ -2618,36 +2654,6 @@ msgstr ""
 msgid "{path} has bad file signature \"{pattern}\", possible Janus exploit!"
 msgstr ""
 
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "{path} has been flagged by virustotal {count} times:"
-msgstr ""
-
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "{path} has the wrong fingerprint ({fingerprint})!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "{path} is not \"key: value\" dict, but a {datatype}!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, fuzzy, python-brace-format
-msgid "{path} is not a standard config file!"
-msgstr "'sdk_path' niet ingesteld in config.yml!"
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "{path} is not list, but a {datatype}!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "{path} is not {expected_type}, but a {datatype}!"
-msgstr ""
-
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "{path} is zero size!"
@@ -2658,22 +2664,12 @@ msgstr ""
 msgid "{path} more than 200MB, manually upload: {url}"
 msgstr ""
 
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "{path}: \"{code}\" is not a valid ISO_3166-1 alpha-2 country code!"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{path}: {error}"
-msgstr ""
-
 #: ../fdroidserver/mirror.py
 #, python-brace-format
 msgid "{url} does not end with \"fdroid\", check the URL path!"
 msgstr ""
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/common.py
 #, python-brace-format
 msgid "{url} does not start with \"http\"!"
 msgstr ""
diff --git a/locale/nn/LC_MESSAGES/fdroidserver.po b/locale/nn/LC_MESSAGES/fdroidserver.po
deleted file mode 100644
index 5db8fd94..00000000
--- a/locale/nn/LC_MESSAGES/fdroidserver.po
+++ /dev/null
@@ -1,2682 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# This file is put in the public domain.
-# Bård Sigurd Møller <git@bsmoller.no>, 2024.
-msgid ""
-msgstr ""
-"Project-Id-Version: fdroidserver 2.3.0-3-g4ba7b5c9\n"
-"Report-Msgid-Bugs-To: https://gitlab.com/fdroid/fdroidserver/issues\n"
-"POT-Creation-Date: 2025-06-25 09:52+0200\n"
-"PO-Revision-Date: 2024-11-26 10:54+0000\n"
-"Last-Translator: Bård Sigurd Møller <git@bsmoller.no>\n"
-"Language-Team: Norwegian Nynorsk <https://hosted.weblate.org/projects/f-droid/fdroidserver/nn/>\n"
-"Language: nn\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 5.9-dev\n"
-
-#: ../fdroidserver/nightly.py
-msgid ""
-"\n"
-"SSH public key to be used as deploy key:"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-#, python-brace-format
-msgid ""
-"\n"
-"{path} encoded for the DEBUG_KEYSTORE secret variable:"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-format
-msgid "\"%s/\" has no matching metadata file!"
-msgstr ""
-
-#: ../fdroidserver/index.py
-msgid "\"isPrimary\" key should not be added to mirrors!"
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "\"local_copy_dir\" {path} does not exist!"
-msgstr ""
-
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "\"{apkfilename}\" is already installed on {dev}."
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "\"{path}\" contains recent {name} ({version})"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "\"{path}\" exists but s3cmd is not installed!"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "\"{path}\" is not a supported file format (use: metadata/*.yml)"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "\"{path}\" is signed by a key that is not allowed:"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
-#, python-brace-format
-msgid "\"{url}\" is not a valid URL!"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "%(prog)s: error: %(message)s\n"
-msgstr "%(prog)s: feil: %(message)s\n"
-
-#: ../fdroidserver/publish.py
-#, python-format
-msgid "%d APKs failed to be signed or verified!"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-format
-msgid "%d problems found"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "%r is not callable"
-msgstr ""
-
-#: ../fdroidserver/signindex.py
-#, python-format
-msgid "%s did not produce a dict!"
-msgstr ""
-
-#: ../fdroidserver/signindex.py
-#, python-format
-msgid "%s has bad SHA-256: %s"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-format
-msgid "%s is not an accepted build field"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "'keypass' not found in config.yml!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "'keystore' is NONE and 'smartcardoptions' is blank!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "'keystore' not found in config.yml!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "'keystorepass' not found in config.yml!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "'repo_keyalias' not found in config.yml!"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-msgid "'required' is an invalid argument for positionals"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "'sdk_path' not set in config.yml!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "'{aapt}' is too old, fdroid requires build-tools-{version} or newer!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "'{path}' failed to execute!"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "'{path}' has invalid format, it should be a dictionary!"
-msgstr ""
-
-#: ../fdroidserver/lint.py ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "'{value}' is not a valid {field} in {appid}. Regex pattern: {pattern}"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "'{value}' is not a valid {field}, should be {pattern}"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "--merge-request only runs on a single appid!"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "...checkupdate failed for {appid} : {error}"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-msgid ".__call__() not defined"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "/issues is missing"
-msgstr ""
-
-#: ../fdroidserver/mirror.py
-msgid "A URL is required as an argument!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "APK signatures have different certificates in {path}:"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Add PGP signatures using GnuPG for packages in repo"
-msgstr ""
-
-#: ../fdroidserver/update.py
-msgid "Add a repo signing key to an unsigned repo"
-msgstr ""
-
-#: ../fdroidserver/update.py
-msgid "Add skeleton metadata files for APKs that are missing them"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Adding new repo for only {name}"
-msgstr ""
-
-#: ../fdroidserver/init.py
-msgid "Alias of the repo signing key in the keystore"
-msgstr ""
-
-#: ../fdroidserver/build.py
-msgid "AllowedAPKSigningKeys missing but reference binary supplied"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
-msgid "Allows a different revision (or git branch) to be specified for the initial import"
-msgstr ""
-
-#: ../fdroidserver/mirror.py
-msgid "Also mirror the full archive section"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Also warn about formatting issues, like rewritemeta -l"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "Android AAR library"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "Android APK file"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "Android DEX code"
-msgstr ""
-
-#: ../fdroidserver/init.py
-#, python-brace-format
-msgid "Android SDK not found at {path}!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Android SDK path '{path}' does not exist!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Android SDK path '{path}' is not a directory!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Android SDK tool {cmd} not found!"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "App has Binaries but does not have corresponding AllowedAPKSigningKeys to pin certificate."
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "App has NoSourceSince or ArchivePolicy \"0 versions\" or 0 but AutoUpdateMode or UpdateCheckMode are not None"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "App is in '{repo}' but has a link to {url}"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "App version has binary but does not have corresponding AllowedAPKSigningKeys to pin certificate."
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Appending .git is not necessary"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Archiving {apkfilename} with invalid signature!"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "AutoUpdateMode with UpdateCheckMode: HTTP must have a pattern."
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "Automatic no to all prompts."
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "Automatic yes to all prompts."
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "Bad entry type \"{mirrortype}\" in mirrors config: {mirror}"
-msgstr ""
-
-#: ../fdroidserver/mirror.py
-msgid "Base URL to mirror, can include the index signing key using the query string: ?fingerprint="
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Branch '{branch}' used as commit in build '{versionName}'"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Branch '{branch}' used as commit in srclib '{srclib}'"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Broken symlink: {path}"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Build a package from source"
-msgstr ""
-
-#: ../fdroidserver/build.py
-msgid "Build all applications available"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Build generated by `fdroid import` - remove disable line once ready"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "Build metadata git repo has uncommited changes!"
-msgstr ""
-
-#: ../fdroidserver/build.py
-msgid "Build only the latest version of each package"
-msgstr ""
-
-#: ../fdroidserver/init.py
-#, python-format
-msgid "Built repo based in \"%s\" with this config:"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "Can't auto-update app with no CurrentVersionCode"
-msgstr ""
-
-#: ../fdroidserver/build.py
-msgid "Can't build due to {} error while scanning"
-msgid_plural "Can't build due to {} errors while scanning"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Cannot read {path}: {error}"
-msgstr ""
-
-#: ../fdroidserver/rewritemeta.py
-#, python-brace-format
-msgid "Cannot rewrite \"{path}\""
-msgstr ""
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
-#: ../fdroidserver/lint.py
-#, python-format
-msgid "Categories '%s' is not valid"
-msgstr ""
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
-#: ../fdroidserver/lint.py
-msgid "Categories are not set"
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "Category \"{category}\" defined but not used for any apps!"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Check for updates to applications"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Checking archiving for {appid} - apks:{integer}, keepversions:{keep}, archapks:{arch}"
-msgstr ""
-
-#: ../fdroidserver/update.py
-msgid "Clean update - don't uses caches, reprocess all APKs"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Color the log output"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
-msgid "Comma separated list of categories."
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-#, python-format
-msgid "Command '%s' not recognised.\n"
-msgstr "Kommandoen '%s' er ikkje gjenkjent\n"
-
-#: ../fdroidserver/checkupdates.py
-msgid "Commit changes"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "Commit changes, push, then make a merge request"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Conflicting \"{field}\" definitions between .yml and localized files:"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Conflicting arguments: '--verbose' and '--quiet' can not be specified at the same time."
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Could not find '{command}' on your system"
-msgstr ""
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/import_subcommand.py
-msgid "Could not find latest version code"
-msgstr ""
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
-#: ../fdroidserver/import_subcommand.py
-msgid "Could not find latest version name"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Could not find {path} to remove it"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Could not open APK {path} for analysis: "
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Could not parse size \"{size}\", wrong type \"{type}\""
-msgstr ""
-
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/import_subcommand.py
-msgid "Couldn't find Application ID"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "Couldn't find any version information"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "Couldn't find package ID"
-msgstr ""
-
-#: ../fdroidserver/update.py
-msgid "Cowardily refusing to overwrite existing signing key setup!"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Created new container \"{name}\""
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Creating \"{path}\" for configuring s3cmd."
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Creating empty {config_file}"
-msgstr ""
-
-#: ../fdroidserver/publish.py
-msgid "Creating log directory"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Creating new S3 bucket: {url}"
-msgstr ""
-
-#: ../fdroidserver/publish.py
-msgid "Creating output directory"
-msgstr ""
-
-#: ../fdroidserver/index.py
-msgid "Creating signed index with this key (SHA256):"
-msgstr ""
-
-#: ../fdroidserver/publish.py ../fdroidserver/verify.py
-msgid "Creating temporary directory"
-msgstr ""
-
-#: ../fdroidserver/index.py
-msgid "Creating unsigned index in preparation for signing"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "CurrentVersionCode {cv} is less than oldest build entry {versionCode}"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-msgid "DEBUG_KEYSTORE is not set or the value is incomplete"
-msgstr ""
-
-#: ../fdroidserver/update.py
-msgid "Delete APKs and/or OBBs without metadata from the repo"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Deleting archive, repo is too big ({size} max {limit})"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Deleting git-mirror history, repo is too big ({size} max {limit})"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Deleting unknown file: {path}"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-format
-msgid "Description '%s' is just the app's summary"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Description has a duplicate line"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Description of length {length} is over the {limit} char limit"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Did you mean config/{name}.yml?"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Did you mean {code}?"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
-msgid "Do not add 'disable:' to the generated build entries"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-msgid "Do not deploy the new files to the repo"
-msgstr ""
-
-#: ../fdroidserver/mirror.py
-#, python-brace-format
-msgid "Do not include \"{path}\" in URL!"
-msgstr ""
-
-#: ../fdroidserver/init.py
-msgid "Do not prompt for Android SDK path, just fail"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-msgid "Do not remove the private keys generated from the keystore"
-msgstr ""
-
-#: ../fdroidserver/build.py
-msgid "Don't create a source tarball, useful when testing a build"
-msgstr ""
-
-#: ../fdroidserver/build.py
-msgid "Don't refresh the repository, useful when testing a build with no internet connection"
-msgstr ""
-
-#: ../fdroidserver/deploy.py ../fdroidserver/nightly.py
-msgid "Don't use rsync checksums"
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "Download F-Droid.apk using mirrors that leak less to the network"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Download complete mirrors of small repos"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Downloading the repository already failed once, not trying again."
-msgstr ""
-
-#: ../fdroidserver/verify.py
-#, python-brace-format
-msgid "Downloading {url} failed. {error}"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Duplicate Anti-Feature declaration at {path} was ignored!"
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-format
-msgid "Duplicate entry \"%s\" in mirrors config!"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Duplicate link in '{field}': {url}"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-format
-msgid "ERROR: %(message)s"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "ERROR: The \"server\" subcommand has been removed, use \"deploy\"!"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-msgid "ERROR: unsupported CI type, patches welcome!"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-#, python-format
-msgid "ERROR: unsupported git host \"%s\", patches welcome!"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "ERROR: {key} in {path} is not \"archive\" or \"repo\"!"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "ERROR: {key} not a valid key!"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "ERROR: {key}'s value should be of type {t}!"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "ERROR: {key}:{subkey} in {path} is not in allowed keys: {allowed_keys}!"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-#, python-brace-format
-msgid "Encoding is set to '{enc}' fdroid might run into encoding issues. Please set it to 'UTF-8' for best results."
-msgstr ""
-
-#: ../fdroidserver/init.py
-#, python-format
-msgid ""
-"Enter the path to the Android SDK (%s) here:\n"
-"> "
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Environment variable {var} from {configname} is not set!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Environment variable {{env: {var}}} is not set!"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "Error deploying 'github_releases', {} not present. (You might need to run `fdroid update` first.)"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
-msgid "Error while getting repo address"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "Exit with a non-zero code if problems were found"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Extract application metadata from a source repository"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Extract signatures from APKs"
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "F-Droid.apk could not be downloaded from any known source!"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Failed copying {path}: {error}"
-msgstr ""
-
-#: ../fdroidserver/signatures.py
-#, python-brace-format
-msgid "Failed fetching signatures for '{apkfilename}': {error}"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Failed reading {path}: {error}"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Failed resizing {path}: {error}"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Failed to create S3 bucket: {url}"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Failed to get APK information, deleting {path}"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Failed to get APK information, skipping {path}"
-msgstr ""
-
-#: ../fdroidserver/update.py
-msgid "Failed to get APK signing key fingerprint"
-msgstr ""
-
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "Failed to install '{apkfilename}' on {dev}: {error}"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Failed to sign application"
-msgstr ""
-
-#: ../fdroidserver/build.py
-#, python-brace-format
-msgid "Fetched buildserverid from VM: {buildserverid}"
-msgstr ""
-
-#: ../fdroidserver/signatures.py
-#, python-brace-format
-msgid "Fetched signatures for '{apkfilename}' -> '{sigdir}'"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "File disappeared while processing it: {path}"
-msgstr ""
-
-#: ../fdroidserver/build.py ../fdroidserver/install.py
-#: ../fdroidserver/rewritemeta.py ../fdroidserver/scanner.py
-#: ../fdroidserver/update.py
-msgid "Finished"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Forbidden HTML tags"
-msgstr ""
-
-#: ../fdroidserver/build.py
-msgid "Force build of disabled apps, and carries on regardless of scan problems. Only allowed in test mode."
-msgstr ""
-
-#: ../fdroidserver/build.py
-#, python-brace-format
-msgid "Force halting build after {0} sec timeout!"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "Force scan of disabled apps and builds."
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Found \"{path}\" graphic without metadata for app \"{name}\"!"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Found bad funding file \"{path}\" for \"{name}\":"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Found invalid appids in arguments"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Found invalid versionCodes for some apps"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Found multiple JAR Signature Block Files in {path}"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Found multiple Signer Certificates!"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Found multiple metadata files for {appid}"
-msgstr ""
-
-#: ../fdroidserver/index.py
-msgid "Found multiple signing certificates for repository."
-msgstr ""
-
-#: ../fdroidserver/index.py
-msgid "Found no signing certificates for repository."
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-format
-msgid "Found non-file at %s"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Found {apkfilename} at {url}"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Found {count} problems in {filename}"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Found {count} warnings in {filename}"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Generated skeleton metadata for {appid}"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-format
-msgid "Git checkout of '%s' failed"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Git clean failed"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Git fetch failed"
-msgstr ""
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/common.py
-#, python-format
-msgid "Git remote set-head failed: \"%s\""
-msgstr ""
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/common.py
-msgid "Git reset failed"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Git submodule deinit failed"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Git submodule sync failed"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Git submodule update failed"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "HTTPS must be used with Subversion URLs!"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "If a git mirror gets to big, allow the archive to be deleted"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "If this upload fails, try manually uploading to {url}"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Ignoring '{field}' in '{metapath}' metadata because it is deprecated."
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-format
-msgid "Ignoring FUNDING.yml entry longer than 2048: %s"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-format
-msgid "Ignoring bad element in manifest: %s"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Ignoring deprecated {oldfile}, use {newfile}!"
-msgstr ""
-
-#: ../fdroidserver/index.py
-msgid "Ignoring package without metadata: "
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Ignoring stale cache data for {apkfilename}"
-msgstr ""
-
-#: ../fdroidserver/update.py
-msgid "Include APKs that are signed with disabled algorithms like MD5"
-msgstr ""
-
-#: ../fdroidserver/mirror.py
-msgid "Include the PGP signature .asc files in the mirror"
-msgstr ""
-
-#: ../fdroidserver/mirror.py
-msgid "Include the build logs in the mirror"
-msgstr ""
-
-#: ../fdroidserver/mirror.py
-msgid "Include the source tarballs in the mirror"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-format
-msgid "Including metadata from %s@%s"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Including metadata from {path}"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Initialising submodules"
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "Install all signed applications available"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Install built packages on devices"
-msgstr ""
-
-#: ../fdroidserver/install.py
-#, python-format
-msgid "Installing %s..."
-msgstr ""
-
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "Installing '{apkfilename}' on {dev}..."
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Interact with the repo HTTP server"
-msgstr ""
-
-#: ../fdroidserver/update.py
-msgid "Invalid APK"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "Invalid AutoUpdateMode: {mode}"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "Invalid UpdateCheckMode: {mode}"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "Invalid VercodeOperation: {field}"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Invalid VercodeOperation: {invalid_ops}"
-msgstr ""
-
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Invalid application ID {appid}"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Invalid bulleted list"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-format
-msgid "Invalid name for published file: %s"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Invalid ndk: entry in build: \"{ndk}\""
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Invalid redirect to non-HTTPS: {before} -> {after} "
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Invalid scrlib metadata: '{file}' does not exist"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Invalid srclib metadata: could not parse '{file}'"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Invalid srclib metadata: unknown key '{key}' in '{file}'"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "JAR signature failed to verify: {path}"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "JAR signature verified: {path}"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "Java JAR file"
-msgstr ""
-
-#: ../fdroidserver/mirror.py ../fdroidserver/publish.py
-#: ../fdroidserver/update.py
-msgid "Java JDK not found! Install in standard location or set java_paths!"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "Java compiled class"
-msgstr ""
-
-#: ../fdroidserver/signindex.py
-msgid "Java jarsigner not found! Install in standard location or set java_paths!"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Javascript in HTML src attributes"
-msgstr ""
-
-#: ../fdroidserver/build.py
-#, python-brace-format
-msgid "Keeping failed build \"{apkfilename}\""
-msgstr ""
-
-#: ../fdroidserver/init.py
-msgid "Keystore for signing key:\t"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Known debug key is used in AllowedAPKSigningKeys: "
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Last used commit '{commit}' looks like a tag, but UpdateCheckMode is '{ucm}'"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Liberapay donation methods belong in the Liberapay: field"
-msgstr ""
-
-#: ../fdroidserver/rewritemeta.py
-msgid "List files that would be reformatted (dry run)"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Locale included in f-droid.org URL"
-msgstr ""
-
-#: ../fdroidserver/build.py
-msgid "Make the build stop on exceptions"
-msgstr ""
-
-#: ../fdroidserver/index.py
-msgid "Malformed repository mirrors."
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "Malformed serverwebroot line:"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-format
-msgid "Max recursion depth in ZIP file reached: %s"
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "Mirror config for {url} contains \"isPrimary\" key!"
-msgstr ""
-
-#: ../fdroidserver/mirror.py
-msgid "Mirror the full repo and archive, all file types."
-msgstr ""
-
-#: ../fdroidserver/gpgsign.py
-msgid "Missing output directory"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-msgid "Moving Anti-Features declarations to localized files:"
-msgstr ""
-
-#: ../fdroidserver/index.py
-msgid "Neither \"repo_pubkey\" nor \"keystorepass\" set in config.yml"
-msgstr ""
-
-#: ../fdroidserver/verify.py
-#, python-format
-msgid "No APK for package: %s"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "No Android SDK found!"
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "No attached devices found"
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "No devices found for `adb install`! Please plug one in."
-msgstr ""
-
-#: ../fdroidserver/index.py
-msgid "No fingerprint in URL."
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "No git submodules available"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
-msgid "No gradle project could be found. Specify --subdir?"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
-msgid "No information found."
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "No matching tags found"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "No minimum SDK version found in {0}, using default (3)."
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "No need to specify that the app is Free Software"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "No need to specify that the app is for Android"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "No option set! Edit your config.yml to set at least one of these:"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "No packages specified"
-msgstr ""
-
-#: ../fdroidserver/install.py
-#, python-format
-msgid "No signed APK available for %s"
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "No signed output directory - nothing to do"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "No signing certificates found in {path}"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-format
-msgid "No such package: %s"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "No such versionCode {versionCode} for app {appid}"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "No tags found"
-msgstr ""
-
-#: ../fdroidserver/publish.py ../fdroidserver/verify.py
-msgid "No unsigned directory - nothing to do"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "No version information could be found."
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Not a valid size definition: \"{}\""
-msgstr ""
-
-#: ../fdroidserver/signindex.py
-msgid "Nothing to do"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "Nothing to do for {appid}."
-msgstr ""
-
-#: ../fdroidserver/init.py
-msgid "Now set these in config.yml:"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "OBB file has newer versionCode({integer}) than any APK:"
-msgstr ""
-
-#: ../fdroidserver/update.py
-msgid "OBB filename must start with \"main.\" or \"patch.\":"
-msgstr ""
-
-#: ../fdroidserver/update.py
-msgid "OBB's packagename does not match a supported APK:"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "Offline machine, skipping git mirror generation until `fdroid deploy`"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "One of the 'github_releases' config items is missing the 'packageNames' value. skipping ..."
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "One of the 'github_releases' config items is missing the 'projectUrl' value. skipping ..."
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "One of the 'github_releases' config items is missing the 'token' value. skipping ..."
-msgstr ""
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Only PNG and JPEG are supported for graphics, found: {path}"
-msgstr ""
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/common.py
-msgid "Only accepts a single key \"env\""
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "Only process apps with auto-updates"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "OpenCollective donation methods belong in the OpenCollective: field"
-msgstr ""
-
-#: ../fdroidserver/verify.py
-msgid "Output JSON report to file named after APK."
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "Output JSON to stdout."
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py ../fdroidserver/gpgsign.py
-#: ../fdroidserver/publish.py ../fdroidserver/signindex.py
-#: ../fdroidserver/update.py
-msgid "Outputting JSON"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
-msgid "Overall license of the project."
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "Overriding blank versionName in {apkfilename} from metadata: {version}"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
-#, python-brace-format
-msgid "Package \"{appid}\" already exists"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Parsing manifest at '{path}'"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Password required with username"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
-msgid "Path to main Android project subdirectory, if not in root."
-msgstr ""
-
-#: ../fdroidserver/init.py
-msgid "Path to the Android SDK (sometimes set in ANDROID_HOME)"
-msgstr ""
-
-#: ../fdroidserver/btlog.py
-msgid "Path to the git repo to use as the log"
-msgstr ""
-
-#: ../fdroidserver/init.py
-msgid "Path to the keystore for the repo signing key"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-msgid "Print the secret variable to the terminal for easy copy/paste"
-msgstr ""
-
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "Privacy mode was enabled based on your locale ({country_code})."
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-format
-msgid "Problem with ZIP file: %s, error %s"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Problem with xml at '{path}'"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "Process auto-updates"
-msgstr ""
-
-#: ../fdroidserver/publish.py ../fdroidserver/update.py
-#, python-brace-format
-msgid "Processing {apkfilename}"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Processing {appid}"
-msgstr ""
-
-#: ../fdroidserver/update.py
-msgid "Produce human-readable XML/JSON for index files"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
-msgid "Project URL to import from."
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Punctuation should be avoided"
-msgstr ""
-
-#: ../fdroidserver/btlog.py
-msgid "Push the log to this git remote repository"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Pushing binary transparency log to {url}"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "Pushing to remote server failed!"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Pushing to {url}"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Quickly start a new repository"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Read all the metadata files and exit"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Reading '{config_file}'"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Reading packageName/versionCode/versionName failed, APK invalid: '{apkfilename}'"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Reading packageName/versionCode/versionName failed,APK invalid: '{apkfilename}'"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Reading {apkfilename} from cache"
-msgstr ""
-
-#: ../fdroidserver/build.py
-msgid "Refresh and cache scanner rules and signatures from the network"
-msgstr ""
-
-#: ../fdroidserver/publish.py
-#, python-brace-format
-msgid "Refusing to sign '{path}', file exists in both {dir1} and {dir2} folder."
-msgstr ""
-
-#: ../fdroidserver/verify.py
-msgid "Remove source tarball and any APKs if successfully verified."
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Removing specified files"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Removing {path}\""
-msgstr ""
-
-#: ../fdroidserver/update.py
-msgid "Rename APK files that do not match package.name_123.apk"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "RepoType {type} is deprecated, please switch to git."
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-#, python-brace-format
-msgid "Resigning {apkfilename} with provided debug.keystore"
-msgstr ""
-
-#: ../fdroidserver/update.py
-msgid "Resize all the icons exceeding the max pixel size and exit"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Restrict output to warnings and errors"
-msgstr ""
-
-#: ../fdroidserver/net.py
-#, python-format
-msgid "Retrying failed download: %s"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Rewrite all the metadata files"
-msgstr ""
-
-#: ../fdroidserver/rewritemeta.py
-#, python-brace-format
-msgid "Rewriting '{appid}'"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "Run on git repo that has uncommitted changes"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-#, python-brace-format
-msgid "Run over {cibase} to find -debug.apk. and skip repo_basedir {repo_basedir}"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Run rewritemeta to fix formatting"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "Running first pass with MD5 checking disabled"
-msgstr ""
-
-#: ../fdroidserver/mirror.py
-#, python-brace-format
-msgid "Running wget in {path}"
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "SHA-256 of {url} does not match entry!"
-msgstr ""
-
-#: ../fdroidserver/build.py
-msgid "Scan the resulting APK(s) for known non-free classes."
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Scan the source code of a package"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Scanner found {count} problems in {apk}"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Scanner found {count} problems in {appid}:"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Scanner found {count} problems in {appid}:{versionCode}:"
-msgstr ""
-
-#: ../fdroidserver/build.py
-msgid "Scanner found {} problem"
-msgid_plural "Scanner found {} problems"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../fdroidserver/scanner.py
-msgid "Scanning APK for extra signing blocks."
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "Scanning APK with dexdump for known non-free classes."
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Set NDK {release} ({version}) up"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Set clock to that time using:"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-msgid "Set maximum releases in repo before older ones are archived"
-msgstr ""
-
-#: ../fdroidserver/build.py
-#, python-brace-format
-msgid "Set open file limit to {integer}"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Set up an app build for a nightly build repo"
-msgstr ""
-
-#: ../fdroidserver/build.py
-msgid "Setting open file limit failed: "
-msgstr ""
-
-#: ../fdroidserver/build.py
-#, python-brace-format
-msgid "Setting {0} sec timeout for this build"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Sign and place packages in the repo"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Sign indexes created using update --nosign"
-msgstr ""
-
-#: ../fdroidserver/build.py
-msgid "Skip scanning the source code for binaries and other problems"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Skipping '{apkfilename}' with invalid signature!"
-msgstr ""
-
-#: ../fdroidserver/deploy.py ../fdroidserver/index.py
-#, python-format
-msgid "Skipping GitLab Pages mirror because the repo is too large (>%.2fGB)!"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Skipping index generation for {appid}"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Skipping {apkfilename} with invalid signature!"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Skipping {appid}: disabled"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "Specify a local folder to sync the repo to"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "Specify an identity file to provide to SSH for rsyncing"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-msgid "Specify which debug keystore file to use."
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Spew out even more information than normal"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-#, python-brace-format
-msgid "Stripping mystery signature from {apkfilename}"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-format
-msgid "Summary '%s' is just the app's name"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Summary of length {length} is over the {limit} char limit"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "System clock is older than date in {path}!"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "Tags update mode only works for git, hg, bzr and git-svn repositories currently"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "Tags update mode used in git-svn, but the repo was not set up with tags"
-msgstr ""
-
-#: ../fdroidserver/build.py
-msgid "Test mode - put output in the tmp directory only, and always build, even if the output already exists."
-msgstr ""
-
-#: ../fdroidserver/index.py
-msgid "The \"qrcode\" Python package is not installed (e.g. apt-get install python3-qrcode)!"
-msgstr ""
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "The OBB version code must come after \"{name}.\":"
-msgstr ""
-
-#: ../fdroidserver/btlog.py
-msgid "The base URL for the repo to log (default: https://f-droid.org)"
-msgstr ""
-
-#: ../fdroidserver/mirror.py
-msgid "The directory to write the mirror to"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-msgid "The file to be included in the repo (path or glob)"
-msgstr ""
-
-#: ../fdroidserver/index.py
-msgid "The repository's fingerprint does not match."
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "The root dir for local_copy_dir \"{path}\" does not exist!"
-msgstr ""
-
-#: ../fdroidserver/publish.py
-msgid "There is a keyalias collision - publishing halted"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "These are the apps that have been archived from the main repo."
-msgstr ""
-
-#: ../fdroidserver/mirror.py
-msgid "This command should never be used to mirror f-droid.org! A full copy requires more than 600GB."
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "This is a repository of apps to be used with F-Droid. Applications in this repository are either official binaries built by the original application developers, or are binaries built from source by the admin of f-droid.org using the tools on https://gitlab.com/fdroid."
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
-#, python-format
-msgid "This repo already has local metadata: %s"
-msgstr ""
-
-#: ../fdroidserver/init.py
-#, python-format
-msgid ""
-"To complete the setup, add your APKs to \"%s\"\n"
-"then run \"fdroid update -c; fdroid update\".  You might also want to edit\n"
-"\"config.yml\" to set the URL, repo name, and more.  You should also set up\n"
-"a signing key (a temporary one might have been automatically generated).\n"
-"\n"
-"For more info: https://f-droid.org/docs/Setup_an_F-Droid_App_Repo\n"
-"and https://f-droid.org/docs/Signing_Process"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "To use awsbucket, awssecretkey and awsaccesskeyid must also be set in config.yml!"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "To use rclone, rclone_config and awsbucket must be set in config.yml!"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "URL must start with https:// or http://"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "URL shorteners should not be used"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "URL {url} in Description: {error}"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Unexpected license tag \"{}\"! Only use FSF or OSI approved tags from https://spdx.org/license-list"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Unexpected license tag \"{}\"! Only use license tags configured in your config file"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Unknown entry {key} in {configname}"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Unknown exception found!"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Unknown file '{filename}' in build '{versionName}'"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-format
-msgid "Unknown metadata format: %s"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Unknown metadata format: {path} (use: *.yml)"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Unknown version of aapt, might cause problems: "
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Unnecessary leading space"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Unnecessary trailing space"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Unrecognised app field '{fieldname}' in '{path}'"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Unrecognised build flag '{build_flag}' in '{path}'"
-msgstr ""
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Unsupported file type \"{extension}\" for repo graphic"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Unsupported graphics file found: {path}"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-format
-msgid "Unused extlib at %s"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-format
-msgid "Unused file at %s"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-format
-msgid "Unused scandelete path: %s"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-format
-msgid "Unused scanignore path: %s"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Update repo information for new packages"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Update the binary transparency log for a URL"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "UpdateCheckData has invalid URL: {url}"
-msgstr ""
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "UpdateCheckData must match the version code as integer (\\d or [0-9]): {codeex}"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "UpdateCheckData must use HTTPS URL: {url}"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "UpdateCheckData not a valid URL: {url}"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "UpdateCheckMode is set but it looks like checkupdates hasn't been run yet."
-msgstr ""
-
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/lint.py
-msgid "UpdateCheckName is set to the known application ID, it can be removed"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Uploading {apkfilename} to androidobservatory.org"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Uploading {apkfilename} to virustotal"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Use /HEAD instead of /master or /main to point at a file in the default branch"
-msgstr ""
-
-#: ../fdroidserver/update.py
-msgid "Use `fdroid update -c` to create it."
-msgstr ""
-
-#: ../fdroidserver/build.py
-msgid "Use build server"
-msgstr ""
-
-#: ../fdroidserver/update.py
-msgid "Use date from APK instead of current time for newly added APKs"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Using \"{path}\" for configuring s3cmd."
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Using \"{path}\" for syncing with remote storage."
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Using APK Signature v2"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Using APK Signature v3"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Using JAR Signature"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Using Java's jarsigner, not recommended for verifying APKs! Use apksigner"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Using blank dictionary instead of contents of {path}!"
-msgstr ""
-
-#: ../fdroidserver/init.py
-#, python-brace-format
-msgid "Using existing keystore \"{path}\""
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Using rclone to sync with: {url}"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Using s3cmd to sync with: {url}"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Valid commands are:"
-msgstr ""
-
-#: ../fdroidserver/verify.py
-msgid "Verify against locally cached copy rather than redownloading."
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Verify the integrity of downloaded packages"
-msgstr ""
-
-#: ../fdroidserver/index.py
-msgid "Verifying index signature:"
-msgstr ""
-
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "Verifying package {path} with apksigner."
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "VirusTotal API key cannot upload files larger than 32MB, use {url} to upload {path}."
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-msgid "WARNING: only public git repos are supported!"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Warn about possible metadata errors"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "WebAssembly binary file"
-msgstr ""
-
-#: ../fdroidserver/update.py
-msgid "When configured for signed indexes, create only unsigned indexes at this stage"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "When linting the entire repository yamllint is disabled by default. This option forces yamllint regardless."
-msgstr ""
-
-#: ../fdroidserver/publish.py
-msgid "When signing or verifying fails, exit with an error code."
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "Would you like to download and install F-Droid.apk via adb? (YES/no)"
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "Would you like to download the app(s) from f-droid.org? (YES/no)"
-msgstr ""
-
-#: ../fdroidserver/init.py
-msgid "X.509 'Distinguished Name' used when generating keys"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "You can use ANDROID_HOME to set the path to your SDK, i.e.:"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "ZIP file archive"
-msgstr ""
-
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "adb reports {serial} is \"{status}\"!"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-#, python-brace-format
-msgid "adding IdentityFile to {path}"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "adding to {name}: {path}"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "ambiguous option: %(option)s could match %(matches)s"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "apksigner in build-tools;{version} passes APKs with invalid v3 signatures, ignoring."
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "apksigner not found! Cannot sign or verify modern APKs"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "apksigner not found, it's required for signing!"
-msgstr ""
-
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/checkupdates.py ../fdroidserver/lint.py
-#: ../fdroidserver/rewritemeta.py
-msgid "application ID of file to operate on"
-msgstr ""
-
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/build.py ../fdroidserver/install.py
-#: ../fdroidserver/publish.py ../fdroidserver/scanner.py
-#: ../fdroidserver/verify.py
-msgid "application ID with optional versionCode in the form APPID[:VERCODE]"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "archive_url needs to end with /archive"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "argument \"-\" with mode %r"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "argument %(argument_name)s: %(message)s"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-msgid "attempting bare SSH connection to test deploy key:"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "can not parse scrlib spec (not a string): '{}'"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "can't open '%(filename)s': %(error)s"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "can't open non-https url: '{};"
-msgstr ""
-
-#: ../fdroidserver/build.py
-#, python-brace-format
-msgid "cannot find required srclibs: \"{path}\""
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-msgid "cannot have multiple subparser arguments"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "cannot merge actions - two groups are named %r"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-msgid "cannot publish update, did you set the deploy key?"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-#, python-brace-format
-msgid "cloning {url}"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "commands from plugin modules:"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "conflicting option string: %s"
-msgid_plural "conflicting option strings: %s"
-msgstr[0] ""
-msgstr[1] ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "conflicting subparser alias: %s"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "conflicting subparser: %s"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "could not parse '{path}'"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "could not parse srclib spec (no name specified): '{}'"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "could not parse srclib spec (no ref specified): '{}'"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-#, python-brace-format
-msgid "created {path}"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "current version is newer: old vercode={old}, new vercode={new}"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "deleting: repo/{apkfilename}"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "dependency file without lock"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "deployed process log {path} to {dest}"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "dest= is required for options like %r"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "downloading '{}'"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "downloading scanner signatures from '{}' failed"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "executable binary, possibly code"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "expected %s argument"
-msgid_plural "expected %s arguments"
-msgstr[0] ""
-msgstr[1] ""
-
-#: /usr/lib/python3.11/argparse.py
-msgid "expected at least one argument"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-msgid "expected at most one argument"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-msgid "expected one argument"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "fdroid [<command>] [-h|--help|--version|<args>]"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "fetch the latest version of signatures from the web"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-msgid "force metadata errors (default) to be warnings, or to be ignored."
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "git svn clone failed"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "gzip file archive"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "ignored explicit argument %r"
-msgstr ""
-
-#: ../fdroidserver/index.py
-msgid "index-v1 must have a signature, use `fdroid signindex` to create it!"
-msgstr ""
-
-#: ../fdroidserver/index.py
-msgid "index-v2 must have a signature, use `fdroid signindex` to create it!"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "invalid %(type)s value: %(value)r"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "invalid choice: %(value)r (choose from %(choices)s)"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "invalid conflict_resolution value: %r"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "invalid option string %(option)r: must start with a character %(prefix_chars)r"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "ipfs_cid not found, skipping CIDv1 generation"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "latest build recipe is newer: old vercode={old}, new vercode={new}"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "local_copy_dir does not end with \"fdroid\", perhaps you meant: \"{path}\""
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "local_copy_dir must be an absolute path!"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "local_copy_dir must be directory, not a file!"
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-format
-msgid "mirror '%s' does not end with 'fdroid'!"
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "mirrors set twice, in config.yml and {path}!"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-msgid "mutually exclusive arguments must be optional"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "next {name} cache update due in {time}"
-msgstr ""
-
-#: ../fdroidserver/mirror.py
-#, python-brace-format
-msgid "no \"icon\" in {appid}"
-msgstr ""
-
-#: ../fdroidserver/signatures.py
-msgid "no APK supplied"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "no version information found"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "not allowed with argument %s"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "one of the arguments %s is required"
-msgstr ""
-
-#: ../fdroidserver/common.py ../fdroidserver/index.py
-msgid "only accepts strings, lists, and tuples"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-msgid "options"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-#, python-brace-format
-msgid "overwriting existing {path}"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-msgid "positional arguments"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "process log deploy {path} to {dest} failed!"
-msgstr ""
-
-#: ../fdroidserver/build.py
-msgid "reference binary missing signature"
-msgstr ""
-
-#: ../fdroidserver/signatures.py
-#, python-brace-format
-msgid "refuse downloading via insecure HTTP connection (use HTTPS or specify --no-https-check): {apkfilename}"
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-format
-msgid "repo_icon \"repo/icons/%s\" does not exist, generating placeholder."
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "repo_url needs to end with /repo"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "rsync is missing or broken: {error}"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "s3cmd sync indexes {path} to {url} and delete"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "s3cmd syncs indexes from {path} to {url} and deletes removed"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "scanner cache is malformed! You can clear it with: '{clear}'"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "serverwebroot: path does not end with \"fdroid\", perhaps you meant one of these:"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "shared library"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-msgid "show this help message and exit"
-msgstr ""
-
-#: ../fdroidserver/signatures.py
-msgid "signed APK, either a file-path or HTTPS URL."
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "skip deploying full build logs: log content is empty"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "skip deploying full build logs: not enabled in config"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "skipping source tarball: {path}"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "srclibs missing name and/or @"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "static library"
-msgstr ""
-
-#: ../fdroidserver/build.py
-#, python-brace-format
-msgid "supplied reference binary has allowed signer {signer}"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "the following arguments are required: %s"
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "true"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "unexpected option string: %s"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "unknown parser %(parser_name)r (choices: %(choices)s)"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "unrecognized arguments: %s"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "unsafe permissions on '{config_file}' (should be 0600)!"
-msgstr ""
-
-#: ../fdroidserver/__main__.py /usr/lib/python3.11/argparse.py
-msgid "usage: "
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "using Apache libcloud to sync with {url}"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "virustotal.com is rate limiting, waiting to retry..."
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "yes"
-msgstr ""
-
-#: ../fdroidserver/publish.py
-#, python-brace-format
-msgid "{0} app, {1} key aliases"
-msgid_plural "{0} apps, {1} key aliases"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{apkfilename} ({appid}) has no metadata!"
-msgstr ""
-
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{apkfilename}'s AndroidManifest.xml has a bad date: "
-msgstr ""
-
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{appid} does not have a name! Using application ID instead."
-msgstr ""
-
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{appid} from {path} is not a valid Android application ID!"
-msgstr ""
-
-#: ../fdroidserver/metadata.py ../fdroidserver/update.py
-#, python-brace-format
-msgid "{appid} from {path} is not a valid Java Package Name!"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{appid} has both APKs and files: {files}"
-msgstr ""
-
-#: ../fdroidserver/mirror.py
-#, python-brace-format
-msgid "{appid} is missing {name}"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "{appid}: Unknown extlib {path} in build '{versionName}'"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "{appid}: no builds specified, running on current source state"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "{appid}: {field} must be a '{type}', but it is a '{fieldtype}!'"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "{appid}: {field} must be a '{type}', but it is a '{fieldtype}'!"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "{build_flag} must be an integer, found: {value}"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "{build_flag} must be list or string, found: {value}"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "{file} is blank or corrupt!"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{name} \"{section}/icons/{path}\" does not exist! Check \"config.yml\"."
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{path1} is a duplicate of {path2}, remove one!"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
-#, python-brace-format
-msgid "{path} already exists, ignoring import results!"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-#, python-brace-format
-msgid "{path} does not exist!  Create it by running:"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{path} has bad file signature \"{pattern}\", possible Janus exploit!"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "{path} has been flagged by virustotal {count} times:"
-msgstr ""
-
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "{path} has the wrong fingerprint ({fingerprint})!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "{path} is not \"key: value\" dict, but a {datatype}!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "{path} is not a standard config file!"
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "{path} is not list, but a {datatype}!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "{path} is not {expected_type}, but a {datatype}!"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{path} is zero size!"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "{path} more than 200MB, manually upload: {url}"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "{path}: \"{code}\" is not a valid ISO_3166-1 alpha-2 country code!"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{path}: {error}"
-msgstr ""
-
-#: ../fdroidserver/mirror.py
-#, python-brace-format
-msgid "{url} does not end with \"fdroid\", check the URL path!"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
-#, python-brace-format
-msgid "{url} does not start with \"http\"!"
-msgstr ""
-
-#: ../fdroidserver/build.py
-msgid "{} build failed"
-msgid_plural "{} builds failed"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../fdroidserver/build.py
-msgid "{} build succeeded"
-msgid_plural "{} builds succeeded"
-msgstr[0] ""
-msgstr[1] ""
diff --git a/locale/pa/LC_MESSAGES/fdroidserver.po b/locale/pa/LC_MESSAGES/fdroidserver.po
deleted file mode 100644
index 8c64a1c2..00000000
--- a/locale/pa/LC_MESSAGES/fdroidserver.po
+++ /dev/null
@@ -1,2681 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# This file is put in the public domain.
-# Kuldeep Singh <kuldeepburjbhalaike@gmail.com>, 2025.
-msgid ""
-msgstr ""
-"Project-Id-Version: fdroidserver 2.3.3\n"
-"Report-Msgid-Bugs-To: https://gitlab.com/fdroid/fdroidserver/issues\n"
-"POT-Creation-Date: 2025-06-25 09:52+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: Automatically generated\n"
-"Language-Team: none\n"
-"Language: pa\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=n > 1;\n"
-
-#: ../fdroidserver/nightly.py
-msgid ""
-"\n"
-"SSH public key to be used as deploy key:"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-#, python-brace-format
-msgid ""
-"\n"
-"{path} encoded for the DEBUG_KEYSTORE secret variable:"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-format
-msgid "\"%s/\" has no matching metadata file!"
-msgstr ""
-
-#: ../fdroidserver/index.py
-msgid "\"isPrimary\" key should not be added to mirrors!"
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "\"local_copy_dir\" {path} does not exist!"
-msgstr ""
-
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "\"{apkfilename}\" is already installed on {dev}."
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "\"{path}\" contains recent {name} ({version})"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "\"{path}\" exists but s3cmd is not installed!"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "\"{path}\" is not a supported file format (use: metadata/*.yml)"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "\"{path}\" is signed by a key that is not allowed:"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
-#, python-brace-format
-msgid "\"{url}\" is not a valid URL!"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "%(prog)s: error: %(message)s\n"
-msgstr ""
-
-#: ../fdroidserver/publish.py
-#, python-format
-msgid "%d APKs failed to be signed or verified!"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-format
-msgid "%d problems found"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "%r is not callable"
-msgstr ""
-
-#: ../fdroidserver/signindex.py
-#, python-format
-msgid "%s did not produce a dict!"
-msgstr ""
-
-#: ../fdroidserver/signindex.py
-#, python-format
-msgid "%s has bad SHA-256: %s"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-format
-msgid "%s is not an accepted build field"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "'keypass' not found in config.yml!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "'keystore' is NONE and 'smartcardoptions' is blank!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "'keystore' not found in config.yml!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "'keystorepass' not found in config.yml!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "'repo_keyalias' not found in config.yml!"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-msgid "'required' is an invalid argument for positionals"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "'sdk_path' not set in config.yml!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "'{aapt}' is too old, fdroid requires build-tools-{version} or newer!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "'{path}' failed to execute!"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "'{path}' has invalid format, it should be a dictionary!"
-msgstr ""
-
-#: ../fdroidserver/lint.py ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "'{value}' is not a valid {field} in {appid}. Regex pattern: {pattern}"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "'{value}' is not a valid {field}, should be {pattern}"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "--merge-request only runs on a single appid!"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "...checkupdate failed for {appid} : {error}"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-msgid ".__call__() not defined"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "/issues is missing"
-msgstr ""
-
-#: ../fdroidserver/mirror.py
-msgid "A URL is required as an argument!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "APK signatures have different certificates in {path}:"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Add PGP signatures using GnuPG for packages in repo"
-msgstr ""
-
-#: ../fdroidserver/update.py
-msgid "Add a repo signing key to an unsigned repo"
-msgstr ""
-
-#: ../fdroidserver/update.py
-msgid "Add skeleton metadata files for APKs that are missing them"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Adding new repo for only {name}"
-msgstr ""
-
-#: ../fdroidserver/init.py
-msgid "Alias of the repo signing key in the keystore"
-msgstr ""
-
-#: ../fdroidserver/build.py
-msgid "AllowedAPKSigningKeys missing but reference binary supplied"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
-msgid "Allows a different revision (or git branch) to be specified for the initial import"
-msgstr ""
-
-#: ../fdroidserver/mirror.py
-msgid "Also mirror the full archive section"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Also warn about formatting issues, like rewritemeta -l"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "Android AAR library"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "Android APK file"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "Android DEX code"
-msgstr ""
-
-#: ../fdroidserver/init.py
-#, python-brace-format
-msgid "Android SDK not found at {path}!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Android SDK path '{path}' does not exist!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Android SDK path '{path}' is not a directory!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Android SDK tool {cmd} not found!"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "App has Binaries but does not have corresponding AllowedAPKSigningKeys to pin certificate."
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "App has NoSourceSince or ArchivePolicy \"0 versions\" or 0 but AutoUpdateMode or UpdateCheckMode are not None"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "App is in '{repo}' but has a link to {url}"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "App version has binary but does not have corresponding AllowedAPKSigningKeys to pin certificate."
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Appending .git is not necessary"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Archiving {apkfilename} with invalid signature!"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "AutoUpdateMode with UpdateCheckMode: HTTP must have a pattern."
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "Automatic no to all prompts."
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "Automatic yes to all prompts."
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "Bad entry type \"{mirrortype}\" in mirrors config: {mirror}"
-msgstr ""
-
-#: ../fdroidserver/mirror.py
-msgid "Base URL to mirror, can include the index signing key using the query string: ?fingerprint="
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Branch '{branch}' used as commit in build '{versionName}'"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Branch '{branch}' used as commit in srclib '{srclib}'"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Broken symlink: {path}"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Build a package from source"
-msgstr ""
-
-#: ../fdroidserver/build.py
-msgid "Build all applications available"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Build generated by `fdroid import` - remove disable line once ready"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "Build metadata git repo has uncommited changes!"
-msgstr ""
-
-#: ../fdroidserver/build.py
-msgid "Build only the latest version of each package"
-msgstr ""
-
-#: ../fdroidserver/init.py
-#, python-format
-msgid "Built repo based in \"%s\" with this config:"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "Can't auto-update app with no CurrentVersionCode"
-msgstr ""
-
-#: ../fdroidserver/build.py
-msgid "Can't build due to {} error while scanning"
-msgid_plural "Can't build due to {} errors while scanning"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Cannot read {path}: {error}"
-msgstr ""
-
-#: ../fdroidserver/rewritemeta.py
-#, python-brace-format
-msgid "Cannot rewrite \"{path}\""
-msgstr ""
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
-#: ../fdroidserver/lint.py
-#, python-format
-msgid "Categories '%s' is not valid"
-msgstr ""
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
-#: ../fdroidserver/lint.py
-msgid "Categories are not set"
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "Category \"{category}\" defined but not used for any apps!"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Check for updates to applications"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Checking archiving for {appid} - apks:{integer}, keepversions:{keep}, archapks:{arch}"
-msgstr ""
-
-#: ../fdroidserver/update.py
-msgid "Clean update - don't uses caches, reprocess all APKs"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Color the log output"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
-msgid "Comma separated list of categories."
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-#, python-format
-msgid "Command '%s' not recognised.\n"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "Commit changes"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "Commit changes, push, then make a merge request"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Conflicting \"{field}\" definitions between .yml and localized files:"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Conflicting arguments: '--verbose' and '--quiet' can not be specified at the same time."
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Could not find '{command}' on your system"
-msgstr ""
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/import_subcommand.py
-msgid "Could not find latest version code"
-msgstr ""
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
-#: ../fdroidserver/import_subcommand.py
-msgid "Could not find latest version name"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Could not find {path} to remove it"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Could not open APK {path} for analysis: "
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Could not parse size \"{size}\", wrong type \"{type}\""
-msgstr ""
-
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/import_subcommand.py
-msgid "Couldn't find Application ID"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "Couldn't find any version information"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "Couldn't find package ID"
-msgstr ""
-
-#: ../fdroidserver/update.py
-msgid "Cowardily refusing to overwrite existing signing key setup!"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Created new container \"{name}\""
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Creating \"{path}\" for configuring s3cmd."
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Creating empty {config_file}"
-msgstr ""
-
-#: ../fdroidserver/publish.py
-msgid "Creating log directory"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Creating new S3 bucket: {url}"
-msgstr ""
-
-#: ../fdroidserver/publish.py
-msgid "Creating output directory"
-msgstr ""
-
-#: ../fdroidserver/index.py
-msgid "Creating signed index with this key (SHA256):"
-msgstr ""
-
-#: ../fdroidserver/publish.py ../fdroidserver/verify.py
-msgid "Creating temporary directory"
-msgstr ""
-
-#: ../fdroidserver/index.py
-msgid "Creating unsigned index in preparation for signing"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "CurrentVersionCode {cv} is less than oldest build entry {versionCode}"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-msgid "DEBUG_KEYSTORE is not set or the value is incomplete"
-msgstr ""
-
-#: ../fdroidserver/update.py
-msgid "Delete APKs and/or OBBs without metadata from the repo"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Deleting archive, repo is too big ({size} max {limit})"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Deleting git-mirror history, repo is too big ({size} max {limit})"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Deleting unknown file: {path}"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-format
-msgid "Description '%s' is just the app's summary"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Description has a duplicate line"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Description of length {length} is over the {limit} char limit"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Did you mean config/{name}.yml?"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Did you mean {code}?"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
-msgid "Do not add 'disable:' to the generated build entries"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-msgid "Do not deploy the new files to the repo"
-msgstr ""
-
-#: ../fdroidserver/mirror.py
-#, python-brace-format
-msgid "Do not include \"{path}\" in URL!"
-msgstr ""
-
-#: ../fdroidserver/init.py
-msgid "Do not prompt for Android SDK path, just fail"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-msgid "Do not remove the private keys generated from the keystore"
-msgstr ""
-
-#: ../fdroidserver/build.py
-msgid "Don't create a source tarball, useful when testing a build"
-msgstr ""
-
-#: ../fdroidserver/build.py
-msgid "Don't refresh the repository, useful when testing a build with no internet connection"
-msgstr ""
-
-#: ../fdroidserver/deploy.py ../fdroidserver/nightly.py
-msgid "Don't use rsync checksums"
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "Download F-Droid.apk using mirrors that leak less to the network"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Download complete mirrors of small repos"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Downloading the repository already failed once, not trying again."
-msgstr ""
-
-#: ../fdroidserver/verify.py
-#, python-brace-format
-msgid "Downloading {url} failed. {error}"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Duplicate Anti-Feature declaration at {path} was ignored!"
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-format
-msgid "Duplicate entry \"%s\" in mirrors config!"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Duplicate link in '{field}': {url}"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-format
-msgid "ERROR: %(message)s"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "ERROR: The \"server\" subcommand has been removed, use \"deploy\"!"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-msgid "ERROR: unsupported CI type, patches welcome!"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-#, python-format
-msgid "ERROR: unsupported git host \"%s\", patches welcome!"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "ERROR: {key} in {path} is not \"archive\" or \"repo\"!"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "ERROR: {key} not a valid key!"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "ERROR: {key}'s value should be of type {t}!"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "ERROR: {key}:{subkey} in {path} is not in allowed keys: {allowed_keys}!"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-#, python-brace-format
-msgid "Encoding is set to '{enc}' fdroid might run into encoding issues. Please set it to 'UTF-8' for best results."
-msgstr ""
-
-#: ../fdroidserver/init.py
-#, python-format
-msgid ""
-"Enter the path to the Android SDK (%s) here:\n"
-"> "
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Environment variable {var} from {configname} is not set!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Environment variable {{env: {var}}} is not set!"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "Error deploying 'github_releases', {} not present. (You might need to run `fdroid update` first.)"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
-msgid "Error while getting repo address"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "Exit with a non-zero code if problems were found"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Extract application metadata from a source repository"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Extract signatures from APKs"
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "F-Droid.apk could not be downloaded from any known source!"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Failed copying {path}: {error}"
-msgstr ""
-
-#: ../fdroidserver/signatures.py
-#, python-brace-format
-msgid "Failed fetching signatures for '{apkfilename}': {error}"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Failed reading {path}: {error}"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Failed resizing {path}: {error}"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Failed to create S3 bucket: {url}"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Failed to get APK information, deleting {path}"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Failed to get APK information, skipping {path}"
-msgstr ""
-
-#: ../fdroidserver/update.py
-msgid "Failed to get APK signing key fingerprint"
-msgstr ""
-
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "Failed to install '{apkfilename}' on {dev}: {error}"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Failed to sign application"
-msgstr ""
-
-#: ../fdroidserver/build.py
-#, python-brace-format
-msgid "Fetched buildserverid from VM: {buildserverid}"
-msgstr ""
-
-#: ../fdroidserver/signatures.py
-#, python-brace-format
-msgid "Fetched signatures for '{apkfilename}' -> '{sigdir}'"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "File disappeared while processing it: {path}"
-msgstr ""
-
-#: ../fdroidserver/build.py ../fdroidserver/install.py
-#: ../fdroidserver/rewritemeta.py ../fdroidserver/scanner.py
-#: ../fdroidserver/update.py
-msgid "Finished"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Forbidden HTML tags"
-msgstr ""
-
-#: ../fdroidserver/build.py
-msgid "Force build of disabled apps, and carries on regardless of scan problems. Only allowed in test mode."
-msgstr ""
-
-#: ../fdroidserver/build.py
-#, python-brace-format
-msgid "Force halting build after {0} sec timeout!"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "Force scan of disabled apps and builds."
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Found \"{path}\" graphic without metadata for app \"{name}\"!"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Found bad funding file \"{path}\" for \"{name}\":"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Found invalid appids in arguments"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Found invalid versionCodes for some apps"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Found multiple JAR Signature Block Files in {path}"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Found multiple Signer Certificates!"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Found multiple metadata files for {appid}"
-msgstr ""
-
-#: ../fdroidserver/index.py
-msgid "Found multiple signing certificates for repository."
-msgstr ""
-
-#: ../fdroidserver/index.py
-msgid "Found no signing certificates for repository."
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-format
-msgid "Found non-file at %s"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Found {apkfilename} at {url}"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Found {count} problems in {filename}"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Found {count} warnings in {filename}"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Generated skeleton metadata for {appid}"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-format
-msgid "Git checkout of '%s' failed"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Git clean failed"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Git fetch failed"
-msgstr ""
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/common.py
-#, python-format
-msgid "Git remote set-head failed: \"%s\""
-msgstr ""
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/common.py
-msgid "Git reset failed"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Git submodule deinit failed"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Git submodule sync failed"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Git submodule update failed"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "HTTPS must be used with Subversion URLs!"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "If a git mirror gets to big, allow the archive to be deleted"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "If this upload fails, try manually uploading to {url}"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Ignoring '{field}' in '{metapath}' metadata because it is deprecated."
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-format
-msgid "Ignoring FUNDING.yml entry longer than 2048: %s"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-format
-msgid "Ignoring bad element in manifest: %s"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Ignoring deprecated {oldfile}, use {newfile}!"
-msgstr ""
-
-#: ../fdroidserver/index.py
-msgid "Ignoring package without metadata: "
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Ignoring stale cache data for {apkfilename}"
-msgstr ""
-
-#: ../fdroidserver/update.py
-msgid "Include APKs that are signed with disabled algorithms like MD5"
-msgstr ""
-
-#: ../fdroidserver/mirror.py
-msgid "Include the PGP signature .asc files in the mirror"
-msgstr ""
-
-#: ../fdroidserver/mirror.py
-msgid "Include the build logs in the mirror"
-msgstr ""
-
-#: ../fdroidserver/mirror.py
-msgid "Include the source tarballs in the mirror"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-format
-msgid "Including metadata from %s@%s"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Including metadata from {path}"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Initialising submodules"
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "Install all signed applications available"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Install built packages on devices"
-msgstr ""
-
-#: ../fdroidserver/install.py
-#, python-format
-msgid "Installing %s..."
-msgstr ""
-
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "Installing '{apkfilename}' on {dev}..."
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Interact with the repo HTTP server"
-msgstr ""
-
-#: ../fdroidserver/update.py
-msgid "Invalid APK"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "Invalid AutoUpdateMode: {mode}"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "Invalid UpdateCheckMode: {mode}"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "Invalid VercodeOperation: {field}"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Invalid VercodeOperation: {invalid_ops}"
-msgstr ""
-
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Invalid application ID {appid}"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Invalid bulleted list"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-format
-msgid "Invalid name for published file: %s"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Invalid ndk: entry in build: \"{ndk}\""
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Invalid redirect to non-HTTPS: {before} -> {after} "
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Invalid scrlib metadata: '{file}' does not exist"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Invalid srclib metadata: could not parse '{file}'"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Invalid srclib metadata: unknown key '{key}' in '{file}'"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "JAR signature failed to verify: {path}"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "JAR signature verified: {path}"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "Java JAR file"
-msgstr ""
-
-#: ../fdroidserver/mirror.py ../fdroidserver/publish.py
-#: ../fdroidserver/update.py
-msgid "Java JDK not found! Install in standard location or set java_paths!"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "Java compiled class"
-msgstr ""
-
-#: ../fdroidserver/signindex.py
-msgid "Java jarsigner not found! Install in standard location or set java_paths!"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Javascript in HTML src attributes"
-msgstr ""
-
-#: ../fdroidserver/build.py
-#, python-brace-format
-msgid "Keeping failed build \"{apkfilename}\""
-msgstr ""
-
-#: ../fdroidserver/init.py
-msgid "Keystore for signing key:\t"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Known debug key is used in AllowedAPKSigningKeys: "
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Last used commit '{commit}' looks like a tag, but UpdateCheckMode is '{ucm}'"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Liberapay donation methods belong in the Liberapay: field"
-msgstr ""
-
-#: ../fdroidserver/rewritemeta.py
-msgid "List files that would be reformatted (dry run)"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Locale included in f-droid.org URL"
-msgstr ""
-
-#: ../fdroidserver/build.py
-msgid "Make the build stop on exceptions"
-msgstr ""
-
-#: ../fdroidserver/index.py
-msgid "Malformed repository mirrors."
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "Malformed serverwebroot line:"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-format
-msgid "Max recursion depth in ZIP file reached: %s"
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "Mirror config for {url} contains \"isPrimary\" key!"
-msgstr ""
-
-#: ../fdroidserver/mirror.py
-msgid "Mirror the full repo and archive, all file types."
-msgstr ""
-
-#: ../fdroidserver/gpgsign.py
-msgid "Missing output directory"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-msgid "Moving Anti-Features declarations to localized files:"
-msgstr ""
-
-#: ../fdroidserver/index.py
-msgid "Neither \"repo_pubkey\" nor \"keystorepass\" set in config.yml"
-msgstr ""
-
-#: ../fdroidserver/verify.py
-#, python-format
-msgid "No APK for package: %s"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "No Android SDK found!"
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "No attached devices found"
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "No devices found for `adb install`! Please plug one in."
-msgstr ""
-
-#: ../fdroidserver/index.py
-msgid "No fingerprint in URL."
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "No git submodules available"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
-msgid "No gradle project could be found. Specify --subdir?"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
-msgid "No information found."
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "No matching tags found"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "No minimum SDK version found in {0}, using default (3)."
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "No need to specify that the app is Free Software"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "No need to specify that the app is for Android"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "No option set! Edit your config.yml to set at least one of these:"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "No packages specified"
-msgstr ""
-
-#: ../fdroidserver/install.py
-#, python-format
-msgid "No signed APK available for %s"
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "No signed output directory - nothing to do"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "No signing certificates found in {path}"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-format
-msgid "No such package: %s"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "No such versionCode {versionCode} for app {appid}"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "No tags found"
-msgstr ""
-
-#: ../fdroidserver/publish.py ../fdroidserver/verify.py
-msgid "No unsigned directory - nothing to do"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "No version information could be found."
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Not a valid size definition: \"{}\""
-msgstr ""
-
-#: ../fdroidserver/signindex.py
-msgid "Nothing to do"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "Nothing to do for {appid}."
-msgstr ""
-
-#: ../fdroidserver/init.py
-msgid "Now set these in config.yml:"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "OBB file has newer versionCode({integer}) than any APK:"
-msgstr ""
-
-#: ../fdroidserver/update.py
-msgid "OBB filename must start with \"main.\" or \"patch.\":"
-msgstr ""
-
-#: ../fdroidserver/update.py
-msgid "OBB's packagename does not match a supported APK:"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "Offline machine, skipping git mirror generation until `fdroid deploy`"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "One of the 'github_releases' config items is missing the 'packageNames' value. skipping ..."
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "One of the 'github_releases' config items is missing the 'projectUrl' value. skipping ..."
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "One of the 'github_releases' config items is missing the 'token' value. skipping ..."
-msgstr ""
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Only PNG and JPEG are supported for graphics, found: {path}"
-msgstr ""
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/common.py
-msgid "Only accepts a single key \"env\""
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "Only process apps with auto-updates"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "OpenCollective donation methods belong in the OpenCollective: field"
-msgstr ""
-
-#: ../fdroidserver/verify.py
-msgid "Output JSON report to file named after APK."
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "Output JSON to stdout."
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py ../fdroidserver/gpgsign.py
-#: ../fdroidserver/publish.py ../fdroidserver/signindex.py
-#: ../fdroidserver/update.py
-msgid "Outputting JSON"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
-msgid "Overall license of the project."
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "Overriding blank versionName in {apkfilename} from metadata: {version}"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
-#, python-brace-format
-msgid "Package \"{appid}\" already exists"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Parsing manifest at '{path}'"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Password required with username"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
-msgid "Path to main Android project subdirectory, if not in root."
-msgstr ""
-
-#: ../fdroidserver/init.py
-msgid "Path to the Android SDK (sometimes set in ANDROID_HOME)"
-msgstr ""
-
-#: ../fdroidserver/btlog.py
-msgid "Path to the git repo to use as the log"
-msgstr ""
-
-#: ../fdroidserver/init.py
-msgid "Path to the keystore for the repo signing key"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-msgid "Print the secret variable to the terminal for easy copy/paste"
-msgstr ""
-
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "Privacy mode was enabled based on your locale ({country_code})."
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-format
-msgid "Problem with ZIP file: %s, error %s"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Problem with xml at '{path}'"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "Process auto-updates"
-msgstr ""
-
-#: ../fdroidserver/publish.py ../fdroidserver/update.py
-#, python-brace-format
-msgid "Processing {apkfilename}"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Processing {appid}"
-msgstr ""
-
-#: ../fdroidserver/update.py
-msgid "Produce human-readable XML/JSON for index files"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
-msgid "Project URL to import from."
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Punctuation should be avoided"
-msgstr ""
-
-#: ../fdroidserver/btlog.py
-msgid "Push the log to this git remote repository"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Pushing binary transparency log to {url}"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "Pushing to remote server failed!"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Pushing to {url}"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Quickly start a new repository"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Read all the metadata files and exit"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Reading '{config_file}'"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Reading packageName/versionCode/versionName failed, APK invalid: '{apkfilename}'"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Reading packageName/versionCode/versionName failed,APK invalid: '{apkfilename}'"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Reading {apkfilename} from cache"
-msgstr ""
-
-#: ../fdroidserver/build.py
-msgid "Refresh and cache scanner rules and signatures from the network"
-msgstr ""
-
-#: ../fdroidserver/publish.py
-#, python-brace-format
-msgid "Refusing to sign '{path}', file exists in both {dir1} and {dir2} folder."
-msgstr ""
-
-#: ../fdroidserver/verify.py
-msgid "Remove source tarball and any APKs if successfully verified."
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Removing specified files"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Removing {path}\""
-msgstr ""
-
-#: ../fdroidserver/update.py
-msgid "Rename APK files that do not match package.name_123.apk"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "RepoType {type} is deprecated, please switch to git."
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-#, python-brace-format
-msgid "Resigning {apkfilename} with provided debug.keystore"
-msgstr ""
-
-#: ../fdroidserver/update.py
-msgid "Resize all the icons exceeding the max pixel size and exit"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Restrict output to warnings and errors"
-msgstr ""
-
-#: ../fdroidserver/net.py
-#, python-format
-msgid "Retrying failed download: %s"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Rewrite all the metadata files"
-msgstr ""
-
-#: ../fdroidserver/rewritemeta.py
-#, python-brace-format
-msgid "Rewriting '{appid}'"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "Run on git repo that has uncommitted changes"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-#, python-brace-format
-msgid "Run over {cibase} to find -debug.apk. and skip repo_basedir {repo_basedir}"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Run rewritemeta to fix formatting"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "Running first pass with MD5 checking disabled"
-msgstr ""
-
-#: ../fdroidserver/mirror.py
-#, python-brace-format
-msgid "Running wget in {path}"
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "SHA-256 of {url} does not match entry!"
-msgstr ""
-
-#: ../fdroidserver/build.py
-msgid "Scan the resulting APK(s) for known non-free classes."
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Scan the source code of a package"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Scanner found {count} problems in {apk}"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Scanner found {count} problems in {appid}:"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Scanner found {count} problems in {appid}:{versionCode}:"
-msgstr ""
-
-#: ../fdroidserver/build.py
-msgid "Scanner found {} problem"
-msgid_plural "Scanner found {} problems"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../fdroidserver/scanner.py
-msgid "Scanning APK for extra signing blocks."
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "Scanning APK with dexdump for known non-free classes."
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Set NDK {release} ({version}) up"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Set clock to that time using:"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-msgid "Set maximum releases in repo before older ones are archived"
-msgstr ""
-
-#: ../fdroidserver/build.py
-#, python-brace-format
-msgid "Set open file limit to {integer}"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Set up an app build for a nightly build repo"
-msgstr ""
-
-#: ../fdroidserver/build.py
-msgid "Setting open file limit failed: "
-msgstr ""
-
-#: ../fdroidserver/build.py
-#, python-brace-format
-msgid "Setting {0} sec timeout for this build"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Sign and place packages in the repo"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Sign indexes created using update --nosign"
-msgstr ""
-
-#: ../fdroidserver/build.py
-msgid "Skip scanning the source code for binaries and other problems"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Skipping '{apkfilename}' with invalid signature!"
-msgstr ""
-
-#: ../fdroidserver/deploy.py ../fdroidserver/index.py
-#, python-format
-msgid "Skipping GitLab Pages mirror because the repo is too large (>%.2fGB)!"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Skipping index generation for {appid}"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Skipping {apkfilename} with invalid signature!"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Skipping {appid}: disabled"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "Specify a local folder to sync the repo to"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "Specify an identity file to provide to SSH for rsyncing"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-msgid "Specify which debug keystore file to use."
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Spew out even more information than normal"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-#, python-brace-format
-msgid "Stripping mystery signature from {apkfilename}"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-format
-msgid "Summary '%s' is just the app's name"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Summary of length {length} is over the {limit} char limit"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "System clock is older than date in {path}!"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "Tags update mode only works for git, hg, bzr and git-svn repositories currently"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "Tags update mode used in git-svn, but the repo was not set up with tags"
-msgstr ""
-
-#: ../fdroidserver/build.py
-msgid "Test mode - put output in the tmp directory only, and always build, even if the output already exists."
-msgstr ""
-
-#: ../fdroidserver/index.py
-msgid "The \"qrcode\" Python package is not installed (e.g. apt-get install python3-qrcode)!"
-msgstr ""
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "The OBB version code must come after \"{name}.\":"
-msgstr ""
-
-#: ../fdroidserver/btlog.py
-msgid "The base URL for the repo to log (default: https://f-droid.org)"
-msgstr ""
-
-#: ../fdroidserver/mirror.py
-msgid "The directory to write the mirror to"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-msgid "The file to be included in the repo (path or glob)"
-msgstr ""
-
-#: ../fdroidserver/index.py
-msgid "The repository's fingerprint does not match."
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "The root dir for local_copy_dir \"{path}\" does not exist!"
-msgstr ""
-
-#: ../fdroidserver/publish.py
-msgid "There is a keyalias collision - publishing halted"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "These are the apps that have been archived from the main repo."
-msgstr ""
-
-#: ../fdroidserver/mirror.py
-msgid "This command should never be used to mirror f-droid.org! A full copy requires more than 600GB."
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "This is a repository of apps to be used with F-Droid. Applications in this repository are either official binaries built by the original application developers, or are binaries built from source by the admin of f-droid.org using the tools on https://gitlab.com/fdroid."
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
-#, python-format
-msgid "This repo already has local metadata: %s"
-msgstr ""
-
-#: ../fdroidserver/init.py
-#, python-format
-msgid ""
-"To complete the setup, add your APKs to \"%s\"\n"
-"then run \"fdroid update -c; fdroid update\".  You might also want to edit\n"
-"\"config.yml\" to set the URL, repo name, and more.  You should also set up\n"
-"a signing key (a temporary one might have been automatically generated).\n"
-"\n"
-"For more info: https://f-droid.org/docs/Setup_an_F-Droid_App_Repo\n"
-"and https://f-droid.org/docs/Signing_Process"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "To use awsbucket, awssecretkey and awsaccesskeyid must also be set in config.yml!"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "To use rclone, rclone_config and awsbucket must be set in config.yml!"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "URL must start with https:// or http://"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "URL shorteners should not be used"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "URL {url} in Description: {error}"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Unexpected license tag \"{}\"! Only use FSF or OSI approved tags from https://spdx.org/license-list"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Unexpected license tag \"{}\"! Only use license tags configured in your config file"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Unknown entry {key} in {configname}"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Unknown exception found!"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Unknown file '{filename}' in build '{versionName}'"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-format
-msgid "Unknown metadata format: %s"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Unknown metadata format: {path} (use: *.yml)"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Unknown version of aapt, might cause problems: "
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Unnecessary leading space"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Unnecessary trailing space"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Unrecognised app field '{fieldname}' in '{path}'"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Unrecognised build flag '{build_flag}' in '{path}'"
-msgstr ""
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Unsupported file type \"{extension}\" for repo graphic"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Unsupported graphics file found: {path}"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-format
-msgid "Unused extlib at %s"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-format
-msgid "Unused file at %s"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-format
-msgid "Unused scandelete path: %s"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-format
-msgid "Unused scanignore path: %s"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Update repo information for new packages"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Update the binary transparency log for a URL"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "UpdateCheckData has invalid URL: {url}"
-msgstr ""
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "UpdateCheckData must match the version code as integer (\\d or [0-9]): {codeex}"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "UpdateCheckData must use HTTPS URL: {url}"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "UpdateCheckData not a valid URL: {url}"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "UpdateCheckMode is set but it looks like checkupdates hasn't been run yet."
-msgstr ""
-
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/lint.py
-msgid "UpdateCheckName is set to the known application ID, it can be removed"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Uploading {apkfilename} to androidobservatory.org"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Uploading {apkfilename} to virustotal"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Use /HEAD instead of /master or /main to point at a file in the default branch"
-msgstr ""
-
-#: ../fdroidserver/update.py
-msgid "Use `fdroid update -c` to create it."
-msgstr ""
-
-#: ../fdroidserver/build.py
-msgid "Use build server"
-msgstr ""
-
-#: ../fdroidserver/update.py
-msgid "Use date from APK instead of current time for newly added APKs"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Using \"{path}\" for configuring s3cmd."
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Using \"{path}\" for syncing with remote storage."
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Using APK Signature v2"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Using APK Signature v3"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Using JAR Signature"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Using Java's jarsigner, not recommended for verifying APKs! Use apksigner"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Using blank dictionary instead of contents of {path}!"
-msgstr ""
-
-#: ../fdroidserver/init.py
-#, python-brace-format
-msgid "Using existing keystore \"{path}\""
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Using rclone to sync with: {url}"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Using s3cmd to sync with: {url}"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Valid commands are:"
-msgstr ""
-
-#: ../fdroidserver/verify.py
-msgid "Verify against locally cached copy rather than redownloading."
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Verify the integrity of downloaded packages"
-msgstr ""
-
-#: ../fdroidserver/index.py
-msgid "Verifying index signature:"
-msgstr ""
-
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "Verifying package {path} with apksigner."
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "VirusTotal API key cannot upload files larger than 32MB, use {url} to upload {path}."
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-msgid "WARNING: only public git repos are supported!"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Warn about possible metadata errors"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "WebAssembly binary file"
-msgstr ""
-
-#: ../fdroidserver/update.py
-msgid "When configured for signed indexes, create only unsigned indexes at this stage"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "When linting the entire repository yamllint is disabled by default. This option forces yamllint regardless."
-msgstr ""
-
-#: ../fdroidserver/publish.py
-msgid "When signing or verifying fails, exit with an error code."
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "Would you like to download and install F-Droid.apk via adb? (YES/no)"
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "Would you like to download the app(s) from f-droid.org? (YES/no)"
-msgstr ""
-
-#: ../fdroidserver/init.py
-msgid "X.509 'Distinguished Name' used when generating keys"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "You can use ANDROID_HOME to set the path to your SDK, i.e.:"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "ZIP file archive"
-msgstr ""
-
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "adb reports {serial} is \"{status}\"!"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-#, python-brace-format
-msgid "adding IdentityFile to {path}"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "adding to {name}: {path}"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "ambiguous option: %(option)s could match %(matches)s"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "apksigner in build-tools;{version} passes APKs with invalid v3 signatures, ignoring."
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "apksigner not found! Cannot sign or verify modern APKs"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "apksigner not found, it's required for signing!"
-msgstr ""
-
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/checkupdates.py ../fdroidserver/lint.py
-#: ../fdroidserver/rewritemeta.py
-msgid "application ID of file to operate on"
-msgstr ""
-
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/build.py ../fdroidserver/install.py
-#: ../fdroidserver/publish.py ../fdroidserver/scanner.py
-#: ../fdroidserver/verify.py
-msgid "application ID with optional versionCode in the form APPID[:VERCODE]"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "archive_url needs to end with /archive"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "argument \"-\" with mode %r"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "argument %(argument_name)s: %(message)s"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-msgid "attempting bare SSH connection to test deploy key:"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "can not parse scrlib spec (not a string): '{}'"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "can't open '%(filename)s': %(error)s"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "can't open non-https url: '{};"
-msgstr ""
-
-#: ../fdroidserver/build.py
-#, python-brace-format
-msgid "cannot find required srclibs: \"{path}\""
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-msgid "cannot have multiple subparser arguments"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "cannot merge actions - two groups are named %r"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-msgid "cannot publish update, did you set the deploy key?"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-#, python-brace-format
-msgid "cloning {url}"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "commands from plugin modules:"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "conflicting option string: %s"
-msgid_plural "conflicting option strings: %s"
-msgstr[0] ""
-msgstr[1] ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "conflicting subparser alias: %s"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "conflicting subparser: %s"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "could not parse '{path}'"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "could not parse srclib spec (no name specified): '{}'"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "could not parse srclib spec (no ref specified): '{}'"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-#, python-brace-format
-msgid "created {path}"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "current version is newer: old vercode={old}, new vercode={new}"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "deleting: repo/{apkfilename}"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "dependency file without lock"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "deployed process log {path} to {dest}"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "dest= is required for options like %r"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "downloading '{}'"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "downloading scanner signatures from '{}' failed"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "executable binary, possibly code"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "expected %s argument"
-msgid_plural "expected %s arguments"
-msgstr[0] ""
-msgstr[1] ""
-
-#: /usr/lib/python3.11/argparse.py
-msgid "expected at least one argument"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-msgid "expected at most one argument"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-msgid "expected one argument"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "fdroid [<command>] [-h|--help|--version|<args>]"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "fetch the latest version of signatures from the web"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-msgid "force metadata errors (default) to be warnings, or to be ignored."
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "git svn clone failed"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "gzip file archive"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "ignored explicit argument %r"
-msgstr ""
-
-#: ../fdroidserver/index.py
-msgid "index-v1 must have a signature, use `fdroid signindex` to create it!"
-msgstr ""
-
-#: ../fdroidserver/index.py
-msgid "index-v2 must have a signature, use `fdroid signindex` to create it!"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "invalid %(type)s value: %(value)r"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "invalid choice: %(value)r (choose from %(choices)s)"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "invalid conflict_resolution value: %r"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "invalid option string %(option)r: must start with a character %(prefix_chars)r"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "ipfs_cid not found, skipping CIDv1 generation"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "latest build recipe is newer: old vercode={old}, new vercode={new}"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "local_copy_dir does not end with \"fdroid\", perhaps you meant: \"{path}\""
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "local_copy_dir must be an absolute path!"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "local_copy_dir must be directory, not a file!"
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-format
-msgid "mirror '%s' does not end with 'fdroid'!"
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "mirrors set twice, in config.yml and {path}!"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-msgid "mutually exclusive arguments must be optional"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "next {name} cache update due in {time}"
-msgstr ""
-
-#: ../fdroidserver/mirror.py
-#, python-brace-format
-msgid "no \"icon\" in {appid}"
-msgstr ""
-
-#: ../fdroidserver/signatures.py
-msgid "no APK supplied"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "no version information found"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "not allowed with argument %s"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "one of the arguments %s is required"
-msgstr ""
-
-#: ../fdroidserver/common.py ../fdroidserver/index.py
-msgid "only accepts strings, lists, and tuples"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-msgid "options"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-#, python-brace-format
-msgid "overwriting existing {path}"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-msgid "positional arguments"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "process log deploy {path} to {dest} failed!"
-msgstr ""
-
-#: ../fdroidserver/build.py
-msgid "reference binary missing signature"
-msgstr ""
-
-#: ../fdroidserver/signatures.py
-#, python-brace-format
-msgid "refuse downloading via insecure HTTP connection (use HTTPS or specify --no-https-check): {apkfilename}"
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-format
-msgid "repo_icon \"repo/icons/%s\" does not exist, generating placeholder."
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "repo_url needs to end with /repo"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "rsync is missing or broken: {error}"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "s3cmd sync indexes {path} to {url} and delete"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "s3cmd syncs indexes from {path} to {url} and deletes removed"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "scanner cache is malformed! You can clear it with: '{clear}'"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "serverwebroot: path does not end with \"fdroid\", perhaps you meant one of these:"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "shared library"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-msgid "show this help message and exit"
-msgstr ""
-
-#: ../fdroidserver/signatures.py
-msgid "signed APK, either a file-path or HTTPS URL."
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "skip deploying full build logs: log content is empty"
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "skip deploying full build logs: not enabled in config"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "skipping source tarball: {path}"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "srclibs missing name and/or @"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "static library"
-msgstr ""
-
-#: ../fdroidserver/build.py
-#, python-brace-format
-msgid "supplied reference binary has allowed signer {signer}"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "the following arguments are required: %s"
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "true"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "unexpected option string: %s"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "unknown parser %(parser_name)r (choices: %(choices)s)"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "unrecognized arguments: %s"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "unsafe permissions on '{config_file}' (should be 0600)!"
-msgstr ""
-
-#: ../fdroidserver/__main__.py /usr/lib/python3.11/argparse.py
-msgid "usage: "
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "using Apache libcloud to sync with {url}"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "virustotal.com is rate limiting, waiting to retry..."
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "yes"
-msgstr ""
-
-#: ../fdroidserver/publish.py
-#, python-brace-format
-msgid "{0} app, {1} key aliases"
-msgid_plural "{0} apps, {1} key aliases"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{apkfilename} ({appid}) has no metadata!"
-msgstr ""
-
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{apkfilename}'s AndroidManifest.xml has a bad date: "
-msgstr ""
-
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{appid} does not have a name! Using application ID instead."
-msgstr ""
-
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{appid} from {path} is not a valid Android application ID!"
-msgstr ""
-
-#: ../fdroidserver/metadata.py ../fdroidserver/update.py
-#, python-brace-format
-msgid "{appid} from {path} is not a valid Java Package Name!"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{appid} has both APKs and files: {files}"
-msgstr ""
-
-#: ../fdroidserver/mirror.py
-#, python-brace-format
-msgid "{appid} is missing {name}"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "{appid}: Unknown extlib {path} in build '{versionName}'"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "{appid}: no builds specified, running on current source state"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "{appid}: {field} must be a '{type}', but it is a '{fieldtype}!'"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "{appid}: {field} must be a '{type}', but it is a '{fieldtype}'!"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "{build_flag} must be an integer, found: {value}"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "{build_flag} must be list or string, found: {value}"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "{file} is blank or corrupt!"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{name} \"{section}/icons/{path}\" does not exist! Check \"config.yml\"."
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{path1} is a duplicate of {path2}, remove one!"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
-#, python-brace-format
-msgid "{path} already exists, ignoring import results!"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-#, python-brace-format
-msgid "{path} does not exist!  Create it by running:"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{path} has bad file signature \"{pattern}\", possible Janus exploit!"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "{path} has been flagged by virustotal {count} times:"
-msgstr ""
-
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "{path} has the wrong fingerprint ({fingerprint})!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "{path} is not \"key: value\" dict, but a {datatype}!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "{path} is not a standard config file!"
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "{path} is not list, but a {datatype}!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "{path} is not {expected_type}, but a {datatype}!"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{path} is zero size!"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "{path} more than 200MB, manually upload: {url}"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "{path}: \"{code}\" is not a valid ISO_3166-1 alpha-2 country code!"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{path}: {error}"
-msgstr ""
-
-#: ../fdroidserver/mirror.py
-#, python-brace-format
-msgid "{url} does not end with \"fdroid\", check the URL path!"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
-#, python-brace-format
-msgid "{url} does not start with \"http\"!"
-msgstr ""
-
-#: ../fdroidserver/build.py
-msgid "{} build failed"
-msgid_plural "{} builds failed"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../fdroidserver/build.py
-msgid "{} build succeeded"
-msgid_plural "{} builds succeeded"
-msgstr[0] ""
-msgstr[1] ""
diff --git a/locale/pick-complete-translations.py b/locale/pick-complete-translations.py
deleted file mode 100755
index be11426c..00000000
--- a/locale/pick-complete-translations.py
+++ /dev/null
@@ -1,97 +0,0 @@
-#!/usr/bin/python3
-#
-# add completed translations from weblate to MANIFEST.in
-
-import json
-import os
-import re
-import subprocess
-
-import git
-import requests
-
-projectbasedir = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
-localedir = os.path.join(projectbasedir, 'locale')
-print(projectbasedir)
-
-cached_file = os.path.join(localedir, 'fdroidserver.json')
-if os.path.exists(cached_file):
-    with open(cached_file) as fp:
-        data = json.load(fp)
-else:
-    url = 'https://hosted.weblate.org/api/components/f-droid/fdroidserver/statistics/?format=json'
-    r = requests.get(url)
-    r.raise_for_status()
-    data = r.json()['results']
-
-active = set()
-print('name                               locale   translated approved error-free')
-for locale in sorted(data, key=lambda locale: locale['code']):
-    print(
-        '%26s' % locale['name'],
-        '%8s' % locale['code'],
-        '%0.1f%%' % locale['translated_percent'],
-        '%0.1f%%' % locale['approved_percent'],
-        '%0.1f%%' % (100 - locale['failing_percent']),
-        sep='\t',
-    )
-    if locale['translated_percent'] >= 90 and locale['failing'] < 5:
-        active.add(locale['code'])
-
-manifest_file = os.path.join(projectbasedir, 'MANIFEST.in')
-with open(manifest_file) as fp:
-    manifest_in = fp.read()
-for m in re.findall(r'include locale/([^/]+)/LC_MESSAGES/fdroidserver.po', manifest_in):
-    active.add(m)
-
-repo = git.Repo(projectbasedir)
-weblate = repo.remotes.weblate
-weblate.fetch()
-upstream = repo.remotes.upstream
-upstream.fetch()
-
-if 'merge_weblate' in repo.heads:
-    merge_weblate = repo.heads['merge_weblate']
-    repo.create_tag(
-        'previous_merge_weblate',
-        ref=merge_weblate,
-        message=('Automatically created by %s' % __file__),
-    )
-else:
-    merge_weblate = repo.create_head('merge_weblate')
-merge_weblate.set_commit(upstream.refs.master)
-merge_weblate.checkout()
-
-active = sorted(active)
-manifest_lines = set()
-for locale in active:
-    po_file = f'locale/{locale}/LC_MESSAGES/fdroidserver.po'
-    manifest_lines.add(f'include {po_file}\n')
-    for commit in repo.iter_commits(
-        str(weblate.refs.master) + '...' + str(upstream.refs.master),
-        paths=[po_file],
-        max_count=10,
-        reverse=True,
-    ):
-        print(f'{locale}: git cherry-pick', commit)
-        repo.git.cherry_pick(commit)
-
-with open(manifest_file, 'a') as fp:
-    for line in manifest_lines:
-        if line:
-            fp.write(line)
-
-# first filter duplicates
-subprocess.run(['sort', '-u', '-o', manifest_file, manifest_file])
-# then use a stable sort order
-subprocess.run(
-    ['sort', '--ignore-case', '--stable', '-o', manifest_file, manifest_file],
-    env={'LC_ALL': 'C'},
-)
-
-print('\tIf all else fails, try:')
-print('\tgit checkout -B merge_weblate weblate/master')
-print('\tgit rebase -i upstream/master')
-print('\t# select all in editor and cut all commit lines')
-print('\twl-paste | grep -Eo ".* \((%s)\) .*" | wl-copy' % '|'.join(active))
-print('\t# paste into editor, and make rebase\n')
diff --git a/locale/pl/LC_MESSAGES/fdroidserver.po b/locale/pl/LC_MESSAGES/fdroidserver.po
index 03bbc39f..cc665f9f 100644
--- a/locale/pl/LC_MESSAGES/fdroidserver.po
+++ b/locale/pl/LC_MESSAGES/fdroidserver.po
@@ -1,25 +1,39 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# WaldiS <sto@tutanota.de>, 2020, 2021, 2024, 2025.
-# Michal L <michalrmsmi@wp.pl>, 2020, 2021.
-# mondstern <mondstern@snopyta.org>, 2021.
-# Hans-Christoph Steiner <hans@guardianproject.info>, 2021, 2024.
-# Agnieszka C <aga_04@o2.pl>, 2021, 2022, 2023, 2024.
-# Eryk Michalak <gnu.ewm@protonmail.com>, 2024.
+# WaldiS <sto@tutanota.de>, 2020.
+# Michal L <michalrmsmi@wp.pl>, 2020.
 msgid ""
 msgstr ""
 "Project-Id-Version: fdroidserver 1.0.0-95-gd7af22b\n"
 "Report-Msgid-Bugs-To: https://gitlab.com/fdroid/fdroidserver/issues\n"
-"POT-Creation-Date: 2025-06-25 09:52+0200\n"
-"PO-Revision-Date: 2025-06-24 12:05+0000\n"
-"Last-Translator: WaldiS <sto@tutanota.de>\n"
+"POT-Creation-Date: 2020-10-21 18:05+0200\n"
+"PO-Revision-Date: 2020-11-20 23:28+0000\n"
+"Last-Translator: Michal L <michalrmsmi@wp.pl>\n"
 "Language-Team: Polish <https://hosted.weblate.org/projects/f-droid/fdroidserver/pl/>\n"
 "Language: pl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-"X-Generator: Weblate 5.13-dev\n"
+"Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"X-Generator: Weblate 4.4-dev\n"
+
+#: ../fdroidserver/common.py
+msgid ""
+"\n"
+"        This is a repository of apps to be used with FDroid. Applications in this\n"
+"        repository are either official binaries built by the original application\n"
+"        developers, or are binaries built from source by f-droid.org using the\n"
+"        tools on https://gitlab.com/fdroid.\n"
+"        "
+msgstr ""
+
+#: ../fdroidserver/nightly.py
+msgid ""
+"\n"
+"SSH Public Key to be used as Deploy Key:"
+msgstr ""
+"\n"
+"Klucz publiczny SSH do użycia jako klucz wdrażania:"
 
 #: ../fdroidserver/nightly.py
 msgid ""
@@ -43,26 +57,22 @@ msgstr ""
 msgid "\"%s/\" has no matching metadata file!"
 msgstr "\"%s/\" nie ma pasującego pliku metadanych!"
 
-#: ../fdroidserver/index.py
-msgid "\"isPrimary\" key should not be added to mirrors!"
-msgstr "Klucz „isPrimary” nie powinien być dodawany do mirrorów!"
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "\"local_copy_dir\" {path} does not exist!"
-msgstr "„local_copy_dir” {path} nie istnieje!"
-
 #: ../fdroidserver/install.py
 #, python-brace-format
 msgid "\"{apkfilename}\" is already installed on {dev}."
 msgstr "\"{apkfilename}\" jest już zainstalowany na {dev}."
 
+#: ../fdroidserver/update.py
+#, python-brace-format
+msgid "\"{path}\" contains outdated {name} ({version})"
+msgstr "\"{path}\" zawiera nieaktualne {name} ({version})"
+
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "\"{path}\" contains recent {name} ({version})"
 msgstr "\"{path}\" zawiera najnowsze {name} ({version})"
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "\"{path}\" exists but s3cmd is not installed!"
 msgstr "\"{path}\" istnieje, ale s3cmd nie jest zainstalowany!"
@@ -72,84 +82,120 @@ msgstr "\"{path}\" istnieje, ale s3cmd nie jest zainstalowany!"
 msgid "\"{path}\" is not a supported file format (use: metadata/*.yml)"
 msgstr "„{path}” nie jest obsługiwanym formatem pliku (użyj: metadata/*.yml)"
 
-#: ../fdroidserver/update.py
+#: ../fdroidserver/metadata.py
 #, python-brace-format
-msgid "\"{path}\" is signed by a key that is not allowed:"
-msgstr "„{path}” jest podpisany kluczem, który jest niedozwolony:"
+msgid "\"{path}\" is not an accepted format, convert to: {formats}"
+msgstr "\"{path}\" nie jest akceptowanym formatem, zamień na: {formats}"
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/common.py
 #, python-brace-format
 msgid "\"{url}\" is not a valid URL!"
 msgstr "\"{url}\" nie jest prawidłowym adresem URL!"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, python-format
+msgid "%(option)s option requires %(number)d argument"
+msgid_plural "%(option)s option requires %(number)d arguments"
+msgstr[0] "%(option)s opcja wymaga %(number)d argument"
+msgstr[1] "%(option)s opcji wymaga %(number)d argumentów"
+msgstr[2] "%(option)s opcje wymagają %(number)d argumentów"
+
+#: ../fdroidserver/mirror.py
+#, python-format
+msgid "%(prog)s [options] url"
+msgstr "%(prog)s [opcje] url"
+
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "%(prog)s: error: %(message)s\n"
 msgstr "%(prog)s: błąd: %(message)s\n"
 
-#: ../fdroidserver/publish.py
-#, python-format
-msgid "%d APKs failed to be signed or verified!"
-msgstr "Nie udało się podpisać lub zweryfikować %d plików APK!"
-
 #: ../fdroidserver/scanner.py
 #, python-format
 msgid "%d problems found"
 msgstr "%d problemy odnalezione"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "%prog [options]"
+msgstr "%prog [opcje]"
+
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "%r is not callable"
 msgstr "%r nie można wywołać"
 
-#: ../fdroidserver/signindex.py
-#, python-format
-msgid "%s did not produce a dict!"
-msgstr "%s nie wytworzyło dict!"
-
-#: ../fdroidserver/signindex.py
-#, python-format
-msgid "%s has bad SHA-256: %s"
-msgstr "%s ma zły SHA-256: %s"
-
 #: ../fdroidserver/lint.py
 #, python-format
 msgid "%s is not an accepted build field"
 msgstr "%s nie jest akceptowanym polem kompilacji"
 
-#: ../fdroidserver/common.py
-msgid "'keypass' not found in config.yml!"
-msgstr "'keypass' nie znaleziono w config.yml!"
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, python-format
+msgid "%s option does not take a value"
+msgstr "%s opcja nie przyjmuje wartości"
+
+#: ../fdroidserver/index.py ../fdroidserver/common.py
+msgid "'keypass' not found in config.py!"
+msgstr "'keypass' nie znaleziono w config.py!"
 
 #: ../fdroidserver/common.py
 msgid "'keystore' is NONE and 'smartcardoptions' is blank!"
-msgstr "\"keystore\" nie ma, a \"smartcardoptions\" jest puste!"
+msgstr ""
 
-#: ../fdroidserver/common.py
-msgid "'keystore' not found in config.yml!"
-msgstr "'Plik kluczy' nie został znaleziony w pliku config.yml!"
+#: ../fdroidserver/index.py ../fdroidserver/common.py
+msgid "'keystore' not found in config.py!"
+msgstr "'Plik kluczy' nie został znaleziony w pliku config.py!"
 
-#: ../fdroidserver/common.py
-msgid "'keystorepass' not found in config.yml!"
-msgstr "'keystorepass' nie znaleziono w config.yml!"
+#: ../fdroidserver/index.py ../fdroidserver/common.py
+msgid "'keystorepass' not found in config.py!"
+msgstr "'keystorepass' nie znaleziono w config.py!"
 
-#: ../fdroidserver/common.py
-msgid "'repo_keyalias' not found in config.yml!"
-msgstr "'repo_keyalias' nie znaleziono w config.yml!"
+#: ../fdroidserver/index.py ../fdroidserver/common.py
+msgid "'repo_keyalias' not found in config.py!"
+msgstr "'repo_keyalias' nie znaleziono w config.py!"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "'required' is an invalid argument for positionals"
 msgstr "'wymagane' jest nieprawidłowym argumentem dla pozycji"
 
 #: ../fdroidserver/common.py
-msgid "'sdk_path' not set in config.yml!"
-msgstr "'sdk_path' nie jest ustawiony w config.yml!"
+msgid "'sdk_path' not set in 'config.py'!"
+msgstr "'sdk_path' nie jest ustawiony w 'config.py'!"
+
+#. Translators: "build-tools" is the file name of a package from
+#. Google, it is part of the Android SDK. So it probably shouldn't be
+#. translated or transliterated.
+#: ../fdroidserver/common.py
+#, python-brace-format
+msgid "'{aapt}' is too old, fdroid requires build-tools-23.0.0 or newer!"
+msgstr "'{aapt}' jest zbyt stary, fdroid wymaga build-tools-23.0.0 lub nowszego!"
 
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "'{aapt}' is too old, fdroid requires build-tools-{version} or newer!"
 msgstr "'{aapt}' jest zbyt stary, fdroid wymaga narzędzi-kompilacji-{version} lub nowsze!"
 
+#: ../fdroidserver/install.py
+#, python-brace-format
+msgid "'{apkfilename}' is already installed on {dev}."
+msgstr "'{apkfilename}' jest już zainstalowany na {dev}."
+
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "'{field}' in {linedesc} is obsolete, see docs for current fields:"
+msgstr "'{field}' w {linedesc} jest przestarzały, sprawdź dokumenty dla bieżących pól:"
+
+#: ../fdroidserver/common.py
+#, python-brace-format
+msgid "'{field}' will be in random order! Use () or [] brackets if order is important!"
+msgstr "'{field}' będą w losowej kolejności! Użyj nawiasów () lub [], jeśli kolejność jest ważna!"
+
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "'{path}' failed to execute!"
@@ -157,32 +203,23 @@ msgstr "'{path}' nie udało się wykonać!"
 
 #: ../fdroidserver/metadata.py
 #, python-brace-format
-msgid "'{path}' has invalid format, it should be a dictionary!"
-msgstr "'{path}' ma nieprawidłowy format, powinien być słownikiem!"
-
-#: ../fdroidserver/lint.py ../fdroidserver/metadata.py
-#, python-brace-format
 msgid "'{value}' is not a valid {field} in {appid}. Regex pattern: {pattern}"
 msgstr "'{value}' nie jest prawidłowy {field} w {appid}. Wzór Regex: {pattern}"
 
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "'{value}' is not a valid {field}, should be {pattern}"
-msgstr "'{value}' nie jest prawidłowym {field}, powinno być {pattern}"
-
-#: ../fdroidserver/checkupdates.py
-msgid "--merge-request only runs on a single appid!"
-msgstr "--merge-request działa tylko na pojedynczym appid!"
-
 #: ../fdroidserver/checkupdates.py
 #, python-brace-format
 msgid "...checkupdate failed for {appid} : {error}"
 msgstr "...sprawdzenie aktualizacji nie powiodło się {appid} : {error}"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid ".__call__() not defined"
 msgstr ".__call__() nie określono"
 
+#: ../fdroidserver/metadata.py
+msgid ".fdroid.txt is not supported!  Convert to .fdroid.yml or .fdroid.json."
+msgstr ".fdroid.txt nie jest obsługiwany! Konwertuj na .fdroid.yml lub .fdroid.json."
+
 #: ../fdroidserver/lint.py
 msgid "/issues is missing"
 msgstr "/nie ma problemów"
@@ -191,15 +228,14 @@ msgstr "/nie ma problemów"
 msgid "A URL is required as an argument!"
 msgstr "Adres URL jest wymagany jako argument!"
 
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "APK signatures have different certificates in {path}:"
-msgstr "Podpisy plików APK mają różne certyfikaty w {path}:"
-
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Add PGP signatures using GnuPG for packages in repo"
 msgstr "Dodaj podpisy PGP za pomocą GnuPG dla pakietów w repozytorium"
 
+#: ../fdroid ../fdroidserver/__main__.py
+msgid "Add a new application from its source code"
+msgstr "Dodaj nową aplikację ze swojego kodu źródłowego"
+
 #: ../fdroidserver/update.py
 msgid "Add a repo signing key to an unsigned repo"
 msgstr "Dodaj klucz podpisu repozytorium do niepodpisanego repozytorium"
@@ -217,11 +253,7 @@ msgstr "Dodaje tylko nowe repozytorium {name}"
 msgid "Alias of the repo signing key in the keystore"
 msgstr "Alias klucza podpisu repozytorium w magazynie kluczy"
 
-#: ../fdroidserver/build.py
-msgid "AllowedAPKSigningKeys missing but reference binary supplied"
-msgstr "Brak AllowedAPKSigningKeys, ale dostarczono referencyjny plik binarny"
-
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "Allows a different revision (or git branch) to be specified for the initial import"
 msgstr "Umożliwia określenie innej wersji (lub gałęzi git) dla początkowego importu"
 
@@ -245,10 +277,14 @@ msgstr "Plik APK systemu Android"
 msgid "Android DEX code"
 msgstr "Kod DEX Android"
 
-#: ../fdroidserver/init.py
+#: ../fdroidserver/common.py ../fdroidserver/build.py
 #, python-brace-format
-msgid "Android SDK not found at {path}!"
-msgstr "Nie znaleziono zestawu SDK systemu Android pod adresem {path}!"
+msgid "Android SDK '{path}' does not have '{dirname}' installed!"
+msgstr "Android SDK '{path}' nie jest '{dirname}' zainstalowany!"
+
+#: ../fdroidserver/common.py
+msgid "Android SDK not found!"
+msgstr "Nie znaleziono Android SDK!"
 
 #: ../fdroidserver/common.py
 #, python-brace-format
@@ -260,28 +296,23 @@ msgstr "Android SDK ścieżka '{path}' nie istnieje!"
 msgid "Android SDK path '{path}' is not a directory!"
 msgstr "Android SDK ścieżka '{path}' nie jest katalogiem!"
 
+#. Translators: "build-tools" is the file name of a package from
+#. Google, it is part of the Android SDK. So it probably shouldn't be
+#. translated or transliterated.
 #: ../fdroidserver/common.py
 #, python-brace-format
-msgid "Android SDK tool {cmd} not found!"
-msgstr "Nie znaleziono narzędzia Android SDK {cmd}!"
+msgid "Android build-tools path '{path}' does not exist!"
+msgstr "Android build-tools ścieżka '{path}' nie istnieje!"
 
-#: ../fdroidserver/lint.py
-msgid "App has Binaries but does not have corresponding AllowedAPKSigningKeys to pin certificate."
-msgstr "Aplikacja ma Binaries, ale nie ma odpowiednich kluczy AllowedAPKSingKeys do przypięcia certyfikatu."
-
-#: ../fdroidserver/lint.py
-msgid "App has NoSourceSince or ArchivePolicy \"0 versions\" or 0 but AutoUpdateMode or UpdateCheckMode are not None"
-msgstr "Aplikacja ma NoSourceSince lub ArchivePolicy „0 versions”, ale AutoUpdateMode lub UpdateCheckMode nie są None"
+#: ../fdroidserver/update.py
+msgid "AndroidManifest.xml has no date"
+msgstr "AndroidManifest.xml nie ma daty"
 
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "App is in '{repo}' but has a link to {url}"
 msgstr "Aplikacja jest w '{repo}' ale ma link do {url}"
 
-#: ../fdroidserver/lint.py
-msgid "App version has binary but does not have corresponding AllowedAPKSigningKeys to pin certificate."
-msgstr "Wersja aplikacji ma plik binarny, ale nie ma odpowiednich kluczy AllowedAPKSigningKeys do przypięcia certyfikatu."
-
 #: ../fdroidserver/lint.py
 msgid "Appending .git is not necessary"
 msgstr "Dołączanie .git nie jest konieczne"
@@ -291,27 +322,11 @@ msgstr "Dołączanie .git nie jest konieczne"
 msgid "Archiving {apkfilename} with invalid signature!"
 msgstr "Archiwizacja {apkfilename} z nieprawidłowym podpisem!"
 
-#: ../fdroidserver/lint.py
-msgid "AutoUpdateMode with UpdateCheckMode: HTTP must have a pattern."
-msgstr "AutoUpdateMode z UpdateCheckMode: HTTP musi mieć wzorzec."
-
-#: ../fdroidserver/install.py
-msgid "Automatic no to all prompts."
-msgstr "Automatyczna odmowa na wszystkie monity."
-
-#: ../fdroidserver/install.py
-msgid "Automatic yes to all prompts."
-msgstr "Automatyczna odpowiedź twierdząca na wszystkie monity."
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "Bad entry type \"{mirrortype}\" in mirrors config: {mirror}"
-msgstr "Błędny typ wpisu „{mirrortype}” w konfiguracji serwerów lustrzanych: {mirror}"
-
 #: ../fdroidserver/mirror.py
 msgid "Base URL to mirror, can include the index signing key using the query string: ?fingerprint="
 msgstr "Bazowy adres URL do serwera lustrzanego, może zawierać klucz do podpisywania indeksu za pomocą łańcucha zapytania: ?fingerprint="
 
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "Branch '{branch}' used as commit in build '{versionName}'"
@@ -327,7 +342,7 @@ msgstr "Gałąź '{branch}' używana jako commit w srclib '{srclib}'"
 msgid "Broken symlink: {path}"
 msgstr "Uszkodzone dowiązanie symboliczne: {path}"
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Build a package from source"
 msgstr "Zbuduj pakiet ze źródła"
 
@@ -341,21 +356,22 @@ msgstr "Kompilacja generowana przez `fdroid import` - usuń wyłączenie linii p
 
 #: ../fdroidserver/checkupdates.py
 msgid "Build metadata git repo has uncommited changes!"
-msgstr "Repozytorium git metadanych kompilacji zawiera niescommitowane zmiany!"
+msgstr "Zbuduj metadane repozytorium git z niezmienionymi zmianami!"
 
 #: ../fdroidserver/build.py
 msgid "Build only the latest version of each package"
 msgstr "Twórz tylko najnowszą wersję każdego pakietu"
 
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Build should have comma-separated versionName and versionCode, not \"{value}\", in {linedesc}"
+msgstr "Kompilacja powinna mieć oddzieloną przecinkami versionName i versionCode, a nie \"{value}\", w {linedesc}"
+
 #: ../fdroidserver/init.py
 #, python-format
 msgid "Built repo based in \"%s\" with this config:"
 msgstr "Zbudowane repo w oparciu o \"%s\" z tą konfiguracją:"
 
-#: ../fdroidserver/checkupdates.py
-msgid "Can't auto-update app with no CurrentVersionCode"
-msgstr "Nie można automatycznie zaktualizować aplikacji bez CurrentVersionCode"
-
 #: ../fdroidserver/build.py
 msgid "Can't build due to {} error while scanning"
 msgid_plural "Can't build due to {} errors while scanning"
@@ -363,33 +379,41 @@ msgstr[0] "Nie można zbudować z powodu błędu {} podczas skanowania"
 msgstr[1] "Nie można zbudować z powodu błędów {} podczas skanowania"
 msgstr[2] "Nie można zbudować z powodu błędów {} podczas skanowania"
 
-#: ../fdroidserver/common.py
-#, fuzzy, python-brace-format
-msgid "Cannot read {path}: {error}"
-msgstr "Błąd odczytu {path}: {error}"
+#: ../fdroidserver/vmtools.py
+#, python-brace-format
+msgid "Cannot read \"{path}\"!"
+msgstr "Nie można odczytać \"{path}\"!"
+
+#. Translators: https://developer.android.com/studio/build/application-id
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Cannot resolve application ID {appid}"
+msgstr "Nie można rozpoznać identyfikatora aplikacji {appid}"
 
 #: ../fdroidserver/rewritemeta.py
-#, python-brace-format
+#, fuzzy, python-brace-format
 msgid "Cannot rewrite \"{path}\""
 msgstr "Nie można odczytać \"{path}\""
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
+#: ../fdroidserver/rewritemeta.py
+msgid "Cannot use --list and --to at the same time"
+msgstr "Nie można używać jednocześnie opcji --list i --to"
+
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Cannot write \"{path}\", not an accepted format, use: {formats}"
+msgstr "Nie można zapisać \"{path}\", nieakceptowalny format, użyj: {formats}"
+
 #: ../fdroidserver/lint.py
 #, python-format
 msgid "Categories '%s' is not valid"
 msgstr "Kategorie '%s' są nieprawidłowe"
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
 #: ../fdroidserver/lint.py
 msgid "Categories are not set"
 msgstr "Kategorie nie są ustawione"
 
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "Category \"{category}\" defined but not used for any apps!"
-msgstr "Kategoria „{category}” zdefiniowana, ale nieużywana dla żadnej aplikacji!"
-
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Check for updates to applications"
 msgstr "Sprawdź aktualizacje aplikacji"
 
@@ -398,35 +422,34 @@ msgstr "Sprawdź aktualizacje aplikacji"
 msgid "Checking archiving for {appid} - apks:{integer}, keepversions:{keep}, archapks:{arch}"
 msgstr "Sprawdzanie archiwizacji dla {appid} - apks: {integer}, keepversions: {keep}, archapks: {arch}"
 
+#: ../fdroidserver/dscanner.py
+msgid "Clean after all scans have finished"
+msgstr "Wyczyść po zakończeniu wszystkich skanów"
+
+#: ../fdroidserver/dscanner.py
+msgid "Clean before the scans start and rebuild the container"
+msgstr "Wyczyść przed rozpoczęciem skanowania i odbuduj kontener"
+
+#: ../fdroidserver/dscanner.py
+msgid "Clean up all containers and then exit"
+msgstr "Oczyść wszystkie pojemniki, a następnie wyjdź"
+
 #: ../fdroidserver/update.py
 msgid "Clean update - don't uses caches, reprocess all APKs"
 msgstr "Czysta aktualizacja - nie używa pamięci podręcznych, przetwarzaj ponownie wszystkie pakiety APK"
 
-#: ../fdroidserver/common.py
-msgid "Color the log output"
-msgstr "Koloruj wpisy w dzienniku zdarzeń"
-
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "Comma separated list of categories."
 msgstr "Rozdzielana przecinkami lista kategorii."
 
-#: ../fdroidserver/__main__.py
-#, python-format
+#: ../fdroid ../fdroidserver/__main__.py
+#, c-format, python-format
 msgid "Command '%s' not recognised.\n"
 msgstr "Polecenie '%s' nie rozpoznane.\n"
 
 #: ../fdroidserver/checkupdates.py
 msgid "Commit changes"
-msgstr "Scommituj zmiany"
-
-#: ../fdroidserver/checkupdates.py
-msgid "Commit changes, push, then make a merge request"
-msgstr "Zatwierdź zmiany, wypchnij, a następnie utwórz żądanie scalenia"
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Conflicting \"{field}\" definitions between .yml and localized files:"
-msgstr "Sprzeczne definicje „{field}” między plikami .yml a przetłumaczonymi:"
+msgstr "Zatwierdź zmiany"
 
 #: ../fdroidserver/__main__.py
 msgid "Conflicting arguments: '--verbose' and '--quiet' can not be specified at the same time."
@@ -437,15 +460,15 @@ msgstr "Sprzeczne argumenty: '--verbose' i '--quiet' nie mogą być podane w tym
 msgid "Could not find '{command}' on your system"
 msgstr "Nie można znaleźć '{command}' w twoim systemie"
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
+#, fuzzy
 msgid "Could not find latest version code"
 msgstr "Nie można znaleźć najnowszej wersji kodu"
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
+#, fuzzy
 msgid "Could not find latest version name"
-msgstr "Nie można odnaleźć nazwy najnowszej wersji"
+msgstr "Nie można znaleźć najnowszej wersji nazwy"
 
 #: ../fdroidserver/update.py
 #, python-brace-format
@@ -453,52 +476,61 @@ msgid "Could not find {path} to remove it"
 msgstr "Nie można znaleźć pliku {path}, aby go usunąć"
 
 #: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Could not open APK {path} for analysis: "
-msgstr "Nie można otworzyć pliku APK {path} do analizy: "
+msgid "Could not open apk file for analysis"
+msgstr "Nie można otworzyć pliku APK do analizy"
 
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "Could not parse size \"{size}\", wrong type \"{type}\""
-msgstr "Nie można przeanalizować rozmiaru \"{size}\", nieprawidłowy typ \"{type}\""
+msgstr ""
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/import_subcommand.py
+#. Translators: https://developer.android.com/studio/build/application-id
+#: ../fdroidserver/import.py
+#, fuzzy
 msgid "Couldn't find Application ID"
-msgstr "Nie można odnaleźć identyfikatora aplikacji"
+msgstr "Nie można znaleźć identyfikatora pakietu"
 
-#: ../fdroidserver/checkupdates.py
-msgid "Couldn't find any version information"
-msgstr "Nie udało się znaleźć żadnych informacji o wersji"
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
+#: ../fdroidserver/import.py
+msgid "Couldn't find latest version code"
+msgstr "Nie można znaleźć najnowszej wersji kodu"
 
-#: ../fdroidserver/checkupdates.py
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
+#: ../fdroidserver/import.py
+msgid "Couldn't find latest version name"
+msgstr "Nie można znaleźć najnowszej wersji nazwy"
+
+#: ../fdroidserver/import.py
 msgid "Couldn't find package ID"
 msgstr "Nie można znaleźć identyfikatora pakietu"
 
 #: ../fdroidserver/update.py
 msgid "Cowardily refusing to overwrite existing signing key setup!"
-msgstr "Tchórzliwa odmowa nadpisania istniejącej konfiguracji klucza podpisu!"
+msgstr "Cowardily odmawia zastąpienia istniejącej konfiguracji klucza podpisującego!"
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/update.py
+msgid "Create a repo signing key in a keystore"
+msgstr "Utwórz klucz podpisu repo w magazynie kluczy"
+
+#: ../fdroidserver/update.py
+msgid "Create skeleton metadata files that are missing"
+msgstr "Utwórz brakujące pliki metadanych szkieletu"
+
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Created new container \"{name}\""
 msgstr "Utworzono nowy kontener \"{name}\""
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Creating \"{path}\" for configuring s3cmd."
 msgstr "Tworzenie \"{path}\" do konfiguracji s3cmd."
 
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Creating empty {config_file}"
-msgstr "Tworzenie pustego pliku {config_file}"
-
 #: ../fdroidserver/publish.py
 msgid "Creating log directory"
 msgstr "Tworzenie katalogu dzienników"
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Creating new S3 bucket: {url}"
 msgstr "Tworzenie nowego zasobnika S3: {url}"
@@ -511,7 +543,8 @@ msgstr "Tworzenie katalogu wyjściowego"
 msgid "Creating signed index with this key (SHA256):"
 msgstr "Tworzenie podpisanego indeksu za pomocą tego klucza (SHA256):"
 
-#: ../fdroidserver/publish.py ../fdroidserver/verify.py
+#: ../fdroidserver/import.py ../fdroidserver/verify.py
+#: ../fdroidserver/publish.py
 msgid "Creating temporary directory"
 msgstr "Tworzenie katalogu tymczasowego"
 
@@ -556,24 +589,19 @@ msgstr "Opis \"%s\" to tylko podsumowanie aplikacji"
 msgid "Description has a duplicate line"
 msgstr "Opis ma zduplikowaną linię"
 
+#: ../fdroidserver/lint.py
+#, python-format
+msgid "Description has a list (%s) but it isn't bulleted (*) nor numbered (#)"
+msgstr "Opis ma listę (%s), ale nie jest wypunktowana (*) ani ponumerowana (#)"
+
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "Description of length {length} is over the {limit} char limit"
 msgstr "Opis długości {length} przekracza limit {limit} char"
 
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Did you mean config/{name}.yml?"
-msgstr "Czy miałeś na myśli config/{name}.yml?"
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Did you mean {code}?"
-msgstr "Czy miałeś na myśli {code}?"
-
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "Do not add 'disable:' to the generated build entries"
-msgstr "Nie dodawaj „wyłącz:” do wygenerowanych wpisów kompilacji"
+msgstr ""
 
 #: ../fdroidserver/nightly.py
 msgid "Do not deploy the new files to the repo"
@@ -596,22 +624,27 @@ msgstr "Nie usuwaj kluczy prywatnych wygenerowanych z magazynu kluczy"
 msgid "Don't create a source tarball, useful when testing a build"
 msgstr "Nie twórz archiwum źródłowego, przydatnego podczas testowania kompilacji"
 
+#: ../fdroidserver/stats.py
+msgid "Don't do anything logs-related"
+msgstr "Nie wykonuj żadnych czynności związanych z logami"
+
 #: ../fdroidserver/build.py
 msgid "Don't refresh the repository, useful when testing a build with no internet connection"
 msgstr "Nie odświeżaj repozytorium, przydatne podczas testowania kompilacji bez połączenia z Internetem"
 
 #: ../fdroidserver/deploy.py ../fdroidserver/nightly.py
+#: ../fdroidserver/upload.py
 msgid "Don't use rsync checksums"
 msgstr "Nie używaj sum kontrolnych rsync"
 
-#: ../fdroidserver/install.py
-msgid "Download F-Droid.apk using mirrors that leak less to the network"
-msgstr "Pobierz F-Droid.apk za pomocą serwerów lustrzanych, które wyciekają mniej do sieci"
-
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Download complete mirrors of small repos"
 msgstr "Pobierz pełne mirrors małych repozytoriów"
 
+#: ../fdroidserver/stats.py
+msgid "Download logs we don't have"
+msgstr "Pobierz dzienniki, których nie mamy"
+
 #: ../fdroidserver/common.py
 msgid "Downloading the repository already failed once, not trying again."
 msgstr "Pobieranie repozytorium już raz się nie powiodło, nie próbuje ponownie."
@@ -623,61 +656,43 @@ msgstr "Pobieranie {url} nie powiodło się. {error}"
 
 #: ../fdroidserver/metadata.py
 #, python-brace-format
-msgid "Duplicate Anti-Feature declaration at {path} was ignored!"
-msgstr "Zduplikowana deklaracja niepożądanej funkcji w {path} została zignorowana!"
-
-#: ../fdroidserver/index.py
-#, python-format
-msgid "Duplicate entry \"%s\" in mirrors config!"
-msgstr "Zduplikowany wpis „%s” w konfiguracji serwerów lustrzanych!"
+msgid "Duplicate build recipe found for versionCode {versionCode} in {linedesc}"
+msgstr "Znaleziono duplikat receptury kompilacji dla versionCode {versionCode} w {linedesc}"
 
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "Duplicate link in '{field}': {url}"
 msgstr "Zduplikowany link w '{field}': {url}"
 
-#: ../fdroidserver/common.py
-#, python-format
-msgid "ERROR: %(message)s"
-msgstr "BŁĄD: %(message)s"
+#: ../fdroid
+msgid "Dynamically scan APKs post build"
+msgstr "Dynamicznie skanuj kompilację postów APK"
 
 #: ../fdroidserver/__main__.py
 msgid "ERROR: The \"server\" subcommand has been removed, use \"deploy\"!"
-msgstr "BŁĄD: podkomenda „serwer” została usunięta, użyj polecenia „deploy”!"
+msgstr ""
+
+#: ../fdroidserver/mirror.py
+msgid ""
+"ERROR: this command should never be used to mirror f-droid.org!\n"
+"A full mirror of f-droid.org requires more than 200GB."
+msgstr ""
+"BŁĄD: tego polecenia nigdy nie należy używać do zwierciadlania f-droid.org!\n"
+"Pełne lustro f-droid.org wymaga ponad 200 GB."
 
 #: ../fdroidserver/nightly.py
 msgid "ERROR: unsupported CI type, patches welcome!"
 msgstr "BŁĄD: nieobsługiwany typ CI, mile widziane poprawki!"
 
-#: ../fdroidserver/nightly.py
-#, python-format
-msgid "ERROR: unsupported git host \"%s\", patches welcome!"
-msgstr "BŁĄD: nieobsługiwany host git „%s”, łatki mile widziane!"
-
-#: ../fdroidserver/lint.py
+#: ../fdroidserver/metadata.py
 #, python-brace-format
-msgid "ERROR: {key} in {path} is not \"archive\" or \"repo\"!"
-msgstr "BŁĄD: {key} w {path} nie jest \"archive\" lub \"repo\"!"
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "ERROR: {key} not a valid key!"
-msgstr "BŁĄD: {key} nie jest prawidłowym kluczem!"
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "ERROR: {key}'s value should be of type {t}!"
-msgstr "BŁĄD: wartość klucza {key} powinna być typu {t}!"
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "ERROR: {key}:{subkey} in {path} is not in allowed keys: {allowed_keys}!"
-msgstr "BŁĄD: {key}:{subkey} w {path} nie jest jednym z dozwolonych kluczy: {allowed_keys}!"
+msgid "Empty build flag at {linedesc}"
+msgstr "Opróżnij flagę kompilacji na {linedesc}"
 
 #: ../fdroidserver/__main__.py
 #, python-brace-format
 msgid "Encoding is set to '{enc}' fdroid might run into encoding issues. Please set it to 'UTF-8' for best results."
-msgstr "Kodowanie jest ustawione na '{enc}'. Fdroid może napotkać problemy z kodowaniem. Aby uzyskać najlepsze wyniki, ustaw go na 'UTF-8'."
+msgstr ""
 
 #: ../fdroidserver/init.py
 #, python-format
@@ -688,40 +703,20 @@ msgstr ""
 "Podaj ścieżkę do zestawu SDK systemu Android (%s) tutaj:\n"
 " > "
 
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Environment variable {var} from {configname} is not set!"
-msgstr "Zmienna środowiskowa {var} z {configname} nie jest ustawiona!"
+#: ../fdroidserver/deploy.py ../fdroidserver/checkupdates.py
+#: ../fdroidserver/upload.py
+#, python-format
+msgid "Error while attempting to publish log: %s"
+msgstr "Błąd podczas próby opublikowania dziennika: %s"
 
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Environment variable {{env: {var}}} is not set!"
-msgstr "Zmienna środowiskowa{{env: {var}}} nie została ustawiona!"
-
-#: ../fdroidserver/deploy.py
-msgid "Error deploying 'github_releases', {} not present. (You might need to run `fdroid update` first.)"
-msgstr "Błąd wdrożenia 'github_releases', {} nie występuje. (Może być konieczne wcześniejsze uruchomienie `fdroid update`)"
-
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py ../fdroidserver/common.py
 msgid "Error while getting repo address"
 msgstr "Błąd podczas uzyskiwania adresu repo"
 
-#: ../fdroidserver/scanner.py
-msgid "Exit with a non-zero code if problems were found"
-msgstr "Zakończ z niezerowym kodem, jeśli znaleziono problemy"
-
-#: ../fdroidserver/__main__.py
-msgid "Extract application metadata from a source repository"
-msgstr "Wyodrębnij metadane aplikacji z repozytorium źródłowego"
-
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Extract signatures from APKs"
 msgstr "Wyciągnij podpisy z plików APK"
 
-#: ../fdroidserver/install.py
-msgid "F-Droid.apk could not be downloaded from any known source!"
-msgstr "F-Droid.apk nie może być pobrany z żadnego znanego źródła!"
-
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Failed copying {path}: {error}"
@@ -730,7 +725,7 @@ msgstr "Nieudane kopiowanie {path}: {error}"
 #: ../fdroidserver/signatures.py
 #, python-brace-format
 msgid "Failed fetching signatures for '{apkfilename}': {error}"
-msgstr "Nie powiodło się pobieranie podpisów dla '{apkfilename}': {error}"
+msgstr "Nie powiodło się pobieranie sygnatur dla '{apkfilename}': {error}"
 
 #: ../fdroidserver/update.py
 #, python-brace-format
@@ -742,34 +737,42 @@ msgstr "Błąd odczytu {path}: {error}"
 msgid "Failed resizing {path}: {error}"
 msgstr "Nie udało się zmienić rozmiaru {path}: {error}"
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/publish.py
+msgid "Failed to align application"
+msgstr "Nie udało się wyrównać aplikacji"
+
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Failed to create S3 bucket: {url}"
 msgstr "Nie można utworzyć zasobnika S3: {url}"
 
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Failed to get APK information, deleting {path}"
-msgstr "Nie udało się uzyskać informacji o APK, usunięcie {path}"
+#: ../fdroidserver/common.py
+msgid "Failed to get APK manifest information"
+msgstr "Nie można uzyskać informacji o manifeście APK"
 
 #: ../fdroidserver/update.py
 #, python-brace-format
-msgid "Failed to get APK information, skipping {path}"
-msgstr "Nie udało się uzyskać informacji o APK, pomijając {path}"
+msgid "Failed to get apk information, deleting {path}"
+msgstr "Nie udało się uzyskać informacji o apk, usunięcie {path}"
 
 #: ../fdroidserver/update.py
-msgid "Failed to get APK signing key fingerprint"
-msgstr "Nie udało się uzyskać odcisku palca klucza podpisywania APK"
+#, python-brace-format
+msgid "Failed to get apk information, skipping {path}"
+msgstr "Nie udało się uzyskać informacji o apk, pomijając {path}"
 
 #: ../fdroidserver/install.py
 #, python-brace-format
 msgid "Failed to install '{apkfilename}' on {dev}: {error}"
 msgstr "Instalacja nie powiodła się '{apkfilename}' na {dev}: {error}"
 
-#: ../fdroidserver/common.py
+#: ../fdroidserver/publish.py ../fdroidserver/common.py
 msgid "Failed to sign application"
 msgstr "Nie udało się podpisać aplikacji"
 
+#: ../fdroidserver/common.py
+msgid "Failed to zipalign application"
+msgstr "Nie udało się zipalign aplikacji"
+
 #: ../fdroidserver/build.py
 #, python-brace-format
 msgid "Fetched buildserverid from VM: {buildserverid}"
@@ -783,14 +786,24 @@ msgstr "Pobrane podpisy dla '{apkfilename}' -> '{sigdir}'"
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "File disappeared while processing it: {path}"
-msgstr "Plik zniknął podczas przetwarzania go: {path}"
+msgstr ""
 
-#: ../fdroidserver/build.py ../fdroidserver/install.py
-#: ../fdroidserver/rewritemeta.py ../fdroidserver/scanner.py
-#: ../fdroidserver/update.py
+#: ../fdroidserver/verify.py ../fdroidserver/stats.py ../fdroidserver/update.py
+#: ../fdroidserver/rewritemeta.py ../fdroidserver/build.py
+#: ../fdroidserver/checkupdates.py ../fdroidserver/scanner.py
+#: ../fdroidserver/install.py
 msgid "Finished"
 msgstr "Skończone"
 
+#: ../fdroidserver/lint.py
+msgid "Flattr donation methods belong in the FlattrID flag"
+msgstr "Metody flattr donation należą do flagi FlattrID"
+
+#: ../fdroidserver/lint.py
+#, fuzzy
+msgid "Flattr donation methods belong in the FlattrID: field"
+msgstr "Metody flattr donation należą do flagi FlattrID"
+
 #: ../fdroidserver/lint.py
 msgid "Forbidden HTML tags"
 msgstr "Zakazane tagi HTML"
@@ -806,7 +819,7 @@ msgstr "Wymuś zatrzymanie kompilacji po {0} upływie limitu czasu!"
 
 #: ../fdroidserver/scanner.py
 msgid "Force scan of disabled apps and builds."
-msgstr "Wymuś skanowanie wyłączonych aplikacji i kompilacji."
+msgstr ""
 
 #: ../fdroidserver/update.py
 #, python-brace-format
@@ -816,24 +829,21 @@ msgstr "Znaleziono \"{path}\" grafiki bez metadanych dla aplikacji \"{name}\"!"
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Found bad funding file \"{path}\" for \"{name}\":"
-msgstr "Znaleziono zły plik finansowania \"{path}\" dla \"{name}\":"
+msgstr ""
 
 #: ../fdroidserver/common.py
 msgid "Found invalid appids in arguments"
 msgstr "Znaleziono nieprawidłowe pliki w argumentach"
 
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
 #: ../fdroidserver/common.py
 msgid "Found invalid versionCodes for some apps"
 msgstr "Znaleziono nieprawidłowe kody wersji dla niektórych aplikacji"
 
 #: ../fdroidserver/common.py
-#, python-brace-format
+#, fuzzy, python-brace-format
 msgid "Found multiple JAR Signature Block Files in {path}"
-msgstr "Znaleziono wiele plików bloków podpisów JAR w {path}"
-
-#: ../fdroidserver/common.py
-msgid "Found multiple Signer Certificates!"
-msgstr "Znaleziono wiele certyfikatów do podpisywania!"
+msgstr "Znaleziono wiele certyfikatów do podpisywania w {path}"
 
 #: ../fdroidserver/metadata.py
 #, python-brace-format
@@ -844,6 +854,11 @@ msgstr "Znaleziono wiele plików metadanych dla {appid}"
 msgid "Found multiple signing certificates for repository."
 msgstr "Znaleziono wiele certyfikatów do podpisywania dla repozytorium."
 
+#: ../fdroidserver/update.py
+#, python-brace-format
+msgid "Found multiple signing certificates in {path}"
+msgstr "Znaleziono wiele certyfikatów do podpisywania w {path}"
+
 #: ../fdroidserver/index.py
 msgid "Found no signing certificates for repository."
 msgstr "Nie znaleziono certyfikatów do podpisywania dla repozytorium."
@@ -858,16 +873,6 @@ msgstr "Znaleziono plik nieprzechowy na %s"
 msgid "Found {apkfilename} at {url}"
 msgstr "Znaleziono {apkfilename} na {url}"
 
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Found {count} problems in {filename}"
-msgstr "Znaleziono {count} problemy(-ów) w {filename}"
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Found {count} warnings in {filename}"
-msgstr "Znaleziono {count} ostrzeżeń(-nia) w {filename}"
-
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Generated skeleton metadata for {appid}"
@@ -886,21 +891,19 @@ msgstr "Git clean nie powiódł się"
 msgid "Git fetch failed"
 msgstr "Pobranie Git nie powiodło się"
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
 #: ../fdroidserver/common.py
-#, python-format
-msgid "Git remote set-head failed: \"%s\""
-msgstr "Błąd zdalnego ustawiania Git: \"%s\""
+msgid "Git remote set-head failed"
+msgstr "Git remote set-head nie powiódł się"
+
+#: ../fdroidserver/common.py
+#, fuzzy, python-format
+msgid "Git remote set-head failed: \"%s\""
+msgstr "Operacja Git remote set-head nie powiodła się: \"%s\""
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
 #: ../fdroidserver/common.py
 msgid "Git reset failed"
 msgstr "Resetowanie Git nie powiodło się"
 
-#: ../fdroidserver/common.py
-msgid "Git submodule deinit failed"
-msgstr "Deinit podmodułu Git nie powiódł się"
-
 #: ../fdroidserver/common.py
 msgid "Git submodule sync failed"
 msgstr "Nie udało się zsynchronizować modułu submodule Git"
@@ -915,7 +918,7 @@ msgstr "HTTPS musi być używany z adresami URL Subversion!"
 
 #: ../fdroidserver/deploy.py
 msgid "If a git mirror gets to big, allow the archive to be deleted"
-msgstr "Jeśli serwer lustrzany git stanie się Duży, Zezwól na usunięcie archiwum"
+msgstr ""
 
 #: ../fdroidserver/deploy.py
 #, python-brace-format
@@ -930,17 +933,7 @@ msgstr "Ignorowanie metadanych '{field}' w '{metapath}' ponieważ są one przest
 #: ../fdroidserver/update.py
 #, python-format
 msgid "Ignoring FUNDING.yml entry longer than 2048: %s"
-msgstr "Ignorowanie wpisu FUNDING.yml dłuższego niż 2048: %s"
-
-#: ../fdroidserver/update.py
-#, python-format
-msgid "Ignoring bad element in manifest: %s"
-msgstr "Ignorowanie błędnego elementu w manifeście: %s"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Ignoring deprecated {oldfile}, use {newfile}!"
-msgstr "{oldfile} jest przestarzałe, użyj {newfile}!"
+msgstr ""
 
 #: ../fdroidserver/index.py
 msgid "Ignoring package without metadata: "
@@ -951,31 +944,26 @@ msgstr "Ignorowanie pakietu bez metadanych: "
 msgid "Ignoring stale cache data for {apkfilename}"
 msgstr "Ignorowanie starych danych pamięci podręcznej dla {apkfilename}"
 
+#: ../fdroidserver/rewritemeta.py
+#, python-brace-format
+msgid "Ignoring {ext} file at '{path}'"
+msgstr "Ignorowanie {ext} pliku w '{path}'"
+
 #: ../fdroidserver/update.py
 msgid "Include APKs that are signed with disabled algorithms like MD5"
 msgstr "Dołącz pliki APK, które są podpisane przy użyciu wyłączonych algorytmów, takich jak MD5"
 
 #: ../fdroidserver/mirror.py
 msgid "Include the PGP signature .asc files in the mirror"
-msgstr "Dołącz podpis PGP .pliki asc w lustrze"
+msgstr ""
 
 #: ../fdroidserver/mirror.py
 msgid "Include the build logs in the mirror"
-msgstr "Dołącz dzienniki budowy do lustra"
+msgstr ""
 
 #: ../fdroidserver/mirror.py
 msgid "Include the source tarballs in the mirror"
-msgstr "Dołącz źródło tarballs w lustrze"
-
-#: ../fdroidserver/metadata.py
-#, python-format
-msgid "Including metadata from %s@%s"
-msgstr "Włączenie metadanych z %s@%s"
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Including metadata from {path}"
-msgstr "Włączenie metadanych z {path}"
+msgstr ""
 
 #: ../fdroidserver/common.py
 msgid "Initialising submodules"
@@ -985,7 +973,7 @@ msgstr "Inicjowanie submodułów"
 msgid "Install all signed applications available"
 msgstr "Zainstaluj wszystkie dostępne podpisane aplikacje"
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Install built packages on devices"
 msgstr "Zainstaluj wbudowane pakiety na urządzeniach"
 
@@ -994,12 +982,22 @@ msgstr "Zainstaluj wbudowane pakiety na urządzeniach"
 msgid "Installing %s..."
 msgstr "Instalowanie %s…"
 
+#: ../fdroidserver/install.py
+#, python-format
+msgid "Installing %s…"
+msgstr "Instalowanie %s…"
+
 #: ../fdroidserver/install.py
 #, python-brace-format
 msgid "Installing '{apkfilename}' on {dev}..."
 msgstr "Instalowanie '{apkfilename}' na {dev}…"
 
-#: ../fdroidserver/__main__.py
+#: ../fdroidserver/install.py
+#, python-brace-format
+msgid "Installing '{apkfilename}' on {dev}…"
+msgstr "Instalowanie '{apkfilename}' na {dev}…"
+
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Interact with the repo HTTP server"
 msgstr "Wejdź w interakcje z repozytorium serwera HTTP"
 
@@ -1007,36 +1005,53 @@ msgstr "Wejdź w interakcje z repozytorium serwera HTTP"
 msgid "Invalid APK"
 msgstr "Nieprawidłowy plik APK"
 
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "Invalid AutoUpdateMode: {mode}"
-msgstr "Nieprawidłowy AutoUpdateMode: {mode}"
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "Invalid UpdateCheckMode: {mode}"
-msgstr "Nieprawidłowy UpdateCheckMode: {mode}"
-
-#: ../fdroidserver/checkupdates.py
+#: ../fdroidserver/lint.py ../fdroidserver/checkupdates.py
 #, python-brace-format
 msgid "Invalid VercodeOperation: {field}"
 msgstr "Nieprawidłowa VercodeOperation: {field}"
 
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Invalid VercodeOperation: {invalid_ops}"
-msgstr "Nieprawidłowa VercodeOperation: {invalid_ops}"
-
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "Invalid application ID {appid}"
 msgstr "Nieprawidłowy ID aplikacji {appid}"
 
+#: ../fdroidserver/metadata.py
+#, python-format
+msgid "Invalid boolean '%s'"
+msgstr "Niepoprawna wartość boolean '%s'"
+
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Invalid build flag at {line} in {linedesc}"
+msgstr "Nieprawidłowa flaga kompilacji na {line} w {linedesc}"
+
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Invalid build format: {value} in {name}"
+msgstr "Nieprawidłowy format kompilacji: {value} w {name}"
+
 #: ../fdroidserver/lint.py
 msgid "Invalid bulleted list"
 msgstr "Nieprawidłowa lista wypunktowana"
 
+#: ../fdroidserver/lint.py
+#, python-format
+msgid "Invalid license tag \"%s\"! Use only tags from https://spdx.org/license-list"
+msgstr "Nieprawidłowy tag licencji \"%s\"! Używaj tylko tagów z https://spdx.org/license-list"
+
+#: ../fdroidserver/lint.py
+msgid "Invalid link - use [http://foo.bar Link title] or [http://foo.bar]"
+msgstr "Nieprawidłowy link - użyj [http://foo.bar Link title] or [http://foo.bar]"
+
+#: ../fdroidserver/metadata.py
+#, python-format
+msgid "Invalid metadata in %s:%d"
+msgstr "Nieprawidłowe metadane w %s:%d"
+
+#: ../fdroidserver/metadata.py
+msgid "Invalid metadata in: "
+msgstr "Nieprawidłowe metadane w: "
+
 #: ../fdroidserver/common.py
 #, python-format
 msgid "Invalid name for published file: %s"
@@ -1044,8 +1059,8 @@ msgstr "Niepoprawna nazwa opublikowanego pliku: %s"
 
 #: ../fdroidserver/common.py
 #, python-brace-format
-msgid "Invalid ndk: entry in build: \"{ndk}\""
-msgstr "Nieprawidłowy ndk: wpis w kompilacji: „{ndk}”"
+msgid "Invalid package name {0}"
+msgstr "Niepoprawna nazwa pakietu {0}"
 
 #: ../fdroidserver/common.py
 #, python-brace-format
@@ -1067,6 +1082,11 @@ msgstr "Nieprawidłowe metadane srclib: nie można przeanalizować '{file}'"
 msgid "Invalid srclib metadata: unknown key '{key}' in '{file}'"
 msgstr "Nieprawidłowe metadane srclib: nieznany klucz '{key}' w '{file}'"
 
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Invalid versionCode: \"{versionCode}\" is not an integer!"
+msgstr "Nieprawidłowy kod wersji: \"{versionCode}\" nie jest liczbą całkowitą!"
+
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "JAR signature failed to verify: {path}"
@@ -1078,17 +1098,18 @@ msgid "JAR signature verified: {path}"
 msgstr "Podpis JAR potwierdzony: {path}"
 
 #: ../fdroidserver/scanner.py
+#, fuzzy
 msgid "Java JAR file"
-msgstr "Plik Java JAR"
+msgstr "Plik JAR Java"
 
-#: ../fdroidserver/mirror.py ../fdroidserver/publish.py
-#: ../fdroidserver/update.py
+#: ../fdroidserver/publish.py ../fdroidserver/update.py
+#: ../fdroidserver/mirror.py
 msgid "Java JDK not found! Install in standard location or set java_paths!"
 msgstr "Nie znaleziono Java JDK! Zainstaluj w standardowej lokalizacji lub ustaw ścieżki java!"
 
 #: ../fdroidserver/scanner.py
 msgid "Java compiled class"
-msgstr "Klasa skompilowana Java"
+msgstr ""
 
 #: ../fdroidserver/signindex.py
 msgid "Java jarsigner not found! Install in standard location or set java_paths!"
@@ -1098,31 +1119,27 @@ msgstr "Jarsigner Java nie został znaleziony! Zainstaluj w standardowej lokaliz
 msgid "Javascript in HTML src attributes"
 msgstr "JavaScript w atrybutach src HTML"
 
-#: ../fdroidserver/build.py
-#, python-brace-format
-msgid "Keeping failed build \"{apkfilename}\""
-msgstr "Utrzymywanie nieudanej kompilacji „{apkfilename}”"
-
 #: ../fdroidserver/init.py
 msgid "Keystore for signing key:\t"
 msgstr "Magazyn kluczy do podpisywania klucza:\t"
 
 #: ../fdroidserver/lint.py
-msgid "Known debug key is used in AllowedAPKSigningKeys: "
-msgstr "Znany klucz debugowania jest używany w AllowedAPKSigningKeys: "
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
+#, fuzzy, python-brace-format
 msgid "Last used commit '{commit}' looks like a tag, but UpdateCheckMode is '{ucm}'"
-msgstr "Ostatnio używany commit '{commit}' wygląda jak tag, ale UpdateCheckMode to '{ucm}'"
+msgstr "Ostatnio używany commit '{commit}' wygląda jak tag, ale tryb sprawdzania aktualizacji to '{ucm}'"
 
 #: ../fdroidserver/lint.py
+#, fuzzy
 msgid "Liberapay donation methods belong in the Liberapay: field"
-msgstr "Metody darowizny Liberapay należą do Liberapay: field"
+msgstr "Metody darowizny Liberapay należą do flagi LiberapayID"
+
+#: ../fdroidserver/lint.py
+msgid "Liberapay donation methods belong in the LiberapayID flag"
+msgstr "Metody darowizny Liberapay należą do flagi LiberapayID"
 
 #: ../fdroidserver/rewritemeta.py
-msgid "List files that would be reformatted (dry run)"
-msgstr "Lista plików, które mają zostać ponownie sformatowane (przebieg próbny)"
+msgid "List files that would be reformatted"
+msgstr "Lista plików, które zostaną sformatowane"
 
 #: ../fdroidserver/lint.py
 msgid "Locale included in f-droid.org URL"
@@ -1140,48 +1157,39 @@ msgstr "Nieprawidłowo repozytorium mirrors."
 msgid "Malformed serverwebroot line:"
 msgstr "Nieprawidłowy wiersz serverwebroot:"
 
-#: ../fdroidserver/scanner.py
-#, python-format
-msgid "Max recursion depth in ZIP file reached: %s"
-msgstr "Osiągnięto maksymalną głębokość rekurencji w pliku ZIP: %s"
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "Mirror config for {url} contains \"isPrimary\" key!"
-msgstr "Konfiguracja Mirror dla {url} zawiera klucz \"isPrimary\"!"
-
 #: ../fdroidserver/mirror.py
 msgid "Mirror the full repo and archive, all file types."
-msgstr "Mirror pełnego repo i archiwum, wszystkie typy plików."
+msgstr ""
 
 #: ../fdroidserver/gpgsign.py
 msgid "Missing output directory"
 msgstr "Brakujący katalog wyjściowy"
 
-#: ../fdroidserver/metadata.py
-msgid "Moving Anti-Features declarations to localized files:"
-msgstr "Przenoszenie deklaracji niepożądanych funkcji do przetłumaczonych plików:"
-
-#: ../fdroidserver/index.py
-msgid "Neither \"repo_pubkey\" nor \"keystorepass\" set in config.yml"
-msgstr "Ani „repo_pubkey”, ani „keystorepass” nie są ustawione w config.yml"
-
-#: ../fdroidserver/verify.py
+#: ../fdroidserver/lint.py
 #, python-format
-msgid "No APK for package: %s"
-msgstr "Brak APK dla pakietu: %s"
+msgid "Name '%s' is just the auto name - remove it"
+msgstr "Nazwa '%s' jest nazwą automatyczną - usuń ją"
+
+#: ../fdroidserver/common.py
+msgid "No 'config.py' found, using defaults."
+msgstr "Nie znaleziono pliku 'config.py', używając wartości domyślnych."
 
 #: ../fdroidserver/common.py
 msgid "No Android SDK found!"
 msgstr "Nie znaleziono pakietu SDK Androida!"
 
+#: ../fdroidserver/import.py
+msgid "No android or kivy project could be found. Specify --subdir?"
+msgstr "Nie można znaleźć projektu android ani kivy. Podaj --subdir?"
+
 #: ../fdroidserver/install.py
 msgid "No attached devices found"
 msgstr "Nie znaleziono podłączonych urządzeń"
 
-#: ../fdroidserver/install.py
-msgid "No devices found for `adb install`! Please plug one in."
-msgstr "Nie znaleziono urządzeń dla `adb install`! Podłącz jedno urządzenie."
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "No commit specified for {versionName} in {linedesc}"
+msgstr "Nie określono zatwierdzenia dla {versionName} w {linedesc}"
 
 #: ../fdroidserver/index.py
 msgid "No fingerprint in URL."
@@ -1191,23 +1199,14 @@ msgstr "Brak odcisku palca w adresie URL."
 msgid "No git submodules available"
 msgstr "Brak dostępnych submodułów git"
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "No gradle project could be found. Specify --subdir?"
 msgstr "Nie można znaleźć żadnego projektu gradle. Podaj --subdir?"
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py ../fdroidserver/common.py
 msgid "No information found."
 msgstr "Nie znaleziono informacji."
 
-#: ../fdroidserver/checkupdates.py
-msgid "No matching tags found"
-msgstr "Nie znaleziono pasujących tagów"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "No minimum SDK version found in {0}, using default (3)."
-msgstr "Nie znaleziono minimalnej wersji SDK w {0}, użyto domyślnej (3)."
-
 #: ../fdroidserver/lint.py
 msgid "No need to specify that the app is Free Software"
 msgstr "Nie musisz określać, że aplikacja jest wolnym oprogramowaniem"
@@ -1217,8 +1216,8 @@ msgid "No need to specify that the app is for Android"
 msgstr "Nie musisz określać, że aplikacja jest przeznaczona dla Androida"
 
 #: ../fdroidserver/deploy.py
-msgid "No option set! Edit your config.yml to set at least one of these:"
-msgstr "Brak opcji! Edytuj plik config.yml, aby ustawić co najmniej jedno z poniższych:"
+msgid "No option set! Edit your config.py to set at least one of these:"
+msgstr "Brak opcji! Edytuj plik config.py, aby ustawić co najmniej jedno z poniższych:"
 
 #: ../fdroidserver/common.py
 msgid "No packages specified"
@@ -1226,14 +1225,14 @@ msgstr "Nie określono pakietów"
 
 #: ../fdroidserver/install.py
 #, python-format
-msgid "No signed APK available for %s"
-msgstr "Żaden podpisany APK nie jest dostępny dla %s"
+msgid "No signed apk available for %s"
+msgstr "Żaden podpisany apk nie jest dostępny dla %s"
 
 #: ../fdroidserver/install.py
 msgid "No signed output directory - nothing to do"
 msgstr "Brak podpisanego katalogu wyjściowego - nic nie można zrobić"
 
-#: ../fdroidserver/common.py
+#: ../fdroidserver/update.py ../fdroidserver/common.py
 #, python-brace-format
 msgid "No signing certificates found in {path}"
 msgstr "Nie znaleziono certyfikatów do podpisu w {path}"
@@ -1243,26 +1242,19 @@ msgstr "Nie znaleziono certyfikatów do podpisu w {path}"
 msgid "No such package: %s"
 msgstr "Brak takiego pakietu: %s"
 
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "No such versionCode {versionCode} for app {appid}"
 msgstr "Brak takiego kodu wersji {versionCode} dla aplikacji {appid}"
 
-#: ../fdroidserver/checkupdates.py
-msgid "No tags found"
-msgstr "Nie znaleziono tagów"
-
-#: ../fdroidserver/publish.py ../fdroidserver/verify.py
+#: ../fdroidserver/verify.py ../fdroidserver/publish.py
 msgid "No unsigned directory - nothing to do"
 msgstr "Brak katalogu bez podpisu - nic nie można zrobić"
 
-#: ../fdroidserver/__main__.py
-msgid "No version information could be found."
-msgstr "Nie udało się znaleźć informacji o wersji."
-
 #: ../fdroidserver/common.py
 msgid "Not a valid size definition: \"{}\""
-msgstr "Nieprawidłowa definicja rozmiaru: \"{}\""
+msgstr ""
 
 #: ../fdroidserver/signindex.py
 msgid "Nothing to do"
@@ -1274,9 +1266,10 @@ msgid "Nothing to do for {appid}."
 msgstr "Nic nie robić w {appid}."
 
 #: ../fdroidserver/init.py
-msgid "Now set these in config.yml:"
-msgstr "Teraz ustaw je w config.yml:"
+msgid "Now set these in config.py:"
+msgstr "Teraz ustaw je w config.py:"
 
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "OBB file has newer versionCode({integer}) than any APK:"
@@ -1292,38 +1285,39 @@ msgstr "Nazwa pakietu OBB nie jest zgodna z obsługiwanym pakietem APK:"
 
 #: ../fdroidserver/deploy.py
 msgid "Offline machine, skipping git mirror generation until `fdroid deploy`"
-msgstr "Maszyna Offline, pomijając generowanie git mirror aż do ' fdroid deploy`"
+msgstr ""
 
-#: ../fdroidserver/deploy.py
-msgid "One of the 'github_releases' config items is missing the 'packageNames' value. skipping ..."
-msgstr "Jeden z elementów 'github_releases' nie posiada wartości 'packageNames'. pomijanie..."
+#: ../fdroidserver/common.py
+#, python-brace-format
+msgid "Old APK signature failed to verify: {path}"
+msgstr "Stary podpis APK nie udało się zweryfikować: {path}"
 
-#: ../fdroidserver/deploy.py
-msgid "One of the 'github_releases' config items is missing the 'projectUrl' value. skipping ..."
-msgstr "Jeden z elementów 'github_releases' nie posiada wartości 'projectUrl'. pomijanie..."
+#: ../fdroid ../fdroidserver/__main__.py
+msgid "Old, deprecated name for fdroid deploy"
+msgstr "Stara, przestarzała nazwa dla systemu fdroid"
 
-#: ../fdroidserver/deploy.py
-msgid "One of the 'github_releases' config items is missing the 'token' value. skipping ..."
-msgstr "Jeden z elementów 'github_releases' nie posiada wartości 'token'. pomijanie..."
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Only PNG and JPEG are supported for graphics, found: {path}"
 msgstr "Tylko PNG i JPEG są obsługiwane dla grafiki, znaleziono: {path}"
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/common.py
-msgid "Only accepts a single key \"env\""
-msgstr "Akceptowany jest tylko jeden klucz \"env\""
+#: ../fdroidserver/checkupdates.py
+msgid "Only print differences with the Play Store"
+msgstr "Wydrukuj tylko różnice ze Sklepem Play"
 
 #: ../fdroidserver/checkupdates.py
 msgid "Only process apps with auto-updates"
 msgstr "Przetwarzaj tylko aplikacje z automatycznymi aktualizacjami"
 
 #: ../fdroidserver/lint.py
+#, fuzzy
 msgid "OpenCollective donation methods belong in the OpenCollective: field"
-msgstr "Metody darowizn OpenCollective należą do OpenCollective: field"
+msgstr "Metody flattr donation należą do flagi FlattrID"
+
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "Options"
+msgstr "Opcje"
 
 #: ../fdroidserver/verify.py
 msgid "Output JSON report to file named after APK."
@@ -1331,24 +1325,28 @@ msgstr "Wyjście raportu JSON do pliku o nazwie po APK."
 
 #: ../fdroidserver/scanner.py
 msgid "Output JSON to stdout."
-msgstr "Wyjście JSON na stdout."
+msgstr ""
 
-#: ../fdroidserver/checkupdates.py ../fdroidserver/gpgsign.py
-#: ../fdroidserver/publish.py ../fdroidserver/signindex.py
-#: ../fdroidserver/update.py
+#: ../fdroidserver/gpgsign.py ../fdroidserver/publish.py
+#: ../fdroidserver/update.py ../fdroidserver/signindex.py
+#: ../fdroidserver/checkupdates.py
 msgid "Outputting JSON"
-msgstr "Wyprowadzanie JSON"
+msgstr ""
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "Overall license of the project."
 msgstr "Całkowita licencja na projekt."
 
+#: ../fdroidserver/dscanner.py
+msgid "Override path for repo APKs (default: ./repo)"
+msgstr "Zastąp ścieżkę dla plików APK repo (domyślnie: ./repo)"
+
 #: ../fdroidserver/index.py
 #, python-brace-format
 msgid "Overriding blank versionName in {apkfilename} from metadata: {version}"
 msgstr "Przesłaniam pustą versionName w {apkfilename} z metadanych: {version}"
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 #, python-brace-format
 msgid "Package \"{appid}\" already exists"
 msgstr "Pakiet \"{appid}\" już istnieje"
@@ -1362,10 +1360,13 @@ msgstr "Analizowanie manifestu w{path}"
 msgid "Password required with username"
 msgstr "Hasło wymagane przy użyciu nazwy użytkownika"
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "Path to main Android project subdirectory, if not in root."
 msgstr "Ścieżka do głównego podkatalogu projektu Android, jeśli nie w katalogu głównym."
 
+msgid "Path to main android project subdirectory, if not in root."
+msgstr "Ścieżka do głównego podkatalogu projektu Android, jeśli nie w katalogu głównym."
+
 #: ../fdroidserver/init.py
 msgid "Path to the Android SDK (sometimes set in ANDROID_HOME)"
 msgstr "Ścieżka do zestawu SDK systemu Android (czasami jest ustawiona w ANDROID_HOME)"
@@ -1378,19 +1379,21 @@ msgstr "Ścieżka do repozytorium git do użycia jako dziennik"
 msgid "Path to the keystore for the repo signing key"
 msgstr "Ścieżka do magazynu kluczy dla klucza podpisywania repo"
 
+#: ../fdroidserver/dscanner.py
+msgid "Prepare Drozer to run a scan"
+msgstr "Przygotuj Drozera do uruchomienia skanowania"
+
+msgid "Prepare drozer to run a scan"
+msgstr "Przygotuj drozer do uruchomienia skanowania"
+
 #: ../fdroidserver/nightly.py
 msgid "Print the secret variable to the terminal for easy copy/paste"
 msgstr "Wydrukuj tajną zmienną do terminala, aby ułatwić kopiowanie/wklejanie"
 
-#: ../fdroidserver/install.py
+#: ../fdroidserver/metadata.py
 #, python-brace-format
-msgid "Privacy mode was enabled based on your locale ({country_code})."
-msgstr "Tryb prywatności został włączony w oparciu o ustawienia regionalne ({country_code})."
-
-#: ../fdroidserver/scanner.py
-#, python-format
-msgid "Problem with ZIP file: %s, error %s"
-msgstr "Problem z plikiem ZIP: %s, błąd %s"
+msgid "Problem with description of {appid}: {error}"
+msgstr "Problem z opisem{appid}: {error}"
 
 #: ../fdroidserver/common.py
 #, python-brace-format
@@ -1415,7 +1418,11 @@ msgstr "Przetwarzanie {appid}"
 msgid "Produce human-readable XML/JSON for index files"
 msgstr "Przygotuj czytelny dla człowieka XML/JSON dla plików index"
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/update.py
+msgid "Produce human-readable index.xml"
+msgstr "Przygotuj czytelny dla człowieka index.xml"
+
+#: ../fdroidserver/import.py
 msgid "Project URL to import from."
 msgstr "Adres URL projektu do zaimportowania z."
 
@@ -1427,25 +1434,21 @@ msgstr "Należy unikać interpunkcji"
 msgid "Push the log to this git remote repository"
 msgstr "Przepchnij dziennik do tego zdalnego repozytorium git"
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Pushing binary transparency log to {url}"
-msgstr "Przesyłanie dziennika przejrzystości plików binarnych do {url}"
+msgstr "Przesyłanie dziennika zmian binarnych do {url}"
 
-#: ../fdroidserver/deploy.py
-msgid "Pushing to remote server failed!"
-msgstr "Przesyłanie na serwer zdalny nie powiodło się!"
-
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Pushing to {url}"
-msgstr "Wyślij do {url}"
+msgstr "Naciśnij na {url}"
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Quickly start a new repository"
 msgstr "Szybko uruchom nowe repozytorium"
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Read all the metadata files and exit"
 msgstr "Przeczytaj wszystkie pliki metadanych i zakończ"
 
@@ -1456,49 +1459,40 @@ msgstr "Czytaj '{config_file}'"
 
 #: ../fdroidserver/common.py
 #, python-brace-format
-msgid "Reading packageName/versionCode/versionName failed, APK invalid: '{apkfilename}'"
-msgstr "Nie można odczytać packageName/versionCode/versionName, niepoprawny pakiet APK: '{apkfilename}'"
+msgid "Reading minSdkVersion failed: \"{apkfilename}\""
+msgstr "Nie udało się odczytać minSdkVersion: \"{apkfilename}\""
 
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
+#. https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
 #: ../fdroidserver/common.py
 #, python-brace-format
-msgid "Reading packageName/versionCode/versionName failed,APK invalid: '{apkfilename}'"
-msgstr "Nie udało się odczytać packageName/versionCode/versionName, nieprawidłowy plik APK: „{apkfilename}”"
+msgid "Reading packageName/versionCode/versionName failed, APK invalid: '{apkfilename}'"
+msgstr "Nie można odczytać packageName/versionCode/versionName, niepoprawny pakiet APK: '{apkfilename}'"
 
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Reading {apkfilename} from cache"
 msgstr "Czytanie {apkfilename} z pamięci podręcznej"
 
-#: ../fdroidserver/build.py
-msgid "Refresh and cache scanner rules and signatures from the network"
-msgstr "Odświeżanie i buforowanie reguł skanera i sygnatur z sieci"
-
-#: ../fdroidserver/publish.py
-#, python-brace-format
-msgid "Refusing to sign '{path}', file exists in both {dir1} and {dir2} folder."
-msgstr "Odmowa podpisania pliku {path}, ponieważ istnieje on zarówno w folderze {dir1}, jak i {dir2}."
-
-#: ../fdroidserver/verify.py
-msgid "Remove source tarball and any APKs if successfully verified."
-msgstr "Usuń źródłowy plik tarball i wszystkie pliki APK, jeśli pomyślnie zweryfikowano."
+#: ../fdroidserver/stats.py
+msgid "Recalculate aggregate stats - use when changes have been made that would invalidate old cached data."
+msgstr "Przelicz statystyki zagregowane - użyj kiedy wprowadzono zmiany, które unieważniłyby stare dane z pamięci podręcznej."
 
 #: ../fdroidserver/common.py
 msgid "Removing specified files"
 msgstr "Usuwanie określonych plików"
 
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Removing {path}\""
-msgstr "Usuwanie „{path}”"
-
 #: ../fdroidserver/update.py
 msgid "Rename APK files that do not match package.name_123.apk"
 msgstr "Zmień nazwy plików APK, które nie pasują do pliku package.name_123.apk"
 
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "RepoType {type} is deprecated, please switch to git."
-msgstr ""
+#: ../fdroidserver/update.py
+msgid "Report on build data status"
+msgstr "Raport o stanie danych dotyczących kompilacji"
+
+#: ../fdroidserver/build.py
+msgid "Reset and create a brand new build server, even if the existing one appears to be ok."
+msgstr "Zresetuj i utwórz zupełnie nowy serwer kompilacji, nawet jeśli istniejący wydaje się być w porządku."
 
 #: ../fdroidserver/nightly.py
 #, python-brace-format
@@ -1513,34 +1507,33 @@ msgstr "Zmień rozmiar wszystkich ikon przekraczających maksymalny rozmiar piks
 msgid "Restrict output to warnings and errors"
 msgstr "Ogranicz wyjście do ostrzeżeń i błędów"
 
-#: ../fdroidserver/net.py
-#, python-format
-msgid "Retrying failed download: %s"
-msgstr "Ponowna próba pobrania nie powiodła się: %s"
-
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Rewrite all the metadata files"
 msgstr "Przepisz wszystkie pliki metadanych"
 
+#: ../fdroidserver/rewritemeta.py
+msgid "Rewrite to a specific format: "
+msgstr "Przepisz do określonego formatu: "
+
 #: ../fdroidserver/rewritemeta.py
 #, python-brace-format
 msgid "Rewriting '{appid}'"
 msgstr "Przepisywanie '{appid}'"
 
+#: ../fdroidserver/rewritemeta.py
+#, python-brace-format
+msgid "Rewriting '{appid}' to '{path}'"
+msgstr "Przepisywanie '{appid}' do '{path}'"
+
 #: ../fdroidserver/checkupdates.py
 msgid "Run on git repo that has uncommitted changes"
-msgstr "Uruchom ponownie repozytorium git z niescommitowanymi zmianami"
-
-#: ../fdroidserver/nightly.py
-#, python-brace-format
-msgid "Run over {cibase} to find -debug.apk. and skip repo_basedir {repo_basedir}"
-msgstr "Uruchom {cibase}, aby znaleźć -debug.apk. i pomiń repo_basedir {repo_basedir}"
+msgstr "Uruchom ponownie repozytorium git z niezatwierdzonymi zmianami"
 
 #: ../fdroidserver/lint.py
 msgid "Run rewritemeta to fix formatting"
 msgstr "Uruchom rewritemeta, aby naprawić formatowanie"
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 msgid "Running first pass with MD5 checking disabled"
 msgstr "Uruchomienie pierwszego przejścia z wyłączonym sprawdzaniem MD5"
 
@@ -1549,24 +1542,18 @@ msgstr "Uruchomienie pierwszego przejścia z wyłączonym sprawdzaniem MD5"
 msgid "Running wget in {path}"
 msgstr "Uruchomienie wget w {path}"
 
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "SHA-256 of {url} does not match entry!"
-msgstr "SHA-256 z {url} nie pasuje do wpisu!"
+#: ../fdroidserver/dscanner.py
+msgid "Scan only the latest version of each package"
+msgstr "Skanuj tylko najnowszą wersję każdego pakietu"
 
 #: ../fdroidserver/build.py
 msgid "Scan the resulting APK(s) for known non-free classes."
-msgstr "Przeskanuj otrzymany plik APK w poszukiwaniu znanych niewolnych klas."
+msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Scan the source code of a package"
 msgstr "Zeskanuj kod źródłowy pakietu"
 
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Scanner found {count} problems in {apk}"
-msgstr "Skaner znalazł {count} problemy(-ów) w {apk}"
-
 #: ../fdroidserver/scanner.py
 #, python-brace-format
 msgid "Scanner found {count} problems in {appid}:"
@@ -1584,33 +1571,20 @@ msgstr[0] "Skaner znalazł {} problem"
 msgstr[1] "Skaner znalazł {} problemów"
 msgstr[2] "Skaner znalazł {} problemy"
 
-#: ../fdroidserver/scanner.py
-msgid "Scanning APK for extra signing blocks."
-msgstr "Skanowanie APK w poszukiwaniu dodatkowych bloków podpisywania."
-
-#: ../fdroidserver/scanner.py
-msgid "Scanning APK with dexdump for known non-free classes."
-msgstr "Skanowanie pakietu APK za pomocą dexdump w poszukiwaniu znanych niewolnych klas."
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Set NDK {release} ({version}) up"
-msgstr "Ustaw NDK {release} ({version})"
-
 #: ../fdroidserver/common.py
 msgid "Set clock to that time using:"
 msgstr "Ustaw zegar na ten czas, używając:"
 
 #: ../fdroidserver/nightly.py
 msgid "Set maximum releases in repo before older ones are archived"
-msgstr "Ustaw maksymalne wydania w repo przed archiwizacją starszych"
+msgstr ""
 
 #: ../fdroidserver/build.py
 #, python-brace-format
 msgid "Set open file limit to {integer}"
 msgstr "Ustaw limit otwartych plików na {integer}"
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Set up an app build for a nightly build repo"
 msgstr "Skonfiguruj aplikację na nocne repozytorium"
 
@@ -1623,11 +1597,18 @@ msgstr "Ustawienie limitu otwartych plików nie powiodło się: "
 msgid "Setting {0} sec timeout for this build"
 msgstr "Ustawienie limitu czasu {0} w sek dla tej kompilacji"
 
-#: ../fdroidserver/__main__.py
+#: ../fdroidserver/build.py
+msgid "Setup an emulator, install the APK on it and perform a Drozer scan"
+msgstr "Skonfiguruj emulator, zainstaluj na nim plik APK i wykonaj skanowanie Drozera"
+
+msgid "Setup an emulator, install the apk on it and perform a drozer scan"
+msgstr "Skonfiguruj emulator, zainstaluj na nim apk i wykonaj skanowanie drozer"
+
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Sign and place packages in the repo"
 msgstr "Podpisz i umieść paczki w repozytorium"
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Sign indexes created using update --nosign"
 msgstr "Zarejestruj indeksy utworzone przy użyciu update --nosign"
 
@@ -1640,11 +1621,6 @@ msgstr "Pomiń skanowanie kodu źródłowego dla plików binarnych i innych prob
 msgid "Skipping '{apkfilename}' with invalid signature!"
 msgstr "Pomijaj '{apkfilename}' z nieprawidłowym podpisem!"
 
-#: ../fdroidserver/deploy.py ../fdroidserver/index.py
-#, python-format
-msgid "Skipping GitLab Pages mirror because the repo is too large (>%.2fGB)!"
-msgstr "Pomijanie serwera lustrzanego GitLab Pages, ponieważ repozytorium jest zbyt duże (>%.2fGB)!"
-
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Skipping index generation for {appid}"
@@ -1660,14 +1636,23 @@ msgstr "Pomijaj pliki {apkfilename} z nieprawidłowym podpisem!"
 msgid "Skipping {appid}: disabled"
 msgstr "Pomiń {appid}: wyłączone"
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/scanner.py
+#, python-brace-format
+msgid "Skipping {appid}: no builds specified"
+msgstr "Pomiń {appid}: nie określono żadnych kompilacji"
+
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 msgid "Specify a local folder to sync the repo to"
 msgstr "Określ folder lokalny do synchronizacji repo do"
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 msgid "Specify an identity file to provide to SSH for rsyncing"
 msgstr "Podaj plik tożsamości, który ma dostarczyć SSH dla rsyncing"
 
+#: ../fdroidserver/build.py
+msgid "Specify that we're running on the build server"
+msgstr "Określ, że działamy na serwerze kompilacji"
+
 #: ../fdroidserver/nightly.py
 msgid "Specify which debug keystore file to use."
 msgstr "Określ, który plik pliku kluczy debugowania ma zostać użyty."
@@ -1678,8 +1663,13 @@ msgstr "Wypluwaj jeszcze więcej informacji niż zwykle"
 
 #: ../fdroidserver/nightly.py
 #, python-brace-format
+msgid "Striping mystery signature from {apkfilename}"
+msgstr "Odrysowywanie tajemniczego podpisu od {apkfilename}"
+
+#: ../fdroidserver/nightly.py
+#, fuzzy, python-brace-format
 msgid "Stripping mystery signature from {apkfilename}"
-msgstr "Usuwanie tajemniczego podpisu z {apkfilename}"
+msgstr "Odrysowywanie tajemniczego podpisu od {apkfilename}"
 
 #: ../fdroidserver/lint.py
 #, python-format
@@ -1696,22 +1686,10 @@ msgstr "Podsumowanie długości {length} przekracza limit {limit} char"
 msgid "System clock is older than date in {path}!"
 msgstr "Zegar systemowy jest starszy niż data w {path}!"
 
-#: ../fdroidserver/checkupdates.py
-msgid "Tags update mode only works for git, hg, bzr and git-svn repositories currently"
-msgstr "Tryb aktualizacji tagów działa obecnie tylko dla repozytoriów git, hg, bzr i git-svn"
-
-#: ../fdroidserver/checkupdates.py
-msgid "Tags update mode used in git-svn, but the repo was not set up with tags"
-msgstr "Tryb aktualizacji tagów użyty w git-svn, ale repozytorium nie zostało skonfigurowane z tagami"
-
 #: ../fdroidserver/build.py
 msgid "Test mode - put output in the tmp directory only, and always build, even if the output already exists."
 msgstr "Tryb testowy - umieszczaj dane wyjściowe tylko w katalogu tmp i zawsze buduj, nawet jeśli dane wyjściowe już istnieją."
 
-#: ../fdroidserver/index.py
-msgid "The \"qrcode\" Python package is not installed (e.g. apt-get install python3-qrcode)!"
-msgstr "Pakiet Pythona „qrcode” nie jest zainstalowany (np. apt-get install python3-qrcode)!"
-
 #. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
 #: ../fdroidserver/update.py
 #, python-brace-format
@@ -1730,10 +1708,18 @@ msgstr "Katalog do zapisania kopii lustrzanej"
 msgid "The file to be included in the repo (path or glob)"
 msgstr "Plik do uwzględnienia w repozytorium (ścieżka lub glob)"
 
+#: ../fdroidserver/deploy.py
+msgid "The only commands currently supported are 'init' and 'update'"
+msgstr "Jedynymi obsługiwanymi obecnie poleceniami są 'init' i 'update'"
+
 #: ../fdroidserver/index.py
 msgid "The repository's fingerprint does not match."
 msgstr "Odcisk palca repozytorium nie pasuje."
 
+#: ../fdroidserver/common.py
+msgid "The repository's index could not be verified."
+msgstr "Indeksu repozytorium nie można zweryfikować."
+
 #: ../fdroidserver/deploy.py
 #, python-brace-format
 msgid "The root dir for local_copy_dir \"{path}\" does not exist!"
@@ -1747,45 +1733,14 @@ msgstr "Istnieje kolizja keyalias - wstrzymano publikowanie"
 msgid "These are the apps that have been archived from the main repo."
 msgstr "To są aplikacje, które zostały zarchiwizowane w głównym repozytorium."
 
-#: ../fdroidserver/mirror.py
-msgid "This command should never be used to mirror f-droid.org! A full copy requires more than 600GB."
-msgstr "To polecenie nigdy nie powinno być używane do tworzenia kopii lustrzanej f-droid.org! Pełna kopia wymaga więcej niż 600 GB."
-
-#: ../fdroidserver/common.py
-msgid "This is a repository of apps to be used with F-Droid. Applications in this repository are either official binaries built by the original application developers, or are binaries built from source by the admin of f-droid.org using the tools on https://gitlab.com/fdroid."
-msgstr "To jest repozytorium aplikacji używanych z F-Droid. Aplikacje w tym repozytorium są albo oficjalnymi plikami binarnymi utworzonymi przez oryginalnych programistów aplikacji, albo plikami binarnymi utworzonymi ze źródła przez administratora f-droid.org przy użyciu narzędzi na https://gitlab.com/fdroid."
-
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 #, python-format
 msgid "This repo already has local metadata: %s"
 msgstr "To repo ma już lokalne metadane: %s"
 
-#: ../fdroidserver/init.py
-#, python-format
-msgid ""
-"To complete the setup, add your APKs to \"%s\"\n"
-"then run \"fdroid update -c; fdroid update\".  You might also want to edit\n"
-"\"config.yml\" to set the URL, repo name, and more.  You should also set up\n"
-"a signing key (a temporary one might have been automatically generated).\n"
-"\n"
-"For more info: https://f-droid.org/docs/Setup_an_F-Droid_App_Repo\n"
-"and https://f-droid.org/docs/Signing_Process"
-msgstr ""
-"Aby zakończyć konfigurację, dodaj swoje pliki APK do „%s”\n"
-"następnie uruchom „fdroid update -c; fdroid update”. Możesz też chcieć zedytować\n"
-"„config.yml”, aby ustawić adres URL, nazwę repozytorium i inne. Powinieneś również skonfigurować\n"
-"klucz podpisu (tymczasowy mógł zostać wygenerowany automatycznie).\n"
-"\n"
-"Więcej informacji: https://f-droid.org/docs/Setup_an_F-Droid_App_Repo\n"
-"i https://f-droid.org/docs/Signing_Process"
-
-#: ../fdroidserver/deploy.py
-msgid "To use awsbucket, awssecretkey and awsaccesskeyid must also be set in config.yml!"
-msgstr "Aby użyć awsbucket, awssecretkey i awsaccesskeyid muszą być również ustawione w config.yml!"
-
-#: ../fdroidserver/deploy.py
-msgid "To use rclone, rclone_config and awsbucket must be set in config.yml!"
-msgstr "Aby używać rclone, rclone_config i awsbucket muszą być one również ustawione w config.yml!"
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
+msgid "To use awsbucket, awssecretkey and awsaccesskeyid must also be set in config.py!"
+msgstr "Aby użyć awsbucket, awssecretkey i awsaccesskeyid muszą być również ustawione w config.py!"
 
 #: ../fdroidserver/lint.py
 msgid "URL must start with https:// or http://"
@@ -1795,6 +1750,10 @@ msgstr "Adres URL musi rozpoczynać się od https:// lub http://"
 msgid "URL shorteners should not be used"
 msgstr "Skróty adresów URL nie powinny być używane"
 
+#: ../fdroidserver/metadata.py
+msgid "URL title is just the URL, use brackets: [URL]"
+msgstr "Tytuł adresu URL to tylko adres URL, użyj nawiasów kwadratowych: [URL]"
+
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "URL {url} in Description: {error}"
@@ -1808,15 +1767,16 @@ msgstr "Nieprawidłowy tag licencji \"{}\"! Używaj tylko tagów zgodnych z FSF
 msgid "Unexpected license tag \"{}\"! Only use license tags configured in your config file"
 msgstr "Nieprawidłowy tag licencji \"{}\"! Używaj tylko tagów licencji skonfigurowanych w twoim pliku konfiguracji"
 
-#: ../fdroidserver/common.py
+#: ../fdroidserver/metadata.py
 #, python-brace-format
-msgid "Unknown entry {key} in {configname}"
-msgstr "Nieznany wpis {key} w {configname}"
+msgid "Unexpected text on same line as {field} in {linedesc}"
+msgstr "Nieoczekiwany tekst w tej samej linii co {field} w {linedesc}"
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Unknown exception found!"
 msgstr "Znaleziono nieznany wyjątek!"
 
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "Unknown file '{filename}' in build '{versionName}'"
@@ -1827,6 +1787,11 @@ msgstr "Nieznany plik '{filename}' w kompilacji '{versionName}'"
 msgid "Unknown metadata format: %s"
 msgstr "Nieznany format metadanych: %s"
 
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Unknown metadata format: {path}"
+msgstr "Nieznany format metadanych: {path}"
+
 #: ../fdroidserver/metadata.py
 #, python-brace-format
 msgid "Unknown metadata format: {path} (use: *.yml)"
@@ -1836,6 +1801,10 @@ msgstr "Nieznany format metadanych: {path} (użyj: *.yml)"
 msgid "Unknown version of aapt, might cause problems: "
 msgstr "Nieznana wersja programu aapt może powodować problemy: "
 
+#: ../fdroidserver/lint.py
+msgid "Unlinkified link - use [http://foo.bar Link title] or [http://foo.bar]"
+msgstr "Unlinkified link - użyj [http://foo.bar Link title] or [http://foo.bar]"
+
 #: ../fdroidserver/lint.py
 msgid "Unnecessary leading space"
 msgstr "Niepotrzebna przestrzeń wiodąca"
@@ -1849,12 +1818,20 @@ msgstr "Niepotrzebne spacje końcowe"
 msgid "Unrecognised app field '{fieldname}' in '{path}'"
 msgstr "Nierozpoznane pole aplikacji '{fieldname}' w '{path}'"
 
+#: ../fdroidserver/metadata.py
+msgid "Unrecognised app field: "
+msgstr "Nierozpoznane pole aplikacji: "
+
 #: ../fdroidserver/metadata.py
 #, python-brace-format
 msgid "Unrecognised build flag '{build_flag}' in '{path}'"
 msgstr "Nierozpoznana flaga kompilacji '{build_flag}' w '{path}'"
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Unrecognised field '{field}' in {linedesc}"
+msgstr "Nierozpoznane pole '{field}' w {linedesc}"
+
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Unsupported file type \"{extension}\" for repo graphic"
@@ -1865,6 +1842,29 @@ msgstr "Nieobsługiwany typ pliku \"{extension}\" dla grafiki repo"
 msgid "Unsupported graphics file found: {path}"
 msgstr "Znaleziono nieobsługiwany plik graficzny: {path}"
 
+#: ../fdroidserver/rewritemeta.py
+#, python-brace-format
+msgid "Unsupported metadata format, use: --to [{supported}]"
+msgstr "Nieobsługiwany format metadanych, użyj: --to [{supported}]"
+
+#: ../fdroidserver/metadata.py
+msgid "Unterminated ]"
+msgstr "Niezakończone ]"
+
+#: ../fdroidserver/metadata.py
+msgid "Unterminated ]]"
+msgstr "Niezakończone ]]"
+
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Unterminated build in {name}"
+msgstr "Niezakończony kompilacji w {name}"
+
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Unterminated continuation in {name}"
+msgstr "Nieokreślona kontynuacja w {name}"
+
 #: ../fdroidserver/lint.py
 #, python-format
 msgid "Unused extlib at %s"
@@ -1885,25 +1885,27 @@ msgstr "Nieużywana ścieżka scandelete: %s"
 msgid "Unused scanignore path: %s"
 msgstr "Nieużywana ścieżka scanignore: %s"
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Update repo information for new packages"
 msgstr "Zaktualizuj informacje o repozytorium dla nowych pakietów"
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Update the binary transparency log for a URL"
-msgstr "Zaktualizuj dziennik przejrzystości plików binarnych dla adresu URL"
+msgstr "Zaktualizuj dziennik przezroczystości binarnej dla adresu URL"
+
+#: ../fdroid ../fdroidserver/__main__.py
+msgid "Update the stats of the repo"
+msgstr "Zaktualizuj statystyki repozytorium"
+
+#: ../fdroidserver/update.py ../fdroidserver/build.py
+msgid "Update the wiki"
+msgstr "Zaktualizuj wiki"
 
 #: ../fdroidserver/checkupdates.py
 #, python-brace-format
 msgid "UpdateCheckData has invalid URL: {url}"
 msgstr "UpdateCheckData ma nieprawidłowy adres URL: {url}"
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "UpdateCheckData must match the version code as integer (\\d or [0-9]): {codeex}"
-msgstr "UpdateCheckData musi odpowiadać kodowi wersji jako liczba całkowita (\\d lub [0-9]): {codeex}"
-
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "UpdateCheckData must use HTTPS URL: {url}"
@@ -1915,13 +1917,19 @@ msgid "UpdateCheckData not a valid URL: {url}"
 msgstr "UpdateCheckData nie jest prawidłowym adresem URL: {url}"
 
 #: ../fdroidserver/lint.py
-msgid "UpdateCheckMode is set but it looks like checkupdates hasn't been run yet."
-msgstr "UpdateCheckMode jest ustawiony, ale wygląda na to, że checkupdates nie został jeszcze uruchomiony"
+msgid "UpdateCheckMode is set but it looks like checkupdates hasn't been run yet"
+msgstr "UpdateCheckMode jest ustawione, ale wygląda na to, że checkupdates nie zostało jeszcze uruchomione"
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
+#. Translators: https://developer.android.com/studio/build/application-id
 #: ../fdroidserver/lint.py
+#, fuzzy
+msgid "UpdateCheckName is set to the known application ID - it can be removed"
+msgstr "UpdateCheckName (Nazwa sprawdzania aktualizacji) jest ustawiona na znany identyfikator aplikacji - można go usunąć"
+
+#: ../fdroidserver/lint.py
+#, fuzzy
 msgid "UpdateCheckName is set to the known application ID, it can be removed"
-msgstr "UpdateCheckName jest ustawiony na znany identyfikator aplikacji, można go usunąć"
+msgstr "UpdateCheckName (Nazwa sprawdzania aktualizacji) jest ustawiona na znany identyfikator aplikacji, można go usunąć"
 
 #: ../fdroidserver/deploy.py
 #, python-brace-format
@@ -1933,9 +1941,20 @@ msgstr "Przesyłanie {apkfilename} do androidobservatory.org"
 msgid "Uploading {apkfilename} to virustotal"
 msgstr "Przesyłanie {apkfilename} do virustotal"
 
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "Usage"
+msgstr "Użycie"
+
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, python-format
+msgid "Usage: %s\n"
+msgstr "Użycie: %s\n"
+
 #: ../fdroidserver/lint.py
-msgid "Use /HEAD instead of /master or /main to point at a file in the default branch"
-msgstr "Użyj /HEAD zamiast /master czy /main, aby wskazać plik w domyślnej gałęzi"
+msgid "Use /HEAD instead of /master to point at a file in the default branch"
+msgstr "Użyj /HEAD zamiast/ master, aby wskazać plik w domyślnej gałęzi"
 
 #: ../fdroidserver/update.py
 msgid "Use `fdroid update -c` to create it."
@@ -1949,16 +1968,14 @@ msgstr "Użyj serwera kompilacji"
 msgid "Use date from APK instead of current time for newly added APKs"
 msgstr "Użyj daty z pliku APK zamiast aktualnego dla nowo dodanych pakietów APK"
 
-#: ../fdroidserver/deploy.py
+msgid "Use date from apk instead of current time for newly added apks"
+msgstr "Użyj daty z apk zamiast bieżącego czasu dla nowo dodanych plików apk"
+
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Using \"{path}\" for configuring s3cmd."
 msgstr "Użyj \"{path}\" do konfiguracji s3cmd."
 
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Using \"{path}\" for syncing with remote storage."
-msgstr "Używanie \"{path}\" do synchronizacji ze zdalnym dyskiem."
-
 #: ../fdroidserver/common.py
 msgid "Using APK Signature v2"
 msgstr "Używając APK Signature v2"
@@ -1967,35 +1984,26 @@ msgstr "Używając APK Signature v2"
 msgid "Using APK Signature v3"
 msgstr "Używając APK Signature v3"
 
-#: ../fdroidserver/common.py
-msgid "Using JAR Signature"
-msgstr "Używanie podpisu JAR"
-
 #: ../fdroidserver/common.py
 msgid "Using Java's jarsigner, not recommended for verifying APKs! Use apksigner"
 msgstr "Korzystanie z jarsignera Java nie jest zalecane do weryfikacji plików APK! Użyj apksigner"
 
-#: ../fdroidserver/metadata.py
+#: ../fdroidserver/common.py
 #, python-brace-format
-msgid "Using blank dictionary instead of contents of {path}!"
-msgstr "Używanie pustego słownika zamiast zawartości {path}!"
+msgid "Using androguard from \"{path}\""
+msgstr "Korzystanie z androguard od \"{path}\""
 
 #: ../fdroidserver/init.py
 #, python-brace-format
 msgid "Using existing keystore \"{path}\""
 msgstr "Korzystanie z istniejącego magazynu kluczy \"{path}\""
 
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Using rclone to sync with: {url}"
-msgstr "Używanie rsync do synchronizacji z: {url}"
-
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Using s3cmd to sync with: {url}"
 msgstr "Użyj s3cmd do synchronizacji z: {url}"
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Valid commands are:"
 msgstr "Prawidłowe polecenia to:"
 
@@ -2003,7 +2011,7 @@ msgstr "Prawidłowe polecenia to:"
 msgid "Verify against locally cached copy rather than redownloading."
 msgstr "Zweryfikuj lokalnie kopiowaną pamięć podręczną zamiast pobierać ponownie."
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Verify the integrity of downloaded packages"
 msgstr "Sprawdź integralność pobranych pakietów"
 
@@ -2011,47 +2019,25 @@ msgstr "Sprawdź integralność pobranych pakietów"
 msgid "Verifying index signature:"
 msgstr "Weryfikowanie podpisu indeksu:"
 
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "Verifying package {path} with apksigner."
-msgstr "Weryfikacja pakietu {path} za pomocą apksigner."
-
 #: ../fdroidserver/deploy.py
 #, python-brace-format
 msgid "VirusTotal API key cannot upload files larger than 32MB, use {url} to upload {path}."
-msgstr "Klucz VirusTotal API nie może przesyłać plików większych niż 32 MB, użyj {url}, aby przesłać {path}."
-
-#: ../fdroidserver/nightly.py
-msgid "WARNING: only public git repos are supported!"
 msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Warn about possible metadata errors"
 msgstr "Ostrzegaj o możliwych błędach metadanych"
 
-#: ../fdroidserver/scanner.py
-msgid "WebAssembly binary file"
-msgstr "Plik binarny WebAssembly"
-
 #: ../fdroidserver/update.py
 msgid "When configured for signed indexes, create only unsigned indexes at this stage"
 msgstr "Po skonfigurowaniu dla indeksów podpisanych utwórz na tym etapie tylko niepodpisane indeksy"
 
 #: ../fdroidserver/lint.py
 msgid "When linting the entire repository yamllint is disabled by default. This option forces yamllint regardless."
-msgstr "Podczas linkowania całego repozytorium yamllint jest domyślnie wyłączony. Ta opcja wymusza yamllint niezależnie od tego."
+msgstr ""
 
-#: ../fdroidserver/publish.py
-msgid "When signing or verifying fails, exit with an error code."
-msgstr "Jeśli podpisanie lub weryfikacja nie powiedzie się, zakończ z kodem błędu."
-
-#: ../fdroidserver/install.py
-msgid "Would you like to download and install F-Droid.apk via adb? (YES/no)"
-msgstr "Czy chcesz pobrać i zainstalować F-Droid.apk przez adb? (TAK/NIE)"
-
-#: ../fdroidserver/install.py
-msgid "Would you like to download the app(s) from f-droid.org? (YES/no)"
-msgstr "Czy chcesz pobrać aplikacje ze strony f-droid.org? (TAK/NIE)"
+msgid "X.509 'Distiguished Name' used when generating keys"
+msgstr "X.509 'Distiguished Name' używana podczas generowania kluczy"
 
 #: ../fdroidserver/init.py
 msgid "X.509 'Distinguished Name' used when generating keys"
@@ -2065,11 +2051,6 @@ msgstr "Możesz użyć ANDROID_HOME, aby ustawić ścieżkę do SDK, tj .:"
 msgid "ZIP file archive"
 msgstr "Plik archiwum ZIP"
 
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "adb reports {serial} is \"{status}\"!"
-msgstr "adb zgłasza, że {serial} to \"{status}\"!"
-
 #: ../fdroidserver/nightly.py
 #, python-brace-format
 msgid "adding IdentityFile to {path}"
@@ -2080,78 +2061,87 @@ msgstr "dodawanie pliku IdentityFile do {path}"
 msgid "adding to {name}: {path}"
 msgstr "dodaj do {name}: {path}"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "ambiguous option: %(option)s could match %(matches)s"
 msgstr "niejednoznaczna opcja: %(option)s może dopasować %(matches)s"
 
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "apksigner in build-tools;{version} passes APKs with invalid v3 signatures, ignoring."
-msgstr "apksigner w build-tools;{version} przekazuje pliki APK z nieprawidłowymi podpisami v3, ignorując je."
-
-#: ../fdroidserver/common.py
-msgid "apksigner not found! Cannot sign or verify modern APKs"
-msgstr "Nie znaleziono apksignera! Nie można podpisać ani zweryfikować nowoczesnych pakietów APK"
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, python-format
+msgid "ambiguous option: %s (%s?)"
+msgstr "niejednoznaczna opcja: %s (%s?)"
 
 #: ../fdroidserver/common.py
 msgid "apksigner not found, it's required for signing!"
-msgstr "apksigner nie znaleziono, jest wymagane do podpisania!"
+msgstr ""
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/checkupdates.py ../fdroidserver/lint.py
-#: ../fdroidserver/rewritemeta.py
+#: ../fdroidserver/lint.py ../fdroidserver/rewritemeta.py
+#: ../fdroidserver/checkupdates.py
+#, fuzzy
 msgid "application ID of file to operate on"
-msgstr "Identyfikator aplikacji, na której ma działać"
+msgstr "applicationId, aby sprawdzić dostępność aktualizacji"
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/build.py ../fdroidserver/install.py
-#: ../fdroidserver/publish.py ../fdroidserver/scanner.py
-#: ../fdroidserver/verify.py
+#: ../fdroidserver/verify.py ../fdroidserver/publish.py
+#: ../fdroidserver/build.py ../fdroidserver/scanner.py
+#: ../fdroidserver/install.py
+#, fuzzy
 msgid "application ID with optional versionCode in the form APPID[:VERCODE]"
-msgstr "identyfikator aplikacji z opcjonalnym kodem wersji w postaci APPID [: VERCODE]"
+msgstr "applicationId z opcjonalnym versionCode w postaci APPID [:VERCODE]"
 
-#: ../fdroidserver/common.py
-msgid "archive_url needs to end with /archive"
-msgstr "archive_url musi kończyć się na /archive"
+#: ../fdroidserver/lint.py ../fdroidserver/rewritemeta.py
+msgid "applicationId in the form APPID"
+msgstr "applicationId w postaci APPID"
 
-#: /usr/lib/python3.11/argparse.py
+#: ../fdroidserver/checkupdates.py
+msgid "applicationId to check for updates"
+msgstr "applicationId, aby sprawdzić dostępność aktualizacji"
+
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
+#: ../fdroidserver/verify.py ../fdroidserver/publish.py
+#: ../fdroidserver/dscanner.py ../fdroidserver/build.py
+#: ../fdroidserver/scanner.py ../fdroidserver/install.py
+msgid "applicationId with optional versionCode in the form APPID[:VERCODE]"
+msgstr "applicationId z opcjonalnym versionCode w postaci APPID [:VERCODE]"
+
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "argument \"-\" with mode %r"
 msgstr "argument \"-\" w trybie %r"
 
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "argument %(argument_name)s: %(message)s"
-msgstr "argument %(argument_name)s: %(message)s"
+#: ../fdroidserver/nightly.py
+#, fuzzy
+msgid "attempting bare SSH connection to test deploy key:"
+msgstr "próbując odsłoniętego połączenia ssh, aby przetestować klucz wdrożenia:"
 
 #: ../fdroidserver/nightly.py
-msgid "attempting bare SSH connection to test deploy key:"
-msgstr "próba połączenia odsłoniętego SSH w celu przetestowania klucza wdrożenia:"
+msgid "attempting bare ssh connection to test deploy key:"
+msgstr "próbując odsłoniętego połączenia ssh, aby przetestować klucz wdrożenia:"
 
 #: ../fdroidserver/common.py
 msgid "can not parse scrlib spec (not a string): '{}'"
-msgstr "can not parse scrlib spec (not a string):' {}'"
+msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
-msgid "can't open '%(filename)s': %(error)s"
-msgstr "nie można otworzyć „%(filename)s”: %(error)s"
-
-#: ../fdroidserver/scanner.py
-msgid "can't open non-https url: '{};"
-msgstr "nie można otworzyć adresu URL innego niż https: „{}”"
+msgid "can't open '%s': %s"
+msgstr "nie można otworzyć '%s':%s"
 
 #: ../fdroidserver/build.py
 #, python-brace-format
 msgid "cannot find required srclibs: \"{path}\""
 msgstr "Nie można znaleźć wymaganych srclibs: \"{path}\""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "cannot have multiple subparser arguments"
 msgstr "nie może mieć wielu argumentów o różnych argumentach"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "cannot merge actions - two groups are named %r"
 msgstr "nie można scalać działania - dwie grupy są nazywane %r"
@@ -2165,11 +2155,21 @@ msgstr "nie mogę opublikować aktualizacji, czy ustawiłeś klucz wdrożenia?"
 msgid "cloning {url}"
 msgstr "klonowanie {url}"
 
+#: ../fdroidserver/deploy.py
+msgid "command to execute, either 'init' or 'update'"
+msgstr "polecenie do wykonania, 'init' lub 'update'"
+
 #: ../fdroidserver/__main__.py
 msgid "commands from plugin modules:"
-msgstr "polecenia z modułów plugin:"
+msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "complex"
+msgstr "złożony"
+
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "conflicting option string: %s"
 msgid_plural "conflicting option strings: %s"
@@ -2177,71 +2177,56 @@ msgstr[0] "sprzeczny ciąg opcji: %s"
 msgstr[1] "sprzecznych ciągów opcji: %s"
 msgstr[2] "sprzeczne ciągi opcji: %s"
 
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "conflicting subparser alias: %s"
-msgstr "kolidujący alias subparsera: %s"
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "conflicting subparser: %s"
-msgstr "kolidujący subparser: %s"
+#: ../fdroidserver/nightly.py
+#, python-brace-format
+msgid "copying {apkfilename} into {path}"
+msgstr "kopiowanie {apkfilename} na {path}"
 
 #: ../fdroidserver/metadata.py
 #, python-brace-format
 msgid "could not parse '{path}'"
-msgstr "nie można przeanalizować '{path}'"
-
-#: ../fdroidserver/common.py
-msgid "could not parse srclib spec (no name specified): '{}'"
-msgstr "nie można przeanalizować specyfikacji srclib (nie podano nazwy): '{}'"
+msgstr ""
 
 #: ../fdroidserver/common.py
 msgid "could not parse srclib spec (no ref specified): '{}'"
-msgstr "could not parse srclib spec (no ref specified):' {}'"
+msgstr ""
+
+#: ../fdroidserver/common.py
+msgid "could not parse srclib spec (too many '@' signs): '{}'"
+msgstr ""
 
 #: ../fdroidserver/nightly.py
 #, python-brace-format
 msgid "created {path}"
 msgstr "tworzony {path}"
 
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "current version is newer: old vercode={old}, new vercode={new}"
-msgstr "aktualna wersja jest nowsza: stary vercode={old}, nowy vercode={new}"
-
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "deleting: repo/{apkfilename}"
 msgstr "usuwanie: repo/{apkfilename}"
 
-#: ../fdroidserver/scanner.py
-msgid "dependency file without lock"
-msgstr "plik zależności bez blokady"
+#: ../fdroidserver/common.py
+#, python-brace-format
+msgid "deployed build logs to '{path}'"
+msgstr "wdrożone dzienniki kompilacji do '{path}'"
 
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "deployed process log {path} to {dest}"
-msgstr "wdrożony dziennik procesów {path} do {dest}"
+msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "dest= is required for options like %r"
 msgstr "dest = jest wymagany dla opcji takich jak %r"
 
-#: ../fdroidserver/scanner.py
-msgid "downloading '{}'"
-msgstr "pobieranie „{}”"
-
-#: ../fdroidserver/scanner.py
-msgid "downloading scanner signatures from '{}' failed"
-msgstr "nie udało się pobrać sygnatur skanera z „{}”"
-
 #: ../fdroidserver/scanner.py
 msgid "executable binary, possibly code"
-msgstr "wykonywalny binarny, ewentualnie kod"
+msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "expected %s argument"
 msgid_plural "expected %s arguments"
@@ -2249,25 +2234,42 @@ msgstr[0] "oczekiwany argument %s"
 msgstr[1] "oczekiwanych argumentów %s"
 msgstr[2] "oczekiwane argumenty %s"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "expected at least one argument"
 msgstr "spodziewano się co najmniej jednego argumentu"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "expected at most one argument"
 msgstr "spodziewano się co najwyżej jednego argumentu"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "expected one argument"
 msgstr "oczekiwano jednego argumentu"
 
-#: ../fdroidserver/__main__.py
+#: ../fdroidserver/common.py
+#, python-brace-format
+msgid "failed deploying build logs to '{path}'"
+msgstr "nie udało się wdrożyć dzienników kompilacji do '{path}'"
+
+#: ../fdroid
+msgid "fdroid [-h|--help|--version] <command> [<args>]"
+msgstr "fdroid [-h|--help|--version] <command> [<args>]"
+
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "fdroid [<command>] [-h|--help|--version|<args>]"
 msgstr "fdroid [<command>] [-h|--help|--version|<args>]"
 
-#: ../fdroidserver/scanner.py
-msgid "fetch the latest version of signatures from the web"
-msgstr "pobierz najnowszą wersję sygnatur z sieci"
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "floating-point"
+msgstr "zmiennoprzecinkowy"
+
+#: ../fdroidserver/metadata.py
+msgid "force errors to be warnings, or ignore"
+msgstr "wymuszać błędy jako ostrzeżenia lub zignorować"
 
 #: ../fdroidserver/metadata.py
 msgid "force metadata errors (default) to be warnings, or to be ignored."
@@ -2281,7 +2283,8 @@ msgstr "klon git svn nie powiódł się"
 msgid "gzip file archive"
 msgstr "plik archiwum gzip"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "ignored explicit argument %r"
 msgstr "zignorował wyraźny argument %r"
@@ -2290,39 +2293,35 @@ msgstr "zignorował wyraźny argument %r"
 msgid "index-v1 must have a signature, use `fdroid signindex` to create it!"
 msgstr "index-v1 musi mieć podpis, użyj `fdroid signindex` aby go utworzyć!"
 
-#: ../fdroidserver/index.py
-msgid "index-v2 must have a signature, use `fdroid signindex` to create it!"
-msgstr "index-v2 musi mieć podpis, użyj `fdroid signindex`, aby go utworzyć!"
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "integer"
+msgstr "liczba całkowita (ang. integer)"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "invalid %(type)s value: %(value)r"
 msgstr "nieprawidłowe %(type)s wartość: %(value)r"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "invalid choice: %(value)r (choose from %(choices)s)"
 msgstr "nieprawidłowy wybór: %(value)r (wybierz z %(choices)s)"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "invalid conflict_resolution value: %r"
 msgstr "niepoprawna wartość parametru conflict_resolution: %r"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "invalid option string %(option)r: must start with a character %(prefix_chars)r"
 msgstr "niepoprawny ciąg opcji %(option)r: musi zaczynać się od postaci %(prefix_chars)r"
 
-#: ../fdroidserver/common.py
-msgid "ipfs_cid not found, skipping CIDv1 generation"
-msgstr "nie znaleziono ipfs_cid, pomijanie generowania CIDv1"
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "latest build recipe is newer: old vercode={old}, new vercode={new}"
-msgstr "najnowsza instrukcja kompilacji jest nowsza: stary vercode={old}, nowy vercode={new}"
-
 #: ../fdroidserver/deploy.py
 #, python-brace-format
 msgid "local_copy_dir does not end with \"fdroid\", perhaps you meant: \"{path}\""
@@ -2341,20 +2340,11 @@ msgstr "local_copy_dir musi być katalogiem, a nie plikiem!"
 msgid "mirror '%s' does not end with 'fdroid'!"
 msgstr "mirror '%s'nie kończy się na 'fdroid'!"
 
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "mirrors set twice, in config.yml and {path}!"
-msgstr "serwery lustrzane zostały ustawione dwukrotnie w config.yml i {path}!"
-
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "mutually exclusive arguments must be optional"
 msgstr "wykluczające się wzajemnie argumenty muszą być opcjonalne"
 
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "next {name} cache update due in {time}"
-msgstr "następna aktualizacja pamięci podręcznej {name} zaplanowana na {time}"
-
 #: ../fdroidserver/mirror.py
 #, python-brace-format
 msgid "no \"icon\" in {appid}"
@@ -2364,89 +2354,141 @@ msgstr "brak \"ikony\" w {appid}"
 msgid "no APK supplied"
 msgstr "nie dostarczono pakietu APK"
 
-#: ../fdroidserver/checkupdates.py
-msgid "no version information found"
-msgstr "nie znaleziono informacji o wersji"
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, python-format
+msgid "no such option: %s"
+msgstr "brak takiej opcji: %s"
 
-#: /usr/lib/python3.11/argparse.py
+#: ../fdroid ../fdroidserver/__main__.py
+msgid "no version info found!"
+msgstr "nie znaleziono informacji o wersji!"
+
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "not allowed with argument %s"
 msgstr "niedozwolone z argumentem %s"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "one of the arguments %s is required"
 msgstr "jeden z argumentów %s jest wymagany"
 
-#: ../fdroidserver/common.py ../fdroidserver/index.py
+#: ../fdroidserver/index.py ../fdroidserver/common.py
 msgid "only accepts strings, lists, and tuples"
 msgstr "akceptuje tylko łańcuchy, listy i krotki"
 
-#: /usr/lib/python3.11/argparse.py
-msgid "options"
-msgstr "opcje"
+#: ../fdroidserver/install.py
+#, python-format
+msgid "option %s: If you really want to install all the signed apps, use --all"
+msgstr "opcja %s: Jeśli naprawdę chcesz zainstalować wszystkie podpisane aplikacje, użyj --all"
+
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, python-format
+msgid "option %s: invalid %s value: %r"
+msgstr "opcja %s: nieprawidłowa %s wartość: %r"
+
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, python-format
+msgid "option %s: invalid choice: %r (choose from %s)"
+msgstr "opcja %s: nieprawidłowy wybór: %r (wybierz z %s)"
+
+#: /usr/lib/python3.5/getopt.py /usr/lib/python3.6/getopt.py
+#: /usr/lib/python3.7/getopt.py
+#, python-format
+msgid "option -%s not recognized"
+msgstr "opcja -%s nie został rozpoznany"
+
+#: /usr/lib/python3.5/getopt.py /usr/lib/python3.6/getopt.py
+#: /usr/lib/python3.7/getopt.py
+#, python-format
+msgid "option -%s requires argument"
+msgstr "opcja -%s wymaga argumentu"
+
+#: /usr/lib/python3.5/getopt.py /usr/lib/python3.6/getopt.py
+#: /usr/lib/python3.7/getopt.py
+#, python-format
+msgid "option --%s must not have an argument"
+msgstr "opcja --%s nie może mieć argumentu"
+
+#: /usr/lib/python3.5/getopt.py /usr/lib/python3.6/getopt.py
+#: /usr/lib/python3.7/getopt.py
+#, python-format
+msgid "option --%s not a unique prefix"
+msgstr "opcja --%s nie jest to unikalny prefiks"
+
+#: /usr/lib/python3.5/getopt.py /usr/lib/python3.6/getopt.py
+#: /usr/lib/python3.7/getopt.py
+#, python-format
+msgid "option --%s not recognized"
+msgstr "opcja --%s nie został rozpoznany"
+
+#: /usr/lib/python3.5/getopt.py /usr/lib/python3.6/getopt.py
+#: /usr/lib/python3.7/getopt.py
+#, python-format
+msgid "option --%s requires argument"
+msgstr "opcja --%s wymaga argumentu"
+
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
+msgid "optional arguments"
+msgstr "opcjonalne argumenty"
 
 #: ../fdroidserver/nightly.py
 #, python-brace-format
 msgid "overwriting existing {path}"
 msgstr "nadpisanie istniejącego {path}"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "positional arguments"
 msgstr "argumenty pozycyjne"
 
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "process log deploy {path} to {dest} failed!"
-msgstr "proces wdrażania dziennika {path} do {dest} nie powiódł się!"
-
-#: ../fdroidserver/build.py
-msgid "reference binary missing signature"
-msgstr "brakujący podpis binarnego pliku odniesienia"
+msgstr ""
 
 #: ../fdroidserver/signatures.py
 #, python-brace-format
 msgid "refuse downloading via insecure HTTP connection (use HTTPS or specify --no-https-check): {apkfilename}"
 msgstr "odmów pobierania przez niezabezpieczone połączenie HTTP (użyj HTTPS lub określ --no-https-check): {apkfilename}"
 
+#: ../fdroidserver/signatures.py
+#, python-brace-format
+msgid "refuse downloading via insecure http connection (use https or specify --no-https-check): {apkfilename}"
+msgstr "odmów pobierania przez niezabezpieczone połączenie http (użyj https lub określ --no-https-check): {apkfilename}"
+
 #: ../fdroidserver/index.py
 #, python-format
-msgid "repo_icon \"repo/icons/%s\" does not exist, generating placeholder."
-msgstr "repo_icon \"repo / icons / %s\" nie istnieje, generuje symbol zastępczy."
+msgid "repo_icon %s does not exist, generating placeholder."
+msgstr ""
 
-#: ../fdroidserver/common.py
-msgid "repo_url needs to end with /repo"
-msgstr "repo_url musi kończyć się na /repo"
+#: ../fdroidserver/metadata.py
+msgid "ruamel.yaml not installed, can not write metadata."
+msgstr "nie zainstalowano ruamel.yaml, nie można zapisać metadanych."
 
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "rsync is missing or broken: {error}"
-msgstr "rsync nie działa lub działa nieprawidłowo: {error}"
-
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "s3cmd sync indexes {path} to {url} and delete"
 msgstr "s3cmd zsynchronizuj indeksy {path} do {url} i usuń"
 
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "s3cmd syncs indexes from {path} to {url} and deletes removed"
-msgstr "s3cmd synchronizuje indeksy z {path} do {url} i usuwa usunięte"
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "scanner cache is malformed! You can clear it with: '{clear}'"
-msgstr "pamięć podręczna skanera jest zniszczona! Możesz to wyczyścić poleceniem: „{clear}”"
-
-#: ../fdroidserver/deploy.py
-msgid "serverwebroot: path does not end with \"fdroid\", perhaps you meant one of these:"
-msgstr "serverwebroot: ścieżka nie kończy się na \"fdroid\", być może miałeś na myśli jedno z tych:"
-
 #: ../fdroidserver/scanner.py
 msgid "shared library"
-msgstr "biblioteka współdzielona"
+msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "show program's version number and exit"
+msgstr "pokaż numer wersji programu i zakończ"
+
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.5/optparse.py
+#: /usr/lib/python3.6/argparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/argparse.py /usr/lib/python3.7/optparse.py
 msgid "show this help message and exit"
 msgstr "pokaż ten komunikat pomocy i zakończ"
 
@@ -2473,33 +2515,33 @@ msgstr "brak nazwy srclibs i/lub @"
 
 #: ../fdroidserver/scanner.py
 msgid "static library"
-msgstr "biblioteka statyczna"
+msgstr ""
 
-#: ../fdroidserver/build.py
+#: ../fdroidserver/common.py
 #, python-brace-format
-msgid "supplied reference binary has allowed signer {signer}"
-msgstr "dostarczony referencyjny plik binarny umożliwił podpis {signer}"
+msgid "supplied timestamp value '{timestamp}' is not a unix timestamp"
+msgstr "dostarczona wartość znacznika czasu '{timestamp}' nie jest znacznikiem czasu unix"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "the following arguments are required: %s"
 msgstr "wymagane są następujące argumenty: %s"
 
-#: ../fdroidserver/install.py
-msgid "true"
-msgstr "prawda"
-
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "unexpected option string: %s"
 msgstr "nieoczekiwany ciąg opcji: %s"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "unknown parser %(parser_name)r (choices: %(choices)s)"
 msgstr "nieznana składnia (parser) %(parser_name)r (wybierz: %(choices)s)"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "unrecognized arguments: %s"
 msgstr "nierozpoznane argumenty: %s"
@@ -2509,22 +2551,27 @@ msgstr "nierozpoznane argumenty: %s"
 msgid "unsafe permissions on '{config_file}' (should be 0600)!"
 msgstr "niebezpieczne uprawnienia na '{config_file}' (powinno być 0600)!"
 
-#: ../fdroidserver/__main__.py /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py ../fdroid
+#: /usr/lib/python3.7/argparse.py ../fdroidserver/__main__.py
 msgid "usage: "
 msgstr "stosowanie: "
 
-#: ../fdroidserver/deploy.py
+#: ../fdroid
+msgid "usage: fdroid [-h|--help|--version] <command> [<args>]"
+msgstr "użycie: fdroid [-h|--help|--version] <command> [<args>]"
+
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "using Apache libcloud to sync with {url}"
 msgstr "używając Apache libcloud do zsynchronizowania z {url}"
 
 #: ../fdroidserver/deploy.py
 msgid "virustotal.com is rate limiting, waiting to retry..."
-msgstr "virustotal.com jest ograniczenie stawki, czeka na ponowną próbę..."
+msgstr ""
 
-#: ../fdroidserver/install.py
-msgid "yes"
-msgstr "tak"
+#: ../fdroidserver/update.py
+msgid "wiki support is deprecated and will be removed in the next release!"
+msgstr ""
 
 #: ../fdroidserver/publish.py
 #, python-brace-format
@@ -2539,39 +2586,47 @@ msgstr[2] "{0} apps, {1} kluczowych aliasów"
 msgid "{apkfilename} ({appid}) has no metadata!"
 msgstr "{apkfilename} ({appid}) nie ma metadanych!"
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
+#: ../fdroidserver/update.py
+#, python-brace-format
+msgid "{apkfilename} has multiple {name} files, looks like Master Key exploit!"
+msgstr "{apkfilename} ma wiele {name} plików, wygląda jak exploit Master Key!"
+
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "{apkfilename}'s AndroidManifest.xml has a bad date: "
 msgstr "{apkfilename} AndroidManifest.xml ma złą datę: "
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
 #: ../fdroidserver/update.py
-#, python-brace-format
+#, fuzzy, python-brace-format
 msgid "{appid} does not have a name! Using application ID instead."
-msgstr "{appid} nie ma nazwy! Zamiast tego używam identyfikatora aplikacji."
+msgstr "{appid} nie ma nazwy! Zamiast tego użyj nazwy pakietu."
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
 #: ../fdroidserver/update.py
 #, python-brace-format
+msgid "{appid} does not have a name! Using package name instead."
+msgstr "{appid} nie ma nazwy! Zamiast tego użyj nazwy pakietu."
+
+#: ../fdroidserver/update.py
+#, python-brace-format
+msgid "{appid} from {path} is not a valid Android Package Name!"
+msgstr "{appid} z {path} nie jest prawidłową nazwą pakietu Android!"
+
+#: ../fdroidserver/update.py
+#, fuzzy, python-brace-format
 msgid "{appid} from {path} is not a valid Android application ID!"
-msgstr "{appid} z {path} nie jest prawidłowym identyfikatorem aplikacji na system Android!"
+msgstr "{appid} z {path} nie jest prawidłową nazwą pakietu Android!"
 
 #: ../fdroidserver/metadata.py ../fdroidserver/update.py
 #, python-brace-format
 msgid "{appid} from {path} is not a valid Java Package Name!"
 msgstr "{appid} z {path} nie jest prawidłową nazwą pakietu Java!"
 
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{appid} has both APKs and files: {files}"
-msgstr "{appid} zawiera zarówno pliki APK, jak i pliki: {files}"
-
 #: ../fdroidserver/mirror.py
 #, python-brace-format
 msgid "{appid} is missing {name}"
 msgstr "{appid} brakuje {name}"
 
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "{appid}: Unknown extlib {path} in build '{versionName}'"
@@ -2595,12 +2650,12 @@ msgstr "{appid}: {field} musi być '{type}', ale to jest '{fieldtype}'!"
 #: ../fdroidserver/metadata.py
 #, python-brace-format
 msgid "{build_flag} must be an integer, found: {value}"
-msgstr "{build_flag} musi być liczbą całkowitą, znaleziono: {value}"
+msgstr ""
 
 #: ../fdroidserver/metadata.py
 #, python-brace-format
-msgid "{build_flag} must be list or string, found: {value}"
-msgstr "{build_flag} musi być listą lub ciągiem, znaleziono: {value}"
+msgid "{field} not terminated in {name}"
+msgstr "{field} nie została zakończona w {name}"
 
 #: ../fdroidserver/metadata.py
 #, python-brace-format
@@ -2609,15 +2664,10 @@ msgstr "{file} jest pusty lub uszkodzony!"
 
 #: ../fdroidserver/update.py
 #, python-brace-format
-msgid "{name} \"{section}/icons/{path}\" does not exist! Check \"config.yml\"."
-msgstr "{name} \"{section}/icons/{path}\" nie istnieje! Sprawdź \"config.yml\"."
+msgid "{name} \"{path}\" does not exist! Correct it in config.py."
+msgstr "{name} \"{path}\" nie istnieje! Popraw go w config.py."
 
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{path1} is a duplicate of {path2}, remove one!"
-msgstr "{path1} to duplikat {path2}, usuń jeden z nich!"
-
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 #, python-brace-format
 msgid "{path} already exists, ignoring import results!"
 msgstr "{path} już istnieje, ignorowanie rezultatów importowania!"
@@ -2632,62 +2682,22 @@ msgstr "{path} nie istnieje! Utwórz go, uruchamiając:"
 msgid "{path} has bad file signature \"{pattern}\", possible Janus exploit!"
 msgstr "{path} ma zły podpis pliku \"{pattern}\", możliwe wykorzystanie Janusa!"
 
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "{path} has been flagged by virustotal {count} times:"
-msgstr "{path} została oznaczona przez virustotal {count} razy:"
-
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "{path} has the wrong fingerprint ({fingerprint})!"
-msgstr "{path} ma niewłaściwy odcisk palca {fingerprint}!"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "{path} is not \"key: value\" dict, but a {datatype}!"
-msgstr "{path} nie jest słownikiem \"klucz: wartość\", lecz {datatype}!"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "{path} is not a standard config file!"
-msgstr "{path} nie jest standardowym plikiem konfiguracyjnym!"
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "{path} is not list, but a {datatype}!"
-msgstr "{path} inie jest listą, lecz {datatype}!"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "{path} is not {expected_type}, but a {datatype}!"
-msgstr "{path} nie jest {expected_type}, lecz {datatype}!"
-
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "{path} is zero size!"
 msgstr "{path} ma zerowy rozmiar!"
 
 #: ../fdroidserver/deploy.py
-#, python-brace-format
+#, fuzzy, python-brace-format
 msgid "{path} more than 200MB, manually upload: {url}"
-msgstr "{path} więcej niż 200MB, przesłane ręcznie: {url}"
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "{path}: \"{code}\" is not a valid ISO_3166-1 alpha-2 country code!"
-msgstr "{path}: \"{code}\" nie jest prawidłowym kodem ISO_3166-1 alpha-2 country!"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{path}: {error}"
-msgstr "{path}: {error}"
+msgstr "{path} więcej niż 200MB, załadowane ręcznie: {url}"
 
 #: ../fdroidserver/mirror.py
 #, python-brace-format
 msgid "{url} does not end with \"fdroid\", check the URL path!"
 msgstr "{url} nie kończy się na 'fdroid', sprawdź ścieżkę URL!"
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/common.py
 #, python-brace-format
 msgid "{url} does not start with \"http\"!"
 msgstr "{url} nie zaczyna się od \"http\"!"
@@ -2705,3 +2715,12 @@ msgid_plural "{} builds succeeded"
 msgstr[0] "{} kompilacja powiodła się"
 msgstr[1] "{} kompilacji powiodło się"
 msgstr[2] "{} kompilacje powiodły się"
+
+#~ msgid "Cannot find a packageName for {path}!"
+#~ msgstr "Nie można znaleźć nazwy pakietu dla {path}!"
+
+#~ msgid "Cannot find an appid for {path}!"
+#~ msgstr "Nie można znaleźć załącznika dla {path}!"
+
+#~ msgid "Interactively ask about things that need updating."
+#~ msgstr "Interaktywnie pytaj o rzeczy, które wymagają aktualizacji."
diff --git a/locale/pt/LC_MESSAGES/fdroidserver.po b/locale/pt/LC_MESSAGES/fdroidserver.po
index 84ee4ed9..5852ac61 100644
--- a/locale/pt/LC_MESSAGES/fdroidserver.po
+++ b/locale/pt/LC_MESSAGES/fdroidserver.po
@@ -1,16 +1,12 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# ssantos <ssantos@web.de>, 2020, 2021, 2022, 2023, 2024, 2025.
-# Peter J. Mello <admin@petermello.net>, 2021.
-# Eduardo Rodrigues <edu.rodrigues2580@gmail.com>, 2021.
-# SC <lalocas@protonmail.com>, 2022.
-# Hugo Carvalho <hugokarvalho@hotmail.com>, 2024.
+# ssantos <ssantos@web.de>, 2020.
 msgid ""
 msgstr ""
 "Project-Id-Version: fdroidserver 1.1-680-ge1d3de71\n"
 "Report-Msgid-Bugs-To: https://gitlab.com/fdroid/fdroidserver/issues\n"
-"POT-Creation-Date: 2025-06-25 09:52+0200\n"
-"PO-Revision-Date: 2025-04-06 16:45+0000\n"
+"POT-Creation-Date: 2020-10-21 18:05+0200\n"
+"PO-Revision-Date: 2020-10-26 07:26+0000\n"
 "Last-Translator: ssantos <ssantos@web.de>\n"
 "Language-Team: Portuguese <https://hosted.weblate.org/projects/f-droid/fdroidserver/pt/>\n"
 "Language: pt\n"
@@ -18,7 +14,31 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Generator: Weblate 5.11-dev\n"
+"X-Generator: Weblate 4.3.2-dev\n"
+
+#: ../fdroidserver/common.py
+msgid ""
+"\n"
+"        This is a repository of apps to be used with FDroid. Applications in this\n"
+"        repository are either official binaries built by the original application\n"
+"        developers, or are binaries built from source by f-droid.org using the\n"
+"        tools on https://gitlab.com/fdroid.\n"
+"        "
+msgstr ""
+"\n"
+"        Este é um repositório de apps a serem usados com o FDroid.\n"
+"        Aplicações neste repositório são binários oficiais compilados pelos\n"
+"        programadores da aplicação original ou são binários compilados da\n"
+"        fonte por f-droid.org a usar as ferramentas em https://gitlab.com/fdroid.\n"
+"        "
+
+#: ../fdroidserver/nightly.py
+msgid ""
+"\n"
+"SSH Public Key to be used as Deploy Key:"
+msgstr ""
+"\n"
+"Chave pública SSH para ser usada como chave de implantar:"
 
 #: ../fdroidserver/nightly.py
 msgid ""
@@ -42,26 +62,22 @@ msgstr ""
 msgid "\"%s/\" has no matching metadata file!"
 msgstr "\"%s/\" não tem ficheiro de metadados correspondente!"
 
-#: ../fdroidserver/index.py
-msgid "\"isPrimary\" key should not be added to mirrors!"
-msgstr "A chave \"isPrimary\" não deve ser adicionada em espelhos!"
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "\"local_copy_dir\" {path} does not exist!"
-msgstr "\"local_copy_dir\" {path} não existe!"
-
 #: ../fdroidserver/install.py
 #, python-brace-format
 msgid "\"{apkfilename}\" is already installed on {dev}."
 msgstr "'{apkfilename}' já está instalado no {dev}."
 
+#: ../fdroidserver/update.py
+#, python-brace-format
+msgid "\"{path}\" contains outdated {name} ({version})"
+msgstr "\"{path}\" contém {name} ({version}) desatualizado"
+
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "\"{path}\" contains recent {name} ({version})"
 msgstr "\"{path}\" contém {name} ({version}) recente"
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "\"{path}\" exists but s3cmd is not installed!"
 msgstr "\"{path}\" existe, mas s3cmd não está instalado!"
@@ -71,84 +87,119 @@ msgstr "\"{path}\" existe, mas s3cmd não está instalado!"
 msgid "\"{path}\" is not a supported file format (use: metadata/*.yml)"
 msgstr "\"{path}\" não é um formato de ficheiro aceito (use: metadata/*.yml)"
 
-#: ../fdroidserver/update.py
+#: ../fdroidserver/metadata.py
 #, python-brace-format
-msgid "\"{path}\" is signed by a key that is not allowed:"
-msgstr "\"{path}\" está acessado por uma chave que não é permitida:"
+msgid "\"{path}\" is not an accepted format, convert to: {formats}"
+msgstr "\"{path}\" não é um formato aceito, converter para: {formats}"
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/common.py
 #, python-brace-format
 msgid "\"{url}\" is not a valid URL!"
 msgstr "\"{url}\" não é uma URL válida!"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, python-format
+msgid "%(option)s option requires %(number)d argument"
+msgid_plural "%(option)s option requires %(number)d arguments"
+msgstr[0] "A opção %(option)s requer o argumento %(number)d"
+msgstr[1] "A opção %(option)s requer os argumentos %(number)d"
+
+#: ../fdroidserver/mirror.py
+#, python-format
+msgid "%(prog)s [options] url"
+msgstr "%(prog)s [opções] url"
+
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "%(prog)s: error: %(message)s\n"
 msgstr "%(prog)s: erro: %(message)s\n"
 
-#: ../fdroidserver/publish.py
-#, python-format
-msgid "%d APKs failed to be signed or verified!"
-msgstr "%d APKs falharam a serem assinados ou verificados!"
-
 #: ../fdroidserver/scanner.py
 #, python-format
 msgid "%d problems found"
 msgstr "%d problemas encontrados"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "%prog [options]"
+msgstr "%prog [opções]"
+
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "%r is not callable"
 msgstr "%r não pode ser invocado"
 
-#: ../fdroidserver/signindex.py
-#, python-format
-msgid "%s did not produce a dict!"
-msgstr "%s não produziu um dict!"
-
-#: ../fdroidserver/signindex.py
-#, python-format
-msgid "%s has bad SHA-256: %s"
-msgstr "%s tem um SHA-256 ruim: %s"
-
 #: ../fdroidserver/lint.py
 #, python-format
 msgid "%s is not an accepted build field"
 msgstr "%s não é um campo criado aceito"
 
-#: ../fdroidserver/common.py
-msgid "'keypass' not found in config.yml!"
-msgstr "'keypass' não foi encontrada em config.yml!"
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, python-format
+msgid "%s option does not take a value"
+msgstr "opção %s não leva um valor"
+
+#: ../fdroidserver/index.py ../fdroidserver/common.py
+msgid "'keypass' not found in config.py!"
+msgstr "'keypass' não foi encontrada em config.py!"
 
 #: ../fdroidserver/common.py
 msgid "'keystore' is NONE and 'smartcardoptions' is blank!"
 msgstr "\"keystore\" é NONE e \"smartcardoptions\" está vazio!"
 
-#: ../fdroidserver/common.py
-msgid "'keystore' not found in config.yml!"
-msgstr "'keystore' não encontrada em config.yml!"
+#: ../fdroidserver/index.py ../fdroidserver/common.py
+msgid "'keystore' not found in config.py!"
+msgstr "'keystore' não encontrada em config.py!"
 
-#: ../fdroidserver/common.py
-msgid "'keystorepass' not found in config.yml!"
-msgstr "'keystorepass' não encontrada em config.yml!"
+#: ../fdroidserver/index.py ../fdroidserver/common.py
+msgid "'keystorepass' not found in config.py!"
+msgstr "'keystorepass' não encontrada em config.py!"
 
-#: ../fdroidserver/common.py
-msgid "'repo_keyalias' not found in config.yml!"
-msgstr "'repo_keyalias' não encontrada em config.yml!"
+#: ../fdroidserver/index.py ../fdroidserver/common.py
+msgid "'repo_keyalias' not found in config.py!"
+msgstr "'repo_keyalias' não encontrada em config.py!"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "'required' is an invalid argument for positionals"
 msgstr "'required' é um argumento inválido para posicionadores"
 
 #: ../fdroidserver/common.py
-msgid "'sdk_path' not set in config.yml!"
-msgstr "'sdk_path' não definido em 'config.yml'!"
+msgid "'sdk_path' not set in 'config.py'!"
+msgstr "'sdk_path' não definido em 'config.py'!"
+
+#. Translators: "build-tools" is the file name of a package from
+#. Google, it is part of the Android SDK. So it probably shouldn't be
+#. translated or transliterated.
+#: ../fdroidserver/common.py
+#, python-brace-format
+msgid "'{aapt}' is too old, fdroid requires build-tools-23.0.0 or newer!"
+msgstr "'{aapt}' é muito antigo, fdroid requer build-tools-23.0.0 ou mais recente!"
 
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "'{aapt}' is too old, fdroid requires build-tools-{version} or newer!"
 msgstr "'{aapt}' é muito antigo, fdroid requer build-tools-{version} ou mais recente!"
 
+#: ../fdroidserver/install.py
+#, python-brace-format
+msgid "'{apkfilename}' is already installed on {dev}."
+msgstr "'{apkfilename}' já está instalado no {dev}."
+
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "'{field}' in {linedesc} is obsolete, see docs for current fields:"
+msgstr "O '{field}' em {linedesc} é obsoleto, veja os documentos para os campos actuais:"
+
+#: ../fdroidserver/common.py
+#, python-brace-format
+msgid "'{field}' will be in random order! Use () or [] brackets if order is important!"
+msgstr "'{field}' será em ordem aleatória! Use () ou [] se a ordem for importante!"
+
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "'{path}' failed to execute!"
@@ -156,49 +207,39 @@ msgstr "'{path}' falhou ao executar!"
 
 #: ../fdroidserver/metadata.py
 #, python-brace-format
-msgid "'{path}' has invalid format, it should be a dictionary!"
-msgstr "'{path}' tem um formato inválido, deveria ser um dicionário!"
-
-#: ../fdroidserver/lint.py ../fdroidserver/metadata.py
-#, python-brace-format
 msgid "'{value}' is not a valid {field} in {appid}. Regex pattern: {pattern}"
 msgstr "'{value}' não é um {field} válido em {appid}. Modelo regex: {pattern}"
 
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "'{value}' is not a valid {field}, should be {pattern}"
-msgstr "'{value}' não é um {field} válido, deve ser {pattern}"
-
-#: ../fdroidserver/checkupdates.py
-msgid "--merge-request only runs on a single appid!"
-msgstr "--merge-request só é executado num único appid!"
-
 #: ../fdroidserver/checkupdates.py
 #, python-brace-format
 msgid "...checkupdate failed for {appid} : {error}"
 msgstr "...checkupdate falhou para {appid} : {error}"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid ".__call__() not defined"
 msgstr ".__call__() não definida"
 
+#: ../fdroidserver/metadata.py
+msgid ".fdroid.txt is not supported!  Convert to .fdroid.yml or .fdroid.json."
+msgstr ".fdroid.txt não é suportado!  Converter para .fdroid.yml ou .fdroid.json."
+
 #: ../fdroidserver/lint.py
 msgid "/issues is missing"
-msgstr "/issues está em falta"
+msgstr "está faltando o /issues"
 
 #: ../fdroidserver/mirror.py
 msgid "A URL is required as an argument!"
 msgstr "Uma URL é necessária como um argumento!"
 
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "APK signatures have different certificates in {path}:"
-msgstr "As assinaturas do APK têm certificados diferentes em {path}:"
-
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Add PGP signatures using GnuPG for packages in repo"
 msgstr "Adicione assinaturas PGP usando GnuPG para os pacotes no repositório"
 
+#: ../fdroid ../fdroidserver/__main__.py
+msgid "Add a new application from its source code"
+msgstr "Adicionar nova aplicação através do código fonte"
+
 #: ../fdroidserver/update.py
 msgid "Add a repo signing key to an unsigned repo"
 msgstr "Adicionar uma chave de assinatura para um repositório não assinado"
@@ -216,11 +257,7 @@ msgstr "Adicionando novo repositório para apenas {name}"
 msgid "Alias of the repo signing key in the keystore"
 msgstr "Alias (apelido) da chave de assinatura do repositório na keystore"
 
-#: ../fdroidserver/build.py
-msgid "AllowedAPKSigningKeys missing but reference binary supplied"
-msgstr "AllowedAPKSigningKeys está ausente, mas o binário de referência foi fornecido"
-
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "Allows a different revision (or git branch) to be specified for the initial import"
 msgstr "Permite que uma revisão diferente (ou árvore do git) seja especificada para a importação inicial"
 
@@ -244,10 +281,14 @@ msgstr "Ficheiro APK do Android"
 msgid "Android DEX code"
 msgstr "Código DEX do Android"
 
-#: ../fdroidserver/init.py
+#: ../fdroidserver/common.py ../fdroidserver/build.py
 #, python-brace-format
-msgid "Android SDK not found at {path}!"
-msgstr "SDK do Android não foi encontrado em {path}!"
+msgid "Android SDK '{path}' does not have '{dirname}' installed!"
+msgstr "O SDK Android '{path}' não tem '{dirname}' instalado!"
+
+#: ../fdroidserver/common.py
+msgid "Android SDK not found!"
+msgstr "SDK do Android não foi encontrado!"
 
 #: ../fdroidserver/common.py
 #, python-brace-format
@@ -259,28 +300,23 @@ msgstr "O caminho do SDK Android '{path}' não existe!"
 msgid "Android SDK path '{path}' is not a directory!"
 msgstr "O caminho do SDK Android '{path}' não é um diretório!"
 
+#. Translators: "build-tools" is the file name of a package from
+#. Google, it is part of the Android SDK. So it probably shouldn't be
+#. translated or transliterated.
 #: ../fdroidserver/common.py
 #, python-brace-format
-msgid "Android SDK tool {cmd} not found!"
-msgstr "Ferramenta {cmd} do Android SDK não foi encontrada!"
+msgid "Android build-tools path '{path}' does not exist!"
+msgstr "Caminho de build-tools do Android '{path}' não existe!"
 
-#: ../fdroidserver/lint.py
-msgid "App has Binaries but does not have corresponding AllowedAPKSigningKeys to pin certificate."
-msgstr "A app tem binários, mas não tem AllowedAPKSigningKeys correspondentes para fixar o certificado."
-
-#: ../fdroidserver/lint.py
-msgid "App has NoSourceSince or ArchivePolicy \"0 versions\" or 0 but AutoUpdateMode or UpdateCheckMode are not None"
-msgstr "A app tem NoSourceSince ou ArchivePolicy \"0 versions\" ou 0, mas AutoUpdateMode ou UpdateCheckMode não são None"
+#: ../fdroidserver/update.py
+msgid "AndroidManifest.xml has no date"
+msgstr "AndroidManifest.xml não tem data"
 
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "App is in '{repo}' but has a link to {url}"
 msgstr "A App está em '{repo}' mas tem uma hiperligação para {url}"
 
-#: ../fdroidserver/lint.py
-msgid "App version has binary but does not have corresponding AllowedAPKSigningKeys to pin certificate."
-msgstr "A versão da app tem um binário, mas não tem as AllowedAPKSigningKeys correspondentes para fixar o certificado."
-
 #: ../fdroidserver/lint.py
 msgid "Appending .git is not necessary"
 msgstr "Acrescentar .git não é necessário"
@@ -290,27 +326,11 @@ msgstr "Acrescentar .git não é necessário"
 msgid "Archiving {apkfilename} with invalid signature!"
 msgstr "Arquivamento {apkfilename} com assinatura inválida!"
 
-#: ../fdroidserver/lint.py
-msgid "AutoUpdateMode with UpdateCheckMode: HTTP must have a pattern."
-msgstr "AutoUpdateMode com UpdateCheckMode: HTTP deve ter um modelo."
-
-#: ../fdroidserver/install.py
-msgid "Automatic no to all prompts."
-msgstr "Não automático a todos os avisos."
-
-#: ../fdroidserver/install.py
-msgid "Automatic yes to all prompts."
-msgstr "Sim automático a todos os avisos."
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "Bad entry type \"{mirrortype}\" in mirrors config: {mirror}"
-msgstr "Tipo de entrada \"{mirrortype}\" incorreto na configuração de espelhos: {mirror}"
-
 #: ../fdroidserver/mirror.py
 msgid "Base URL to mirror, can include the index signing key using the query string: ?fingerprint="
-msgstr "URL base para espelhar, pode incluir a chave de assinatura de índice usando a cadeia de consulta: ?fingerprint ="
+msgstr "URL base para espelhar, pode incluir a chave de assinatura de índice usando a string de consulta:? Fingerprint ="
 
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "Branch '{branch}' used as commit in build '{versionName}'"
@@ -326,7 +346,7 @@ msgstr "Ramificação '{branch}' usado como commit em srclib '{srclib}'"
 msgid "Broken symlink: {path}"
 msgstr "Ligação simbólica quebrada: {path}"
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Build a package from source"
 msgstr "Construir pacote através da fonte"
 
@@ -346,48 +366,57 @@ msgstr "Construir metadados git repo não tem mudanças comprometidas!"
 msgid "Build only the latest version of each package"
 msgstr "Compilar apenas a última versão de cada pacote"
 
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Build should have comma-separated versionName and versionCode, not \"{value}\", in {linedesc}"
+msgstr "A compilação deve ter versionName e versionCode separados por vírgula, e não \"{value} 1\", em {linedesc} 2"
+
 #: ../fdroidserver/init.py
 #, python-format
 msgid "Built repo based in \"%s\" with this config:"
 msgstr "Repo construído baseado em \"%s\" com esta configuração:"
 
-#: ../fdroidserver/checkupdates.py
-msgid "Can't auto-update app with no CurrentVersionCode"
-msgstr "Aplicação não pode ser auto-atualizada sem CurrentVersionCode"
-
 #: ../fdroidserver/build.py
 msgid "Can't build due to {} error while scanning"
 msgid_plural "Can't build due to {} errors while scanning"
 msgstr[0] "Não é possível construir devido a erro {} durante a digitalização"
 msgstr[1] "Não é possível construir devido a erros {} durante a digitalização"
 
-#: ../fdroidserver/common.py
-#, fuzzy, python-brace-format
-msgid "Cannot read {path}: {error}"
-msgstr "Falha de leitura {path}: {error}"
+#: ../fdroidserver/vmtools.py
+#, python-brace-format
+msgid "Cannot read \"{path}\"!"
+msgstr "Não é possível ler \"{path}\"!"
+
+#. Translators: https://developer.android.com/studio/build/application-id
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Cannot resolve application ID {appid}"
+msgstr "Não é possível resolver o ID da app {appid}"
 
 #: ../fdroidserver/rewritemeta.py
 #, python-brace-format
 msgid "Cannot rewrite \"{path}\""
 msgstr "Não é possível reescrever \"{path}\""
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
+#: ../fdroidserver/rewritemeta.py
+msgid "Cannot use --list and --to at the same time"
+msgstr "Não é possível usar --list e --to ao mesmo tempo"
+
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Cannot write \"{path}\", not an accepted format, use: {formats}"
+msgstr "Não é possível escrever \"{path}\", não é um formato aceito, use: {formats}"
+
 #: ../fdroidserver/lint.py
 #, python-format
 msgid "Categories '%s' is not valid"
 msgstr "As categorias '%s' não são válidas"
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
 #: ../fdroidserver/lint.py
 msgid "Categories are not set"
 msgstr "As categorias não são definidas"
 
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "Category \"{category}\" defined but not used for any apps!"
-msgstr "Categoria \"{category}\" definida, mas não usada para nenhuma app!"
-
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Check for updates to applications"
 msgstr "Verificação de actualizações das aplicações"
 
@@ -396,35 +425,34 @@ msgstr "Verificação de actualizações das aplicações"
 msgid "Checking archiving for {appid} - apks:{integer}, keepversions:{keep}, archapks:{arch}"
 msgstr "Verificando o arquivamento para {appid} - apks:{integer}, keepversions:{keep}, archapks:{arch}"
 
+#: ../fdroidserver/dscanner.py
+msgid "Clean after all scans have finished"
+msgstr "Limpar depois que todos os escaneamentos terminarem"
+
+#: ../fdroidserver/dscanner.py
+msgid "Clean before the scans start and rebuild the container"
+msgstr "Limpar antes do escanemento começar e recompilar o container"
+
+#: ../fdroidserver/dscanner.py
+msgid "Clean up all containers and then exit"
+msgstr "Limpar todos os containers e então sair"
+
 #: ../fdroidserver/update.py
 msgid "Clean update - don't uses caches, reprocess all APKs"
 msgstr "Atualização limpa - não usa cache, reprocessa todos os APKs"
 
-#: ../fdroidserver/common.py
-msgid "Color the log output"
-msgstr "Colorir o registo de saída"
-
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "Comma separated list of categories."
 msgstr "Lista de categorias separadas por vírgula."
 
-#: ../fdroidserver/__main__.py
-#, python-format
+#: ../fdroid ../fdroidserver/__main__.py
+#, c-format, python-format
 msgid "Command '%s' not recognised.\n"
 msgstr "Comando '%s' não reconhecido.\n"
 
 #: ../fdroidserver/checkupdates.py
 msgid "Commit changes"
-msgstr "Enviar alterações"
-
-#: ../fdroidserver/checkupdates.py
-msgid "Commit changes, push, then make a merge request"
-msgstr "Confirme as alterações, envie e faça um pedido de fusão"
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Conflicting \"{field}\" definitions between .yml and localized files:"
-msgstr "Definições contraditórias de \"{field}\" entre ficheiros .yml e ficheiros localizados:"
+msgstr "Enviar mudanças"
 
 #: ../fdroidserver/__main__.py
 msgid "Conflicting arguments: '--verbose' and '--quiet' can not be specified at the same time."
@@ -435,13 +463,11 @@ msgstr "Argumentos conflitantes: \"--verbose\" e \"--quiet\" não podem ser espe
 msgid "Could not find '{command}' on your system"
 msgstr "Não foi possível encontrar '{command}' no seu sistema"
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "Could not find latest version code"
 msgstr "Não foi possível encontrar o código de versão mais recente"
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "Could not find latest version name"
 msgstr "Não foi possível encontrar o nome da versão mais recente"
 
@@ -451,25 +477,30 @@ msgid "Could not find {path} to remove it"
 msgstr "Não foi possível localizar {path} para removê-lo"
 
 #: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Could not open APK {path} for analysis: "
-msgstr "Não foi possível abrir o APK {path} para análise: "
+msgid "Could not open apk file for analysis"
+msgstr "Não foi possível abrir ficheiro apk para análise"
 
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "Could not parse size \"{size}\", wrong type \"{type}\""
 msgstr "Não foi possível analisar o tamanho \"{size}\", tipo \"{type}\" incorreto"
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/import_subcommand.py
+#. Translators: https://developer.android.com/studio/build/application-id
+#: ../fdroidserver/import.py
 msgid "Couldn't find Application ID"
 msgstr "Não foi possível encontrar o ID da aplicação"
 
-#: ../fdroidserver/checkupdates.py
-msgid "Couldn't find any version information"
-msgstr "Não foi encontrada qualquer informação da versão"
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
+#: ../fdroidserver/import.py
+msgid "Couldn't find latest version code"
+msgstr "Não foi possível encontrar o código de versão mais recente"
 
-#: ../fdroidserver/checkupdates.py
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
+#: ../fdroidserver/import.py
+msgid "Couldn't find latest version name"
+msgstr "Não foi possível encontrar o nome da versão mais recente"
+
+#: ../fdroidserver/import.py
 msgid "Couldn't find package ID"
 msgstr "Não foi possível encontrar o ID do pacote"
 
@@ -477,26 +508,29 @@ msgstr "Não foi possível encontrar o ID do pacote"
 msgid "Cowardily refusing to overwrite existing signing key setup!"
 msgstr "Cobardemente recusando substituir a configuração da chave de assinatura existente!"
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/update.py
+msgid "Create a repo signing key in a keystore"
+msgstr "Criar uma chave de assinatura do repositório numa keystore"
+
+#: ../fdroidserver/update.py
+msgid "Create skeleton metadata files that are missing"
+msgstr "Criação do esqueleto de metadados dos ficheiros que estão em falta"
+
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Created new container \"{name}\""
 msgstr "Novo contentor criado: \"{name}\""
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Creating \"{path}\" for configuring s3cmd."
 msgstr "Criando \"{path}\" para configurar s3cmd."
 
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Creating empty {config_file}"
-msgstr "A criar '{config_file}' vazio"
-
 #: ../fdroidserver/publish.py
 msgid "Creating log directory"
 msgstr "Criando o diretório de log"
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Creating new S3 bucket: {url}"
 msgstr "Criando novo bucket S3: {url}"
@@ -509,7 +543,8 @@ msgstr "Criando diretório de output"
 msgid "Creating signed index with this key (SHA256):"
 msgstr "Criando índice assinado com esta chave (SHA256):"
 
-#: ../fdroidserver/publish.py ../fdroidserver/verify.py
+#: ../fdroidserver/import.py ../fdroidserver/verify.py
+#: ../fdroidserver/publish.py
 msgid "Creating temporary directory"
 msgstr "Criando diretório temporário"
 
@@ -554,22 +589,17 @@ msgstr "Descrição '%s' é apenas o resumo da app"
 msgid "Description has a duplicate line"
 msgstr "A descrição tem uma linha duplicada"
 
+#: ../fdroidserver/lint.py
+#, python-format
+msgid "Description has a list (%s) but it isn't bulleted (*) nor numbered (#)"
+msgstr "A descrição tem a lista (%s), mas não tem marcadores (*), nem é numerada (#)"
+
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "Description of length {length} is over the {limit} char limit"
 msgstr "A descrição de comprimento {length} é sobre o limite de char {limit}"
 
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Did you mean config/{name}.yml?"
-msgstr "Quis dizer config/{name}.yml?"
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Did you mean {code}?"
-msgstr "Quis dizer {code}?"
-
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "Do not add 'disable:' to the generated build entries"
 msgstr "Não adicionar 'disable:' às entradas de compilação geradas"
 
@@ -594,22 +624,27 @@ msgstr "Não remover as chaves privadas geradas do keystore"
 msgid "Don't create a source tarball, useful when testing a build"
 msgstr "Não criar um tarball da fonte; útil quando testando uma compilação"
 
+#: ../fdroidserver/stats.py
+msgid "Don't do anything logs-related"
+msgstr "Não fazer nada relacionado a registros de alterações"
+
 #: ../fdroidserver/build.py
 msgid "Don't refresh the repository, useful when testing a build with no internet connection"
 msgstr "Não atualizar o repositório; útil quando testando uma compilação sem conexão com a internet"
 
 #: ../fdroidserver/deploy.py ../fdroidserver/nightly.py
+#: ../fdroidserver/upload.py
 msgid "Don't use rsync checksums"
 msgstr "Não usar as somas de verificação (checksums) do rsync"
 
-#: ../fdroidserver/install.py
-msgid "Download F-Droid.apk using mirrors that leak less to the network"
-msgstr "Descarregue o F-Droid.apk utilizando espelhos que vazam menos para a rede"
-
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Download complete mirrors of small repos"
 msgstr "Descarregar espelhos completos de repos pequenos"
 
+#: ../fdroidserver/stats.py
+msgid "Download logs we don't have"
+msgstr "Descarregar os registos que nós não temos"
+
 #: ../fdroidserver/common.py
 msgid "Downloading the repository already failed once, not trying again."
 msgstr "O descarregamento do repositório já falhou uma vez, não tento novamente."
@@ -621,56 +656,38 @@ msgstr "Descarregar {url} falhou. {error}"
 
 #: ../fdroidserver/metadata.py
 #, python-brace-format
-msgid "Duplicate Anti-Feature declaration at {path} was ignored!"
-msgstr "A declaração duplicada da característica indesejada em {path} foi ignorada!"
-
-#: ../fdroidserver/index.py
-#, python-format
-msgid "Duplicate entry \"%s\" in mirrors config!"
-msgstr "Entrada \"%s\" duplicada na configuração de espelhos!"
+msgid "Duplicate build recipe found for versionCode {versionCode} in {linedesc}"
+msgstr "Receita de compilação duplicada encontrada para versionCode {versionCode} em {linedesc}"
 
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "Duplicate link in '{field}': {url}"
 msgstr "Ligação duplicada em '{field}': {url}"
 
-#: ../fdroidserver/common.py
-#, python-format
-msgid "ERROR: %(message)s"
-msgstr "ERRO: %(message)s"
+#: ../fdroid
+msgid "Dynamically scan APKs post build"
+msgstr "Analise dinâmica dos APKs após a compilação"
 
 #: ../fdroidserver/__main__.py
 msgid "ERROR: The \"server\" subcommand has been removed, use \"deploy\"!"
 msgstr "ERRO: o subcomando \"server\" foi removido, use \"deploy\"!"
 
+#: ../fdroidserver/mirror.py
+msgid ""
+"ERROR: this command should never be used to mirror f-droid.org!\n"
+"A full mirror of f-droid.org requires more than 200GB."
+msgstr ""
+"ERRO: este comando nunca deve ser usado para espelhar f-Droid.org!\n"
+"Um espelho completo de f-Droid.org requer mais de 200GB."
+
 #: ../fdroidserver/nightly.py
 msgid "ERROR: unsupported CI type, patches welcome!"
 msgstr "ERRO: tipo de CI sem suporte, patches são bem-vindos!"
 
-#: ../fdroidserver/nightly.py
-#, python-format
-msgid "ERROR: unsupported git host \"%s\", patches welcome!"
-msgstr "ERRO: host de git \"%s\" não suportado, patches são bem-vindos!"
-
-#: ../fdroidserver/lint.py
+#: ../fdroidserver/metadata.py
 #, python-brace-format
-msgid "ERROR: {key} in {path} is not \"archive\" or \"repo\"!"
-msgstr "ERRO: {key} em {path} não é \"arquivo\" ou \"repositório\"!"
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "ERROR: {key} not a valid key!"
-msgstr "ERRO: {key} não é uma chave válida!"
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "ERROR: {key}'s value should be of type {t}!"
-msgstr "ERRO: o valor de {key} deve ser do tipo {t}!"
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "ERROR: {key}:{subkey} in {path} is not in allowed keys: {allowed_keys}!"
-msgstr "ERRO: {key}:{subkey} em {path} não está nas chaves permitidas: {allowed_keys}!"
+msgid "Empty build flag at {linedesc}"
+msgstr "Sinalizador de compilação vazio em {linedesc}"
 
 #: ../fdroidserver/__main__.py
 #, python-brace-format
@@ -686,40 +703,20 @@ msgstr ""
 "Digite o caminho para o SDK do Android (%s) aqui:\n"
 "> "
 
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Environment variable {var} from {configname} is not set!"
-msgstr "A variável de ambiente {var} de {configname} não está definida!"
+#: ../fdroidserver/deploy.py ../fdroidserver/checkupdates.py
+#: ../fdroidserver/upload.py
+#, python-format
+msgid "Error while attempting to publish log: %s"
+msgstr "Erro ao tentar publicar o log: %s"
 
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Environment variable {{env: {var}}} is not set!"
-msgstr "A variável de ambiente {{env: {var} não está definida!"
-
-#: ../fdroidserver/deploy.py
-msgid "Error deploying 'github_releases', {} not present. (You might need to run `fdroid update` first.)"
-msgstr "Erro ao implementar 'github_releases', {} não está presente. (Pode ser necessário executar `fdroid update` primeiro.)"
-
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py ../fdroidserver/common.py
 msgid "Error while getting repo address"
 msgstr "Erro ao obter o endereço do repo"
 
-#: ../fdroidserver/scanner.py
-msgid "Exit with a non-zero code if problems were found"
-msgstr "Sair com um código diferente de zero se problemas forem encontrados"
-
-#: ../fdroidserver/__main__.py
-msgid "Extract application metadata from a source repository"
-msgstr "Extrair metadados de aplicações de um repositório de origem"
-
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Extract signatures from APKs"
 msgstr "Extrato de assinaturas de APKs"
 
-#: ../fdroidserver/install.py
-msgid "F-Droid.apk could not be downloaded from any known source!"
-msgstr "Não foi possível descarregar o F-Droid.apk de nenhuma fonte conhecida!"
-
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Failed copying {path}: {error}"
@@ -740,34 +737,42 @@ msgstr "Falha de leitura {path}: {error}"
 msgid "Failed resizing {path}: {error}"
 msgstr "Falha ao redimensionar {path}: {error}"
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/publish.py
+msgid "Failed to align application"
+msgstr "Falha ao alinhar a aplicação"
+
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Failed to create S3 bucket: {url}"
 msgstr "Falha ao criar o bucket S3: {url}"
 
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Failed to get APK information, deleting {path}"
-msgstr "Falha ao obter informações do APK, apagando {path}"
+#: ../fdroidserver/common.py
+msgid "Failed to get APK manifest information"
+msgstr "Falha ao obter informações de manifesto do APK"
 
 #: ../fdroidserver/update.py
 #, python-brace-format
-msgid "Failed to get APK information, skipping {path}"
-msgstr "Falha ao obter informações do APK, ignorando {path}"
+msgid "Failed to get apk information, deleting {path}"
+msgstr "Falha ao obter informações do apk, apagando {path}"
 
 #: ../fdroidserver/update.py
-msgid "Failed to get APK signing key fingerprint"
-msgstr "Falha ao obter a impressão digital da chave de assinatura do APK"
+#, python-brace-format
+msgid "Failed to get apk information, skipping {path}"
+msgstr "Falha ao obter informações do apk, ignorando {path}"
 
 #: ../fdroidserver/install.py
 #, python-brace-format
 msgid "Failed to install '{apkfilename}' on {dev}: {error}"
 msgstr "Falha ao instalar '{apkfilename}' em {dev}: {error}"
 
-#: ../fdroidserver/common.py
+#: ../fdroidserver/publish.py ../fdroidserver/common.py
 msgid "Failed to sign application"
 msgstr "Falha ao assinar a app"
 
+#: ../fdroidserver/common.py
+msgid "Failed to zipalign application"
+msgstr "Falha no zipaligning a app"
+
 #: ../fdroidserver/build.py
 #, python-brace-format
 msgid "Fetched buildserverid from VM: {buildserverid}"
@@ -783,12 +788,21 @@ msgstr "Assinaturas obtidas para '{apkfilename}'-> '{sigdir}'"
 msgid "File disappeared while processing it: {path}"
 msgstr "O ficheiro desapareceu enquanto era processado: {path}"
 
-#: ../fdroidserver/build.py ../fdroidserver/install.py
-#: ../fdroidserver/rewritemeta.py ../fdroidserver/scanner.py
-#: ../fdroidserver/update.py
+#: ../fdroidserver/verify.py ../fdroidserver/stats.py ../fdroidserver/update.py
+#: ../fdroidserver/rewritemeta.py ../fdroidserver/build.py
+#: ../fdroidserver/checkupdates.py ../fdroidserver/scanner.py
+#: ../fdroidserver/install.py
 msgid "Finished"
 msgstr "Terminado"
 
+#: ../fdroidserver/lint.py
+msgid "Flattr donation methods belong in the FlattrID flag"
+msgstr "Os métodos de doação do Flattr pertencem no sinalizador FlattrID"
+
+#: ../fdroidserver/lint.py
+msgid "Flattr donation methods belong in the FlattrID: field"
+msgstr "Os métodos de doação do Flattr pertencem no campo FlattrID:"
+
 #: ../fdroidserver/lint.py
 msgid "Forbidden HTML tags"
 msgstr "Tags HTML proibidos"
@@ -820,6 +834,7 @@ msgstr "Ficheiro de financiamento ruim \"{path}\" encontrado para \"{name}\":"
 msgid "Found invalid appids in arguments"
 msgstr "appids inválidos encontrados em argumentos"
 
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
 #: ../fdroidserver/common.py
 msgid "Found invalid versionCodes for some apps"
 msgstr "versionCodes inválidos encontrados para algumas apps"
@@ -829,10 +844,6 @@ msgstr "versionCodes inválidos encontrados para algumas apps"
 msgid "Found multiple JAR Signature Block Files in {path}"
 msgstr "Vários ficheiros de blocos de assinaturas JAR foram encontrados em {path}"
 
-#: ../fdroidserver/common.py
-msgid "Found multiple Signer Certificates!"
-msgstr "Vários certificados de assinante foram encontrados!"
-
 #: ../fdroidserver/metadata.py
 #, python-brace-format
 msgid "Found multiple metadata files for {appid}"
@@ -842,6 +853,11 @@ msgstr "Encontrados vários ficheiros de metadados para {appid}"
 msgid "Found multiple signing certificates for repository."
 msgstr "Vários certificados de assinatura encontrados para o repositório."
 
+#: ../fdroidserver/update.py
+#, python-brace-format
+msgid "Found multiple signing certificates in {path}"
+msgstr "Vários certificados de assinatura encontrados em {path}"
+
 #: ../fdroidserver/index.py
 msgid "Found no signing certificates for repository."
 msgstr "Nenhum certificado de assinatura para repositório encontrado."
@@ -856,16 +872,6 @@ msgstr "Não-ficheiro encontrado em %s"
 msgid "Found {apkfilename} at {url}"
 msgstr "{apkfilename} encontrado em {url}"
 
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Found {count} problems in {filename}"
-msgstr "{count} problemas encontrados em {filename}"
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Found {count} warnings in {filename}"
-msgstr "{count} avisos encontrados em {filename}"
-
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Generated skeleton metadata for {appid}"
@@ -884,21 +890,19 @@ msgstr "Git clean falhou"
 msgid "Git fetch failed"
 msgstr "Git fetch falhou"
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
+#: ../fdroidserver/common.py
+msgid "Git remote set-head failed"
+msgstr "Git remote set-head falhou"
+
 #: ../fdroidserver/common.py
 #, python-format
 msgid "Git remote set-head failed: \"%s\""
 msgstr "Git remote set-head falhou: \"%s\""
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
 #: ../fdroidserver/common.py
 msgid "Git reset failed"
 msgstr "Git reset falhou"
 
-#: ../fdroidserver/common.py
-msgid "Git submodule deinit failed"
-msgstr "Falha no submódulo deinit do Git"
-
 #: ../fdroidserver/common.py
 msgid "Git submodule sync failed"
 msgstr "Git submodule sync falhou"
@@ -928,17 +932,7 @@ msgstr "A ignorar '{field}' em metadados '{metapath}' porque é depreciado."
 #: ../fdroidserver/update.py
 #, python-format
 msgid "Ignoring FUNDING.yml entry longer than 2048: %s"
-msgstr "A ignorar a entrada FUNDING.yml por mais que 2048: %s"
-
-#: ../fdroidserver/update.py
-#, python-format
-msgid "Ignoring bad element in manifest: %s"
-msgstr "A ignorar o elemento mau no manifesto: %s"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Ignoring deprecated {oldfile}, use {newfile}!"
-msgstr "A ignorar {oldfile} obsoleto, use {newfile}!"
+msgstr "A ignorar a entrada FUNDING.yml por mais de 2048: %s"
 
 #: ../fdroidserver/index.py
 msgid "Ignoring package without metadata: "
@@ -949,6 +943,11 @@ msgstr "Ignorando o pacote sem metadados: "
 msgid "Ignoring stale cache data for {apkfilename}"
 msgstr "Ignorando dados de cache obsoletos para {apkfilename}"
 
+#: ../fdroidserver/rewritemeta.py
+#, python-brace-format
+msgid "Ignoring {ext} file at '{path}'"
+msgstr "Ignorando o ficheiro {ext} em '{path}'"
+
 #: ../fdroidserver/update.py
 msgid "Include APKs that are signed with disabled algorithms like MD5"
 msgstr "Incluir APKs assinados com algoritmos desativados como MD5"
@@ -965,16 +964,6 @@ msgstr "Incluir os registos de construção no espelho"
 msgid "Include the source tarballs in the mirror"
 msgstr "Incluir os tarballs de fontes no espelho"
 
-#: ../fdroidserver/metadata.py
-#, python-format
-msgid "Including metadata from %s@%s"
-msgstr "Incluindo metadados de %s@%s"
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Including metadata from {path}"
-msgstr "Incluindo metadados de {path}"
-
 #: ../fdroidserver/common.py
 msgid "Initialising submodules"
 msgstr "Inicializando submódulos"
@@ -983,7 +972,7 @@ msgstr "Inicializando submódulos"
 msgid "Install all signed applications available"
 msgstr "Instalar todas as aplicações assinadas disponíveis"
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Install built packages on devices"
 msgstr "Instalação dos pacotes compilados no aparelho"
 
@@ -992,12 +981,22 @@ msgstr "Instalação dos pacotes compilados no aparelho"
 msgid "Installing %s..."
 msgstr "A instalar %s…"
 
+#: ../fdroidserver/install.py
+#, python-format
+msgid "Installing %s…"
+msgstr "Instalando %s…"
+
 #: ../fdroidserver/install.py
 #, python-brace-format
 msgid "Installing '{apkfilename}' on {dev}..."
 msgstr "A instalar '{apkfilename}' em {dev}…"
 
-#: ../fdroidserver/__main__.py
+#: ../fdroidserver/install.py
+#, python-brace-format
+msgid "Installing '{apkfilename}' on {dev}…"
+msgstr "Instalando '{apkfilename}' em {dev}…"
+
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Interact with the repo HTTP server"
 msgstr "Interacção com o repositório do servidor HTTP"
 
@@ -1005,36 +1004,53 @@ msgstr "Interacção com o repositório do servidor HTTP"
 msgid "Invalid APK"
 msgstr "APK inválido"
 
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "Invalid AutoUpdateMode: {mode}"
-msgstr "AutoUpdateMode inválido: {mode}"
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "Invalid UpdateCheckMode: {mode}"
-msgstr "UpdateCheckMode inválido: {mode}"
-
-#: ../fdroidserver/checkupdates.py
+#: ../fdroidserver/lint.py ../fdroidserver/checkupdates.py
 #, python-brace-format
 msgid "Invalid VercodeOperation: {field}"
 msgstr "VercodeOperation inválido: {field}"
 
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Invalid VercodeOperation: {invalid_ops}"
-msgstr "VercodeOperation inválido: {invalid_ops}"
-
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "Invalid application ID {appid}"
 msgstr "ID da aplicação {appid} inválido"
 
+#: ../fdroidserver/metadata.py
+#, python-format
+msgid "Invalid boolean '%s'"
+msgstr "Booleano inválido '%s'"
+
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Invalid build flag at {line} in {linedesc}"
+msgstr "Sinalizador de compilação inválido em {line} em {linedesc}"
+
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Invalid build format: {value} in {name}"
+msgstr "Formato de compilação inválido: {value} em {name}"
+
 #: ../fdroidserver/lint.py
 msgid "Invalid bulleted list"
 msgstr "Lista com marcadores inválida"
 
+#: ../fdroidserver/lint.py
+#, python-format
+msgid "Invalid license tag \"%s\"! Use only tags from https://spdx.org/license-list"
+msgstr "Etiqueta de licença \"%s\" inválida! Use apenas etiquetas de https://spdx.org/license-list"
+
+#: ../fdroidserver/lint.py
+msgid "Invalid link - use [http://foo.bar Link title] or [http://foo.bar]"
+msgstr "Hiperligação inválida - use [http://foo.bar Título do link] ou [http://foo.bar]"
+
+#: ../fdroidserver/metadata.py
+#, python-format
+msgid "Invalid metadata in %s:%d"
+msgstr "Metadados inválidos em %s:%d"
+
+#: ../fdroidserver/metadata.py
+msgid "Invalid metadata in: "
+msgstr "Metadados inválidos em: "
+
 #: ../fdroidserver/common.py
 #, python-format
 msgid "Invalid name for published file: %s"
@@ -1042,8 +1058,8 @@ msgstr "Nome inválido para o ficheiro publicado: %s"
 
 #: ../fdroidserver/common.py
 #, python-brace-format
-msgid "Invalid ndk: entry in build: \"{ndk}\""
-msgstr "Ndk inválido: entrada na compilação: \"{ndk}\""
+msgid "Invalid package name {0}"
+msgstr "Nome do pacote inválido {0}"
 
 #: ../fdroidserver/common.py
 #, python-brace-format
@@ -1065,6 +1081,11 @@ msgstr "Metadados de srclib inválidos: não foi possível analisar \"{file}\""
 msgid "Invalid srclib metadata: unknown key '{key}' in '{file}'"
 msgstr "Metadados de srclib inválidos: chave \"{key}\" desconhecida no \"{file}\""
 
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Invalid versionCode: \"{versionCode}\" is not an integer!"
+msgstr "VersionCode inválido: \"{versionCode}\" não é um inteiro!"
+
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "JAR signature failed to verify: {path}"
@@ -1079,8 +1100,8 @@ msgstr "Assinatura JAR verificada: {path}"
 msgid "Java JAR file"
 msgstr "Ficheiro Java JAR"
 
-#: ../fdroidserver/mirror.py ../fdroidserver/publish.py
-#: ../fdroidserver/update.py
+#: ../fdroidserver/publish.py ../fdroidserver/update.py
+#: ../fdroidserver/mirror.py
 msgid "Java JDK not found! Install in standard location or set java_paths!"
 msgstr "O Java JDK não foi encontrado! Instalar no local predefinido ou definir java_paths!"
 
@@ -1096,19 +1117,10 @@ msgstr "Java jarsigner não encontrado! Instale no local predefinido ou define j
 msgid "Javascript in HTML src attributes"
 msgstr "JavaScript em atributos HTML src"
 
-#: ../fdroidserver/build.py
-#, python-brace-format
-msgid "Keeping failed build \"{apkfilename}\""
-msgstr "Mantendo a compilação com falha \"{apkfilename}\""
-
 #: ../fdroidserver/init.py
 msgid "Keystore for signing key:\t"
 msgstr "Armazenamento de chaves de assinatura:\t"
 
-#: ../fdroidserver/lint.py
-msgid "Known debug key is used in AllowedAPKSigningKeys: "
-msgstr "A chave de depuração conhecida é usada em AllowedAPKSigningKeys: "
-
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "Last used commit '{commit}' looks like a tag, but UpdateCheckMode is '{ucm}'"
@@ -1118,9 +1130,13 @@ msgstr "O último commit usado '{commit}' parece-se com uma tag, mas o UpdateChe
 msgid "Liberapay donation methods belong in the Liberapay: field"
 msgstr "Os métodos de doação de Liberapay pertencem no campo Liberapay:"
 
+#: ../fdroidserver/lint.py
+msgid "Liberapay donation methods belong in the LiberapayID flag"
+msgstr "Os métodos de doação de Liberapay pertencem na bandeira de LiberapayID"
+
 #: ../fdroidserver/rewritemeta.py
-msgid "List files that would be reformatted (dry run)"
-msgstr "Listar ficheiros que devem ser reformatados (execução a seco)"
+msgid "List files that would be reformatted"
+msgstr "Listar ficheiros que devem ser reformatados"
 
 #: ../fdroidserver/lint.py
 msgid "Locale included in f-droid.org URL"
@@ -1138,16 +1154,6 @@ msgstr "Espelhos de repositório malformados."
 msgid "Malformed serverwebroot line:"
 msgstr "Linha de serverwebroot malformada:"
 
-#: ../fdroidserver/scanner.py
-#, python-format
-msgid "Max recursion depth in ZIP file reached: %s"
-msgstr "Profundidade máxima de recursão no ficheiro ZIP atingida: %s"
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "Mirror config for {url} contains \"isPrimary\" key!"
-msgstr "A configuração de espelho de {url} contém a chave \"isPrimary\"!"
-
 #: ../fdroidserver/mirror.py
 msgid "Mirror the full repo and archive, all file types."
 msgstr "Espelha todo o repositório e pacotes, todos os tipos de ficheiros."
@@ -1156,30 +1162,31 @@ msgstr "Espelha todo o repositório e pacotes, todos os tipos de ficheiros."
 msgid "Missing output directory"
 msgstr "Falta diretório de saída"
 
-#: ../fdroidserver/metadata.py
-msgid "Moving Anti-Features declarations to localized files:"
-msgstr "A mover as declarações de características indesejadas para ficheiros localizados:"
-
-#: ../fdroidserver/index.py
-msgid "Neither \"repo_pubkey\" nor \"keystorepass\" set in config.yml"
-msgstr "Nem \"repo_pubkey\" nem \"keystorepass\" definidos em config.yml"
-
-#: ../fdroidserver/verify.py
+#: ../fdroidserver/lint.py
 #, python-format
-msgid "No APK for package: %s"
-msgstr "Nenhum APK para o pacote: %s"
+msgid "Name '%s' is just the auto name - remove it"
+msgstr "O nome '%s' é apenas o nome automático - remover"
+
+#: ../fdroidserver/common.py
+msgid "No 'config.py' found, using defaults."
+msgstr "'config.py' não encontrado, utilizando as predefinições."
 
 #: ../fdroidserver/common.py
 msgid "No Android SDK found!"
 msgstr "Android SDK não encontrado!"
 
+#: ../fdroidserver/import.py
+msgid "No android or kivy project could be found. Specify --subdir?"
+msgstr "Nenhum projeto Android ou Kivy poderia ser encontrado. Especificar --subdir?"
+
 #: ../fdroidserver/install.py
 msgid "No attached devices found"
 msgstr "Nenhum aparelho anexado encontrado"
 
-#: ../fdroidserver/install.py
-msgid "No devices found for `adb install`! Please plug one in."
-msgstr "Nenhum dispositivo encontrado para `adb install`! Ligue um."
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "No commit specified for {versionName} in {linedesc}"
+msgstr "Nenhum commit especificado para {versionName} em {linedesc}"
 
 #: ../fdroidserver/index.py
 msgid "No fingerprint in URL."
@@ -1189,23 +1196,14 @@ msgstr "Nenhuma impressão digital no URL."
 msgid "No git submodules available"
 msgstr "Não há submódulos git disponíveis"
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "No gradle project could be found. Specify --subdir?"
 msgstr "Não foi possível encontrar nenhum projeto de gradle. Especificar --subdir?"
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py ../fdroidserver/common.py
 msgid "No information found."
 msgstr "Nenhuma informação encontrada."
 
-#: ../fdroidserver/checkupdates.py
-msgid "No matching tags found"
-msgstr "Não foram encontradas marcações correspondentes"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "No minimum SDK version found in {0}, using default (3)."
-msgstr "Nenhuma versão mínima do SDK encontrada em {0}, a usar a predefinição (3)."
-
 #: ../fdroidserver/lint.py
 msgid "No need to specify that the app is Free Software"
 msgstr "Não há necessidade de especificar que o app é software livre"
@@ -1215,8 +1213,8 @@ msgid "No need to specify that the app is for Android"
 msgstr "Não há necessidade de especificar que o app é para Android"
 
 #: ../fdroidserver/deploy.py
-msgid "No option set! Edit your config.yml to set at least one of these:"
-msgstr "Sem opção definida! Edite seu config.yml para definir pelo menos um destes:"
+msgid "No option set! Edit your config.py to set at least one of these:"
+msgstr "Sem opção definida! Edite seu config.py para definir pelo menos um destes:"
 
 #: ../fdroidserver/common.py
 msgid "No packages specified"
@@ -1224,14 +1222,14 @@ msgstr "Nenhum pacote especificado"
 
 #: ../fdroidserver/install.py
 #, python-format
-msgid "No signed APK available for %s"
-msgstr "Nenhum APK assinado disponível para %s"
+msgid "No signed apk available for %s"
+msgstr "Nenhum apk assinado disponível para %s"
 
 #: ../fdroidserver/install.py
 msgid "No signed output directory - nothing to do"
 msgstr "Nenhum diretório de saída assinado - nada a fazer"
 
-#: ../fdroidserver/common.py
+#: ../fdroidserver/update.py ../fdroidserver/common.py
 #, python-brace-format
 msgid "No signing certificates found in {path}"
 msgstr "Nenhum certificado de assinatura encontrado em {path}"
@@ -1241,23 +1239,16 @@ msgstr "Nenhum certificado de assinatura encontrado em {path}"
 msgid "No such package: %s"
 msgstr "Nenhum pacote desses: %s"
 
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "No such versionCode {versionCode} for app {appid}"
 msgstr "Nenhum versionCode {versionCode} para o app {appid}"
 
-#: ../fdroidserver/checkupdates.py
-msgid "No tags found"
-msgstr "Nenhuma etiqueta encontrada"
-
-#: ../fdroidserver/publish.py ../fdroidserver/verify.py
+#: ../fdroidserver/verify.py ../fdroidserver/publish.py
 msgid "No unsigned directory - nothing to do"
 msgstr "Nenhum diretório não assinado - nada a fazer"
 
-#: ../fdroidserver/__main__.py
-msgid "No version information could be found."
-msgstr "Não foi possível encontrar informações de versão."
-
 #: ../fdroidserver/common.py
 msgid "Not a valid size definition: \"{}\""
 msgstr "Não é uma definição de tamanho válida: \"{}\""
@@ -1272,9 +1263,10 @@ msgid "Nothing to do for {appid}."
 msgstr "Nada a fazer para {appid}."
 
 #: ../fdroidserver/init.py
-msgid "Now set these in config.yml:"
-msgstr "Agora configure estes em config.yml:"
+msgid "Now set these in config.py:"
+msgstr "Agora configure estes em config.py:"
 
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "OBB file has newer versionCode({integer}) than any APK:"
@@ -1292,28 +1284,23 @@ msgstr "O packagename do OBB não corresponde a um APK suportado:"
 msgid "Offline machine, skipping git mirror generation until `fdroid deploy`"
 msgstr "A máquina está offline, a saltar a geração de espelhos de git até o `fdroid deploy'"
 
-#: ../fdroidserver/deploy.py
-msgid "One of the 'github_releases' config items is missing the 'packageNames' value. skipping ..."
-msgstr "Um dos itens de configuração 'github_releases' está a faltar o valor 'packageNames'. A ignorar ..."
+#: ../fdroidserver/common.py
+#, python-brace-format
+msgid "Old APK signature failed to verify: {path}"
+msgstr "A assinatura antiga do APK não pôde ser verificada: {path}"
 
-#: ../fdroidserver/deploy.py
-msgid "One of the 'github_releases' config items is missing the 'projectUrl' value. skipping ..."
-msgstr "Um dos itens de configuração 'github_releases' não tem o valor 'projectUrl'. A ignorar ..."
+#: ../fdroid ../fdroidserver/__main__.py
+msgid "Old, deprecated name for fdroid deploy"
+msgstr "Nome velho e obsoleto para implantar fdroid"
 
-#: ../fdroidserver/deploy.py
-msgid "One of the 'github_releases' config items is missing the 'token' value. skipping ..."
-msgstr "Um dos itens de configuração 'github_releases' não tem o valor 'token'. A ignorar ..."
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Only PNG and JPEG are supported for graphics, found: {path}"
 msgstr "Somente PNG e JPEG são suportados para gráficos, encontrado: {path}"
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/common.py
-msgid "Only accepts a single key \"env\""
-msgstr "Aceita apenas uma única chave \"env\""
+#: ../fdroidserver/checkupdates.py
+msgid "Only print differences with the Play Store"
+msgstr "Apenas mostrar diferenças com a Play Store"
 
 #: ../fdroidserver/checkupdates.py
 msgid "Only process apps with auto-updates"
@@ -1323,6 +1310,11 @@ msgstr "Processar apenas apps com atualizações automáticas"
 msgid "OpenCollective donation methods belong in the OpenCollective: field"
 msgstr "Os métodos de doação OpenCollective pertencem no campo OpenCollective:"
 
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "Options"
+msgstr "Opções"
+
 #: ../fdroidserver/verify.py
 msgid "Output JSON report to file named after APK."
 msgstr "Saída de relatório JSON para ficheiro nomeado após APK."
@@ -1331,22 +1323,26 @@ msgstr "Saída de relatório JSON para ficheiro nomeado após APK."
 msgid "Output JSON to stdout."
 msgstr "Saída de JSON para stdout."
 
-#: ../fdroidserver/checkupdates.py ../fdroidserver/gpgsign.py
-#: ../fdroidserver/publish.py ../fdroidserver/signindex.py
-#: ../fdroidserver/update.py
+#: ../fdroidserver/gpgsign.py ../fdroidserver/publish.py
+#: ../fdroidserver/update.py ../fdroidserver/signindex.py
+#: ../fdroidserver/checkupdates.py
 msgid "Outputting JSON"
 msgstr "Saída do JSON"
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "Overall license of the project."
 msgstr "Licença geral do projeto."
 
+#: ../fdroidserver/dscanner.py
+msgid "Override path for repo APKs (default: ./repo)"
+msgstr "Substituir o caminho para os APKs do repositório (predefinição: ./repo)"
+
 #: ../fdroidserver/index.py
 #, python-brace-format
 msgid "Overriding blank versionName in {apkfilename} from metadata: {version}"
 msgstr "Substituindo versionName em branco em {apkfilename} dos metadados: {version}"
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 #, python-brace-format
 msgid "Package \"{appid}\" already exists"
 msgstr "O pacote \"{appid}\" já existe"
@@ -1360,10 +1356,13 @@ msgstr "Analisando o manifesto em '{path}'"
 msgid "Password required with username"
 msgstr "Palavra-passe necessária com o nome de utilizador"
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "Path to main Android project subdirectory, if not in root."
 msgstr "Caminho para o subdiretório principal do projeto Android, se não estiver na raiz."
 
+msgid "Path to main android project subdirectory, if not in root."
+msgstr "Caminho para o subdiretório principal do projeto Android, se não estiver na raiz."
+
 #: ../fdroidserver/init.py
 msgid "Path to the Android SDK (sometimes set in ANDROID_HOME)"
 msgstr "Caminho até o Android SDK (algumas vezes definido em ANDROID_HOME)"
@@ -1376,19 +1375,21 @@ msgstr "Caminho para o repositório git para usar como log"
 msgid "Path to the keystore for the repo signing key"
 msgstr "Caminho até a keystore para a chave de assinatura do repositório"
 
+#: ../fdroidserver/dscanner.py
+msgid "Prepare Drozer to run a scan"
+msgstr "Preparar Drozer para executar uma verificação"
+
+msgid "Prepare drozer to run a scan"
+msgstr "Preparar Drozer para executar uma verificação"
+
 #: ../fdroidserver/nightly.py
 msgid "Print the secret variable to the terminal for easy copy/paste"
 msgstr "Imprimir a variável secreta para o terminal para copiar/colar fácilmente"
 
-#: ../fdroidserver/install.py
+#: ../fdroidserver/metadata.py
 #, python-brace-format
-msgid "Privacy mode was enabled based on your locale ({country_code})."
-msgstr "O modo de privacidade foi ativado com base na sua localização ({country_code})."
-
-#: ../fdroidserver/scanner.py
-#, python-format
-msgid "Problem with ZIP file: %s, error %s"
-msgstr "Problema com o ficheiro ZIP: %s, erro %s"
+msgid "Problem with description of {appid}: {error}"
+msgstr "Problema com a descrição de {appid}: {error}"
 
 #: ../fdroidserver/common.py
 #, python-brace-format
@@ -1413,7 +1414,11 @@ msgstr "A processar {appid}"
 msgid "Produce human-readable XML/JSON for index files"
 msgstr "Produzir XML/JSON legível por humanos para ficheiros de índice"
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/update.py
+msgid "Produce human-readable index.xml"
+msgstr "Criação human-readable index.xml"
+
+#: ../fdroidserver/import.py
 msgid "Project URL to import from."
 msgstr "URL do projeto para importar."
 
@@ -1425,25 +1430,21 @@ msgstr "A pontuação deve ser evitada"
 msgid "Push the log to this git remote repository"
 msgstr "Submeter o registo de eventos para este repositório git remoto"
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Pushing binary transparency log to {url}"
 msgstr "A submeter o registo de transparência de binário para {url}"
 
-#: ../fdroidserver/deploy.py
-msgid "Pushing to remote server failed!"
-msgstr "Falha ao submeter para o servidor remoto!"
-
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Pushing to {url}"
 msgstr "A submeter para {url}"
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Quickly start a new repository"
 msgstr "Criar rapidamente um novo repositório"
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Read all the metadata files and exit"
 msgstr "Ler todos os ficheiros de metadados e sair"
 
@@ -1454,49 +1455,40 @@ msgstr "A ler '{config_file}'"
 
 #: ../fdroidserver/common.py
 #, python-brace-format
-msgid "Reading packageName/versionCode/versionName failed, APK invalid: '{apkfilename}'"
-msgstr "A leitura de packageName/versionCode/versionName falhou, APK inválido: '{apkfilename}'"
+msgid "Reading minSdkVersion failed: \"{apkfilename}\""
+msgstr "A leitura de minSdkVersion falhou: \"{apkfilename}\""
 
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
+#. https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
 #: ../fdroidserver/common.py
 #, python-brace-format
-msgid "Reading packageName/versionCode/versionName failed,APK invalid: '{apkfilename}'"
-msgstr "Falha ao ler packageName/versionCode/versionName, APK inválido: '{apkfilename}'"
+msgid "Reading packageName/versionCode/versionName failed, APK invalid: '{apkfilename}'"
+msgstr "A leitura de packageName/versionCode/versionName falhou, APK inválido: '{apkfilename}'"
 
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Reading {apkfilename} from cache"
 msgstr "Lendo {apkfilename} do cache"
 
-#: ../fdroidserver/build.py
-msgid "Refresh and cache scanner rules and signatures from the network"
-msgstr "Atualizar e armazenar as regras e assinaturas do scanner da rede no cache"
-
-#: ../fdroidserver/publish.py
-#, python-brace-format
-msgid "Refusing to sign '{path}', file exists in both {dir1} and {dir2} folder."
-msgstr "Recuso assinar '{path}', o ficheiro existe nas pastas {dir1} e {dir2}."
-
-#: ../fdroidserver/verify.py
-msgid "Remove source tarball and any APKs if successfully verified."
-msgstr "Remover tarball de código-fonte e todos APKs se for verificado com sucesso."
+#: ../fdroidserver/stats.py
+msgid "Recalculate aggregate stats - use when changes have been made that would invalidate old cached data."
+msgstr "Recalcular estatísticas agregadas - use quando foram feitas alterações que invalidariam os dados cache antigos."
 
 #: ../fdroidserver/common.py
 msgid "Removing specified files"
 msgstr "Apagando ficheiros especificados"
 
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Removing {path}\""
-msgstr "A remover {path}\""
-
 #: ../fdroidserver/update.py
 msgid "Rename APK files that do not match package.name_123.apk"
 msgstr "Renomear todos os ficheiros APKs que não correspondem com package.name_123.apk"
 
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "RepoType {type} is deprecated, please switch to git."
-msgstr ""
+#: ../fdroidserver/update.py
+msgid "Report on build data status"
+msgstr "Relatório sobre o estado dos dados de compilação"
+
+#: ../fdroidserver/build.py
+msgid "Reset and create a brand new build server, even if the existing one appears to be ok."
+msgstr "Redefinir e criar um novo servidor de compilação, mesmo que o existente parecer normal."
 
 #: ../fdroidserver/nightly.py
 #, python-brace-format
@@ -1511,34 +1503,33 @@ msgstr "Redimensionar todos os ícones que excedam o tamanho máximo de pixels e
 msgid "Restrict output to warnings and errors"
 msgstr "Restringir a saída a erros e avisos"
 
-#: ../fdroidserver/net.py
-#, python-format
-msgid "Retrying failed download: %s"
-msgstr "Nova tentativa de descarga com falha: %s"
-
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Rewrite all the metadata files"
 msgstr "Regravar todos os ficheiros de metadados"
 
+#: ../fdroidserver/rewritemeta.py
+msgid "Rewrite to a specific format: "
+msgstr "Reescrever para um formato específico: "
+
 #: ../fdroidserver/rewritemeta.py
 #, python-brace-format
 msgid "Rewriting '{appid}'"
 msgstr "Reescrevendo '{appid}'"
 
+#: ../fdroidserver/rewritemeta.py
+#, python-brace-format
+msgid "Rewriting '{appid}' to '{path}'"
+msgstr "Reescrevendo '{appid}' para '{path}'"
+
 #: ../fdroidserver/checkupdates.py
 msgid "Run on git repo that has uncommitted changes"
 msgstr "Executar no repo git que tem alterações não confirmadas"
 
-#: ../fdroidserver/nightly.py
-#, python-brace-format
-msgid "Run over {cibase} to find -debug.apk. and skip repo_basedir {repo_basedir}"
-msgstr "Passar por cima de {cibase} para encontrar -debug.apk. e ignorar repo_basedir {repo_basedir}"
-
 #: ../fdroidserver/lint.py
 msgid "Run rewritemeta to fix formatting"
 msgstr "Executar rewritemeta para corrigir a formatação"
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 msgid "Running first pass with MD5 checking disabled"
 msgstr "Executando a primeira passagem com a verificação de MD5 desativada"
 
@@ -1547,24 +1538,18 @@ msgstr "Executando a primeira passagem com a verificação de MD5 desativada"
 msgid "Running wget in {path}"
 msgstr "Executando o wget em {path}"
 
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "SHA-256 of {url} does not match entry!"
-msgstr "O SHA-256 de {url} não corresponde à entrada!"
+#: ../fdroidserver/dscanner.py
+msgid "Scan only the latest version of each package"
+msgstr "Escanear apenas a versão mais recente de cada pacote"
 
 #: ../fdroidserver/build.py
 msgid "Scan the resulting APK(s) for known non-free classes."
 msgstr "Procure no(s) APK(s) resultante(s) por classes conhecidas não livres."
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Scan the source code of a package"
 msgstr "Analisar o código fonte de um pacote"
 
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Scanner found {count} problems in {apk}"
-msgstr "O scanner encontrou {count} problemas em {apk}"
-
 #: ../fdroidserver/scanner.py
 #, python-brace-format
 msgid "Scanner found {count} problems in {appid}:"
@@ -1581,19 +1566,6 @@ msgid_plural "Scanner found {} problems"
 msgstr[0] "Scanner encontrou {} problema"
 msgstr[1] "Scanner encontrou {} problemas"
 
-#: ../fdroidserver/scanner.py
-msgid "Scanning APK for extra signing blocks."
-msgstr "A verificar a APK em busca de blocos de assinatura extra."
-
-#: ../fdroidserver/scanner.py
-msgid "Scanning APK with dexdump for known non-free classes."
-msgstr "A verificar o APK com dexdump por classes não-livres conhecidas."
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Set NDK {release} ({version}) up"
-msgstr "Definir NDK {release} ({version}) para cima"
-
 #: ../fdroidserver/common.py
 msgid "Set clock to that time using:"
 msgstr "Configurar o relógio para esse tempo usando:"
@@ -1607,7 +1579,7 @@ msgstr "Definir o máximo de lançamentos no repo antes que os mais antigos seja
 msgid "Set open file limit to {integer}"
 msgstr "Definir o limite de ficheiros abertos para {integer}"
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Set up an app build for a nightly build repo"
 msgstr "Configurar uma compilação de app para um repositório de compilação noturno"
 
@@ -1620,11 +1592,18 @@ msgstr "Falha ao definir o limite de ficheiros abertos: "
 msgid "Setting {0} sec timeout for this build"
 msgstr "Definindo o tempo limite de {0} seg para esta compilação"
 
-#: ../fdroidserver/__main__.py
+#: ../fdroidserver/build.py
+msgid "Setup an emulator, install the APK on it and perform a Drozer scan"
+msgstr "Configure um emulador, instale o APK nele e execute um scan do Drozer"
+
+msgid "Setup an emulator, install the apk on it and perform a drozer scan"
+msgstr "Configure um emulador, instale o apk nele e execute um scan do drozer"
+
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Sign and place packages in the repo"
 msgstr "Assinar e pôr os pacotes no repositório"
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Sign indexes created using update --nosign"
 msgstr "Assinar os índices criados com o uso de update --nosign"
 
@@ -1637,11 +1616,6 @@ msgstr "Pular o escaneamento do código-fonte atrás de binários e outros probl
 msgid "Skipping '{apkfilename}' with invalid signature!"
 msgstr "Ignorando '{apkfilename}' com uma assinatura inválida!"
 
-#: ../fdroidserver/deploy.py ../fdroidserver/index.py
-#, python-format
-msgid "Skipping GitLab Pages mirror because the repo is too large (>%.2fGB)!"
-msgstr "A ignorar o espelho do GitLab Pages porque o repositório é muito grande (>%.2fGB)!"
-
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Skipping index generation for {appid}"
@@ -1657,14 +1631,23 @@ msgstr "Ignorando '{apkfilename}' com uma assinatura inválida!"
 msgid "Skipping {appid}: disabled"
 msgstr "Ignorando {appid}: desativado"
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/scanner.py
+#, python-brace-format
+msgid "Skipping {appid}: no builds specified"
+msgstr "Ignorando {appid}: nenhuma compilação especificada"
+
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 msgid "Specify a local folder to sync the repo to"
 msgstr "Especifique uma pasta local para ser sincronizada com o repositório"
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 msgid "Specify an identity file to provide to SSH for rsyncing"
 msgstr "Especifique um ficheiro identidade para fornecer ao SSH para usar o rsync"
 
+#: ../fdroidserver/build.py
+msgid "Specify that we're running on the build server"
+msgstr "Especificar que estamos executando no servidor de compilação"
+
 #: ../fdroidserver/nightly.py
 msgid "Specify which debug keystore file to use."
 msgstr "Especifique o ficheiro de armazenamento de chaves de depuração."
@@ -1673,6 +1656,11 @@ msgstr "Especifique o ficheiro de armazenamento de chaves de depuração."
 msgid "Spew out even more information than normal"
 msgstr "Mostrar ainda mais informações que o normal"
 
+#: ../fdroidserver/nightly.py
+#, python-brace-format
+msgid "Striping mystery signature from {apkfilename}"
+msgstr "Esvaziar assinatura misteriosa de {apkfilename}"
+
 #: ../fdroidserver/nightly.py
 #, python-brace-format
 msgid "Stripping mystery signature from {apkfilename}"
@@ -1693,21 +1681,9 @@ msgstr "A descrição de comprimento {length} é sobre o limite de charácteres
 msgid "System clock is older than date in {path}!"
 msgstr "O relógio do sistema é mais antigo que a data em {path}!"
 
-#: ../fdroidserver/checkupdates.py
-msgid "Tags update mode only works for git, hg, bzr and git-svn repositories currently"
-msgstr "O modo de atualização de marcações só funciona atualmente para repositórios git, hg, bzr e git-svn"
-
-#: ../fdroidserver/checkupdates.py
-msgid "Tags update mode used in git-svn, but the repo was not set up with tags"
-msgstr "Modo de atualização de marcações usado no git-svn, mas a repo não foi configurada com marcações"
-
 #: ../fdroidserver/build.py
 msgid "Test mode - put output in the tmp directory only, and always build, even if the output already exists."
-msgstr "Modo de teste - ponha a saída apenas no diretório tmp e sempre compile, mesmo que a saída já exista."
-
-#: ../fdroidserver/index.py
-msgid "The \"qrcode\" Python package is not installed (e.g. apt-get install python3-qrcode)!"
-msgstr "O pacote Python \"qrcode\" não está instalado (por exemplo, apt-get install python3-qrcode)!"
+msgstr "Modo de teste - coloque a saída apenas no diretório tmp e sempre compile, mesmo que a saída já exista."
 
 #. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
 #: ../fdroidserver/update.py
@@ -1717,7 +1693,7 @@ msgstr "O código de versão OBB deve estar após \"{name}.\":"
 
 #: ../fdroidserver/btlog.py
 msgid "The base URL for the repo to log (default: https://f-droid.org)"
-msgstr "O URL base para o registo de mudanças do repositório (predefinição: https://f-droid.org)"
+msgstr "O URL base para o registro de mudanças do repositório (predefinição: https://f-droid.org)"
 
 #: ../fdroidserver/mirror.py
 msgid "The directory to write the mirror to"
@@ -1727,10 +1703,18 @@ msgstr "O diretório para onde escrever o espelho"
 msgid "The file to be included in the repo (path or glob)"
 msgstr "O ficherio a ser incluído no repo (caminho ou glob)"
 
+#: ../fdroidserver/deploy.py
+msgid "The only commands currently supported are 'init' and 'update'"
+msgstr "Os únicos comandos suportados atualmente são 'init' e 'update'"
+
 #: ../fdroidserver/index.py
 msgid "The repository's fingerprint does not match."
 msgstr "A impressão digital do repositório não corresponde."
 
+#: ../fdroidserver/common.py
+msgid "The repository's index could not be verified."
+msgstr "O índice do repositório não pôde ser verificado."
+
 #: ../fdroidserver/deploy.py
 #, python-brace-format
 msgid "The root dir for local_copy_dir \"{path}\" does not exist!"
@@ -1744,45 +1728,14 @@ msgstr "Há uma colisão do keyalias - publicação parada"
 msgid "These are the apps that have been archived from the main repo."
 msgstr "Estas são as aplicações que foram arquivadas do repositório principal."
 
-#: ../fdroidserver/mirror.py
-msgid "This command should never be used to mirror f-droid.org! A full copy requires more than 600GB."
-msgstr "Este comando nunca deve ser usado para espelhar o f-droid.org! Uma cópia completa requer mais que 600GB."
-
-#: ../fdroidserver/common.py
-msgid "This is a repository of apps to be used with F-Droid. Applications in this repository are either official binaries built by the original application developers, or are binaries built from source by the admin of f-droid.org using the tools on https://gitlab.com/fdroid."
-msgstr "Este é um repositório de apps a serem usados com o F-Droid. Aplicações neste repositório são binários oficiais compilados pelos programadores da aplicação original ou são binários compilados da fonte por f-droid.org a usar as ferramentas em https://gitlab.com/fdroid."
-
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 #, python-format
 msgid "This repo already has local metadata: %s"
 msgstr "Este repositório já tem metadados locais: %s"
 
-#: ../fdroidserver/init.py
-#, python-format
-msgid ""
-"To complete the setup, add your APKs to \"%s\"\n"
-"then run \"fdroid update -c; fdroid update\".  You might also want to edit\n"
-"\"config.yml\" to set the URL, repo name, and more.  You should also set up\n"
-"a signing key (a temporary one might have been automatically generated).\n"
-"\n"
-"For more info: https://f-droid.org/docs/Setup_an_F-Droid_App_Repo\n"
-"and https://f-droid.org/docs/Signing_Process"
-msgstr ""
-"Para completar a configuração, adicione os seus APKs ao \"%s\",\n"
-"depois execute \"fdroid update -c; fdroid update\".  Também pode editar\n"
-"\"config.yml\" para definir a URL, nome do repo, e muito mais. Também deve configurar\n"
-"uma chave de assinatura (uma chave temporária pode ter sido gerada automaticamente).\n"
-"\n"
-"Para mais informações: https://f-droid.org/docs/Setup_an_F-Droid_App_Repo\n"
-"e https://f-droid.org/docs/Signing_Process"
-
-#: ../fdroidserver/deploy.py
-msgid "To use awsbucket, awssecretkey and awsaccesskeyid must also be set in config.yml!"
-msgstr "Para usar awsbucket, os awssecretkey e awsaccesskeyid também devem ser definidos no config.yml!"
-
-#: ../fdroidserver/deploy.py
-msgid "To use rclone, rclone_config and awsbucket must be set in config.yml!"
-msgstr "Para usar rclone, rclone_config e awsbucket também devem ser definidos no config.yml!"
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
+msgid "To use awsbucket, awssecretkey and awsaccesskeyid must also be set in config.py!"
+msgstr "Para usar awsbucket, os awssecretkey e awsaccesskeyid também devem ser definidos no config.py!"
 
 #: ../fdroidserver/lint.py
 msgid "URL must start with https:// or http://"
@@ -1792,6 +1745,10 @@ msgstr "A URL deve começar com https:// ou http://"
 msgid "URL shorteners should not be used"
 msgstr "Encurtadores de URL não devem ser usados"
 
+#: ../fdroidserver/metadata.py
+msgid "URL title is just the URL, use brackets: [URL]"
+msgstr "O título do URL é apenas o URL, use parênteses: [URL]"
+
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "URL {url} in Description: {error}"
@@ -1805,15 +1762,16 @@ msgstr "Etiqueta de licença \"{}\" inesperada! Use somente as etiquetas aprovad
 msgid "Unexpected license tag \"{}\"! Only use license tags configured in your config file"
 msgstr "Etiqueta de licença \"{}\" inesperada! Use somente as etiquetas de licença configuradas no seu ficheiro de configuração"
 
-#: ../fdroidserver/common.py
+#: ../fdroidserver/metadata.py
 #, python-brace-format
-msgid "Unknown entry {key} in {configname}"
-msgstr "Entrada {key} desconhecida em {configname}"
+msgid "Unexpected text on same line as {field} in {linedesc}"
+msgstr "Texto inesperado na mesma linha como {field} em {linedesc}"
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Unknown exception found!"
 msgstr "Exceção desconhecida!"
 
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "Unknown file '{filename}' in build '{versionName}'"
@@ -1824,6 +1782,11 @@ msgstr "Ficheiro desconhecido '{filename}' na compilação '{versionName}'"
 msgid "Unknown metadata format: %s"
 msgstr "Formato de metadados desconhecido: %s"
 
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Unknown metadata format: {path}"
+msgstr "Formato de metadados desconhecido: {path}"
+
 #: ../fdroidserver/metadata.py
 #, python-brace-format
 msgid "Unknown metadata format: {path} (use: *.yml)"
@@ -1833,6 +1796,10 @@ msgstr "O formato de metadados é desconhecido: {path} (use: *.yml)"
 msgid "Unknown version of aapt, might cause problems: "
 msgstr "Versão desconhecida do aapt, pode causar problemas: "
 
+#: ../fdroidserver/lint.py
+msgid "Unlinkified link - use [http://foo.bar Link title] or [http://foo.bar]"
+msgstr "Ligação des-lig-ada - use [http://foo.bar Título do link] ou [http://foo.bar]"
+
 #: ../fdroidserver/lint.py
 msgid "Unnecessary leading space"
 msgstr "Espaço desnecessário à frente"
@@ -1846,12 +1813,20 @@ msgstr "Espaço desnecessário ao fim"
 msgid "Unrecognised app field '{fieldname}' in '{path}'"
 msgstr "Campo de aplicação '{fieldname}' não reconhecido em '{path}'"
 
+#: ../fdroidserver/metadata.py
+msgid "Unrecognised app field: "
+msgstr "Campo da app não reconhecido: "
+
 #: ../fdroidserver/metadata.py
 #, python-brace-format
 msgid "Unrecognised build flag '{build_flag}' in '{path}'"
 msgstr "Bandeira de compilação '{build_flag}' não reconhecida em '{path}'"
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Unrecognised field '{field}' in {linedesc}"
+msgstr "Campo '{field}' não reconhecido em {linedesc}"
+
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Unsupported file type \"{extension}\" for repo graphic"
@@ -1862,6 +1837,29 @@ msgstr "Tipo de ficheiro \"{extension}\" não suportado para o gráfico de repo"
 msgid "Unsupported graphics file found: {path}"
 msgstr "Ficheiro gráfico não suportado encontrado: {path}"
 
+#: ../fdroidserver/rewritemeta.py
+#, python-brace-format
+msgid "Unsupported metadata format, use: --to [{supported}]"
+msgstr "Formato de metadados não suportado, use:--to [{supported}]"
+
+#: ../fdroidserver/metadata.py
+msgid "Unterminated ]"
+msgstr "Não terminado ]"
+
+#: ../fdroidserver/metadata.py
+msgid "Unterminated ]]"
+msgstr "Não terminado ]]"
+
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Unterminated build in {name}"
+msgstr "Compilação não terminada em {name}"
+
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Unterminated continuation in {name}"
+msgstr "Continuação não terminada em {name}"
+
 #: ../fdroidserver/lint.py
 #, python-format
 msgid "Unused extlib at %s"
@@ -1882,25 +1880,27 @@ msgstr "O caminho de scandelete não é usado: %s"
 msgid "Unused scanignore path: %s"
 msgstr "O caminho de scanignore não é usado: %s"
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Update repo information for new packages"
 msgstr "Atualizar a informação do repositório para novos pacotes"
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Update the binary transparency log for a URL"
 msgstr "Atualizar o registo de transparência de binário para um URL"
 
+#: ../fdroid ../fdroidserver/__main__.py
+msgid "Update the stats of the repo"
+msgstr "Atualizar as estatísticas do repositório"
+
+#: ../fdroidserver/update.py ../fdroidserver/build.py
+msgid "Update the wiki"
+msgstr "Atualizar a wiki"
+
 #: ../fdroidserver/checkupdates.py
 #, python-brace-format
 msgid "UpdateCheckData has invalid URL: {url}"
 msgstr "UpdateCheckData tem URL inválido: {url}"
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "UpdateCheckData must match the version code as integer (\\d or [0-9]): {codeex}"
-msgstr "UpdateCheckData deve corresponder ao código da versão como inteiro (\\d ou [0-9]): {codeex}"
-
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "UpdateCheckData must use HTTPS URL: {url}"
@@ -1912,10 +1912,14 @@ msgid "UpdateCheckData not a valid URL: {url}"
 msgstr "UpdateCheckData não é uma URL válida: {url}"
 
 #: ../fdroidserver/lint.py
-msgid "UpdateCheckMode is set but it looks like checkupdates hasn't been run yet."
-msgstr "UpdateCheckMode é definido, mas parece que likecheckupdates ainda não foi executado."
+msgid "UpdateCheckMode is set but it looks like checkupdates hasn't been run yet"
+msgstr "UpdateCheckMode é definido, mas parece que checkupdates ainda não foi executado"
+
+#. Translators: https://developer.android.com/studio/build/application-id
+#: ../fdroidserver/lint.py
+msgid "UpdateCheckName is set to the known application ID - it can be removed"
+msgstr "UpdateCheckName (o nome da verificação de atualização) é definido como o ID comum da aplicação - pode ser removido"
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
 #: ../fdroidserver/lint.py
 msgid "UpdateCheckName is set to the known application ID, it can be removed"
 msgstr "UpdateCheckName (o nome da verificação de atualização) é definido como o ID comun da aplicação - pode ser removido"
@@ -1930,9 +1934,20 @@ msgstr "A enviar {apkfilename} ao androidobservatory.org"
 msgid "Uploading {apkfilename} to virustotal"
 msgstr "A enviar {apkfilename} ao virustotal"
 
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "Usage"
+msgstr "Utilização"
+
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, python-format
+msgid "Usage: %s\n"
+msgstr "Utilização: %s\n"
+
 #: ../fdroidserver/lint.py
-msgid "Use /HEAD instead of /master or /main to point at a file in the default branch"
-msgstr "Use /HEAD em vez de /master ou /main para apontar a um ficheiro no ramo predefinido"
+msgid "Use /HEAD instead of /master to point at a file in the default branch"
+msgstr "Use /HEAD em vez de /master para apontar num ficheiro na ramificação predefinida"
 
 #: ../fdroidserver/update.py
 msgid "Use `fdroid update -c` to create it."
@@ -1946,16 +1961,14 @@ msgstr "Usar servidor de compilação"
 msgid "Use date from APK instead of current time for newly added APKs"
 msgstr "Use da data do APK em vez do tempo atual para APKs recém-adicionados"
 
-#: ../fdroidserver/deploy.py
+msgid "Use date from apk instead of current time for newly added apks"
+msgstr "Use a data do apk em vez do tempo atual para apks recém-adicionados"
+
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Using \"{path}\" for configuring s3cmd."
 msgstr "Usando \"{path}\" para configurar s3cmd."
 
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Using \"{path}\" for syncing with remote storage."
-msgstr "A usar \"{path}\" para sincronizar com o armazenamento remoto."
-
 #: ../fdroidserver/common.py
 msgid "Using APK Signature v2"
 msgstr "A usar a assinatura APK v2"
@@ -1964,35 +1977,26 @@ msgstr "A usar a assinatura APK v2"
 msgid "Using APK Signature v3"
 msgstr "A usar a assinatura APK v3"
 
-#: ../fdroidserver/common.py
-msgid "Using JAR Signature"
-msgstr "A usar a assinatura JAR"
-
 #: ../fdroidserver/common.py
 msgid "Using Java's jarsigner, not recommended for verifying APKs! Use apksigner"
 msgstr "Usando o jarsigner de Java, não recomendado para verificar APKs! Use apksigner"
 
-#: ../fdroidserver/metadata.py
+#: ../fdroidserver/common.py
 #, python-brace-format
-msgid "Using blank dictionary instead of contents of {path}!"
-msgstr "A utilizar um dicionário em branco em vez do conteúdo de {path}!"
+msgid "Using androguard from \"{path}\""
+msgstr "Usando androguard de \"{path}\""
 
 #: ../fdroidserver/init.py
 #, python-brace-format
 msgid "Using existing keystore \"{path}\""
 msgstr "Utilizando armazenamento de chave existente \"{path}\""
 
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Using rclone to sync with: {url}"
-msgstr "A usar rclone para sincronizar com: {url}"
-
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Using s3cmd to sync with: {url}"
 msgstr "Usando s3cmd para sincronizar com: {url}"
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Valid commands are:"
 msgstr "Comandos válidos:"
 
@@ -2000,7 +2004,7 @@ msgstr "Comandos válidos:"
 msgid "Verify against locally cached copy rather than redownloading."
 msgstr "Verifique a cópia em cache local em vez de redescarregando."
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Verify the integrity of downloaded packages"
 msgstr "Verifique a integridade dos pacotes descarregados"
 
@@ -2008,28 +2012,15 @@ msgstr "Verifique a integridade dos pacotes descarregados"
 msgid "Verifying index signature:"
 msgstr "Verificar o índice de assinatura:"
 
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "Verifying package {path} with apksigner."
-msgstr "A verificar o pacote {path} com apksigner."
-
 #: ../fdroidserver/deploy.py
 #, python-brace-format
 msgid "VirusTotal API key cannot upload files larger than 32MB, use {url} to upload {path}."
 msgstr "A chave VirusTotal API não pode enviar ficheiros maiores que 32MB, use {url} para enviar {path}."
 
-#: ../fdroidserver/nightly.py
-msgid "WARNING: only public git repos are supported!"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Warn about possible metadata errors"
 msgstr "Avisar sobre possíveis erros de metadados"
 
-#: ../fdroidserver/scanner.py
-msgid "WebAssembly binary file"
-msgstr "Ficheiro binário WebAssembly"
-
 #: ../fdroidserver/update.py
 msgid "When configured for signed indexes, create only unsigned indexes at this stage"
 msgstr "Quando configurado para índices assinados, crie apenas índices não assinados nesta etapa"
@@ -2038,17 +2029,8 @@ msgstr "Quando configurado para índices assinados, crie apenas índices não as
 msgid "When linting the entire repository yamllint is disabled by default. This option forces yamllint regardless."
 msgstr "Ao cotar todo o repositório o yamllint é desativado por predefinição. Esta opção força o yamllint independentemente."
 
-#: ../fdroidserver/publish.py
-msgid "When signing or verifying fails, exit with an error code."
-msgstr "Se assinar ou verificar falhar, sair com um código de erro."
-
-#: ../fdroidserver/install.py
-msgid "Would you like to download and install F-Droid.apk via adb? (YES/no)"
-msgstr "Gostaria de descarregar e instalar o F-Droid.apk via adb? (SIM/não)"
-
-#: ../fdroidserver/install.py
-msgid "Would you like to download the app(s) from f-droid.org? (YES/no)"
-msgstr "Gostaria de descarregar a(s) aplicação(ões) do f-droid.org? (SIM/não)"
+msgid "X.509 'Distiguished Name' used when generating keys"
+msgstr "X.509 'Distiguished Name' usado ao gerar as chaves"
 
 #: ../fdroidserver/init.py
 msgid "X.509 'Distinguished Name' used when generating keys"
@@ -2062,11 +2044,6 @@ msgstr "Pode usar ANDROID_HOME para definir o caminho para o seu SDK, ou seja:"
 msgid "ZIP file archive"
 msgstr "Arquivo de ficheiros ZIP"
 
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "adb reports {serial} is \"{status}\"!"
-msgstr "adb reporta {serial} é \"{status}\"!"
-
 #: ../fdroidserver/nightly.py
 #, python-brace-format
 msgid "adding IdentityFile to {path}"
@@ -2077,78 +2054,84 @@ msgstr "adicionando IdentityFile a {path}"
 msgid "adding to {name}: {path}"
 msgstr "adicionando a {name}: {path}"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "ambiguous option: %(option)s could match %(matches)s"
 msgstr "opção ambígua: %(option)s poderia corresponder %(matches)s"
 
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "apksigner in build-tools;{version} passes APKs with invalid v3 signatures, ignoring."
-msgstr "apksigner nos build-tools;{version} passa APKs com assinaturas v3 inválidas, ignorando."
-
-#: ../fdroidserver/common.py
-msgid "apksigner not found! Cannot sign or verify modern APKs"
-msgstr "apksigner não encontrado! Não é possível assinar ou verificar APKs modernos"
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, python-format
+msgid "ambiguous option: %s (%s?)"
+msgstr "opção ambígua: %s (%s?)"
 
 #: ../fdroidserver/common.py
 msgid "apksigner not found, it's required for signing!"
 msgstr "Nenhum apksigner encontrado, é necessário para assinar!"
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/checkupdates.py ../fdroidserver/lint.py
-#: ../fdroidserver/rewritemeta.py
+#: ../fdroidserver/lint.py ../fdroidserver/rewritemeta.py
+#: ../fdroidserver/checkupdates.py
 msgid "application ID of file to operate on"
 msgstr "ID de aplicação do ficheiro para operar"
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/build.py ../fdroidserver/install.py
-#: ../fdroidserver/publish.py ../fdroidserver/scanner.py
-#: ../fdroidserver/verify.py
+#: ../fdroidserver/verify.py ../fdroidserver/publish.py
+#: ../fdroidserver/build.py ../fdroidserver/scanner.py
+#: ../fdroidserver/install.py
 msgid "application ID with optional versionCode in the form APPID[:VERCODE]"
 msgstr "applicationID com versionCode opcional na forma APPID[:VERCODE]"
 
-#: ../fdroidserver/common.py
-msgid "archive_url needs to end with /archive"
-msgstr "archive_url precisa de terminar com /archive"
+#: ../fdroidserver/lint.py ../fdroidserver/rewritemeta.py
+msgid "applicationId in the form APPID"
+msgstr "applicationId, na forma APPID"
 
-#: /usr/lib/python3.11/argparse.py
+#: ../fdroidserver/checkupdates.py
+msgid "applicationId to check for updates"
+msgstr "applicationId para verificar se há atualizações"
+
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
+#: ../fdroidserver/verify.py ../fdroidserver/publish.py
+#: ../fdroidserver/dscanner.py ../fdroidserver/build.py
+#: ../fdroidserver/scanner.py ../fdroidserver/install.py
+msgid "applicationId with optional versionCode in the form APPID[:VERCODE]"
+msgstr "applicationId com versionCode opcional na forma APPID[:VERCODE]"
+
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "argument \"-\" with mode %r"
 msgstr "argumento \"-\" com o modo %r"
 
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "argument %(argument_name)s: %(message)s"
-msgstr "argumento %(argument_name)s: %(message)s"
-
 #: ../fdroidserver/nightly.py
 msgid "attempting bare SSH connection to test deploy key:"
 msgstr "tentar a conexão nua por SSH para testar a implantação da chave:"
 
+#: ../fdroidserver/nightly.py
+msgid "attempting bare ssh connection to test deploy key:"
+msgstr "tentativa de conexão nua por SSH para testar a implantação da chave:"
+
 #: ../fdroidserver/common.py
 msgid "can not parse scrlib spec (not a string): '{}'"
 msgstr "não é possível analisar as especificações do scrlib (não é uma cadeia): '{}'"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
-msgid "can't open '%(filename)s': %(error)s"
-msgstr "não é possível abrir '%(filename)s': %(error)s"
-
-#: ../fdroidserver/scanner.py
-msgid "can't open non-https url: '{};"
-msgstr "não é possível abrir o url não-https: '{};"
+msgid "can't open '%s': %s"
+msgstr "não dá pra abrir '%s': %s"
 
 #: ../fdroidserver/build.py
 #, python-brace-format
 msgid "cannot find required srclibs: \"{path}\""
 msgstr "não é possível encontrar os srclibs necessários: \"{path}\""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "cannot have multiple subparser arguments"
 msgstr "não é possível ter vários argumentos de subparser"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "cannot merge actions - two groups are named %r"
 msgstr "não é possível unir ações - dois grupos são denominados %r"
@@ -2162,107 +2145,119 @@ msgstr "não é possível publicar a atualização, definiu a chave de implanta
 msgid "cloning {url}"
 msgstr "clonagem {url}"
 
+#: ../fdroidserver/deploy.py
+msgid "command to execute, either 'init' or 'update'"
+msgstr "comando para executar, seja 'init' ou 'update'"
+
 #: ../fdroidserver/__main__.py
 msgid "commands from plugin modules:"
 msgstr "comandos dos módulos de plugin:"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "complex"
+msgstr "complexo"
+
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "conflicting option string: %s"
 msgid_plural "conflicting option strings: %s"
 msgstr[0] "cadeia de opções conflitante: %s"
 msgstr[1] "cadeias de opções conflitantes: %s"
 
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "conflicting subparser alias: %s"
-msgstr "alias de subanalisador conflitante: %s"
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "conflicting subparser: %s"
-msgstr "subanalisador conflitante: %s"
+#: ../fdroidserver/nightly.py
+#, python-brace-format
+msgid "copying {apkfilename} into {path}"
+msgstr "copiando {apkfilename} para {path}"
 
 #: ../fdroidserver/metadata.py
 #, python-brace-format
 msgid "could not parse '{path}'"
 msgstr "não foi possível analisar '{path}'"
 
-#: ../fdroidserver/common.py
-msgid "could not parse srclib spec (no name specified): '{}'"
-msgstr "não foi possível analisar a especificação srclib (nenhum nome especificado): '{}'"
-
 #: ../fdroidserver/common.py
 msgid "could not parse srclib spec (no ref specified): '{}'"
 msgstr "não foi possível analisar a especificação srclib (referência não especificada): '{}'"
 
+#: ../fdroidserver/common.py
+msgid "could not parse srclib spec (too many '@' signs): '{}'"
+msgstr "não foi possível analisar a especificação srclib (demais símbolos '@'): '{}'"
+
 #: ../fdroidserver/nightly.py
 #, python-brace-format
 msgid "created {path}"
 msgstr "{path} criado"
 
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "current version is newer: old vercode={old}, new vercode={new}"
-msgstr "a versão atual é mais nova: velho vercódigo={old}, novo vercódigo={new}"
-
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "deleting: repo/{apkfilename}"
 msgstr "apagando: repo/{apkfilename}"
 
-#: ../fdroidserver/scanner.py
-msgid "dependency file without lock"
-msgstr "ficheiro de dependência sem bloqueio"
+#: ../fdroidserver/common.py
+#, python-brace-format
+msgid "deployed build logs to '{path}'"
+msgstr "logs de compilação implantados para '{path}'"
 
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "deployed process log {path} to {dest}"
 msgstr "registo de processo implantado {path} a {dest}"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "dest= is required for options like %r"
 msgstr "dest = é necessário para opções como %r"
 
-#: ../fdroidserver/scanner.py
-msgid "downloading '{}'"
-msgstr "a descarregar '{}'"
-
-#: ../fdroidserver/scanner.py
-msgid "downloading scanner signatures from '{}' failed"
-msgstr "a descarga de assinaturas de scanner de '{}' falhou"
-
 #: ../fdroidserver/scanner.py
 msgid "executable binary, possibly code"
 msgstr "binário executável, possivelmente código"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "expected %s argument"
 msgid_plural "expected %s arguments"
 msgstr[0] "%s argumento esperado"
 msgstr[1] "%s argumentos esperados"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "expected at least one argument"
 msgstr "esperado pelo menos um argumento"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "expected at most one argument"
 msgstr "esperado um argumento no máximo"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "expected one argument"
 msgstr "esperado um argumento"
 
-#: ../fdroidserver/__main__.py
+#: ../fdroidserver/common.py
+#, python-brace-format
+msgid "failed deploying build logs to '{path}'"
+msgstr "falha na implantação de logs de compilação para '{path}'"
+
+#: ../fdroid
+msgid "fdroid [-h|--help|--version] <command> [<args>]"
+msgstr "fdroid [-h|--help|--version] <comando> [<args>]"
+
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "fdroid [<command>] [-h|--help|--version|<args>]"
 msgstr "fdroid [<comando>] [-h|--help|--version|<args>]"
 
-#: ../fdroidserver/scanner.py
-msgid "fetch the latest version of signatures from the web"
-msgstr "buscar a versão de assinaturas mais recente da Web"
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "floating-point"
+msgstr "ponto flutuante"
+
+#: ../fdroidserver/metadata.py
+msgid "force errors to be warnings, or ignore"
+msgstr "forçar erros como avisos ou ignorá-los"
 
 #: ../fdroidserver/metadata.py
 msgid "force metadata errors (default) to be warnings, or to be ignored."
@@ -2276,7 +2271,8 @@ msgstr "git svn clone falhou"
 msgid "gzip file archive"
 msgstr "arquivo de ficheiros gzip"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "ignored explicit argument %r"
 msgstr "argumento explícito %r ignorado"
@@ -2285,39 +2281,35 @@ msgstr "argumento explícito %r ignorado"
 msgid "index-v1 must have a signature, use `fdroid signindex` to create it!"
 msgstr "index-v1 deve ter uma assinatura, use ' fdroid signindex ' para criá-lo!"
 
-#: ../fdroidserver/index.py
-msgid "index-v2 must have a signature, use `fdroid signindex` to create it!"
-msgstr "index-v2 deve ter uma assinatura, use droid signindex` para o criar!"
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "integer"
+msgstr "inteiro"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "invalid %(type)s value: %(value)r"
 msgstr "valor inválido do tipo %(type)s: %(value)r"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "invalid choice: %(value)r (choose from %(choices)s)"
 msgstr "opção inválida: %(value)r (escolha de %(choices)s)"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "invalid conflict_resolution value: %r"
 msgstr "valor conflict_resolution inválido: %r"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "invalid option string %(option)r: must start with a character %(prefix_chars)r"
 msgstr "Opção cadeia %(option)r inválida: deve começar com o caractere %(prefix_chars)r"
 
-#: ../fdroidserver/common.py
-msgid "ipfs_cid not found, skipping CIDv1 generation"
-msgstr "ipfs_cid não encontrado, a ignorar a geração de CIDv1"
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "latest build recipe is newer: old vercode={old}, new vercode={new}"
-msgstr "a última receita de construção é mais recente: velho vercódigo={old}, novo vercódigo={new}"
-
 #: ../fdroidserver/deploy.py
 #, python-brace-format
 msgid "local_copy_dir does not end with \"fdroid\", perhaps you meant: \"{path}\""
@@ -2336,20 +2328,11 @@ msgstr "local_copy_dir deve ser directory, não um ficheiro!"
 msgid "mirror '%s' does not end with 'fdroid'!"
 msgstr "espelho '%s' não termina com 'fdroid'!"
 
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "mirrors set twice, in config.yml and {path}!"
-msgstr "espelhos (mirrors) definidos duas vezes, em config.yml e em {path}!"
-
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "mutually exclusive arguments must be optional"
 msgstr "argumentos mutuamente exclusivos devem ser opcional"
 
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "next {name} cache update due in {time}"
-msgstr "próxima atualização do cache {name} prevista para {time}"
-
 #: ../fdroidserver/mirror.py
 #, python-brace-format
 msgid "no \"icon\" in {appid}"
@@ -2359,34 +2342,97 @@ msgstr "nenhum \"ícone\" em {appid}"
 msgid "no APK supplied"
 msgstr "nenhum APK fornecido"
 
-#: ../fdroidserver/checkupdates.py
-msgid "no version information found"
-msgstr "nenhuma informação de versão encontrada"
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, python-format
+msgid "no such option: %s"
+msgstr "não tem tal opção: %s"
 
-#: /usr/lib/python3.11/argparse.py
+#: ../fdroid ../fdroidserver/__main__.py
+msgid "no version info found!"
+msgstr "não há informações de versão encontrada!"
+
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "not allowed with argument %s"
 msgstr "não é permitido com o argumento %s"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "one of the arguments %s is required"
 msgstr "um dos argumentos %s é necessário"
 
-#: ../fdroidserver/common.py ../fdroidserver/index.py
+#: ../fdroidserver/index.py ../fdroidserver/common.py
 msgid "only accepts strings, lists, and tuples"
 msgstr "apenas aceita cadeias, listas e tuplos"
 
-#: /usr/lib/python3.11/argparse.py
-msgid "options"
-msgstr "opções"
+#: ../fdroidserver/install.py
+#, python-format
+msgid "option %s: If you really want to install all the signed apps, use --all"
+msgstr "opção %s: se realmente deseja instalar todas as apps assinadas, use --all"
+
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, python-format
+msgid "option %s: invalid %s value: %r"
+msgstr "Opção %s: valor %s inválido: %r"
+
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, python-format
+msgid "option %s: invalid choice: %r (choose from %s)"
+msgstr "opção %s: escolha inválida: %r (escolha entre %s)"
+
+#: /usr/lib/python3.5/getopt.py /usr/lib/python3.6/getopt.py
+#: /usr/lib/python3.7/getopt.py
+#, python-format
+msgid "option -%s not recognized"
+msgstr "opção -%s não reconhecida"
+
+#: /usr/lib/python3.5/getopt.py /usr/lib/python3.6/getopt.py
+#: /usr/lib/python3.7/getopt.py
+#, python-format
+msgid "option -%s requires argument"
+msgstr "opção -%s requer um argumento"
+
+#: /usr/lib/python3.5/getopt.py /usr/lib/python3.6/getopt.py
+#: /usr/lib/python3.7/getopt.py
+#, python-format
+msgid "option --%s must not have an argument"
+msgstr "opção --%s não pode ter argumento"
+
+#: /usr/lib/python3.5/getopt.py /usr/lib/python3.6/getopt.py
+#: /usr/lib/python3.7/getopt.py
+#, python-format
+msgid "option --%s not a unique prefix"
+msgstr "opção --%s não é prefixo único"
+
+#: /usr/lib/python3.5/getopt.py /usr/lib/python3.6/getopt.py
+#: /usr/lib/python3.7/getopt.py
+#, python-format
+msgid "option --%s not recognized"
+msgstr "opção --%s não reconhecida"
+
+#: /usr/lib/python3.5/getopt.py /usr/lib/python3.6/getopt.py
+#: /usr/lib/python3.7/getopt.py
+#, python-format
+msgid "option --%s requires argument"
+msgstr "opção --%s necessita argumento"
+
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
+msgid "optional arguments"
+msgstr "argumentos opcionais"
 
 #: ../fdroidserver/nightly.py
 #, python-brace-format
 msgid "overwriting existing {path}"
 msgstr "sobrescrevendo {path} existente"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "positional arguments"
 msgstr "argumentos posicionais"
 
@@ -2395,53 +2441,42 @@ msgstr "argumentos posicionais"
 msgid "process log deploy {path} to {dest} failed!"
 msgstr "a implementação do registo de processo {path} a {dest} falhou!"
 
-#: ../fdroidserver/build.py
-msgid "reference binary missing signature"
-msgstr "binária de referência sem assinatura"
-
 #: ../fdroidserver/signatures.py
 #, python-brace-format
 msgid "refuse downloading via insecure HTTP connection (use HTTPS or specify --no-https-check): {apkfilename}"
-msgstr "Recusado a descarrega via conexão HTTP insegura (use HTTPS ou especifique --no-https-check): {apkfilename}"
+msgstr "Recusado o download via conexão HTTP insegura (use HTTPS ou especifique --no-https-check): {apkfilename}"
+
+#: ../fdroidserver/signatures.py
+#, python-brace-format
+msgid "refuse downloading via insecure http connection (use https or specify --no-https-check): {apkfilename}"
+msgstr "Recusado o download via conexão http insegura (use https ou especifique --no-https-check): {apkfilename}"
 
 #: ../fdroidserver/index.py
 #, python-format
-msgid "repo_icon \"repo/icons/%s\" does not exist, generating placeholder."
-msgstr "repo_icon \"repo/icons/%s\" não existe, a gerar um espaço reservado."
+msgid "repo_icon %s does not exist, generating placeholder."
+msgstr "repo_icon %s não existe, a gerar um espaço reservado."
 
-#: ../fdroidserver/common.py
-msgid "repo_url needs to end with /repo"
-msgstr "repo_url precisa de terminar com /repo"
+#: ../fdroidserver/metadata.py
+msgid "ruamel.yaml not installed, can not write metadata."
+msgstr "o ruamel.yaml não está instalado, não é possível escrever metadados."
 
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "rsync is missing or broken: {error}"
-msgstr "rsync está ausente ou quebrado: {error}"
-
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "s3cmd sync indexes {path} to {url} and delete"
 msgstr "s3cmd sincroniza índices {path} para {url} e apaga"
 
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "s3cmd syncs indexes from {path} to {url} and deletes removed"
-msgstr "s3cmd sincroniza os índices de {path} para {url} e elimina os removidos"
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "scanner cache is malformed! You can clear it with: '{clear}'"
-msgstr "o cache do scanner está malformado! Pode limpá-lo com: '{clear}'"
-
-#: ../fdroidserver/deploy.py
-msgid "serverwebroot: path does not end with \"fdroid\", perhaps you meant one of these:"
-msgstr "serverwebroot: o caminho não termina com \"fdroid\", talvez queria usar um destes:"
-
 #: ../fdroidserver/scanner.py
 msgid "shared library"
-msgstr "biblioteca partilhada"
+msgstr "biblioteca compartilhada"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "show program's version number and exit"
+msgstr "mostrar versão do programa e sair"
+
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.5/optparse.py
+#: /usr/lib/python3.6/argparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/argparse.py /usr/lib/python3.7/optparse.py
 msgid "show this help message and exit"
 msgstr "mostrar esta ajuda e sair"
 
@@ -2470,31 +2505,31 @@ msgstr "Nome 'srclibs' ausente e/ou '@'"
 msgid "static library"
 msgstr "biblioteca estática"
 
-#: ../fdroidserver/build.py
+#: ../fdroidserver/common.py
 #, python-brace-format
-msgid "supplied reference binary has allowed signer {signer}"
-msgstr "o binário de referência fornecido tem o assinante permitido {signer}"
+msgid "supplied timestamp value '{timestamp}' is not a unix timestamp"
+msgstr "o valor do data-hora fornecido ('{timestamp}') não está no formato timestamp unix"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "the following arguments are required: %s"
 msgstr "os seguintes argumentos são necessários: %s"
 
-#: ../fdroidserver/install.py
-msgid "true"
-msgstr "verdadeiro"
-
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "unexpected option string: %s"
 msgstr "opção de cadeia de texto inesperada: %s"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "unknown parser %(parser_name)r (choices: %(choices)s)"
 msgstr "O formato '%(parser_name)r' é desconhecido. (Opções Válidas: %(choices)s)"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "unrecognized arguments: %s"
 msgstr "argumentos não reconhecidos: %s"
@@ -2504,11 +2539,16 @@ msgstr "argumentos não reconhecidos: %s"
 msgid "unsafe permissions on '{config_file}' (should be 0600)!"
 msgstr "permissões inseguras em '{config_file}' (deveria ser 0600)!"
 
-#: ../fdroidserver/__main__.py /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py ../fdroid
+#: /usr/lib/python3.7/argparse.py ../fdroidserver/__main__.py
 msgid "usage: "
 msgstr "utilização: "
 
-#: ../fdroidserver/deploy.py
+#: ../fdroid
+msgid "usage: fdroid [-h|--help|--version] <command> [<args>]"
+msgstr "utilização: fdroid [-h|--help|--version] <command> [<args>]"
+
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "using Apache libcloud to sync with {url}"
 msgstr "usando o Apache libcloud para sincronizar com {url}"
@@ -2517,9 +2557,9 @@ msgstr "usando o Apache libcloud para sincronizar com {url}"
 msgid "virustotal.com is rate limiting, waiting to retry..."
 msgstr "o virustotal.com está a limitar a taxa, à espera para voltar a tentar..."
 
-#: ../fdroidserver/install.py
-msgid "yes"
-msgstr "sim"
+#: ../fdroidserver/update.py
+msgid "wiki support is deprecated and will be removed in the next release!"
+msgstr "O suporte do wiki é depreciado e será removido no próximo lançamento!"
 
 #: ../fdroidserver/publish.py
 #, python-brace-format
@@ -2533,19 +2573,31 @@ msgstr[1] "{0} apps, {1} aliases chave"
 msgid "{apkfilename} ({appid}) has no metadata!"
 msgstr "{apkfilename} ({appid}) não tem metadados!"
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
+#: ../fdroidserver/update.py
+#, python-brace-format
+msgid "{apkfilename} has multiple {name} files, looks like Master Key exploit!"
+msgstr "{apkfilename} tem vários ficheiros {name} que, parece explorar a Master Key!"
+
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "{apkfilename}'s AndroidManifest.xml has a bad date: "
 msgstr "AndroidManifest.xml do {apkfilename} tem uma data má: "
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "{appid} does not have a name! Using application ID instead."
 msgstr "{appid} não tem um nome! A usar o ID da aplicação em vez disso."
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
+#: ../fdroidserver/update.py
+#, python-brace-format
+msgid "{appid} does not have a name! Using package name instead."
+msgstr "{appid} não tem um nome! Usando o nome do pacote em vez disso."
+
+#: ../fdroidserver/update.py
+#, python-brace-format
+msgid "{appid} from {path} is not a valid Android Package Name!"
+msgstr "{appid} from {path} não é um nome de pacote Android válido!"
+
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "{appid} from {path} is not a valid Android application ID!"
@@ -2556,16 +2608,12 @@ msgstr "{appid} de {path} não é um ID de aplicação Android válido!"
 msgid "{appid} from {path} is not a valid Java Package Name!"
 msgstr "{appid} do {path} não é um Nome de Pacote Java válido!"
 
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{appid} has both APKs and files: {files}"
-msgstr "{appid} tem APKs e ficheiros: {files}"
-
 #: ../fdroidserver/mirror.py
 #, python-brace-format
 msgid "{appid} is missing {name}"
 msgstr "{appid} tem falta de {name}"
 
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "{appid}: Unknown extlib {path} in build '{versionName}'"
@@ -2593,8 +2641,8 @@ msgstr "{build_flag} deve ser um inteiro, encontrado: {value}"
 
 #: ../fdroidserver/metadata.py
 #, python-brace-format
-msgid "{build_flag} must be list or string, found: {value}"
-msgstr "{build_flag} deve ser uma lista ou uma cadeia de caracteres, encontrado: {value}"
+msgid "{field} not terminated in {name}"
+msgstr "{field} não foi terminado em {name}"
 
 #: ../fdroidserver/metadata.py
 #, python-brace-format
@@ -2603,15 +2651,10 @@ msgstr "{file} está em branco ou corrompido!"
 
 #: ../fdroidserver/update.py
 #, python-brace-format
-msgid "{name} \"{section}/icons/{path}\" does not exist! Check \"config.yml\"."
-msgstr "{name} \"{section}/icons/{path}\" não existe! Corrija-o no \"config.yml\"."
+msgid "{name} \"{path}\" does not exist! Correct it in config.py."
+msgstr "{name} \"{path}\" não existe! Corrija-o no config.py."
 
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{path1} is a duplicate of {path2}, remove one!"
-msgstr "{path1} é uma duplicata de {path2}, remova uma!"
-
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 #, python-brace-format
 msgid "{path} already exists, ignoring import results!"
 msgstr "{path} já existe, a ignorar os resultados das importações!"
@@ -2626,36 +2669,6 @@ msgstr "{path} não existe! Crie-o executando:"
 msgid "{path} has bad file signature \"{pattern}\", possible Janus exploit!"
 msgstr "{path} tem uma má assinatura de ficheiro \"{pattern}\", um exploração Janus é possível!"
 
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "{path} has been flagged by virustotal {count} times:"
-msgstr "{path} foi marcado por virustotal {count} vezes:"
-
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "{path} has the wrong fingerprint ({fingerprint})!"
-msgstr "{path} tem a impressão digital errada ({fingerprint})!"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "{path} is not \"key: value\" dict, but a {datatype}!"
-msgstr "{path} não é um dicionário \"key: value\", mas um {datatype}!"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "{path} is not a standard config file!"
-msgstr "{path} não é um ficheiro de configuração padrão!"
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "{path} is not list, but a {datatype}!"
-msgstr "{path} não é uma lista, mas um {datatype}!"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "{path} is not {expected_type}, but a {datatype}!"
-msgstr "{path} não é um {expected_type}, mas um {datatype}!"
-
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "{path} is zero size!"
@@ -2664,24 +2677,14 @@ msgstr "{path} tem um tamanho de zero!"
 #: ../fdroidserver/deploy.py
 #, python-brace-format
 msgid "{path} more than 200MB, manually upload: {url}"
-msgstr "{path} mais que 200MB, enviar manualmente: {url}"
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "{path}: \"{code}\" is not a valid ISO_3166-1 alpha-2 country code!"
-msgstr "{path}: \"{code}\" não é um código de país ISO_3166-1 alfa-2 válido!"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{path}: {error}"
-msgstr "{path}: {error}"
+msgstr "{path} mais de 200MB, enviar manualmente: {url}"
 
 #: ../fdroidserver/mirror.py
 #, python-brace-format
 msgid "{url} does not end with \"fdroid\", check the URL path!"
 msgstr "{url} não termina com \"fdroid\", verifique o caminho na URL!"
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/common.py
 #, python-brace-format
 msgid "{url} does not start with \"http\"!"
 msgstr "{url} não começa com \"http\"!"
@@ -2697,3 +2700,9 @@ msgid "{} build succeeded"
 msgid_plural "{} builds succeeded"
 msgstr[0] "{} compilação com sucesso"
 msgstr[1] "{} compilações com sucesso"
+
+#~ msgid "Cannot find a packageName for {path}!"
+#~ msgstr "Não é possível encontrar um packageName para {path} 1!"
+
+#~ msgid "Cannot find an appid for {path}!"
+#~ msgstr "Não é possível encontrar um appid para {path} 1!"
diff --git a/locale/pt_BR/LC_MESSAGES/fdroidserver.po b/locale/pt_BR/LC_MESSAGES/fdroidserver.po
index ea2ad833..2776035d 100644
--- a/locale/pt_BR/LC_MESSAGES/fdroidserver.po
+++ b/locale/pt_BR/LC_MESSAGES/fdroidserver.po
@@ -2,33 +2,49 @@
 # Copyright (C) YEAR Free Software Foundation, Inc.
 # Wellington Terumi Uemura <wellingtonuemura@gmail.com>, 2020.
 # André Marcelo Alvarenga <andrealvarenga@gmx.net>, 2020.
-# Hans-Christoph Steiner <hans@guardianproject.info>, 2020, 2024.
-# Rafael Fontenelle <rafaelff@gnome.org>, 2020, 2021.
+# Hans-Christoph Steiner <hans@guardianproject.info>, 2020.
+# Rafael Fontenelle <rafaelff@gnome.org>, 2020.
 # ssantos <ssantos@web.de>, 2020.
 # The Cats <philosoph@snopyta.org>, 2020.
-# Eduardo Rodrigues <edu.rodrigues2580@gmail.com>, 2021.
-# Flavio F. M. <flavius_androiduser@protonmail.com>, 2022.
-# The Cats <philosoph@danwin1210.de>, 2023.
-# lucasmz-dev <git@lucasmz.dev>, 2024.
-# Jose Delvani <delvani.eletricista@gmail.com>, 2024.
-# Jose Delvani <jsdelvani@users.noreply.hosted.weblate.org>, 2024.
-# LucasMZ <git@lucasmz.dev>, 2024, 2025.
-# dedakir923 <dedakir923@exoular.com>, 2024.
-# Igor Rückert <igorruckert@yahoo.com.br>, 2025.
 msgid ""
 msgstr ""
 "Project-Id-Version: fdroidserver 0.9\n"
 "Report-Msgid-Bugs-To: https://gitlab.com/fdroid/fdroidserver/issues\n"
-"POT-Creation-Date: 2025-06-25 09:52+0200\n"
-"PO-Revision-Date: 2025-03-26 10:00+0000\n"
-"Last-Translator: Igor Rückert <igorruckert@yahoo.com.br>\n"
+"POT-Creation-Date: 2020-10-21 18:05+0200\n"
+"PO-Revision-Date: 2020-11-09 19:08+0000\n"
+"Last-Translator: The Cats <philosoph@snopyta.org>\n"
 "Language-Team: Portuguese (Brazil) <https://hosted.weblate.org/projects/f-droid/fdroidserver/pt_BR/>\n"
 "Language: pt_BR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Generator: Weblate 5.11-dev\n"
+"X-Generator: Weblate 4.3.2\n"
+
+#: ../fdroidserver/common.py
+msgid ""
+"\n"
+"        This is a repository of apps to be used with FDroid. Applications in this\n"
+"        repository are either official binaries built by the original application\n"
+"        developers, or are binaries built from source by f-droid.org using the\n"
+"        tools on https://gitlab.com/fdroid.\n"
+"        "
+msgstr ""
+"\n"
+"        Este é um repositório de aplicativos a serem usados com o FDroid. Os\n"
+"        aplicativos neste repositório são binários oficiais compilados pelos\n"
+"        desenvolvedores do aplicativo original ou são binários compilados a\n"
+"        partir da fonte por f-droid.org usando as ferramentas em\n"
+"        https://gitlab.com/fdroid.\n"
+"        "
+
+#: ../fdroidserver/nightly.py
+msgid ""
+"\n"
+"SSH Public Key to be used as Deploy Key:"
+msgstr ""
+"\n"
+"Chave pública SSH para ser usada como chave de implantar:"
 
 #: ../fdroidserver/nightly.py
 msgid ""
@@ -52,26 +68,22 @@ msgstr ""
 msgid "\"%s/\" has no matching metadata file!"
 msgstr "\"%s/\" não tem arquivo de metadados correspondente!"
 
-#: ../fdroidserver/index.py
-msgid "\"isPrimary\" key should not be added to mirrors!"
-msgstr "A chave \"isPrimary\" não deve ser adicionada em espelhos!"
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "\"local_copy_dir\" {path} does not exist!"
-msgstr "O diretório raiz para \"local_copy_dir\" {path} não existe!"
-
 #: ../fdroidserver/install.py
 #, python-brace-format
 msgid "\"{apkfilename}\" is already installed on {dev}."
 msgstr "\"{apkfilename}\" já está instalado em {dev}."
 
+#: ../fdroidserver/update.py
+#, python-brace-format
+msgid "\"{path}\" contains outdated {name} ({version})"
+msgstr "\"{path}\" contém {name} ({version}) desatualizado"
+
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "\"{path}\" contains recent {name} ({version})"
 msgstr "\"{path}\" contém {name} ({version}) recente"
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "\"{path}\" exists but s3cmd is not installed!"
 msgstr "\"{path}\" existe, mas s3cmd não está instalado!"
@@ -81,84 +93,119 @@ msgstr "\"{path}\" existe, mas s3cmd não está instalado!"
 msgid "\"{path}\" is not a supported file format (use: metadata/*.yml)"
 msgstr "\"{path}\" não é um formato aceito (use: metadata/*.yml)"
 
-#: ../fdroidserver/update.py
+#: ../fdroidserver/metadata.py
 #, python-brace-format
-msgid "\"{path}\" is signed by a key that is not allowed:"
-msgstr "\"{path}\" é assinado por uma chave que não é permitida:"
+msgid "\"{path}\" is not an accepted format, convert to: {formats}"
+msgstr "\"{path}\" não é um formato aceito, converter para: {formats}"
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/common.py
 #, python-brace-format
 msgid "\"{url}\" is not a valid URL!"
 msgstr "\"{url}\" não é uma URL válida!"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, python-format
+msgid "%(option)s option requires %(number)d argument"
+msgid_plural "%(option)s option requires %(number)d arguments"
+msgstr[0] "opção %(option)s necessita %(number)d argumento"
+msgstr[1] "opção %(option)s necessita %(number)d argumentos"
+
+#: ../fdroidserver/mirror.py
+#, python-format
+msgid "%(prog)s [options] url"
+msgstr "%(prog)s [opções] url"
+
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "%(prog)s: error: %(message)s\n"
 msgstr "%(prog)s: erro: %(message)s\n"
 
-#: ../fdroidserver/publish.py
-#, python-format
-msgid "%d APKs failed to be signed or verified!"
-msgstr "%d APKs falharam em serem assinados ou verificados!"
-
 #: ../fdroidserver/scanner.py
 #, python-format
 msgid "%d problems found"
 msgstr "%d problemas encontrados"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "%prog [options]"
+msgstr "%prog [opções]"
+
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "%r is not callable"
 msgstr "%r não é chamável"
 
-#: ../fdroidserver/signindex.py
-#, python-format
-msgid "%s did not produce a dict!"
-msgstr "%s não produziu um dict!"
-
-#: ../fdroidserver/signindex.py
-#, python-format
-msgid "%s has bad SHA-256: %s"
-msgstr "%s tem SHA-256 ruim: %s"
-
 #: ../fdroidserver/lint.py
 #, python-format
 msgid "%s is not an accepted build field"
 msgstr "%s não é um campo criado aceito"
 
-#: ../fdroidserver/common.py
-msgid "'keypass' not found in config.yml!"
-msgstr "'keypass' não foi encontrada em config.yml!"
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, python-format
+msgid "%s option does not take a value"
+msgstr "opção %s não leva um valor"
+
+#: ../fdroidserver/index.py ../fdroidserver/common.py
+msgid "'keypass' not found in config.py!"
+msgstr "'keypass' não foi encontrada em config.py!"
 
 #: ../fdroidserver/common.py
 msgid "'keystore' is NONE and 'smartcardoptions' is blank!"
 msgstr "\"keystore\" é NONE e \"smartcardoptions\" está vazia!"
 
-#: ../fdroidserver/common.py
-msgid "'keystore' not found in config.yml!"
-msgstr "'keystore' não encontrada em config.yml!"
+#: ../fdroidserver/index.py ../fdroidserver/common.py
+msgid "'keystore' not found in config.py!"
+msgstr "'keystore' não encontrada em config.py!"
 
-#: ../fdroidserver/common.py
-msgid "'keystorepass' not found in config.yml!"
-msgstr "'keystorepass' não encontrada em config.yml!"
+#: ../fdroidserver/index.py ../fdroidserver/common.py
+msgid "'keystorepass' not found in config.py!"
+msgstr "'keystorepass' não encontrada em config.py!"
 
-#: ../fdroidserver/common.py
-msgid "'repo_keyalias' not found in config.yml!"
-msgstr "'repo_keyalias' não encontrada em config.yml!"
+#: ../fdroidserver/index.py ../fdroidserver/common.py
+msgid "'repo_keyalias' not found in config.py!"
+msgstr "'repo_keyalias' não encontrada em config.py!"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "'required' is an invalid argument for positionals"
 msgstr "'required' é um argumento inválido para posicionadores"
 
 #: ../fdroidserver/common.py
-msgid "'sdk_path' not set in config.yml!"
-msgstr "\"sdk_path\" não definido em config.yml!"
+msgid "'sdk_path' not set in 'config.py'!"
+msgstr "'sdk_path' não definido em 'config.py'!"
+
+#. Translators: "build-tools" is the file name of a package from
+#. Google, it is part of the Android SDK. So it probably shouldn't be
+#. translated or transliterated.
+#: ../fdroidserver/common.py
+#, python-brace-format
+msgid "'{aapt}' is too old, fdroid requires build-tools-23.0.0 or newer!"
+msgstr "'{aapt}' é muito antigo, fdroid requer build-tools-23.0.0 ou mais recente!"
 
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "'{aapt}' is too old, fdroid requires build-tools-{version} or newer!"
 msgstr "'{aapt}' é muito antigo, fdroid requer build-tools-{version} ou mais recente!"
 
+#: ../fdroidserver/install.py
+#, python-brace-format
+msgid "'{apkfilename}' is already installed on {dev}."
+msgstr "'{apkfilename}' já está instalado no {dev}."
+
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "'{field}' in {linedesc} is obsolete, see docs for current fields:"
+msgstr "O '{field}' em {linedesc} é obsoleto, veja a documentação para conhecer os campos atuais:"
+
+#: ../fdroidserver/common.py
+#, python-brace-format
+msgid "'{field}' will be in random order! Use () or [] brackets if order is important!"
+msgstr "'{field}' será em ordem aleatória! Use () ou [] se a ordem for importante!"
+
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "'{path}' failed to execute!"
@@ -166,31 +213,22 @@ msgstr "'{path}' falhou ao executar!"
 
 #: ../fdroidserver/metadata.py
 #, python-brace-format
-msgid "'{path}' has invalid format, it should be a dictionary!"
-msgstr "'{path}' tem um formato inválido, deveria ser um dicionário!"
-
-#: ../fdroidserver/lint.py ../fdroidserver/metadata.py
-#, python-brace-format
 msgid "'{value}' is not a valid {field} in {appid}. Regex pattern: {pattern}"
 msgstr "'{value}' não é um{field} válido em {appid}. Regex padrão: {pattern}"
 
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "'{value}' is not a valid {field}, should be {pattern}"
-msgstr "'{value}' não é um {field} válido, deveria ser {pattern}"
-
-#: ../fdroidserver/checkupdates.py
-msgid "--merge-request only runs on a single appid!"
-msgstr "--merge-request roda somente com um único appid!"
-
 #: ../fdroidserver/checkupdates.py
 #, python-brace-format
 msgid "...checkupdate failed for {appid} : {error}"
 msgstr "...checkupdate falhou para {appid} : {error}"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid ".__call__() not defined"
-msgstr ".__call__() não definida"
+msgstr ".__ligação__() não definida"
+
+#: ../fdroidserver/metadata.py
+msgid ".fdroid.txt is not supported!  Convert to .fdroid.yml or .fdroid.json."
+msgstr ".fdroid.txt não é suportado!  Converter para .fdroid.yml ou .fdroid.json."
 
 #: ../fdroidserver/lint.py
 msgid "/issues is missing"
@@ -200,15 +238,14 @@ msgstr "está faltando o /issues"
 msgid "A URL is required as an argument!"
 msgstr "Uma URL é necessária como um argumento!"
 
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "APK signatures have different certificates in {path}:"
-msgstr "As assinaturas do APK têm certificados diferentes em {path}:"
-
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Add PGP signatures using GnuPG for packages in repo"
 msgstr "Adicione assinaturas PGP usando GnuPG para os pacotes no repositório"
 
+#: ../fdroid ../fdroidserver/__main__.py
+msgid "Add a new application from its source code"
+msgstr "Adicione um novo aplicativo a partir do seu código fonte"
+
 #: ../fdroidserver/update.py
 msgid "Add a repo signing key to an unsigned repo"
 msgstr "Adicionar uma chave de assinatura para um repositório não assinado"
@@ -226,11 +263,7 @@ msgstr "Adicionando novo repositório para apenas {name}"
 msgid "Alias of the repo signing key in the keystore"
 msgstr "Alias (apelido) da chave de assinatura do repositório na keystore"
 
-#: ../fdroidserver/build.py
-msgid "AllowedAPKSigningKeys missing but reference binary supplied"
-msgstr "AllowedAPKSigningKeys ausente, mas binário de referência fornecido"
-
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "Allows a different revision (or git branch) to be specified for the initial import"
 msgstr "Permite que uma revisão diferente (ou árvore do git) seja especificada para a importação inicial"
 
@@ -254,10 +287,14 @@ msgstr "Arquivo APK do Android"
 msgid "Android DEX code"
 msgstr "Código DEX do Android"
 
-#: ../fdroidserver/init.py
+#: ../fdroidserver/common.py ../fdroidserver/build.py
 #, python-brace-format
-msgid "Android SDK not found at {path}!"
-msgstr "Android SDK não encontrado em {path}!"
+msgid "Android SDK '{path}' does not have '{dirname}' installed!"
+msgstr "O SDK Android '{path}' não tem '{dirname}' instalado!"
+
+#: ../fdroidserver/common.py
+msgid "Android SDK not found!"
+msgstr "SDK do Android não foi encontrado!"
 
 #: ../fdroidserver/common.py
 #, python-brace-format
@@ -269,28 +306,23 @@ msgstr "O caminho do SDK Android '{path}' não existe!"
 msgid "Android SDK path '{path}' is not a directory!"
 msgstr "O caminho do SDK Android '{path}' não é um diretório!"
 
+#. Translators: "build-tools" is the file name of a package from
+#. Google, it is part of the Android SDK. So it probably shouldn't be
+#. translated or transliterated.
 #: ../fdroidserver/common.py
 #, python-brace-format
-msgid "Android SDK tool {cmd} not found!"
-msgstr "A ferramenta SDK do Android {cmd} não foi encontrada!"
+msgid "Android build-tools path '{path}' does not exist!"
+msgstr "Caminho de build-tools do Android '{path}' não existe!"
 
-#: ../fdroidserver/lint.py
-msgid "App has Binaries but does not have corresponding AllowedAPKSigningKeys to pin certificate."
-msgstr "O aplicativo tem binários, mas não tem AllowedAPKSigningKeys correspondentes para fixar o certificado."
-
-#: ../fdroidserver/lint.py
-msgid "App has NoSourceSince or ArchivePolicy \"0 versions\" or 0 but AutoUpdateMode or UpdateCheckMode are not None"
-msgstr "O aplicativo tem NoSourceSince ou ArchivePolicy \"0 versões\" ou 0, mas AutoUpdateMode ou UpdateCheckMode não são None"
+#: ../fdroidserver/update.py
+msgid "AndroidManifest.xml has no date"
+msgstr "AndroidManifest.xml não tem data"
 
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "App is in '{repo}' but has a link to {url}"
 msgstr "O App está em '{repo}' mas tem um link para {url}"
 
-#: ../fdroidserver/lint.py
-msgid "App version has binary but does not have corresponding AllowedAPKSigningKeys to pin certificate."
-msgstr "A versão do aplicativo tem binário, mas não tem as correspondentes AllowedAPKSigningKeys para fixar o certificado."
-
 #: ../fdroidserver/lint.py
 msgid "Appending .git is not necessary"
 msgstr "Acrescentar .git não é necessário"
@@ -300,27 +332,11 @@ msgstr "Acrescentar .git não é necessário"
 msgid "Archiving {apkfilename} with invalid signature!"
 msgstr "Arquivamento {apkfilename} com assinatura inválida!"
 
-#: ../fdroidserver/lint.py
-msgid "AutoUpdateMode with UpdateCheckMode: HTTP must have a pattern."
-msgstr "AutoUpdateMode com atualização CheckMode: HTTP deve ter um padrão."
-
-#: ../fdroidserver/install.py
-msgid "Automatic no to all prompts."
-msgstr "Não automático à todas as perguntas."
-
-#: ../fdroidserver/install.py
-msgid "Automatic yes to all prompts."
-msgstr "Sim automático à todas as perguntas."
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "Bad entry type \"{mirrortype}\" in mirrors config: {mirror}"
-msgstr "Tipo de entrada incorreto \"{mirrortype}\" na configuração de espelhos: {mirror}"
-
 #: ../fdroidserver/mirror.py
 msgid "Base URL to mirror, can include the index signing key using the query string: ?fingerprint="
 msgstr "URL base para espelhar, pode incluir a chave de assinatura de índice usando a string de consulta:? Fingerprint ="
 
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "Branch '{branch}' used as commit in build '{versionName}'"
@@ -336,9 +352,9 @@ msgstr "Ramificação '{branch}' usada como commit em srclib '{srclib}'"
 msgid "Broken symlink: {path}"
 msgstr "Link simbólico quebrado: {path}"
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Build a package from source"
-msgstr "Compila um pacote a partir do código-fonte"
+msgstr "Compilar um pacote a partir do código fonte"
 
 #: ../fdroidserver/build.py
 msgid "Build all applications available"
@@ -356,86 +372,94 @@ msgstr "Construir metadados git repo não tem mudanças comprometidas!"
 msgid "Build only the latest version of each package"
 msgstr "Compilar apenas a última versão de cada pacote"
 
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Build should have comma-separated versionName and versionCode, not \"{value}\", in {linedesc}"
+msgstr "A compilação deve ter versionName e versionCode separados por vírgula, e não \"{value} 1\", em {linedesc} 2"
+
 #: ../fdroidserver/init.py
 #, python-format
 msgid "Built repo based in \"%s\" with this config:"
 msgstr "Repo construído baseado em \"%s\" com esta configuração:"
 
-#: ../fdroidserver/checkupdates.py
-msgid "Can't auto-update app with no CurrentVersionCode"
-msgstr "Não pode atualizar automaticamente o aplicativo sem CurrentVersionCode"
-
 #: ../fdroidserver/build.py
 msgid "Can't build due to {} error while scanning"
 msgid_plural "Can't build due to {} errors while scanning"
 msgstr[0] "Não é possível criar devido a {} erro durante a digitalização"
 msgstr[1] "Não é possível criar devido a {} erros durante a digitalização"
 
-#: ../fdroidserver/common.py
-#, fuzzy, python-brace-format
-msgid "Cannot read {path}: {error}"
-msgstr "Falha ao ler {path}: {error}"
+#: ../fdroidserver/vmtools.py
+#, python-brace-format
+msgid "Cannot read \"{path}\"!"
+msgstr "Impossível ler \"{path}\"!"
+
+#. Translators: https://developer.android.com/studio/build/application-id
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Cannot resolve application ID {appid}"
+msgstr "Impossível resolver o ID do Aplicativo {appid}"
 
 #: ../fdroidserver/rewritemeta.py
 #, python-brace-format
 msgid "Cannot rewrite \"{path}\""
 msgstr "Não é possível reescrever \"{path}\""
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
+#: ../fdroidserver/rewritemeta.py
+msgid "Cannot use --list and --to at the same time"
+msgstr "Não é possível usar --list e --to ao mesmo tempo"
+
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Cannot write \"{path}\", not an accepted format, use: {formats}"
+msgstr "Não é possível escrever \"{path}\" por não ser um formato aceito. Use: {formats}"
+
 #: ../fdroidserver/lint.py
 #, python-format
 msgid "Categories '%s' is not valid"
 msgstr "Categorias '%s' não são válidas"
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
 #: ../fdroidserver/lint.py
 msgid "Categories are not set"
 msgstr "As categorias não estão definidas"
 
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "Category \"{category}\" defined but not used for any apps!"
-msgstr "Categoria \"{category}\" definida, mas não usada para nenhum aplicativo!"
-
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Check for updates to applications"
-msgstr "Verifica se existem atualizações para os aplicativos"
+msgstr "Verifique se existem atualizações para os aplicativos"
 
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Checking archiving for {appid} - apks:{integer}, keepversions:{keep}, archapks:{arch}"
-msgstr "Verificar o arquivamento de {appid} - apks:{integer}, keepversions:{keep}, archapks:{arch}"
+msgstr "Verificar o arquivamento de {appid} - APKs: {integer}, Versões Mantidas: {keep}, Arcos de APKs: {arch}"
+
+#: ../fdroidserver/dscanner.py
+msgid "Clean after all scans have finished"
+msgstr "Limpar depois que todos os escaneamentos terminarem"
+
+#: ../fdroidserver/dscanner.py
+msgid "Clean before the scans start and rebuild the container"
+msgstr "Limpar antes do escanemento começar e recompilar o container"
+
+#: ../fdroidserver/dscanner.py
+msgid "Clean up all containers and then exit"
+msgstr "Limpar todos os containers e então sair"
 
 #: ../fdroidserver/update.py
 msgid "Clean update - don't uses caches, reprocess all APKs"
 msgstr "Atualização limpa - não utiliza o cache, reprocessa todos os APKs"
 
-#: ../fdroidserver/common.py
-msgid "Color the log output"
-msgstr "Colorir a saída de registros"
-
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "Comma separated list of categories."
 msgstr "Lista de categorias separadas por vírgula."
 
-#: ../fdroidserver/__main__.py
-#, python-format
+#: ../fdroid ../fdroidserver/__main__.py
+#, c-format, python-format
 msgid "Command '%s' not recognised.\n"
-msgstr "Comando \"%s\" não reconhecido.\n"
+msgstr "Comando '%s' não é reconhecido\n"
 
 #: ../fdroidserver/checkupdates.py
 msgid "Commit changes"
 msgstr "Enviar mudanças"
 
-#: ../fdroidserver/checkupdates.py
-msgid "Commit changes, push, then make a merge request"
-msgstr "Fazer commit das mudanças, push, e então faça uma merge request"
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Conflicting \"{field}\" definitions between .yml and localized files:"
-msgstr "Definições conflitantes de \"{field}\" entre arquivos .yml e localizados:"
-
 #: ../fdroidserver/__main__.py
 msgid "Conflicting arguments: '--verbose' and '--quiet' can not be specified at the same time."
 msgstr "Argumentos conflitantes: \"--verbose\" e \"--quiet\" não podem ser especificados ao mesmo tempo."
@@ -445,13 +469,11 @@ msgstr "Argumentos conflitantes: \"--verbose\" e \"--quiet\" não podem ser espe
 msgid "Could not find '{command}' on your system"
 msgstr "Impossível encontrar '{command}' em seu sistema"
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "Could not find latest version code"
 msgstr "Não foi possível encontrar o código da versão mais recente"
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "Could not find latest version name"
 msgstr "Não foi possível encontrar o nome da versão mais recente"
 
@@ -461,25 +483,30 @@ msgid "Could not find {path} to remove it"
 msgstr "Impossível encontrar {path} para removê-lo"
 
 #: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Could not open APK {path} for analysis: "
-msgstr "Impossível abrir o APK {path} para análise: "
+msgid "Could not open apk file for analysis"
+msgstr "Impossível abrir o arquivo de APK para analisá-lo"
 
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "Could not parse size \"{size}\", wrong type \"{type}\""
 msgstr "Não foi possível analisar o tamanho \"{size}\", tipo incorreto \"{type}\""
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/import_subcommand.py
+#. Translators: https://developer.android.com/studio/build/application-id
+#: ../fdroidserver/import.py
 msgid "Couldn't find Application ID"
 msgstr "Não foi possível encontrar o ID do aplicativo"
 
-#: ../fdroidserver/checkupdates.py
-msgid "Couldn't find any version information"
-msgstr "Não foi possível encontrar nenhuma informação de versão"
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
+#: ../fdroidserver/import.py
+msgid "Couldn't find latest version code"
+msgstr "Impossível encontrar o código da versão mais recente"
 
-#: ../fdroidserver/checkupdates.py
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
+#: ../fdroidserver/import.py
+msgid "Couldn't find latest version name"
+msgstr "Impossível encontrar o nome da versão mais recente"
+
+#: ../fdroidserver/import.py
 msgid "Couldn't find package ID"
 msgstr "Impossível encontrar o ID do pacote"
 
@@ -487,26 +514,29 @@ msgstr "Impossível encontrar o ID do pacote"
 msgid "Cowardily refusing to overwrite existing signing key setup!"
 msgstr "Recusando-se covardemente de sobrescrever a configuração de chave de assinatura existente!"
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/update.py
+msgid "Create a repo signing key in a keystore"
+msgstr "Criar uma chave de assinatura do repositório em uma keystore"
+
+#: ../fdroidserver/update.py
+msgid "Create skeleton metadata files that are missing"
+msgstr "Criar as bases dos arquivos de metadados que estão faltando"
+
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Created new container \"{name}\""
 msgstr "Novo container criado \"{name}\""
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Creating \"{path}\" for configuring s3cmd."
 msgstr "Criando \"{path}\" para configurar s3cmd."
 
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Creating empty {config_file}"
-msgstr "Criando '{config_file}' vazio"
-
 #: ../fdroidserver/publish.py
 msgid "Creating log directory"
 msgstr "Criando diretório de registro"
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Creating new S3 bucket: {url}"
 msgstr "Criando o novo Balde de S3: {url}"
@@ -519,7 +549,8 @@ msgstr "Criando diretório de saída"
 msgid "Creating signed index with this key (SHA256):"
 msgstr "Criando índice assinado com esta chave (SHA256):"
 
-#: ../fdroidserver/publish.py ../fdroidserver/verify.py
+#: ../fdroidserver/import.py ../fdroidserver/verify.py
+#: ../fdroidserver/publish.py
 msgid "Creating temporary directory"
 msgstr "Criando diretório temporário"
 
@@ -538,7 +569,7 @@ msgstr "DEBUG_KEYSTORE não está definido ou o valor está incompleto"
 
 #: ../fdroidserver/update.py
 msgid "Delete APKs and/or OBBs without metadata from the repo"
-msgstr "Apaga os APKs e/ou OBBs sem metadados do repositório"
+msgstr "Apagar os APKs e/ou OBBs sem metadados do repositório"
 
 #: ../fdroidserver/deploy.py
 #, python-brace-format
@@ -558,28 +589,23 @@ msgstr "Excluindo arquivo desconhecido: {path}"
 #: ../fdroidserver/lint.py
 #, python-format
 msgid "Description '%s' is just the app's summary"
-msgstr "Descrição '%s' é apenas o resumo do app"
+msgstr "Descrição '%s' é apenas o resumo do aplicativo"
 
 #: ../fdroidserver/lint.py
 msgid "Description has a duplicate line"
 msgstr "Descrição tem uma linha duplicada"
 
+#: ../fdroidserver/lint.py
+#, python-format
+msgid "Description has a list (%s) but it isn't bulleted (*) nor numbered (#)"
+msgstr "Descrição tem uma lista (%s), mas não é com marcadores (*) nem numerada (#)"
+
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "Description of length {length} is over the {limit} char limit"
 msgstr "A descrição de tamanho {length} está acima do limite de {limit} caracteres"
 
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Did you mean config/{name}.yml?"
-msgstr "Você quis dizer config/{name}.yml?"
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Did you mean {code}?"
-msgstr "Você quis dizer {code}?"
-
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "Do not add 'disable:' to the generated build entries"
 msgstr "Não adicione \"disable:\" para as entradas de compilação geradas"
 
@@ -604,22 +630,27 @@ msgstr "Não remova as chaves privadas geradas do keystore"
 msgid "Don't create a source tarball, useful when testing a build"
 msgstr "Não criar um tarball da fonte; útil quando testando uma compilação"
 
+#: ../fdroidserver/stats.py
+msgid "Don't do anything logs-related"
+msgstr "Não fazer nada relacionado a registros de alterações"
+
 #: ../fdroidserver/build.py
 msgid "Don't refresh the repository, useful when testing a build with no internet connection"
 msgstr "Não atualizar o repositório; útil quando testando uma compilação sem conexão com a internet"
 
 #: ../fdroidserver/deploy.py ../fdroidserver/nightly.py
+#: ../fdroidserver/upload.py
 msgid "Don't use rsync checksums"
 msgstr "Não usar as somas de verificação (checksums) do rsync"
 
-#: ../fdroidserver/install.py
-msgid "Download F-Droid.apk using mirrors that leak less to the network"
-msgstr "Faça o download do F-Droid.apk usando mirrors (sites espelhos) que vazam menos privacidade na rede"
-
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Download complete mirrors of small repos"
 msgstr "Faça o download de espelhos completos de pequenos repositórios"
 
+#: ../fdroidserver/stats.py
+msgid "Download logs we don't have"
+msgstr "Baixar os registros de alterações que nós não temos"
+
 #: ../fdroidserver/common.py
 msgid "Downloading the repository already failed once, not trying again."
 msgstr "O download do repositório já falhou uma vez, não tente novamente."
@@ -631,56 +662,38 @@ msgstr "Falha ao baixar '{url}'. {error}"
 
 #: ../fdroidserver/metadata.py
 #, python-brace-format
-msgid "Duplicate Anti-Feature declaration at {path} was ignored!"
-msgstr "A declaração duplicada do Anti-Recurso em {path} foi ignorada!"
-
-#: ../fdroidserver/index.py
-#, python-format
-msgid "Duplicate entry \"%s\" in mirrors config!"
-msgstr "Entrada \"%s\" duplicada na configuração de espelhos!"
+msgid "Duplicate build recipe found for versionCode {versionCode} in {linedesc}"
+msgstr "Receita de compilação duplicada encontrada para a versão de código {versionCode} em {linedesc}"
 
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "Duplicate link in '{field}': {url}"
 msgstr "Link duplicado em '{field}': {url}"
 
-#: ../fdroidserver/common.py
-#, python-format
-msgid "ERROR: %(message)s"
-msgstr "ERRO: %(message)s"
+#: ../fdroid
+msgid "Dynamically scan APKs post build"
+msgstr "Escanear dinamicamente os APKs após a compilação"
 
 #: ../fdroidserver/__main__.py
 msgid "ERROR: The \"server\" subcommand has been removed, use \"deploy\"!"
 msgstr "ERRO: o subcomando \"server\" foi removido, use \"deploy\"!"
 
+#: ../fdroidserver/mirror.py
+msgid ""
+"ERROR: this command should never be used to mirror f-droid.org!\n"
+"A full mirror of f-droid.org requires more than 200GB."
+msgstr ""
+"ERRO: este comando nunca deve ser usado para espelhar o f-droid.org!\n"
+"Um espelho completo de f-droid.org requer mais de 200 GB."
+
 #: ../fdroidserver/nightly.py
 msgid "ERROR: unsupported CI type, patches welcome!"
 msgstr "ERRO: tipo de IC não suportado, correções bem-vindas!"
 
-#: ../fdroidserver/nightly.py
-#, python-format
-msgid "ERROR: unsupported git host \"%s\", patches welcome!"
-msgstr "ERRO: host de git \"%s\" não suportado, patches são bem-vindos!"
-
-#: ../fdroidserver/lint.py
+#: ../fdroidserver/metadata.py
 #, python-brace-format
-msgid "ERROR: {key} in {path} is not \"archive\" or \"repo\"!"
-msgstr "ERRO: {key} em {path} não é um \"arquivamento\" ou \"repositório\"!"
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "ERROR: {key} not a valid key!"
-msgstr "ERRO: {key} não é uma chave válida!"
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "ERROR: {key}'s value should be of type {t}!"
-msgstr "ERRO: o valor de {key} deve ser do tipo {t}!"
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "ERROR: {key}:{subkey} in {path} is not in allowed keys: {allowed_keys}!"
-msgstr "ERRO: {key}:{subkey} em {path} não está nas chaves permitidas: {allowed_keys}!"
+msgid "Empty build flag at {linedesc}"
+msgstr "Bandeira de construção vazia no {linedesc}"
 
 #: ../fdroidserver/__main__.py
 #, python-brace-format
@@ -696,40 +709,20 @@ msgstr ""
 "Digite o caminho para o Android SDK (%s) aqui:\n"
 "> "
 
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Environment variable {var} from {configname} is not set!"
-msgstr "A variável de ambiente {var} de {configname} não está definida!"
+#: ../fdroidserver/deploy.py ../fdroidserver/checkupdates.py
+#: ../fdroidserver/upload.py
+#, python-format
+msgid "Error while attempting to publish log: %s"
+msgstr "Erro ao tentar publicar o registro: %s"
 
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Environment variable {{env: {var}}} is not set!"
-msgstr "A variável de ambiente {{env: {var} não está definida!"
-
-#: ../fdroidserver/deploy.py
-msgid "Error deploying 'github_releases', {} not present. (You might need to run `fdroid update` first.)"
-msgstr "Erro ao implementar 'github_releases', {} não está presente. (Talvez seja necessário executar `fdroid update` primeiro)"
-
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py ../fdroidserver/common.py
 msgid "Error while getting repo address"
 msgstr "Erro ao obter o endereço do repositório"
 
-#: ../fdroidserver/scanner.py
-msgid "Exit with a non-zero code if problems were found"
-msgstr "Sair com um código diferente de zero se problemas forem encontrados"
-
-#: ../fdroidserver/__main__.py
-msgid "Extract application metadata from a source repository"
-msgstr "Extrair metadados de aplicativos de um repositório de origem"
-
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Extract signatures from APKs"
 msgstr "Extrair assinaturas de APKs"
 
-#: ../fdroidserver/install.py
-msgid "F-Droid.apk could not be downloaded from any known source!"
-msgstr "F-Droid.apk não pode ser baixado de nenhuma fonte conhecida!"
-
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Failed copying {path}: {error}"
@@ -750,34 +743,42 @@ msgstr "Falha ao ler {path}: {error}"
 msgid "Failed resizing {path}: {error}"
 msgstr "Falha ao redimensionar {path}: {error}"
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/publish.py
+msgid "Failed to align application"
+msgstr "Falha ao alinhar a aplicação"
+
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Failed to create S3 bucket: {url}"
 msgstr "Falha ao criar o Balde do S3: {url}"
 
+#: ../fdroidserver/common.py
+msgid "Failed to get APK manifest information"
+msgstr "Falha ao obter informações de manifesto do APK"
+
 #: ../fdroidserver/update.py
 #, python-brace-format
-msgid "Failed to get APK information, deleting {path}"
+msgid "Failed to get apk information, deleting {path}"
 msgstr "Falha ao obter informações do APK, excluindo {path}"
 
 #: ../fdroidserver/update.py
 #, python-brace-format
-msgid "Failed to get APK information, skipping {path}"
+msgid "Failed to get apk information, skipping {path}"
 msgstr "Falha ao obter informações do APK, ignorando {path}"
 
-#: ../fdroidserver/update.py
-msgid "Failed to get APK signing key fingerprint"
-msgstr "Falha ao obter a impressão digital da chave de assinatura do APK"
-
 #: ../fdroidserver/install.py
 #, python-brace-format
 msgid "Failed to install '{apkfilename}' on {dev}: {error}"
 msgstr "Falha ao instalar '{apkfilename}' em {dev}: {error}"
 
-#: ../fdroidserver/common.py
+#: ../fdroidserver/publish.py ../fdroidserver/common.py
 msgid "Failed to sign application"
 msgstr "Falha ao assinar inscrição"
 
+#: ../fdroidserver/common.py
+msgid "Failed to zipalign application"
+msgstr "Falha no zipaligning do aplicativo"
+
 #: ../fdroidserver/build.py
 #, python-brace-format
 msgid "Fetched buildserverid from VM: {buildserverid}"
@@ -793,19 +794,28 @@ msgstr "As assinaturas buscadas para '{apkfilename}' -> '{sigdir}'"
 msgid "File disappeared while processing it: {path}"
 msgstr "O arquivo desapareceu enquanto era processado: {path}"
 
-#: ../fdroidserver/build.py ../fdroidserver/install.py
-#: ../fdroidserver/rewritemeta.py ../fdroidserver/scanner.py
-#: ../fdroidserver/update.py
+#: ../fdroidserver/verify.py ../fdroidserver/stats.py ../fdroidserver/update.py
+#: ../fdroidserver/rewritemeta.py ../fdroidserver/build.py
+#: ../fdroidserver/checkupdates.py ../fdroidserver/scanner.py
+#: ../fdroidserver/install.py
 msgid "Finished"
 msgstr "Acabado"
 
+#: ../fdroidserver/lint.py
+msgid "Flattr donation methods belong in the FlattrID flag"
+msgstr "Métodos de doação Flattr pertencem ao sinalizador FlattrID"
+
+#: ../fdroidserver/lint.py
+msgid "Flattr donation methods belong in the FlattrID: field"
+msgstr "Métodos de doação Flattr pertencem ao campo FlattrID"
+
 #: ../fdroidserver/lint.py
 msgid "Forbidden HTML tags"
 msgstr "Tags HTML proibidas"
 
 #: ../fdroidserver/build.py
 msgid "Force build of disabled apps, and carries on regardless of scan problems. Only allowed in test mode."
-msgstr "Forçar a compilação de apps desativados e continuar independentemente de problemas de escaneamento. Apenas permitido no modo de teste."
+msgstr "Forçar a compilação de aplicativos desativados e continuar independentemente de problemas de escaneamento. Apenas permitido no modo de teste."
 
 #: ../fdroidserver/build.py
 #, python-brace-format
@@ -819,7 +829,7 @@ msgstr "Força varredura de aplicativos e compilações desativadas."
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Found \"{path}\" graphic without metadata for app \"{name}\"!"
-msgstr "Foi encontrado o gráfico \"{path}\" sem metadados para o app \"{name}\"!"
+msgstr "Foi encontrado o gráfico \"{path}\" sem metadados para o aplicativo \"{name}\"!"
 
 #: ../fdroidserver/update.py
 #, python-brace-format
@@ -828,21 +838,18 @@ msgstr "Encontrado arquivo inválido \"{path}\" de financiamento para \"{name}\"
 
 #: ../fdroidserver/common.py
 msgid "Found invalid appids in arguments"
-msgstr "Encontrou apps inválidos em argumentos"
+msgstr "Encontrou aplicativos inválidos em argumentos"
 
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
 #: ../fdroidserver/common.py
 msgid "Found invalid versionCodes for some apps"
-msgstr "Encontrado versões de códigos inválidas para alguns apps"
+msgstr "Encontrado versões de códigos inválidas para alguns aplicativos"
 
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "Found multiple JAR Signature Block Files in {path}"
 msgstr "Encontrados vários arquivos de bloqueio de assinatura JAR em {path}"
 
-#: ../fdroidserver/common.py
-msgid "Found multiple Signer Certificates!"
-msgstr "Foram encontrados vários certificados de assinantes!"
-
 #: ../fdroidserver/metadata.py
 #, python-brace-format
 msgid "Found multiple metadata files for {appid}"
@@ -852,6 +859,11 @@ msgstr "Encontrados vários arquivos de metadados para {appid}"
 msgid "Found multiple signing certificates for repository."
 msgstr "Encontrado vários certificados de assinatura para o repositório."
 
+#: ../fdroidserver/update.py
+#, python-brace-format
+msgid "Found multiple signing certificates in {path}"
+msgstr "Encontrado vários certificados de assinatura em {path}"
+
 #: ../fdroidserver/index.py
 msgid "Found no signing certificates for repository."
 msgstr "Não encontrado os certificados de assinatura para o repositório."
@@ -866,16 +878,6 @@ msgstr "Arquivo não encontrado em %s"
 msgid "Found {apkfilename} at {url}"
 msgstr "Encontrado {apkfilename} em {url}"
 
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Found {count} problems in {filename}"
-msgstr "{count} problemas encontrados em {filename}"
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Found {count} warnings in {filename}"
-msgstr "{count} advertências encontradas em {filename}"
-
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Generated skeleton metadata for {appid}"
@@ -894,21 +896,19 @@ msgstr "Falha ao limpar o Git"
 msgid "Git fetch failed"
 msgstr "Falha no 'fetch' do Git"
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
+#: ../fdroidserver/common.py
+msgid "Git remote set-head failed"
+msgstr "Falha ao indicar o 'head' do Git remoto"
+
 #: ../fdroidserver/common.py
 #, python-format
 msgid "Git remote set-head failed: \"%s\""
 msgstr "Git remote set-head falhou: \"%s\""
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
 #: ../fdroidserver/common.py
 msgid "Git reset failed"
 msgstr "Falha no 'reset' do Git"
 
-#: ../fdroidserver/common.py
-msgid "Git submodule deinit failed"
-msgstr "Falha no submódulo Git deinit"
-
 #: ../fdroidserver/common.py
 msgid "Git submodule sync failed"
 msgstr "Falha na sincronização do submódulo Git"
@@ -940,16 +940,6 @@ msgstr "Ignorando \"{field}\" em metadados \"{metapath}\" porque foi descontinua
 msgid "Ignoring FUNDING.yml entry longer than 2048: %s"
 msgstr "Ignorando entrada de FUNDING.yml maior que 2048: %s"
 
-#: ../fdroidserver/update.py
-#, python-format
-msgid "Ignoring bad element in manifest: %s"
-msgstr "Ignorando o elemento mau no manifesto: %s"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Ignoring deprecated {oldfile}, use {newfile}!"
-msgstr "Ignorando {oldfile} obsoleto, use {newfile}!"
-
 #: ../fdroidserver/index.py
 msgid "Ignoring package without metadata: "
 msgstr "Ignorando o pacote sem metadados: "
@@ -959,6 +949,11 @@ msgstr "Ignorando o pacote sem metadados: "
 msgid "Ignoring stale cache data for {apkfilename}"
 msgstr "Ignorando dados de 'cache' antigos de {apkfilename}"
 
+#: ../fdroidserver/rewritemeta.py
+#, python-brace-format
+msgid "Ignoring {ext} file at '{path}'"
+msgstr "Ignorando arquivo tipo {ext} em '{path}'"
+
 #: ../fdroidserver/update.py
 msgid "Include APKs that are signed with disabled algorithms like MD5"
 msgstr "Inclua APKs assinados com algoritmos desativados, como o MD5"
@@ -975,16 +970,6 @@ msgstr "Inclui os logs de compilação no espelho"
 msgid "Include the source tarballs in the mirror"
 msgstr "Inclui os tarballs fonte no espelho"
 
-#: ../fdroidserver/metadata.py
-#, python-format
-msgid "Including metadata from %s@%s"
-msgstr "Incluindo metadados de %s@%s"
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Including metadata from {path}"
-msgstr "Incluindo metadados de {path}"
-
 #: ../fdroidserver/common.py
 msgid "Initialising submodules"
 msgstr "Inicializando submódulos"
@@ -993,58 +978,85 @@ msgstr "Inicializando submódulos"
 msgid "Install all signed applications available"
 msgstr "Instalar todos os aplicativos assinados disponíveis"
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Install built packages on devices"
-msgstr "Instala pacotes compilados nos dispositivos"
+msgstr "Instalar pacotes prontos nos dispositivos"
 
 #: ../fdroidserver/install.py
 #, python-format
 msgid "Installing %s..."
 msgstr "Instalando %s…"
 
+#: ../fdroidserver/install.py
+#, python-format
+msgid "Installing %s…"
+msgstr "Instalando %s …"
+
 #: ../fdroidserver/install.py
 #, python-brace-format
 msgid "Installing '{apkfilename}' on {dev}..."
 msgstr "Instalando \"{apkfilename}\" em {dev}…"
 
-#: ../fdroidserver/__main__.py
+#: ../fdroidserver/install.py
+#, python-brace-format
+msgid "Installing '{apkfilename}' on {dev}…"
+msgstr "Instalando '{apkfilename}' em {dev} …"
+
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Interact with the repo HTTP server"
-msgstr "Interage com o servidor HTTP do repositório"
+msgstr "Interagir com o servidor HTTP do repositório"
 
 #: ../fdroidserver/update.py
 msgid "Invalid APK"
 msgstr "APK inválido"
 
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "Invalid AutoUpdateMode: {mode}"
-msgstr "Modo de Atualização Automática inválido: {mode}"
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "Invalid UpdateCheckMode: {mode}"
-msgstr "UpdateCheckMode inválido: {mode}"
-
-#: ../fdroidserver/checkupdates.py
+#: ../fdroidserver/lint.py ../fdroidserver/checkupdates.py
 #, python-brace-format
 msgid "Invalid VercodeOperation: {field}"
 msgstr "Versão de Operação de Código inválido: {field}"
 
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Invalid VercodeOperation: {invalid_ops}"
-msgstr "Versão de Operação de Código inválido: {invalid_ops}"
-
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "Invalid application ID {appid}"
 msgstr "ID do aplicativo {appid} inválido"
 
+#: ../fdroidserver/metadata.py
+#, python-format
+msgid "Invalid boolean '%s'"
+msgstr "Booleano inválido '%s'"
+
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Invalid build flag at {line} in {linedesc}"
+msgstr "Sinalizador de compilação inválido em {line} em {linedesc}"
+
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Invalid build format: {value} in {name}"
+msgstr "Formato de criação inválido: {value} em {name}"
+
 #: ../fdroidserver/lint.py
 msgid "Invalid bulleted list"
 msgstr "Lista com marcadores inválida"
 
+#: ../fdroidserver/lint.py
+#, python-format
+msgid "Invalid license tag \"%s\"! Use only tags from https://spdx.org/license-list"
+msgstr "Etiqueta de licença inválida \"%s\"! Use apenas tags de https://spdx.org/license-list"
+
+#: ../fdroidserver/lint.py
+msgid "Invalid link - use [http://foo.bar Link title] or [http://foo.bar]"
+msgstr "Link inválido - use [http://foo.bar Título do Link] ou [http://foo.bar]"
+
+#: ../fdroidserver/metadata.py
+#, python-format
+msgid "Invalid metadata in %s:%d"
+msgstr "Metadados inválidos em %s: %d"
+
+#: ../fdroidserver/metadata.py
+msgid "Invalid metadata in: "
+msgstr "Metadados inválidos em: "
+
 #: ../fdroidserver/common.py
 #, python-format
 msgid "Invalid name for published file: %s"
@@ -1052,8 +1064,8 @@ msgstr "Nome inválido para o arquivo publicado: %s"
 
 #: ../fdroidserver/common.py
 #, python-brace-format
-msgid "Invalid ndk: entry in build: \"{ndk}\""
-msgstr "ndk inválido: entrada na compilação: \"{ndk}\""
+msgid "Invalid package name {0}"
+msgstr "Nome do pacote inválido {0}"
 
 #: ../fdroidserver/common.py
 #, python-brace-format
@@ -1075,6 +1087,11 @@ msgstr "Metadados de srclib inválidos: não foi possível analisar \"{file}\""
 msgid "Invalid srclib metadata: unknown key '{key}' in '{file}'"
 msgstr "Metadados de srclib inválidos: chave desconhecida \"{key}\" em \"{file}\""
 
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Invalid versionCode: \"{versionCode}\" is not an integer!"
+msgstr "Código de versão inválido: \"{versionCode}\" não é um inteiro!"
+
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "JAR signature failed to verify: {path}"
@@ -1089,8 +1106,8 @@ msgstr "Assinatura do JAR verificada: {path}"
 msgid "Java JAR file"
 msgstr "Arquivo JAR de Java"
 
-#: ../fdroidserver/mirror.py ../fdroidserver/publish.py
-#: ../fdroidserver/update.py
+#: ../fdroidserver/publish.py ../fdroidserver/update.py
+#: ../fdroidserver/mirror.py
 msgid "Java JDK not found! Install in standard location or set java_paths!"
 msgstr "Java JDK não encontrado! Instale no local padrão ou defina java_paths!"
 
@@ -1106,19 +1123,10 @@ msgstr "Java jarsigner não encontrado! Instale no local padrão ou defina java_
 msgid "Javascript in HTML src attributes"
 msgstr "Javascript em atributo 'src' de HTML"
 
-#: ../fdroidserver/build.py
-#, python-brace-format
-msgid "Keeping failed build \"{apkfilename}\""
-msgstr "Mantendo a compilação com falha \"{apkfilename}\""
-
 #: ../fdroidserver/init.py
 msgid "Keystore for signing key:\t"
 msgstr "Armazenamento de chaves de assinatura:\t"
 
-#: ../fdroidserver/lint.py
-msgid "Known debug key is used in AllowedAPKSigningKeys: "
-msgstr "A chave de depuração conhecida é usada em AllowedAPKSigningKeys: "
-
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "Last used commit '{commit}' looks like a tag, but UpdateCheckMode is '{ucm}'"
@@ -1128,9 +1136,13 @@ msgstr "O último commit usado '{commit}' parece com uma tag, mas o UpdateCheckM
 msgid "Liberapay donation methods belong in the Liberapay: field"
 msgstr "Métodos de doação do Liberapay pertencem ao campo LiberapayID"
 
+#: ../fdroidserver/lint.py
+msgid "Liberapay donation methods belong in the LiberapayID flag"
+msgstr "Métodos de doação Liberapay pertencem à bandeira LiberapayID"
+
 #: ../fdroidserver/rewritemeta.py
-msgid "List files that would be reformatted (dry run)"
-msgstr "Listar arquivos que seriam reformatados (execução a seco)"
+msgid "List files that would be reformatted"
+msgstr "Listar arquivos que devem ser reformatados"
 
 #: ../fdroidserver/lint.py
 msgid "Locale included in f-droid.org URL"
@@ -1148,16 +1160,6 @@ msgstr "Espelhos de repositórios malformados."
 msgid "Malformed serverwebroot line:"
 msgstr "Linha mal-formada do 'serverwebroot':"
 
-#: ../fdroidserver/scanner.py
-#, python-format
-msgid "Max recursion depth in ZIP file reached: %s"
-msgstr "Profundidade máxima de recursão no arquivo ZIP atingida: %s"
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "Mirror config for {url} contains \"isPrimary\" key!"
-msgstr "A configuração de espelho de {url} contém a chave \"isPrimary\"!"
-
 #: ../fdroidserver/mirror.py
 msgid "Mirror the full repo and archive, all file types."
 msgstr "Espelha todo o repositório e pacotes, todos os tipos de arquivos."
@@ -1166,30 +1168,31 @@ msgstr "Espelha todo o repositório e pacotes, todos os tipos de arquivos."
 msgid "Missing output directory"
 msgstr "Diretório de saída ausente"
 
-#: ../fdroidserver/metadata.py
-msgid "Moving Anti-Features declarations to localized files:"
-msgstr "Movendo declarações de Anti-Recursos para arquivos localizados:"
-
-#: ../fdroidserver/index.py
-msgid "Neither \"repo_pubkey\" nor \"keystorepass\" set in config.yml"
-msgstr "Nem \"repo_pubkey\" nem \"keystorepass\" definidos em config.yml"
-
-#: ../fdroidserver/verify.py
+#: ../fdroidserver/lint.py
 #, python-format
-msgid "No APK for package: %s"
-msgstr "Nenhum APK para o pacote: %s"
+msgid "Name '%s' is just the auto name - remove it"
+msgstr "O nome '%s' é apenas o nome automático. Remova-o!"
+
+#: ../fdroidserver/common.py
+msgid "No 'config.py' found, using defaults."
+msgstr "Nenhum 'config.py' encontrado, usando padrões."
 
 #: ../fdroidserver/common.py
 msgid "No Android SDK found!"
 msgstr "Nenhum 'Android SDK' foi encontrado!"
 
+#: ../fdroidserver/import.py
+msgid "No android or kivy project could be found. Specify --subdir?"
+msgstr "Nenhum projeto android ou kivy foi encontrado. Especifique --subdir?"
+
 #: ../fdroidserver/install.py
 msgid "No attached devices found"
 msgstr "Nenhum dispositivo conectado encontrado"
 
-#: ../fdroidserver/install.py
-msgid "No devices found for `adb install`! Please plug one in."
-msgstr "Nenhum dispositivo foi encontrado usando o comando `adb install`! Por favor, conecte um."
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "No commit specified for {versionName} in {linedesc}"
+msgstr "Nenhum commit especificado para {versionName} em {linedesc}"
 
 #: ../fdroidserver/index.py
 msgid "No fingerprint in URL."
@@ -1199,34 +1202,25 @@ msgstr "Nenhuma impressão digital (fingerprint) no URL."
 msgid "No git submodules available"
 msgstr "Nenhum Submódulo Git disponível"
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "No gradle project could be found. Specify --subdir?"
 msgstr "Nenhum projeto gradle foi encontrado. Especifique --subdir?"
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py ../fdroidserver/common.py
 msgid "No information found."
 msgstr "Nenhuma informação encontrada."
 
-#: ../fdroidserver/checkupdates.py
-msgid "No matching tags found"
-msgstr "Nenhuma tag correspondente encontrada"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "No minimum SDK version found in {0}, using default (3)."
-msgstr "Nenhuma versão mínima do SDK encontrada em {0}, usando o padrão (3)."
-
 #: ../fdroidserver/lint.py
 msgid "No need to specify that the app is Free Software"
-msgstr "Não há necessidade de especificar que o app é Software Livre"
+msgstr "Não há necessidade de especificar que o aplicativo é Software Livre"
 
 #: ../fdroidserver/lint.py
 msgid "No need to specify that the app is for Android"
-msgstr "Não há necessidade de especificar que é um app para Android"
+msgstr "Não há necessidade de especificar que é um aplicativo para Android"
 
 #: ../fdroidserver/deploy.py
-msgid "No option set! Edit your config.yml to set at least one of these:"
-msgstr "Nenhuma opção definida! Edite seu 'config.yml' para definir pelo menos um destes:"
+msgid "No option set! Edit your config.py to set at least one of these:"
+msgstr "Nenhuma opção definida! Edite seu 'config.py' para definir pelo menos um destes:"
 
 #: ../fdroidserver/common.py
 msgid "No packages specified"
@@ -1234,14 +1228,14 @@ msgstr "Nenhum pacote especificado"
 
 #: ../fdroidserver/install.py
 #, python-format
-msgid "No signed APK available for %s"
+msgid "No signed apk available for %s"
 msgstr "Não há APK assinado disponível para %s"
 
 #: ../fdroidserver/install.py
 msgid "No signed output directory - nothing to do"
 msgstr "Nenhum diretório de saída assinado - nada a fazer"
 
-#: ../fdroidserver/common.py
+#: ../fdroidserver/update.py ../fdroidserver/common.py
 #, python-brace-format
 msgid "No signing certificates found in {path}"
 msgstr "Nenhum certificado de assinatura encontrado em {path}"
@@ -1251,23 +1245,16 @@ msgstr "Nenhum certificado de assinatura encontrado em {path}"
 msgid "No such package: %s"
 msgstr "Nenhum pacote desse tipo: %s"
 
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "No such versionCode {versionCode} for app {appid}"
-msgstr "Nenhum tal versionCode {versionCode} para o app {appid}"
+msgstr "Nenhum tal versionCode {versionCode} para o aplicativo {appid}"
 
-#: ../fdroidserver/checkupdates.py
-msgid "No tags found"
-msgstr "Nenhuma etiqueta encontrada"
-
-#: ../fdroidserver/publish.py ../fdroidserver/verify.py
+#: ../fdroidserver/verify.py ../fdroidserver/publish.py
 msgid "No unsigned directory - nothing to do"
 msgstr "Nenhum diretório não assinado - nada a fazer"
 
-#: ../fdroidserver/__main__.py
-msgid "No version information could be found."
-msgstr "Não foi possível encontrar informações sobre a versão."
-
 #: ../fdroidserver/common.py
 msgid "Not a valid size definition: \"{}\""
 msgstr "Não é uma definição de tamanho válida: \"{}\""
@@ -1282,9 +1269,10 @@ msgid "Nothing to do for {appid}."
 msgstr "Nada a fazer para {appid}."
 
 #: ../fdroidserver/init.py
-msgid "Now set these in config.yml:"
-msgstr "Agora defina estes em config.yml:"
+msgid "Now set these in config.py:"
+msgstr "Agora defina estes em config.py:"
 
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "OBB file has newer versionCode({integer}) than any APK:"
@@ -1302,37 +1290,37 @@ msgstr "O nome do pacote do OBB não corresponde a um APK suportado:"
 msgid "Offline machine, skipping git mirror generation until `fdroid deploy`"
 msgstr "A máquina está desconectada, pulando geração de espelhos de git até o `fdroid deploy'"
 
-#: ../fdroidserver/deploy.py
-msgid "One of the 'github_releases' config items is missing the 'packageNames' value. skipping ..."
-msgstr "Um dos itens de configuração 'github_releases' está faltando o valor 'packageNames'. ignorando ..."
+#: ../fdroidserver/common.py
+#, python-brace-format
+msgid "Old APK signature failed to verify: {path}"
+msgstr "Falha na assinatura do antigo APK ao verificar: {path}"
 
-#: ../fdroidserver/deploy.py
-msgid "One of the 'github_releases' config items is missing the 'projectUrl' value. skipping ..."
-msgstr "Um dos itens de configuração 'github_releases' está faltando o valor 'projectUrl'. ignorando ..."
+#: ../fdroid ../fdroidserver/__main__.py
+msgid "Old, deprecated name for fdroid deploy"
+msgstr "Nome antigo e obsoleto para o implante fdroid"
 
-#: ../fdroidserver/deploy.py
-msgid "One of the 'github_releases' config items is missing the 'token' value. skipping ..."
-msgstr "Um dos itens de configuração 'github_releases' está faltando o valor 'token'. ignorando ..."
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Only PNG and JPEG are supported for graphics, found: {path}"
 msgstr "Apenas PNG e JPEG são suportados para gráficos, encontrados: {path}"
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/common.py
-msgid "Only accepts a single key \"env\""
-msgstr "Aceita apenas uma única chave \"env\""
+#: ../fdroidserver/checkupdates.py
+msgid "Only print differences with the Play Store"
+msgstr "Apenas mostrar diferenças com a Play Store"
 
 #: ../fdroidserver/checkupdates.py
 msgid "Only process apps with auto-updates"
-msgstr "Processar apenas apps com atualizações automáticas"
+msgstr "Processar apenas aplicativos com atualizações automáticas"
 
 #: ../fdroidserver/lint.py
 msgid "OpenCollective donation methods belong in the OpenCollective: field"
 msgstr "Os métodos de doação opencollective pertencem ao campo OpenCollective"
 
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "Options"
+msgstr "Opções"
+
 #: ../fdroidserver/verify.py
 msgid "Output JSON report to file named after APK."
 msgstr "Exporte a saída do relatório JSON para um nome de arquivo após APK."
@@ -1341,22 +1329,26 @@ msgstr "Exporte a saída do relatório JSON para um nome de arquivo após APK."
 msgid "Output JSON to stdout."
 msgstr "Emite JSON para stdout (saída padrão)."
 
-#: ../fdroidserver/checkupdates.py ../fdroidserver/gpgsign.py
-#: ../fdroidserver/publish.py ../fdroidserver/signindex.py
-#: ../fdroidserver/update.py
+#: ../fdroidserver/gpgsign.py ../fdroidserver/publish.py
+#: ../fdroidserver/update.py ../fdroidserver/signindex.py
+#: ../fdroidserver/checkupdates.py
 msgid "Outputting JSON"
 msgstr "Emitindo JSON"
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "Overall license of the project."
 msgstr "Licença geral do projeto."
 
+#: ../fdroidserver/dscanner.py
+msgid "Override path for repo APKs (default: ./repo)"
+msgstr "Substituir o caminho para os APKs do repositório (padrão: ./repo)"
+
 #: ../fdroidserver/index.py
 #, python-brace-format
 msgid "Overriding blank versionName in {apkfilename} from metadata: {version}"
 msgstr "Substituindo versionName em branco em {apkfilename} dos metadados: {version}"
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 #, python-brace-format
 msgid "Package \"{appid}\" already exists"
 msgstr "O pacote \"{appid}\" já existe"
@@ -1370,10 +1362,13 @@ msgstr "Manifesto de análise no '{path}'"
 msgid "Password required with username"
 msgstr "Senha requerida com nome de usuário"
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "Path to main Android project subdirectory, if not in root."
 msgstr "Caminho para os principais subdiretórios do projeto android, se não estiver na raiz (root)."
 
+msgid "Path to main android project subdirectory, if not in root."
+msgstr "Caminho para os principais subdiretórios do projeto android, se não estiver na raiz (root)."
+
 #: ../fdroidserver/init.py
 msgid "Path to the Android SDK (sometimes set in ANDROID_HOME)"
 msgstr "Caminho até o Android SDK (algumas vezes definido em ANDROID_HOME)"
@@ -1386,19 +1381,21 @@ msgstr "Caminho para o repositório git para usar como log"
 msgid "Path to the keystore for the repo signing key"
 msgstr "Caminho até a keystore para a chave de assinatura do repositório"
 
+#: ../fdroidserver/dscanner.py
+msgid "Prepare Drozer to run a scan"
+msgstr "Preparar o Drozer para executar uma varredura"
+
+msgid "Prepare drozer to run a scan"
+msgstr "Preparar o Drozer para fazer um escaneamento"
+
 #: ../fdroidserver/nightly.py
 msgid "Print the secret variable to the terminal for easy copy/paste"
 msgstr "Imprima a variável secreta no terminal para facilitar a cópia/colagem"
 
-#: ../fdroidserver/install.py
+#: ../fdroidserver/metadata.py
 #, python-brace-format
-msgid "Privacy mode was enabled based on your locale ({country_code})."
-msgstr "O modo de privacidade foi ativado com base em sua localidade ({country_code})."
-
-#: ../fdroidserver/scanner.py
-#, python-format
-msgid "Problem with ZIP file: %s, error %s"
-msgstr "Problema com o arquivo ZIP: %s, erro %s"
+msgid "Problem with description of {appid}: {error}"
+msgstr "Problema com a descrição de {appid}: {error}"
 
 #: ../fdroidserver/common.py
 #, python-brace-format
@@ -1423,7 +1420,11 @@ msgstr "Processando {appid}"
 msgid "Produce human-readable XML/JSON for index files"
 msgstr "Produzir XML/JSON legível por humanos para arquivos de índice"
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/update.py
+msgid "Produce human-readable index.xml"
+msgstr "Gerar um index.xml legível por humanos"
+
+#: ../fdroidserver/import.py
 msgid "Project URL to import from."
 msgstr "URL do projeto para importar."
 
@@ -1435,27 +1436,23 @@ msgstr "Pontuação deve ser evitada"
 msgid "Push the log to this git remote repository"
 msgstr "Mandar o registro de mudanças para este repositório git remoto"
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Pushing binary transparency log to {url}"
 msgstr "Atualizar o log de transparência de um binário para {url}"
 
-#: ../fdroidserver/deploy.py
-msgid "Pushing to remote server failed!"
-msgstr "Falha ao enviar para o servidor remoto!"
-
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Pushing to {url}"
 msgstr "Empurrando para {url}"
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Quickly start a new repository"
-msgstr "Cria rapidamente um novo repositório"
+msgstr "Rapidamente comece um novo repositório"
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Read all the metadata files and exit"
-msgstr "Lê todos os arquivos de metadados e sai"
+msgstr "Ler todos os arquivos de metadados e sair"
 
 #: ../fdroidserver/common.py
 #, python-brace-format
@@ -1464,49 +1461,40 @@ msgstr "Lendo '{config_file}'"
 
 #: ../fdroidserver/common.py
 #, python-brace-format
-msgid "Reading packageName/versionCode/versionName failed, APK invalid: '{apkfilename}'"
-msgstr "A leitura de packageName/versionCode/versionName falhou, o APK inválido: '{apkfilename}'"
+msgid "Reading minSdkVersion failed: \"{apkfilename}\""
+msgstr "Falha na leitura de minSdkVersion: \"{apkfilename}\""
 
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
+#. https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
 #: ../fdroidserver/common.py
 #, python-brace-format
-msgid "Reading packageName/versionCode/versionName failed,APK invalid: '{apkfilename}'"
-msgstr "Falha ao ler packageName/versionCode/versionName, APK inválido: '{apkfilename}'"
+msgid "Reading packageName/versionCode/versionName failed, APK invalid: '{apkfilename}'"
+msgstr "A leitura de packageName/versionCode/versionName falhou, o APK inválido: '{apkfilename}'"
 
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Reading {apkfilename} from cache"
 msgstr "Lendo {apkfilename} do cache"
 
-#: ../fdroidserver/build.py
-msgid "Refresh and cache scanner rules and signatures from the network"
-msgstr "Atualizar e armazenar em cache regras e assinaturas do scanner da rede"
-
-#: ../fdroidserver/publish.py
-#, python-brace-format
-msgid "Refusing to sign '{path}', file exists in both {dir1} and {dir2} folder."
-msgstr "Recusando assinar '{path}', o arquivo existe nas pastas {dir1} e {dir2}."
-
-#: ../fdroidserver/verify.py
-msgid "Remove source tarball and any APKs if successfully verified."
-msgstr "Remover pacote de código-fonte e qualquer APK se verificado com sucesso."
+#: ../fdroidserver/stats.py
+msgid "Recalculate aggregate stats - use when changes have been made that would invalidate old cached data."
+msgstr "Recalcular estatísticas agregadas - use quando foram feitas alterações que invalidariam os dados cache antigos."
 
 #: ../fdroidserver/common.py
 msgid "Removing specified files"
 msgstr "Removendo arquivos especificados"
 
 #: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Removing {path}\""
-msgstr "Removendo {path}\""
+msgid "Rename APK files that do not match package.name_123.apk"
+msgstr "Renomear arquivos APK que não são do tipo pacote.nome_123.apk"
 
 #: ../fdroidserver/update.py
-msgid "Rename APK files that do not match package.name_123.apk"
-msgstr "Renomeia arquivos APK que não correspondem a pacote.nome_123.apk"
+msgid "Report on build data status"
+msgstr "Relatório sobre o status dos dados de compilação"
 
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "RepoType {type} is deprecated, please switch to git."
-msgstr ""
+#: ../fdroidserver/build.py
+msgid "Reset and create a brand new build server, even if the existing one appears to be ok."
+msgstr "Redefinir e criar um novo servidor de compilação, mesmo que o existente parecer normal."
 
 #: ../fdroidserver/nightly.py
 #, python-brace-format
@@ -1521,34 +1509,33 @@ msgstr "Redimensionar todos os ícones que excedam o tamanho máximo de pixels e
 msgid "Restrict output to warnings and errors"
 msgstr "Restringir a saída a erros e avisos"
 
-#: ../fdroidserver/net.py
-#, python-format
-msgid "Retrying failed download: %s"
-msgstr "Nova tentativa de download com falha: %s"
-
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Rewrite all the metadata files"
-msgstr "Reescreve todos os arquivos de metadados"
+msgstr "Reescrever todos os arquivos de metadados"
+
+#: ../fdroidserver/rewritemeta.py
+msgid "Rewrite to a specific format: "
+msgstr "Reescrever para um formato específico: "
 
 #: ../fdroidserver/rewritemeta.py
 #, python-brace-format
 msgid "Rewriting '{appid}'"
 msgstr "Reescrevendo '{appid}'"
 
+#: ../fdroidserver/rewritemeta.py
+#, python-brace-format
+msgid "Rewriting '{appid}' to '{path}'"
+msgstr "Reescrevendo '{appid}' para '{path}'"
+
 #: ../fdroidserver/checkupdates.py
 msgid "Run on git repo that has uncommitted changes"
 msgstr "Executar no repositório do Git que tenha alterações não confirmadas"
 
-#: ../fdroidserver/nightly.py
-#, python-brace-format
-msgid "Run over {cibase} to find -debug.apk. and skip repo_basedir {repo_basedir}"
-msgstr "Execute {cibase} para encontrar -debug.apk. e ignore repo_basedir {repo_basedir}"
-
 #: ../fdroidserver/lint.py
 msgid "Run rewritemeta to fix formatting"
 msgstr "Executar rewritemeta para corrigir a formatação"
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 msgid "Running first pass with MD5 checking disabled"
 msgstr "Execução da primeira passagem com a verificação do MD5 desativada"
 
@@ -1557,23 +1544,17 @@ msgstr "Execução da primeira passagem com a verificação do MD5 desativada"
 msgid "Running wget in {path}"
 msgstr "Executando o 'wget' em {path}"
 
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "SHA-256 of {url} does not match entry!"
-msgstr "O SHA-256 de {url} não corresponde à entrada!"
+#: ../fdroidserver/dscanner.py
+msgid "Scan only the latest version of each package"
+msgstr "Escanear apenas a versão mais recente de cada pacote"
 
 #: ../fdroidserver/build.py
 msgid "Scan the resulting APK(s) for known non-free classes."
 msgstr "Verifique os APKs resultantes na busca das classes não gratuitas já conhecidas."
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Scan the source code of a package"
-msgstr "Percorre o código-fonte de um pacote"
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Scanner found {count} problems in {apk}"
-msgstr "O scanner encontrou {count} problemas em {apk}"
+msgstr "Escanear o código fonte de um pacote"
 
 #: ../fdroidserver/scanner.py
 #, python-brace-format
@@ -1591,19 +1572,6 @@ msgid_plural "Scanner found {} problems"
 msgstr[0] "O Scanner encontrou {} problema"
 msgstr[1] "O Scanner encontrou {} problemas"
 
-#: ../fdroidserver/scanner.py
-msgid "Scanning APK for extra signing blocks."
-msgstr "Verificando o APK em busca de blocos de assinatura adicionais."
-
-#: ../fdroidserver/scanner.py
-msgid "Scanning APK with dexdump for known non-free classes."
-msgstr "Verificando o APK com dexdump por classes não-livres conhecidas."
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Set NDK {release} ({version}) up"
-msgstr "Defina NDK {release} ({version}) para cima"
-
 #: ../fdroidserver/common.py
 msgid "Set clock to that time using:"
 msgstr "Ajuste o relógio para esse horário usando:"
@@ -1617,9 +1585,9 @@ msgstr "Defina as liberações máximas no repo antes que as mais antigas sejam
 msgid "Set open file limit to {integer}"
 msgstr "Defina o limite de arquivos abertos para {integer}"
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Set up an app build for a nightly build repo"
-msgstr "Configurar uma compilação de app para um repositório de compilação todas-as-noites"
+msgstr "Configurar uma compilação de aplicativo para um repositório de compilação todas-as-noites"
 
 #: ../fdroidserver/build.py
 msgid "Setting open file limit failed: "
@@ -1630,13 +1598,20 @@ msgstr "A configuração do limite de arquivos abertos falhou: "
 msgid "Setting {0} sec timeout for this build"
 msgstr "Definindo {0} segundos como tempo limite de para esta compilação"
 
-#: ../fdroidserver/__main__.py
-msgid "Sign and place packages in the repo"
-msgstr "Assina e coloca pacotes no repositório"
+#: ../fdroidserver/build.py
+msgid "Setup an emulator, install the APK on it and perform a Drozer scan"
+msgstr "Configurar um emulador, instalar o apk nele e escanear com o Drozer"
 
-#: ../fdroidserver/__main__.py
+msgid "Setup an emulator, install the apk on it and perform a drozer scan"
+msgstr "Configurar um emulador, instalar o apk nele e escanear com o drozer"
+
+#: ../fdroid ../fdroidserver/__main__.py
+msgid "Sign and place packages in the repo"
+msgstr "Assine e coloque pacotes no repositório"
+
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Sign indexes created using update --nosign"
-msgstr "Assina os índices criados usando update --nosign"
+msgstr "Assinar os índices criados usando update --nosign"
 
 #: ../fdroidserver/build.py
 msgid "Skip scanning the source code for binaries and other problems"
@@ -1647,11 +1622,6 @@ msgstr "Pular o escaneamento do código fonte atrás de binários e outros probl
 msgid "Skipping '{apkfilename}' with invalid signature!"
 msgstr "Ignorando '{apkfilename}' com assinatura inválida!"
 
-#: ../fdroidserver/deploy.py ../fdroidserver/index.py
-#, python-format
-msgid "Skipping GitLab Pages mirror because the repo is too large (>%.2fGB)!"
-msgstr "Ignorando o espelho do GitLab Pages porque o repositório é muito grande (>%.2fGB)!"
-
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Skipping index generation for {appid}"
@@ -1667,14 +1637,23 @@ msgstr "Ignorando {apkfilename} com assinatura inválida!"
 msgid "Skipping {appid}: disabled"
 msgstr "Ignorando {appid}: desativado"
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/scanner.py
+#, python-brace-format
+msgid "Skipping {appid}: no builds specified"
+msgstr "Ignorando {appid}: nenhuma construção especificada"
+
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 msgid "Specify a local folder to sync the repo to"
 msgstr "Especifique uma pasta local para ser sincronizada com o repositório"
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 msgid "Specify an identity file to provide to SSH for rsyncing"
 msgstr "Especifique um arquivo identidade para fornecer ao SSH para usar o rsync"
 
+#: ../fdroidserver/build.py
+msgid "Specify that we're running on the build server"
+msgstr "Especificar que estamos executando no servidor de compilação"
+
 #: ../fdroidserver/nightly.py
 msgid "Specify which debug keystore file to use."
 msgstr "Especifique qual arquivo keystore de depuração deve ser usado."
@@ -1683,6 +1662,11 @@ msgstr "Especifique qual arquivo keystore de depuração deve ser usado."
 msgid "Spew out even more information than normal"
 msgstr "Mostrar ainda mais informações que o normal"
 
+#: ../fdroidserver/nightly.py
+#, python-brace-format
+msgid "Striping mystery signature from {apkfilename}"
+msgstr "Assinatura misteriosa de striping de {apkfilename}"
+
 #: ../fdroidserver/nightly.py
 #, python-brace-format
 msgid "Stripping mystery signature from {apkfilename}"
@@ -1691,7 +1675,7 @@ msgstr "Descarnar a assinatura misteriosa a partir do {apkfilename}"
 #: ../fdroidserver/lint.py
 #, python-format
 msgid "Summary '%s' is just the app's name"
-msgstr "Resumo '%s' é apenas o nome do app"
+msgstr "Resumo '%s' é apenas o nome do aplicativo"
 
 #: ../fdroidserver/lint.py
 #, python-brace-format
@@ -1703,22 +1687,10 @@ msgstr "O resumo do tamanho {length} está acima do limite de caracteres {limit}
 msgid "System clock is older than date in {path}!"
 msgstr "O relógio/calendário do sistema é mais atrasado que em '{path}'!"
 
-#: ../fdroidserver/checkupdates.py
-msgid "Tags update mode only works for git, hg, bzr and git-svn repositories currently"
-msgstr "O modo de atualização de tags só funciona para repositórios git, hg, bzr e git-svn atualmente"
-
-#: ../fdroidserver/checkupdates.py
-msgid "Tags update mode used in git-svn, but the repo was not set up with tags"
-msgstr "Modo de atualização de tags usado no git-svn, mas o repositório não foi configurado com tags"
-
 #: ../fdroidserver/build.py
 msgid "Test mode - put output in the tmp directory only, and always build, even if the output already exists."
 msgstr "Modo de teste - coloque a saída apenas no diretório tmp e sempre compile, mesmo que a saída já exista."
 
-#: ../fdroidserver/index.py
-msgid "The \"qrcode\" Python package is not installed (e.g. apt-get install python3-qrcode)!"
-msgstr "O pacote Python \"qrcode\" não está instalado (por exemplo, apt-get install python3-qrcode)!"
-
 #. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
 #: ../fdroidserver/update.py
 #, python-brace-format
@@ -1737,10 +1709,18 @@ msgstr "O diretório para escrever o espelho para"
 msgid "The file to be included in the repo (path or glob)"
 msgstr "O arquivo a ser incluído no repositório (caminho ou glob)"
 
+#: ../fdroidserver/deploy.py
+msgid "The only commands currently supported are 'init' and 'update'"
+msgstr "Os únicos comandos suportados atualmente são 'init' e 'update'"
+
 #: ../fdroidserver/index.py
 msgid "The repository's fingerprint does not match."
 msgstr "A impressão digital do repositório não corresponde."
 
+#: ../fdroidserver/common.py
+msgid "The repository's index could not be verified."
+msgstr "O índice do repositório não pôde ser verificado."
+
 #: ../fdroidserver/deploy.py
 #, python-brace-format
 msgid "The root dir for local_copy_dir \"{path}\" does not exist!"
@@ -1754,45 +1734,14 @@ msgstr "Há uma colisão do keyalias - publicação parada"
 msgid "These are the apps that have been archived from the main repo."
 msgstr "Estas são as aplicações que foram arquivadas a partir do repositório principal."
 
-#: ../fdroidserver/mirror.py
-msgid "This command should never be used to mirror f-droid.org! A full copy requires more than 600GB."
-msgstr "Esse comando nunca deve ser usado para espelhar o f-droid.org! Uma cópia completa requer mais de 600 GB."
-
-#: ../fdroidserver/common.py
-msgid "This is a repository of apps to be used with F-Droid. Applications in this repository are either official binaries built by the original application developers, or are binaries built from source by the admin of f-droid.org using the tools on https://gitlab.com/fdroid."
-msgstr "Este é um repositório de aplicativos a serem usados com o F-Droid. Os aplicativos neste repositório são binários oficiais compilados pelos desenvolvedores do aplicativo original ou são binários compilados a partir da fonte por f-droid.org usando as ferramentas em https://gitlab.com/fdroid."
-
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 #, python-format
 msgid "This repo already has local metadata: %s"
 msgstr "Este repositório já tem metadados locais: %s"
 
-#: ../fdroidserver/init.py
-#, python-format
-msgid ""
-"To complete the setup, add your APKs to \"%s\"\n"
-"then run \"fdroid update -c; fdroid update\".  You might also want to edit\n"
-"\"config.yml\" to set the URL, repo name, and more.  You should also set up\n"
-"a signing key (a temporary one might have been automatically generated).\n"
-"\n"
-"For more info: https://f-droid.org/docs/Setup_an_F-Droid_App_Repo\n"
-"and https://f-droid.org/docs/Signing_Process"
-msgstr ""
-"Para concluir a configuração, adicione seus APKs a \"%s\"\n"
-"em seguida, execute \"fdroid update -c; atualização do fdroid\". Você também pode querer editar\n"
-"\"config.yml\" para definir o URL, o nome do repositório e muito mais. Você também deve configurar\n"
-"uma chave de assinatura (uma temporária pode ter sido gerada automaticamente).\n"
-"\n"
-"Para mais informações: https://f-droid.org/docs/Setup_an_F-Droid_App_Repo\n"
-"e https://f-droid.org/docs/Signing_Process"
-
-#: ../fdroidserver/deploy.py
-msgid "To use awsbucket, awssecretkey and awsaccesskeyid must also be set in config.yml!"
-msgstr "Para usar awsbucket, os awssecretkey e awsaccesskeyid também devem ser definidos no config.yml!"
-
-#: ../fdroidserver/deploy.py
-msgid "To use rclone, rclone_config and awsbucket must be set in config.yml!"
-msgstr "Para usar rclone, rclone_config e awsbucket devem ser configurados em config.yml!"
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
+msgid "To use awsbucket, awssecretkey and awsaccesskeyid must also be set in config.py!"
+msgstr "Para usar awsbucket, os awssecretkey e awsaccesskeyid também devem ser definidos no config.py!"
 
 #: ../fdroidserver/lint.py
 msgid "URL must start with https:// or http://"
@@ -1802,6 +1751,10 @@ msgstr "A URL deve começar com https:// ou http://"
 msgid "URL shorteners should not be used"
 msgstr "Encurtadores de URL não devem ser usados"
 
+#: ../fdroidserver/metadata.py
+msgid "URL title is just the URL, use brackets: [URL]"
+msgstr "O título do URL é apenas o URL, use parênteses: [URL]"
+
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "URL {url} in Description: {error}"
@@ -1815,15 +1768,16 @@ msgstr "A etiqueta da licença foi inesperada \"{}\"! Use apenas etiquetas FSF o
 msgid "Unexpected license tag \"{}\"! Only use license tags configured in your config file"
 msgstr "A etiqueta da licença foi inesperada \"{}\"! Use apenas as etiquetas configuradas no seu arquivo de configuração"
 
-#: ../fdroidserver/common.py
+#: ../fdroidserver/metadata.py
 #, python-brace-format
-msgid "Unknown entry {key} in {configname}"
-msgstr "Entrada desconhecida {key} em {configname}"
+msgid "Unexpected text on same line as {field} in {linedesc}"
+msgstr "Texto inesperado na mesma linha como {field} em {linedesc}"
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Unknown exception found!"
 msgstr "Exceção desconhecida encontrada!"
 
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "Unknown file '{filename}' in build '{versionName}'"
@@ -1834,6 +1788,11 @@ msgstr "Arquivo desconhecido '{filename}' na compilação '{versionName}'"
 msgid "Unknown metadata format: %s"
 msgstr "Formato de metadados desconhecido: %s"
 
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Unknown metadata format: {path}"
+msgstr "Formato de metadados desconhecido: {path}"
+
 #: ../fdroidserver/metadata.py
 #, python-brace-format
 msgid "Unknown metadata format: {path} (use: *.yml)"
@@ -1843,6 +1802,10 @@ msgstr "O formato dos metadados é desconhecido: {path} (use: *.yml)"
 msgid "Unknown version of aapt, might cause problems: "
 msgstr "Versão desconhecida do aapt, pode causar problemas: "
 
+#: ../fdroidserver/lint.py
+msgid "Unlinkified link - use [http://foo.bar Link title] or [http://foo.bar]"
+msgstr "Link des-link-ado - use [http://foo.bar Título do link] ou [http://foo.bar]"
+
 #: ../fdroidserver/lint.py
 msgid "Unnecessary leading space"
 msgstr "Espaço desnecessário à frente"
@@ -1856,12 +1819,20 @@ msgstr "Espaço desnecessário ao fim"
 msgid "Unrecognised app field '{fieldname}' in '{path}'"
 msgstr "O campo '{fieldname}' não foi reconhecido em '{path}'"
 
+#: ../fdroidserver/metadata.py
+msgid "Unrecognised app field: "
+msgstr "Campo da app não reconhecido: "
+
 #: ../fdroidserver/metadata.py
 #, python-brace-format
 msgid "Unrecognised build flag '{build_flag}' in '{path}'"
 msgstr "O sinalizador de construção '{build_flag}' desconhecido em '{path}'"
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Unrecognised field '{field}' in {linedesc}"
+msgstr "Campo '{field}' não reconhecido em {linedesc}"
+
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Unsupported file type \"{extension}\" for repo graphic"
@@ -1872,6 +1843,29 @@ msgstr "Tipo de arquivo \"{extension}\" não suportado para o gráfico de repo"
 msgid "Unsupported graphics file found: {path}"
 msgstr "Arquivo gráfico não suportado encontrado: {path}"
 
+#: ../fdroidserver/rewritemeta.py
+#, python-brace-format
+msgid "Unsupported metadata format, use: --to [{supported}]"
+msgstr "Formato de metadados não suportado, use:--to [{supported}]"
+
+#: ../fdroidserver/metadata.py
+msgid "Unterminated ]"
+msgstr "Não terminado ]"
+
+#: ../fdroidserver/metadata.py
+msgid "Unterminated ]]"
+msgstr "Não terminado ]]"
+
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Unterminated build in {name}"
+msgstr "Compilação não terminada em {name}"
+
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Unterminated continuation in {name}"
+msgstr "Continuação não terminada em {name}"
+
 #: ../fdroidserver/lint.py
 #, python-format
 msgid "Unused extlib at %s"
@@ -1892,25 +1886,27 @@ msgstr "Caminho scandelete não usado: %s"
 msgid "Unused scanignore path: %s"
 msgstr "Caminho scanignore não usado: %s"
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Update repo information for new packages"
-msgstr "Atualiza as informações do repositório para novos pacotes"
+msgstr "Atualize as informações do repositório para novos pacotes"
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Update the binary transparency log for a URL"
-msgstr "Atualiza o log de transparência de um binário para um URL"
+msgstr "Atualizar o log de transparência de um binário para um URL"
+
+#: ../fdroid ../fdroidserver/__main__.py
+msgid "Update the stats of the repo"
+msgstr "Atualizar as estatísticas do repositório"
+
+#: ../fdroidserver/update.py ../fdroidserver/build.py
+msgid "Update the wiki"
+msgstr "Atualizar a wiki"
 
 #: ../fdroidserver/checkupdates.py
 #, python-brace-format
 msgid "UpdateCheckData has invalid URL: {url}"
 msgstr "UpdateCheckData tem URL inválido: {url}"
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "UpdateCheckData must match the version code as integer (\\d or [0-9]): {codeex}"
-msgstr "UpdateCheckData deve corresponder ao código da versão como número inteiro (\\d ou [0-9]): {codeex}"
-
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "UpdateCheckData must use HTTPS URL: {url}"
@@ -1922,13 +1918,17 @@ msgid "UpdateCheckData not a valid URL: {url}"
 msgstr "UpdateCheckData não é uma URL válida: {url}"
 
 #: ../fdroidserver/lint.py
-msgid "UpdateCheckMode is set but it looks like checkupdates hasn't been run yet."
-msgstr "UpdateCheckMode é definido, mas parece que likecheckupdates ainda não foi executado."
+msgid "UpdateCheckMode is set but it looks like checkupdates hasn't been run yet"
+msgstr "UpdateCheckMode é definido, mas parece que checkupdates ainda não foi executado"
+
+#. Translators: https://developer.android.com/studio/build/application-id
+#: ../fdroidserver/lint.py
+msgid "UpdateCheckName is set to the known application ID - it can be removed"
+msgstr "UpdateCheckName (atualização da verificação do nome) está definido como o ID comum da aplicação - pode ser removido"
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
 #: ../fdroidserver/lint.py
 msgid "UpdateCheckName is set to the known application ID, it can be removed"
-msgstr "UpdateCheckName (atualização da verificação do nome) é definido como o ID comun do aplicativo - pode ser removido"
+msgstr "UpdateCheckName (atualização da verificação do nome) é definido como o ID comun do app - pode ser removido"
 
 #: ../fdroidserver/deploy.py
 #, python-brace-format
@@ -1940,9 +1940,20 @@ msgstr "Enviando o {apkfilename} para o androidobservatory.org"
 msgid "Uploading {apkfilename} to virustotal"
 msgstr "Enviando o {apkfilename} para o virustotal"
 
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "Usage"
+msgstr "Uso"
+
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, python-format
+msgid "Usage: %s\n"
+msgstr "Uso: %s\n"
+
 #: ../fdroidserver/lint.py
-msgid "Use /HEAD instead of /master or /main to point at a file in the default branch"
-msgstr "Use /HEAD em vez de /master ou /main para apontar para um arquivo na ramificação padrão"
+msgid "Use /HEAD instead of /master to point at a file in the default branch"
+msgstr "Use /HEAD em vez de /master para apontar em um arquivo na ramificação predefinida"
 
 #: ../fdroidserver/update.py
 msgid "Use `fdroid update -c` to create it."
@@ -1954,18 +1965,16 @@ msgstr "Usar servidor de compilação"
 
 #: ../fdroidserver/update.py
 msgid "Use date from APK instead of current time for newly added APKs"
-msgstr "Usar a data do APK ao invés do horário atual para APKs recentemente adicionados"
+msgstr "Usar a data do apk ao invés do horário atual para APKs recentemente adicionados"
 
-#: ../fdroidserver/deploy.py
+msgid "Use date from apk instead of current time for newly added apks"
+msgstr "Usar a data do apk ao invés do horário atual para APKs recentemente adicionados"
+
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Using \"{path}\" for configuring s3cmd."
 msgstr "Usando \"{path}\" para configurar s3cmd."
 
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Using \"{path}\" for syncing with remote storage."
-msgstr "Usando \"{path}\" para sincronização com armazenamento remoto."
-
 #: ../fdroidserver/common.py
 msgid "Using APK Signature v2"
 msgstr "Usando a Assinatura APK v2"
@@ -1974,35 +1983,26 @@ msgstr "Usando a Assinatura APK v2"
 msgid "Using APK Signature v3"
 msgstr "Usando a Assinatura APK v3"
 
-#: ../fdroidserver/common.py
-msgid "Using JAR Signature"
-msgstr "Usando assinatura JAR"
-
 #: ../fdroidserver/common.py
 msgid "Using Java's jarsigner, not recommended for verifying APKs! Use apksigner"
 msgstr "Usando o jarsigner de Java, não recomendado para verificar APKs! Use apksigner"
 
-#: ../fdroidserver/metadata.py
+#: ../fdroidserver/common.py
 #, python-brace-format
-msgid "Using blank dictionary instead of contents of {path}!"
-msgstr "Usando um dicionário em branco em vez do conteúdo de {path}!"
+msgid "Using androguard from \"{path}\""
+msgstr "Usando androguard de \"{path}\""
 
 #: ../fdroidserver/init.py
 #, python-brace-format
 msgid "Using existing keystore \"{path}\""
 msgstr "Utilizando armazenamento de chave existente \"{path}\""
 
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Using rclone to sync with: {url}"
-msgstr "Usando rclone para sincronizar com: {url}"
-
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Using s3cmd to sync with: {url}"
 msgstr "Usando s3cmd para sincronizar com: {url}"
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Valid commands are:"
 msgstr "Os comandos válidos são:"
 
@@ -2010,35 +2010,22 @@ msgstr "Os comandos válidos são:"
 msgid "Verify against locally cached copy rather than redownloading."
 msgstr "Verifique a cópia em cache local em vez de redescarregando."
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Verify the integrity of downloaded packages"
-msgstr "Verifica a integridade dos pacotes baixados"
+msgstr "Verifique a integridade dos pacotes baixados"
 
 #: ../fdroidserver/index.py
 msgid "Verifying index signature:"
 msgstr "Verificar o índice de assinatura:"
 
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "Verifying package {path} with apksigner."
-msgstr "Verificando o pacote {path} com apksigner."
-
 #: ../fdroidserver/deploy.py
 #, python-brace-format
 msgid "VirusTotal API key cannot upload files larger than 32MB, use {url} to upload {path}."
 msgstr "A chave API do VirusTotal não pode carregar arquivos maiores que 32MB, utilize {url} para enviar para {path}."
 
-#: ../fdroidserver/nightly.py
-msgid "WARNING: only public git repos are supported!"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Warn about possible metadata errors"
-msgstr "Avisa sobre possíveis erros de metadados"
-
-#: ../fdroidserver/scanner.py
-msgid "WebAssembly binary file"
-msgstr "Arquivo binário WebAssembly"
+msgstr "Avisar sobre possíveis erros de metadados"
 
 #: ../fdroidserver/update.py
 msgid "When configured for signed indexes, create only unsigned indexes at this stage"
@@ -2048,17 +2035,8 @@ msgstr "Quando configurado para índices assinados, crie apenas índices não as
 msgid "When linting the entire repository yamllint is disabled by default. This option forces yamllint regardless."
 msgstr "Ao cotar todo o repositório, o yamllint é desativado por padrão. Independente de qualquer coisa esta opção impõem o uso do yamllint."
 
-#: ../fdroidserver/publish.py
-msgid "When signing or verifying fails, exit with an error code."
-msgstr "Ao assinar ou verificar falhar, um código de erro será lançado."
-
-#: ../fdroidserver/install.py
-msgid "Would you like to download and install F-Droid.apk via adb? (YES/no)"
-msgstr "Gostaria de baixar e instalar F-Droid.apk via adb? (SIM/NÃO)"
-
-#: ../fdroidserver/install.py
-msgid "Would you like to download the app(s) from f-droid.org? (YES/no)"
-msgstr "Gostaria de baixar aplicativo(s) de f-droid.org? (SIM/NÃO)"
+msgid "X.509 'Distiguished Name' used when generating keys"
+msgstr "X.509 'Distiguished Name' usado ao gerar as chaves"
 
 #: ../fdroidserver/init.py
 msgid "X.509 'Distinguished Name' used when generating keys"
@@ -2072,11 +2050,6 @@ msgstr "Você pode usar ANDROID_HOME para definir o caminho para o seu SDK, ou s
 msgid "ZIP file archive"
 msgstr "Arquivo ZIP"
 
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "adb reports {serial} is \"{status}\"!"
-msgstr "O adb informa que {serial} é \"{status}\"!"
-
 #: ../fdroidserver/nightly.py
 #, python-brace-format
 msgid "adding IdentityFile to {path}"
@@ -2087,78 +2060,84 @@ msgstr "adicionando IdentityFile a {path}"
 msgid "adding to {name}: {path}"
 msgstr "adicionando a {name}: {path}"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "ambiguous option: %(option)s could match %(matches)s"
-msgstr "opção ambígua: %(option)s pode corresponder a %(matches)s"
+msgstr "opção ambígua: %(option)s poderia corresponder %(matches)s"
 
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "apksigner in build-tools;{version} passes APKs with invalid v3 signatures, ignoring."
-msgstr "apksigner no builds-tools;{version} passa APKs com assinaturas v3 inválidas, ignorando."
-
-#: ../fdroidserver/common.py
-msgid "apksigner not found! Cannot sign or verify modern APKs"
-msgstr "apksigner não encontrado! Não é possível assinar ou verificar APKs modernos"
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, python-format
+msgid "ambiguous option: %s (%s?)"
+msgstr "opção ambígua: %s (%s?)"
 
 #: ../fdroidserver/common.py
 msgid "apksigner not found, it's required for signing!"
 msgstr "o apksigner não foi encontrado, ele é necessário para assinar!"
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/checkupdates.py ../fdroidserver/lint.py
-#: ../fdroidserver/rewritemeta.py
+#: ../fdroidserver/lint.py ../fdroidserver/rewritemeta.py
+#: ../fdroidserver/checkupdates.py
 msgid "application ID of file to operate on"
 msgstr "ID de aplicação do arquivo para operar"
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/build.py ../fdroidserver/install.py
-#: ../fdroidserver/publish.py ../fdroidserver/scanner.py
-#: ../fdroidserver/verify.py
+#: ../fdroidserver/verify.py ../fdroidserver/publish.py
+#: ../fdroidserver/build.py ../fdroidserver/scanner.py
+#: ../fdroidserver/install.py
 msgid "application ID with optional versionCode in the form APPID[:VERCODE]"
 msgstr "applicationId com versionCode opcional na forma APPID[:VERCODE]"
 
-#: ../fdroidserver/common.py
-msgid "archive_url needs to end with /archive"
-msgstr "archive_url precisa terminar com /archive"
+#: ../fdroidserver/lint.py ../fdroidserver/rewritemeta.py
+msgid "applicationId in the form APPID"
+msgstr "applicationId, na forma APPID"
 
-#: /usr/lib/python3.11/argparse.py
+#: ../fdroidserver/checkupdates.py
+msgid "applicationId to check for updates"
+msgstr "applicationId para verificar se há atualizações"
+
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
+#: ../fdroidserver/verify.py ../fdroidserver/publish.py
+#: ../fdroidserver/dscanner.py ../fdroidserver/build.py
+#: ../fdroidserver/scanner.py ../fdroidserver/install.py
+msgid "applicationId with optional versionCode in the form APPID[:VERCODE]"
+msgstr "applicationId com versionCode opcional na forma APPID[:VERCODE]"
+
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "argument \"-\" with mode %r"
 msgstr "argumento \"-\" com o modo %r"
 
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "argument %(argument_name)s: %(message)s"
-msgstr "argumento %(argument_name)s: %(message)s"
-
 #: ../fdroidserver/nightly.py
 msgid "attempting bare SSH connection to test deploy key:"
 msgstr "tentando uma conexão SSH vazia para testar a chave de implantação:"
 
+#: ../fdroidserver/nightly.py
+msgid "attempting bare ssh connection to test deploy key:"
+msgstr "tentativa de conexão nua por SSH para testar a implantação da chave:"
+
 #: ../fdroidserver/common.py
 msgid "can not parse scrlib spec (not a string): '{}'"
 msgstr "não é possível analisar a especificação scrlib (não uma string): '{}'"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
-msgid "can't open '%(filename)s': %(error)s"
-msgstr "não é possível abrir '%(filename)s': %(error)s"
-
-#: ../fdroidserver/scanner.py
-msgid "can't open non-https url: '{};"
-msgstr "não é possível abrir a url não-https: '{};"
+msgid "can't open '%s': %s"
+msgstr "não dá pra abrir '%s': %s"
 
 #: ../fdroidserver/build.py
 #, python-brace-format
 msgid "cannot find required srclibs: \"{path}\""
 msgstr "não é possível encontrar os srclibs necessários: \"{path}\""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "cannot have multiple subparser arguments"
 msgstr "não é possível ter vários argumentos de subparser"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "cannot merge actions - two groups are named %r"
 msgstr "não é possível unir ações - dois grupos são denominados %r"
@@ -2172,107 +2151,119 @@ msgstr "não é possível publicar a atualização, você definiu a chave de imp
 msgid "cloning {url}"
 msgstr "clonagem {url}"
 
+#: ../fdroidserver/deploy.py
+msgid "command to execute, either 'init' or 'update'"
+msgstr "comando para executar, seja 'init' ou 'update'"
+
 #: ../fdroidserver/__main__.py
 msgid "commands from plugin modules:"
 msgstr "comandos a partir dos módulos de plugin:"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "complex"
+msgstr "complexo"
+
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "conflicting option string: %s"
 msgid_plural "conflicting option strings: %s"
 msgstr[0] "opção conflitante na string: %s"
 msgstr[1] "opções conflitantes nas strings: %s"
 
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "conflicting subparser alias: %s"
-msgstr "alias de subanalizador conflitante: %s"
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "conflicting subparser: %s"
-msgstr "subanalizador conflitante: %s"
+#: ../fdroidserver/nightly.py
+#, python-brace-format
+msgid "copying {apkfilename} into {path}"
+msgstr "copiando {apkfilename} para {path}"
 
 #: ../fdroidserver/metadata.py
 #, python-brace-format
 msgid "could not parse '{path}'"
 msgstr "não foi possível analisar '{path}'"
 
-#: ../fdroidserver/common.py
-msgid "could not parse srclib spec (no name specified): '{}'"
-msgstr "não foi possível analisar a especificação srclib (nenhum nome especificado): '{}'"
-
 #: ../fdroidserver/common.py
 msgid "could not parse srclib spec (no ref specified): '{}'"
 msgstr "não foi possível analisar a especificação srclib (referência sem especificação): '{}'"
 
+#: ../fdroidserver/common.py
+msgid "could not parse srclib spec (too many '@' signs): '{}'"
+msgstr "não foi possível analisar a especificação srclib (excesso de sinais '@'): '{}'"
+
 #: ../fdroidserver/nightly.py
 #, python-brace-format
 msgid "created {path}"
 msgstr "{path} criado"
 
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "current version is newer: old vercode={old}, new vercode={new}"
-msgstr "versão atual é mais recente: old vercode={old}, new vercode={new}"
-
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "deleting: repo/{apkfilename}"
 msgstr "apagando: repo/{apkfilename}"
 
-#: ../fdroidserver/scanner.py
-msgid "dependency file without lock"
-msgstr "arquivo de dependência sem bloqueio"
+#: ../fdroidserver/common.py
+#, python-brace-format
+msgid "deployed build logs to '{path}'"
+msgstr "logs de compilação implantados para '{path}'"
 
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "deployed process log {path} to {dest}"
 msgstr "registro de processo implantado {path} para {dest}"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "dest= is required for options like %r"
 msgstr "dest = é necessário para opções como %r"
 
-#: ../fdroidserver/scanner.py
-msgid "downloading '{}'"
-msgstr "baixando '{}'"
-
-#: ../fdroidserver/scanner.py
-msgid "downloading scanner signatures from '{}' failed"
-msgstr "o download de assinaturas de scanner de '{}' falhou"
-
 #: ../fdroidserver/scanner.py
 msgid "executable binary, possibly code"
 msgstr "binário executável, possivelmente código"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "expected %s argument"
 msgid_plural "expected %s arguments"
 msgstr[0] "foi previsto %s argumento"
 msgstr[1] "foi previsto %s argumentos"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "expected at least one argument"
 msgstr "esperado pelo menos um argumento"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "expected at most one argument"
 msgstr "esperado um argumento no máximo"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "expected one argument"
 msgstr "esperado um argumento"
 
-#: ../fdroidserver/__main__.py
+#: ../fdroidserver/common.py
+#, python-brace-format
+msgid "failed deploying build logs to '{path}'"
+msgstr "falha na implantação de logs de compilação para '{path}'"
+
+#: ../fdroid
+msgid "fdroid [-h|--help|--version] <command> [<args>]"
+msgstr "fdroid [-h|--help|--version] <comando> [<args>]"
+
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "fdroid [<command>] [-h|--help|--version|<args>]"
 msgstr "fdroid [<comando>] [-h|--help|--version|<args>]"
 
-#: ../fdroidserver/scanner.py
-msgid "fetch the latest version of signatures from the web"
-msgstr "obter a versão de assinaturas mais recente da Web"
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "floating-point"
+msgstr "ponto flutuante"
+
+#: ../fdroidserver/metadata.py
+msgid "force errors to be warnings, or ignore"
+msgstr "forçar erros como avisos ou ignorá-los"
 
 #: ../fdroidserver/metadata.py
 msgid "force metadata errors (default) to be warnings, or to be ignored."
@@ -2286,7 +2277,8 @@ msgstr "git svn clone falhou"
 msgid "gzip file archive"
 msgstr "arquivo gzip"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "ignored explicit argument %r"
 msgstr "argumento explícito %r ignorado"
@@ -2295,39 +2287,35 @@ msgstr "argumento explícito %r ignorado"
 msgid "index-v1 must have a signature, use `fdroid signindex` to create it!"
 msgstr "index-v1 deve ter uma assinatura, use ' fdroid signindex ' para criá-lo!"
 
-#: ../fdroidserver/index.py
-msgid "index-v2 must have a signature, use `fdroid signindex` to create it!"
-msgstr "index-v2 deve ter uma assinatura, use droid signindex` para criá-la!"
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "integer"
+msgstr "inteiro"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "invalid %(type)s value: %(value)r"
 msgstr "valor inválido do tipo %(type)s: %(value)r"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "invalid choice: %(value)r (choose from %(choices)s)"
 msgstr "opção inválida: %(value)r (escolha de %(choices)s)"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "invalid conflict_resolution value: %r"
 msgstr "valor conflict_resolution inválido: %r"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "invalid option string %(option)r: must start with a character %(prefix_chars)r"
 msgstr "Opção cadeia %(option)r inválida: deve começar com o caractere %(prefix_chars)r"
 
-#: ../fdroidserver/common.py
-msgid "ipfs_cid not found, skipping CIDv1 generation"
-msgstr "ipfs_cid não encontrado, omitindo a geração de CIDv1"
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "latest build recipe is newer: old vercode={old}, new vercode={new}"
-msgstr "receita de compilação mais recente é: old vercode={old}, new vercode={new}"
-
 #: ../fdroidserver/deploy.py
 #, python-brace-format
 msgid "local_copy_dir does not end with \"fdroid\", perhaps you meant: \"{path}\""
@@ -2339,27 +2327,18 @@ msgstr "local_copy_dir deve ser um caminho absoluto!"
 
 #: ../fdroidserver/deploy.py
 msgid "local_copy_dir must be directory, not a file!"
-msgstr "local_copy_dir deve ser um diretório, não um arquivo!"
+msgstr "local_copy_dir deve ser directory, não um arquivo!"
 
 #: ../fdroidserver/index.py
 #, python-format
 msgid "mirror '%s' does not end with 'fdroid'!"
 msgstr "espelho '%s' não termina com 'fdroid'!"
 
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "mirrors set twice, in config.yml and {path}!"
-msgstr "espelhos (mirrors) definidos duas vezes, em config.yml e {path}!"
-
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "mutually exclusive arguments must be optional"
 msgstr "argumentos mutuamente exclusivos devem ser opcional"
 
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "next {name} cache update due in {time}"
-msgstr "próxima atualização do cache {name} prevista para {time}"
-
 #: ../fdroidserver/mirror.py
 #, python-brace-format
 msgid "no \"icon\" in {appid}"
@@ -2369,34 +2348,97 @@ msgstr "nenhum \"ícone\" em {appid}"
 msgid "no APK supplied"
 msgstr "nenhum APK fornecido"
 
-#: ../fdroidserver/checkupdates.py
-msgid "no version information found"
-msgstr "nenhuma informação de versão encontrada"
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, python-format
+msgid "no such option: %s"
+msgstr "não tem tal opção: %s"
 
-#: /usr/lib/python3.11/argparse.py
+#: ../fdroid ../fdroidserver/__main__.py
+msgid "no version info found!"
+msgstr "não há informações de versão encontrada!"
+
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "not allowed with argument %s"
 msgstr "não é permitido com o argumento %s"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "one of the arguments %s is required"
 msgstr "um dos argumentos %s é necessário"
 
-#: ../fdroidserver/common.py ../fdroidserver/index.py
+#: ../fdroidserver/index.py ../fdroidserver/common.py
 msgid "only accepts strings, lists, and tuples"
 msgstr "apenas aceita cadeias, listas e tuplos"
 
-#: /usr/lib/python3.11/argparse.py
-msgid "options"
-msgstr "opções"
+#: ../fdroidserver/install.py
+#, python-format
+msgid "option %s: If you really want to install all the signed apps, use --all"
+msgstr "opção %s: se você realmente deseja instalar todas as apps assinadas, use --all"
+
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, python-format
+msgid "option %s: invalid %s value: %r"
+msgstr "Opção %s: valor %s inválido: %r"
+
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, python-format
+msgid "option %s: invalid choice: %r (choose from %s)"
+msgstr "opção %s: escolha inválida: %r (escolha entre %s)"
+
+#: /usr/lib/python3.5/getopt.py /usr/lib/python3.6/getopt.py
+#: /usr/lib/python3.7/getopt.py
+#, python-format
+msgid "option -%s not recognized"
+msgstr "Comando '%s' não é reconhecido"
+
+#: /usr/lib/python3.5/getopt.py /usr/lib/python3.6/getopt.py
+#: /usr/lib/python3.7/getopt.py
+#, python-format
+msgid "option -%s requires argument"
+msgstr "Opção -%s necessita argumento"
+
+#: /usr/lib/python3.5/getopt.py /usr/lib/python3.6/getopt.py
+#: /usr/lib/python3.7/getopt.py
+#, python-format
+msgid "option --%s must not have an argument"
+msgstr "opção --%s não pode ter argumento"
+
+#: /usr/lib/python3.5/getopt.py /usr/lib/python3.6/getopt.py
+#: /usr/lib/python3.7/getopt.py
+#, python-format
+msgid "option --%s not a unique prefix"
+msgstr "opção --%s não é prefixo único"
+
+#: /usr/lib/python3.5/getopt.py /usr/lib/python3.6/getopt.py
+#: /usr/lib/python3.7/getopt.py
+#, python-format
+msgid "option --%s not recognized"
+msgstr "Comando --%s não é reconhecido"
+
+#: /usr/lib/python3.5/getopt.py /usr/lib/python3.6/getopt.py
+#: /usr/lib/python3.7/getopt.py
+#, python-format
+msgid "option --%s requires argument"
+msgstr "opção --%s necessita argumento"
+
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
+msgid "optional arguments"
+msgstr "argumentos opcionais"
 
 #: ../fdroidserver/nightly.py
 #, python-brace-format
 msgid "overwriting existing {path}"
 msgstr "sobrescrevendo {path} existente"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "positional arguments"
 msgstr "argumentos posicionais"
 
@@ -2405,55 +2447,44 @@ msgstr "argumentos posicionais"
 msgid "process log deploy {path} to {dest} failed!"
 msgstr "houve uma falha no registro de processo implantação {path} para {dest}!"
 
-#: ../fdroidserver/build.py
-msgid "reference binary missing signature"
-msgstr "falta assinatura no binário de referência"
-
 #: ../fdroidserver/signatures.py
 #, python-brace-format
 msgid "refuse downloading via insecure HTTP connection (use HTTPS or specify --no-https-check): {apkfilename}"
 msgstr "Recuse o download inseguro via conexão HTTP (use HTTPS ou especifique --no-https-check): {apkfilename}"
 
+#: ../fdroidserver/signatures.py
+#, python-brace-format
+msgid "refuse downloading via insecure http connection (use https or specify --no-https-check): {apkfilename}"
+msgstr "Recuse o download insegura via conexão http (use https ou especifique --no-https-check): {apkfilename}"
+
 #: ../fdroidserver/index.py
 #, python-format
-msgid "repo_icon \"repo/icons/%s\" does not exist, generating placeholder."
-msgstr "repo_icon \"repo/icons/%s\" não existe, gerando um espaço reservado."
+msgid "repo_icon %s does not exist, generating placeholder."
+msgstr "repo_icon %s não existe, gerando um espaço reservado."
 
-#: ../fdroidserver/common.py
-msgid "repo_url needs to end with /repo"
-msgstr "repo_url precisa terminar com /repo"
+#: ../fdroidserver/metadata.py
+msgid "ruamel.yaml not installed, can not write metadata."
+msgstr "o ruamel.yaml não está instalado, não é possível escrever os metadados."
 
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "rsync is missing or broken: {error}"
-msgstr "rsync está ausente ou quebrado: {error}"
-
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "s3cmd sync indexes {path} to {url} and delete"
 msgstr "s3cmd sincroniza índices {path} para {url} e exclui"
 
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "s3cmd syncs indexes from {path} to {url} and deletes removed"
-msgstr "s3cmd sincroniza os índices de {path} para {url} e exclui os índices removidos"
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "scanner cache is malformed! You can clear it with: '{clear}'"
-msgstr "o cache do scanner está malformado! Você pode limpá-lo com: '{clear}'"
-
-#: ../fdroidserver/deploy.py
-msgid "serverwebroot: path does not end with \"fdroid\", perhaps you meant one of these:"
-msgstr "serverwebroot: o caminho não termina com \"fdroid\", talvez você tenha se referido a um destes:"
-
 #: ../fdroidserver/scanner.py
 msgid "shared library"
 msgstr "biblioteca compartilhada"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "show program's version number and exit"
+msgstr "mostrar versão do programa e sair"
+
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.5/optparse.py
+#: /usr/lib/python3.6/argparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/argparse.py /usr/lib/python3.7/optparse.py
 msgid "show this help message and exit"
-msgstr "mostra esta mensagem de ajuda e sai"
+msgstr "mostrar esta mensagem de ajuda e sair"
 
 #: ../fdroidserver/signatures.py
 msgid "signed APK, either a file-path or HTTPS URL."
@@ -2461,11 +2492,11 @@ msgstr "APK assinado, seja um caminho de arquivo ou um URL HTTPS."
 
 #: ../fdroidserver/common.py
 msgid "skip deploying full build logs: log content is empty"
-msgstr "ignorar a implantação de logs de compilação completos: o conteúdo do log está vazio"
+msgstr "Pule a implantação de logs completos de compilação: o conteúdo do log está vazio."
 
 #: ../fdroidserver/common.py
 msgid "skip deploying full build logs: not enabled in config"
-msgstr "ignorar a implantação de logs de compilação completos: não habilitado na configuração"
+msgstr "Pule a implantação de logs de criação completos: não habilitado em configuração."
 
 #: ../fdroidserver/update.py
 #, python-brace-format
@@ -2480,31 +2511,31 @@ msgstr "Nome 'srclibs' ausente e/ou '@'"
 msgid "static library"
 msgstr "biblioteca estática"
 
-#: ../fdroidserver/build.py
+#: ../fdroidserver/common.py
 #, python-brace-format
-msgid "supplied reference binary has allowed signer {signer}"
-msgstr "o binário de referência fornecido autorizou o signatário {signer}"
+msgid "supplied timestamp value '{timestamp}' is not a unix timestamp"
+msgstr "O valor do data-hora fornecido ('{timestamp}') não está no formato timestamp unix."
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "the following arguments are required: %s"
 msgstr "os seguintes argumentos são necessários: %s"
 
-#: ../fdroidserver/install.py
-msgid "true"
-msgstr "verdadeiro"
-
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "unexpected option string: %s"
 msgstr "opção de cadeia de texto inesperada: %s"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "unknown parser %(parser_name)r (choices: %(choices)s)"
 msgstr "O formato '%(parser_name)r' é desconhecido. (Opções Válidas: %(choices)s)"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "unrecognized arguments: %s"
 msgstr "argumentos não reconhecidos: %s"
@@ -2514,11 +2545,16 @@ msgstr "argumentos não reconhecidos: %s"
 msgid "unsafe permissions on '{config_file}' (should be 0600)!"
 msgstr "permissões inseguras em '{config_file}' (deveria ser 0600)!"
 
-#: ../fdroidserver/__main__.py /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py ../fdroid
+#: /usr/lib/python3.7/argparse.py ../fdroidserver/__main__.py
 msgid "usage: "
 msgstr "uso: "
 
-#: ../fdroidserver/deploy.py
+#: ../fdroid
+msgid "usage: fdroid [-h|--help|--version] <command> [<args>]"
+msgstr "uso: fdroid [-h|--help|--version] <comando> [<args>]"
+
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "using Apache libcloud to sync with {url}"
 msgstr "usando o Apache libcloud para sincronizar com {url}"
@@ -2527,9 +2563,9 @@ msgstr "usando o Apache libcloud para sincronizar com {url}"
 msgid "virustotal.com is rate limiting, waiting to retry..."
 msgstr "o virustotal.com está limitando a taxa, esperando para tentar novamente ..."
 
-#: ../fdroidserver/install.py
-msgid "yes"
-msgstr "sim"
+#: ../fdroidserver/update.py
+msgid "wiki support is deprecated and will be removed in the next release!"
+msgstr "O suporte do wiki está descontinuado e será removido no próximo lançamento!"
 
 #: ../fdroidserver/publish.py
 #, python-brace-format
@@ -2543,19 +2579,31 @@ msgstr[1] "{0} apls, {1} codinome de chaves"
 msgid "{apkfilename} ({appid}) has no metadata!"
 msgstr "{apkfilename} ({appid}) não tem metadados!"
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
+#: ../fdroidserver/update.py
+#, python-brace-format
+msgid "{apkfilename} has multiple {name} files, looks like Master Key exploit!"
+msgstr "{apkfilename} tem vários arquivos {name} que, parece explorar a Master Key!"
+
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "{apkfilename}'s AndroidManifest.xml has a bad date: "
 msgstr "AndroidManifest.xml do {apkfilename} tem uma data má: "
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "{appid} does not have a name! Using application ID instead."
 msgstr "{appid} não tem um nome! Usando o ID do applicativo em vez disso."
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
+#: ../fdroidserver/update.py
+#, python-brace-format
+msgid "{appid} does not have a name! Using package name instead."
+msgstr "{appid} não tem um nome! Usando o nome do pacote em vez disso."
+
+#: ../fdroidserver/update.py
+#, python-brace-format
+msgid "{appid} from {path} is not a valid Android Package Name!"
+msgstr "O {appid} do {path} não é um Nome de Pacote Android válido!"
+
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "{appid} from {path} is not a valid Android application ID!"
@@ -2566,16 +2614,12 @@ msgstr "O {appid} do {path} não é um ID de aplicativo Android válido!"
 msgid "{appid} from {path} is not a valid Java Package Name!"
 msgstr "O {appid} do {path} não é um Nome de Pacote Java válido!"
 
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{appid} has both APKs and files: {files}"
-msgstr "{appid} tem APKs e arquivos: {files}"
-
 #: ../fdroidserver/mirror.py
 #, python-brace-format
 msgid "{appid} is missing {name}"
 msgstr "{appid} tem falta de {name}"
 
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "{appid}: Unknown extlib {path} in build '{versionName}'"
@@ -2603,8 +2647,8 @@ msgstr "{build_flag} deve ser um número inteiro, encontrado: {value}"
 
 #: ../fdroidserver/metadata.py
 #, python-brace-format
-msgid "{build_flag} must be list or string, found: {value}"
-msgstr "{build_flag} deve ser uma lista ou uma cadeia de caracteres, encontrado: {value}"
+msgid "{field} not terminated in {name}"
+msgstr "{field} não foi terminado em {name}"
 
 #: ../fdroidserver/metadata.py
 #, python-brace-format
@@ -2613,15 +2657,10 @@ msgstr "o {file} está vazio ou está corrompido!"
 
 #: ../fdroidserver/update.py
 #, python-brace-format
-msgid "{name} \"{section}/icons/{path}\" does not exist! Check \"config.yml\"."
-msgstr "{name} \"{section}/icons/{path}\" não existe! Corrija-o no \"config.yml\"."
+msgid "{name} \"{path}\" does not exist! Correct it in config.py."
+msgstr "{name} \"{path}\" não existe! Corrija-o no config.py."
 
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{path1} is a duplicate of {path2}, remove one!"
-msgstr "{path1} é uma duplicata de {path2}, remova uma!"
-
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 #, python-brace-format
 msgid "{path} already exists, ignoring import results!"
 msgstr "o {path} já existe, ignorando os resultados de importação!"
@@ -2636,36 +2675,6 @@ msgstr "{path} não existe! Crie-o executando:"
 msgid "{path} has bad file signature \"{pattern}\", possible Janus exploit!"
 msgstr "{path} tem uma má assinatura de arquivo \"{pattern}\", um exploração Janus é possível!"
 
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "{path} has been flagged by virustotal {count} times:"
-msgstr "{path} foi sinalizado pelo virustotal {count} vezes:"
-
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "{path} has the wrong fingerprint ({fingerprint})!"
-msgstr "{path} tem a impressão digital errada ({fingerprint})!"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "{path} is not \"key: value\" dict, but a {datatype}!"
-msgstr "{path} não é um ditado \"key: value\", mas um {datatype}!"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "{path} is not a standard config file!"
-msgstr "{path} não é um arquivo de configuração padrão!"
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "{path} is not list, but a {datatype}!"
-msgstr "{path} não é uma lista, mas um {datatype}!"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "{path} is not {expected_type}, but a {datatype}!"
-msgstr "{path} não é {expected_type}, mas um {datatype}!"
-
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "{path} is zero size!"
@@ -2676,22 +2685,12 @@ msgstr "{path} tem um tamanho de zero!"
 msgid "{path} more than 200MB, manually upload: {url}"
 msgstr "o {path} tem mais de 200MB, upload manual: {url}"
 
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "{path}: \"{code}\" is not a valid ISO_3166-1 alpha-2 country code!"
-msgstr "{path}: \"{code}\" não é um código de país ISO_3166-1 alfa-2 válido!"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{path}: {error}"
-msgstr "Falha ao copiar {path}: {error}"
-
 #: ../fdroidserver/mirror.py
 #, python-brace-format
 msgid "{url} does not end with \"fdroid\", check the URL path!"
 msgstr "{url} não termina com \"fdroid\", verifique o caminho na URL!"
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/common.py
 #, python-brace-format
 msgid "{url} does not start with \"http\"!"
 msgstr "a {url} não começa com \"http\"!"
@@ -2707,3 +2706,43 @@ msgid "{} build succeeded"
 msgid_plural "{} builds succeeded"
 msgstr[0] "{} compilação foi bem sucedida"
 msgstr[1] "{} compilações foram bem sucedidas"
+
+#, fuzzy
+#~ msgid "Add PGP signatures for packages in repo using GnuPG"
+#~ msgstr "Adicione assinaturas gpg para os pacotes no repositório"
+
+#~ msgid "Add gpg signatures for packages in repo"
+#~ msgstr "Adicione assinaturas gpg para os pacotes no repositório"
+
+#~ msgid "Cannot find a packageName for {path}!"
+#~ msgstr "Não é possível encontrar um packageName para {path} 1!"
+
+#~ msgid "Cannot find an appid for {path}!"
+#~ msgstr "Não é possível encontrar um appid para {path} 1!"
+
+#~ msgid "Clean update - don't uses caches, reprocess all apks"
+#~ msgstr "Atualização limpa - não usa cache, reprocessa todos os APKs"
+
+#~ msgid "Interactively ask about things that need updating."
+#~ msgstr "Perguntar interativamente sobre elementos que precisam de atualização."
+
+#~ msgid "Specify editor to use in interactive mode. Default "
+#~ msgstr "Especifique o editor a ser usado no modo interativo. Padrão "
+
+#~ msgid "Specify editor to use in interactive mode. Default %s"
+#~ msgstr "Especificar o editor que será usado no modo interativo. O padrão é %s"
+
+#~ msgid "Specify editor to use in interactive mode. Default is {path}"
+#~ msgstr "Especifique o editor a ser usado no modo interativo. O padrão é {path}"
+
+#~ msgid "app-id in the form APPID"
+#~ msgstr "app-id na forma APPID"
+
+#~ msgid "app-id to check for updates"
+#~ msgstr "app-id para verificar por atualizações"
+
+#~ msgid "app-id with optional versionCode in the form APPID[:VERCODE]"
+#~ msgstr "app-id, com código de versão (versionCode) opcional, na forma APPID[:VERCODE]"
+
+#~ msgid "app-id with optional versioncode in the form APPID[:VERCODE]"
+#~ msgstr "app-id, com código de versão (versioncode) opcional, na forma APPID[:VERCODE]"
diff --git a/locale/pt_PT/LC_MESSAGES/fdroidserver.po b/locale/pt_PT/LC_MESSAGES/fdroidserver.po
index e9f15dfa..906dc132 100644
--- a/locale/pt_PT/LC_MESSAGES/fdroidserver.po
+++ b/locale/pt_PT/LC_MESSAGES/fdroidserver.po
@@ -2,17 +2,14 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # Manuela Silva <mmsrs@sky.com>, 2020.
-# ssantos <ssantos@web.de>, 2020, 2021, 2022, 2023, 2024, 2025.
-# Hans-Christoph Steiner <hans@guardianproject.info>, 2020, 2022, 2024.
-# Peter J. Mello <admin@petermello.net>, 2021.
-# Fat Potato <mjwany48@gmail.com>, 2024.
-# Hugo Carvalho <hugokarvalho@hotmail.com>, 2024.
+# ssantos <ssantos@web.de>, 2020.
+# Hans-Christoph Steiner <hans@guardianproject.info>, 2020.
 msgid ""
 msgstr ""
 "Project-Id-Version: fdroidserver 0.9\n"
 "Report-Msgid-Bugs-To: https://gitlab.com/fdroid/fdroidserver/issues\n"
-"POT-Creation-Date: 2025-06-25 09:52+0200\n"
-"PO-Revision-Date: 2025-05-30 07:19+0000\n"
+"POT-Creation-Date: 2020-10-21 18:05+0200\n"
+"PO-Revision-Date: 2020-10-26 07:26+0000\n"
 "Last-Translator: ssantos <ssantos@web.de>\n"
 "Language-Team: Portuguese (Portugal) <https://hosted.weblate.org/projects/f-droid/fdroidserver/pt_PT/>\n"
 "Language: pt_PT\n"
@@ -20,7 +17,31 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Generator: Weblate 5.12-dev\n"
+"X-Generator: Weblate 4.3.2-dev\n"
+
+#: ../fdroidserver/common.py
+msgid ""
+"\n"
+"        This is a repository of apps to be used with FDroid. Applications in this\n"
+"        repository are either official binaries built by the original application\n"
+"        developers, or are binaries built from source by f-droid.org using the\n"
+"        tools on https://gitlab.com/fdroid.\n"
+"        "
+msgstr ""
+"\n"
+"        Este é um repositório de apps a serem usados com o FDroid.\n"
+"        Aplicações neste repositório são binários oficiais compilados pelos\n"
+"        programadores da aplicação original ou são binários compilados da\n"
+"        fonte por f-droid.org a usar as ferramentas em https://gitlab.com/fdroid.\n"
+"        "
+
+#: ../fdroidserver/nightly.py
+msgid ""
+"\n"
+"SSH Public Key to be used as Deploy Key:"
+msgstr ""
+"\n"
+"Chave pública SSH para ser usada como chave de implantar:"
 
 #: ../fdroidserver/nightly.py
 msgid ""
@@ -44,26 +65,22 @@ msgstr ""
 msgid "\"%s/\" has no matching metadata file!"
 msgstr "\"%s/\" não tem ficheiro de metadados correspondente!"
 
-#: ../fdroidserver/index.py
-msgid "\"isPrimary\" key should not be added to mirrors!"
-msgstr "A chave \"isPrimary\" não deve ser adicionada em espelhos!"
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "\"local_copy_dir\" {path} does not exist!"
-msgstr "\"local_copy_dir\" {path} não existe!"
-
 #: ../fdroidserver/install.py
 #, python-brace-format
 msgid "\"{apkfilename}\" is already installed on {dev}."
 msgstr "'{apkfilename}' já está instalado no {dev}."
 
+#: ../fdroidserver/update.py
+#, python-brace-format
+msgid "\"{path}\" contains outdated {name} ({version})"
+msgstr "\"{path}\" contém {name} ({version}) desatualizado"
+
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "\"{path}\" contains recent {name} ({version})"
 msgstr "\"{path}\" contém {name} ({version}) recente"
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "\"{path}\" exists but s3cmd is not installed!"
 msgstr "\"{path}\" existe, mas s3cmd não está instalado!"
@@ -73,84 +90,119 @@ msgstr "\"{path}\" existe, mas s3cmd não está instalado!"
 msgid "\"{path}\" is not a supported file format (use: metadata/*.yml)"
 msgstr "\"{path}\" não é um formato de ficheiro aceito (use: metadata/*.yml)"
 
-#: ../fdroidserver/update.py
+#: ../fdroidserver/metadata.py
 #, python-brace-format
-msgid "\"{path}\" is signed by a key that is not allowed:"
-msgstr "\"{path}\" está acessado por uma chave que não é permitida:"
+msgid "\"{path}\" is not an accepted format, convert to: {formats}"
+msgstr "\"{path}\" não é um formato aceito, converter para: {formats}"
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/common.py
 #, python-brace-format
 msgid "\"{url}\" is not a valid URL!"
 msgstr "\"{url}\" não é uma URL válida!"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, python-format
+msgid "%(option)s option requires %(number)d argument"
+msgid_plural "%(option)s option requires %(number)d arguments"
+msgstr[0] "A opção %(option)s requer o argumento %(number)d"
+msgstr[1] "A opção %(option)s requer os argumentos %(number)d"
+
+#: ../fdroidserver/mirror.py
+#, python-format
+msgid "%(prog)s [options] url"
+msgstr "%(prog)s [opções] url"
+
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "%(prog)s: error: %(message)s\n"
 msgstr "%(prog)s: erro: %(message)s\n"
 
-#: ../fdroidserver/publish.py
-#, python-format
-msgid "%d APKs failed to be signed or verified!"
-msgstr "%d APKs falharam a serem assinados ou verificados!"
-
 #: ../fdroidserver/scanner.py
 #, python-format
 msgid "%d problems found"
 msgstr "%d problemas encontrados"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "%prog [options]"
+msgstr "%prog [opções]"
+
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "%r is not callable"
 msgstr "%r não pode ser invocado"
 
-#: ../fdroidserver/signindex.py
-#, python-format
-msgid "%s did not produce a dict!"
-msgstr "%s não produziu um dict!"
-
-#: ../fdroidserver/signindex.py
-#, python-format
-msgid "%s has bad SHA-256: %s"
-msgstr "%s tem um SHA-256 ruim: %s"
-
 #: ../fdroidserver/lint.py
 #, python-format
 msgid "%s is not an accepted build field"
 msgstr "%s não é um campo criado aceito"
 
-#: ../fdroidserver/common.py
-msgid "'keypass' not found in config.yml!"
-msgstr "'keypass' não foi encontrada em config.yml!"
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, python-format
+msgid "%s option does not take a value"
+msgstr "opção %s não leva um valor"
+
+#: ../fdroidserver/index.py ../fdroidserver/common.py
+msgid "'keypass' not found in config.py!"
+msgstr "'keypass' não foi encontrada em config.py!"
 
 #: ../fdroidserver/common.py
 msgid "'keystore' is NONE and 'smartcardoptions' is blank!"
 msgstr "\"keystore\" é NONE e \"smartcardoptions\" está vazio!"
 
-#: ../fdroidserver/common.py
-msgid "'keystore' not found in config.yml!"
-msgstr "'keystore' não encontrada em config.yml!"
+#: ../fdroidserver/index.py ../fdroidserver/common.py
+msgid "'keystore' not found in config.py!"
+msgstr "'keystore' não encontrada em config.py!"
 
-#: ../fdroidserver/common.py
-msgid "'keystorepass' not found in config.yml!"
-msgstr "'keystorepass' não encontrada em config.yml!"
+#: ../fdroidserver/index.py ../fdroidserver/common.py
+msgid "'keystorepass' not found in config.py!"
+msgstr "'keystorepass' não encontrada em config.py!"
 
-#: ../fdroidserver/common.py
-msgid "'repo_keyalias' not found in config.yml!"
-msgstr "'repo_keyalias' não encontrada em config.yml!"
+#: ../fdroidserver/index.py ../fdroidserver/common.py
+msgid "'repo_keyalias' not found in config.py!"
+msgstr "'repo_keyalias' não encontrada em config.py!"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "'required' is an invalid argument for positionals"
 msgstr "'required' é um argumento inválido para posicionadores"
 
 #: ../fdroidserver/common.py
-msgid "'sdk_path' not set in config.yml!"
-msgstr "'sdk_path' não definido em 'config.yml'!"
+msgid "'sdk_path' not set in 'config.py'!"
+msgstr "'sdk_path' não definido em 'config.py'!"
+
+#. Translators: "build-tools" is the file name of a package from
+#. Google, it is part of the Android SDK. So it probably shouldn't be
+#. translated or transliterated.
+#: ../fdroidserver/common.py
+#, python-brace-format
+msgid "'{aapt}' is too old, fdroid requires build-tools-23.0.0 or newer!"
+msgstr "'{aapt}' é muito antigo, fdroid requer build-tools-23.0.0 ou mais recente!"
 
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "'{aapt}' is too old, fdroid requires build-tools-{version} or newer!"
 msgstr "'{aapt}' é muito antigo, fdroid requer build-tools-{version} ou mais recente!"
 
+#: ../fdroidserver/install.py
+#, python-brace-format
+msgid "'{apkfilename}' is already installed on {dev}."
+msgstr "'{apkfilename}' já está instalado no {dev}."
+
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "'{field}' in {linedesc} is obsolete, see docs for current fields:"
+msgstr "O '{field}' em {linedesc} é obsoleto, veja os documentos para os campos actuais:"
+
+#: ../fdroidserver/common.py
+#, python-brace-format
+msgid "'{field}' will be in random order! Use () or [] brackets if order is important!"
+msgstr "'{field}' será em ordem aleatória! Use () ou [] se a ordem for importante!"
+
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "'{path}' failed to execute!"
@@ -158,49 +210,39 @@ msgstr "'{path}' falhou ao executar!"
 
 #: ../fdroidserver/metadata.py
 #, python-brace-format
-msgid "'{path}' has invalid format, it should be a dictionary!"
-msgstr "'{path}' tem um formato inválido, deveria ser um dicionário!"
-
-#: ../fdroidserver/lint.py ../fdroidserver/metadata.py
-#, python-brace-format
 msgid "'{value}' is not a valid {field} in {appid}. Regex pattern: {pattern}"
 msgstr "'{value}' não é um {field} válido em {appid}. Modelo regex: {pattern}"
 
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "'{value}' is not a valid {field}, should be {pattern}"
-msgstr "'{value}' não é um {field} válido, deve ser {pattern}"
-
-#: ../fdroidserver/checkupdates.py
-msgid "--merge-request only runs on a single appid!"
-msgstr "--merge-request só é executado num único appid!"
-
 #: ../fdroidserver/checkupdates.py
 #, python-brace-format
 msgid "...checkupdate failed for {appid} : {error}"
 msgstr "...checkupdate falhou para {appid} : {error}"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid ".__call__() not defined"
 msgstr ".__call__() não definida"
 
+#: ../fdroidserver/metadata.py
+msgid ".fdroid.txt is not supported!  Convert to .fdroid.yml or .fdroid.json."
+msgstr ".fdroid.txt não é suportado!  Converter para .fdroid.yml ou .fdroid.json."
+
 #: ../fdroidserver/lint.py
 msgid "/issues is missing"
-msgstr "/issues está em falta"
+msgstr "está faltando o /issues"
 
 #: ../fdroidserver/mirror.py
 msgid "A URL is required as an argument!"
 msgstr "Uma URL é necessária como um argumento!"
 
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "APK signatures have different certificates in {path}:"
-msgstr "As assinaturas do APK têm certificados diferentes em {path}:"
-
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Add PGP signatures using GnuPG for packages in repo"
 msgstr "Adicione assinaturas PGP usando GnuPG para os pacotes no repositório"
 
+#: ../fdroid ../fdroidserver/__main__.py
+msgid "Add a new application from its source code"
+msgstr "Adicionar nova aplicação através do código fonte"
+
 #: ../fdroidserver/update.py
 msgid "Add a repo signing key to an unsigned repo"
 msgstr "Adicionar uma chave de assinatura para um repositório não assinado"
@@ -218,11 +260,7 @@ msgstr "Adicionando novo repositório para apenas {name}"
 msgid "Alias of the repo signing key in the keystore"
 msgstr "Alias (apelido) da chave de assinatura do repositório na keystore"
 
-#: ../fdroidserver/build.py
-msgid "AllowedAPKSigningKeys missing but reference binary supplied"
-msgstr "AllowedAPKSigningKeys está ausente, mas o binário de referência foi fornecido"
-
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "Allows a different revision (or git branch) to be specified for the initial import"
 msgstr "Permite que uma revisão diferente (ou árvore do git) seja especificada para a importação inicial"
 
@@ -246,10 +284,14 @@ msgstr "Ficheiro APK do Android"
 msgid "Android DEX code"
 msgstr "Código DEX do Android"
 
-#: ../fdroidserver/init.py
+#: ../fdroidserver/common.py ../fdroidserver/build.py
 #, python-brace-format
-msgid "Android SDK not found at {path}!"
-msgstr "SDK do Android não foi encontrado em {path}!"
+msgid "Android SDK '{path}' does not have '{dirname}' installed!"
+msgstr "O SDK Android '{path}' não tem '{dirname}' instalado!"
+
+#: ../fdroidserver/common.py
+msgid "Android SDK not found!"
+msgstr "SDK do Android não foi encontrado!"
 
 #: ../fdroidserver/common.py
 #, python-brace-format
@@ -261,28 +303,23 @@ msgstr "O caminho do SDK Android '{path}' não existe!"
 msgid "Android SDK path '{path}' is not a directory!"
 msgstr "O caminho do SDK Android '{path}' não é um diretório!"
 
+#. Translators: "build-tools" is the file name of a package from
+#. Google, it is part of the Android SDK. So it probably shouldn't be
+#. translated or transliterated.
 #: ../fdroidserver/common.py
 #, python-brace-format
-msgid "Android SDK tool {cmd} not found!"
-msgstr "Ferramenta {cmd} do Android SDK não foi encontrada!"
+msgid "Android build-tools path '{path}' does not exist!"
+msgstr "Caminho de build-tools do Android '{path}' não existe!"
 
-#: ../fdroidserver/lint.py
-msgid "App has Binaries but does not have corresponding AllowedAPKSigningKeys to pin certificate."
-msgstr "A app tem binários, mas não tem AllowedAPKSigningKeys correspondentes para fixar o certificado."
-
-#: ../fdroidserver/lint.py
-msgid "App has NoSourceSince or ArchivePolicy \"0 versions\" or 0 but AutoUpdateMode or UpdateCheckMode are not None"
-msgstr "A app tem NoSourceSince ou ArchivePolicy \"0 versions\" ou 0, mas AutoUpdateMode ou UpdateCheckMode não são None"
+#: ../fdroidserver/update.py
+msgid "AndroidManifest.xml has no date"
+msgstr "AndroidManifest.xml não tem data"
 
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "App is in '{repo}' but has a link to {url}"
 msgstr "A App está em '{repo}' mas tem uma hiperligação para {url}"
 
-#: ../fdroidserver/lint.py
-msgid "App version has binary but does not have corresponding AllowedAPKSigningKeys to pin certificate."
-msgstr "A versão da app tem um binário, mas não tem as AllowedAPKSigningKeys correspondentes para fixar o certificado."
-
 #: ../fdroidserver/lint.py
 msgid "Appending .git is not necessary"
 msgstr "Acrescentar .git não é necessário"
@@ -292,27 +329,11 @@ msgstr "Acrescentar .git não é necessário"
 msgid "Archiving {apkfilename} with invalid signature!"
 msgstr "Arquivamento {apkfilename} com assinatura inválida!"
 
-#: ../fdroidserver/lint.py
-msgid "AutoUpdateMode with UpdateCheckMode: HTTP must have a pattern."
-msgstr "AutoUpdateMode com UpdateCheckMode: HTTP deve ter um modelo."
-
-#: ../fdroidserver/install.py
-msgid "Automatic no to all prompts."
-msgstr "Não automático a todos os avisos."
-
-#: ../fdroidserver/install.py
-msgid "Automatic yes to all prompts."
-msgstr "Sim automático a todos os avisos."
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "Bad entry type \"{mirrortype}\" in mirrors config: {mirror}"
-msgstr "Tipo de entrada \"{mirrortype}\" incorreto na configuração de espelhos: {mirror}"
-
 #: ../fdroidserver/mirror.py
 msgid "Base URL to mirror, can include the index signing key using the query string: ?fingerprint="
-msgstr "URL base para espelhar, pode incluir a chave de assinatura de índice usando a cadeia de consulta: ?fingerprint ="
+msgstr "URL base para espelhar, pode incluir a chave de assinatura de índice usando a string de consulta:? Fingerprint ="
 
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "Branch '{branch}' used as commit in build '{versionName}'"
@@ -328,7 +349,7 @@ msgstr "Ramificação '{branch}' usado como commit em srclib '{srclib}'"
 msgid "Broken symlink: {path}"
 msgstr "Ligação simbólica quebrada: {path}"
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Build a package from source"
 msgstr "Construir pacote através da fonte"
 
@@ -348,48 +369,57 @@ msgstr "Construir metadados git repo não tem mudanças comprometidas!"
 msgid "Build only the latest version of each package"
 msgstr "Compilar apenas a última versão de cada pacote"
 
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Build should have comma-separated versionName and versionCode, not \"{value}\", in {linedesc}"
+msgstr "A compilação deve ter versionName e versionCode separados por vírgula, e não \"{value} 1\", em {linedesc} 2"
+
 #: ../fdroidserver/init.py
 #, python-format
 msgid "Built repo based in \"%s\" with this config:"
 msgstr "Repo construído baseado em \"%s\" com esta configuração:"
 
-#: ../fdroidserver/checkupdates.py
-msgid "Can't auto-update app with no CurrentVersionCode"
-msgstr "Aplicação não pode ser auto-atualizada sem CurrentVersionCode"
-
 #: ../fdroidserver/build.py
 msgid "Can't build due to {} error while scanning"
 msgid_plural "Can't build due to {} errors while scanning"
 msgstr[0] "Não é possível construir devido a erro {} durante a digitalização"
 msgstr[1] "Não é possível construir devido a erros {} durante a digitalização"
 
-#: ../fdroidserver/common.py
-#, fuzzy, python-brace-format
-msgid "Cannot read {path}: {error}"
-msgstr "Falha de leitura {path}: {error}"
+#: ../fdroidserver/vmtools.py
+#, python-brace-format
+msgid "Cannot read \"{path}\"!"
+msgstr "Não é possível ler \"{path}\"!"
+
+#. Translators: https://developer.android.com/studio/build/application-id
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Cannot resolve application ID {appid}"
+msgstr "Não é possível resolver o ID da applicação {appid}"
 
 #: ../fdroidserver/rewritemeta.py
 #, python-brace-format
 msgid "Cannot rewrite \"{path}\""
 msgstr "Não é possível reescrever \"{path}\""
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
+#: ../fdroidserver/rewritemeta.py
+msgid "Cannot use --list and --to at the same time"
+msgstr "Não é possível usar --list e --to ao mesmo tempo"
+
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Cannot write \"{path}\", not an accepted format, use: {formats}"
+msgstr "Não é possível escrever \"{path}\", não é um formato aceito, use: {formats}"
+
 #: ../fdroidserver/lint.py
 #, python-format
 msgid "Categories '%s' is not valid"
 msgstr "As categorias '%s' não são válidas"
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
 #: ../fdroidserver/lint.py
 msgid "Categories are not set"
 msgstr "As categorias não são definidas"
 
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "Category \"{category}\" defined but not used for any apps!"
-msgstr "Categoria \"{category}\" definida, mas não usada para nenhuma app!"
-
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Check for updates to applications"
 msgstr "Verificação de actualizações das aplicações"
 
@@ -398,35 +428,34 @@ msgstr "Verificação de actualizações das aplicações"
 msgid "Checking archiving for {appid} - apks:{integer}, keepversions:{keep}, archapks:{arch}"
 msgstr "Verificando o arquivamento para {appid} - apks:{integer}, keepversions:{keep}, archapks:{arch}"
 
+#: ../fdroidserver/dscanner.py
+msgid "Clean after all scans have finished"
+msgstr "Limpar depois que todos os escaneamentos terminarem"
+
+#: ../fdroidserver/dscanner.py
+msgid "Clean before the scans start and rebuild the container"
+msgstr "Limpar antes do escanemento começar e recompilar o container"
+
+#: ../fdroidserver/dscanner.py
+msgid "Clean up all containers and then exit"
+msgstr "Limpar todos os containers e então sair"
+
 #: ../fdroidserver/update.py
 msgid "Clean update - don't uses caches, reprocess all APKs"
 msgstr "Atualização limpa - não usa cache, reprocessa todos os APKs"
 
-#: ../fdroidserver/common.py
-msgid "Color the log output"
-msgstr "Colorir o registo de saída"
-
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "Comma separated list of categories."
 msgstr "Lista de categorias separadas por vírgula."
 
-#: ../fdroidserver/__main__.py
-#, python-format
+#: ../fdroid ../fdroidserver/__main__.py
+#, c-format, python-format
 msgid "Command '%s' not recognised.\n"
 msgstr "Comando '%s' não reconhecido.\n"
 
 #: ../fdroidserver/checkupdates.py
 msgid "Commit changes"
-msgstr "Enviar alterações"
-
-#: ../fdroidserver/checkupdates.py
-msgid "Commit changes, push, then make a merge request"
-msgstr "Confirme as alterações, envie e faça um pedido de fusão"
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Conflicting \"{field}\" definitions between .yml and localized files:"
-msgstr "Definições contraditórias de \"{field}\" entre ficheiros .yml e ficheiros localizados:"
+msgstr "Enviar mudanças"
 
 #: ../fdroidserver/__main__.py
 msgid "Conflicting arguments: '--verbose' and '--quiet' can not be specified at the same time."
@@ -437,13 +466,11 @@ msgstr "Argumentos conflitantes: \"--verbose\" e \"--quiet\" não podem ser espe
 msgid "Could not find '{command}' on your system"
 msgstr "Não foi possível encontrar '{command}' no seu sistema"
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "Could not find latest version code"
 msgstr "Não foi possível encontrar o código de versão mais recente"
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "Could not find latest version name"
 msgstr "Não foi possível encontrar o nome da versão mais recente"
 
@@ -453,25 +480,30 @@ msgid "Could not find {path} to remove it"
 msgstr "Não foi possível localizar {path} para removê-lo"
 
 #: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Could not open APK {path} for analysis: "
-msgstr "Não foi possível abrir o APK {path} para análise: "
+msgid "Could not open apk file for analysis"
+msgstr "Não foi possível abrir ficheiro apk para análise"
 
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "Could not parse size \"{size}\", wrong type \"{type}\""
 msgstr "Não foi possível analisar o tamanho \"{size}\", tipo \"{type}\" incorreto"
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/import_subcommand.py
+#. Translators: https://developer.android.com/studio/build/application-id
+#: ../fdroidserver/import.py
 msgid "Couldn't find Application ID"
 msgstr "Não foi possível encontrar o ID da aplicação"
 
-#: ../fdroidserver/checkupdates.py
-msgid "Couldn't find any version information"
-msgstr "Não foi encontrada qualquer informação da versão"
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
+#: ../fdroidserver/import.py
+msgid "Couldn't find latest version code"
+msgstr "Não foi possível encontrar o código de versão mais recente"
 
-#: ../fdroidserver/checkupdates.py
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
+#: ../fdroidserver/import.py
+msgid "Couldn't find latest version name"
+msgstr "Não foi possível encontrar o nome da versão mais recente"
+
+#: ../fdroidserver/import.py
 msgid "Couldn't find package ID"
 msgstr "Não foi possível encontrar o ID do pacote"
 
@@ -479,26 +511,29 @@ msgstr "Não foi possível encontrar o ID do pacote"
 msgid "Cowardily refusing to overwrite existing signing key setup!"
 msgstr "Cobardemente recusando substituir a configuração da chave de assinatura existente!"
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/update.py
+msgid "Create a repo signing key in a keystore"
+msgstr "Criar uma chave de assinatura do repositório numa keystore"
+
+#: ../fdroidserver/update.py
+msgid "Create skeleton metadata files that are missing"
+msgstr "Criação do esqueleto de metadados dos ficheiros que estão em falta"
+
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Created new container \"{name}\""
 msgstr "Novo contentor criado: \"{name}\""
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Creating \"{path}\" for configuring s3cmd."
 msgstr "Criando \"{path}\" para configurar s3cmd."
 
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Creating empty {config_file}"
-msgstr "A criar '{config_file}' vazio"
-
 #: ../fdroidserver/publish.py
 msgid "Creating log directory"
 msgstr "Criando o diretório de log"
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Creating new S3 bucket: {url}"
 msgstr "Criando novo bucket S3: {url}"
@@ -511,7 +546,8 @@ msgstr "Criando diretório de output"
 msgid "Creating signed index with this key (SHA256):"
 msgstr "Criando índice assinado com esta chave (SHA256):"
 
-#: ../fdroidserver/publish.py ../fdroidserver/verify.py
+#: ../fdroidserver/import.py ../fdroidserver/verify.py
+#: ../fdroidserver/publish.py
 msgid "Creating temporary directory"
 msgstr "Criando diretório temporário"
 
@@ -556,22 +592,17 @@ msgstr "Descrição '%s' é apenas o resumo da app"
 msgid "Description has a duplicate line"
 msgstr "A descrição tem uma linha duplicada"
 
+#: ../fdroidserver/lint.py
+#, python-format
+msgid "Description has a list (%s) but it isn't bulleted (*) nor numbered (#)"
+msgstr "A descrição tem a lista (%s), mas não tem marcadores (*), nem é numerada (#)"
+
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "Description of length {length} is over the {limit} char limit"
 msgstr "A descrição de comprimento {length} é sobre o limite de char {limit}"
 
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Did you mean config/{name}.yml?"
-msgstr "Quis dizer config/{name}.yml?"
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Did you mean {code}?"
-msgstr "Quis dizer {code}?"
-
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "Do not add 'disable:' to the generated build entries"
 msgstr "Não adicionar 'disable:' às entradas de compilação geradas"
 
@@ -596,22 +627,27 @@ msgstr "Não remover as chaves privadas geradas do keystore"
 msgid "Don't create a source tarball, useful when testing a build"
 msgstr "Não criar um tarball da fonte; útil quando testando uma compilação"
 
+#: ../fdroidserver/stats.py
+msgid "Don't do anything logs-related"
+msgstr "Não fazer nada relacionado a registros de alterações"
+
 #: ../fdroidserver/build.py
 msgid "Don't refresh the repository, useful when testing a build with no internet connection"
 msgstr "Não atualizar o repositório; útil quando testando uma compilação sem conexão com a internet"
 
 #: ../fdroidserver/deploy.py ../fdroidserver/nightly.py
+#: ../fdroidserver/upload.py
 msgid "Don't use rsync checksums"
 msgstr "Não usar as somas de verificação (checksums) do rsync"
 
-#: ../fdroidserver/install.py
-msgid "Download F-Droid.apk using mirrors that leak less to the network"
-msgstr "Descarregue o F-Droid.apk utilizando espelhos que vazam menos para a rede"
-
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Download complete mirrors of small repos"
 msgstr "Descarregar espelhos completos de repos pequenos"
 
+#: ../fdroidserver/stats.py
+msgid "Download logs we don't have"
+msgstr "Descarregar os registos que nós não temos"
+
 #: ../fdroidserver/common.py
 msgid "Downloading the repository already failed once, not trying again."
 msgstr "O descarregamento do repositório já falhou uma vez, não tento novamente."
@@ -623,56 +659,38 @@ msgstr "Descarregar {url} falhou. {error}"
 
 #: ../fdroidserver/metadata.py
 #, python-brace-format
-msgid "Duplicate Anti-Feature declaration at {path} was ignored!"
-msgstr "A declaração duplicada da característica indesejada em {path} foi ignorada!"
-
-#: ../fdroidserver/index.py
-#, python-format
-msgid "Duplicate entry \"%s\" in mirrors config!"
-msgstr "Entrada \"%s\" duplicada na configuração de espelhos!"
+msgid "Duplicate build recipe found for versionCode {versionCode} in {linedesc}"
+msgstr "Receita de compilação duplicada encontrada para versionCode {versionCode} em {linedesc}"
 
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "Duplicate link in '{field}': {url}"
 msgstr "Ligação duplicada em '{field}': {url}"
 
-#: ../fdroidserver/common.py
-#, python-format
-msgid "ERROR: %(message)s"
-msgstr "ERRO: %(message)s"
+#: ../fdroid
+msgid "Dynamically scan APKs post build"
+msgstr "Analise dinâmica dos APKs após a compilação"
 
 #: ../fdroidserver/__main__.py
 msgid "ERROR: The \"server\" subcommand has been removed, use \"deploy\"!"
 msgstr "ERRO: o subcomando \"server\" foi removido, use \"deploy\"!"
 
+#: ../fdroidserver/mirror.py
+msgid ""
+"ERROR: this command should never be used to mirror f-droid.org!\n"
+"A full mirror of f-droid.org requires more than 200GB."
+msgstr ""
+"ERRO: este comando nunca deve ser usado para espelhar f-Droid.org!\n"
+"Um espelho completo de f-Droid.org requer mais de 200GB."
+
 #: ../fdroidserver/nightly.py
 msgid "ERROR: unsupported CI type, patches welcome!"
 msgstr "ERRO: tipo de CI sem suporte, patches são bem-vindos!"
 
-#: ../fdroidserver/nightly.py
-#, python-format
-msgid "ERROR: unsupported git host \"%s\", patches welcome!"
-msgstr "ERRO: host de git \"%s\" não suportado, patches são bem-vindos!"
-
-#: ../fdroidserver/lint.py
+#: ../fdroidserver/metadata.py
 #, python-brace-format
-msgid "ERROR: {key} in {path} is not \"archive\" or \"repo\"!"
-msgstr "ERRO: {key} em {path} não é \"arquivo\" ou \"repositório\"!"
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "ERROR: {key} not a valid key!"
-msgstr "ERRO: {key} não é uma chave válida!"
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "ERROR: {key}'s value should be of type {t}!"
-msgstr "ERRO: o valor de {key} deve ser do tipo {t}!"
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "ERROR: {key}:{subkey} in {path} is not in allowed keys: {allowed_keys}!"
-msgstr "ERRO: {key}:{subkey} em {path} não está nas chaves permitidas: {allowed_keys}!"
+msgid "Empty build flag at {linedesc}"
+msgstr "Sinalizador de compilação vazio em {linedesc}"
 
 #: ../fdroidserver/__main__.py
 #, python-brace-format
@@ -688,40 +706,20 @@ msgstr ""
 "Digite o caminho para o SDK do Android (%s) aqui:\n"
 "> "
 
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Environment variable {var} from {configname} is not set!"
-msgstr "A variável de ambiente {var} de {configname} não está definida!"
+#: ../fdroidserver/deploy.py ../fdroidserver/checkupdates.py
+#: ../fdroidserver/upload.py
+#, python-format
+msgid "Error while attempting to publish log: %s"
+msgstr "Erro ao tentar publicar o log: %s"
 
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Environment variable {{env: {var}}} is not set!"
-msgstr "A variável de ambiente {{env: {var} não está definida!"
-
-#: ../fdroidserver/deploy.py
-msgid "Error deploying 'github_releases', {} not present. (You might need to run `fdroid update` first.)"
-msgstr "Erro ao implementar 'github_releases', {} não está presente. (Pode ser necessário executar `fdroid update` primeiro.)"
-
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py ../fdroidserver/common.py
 msgid "Error while getting repo address"
 msgstr "Erro ao obter o endereço do repo"
 
-#: ../fdroidserver/scanner.py
-msgid "Exit with a non-zero code if problems were found"
-msgstr "Sair com um código diferente de zero se problemas forem encontrados"
-
-#: ../fdroidserver/__main__.py
-msgid "Extract application metadata from a source repository"
-msgstr "Extrair metadados de aplicações de um repositório de origem"
-
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Extract signatures from APKs"
 msgstr "Extrato de assinaturas de APKs"
 
-#: ../fdroidserver/install.py
-msgid "F-Droid.apk could not be downloaded from any known source!"
-msgstr "Não foi possível descarregar o F-Droid.apk de nenhuma fonte conhecida!"
-
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Failed copying {path}: {error}"
@@ -742,34 +740,42 @@ msgstr "Falha de leitura {path}: {error}"
 msgid "Failed resizing {path}: {error}"
 msgstr "Falha ao redimensionar {path}: {error}"
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/publish.py
+msgid "Failed to align application"
+msgstr "Falha ao alinhar a aplicação"
+
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Failed to create S3 bucket: {url}"
 msgstr "Falha ao criar o bucket S3: {url}"
 
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Failed to get APK information, deleting {path}"
-msgstr "Falha ao obter informações do APK, apagando {path}"
+#: ../fdroidserver/common.py
+msgid "Failed to get APK manifest information"
+msgstr "Falha ao obter informações de manifesto do APK"
 
 #: ../fdroidserver/update.py
 #, python-brace-format
-msgid "Failed to get APK information, skipping {path}"
-msgstr "Falha ao obter informações do APK, ignorando {path}"
+msgid "Failed to get apk information, deleting {path}"
+msgstr "Falha ao obter informações do apk, apagando {path}"
 
 #: ../fdroidserver/update.py
-msgid "Failed to get APK signing key fingerprint"
-msgstr "Falha ao obter a impressão digital da chave de assinatura do APK"
+#, python-brace-format
+msgid "Failed to get apk information, skipping {path}"
+msgstr "Falha ao obter informações do apk, ignorando {path}"
 
 #: ../fdroidserver/install.py
 #, python-brace-format
 msgid "Failed to install '{apkfilename}' on {dev}: {error}"
 msgstr "Falha ao instalar '{apkfilename}' em {dev}: {error}"
 
-#: ../fdroidserver/common.py
+#: ../fdroidserver/publish.py ../fdroidserver/common.py
 msgid "Failed to sign application"
 msgstr "Falha ao assinar a app"
 
+#: ../fdroidserver/common.py
+msgid "Failed to zipalign application"
+msgstr "Falha no zipaligning a app"
+
 #: ../fdroidserver/build.py
 #, python-brace-format
 msgid "Fetched buildserverid from VM: {buildserverid}"
@@ -785,12 +791,21 @@ msgstr "Assinaturas obtidas para '{apkfilename}'-> '{sigdir}'"
 msgid "File disappeared while processing it: {path}"
 msgstr "O ficheiro desapareceu enquanto era processado: {path}"
 
-#: ../fdroidserver/build.py ../fdroidserver/install.py
-#: ../fdroidserver/rewritemeta.py ../fdroidserver/scanner.py
-#: ../fdroidserver/update.py
+#: ../fdroidserver/verify.py ../fdroidserver/stats.py ../fdroidserver/update.py
+#: ../fdroidserver/rewritemeta.py ../fdroidserver/build.py
+#: ../fdroidserver/checkupdates.py ../fdroidserver/scanner.py
+#: ../fdroidserver/install.py
 msgid "Finished"
 msgstr "Terminado"
 
+#: ../fdroidserver/lint.py
+msgid "Flattr donation methods belong in the FlattrID flag"
+msgstr "Os métodos de doação do Flattr pertencem no sinalizador FlattrID"
+
+#: ../fdroidserver/lint.py
+msgid "Flattr donation methods belong in the FlattrID: field"
+msgstr "Os métodos de doação do Flattr pertencem no campo FlattrID:"
+
 #: ../fdroidserver/lint.py
 msgid "Forbidden HTML tags"
 msgstr "Tags HTML proibidos"
@@ -822,6 +837,7 @@ msgstr "Ficheiro de financiamento ruim \"{path}\" encontrado para \"{name}\":"
 msgid "Found invalid appids in arguments"
 msgstr "appids inválidos encontrados em argumentos"
 
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
 #: ../fdroidserver/common.py
 msgid "Found invalid versionCodes for some apps"
 msgstr "versionCodes inválidos encontrados para algumas apps"
@@ -831,10 +847,6 @@ msgstr "versionCodes inválidos encontrados para algumas apps"
 msgid "Found multiple JAR Signature Block Files in {path}"
 msgstr "Vários ficheiros de blocos de assinaturas JAR foram encontrados em {path}"
 
-#: ../fdroidserver/common.py
-msgid "Found multiple Signer Certificates!"
-msgstr "Vários certificados de assinante foram encontrados!"
-
 #: ../fdroidserver/metadata.py
 #, python-brace-format
 msgid "Found multiple metadata files for {appid}"
@@ -844,6 +856,11 @@ msgstr "Encontrados vários ficheiros de metadados para {appid}"
 msgid "Found multiple signing certificates for repository."
 msgstr "Vários certificados de assinatura encontrados para o repositório."
 
+#: ../fdroidserver/update.py
+#, python-brace-format
+msgid "Found multiple signing certificates in {path}"
+msgstr "Vários certificados de assinatura encontrados em {path}"
+
 #: ../fdroidserver/index.py
 msgid "Found no signing certificates for repository."
 msgstr "Nenhum certificado de assinatura para repositório encontrado."
@@ -858,16 +875,6 @@ msgstr "Não-ficheiro encontrado em %s"
 msgid "Found {apkfilename} at {url}"
 msgstr "{apkfilename} encontrado em {url}"
 
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Found {count} problems in {filename}"
-msgstr "{count} problemas encontrados em {filename}"
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Found {count} warnings in {filename}"
-msgstr "{count} avisos encontrados em {filename}"
-
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Generated skeleton metadata for {appid}"
@@ -886,21 +893,19 @@ msgstr "Git clean falhou"
 msgid "Git fetch failed"
 msgstr "Git fetch falhou"
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
+#: ../fdroidserver/common.py
+msgid "Git remote set-head failed"
+msgstr "Git remote set-head falhou"
+
 #: ../fdroidserver/common.py
 #, python-format
 msgid "Git remote set-head failed: \"%s\""
 msgstr "Git remote set-head falhou: \"%s\""
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
 #: ../fdroidserver/common.py
 msgid "Git reset failed"
 msgstr "Git reset falhou"
 
-#: ../fdroidserver/common.py
-msgid "Git submodule deinit failed"
-msgstr "Falha no submódulo deinit do Git"
-
 #: ../fdroidserver/common.py
 msgid "Git submodule sync failed"
 msgstr "Git submodule sync falhou"
@@ -930,17 +935,7 @@ msgstr "A ignorar '{field}' em metadados '{metapath}' porque é depreciado."
 #: ../fdroidserver/update.py
 #, python-format
 msgid "Ignoring FUNDING.yml entry longer than 2048: %s"
-msgstr "A ignorar a entrada FUNDING.yml por mais que 2048: %s"
-
-#: ../fdroidserver/update.py
-#, python-format
-msgid "Ignoring bad element in manifest: %s"
-msgstr "A ignorar o elemento mau no manifesto: %s"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Ignoring deprecated {oldfile}, use {newfile}!"
-msgstr "A ignorar {oldfile} obsoleto, use {newfile}!"
+msgstr "A ignorar a entrada FUNDING.yml por mais de 2048: %s"
 
 #: ../fdroidserver/index.py
 msgid "Ignoring package without metadata: "
@@ -951,9 +946,14 @@ msgstr "Ignorando o pacote sem metadados: "
 msgid "Ignoring stale cache data for {apkfilename}"
 msgstr "Ignorando dados de cache obsoletos para {apkfilename}"
 
+#: ../fdroidserver/rewritemeta.py
+#, python-brace-format
+msgid "Ignoring {ext} file at '{path}'"
+msgstr "Ignorando o ficheiro {ext} em '{path}'"
+
 #: ../fdroidserver/update.py
 msgid "Include APKs that are signed with disabled algorithms like MD5"
-msgstr "Incluir APKs assinados com algoritmos desativados como MD5"
+msgstr "Incluir APKs assinados com algoritmos desabilitados como MD5"
 
 #: ../fdroidserver/mirror.py
 msgid "Include the PGP signature .asc files in the mirror"
@@ -967,16 +967,6 @@ msgstr "Incluir os registos de construção no espelho"
 msgid "Include the source tarballs in the mirror"
 msgstr "Incluir os tarballs de fontes no espelho"
 
-#: ../fdroidserver/metadata.py
-#, python-format
-msgid "Including metadata from %s@%s"
-msgstr "Incluindo metadados de %s@%s"
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Including metadata from {path}"
-msgstr "Incluindo metadados de {path}"
-
 #: ../fdroidserver/common.py
 msgid "Initialising submodules"
 msgstr "Inicializando submódulos"
@@ -985,7 +975,7 @@ msgstr "Inicializando submódulos"
 msgid "Install all signed applications available"
 msgstr "Instalar todas as aplicações assinadas disponíveis"
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Install built packages on devices"
 msgstr "Instalação dos pacotes compilados no aparelho"
 
@@ -994,12 +984,22 @@ msgstr "Instalação dos pacotes compilados no aparelho"
 msgid "Installing %s..."
 msgstr "A instalar %s…"
 
+#: ../fdroidserver/install.py
+#, python-format
+msgid "Installing %s…"
+msgstr "Instalando %s…"
+
 #: ../fdroidserver/install.py
 #, python-brace-format
 msgid "Installing '{apkfilename}' on {dev}..."
 msgstr "A instalar '{apkfilename}' em {dev}…"
 
-#: ../fdroidserver/__main__.py
+#: ../fdroidserver/install.py
+#, python-brace-format
+msgid "Installing '{apkfilename}' on {dev}…"
+msgstr "Instalando '{apkfilename}' em {dev}…"
+
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Interact with the repo HTTP server"
 msgstr "Interacção com o repositório do servidor HTTP"
 
@@ -1007,36 +1007,53 @@ msgstr "Interacção com o repositório do servidor HTTP"
 msgid "Invalid APK"
 msgstr "APK inválido"
 
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "Invalid AutoUpdateMode: {mode}"
-msgstr "AutoUpdateMode inválido: {mode}"
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "Invalid UpdateCheckMode: {mode}"
-msgstr "UpdateCheckMode inválido: {mode}"
-
-#: ../fdroidserver/checkupdates.py
+#: ../fdroidserver/lint.py ../fdroidserver/checkupdates.py
 #, python-brace-format
 msgid "Invalid VercodeOperation: {field}"
 msgstr "VercodeOperation inválido: {field}"
 
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Invalid VercodeOperation: {invalid_ops}"
-msgstr "VercodeOperation inválido: {invalid_ops}"
-
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "Invalid application ID {appid}"
 msgstr "ID da aplicação {appid} inválido"
 
+#: ../fdroidserver/metadata.py
+#, python-format
+msgid "Invalid boolean '%s'"
+msgstr "Booleano inválido '%s'"
+
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Invalid build flag at {line} in {linedesc}"
+msgstr "Sinalizador de compilação inválido em {line} em {linedesc}"
+
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Invalid build format: {value} in {name}"
+msgstr "Formato de compilação inválido: {value} em {name}"
+
 #: ../fdroidserver/lint.py
 msgid "Invalid bulleted list"
 msgstr "Lista com marcadores inválida"
 
+#: ../fdroidserver/lint.py
+#, python-format
+msgid "Invalid license tag \"%s\"! Use only tags from https://spdx.org/license-list"
+msgstr "Etiqueta de licença \"%s\" inválida! Use apenas etiquetas de https://spdx.org/license-list"
+
+#: ../fdroidserver/lint.py
+msgid "Invalid link - use [http://foo.bar Link title] or [http://foo.bar]"
+msgstr "Hiperligação inválida - use [http://foo.bar Título do link] ou [http://foo.bar]"
+
+#: ../fdroidserver/metadata.py
+#, python-format
+msgid "Invalid metadata in %s:%d"
+msgstr "Metadados inválidos em %s:%d"
+
+#: ../fdroidserver/metadata.py
+msgid "Invalid metadata in: "
+msgstr "Metadados inválidos em: "
+
 #: ../fdroidserver/common.py
 #, python-format
 msgid "Invalid name for published file: %s"
@@ -1044,8 +1061,8 @@ msgstr "Nome inválido para o ficheiro publicado: %s"
 
 #: ../fdroidserver/common.py
 #, python-brace-format
-msgid "Invalid ndk: entry in build: \"{ndk}\""
-msgstr "Ndk inválido: entrada na compilação: \"{ndk}\""
+msgid "Invalid package name {0}"
+msgstr "Nome do pacote inválido {0}"
 
 #: ../fdroidserver/common.py
 #, python-brace-format
@@ -1067,6 +1084,11 @@ msgstr "Metadados de srclib inválidos: não foi possível analisar \"{file}\""
 msgid "Invalid srclib metadata: unknown key '{key}' in '{file}'"
 msgstr "Metadados de srclib inválidos: chave \"{key}\" desconhecida no \"{file}\""
 
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Invalid versionCode: \"{versionCode}\" is not an integer!"
+msgstr "VersionCode inválido: \"{versionCode}\" não é um inteiro!"
+
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "JAR signature failed to verify: {path}"
@@ -1081,8 +1103,8 @@ msgstr "Assinatura JAR verificada: {path}"
 msgid "Java JAR file"
 msgstr "Ficheiro Java JAR"
 
-#: ../fdroidserver/mirror.py ../fdroidserver/publish.py
-#: ../fdroidserver/update.py
+#: ../fdroidserver/publish.py ../fdroidserver/update.py
+#: ../fdroidserver/mirror.py
 msgid "Java JDK not found! Install in standard location or set java_paths!"
 msgstr "O Java JDK não foi encontrado! Instalar no local predefinido ou definir java_paths!"
 
@@ -1098,19 +1120,10 @@ msgstr "Java jarsigner não encontrado! Instale no local predefinido ou define j
 msgid "Javascript in HTML src attributes"
 msgstr "JavaScript em atributos HTML src"
 
-#: ../fdroidserver/build.py
-#, python-brace-format
-msgid "Keeping failed build \"{apkfilename}\""
-msgstr "Mantendo a compilação com falha \"{apkfilename}\""
-
 #: ../fdroidserver/init.py
 msgid "Keystore for signing key:\t"
 msgstr "Armazenamento de chaves de assinatura:\t"
 
-#: ../fdroidserver/lint.py
-msgid "Known debug key is used in AllowedAPKSigningKeys: "
-msgstr "A chave de depuração conhecida é usada em AllowedAPKSigningKeys: "
-
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "Last used commit '{commit}' looks like a tag, but UpdateCheckMode is '{ucm}'"
@@ -1120,9 +1133,13 @@ msgstr "O último commit usado '{commit}' parece-se com uma tag, mas o UpdateChe
 msgid "Liberapay donation methods belong in the Liberapay: field"
 msgstr "Os métodos de doação de Liberapay pertencem no campo Liberapay:"
 
+#: ../fdroidserver/lint.py
+msgid "Liberapay donation methods belong in the LiberapayID flag"
+msgstr "Os métodos de doação de Liberapay pertencem na bandeira de LiberapayID"
+
 #: ../fdroidserver/rewritemeta.py
-msgid "List files that would be reformatted (dry run)"
-msgstr "Listar ficheiros que devem ser reformatados (execução a seco)"
+msgid "List files that would be reformatted"
+msgstr "Listar ficheiros que devem ser reformatados"
 
 #: ../fdroidserver/lint.py
 msgid "Locale included in f-droid.org URL"
@@ -1140,16 +1157,6 @@ msgstr "Espelhos de repositório malformados."
 msgid "Malformed serverwebroot line:"
 msgstr "Linha de serverwebroot malformada:"
 
-#: ../fdroidserver/scanner.py
-#, python-format
-msgid "Max recursion depth in ZIP file reached: %s"
-msgstr "Profundidade máxima de recursão no ficheiro ZIP atingida: %s"
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "Mirror config for {url} contains \"isPrimary\" key!"
-msgstr "A configuração de espelho de {url} contém a chave \"isPrimary\"!"
-
 #: ../fdroidserver/mirror.py
 msgid "Mirror the full repo and archive, all file types."
 msgstr "Espelha todo o repositório e pacotes, todos os tipos de ficheiros."
@@ -1158,30 +1165,31 @@ msgstr "Espelha todo o repositório e pacotes, todos os tipos de ficheiros."
 msgid "Missing output directory"
 msgstr "Falta diretório de saída"
 
-#: ../fdroidserver/metadata.py
-msgid "Moving Anti-Features declarations to localized files:"
-msgstr "A mover as declarações de características indesejadas para ficheiros localizados:"
-
-#: ../fdroidserver/index.py
-msgid "Neither \"repo_pubkey\" nor \"keystorepass\" set in config.yml"
-msgstr "Nem \"repo_pubkey\" nem \"keystorepass\" definidos em config.yml"
-
-#: ../fdroidserver/verify.py
+#: ../fdroidserver/lint.py
 #, python-format
-msgid "No APK for package: %s"
-msgstr "Nenhum APK para o pacote: %s"
+msgid "Name '%s' is just the auto name - remove it"
+msgstr "O nome '%s' é apenas o nome automático - remover"
+
+#: ../fdroidserver/common.py
+msgid "No 'config.py' found, using defaults."
+msgstr "'config.py' não encontrado, utilizando as predefinições."
 
 #: ../fdroidserver/common.py
 msgid "No Android SDK found!"
 msgstr "Android SDK não encontrado!"
 
+#: ../fdroidserver/import.py
+msgid "No android or kivy project could be found. Specify --subdir?"
+msgstr "Nenhum projeto Android ou Kivy poderia ser encontrado. Especificar --subdir?"
+
 #: ../fdroidserver/install.py
 msgid "No attached devices found"
 msgstr "Nenhum aparelho anexado encontrado"
 
-#: ../fdroidserver/install.py
-msgid "No devices found for `adb install`! Please plug one in."
-msgstr "Nenhum dispositivo encontrado para `adb install`! Ligue um."
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "No commit specified for {versionName} in {linedesc}"
+msgstr "Nenhum commit especificado para {versionName} em {linedesc}"
 
 #: ../fdroidserver/index.py
 msgid "No fingerprint in URL."
@@ -1191,23 +1199,14 @@ msgstr "Nenhuma impressão digital no URL."
 msgid "No git submodules available"
 msgstr "Não há submódulos git disponíveis"
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "No gradle project could be found. Specify --subdir?"
 msgstr "Não foi possível encontrar nenhum projeto de gradle. Especificar --subdir?"
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py ../fdroidserver/common.py
 msgid "No information found."
 msgstr "Nenhuma informação encontrada."
 
-#: ../fdroidserver/checkupdates.py
-msgid "No matching tags found"
-msgstr "Não foram encontradas marcações correspondentes"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "No minimum SDK version found in {0}, using default (3)."
-msgstr "Nenhuma versão mínima do SDK encontrada em {0}, a usar a predefinição (3)."
-
 #: ../fdroidserver/lint.py
 msgid "No need to specify that the app is Free Software"
 msgstr "Não há necessidade de especificar que o app é software livre"
@@ -1217,8 +1216,8 @@ msgid "No need to specify that the app is for Android"
 msgstr "Não há necessidade de especificar que o app é para Android"
 
 #: ../fdroidserver/deploy.py
-msgid "No option set! Edit your config.yml to set at least one of these:"
-msgstr "Sem opção definida! Edite seu config.yml para definir pelo menos um destes:"
+msgid "No option set! Edit your config.py to set at least one of these:"
+msgstr "Sem opção definida! Edite seu config.py para definir pelo menos um destes:"
 
 #: ../fdroidserver/common.py
 msgid "No packages specified"
@@ -1226,14 +1225,14 @@ msgstr "Nenhum pacote especificado"
 
 #: ../fdroidserver/install.py
 #, python-format
-msgid "No signed APK available for %s"
-msgstr "Nenhum APK assinado disponível para %s"
+msgid "No signed apk available for %s"
+msgstr "Nenhum apk assinado disponível para %s"
 
 #: ../fdroidserver/install.py
 msgid "No signed output directory - nothing to do"
 msgstr "Nenhum diretório de saída assinado - nada a fazer"
 
-#: ../fdroidserver/common.py
+#: ../fdroidserver/update.py ../fdroidserver/common.py
 #, python-brace-format
 msgid "No signing certificates found in {path}"
 msgstr "Nenhum certificado de assinatura encontrado em {path}"
@@ -1243,23 +1242,16 @@ msgstr "Nenhum certificado de assinatura encontrado em {path}"
 msgid "No such package: %s"
 msgstr "Nenhum pacote desses: %s"
 
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "No such versionCode {versionCode} for app {appid}"
 msgstr "Nenhum versionCode {versionCode} para o app {appid}"
 
-#: ../fdroidserver/checkupdates.py
-msgid "No tags found"
-msgstr "Nenhuma etiqueta encontrada"
-
-#: ../fdroidserver/publish.py ../fdroidserver/verify.py
+#: ../fdroidserver/verify.py ../fdroidserver/publish.py
 msgid "No unsigned directory - nothing to do"
 msgstr "Nenhum diretório não assinado - nada a fazer"
 
-#: ../fdroidserver/__main__.py
-msgid "No version information could be found."
-msgstr "Não foi possível encontrar informações de versão."
-
 #: ../fdroidserver/common.py
 msgid "Not a valid size definition: \"{}\""
 msgstr "Não é uma definição de tamanho válida: \"{}\""
@@ -1274,9 +1266,10 @@ msgid "Nothing to do for {appid}."
 msgstr "Nada a fazer para {appid}."
 
 #: ../fdroidserver/init.py
-msgid "Now set these in config.yml:"
-msgstr "Agora configure estes em config.yml:"
+msgid "Now set these in config.py:"
+msgstr "Agora configure estes em config.py:"
 
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "OBB file has newer versionCode({integer}) than any APK:"
@@ -1294,28 +1287,23 @@ msgstr "O packagename do OBB não corresponde a um APK suportado:"
 msgid "Offline machine, skipping git mirror generation until `fdroid deploy`"
 msgstr "A máquina está offline, a saltar a geração de espelhos de git até o `fdroid deploy'"
 
-#: ../fdroidserver/deploy.py
-msgid "One of the 'github_releases' config items is missing the 'packageNames' value. skipping ..."
-msgstr "Um dos itens de configuração 'github_releases' está a faltar o valor 'packageNames'. A ignorar ..."
+#: ../fdroidserver/common.py
+#, python-brace-format
+msgid "Old APK signature failed to verify: {path}"
+msgstr "A assinatura antiga do APK não pôde ser verificada: {path}"
 
-#: ../fdroidserver/deploy.py
-msgid "One of the 'github_releases' config items is missing the 'projectUrl' value. skipping ..."
-msgstr "Um dos itens de configuração 'github_releases' não tem o valor 'projectUrl'. A ignorar ..."
+#: ../fdroid ../fdroidserver/__main__.py
+msgid "Old, deprecated name for fdroid deploy"
+msgstr "Nome velho e obsoleto para implantar fdroid"
 
-#: ../fdroidserver/deploy.py
-msgid "One of the 'github_releases' config items is missing the 'token' value. skipping ..."
-msgstr "Um dos itens de configuração 'github_releases' não tem o valor 'token'. A ignorar ..."
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Only PNG and JPEG are supported for graphics, found: {path}"
 msgstr "Somente PNG e JPEG são suportados para gráficos, encontrado: {path}"
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/common.py
-msgid "Only accepts a single key \"env\""
-msgstr "Aceita apenas uma única chave \"env\""
+#: ../fdroidserver/checkupdates.py
+msgid "Only print differences with the Play Store"
+msgstr "Apenas mostrar diferenças com a Play Store"
 
 #: ../fdroidserver/checkupdates.py
 msgid "Only process apps with auto-updates"
@@ -1325,6 +1313,11 @@ msgstr "Processar apenas apps com atualizações automáticas"
 msgid "OpenCollective donation methods belong in the OpenCollective: field"
 msgstr "Os métodos de doação OpenCollective pertencem no campo OpenCollective:"
 
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "Options"
+msgstr "Opções"
+
 #: ../fdroidserver/verify.py
 msgid "Output JSON report to file named after APK."
 msgstr "Saída de relatório JSON para ficheiro nomeado após APK."
@@ -1333,22 +1326,26 @@ msgstr "Saída de relatório JSON para ficheiro nomeado após APK."
 msgid "Output JSON to stdout."
 msgstr "Saída de JSON para stdout."
 
-#: ../fdroidserver/checkupdates.py ../fdroidserver/gpgsign.py
-#: ../fdroidserver/publish.py ../fdroidserver/signindex.py
-#: ../fdroidserver/update.py
+#: ../fdroidserver/gpgsign.py ../fdroidserver/publish.py
+#: ../fdroidserver/update.py ../fdroidserver/signindex.py
+#: ../fdroidserver/checkupdates.py
 msgid "Outputting JSON"
 msgstr "Saída do JSON"
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "Overall license of the project."
 msgstr "Licença geral do projeto."
 
+#: ../fdroidserver/dscanner.py
+msgid "Override path for repo APKs (default: ./repo)"
+msgstr "Substituir o caminho para os APKs do repositório (predefinição: ./repo)"
+
 #: ../fdroidserver/index.py
 #, python-brace-format
 msgid "Overriding blank versionName in {apkfilename} from metadata: {version}"
 msgstr "Substituindo versionName em branco em {apkfilename} dos metadados: {version}"
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 #, python-brace-format
 msgid "Package \"{appid}\" already exists"
 msgstr "O pacote \"{appid}\" já existe"
@@ -1362,10 +1359,13 @@ msgstr "Analisando o manifesto em '{path}'"
 msgid "Password required with username"
 msgstr "Palavra-passe necessária com o nome de utilizador"
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "Path to main Android project subdirectory, if not in root."
 msgstr "Caminho para o subdiretório principal do projeto Android, se não estiver na raiz."
 
+msgid "Path to main android project subdirectory, if not in root."
+msgstr "Caminho para o subdiretório principal do projeto Android, se não estiver na raiz."
+
 #: ../fdroidserver/init.py
 msgid "Path to the Android SDK (sometimes set in ANDROID_HOME)"
 msgstr "Caminho até o Android SDK (algumas vezes definido em ANDROID_HOME)"
@@ -1378,19 +1378,21 @@ msgstr "Caminho para o repositório git para usar como log"
 msgid "Path to the keystore for the repo signing key"
 msgstr "Caminho até a keystore para a chave de assinatura do repositório"
 
+#: ../fdroidserver/dscanner.py
+msgid "Prepare Drozer to run a scan"
+msgstr "Preparar Drozer para executar uma verificação"
+
+msgid "Prepare drozer to run a scan"
+msgstr "Preparar Drozer para executar uma verificação"
+
 #: ../fdroidserver/nightly.py
 msgid "Print the secret variable to the terminal for easy copy/paste"
 msgstr "Imprimir a variável secreta para o terminal para copiar/colar fácilmente"
 
-#: ../fdroidserver/install.py
+#: ../fdroidserver/metadata.py
 #, python-brace-format
-msgid "Privacy mode was enabled based on your locale ({country_code})."
-msgstr "O modo de privacidade foi ativado com base na sua localização ({country_code})."
-
-#: ../fdroidserver/scanner.py
-#, python-format
-msgid "Problem with ZIP file: %s, error %s"
-msgstr "Problema com o ficheiro ZIP: %s, erro %s"
+msgid "Problem with description of {appid}: {error}"
+msgstr "Problema com a descrição de {appid}: {error}"
 
 #: ../fdroidserver/common.py
 #, python-brace-format
@@ -1415,7 +1417,11 @@ msgstr "A processar {appid}"
 msgid "Produce human-readable XML/JSON for index files"
 msgstr "Produzir XML/JSON legível por humanos para ficheiros de índice"
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/update.py
+msgid "Produce human-readable index.xml"
+msgstr "Criação human-readable index.xml"
+
+#: ../fdroidserver/import.py
 msgid "Project URL to import from."
 msgstr "URL do projeto para importar."
 
@@ -1427,25 +1433,21 @@ msgstr "A pontuação deve ser evitada"
 msgid "Push the log to this git remote repository"
 msgstr "Submeter o registo de eventos para este repositório git remoto"
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Pushing binary transparency log to {url}"
 msgstr "A submeter o registo de transparência de binário para {url}"
 
-#: ../fdroidserver/deploy.py
-msgid "Pushing to remote server failed!"
-msgstr "Falha ao submeter para o servidor remoto!"
-
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Pushing to {url}"
 msgstr "A submeter para {url}"
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Quickly start a new repository"
 msgstr "Criar rapidamente um novo repositório"
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Read all the metadata files and exit"
 msgstr "Ler todos os ficheiros de metadados e sair"
 
@@ -1456,49 +1458,40 @@ msgstr "A ler '{config_file}'"
 
 #: ../fdroidserver/common.py
 #, python-brace-format
-msgid "Reading packageName/versionCode/versionName failed, APK invalid: '{apkfilename}'"
-msgstr "A leitura de packageName/versionCode/versionName falhou, APK inválido: '{apkfilename}'"
+msgid "Reading minSdkVersion failed: \"{apkfilename}\""
+msgstr "A leitura de minSdkVersion falhou: \"{apkfilename}\""
 
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
+#. https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
 #: ../fdroidserver/common.py
 #, python-brace-format
-msgid "Reading packageName/versionCode/versionName failed,APK invalid: '{apkfilename}'"
-msgstr "Falha ao ler packageName/versionCode/versionName, APK inválido: '{apkfilename}'"
+msgid "Reading packageName/versionCode/versionName failed, APK invalid: '{apkfilename}'"
+msgstr "A leitura de packageName/versionCode/versionName falhou, APK inválido: '{apkfilename}'"
 
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Reading {apkfilename} from cache"
 msgstr "Lendo {apkfilename} do cache"
 
-#: ../fdroidserver/build.py
-msgid "Refresh and cache scanner rules and signatures from the network"
-msgstr "Atualizar e armazenar as regras e assinaturas do scanner da rede no cache"
-
-#: ../fdroidserver/publish.py
-#, python-brace-format
-msgid "Refusing to sign '{path}', file exists in both {dir1} and {dir2} folder."
-msgstr "Recuso assinar '{path}', o ficheiro existe nas pastas {dir1} e {dir2}."
-
-#: ../fdroidserver/verify.py
-msgid "Remove source tarball and any APKs if successfully verified."
-msgstr "Remover tarball de código-fonte e todos APKs se for verificado com sucesso."
+#: ../fdroidserver/stats.py
+msgid "Recalculate aggregate stats - use when changes have been made that would invalidate old cached data."
+msgstr "Recalcular estatísticas agregadas - use quando foram feitas alterações que invalidariam os dados cache antigos."
 
 #: ../fdroidserver/common.py
 msgid "Removing specified files"
 msgstr "Apagando ficheiros especificados"
 
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Removing {path}\""
-msgstr "A remover {path}\""
-
 #: ../fdroidserver/update.py
 msgid "Rename APK files that do not match package.name_123.apk"
 msgstr "Renomear todos os ficheiros APKs que não correspondem com package.name_123.apk"
 
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "RepoType {type} is deprecated, please switch to git."
-msgstr ""
+#: ../fdroidserver/update.py
+msgid "Report on build data status"
+msgstr "Relatório sobre o status dos dados de compilação"
+
+#: ../fdroidserver/build.py
+msgid "Reset and create a brand new build server, even if the existing one appears to be ok."
+msgstr "Redefinir e criar um novo servidor de compilação, mesmo que o existente parecer normal."
 
 #: ../fdroidserver/nightly.py
 #, python-brace-format
@@ -1513,34 +1506,33 @@ msgstr "Redimensionar todos os ícones que excedam o tamanho máximo de pixels e
 msgid "Restrict output to warnings and errors"
 msgstr "Restringir a saída a erros e avisos"
 
-#: ../fdroidserver/net.py
-#, python-format
-msgid "Retrying failed download: %s"
-msgstr "Nova tentativa de descarga com falha: %s"
-
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Rewrite all the metadata files"
 msgstr "Regravar todos os ficheiros de metadados"
 
+#: ../fdroidserver/rewritemeta.py
+msgid "Rewrite to a specific format: "
+msgstr "Reescrever para um formato específico: "
+
 #: ../fdroidserver/rewritemeta.py
 #, python-brace-format
 msgid "Rewriting '{appid}'"
 msgstr "Reescrevendo '{appid}'"
 
+#: ../fdroidserver/rewritemeta.py
+#, python-brace-format
+msgid "Rewriting '{appid}' to '{path}'"
+msgstr "Reescrevendo '{appid}' para '{path}'"
+
 #: ../fdroidserver/checkupdates.py
 msgid "Run on git repo that has uncommitted changes"
 msgstr "Executar no repo git que tem alterações não confirmadas"
 
-#: ../fdroidserver/nightly.py
-#, python-brace-format
-msgid "Run over {cibase} to find -debug.apk. and skip repo_basedir {repo_basedir}"
-msgstr "Passar por cima de {cibase} para encontrar -debug.apk. e ignorar repo_basedir {repo_basedir}"
-
 #: ../fdroidserver/lint.py
 msgid "Run rewritemeta to fix formatting"
 msgstr "Executar rewritemeta para corrigir a formatação"
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 msgid "Running first pass with MD5 checking disabled"
 msgstr "Executando a primeira passagem com a verificação de MD5 desativada"
 
@@ -1549,24 +1541,18 @@ msgstr "Executando a primeira passagem com a verificação de MD5 desativada"
 msgid "Running wget in {path}"
 msgstr "Executando o wget em {path}"
 
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "SHA-256 of {url} does not match entry!"
-msgstr "O SHA-256 de {url} não corresponde à entrada!"
+#: ../fdroidserver/dscanner.py
+msgid "Scan only the latest version of each package"
+msgstr "Escanear apenas a versão mais recente de cada pacote"
 
 #: ../fdroidserver/build.py
 msgid "Scan the resulting APK(s) for known non-free classes."
 msgstr "Procure no(s) APK(s) resultante(s) por classes conhecidas não livres."
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Scan the source code of a package"
 msgstr "Analisar o código fonte de um pacote"
 
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Scanner found {count} problems in {apk}"
-msgstr "O scanner encontrou {count} problemas em {apk}"
-
 #: ../fdroidserver/scanner.py
 #, python-brace-format
 msgid "Scanner found {count} problems in {appid}:"
@@ -1583,19 +1569,6 @@ msgid_plural "Scanner found {} problems"
 msgstr[0] "Scanner encontrou {} problema"
 msgstr[1] "Scanner encontrou {} problemas"
 
-#: ../fdroidserver/scanner.py
-msgid "Scanning APK for extra signing blocks."
-msgstr "A verificar a APK em busca de blocos de assinatura extra."
-
-#: ../fdroidserver/scanner.py
-msgid "Scanning APK with dexdump for known non-free classes."
-msgstr "A verificar o APK com dexdump por classes não-livres conhecidas."
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Set NDK {release} ({version}) up"
-msgstr "Definir NDK {release} ({version}) para cima"
-
 #: ../fdroidserver/common.py
 msgid "Set clock to that time using:"
 msgstr "Configurar o relógio para esse tempo usando:"
@@ -1609,7 +1582,7 @@ msgstr "Definir o máximo de lançamentos no repo antes que os mais antigos seja
 msgid "Set open file limit to {integer}"
 msgstr "Definir o limite de ficheiros abertos para {integer}"
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Set up an app build for a nightly build repo"
 msgstr "Configurar uma compilação de app para um repositório de compilação noturno"
 
@@ -1622,11 +1595,18 @@ msgstr "Falha ao definir o limite de ficheiros abertos: "
 msgid "Setting {0} sec timeout for this build"
 msgstr "Definindo o tempo limite de {0} seg para esta compilação"
 
-#: ../fdroidserver/__main__.py
+#: ../fdroidserver/build.py
+msgid "Setup an emulator, install the APK on it and perform a Drozer scan"
+msgstr "Configure um emulador, instale o APK nele e execute um scan do Drozer"
+
+msgid "Setup an emulator, install the apk on it and perform a drozer scan"
+msgstr "Configure um emulador, instale o apk nele e execute um scan do drozer"
+
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Sign and place packages in the repo"
 msgstr "Assinar e pôr os pacotes no repositório"
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Sign indexes created using update --nosign"
 msgstr "Assinar os índices criados com o uso de update --nosign"
 
@@ -1639,11 +1619,6 @@ msgstr "Pular o escaneamento do código-fonte atrás de binários e outros probl
 msgid "Skipping '{apkfilename}' with invalid signature!"
 msgstr "Ignorando '{apkfilename}' com uma assinatura inválida!"
 
-#: ../fdroidserver/deploy.py ../fdroidserver/index.py
-#, python-format
-msgid "Skipping GitLab Pages mirror because the repo is too large (>%.2fGB)!"
-msgstr "A ignorar o espelho do GitLab Pages porque o repositório é muito grande (>%.2fGB)!"
-
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Skipping index generation for {appid}"
@@ -1659,14 +1634,23 @@ msgstr "Ignorando '{apkfilename}' com uma assinatura inválida!"
 msgid "Skipping {appid}: disabled"
 msgstr "Ignorando {appid}: desativado"
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/scanner.py
+#, python-brace-format
+msgid "Skipping {appid}: no builds specified"
+msgstr "Ignorando {appid}: nenhuma compilação especificada"
+
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 msgid "Specify a local folder to sync the repo to"
 msgstr "Especifique uma pasta local para ser sincronizada com o repositório"
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 msgid "Specify an identity file to provide to SSH for rsyncing"
 msgstr "Especifique um ficheiro identidade para fornecer ao SSH para usar o rsync"
 
+#: ../fdroidserver/build.py
+msgid "Specify that we're running on the build server"
+msgstr "Especificar que estamos executando no servidor de compilação"
+
 #: ../fdroidserver/nightly.py
 msgid "Specify which debug keystore file to use."
 msgstr "Especifique o ficheiro de armazenamento de chaves de depuração."
@@ -1675,6 +1659,11 @@ msgstr "Especifique o ficheiro de armazenamento de chaves de depuração."
 msgid "Spew out even more information than normal"
 msgstr "Mostrar ainda mais informações que o normal"
 
+#: ../fdroidserver/nightly.py
+#, python-brace-format
+msgid "Striping mystery signature from {apkfilename}"
+msgstr "Esvaziar assinatura misteriosa de {apkfilename}"
+
 #: ../fdroidserver/nightly.py
 #, python-brace-format
 msgid "Stripping mystery signature from {apkfilename}"
@@ -1695,21 +1684,9 @@ msgstr "A descrição de comprimento {length} é sobre o limite de charácteres
 msgid "System clock is older than date in {path}!"
 msgstr "O relógio do sistema é mais antigo que a data em {path}!"
 
-#: ../fdroidserver/checkupdates.py
-msgid "Tags update mode only works for git, hg, bzr and git-svn repositories currently"
-msgstr "O modo de atualização de marcações só funciona atualmente para repositórios git, hg, bzr e git-svn"
-
-#: ../fdroidserver/checkupdates.py
-msgid "Tags update mode used in git-svn, but the repo was not set up with tags"
-msgstr "Modo de atualização de marcações usado no git-svn, mas a repo não foi configurada com marcações"
-
 #: ../fdroidserver/build.py
 msgid "Test mode - put output in the tmp directory only, and always build, even if the output already exists."
-msgstr "Modo de teste - ponha a saída apenas no diretório tmp e sempre compile, mesmo que a saída já exista."
-
-#: ../fdroidserver/index.py
-msgid "The \"qrcode\" Python package is not installed (e.g. apt-get install python3-qrcode)!"
-msgstr "O pacote de Python \"qrcode\" não está instalado (por exemplo, apt-get install python3-qrcode)!"
+msgstr "Modo de teste - coloque a saída apenas no diretório tmp e sempre compile, mesmo que a saída já exista."
 
 #. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
 #: ../fdroidserver/update.py
@@ -1719,7 +1696,7 @@ msgstr "O código de versão OBB deve estar após \"{name}.\":"
 
 #: ../fdroidserver/btlog.py
 msgid "The base URL for the repo to log (default: https://f-droid.org)"
-msgstr "O URL base para o registo de mudanças do repositório (predefinição: https://f-droid.org)"
+msgstr "O URL base para o registro de mudanças do repositório (predefinição: https://f-droid.org)"
 
 #: ../fdroidserver/mirror.py
 msgid "The directory to write the mirror to"
@@ -1729,10 +1706,18 @@ msgstr "O diretório para onde escrever o espelho"
 msgid "The file to be included in the repo (path or glob)"
 msgstr "O ficherio a ser incluído no repo (caminho ou glob)"
 
+#: ../fdroidserver/deploy.py
+msgid "The only commands currently supported are 'init' and 'update'"
+msgstr "Os únicos comandos suportados atualmente são 'init' e 'update'"
+
 #: ../fdroidserver/index.py
 msgid "The repository's fingerprint does not match."
 msgstr "A impressão digital do repositório não corresponde."
 
+#: ../fdroidserver/common.py
+msgid "The repository's index could not be verified."
+msgstr "O índice do repositório não pôde ser verificado."
+
 #: ../fdroidserver/deploy.py
 #, python-brace-format
 msgid "The root dir for local_copy_dir \"{path}\" does not exist!"
@@ -1746,45 +1731,14 @@ msgstr "Há uma colisão do keyalias - publicação parada"
 msgid "These are the apps that have been archived from the main repo."
 msgstr "Estas são as aplicações que foram arquivadas do repositório principal."
 
-#: ../fdroidserver/mirror.py
-msgid "This command should never be used to mirror f-droid.org! A full copy requires more than 600GB."
-msgstr "Este comando nunca deve ser usado para espelhar o f-droid.org! Uma cópia completa requer mais que 600GB."
-
-#: ../fdroidserver/common.py
-msgid "This is a repository of apps to be used with F-Droid. Applications in this repository are either official binaries built by the original application developers, or are binaries built from source by the admin of f-droid.org using the tools on https://gitlab.com/fdroid."
-msgstr "Este é um repositório de apps a serem usados com o F-Droid. Aplicações neste repositório são binários oficiais compilados pelos programadores da aplicação original ou são binários compilados da fonte por f-droid.org a usar as ferramentas em https://gitlab.com/fdroid."
-
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 #, python-format
 msgid "This repo already has local metadata: %s"
 msgstr "Este repositório já tem metadados locais: %s"
 
-#: ../fdroidserver/init.py
-#, python-format
-msgid ""
-"To complete the setup, add your APKs to \"%s\"\n"
-"then run \"fdroid update -c; fdroid update\".  You might also want to edit\n"
-"\"config.yml\" to set the URL, repo name, and more.  You should also set up\n"
-"a signing key (a temporary one might have been automatically generated).\n"
-"\n"
-"For more info: https://f-droid.org/docs/Setup_an_F-Droid_App_Repo\n"
-"and https://f-droid.org/docs/Signing_Process"
-msgstr ""
-"Para completar a configuração, adicione os seus APKs ao \"%s\",\n"
-"depois execute \"fdroid update -c; fdroid update\".  Também pode editar\n"
-"\"config.yml\" para definir a URL, nome do repo, e muito mais. Também deve configurar\n"
-"uma chave de assinatura (uma chave temporária pode ter sido gerada automaticamente).\n"
-"\n"
-"Para mais informações: https://f-droid.org/docs/Setup_an_F-Droid_App_Repo\n"
-"e https://f-droid.org/docs/Signing_Process"
-
-#: ../fdroidserver/deploy.py
-msgid "To use awsbucket, awssecretkey and awsaccesskeyid must also be set in config.yml!"
-msgstr "Para usar awsbucket, os awssecretkey e awsaccesskeyid também devem ser definidos no config.yml!"
-
-#: ../fdroidserver/deploy.py
-msgid "To use rclone, rclone_config and awsbucket must be set in config.yml!"
-msgstr "Para usar rclone, rclone_config e awsbucket também devem ser definidos no config.yml!"
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
+msgid "To use awsbucket, awssecretkey and awsaccesskeyid must also be set in config.py!"
+msgstr "Para usar awsbucket, os awssecretkey e awsaccesskeyid também devem ser definidos no config.py!"
 
 #: ../fdroidserver/lint.py
 msgid "URL must start with https:// or http://"
@@ -1794,6 +1748,10 @@ msgstr "A URL deve começar com https:// ou http://"
 msgid "URL shorteners should not be used"
 msgstr "Encurtadores de URL não devem ser usados"
 
+#: ../fdroidserver/metadata.py
+msgid "URL title is just the URL, use brackets: [URL]"
+msgstr "O título do URL é apenas o URL, use parênteses: [URL]"
+
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "URL {url} in Description: {error}"
@@ -1807,15 +1765,16 @@ msgstr "Etiqueta de licença \"{}\" inesperada! Use somente as etiquetas aprovad
 msgid "Unexpected license tag \"{}\"! Only use license tags configured in your config file"
 msgstr "Etiqueta de licença \"{}\" inesperada! Use somente as etiquetas de licença configuradas no seu ficheiro de configuração"
 
-#: ../fdroidserver/common.py
+#: ../fdroidserver/metadata.py
 #, python-brace-format
-msgid "Unknown entry {key} in {configname}"
-msgstr "Entrada {key} desconhecida em {configname}"
+msgid "Unexpected text on same line as {field} in {linedesc}"
+msgstr "Texto inesperado na mesma linha como {field} em {linedesc}"
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Unknown exception found!"
 msgstr "Exceção desconhecida!"
 
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "Unknown file '{filename}' in build '{versionName}'"
@@ -1826,6 +1785,11 @@ msgstr "Ficheiro desconhecido '{filename}' na compilação '{versionName}'"
 msgid "Unknown metadata format: %s"
 msgstr "Formato de metadados desconhecido: %s"
 
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Unknown metadata format: {path}"
+msgstr "Formato de metadados desconhecido: {path}"
+
 #: ../fdroidserver/metadata.py
 #, python-brace-format
 msgid "Unknown metadata format: {path} (use: *.yml)"
@@ -1835,6 +1799,10 @@ msgstr "O formato de metadados é desconhecido: {path} (use: *.yml)"
 msgid "Unknown version of aapt, might cause problems: "
 msgstr "Versão desconhecida do aapt, pode causar problemas: "
 
+#: ../fdroidserver/lint.py
+msgid "Unlinkified link - use [http://foo.bar Link title] or [http://foo.bar]"
+msgstr "Ligação des-lig-ada - use [http://foo.bar Título do link] ou [http://foo.bar]"
+
 #: ../fdroidserver/lint.py
 msgid "Unnecessary leading space"
 msgstr "Espaço desnecessário à frente"
@@ -1848,12 +1816,20 @@ msgstr "Espaço desnecessário ao fim"
 msgid "Unrecognised app field '{fieldname}' in '{path}'"
 msgstr "Campo de aplicação '{fieldname}' não reconhecido em '{path}'"
 
+#: ../fdroidserver/metadata.py
+msgid "Unrecognised app field: "
+msgstr "Campo da app não reconhecido: "
+
 #: ../fdroidserver/metadata.py
 #, python-brace-format
 msgid "Unrecognised build flag '{build_flag}' in '{path}'"
 msgstr "Bandeira de compilação '{build_flag}' não reconhecida em '{path}'"
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Unrecognised field '{field}' in {linedesc}"
+msgstr "Campo '{field}' não reconhecido em {linedesc}"
+
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Unsupported file type \"{extension}\" for repo graphic"
@@ -1864,6 +1840,29 @@ msgstr "Tipo de ficheiro \"{extension}\" não suportado para o gráfico de repo"
 msgid "Unsupported graphics file found: {path}"
 msgstr "Ficheiro gráfico não suportado encontrado: {path}"
 
+#: ../fdroidserver/rewritemeta.py
+#, python-brace-format
+msgid "Unsupported metadata format, use: --to [{supported}]"
+msgstr "Formato de metadados não suportado, use:--to [{supported}]"
+
+#: ../fdroidserver/metadata.py
+msgid "Unterminated ]"
+msgstr "Não terminado ]"
+
+#: ../fdroidserver/metadata.py
+msgid "Unterminated ]]"
+msgstr "Não terminado ]]"
+
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Unterminated build in {name}"
+msgstr "Compilação não terminada em {name}"
+
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Unterminated continuation in {name}"
+msgstr "Continuação não terminada em {name}"
+
 #: ../fdroidserver/lint.py
 #, python-format
 msgid "Unused extlib at %s"
@@ -1884,25 +1883,27 @@ msgstr "O caminho de scandelete não é usado: %s"
 msgid "Unused scanignore path: %s"
 msgstr "O caminho de scanignore não é usado: %s"
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Update repo information for new packages"
 msgstr "Atualizar a informação do repositório para novos pacotes"
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Update the binary transparency log for a URL"
 msgstr "Atualizar o registo de transparência de binário para um URL"
 
+#: ../fdroid ../fdroidserver/__main__.py
+msgid "Update the stats of the repo"
+msgstr "Atualizar as estatísticas do repositório"
+
+#: ../fdroidserver/update.py ../fdroidserver/build.py
+msgid "Update the wiki"
+msgstr "Atualizar a wiki"
+
 #: ../fdroidserver/checkupdates.py
 #, python-brace-format
 msgid "UpdateCheckData has invalid URL: {url}"
 msgstr "UpdateCheckData tem URL inválido: {url}"
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "UpdateCheckData must match the version code as integer (\\d or [0-9]): {codeex}"
-msgstr "UpdateCheckData deve corresponder ao código da versão como inteiro (\\d ou [0-9]): {codeex}"
-
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "UpdateCheckData must use HTTPS URL: {url}"
@@ -1914,10 +1915,14 @@ msgid "UpdateCheckData not a valid URL: {url}"
 msgstr "UpdateCheckData não é uma URL válida: {url}"
 
 #: ../fdroidserver/lint.py
-msgid "UpdateCheckMode is set but it looks like checkupdates hasn't been run yet."
-msgstr "UpdateCheckMode é definido, mas parece que likecheckupdates ainda não foi executado."
+msgid "UpdateCheckMode is set but it looks like checkupdates hasn't been run yet"
+msgstr "UpdateCheckMode é definido, mas parece que checkupdates ainda não foi executado"
+
+#. Translators: https://developer.android.com/studio/build/application-id
+#: ../fdroidserver/lint.py
+msgid "UpdateCheckName is set to the known application ID - it can be removed"
+msgstr "UpdateCheckName (o nome da verificação de atualização) é definido como o ID comum da aplicação - pode ser removido"
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
 #: ../fdroidserver/lint.py
 msgid "UpdateCheckName is set to the known application ID, it can be removed"
 msgstr "UpdateCheckName (o nome da verificação de atualização) é definido como o ID comun da aplicação - pode ser removido"
@@ -1932,9 +1937,20 @@ msgstr "A enviar {apkfilename} ao androidobservatory.org"
 msgid "Uploading {apkfilename} to virustotal"
 msgstr "A enviar {apkfilename} ao virustotal"
 
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "Usage"
+msgstr "Utilização"
+
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, python-format
+msgid "Usage: %s\n"
+msgstr "Utilização: %s\n"
+
 #: ../fdroidserver/lint.py
-msgid "Use /HEAD instead of /master or /main to point at a file in the default branch"
-msgstr "Use /HEAD em vez de /master ou /main para apontar a um ficheiro no ramo predefinido"
+msgid "Use /HEAD instead of /master to point at a file in the default branch"
+msgstr "Use /HEAD em vez de /master para apontar num ficheiro na ramificação predefinida"
 
 #: ../fdroidserver/update.py
 msgid "Use `fdroid update -c` to create it."
@@ -1948,16 +1964,14 @@ msgstr "Usar servidor de compilação"
 msgid "Use date from APK instead of current time for newly added APKs"
 msgstr "Use da data do APK em vez do tempo atual para APKs recém-adicionados"
 
-#: ../fdroidserver/deploy.py
+msgid "Use date from apk instead of current time for newly added apks"
+msgstr "Use a data do apk em vez do tempo atual para apks recém-adicionados"
+
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Using \"{path}\" for configuring s3cmd."
 msgstr "Usando \"{path}\" para configurar s3cmd."
 
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Using \"{path}\" for syncing with remote storage."
-msgstr "A usar \"{path}\" para sincronizar com o armazenamento remoto."
-
 #: ../fdroidserver/common.py
 msgid "Using APK Signature v2"
 msgstr "A usar a assinatura APK v2"
@@ -1966,35 +1980,26 @@ msgstr "A usar a assinatura APK v2"
 msgid "Using APK Signature v3"
 msgstr "A usar a assinatura APK v3"
 
-#: ../fdroidserver/common.py
-msgid "Using JAR Signature"
-msgstr "A usar a assinatura JAR"
-
 #: ../fdroidserver/common.py
 msgid "Using Java's jarsigner, not recommended for verifying APKs! Use apksigner"
 msgstr "Usando o jarsigner de Java, não recomendado para verificar APKs! Use apksigner"
 
-#: ../fdroidserver/metadata.py
+#: ../fdroidserver/common.py
 #, python-brace-format
-msgid "Using blank dictionary instead of contents of {path}!"
-msgstr "A utilizar um dicionário em branco em vez do conteúdo de {path}!"
+msgid "Using androguard from \"{path}\""
+msgstr "Usando androguard de \"{path}\""
 
 #: ../fdroidserver/init.py
 #, python-brace-format
 msgid "Using existing keystore \"{path}\""
 msgstr "Utilizando armazenamento de chave existente \"{path}\""
 
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Using rclone to sync with: {url}"
-msgstr "A usar rclone para sincronizar com: {url}"
-
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Using s3cmd to sync with: {url}"
 msgstr "Usando s3cmd para sincronizar com: {url}"
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Valid commands are:"
 msgstr "Comandos válidos:"
 
@@ -2002,7 +2007,7 @@ msgstr "Comandos válidos:"
 msgid "Verify against locally cached copy rather than redownloading."
 msgstr "Verifique a cópia em cache local em vez de redescarregando."
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Verify the integrity of downloaded packages"
 msgstr "Verifique a integridade dos pacotes descarregados"
 
@@ -2010,28 +2015,15 @@ msgstr "Verifique a integridade dos pacotes descarregados"
 msgid "Verifying index signature:"
 msgstr "Verificar o índice de assinatura:"
 
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "Verifying package {path} with apksigner."
-msgstr "A verificar o pacote {path} com apksigner."
-
 #: ../fdroidserver/deploy.py
 #, python-brace-format
 msgid "VirusTotal API key cannot upload files larger than 32MB, use {url} to upload {path}."
 msgstr "A chave VirusTotal API não pode enviar ficheiros maiores que 32MB, use {url} para enviar {path}."
 
-#: ../fdroidserver/nightly.py
-msgid "WARNING: only public git repos are supported!"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Warn about possible metadata errors"
 msgstr "Avisar sobre possíveis erros de metadados"
 
-#: ../fdroidserver/scanner.py
-msgid "WebAssembly binary file"
-msgstr "Ficheiro binário WebAssembly"
-
 #: ../fdroidserver/update.py
 msgid "When configured for signed indexes, create only unsigned indexes at this stage"
 msgstr "Quando configurado para índices assinados, crie apenas índices não assinados nesta etapa"
@@ -2040,17 +2032,8 @@ msgstr "Quando configurado para índices assinados, crie apenas índices não as
 msgid "When linting the entire repository yamllint is disabled by default. This option forces yamllint regardless."
 msgstr "Ao cotar todo o repositório o yamllint é desativado por predefinição. Esta opção força o yamllint independentemente."
 
-#: ../fdroidserver/publish.py
-msgid "When signing or verifying fails, exit with an error code."
-msgstr "Se assinar ou verificar falhar, sair com um código de erro."
-
-#: ../fdroidserver/install.py
-msgid "Would you like to download and install F-Droid.apk via adb? (YES/no)"
-msgstr "Gostaria de descarregar e instalar o F-Droid.apk via adb? (SIM/não)"
-
-#: ../fdroidserver/install.py
-msgid "Would you like to download the app(s) from f-droid.org? (YES/no)"
-msgstr "Gostaria de descarregar a(s) aplicação(ões) do f-droid.org? (SIM/não)"
+msgid "X.509 'Distiguished Name' used when generating keys"
+msgstr "X.509 'Distiguished Name' usado ao gerar as chaves"
 
 #: ../fdroidserver/init.py
 msgid "X.509 'Distinguished Name' used when generating keys"
@@ -2064,11 +2047,6 @@ msgstr "Pode usar ANDROID_HOME para definir o caminho para o seu SDK, ou seja:"
 msgid "ZIP file archive"
 msgstr "Arquivo de ficheiros ZIP"
 
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "adb reports {serial} is \"{status}\"!"
-msgstr "adb reporta {serial} é \"{status}\"!"
-
 #: ../fdroidserver/nightly.py
 #, python-brace-format
 msgid "adding IdentityFile to {path}"
@@ -2079,78 +2057,84 @@ msgstr "adicionando IdentityFile a {path}"
 msgid "adding to {name}: {path}"
 msgstr "adicionando a {name}: {path}"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "ambiguous option: %(option)s could match %(matches)s"
 msgstr "opção ambígua: %(option)s poderia corresponder %(matches)s"
 
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "apksigner in build-tools;{version} passes APKs with invalid v3 signatures, ignoring."
-msgstr "apksigner nos build-tools;{version} passa APKs com assinaturas v3 inválidas, ignorando."
-
-#: ../fdroidserver/common.py
-msgid "apksigner not found! Cannot sign or verify modern APKs"
-msgstr "apksigner não encontrado! Não é possível assinar ou verificar APKs modernos"
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, python-format
+msgid "ambiguous option: %s (%s?)"
+msgstr "opção ambígua: %s (%s?)"
 
 #: ../fdroidserver/common.py
 msgid "apksigner not found, it's required for signing!"
 msgstr "Nenhum apksigner encontrado, é necessário para assinar!"
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/checkupdates.py ../fdroidserver/lint.py
-#: ../fdroidserver/rewritemeta.py
+#: ../fdroidserver/lint.py ../fdroidserver/rewritemeta.py
+#: ../fdroidserver/checkupdates.py
 msgid "application ID of file to operate on"
 msgstr "ID de aplicação do ficheiro para operar"
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/build.py ../fdroidserver/install.py
-#: ../fdroidserver/publish.py ../fdroidserver/scanner.py
-#: ../fdroidserver/verify.py
+#: ../fdroidserver/verify.py ../fdroidserver/publish.py
+#: ../fdroidserver/build.py ../fdroidserver/scanner.py
+#: ../fdroidserver/install.py
 msgid "application ID with optional versionCode in the form APPID[:VERCODE]"
 msgstr "applicationID com versionCode opcional na forma APPID[:VERCODE]"
 
-#: ../fdroidserver/common.py
-msgid "archive_url needs to end with /archive"
-msgstr "archive_url precisa de terminar com /archive"
+#: ../fdroidserver/lint.py ../fdroidserver/rewritemeta.py
+msgid "applicationId in the form APPID"
+msgstr "applicationId, na forma APPID"
 
-#: /usr/lib/python3.11/argparse.py
+#: ../fdroidserver/checkupdates.py
+msgid "applicationId to check for updates"
+msgstr "applicationId para verificar se há atualizações"
+
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
+#: ../fdroidserver/verify.py ../fdroidserver/publish.py
+#: ../fdroidserver/dscanner.py ../fdroidserver/build.py
+#: ../fdroidserver/scanner.py ../fdroidserver/install.py
+msgid "applicationId with optional versionCode in the form APPID[:VERCODE]"
+msgstr "applicationId com versionCode opcional na forma APPID[:VERCODE]"
+
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "argument \"-\" with mode %r"
 msgstr "argumento \"-\" com o modo %r"
 
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "argument %(argument_name)s: %(message)s"
-msgstr "argumento %(argument_name)s: %(message)s"
-
 #: ../fdroidserver/nightly.py
 msgid "attempting bare SSH connection to test deploy key:"
 msgstr "tentar a conexão nua por SSH para testar a implantação da chave:"
 
+#: ../fdroidserver/nightly.py
+msgid "attempting bare ssh connection to test deploy key:"
+msgstr "tentativa de conexão nua por SSH para testar a implantação da chave:"
+
 #: ../fdroidserver/common.py
 msgid "can not parse scrlib spec (not a string): '{}'"
 msgstr "não é possível analisar as especificações do scrlib (não é uma cadeia): '{}'"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
-msgid "can't open '%(filename)s': %(error)s"
-msgstr "não é possível abrir '%(filename)s': %(error)s"
-
-#: ../fdroidserver/scanner.py
-msgid "can't open non-https url: '{};"
-msgstr "não é possível abrir o url não-https: '{};"
+msgid "can't open '%s': %s"
+msgstr "não dá pra abrir '%s': %s"
 
 #: ../fdroidserver/build.py
 #, python-brace-format
 msgid "cannot find required srclibs: \"{path}\""
 msgstr "não é possível encontrar os srclibs necessários: \"{path}\""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "cannot have multiple subparser arguments"
 msgstr "não é possível ter vários argumentos de subparser"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "cannot merge actions - two groups are named %r"
 msgstr "não é possível unir ações - dois grupos são denominados %r"
@@ -2164,107 +2148,119 @@ msgstr "não é possível publicar a atualização, definiu a chave de implanta
 msgid "cloning {url}"
 msgstr "clonagem {url}"
 
+#: ../fdroidserver/deploy.py
+msgid "command to execute, either 'init' or 'update'"
+msgstr "comando para executar, seja 'init' ou 'update'"
+
 #: ../fdroidserver/__main__.py
 msgid "commands from plugin modules:"
 msgstr "comandos dos módulos de plugin:"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "complex"
+msgstr "complexo"
+
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "conflicting option string: %s"
 msgid_plural "conflicting option strings: %s"
 msgstr[0] "cadeia de opções conflitante: %s"
 msgstr[1] "cadeias de opções conflitantes: %s"
 
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "conflicting subparser alias: %s"
-msgstr "alias de subanalisador conflitante: %s"
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "conflicting subparser: %s"
-msgstr "subanalisador conflitante: %s"
+#: ../fdroidserver/nightly.py
+#, python-brace-format
+msgid "copying {apkfilename} into {path}"
+msgstr "copiando {apkfilename} para {path}"
 
 #: ../fdroidserver/metadata.py
 #, python-brace-format
 msgid "could not parse '{path}'"
 msgstr "não foi possível analisar '{path}'"
 
-#: ../fdroidserver/common.py
-msgid "could not parse srclib spec (no name specified): '{}'"
-msgstr "não foi possível analisar a especificação srclib (nenhum nome especificado): '{}'"
-
 #: ../fdroidserver/common.py
 msgid "could not parse srclib spec (no ref specified): '{}'"
 msgstr "não foi possível analisar a especificação srclib (referência não especificada): '{}'"
 
+#: ../fdroidserver/common.py
+msgid "could not parse srclib spec (too many '@' signs): '{}'"
+msgstr "não foi possível analisar a especificação srclib (demais símbolos '@'): '{}'"
+
 #: ../fdroidserver/nightly.py
 #, python-brace-format
 msgid "created {path}"
 msgstr "{path} criado"
 
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "current version is newer: old vercode={old}, new vercode={new}"
-msgstr "a versão atual é mais nova: velho vercódigo={old}, novo vercódigo={new}"
-
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "deleting: repo/{apkfilename}"
 msgstr "apagando: repo/{apkfilename}"
 
-#: ../fdroidserver/scanner.py
-msgid "dependency file without lock"
-msgstr "ficheiro de dependência sem bloqueio"
+#: ../fdroidserver/common.py
+#, python-brace-format
+msgid "deployed build logs to '{path}'"
+msgstr "logs de compilação implantados para '{path}'"
 
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "deployed process log {path} to {dest}"
 msgstr "registo de processo implantado {path} a {dest}"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "dest= is required for options like %r"
 msgstr "dest = é necessário para opções como %r"
 
-#: ../fdroidserver/scanner.py
-msgid "downloading '{}'"
-msgstr "a descarregar '{}'"
-
-#: ../fdroidserver/scanner.py
-msgid "downloading scanner signatures from '{}' failed"
-msgstr "a descarga de assinaturas de scanner de '{}' falhou"
-
 #: ../fdroidserver/scanner.py
 msgid "executable binary, possibly code"
 msgstr "binário executável, possivelmente código"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "expected %s argument"
 msgid_plural "expected %s arguments"
 msgstr[0] "%s argumento esperado"
 msgstr[1] "%s argumentos esperados"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "expected at least one argument"
 msgstr "esperado pelo menos um argumento"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "expected at most one argument"
 msgstr "esperado um argumento no máximo"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "expected one argument"
 msgstr "esperado um argumento"
 
-#: ../fdroidserver/__main__.py
+#: ../fdroidserver/common.py
+#, python-brace-format
+msgid "failed deploying build logs to '{path}'"
+msgstr "falha na implantação de logs de compilação para '{path}'"
+
+#: ../fdroid
+msgid "fdroid [-h|--help|--version] <command> [<args>]"
+msgstr "fdroid [-h|--help|--version] <comando> [<args>]"
+
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "fdroid [<command>] [-h|--help|--version|<args>]"
 msgstr "fdroid [<comando>] [-h|--help|--version|<args>]"
 
-#: ../fdroidserver/scanner.py
-msgid "fetch the latest version of signatures from the web"
-msgstr "buscar a versão de assinaturas mais recente da Web"
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "floating-point"
+msgstr "ponto flutuante"
+
+#: ../fdroidserver/metadata.py
+msgid "force errors to be warnings, or ignore"
+msgstr "forçar erros como avisos ou ignorá-los"
 
 #: ../fdroidserver/metadata.py
 msgid "force metadata errors (default) to be warnings, or to be ignored."
@@ -2278,7 +2274,8 @@ msgstr "git svn clone falhou"
 msgid "gzip file archive"
 msgstr "arquivo de ficheiros gzip"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "ignored explicit argument %r"
 msgstr "argumento explícito %r ignorado"
@@ -2287,39 +2284,35 @@ msgstr "argumento explícito %r ignorado"
 msgid "index-v1 must have a signature, use `fdroid signindex` to create it!"
 msgstr "index-v1 deve ter uma assinatura, use ' fdroid signindex ' para criá-lo!"
 
-#: ../fdroidserver/index.py
-msgid "index-v2 must have a signature, use `fdroid signindex` to create it!"
-msgstr "index-v2 deve ter uma assinatura, use droid signindex` para o criar!"
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "integer"
+msgstr "inteiro"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "invalid %(type)s value: %(value)r"
 msgstr "valor inválido do tipo %(type)s: %(value)r"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "invalid choice: %(value)r (choose from %(choices)s)"
 msgstr "opção inválida: %(value)r (escolha de %(choices)s)"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "invalid conflict_resolution value: %r"
 msgstr "valor conflict_resolution inválido: %r"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "invalid option string %(option)r: must start with a character %(prefix_chars)r"
 msgstr "Opção cadeia %(option)r inválida: deve começar com o caractere %(prefix_chars)r"
 
-#: ../fdroidserver/common.py
-msgid "ipfs_cid not found, skipping CIDv1 generation"
-msgstr "ipfs_cid não encontrado, a ignorar a geração de CIDv1"
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "latest build recipe is newer: old vercode={old}, new vercode={new}"
-msgstr "a última receita de construção é mais recente: velho vercódigo={old}, novo vercódigo={new}"
-
 #: ../fdroidserver/deploy.py
 #, python-brace-format
 msgid "local_copy_dir does not end with \"fdroid\", perhaps you meant: \"{path}\""
@@ -2338,20 +2331,11 @@ msgstr "local_copy_dir deve ser directory, não um ficheiro!"
 msgid "mirror '%s' does not end with 'fdroid'!"
 msgstr "espelho '%s' não termina com 'fdroid'!"
 
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "mirrors set twice, in config.yml and {path}!"
-msgstr "espelhos (mirrors) definidos duas vezes, em config.yml e em {path}!"
-
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "mutually exclusive arguments must be optional"
 msgstr "argumentos mutuamente exclusivos devem ser opcional"
 
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "next {name} cache update due in {time}"
-msgstr "próxima atualização do cache {name} prevista para {time}"
-
 #: ../fdroidserver/mirror.py
 #, python-brace-format
 msgid "no \"icon\" in {appid}"
@@ -2361,34 +2345,97 @@ msgstr "nenhum \"ícone\" em {appid}"
 msgid "no APK supplied"
 msgstr "nenhum APK fornecido"
 
-#: ../fdroidserver/checkupdates.py
-msgid "no version information found"
-msgstr "nenhuma informação de versão encontrada"
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, python-format
+msgid "no such option: %s"
+msgstr "não tem tal opção: %s"
 
-#: /usr/lib/python3.11/argparse.py
+#: ../fdroid ../fdroidserver/__main__.py
+msgid "no version info found!"
+msgstr "não há informações de versão encontrada!"
+
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "not allowed with argument %s"
 msgstr "não é permitido com o argumento %s"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "one of the arguments %s is required"
 msgstr "um dos argumentos %s é necessário"
 
-#: ../fdroidserver/common.py ../fdroidserver/index.py
+#: ../fdroidserver/index.py ../fdroidserver/common.py
 msgid "only accepts strings, lists, and tuples"
 msgstr "apenas aceita cadeias, listas e tuplos"
 
-#: /usr/lib/python3.11/argparse.py
-msgid "options"
-msgstr "opções"
+#: ../fdroidserver/install.py
+#, python-format
+msgid "option %s: If you really want to install all the signed apps, use --all"
+msgstr "opção %s: se realmente deseja instalar todas as apps assinadas, use --all"
+
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, python-format
+msgid "option %s: invalid %s value: %r"
+msgstr "Opção %s: valor %s inválido: %r"
+
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, python-format
+msgid "option %s: invalid choice: %r (choose from %s)"
+msgstr "opção %s: escolha inválida: %r (escolha entre %s)"
+
+#: /usr/lib/python3.5/getopt.py /usr/lib/python3.6/getopt.py
+#: /usr/lib/python3.7/getopt.py
+#, python-format
+msgid "option -%s not recognized"
+msgstr "opção -%s não reconhecida"
+
+#: /usr/lib/python3.5/getopt.py /usr/lib/python3.6/getopt.py
+#: /usr/lib/python3.7/getopt.py
+#, python-format
+msgid "option -%s requires argument"
+msgstr "opção -%s requer um argumento"
+
+#: /usr/lib/python3.5/getopt.py /usr/lib/python3.6/getopt.py
+#: /usr/lib/python3.7/getopt.py
+#, python-format
+msgid "option --%s must not have an argument"
+msgstr "opção --%s não pode ter argumento"
+
+#: /usr/lib/python3.5/getopt.py /usr/lib/python3.6/getopt.py
+#: /usr/lib/python3.7/getopt.py
+#, python-format
+msgid "option --%s not a unique prefix"
+msgstr "opção --%s não é prefixo único"
+
+#: /usr/lib/python3.5/getopt.py /usr/lib/python3.6/getopt.py
+#: /usr/lib/python3.7/getopt.py
+#, python-format
+msgid "option --%s not recognized"
+msgstr "opção --%s não reconhecida"
+
+#: /usr/lib/python3.5/getopt.py /usr/lib/python3.6/getopt.py
+#: /usr/lib/python3.7/getopt.py
+#, python-format
+msgid "option --%s requires argument"
+msgstr "opção --%s necessita argumento"
+
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
+msgid "optional arguments"
+msgstr "argumentos opcionais"
 
 #: ../fdroidserver/nightly.py
 #, python-brace-format
 msgid "overwriting existing {path}"
 msgstr "sobrescrevendo {path} existente"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "positional arguments"
 msgstr "argumentos posicionais"
 
@@ -2397,53 +2444,42 @@ msgstr "argumentos posicionais"
 msgid "process log deploy {path} to {dest} failed!"
 msgstr "a implementação do registo de processo {path} a {dest} falhou!"
 
-#: ../fdroidserver/build.py
-msgid "reference binary missing signature"
-msgstr "binária de referência sem assinatura"
-
 #: ../fdroidserver/signatures.py
 #, python-brace-format
 msgid "refuse downloading via insecure HTTP connection (use HTTPS or specify --no-https-check): {apkfilename}"
-msgstr "Recusado a descarrega via conexão HTTP insegura (use HTTPS ou especifique --no-https-check): {apkfilename}"
+msgstr "Recusado o download via conexão HTTP insegura (use HTTPS ou especifique --no-https-check): {apkfilename}"
+
+#: ../fdroidserver/signatures.py
+#, python-brace-format
+msgid "refuse downloading via insecure http connection (use https or specify --no-https-check): {apkfilename}"
+msgstr "Recusado o download via conexão http insegura (use https ou especifique --no-https-check): {apkfilename}"
 
 #: ../fdroidserver/index.py
 #, python-format
-msgid "repo_icon \"repo/icons/%s\" does not exist, generating placeholder."
-msgstr "repo_icon \"repo/icons/%s\" não existe, a gerar um espaço reservado."
+msgid "repo_icon %s does not exist, generating placeholder."
+msgstr "repo_icon %s não existe, a gerar um espaço reservado."
 
-#: ../fdroidserver/common.py
-msgid "repo_url needs to end with /repo"
-msgstr "repo_url precisa de terminar com /repo"
+#: ../fdroidserver/metadata.py
+msgid "ruamel.yaml not installed, can not write metadata."
+msgstr "o ruamel.yaml não está instalado, não é possível escrever metadados."
 
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "rsync is missing or broken: {error}"
-msgstr "rsync está ausente ou quebrado: {error}"
-
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "s3cmd sync indexes {path} to {url} and delete"
-msgstr "s3cmd sincroniza índices {path} para {url} e apaga"
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "s3cmd syncs indexes from {path} to {url} and deletes removed"
-msgstr "s3cmd sincroniza os índices de {path} para {url} e elimina os removidos"
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "scanner cache is malformed! You can clear it with: '{clear}'"
-msgstr "o cache do scanner está malformado! Pode limpá-lo com: '{clear}'"
-
-#: ../fdroidserver/deploy.py
-msgid "serverwebroot: path does not end with \"fdroid\", perhaps you meant one of these:"
-msgstr "serverwebroot: o caminho não termina com \"fdroid\", talvez queria usar um destes:"
+msgstr "s3cmd sincroniza índices {path} para {url} e exclui"
 
 #: ../fdroidserver/scanner.py
 msgid "shared library"
-msgstr "biblioteca partilhada"
+msgstr "biblioteca compartilhada"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "show program's version number and exit"
+msgstr "mostrar versão do programa e sair"
+
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.5/optparse.py
+#: /usr/lib/python3.6/argparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/argparse.py /usr/lib/python3.7/optparse.py
 msgid "show this help message and exit"
 msgstr "mostrar esta ajuda e sair"
 
@@ -2472,31 +2508,31 @@ msgstr "Nome 'srclibs' ausente e/ou '@'"
 msgid "static library"
 msgstr "biblioteca estática"
 
-#: ../fdroidserver/build.py
+#: ../fdroidserver/common.py
 #, python-brace-format
-msgid "supplied reference binary has allowed signer {signer}"
-msgstr "o binário de referência fornecido tem o assinante permitido {signer}"
+msgid "supplied timestamp value '{timestamp}' is not a unix timestamp"
+msgstr "O valor do data-hora fornecido ('{timestamp}') não está no formato timestamp unix."
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "the following arguments are required: %s"
 msgstr "os seguintes argumentos são necessários: %s"
 
-#: ../fdroidserver/install.py
-msgid "true"
-msgstr "verdadeiro"
-
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "unexpected option string: %s"
 msgstr "opção de cadeia de texto inesperada: %s"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "unknown parser %(parser_name)r (choices: %(choices)s)"
 msgstr "O formato '%(parser_name)r' é desconhecido. (Opções Válidas: %(choices)s)"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "unrecognized arguments: %s"
 msgstr "argumentos não reconhecidos: %s"
@@ -2506,11 +2542,16 @@ msgstr "argumentos não reconhecidos: %s"
 msgid "unsafe permissions on '{config_file}' (should be 0600)!"
 msgstr "permissões inseguras em '{config_file}' (deveria ser 0600)!"
 
-#: ../fdroidserver/__main__.py /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py ../fdroid
+#: /usr/lib/python3.7/argparse.py ../fdroidserver/__main__.py
 msgid "usage: "
 msgstr "utilização: "
 
-#: ../fdroidserver/deploy.py
+#: ../fdroid
+msgid "usage: fdroid [-h|--help|--version] <command> [<args>]"
+msgstr "utilização: fdroid [-h|--help|--version] <command> [<args>]"
+
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "using Apache libcloud to sync with {url}"
 msgstr "usando o Apache libcloud para sincronizar com {url}"
@@ -2519,9 +2560,9 @@ msgstr "usando o Apache libcloud para sincronizar com {url}"
 msgid "virustotal.com is rate limiting, waiting to retry..."
 msgstr "o virustotal.com está a limitar a taxa, à espera para voltar a tentar..."
 
-#: ../fdroidserver/install.py
-msgid "yes"
-msgstr "sim"
+#: ../fdroidserver/update.py
+msgid "wiki support is deprecated and will be removed in the next release!"
+msgstr "O suporte do wiki é depreciado e será removido no próximo lançamento!"
 
 #: ../fdroidserver/publish.py
 #, python-brace-format
@@ -2535,19 +2576,31 @@ msgstr[1] "{0} apps, {1} aliases chave"
 msgid "{apkfilename} ({appid}) has no metadata!"
 msgstr "{apkfilename} ({appid}) não tem metadados!"
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
+#: ../fdroidserver/update.py
+#, python-brace-format
+msgid "{apkfilename} has multiple {name} files, looks like Master Key exploit!"
+msgstr "{apkfilename} tem vários ficheiros {name} que, parece explorar a Master Key!"
+
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "{apkfilename}'s AndroidManifest.xml has a bad date: "
 msgstr "AndroidManifest.xml do {apkfilename} tem uma data má: "
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "{appid} does not have a name! Using application ID instead."
 msgstr "{appid} não tem um nome! A usar o ID da aplicação em vez disso."
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
+#: ../fdroidserver/update.py
+#, python-brace-format
+msgid "{appid} does not have a name! Using package name instead."
+msgstr "{appid} não tem um nome! Usando o nome do pacote em vez disso."
+
+#: ../fdroidserver/update.py
+#, python-brace-format
+msgid "{appid} from {path} is not a valid Android Package Name!"
+msgstr "{appid} from {path} não é um nome de pacote Android válido!"
+
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "{appid} from {path} is not a valid Android application ID!"
@@ -2558,16 +2611,12 @@ msgstr "{appid} de {path} não é um ID de aplicação Android válido!"
 msgid "{appid} from {path} is not a valid Java Package Name!"
 msgstr "{appid} do {path} não é um Nome de Pacote Java válido!"
 
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{appid} has both APKs and files: {files}"
-msgstr "{appid} tem APKs e ficheiros: {files}"
-
 #: ../fdroidserver/mirror.py
 #, python-brace-format
 msgid "{appid} is missing {name}"
 msgstr "{appid} tem falta de {name}"
 
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "{appid}: Unknown extlib {path} in build '{versionName}'"
@@ -2595,8 +2644,8 @@ msgstr "{build_flag} deve ser um inteiro, encontrado: {value}"
 
 #: ../fdroidserver/metadata.py
 #, python-brace-format
-msgid "{build_flag} must be list or string, found: {value}"
-msgstr "{build_flag} deve ser uma lista ou uma cadeia de caracteres, encontrado: {value}"
+msgid "{field} not terminated in {name}"
+msgstr "{field} não foi terminado em {name}"
 
 #: ../fdroidserver/metadata.py
 #, python-brace-format
@@ -2605,15 +2654,10 @@ msgstr "{file} está em branco ou corrompido!"
 
 #: ../fdroidserver/update.py
 #, python-brace-format
-msgid "{name} \"{section}/icons/{path}\" does not exist! Check \"config.yml\"."
-msgstr "{name} \"{section}/icons/{path}\" não existe! Corrija-o no \"config.yml\"."
+msgid "{name} \"{path}\" does not exist! Correct it in config.py."
+msgstr "{name} \"{path}\" não existe! Corrija-o no config.py."
 
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{path1} is a duplicate of {path2}, remove one!"
-msgstr "{path1} é uma duplicata de {path2}, remova uma!"
-
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 #, python-brace-format
 msgid "{path} already exists, ignoring import results!"
 msgstr "{path} já existe, a ignorar os resultados das importações!"
@@ -2628,36 +2672,6 @@ msgstr "{path} não existe! Crie-o executando:"
 msgid "{path} has bad file signature \"{pattern}\", possible Janus exploit!"
 msgstr "{path} tem uma má assinatura de ficheiro \"{pattern}\", um exploração Janus é possível!"
 
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "{path} has been flagged by virustotal {count} times:"
-msgstr "{path} foi marcado por virustotal {count} vezes:"
-
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "{path} has the wrong fingerprint ({fingerprint})!"
-msgstr "{path} tem a impressão digital errada ({fingerprint})!"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "{path} is not \"key: value\" dict, but a {datatype}!"
-msgstr "{path} não é um dicionário \"key: value\", mas um {datatype}!"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "{path} is not a standard config file!"
-msgstr "{path} não é um ficheiro de configuração padrão!"
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "{path} is not list, but a {datatype}!"
-msgstr "{path} não é uma lista, mas um {datatype}!"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "{path} is not {expected_type}, but a {datatype}!"
-msgstr "{path} não é um {expected_type}, mas um {datatype}!"
-
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "{path} is zero size!"
@@ -2666,24 +2680,14 @@ msgstr "{path} tem um tamanho de zero!"
 #: ../fdroidserver/deploy.py
 #, python-brace-format
 msgid "{path} more than 200MB, manually upload: {url}"
-msgstr "{path} mais que 200MB, enviar manualmente: {url}"
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "{path}: \"{code}\" is not a valid ISO_3166-1 alpha-2 country code!"
-msgstr "{path}: \"{code}\" não é um código de país ISO_3166-1 alfa-2 válido!"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{path}: {error}"
-msgstr "{path}: {error}"
+msgstr "{path} mais de 200MB, enviar manualmente: {url}"
 
 #: ../fdroidserver/mirror.py
 #, python-brace-format
 msgid "{url} does not end with \"fdroid\", check the URL path!"
 msgstr "{url} não termina com \"fdroid\", verifique o caminho na URL!"
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/common.py
 #, python-brace-format
 msgid "{url} does not start with \"http\"!"
 msgstr "{url} não começa com \"http\"!"
@@ -2699,3 +2703,9 @@ msgid "{} build succeeded"
 msgid_plural "{} builds succeeded"
 msgstr[0] "{} compilação com sucesso"
 msgstr[1] "{} compilações com sucesso"
+
+#~ msgid "Cannot find a packageName for {path}!"
+#~ msgstr "Não é possível encontrar um packageName para {path} 1!"
+
+#~ msgid "Cannot find an appid for {path}!"
+#~ msgstr "Não é possível encontrar um appid para {path} 1!"
diff --git a/locale/ro/LC_MESSAGES/fdroidserver.po b/locale/ro/LC_MESSAGES/fdroidserver.po
deleted file mode 100644
index 0599ee8c..00000000
--- a/locale/ro/LC_MESSAGES/fdroidserver.po
+++ /dev/null
@@ -1,2707 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# This file is put in the public domain.
-# Daniel Șerbănescu <daniel@serbanescu.dk>, 2021.
-# Christian Eichert <c@zp1.net>, 2021.
-# Simona Iacob <s@zp1.net>, 2021, 2022, 2023, 2024.
-# Licaon Kter <licaon.kter@protonmail.com>, 2021, 2022, 2023, 2024.
-# Hans-Christoph Steiner <hans@guardianproject.info>, 2024.
-msgid ""
-msgstr ""
-"Project-Id-Version: fdroidserver 2.0a5-27-gf24eae0f\n"
-"Report-Msgid-Bugs-To: https://gitlab.com/fdroid/fdroidserver/issues\n"
-"POT-Creation-Date: 2025-06-25 09:52+0200\n"
-"PO-Revision-Date: 2024-12-02 17:00+0000\n"
-"Last-Translator: Licaon Kter <licaon.kter@protonmail.com>\n"
-"Language-Team: Romanian <https://hosted.weblate.org/projects/f-droid/fdroidserver/ro/>\n"
-"Language: ro\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < 20)) ? 1 : 2;\n"
-"X-Generator: Weblate 5.9-dev\n"
-
-#: ../fdroidserver/nightly.py
-msgid ""
-"\n"
-"SSH public key to be used as deploy key:"
-msgstr ""
-"\n"
-"Cheia publică SSH care urmează să fie utilizată ca cheie de implementare:"
-
-#: ../fdroidserver/nightly.py
-#, python-brace-format
-msgid ""
-"\n"
-"{path} encoded for the DEBUG_KEYSTORE secret variable:"
-msgstr ""
-"\n"
-"{path} codificată pentru variabila secretă DEBUG_KEYSTORE:"
-
-#: ../fdroidserver/lint.py
-#, python-format
-msgid "\"%s/\" has no matching metadata file!"
-msgstr "\"%s/\" nu are un fișier de metadate corespunzător!"
-
-#: ../fdroidserver/index.py
-msgid "\"isPrimary\" key should not be added to mirrors!"
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "\"local_copy_dir\" {path} does not exist!"
-msgstr "\"local_copy_dir\" {path} nu există!"
-
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "\"{apkfilename}\" is already installed on {dev}."
-msgstr "\"{apkfilename}\" este deja instalat pe {dev}."
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "\"{path}\" contains recent {name} ({version})"
-msgstr "\"{path}\" conține {name} recente ({version})"
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "\"{path}\" exists but s3cmd is not installed!"
-msgstr "\"{path}\" există, dar s3cmd nu este instalat!"
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "\"{path}\" is not a supported file format (use: metadata/*.yml)"
-msgstr "\"{path}\" nu este un format de fișier acceptat (utilizați: metadata/*.yml)"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "\"{path}\" is signed by a key that is not allowed:"
-msgstr "\"{path}\" este semnat de o cheie care nu este permisă:"
-
-#: ../fdroidserver/import_subcommand.py
-#, python-brace-format
-msgid "\"{url}\" is not a valid URL!"
-msgstr "\"{url}\" nu este un URL valid!"
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "%(prog)s: error: %(message)s\n"
-msgstr "%(prog)s: eroare: %(message)s\n"
-
-#: ../fdroidserver/publish.py
-#, python-format
-msgid "%d APKs failed to be signed or verified!"
-msgstr "%d fișiere APK nu au putut fi semnate sau verificate!"
-
-#: ../fdroidserver/scanner.py
-#, python-format
-msgid "%d problems found"
-msgstr "%d probleme găsite"
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "%r is not callable"
-msgstr "%r nu este apelabil"
-
-#: ../fdroidserver/signindex.py
-#, python-format
-msgid "%s did not produce a dict!"
-msgstr "%s nu a produs un text!"
-
-#: ../fdroidserver/signindex.py
-#, python-format
-msgid "%s has bad SHA-256: %s"
-msgstr "%s are un SHA-256 greșit: %s"
-
-#: ../fdroidserver/lint.py
-#, python-format
-msgid "%s is not an accepted build field"
-msgstr "%s nu este un câmp de construcție acceptat"
-
-#: ../fdroidserver/common.py
-msgid "'keypass' not found in config.yml!"
-msgstr "'keypass' nu a fost găsit în config.yml!"
-
-#: ../fdroidserver/common.py
-msgid "'keystore' is NONE and 'smartcardoptions' is blank!"
-msgstr "'keystore' este NONE și 'smartcardoptions' este gol!"
-
-#: ../fdroidserver/common.py
-msgid "'keystore' not found in config.yml!"
-msgstr "'keystore' nu a fost găsit în config.yml!"
-
-#: ../fdroidserver/common.py
-msgid "'keystorepass' not found in config.yml!"
-msgstr "'keystorepass' nu se găsește în config.yml!"
-
-#: ../fdroidserver/common.py
-msgid "'repo_keyalias' not found in config.yml!"
-msgstr "'repo_keyalias' nu se găsește în config.yml!"
-
-#: /usr/lib/python3.11/argparse.py
-msgid "'required' is an invalid argument for positionals"
-msgstr "'required' este un argument invalid pentru poziționale"
-
-#: ../fdroidserver/common.py
-msgid "'sdk_path' not set in config.yml!"
-msgstr "'sdk_path' nu este setat în 'config.yml'!"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "'{aapt}' is too old, fdroid requires build-tools-{version} or newer!"
-msgstr "'{aapt}' este prea vechi, fdroid necesită build-tools-{version} sau mai nou!"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "'{path}' failed to execute!"
-msgstr "'{path}' nu a reușit să se execute!"
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "'{path}' has invalid format, it should be a dictionary!"
-msgstr "'{path}' are un format invalid, ar trebui să fie un dicționar!"
-
-#: ../fdroidserver/lint.py ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "'{value}' is not a valid {field} in {appid}. Regex pattern: {pattern}"
-msgstr "'{value}' nu este valid {field} în {appid}. Regex model: {pattern}"
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "'{value}' is not a valid {field}, should be {pattern}"
-msgstr "'{value}' nu este un {field} valid, ar trebui să fie {pattern}"
-
-#: ../fdroidserver/checkupdates.py
-msgid "--merge-request only runs on a single appid!"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "...checkupdate failed for {appid} : {error}"
-msgstr "...checkupdate a eșuat pentru {appid} : {error}"
-
-#: /usr/lib/python3.11/argparse.py
-msgid ".__call__() not defined"
-msgstr ".__call__() nu este definit"
-
-#: ../fdroidserver/lint.py
-msgid "/issues is missing"
-msgstr "/problemele lipsesc"
-
-#: ../fdroidserver/mirror.py
-msgid "A URL is required as an argument!"
-msgstr "Un URL este necesar ca argument!"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "APK signatures have different certificates in {path}:"
-msgstr "Semnăturile APK au certificate diferite în {path}:"
-
-#: ../fdroidserver/__main__.py
-msgid "Add PGP signatures using GnuPG for packages in repo"
-msgstr "Adăugați semnături PGP folosind GnuPG pentru pachetele din depozit"
-
-#: ../fdroidserver/update.py
-msgid "Add a repo signing key to an unsigned repo"
-msgstr "Adăugați o cheie de semnare repo la un depozit nesemnat"
-
-#: ../fdroidserver/update.py
-msgid "Add skeleton metadata files for APKs that are missing them"
-msgstr "Adăugați fișiere de metadate schelet pentru APK-urile care le lipsesc"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Adding new repo for only {name}"
-msgstr "Adăugarea unui nou depozit doar pentru {name}"
-
-#: ../fdroidserver/init.py
-msgid "Alias of the repo signing key in the keystore"
-msgstr "Alias al cheii de semnare repo din magazinul de chei"
-
-#: ../fdroidserver/build.py
-msgid "AllowedAPKSigningKeys missing but reference binary supplied"
-msgstr "AllowedAPKSigningKeys lipsește, dar este furnizat un binar de referință"
-
-#: ../fdroidserver/import_subcommand.py
-msgid "Allows a different revision (or git branch) to be specified for the initial import"
-msgstr "Permite specificarea unei revizuiri diferite (sau a unei ramuri git) pentru importul inițial"
-
-#: ../fdroidserver/mirror.py
-msgid "Also mirror the full archive section"
-msgstr "De asemenea, oglindește secțiunea arhivă completă"
-
-#: ../fdroidserver/lint.py
-msgid "Also warn about formatting issues, like rewritemeta -l"
-msgstr "De asemenea, avertizează asupra problemelor de formatare, cum ar fi rewritemeta -l"
-
-#: ../fdroidserver/scanner.py
-msgid "Android AAR library"
-msgstr "Biblioteca Android AAR"
-
-#: ../fdroidserver/scanner.py
-msgid "Android APK file"
-msgstr "Android APK fișier"
-
-#: ../fdroidserver/scanner.py
-msgid "Android DEX code"
-msgstr "Android DEX cod"
-
-#: ../fdroidserver/init.py
-#, python-brace-format
-msgid "Android SDK not found at {path}!"
-msgstr "Android SDK nu a fost găsit la {path}!"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Android SDK path '{path}' does not exist!"
-msgstr "Calea Android SDK '{path}' nu există!"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Android SDK path '{path}' is not a directory!"
-msgstr "Calea Android SDK '{path}' nu este un director!"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Android SDK tool {cmd} not found!"
-msgstr "Instrumentul Android SDK {cmd} nu a fost găsit!"
-
-#: ../fdroidserver/lint.py
-msgid "App has Binaries but does not have corresponding AllowedAPKSigningKeys to pin certificate."
-msgstr "Aplicația are binare, dar nu are AllowedAPKSigningKeys corespunzătoare pentru a fixa certificatul."
-
-#: ../fdroidserver/lint.py
-msgid "App has NoSourceSince or ArchivePolicy \"0 versions\" or 0 but AutoUpdateMode or UpdateCheckMode are not None"
-msgstr "Aplicatia are NoSourceSince sau ArchivePolicy \"0 versions\" dar AutoUpdateMode sau UpdateCheckMode nu sunt None"
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "App is in '{repo}' but has a link to {url}"
-msgstr "Aplicația se află în '{repo}', dar are un link către {url}"
-
-#: ../fdroidserver/lint.py
-msgid "App version has binary but does not have corresponding AllowedAPKSigningKeys to pin certificate."
-msgstr "Versiunea aplicației are o versiune binară, dar nu are AllowedAPKSigningKeys corespunzătoare pentru a fixa certificatul."
-
-#: ../fdroidserver/lint.py
-msgid "Appending .git is not necessary"
-msgstr "Adăugarea .git nu este necesară"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Archiving {apkfilename} with invalid signature!"
-msgstr "Arhivare {apkfilename} cu semnătură invalidă!"
-
-#: ../fdroidserver/lint.py
-msgid "AutoUpdateMode with UpdateCheckMode: HTTP must have a pattern."
-msgstr "AutoUpdateMode cu UpdateCheckMode: HTTP trebuie să aivă un format."
-
-#: ../fdroidserver/install.py
-msgid "Automatic no to all prompts."
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "Automatic yes to all prompts."
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "Bad entry type \"{mirrortype}\" in mirrors config: {mirror}"
-msgstr "Intrare de tip \"{mirrortype}\" greșită în configurația oglinzilor: {mirror}"
-
-#: ../fdroidserver/mirror.py
-msgid "Base URL to mirror, can include the index signing key using the query string: ?fingerprint="
-msgstr "URL de bază pentru oglindire, poate include cheia de semnare a indexului folosind șirul de interogare: ?fingerprint="
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Branch '{branch}' used as commit in build '{versionName}'"
-msgstr "Ramificația '{branch}' utilizată ca și confirmare în construcția '{versionName}'"
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Branch '{branch}' used as commit in srclib '{srclib}'"
-msgstr "Ramificația '{branch}' utilizată ca și commit în srclib '{srclib}'"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Broken symlink: {path}"
-msgstr "Legătură sym ruptă: {path}"
-
-#: ../fdroidserver/__main__.py
-msgid "Build a package from source"
-msgstr "Construiți un pachet din sursă"
-
-#: ../fdroidserver/build.py
-msgid "Build all applications available"
-msgstr "Construiți toate aplicațiile disponibile"
-
-#: ../fdroidserver/lint.py
-msgid "Build generated by `fdroid import` - remove disable line once ready"
-msgstr "Construire generată de `fdroid import` - eliminați linia de dezactivare odată ce este gata"
-
-#: ../fdroidserver/checkupdates.py
-msgid "Build metadata git repo has uncommited changes!"
-msgstr "Depozitul git al metadatelor de construire are modificări necomandate!"
-
-#: ../fdroidserver/build.py
-msgid "Build only the latest version of each package"
-msgstr "Construiți doar cea mai recentă versiune a fiecărui pachet"
-
-#: ../fdroidserver/init.py
-#, python-format
-msgid "Built repo based in \"%s\" with this config:"
-msgstr "Construit depozit bazat în \"%s\" cu această configurație:"
-
-#: ../fdroidserver/checkupdates.py
-msgid "Can't auto-update app with no CurrentVersionCode"
-msgstr "Nu se poate actualiza automat aplicația fără CurrentVersionCode"
-
-#: ../fdroidserver/build.py
-msgid "Can't build due to {} error while scanning"
-msgid_plural "Can't build due to {} errors while scanning"
-msgstr[0] "Nu se poate construi din cauza unei erori {} în timpul scanării"
-msgstr[1] "Nu se poate construi din cauza erorilor {} în timpul scanării"
-msgstr[2] "Nu se poate construi din cauza erorilor {} în timpul scanării"
-
-#: ../fdroidserver/common.py
-#, fuzzy, python-brace-format
-msgid "Cannot read {path}: {error}"
-msgstr "A eșuat citirea {path}: {error}"
-
-#: ../fdroidserver/rewritemeta.py
-#, python-brace-format
-msgid "Cannot rewrite \"{path}\""
-msgstr "Nu se poate rescrie \"{path}\""
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
-#: ../fdroidserver/lint.py
-#, python-format
-msgid "Categories '%s' is not valid"
-msgstr "Categoriile \"%s\" nu sunt valabile"
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
-#: ../fdroidserver/lint.py
-msgid "Categories are not set"
-msgstr "Categoriile nu sunt setate"
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "Category \"{category}\" defined but not used for any apps!"
-msgstr "Categoria \"{category}\" este definită dar nu este folosită de nici o aplicație!"
-
-#: ../fdroidserver/__main__.py
-msgid "Check for updates to applications"
-msgstr "Verificați dacă există actualizări ale aplicațiilor"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Checking archiving for {appid} - apks:{integer}, keepversions:{keep}, archapks:{arch}"
-msgstr "Verificarea arhivării pentru {appid} - apks:{integer}, keepversions:{keep}, archapks:{arch}"
-
-#: ../fdroidserver/update.py
-msgid "Clean update - don't uses caches, reprocess all APKs"
-msgstr "Actualizare curată - nu folosește memoria cache, reprocesează toate APK-urile"
-
-#: ../fdroidserver/common.py
-msgid "Color the log output"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
-msgid "Comma separated list of categories."
-msgstr "Lista de categorii separate prin virgulă."
-
-#: ../fdroidserver/__main__.py
-#, python-format
-msgid "Command '%s' not recognised.\n"
-msgstr "Comanda '%s' nerecunoscută.\n"
-
-#: ../fdroidserver/checkupdates.py
-msgid "Commit changes"
-msgstr "Efectuați modificări"
-
-#: ../fdroidserver/checkupdates.py
-msgid "Commit changes, push, then make a merge request"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Conflicting \"{field}\" definitions between .yml and localized files:"
-msgstr "Definiții \"{field}\" contradictorii între fișierele .yml și cele localizate:"
-
-#: ../fdroidserver/__main__.py
-msgid "Conflicting arguments: '--verbose' and '--quiet' can not be specified at the same time."
-msgstr "Argumente contradictorii: '--verbose' și '--quiet' nu pot fi specificate în același timp."
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Could not find '{command}' on your system"
-msgstr "Nu a putut găsi '{command}' pe sistemul dvs"
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/import_subcommand.py
-msgid "Could not find latest version code"
-msgstr "Nu a putut găsi codul ultimei versiuni"
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
-#: ../fdroidserver/import_subcommand.py
-msgid "Could not find latest version name"
-msgstr "Nu a putut găsi numele celei mai recente versiuni"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Could not find {path} to remove it"
-msgstr "Nu a putut găsi {path} pentru a-l elimina"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Could not open APK {path} for analysis: "
-msgstr "Nu s-a putut deschide APK {path} pentru analiză: "
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Could not parse size \"{size}\", wrong type \"{type}\""
-msgstr "Nu a putut analiza dimensiunea \"{size}\", tip greșit \"{type}\""
-
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/import_subcommand.py
-msgid "Couldn't find Application ID"
-msgstr "Nu s-a putut găsi ID-ul aplicației"
-
-#: ../fdroidserver/checkupdates.py
-msgid "Couldn't find any version information"
-msgstr "Nu am putut găsi nicio informație despre versiune"
-
-#: ../fdroidserver/checkupdates.py
-msgid "Couldn't find package ID"
-msgstr "Nu a putut găsi ID-ul pachetului"
-
-#: ../fdroidserver/update.py
-msgid "Cowardily refusing to overwrite existing signing key setup!"
-msgstr "Refuzând cu lașitate să suprascrieți configurarea cheilor de semnare existente!"
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Created new container \"{name}\""
-msgstr "Creat un nou container \"{name}\""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Creating \"{path}\" for configuring s3cmd."
-msgstr "Crearea \"{path}\" pentru configurarea s3cmd."
-
-#: ../fdroidserver/common.py
-#, fuzzy, python-brace-format
-msgid "Creating empty {config_file}"
-msgstr "Citirea '{config_file}'"
-
-#: ../fdroidserver/publish.py
-msgid "Creating log directory"
-msgstr "Crearea directorului de jurnal"
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Creating new S3 bucket: {url}"
-msgstr "Crearea unui nou recipient S3: {url}"
-
-#: ../fdroidserver/publish.py
-msgid "Creating output directory"
-msgstr "Crearea directorului de ieșire"
-
-#: ../fdroidserver/index.py
-msgid "Creating signed index with this key (SHA256):"
-msgstr "Crearea unui index semnat cu această cheie (SHA256):"
-
-#: ../fdroidserver/publish.py ../fdroidserver/verify.py
-msgid "Creating temporary directory"
-msgstr "Crearea unui director temporar"
-
-#: ../fdroidserver/index.py
-msgid "Creating unsigned index in preparation for signing"
-msgstr "Crearea unui index nesemnat în vederea pregătirii pentru semnare"
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "CurrentVersionCode {cv} is less than oldest build entry {versionCode}"
-msgstr "CurrentVersionCode {cv} este mai mic decât cea mai veche intrare de construcție {versionCode}"
-
-#: ../fdroidserver/nightly.py
-msgid "DEBUG_KEYSTORE is not set or the value is incomplete"
-msgstr "DEBUG_KEYSTORE nu este setat sau valoarea este incompletă"
-
-#: ../fdroidserver/update.py
-msgid "Delete APKs and/or OBBs without metadata from the repo"
-msgstr "Ștergeți APK-urile și/sau OBB-urile fără metadate din repo"
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Deleting archive, repo is too big ({size} max {limit})"
-msgstr "Ștergerea arhivei, repo este prea mare ({size} max {limit})"
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Deleting git-mirror history, repo is too big ({size} max {limit})"
-msgstr "Ștergerea istoricului git-mirror, repo este prea mare ({size} max {limit})"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Deleting unknown file: {path}"
-msgstr "Ștergerea unui fișier necunoscut: {path}"
-
-#: ../fdroidserver/lint.py
-#, python-format
-msgid "Description '%s' is just the app's summary"
-msgstr "Descrierea \"%s\" este doar un rezumat al aplicației"
-
-#: ../fdroidserver/lint.py
-msgid "Description has a duplicate line"
-msgstr "Descrierea are o linie duplicată"
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Description of length {length} is over the {limit} char limit"
-msgstr "Descrierea lungimii {length} este peste limita {limit} limitei de caractere"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Did you mean config/{name}.yml?"
-msgstr "Ați vrut de fapt config/{name}.yml?"
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Did you mean {code}?"
-msgstr "Ați vrut de fapt {code}?"
-
-#: ../fdroidserver/import_subcommand.py
-msgid "Do not add 'disable:' to the generated build entries"
-msgstr "Nu adăugați \"disable:\" la intrările de construcție generate"
-
-#: ../fdroidserver/nightly.py
-msgid "Do not deploy the new files to the repo"
-msgstr "Nu distribuiți noile fișiere în repo"
-
-#: ../fdroidserver/mirror.py
-#, python-brace-format
-msgid "Do not include \"{path}\" in URL!"
-msgstr "Nu includeți \"{path}\" în URL!"
-
-#: ../fdroidserver/init.py
-msgid "Do not prompt for Android SDK path, just fail"
-msgstr "Nu solicitați calea Android SDK, doar eșuați"
-
-#: ../fdroidserver/nightly.py
-msgid "Do not remove the private keys generated from the keystore"
-msgstr "Nu eliminați cheile private generate din keystore"
-
-#: ../fdroidserver/build.py
-msgid "Don't create a source tarball, useful when testing a build"
-msgstr "Nu creați un tarball sursă, util atunci când testați o construcție"
-
-#: ../fdroidserver/build.py
-msgid "Don't refresh the repository, useful when testing a build with no internet connection"
-msgstr "Nu reîmprospătați depozitul, util atunci când testați o construcție fără conexiune la internet"
-
-#: ../fdroidserver/deploy.py ../fdroidserver/nightly.py
-msgid "Don't use rsync checksums"
-msgstr "Nu folosiți sumele de verificare rsync"
-
-#: ../fdroidserver/install.py
-msgid "Download F-Droid.apk using mirrors that leak less to the network"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Download complete mirrors of small repos"
-msgstr "Descărcați oglinzi complete ale depozitelor mici"
-
-#: ../fdroidserver/common.py
-msgid "Downloading the repository already failed once, not trying again."
-msgstr "Descărcarea depozitului a eșuat deja o dată, nu mai încerc din nou."
-
-#: ../fdroidserver/verify.py
-#, python-brace-format
-msgid "Downloading {url} failed. {error}"
-msgstr "Descărcarea {url} a eșuat. {error}"
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Duplicate Anti-Feature declaration at {path} was ignored!"
-msgstr "Declarația duplicată Anti-Feature la {path} a fost ignorată!"
-
-#: ../fdroidserver/index.py
-#, python-format
-msgid "Duplicate entry \"%s\" in mirrors config!"
-msgstr "Intrare duplicată \"%s\" în oglinzile config!"
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Duplicate link in '{field}': {url}"
-msgstr "Legătură duplicată în \"{field}\": {url}"
-
-#: ../fdroidserver/common.py
-#, python-format
-msgid "ERROR: %(message)s"
-msgstr "EROARE: %(message)s"
-
-#: ../fdroidserver/__main__.py
-msgid "ERROR: The \"server\" subcommand has been removed, use \"deploy\"!"
-msgstr "ERROR: Subcomanda \"server\" a fost eliminată, utilizați \"deploy\"!"
-
-#: ../fdroidserver/nightly.py
-msgid "ERROR: unsupported CI type, patches welcome!"
-msgstr "ERROR: tip CI neacceptat, patch-uri binevenite!"
-
-#: ../fdroidserver/nightly.py
-#, python-format
-msgid "ERROR: unsupported git host \"%s\", patches welcome!"
-msgstr "EROARE: gazdă git neacceptată „%s”, corecții binevenite!"
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "ERROR: {key} in {path} is not \"archive\" or \"repo\"!"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "ERROR: {key} not a valid key!"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "ERROR: {key}'s value should be of type {t}!"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "ERROR: {key}:{subkey} in {path} is not in allowed keys: {allowed_keys}!"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-#, python-brace-format
-msgid "Encoding is set to '{enc}' fdroid might run into encoding issues. Please set it to 'UTF-8' for best results."
-msgstr "Encoding este setat la '{enc}' fdroid ar putea întâmpina probleme de codificare. Vă rugăm să o setați la 'UTF-8' pentru cele mai bune rezultate."
-
-#: ../fdroidserver/init.py
-#, python-format
-msgid ""
-"Enter the path to the Android SDK (%s) here:\n"
-"> "
-msgstr ""
-"Introduceți aici calea către Android SDK (%s):\n"
-"> "
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Environment variable {var} from {configname} is not set!"
-msgstr "Variabila de mediu {var} din {configname} nu este setată!"
-
-#: ../fdroidserver/common.py
-#, fuzzy, python-brace-format
-msgid "Environment variable {{env: {var}}} is not set!"
-msgstr "Variabila de mediu {var} din {configname} nu este setată!"
-
-#: ../fdroidserver/deploy.py
-msgid "Error deploying 'github_releases', {} not present. (You might need to run `fdroid update` first.)"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
-msgid "Error while getting repo address"
-msgstr "Eroare la obținerea adresei repo"
-
-#: ../fdroidserver/scanner.py
-msgid "Exit with a non-zero code if problems were found"
-msgstr "Ieșiți cu un cod diferit de zero dacă au fost găsite probleme"
-
-#: ../fdroidserver/__main__.py
-msgid "Extract application metadata from a source repository"
-msgstr "Extrageți metadatele aplicației dintr-un depozit sursă"
-
-#: ../fdroidserver/__main__.py
-msgid "Extract signatures from APKs"
-msgstr "Extrageți semnăturile din APK-uri"
-
-#: ../fdroidserver/install.py
-msgid "F-Droid.apk could not be downloaded from any known source!"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Failed copying {path}: {error}"
-msgstr "A eșuat copierea {path}: {error}"
-
-#: ../fdroidserver/signatures.py
-#, python-brace-format
-msgid "Failed fetching signatures for '{apkfilename}': {error}"
-msgstr "A eșuat preluarea semnăturilor pentru '{apkfilename}': {error}"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Failed reading {path}: {error}"
-msgstr "A eșuat citirea {path}: {error}"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Failed resizing {path}: {error}"
-msgstr "A eșuat redimensionarea {path}: {error}"
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Failed to create S3 bucket: {url}"
-msgstr "Nu s-a reușit crearea unui recipient S3: {url}"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Failed to get APK information, deleting {path}"
-msgstr "Nu a reușit să obțină informații despre APK, ștergând {path}"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Failed to get APK information, skipping {path}"
-msgstr "Nu a reușit să obțină informații despre APK, sărind peste {path}"
-
-#: ../fdroidserver/update.py
-msgid "Failed to get APK signing key fingerprint"
-msgstr "Nu a reușit să obțină amprenta digitală a cheii de semnare APK"
-
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "Failed to install '{apkfilename}' on {dev}: {error}"
-msgstr "Nu s-a reușit instalarea '{apkfilename}' pe {dev}: {error}"
-
-#: ../fdroidserver/common.py
-msgid "Failed to sign application"
-msgstr "Nu a reușit să semneze aplicația"
-
-#: ../fdroidserver/build.py
-#, python-brace-format
-msgid "Fetched buildserverid from VM: {buildserverid}"
-msgstr "A preluat buildserverid de la VM: {buildserverid}"
-
-#: ../fdroidserver/signatures.py
-#, python-brace-format
-msgid "Fetched signatures for '{apkfilename}' -> '{sigdir}'"
-msgstr "A preluat semnăturile pentru '{apkfilename}' -> '{sigdir}'"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "File disappeared while processing it: {path}"
-msgstr "Fișierul a dispărut în timpul procesării acestuia: {path}"
-
-#: ../fdroidserver/build.py ../fdroidserver/install.py
-#: ../fdroidserver/rewritemeta.py ../fdroidserver/scanner.py
-#: ../fdroidserver/update.py
-msgid "Finished"
-msgstr "Finalizat"
-
-#: ../fdroidserver/lint.py
-msgid "Forbidden HTML tags"
-msgstr "Etichete HTML interzise"
-
-#: ../fdroidserver/build.py
-msgid "Force build of disabled apps, and carries on regardless of scan problems. Only allowed in test mode."
-msgstr "Forțează compilarea forțată a aplicațiilor dezactivate și continuă indiferent de problemele de scanare. Este permisă numai în modul de testare."
-
-#: ../fdroidserver/build.py
-#, python-brace-format
-msgid "Force halting build after {0} sec timeout!"
-msgstr "Forțați oprirea construcției după {0} sec timeout!"
-
-#: ../fdroidserver/scanner.py
-msgid "Force scan of disabled apps and builds."
-msgstr "Forțați scanarea aplicațiilor și construcțiilor dezactivate."
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Found \"{path}\" graphic without metadata for app \"{name}\"!"
-msgstr "Am găsit graficul \"{path}\" fără metadate pentru aplicația \"{name}\"!"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Found bad funding file \"{path}\" for \"{name}\":"
-msgstr "Am găsit un fișier de finanțare necorespunzător \"{path}\" pentru \"{name}\":"
-
-#: ../fdroidserver/common.py
-msgid "Found invalid appids in arguments"
-msgstr "Găsit appids invalid în argumente"
-
-#: ../fdroidserver/common.py
-msgid "Found invalid versionCodes for some apps"
-msgstr "Am găsit coduri de versiune invalide pentru unele aplicații"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Found multiple JAR Signature Block Files in {path}"
-msgstr "Am găsit mai multe fișiere JAR Signature Block în {path}"
-
-#: ../fdroidserver/common.py
-msgid "Found multiple Signer Certificates!"
-msgstr "S-au găsit mai multe certificate de semnare!"
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Found multiple metadata files for {appid}"
-msgstr "Am găsit mai multe fișiere de metadate pentru {appid}"
-
-#: ../fdroidserver/index.py
-msgid "Found multiple signing certificates for repository."
-msgstr "S-au găsit mai multe certificate de semnare pentru depozit."
-
-#: ../fdroidserver/index.py
-msgid "Found no signing certificates for repository."
-msgstr "Nu s-au găsit certificate de semnare pentru depozit."
-
-#: ../fdroidserver/lint.py
-#, python-format
-msgid "Found non-file at %s"
-msgstr "Găsit non-file la %s"
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Found {apkfilename} at {url}"
-msgstr "Am găsit {apkfilename} la {url}"
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Found {count} problems in {filename}"
-msgstr "Am găsit {count} probleme în {filename}"
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Found {count} warnings in {filename}"
-msgstr "Am găsit {count} avertismente în {filename}"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Generated skeleton metadata for {appid}"
-msgstr "Generarea metadatelor schelet pentru {appid}"
-
-#: ../fdroidserver/common.py
-#, python-format
-msgid "Git checkout of '%s' failed"
-msgstr "Verificarea Git a '%s' a eșuat"
-
-#: ../fdroidserver/common.py
-msgid "Git clean failed"
-msgstr "Curățarea Git a eșuat"
-
-#: ../fdroidserver/common.py
-msgid "Git fetch failed"
-msgstr "Git fetch a eșuat"
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/common.py
-#, python-format
-msgid "Git remote set-head failed: \"%s\""
-msgstr "Git remote set-head a eșuat: \"%s\""
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/common.py
-msgid "Git reset failed"
-msgstr "Resetarea Git a eșuat"
-
-#: ../fdroidserver/common.py
-msgid "Git submodule deinit failed"
-msgstr "Eliminarea submodulelor Git a eșuat"
-
-#: ../fdroidserver/common.py
-msgid "Git submodule sync failed"
-msgstr "Sincronizarea submodulelor Git a eșuat"
-
-#: ../fdroidserver/common.py
-msgid "Git submodule update failed"
-msgstr "Actualizarea submodulelor Git a eșuat"
-
-#: ../fdroidserver/common.py
-msgid "HTTPS must be used with Subversion URLs!"
-msgstr "HTTPS trebuie folosit cu URL-urile Subversion!"
-
-#: ../fdroidserver/deploy.py
-msgid "If a git mirror gets to big, allow the archive to be deleted"
-msgstr "Dacă o oglindă git devine prea mare, permite ca arhiva să fie ștearsă"
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "If this upload fails, try manually uploading to {url}"
-msgstr "Dacă această încărcare eșuează, încercați să încărcați manual la {url}"
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Ignoring '{field}' in '{metapath}' metadata because it is deprecated."
-msgstr "Ignorarea lui '{field}' în metadatele '{metapath}', deoarece este depășită."
-
-#: ../fdroidserver/update.py
-#, python-format
-msgid "Ignoring FUNDING.yml entry longer than 2048: %s"
-msgstr "Ignorarea intrării FUNDING.yml mai lungă de 2048: %s"
-
-#: ../fdroidserver/update.py
-#, python-format
-msgid "Ignoring bad element in manifest: %s"
-msgstr "Ignorarea elementului greșit din manifest: %s"
-
-#: ../fdroidserver/common.py
-#, fuzzy, python-brace-format
-msgid "Ignoring deprecated {oldfile}, use {newfile}!"
-msgstr "{oldfile} este depreciat, folosiți {newfile}"
-
-#: ../fdroidserver/index.py
-msgid "Ignoring package without metadata: "
-msgstr "Ignorarea pachetului fără metadate: "
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Ignoring stale cache data for {apkfilename}"
-msgstr "Ignorarea datelor vechi din memoria cache pentru {apkfilename}"
-
-#: ../fdroidserver/update.py
-msgid "Include APKs that are signed with disabled algorithms like MD5"
-msgstr "Includeți APK-uri care sunt semnate cu algoritmi dezactivați, cum ar fi MD5"
-
-#: ../fdroidserver/mirror.py
-msgid "Include the PGP signature .asc files in the mirror"
-msgstr "Includeți fișierele .asc cu semnătura PGP în oglindă"
-
-#: ../fdroidserver/mirror.py
-msgid "Include the build logs in the mirror"
-msgstr "Includeți jurnalele de construcție în oglindă"
-
-#: ../fdroidserver/mirror.py
-msgid "Include the source tarballs in the mirror"
-msgstr "Includeți tarball-urile sursă în oglindă"
-
-#: ../fdroidserver/metadata.py
-#, python-format
-msgid "Including metadata from %s@%s"
-msgstr "Includerea metadatelor din %s@%s"
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Including metadata from {path}"
-msgstr "Includerea metadatelor din {path}"
-
-#: ../fdroidserver/common.py
-msgid "Initialising submodules"
-msgstr "Inițializarea submodulelor"
-
-#: ../fdroidserver/install.py
-msgid "Install all signed applications available"
-msgstr "Instalați toate aplicațiile semnate disponibile"
-
-#: ../fdroidserver/__main__.py
-msgid "Install built packages on devices"
-msgstr "Instalarea pachetelor construite pe dispozitive"
-
-#: ../fdroidserver/install.py
-#, python-format
-msgid "Installing %s..."
-msgstr "Se instalează %s..."
-
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "Installing '{apkfilename}' on {dev}..."
-msgstr "Instalarea '{apkfilename}' pe {dev}..."
-
-#: ../fdroidserver/__main__.py
-msgid "Interact with the repo HTTP server"
-msgstr "Interacționați cu serverul HTTP repo"
-
-#: ../fdroidserver/update.py
-msgid "Invalid APK"
-msgstr "APK invalid"
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "Invalid AutoUpdateMode: {mode}"
-msgstr "AutoUpdateMode invalid: {mode}"
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "Invalid UpdateCheckMode: {mode}"
-msgstr "UpdateCheckMode invalid: {mode}"
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "Invalid VercodeOperation: {field}"
-msgstr "VercodeOperation invalid: {field}"
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Invalid VercodeOperation: {invalid_ops}"
-msgstr "VercodeOperation invalidă: {invalid_ops}"
-
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Invalid application ID {appid}"
-msgstr "ID-ul aplicației nevalabil {appid}"
-
-#: ../fdroidserver/lint.py
-msgid "Invalid bulleted list"
-msgstr "Listă cu puncte invalidă"
-
-#: ../fdroidserver/common.py
-#, python-format
-msgid "Invalid name for published file: %s"
-msgstr "Nume nevalabil pentru fișierul publicat: %s"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Invalid ndk: entry in build: \"{ndk}\""
-msgstr "Ndk invalid: intrare în build: \"{ndk}\""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Invalid redirect to non-HTTPS: {before} -> {after} "
-msgstr "Redirecționare nevalabilă către non-HTTPS: {before} -> {after} "
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Invalid scrlib metadata: '{file}' does not exist"
-msgstr "Metadate scrlib nevalabile: '{file}' nu există"
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Invalid srclib metadata: could not parse '{file}'"
-msgstr "Metadate srclib nevalabile: nu s-a putut analiza '{file}'"
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Invalid srclib metadata: unknown key '{key}' in '{file}'"
-msgstr "Metadate srclib invalide: cheie necunoscută '{key}' în '{file}'"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "JAR signature failed to verify: {path}"
-msgstr "Nu s-a reușit verificarea semnăturii JAR: {path}"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "JAR signature verified: {path}"
-msgstr "Semnătura JAR verificată: {path}"
-
-#: ../fdroidserver/scanner.py
-msgid "Java JAR file"
-msgstr "Fișier Java JAR"
-
-#: ../fdroidserver/mirror.py ../fdroidserver/publish.py
-#: ../fdroidserver/update.py
-msgid "Java JDK not found! Install in standard location or set java_paths!"
-msgstr "Java JDK nu a fost găsit! Instalați în locația standard sau setați java_paths!"
-
-#: ../fdroidserver/scanner.py
-msgid "Java compiled class"
-msgstr "Clasa compilată Java"
-
-#: ../fdroidserver/signindex.py
-msgid "Java jarsigner not found! Install in standard location or set java_paths!"
-msgstr "Java jarsigner nu a fost găsit! Instalați în locația standard sau setați java_paths!"
-
-#: ../fdroidserver/lint.py
-msgid "Javascript in HTML src attributes"
-msgstr "Javascript în atributele src HTML"
-
-#: ../fdroidserver/build.py
-#, python-brace-format
-msgid "Keeping failed build \"{apkfilename}\""
-msgstr "Nu a reușit să construiască \"{apkfilename}\""
-
-#: ../fdroidserver/init.py
-msgid "Keystore for signing key:\t"
-msgstr "Keystore pentru cheia de semnare:\t"
-
-#: ../fdroidserver/lint.py
-msgid "Known debug key is used in AllowedAPKSigningKeys: "
-msgstr "Cheie de depanare cunoscută este utilizată în AllowedAPKSigningKeys: "
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Last used commit '{commit}' looks like a tag, but UpdateCheckMode is '{ucm}'"
-msgstr "Ultima confirmare utilizată '{commit}' arată ca o etichetă, dar UpdateCheckMode este '{ucm}'"
-
-#: ../fdroidserver/lint.py
-msgid "Liberapay donation methods belong in the Liberapay: field"
-msgstr "Metodele de donație Liberapay se află în Liberapay: câmp"
-
-#: ../fdroidserver/rewritemeta.py
-msgid "List files that would be reformatted (dry run)"
-msgstr "Lista fișierelor care ar urma să fie reformatate (execuție în regim de probă)"
-
-#: ../fdroidserver/lint.py
-msgid "Locale included in f-droid.org URL"
-msgstr "Locale incluse în URL-ul f-droid.org"
-
-#: ../fdroidserver/build.py
-msgid "Make the build stop on exceptions"
-msgstr "Opriți construcția la excepții"
-
-#: ../fdroidserver/index.py
-msgid "Malformed repository mirrors."
-msgstr "Oglinzi de depozit malformate."
-
-#: ../fdroidserver/deploy.py
-msgid "Malformed serverwebroot line:"
-msgstr "Linie de root a serverului web deformată:"
-
-#: ../fdroidserver/scanner.py
-#, python-format
-msgid "Max recursion depth in ZIP file reached: %s"
-msgstr "A fost atinsă adâncimea maximă de recursivitate în fișierul ZIP: %s"
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "Mirror config for {url} contains \"isPrimary\" key!"
-msgstr ""
-
-#: ../fdroidserver/mirror.py
-msgid "Mirror the full repo and archive, all file types."
-msgstr "Oglindește întregul repo și arhiva, toate tipurile de fișiere."
-
-#: ../fdroidserver/gpgsign.py
-msgid "Missing output directory"
-msgstr "Lipsește directorul de ieșire"
-
-#: ../fdroidserver/metadata.py
-msgid "Moving Anti-Features declarations to localized files:"
-msgstr "Mutarea declarațiilor Anti-Features în fișierele localizate:"
-
-#: ../fdroidserver/index.py
-msgid "Neither \"repo_pubkey\" nor \"keystorepass\" set in config.yml"
-msgstr "Nici \"repo_pubkey\" și nici \"keystorepass\" nu sunt setate în config.yml"
-
-#: ../fdroidserver/verify.py
-#, python-format
-msgid "No APK for package: %s"
-msgstr "Nu există APK pentru pachetul: %s"
-
-#: ../fdroidserver/common.py
-msgid "No Android SDK found!"
-msgstr "Nu s-a găsit niciun SDK Android!"
-
-#: ../fdroidserver/install.py
-msgid "No attached devices found"
-msgstr "Nu s-au găsit dispozitive atașate"
-
-#: ../fdroidserver/install.py
-msgid "No devices found for `adb install`! Please plug one in."
-msgstr ""
-
-#: ../fdroidserver/index.py
-msgid "No fingerprint in URL."
-msgstr "Nu există amprente în URL."
-
-#: ../fdroidserver/common.py
-msgid "No git submodules available"
-msgstr "Nu există submodule git disponibile"
-
-#: ../fdroidserver/import_subcommand.py
-msgid "No gradle project could be found. Specify --subdir?"
-msgstr "Nu a putut fi găsit niciun proiect gradle. Specificați --subdir?"
-
-#: ../fdroidserver/import_subcommand.py
-msgid "No information found."
-msgstr "Nu s-au găsit informații."
-
-#: ../fdroidserver/checkupdates.py
-msgid "No matching tags found"
-msgstr "Nu s-au găsit etichete corespunzătoare"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "No minimum SDK version found in {0}, using default (3)."
-msgstr "Nu a fost găsită nicio versiune minimă a SDK în {0}, se utilizează versiunea implicită (3)."
-
-#: ../fdroidserver/lint.py
-msgid "No need to specify that the app is Free Software"
-msgstr "Nu este nevoie să specificați că aplicația este Free Software"
-
-#: ../fdroidserver/lint.py
-msgid "No need to specify that the app is for Android"
-msgstr "Nu este nevoie să specificați că aplicația este pentru Android"
-
-#: ../fdroidserver/deploy.py
-msgid "No option set! Edit your config.yml to set at least one of these:"
-msgstr "Nu există set de opțiuni! Modificați fișierul config.yml pentru a seta cel puțin una dintre acestea:"
-
-#: ../fdroidserver/common.py
-msgid "No packages specified"
-msgstr "Nu sunt specificate pachete"
-
-#: ../fdroidserver/install.py
-#, python-format
-msgid "No signed APK available for %s"
-msgstr "Nu există niciun APK semnat disponibil pentru %s"
-
-#: ../fdroidserver/install.py
-msgid "No signed output directory - nothing to do"
-msgstr "Nici un director de ieșire semnat - nimic de făcut"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "No signing certificates found in {path}"
-msgstr "Nu s-au găsit certificate de semnare în {path}"
-
-#: ../fdroidserver/common.py
-#, python-format
-msgid "No such package: %s"
-msgstr "Nu există un astfel de pachet: %s"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "No such versionCode {versionCode} for app {appid}"
-msgstr "Nu există un astfel de versionCode {versionCode} pentru aplicația {appid}"
-
-#: ../fdroidserver/checkupdates.py
-msgid "No tags found"
-msgstr "Nu s-au găsit etichete"
-
-#: ../fdroidserver/publish.py ../fdroidserver/verify.py
-msgid "No unsigned directory - nothing to do"
-msgstr "Niciun director nesemnat - nimic de făcut"
-
-#: ../fdroidserver/__main__.py
-msgid "No version information could be found."
-msgstr "Nu s-au găsit informații despre versiune."
-
-#: ../fdroidserver/common.py
-msgid "Not a valid size definition: \"{}\""
-msgstr "Nu este o definiție valabilă a dimensiunii: \"{}\""
-
-#: ../fdroidserver/signindex.py
-msgid "Nothing to do"
-msgstr "Nimic de făcut"
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "Nothing to do for {appid}."
-msgstr "Nimic de făcut pentru {appid}."
-
-#: ../fdroidserver/init.py
-msgid "Now set these in config.yml:"
-msgstr "Acum setați-le în config.yml:"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "OBB file has newer versionCode({integer}) than any APK:"
-msgstr "Fișierul OBB are un versionCode({integer}) mai nou decât orice APK:"
-
-#: ../fdroidserver/update.py
-msgid "OBB filename must start with \"main.\" or \"patch.\":"
-msgstr "Numele fișierului OBB trebuie să înceapă cu \"main.\" sau \"patch.\":"
-
-#: ../fdroidserver/update.py
-msgid "OBB's packagename does not match a supported APK:"
-msgstr "OBB's packagename nu se potrivește cu un APK acceptat:"
-
-#: ../fdroidserver/deploy.py
-msgid "Offline machine, skipping git mirror generation until `fdroid deploy`"
-msgstr "Mașină offline, sărind peste generarea oglinzii git până la `fdroid deploy`"
-
-#: ../fdroidserver/deploy.py
-msgid "One of the 'github_releases' config items is missing the 'packageNames' value. skipping ..."
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "One of the 'github_releases' config items is missing the 'projectUrl' value. skipping ..."
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "One of the 'github_releases' config items is missing the 'token' value. skipping ..."
-msgstr ""
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Only PNG and JPEG are supported for graphics, found: {path}"
-msgstr "Doar PNG și JPEG sunt acceptate pentru grafică, găsite: {path}"
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/common.py
-msgid "Only accepts a single key \"env\""
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "Only process apps with auto-updates"
-msgstr "Procesați numai aplicațiile cu actualizări automate"
-
-#: ../fdroidserver/lint.py
-msgid "OpenCollective donation methods belong in the OpenCollective: field"
-msgstr "Metodele de donație OpenCollective aparțin OpenCollective: câmp"
-
-#: ../fdroidserver/verify.py
-msgid "Output JSON report to file named after APK."
-msgstr "Emite raportul JSON în fișierul numit după APK."
-
-#: ../fdroidserver/scanner.py
-msgid "Output JSON to stdout."
-msgstr "Emite JSON către stdout."
-
-#: ../fdroidserver/checkupdates.py ../fdroidserver/gpgsign.py
-#: ../fdroidserver/publish.py ../fdroidserver/signindex.py
-#: ../fdroidserver/update.py
-msgid "Outputting JSON"
-msgstr "Ieșirea JSON"
-
-#: ../fdroidserver/import_subcommand.py
-msgid "Overall license of the project."
-msgstr "Licența generală a proiectului."
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "Overriding blank versionName in {apkfilename} from metadata: {version}"
-msgstr "Suprascrierea versiunii goale VersionName în {apkfilename} din metadate: {version}"
-
-#: ../fdroidserver/import_subcommand.py
-#, python-brace-format
-msgid "Package \"{appid}\" already exists"
-msgstr "Pachetul \"{appid}\" există deja"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Parsing manifest at '{path}'"
-msgstr "Analiza manifestului la '{path}'"
-
-#: ../fdroidserver/common.py
-msgid "Password required with username"
-msgstr "Parola este necesară cu numele de utilizator"
-
-#: ../fdroidserver/import_subcommand.py
-msgid "Path to main Android project subdirectory, if not in root."
-msgstr "Calea de acces la subdirectorul principal al proiectului Android, dacă nu se află în root."
-
-#: ../fdroidserver/init.py
-msgid "Path to the Android SDK (sometimes set in ANDROID_HOME)"
-msgstr "Calea către Android SDK (uneori setată în ANDROID_HOME)"
-
-#: ../fdroidserver/btlog.py
-msgid "Path to the git repo to use as the log"
-msgstr "Calea către repo-ul git care urmează să fie utilizat ca jurnal"
-
-#: ../fdroidserver/init.py
-msgid "Path to the keystore for the repo signing key"
-msgstr "Calea către depozitul de chei pentru cheia de semnare a repo-ului"
-
-#: ../fdroidserver/nightly.py
-msgid "Print the secret variable to the terminal for easy copy/paste"
-msgstr "Tipărește variabila secretă în terminal pentru un ușor copy/paste"
-
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "Privacy mode was enabled based on your locale ({country_code})."
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-format
-msgid "Problem with ZIP file: %s, error %s"
-msgstr "Problema cu fișierul ZIP: %s, eroare %s"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Problem with xml at '{path}'"
-msgstr "Problemă cu xml la '{path}'"
-
-#: ../fdroidserver/checkupdates.py
-msgid "Process auto-updates"
-msgstr "Procesul de autoactualizare"
-
-#: ../fdroidserver/publish.py ../fdroidserver/update.py
-#, python-brace-format
-msgid "Processing {apkfilename}"
-msgstr "Procesarea {apkfilename}"
-
-#: ../fdroidserver/checkupdates.py ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Processing {appid}"
-msgstr "Prelucrare {appid}"
-
-#: ../fdroidserver/update.py
-msgid "Produce human-readable XML/JSON for index files"
-msgstr "Producerea de fișiere XML/JSON lizibile de către om pentru fișierele de indexare"
-
-#: ../fdroidserver/import_subcommand.py
-msgid "Project URL to import from."
-msgstr "URL-ul proiectului din care se importă."
-
-#: ../fdroidserver/lint.py
-msgid "Punctuation should be avoided"
-msgstr "Punctuația trebuie evitată"
-
-#: ../fdroidserver/btlog.py
-msgid "Push the log to this git remote repository"
-msgstr "Împingeți jurnalul în acest depozit de la distanță git"
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Pushing binary transparency log to {url}"
-msgstr "Trimiterea jurnalului de transparență binară la {url}"
-
-#: ../fdroidserver/deploy.py
-msgid "Pushing to remote server failed!"
-msgstr "Încărcarea la serverul de la distanță a eșuat!"
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Pushing to {url}"
-msgstr "Împingerea către {url}"
-
-#: ../fdroidserver/__main__.py
-msgid "Quickly start a new repository"
-msgstr "Începeți rapid un nou depozit"
-
-#: ../fdroidserver/__main__.py
-msgid "Read all the metadata files and exit"
-msgstr "Citiți toate fișierele de metadate și ieșiți"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Reading '{config_file}'"
-msgstr "Citirea '{config_file}'"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Reading packageName/versionCode/versionName failed, APK invalid: '{apkfilename}'"
-msgstr "Citirea packageName/versionCode/versionName a eșuat, APK invalid: '{apkfilename}'"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Reading packageName/versionCode/versionName failed,APK invalid: '{apkfilename}'"
-msgstr "Citirea packageName/versionCode/versionName a eșuat, APK invalid: '{apkfilename}'"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Reading {apkfilename} from cache"
-msgstr "Citirea {apkfilename} din memoria cache"
-
-#: ../fdroidserver/build.py
-msgid "Refresh and cache scanner rules and signatures from the network"
-msgstr "Actualizează și stochează în memorie regulile și semnăturilor de scanare din rețea"
-
-#: ../fdroidserver/publish.py
-#, python-brace-format
-msgid "Refusing to sign '{path}', file exists in both {dir1} and {dir2} folder."
-msgstr ""
-
-#: ../fdroidserver/verify.py
-msgid "Remove source tarball and any APKs if successfully verified."
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Removing specified files"
-msgstr "Eliminarea fișierelor specificate"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Removing {path}\""
-msgstr "Eliminarea lui {path}\""
-
-#: ../fdroidserver/update.py
-msgid "Rename APK files that do not match package.name_123.apk"
-msgstr "Redenumiți fișierele APK care nu se potrivesc cu package.name_123.apk"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "RepoType {type} is deprecated, please switch to git."
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-#, python-brace-format
-msgid "Resigning {apkfilename} with provided debug.keystore"
-msgstr "Renunțarea la {apkfilename} cu debug.keystore furnizat"
-
-#: ../fdroidserver/update.py
-msgid "Resize all the icons exceeding the max pixel size and exit"
-msgstr "Redimensionați toate pictogramele care depășesc dimensiunea maximă a pixelilor și ieșiți"
-
-#: ../fdroidserver/common.py
-msgid "Restrict output to warnings and errors"
-msgstr "Limitarea ieșirii la avertismente și erori"
-
-#: ../fdroidserver/net.py
-#, python-format
-msgid "Retrying failed download: %s"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Rewrite all the metadata files"
-msgstr "Rescrieți toate fișierele de metadate"
-
-#: ../fdroidserver/rewritemeta.py
-#, python-brace-format
-msgid "Rewriting '{appid}'"
-msgstr "Rescrierea '{appid}'"
-
-#: ../fdroidserver/checkupdates.py
-msgid "Run on git repo that has uncommitted changes"
-msgstr "Rulați pe un depozit git care are modificări necomandate"
-
-#: ../fdroidserver/nightly.py
-#, python-brace-format
-msgid "Run over {cibase} to find -debug.apk. and skip repo_basedir {repo_basedir}"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Run rewritemeta to fix formatting"
-msgstr "Rulați rewritemeta pentru a repara formatarea"
-
-#: ../fdroidserver/deploy.py
-msgid "Running first pass with MD5 checking disabled"
-msgstr "Rularea primei treceri cu verificarea MD5 dezactivată"
-
-#: ../fdroidserver/mirror.py
-#, python-brace-format
-msgid "Running wget in {path}"
-msgstr "Rularea wget în {path}"
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "SHA-256 of {url} does not match entry!"
-msgstr "SHA-256 din {url} nu se potrivește cu intrarea!"
-
-#: ../fdroidserver/build.py
-msgid "Scan the resulting APK(s) for known non-free classes."
-msgstr "Scanați APK-ul (APK-urile) rezultat(e) pentru clasele cunoscute care nu sunt libere."
-
-#: ../fdroidserver/__main__.py
-msgid "Scan the source code of a package"
-msgstr "Scanarea codului sursă al unui pachet"
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Scanner found {count} problems in {apk}"
-msgstr "Scanerul a găsit {count} probleme în {apk}"
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Scanner found {count} problems in {appid}:"
-msgstr "Scanerul a găsit {count} probleme în {appid}:"
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Scanner found {count} problems in {appid}:{versionCode}:"
-msgstr "Scanerul a găsit {count} probleme în {appid}:{versionCode}:"
-
-#: ../fdroidserver/build.py
-msgid "Scanner found {} problem"
-msgid_plural "Scanner found {} problems"
-msgstr[0] "Scannerul a găsit o problemă {}"
-msgstr[1] "Scannerul a găsit {} probleme"
-msgstr[2] "Scannerul a găsit {} probleme"
-
-#: ../fdroidserver/scanner.py
-msgid "Scanning APK for extra signing blocks."
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "Scanning APK with dexdump for known non-free classes."
-msgstr "Scanarea APK cu dexdump pentru clasele cunoscute ca fiind non-libere."
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Set NDK {release} ({version}) up"
-msgstr "Setați NDK {release} ({version}) sus"
-
-#: ../fdroidserver/common.py
-msgid "Set clock to that time using:"
-msgstr "Setați ceasul la ora respectivă folosind:"
-
-#: ../fdroidserver/nightly.py
-msgid "Set maximum releases in repo before older ones are archived"
-msgstr "Setați numărul maxim de versiuni în depozit înainte ca cele mai vechi să fie arhivate"
-
-#: ../fdroidserver/build.py
-#, python-brace-format
-msgid "Set open file limit to {integer}"
-msgstr "Setați limita fișierelor deschise la {integer}"
-
-#: ../fdroidserver/__main__.py
-msgid "Set up an app build for a nightly build repo"
-msgstr "Configurați o compilare de aplicații pentru un depozit de compilare nocturnă"
-
-#: ../fdroidserver/build.py
-msgid "Setting open file limit failed: "
-msgstr "Setarea limitei fișierelor deschise a eșuat: "
-
-#: ../fdroidserver/build.py
-#, python-brace-format
-msgid "Setting {0} sec timeout for this build"
-msgstr "Setarea {0} sec timeout pentru această construcție"
-
-#: ../fdroidserver/__main__.py
-msgid "Sign and place packages in the repo"
-msgstr "Semnați și plasați pachetele în repo"
-
-#: ../fdroidserver/__main__.py
-msgid "Sign indexes created using update --nosign"
-msgstr "Semnează indexurile create folosind update --nosign"
-
-#: ../fdroidserver/build.py
-msgid "Skip scanning the source code for binaries and other problems"
-msgstr "Treceți peste scanarea codului sursă pentru binare și alte probleme"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Skipping '{apkfilename}' with invalid signature!"
-msgstr "Ignorarea '{apkfilename}' cu semnătură invalidă!"
-
-#: ../fdroidserver/deploy.py ../fdroidserver/index.py
-#, python-format
-msgid "Skipping GitLab Pages mirror because the repo is too large (>%.2fGB)!"
-msgstr "Omiterea oglinzii GitLab Pages pentru că repo-ul este prea mare (>%.2fGB)!"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Skipping index generation for {appid}"
-msgstr "Ignorarea generării indexului pentru {appid}"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Skipping {apkfilename} with invalid signature!"
-msgstr "Săritură {apkfilename} cu semnătură invalidă!"
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Skipping {appid}: disabled"
-msgstr "Salt peste {appid}: dezactivat"
-
-#: ../fdroidserver/deploy.py
-msgid "Specify a local folder to sync the repo to"
-msgstr "Specificați un dosar local în care să sincronizați depozitul"
-
-#: ../fdroidserver/deploy.py
-msgid "Specify an identity file to provide to SSH for rsyncing"
-msgstr "Specificați un fișier de identitate pe care să îl furnizați la SSH pentru rsyncing"
-
-#: ../fdroidserver/nightly.py
-msgid "Specify which debug keystore file to use."
-msgstr "Specificați fișierul keystore de depanare care trebuie utilizat."
-
-#: ../fdroidserver/common.py
-msgid "Spew out even more information than normal"
-msgstr "Aruncă și mai multe informații decât în mod normal"
-
-#: ../fdroidserver/nightly.py
-#, python-brace-format
-msgid "Stripping mystery signature from {apkfilename}"
-msgstr "Eliminarea semnăturii misterioase din {apkfilename}"
-
-#: ../fdroidserver/lint.py
-#, python-format
-msgid "Summary '%s' is just the app's name"
-msgstr "Rezumat \"%s\" este doar numele aplicației"
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Summary of length {length} is over the {limit} char limit"
-msgstr "Rezumat al lungimii {length} depășește limita de caractere {limit} char limit"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "System clock is older than date in {path}!"
-msgstr "Ceasul sistemului este mai vechi decât data din {path}!"
-
-#: ../fdroidserver/checkupdates.py
-msgid "Tags update mode only works for git, hg, bzr and git-svn repositories currently"
-msgstr "Modul de actualizare a etichetelor funcționează doar pentru depozitele git, hg, bzr și git-svn în prezent"
-
-#: ../fdroidserver/checkupdates.py
-msgid "Tags update mode used in git-svn, but the repo was not set up with tags"
-msgstr "Modul de actualizare a etichetelor folosit în git-svn, dar repo-ul nu a fost configurat cu etichete"
-
-#: ../fdroidserver/build.py
-msgid "Test mode - put output in the tmp directory only, and always build, even if the output already exists."
-msgstr "Modul test - puneți ieșirea numai în directorul tmp și construiți întotdeauna, chiar dacă ieșirea există deja."
-
-#: ../fdroidserver/index.py
-msgid "The \"qrcode\" Python package is not installed (e.g. apt-get install python3-qrcode)!"
-msgstr ""
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "The OBB version code must come after \"{name}.\":"
-msgstr "Codul versiunii OBB trebuie să apară după \"{name}.\":"
-
-#: ../fdroidserver/btlog.py
-msgid "The base URL for the repo to log (default: https://f-droid.org)"
-msgstr "URL-ul de bază pentru repo-ul de logat (implicit: https://f-droid.org)"
-
-#: ../fdroidserver/mirror.py
-msgid "The directory to write the mirror to"
-msgstr "Directorul în care se va scrie oglinda"
-
-#: ../fdroidserver/nightly.py
-msgid "The file to be included in the repo (path or glob)"
-msgstr "Fișierul care urmează să fie inclus în repo (cale sau glob)"
-
-#: ../fdroidserver/index.py
-msgid "The repository's fingerprint does not match."
-msgstr "Amprenta digitală a depozitului nu se potrivește."
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "The root dir for local_copy_dir \"{path}\" does not exist!"
-msgstr "Directorul root pentru local_copy_dir \"{path}\" nu există!"
-
-#: ../fdroidserver/publish.py
-msgid "There is a keyalias collision - publishing halted"
-msgstr "Există o coliziune keyalias - publicarea a fost oprită"
-
-#: ../fdroidserver/common.py
-msgid "These are the apps that have been archived from the main repo."
-msgstr "Acestea sunt aplicațiile care au fost arhivate din depozitul principal."
-
-#: ../fdroidserver/mirror.py
-msgid "This command should never be used to mirror f-droid.org! A full copy requires more than 600GB."
-msgstr "Această comandă nu trebuie folosită niciodată pentru a seta un server de rezervă f-droid.org! O copie completă necesită mai mult de 600GB."
-
-#: ../fdroidserver/common.py
-msgid "This is a repository of apps to be used with F-Droid. Applications in this repository are either official binaries built by the original application developers, or are binaries built from source by the admin of f-droid.org using the tools on https://gitlab.com/fdroid."
-msgstr "Acesta este un depozit de aplicații care pot fi utilizate cu F-Droid. Aplicațiile din acest depozit sunt fie binare oficiale construite de către dezvoltatorii aplicațiilor originale, fie binare construite din sursă de către administratorul f-droid.org folosind instrumentele de pe https://gitlab.com/fdroid."
-
-#: ../fdroidserver/import_subcommand.py
-#, python-format
-msgid "This repo already has local metadata: %s"
-msgstr "Acest depozit are deja metadate locale: %s"
-
-#: ../fdroidserver/init.py
-#, python-format
-msgid ""
-"To complete the setup, add your APKs to \"%s\"\n"
-"then run \"fdroid update -c; fdroid update\".  You might also want to edit\n"
-"\"config.yml\" to set the URL, repo name, and more.  You should also set up\n"
-"a signing key (a temporary one might have been automatically generated).\n"
-"\n"
-"For more info: https://f-droid.org/docs/Setup_an_F-Droid_App_Repo\n"
-"and https://f-droid.org/docs/Signing_Process"
-msgstr ""
-"Pentru a finaliza configurarea, adăugați APK-urile la \"%s\"\n"
-"apoi rulați \"fdroid update -c; fdroid update\".  De asemenea, este posibil să doriți să editați\n"
-"\"config.yml\" pentru a seta URL-ul, numele repo și altele.  De asemenea, ar trebui să configurați\n"
-"o cheie de semnare (este posibil ca una temporară să fi fost generată automat).\n"
-"\n"
-"Pentru mai multe informații: https://f-droid.org/docs/Setup_an_F-Droid_App_Repo\n"
-"și https://f-droid.org/docs/Signing_Process"
-
-#: ../fdroidserver/deploy.py
-msgid "To use awsbucket, awssecretkey and awsaccesskeyid must also be set in config.yml!"
-msgstr "Pentru a utiliza awsbucket, awssecretkey și awsaccesskeyid trebuie să fie de asemenea setate în config.yml!"
-
-#: ../fdroidserver/deploy.py
-#, fuzzy
-msgid "To use rclone, rclone_config and awsbucket must be set in config.yml!"
-msgstr "Pentru a utiliza awsbucket, awssecretkey și awsaccesskeyid trebuie să fie de asemenea setate în config.yml!"
-
-#: ../fdroidserver/lint.py
-msgid "URL must start with https:// or http://"
-msgstr "URL-ul trebuie să înceapă cu https:// sau http://"
-
-#: ../fdroidserver/lint.py
-msgid "URL shorteners should not be used"
-msgstr "Scurtătoarele de URL-uri nu trebuie utilizate"
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "URL {url} in Description: {error}"
-msgstr "URL {url} în Descriere: {error}"
-
-#: ../fdroidserver/lint.py
-msgid "Unexpected license tag \"{}\"! Only use FSF or OSI approved tags from https://spdx.org/license-list"
-msgstr "Etichetă de licență neașteptată \"{}\"! Folosiți numai etichete aprobate de FSF sau OSI de pe https://spdx.org/license-list"
-
-#: ../fdroidserver/lint.py
-msgid "Unexpected license tag \"{}\"! Only use license tags configured in your config file"
-msgstr "Etichetă de licență neașteptată \"{}\"! Utilizați numai etichetele de licență configurate în fișierul de configurare"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Unknown entry {key} in {configname}"
-msgstr "Intrare necunoscută {key} în {configname}"
-
-#: ../fdroidserver/__main__.py
-msgid "Unknown exception found!"
-msgstr "S-a găsit o excepție necunoscută!"
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Unknown file '{filename}' in build '{versionName}'"
-msgstr "Fișier necunoscut '{filename}' în build '{versionName}'"
-
-#: ../fdroidserver/metadata.py
-#, python-format
-msgid "Unknown metadata format: %s"
-msgstr "Format de metadate necunoscut: %s"
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Unknown metadata format: {path} (use: *.yml)"
-msgstr "Format de metadate necunoscut: {path} (use: *.yml)"
-
-#: ../fdroidserver/common.py
-msgid "Unknown version of aapt, might cause problems: "
-msgstr "Versiune necunoscută de aapt, ar putea cauza probleme: "
-
-#: ../fdroidserver/lint.py
-msgid "Unnecessary leading space"
-msgstr "Spațiu de conducere inutil"
-
-#: ../fdroidserver/lint.py
-msgid "Unnecessary trailing space"
-msgstr "Spațiu de urmărire nejustificat"
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Unrecognised app field '{fieldname}' in '{path}'"
-msgstr "Câmp de aplicație nerecunoscut '{fieldname}' în '{path}'"
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Unrecognised build flag '{build_flag}' in '{path}'"
-msgstr "Indicator de construcție nerecunoscut '{build_flag}' în '{path}'"
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Unsupported file type \"{extension}\" for repo graphic"
-msgstr "Tip de fișier \"{extension}\" neacceptat pentru graficul repo"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Unsupported graphics file found: {path}"
-msgstr "A fost găsit un fișier grafic neacceptat: {path}"
-
-#: ../fdroidserver/lint.py
-#, python-format
-msgid "Unused extlib at %s"
-msgstr "Extlib nefolosit la %s"
-
-#: ../fdroidserver/lint.py
-#, python-format
-msgid "Unused file at %s"
-msgstr "Fișier nefolosit la %s"
-
-#: ../fdroidserver/scanner.py
-#, python-format
-msgid "Unused scandelete path: %s"
-msgstr "Calea de scanare a ștergerii neutilizată: %s"
-
-#: ../fdroidserver/scanner.py
-#, python-format
-msgid "Unused scanignore path: %s"
-msgstr "Cale de scanare neutilizată: %s"
-
-#: ../fdroidserver/__main__.py
-msgid "Update repo information for new packages"
-msgstr "Actualizarea informațiilor repo pentru noile pachete"
-
-#: ../fdroidserver/__main__.py
-msgid "Update the binary transparency log for a URL"
-msgstr "Actualizarea jurnalului de transparență binară pentru o adresă URL"
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "UpdateCheckData has invalid URL: {url}"
-msgstr "UpdateCheckData are un URL invalid: {url}"
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "UpdateCheckData must match the version code as integer (\\d or [0-9]): {codeex}"
-msgstr "UpdateCheckData trebuie să corespundă codului versiunii ca număr întreg (\\d sau [0-9]): {codeex}"
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "UpdateCheckData must use HTTPS URL: {url}"
-msgstr "UpdateCheckData trebuie să utilizeze un URL HTTPS: {url}"
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "UpdateCheckData not a valid URL: {url}"
-msgstr "UpdateCheckData nu este un URL valid: {url}"
-
-#: ../fdroidserver/lint.py
-msgid "UpdateCheckMode is set but it looks like checkupdates hasn't been run yet."
-msgstr "UpdateCheckMode este setat, dar se pare că checkupdates nu a fost încă rulat."
-
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/lint.py
-msgid "UpdateCheckName is set to the known application ID, it can be removed"
-msgstr "UpdateCheckName este setat la ID-ul cunoscut al aplicației, acesta poate fi eliminat"
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Uploading {apkfilename} to androidobservatory.org"
-msgstr "Încărcarea {apkfilename} pe androidobservatory.org"
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Uploading {apkfilename} to virustotal"
-msgstr "Încărcarea {apkfilename} la virustotal"
-
-#: ../fdroidserver/lint.py
-msgid "Use /HEAD instead of /master or /main to point at a file in the default branch"
-msgstr "Folosiți /HEAD în loc de /master sau /main pentru a indica un fișier din ramura implicită"
-
-#: ../fdroidserver/update.py
-msgid "Use `fdroid update -c` to create it."
-msgstr "Utilizați `fdroid update -c` pentru a-l crea."
-
-#: ../fdroidserver/build.py
-msgid "Use build server"
-msgstr "Utilizați serverul de construcție"
-
-#: ../fdroidserver/update.py
-msgid "Use date from APK instead of current time for newly added APKs"
-msgstr "Utilizați data din APK în loc de ora curentă pentru APK-urile nou adăugate"
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Using \"{path}\" for configuring s3cmd."
-msgstr "Utilizarea \"{path}\" pentru configurarea s3cmd."
-
-#: ../fdroidserver/deploy.py
-#, fuzzy, python-brace-format
-msgid "Using \"{path}\" for syncing with remote storage."
-msgstr "Utilizarea \"{path}\" pentru configurarea s3cmd."
-
-#: ../fdroidserver/common.py
-msgid "Using APK Signature v2"
-msgstr "Folosind APK Signature v2"
-
-#: ../fdroidserver/common.py
-msgid "Using APK Signature v3"
-msgstr "Folosind APK Signature v3"
-
-#: ../fdroidserver/common.py
-msgid "Using JAR Signature"
-msgstr "Folosind JAR Signature"
-
-#: ../fdroidserver/common.py
-msgid "Using Java's jarsigner, not recommended for verifying APKs! Use apksigner"
-msgstr "Folosind jarsigner de la Java, nu este recomandat pentru verificarea APK-urilor! Utilizați apksigner"
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Using blank dictionary instead of contents of {path}!"
-msgstr "Utilizarea dicționarului gol în loc de conținutul lui {path}!"
-
-#: ../fdroidserver/init.py
-#, python-brace-format
-msgid "Using existing keystore \"{path}\""
-msgstr "Utilizarea keystore-ului existent \"{path}\""
-
-#: ../fdroidserver/deploy.py
-#, fuzzy, python-brace-format
-msgid "Using rclone to sync with: {url}"
-msgstr "Folosind s3cmd pentru a sincroniza cu: {url}"
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Using s3cmd to sync with: {url}"
-msgstr "Folosind s3cmd pentru a sincroniza cu: {url}"
-
-#: ../fdroidserver/__main__.py
-msgid "Valid commands are:"
-msgstr "Comenzile valide sunt:"
-
-#: ../fdroidserver/verify.py
-msgid "Verify against locally cached copy rather than redownloading."
-msgstr "Verificați în funcție de copia memorată în memoria cache locală, mai degrabă decât să reîncărcați."
-
-#: ../fdroidserver/__main__.py
-msgid "Verify the integrity of downloaded packages"
-msgstr "Verificarea integrității pachetelor descărcate"
-
-#: ../fdroidserver/index.py
-msgid "Verifying index signature:"
-msgstr "Verificarea semnăturii indexului:"
-
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "Verifying package {path} with apksigner."
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "VirusTotal API key cannot upload files larger than 32MB, use {url} to upload {path}."
-msgstr "VirusTotal API key nu poate încărca fișiere mai mari de 32MB, utilizați {url} pentru a încărca {path}."
-
-#: ../fdroidserver/nightly.py
-msgid "WARNING: only public git repos are supported!"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Warn about possible metadata errors"
-msgstr "Avertizează cu privire la posibile erori de metadate"
-
-#: ../fdroidserver/scanner.py
-msgid "WebAssembly binary file"
-msgstr ""
-
-#: ../fdroidserver/update.py
-msgid "When configured for signed indexes, create only unsigned indexes at this stage"
-msgstr "Atunci când este configurat pentru indici cu semnătură, creați numai indici fără semnătură în această etapă"
-
-#: ../fdroidserver/lint.py
-msgid "When linting the entire repository yamllint is disabled by default. This option forces yamllint regardless."
-msgstr "Atunci când se face linting pentru întregul depozit, yamllint este dezactivat în mod implicit. Această opțiune forțează yamllint indiferent de aceasta."
-
-#: ../fdroidserver/publish.py
-msgid "When signing or verifying fails, exit with an error code."
-msgstr "În cazul în care semnarea sau verificarea eșuează, ieșiți cu un cod de eroare."
-
-#: ../fdroidserver/install.py
-msgid "Would you like to download and install F-Droid.apk via adb? (YES/no)"
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "Would you like to download the app(s) from f-droid.org? (YES/no)"
-msgstr ""
-
-#: ../fdroidserver/init.py
-msgid "X.509 'Distinguished Name' used when generating keys"
-msgstr "X.509 \"Distinguished Name\" utilizat la generarea cheilor"
-
-#: ../fdroidserver/common.py
-msgid "You can use ANDROID_HOME to set the path to your SDK, i.e.:"
-msgstr "Puteți utiliza ANDROID_HOME pentru a seta calea către SDK-ul dvs., adică:"
-
-#: ../fdroidserver/scanner.py
-msgid "ZIP file archive"
-msgstr "Arhiva de fișiere ZIP"
-
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "adb reports {serial} is \"{status}\"!"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-#, python-brace-format
-msgid "adding IdentityFile to {path}"
-msgstr "adăugând IdentityFile la {path}"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "adding to {name}: {path}"
-msgstr "adăugând la {name}: {path}"
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "ambiguous option: %(option)s could match %(matches)s"
-msgstr "opțiune ambiguă: %(option)s ar putea corespunde cu %(matches)s"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "apksigner in build-tools;{version} passes APKs with invalid v3 signatures, ignoring."
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "apksigner not found! Cannot sign or verify modern APKs"
-msgstr "apksigner nu a fost găsit! Nu se poate semna sau verifica APK-urile moderne"
-
-#: ../fdroidserver/common.py
-msgid "apksigner not found, it's required for signing!"
-msgstr "apksigner nu a fost găsit, este necesar pentru a semna!"
-
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/checkupdates.py ../fdroidserver/lint.py
-#: ../fdroidserver/rewritemeta.py
-msgid "application ID of file to operate on"
-msgstr "ID-ul de aplicație al fișierului pe care se operează"
-
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/build.py ../fdroidserver/install.py
-#: ../fdroidserver/publish.py ../fdroidserver/scanner.py
-#: ../fdroidserver/verify.py
-msgid "application ID with optional versionCode in the form APPID[:VERCODE]"
-msgstr "ID-ul aplicației cu versionCode opțional sub forma APPID[:VERCODE]"
-
-#: ../fdroidserver/common.py
-msgid "archive_url needs to end with /archive"
-msgstr "archive_url trebuie să se termine cu /archive"
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "argument \"-\" with mode %r"
-msgstr "argumentul \"-\" cu modul %r"
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "argument %(argument_name)s: %(message)s"
-msgstr "argument %(argument_name)s: %(message)s"
-
-#: ../fdroidserver/nightly.py
-msgid "attempting bare SSH connection to test deploy key:"
-msgstr "încercând o conexiune SSH goală pentru a testa cheia de implementare:"
-
-#: ../fdroidserver/common.py
-msgid "can not parse scrlib spec (not a string): '{}'"
-msgstr "nu poate analiza specificația scrlib (not a string): '{}'"
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "can't open '%(filename)s': %(error)s"
-msgstr "nu se poate deschide '%(filename)s': %(error)s"
-
-#: ../fdroidserver/scanner.py
-msgid "can't open non-https url: '{};"
-msgstr "nu se poate deschide un URL non-https: '{};"
-
-#: ../fdroidserver/build.py
-#, python-brace-format
-msgid "cannot find required srclibs: \"{path}\""
-msgstr "nu poate găsi srclibs necesare: \"{path}\""
-
-#: /usr/lib/python3.11/argparse.py
-msgid "cannot have multiple subparser arguments"
-msgstr "nu poate avea mai multe argumente subparser"
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "cannot merge actions - two groups are named %r"
-msgstr "nu poate fuziona acțiuni - două grupuri se numesc %r"
-
-#: ../fdroidserver/nightly.py
-msgid "cannot publish update, did you set the deploy key?"
-msgstr "nu poate publica actualizarea, ați setat cheia de implementare?"
-
-#: ../fdroidserver/nightly.py
-#, python-brace-format
-msgid "cloning {url}"
-msgstr "clonarea {url}"
-
-#: ../fdroidserver/__main__.py
-msgid "commands from plugin modules:"
-msgstr "comenzi din modulele plugin:"
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "conflicting option string: %s"
-msgid_plural "conflicting option strings: %s"
-msgstr[0] "șir de opțiuni conflictuale: %s"
-msgstr[1] "șiruri de opțiuni conflictuale: %s"
-msgstr[2] "șiruri de opțiuni conflictuale: %s"
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "conflicting subparser alias: %s"
-msgstr "șir de alias conflictual: %s"
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "conflicting subparser: %s"
-msgstr "șir de opțiuni conflictuale: %s"
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "could not parse '{path}'"
-msgstr "nu s-a putut analiza '{path}'"
-
-#: ../fdroidserver/common.py
-msgid "could not parse srclib spec (no name specified): '{}'"
-msgstr "nu a putut analiza specificația srclib (nu a fost specificat niciun nume): '{}'"
-
-#: ../fdroidserver/common.py
-msgid "could not parse srclib spec (no ref specified): '{}'"
-msgstr "nu a putut analiza specificația srclib (nu a fost specificat niciun ref): '{}'"
-
-#: ../fdroidserver/nightly.py
-#, python-brace-format
-msgid "created {path}"
-msgstr "a creat {path}"
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "current version is newer: old vercode={old}, new vercode={new}"
-msgstr "versiunea curentă este mai nouă: old vercode={old}, new vercode={new}"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "deleting: repo/{apkfilename}"
-msgstr "ștergere: repo/{apkfilename}"
-
-#: ../fdroidserver/scanner.py
-msgid "dependency file without lock"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "deployed process log {path} to {dest}"
-msgstr "a implementat jurnalul de proces {path} la {dest}"
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "dest= is required for options like %r"
-msgstr "dest= este necesar pentru opțiuni precum %r"
-
-#: ../fdroidserver/scanner.py
-msgid "downloading '{}'"
-msgstr "descărcare '{}'"
-
-#: ../fdroidserver/scanner.py
-msgid "downloading scanner signatures from '{}' failed"
-msgstr "descărcarea semnăturilor de scaner de la '{}' a eșuat"
-
-#: ../fdroidserver/scanner.py
-msgid "executable binary, possibly code"
-msgstr "binar executabil, eventual cod"
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "expected %s argument"
-msgid_plural "expected %s arguments"
-msgstr[0] "argument %s așteptat"
-msgstr[1] "argumente %s așteptate"
-msgstr[2] "argumente %s așteptate"
-
-#: /usr/lib/python3.11/argparse.py
-msgid "expected at least one argument"
-msgstr "se așteaptă cel puțin un argument"
-
-#: /usr/lib/python3.11/argparse.py
-msgid "expected at most one argument"
-msgstr "se așteaptă cel mult un argument"
-
-#: /usr/lib/python3.11/argparse.py
-msgid "expected one argument"
-msgstr "se așteaptă un singur argument"
-
-#: ../fdroidserver/__main__.py
-msgid "fdroid [<command>] [-h|--help|--version|<args>]"
-msgstr "fdroid [<comandă>] [-h|--help|--version|<args>]"
-
-#: ../fdroidserver/scanner.py
-msgid "fetch the latest version of signatures from the web"
-msgstr "extrage cea mai recentă versiune de semnături de pe web"
-
-#: ../fdroidserver/metadata.py
-msgid "force metadata errors (default) to be warnings, or to be ignored."
-msgstr "forțează erorile de metadate (implicit) să fie avertismente sau să fie ignorate."
-
-#: ../fdroidserver/common.py
-msgid "git svn clone failed"
-msgstr "git svn clone a eșuat"
-
-#: ../fdroidserver/scanner.py
-msgid "gzip file archive"
-msgstr "Arhiva de fișiere gzip"
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "ignored explicit argument %r"
-msgstr "a ignorat argumentul explicit %r"
-
-#: ../fdroidserver/index.py
-msgid "index-v1 must have a signature, use `fdroid signindex` to create it!"
-msgstr "index-v1 trebuie să aibă o semnătură, folosiți `fdroid signindex` pentru a o crea!"
-
-#: ../fdroidserver/index.py
-msgid "index-v2 must have a signature, use `fdroid signindex` to create it!"
-msgstr "index-v2 trebuie să aibă o semnătură, folosiți `fdroid signindex` pentru a o crea!"
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "invalid %(type)s value: %(value)r"
-msgstr "invalid %(type)s valoare: %(value)r"
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "invalid choice: %(value)r (choose from %(choices)s)"
-msgstr "alegere invalidă: %(value)r (alege din %(choices)s)"
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "invalid conflict_resolution value: %r"
-msgstr "valoare invalidă a rezoluției_conflictului: %r"
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "invalid option string %(option)r: must start with a character %(prefix_chars)r"
-msgstr "șir de opțiuni invalid %(option)r: trebuie să înceapă cu un caracter %(prefix_chars)r"
-
-#: ../fdroidserver/common.py
-msgid "ipfs_cid not found, skipping CIDv1 generation"
-msgstr "ipfs_cid nu a fost găsit, sărind peste generarea CIDv1"
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "latest build recipe is newer: old vercode={old}, new vercode={new}"
-msgstr "ultima rețetă de construcție este mai nouă: old vercode={old}, new vercode={new}"
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "local_copy_dir does not end with \"fdroid\", perhaps you meant: \"{path}\""
-msgstr "local_copy_dir nu se termină cu \"fdroid\", poate ai vrut să spui: \"{path}\""
-
-#: ../fdroidserver/deploy.py
-msgid "local_copy_dir must be an absolute path!"
-msgstr "local_copy_dir trebuie să fie o rută de acces absolută!"
-
-#: ../fdroidserver/deploy.py
-msgid "local_copy_dir must be directory, not a file!"
-msgstr "local_copy_dir trebuie să fie un director, nu un fișier!"
-
-#: ../fdroidserver/index.py
-#, python-format
-msgid "mirror '%s' does not end with 'fdroid'!"
-msgstr "oglinda '%s' nu se termină cu 'fdroid'!"
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "mirrors set twice, in config.yml and {path}!"
-msgstr "servere de rezervă duplicat, în config.yml și {path}!"
-
-#: /usr/lib/python3.11/argparse.py
-msgid "mutually exclusive arguments must be optional"
-msgstr "argumentele care se exclud reciproc trebuie să fie opționale"
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "next {name} cache update due in {time}"
-msgstr "următoarea actualizare a memoriei cache {name} va fi efectuată în {time}"
-
-#: ../fdroidserver/mirror.py
-#, python-brace-format
-msgid "no \"icon\" in {appid}"
-msgstr "nu există \" pictogramă \" în {appid}"
-
-#: ../fdroidserver/signatures.py
-msgid "no APK supplied"
-msgstr "nici un APK furnizat"
-
-#: ../fdroidserver/checkupdates.py
-msgid "no version information found"
-msgstr "nu s-au găsit informații despre versiune"
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "not allowed with argument %s"
-msgstr "nu este permis cu argumentul %s"
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "one of the arguments %s is required"
-msgstr "unul dintre argumentele %s este necesar"
-
-#: ../fdroidserver/common.py ../fdroidserver/index.py
-msgid "only accepts strings, lists, and tuples"
-msgstr "acceptă doar șiruri de caractere, liste și tupluri"
-
-#: /usr/lib/python3.11/argparse.py
-msgid "options"
-msgstr "opțiuni"
-
-#: ../fdroidserver/nightly.py
-#, python-brace-format
-msgid "overwriting existing {path}"
-msgstr "suprascriere {path} existent"
-
-#: /usr/lib/python3.11/argparse.py
-msgid "positional arguments"
-msgstr "argumente poziționale"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "process log deploy {path} to {dest} failed!"
-msgstr "jurnalul procesului deploy {path} la {dest} a eșuat!"
-
-#: ../fdroidserver/build.py
-msgid "reference binary missing signature"
-msgstr "referință binară semnătură lipsă"
-
-#: ../fdroidserver/signatures.py
-#, python-brace-format
-msgid "refuse downloading via insecure HTTP connection (use HTTPS or specify --no-https-check): {apkfilename}"
-msgstr "refuză descărcarea prin conexiune HTTP nesigură (utilizați HTTPS sau specificați --no-https-check): {apkfilename}"
-
-#: ../fdroidserver/index.py
-#, python-format
-msgid "repo_icon \"repo/icons/%s\" does not exist, generating placeholder."
-msgstr "repo_icon \"repo/icons/%s\" nu există, se generează un înlocuitor."
-
-#: ../fdroidserver/common.py
-msgid "repo_url needs to end with /repo"
-msgstr "repo_url trebuie să se termine cu /repo"
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "rsync is missing or broken: {error}"
-msgstr "rsync lipsește sau este nefuncțional: {error}"
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "s3cmd sync indexes {path} to {url} and delete"
-msgstr "s3cmd sincronizează indexurile {path} cu {url} și șterge"
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "s3cmd syncs indexes from {path} to {url} and deletes removed"
-msgstr "s3cmd sincronizează indexurile {path} cu {url} și le șterge pe cele eliminate"
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "scanner cache is malformed! You can clear it with: '{clear}'"
-msgstr "cache-ul scanerului este deformat! Puteți să o ștergeți cu: '{clear}'"
-
-#: ../fdroidserver/deploy.py
-msgid "serverwebroot: path does not end with \"fdroid\", perhaps you meant one of these:"
-msgstr "serverwebroot: calea nu se termină cu \"fdroid\", poate că v-ați referit la una dintre acestea:"
-
-#: ../fdroidserver/scanner.py
-msgid "shared library"
-msgstr "bibliotecă partajată"
-
-#: /usr/lib/python3.11/argparse.py
-msgid "show this help message and exit"
-msgstr "arată acest mesaj de ajutor și iese"
-
-#: ../fdroidserver/signatures.py
-msgid "signed APK, either a file-path or HTTPS URL."
-msgstr "APK semnat, fie un file-path, fie un URL HTTPS."
-
-#: ../fdroidserver/common.py
-msgid "skip deploying full build logs: log content is empty"
-msgstr "săriți distribuirea jurnalelor complete de construcție: conținutul jurnalului este gol"
-
-#: ../fdroidserver/common.py
-msgid "skip deploying full build logs: not enabled in config"
-msgstr "săriți distribuirea jurnalelor complete de construcție: nu este activată în configurare"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "skipping source tarball: {path}"
-msgstr "săriți de la pachetul sursă: {path}"
-
-#: ../fdroidserver/lint.py
-msgid "srclibs missing name and/or @"
-msgstr "srclibs lipsește numele și/sau @"
-
-#: ../fdroidserver/scanner.py
-msgid "static library"
-msgstr "bibliotecă statică"
-
-#: ../fdroidserver/build.py
-#, python-brace-format
-msgid "supplied reference binary has allowed signer {signer}"
-msgstr "binare de referință furnizate au permis semnatarului {signer}"
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "the following arguments are required: %s"
-msgstr "sunt necesare următoarele argumente: %s"
-
-#: ../fdroidserver/install.py
-msgid "true"
-msgstr "adevărat"
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "unexpected option string: %s"
-msgstr "șir de opțiuni neașteptate: %s"
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "unknown parser %(parser_name)r (choices: %(choices)s)"
-msgstr "parser necunoscut %(parser_name)r (choices: %(choices)s)"
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "unrecognized arguments: %s"
-msgstr "argumente nerecunoscute: %s"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "unsafe permissions on '{config_file}' (should be 0600)!"
-msgstr "permisiuni nesigure pe '{config_file}' (ar trebui să fie 0600)!"
-
-#: ../fdroidserver/__main__.py /usr/lib/python3.11/argparse.py
-msgid "usage: "
-msgstr "utilizare: "
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "using Apache libcloud to sync with {url}"
-msgstr "folosind Apache libcloud pentru a se sincroniza cu {url}"
-
-#: ../fdroidserver/deploy.py
-msgid "virustotal.com is rate limiting, waiting to retry..."
-msgstr "virustotal.com limitează rata, așteptând o nouă încercare..."
-
-#: ../fdroidserver/install.py
-msgid "yes"
-msgstr "da"
-
-#: ../fdroidserver/publish.py
-#, python-brace-format
-msgid "{0} app, {1} key aliases"
-msgid_plural "{0} apps, {1} key aliases"
-msgstr[0] "{0} aplicație, {1} aliasuri de chei"
-msgstr[1] "{0} aplicații, {1} aliasuri de chei"
-msgstr[2] "{0} aplicații, {1} aliasuri de chei"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{apkfilename} ({appid}) has no metadata!"
-msgstr "{apkfilename} ({appid}) nu are metadate!"
-
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{apkfilename}'s AndroidManifest.xml has a bad date: "
-msgstr "AndroidManifest.xml al lui {apkfilename} are o dată greșită: "
-
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{appid} does not have a name! Using application ID instead."
-msgstr "{appid} nu are un nume! În schimb, utilizați ID-ul aplicației."
-
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{appid} from {path} is not a valid Android application ID!"
-msgstr "{appid} din {path} nu este un ID de aplicație Android valid!"
-
-#: ../fdroidserver/metadata.py ../fdroidserver/update.py
-#, python-brace-format
-msgid "{appid} from {path} is not a valid Java Package Name!"
-msgstr "{appid} din {path} nu este un nume de pachet Java valid!"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{appid} has both APKs and files: {files}"
-msgstr "{appid} are atât APK-uri, cât și fișiere: {files}"
-
-#: ../fdroidserver/mirror.py
-#, python-brace-format
-msgid "{appid} is missing {name}"
-msgstr "{appid} lipsește {name}"
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "{appid}: Unknown extlib {path} in build '{versionName}'"
-msgstr "{appid}: Extlib necunoscut {path} în build '{versionName}'"
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "{appid}: no builds specified, running on current source state"
-msgstr "{appid}: nu este specificată nicio construcție, rulează pe starea curentă a sursei"
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "{appid}: {field} must be a '{type}', but it is a '{fieldtype}!'"
-msgstr "{appid}: {field} trebuie să fie un \"{type}\", dar este un \"{fieldtype}!\""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "{appid}: {field} must be a '{type}', but it is a '{fieldtype}'!"
-msgstr "{appid}: {field} trebuie să fie un '{type}', dar este un '{fieldtype}'!"
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "{build_flag} must be an integer, found: {value}"
-msgstr "{build_flag} trebuie să fie un număr întreg, găsit: {value}"
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "{build_flag} must be list or string, found: {value}"
-msgstr "{build_flag} trebuie să fie un număr întreg, găsit: {value}"
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "{file} is blank or corrupt!"
-msgstr "{file} este gol sau corupt!"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{name} \"{section}/icons/{path}\" does not exist! Check \"config.yml\"."
-msgstr "{name} \"{section}/icons/{path}\" nu există! Verificați \"config.yml\"."
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{path1} is a duplicate of {path2}, remove one!"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
-#, python-brace-format
-msgid "{path} already exists, ignoring import results!"
-msgstr "{path} există deja, ignorând rezultatele importului!"
-
-#: ../fdroidserver/nightly.py
-#, python-brace-format
-msgid "{path} does not exist!  Create it by running:"
-msgstr "{path} nu există!   Creați-l prin rularea:"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{path} has bad file signature \"{pattern}\", possible Janus exploit!"
-msgstr "{path} are o semnătură proastă a fișierului \"{pattern}\", posibil exploit Janus!"
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "{path} has been flagged by virustotal {count} times:"
-msgstr "{path} a fost marcat de virustotal de {count} ori:"
-
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "{path} has the wrong fingerprint ({fingerprint})!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "{path} is not \"key: value\" dict, but a {datatype}!"
-msgstr "{path} nu este de tip \"key: value\", ci {datatype}!"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "{path} is not a standard config file!"
-msgstr "{path} nu este un fișier de configurare standard!"
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "{path} is not list, but a {datatype}!"
-msgstr "{path} nu este o listă, ci {datatype}!"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "{path} is not {expected_type}, but a {datatype}!"
-msgstr "{path} nu este {expected_type}, ci {datatype}!"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{path} is zero size!"
-msgstr "{path} este de dimensiune zero!"
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "{path} more than 200MB, manually upload: {url}"
-msgstr "{path} mai mult de 200MB, încărcați manual: {url}"
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "{path}: \"{code}\" is not a valid ISO_3166-1 alpha-2 country code!"
-msgstr "{path}: \"{code}\" nu este un cod de țară valid conform ISO_3166-1 alpha-2!"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{path}: {error}"
-msgstr "{path}: {error}"
-
-#: ../fdroidserver/mirror.py
-#, python-brace-format
-msgid "{url} does not end with \"fdroid\", check the URL path!"
-msgstr "{url} nu se termină cu \"fdroid\", verificați calea URL!"
-
-#: ../fdroidserver/import_subcommand.py
-#, python-brace-format
-msgid "{url} does not start with \"http\"!"
-msgstr "{url} nu începe cu \"http\"!"
-
-#: ../fdroidserver/build.py
-msgid "{} build failed"
-msgid_plural "{} builds failed"
-msgstr[0] "{} construcția a eșuat"
-msgstr[1] "{} a eșuat"
-msgstr[2] "{} a eșuat"
-
-#: ../fdroidserver/build.py
-msgid "{} build succeeded"
-msgid_plural "{} builds succeeded"
-msgstr[0] "{} a reușit să construiască"
-msgstr[1] "{} construite cu succes"
-msgstr[2] "{} construite cu succes"
diff --git a/locale/ru/LC_MESSAGES/fdroidserver.po b/locale/ru/LC_MESSAGES/fdroidserver.po
index bd4aa6f5..341611d3 100644
--- a/locale/ru/LC_MESSAGES/fdroidserver.po
+++ b/locale/ru/LC_MESSAGES/fdroidserver.po
@@ -1,44 +1,54 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# Golubev Alexander <fatzer2@gmail.com>, 2020, 2021, 2024, 2025.
+# Golubev Alexander <fatzer2@gmail.com>, 2020.
 # Mingun <Alexander_Sergey@mail.ru>, 2020.
 # anonymous <noreply@weblate.org>, 2020.
-# Andrey <andrey@mailbox.org>, 2020, 2021, 2022, 2023, 2025.
+# Andrey <andrey@mailbox.org>, 2020.
 # gardenapple <gardenapple@posteo.net>, 2020.
 # Boris Timofeev <mashin87@gmail.com>, 2020.
 # Hans-Christoph Steiner <hans@guardianproject.info>, 2020.
 # Roman <WT_Roma@mail.ru>, 2020.
-# S3aBreeze <paperwork@evilcorp.ltd>, 2021.
-# Чтабс <chtabs2k19@gmail.com>, 2021.
-# Andrei Stepanov <adem4ik@gmail.com>, 2022.
-# Макар Разин <makarrazin14@gmail.com>, 2023.
-# Alexander Ivanov <saiv46.dev@gmail.com>, 2024.
-# gfbdrgng <hnaofegnp@hldrive.com>, 2024.
-# neverender <audiolunaire@getgoogleoff.me>, 2024.
-# Dmitry <dmitrydmitry761@gmail.com>, 2024.
-# Artyom Rybakov <rib.artem@gmail.com>, 2025.
 msgid ""
 msgstr ""
 "Project-Id-Version: fdroidserver 1.0.0-95-gd7af22b\n"
 "Report-Msgid-Bugs-To: https://gitlab.com/fdroid/fdroidserver/issues\n"
-"POT-Creation-Date: 2025-06-25 09:52+0200\n"
-"PO-Revision-Date: 2025-06-24 10:15+0000\n"
-"Last-Translator: Artyom Rybakov <rib.artem@gmail.com>\n"
+"POT-Creation-Date: 2020-10-21 18:05+0200\n"
+"PO-Revision-Date: 2020-11-18 17:28+0000\n"
+"Last-Translator: Roman <WT_Roma@mail.ru>\n"
 "Language-Team: Russian <https://hosted.weblate.org/projects/f-droid/fdroidserver/ru/>\n"
 "Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-"X-Generator: Weblate 5.13-dev\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"X-Generator: Weblate 4.4-dev\n"
+
+#: ../fdroidserver/common.py
+msgid ""
+"\n"
+"        This is a repository of apps to be used with FDroid. Applications in this\n"
+"        repository are either official binaries built by the original application\n"
+"        developers, or are binaries built from source by f-droid.org using the\n"
+"        tools on https://gitlab.com/fdroid.\n"
+"        "
+msgstr ""
 
 #: ../fdroidserver/nightly.py
 msgid ""
 "\n"
+"SSH Public Key to be used as Deploy Key:"
+msgstr ""
+"\n"
+"Использовать публичный SSH ключ как ключ для развертывания (Deploy Key):"
+
+#: ../fdroidserver/nightly.py
+#, fuzzy
+msgid ""
+"\n"
 "SSH public key to be used as deploy key:"
 msgstr ""
 "\n"
-"Открытый SSH-ключ, который будет использоваться в качестве ключа развертывания (Deploy Key):"
+"Использовать публичный SSH ключ как ключ для развертывания (Deploy Key):"
 
 #: ../fdroidserver/nightly.py
 #, python-brace-format
@@ -47,33 +57,29 @@ msgid ""
 "{path} encoded for the DEBUG_KEYSTORE secret variable:"
 msgstr ""
 "\n"
-"{path} закодирован в скрытую переменную DEBUG_KEYSTORE:"
+"зашифрованный путь {path}, который будет присвоен скрытой переменной DEBUG_KEYSTORE:"
 
 #: ../fdroidserver/lint.py
 #, python-format
 msgid "\"%s/\" has no matching metadata file!"
 msgstr "У \"%s/\" нет соответствующего файла метаданных!"
 
-#: ../fdroidserver/index.py
-msgid "\"isPrimary\" key should not be added to mirrors!"
-msgstr "Ключ \"IsPrimary\" не следует добавлять в зеркала!"
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "\"local_copy_dir\" {path} does not exist!"
-msgstr "\"local_copy_dir\" {path} не существует!"
-
 #: ../fdroidserver/install.py
-#, python-brace-format
+#, fuzzy, python-brace-format
 msgid "\"{apkfilename}\" is already installed on {dev}."
 msgstr "'{apkfilename}' уже установлен на {dev}."
 
+#: ../fdroidserver/update.py
+#, python-brace-format
+msgid "\"{path}\" contains outdated {name} ({version})"
+msgstr "В пути \"{path}\" устаревшие имя {name} или версия {version} пакета"
+
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "\"{path}\" contains recent {name} ({version})"
 msgstr "в пути \"{path}\" последние имя {name} и версия {version} пакета"
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "\"{path}\" exists but s3cmd is not installed!"
 msgstr "путь \"{path}\" существует, но s3cmd клиент не установлен!"
@@ -83,84 +89,120 @@ msgstr "путь \"{path}\" существует, но s3cmd клиент не 
 msgid "\"{path}\" is not a supported file format (use: metadata/*.yml)"
 msgstr "\"{path}\" не поддерживаемый формат файла (используйте: metadata/*.yml)"
 
-#: ../fdroidserver/update.py
+#: ../fdroidserver/metadata.py
 #, python-brace-format
-msgid "\"{path}\" is signed by a key that is not allowed:"
-msgstr "\"{path}\" подписан ключом, который не разрешен:"
+msgid "\"{path}\" is not an accepted format, convert to: {formats}"
+msgstr "формат пути \"{path}\" не принимается, преобразуйте в другой доступный: {formats}"
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/common.py
 #, python-brace-format
 msgid "\"{url}\" is not a valid URL!"
-msgstr "\"{url}\" — не корректный URL!"
+msgstr "\"{url}\" не действительный URL!"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, python-format
+msgid "%(option)s option requires %(number)d argument"
+msgid_plural "%(option)s option requires %(number)d arguments"
+msgstr[0] "Параметр %(option)s требует %(number)d аргумент"
+msgstr[1] "Параметр %(option)s требует %(number)d аргумента"
+msgstr[2] "Параметр %(option)s требует %(number)d аргументов"
+
+#: ../fdroidserver/mirror.py
+#, python-format
+msgid "%(prog)s [options] url"
+msgstr "%(prog)s [параметры] URL"
+
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "%(prog)s: error: %(message)s\n"
 msgstr "%(prog)s: ошибка: %(message)s\n"
 
-#: ../fdroidserver/publish.py
-#, python-format
-msgid "%d APKs failed to be signed or verified!"
-msgstr "%d APK не удалось подписать или проверить!"
-
 #: ../fdroidserver/scanner.py
 #, python-format
 msgid "%d problems found"
-msgstr "%d ошибок найдено"
+msgstr "найдено %d ошибок"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "%prog [options]"
+msgstr "%prog [параметры]"
+
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "%r is not callable"
 msgstr "к %r нельзя обратиться"
 
-#: ../fdroidserver/signindex.py
-#, python-format
-msgid "%s did not produce a dict!"
-msgstr "%s не создает dict!"
-
-#: ../fdroidserver/signindex.py
-#, python-format
-msgid "%s has bad SHA-256: %s"
-msgstr "%s имеет неверный SHA-256: %s"
-
 #: ../fdroidserver/lint.py
 #, python-format
 msgid "%s is not an accepted build field"
 msgstr "%s не является допустимым полем"
 
-#: ../fdroidserver/common.py
-msgid "'keypass' not found in config.yml!"
-msgstr "В config.yml нет переменной 'keypass'!"
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, python-format
+msgid "%s option does not take a value"
+msgstr "%s параметр не принимает значений"
+
+#: ../fdroidserver/index.py ../fdroidserver/common.py
+msgid "'keypass' not found in config.py!"
+msgstr "В config.py нет переменной 'keypass'!"
 
 #: ../fdroidserver/common.py
 msgid "'keystore' is NONE and 'smartcardoptions' is blank!"
-msgstr "Значение 'keystore` — NONE, но 'smartcardoptions' не задан!"
+msgstr ""
 
-#: ../fdroidserver/common.py
-msgid "'keystore' not found in config.yml!"
-msgstr "'keystore' не найден в config.yml!"
+#: ../fdroidserver/index.py ../fdroidserver/common.py
+msgid "'keystore' not found in config.py!"
+msgstr "В config.py нет переменной 'keystore'!"
 
-#: ../fdroidserver/common.py
-msgid "'keystorepass' not found in config.yml!"
-msgstr "'keystorepass' не найден в config.yml!"
+#: ../fdroidserver/index.py ../fdroidserver/common.py
+msgid "'keystorepass' not found in config.py!"
+msgstr "В config.py нет переменной 'keystorepass'!"
 
-#: ../fdroidserver/common.py
-msgid "'repo_keyalias' not found in config.yml!"
-msgstr "'repo_keyalias' не найден в config.yml!"
+#: ../fdroidserver/index.py ../fdroidserver/common.py
+msgid "'repo_keyalias' not found in config.py!"
+msgstr "В config.py нет переменной 'repo_ keyalias'!"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "'required' is an invalid argument for positionals"
 msgstr "'required' не годится в качестве позиционного аргумента"
 
 #: ../fdroidserver/common.py
-msgid "'sdk_path' not set in config.yml!"
-msgstr "'sdk_path' не найден в config.yml!"
+msgid "'sdk_path' not set in 'config.py'!"
+msgstr "В config.py не определен 'sdk_path'!"
+
+#. Translators: "build-tools" is the file name of a package from
+#. Google, it is part of the Android SDK. So it probably shouldn't be
+#. translated or transliterated.
+#: ../fdroidserver/common.py
+#, python-brace-format
+msgid "'{aapt}' is too old, fdroid requires build-tools-23.0.0 or newer!"
+msgstr "{aapt} — устаревшая версия, F-droid нужна версия build-tools-23.0.0 или более поздняя!"
 
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "'{aapt}' is too old, fdroid requires build-tools-{version} or newer!"
 msgstr "{aapt} — устаревшая версия, F-droid нужна версия build-tools-{version} или более поздняя!"
 
+#: ../fdroidserver/install.py
+#, python-brace-format
+msgid "'{apkfilename}' is already installed on {dev}."
+msgstr "'{apkfilename}' уже установлен на {dev}."
+
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "'{field}' in {linedesc} is obsolete, see docs for current fields:"
+msgstr "Поле '{field}' в {linedesc} устарело, смотрите список полей достпных на данный момент в документации:"
+
+#: ../fdroidserver/common.py
+#, python-brace-format
+msgid "'{field}' will be in random order! Use () or [] brackets if order is important!"
+msgstr "'{field}' добавлено в произвольном порядке! Если порядок важен, используйте скобки () и []!"
+
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "'{path}' failed to execute!"
@@ -168,32 +210,23 @@ msgstr "{path} не удалось исполнить!"
 
 #: ../fdroidserver/metadata.py
 #, python-brace-format
-msgid "'{path}' has invalid format, it should be a dictionary!"
-msgstr "'{path}' имеет недопустимый формат, это должен быть словарь!"
-
-#: ../fdroidserver/lint.py ../fdroidserver/metadata.py
-#, python-brace-format
 msgid "'{value}' is not a valid {field} in {appid}. Regex pattern: {pattern}"
 msgstr "'{value}' не подходит в качестве {field} в {appid}. Образец регулярного выражения: {pattern}"
 
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "'{value}' is not a valid {field}, should be {pattern}"
-msgstr "'{value}' не является допустимым {field}, должно быть {pattern}"
-
-#: ../fdroidserver/checkupdates.py
-msgid "--merge-request only runs on a single appid!"
-msgstr "--merge-request работает только с одним appid!"
-
 #: ../fdroidserver/checkupdates.py
 #, python-brace-format
 msgid "...checkupdate failed for {appid} : {error}"
 msgstr "...checkupdate для {appid} завершился ошибкой: {error}"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid ".__call__() not defined"
 msgstr ".__call__() не определен"
 
+#: ../fdroidserver/metadata.py
+msgid ".fdroid.txt is not supported!  Convert to .fdroid.yml or .fdroid.json."
+msgstr ".fdroid.txt не поддерживается!   Поменяйте на .fdroid.yml или .fdroid.json."
+
 #: ../fdroidserver/lint.py
 msgid "/issues is missing"
 msgstr "Не хватает /issues"
@@ -202,22 +235,21 @@ msgstr "Не хватает /issues"
 msgid "A URL is required as an argument!"
 msgstr "В качестве аргумента нужен URL-адрес!"
 
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "APK signatures have different certificates in {path}:"
-msgstr "Подписи APK имеют различные сертификаты в {path}:"
-
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Add PGP signatures using GnuPG for packages in repo"
 msgstr "Добавить PGP подписи для пакетов в репозитории с помощью GnuPG"
 
+#: ../fdroid ../fdroidserver/__main__.py
+msgid "Add a new application from its source code"
+msgstr "Добавить новое приложение из исходного кода"
+
 #: ../fdroidserver/update.py
 msgid "Add a repo signing key to an unsigned repo"
-msgstr "Добавлять ключ для подписи в неподписанный репозиторий"
+msgstr "Добавить ключ для подписи в неподписанный репозиторий"
 
 #: ../fdroidserver/update.py
 msgid "Add skeleton metadata files for APKs that are missing them"
-msgstr "Добавлять основные файлы метаданных в APK, если они там отсутствуют"
+msgstr "Добавить основные отсутствующие файлы метаданных для нуждающихся в них APK"
 
 #: ../fdroidserver/update.py
 #, python-brace-format
@@ -228,17 +260,13 @@ msgstr "Добавление нового репозитория только д
 msgid "Alias of the repo signing key in the keystore"
 msgstr "Алиас для ключа для подписи репозитория в хранилище ключей"
 
-#: ../fdroidserver/build.py
-msgid "AllowedAPKSigningKeys missing but reference binary supplied"
-msgstr "AllowedAPKSigningKeys отсутствует, но предоставлен эталонный двоичный файл"
-
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "Allows a different revision (or git branch) to be specified for the initial import"
 msgstr "Позволяет выбрать разные ревизии или ветки для первичного импорта"
 
 #: ../fdroidserver/mirror.py
 msgid "Also mirror the full archive section"
-msgstr "Дополнительно создавать полную копию раздела архива"
+msgstr "Дополнительно создать полную копию раздела архива"
 
 #: ../fdroidserver/lint.py
 msgid "Also warn about formatting issues, like rewritemeta -l"
@@ -246,20 +274,24 @@ msgstr "Дополнительно предупреждать о нарушен
 
 #: ../fdroidserver/scanner.py
 msgid "Android AAR library"
-msgstr "AAR-библиотека Android"
+msgstr ""
 
 #: ../fdroidserver/scanner.py
 msgid "Android APK file"
-msgstr "APK-файл Android"
+msgstr ""
 
 #: ../fdroidserver/scanner.py
 msgid "Android DEX code"
-msgstr "DEX-код Android"
+msgstr "Android DEX код"
 
-#: ../fdroidserver/init.py
+#: ../fdroidserver/common.py ../fdroidserver/build.py
 #, python-brace-format
-msgid "Android SDK not found at {path}!"
-msgstr "Android SDK не обнаружен в {path}!"
+msgid "Android SDK '{path}' does not have '{dirname}' installed!"
+msgstr "В установленной Android SDK '{path}' нет '{dirname}'!"
+
+#: ../fdroidserver/common.py
+msgid "Android SDK not found!"
+msgstr "Android SDK не обнаружен!"
 
 #: ../fdroidserver/common.py
 #, python-brace-format
@@ -271,28 +303,23 @@ msgstr "Android SDK '{path}' нет в переменных окружения!"
 msgid "Android SDK path '{path}' is not a directory!"
 msgstr "Путь Android SDK '{path}' указывает не на директорию!"
 
+#. Translators: "build-tools" is the file name of a package from
+#. Google, it is part of the Android SDK. So it probably shouldn't be
+#. translated or transliterated.
 #: ../fdroidserver/common.py
 #, python-brace-format
-msgid "Android SDK tool {cmd} not found!"
-msgstr "Инструмент Android SDK {cmd} не найден!"
+msgid "Android build-tools path '{path}' does not exist!"
+msgstr "Директория с Android build-tools '{path}' не обнаружена!"
 
-#: ../fdroidserver/lint.py
-msgid "App has Binaries but does not have corresponding AllowedAPKSigningKeys to pin certificate."
-msgstr "У приложения задано поле Binaries, но не указано AllowedAPKSigningKeys, что необходимо, чтобы ограничить ключи подписи."
-
-#: ../fdroidserver/lint.py
-msgid "App has NoSourceSince or ArchivePolicy \"0 versions\" or 0 but AutoUpdateMode or UpdateCheckMode are not None"
-msgstr "У приложения задано поле NoSourceSince, или поле ArchivePolicy равно \"0 versions\" или \"0\", но AutoUpdateMode или UpdateCheckMode не равны None"
+#: ../fdroidserver/update.py
+msgid "AndroidManifest.xml has no date"
+msgstr "В AndroidManifest.xml нет даты"
 
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "App is in '{repo}' but has a link to {url}"
 msgstr "Приложение находится в репозитории '{repo}', но ссылка указывает на {url}"
 
-#: ../fdroidserver/lint.py
-msgid "App version has binary but does not have corresponding AllowedAPKSigningKeys to pin certificate."
-msgstr "Версия приложения имеет двоичный код, но не имеет соответствующего сертификата AllowedAPKSigningKeys для закрепления."
-
 #: ../fdroidserver/lint.py
 msgid "Appending .git is not necessary"
 msgstr "Добавлять .git необязательно"
@@ -302,27 +329,11 @@ msgstr "Добавлять .git необязательно"
 msgid "Archiving {apkfilename} with invalid signature!"
 msgstr "Вы пытаетесь поместить в архив {apkfilename} с недопустимой подписью!"
 
-#: ../fdroidserver/lint.py
-msgid "AutoUpdateMode with UpdateCheckMode: HTTP must have a pattern."
-msgstr "AutoUpdateMode с UpdateCheckMode: HTTP должен иметь шаблон."
-
-#: ../fdroidserver/install.py
-msgid "Automatic no to all prompts."
-msgstr "Автоматически отвечать \"нет\" на все запросы."
-
-#: ../fdroidserver/install.py
-msgid "Automatic yes to all prompts."
-msgstr "Автоматически отвечать \"да\" на все запросы."
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "Bad entry type \"{mirrortype}\" in mirrors config: {mirror}"
-msgstr "Неверный тип записи \"{mirrortype}\" в конфигурации зеркал: {mirror}"
-
 #: ../fdroidserver/mirror.py
 msgid "Base URL to mirror, can include the index signing key using the query string: ?fingerprint="
 msgstr "Основной URL-адрес зеркала может содержать ключ для подписывания индекса (добавьте запрос \"?fingerprint=\")"
 
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "Branch '{branch}' used as commit in build '{versionName}'"
@@ -338,7 +349,7 @@ msgstr "Ветка '{branch}' вошла в библиотеку '{srclib}' ка
 msgid "Broken symlink: {path}"
 msgstr "Неработающая символическая ссылка: {path}"
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Build a package from source"
 msgstr "Собрать пакет из исходников"
 
@@ -358,15 +369,16 @@ msgstr "В репозитории с метаданными билдов ест
 msgid "Build only the latest version of each package"
 msgstr "Запустить сборку только последней версии для каждого пакета"
 
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Build should have comma-separated versionName and versionCode, not \"{value}\", in {linedesc}"
+msgstr "Для сборки необходимо разделять versionName и versionCode запятой. Вы указали \"{value}\" в строке {linedesc}"
+
 #: ../fdroidserver/init.py
 #, python-format
 msgid "Built repo based in \"%s\" with this config:"
 msgstr "Репозиторий создан в \"%s\", основываясь на конфигурации:"
 
-#: ../fdroidserver/checkupdates.py
-msgid "Can't auto-update app with no CurrentVersionCode"
-msgstr "Невозможно автоматически обновить приложение без CurrentVersionCode"
-
 #: ../fdroidserver/build.py
 msgid "Can't build due to {} error while scanning"
 msgid_plural "Can't build due to {} errors while scanning"
@@ -374,33 +386,41 @@ msgstr[0] "Запустить сборку невозможно из-за {} о
 msgstr[1] "Запустить сборку невозможно из-за {} ошибок во время сканирования данных"
 msgstr[2] "Запустить сборку невозможно из-за {} ошибок во время сканирования данных"
 
-#: ../fdroidserver/common.py
+#: ../fdroidserver/vmtools.py
+#, python-brace-format
+msgid "Cannot read \"{path}\"!"
+msgstr "Неправильно указан путь \"{path}\"!"
+
+#. Translators: https://developer.android.com/studio/build/application-id
+#: ../fdroidserver/metadata.py
 #, fuzzy, python-brace-format
-msgid "Cannot read {path}: {error}"
-msgstr "Не удалось распознать {path}: {error}"
+msgid "Cannot resolve application ID {appid}"
+msgstr "Не удалось разобрать app id {appid}"
 
 #: ../fdroidserver/rewritemeta.py
 #, python-brace-format
 msgid "Cannot rewrite \"{path}\""
 msgstr "Невозможно переписать \"{path}\""
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
+#: ../fdroidserver/rewritemeta.py
+msgid "Cannot use --list and --to at the same time"
+msgstr "Опции --list и --to нельзя использовать одновременно"
+
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Cannot write \"{path}\", not an accepted format, use: {formats}"
+msgstr "Указанный формат \"{path}\" не годится для записи, укажите правильный: {formats}"
+
 #: ../fdroidserver/lint.py
 #, python-format
 msgid "Categories '%s' is not valid"
 msgstr "Неправильные категории: '%s'"
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
 #: ../fdroidserver/lint.py
 msgid "Categories are not set"
 msgstr "Категории не выбраны"
 
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "Category \"{category}\" defined but not used for any apps!"
-msgstr "Категория \"{category}\" определена, но не используется ни для одного приложения!"
-
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Check for updates to applications"
 msgstr "Проверить обновления для приложений"
 
@@ -409,52 +429,49 @@ msgstr "Проверить обновления для приложений"
 msgid "Checking archiving for {appid} - apks:{integer}, keepversions:{keep}, archapks:{arch}"
 msgstr "Проверка перед помещением в архив для {appid}. apks:{integer}, keepversions:{keep}, archapks:{arch}"
 
+#: ../fdroidserver/dscanner.py
+msgid "Clean after all scans have finished"
+msgstr "Очистить после завершения сканирования"
+
+#: ../fdroidserver/dscanner.py
+msgid "Clean before the scans start and rebuild the container"
+msgstr "Очистить до начала сканирования и пересоздать контейнер"
+
+#: ../fdroidserver/dscanner.py
+msgid "Clean up all containers and then exit"
+msgstr "Очистить все контейнеры и выйти"
+
 #: ../fdroidserver/update.py
 msgid "Clean update - don't uses caches, reprocess all APKs"
 msgstr "Очистка с обновлением: не использовать кэш, повторно сгенерировать все APK"
 
-#: ../fdroidserver/common.py
-msgid "Color the log output"
-msgstr "Раскрашивать сообщения журнала при выводе"
-
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "Comma separated list of categories."
 msgstr "Категории перечислены через запятую."
 
-#: ../fdroidserver/__main__.py
-#, python-format
+#: ../fdroid ../fdroidserver/__main__.py
+#, c-format, python-format
 msgid "Command '%s' not recognised.\n"
 msgstr "Команда '%s' не распознана.\n"
 
 #: ../fdroidserver/checkupdates.py
 msgid "Commit changes"
-msgstr "Зафиксировать изменения (commit)"
-
-#: ../fdroidserver/checkupdates.py
-msgid "Commit changes, push, then make a merge request"
-msgstr "Зафиксировать изменения (commit), отправить (push) их в удаленный репозиторий, и затем создать запрос на слияние"
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Conflicting \"{field}\" definitions between .yml and localized files:"
-msgstr "Конфликтующие определения \"{field}\" между .yml и локализованными файлами:"
+msgstr "Сохранить изменения (commit)"
 
 #: ../fdroidserver/__main__.py
 msgid "Conflicting arguments: '--verbose' and '--quiet' can not be specified at the same time."
-msgstr "Несовместимые аргументы: '--verbose' и '--quiet' нельзя указывать одновременно."
+msgstr "Противоречивые аргументы: '--verbose' и '--quiet' нельзя указывать одновременно."
 
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "Could not find '{command}' on your system"
 msgstr "В вашей системе недоступна команда '{command}'"
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "Could not find latest version code"
 msgstr "Не удалось найти последнюю версию приложения (versionCode)"
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "Could not find latest version name"
 msgstr "Не удалось найти название последней версии"
 
@@ -464,25 +481,30 @@ msgid "Could not find {path} to remove it"
 msgstr "Указанный для удаления {path} не найден"
 
 #: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Could not open APK {path} for analysis: "
-msgstr "Не удалось открыть и проанализировать файл APK {path}: "
+msgid "Could not open apk file for analysis"
+msgstr "Не удалось открыть и проанализировать файл APK"
 
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "Could not parse size \"{size}\", wrong type \"{type}\""
-msgstr "Не удалось разобрать размер «{size}», неверный тип «{type}»"
+msgstr ""
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/import_subcommand.py
+#. Translators: https://developer.android.com/studio/build/application-id
+#: ../fdroidserver/import.py
 msgid "Couldn't find Application ID"
 msgstr "Не удалось найти Application ID"
 
-#: ../fdroidserver/checkupdates.py
-msgid "Couldn't find any version information"
-msgstr "Не удалось найти никакой информации о версии"
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
+#: ../fdroidserver/import.py
+msgid "Couldn't find latest version code"
+msgstr "Не удалось найти внутреннюю версию приложения (versionCode)"
 
-#: ../fdroidserver/checkupdates.py
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
+#: ../fdroidserver/import.py
+msgid "Couldn't find latest version name"
+msgstr "Не удалось найти публичную версию приложения (versionName)"
+
+#: ../fdroidserver/import.py
 msgid "Couldn't find package ID"
 msgstr "Не удалось найти package ID"
 
@@ -490,26 +512,29 @@ msgstr "Не удалось найти package ID"
 msgid "Cowardily refusing to overwrite existing signing key setup!"
 msgstr "Менять текущий ключ для подписывания как-то боязно. Пожалуй, не станем!"
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/update.py
+msgid "Create a repo signing key in a keystore"
+msgstr "Создать ключ для подписывания репозитория"
+
+#: ../fdroidserver/update.py
+msgid "Create skeleton metadata files that are missing"
+msgstr "Создать отсутствующие основные метаданные"
+
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Created new container \"{name}\""
 msgstr "Новый контейнер \"{name}\" создан"
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Creating \"{path}\" for configuring s3cmd."
 msgstr "Создание \"{path}\" для конфигурации s3cmd."
 
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Creating empty {config_file}"
-msgstr "Создание пустого '{config_file}'"
-
 #: ../fdroidserver/publish.py
 msgid "Creating log directory"
 msgstr "Создание директории для хранения логов"
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Creating new S3 bucket: {url}"
 msgstr "Создание нового S3 bucket: {url}"
@@ -522,7 +547,8 @@ msgstr "Создание директории для выходных данны
 msgid "Creating signed index with this key (SHA256):"
 msgstr "Подписывание индекса ключом (SHA256):"
 
-#: ../fdroidserver/publish.py ../fdroidserver/verify.py
+#: ../fdroidserver/import.py ../fdroidserver/verify.py
+#: ../fdroidserver/publish.py
 msgid "Creating temporary directory"
 msgstr "Создание директории для хранения временных файлов"
 
@@ -541,17 +567,17 @@ msgstr "Переменная DEBUG_KEYSTORE пустая или заполнен
 
 #: ../fdroidserver/update.py
 msgid "Delete APKs and/or OBBs without metadata from the repo"
-msgstr "Удалить APK и/или OBB без метаданных из репозитория"
+msgstr "Удалить из репозитория APK и/или OBB файлы без метаданных"
 
 #: ../fdroidserver/deploy.py
 #, python-brace-format
 msgid "Deleting archive, repo is too big ({size} max {limit})"
-msgstr "Удаление архива, репозиторий слишком большой ({size}, максиммум {limit})"
+msgstr ""
 
 #: ../fdroidserver/deploy.py
 #, python-brace-format
 msgid "Deleting git-mirror history, repo is too big ({size} max {limit})"
-msgstr "Удаление истории git-зеркала, репозиторий слишком большой ({size}, максиммум {limit})"
+msgstr ""
 
 #: ../fdroidserver/update.py
 #, python-brace-format
@@ -567,24 +593,19 @@ msgstr "Описание '%s' копирует краткий обзор при
 msgid "Description has a duplicate line"
 msgstr "В описании встречаются одинаковые строки"
 
+#: ../fdroidserver/lint.py
+#, python-format
+msgid "Description has a list (%s) but it isn't bulleted (*) nor numbered (#)"
+msgstr "В описании есть неразмеченный список (%s). Воспользуйтесь (*) для ненумерованного списка и (#) для нумерованного"
+
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "Description of length {length} is over the {limit} char limit"
 msgstr "Описание {length} превышает лимит по количеству знаков {limit}"
 
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Did you mean config/{name}.yml?"
-msgstr "Вы имели в виду config/{name}.yml?"
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Did you mean {code}?"
-msgstr "Вы имели в виду {code}?"
-
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "Do not add 'disable:' to the generated build entries"
-msgstr "Не добавлять 'disable:' к сгенерированным данным сборки"
+msgstr ""
 
 #: ../fdroidserver/nightly.py
 msgid "Do not deploy the new files to the repo"
@@ -607,22 +628,27 @@ msgstr "Не удалять сгенерированные приватные к
 msgid "Don't create a source tarball, useful when testing a build"
 msgstr "Не создавать архив с исходниками. Ускоряет тестовые сборки"
 
+#: ../fdroidserver/stats.py
+msgid "Don't do anything logs-related"
+msgstr "Не писать никаких логов"
+
 #: ../fdroidserver/build.py
 msgid "Don't refresh the repository, useful when testing a build with no internet connection"
 msgstr "Не обновлять репозиторий. Упрощает тестовые сборки при отсутствии интернета"
 
 #: ../fdroidserver/deploy.py ../fdroidserver/nightly.py
+#: ../fdroidserver/upload.py
 msgid "Don't use rsync checksums"
 msgstr "Не использовать контрольные суммы rsync"
 
-#: ../fdroidserver/install.py
-msgid "Download F-Droid.apk using mirrors that leak less to the network"
-msgstr "Загружать F-Droid.apk с помощью тех зеркал, из которые в сеть утекает меньше данных"
-
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Download complete mirrors of small repos"
 msgstr "Полностью загружать зеркала для небольших репозиториев"
 
+#: ../fdroidserver/stats.py
+msgid "Download logs we don't have"
+msgstr "Загрузить отсутствующие логи"
+
 #: ../fdroidserver/common.py
 msgid "Downloading the repository already failed once, not trying again."
 msgstr "Репозиторий не удалось склонировать с первой попытки."
@@ -634,61 +660,43 @@ msgstr "Загрузить {url} не получилось. {error}"
 
 #: ../fdroidserver/metadata.py
 #, python-brace-format
-msgid "Duplicate Anti-Feature declaration at {path} was ignored!"
-msgstr "Повторяющееся объявление Anti-Feature в {path} было проигнорировано!"
-
-#: ../fdroidserver/index.py
-#, python-format
-msgid "Duplicate entry \"%s\" in mirrors config!"
-msgstr "Дублирующаяся запись \"%s\" в конфигурации зеркал!"
+msgid "Duplicate build recipe found for versionCode {versionCode} in {linedesc}"
+msgstr "Обнаружена точная копия рецепта сборки для версии {versionCode} в {linedesc}"
 
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "Duplicate link in '{field}': {url}"
 msgstr "Точная копия ссылки в '{field}': {url}"
 
-#: ../fdroidserver/common.py
-#, python-format
-msgid "ERROR: %(message)s"
-msgstr "ОШИБКА: %(message)s"
+#: ../fdroid
+msgid "Dynamically scan APKs post build"
+msgstr "Сканировать APK файлы после сборки"
 
 #: ../fdroidserver/__main__.py
 msgid "ERROR: The \"server\" subcommand has been removed, use \"deploy\"!"
-msgstr "ОШИБКА: подкоманда \"server\" была удалена, используйте \"deploy\"!"
+msgstr ""
+
+#: ../fdroidserver/mirror.py
+msgid ""
+"ERROR: this command should never be used to mirror f-droid.org!\n"
+"A full mirror of f-droid.org requires more than 200GB."
+msgstr ""
+"ОШИБКА: эту команду ни в коем случае нельзя использовать для создания зеркала f-droid.org!\n"
+"Оно занимает больше 200 Гб."
 
 #: ../fdroidserver/nightly.py
 msgid "ERROR: unsupported CI type, patches welcome!"
 msgstr "ОШИБКА: этот тип CI не поддерживается, налаживайте и присылайте патчи!"
 
-#: ../fdroidserver/nightly.py
-#, python-format
-msgid "ERROR: unsupported git host \"%s\", patches welcome!"
-msgstr "ОШИБКА: неподдерживаемый хост git «%s», патчи приветствуются!"
-
-#: ../fdroidserver/lint.py
+#: ../fdroidserver/metadata.py
 #, python-brace-format
-msgid "ERROR: {key} in {path} is not \"archive\" or \"repo\"!"
-msgstr "ОШИБКА: {key} в {path} должен быть или \"archive\", или \"repo\"!"
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "ERROR: {key} not a valid key!"
-msgstr "ОШИБКА: {key} недействительный ключ!"
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "ERROR: {key}'s value should be of type {t}!"
-msgstr "ОШИБКА: значение {key} должно быть типа {t}!"
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "ERROR: {key}:{subkey} in {path} is not in allowed keys: {allowed_keys}!"
-msgstr "ОШИБКА: {key}:{subkey} в {path} не входит в список допустимых значений: {allowed_keys}!"
+msgid "Empty build flag at {linedesc}"
+msgstr "У флага сборки в {linedesc} нет значения"
 
 #: ../fdroidserver/__main__.py
 #, python-brace-format
 msgid "Encoding is set to '{enc}' fdroid might run into encoding issues. Please set it to 'UTF-8' for best results."
-msgstr "Задана кодировка '{enc}'. F-droid может испытывать сложности с кодировками. Пожалуйста, используйте 'UTF-8' во избежании ошибок."
+msgstr ""
 
 #: ../fdroidserver/init.py
 #, python-format
@@ -699,40 +707,20 @@ msgstr ""
 "Укажите путь к Android SDK (%s): \n"
 "> "
 
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Environment variable {var} from {configname} is not set!"
-msgstr "Переменная среды {var} из {configname} не установлена!"
+#: ../fdroidserver/deploy.py ../fdroidserver/checkupdates.py
+#: ../fdroidserver/upload.py
+#, python-format
+msgid "Error while attempting to publish log: %s"
+msgstr "Ошибка во время публикации лога: %s"
 
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Environment variable {{env: {var}}} is not set!"
-msgstr "Переменная среды {{env: {var}}} не установлена!"
-
-#: ../fdroidserver/deploy.py
-msgid "Error deploying 'github_releases', {} not present. (You might need to run `fdroid update` first.)"
-msgstr "Ошибка развертывания 'github_releases', {} отсутствует. (Возможно, сначала вам нужно запустить `fdroid update`.)"
-
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py ../fdroidserver/common.py
 msgid "Error while getting repo address"
 msgstr "Ошибка при получении адреса репозитория"
 
-#: ../fdroidserver/scanner.py
-msgid "Exit with a non-zero code if problems were found"
-msgstr "Выход с ненулевым кодом, если обнаружены проблемы"
-
-#: ../fdroidserver/__main__.py
-msgid "Extract application metadata from a source repository"
-msgstr "Извлекать метаданные приложения из исходного репозитория"
-
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Extract signatures from APKs"
 msgstr "Извлечь подписи из APK файлов"
 
-#: ../fdroidserver/install.py
-msgid "F-Droid.apk could not be downloaded from any known source!"
-msgstr "F-Droid.apk не может быть загружен ни из одного известного источника!"
-
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Failed copying {path}: {error}"
@@ -753,34 +741,42 @@ msgstr "Не удалось распознать {path}: {error}"
 msgid "Failed resizing {path}: {error}"
 msgstr "Не удалось изменить размер {path}: {error}"
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/publish.py
+msgid "Failed to align application"
+msgstr "Оптимизировать (align) приложение не удалось"
+
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Failed to create S3 bucket: {url}"
 msgstr "Создать S3 объект (S3 bucket) не получилось: {url}"
 
+#: ../fdroidserver/common.py
+msgid "Failed to get APK manifest information"
+msgstr "Извлечь информацию из APK манифеста не получилось"
+
 #: ../fdroidserver/update.py
 #, python-brace-format
-msgid "Failed to get APK information, deleting {path}"
+msgid "Failed to get apk information, deleting {path}"
 msgstr "Не удалось получить информацию об APK файле, {path} будет удален"
 
 #: ../fdroidserver/update.py
 #, python-brace-format
-msgid "Failed to get APK information, skipping {path}"
+msgid "Failed to get apk information, skipping {path}"
 msgstr "Не удалось получить информацию об APK файле, {path} будет пропущен"
 
-#: ../fdroidserver/update.py
-msgid "Failed to get APK signing key fingerprint"
-msgstr "Не удалось получить отпечаток ключа подписи APK"
-
 #: ../fdroidserver/install.py
 #, python-brace-format
 msgid "Failed to install '{apkfilename}' on {dev}: {error}"
 msgstr "Установить {apkfilename} на {dev} не получилось: {error}"
 
-#: ../fdroidserver/common.py
+#: ../fdroidserver/publish.py ../fdroidserver/common.py
 msgid "Failed to sign application"
 msgstr "Подписать приложение не удалось"
 
+#: ../fdroidserver/common.py
+msgid "Failed to zipalign application"
+msgstr "Оптимизировать (zipalign) приложение не удалось"
+
 #: ../fdroidserver/build.py
 #, python-brace-format
 msgid "Fetched buildserverid from VM: {buildserverid}"
@@ -796,12 +792,22 @@ msgstr "Получены подписи для '{apkfilename}' -> '{sigdir}'"
 msgid "File disappeared while processing it: {path}"
 msgstr "Файл исчез во время обработки: {path}"
 
-#: ../fdroidserver/build.py ../fdroidserver/install.py
-#: ../fdroidserver/rewritemeta.py ../fdroidserver/scanner.py
-#: ../fdroidserver/update.py
+#: ../fdroidserver/verify.py ../fdroidserver/stats.py ../fdroidserver/update.py
+#: ../fdroidserver/rewritemeta.py ../fdroidserver/build.py
+#: ../fdroidserver/checkupdates.py ../fdroidserver/scanner.py
+#: ../fdroidserver/install.py
 msgid "Finished"
 msgstr "Готово"
 
+#: ../fdroidserver/lint.py
+msgid "Flattr donation methods belong in the FlattrID flag"
+msgstr "Способы пожертвования с помощью Flattr определяются флагом FlattrID"
+
+#: ../fdroidserver/lint.py
+#, fuzzy
+msgid "Flattr donation methods belong in the FlattrID: field"
+msgstr "Способы пожертвования с помощью Flattr определяются флагом FlattrID"
+
 #: ../fdroidserver/lint.py
 msgid "Forbidden HTML tags"
 msgstr "Запрещенные теги HTML"
@@ -816,8 +822,9 @@ msgid "Force halting build after {0} sec timeout!"
 msgstr "Принудительно останавливать сборку, если тайм-аут больше {0} секунд!"
 
 #: ../fdroidserver/scanner.py
+#, fuzzy
 msgid "Force scan of disabled apps and builds."
-msgstr "Принудительно сканировать отключенные приложения и сборки."
+msgstr "Принудительное сканирование отключенных приложений и сборок."
 
 #: ../fdroidserver/update.py
 #, python-brace-format
@@ -825,7 +832,7 @@ msgid "Found \"{path}\" graphic without metadata for app \"{name}\"!"
 msgstr "В \"{path}\" обнаружены изображения без метаданных для приложения \"{name}\"!"
 
 #: ../fdroidserver/update.py
-#, python-brace-format
+#, fuzzy, python-brace-format
 msgid "Found bad funding file \"{path}\" for \"{name}\":"
 msgstr "Обнаружен неверный файл финансирования \"{path}\" для \"{name}\":"
 
@@ -833,18 +840,15 @@ msgstr "Обнаружен неверный файл финансировани
 msgid "Found invalid appids in arguments"
 msgstr "В аргументах обнаружены неправильные appid"
 
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
 #: ../fdroidserver/common.py
 msgid "Found invalid versionCodes for some apps"
 msgstr "Для некоторых приложений обнаружены неправильные номера внутренней версии (versionCode)"
 
 #: ../fdroidserver/common.py
-#, python-brace-format
+#, fuzzy, python-brace-format
 msgid "Found multiple JAR Signature Block Files in {path}"
-msgstr "В {path} обнаружено несколько сертификатов (JAR Signature Block File)"
-
-#: ../fdroidserver/common.py
-msgid "Found multiple Signer Certificates!"
-msgstr "Найдено несколько сертификатов подписи!"
+msgstr "В {path} обнаружено несколько сертификатов для подписывания"
 
 #: ../fdroidserver/metadata.py
 #, python-brace-format
@@ -855,6 +859,11 @@ msgstr "Для {appid} обнаружено несколько файлов ме
 msgid "Found multiple signing certificates for repository."
 msgstr "Для этого репозитория обнаружено несколько ключей для подписывания."
 
+#: ../fdroidserver/update.py
+#, python-brace-format
+msgid "Found multiple signing certificates in {path}"
+msgstr "В {path} обнаружено несколько сертификатов для подписывания"
+
 #: ../fdroidserver/index.py
 msgid "Found no signing certificates for repository."
 msgstr "Сертификат для подписывания для этого репозитория не обнаружен."
@@ -865,20 +874,10 @@ msgid "Found non-file at %s"
 msgstr "Это не похоже на файл: %s"
 
 #: ../fdroidserver/deploy.py
-#, python-brace-format
+#, fuzzy, python-brace-format
 msgid "Found {apkfilename} at {url}"
 msgstr "Найдено {apkfilename} в {url}"
 
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Found {count} problems in {filename}"
-msgstr "Найдено {count} проблем(ы) в {filename}"
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Found {count} warnings in {filename}"
-msgstr "Найдено {count} предупреждений в {filename}"
-
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Generated skeleton metadata for {appid}"
@@ -897,21 +896,19 @@ msgstr "Очистка репозитория (git clean) не удалась"
 msgid "Git fetch failed"
 msgstr "Не удалось получить данные из репозитория (git fetch)"
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
 #: ../fdroidserver/common.py
-#, python-format
+msgid "Git remote set-head failed"
+msgstr "Не удалось настроить HEAD для удаленного репозитория (git remote set-head)"
+
+#: ../fdroidserver/common.py
+#, fuzzy, python-format
 msgid "Git remote set-head failed: \"%s\""
 msgstr "Не удалось настроить HEAD для удаленного репозитория (git remote set-head): \"%s\""
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
 #: ../fdroidserver/common.py
 msgid "Git reset failed"
 msgstr "Не удалось отменить изменения (git reset)"
 
-#: ../fdroidserver/common.py
-msgid "Git submodule deinit failed"
-msgstr "Деинициализация подмодуля Git не удалась"
-
 #: ../fdroidserver/common.py
 msgid "Git submodule sync failed"
 msgstr "Не удалось синхронизировать модули Git (git submodules sync)"
@@ -925,68 +922,54 @@ msgid "HTTPS must be used with Subversion URLs!"
 msgstr "URL-адреса для Subversion должны начинаться с HTTPS!"
 
 #: ../fdroidserver/deploy.py
+#, fuzzy
 msgid "If a git mirror gets to big, allow the archive to be deleted"
-msgstr "Разрешить удаление архива, когда git-зеркало становится слишком большим"
+msgstr "Если git-зеркало станет большим, разрешите удалить архив."
 
 #: ../fdroidserver/deploy.py
-#, python-brace-format
+#, fuzzy, python-brace-format
 msgid "If this upload fails, try manually uploading to {url}"
-msgstr "Если эта загрузка не удалась, попробуйте вручную загрузить на {url}"
+msgstr "Если эта загрузка не удалась, попробуйте вручную загрузить в {url}."
 
 #: ../fdroidserver/metadata.py
 #, python-brace-format
 msgid "Ignoring '{field}' in '{metapath}' metadata because it is deprecated."
-msgstr "Проигнорировано: поле '{field}' в метаданных '{metapath}' т.к. оно признано нежелательным (deprecated)."
+msgstr ""
 
 #: ../fdroidserver/update.py
 #, python-format
 msgid "Ignoring FUNDING.yml entry longer than 2048: %s"
-msgstr "Проигнорировано: запись в FUNDING.yml длиннее 2048 символов: %s"
-
-#: ../fdroidserver/update.py
-#, python-format
-msgid "Ignoring bad element in manifest: %s"
-msgstr "Проигнорировано: плохой элемент в манифесте: %s"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Ignoring deprecated {oldfile}, use {newfile}!"
-msgstr "Устаревший {oldfile} игнорируется, используйте {newfile}!"
+msgstr ""
 
 #: ../fdroidserver/index.py
 msgid "Ignoring package without metadata: "
-msgstr "Проигнорировано: пакеты без метаданных: "
+msgstr "Пропустить пакеты без метаданных: "
 
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Ignoring stale cache data for {apkfilename}"
-msgstr "Проигнорировано: устаревший кеш для {apkfilename}"
+msgstr "Пропустить устаревший кеш для {apkfilename}"
+
+#: ../fdroidserver/rewritemeta.py
+#, python-brace-format
+msgid "Ignoring {ext} file at '{path}'"
+msgstr "Пропустить файл {ext} в '{path}'"
 
 #: ../fdroidserver/update.py
 msgid "Include APKs that are signed with disabled algorithms like MD5"
-msgstr "Включать APK, подписанные отключенными алгоритмами, например MD5"
+msgstr "Разрешить APK, подписанные без использования алгоритмов идентичности (MD5 и т.п.)"
 
 #: ../fdroidserver/mirror.py
 msgid "Include the PGP signature .asc files in the mirror"
-msgstr "Включать PGP-подпись («*.asc» файлы) в зеркало"
+msgstr ""
 
 #: ../fdroidserver/mirror.py
 msgid "Include the build logs in the mirror"
-msgstr "Включать логи сборки в зеркало"
+msgstr ""
 
 #: ../fdroidserver/mirror.py
 msgid "Include the source tarballs in the mirror"
-msgstr "Включать архивы с исходным кодом в зеркало"
-
-#: ../fdroidserver/metadata.py
-#, python-format
-msgid "Including metadata from %s@%s"
-msgstr "Включение метаданных из %s@%s"
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Including metadata from {path}"
-msgstr "Включение метаданных из {path}"
+msgstr ""
 
 #: ../fdroidserver/common.py
 msgid "Initialising submodules"
@@ -996,21 +979,31 @@ msgstr "Подключение модулей"
 msgid "Install all signed applications available"
 msgstr "Установить все доступные подписанные приложения"
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Install built packages on devices"
 msgstr "Установить собранные пакеты на устройства"
 
 #: ../fdroidserver/install.py
-#, python-format
+#, fuzzy, python-format
 msgid "Installing %s..."
-msgstr "Установка %s..."
+msgstr "Установка %s…"
+
+#: ../fdroidserver/install.py
+#, python-format
+msgid "Installing %s…"
+msgstr "Установка %s…"
+
+#: ../fdroidserver/install.py
+#, fuzzy, python-brace-format
+msgid "Installing '{apkfilename}' on {dev}..."
+msgstr "Установка '{apkfilename}' на устройство {dev}…"
 
 #: ../fdroidserver/install.py
 #, python-brace-format
-msgid "Installing '{apkfilename}' on {dev}..."
-msgstr "Установка '{apkfilename}' на устройство {dev}..."
+msgid "Installing '{apkfilename}' on {dev}…"
+msgstr "Установка '{apkfilename}' на устройство {dev}…"
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Interact with the repo HTTP server"
 msgstr "Взаимодействовать с HTTP сервером репозитория"
 
@@ -1018,36 +1011,53 @@ msgstr "Взаимодействовать с HTTP сервером репози
 msgid "Invalid APK"
 msgstr "Непригодный файл APK"
 
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "Invalid AutoUpdateMode: {mode}"
-msgstr "Неверный режим автообновления: {mode}"
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "Invalid UpdateCheckMode: {mode}"
-msgstr "Недопустимый UpdateCheckMode: {mode}"
-
-#: ../fdroidserver/checkupdates.py
+#: ../fdroidserver/lint.py ../fdroidserver/checkupdates.py
 #, python-brace-format
 msgid "Invalid VercodeOperation: {field}"
 msgstr "Расхождение версий приложения в метаданных: {field}"
 
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Invalid VercodeOperation: {invalid_ops}"
-msgstr "Недействительная VercodeOperation: {invalid_ops}"
-
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "Invalid application ID {appid}"
-msgstr "Неверный ID приложения: {appid}"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+#, python-format
+msgid "Invalid boolean '%s'"
+msgstr "Расхождение условий перехода состояния (boolean) в метаданных: '%s'"
+
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Invalid build flag at {line} in {linedesc}"
+msgstr "Неверный флаг сборки в строке {line} в {linedesc}"
+
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Invalid build format: {value} in {name}"
+msgstr "Неверный формат сборки: {value} в {name}"
 
 #: ../fdroidserver/lint.py
 msgid "Invalid bulleted list"
 msgstr "Неверно размеченный список"
 
+#: ../fdroidserver/lint.py
+#, python-format
+msgid "Invalid license tag \"%s\"! Use only tags from https://spdx.org/license-list"
+msgstr "Неверная метка лицензии: \"%s\". Используйте только метки, перечисленные в https://spdx.org/license-list"
+
+#: ../fdroidserver/lint.py
+msgid "Invalid link - use [http://foo.bar Link title] or [http://foo.bar]"
+msgstr "Неверный формат ссылки. Правильно так: [http://foo.bar текст-ссылки] or [http://foo.bar]"
+
+#: ../fdroidserver/metadata.py
+#, python-format
+msgid "Invalid metadata in %s:%d"
+msgstr "Неверные метаданные в %s:%d"
+
+#: ../fdroidserver/metadata.py
+msgid "Invalid metadata in: "
+msgstr "Неверные метаданные: "
+
 #: ../fdroidserver/common.py
 #, python-format
 msgid "Invalid name for published file: %s"
@@ -1055,8 +1065,8 @@ msgstr "Неверное имя для опубликованного файла
 
 #: ../fdroidserver/common.py
 #, python-brace-format
-msgid "Invalid ndk: entry in build: \"{ndk}\""
-msgstr "Недопустимый ndk: запись в сборке: \"{ndk}\""
+msgid "Invalid package name {0}"
+msgstr "Неверное имя (package name) {0}"
 
 #: ../fdroidserver/common.py
 #, python-brace-format
@@ -1066,22 +1076,27 @@ msgstr "Неверное перенаправление (не HTTPS): {before} -
 #: ../fdroidserver/metadata.py
 #, python-brace-format
 msgid "Invalid scrlib metadata: '{file}' does not exist"
-msgstr "Некорректные метаданные scrlib: '{file}' не существует"
+msgstr ""
 
 #: ../fdroidserver/metadata.py
 #, python-brace-format
 msgid "Invalid srclib metadata: could not parse '{file}'"
-msgstr "Некорректные метаданные scrlib: не удалось разобрать содержимое '{file}'"
+msgstr ""
 
 #: ../fdroidserver/metadata.py
 #, python-brace-format
 msgid "Invalid srclib metadata: unknown key '{key}' in '{file}'"
-msgstr "Некорректные метаданные scrlib: не известный ключ '{key}' в '{file}'"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Invalid versionCode: \"{versionCode}\" is not an integer!"
+msgstr "Неверно указан versionCode: \"{versionCode}\". Это должно быть число!"
 
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "JAR signature failed to verify: {path}"
-msgstr "Не удается проверить подпись JAR: {path}"
+msgstr "Не удаётся проверить подпись JAR: {path}"
 
 #: ../fdroidserver/common.py
 #, python-brace-format
@@ -1090,16 +1105,16 @@ msgstr "Подпись JAR прошла проверку: {path}"
 
 #: ../fdroidserver/scanner.py
 msgid "Java JAR file"
-msgstr "JAR-файл Java"
+msgstr ""
 
-#: ../fdroidserver/mirror.py ../fdroidserver/publish.py
-#: ../fdroidserver/update.py
+#: ../fdroidserver/publish.py ../fdroidserver/update.py
+#: ../fdroidserver/mirror.py
 msgid "Java JDK not found! Install in standard location or set java_paths!"
-msgstr "Не обнаружена Java JDK! Установите ее по стандартному пути или настройте переменную java_paths!"
+msgstr "Не обнаружена Java JDK! Установите её по стандартному пути или настройте переменную java_paths!"
 
 #: ../fdroidserver/scanner.py
 msgid "Java compiled class"
-msgstr "Скомпилированный класс Java"
+msgstr ""
 
 #: ../fdroidserver/signindex.py
 msgid "Java jarsigner not found! Install in standard location or set java_paths!"
@@ -1109,31 +1124,27 @@ msgstr "Java jarsigner не обнаружен! Установите по ста
 msgid "Javascript in HTML src attributes"
 msgstr "В атрибутах исходного HTML кода содержится Javascript"
 
-#: ../fdroidserver/build.py
-#, python-brace-format
-msgid "Keeping failed build \"{apkfilename}\""
-msgstr "Сохранение неудачной сборки \"{apkfilename}\""
-
 #: ../fdroidserver/init.py
 msgid "Keystore for signing key:\t"
 msgstr "Хранилище ключа для подписывания:→\t"
 
 #: ../fdroidserver/lint.py
-msgid "Known debug key is used in AllowedAPKSigningKeys: "
-msgstr "Известный отладочный ключ используется в AllowedAPKSigningKeys: "
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
+#, fuzzy, python-brace-format
 msgid "Last used commit '{commit}' looks like a tag, but UpdateCheckMode is '{ucm}'"
-msgstr "Последний наложенный коммит '{commit}' похож на метку (tag), но режим проверки обновлений (UpdateCheckMode) — '{ucm}'"
+msgstr "Последний наложенный коммит '{commit}' похож на метку (tag), но режим проверки обновлений (Update Check Mode) — '{ucm}'"
 
 #: ../fdroidserver/lint.py
+#, fuzzy
 msgid "Liberapay donation methods belong in the Liberapay: field"
-msgstr "Cсылка на пожертвования через Liberapay должна быть в поле «Liberapay:»"
+msgstr "Способ пожертвования Liberapay определяется с помощью флага LiberapayID"
+
+#: ../fdroidserver/lint.py
+msgid "Liberapay donation methods belong in the LiberapayID flag"
+msgstr "Способ пожертвования Liberapay определяется с помощью флага LiberapayID"
 
 #: ../fdroidserver/rewritemeta.py
-msgid "List files that would be reformatted (dry run)"
-msgstr "Список файлов, которые будут переформатированы (сухой прогон)"
+msgid "List files that would be reformatted"
+msgstr "Отобразить список файлов, формат которых поменяется"
 
 #: ../fdroidserver/lint.py
 msgid "Locale included in f-droid.org URL"
@@ -1151,48 +1162,39 @@ msgstr "Неверные адреса зеркал для репозитория
 msgid "Malformed serverwebroot line:"
 msgstr "Неверный путь serverwebroot:"
 
-#: ../fdroidserver/scanner.py
-#, python-format
-msgid "Max recursion depth in ZIP file reached: %s"
-msgstr "Достигнута максимальная глубина рекурсии в ZIP-файле: %s"
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "Mirror config for {url} contains \"isPrimary\" key!"
-msgstr "Конфигурация зеркала для {url} содержит ключ \"IsPrimary\"!"
-
 #: ../fdroidserver/mirror.py
 msgid "Mirror the full repo and archive, all file types."
-msgstr "Создать зеркало всего репозитория и архива, включая все типы файлов."
+msgstr ""
 
 #: ../fdroidserver/gpgsign.py
 msgid "Missing output directory"
 msgstr "Директории для хранения выводных данных не существует"
 
-#: ../fdroidserver/metadata.py
-msgid "Moving Anti-Features declarations to localized files:"
-msgstr "Перемещение объявлений Anti-Features в локализованные файлы:"
-
-#: ../fdroidserver/index.py
-msgid "Neither \"repo_pubkey\" nor \"keystorepass\" set in config.yml"
-msgstr "Ни «repo_pubkey», ни «keystorepass» не указаны в config.yml"
-
-#: ../fdroidserver/verify.py
+#: ../fdroidserver/lint.py
 #, python-format
-msgid "No APK for package: %s"
-msgstr "Нет APK для пакета: %s"
+msgid "Name '%s' is just the auto name - remove it"
+msgstr "Удалите автоматически сгенерированное имя приложения '%s'"
+
+#: ../fdroidserver/common.py
+msgid "No 'config.py' found, using defaults."
+msgstr "Файл 'config.py' не обнаружен. Используется конфигурация по умолчанию."
 
 #: ../fdroidserver/common.py
 msgid "No Android SDK found!"
 msgstr "Android SDK не обнаружена!"
 
+#: ../fdroidserver/import.py
+msgid "No android or kivy project could be found. Specify --subdir?"
+msgstr "Неверный путь к проекту Android или Kivy. Указать его в опции --subdir?"
+
 #: ../fdroidserver/install.py
 msgid "No attached devices found"
 msgstr "Подключенных устройств не найдено"
 
-#: ../fdroidserver/install.py
-msgid "No devices found for `adb install`! Please plug one in."
-msgstr "Для `adb install` не найдено ни одного устройства! Пожалуйста, подключите какое-нибудь."
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "No commit specified for {versionName} in {linedesc}"
+msgstr "Не выбраны коммиты для {versionName} в {linedesc}"
 
 #: ../fdroidserver/index.py
 msgid "No fingerprint in URL."
@@ -1202,23 +1204,15 @@ msgstr "URL-адрес не содержит идентификационной
 msgid "No git submodules available"
 msgstr "Модулей Git не обнаружено"
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
+#, fuzzy
 msgid "No gradle project could be found. Specify --subdir?"
-msgstr "Проект gradle не найден. Возможно, нужно указать его в параметре --subdir?"
+msgstr "Неверный путь к проекту Android или Kivy. Указать его в опции --subdir?"
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py ../fdroidserver/common.py
 msgid "No information found."
 msgstr "Информация о репозитории неверна."
 
-#: ../fdroidserver/checkupdates.py
-msgid "No matching tags found"
-msgstr "Соответствующие теги не найдены"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "No minimum SDK version found in {0}, using default (3)."
-msgstr "Не найдена минимальная версия SDK в {0}, используется версия по умолчанию (3)."
-
 #: ../fdroidserver/lint.py
 msgid "No need to specify that the app is Free Software"
 msgstr "Указывать в описании, что приложение свободное, необязательно. Других здесь не держат"
@@ -1228,8 +1222,8 @@ msgid "No need to specify that the app is for Android"
 msgstr "Указывать в описании, что приложение для Android, не обязательно. Других здесь не держат"
 
 #: ../fdroidserver/deploy.py
-msgid "No option set! Edit your config.yml to set at least one of these:"
-msgstr "Недостаточно опций сборки! Настройте как минимум вот эти (в config.yml):"
+msgid "No option set! Edit your config.py to set at least one of these:"
+msgstr "Недостаточно опций сборки! Настройте как минимум вот эти (в config.py):"
 
 #: ../fdroidserver/common.py
 msgid "No packages specified"
@@ -1237,14 +1231,14 @@ msgstr "Не выбраны пакеты"
 
 #: ../fdroidserver/install.py
 #, python-format
-msgid "No signed APK available for %s"
-msgstr "Для %s нет подписанного APK"
+msgid "No signed apk available for %s"
+msgstr "Для %s нет подписанного apk"
 
 #: ../fdroidserver/install.py
 msgid "No signed output directory - nothing to do"
 msgstr "Директории с данными для подписывания не найдено. До новых встреч"
 
-#: ../fdroidserver/common.py
+#: ../fdroidserver/update.py ../fdroidserver/common.py
 #, python-brace-format
 msgid "No signing certificates found in {path}"
 msgstr "В {path} не обнаружены сертификаты для подписывания"
@@ -1254,26 +1248,19 @@ msgstr "В {path} не обнаружены сертификаты для под
 msgid "No such package: %s"
 msgstr "Такого пакета не существует: %s"
 
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "No such versionCode {versionCode} for app {appid}"
 msgstr "Внутренней версии (versionCode) с номером {versionCode} для приложения {appid} не существует"
 
-#: ../fdroidserver/checkupdates.py
-msgid "No tags found"
-msgstr "Теги не найдены"
-
-#: ../fdroidserver/publish.py ../fdroidserver/verify.py
+#: ../fdroidserver/verify.py ../fdroidserver/publish.py
 msgid "No unsigned directory - nothing to do"
 msgstr "Директории с неподписанными данными не существует. До новых встреч"
 
-#: ../fdroidserver/__main__.py
-msgid "No version information could be found."
-msgstr "Информацию о версии найти не удалось."
-
 #: ../fdroidserver/common.py
 msgid "Not a valid size definition: \"{}\""
-msgstr "Неверное определение размера: \"{}\""
+msgstr ""
 
 #: ../fdroidserver/signindex.py
 msgid "Nothing to do"
@@ -1285,9 +1272,10 @@ msgid "Nothing to do for {appid}."
 msgstr "Автоматические обновления для {appid} недоступны."
 
 #: ../fdroidserver/init.py
-msgid "Now set these in config.yml:"
-msgstr "Определите эти переменные в config.yml:"
+msgid "Now set these in config.py:"
+msgstr "Определите эти переменные в config.py:"
 
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "OBB file has newer versionCode({integer}) than any APK:"
@@ -1303,66 +1291,71 @@ msgstr "Указанный в OBB файле packagename не соответст
 
 #: ../fdroidserver/deploy.py
 msgid "Offline machine, skipping git mirror generation until `fdroid deploy`"
-msgstr "Автономная система, пропуск генерации git-зеркала до `fdroid deploy`"
+msgstr ""
 
-#: ../fdroidserver/deploy.py
-msgid "One of the 'github_releases' config items is missing the 'packageNames' value. skipping ..."
-msgstr "В одном из 'github_releases' отсутствует значение 'packageNames'; пропускаем ..."
+#: ../fdroidserver/common.py
+#, python-brace-format
+msgid "Old APK signature failed to verify: {path}"
+msgstr "Не удалось проверить прежнюю подпись APK: {path}"
 
-#: ../fdroidserver/deploy.py
-msgid "One of the 'github_releases' config items is missing the 'projectUrl' value. skipping ..."
-msgstr "В одном из 'github_releases' отсутствует значение 'projectUrl'; пропускаем ..."
+#: ../fdroid ../fdroidserver/__main__.py
+msgid "Old, deprecated name for fdroid deploy"
+msgstr "Старое название для fdroid deploy"
 
-#: ../fdroidserver/deploy.py
-msgid "One of the 'github_releases' config items is missing the 'token' value. skipping ..."
-msgstr "В одном из 'github_releases' отсутствует значение 'token'; пропускаем ..."
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Only PNG and JPEG are supported for graphics, found: {path}"
 msgstr "Допускаются изображения только в форматах PNG и JPEG: {path}"
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/common.py
-msgid "Only accepts a single key \"env\""
-msgstr "Принимает только один ключ \"env\""
+#: ../fdroidserver/checkupdates.py
+msgid "Only print differences with the Play Store"
+msgstr "Отобразить только приложения, версия которых в Play Store отличается от здешней"
 
 #: ../fdroidserver/checkupdates.py
 msgid "Only process apps with auto-updates"
 msgstr "Запустить проверку только для приложений с автоматическим обновлением"
 
 #: ../fdroidserver/lint.py
+#, fuzzy
 msgid "OpenCollective donation methods belong in the OpenCollective: field"
-msgstr "Cсылка на пожертвования через OpenCollective должна быть в поле «OpenCollective:»"
+msgstr "Способы пожертвования с помощью Flattr определяются флагом FlattrID"
+
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "Options"
+msgstr "Параметры"
 
 #: ../fdroidserver/verify.py
 msgid "Output JSON report to file named after APK."
-msgstr "Вывод отчета в формате JSON под именем файла APK."
+msgstr "Вывод отчёта в формате JSON под именем файла APK."
 
 #: ../fdroidserver/scanner.py
 msgid "Output JSON to stdout."
-msgstr "Вывести JSON в stdout."
+msgstr ""
 
-#: ../fdroidserver/checkupdates.py ../fdroidserver/gpgsign.py
-#: ../fdroidserver/publish.py ../fdroidserver/signindex.py
-#: ../fdroidserver/update.py
+#: ../fdroidserver/gpgsign.py ../fdroidserver/publish.py
+#: ../fdroidserver/update.py ../fdroidserver/signindex.py
+#: ../fdroidserver/checkupdates.py
 msgid "Outputting JSON"
-msgstr "Выводится JSON"
+msgstr ""
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "Overall license of the project."
 msgstr "Основная лицензия проекта."
 
+#: ../fdroidserver/dscanner.py
+msgid "Override path for repo APKs (default: ./repo)"
+msgstr "Переопределить путь к APK файлам репозитория (по умолчанию это ./repo)"
+
 #: ../fdroidserver/index.py
 #, python-brace-format
 msgid "Overriding blank versionName in {apkfilename} from metadata: {version}"
 msgstr "Заменить пустое значение versionName в {apkfilename} значением из метаданных: {version}"
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 #, python-brace-format
 msgid "Package \"{appid}\" already exists"
-msgstr "Пакет {appid}\" уже существует"
+msgstr ""
 
 #: ../fdroidserver/common.py
 #, python-brace-format
@@ -1373,10 +1366,13 @@ msgstr "Чтение манифеста: '{path}'"
 msgid "Password required with username"
 msgstr "Необходимо указать не только имя пользователя, но и пароль"
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "Path to main Android project subdirectory, if not in root."
 msgstr "Путь к рабочей директории проекта Android (если она не в его корне)."
 
+msgid "Path to main android project subdirectory, if not in root."
+msgstr "Путь к рабочей директории проекта Android (если она не в его корне)."
+
 #: ../fdroidserver/init.py
 msgid "Path to the Android SDK (sometimes set in ANDROID_HOME)"
 msgstr "Путь к Android SDK (можно настроить в переменной ANDROID_HOME)"
@@ -1389,19 +1385,21 @@ msgstr "Путь к репозиторию git, который будет ото
 msgid "Path to the keystore for the repo signing key"
 msgstr "Путь к хранилищу с ключом для подписывания"
 
+#: ../fdroidserver/dscanner.py
+msgid "Prepare Drozer to run a scan"
+msgstr "Подготовка Drozer к сканированию репозитория"
+
+msgid "Prepare drozer to run a scan"
+msgstr "Подготовка к сканированию Drozer"
+
 #: ../fdroidserver/nightly.py
 msgid "Print the secret variable to the terminal for easy copy/paste"
 msgstr "Отобразить секретную переменную в терминале (чтобы ее было легче скопировать и вставить)"
 
-#: ../fdroidserver/install.py
+#: ../fdroidserver/metadata.py
 #, python-brace-format
-msgid "Privacy mode was enabled based on your locale ({country_code})."
-msgstr "Режим конфиденциальности был включен в соответствии с вашей локалью ({country_code})."
-
-#: ../fdroidserver/scanner.py
-#, python-format
-msgid "Problem with ZIP file: %s, error %s"
-msgstr "Проблема с файлом ZIP: %s, ошибка %s"
+msgid "Problem with description of {appid}: {error}"
+msgstr "Ошибка в описании {appid}: {error}"
 
 #: ../fdroidserver/common.py
 #, python-brace-format
@@ -1426,7 +1424,11 @@ msgstr "Обработка данных {appid}"
 msgid "Produce human-readable XML/JSON for index files"
 msgstr "Отобразить XML/JSON для индекс файлов в удобном для чтения виде"
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/update.py
+msgid "Produce human-readable index.xml"
+msgstr "Создать удобочитаемый файл index.xml"
+
+#: ../fdroidserver/import.py
 msgid "Project URL to import from."
 msgstr "URL-адрес проекта для импорта."
 
@@ -1438,25 +1440,21 @@ msgstr "Знаки препинания недопустимы"
 msgid "Push the log to this git remote repository"
 msgstr "Отправить лог в удаленный репозиторий git"
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Pushing binary transparency log to {url}"
 msgstr "Публикация лога прозрачности кода в {url}"
 
-#: ../fdroidserver/deploy.py
-msgid "Pushing to remote server failed!"
-msgstr "Передача данных на удаленный сервер не удалась!"
-
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Pushing to {url}"
 msgstr "Публикация в {url}"
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Quickly start a new repository"
-msgstr "Быстро создать новый репозиторий"
+msgstr "Создать новый репозиторий (укороченная процедура)"
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Read all the metadata files and exit"
 msgstr "Прочесть все метаданные и выйти"
 
@@ -1467,49 +1465,40 @@ msgstr "Чтение '{config_file}'"
 
 #: ../fdroidserver/common.py
 #, python-brace-format
-msgid "Reading packageName/versionCode/versionName failed, APK invalid: '{apkfilename}'"
-msgstr "Не удалось извлечь packageName, внутреннюю или внешнюю версию приложения, поэтому APK считается непригодным: '{apkfilename}'"
+msgid "Reading minSdkVersion failed: \"{apkfilename}\""
+msgstr "Не удалось извлечь minSdkVersion для \"{apkfilename}\""
 
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
+#. https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
 #: ../fdroidserver/common.py
 #, python-brace-format
-msgid "Reading packageName/versionCode/versionName failed,APK invalid: '{apkfilename}'"
-msgstr "Не удалось прочитать packageName/versionCode/versionName failed, APK недействителен: '{apkfilename}'"
+msgid "Reading packageName/versionCode/versionName failed, APK invalid: '{apkfilename}'"
+msgstr "Не удалось извлечь packageName, внутреннюю или внешнюю версию приложения, поэтому APK считается непригодным: '{apkfilename}'"
 
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Reading {apkfilename} from cache"
 msgstr "Чтение {apkfilename} из кеша"
 
-#: ../fdroidserver/build.py
-msgid "Refresh and cache scanner rules and signatures from the network"
-msgstr "Обновление и кэширование правил и сигнатур сканера из сети"
-
-#: ../fdroidserver/publish.py
-#, python-brace-format
-msgid "Refusing to sign '{path}', file exists in both {dir1} and {dir2} folder."
-msgstr "Отказываюсь подписывать '{path}', файл существует как в папке {dir1}, так и в папке {dir2}."
-
-#: ../fdroidserver/verify.py
-msgid "Remove source tarball and any APKs if successfully verified."
-msgstr "Удалить tar-архив с исходным кодом и все APK-файлы, если проверка для них прошла успешно."
+#: ../fdroidserver/stats.py
+msgid "Recalculate aggregate stats - use when changes have been made that would invalidate old cached data."
+msgstr "Пересчитать совокупную статистику. Используйте эту опцию, когда свежие изменения конфликтуют с прежними закешированными данными."
 
 #: ../fdroidserver/common.py
 msgid "Removing specified files"
 msgstr "Удаление выбранных файлов"
 
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Removing {path}\""
-msgstr "Удаление {path}\""
-
 #: ../fdroidserver/update.py
 msgid "Rename APK files that do not match package.name_123.apk"
 msgstr "Переименовать все APK файлы, не соответствующие шаблону \"название.пакета_123.apk\""
 
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "RepoType {type} is deprecated, please switch to git."
-msgstr ""
+#: ../fdroidserver/update.py
+msgid "Report on build data status"
+msgstr "Отчет от состоянии данных сборки"
+
+#: ../fdroidserver/build.py
+msgid "Reset and create a brand new build server, even if the existing one appears to be ok."
+msgstr "Сбросить все настройки и создать новый сервер сборки, даже если со старым все в порядке."
 
 #: ../fdroidserver/nightly.py
 #, python-brace-format
@@ -1524,34 +1513,33 @@ msgstr "Изменить размер всех иконок, превышающ
 msgid "Restrict output to warnings and errors"
 msgstr "Показывать в выводе только предупреждения и ошибки"
 
-#: ../fdroidserver/net.py
-#, python-format
-msgid "Retrying failed download: %s"
-msgstr "Повторная попытка неудачной загрузки: %s"
-
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Rewrite all the metadata files"
 msgstr "Перезаписать все метаданные"
 
+#: ../fdroidserver/rewritemeta.py
+msgid "Rewrite to a specific format: "
+msgstr "Перезаписать в заданном формате: "
+
 #: ../fdroidserver/rewritemeta.py
 #, python-brace-format
 msgid "Rewriting '{appid}'"
 msgstr "Перезапись '{appid}'"
 
+#: ../fdroidserver/rewritemeta.py
+#, python-brace-format
+msgid "Rewriting '{appid}' to '{path}'"
+msgstr "Перезапись '{appid}' в '{path}'"
+
 #: ../fdroidserver/checkupdates.py
 msgid "Run on git repo that has uncommitted changes"
 msgstr "Запустить для репозитория git с несохраненными изменениями"
 
-#: ../fdroidserver/nightly.py
-#, python-brace-format
-msgid "Run over {cibase} to find -debug.apk. and skip repo_basedir {repo_basedir}"
-msgstr "Просматриваем {cibase} в поиске -debug.apk (пропуская repo_basedir: {repo_basedir})"
-
 #: ../fdroidserver/lint.py
 msgid "Run rewritemeta to fix formatting"
 msgstr "Запустить rewritemeta для исправления ошибок форматирования"
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 msgid "Running first pass with MD5 checking disabled"
 msgstr "Первая попытка загрузить данные (выполняется с отключенной проверкой MD5)"
 
@@ -1560,24 +1548,18 @@ msgstr "Первая попытка загрузить данные (выпол
 msgid "Running wget in {path}"
 msgstr "Выполняется wget в {path}"
 
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "SHA-256 of {url} does not match entry!"
-msgstr "SHA-256 {url} не соответствует записи!"
+#: ../fdroidserver/dscanner.py
+msgid "Scan only the latest version of each package"
+msgstr "Сканировать только самую свежую версию каждого пакета"
 
 #: ../fdroidserver/build.py
 msgid "Scan the resulting APK(s) for known non-free classes."
-msgstr "Проскандировать получившиеся APK на известные несвободные классы."
+msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Scan the source code of a package"
 msgstr "Сканировать исходный код пакета"
 
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Scanner found {count} problems in {apk}"
-msgstr "Сканирование обнаружило {count} проблем(ы) в {apk}"
-
 #: ../fdroidserver/scanner.py
 #, python-brace-format
 msgid "Scanner found {count} problems in {appid}:"
@@ -1595,33 +1577,20 @@ msgstr[0] "Сканирование обнаружило {} ошибку"
 msgstr[1] "Сканирование обнаружило {} ошибки"
 msgstr[2] "Сканирование обнаружило {} ошибок"
 
-#: ../fdroidserver/scanner.py
-msgid "Scanning APK for extra signing blocks."
-msgstr "Проверка APK на наличие дополнительных блоков подписи."
-
-#: ../fdroidserver/scanner.py
-msgid "Scanning APK with dexdump for known non-free classes."
-msgstr "Сканирование APK с помощью dexdump на наличие известных несвободных классов."
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Set NDK {release} ({version}) up"
-msgstr "Настройка NDK {release} ({version})"
-
 #: ../fdroidserver/common.py
 msgid "Set clock to that time using:"
 msgstr "Настроить системное время с помощью:"
 
 #: ../fdroidserver/nightly.py
 msgid "Set maximum releases in repo before older ones are archived"
-msgstr "Установить максимальный номер версии релиза в репозитории прежде чем более старые версии будут заархивированы"
+msgstr ""
 
 #: ../fdroidserver/build.py
 #, python-brace-format
 msgid "Set open file limit to {integer}"
 msgstr "Настроить ограничение для количества одновременно открытых файлов: {integer}"
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Set up an app build for a nightly build repo"
 msgstr "Настроить ежедневную сборку приложения (nightly build)"
 
@@ -1634,13 +1603,20 @@ msgstr "Не удалось настроить ограничение для к
 msgid "Setting {0} sec timeout for this build"
 msgstr "Время ожидания для этой сборки выставляется в {0} секунд"
 
-#: ../fdroidserver/__main__.py
+#: ../fdroidserver/build.py
+msgid "Setup an emulator, install the APK on it and perform a Drozer scan"
+msgstr "Настроить эмулятор, установить в него APK и запустить сканирование Drozer"
+
+msgid "Setup an emulator, install the apk on it and perform a drozer scan"
+msgstr "Настроить эмулятор, установить в него APK и запустить сканирование Drozer"
+
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Sign and place packages in the repo"
 msgstr "Подписать пакеты и поместить в репозиторий"
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Sign indexes created using update --nosign"
-msgstr "Подписать индексы созданные с \"update --nosign\""
+msgstr "Подписать индексы, созданные с флагом \"update --nosign\""
 
 #: ../fdroidserver/build.py
 msgid "Skip scanning the source code for binaries and other problems"
@@ -1651,11 +1627,6 @@ msgstr "Пропустить сканирование исходного код
 msgid "Skipping '{apkfilename}' with invalid signature!"
 msgstr "Неверная подпись '{apkfilename}', пропустить!"
 
-#: ../fdroidserver/deploy.py ../fdroidserver/index.py
-#, python-format
-msgid "Skipping GitLab Pages mirror because the repo is too large (>%.2fGB)!"
-msgstr "Пропуск зеркала GitLab Pages из-за слишком большого размера репозитория (>%.2fGB)!"
-
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Skipping index generation for {appid}"
@@ -1671,14 +1642,23 @@ msgstr "Неверная подпись {apkfilename}, пропустить!"
 msgid "Skipping {appid}: disabled"
 msgstr "Пропустить {appid}: отключено"
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/scanner.py
+#, python-brace-format
+msgid "Skipping {appid}: no builds specified"
+msgstr "Пропустить {appid}: нет выбранных сборок"
+
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 msgid "Specify a local folder to sync the repo to"
 msgstr "Выбрать локальную директорию, с которой будет синхронизирован репозиторий"
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 msgid "Specify an identity file to provide to SSH for rsyncing"
 msgstr "Выбрать идентификационный файл (нужен SSH для rsync)"
 
+#: ../fdroidserver/build.py
+msgid "Specify that we're running on the build server"
+msgstr "Выбрать, если сборка происходит на сервере сборки"
+
 #: ../fdroidserver/nightly.py
 msgid "Specify which debug keystore file to use."
 msgstr "Выбрать отладочный ключ."
@@ -1689,8 +1669,13 @@ msgstr "Писать очень подробные логи"
 
 #: ../fdroidserver/nightly.py
 #, python-brace-format
+msgid "Striping mystery signature from {apkfilename}"
+msgstr "Удаление неизвестной подписи {apkfilename}"
+
+#: ../fdroidserver/nightly.py
+#, fuzzy, python-brace-format
 msgid "Stripping mystery signature from {apkfilename}"
-msgstr "Удаление неизвестной подписи из {apkfilename}"
+msgstr "Удаление неизвестной подписи {apkfilename}"
 
 #: ../fdroidserver/lint.py
 #, python-format
@@ -1705,23 +1690,11 @@ msgstr "Короткое описание приложения ({length} зна
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "System clock is older than date in {path}!"
-msgstr "Системное время отстает от date в {path}!"
-
-#: ../fdroidserver/checkupdates.py
-msgid "Tags update mode only works for git, hg, bzr and git-svn repositories currently"
-msgstr "Режим обновления тегов в настоящее время работает только для репозиториев git, hg, bzr и git-svn"
-
-#: ../fdroidserver/checkupdates.py
-msgid "Tags update mode used in git-svn, but the repo was not set up with tags"
-msgstr "Режим обновления тегов используется в git-svn, но репозиторий не был настроен с тегами"
+msgstr "Системное время отстаёт от date в {path}!"
 
 #: ../fdroidserver/build.py
 msgid "Test mode - put output in the tmp directory only, and always build, even if the output already exists."
-msgstr "Тестовый режим. Все собранное попадает во временную директорию; сборка запускается снова в любом случае."
-
-#: ../fdroidserver/index.py
-msgid "The \"qrcode\" Python package is not installed (e.g. apt-get install python3-qrcode)!"
-msgstr "Пакет Python \"qrcode\" не установлен (например, apt-get install python3-qrcode)!"
+msgstr "Тестовый режим. Всё собранное попадает во временную директорию; сборка запускается снова в любом случае."
 
 #. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
 #: ../fdroidserver/update.py
@@ -1741,10 +1714,18 @@ msgstr "Директория для сохранения зеркала"
 msgid "The file to be included in the repo (path or glob)"
 msgstr "Файл для включения в репозиторий (путь или шаблон пути)"
 
+#: ../fdroidserver/deploy.py
+msgid "The only commands currently supported are 'init' and 'update'"
+msgstr "В настоящее время поддерживаются только команды 'init' и 'update'"
+
 #: ../fdroidserver/index.py
 msgid "The repository's fingerprint does not match."
 msgstr "Идентификационная метка (fingerprint) репозитория не совпадает с исходной."
 
+#: ../fdroidserver/common.py
+msgid "The repository's index could not be verified."
+msgstr "Индекс репозитория не прошёл проверку."
+
 #: ../fdroidserver/deploy.py
 #, python-brace-format
 msgid "The root dir for local_copy_dir \"{path}\" does not exist!"
@@ -1756,78 +1737,53 @@ msgstr "Есть расхождения в алиасах ключей для п
 
 #: ../fdroidserver/common.py
 msgid "These are the apps that have been archived from the main repo."
-msgstr "Это те приложения, которые были заархивированы из основного репозитория."
+msgstr ""
 
-#: ../fdroidserver/mirror.py
-msgid "This command should never be used to mirror f-droid.org! A full copy requires more than 600GB."
-msgstr "Эта команда никогда не должна использоваться для зеркалирования f-droid.org! Полная копия требует более 600 ГБ."
-
-#: ../fdroidserver/common.py
-msgid "This is a repository of apps to be used with F-Droid. Applications in this repository are either official binaries built by the original application developers, or are binaries built from source by the admin of f-droid.org using the tools on https://gitlab.com/fdroid."
-msgstr "Это репозиторий приложений, предназначенных для использования в FDroid. Приложения в этом репозитории являются либо официальными бинарными файлами, созданными разработчиками оригинального приложения, либо бинарными файлами, созданными f-droid.org из исходного кода с помощью инструментов на https://gitlab.com/fdroid."
-
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 #, python-format
 msgid "This repo already has local metadata: %s"
 msgstr "Локальная копия метаданных репозитория уже существует: %s"
 
-#: ../fdroidserver/init.py
-#, python-format
-msgid ""
-"To complete the setup, add your APKs to \"%s\"\n"
-"then run \"fdroid update -c; fdroid update\".  You might also want to edit\n"
-"\"config.yml\" to set the URL, repo name, and more.  You should also set up\n"
-"a signing key (a temporary one might have been automatically generated).\n"
-"\n"
-"For more info: https://f-droid.org/docs/Setup_an_F-Droid_App_Repo\n"
-"and https://f-droid.org/docs/Signing_Process"
-msgstr ""
-"Для завершения настройки добавьте свои APK в \"%s\"\n"
-"затем запустите \"fdroid update -c; fdroid update\".  Возможно, вы также захотите отредактировать\n"
-"\"config.yml\", чтобы задать URL, имя репозитория и многое другое.  Вам также следует установить\n"
-"ключ подписи (временный ключ может быть сгенерирован автоматически).\n"
-"\n"
-"Дополнительная информация: https://f-droid.org/docs/Setup_an_F-Droid_App_Repo\n"
-"и https://f-droid.org/docs/Signing_Process"
-
-#: ../fdroidserver/deploy.py
-msgid "To use awsbucket, awssecretkey and awsaccesskeyid must also be set in config.yml!"
-msgstr "Необходимо определить переменные awsbucket, awssecretkey и awsaccesskeyid в config.yml!"
-
-#: ../fdroidserver/deploy.py
-msgid "To use rclone, rclone_config and awsbucket must be set in config.yml!"
-msgstr "Чтобы использовать rclone, в config.yml должны быть заданы rclone_config и awsbucket!"
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
+msgid "To use awsbucket, awssecretkey and awsaccesskeyid must also be set in config.py!"
+msgstr "Необходимо определить переменные awsbucket, awssecretkey и awsaccesskeyid в config.py!"
 
 #: ../fdroidserver/lint.py
 msgid "URL must start with https:// or http://"
-msgstr "URL должна начинаться с https:// или http://"
+msgstr ""
 
 #: ../fdroidserver/lint.py
 msgid "URL shorteners should not be used"
 msgstr "URL-адреса сокращать нельзя"
 
+#: ../fdroidserver/metadata.py
+msgid "URL title is just the URL, use brackets: [URL]"
+msgstr "Текст URL-адреса должен быть заключен в скобки: [URL]"
+
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "URL {url} in Description: {error}"
 msgstr "URL-адрес {url} в описании приложения: {error}"
 
 #: ../fdroidserver/lint.py
+#, fuzzy
 msgid "Unexpected license tag \"{}\"! Only use FSF or OSI approved tags from https://spdx.org/license-list"
-msgstr "Неожиданная метка лицензии: \"{}\"! Используйте только метки, одобренные FSF или OSI из https://spdx.org/license-list"
+msgstr "Неверная метка лицензии: \"%s\". Используйте только метки, перечисленные в https://spdx.org/license-list"
 
 #: ../fdroidserver/lint.py
 msgid "Unexpected license tag \"{}\"! Only use license tags configured in your config file"
-msgstr "Неожиданная метка лицензии: \"{}\"! Используйте только метки, указанные в вашем файле настроек"
+msgstr ""
 
-#: ../fdroidserver/common.py
+#: ../fdroidserver/metadata.py
 #, python-brace-format
-msgid "Unknown entry {key} in {configname}"
-msgstr "Неизвестная запись {key} в {configname}"
+msgid "Unexpected text on same line as {field} in {linedesc}"
+msgstr "Лишний текст в той же строчке, что и {field} в {linedesc}"
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Unknown exception found!"
 msgstr "Произошла неизвестная ошибка!"
 
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "Unknown file '{filename}' in build '{versionName}'"
@@ -1840,13 +1796,22 @@ msgstr "Неизвестный формат метаданных: %s"
 
 #: ../fdroidserver/metadata.py
 #, python-brace-format
+msgid "Unknown metadata format: {path}"
+msgstr "Неизвестный формат метаданных: {path}"
+
+#: ../fdroidserver/metadata.py
+#, fuzzy, python-brace-format
 msgid "Unknown metadata format: {path} (use: *.yml)"
-msgstr "Неизвестный формат метаданных: {path} (используйте *.yml)"
+msgstr "Неизвестный формат метаданных: {path}"
 
 #: ../fdroidserver/common.py
 msgid "Unknown version of aapt, might cause problems: "
 msgstr "Неизвестная версия AAPT. Это может сломать сборку: "
 
+#: ../fdroidserver/lint.py
+msgid "Unlinkified link - use [http://foo.bar Link title] or [http://foo.bar]"
+msgstr "Неверный формат ссылки. Правильно вот так: [http://foo.bar текст-ссылки] или [http://foo.bar]"
+
 #: ../fdroidserver/lint.py
 msgid "Unnecessary leading space"
 msgstr "Лишний пробел в начале строки"
@@ -1860,12 +1825,20 @@ msgstr "Лишний пробел в конце строки"
 msgid "Unrecognised app field '{fieldname}' in '{path}'"
 msgstr "Неизвестное поле приложения '{fieldname}' в '{path}'"
 
+#: ../fdroidserver/metadata.py
+msgid "Unrecognised app field: "
+msgstr "Неизвестное поле в файле метаданных приложения: "
+
 #: ../fdroidserver/metadata.py
 #, python-brace-format
 msgid "Unrecognised build flag '{build_flag}' in '{path}'"
 msgstr "Неизвестный флаг сборки '{build_flag}' в '{path}'"
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Unrecognised field '{field}' in {linedesc}"
+msgstr "Неизвестное поле '{field}' в '{linedesc}'"
+
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Unsupported file type \"{extension}\" for repo graphic"
@@ -1876,6 +1849,29 @@ msgstr "Формат изображений \"{extension}\" не поддерж
 msgid "Unsupported graphics file found: {path}"
 msgstr "Обнаружены изображения в неверном формате: {path}"
 
+#: ../fdroidserver/rewritemeta.py
+#, python-brace-format
+msgid "Unsupported metadata format, use: --to [{supported}]"
+msgstr "Формат метаданных не поддерживается, выберите любой другой из списка: --to [{supported}]"
+
+#: ../fdroidserver/metadata.py
+msgid "Unterminated ]"
+msgstr "Пропущена одинарная закрывающая скобка ]"
+
+#: ../fdroidserver/metadata.py
+msgid "Unterminated ]]"
+msgstr "Пропущены двойные закрывающие скобки ]]"
+
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Unterminated build in {name}"
+msgstr "Неполная команда для запуска сборки в {name}"
+
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Unterminated continuation in {name}"
+msgstr "Незавершенное продолжение строки в {name}"
+
 #: ../fdroidserver/lint.py
 #, python-format
 msgid "Unused extlib at %s"
@@ -1887,34 +1883,36 @@ msgid "Unused file at %s"
 msgstr "Файл не ипользуется %s"
 
 #: ../fdroidserver/scanner.py
-#, python-format
+#, fuzzy, python-format
 msgid "Unused scandelete path: %s"
-msgstr "Неиспользованный scandelete-путь: %s"
+msgstr "Файл не ипользуется %s"
 
 #: ../fdroidserver/scanner.py
-#, python-format
+#, fuzzy, python-format
 msgid "Unused scanignore path: %s"
-msgstr "Неиспользованный scanignore-путь: %s"
+msgstr "Файл не ипользуется %s"
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Update repo information for new packages"
 msgstr "Обновить информацию о репозитории для новых пакетов"
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Update the binary transparency log for a URL"
 msgstr "Обновить лог степени прозрачности (binary transparency log) для URL-адреса"
 
+#: ../fdroid ../fdroidserver/__main__.py
+msgid "Update the stats of the repo"
+msgstr "Обновить статистику репозитория"
+
+#: ../fdroidserver/update.py ../fdroidserver/build.py
+msgid "Update the wiki"
+msgstr "Обновить вики"
+
 #: ../fdroidserver/checkupdates.py
 #, python-brace-format
 msgid "UpdateCheckData has invalid URL: {url}"
 msgstr "UpdateCheckData содержит некорректный URL-адрес: {url}"
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "UpdateCheckData must match the version code as integer (\\d or [0-9]): {codeex}"
-msgstr "UpdateCheckData должен соответствовать коду версии как целое число (\\d или [0-9]): {codeex}"
-
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "UpdateCheckData must use HTTPS URL: {url}"
@@ -1926,27 +1924,44 @@ msgid "UpdateCheckData not a valid URL: {url}"
 msgstr "UpdateCheckData содержит некорректный URL-адрес: {url}"
 
 #: ../fdroidserver/lint.py
-msgid "UpdateCheckMode is set but it looks like checkupdates hasn't been run yet."
-msgstr "UpdateCheckMode установлен, но похоже, что checkupdates еще не запущен."
+msgid "UpdateCheckMode is set but it looks like checkupdates hasn't been run yet"
+msgstr "Режим проверки обновлений (Update Check Mode) выбран, но проверка еще ни разу не выполнялась"
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
+#. Translators: https://developer.android.com/studio/build/application-id
 #: ../fdroidserver/lint.py
+#, fuzzy
+msgid "UpdateCheckName is set to the known application ID - it can be removed"
+msgstr "Имя приложения для проверки обновлений (Update Check Name) соответствует app id. Это поле можно удалить"
+
+#: ../fdroidserver/lint.py
+#, fuzzy
 msgid "UpdateCheckName is set to the known application ID, it can be removed"
-msgstr "Имя приложения для проверки обновлений (UpdateCheckName) соответствует ID приложения — это поле можно удалить"
+msgstr "Имя приложения для проверки обновлений (Update Check Name) соответствует app id. Это поле можно удалить"
 
 #: ../fdroidserver/deploy.py
 #, python-brace-format
 msgid "Uploading {apkfilename} to androidobservatory.org"
-msgstr "Загрузка {apkfilename} на androidobservatory.org"
+msgstr ""
 
 #: ../fdroidserver/deploy.py
-#, python-brace-format
+#, fuzzy, python-brace-format
 msgid "Uploading {apkfilename} to virustotal"
-msgstr "Загрузка {apkfilename} на virustotal"
+msgstr "Чтение {apkfilename} из кеша"
+
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "Usage"
+msgstr "Использование"
+
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, python-format
+msgid "Usage: %s\n"
+msgstr "Использование: %s\n"
 
 #: ../fdroidserver/lint.py
-msgid "Use /HEAD instead of /master or /main to point at a file in the default branch"
-msgstr "Используйте /HEAD вместо /master или /main, чтобы указать на файл в ветке по умолчанию"
+msgid "Use /HEAD instead of /master to point at a file in the default branch"
+msgstr "Указывайте /HEAD, а не /master, ссылаясь на файл в ветке по умолчанию"
 
 #: ../fdroidserver/update.py
 msgid "Use `fdroid update -c` to create it."
@@ -1960,53 +1975,42 @@ msgstr "Использовать сервер сборки"
 msgid "Use date from APK instead of current time for newly added APKs"
 msgstr "Использовать время date из APK вместо текущего при добавлении новых APK"
 
-#: ../fdroidserver/deploy.py
+msgid "Use date from apk instead of current time for newly added apks"
+msgstr "Использовать время date из APK вместо текущего при добавлении новых APK"
+
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Using \"{path}\" for configuring s3cmd."
 msgstr "Для конфигурации s3cmd используется \"{path}\"."
 
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Using \"{path}\" for syncing with remote storage."
-msgstr "Для синхронизации с удаленным хранилищем используется путь \"{path}\"."
-
 #: ../fdroidserver/common.py
 msgid "Using APK Signature v2"
-msgstr "Используется схема подписи APK v2"
+msgstr ""
 
 #: ../fdroidserver/common.py
 msgid "Using APK Signature v3"
-msgstr "Используется схема подписи APK v3"
-
-#: ../fdroidserver/common.py
-msgid "Using JAR Signature"
-msgstr "Использование подписи JAR"
+msgstr ""
 
 #: ../fdroidserver/common.py
 msgid "Using Java's jarsigner, not recommended for verifying APKs! Use apksigner"
 msgstr "Проверка APK с помощью Java jarsigner. Так делать не следует! Пользуйтесь для этого apksigner"
 
-#: ../fdroidserver/metadata.py
+#: ../fdroidserver/common.py
 #, python-brace-format
-msgid "Using blank dictionary instead of contents of {path}!"
-msgstr "Использование пустого словаря вместо содержимого {path}!"
+msgid "Using androguard from \"{path}\""
+msgstr "Запуск androguard из \"{path}\""
 
 #: ../fdroidserver/init.py
 #, python-brace-format
 msgid "Using existing keystore \"{path}\""
 msgstr "Используются ключи из \"{path}\""
 
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Using rclone to sync with: {url}"
-msgstr "Используется rclone для синхронизации с: {url}"
-
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Using s3cmd to sync with: {url}"
-msgstr "Используется s3cmd для синхронизации с: {url}"
+msgstr "s3cmd синхронизация с: {url}"
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Valid commands are:"
 msgstr "Допустимые команды:"
 
@@ -2014,55 +2018,33 @@ msgstr "Допустимые команды:"
 msgid "Verify against locally cached copy rather than redownloading."
 msgstr "Сверяться с закешированной копией вместо того, чтобы загружать еще раз."
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Verify the integrity of downloaded packages"
-msgstr "Проверить целостность загруженных пакетов"
+msgstr "Проверить загруженные пакеты на повреждения"
 
 #: ../fdroidserver/index.py
 msgid "Verifying index signature:"
 msgstr "Проверка подписи индекса:"
 
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "Verifying package {path} with apksigner."
-msgstr "Проверка пакета {path} с помощью apksigner."
-
 #: ../fdroidserver/deploy.py
 #, python-brace-format
 msgid "VirusTotal API key cannot upload files larger than 32MB, use {url} to upload {path}."
-msgstr "Через API VirusTotal нельзя загрузить файлы больше 32MB, загрузите {path} на {url} самостоятельно."
-
-#: ../fdroidserver/nightly.py
-msgid "WARNING: only public git repos are supported!"
 msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Warn about possible metadata errors"
 msgstr "Предупреждать о возможных ошибках в метаданных"
 
-#: ../fdroidserver/scanner.py
-msgid "WebAssembly binary file"
-msgstr "Двоичный файл WebAssembly"
-
 #: ../fdroidserver/update.py
 msgid "When configured for signed indexes, create only unsigned indexes at this stage"
-msgstr "Даже если в конфигурации сборки задано подписывать индексы, то все равно cоздавать неподписанные индексы (только на данном этапе)"
+msgstr "Если в конфигурации сборки задано подписывать индексы, опция позволяет вместо этого создавать неподписанные индексы"
 
 #: ../fdroidserver/lint.py
 msgid "When linting the entire repository yamllint is disabled by default. This option forces yamllint regardless."
-msgstr "При проверке целого репозитория, yamllint по умолчанию отключен. Этот параметр принудительно включает yamllint."
+msgstr ""
 
-#: ../fdroidserver/publish.py
-msgid "When signing or verifying fails, exit with an error code."
-msgstr "При неудачном подписании или проверке выйдите с кодом ошибки."
-
-#: ../fdroidserver/install.py
-msgid "Would you like to download and install F-Droid.apk via adb? (YES/no)"
-msgstr "Вы хотите скачать и установить F-Droid.apk через adb? (ДА/нет)"
-
-#: ../fdroidserver/install.py
-msgid "Would you like to download the app(s) from f-droid.org? (YES/no)"
-msgstr "Хотите ли вы загрузить приложение(я) с сайта f-droid.org? (ДА/нет)"
+msgid "X.509 'Distiguished Name' used when generating keys"
+msgstr "При генерации ключей использовалось различимое имя (Distinguished Name) стандарта X.509"
 
 #: ../fdroidserver/init.py
 msgid "X.509 'Distinguished Name' used when generating keys"
@@ -2074,12 +2056,7 @@ msgstr "Путь к SDK можно указать в переменной ANDROI
 
 #: ../fdroidserver/scanner.py
 msgid "ZIP file archive"
-msgstr "Архив ZIP"
-
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "adb reports {serial} is \"{status}\"!"
-msgstr "adb сообщает, что устройство «{serial}» находится в состоянии «{status}»!"
+msgstr ""
 
 #: ../fdroidserver/nightly.py
 #, python-brace-format
@@ -2091,78 +2068,87 @@ msgstr "добавление IdentiyFile в {path}"
 msgid "adding to {name}: {path}"
 msgstr "добавление в {name}:{path}"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "ambiguous option: %(option)s could match %(matches)s"
 msgstr "неоднозначный выбор: %(option)s совпадает с %(matches)s"
 
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "apksigner in build-tools;{version} passes APKs with invalid v3 signatures, ignoring."
-msgstr "apksigner из build-tools;{version} пропускает APK-пакеты с некорректными подписями v3; проигнорировано."
-
-#: ../fdroidserver/common.py
-msgid "apksigner not found! Cannot sign or verify modern APKs"
-msgstr "apksigner не найден! Невозможно подписать или проверить актуальные APK-файлы"
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, python-format
+msgid "ambiguous option: %s (%s?)"
+msgstr "неоднозначный выбор: %s (%s?)"
 
 #: ../fdroidserver/common.py
 msgid "apksigner not found, it's required for signing!"
-msgstr "apksigner не найден, он необходим для создания подписи!"
+msgstr ""
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/checkupdates.py ../fdroidserver/lint.py
-#: ../fdroidserver/rewritemeta.py
+#: ../fdroidserver/lint.py ../fdroidserver/rewritemeta.py
+#: ../fdroidserver/checkupdates.py
+#, fuzzy
 msgid "application ID of file to operate on"
-msgstr "ID приложения того файла, с которым будут производится операции"
+msgstr "applicationId для проверки обновлений"
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/build.py ../fdroidserver/install.py
-#: ../fdroidserver/publish.py ../fdroidserver/scanner.py
-#: ../fdroidserver/verify.py
+#: ../fdroidserver/verify.py ../fdroidserver/publish.py
+#: ../fdroidserver/build.py ../fdroidserver/scanner.py
+#: ../fdroidserver/install.py
+#, fuzzy
 msgid "application ID with optional versionCode in the form APPID[:VERCODE]"
-msgstr "ID приложения и внутренняя версия приложения (versionCode) в виде APPID[:VERCODE]"
+msgstr "applicationId и внутренняя версия приложения (versionCode) в виде APPID[:VERCODE]"
 
-#: ../fdroidserver/common.py
-msgid "archive_url needs to end with /archive"
-msgstr "archive_url должен оканчиваться «/archive»"
+#: ../fdroidserver/lint.py ../fdroidserver/rewritemeta.py
+msgid "applicationId in the form APPID"
+msgstr "applicationId в виде APPID"
 
-#: /usr/lib/python3.11/argparse.py
+#: ../fdroidserver/checkupdates.py
+msgid "applicationId to check for updates"
+msgstr "applicationId для проверки обновлений"
+
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
+#: ../fdroidserver/verify.py ../fdroidserver/publish.py
+#: ../fdroidserver/dscanner.py ../fdroidserver/build.py
+#: ../fdroidserver/scanner.py ../fdroidserver/install.py
+msgid "applicationId with optional versionCode in the form APPID[:VERCODE]"
+msgstr "applicationId и внутренняя версия приложения (versionCode) в виде APPID[:VERCODE]"
+
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "argument \"-\" with mode %r"
 msgstr "аргумент \"-\" c режимом %r"
 
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "argument %(argument_name)s: %(message)s"
-msgstr "аргумент %(argument_name)s: %(message)s"
+#: ../fdroidserver/nightly.py
+#, fuzzy
+msgid "attempting bare SSH connection to test deploy key:"
+msgstr "попытка установить SSH соединение для проверки ключа развертывания:"
 
 #: ../fdroidserver/nightly.py
-msgid "attempting bare SSH connection to test deploy key:"
-msgstr "попытка установить голое SSH-соединение для проверки ключа развертывания:"
+msgid "attempting bare ssh connection to test deploy key:"
+msgstr "попытка установить SSH соединение для проверки ключа развертывания:"
 
 #: ../fdroidserver/common.py
 msgid "can not parse scrlib spec (not a string): '{}'"
-msgstr "не удалось разобрать спецификацию scrlib (не является строкой): '{}'"
+msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
-msgid "can't open '%(filename)s': %(error)s"
-msgstr "не удается открыть '%(filename)s': %(error)s"
-
-#: ../fdroidserver/scanner.py
-msgid "can't open non-https url: '{};"
-msgstr "не удалось открыть не-https url: '{};"
+msgid "can't open '%s': %s"
+msgstr "не получается открыть '%s': %s"
 
 #: ../fdroidserver/build.py
-#, python-brace-format
+#, fuzzy, python-brace-format
 msgid "cannot find required srclibs: \"{path}\""
-msgstr "не удалось найти необходимые srclibs: {path}"
+msgstr "По указанному пути {path} не удалось найти appid!"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "cannot have multiple subparser arguments"
 msgstr "у субпарсера должен быть только один аргумент"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "cannot merge actions - two groups are named %r"
 msgstr "не получается объединить действия: указаны две группы %r"
@@ -2176,11 +2162,21 @@ msgstr "не получается опубликовать обновление.
 msgid "cloning {url}"
 msgstr "клонирование {url}"
 
+#: ../fdroidserver/deploy.py
+msgid "command to execute, either 'init' or 'update'"
+msgstr "выполняемая команда, 'init' или 'update'"
+
 #: ../fdroidserver/__main__.py
 msgid "commands from plugin modules:"
-msgstr "Команды из подключаемых модулей:"
+msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "complex"
+msgstr "complex"
+
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "conflicting option string: %s"
 msgid_plural "conflicting option strings: %s"
@@ -2188,71 +2184,56 @@ msgstr[0] "конфликтующая строка: %s"
 msgstr[1] "кофликтующие строки: %s"
 msgstr[2] "конфликтующих строк: %s"
 
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "conflicting subparser alias: %s"
-msgstr "конфликтный псевдоним субпарсера: %s"
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "conflicting subparser: %s"
-msgstr "конфликтный субпарсер:%s"
+#: ../fdroidserver/nightly.py
+#, python-brace-format
+msgid "copying {apkfilename} into {path}"
+msgstr "копирование {apkfilename} в {path}"
 
 #: ../fdroidserver/metadata.py
 #, python-brace-format
 msgid "could not parse '{path}'"
-msgstr "не удалось разобрать '{path}'"
-
-#: ../fdroidserver/common.py
-msgid "could not parse srclib spec (no name specified): '{}'"
-msgstr "не удалось разобрать srclib spec (не указано имя): '{}'"
+msgstr ""
 
 #: ../fdroidserver/common.py
 msgid "could not parse srclib spec (no ref specified): '{}'"
-msgstr "не удалось разобрать спецификацию scrlib (не задана ссылка): '{}'"
+msgstr ""
+
+#: ../fdroidserver/common.py
+msgid "could not parse srclib spec (too many '@' signs): '{}'"
+msgstr ""
 
 #: ../fdroidserver/nightly.py
 #, python-brace-format
 msgid "created {path}"
 msgstr "создан {path}"
 
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "current version is newer: old vercode={old}, new vercode={new}"
-msgstr "текущая версия новее: old vercode={old}, new vercode={new}"
-
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "deleting: repo/{apkfilename}"
 msgstr "удаление: repo/{apkfilename}"
 
-#: ../fdroidserver/scanner.py
-msgid "dependency file without lock"
-msgstr "файл зависимостей без блокировки"
+#: ../fdroidserver/common.py
+#, python-brace-format
+msgid "deployed build logs to '{path}'"
+msgstr "логи сборки загружены в '{path}'"
 
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "deployed process log {path} to {dest}"
-msgstr "лог {path} загружен на {dest}"
+msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "dest= is required for options like %r"
-msgstr "для параметра %r необходимо указать dest="
-
-#: ../fdroidserver/scanner.py
-msgid "downloading '{}'"
-msgstr "загрузка '{}'"
-
-#: ../fdroidserver/scanner.py
-msgid "downloading scanner signatures from '{}' failed"
-msgstr "не удалось загрузить подписи сканера с '{}'"
+msgstr "для опции %r необходимо указать dest="
 
 #: ../fdroidserver/scanner.py
 msgid "executable binary, possibly code"
-msgstr "исполняемый бинарный файл, возможно код"
+msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "expected %s argument"
 msgid_plural "expected %s arguments"
@@ -2260,25 +2241,42 @@ msgstr[0] "необходимо указать %s аргумент"
 msgstr[1] "необходимо указать %s аргумента"
 msgstr[2] "необходимо указать %s аргументов"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "expected at least one argument"
 msgstr "необходимо указать хотя бы один аргумент"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "expected at most one argument"
 msgstr "можно указать только один аргумент"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "expected one argument"
 msgstr "можно указать только один аргумент"
 
-#: ../fdroidserver/__main__.py
+#: ../fdroidserver/common.py
+#, python-brace-format
+msgid "failed deploying build logs to '{path}'"
+msgstr "не получается загрузить логи сборки в '{path}'"
+
+#: ../fdroid
+msgid "fdroid [-h|--help|--version] <command> [<args>]"
+msgstr "fdroid [-h|--help|--version] <команда> [<аргументы>]"
+
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "fdroid [<command>] [-h|--help|--version|<args>]"
 msgstr "fdroid [<команда>] [-h|--help|--version|<аргументы>]"
 
-#: ../fdroidserver/scanner.py
-msgid "fetch the latest version of signatures from the web"
-msgstr "получить последнюю версию подписей из интернета"
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "floating-point"
+msgstr "с плавающей запятой"
+
+#: ../fdroidserver/metadata.py
+msgid "force errors to be warnings, or ignore"
+msgstr "Обрабатывать ошибки как предупреждения или игнорировать"
 
 #: ../fdroidserver/metadata.py
 msgid "force metadata errors (default) to be warnings, or to be ignored."
@@ -2290,9 +2288,10 @@ msgstr "команда git svn clone не выполнена"
 
 #: ../fdroidserver/scanner.py
 msgid "gzip file archive"
-msgstr "архив gzip"
+msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "ignored explicit argument %r"
 msgstr "указанный аргумент %r проигнорирован"
@@ -2301,38 +2300,34 @@ msgstr "указанный аргумент %r проигнорирован"
 msgid "index-v1 must have a signature, use `fdroid signindex` to create it!"
 msgstr "index-v1 должен быть подписан, сделайте это с помощью `fdroid signindex`!"
 
-#: ../fdroidserver/index.py
-msgid "index-v2 must have a signature, use `fdroid signindex` to create it!"
-msgstr "index-v2 должен быть подписан, сделайте это с помощью `fdroid signindex`!"
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "integer"
+msgstr "число"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "invalid %(type)s value: %(value)r"
 msgstr "неверное %(type)s значение: %(value)r"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "invalid choice: %(value)r (choose from %(choices)s)"
 msgstr "неверный выбор: %(value)r (следует выбрать из %(choices)s)"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "invalid conflict_resolution value: %r"
 msgstr "неверное значение conflict_resolution: %r"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "invalid option string %(option)r: must start with a character %(prefix_chars)r"
-msgstr "неверный синтаксис в строке параметра %(option)r: она должна начинаться с символа %(prefix_chars)r"
-
-#: ../fdroidserver/common.py
-msgid "ipfs_cid not found, skipping CIDv1 generation"
-msgstr "ipfs_cid не найдено, пропускаем генерацию CIDv1"
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "latest build recipe is newer: old vercode={old}, new vercode={new}"
-msgstr "рецепт последней сборки более новый: old vercode={old}, new vercode={new}"
+msgstr "неверный синтаксис в строке опции %(option)r: она должна начинаться с символа %(prefix_chars)r"
 
 #: ../fdroidserver/deploy.py
 #, python-brace-format
@@ -2352,20 +2347,11 @@ msgstr "local_copy_dir должна быть директорией, а не ф
 msgid "mirror '%s' does not end with 'fdroid'!"
 msgstr "адрес зеркала '%s' должен заканчиваться 'fdroid'!"
 
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "mirrors set twice, in config.yml and {path}!"
-msgstr "Зеркала установлены дважды, в config.yml и {path}!"
-
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "mutually exclusive arguments must be optional"
 msgstr "взаимоисключающие аргументы не должны быть обязательными"
 
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "next {name} cache update due in {time}"
-msgstr "следующее обновление кэша {name} должно произойти {time}"
-
 #: ../fdroidserver/mirror.py
 #, python-brace-format
 msgid "no \"icon\" in {appid}"
@@ -2375,89 +2361,141 @@ msgstr "{appid} не содержит поля \"icon\""
 msgid "no APK supplied"
 msgstr "APK файл не указан"
 
-#: ../fdroidserver/checkupdates.py
-msgid "no version information found"
-msgstr "информация о версии не найдена"
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, python-format
+msgid "no such option: %s"
+msgstr "такой опции нет: %s"
 
-#: /usr/lib/python3.11/argparse.py
+#: ../fdroid ../fdroidserver/__main__.py
+msgid "no version info found!"
+msgstr "определить версию не удалось!"
+
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "not allowed with argument %s"
 msgstr "недопустимо с аргументом %s"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "one of the arguments %s is required"
 msgstr "необходимо указать хотя бы один аргумент из списка %s"
 
-#: ../fdroidserver/common.py ../fdroidserver/index.py
+#: ../fdroidserver/index.py ../fdroidserver/common.py
 msgid "only accepts strings, lists, and tuples"
 msgstr "принимает строки, списки и туплы"
 
-#: /usr/lib/python3.11/argparse.py
-msgid "options"
-msgstr "параметры"
+#: ../fdroidserver/install.py
+#, python-format
+msgid "option %s: If you really want to install all the signed apps, use --all"
+msgstr "опция %s: для того, чтобы установить все подписанные приложения, добавьте --all"
+
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, python-format
+msgid "option %s: invalid %s value: %r"
+msgstr "опция %s: неверное %s значение: %r"
+
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, python-format
+msgid "option %s: invalid choice: %r (choose from %s)"
+msgstr "опция %s: неверный выбор: %r (следует выбрать из %s)"
+
+#: /usr/lib/python3.5/getopt.py /usr/lib/python3.6/getopt.py
+#: /usr/lib/python3.7/getopt.py
+#, python-format
+msgid "option -%s not recognized"
+msgstr "параметр -%s не распознан"
+
+#: /usr/lib/python3.5/getopt.py /usr/lib/python3.6/getopt.py
+#: /usr/lib/python3.7/getopt.py
+#, python-format
+msgid "option -%s requires argument"
+msgstr "параметр -%s требует аргумент"
+
+#: /usr/lib/python3.5/getopt.py /usr/lib/python3.6/getopt.py
+#: /usr/lib/python3.7/getopt.py
+#, python-format
+msgid "option --%s must not have an argument"
+msgstr "параметру --%s не нужны аргументы"
+
+#: /usr/lib/python3.5/getopt.py /usr/lib/python3.6/getopt.py
+#: /usr/lib/python3.7/getopt.py
+#, python-format
+msgid "option --%s not a unique prefix"
+msgstr "параметр --%s не является уникальным префиксом"
+
+#: /usr/lib/python3.5/getopt.py /usr/lib/python3.6/getopt.py
+#: /usr/lib/python3.7/getopt.py
+#, python-format
+msgid "option --%s not recognized"
+msgstr "параметр --%s не распознан"
+
+#: /usr/lib/python3.5/getopt.py /usr/lib/python3.6/getopt.py
+#: /usr/lib/python3.7/getopt.py
+#, python-format
+msgid "option --%s requires argument"
+msgstr "параметру --%s нужен аргумент"
+
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
+msgid "optional arguments"
+msgstr "необязательные аргументы"
 
 #: ../fdroidserver/nightly.py
 #, python-brace-format
 msgid "overwriting existing {path}"
 msgstr "перезапись существующего пути {path}"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "positional arguments"
 msgstr "позиционные аргументы"
 
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "process log deploy {path} to {dest} failed!"
-msgstr "Не удалось загрузить лог {path} на {dest}!"
-
-#: ../fdroidserver/build.py
-msgid "reference binary missing signature"
-msgstr "эталонный двоичный файл с отсутствующей подписью"
+msgstr ""
 
 #: ../fdroidserver/signatures.py
 #, python-brace-format
 msgid "refuse downloading via insecure HTTP connection (use HTTPS or specify --no-https-check): {apkfilename}"
 msgstr "использовать для загрузки небезопасное HTTP-соединение не стоит (пользуйтесь HTTPS или укажите --no-https-check): {apkfilename}"
 
+#: ../fdroidserver/signatures.py
+#, python-brace-format
+msgid "refuse downloading via insecure http connection (use https or specify --no-https-check): {apkfilename}"
+msgstr "использовать для загрузки небезопасное HTTP-соединение не стоит (пользуйтесь HTTPS или укажите --no-https-check): {apkfilename}"
+
 #: ../fdroidserver/index.py
 #, python-format
-msgid "repo_icon \"repo/icons/%s\" does not exist, generating placeholder."
-msgstr "значок репозитория (repo_icon) 'repo/icons/%s' не существует, генерируется суррогат."
+msgid "repo_icon %s does not exist, generating placeholder."
+msgstr ""
 
-#: ../fdroidserver/common.py
-msgid "repo_url needs to end with /repo"
-msgstr "repo_url должен оканчиваться «/repo»"
+#: ../fdroidserver/metadata.py
+msgid "ruamel.yaml not installed, can not write metadata."
+msgstr ""
 
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "rsync is missing or broken: {error}"
-msgstr "rsync отсутствует или сломан: {error}"
-
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "s3cmd sync indexes {path} to {url} and delete"
 msgstr "s3cmd синхронизировать индексы из {path} в {url} и удалить их"
 
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "s3cmd syncs indexes from {path} to {url} and deletes removed"
-msgstr "s3cmd синхронизирует индексы из {path} в {url} и удаляет стертые"
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "scanner cache is malformed! You can clear it with: '{clear}'"
-msgstr "кэш сканера поврежден! Вы можете очистить его с помощью: '{clear}'"
-
-#: ../fdroidserver/deploy.py
-msgid "serverwebroot: path does not end with \"fdroid\", perhaps you meant one of these:"
-msgstr "serverwebroot: путь не заканчивается на \"fdroid\", возможно, вы имели в виду что-то из этого:"
-
 #: ../fdroidserver/scanner.py
 msgid "shared library"
-msgstr "разделяемая библиотека"
+msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "show program's version number and exit"
+msgstr "показать номер версии программы и выйти"
+
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.5/optparse.py
+#: /usr/lib/python3.6/argparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/argparse.py /usr/lib/python3.7/optparse.py
 msgid "show this help message and exit"
 msgstr "показать это справочное сообщение и выйти"
 
@@ -2484,33 +2522,33 @@ msgstr "библиотеки srclib: имя отсутствует или не 
 
 #: ../fdroidserver/scanner.py
 msgid "static library"
-msgstr "статическая библиотека"
+msgstr ""
 
-#: ../fdroidserver/build.py
+#: ../fdroidserver/common.py
 #, python-brace-format
-msgid "supplied reference binary has allowed signer {signer}"
-msgstr "предоставленный эталонный двоичный файл разрешил подписанту {signer}"
+msgid "supplied timestamp value '{timestamp}' is not a unix timestamp"
+msgstr "указанная метка времени '{timestamp}' противоречит формату, принятому в UNIX"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "the following arguments are required: %s"
 msgstr "требуются аргументы: %s"
 
-#: ../fdroidserver/install.py
-msgid "true"
-msgstr "истина"
-
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "unexpected option string: %s"
 msgstr "неизвестная строка параметра: %s"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "unknown parser %(parser_name)r (choices: %(choices)s)"
 msgstr "неизвестный парсер %(parser_name)r (следует выбрать из %(choices)s)"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "unrecognized arguments: %s"
 msgstr "неизвестные аргументы: %s"
@@ -2520,11 +2558,16 @@ msgstr "неизвестные аргументы: %s"
 msgid "unsafe permissions on '{config_file}' (should be 0600)!"
 msgstr "небезопасные права доступа к файлу '{config_file}' (должны быть 0600)!"
 
-#: ../fdroidserver/__main__.py /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py ../fdroid
+#: /usr/lib/python3.7/argparse.py ../fdroidserver/__main__.py
 msgid "usage: "
 msgstr "использование: "
 
-#: ../fdroidserver/deploy.py
+#: ../fdroid
+msgid "usage: fdroid [-h|--help|--version] <command> [<args>]"
+msgstr "использование: fdroid [-h|--help|--version] <команда> [<args>]"
+
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "using Apache libcloud to sync with {url}"
 msgstr "Аpache libcloud: синхронизация с {url}"
@@ -2533,9 +2576,9 @@ msgstr "Аpache libcloud: синхронизация с {url}"
 msgid "virustotal.com is rate limiting, waiting to retry..."
 msgstr "virustotal.com ограничивает траффик, ждем повторной попытки..."
 
-#: ../fdroidserver/install.py
-msgid "yes"
-msgstr "да"
+#: ../fdroidserver/update.py
+msgid "wiki support is deprecated and will be removed in the next release!"
+msgstr ""
 
 #: ../fdroidserver/publish.py
 #, python-brace-format
@@ -2550,39 +2593,47 @@ msgstr[2] "{0} приложений, {1} алиасов ключей для по
 msgid "{apkfilename} ({appid}) has no metadata!"
 msgstr "Не обнаружено метаданных для {apkfilename} ({appid})!"
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
+#: ../fdroidserver/update.py
+#, python-brace-format
+msgid "{apkfilename} has multiple {name} files, looks like Master Key exploit!"
+msgstr "У {apkfilename} несколько файлов {name}. Выглядит подозрительно и похоже на попытку нарушения безопасности (Master Key exploit)!"
+
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "{apkfilename}'s AndroidManifest.xml has a bad date: "
 msgstr "AndroidManifest.xml приложения {apkfilename} содержит неверную дату: "
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
 #: ../fdroidserver/update.py
-#, python-brace-format
+#, fuzzy, python-brace-format
 msgid "{appid} does not have a name! Using application ID instead."
-msgstr "У {appid} нет имени! Будет использовано ID приложения."
+msgstr "У {appid} нет имени! Будет использовано имя пакета."
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
 #: ../fdroidserver/update.py
 #, python-brace-format
+msgid "{appid} does not have a name! Using package name instead."
+msgstr "У {appid} нет имени! Будет использовано имя пакета."
+
+#: ../fdroidserver/update.py
+#, python-brace-format
+msgid "{appid} from {path} is not a valid Android Package Name!"
+msgstr "{appid} из {path} не годится в качестве имени пакета Android!"
+
+#: ../fdroidserver/update.py
+#, fuzzy, python-brace-format
 msgid "{appid} from {path} is not a valid Android application ID!"
-msgstr "{appid} из {path} не годится в качестве ID приложения Android!"
+msgstr "{appid} из {path} не годится в качестве имени пакета Android!"
 
 #: ../fdroidserver/metadata.py ../fdroidserver/update.py
 #, python-brace-format
 msgid "{appid} from {path} is not a valid Java Package Name!"
 msgstr "{appid} из {path} не годится в качестве имени пакета Java!"
 
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{appid} has both APKs and files: {files}"
-msgstr "{appid} содержит как APK, так и файлы: {files}"
-
 #: ../fdroidserver/mirror.py
 #, python-brace-format
 msgid "{appid} is missing {name}"
 msgstr "В {appid} нет {name}"
 
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "{appid}: Unknown extlib {path} in build '{versionName}'"
@@ -2596,7 +2647,7 @@ msgstr "{appid}: ревизия сборки не указана, сборка 
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "{appid}: {field} must be a '{type}', but it is a '{fieldtype}!'"
-msgstr "{appid}: {field} должно быть '{type}', а не '{fieldtype}!'"
+msgstr "{appid}: {field} должно быть '{type}', а не '{fieldtype}'!"
 
 #: ../fdroidserver/lint.py
 #, python-brace-format
@@ -2606,32 +2657,27 @@ msgstr "{appid}: {field} должно быть '{type}', а не '{fieldtype}'!"
 #: ../fdroidserver/metadata.py
 #, python-brace-format
 msgid "{build_flag} must be an integer, found: {value}"
-msgstr "{build_flag} должен быть целым числом, но найдено значение: {value}"
+msgstr ""
 
 #: ../fdroidserver/metadata.py
 #, python-brace-format
-msgid "{build_flag} must be list or string, found: {value}"
-msgstr "{build_flag} должен быть списком или строкой, найдено: {value}"
+msgid "{field} not terminated in {name}"
+msgstr "Неверно заполненное поле {field} в {name}"
 
 #: ../fdroidserver/metadata.py
 #, python-brace-format
 msgid "{file} is blank or corrupt!"
-msgstr "{file} пустой или поврежденный!"
+msgstr ""
 
 #: ../fdroidserver/update.py
 #, python-brace-format
-msgid "{name} \"{section}/icons/{path}\" does not exist! Check \"config.yml\"."
-msgstr "{name}: \"{section}/icons/{path}\" не существует! Поправьте свой \"config.yml\"."
+msgid "{name} \"{path}\" does not exist! Correct it in config.py."
+msgstr "{name}: неверный путь \"{path}\"! Поправьте его в config.py."
 
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{path1} is a duplicate of {path2}, remove one!"
-msgstr "{path1} дублирует {path2}, удалите один!"
-
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 #, python-brace-format
 msgid "{path} already exists, ignoring import results!"
-msgstr "{path} уже существует, результаты импорта игнорируются!"
+msgstr ""
 
 #: ../fdroidserver/nightly.py
 #, python-brace-format
@@ -2643,36 +2689,6 @@ msgstr "{path} не существует! Создайте, выполнив к
 msgid "{path} has bad file signature \"{pattern}\", possible Janus exploit!"
 msgstr "{path}: неверная подпись \"{pattern}\". Выглядит подозрительно и похоже на попытку нарушения безопасности (Janus exploit)!"
 
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "{path} has been flagged by virustotal {count} times:"
-msgstr "{path} был отмечен virustotal {count} раз:"
-
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "{path} has the wrong fingerprint ({fingerprint})!"
-msgstr "У {path} неправильный отпечаток ({fingerprint})!"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "{path} is not \"key: value\" dict, but a {datatype}!"
-msgstr "{path} - это не диктант \"ключ: значение\", а {datatype}!"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "{path} is not a standard config file!"
-msgstr "{path} не является стандартным файлом конфигурации!"
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "{path} is not list, but a {datatype}!"
-msgstr "{path} - это не список, а {datatype}!"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "{path} is not {expected_type}, but a {datatype}!"
-msgstr "{path} - это не {expected_type}, а {datatype}!"
-
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "{path} is zero size!"
@@ -2681,27 +2697,17 @@ msgstr "размер {path} равен нулю!"
 #: ../fdroidserver/deploy.py
 #, python-brace-format
 msgid "{path} more than 200MB, manually upload: {url}"
-msgstr "Размер {path} больше 200MB, загрузите его вручную на {url}"
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "{path}: \"{code}\" is not a valid ISO_3166-1 alpha-2 country code!"
-msgstr "{path}: \"{code}\" не является действительным кодом страны ISO_3166-1 alpha-2!"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{path}: {error}"
-msgstr "{path}: {error}"
+msgstr ""
 
 #: ../fdroidserver/mirror.py
 #, python-brace-format
 msgid "{url} does not end with \"fdroid\", check the URL path!"
 msgstr "Адрес {url} должен заканчиваться на \"fdroid\". Проверьте URL-адрес!"
 
-#: ../fdroidserver/import_subcommand.py
-#, python-brace-format
+#: ../fdroidserver/common.py
+#, fuzzy, python-brace-format
 msgid "{url} does not start with \"http\"!"
-msgstr "Адрес {url} должен начинаться с \"http\"!"
+msgstr "Адрес {url} должен заканчиваться на \"fdroid\". Проверьте URL-адрес!"
 
 #: ../fdroidserver/build.py
 msgid "{} build failed"
@@ -2716,3 +2722,9 @@ msgid_plural "{} builds succeeded"
 msgstr[0] "{} успешная сборка"
 msgstr[1] "{} успешные сборки"
 msgstr[2] "{} успешных сборок"
+
+#~ msgid "Cannot find a packageName for {path}!"
+#~ msgstr "По указанному пути {path} не удалось найти packageName!"
+
+#~ msgid "Cannot find an appid for {path}!"
+#~ msgstr "По указанному пути {path} не удалось найти appid!"
diff --git a/locale/sk/LC_MESSAGES/fdroidserver.po b/locale/sk/LC_MESSAGES/fdroidserver.po
index f3f21800..07e91cbd 100644
--- a/locale/sk/LC_MESSAGES/fdroidserver.po
+++ b/locale/sk/LC_MESSAGES/fdroidserver.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fdroidserver 1.0.6-349-g907c04ea\n"
 "Report-Msgid-Bugs-To: https://gitlab.com/fdroid/fdroidserver/issues\n"
-"POT-Creation-Date: 2025-06-25 09:52+0200\n"
+"POT-Creation-Date: 2020-10-21 18:05+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -15,6 +15,22 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
+#: ../fdroidserver/common.py
+msgid ""
+"\n"
+"        This is a repository of apps to be used with FDroid. Applications in this\n"
+"        repository are either official binaries built by the original application\n"
+"        developers, or are binaries built from source by f-droid.org using the\n"
+"        tools on https://gitlab.com/fdroid.\n"
+"        "
+msgstr ""
+
+#: ../fdroidserver/nightly.py
+msgid ""
+"\n"
+"SSH Public Key to be used as Deploy Key:"
+msgstr ""
+
 #: ../fdroidserver/nightly.py
 msgid ""
 "\n"
@@ -33,26 +49,22 @@ msgstr ""
 msgid "\"%s/\" has no matching metadata file!"
 msgstr ""
 
-#: ../fdroidserver/index.py
-msgid "\"isPrimary\" key should not be added to mirrors!"
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "\"local_copy_dir\" {path} does not exist!"
-msgstr ""
-
 #: ../fdroidserver/install.py
 #, python-brace-format
 msgid "\"{apkfilename}\" is already installed on {dev}."
 msgstr ""
 
+#: ../fdroidserver/update.py
+#, python-brace-format
+msgid "\"{path}\" contains outdated {name} ({version})"
+msgstr ""
+
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "\"{path}\" contains recent {name} ({version})"
 msgstr ""
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "\"{path}\" exists but s3cmd is not installed!"
 msgstr ""
@@ -62,24 +74,34 @@ msgstr ""
 msgid "\"{path}\" is not a supported file format (use: metadata/*.yml)"
 msgstr ""
 
-#: ../fdroidserver/update.py
+#: ../fdroidserver/metadata.py
 #, python-brace-format
-msgid "\"{path}\" is signed by a key that is not allowed:"
+msgid "\"{path}\" is not an accepted format, convert to: {formats}"
 msgstr ""
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/common.py
 #, python-brace-format
 msgid "\"{url}\" is not a valid URL!"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
 #, python-format
-msgid "%(prog)s: error: %(message)s\n"
+msgid "%(option)s option requires %(number)d argument"
+msgid_plural "%(option)s option requires %(number)d arguments"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: ../fdroidserver/mirror.py
+#, python-format
+msgid "%(prog)s [options] url"
 msgstr ""
 
-#: ../fdroidserver/publish.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
-msgid "%d APKs failed to be signed or verified!"
+msgid "%(prog)s: error: %(message)s\n"
 msgstr ""
 
 #: ../fdroidserver/scanner.py
@@ -87,52 +109,63 @@ msgstr ""
 msgid "%d problems found"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "%prog [options]"
+msgstr ""
+
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "%r is not callable"
 msgstr ""
 
-#: ../fdroidserver/signindex.py
-#, python-format
-msgid "%s did not produce a dict!"
-msgstr ""
-
-#: ../fdroidserver/signindex.py
-#, python-format
-msgid "%s has bad SHA-256: %s"
-msgstr ""
-
 #: ../fdroidserver/lint.py
 #, python-format
 msgid "%s is not an accepted build field"
 msgstr ""
 
-#: ../fdroidserver/common.py
-msgid "'keypass' not found in config.yml!"
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, python-format
+msgid "%s option does not take a value"
+msgstr ""
+
+#: ../fdroidserver/index.py ../fdroidserver/common.py
+msgid "'keypass' not found in config.py!"
 msgstr ""
 
 #: ../fdroidserver/common.py
 msgid "'keystore' is NONE and 'smartcardoptions' is blank!"
 msgstr ""
 
-#: ../fdroidserver/common.py
-msgid "'keystore' not found in config.yml!"
+#: ../fdroidserver/index.py ../fdroidserver/common.py
+msgid "'keystore' not found in config.py!"
 msgstr ""
 
-#: ../fdroidserver/common.py
-msgid "'keystorepass' not found in config.yml!"
+#: ../fdroidserver/index.py ../fdroidserver/common.py
+msgid "'keystorepass' not found in config.py!"
 msgstr ""
 
-#: ../fdroidserver/common.py
-msgid "'repo_keyalias' not found in config.yml!"
+#: ../fdroidserver/index.py ../fdroidserver/common.py
+msgid "'repo_keyalias' not found in config.py!"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "'required' is an invalid argument for positionals"
 msgstr ""
 
 #: ../fdroidserver/common.py
-msgid "'sdk_path' not set in config.yml!"
+msgid "'sdk_path' not set in 'config.py'!"
+msgstr ""
+
+#. Translators: "build-tools" is the file name of a package from
+#. Google, it is part of the Android SDK. So it probably shouldn't be
+#. translated or transliterated.
+#: ../fdroidserver/common.py
+#, python-brace-format
+msgid "'{aapt}' is too old, fdroid requires build-tools-23.0.0 or newer!"
 msgstr ""
 
 #: ../fdroidserver/common.py
@@ -140,6 +173,21 @@ msgstr ""
 msgid "'{aapt}' is too old, fdroid requires build-tools-{version} or newer!"
 msgstr ""
 
+#: ../fdroidserver/install.py
+#, python-brace-format
+msgid "'{apkfilename}' is already installed on {dev}."
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "'{field}' in {linedesc} is obsolete, see docs for current fields:"
+msgstr ""
+
+#: ../fdroidserver/common.py
+#, python-brace-format
+msgid "'{field}' will be in random order! Use () or [] brackets if order is important!"
+msgstr ""
+
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "'{path}' failed to execute!"
@@ -147,32 +195,23 @@ msgstr ""
 
 #: ../fdroidserver/metadata.py
 #, python-brace-format
-msgid "'{path}' has invalid format, it should be a dictionary!"
-msgstr ""
-
-#: ../fdroidserver/lint.py ../fdroidserver/metadata.py
-#, python-brace-format
 msgid "'{value}' is not a valid {field} in {appid}. Regex pattern: {pattern}"
 msgstr ""
 
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "'{value}' is not a valid {field}, should be {pattern}"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "--merge-request only runs on a single appid!"
-msgstr ""
-
 #: ../fdroidserver/checkupdates.py
 #, python-brace-format
 msgid "...checkupdate failed for {appid} : {error}"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid ".__call__() not defined"
 msgstr ""
 
+#: ../fdroidserver/metadata.py
+msgid ".fdroid.txt is not supported!  Convert to .fdroid.yml or .fdroid.json."
+msgstr ""
+
 #: ../fdroidserver/lint.py
 msgid "/issues is missing"
 msgstr ""
@@ -181,13 +220,12 @@ msgstr ""
 msgid "A URL is required as an argument!"
 msgstr ""
 
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "APK signatures have different certificates in {path}:"
+#: ../fdroid ../fdroidserver/__main__.py
+msgid "Add PGP signatures using GnuPG for packages in repo"
 msgstr ""
 
-#: ../fdroidserver/__main__.py
-msgid "Add PGP signatures using GnuPG for packages in repo"
+#: ../fdroid ../fdroidserver/__main__.py
+msgid "Add a new application from its source code"
 msgstr ""
 
 #: ../fdroidserver/update.py
@@ -207,11 +245,7 @@ msgstr ""
 msgid "Alias of the repo signing key in the keystore"
 msgstr ""
 
-#: ../fdroidserver/build.py
-msgid "AllowedAPKSigningKeys missing but reference binary supplied"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "Allows a different revision (or git branch) to be specified for the initial import"
 msgstr ""
 
@@ -235,9 +269,13 @@ msgstr ""
 msgid "Android DEX code"
 msgstr ""
 
-#: ../fdroidserver/init.py
+#: ../fdroidserver/common.py ../fdroidserver/build.py
 #, python-brace-format
-msgid "Android SDK not found at {path}!"
+msgid "Android SDK '{path}' does not have '{dirname}' installed!"
+msgstr ""
+
+#: ../fdroidserver/common.py
+msgid "Android SDK not found!"
 msgstr ""
 
 #: ../fdroidserver/common.py
@@ -250,17 +288,16 @@ msgstr ""
 msgid "Android SDK path '{path}' is not a directory!"
 msgstr ""
 
+#. Translators: "build-tools" is the file name of a package from
+#. Google, it is part of the Android SDK. So it probably shouldn't be
+#. translated or transliterated.
 #: ../fdroidserver/common.py
 #, python-brace-format
-msgid "Android SDK tool {cmd} not found!"
+msgid "Android build-tools path '{path}' does not exist!"
 msgstr ""
 
-#: ../fdroidserver/lint.py
-msgid "App has Binaries but does not have corresponding AllowedAPKSigningKeys to pin certificate."
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "App has NoSourceSince or ArchivePolicy \"0 versions\" or 0 but AutoUpdateMode or UpdateCheckMode are not None"
+#: ../fdroidserver/update.py
+msgid "AndroidManifest.xml has no date"
 msgstr ""
 
 #: ../fdroidserver/lint.py
@@ -268,10 +305,6 @@ msgstr ""
 msgid "App is in '{repo}' but has a link to {url}"
 msgstr ""
 
-#: ../fdroidserver/lint.py
-msgid "App version has binary but does not have corresponding AllowedAPKSigningKeys to pin certificate."
-msgstr ""
-
 #: ../fdroidserver/lint.py
 msgid "Appending .git is not necessary"
 msgstr ""
@@ -281,27 +314,11 @@ msgstr ""
 msgid "Archiving {apkfilename} with invalid signature!"
 msgstr ""
 
-#: ../fdroidserver/lint.py
-msgid "AutoUpdateMode with UpdateCheckMode: HTTP must have a pattern."
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "Automatic no to all prompts."
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "Automatic yes to all prompts."
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "Bad entry type \"{mirrortype}\" in mirrors config: {mirror}"
-msgstr ""
-
 #: ../fdroidserver/mirror.py
 msgid "Base URL to mirror, can include the index signing key using the query string: ?fingerprint="
 msgstr ""
 
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "Branch '{branch}' used as commit in build '{versionName}'"
@@ -317,7 +334,7 @@ msgstr ""
 msgid "Broken symlink: {path}"
 msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Build a package from source"
 msgstr ""
 
@@ -337,15 +354,16 @@ msgstr ""
 msgid "Build only the latest version of each package"
 msgstr ""
 
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Build should have comma-separated versionName and versionCode, not \"{value}\", in {linedesc}"
+msgstr ""
+
 #: ../fdroidserver/init.py
 #, python-format
 msgid "Built repo based in \"%s\" with this config:"
 msgstr ""
 
-#: ../fdroidserver/checkupdates.py
-msgid "Can't auto-update app with no CurrentVersionCode"
-msgstr ""
-
 #: ../fdroidserver/build.py
 msgid "Can't build due to {} error while scanning"
 msgid_plural "Can't build due to {} errors while scanning"
@@ -353,9 +371,15 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: ../fdroidserver/common.py
+#: ../fdroidserver/vmtools.py
 #, python-brace-format
-msgid "Cannot read {path}: {error}"
+msgid "Cannot read \"{path}\"!"
+msgstr ""
+
+#. Translators: https://developer.android.com/studio/build/application-id
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Cannot resolve application ID {appid}"
 msgstr ""
 
 #: ../fdroidserver/rewritemeta.py
@@ -363,23 +387,25 @@ msgstr ""
 msgid "Cannot rewrite \"{path}\""
 msgstr ""
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
+#: ../fdroidserver/rewritemeta.py
+msgid "Cannot use --list and --to at the same time"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Cannot write \"{path}\", not an accepted format, use: {formats}"
+msgstr ""
+
 #: ../fdroidserver/lint.py
 #, python-format
 msgid "Categories '%s' is not valid"
 msgstr ""
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
 #: ../fdroidserver/lint.py
 msgid "Categories are not set"
 msgstr ""
 
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "Category \"{category}\" defined but not used for any apps!"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Check for updates to applications"
 msgstr ""
 
@@ -388,20 +414,28 @@ msgstr ""
 msgid "Checking archiving for {appid} - apks:{integer}, keepversions:{keep}, archapks:{arch}"
 msgstr ""
 
+#: ../fdroidserver/dscanner.py
+msgid "Clean after all scans have finished"
+msgstr ""
+
+#: ../fdroidserver/dscanner.py
+msgid "Clean before the scans start and rebuild the container"
+msgstr ""
+
+#: ../fdroidserver/dscanner.py
+msgid "Clean up all containers and then exit"
+msgstr ""
+
 #: ../fdroidserver/update.py
 msgid "Clean update - don't uses caches, reprocess all APKs"
 msgstr ""
 
-#: ../fdroidserver/common.py
-msgid "Color the log output"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "Comma separated list of categories."
 msgstr ""
 
-#: ../fdroidserver/__main__.py
-#, python-format
+#: ../fdroid ../fdroidserver/__main__.py
+#, c-format, python-format
 msgid "Command '%s' not recognised.\n"
 msgstr ""
 
@@ -409,15 +443,6 @@ msgstr ""
 msgid "Commit changes"
 msgstr ""
 
-#: ../fdroidserver/checkupdates.py
-msgid "Commit changes, push, then make a merge request"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Conflicting \"{field}\" definitions between .yml and localized files:"
-msgstr ""
-
 #: ../fdroidserver/__main__.py
 msgid "Conflicting arguments: '--verbose' and '--quiet' can not be specified at the same time."
 msgstr ""
@@ -427,13 +452,11 @@ msgstr ""
 msgid "Could not find '{command}' on your system"
 msgstr ""
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "Could not find latest version code"
 msgstr ""
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "Could not find latest version name"
 msgstr ""
 
@@ -443,8 +466,7 @@ msgid "Could not find {path} to remove it"
 msgstr ""
 
 #: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Could not open APK {path} for analysis: "
+msgid "Could not open apk file for analysis"
 msgstr ""
 
 #: ../fdroidserver/common.py
@@ -452,16 +474,22 @@ msgstr ""
 msgid "Could not parse size \"{size}\", wrong type \"{type}\""
 msgstr ""
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/import_subcommand.py
+#. Translators: https://developer.android.com/studio/build/application-id
+#: ../fdroidserver/import.py
 msgid "Couldn't find Application ID"
 msgstr ""
 
-#: ../fdroidserver/checkupdates.py
-msgid "Couldn't find any version information"
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
+#: ../fdroidserver/import.py
+msgid "Couldn't find latest version code"
 msgstr ""
 
-#: ../fdroidserver/checkupdates.py
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
+#: ../fdroidserver/import.py
+msgid "Couldn't find latest version name"
+msgstr ""
+
+#: ../fdroidserver/import.py
 msgid "Couldn't find package ID"
 msgstr ""
 
@@ -469,26 +497,29 @@ msgstr ""
 msgid "Cowardily refusing to overwrite existing signing key setup!"
 msgstr ""
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/update.py
+msgid "Create a repo signing key in a keystore"
+msgstr ""
+
+#: ../fdroidserver/update.py
+msgid "Create skeleton metadata files that are missing"
+msgstr ""
+
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Created new container \"{name}\""
 msgstr ""
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Creating \"{path}\" for configuring s3cmd."
 msgstr ""
 
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Creating empty {config_file}"
-msgstr ""
-
 #: ../fdroidserver/publish.py
 msgid "Creating log directory"
 msgstr ""
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Creating new S3 bucket: {url}"
 msgstr ""
@@ -501,7 +532,8 @@ msgstr ""
 msgid "Creating signed index with this key (SHA256):"
 msgstr ""
 
-#: ../fdroidserver/publish.py ../fdroidserver/verify.py
+#: ../fdroidserver/import.py ../fdroidserver/verify.py
+#: ../fdroidserver/publish.py
 msgid "Creating temporary directory"
 msgstr ""
 
@@ -547,21 +579,16 @@ msgid "Description has a duplicate line"
 msgstr ""
 
 #: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Description of length {length} is over the {limit} char limit"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Did you mean config/{name}.yml?"
+#, python-format
+msgid "Description has a list (%s) but it isn't bulleted (*) nor numbered (#)"
 msgstr ""
 
 #: ../fdroidserver/lint.py
 #, python-brace-format
-msgid "Did you mean {code}?"
+msgid "Description of length {length} is over the {limit} char limit"
 msgstr ""
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "Do not add 'disable:' to the generated build entries"
 msgstr ""
 
@@ -586,20 +613,25 @@ msgstr ""
 msgid "Don't create a source tarball, useful when testing a build"
 msgstr ""
 
+#: ../fdroidserver/stats.py
+msgid "Don't do anything logs-related"
+msgstr ""
+
 #: ../fdroidserver/build.py
 msgid "Don't refresh the repository, useful when testing a build with no internet connection"
 msgstr ""
 
 #: ../fdroidserver/deploy.py ../fdroidserver/nightly.py
+#: ../fdroidserver/upload.py
 msgid "Don't use rsync checksums"
 msgstr ""
 
-#: ../fdroidserver/install.py
-msgid "Download F-Droid.apk using mirrors that leak less to the network"
+#: ../fdroid ../fdroidserver/__main__.py
+msgid "Download complete mirrors of small repos"
 msgstr ""
 
-#: ../fdroidserver/__main__.py
-msgid "Download complete mirrors of small repos"
+#: ../fdroidserver/stats.py
+msgid "Download logs we don't have"
 msgstr ""
 
 #: ../fdroidserver/common.py
@@ -613,12 +645,7 @@ msgstr ""
 
 #: ../fdroidserver/metadata.py
 #, python-brace-format
-msgid "Duplicate Anti-Feature declaration at {path} was ignored!"
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-format
-msgid "Duplicate entry \"%s\" in mirrors config!"
+msgid "Duplicate build recipe found for versionCode {versionCode} in {linedesc}"
 msgstr ""
 
 #: ../fdroidserver/lint.py
@@ -626,42 +653,27 @@ msgstr ""
 msgid "Duplicate link in '{field}': {url}"
 msgstr ""
 
-#: ../fdroidserver/common.py
-#, python-format
-msgid "ERROR: %(message)s"
+#: ../fdroid
+msgid "Dynamically scan APKs post build"
 msgstr ""
 
 #: ../fdroidserver/__main__.py
 msgid "ERROR: The \"server\" subcommand has been removed, use \"deploy\"!"
 msgstr ""
 
+#: ../fdroidserver/mirror.py
+msgid ""
+"ERROR: this command should never be used to mirror f-droid.org!\n"
+"A full mirror of f-droid.org requires more than 200GB."
+msgstr ""
+
 #: ../fdroidserver/nightly.py
 msgid "ERROR: unsupported CI type, patches welcome!"
 msgstr ""
 
-#: ../fdroidserver/nightly.py
-#, python-format
-msgid "ERROR: unsupported git host \"%s\", patches welcome!"
-msgstr ""
-
-#: ../fdroidserver/lint.py
+#: ../fdroidserver/metadata.py
 #, python-brace-format
-msgid "ERROR: {key} in {path} is not \"archive\" or \"repo\"!"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "ERROR: {key} not a valid key!"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "ERROR: {key}'s value should be of type {t}!"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "ERROR: {key}:{subkey} in {path} is not in allowed keys: {allowed_keys}!"
+msgid "Empty build flag at {linedesc}"
 msgstr ""
 
 #: ../fdroidserver/__main__.py
@@ -676,40 +688,20 @@ msgid ""
 "> "
 msgstr ""
 
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Environment variable {var} from {configname} is not set!"
+#: ../fdroidserver/deploy.py ../fdroidserver/checkupdates.py
+#: ../fdroidserver/upload.py
+#, python-format
+msgid "Error while attempting to publish log: %s"
 msgstr ""
 
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Environment variable {{env: {var}}} is not set!"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "Error deploying 'github_releases', {} not present. (You might need to run `fdroid update` first.)"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py ../fdroidserver/common.py
 msgid "Error while getting repo address"
 msgstr ""
 
-#: ../fdroidserver/scanner.py
-msgid "Exit with a non-zero code if problems were found"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Extract application metadata from a source repository"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Extract signatures from APKs"
 msgstr ""
 
-#: ../fdroidserver/install.py
-msgid "F-Droid.apk could not be downloaded from any known source!"
-msgstr ""
-
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Failed copying {path}: {error}"
@@ -730,23 +722,27 @@ msgstr ""
 msgid "Failed resizing {path}: {error}"
 msgstr ""
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/publish.py
+msgid "Failed to align application"
+msgstr ""
+
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Failed to create S3 bucket: {url}"
 msgstr ""
 
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Failed to get APK information, deleting {path}"
+#: ../fdroidserver/common.py
+msgid "Failed to get APK manifest information"
 msgstr ""
 
 #: ../fdroidserver/update.py
 #, python-brace-format
-msgid "Failed to get APK information, skipping {path}"
+msgid "Failed to get apk information, deleting {path}"
 msgstr ""
 
 #: ../fdroidserver/update.py
-msgid "Failed to get APK signing key fingerprint"
+#, python-brace-format
+msgid "Failed to get apk information, skipping {path}"
 msgstr ""
 
 #: ../fdroidserver/install.py
@@ -754,10 +750,14 @@ msgstr ""
 msgid "Failed to install '{apkfilename}' on {dev}: {error}"
 msgstr ""
 
-#: ../fdroidserver/common.py
+#: ../fdroidserver/publish.py ../fdroidserver/common.py
 msgid "Failed to sign application"
 msgstr ""
 
+#: ../fdroidserver/common.py
+msgid "Failed to zipalign application"
+msgstr ""
+
 #: ../fdroidserver/build.py
 #, python-brace-format
 msgid "Fetched buildserverid from VM: {buildserverid}"
@@ -773,12 +773,21 @@ msgstr ""
 msgid "File disappeared while processing it: {path}"
 msgstr ""
 
-#: ../fdroidserver/build.py ../fdroidserver/install.py
-#: ../fdroidserver/rewritemeta.py ../fdroidserver/scanner.py
-#: ../fdroidserver/update.py
+#: ../fdroidserver/verify.py ../fdroidserver/stats.py ../fdroidserver/update.py
+#: ../fdroidserver/rewritemeta.py ../fdroidserver/build.py
+#: ../fdroidserver/checkupdates.py ../fdroidserver/scanner.py
+#: ../fdroidserver/install.py
 msgid "Finished"
 msgstr ""
 
+#: ../fdroidserver/lint.py
+msgid "Flattr donation methods belong in the FlattrID flag"
+msgstr ""
+
+#: ../fdroidserver/lint.py
+msgid "Flattr donation methods belong in the FlattrID: field"
+msgstr ""
+
 #: ../fdroidserver/lint.py
 msgid "Forbidden HTML tags"
 msgstr ""
@@ -810,6 +819,7 @@ msgstr ""
 msgid "Found invalid appids in arguments"
 msgstr ""
 
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
 #: ../fdroidserver/common.py
 msgid "Found invalid versionCodes for some apps"
 msgstr ""
@@ -819,10 +829,6 @@ msgstr ""
 msgid "Found multiple JAR Signature Block Files in {path}"
 msgstr ""
 
-#: ../fdroidserver/common.py
-msgid "Found multiple Signer Certificates!"
-msgstr ""
-
 #: ../fdroidserver/metadata.py
 #, python-brace-format
 msgid "Found multiple metadata files for {appid}"
@@ -832,6 +838,11 @@ msgstr ""
 msgid "Found multiple signing certificates for repository."
 msgstr ""
 
+#: ../fdroidserver/update.py
+#, python-brace-format
+msgid "Found multiple signing certificates in {path}"
+msgstr ""
+
 #: ../fdroidserver/index.py
 msgid "Found no signing certificates for repository."
 msgstr ""
@@ -846,16 +857,6 @@ msgstr ""
 msgid "Found {apkfilename} at {url}"
 msgstr ""
 
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Found {count} problems in {filename}"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Found {count} warnings in {filename}"
-msgstr ""
-
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Generated skeleton metadata for {appid}"
@@ -874,21 +875,19 @@ msgstr ""
 msgid "Git fetch failed"
 msgstr ""
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
+#: ../fdroidserver/common.py
+msgid "Git remote set-head failed"
+msgstr ""
+
 #: ../fdroidserver/common.py
 #, python-format
 msgid "Git remote set-head failed: \"%s\""
 msgstr ""
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
 #: ../fdroidserver/common.py
 msgid "Git reset failed"
 msgstr ""
 
-#: ../fdroidserver/common.py
-msgid "Git submodule deinit failed"
-msgstr ""
-
 #: ../fdroidserver/common.py
 msgid "Git submodule sync failed"
 msgstr ""
@@ -920,16 +919,6 @@ msgstr ""
 msgid "Ignoring FUNDING.yml entry longer than 2048: %s"
 msgstr ""
 
-#: ../fdroidserver/update.py
-#, python-format
-msgid "Ignoring bad element in manifest: %s"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Ignoring deprecated {oldfile}, use {newfile}!"
-msgstr ""
-
 #: ../fdroidserver/index.py
 msgid "Ignoring package without metadata: "
 msgstr ""
@@ -939,6 +928,11 @@ msgstr ""
 msgid "Ignoring stale cache data for {apkfilename}"
 msgstr ""
 
+#: ../fdroidserver/rewritemeta.py
+#, python-brace-format
+msgid "Ignoring {ext} file at '{path}'"
+msgstr ""
+
 #: ../fdroidserver/update.py
 msgid "Include APKs that are signed with disabled algorithms like MD5"
 msgstr ""
@@ -955,16 +949,6 @@ msgstr ""
 msgid "Include the source tarballs in the mirror"
 msgstr ""
 
-#: ../fdroidserver/metadata.py
-#, python-format
-msgid "Including metadata from %s@%s"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Including metadata from {path}"
-msgstr ""
-
 #: ../fdroidserver/common.py
 msgid "Initialising submodules"
 msgstr ""
@@ -973,7 +957,7 @@ msgstr ""
 msgid "Install all signed applications available"
 msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Install built packages on devices"
 msgstr ""
 
@@ -982,12 +966,22 @@ msgstr ""
 msgid "Installing %s..."
 msgstr ""
 
+#: ../fdroidserver/install.py
+#, python-format
+msgid "Installing %s…"
+msgstr ""
+
 #: ../fdroidserver/install.py
 #, python-brace-format
 msgid "Installing '{apkfilename}' on {dev}..."
 msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroidserver/install.py
+#, python-brace-format
+msgid "Installing '{apkfilename}' on {dev}…"
+msgstr ""
+
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Interact with the repo HTTP server"
 msgstr ""
 
@@ -995,36 +989,53 @@ msgstr ""
 msgid "Invalid APK"
 msgstr ""
 
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "Invalid AutoUpdateMode: {mode}"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "Invalid UpdateCheckMode: {mode}"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
+#: ../fdroidserver/lint.py ../fdroidserver/checkupdates.py
 #, python-brace-format
 msgid "Invalid VercodeOperation: {field}"
 msgstr ""
 
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Invalid VercodeOperation: {invalid_ops}"
-msgstr ""
-
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "Invalid application ID {appid}"
 msgstr ""
 
+#: ../fdroidserver/metadata.py
+#, python-format
+msgid "Invalid boolean '%s'"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Invalid build flag at {line} in {linedesc}"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Invalid build format: {value} in {name}"
+msgstr ""
+
 #: ../fdroidserver/lint.py
 msgid "Invalid bulleted list"
 msgstr ""
 
+#: ../fdroidserver/lint.py
+#, python-format
+msgid "Invalid license tag \"%s\"! Use only tags from https://spdx.org/license-list"
+msgstr ""
+
+#: ../fdroidserver/lint.py
+msgid "Invalid link - use [http://foo.bar Link title] or [http://foo.bar]"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+#, python-format
+msgid "Invalid metadata in %s:%d"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+msgid "Invalid metadata in: "
+msgstr ""
+
 #: ../fdroidserver/common.py
 #, python-format
 msgid "Invalid name for published file: %s"
@@ -1032,7 +1043,7 @@ msgstr ""
 
 #: ../fdroidserver/common.py
 #, python-brace-format
-msgid "Invalid ndk: entry in build: \"{ndk}\""
+msgid "Invalid package name {0}"
 msgstr ""
 
 #: ../fdroidserver/common.py
@@ -1055,6 +1066,11 @@ msgstr ""
 msgid "Invalid srclib metadata: unknown key '{key}' in '{file}'"
 msgstr ""
 
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Invalid versionCode: \"{versionCode}\" is not an integer!"
+msgstr ""
+
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "JAR signature failed to verify: {path}"
@@ -1069,8 +1085,8 @@ msgstr ""
 msgid "Java JAR file"
 msgstr ""
 
-#: ../fdroidserver/mirror.py ../fdroidserver/publish.py
-#: ../fdroidserver/update.py
+#: ../fdroidserver/publish.py ../fdroidserver/update.py
+#: ../fdroidserver/mirror.py
 msgid "Java JDK not found! Install in standard location or set java_paths!"
 msgstr ""
 
@@ -1086,19 +1102,10 @@ msgstr ""
 msgid "Javascript in HTML src attributes"
 msgstr ""
 
-#: ../fdroidserver/build.py
-#, python-brace-format
-msgid "Keeping failed build \"{apkfilename}\""
-msgstr ""
-
 #: ../fdroidserver/init.py
 msgid "Keystore for signing key:\t"
 msgstr ""
 
-#: ../fdroidserver/lint.py
-msgid "Known debug key is used in AllowedAPKSigningKeys: "
-msgstr ""
-
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "Last used commit '{commit}' looks like a tag, but UpdateCheckMode is '{ucm}'"
@@ -1108,8 +1115,12 @@ msgstr ""
 msgid "Liberapay donation methods belong in the Liberapay: field"
 msgstr ""
 
+#: ../fdroidserver/lint.py
+msgid "Liberapay donation methods belong in the LiberapayID flag"
+msgstr ""
+
 #: ../fdroidserver/rewritemeta.py
-msgid "List files that would be reformatted (dry run)"
+msgid "List files that would be reformatted"
 msgstr ""
 
 #: ../fdroidserver/lint.py
@@ -1128,16 +1139,6 @@ msgstr ""
 msgid "Malformed serverwebroot line:"
 msgstr ""
 
-#: ../fdroidserver/scanner.py
-#, python-format
-msgid "Max recursion depth in ZIP file reached: %s"
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "Mirror config for {url} contains \"isPrimary\" key!"
-msgstr ""
-
 #: ../fdroidserver/mirror.py
 msgid "Mirror the full repo and archive, all file types."
 msgstr ""
@@ -1146,29 +1147,30 @@ msgstr ""
 msgid "Missing output directory"
 msgstr ""
 
-#: ../fdroidserver/metadata.py
-msgid "Moving Anti-Features declarations to localized files:"
-msgstr ""
-
-#: ../fdroidserver/index.py
-msgid "Neither \"repo_pubkey\" nor \"keystorepass\" set in config.yml"
-msgstr ""
-
-#: ../fdroidserver/verify.py
+#: ../fdroidserver/lint.py
 #, python-format
-msgid "No APK for package: %s"
+msgid "Name '%s' is just the auto name - remove it"
+msgstr ""
+
+#: ../fdroidserver/common.py
+msgid "No 'config.py' found, using defaults."
 msgstr ""
 
 #: ../fdroidserver/common.py
 msgid "No Android SDK found!"
 msgstr ""
 
+#: ../fdroidserver/import.py
+msgid "No android or kivy project could be found. Specify --subdir?"
+msgstr ""
+
 #: ../fdroidserver/install.py
 msgid "No attached devices found"
 msgstr ""
 
-#: ../fdroidserver/install.py
-msgid "No devices found for `adb install`! Please plug one in."
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "No commit specified for {versionName} in {linedesc}"
 msgstr ""
 
 #: ../fdroidserver/index.py
@@ -1179,23 +1181,14 @@ msgstr ""
 msgid "No git submodules available"
 msgstr ""
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "No gradle project could be found. Specify --subdir?"
 msgstr ""
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py ../fdroidserver/common.py
 msgid "No information found."
 msgstr ""
 
-#: ../fdroidserver/checkupdates.py
-msgid "No matching tags found"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "No minimum SDK version found in {0}, using default (3)."
-msgstr ""
-
 #: ../fdroidserver/lint.py
 msgid "No need to specify that the app is Free Software"
 msgstr ""
@@ -1205,7 +1198,7 @@ msgid "No need to specify that the app is for Android"
 msgstr ""
 
 #: ../fdroidserver/deploy.py
-msgid "No option set! Edit your config.yml to set at least one of these:"
+msgid "No option set! Edit your config.py to set at least one of these:"
 msgstr ""
 
 #: ../fdroidserver/common.py
@@ -1214,14 +1207,14 @@ msgstr ""
 
 #: ../fdroidserver/install.py
 #, python-format
-msgid "No signed APK available for %s"
+msgid "No signed apk available for %s"
 msgstr ""
 
 #: ../fdroidserver/install.py
 msgid "No signed output directory - nothing to do"
 msgstr ""
 
-#: ../fdroidserver/common.py
+#: ../fdroidserver/update.py ../fdroidserver/common.py
 #, python-brace-format
 msgid "No signing certificates found in {path}"
 msgstr ""
@@ -1231,23 +1224,16 @@ msgstr ""
 msgid "No such package: %s"
 msgstr ""
 
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "No such versionCode {versionCode} for app {appid}"
 msgstr ""
 
-#: ../fdroidserver/checkupdates.py
-msgid "No tags found"
-msgstr ""
-
-#: ../fdroidserver/publish.py ../fdroidserver/verify.py
+#: ../fdroidserver/verify.py ../fdroidserver/publish.py
 msgid "No unsigned directory - nothing to do"
 msgstr ""
 
-#: ../fdroidserver/__main__.py
-msgid "No version information could be found."
-msgstr ""
-
 #: ../fdroidserver/common.py
 msgid "Not a valid size definition: \"{}\""
 msgstr ""
@@ -1262,9 +1248,10 @@ msgid "Nothing to do for {appid}."
 msgstr ""
 
 #: ../fdroidserver/init.py
-msgid "Now set these in config.yml:"
+msgid "Now set these in config.py:"
 msgstr ""
 
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "OBB file has newer versionCode({integer}) than any APK:"
@@ -1282,27 +1269,22 @@ msgstr ""
 msgid "Offline machine, skipping git mirror generation until `fdroid deploy`"
 msgstr ""
 
-#: ../fdroidserver/deploy.py
-msgid "One of the 'github_releases' config items is missing the 'packageNames' value. skipping ..."
+#: ../fdroidserver/common.py
+#, python-brace-format
+msgid "Old APK signature failed to verify: {path}"
 msgstr ""
 
-#: ../fdroidserver/deploy.py
-msgid "One of the 'github_releases' config items is missing the 'projectUrl' value. skipping ..."
+#: ../fdroid ../fdroidserver/__main__.py
+msgid "Old, deprecated name for fdroid deploy"
 msgstr ""
 
-#: ../fdroidserver/deploy.py
-msgid "One of the 'github_releases' config items is missing the 'token' value. skipping ..."
-msgstr ""
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Only PNG and JPEG are supported for graphics, found: {path}"
 msgstr ""
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/common.py
-msgid "Only accepts a single key \"env\""
+#: ../fdroidserver/checkupdates.py
+msgid "Only print differences with the Play Store"
 msgstr ""
 
 #: ../fdroidserver/checkupdates.py
@@ -1313,6 +1295,11 @@ msgstr ""
 msgid "OpenCollective donation methods belong in the OpenCollective: field"
 msgstr ""
 
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "Options"
+msgstr ""
+
 #: ../fdroidserver/verify.py
 msgid "Output JSON report to file named after APK."
 msgstr ""
@@ -1321,22 +1308,26 @@ msgstr ""
 msgid "Output JSON to stdout."
 msgstr ""
 
-#: ../fdroidserver/checkupdates.py ../fdroidserver/gpgsign.py
-#: ../fdroidserver/publish.py ../fdroidserver/signindex.py
-#: ../fdroidserver/update.py
+#: ../fdroidserver/gpgsign.py ../fdroidserver/publish.py
+#: ../fdroidserver/update.py ../fdroidserver/signindex.py
+#: ../fdroidserver/checkupdates.py
 msgid "Outputting JSON"
 msgstr ""
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "Overall license of the project."
 msgstr ""
 
+#: ../fdroidserver/dscanner.py
+msgid "Override path for repo APKs (default: ./repo)"
+msgstr ""
+
 #: ../fdroidserver/index.py
 #, python-brace-format
 msgid "Overriding blank versionName in {apkfilename} from metadata: {version}"
 msgstr ""
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 #, python-brace-format
 msgid "Package \"{appid}\" already exists"
 msgstr ""
@@ -1350,10 +1341,13 @@ msgstr ""
 msgid "Password required with username"
 msgstr ""
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "Path to main Android project subdirectory, if not in root."
 msgstr ""
 
+msgid "Path to main android project subdirectory, if not in root."
+msgstr ""
+
 #: ../fdroidserver/init.py
 msgid "Path to the Android SDK (sometimes set in ANDROID_HOME)"
 msgstr ""
@@ -1366,18 +1360,20 @@ msgstr ""
 msgid "Path to the keystore for the repo signing key"
 msgstr ""
 
+#: ../fdroidserver/dscanner.py
+msgid "Prepare Drozer to run a scan"
+msgstr ""
+
+msgid "Prepare drozer to run a scan"
+msgstr ""
+
 #: ../fdroidserver/nightly.py
 msgid "Print the secret variable to the terminal for easy copy/paste"
 msgstr ""
 
-#: ../fdroidserver/install.py
+#: ../fdroidserver/metadata.py
 #, python-brace-format
-msgid "Privacy mode was enabled based on your locale ({country_code})."
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-format
-msgid "Problem with ZIP file: %s, error %s"
+msgid "Problem with description of {appid}: {error}"
 msgstr ""
 
 #: ../fdroidserver/common.py
@@ -1403,7 +1399,11 @@ msgstr ""
 msgid "Produce human-readable XML/JSON for index files"
 msgstr ""
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/update.py
+msgid "Produce human-readable index.xml"
+msgstr ""
+
+#: ../fdroidserver/import.py
 msgid "Project URL to import from."
 msgstr ""
 
@@ -1415,25 +1415,21 @@ msgstr ""
 msgid "Push the log to this git remote repository"
 msgstr ""
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Pushing binary transparency log to {url}"
 msgstr ""
 
-#: ../fdroidserver/deploy.py
-msgid "Pushing to remote server failed!"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Pushing to {url}"
 msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Quickly start a new repository"
 msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Read all the metadata files and exit"
 msgstr ""
 
@@ -1444,12 +1440,14 @@ msgstr ""
 
 #: ../fdroidserver/common.py
 #, python-brace-format
-msgid "Reading packageName/versionCode/versionName failed, APK invalid: '{apkfilename}'"
+msgid "Reading minSdkVersion failed: \"{apkfilename}\""
 msgstr ""
 
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
+#. https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
 #: ../fdroidserver/common.py
 #, python-brace-format
-msgid "Reading packageName/versionCode/versionName failed,APK invalid: '{apkfilename}'"
+msgid "Reading packageName/versionCode/versionName failed, APK invalid: '{apkfilename}'"
 msgstr ""
 
 #: ../fdroidserver/update.py
@@ -1457,35 +1455,24 @@ msgstr ""
 msgid "Reading {apkfilename} from cache"
 msgstr ""
 
-#: ../fdroidserver/build.py
-msgid "Refresh and cache scanner rules and signatures from the network"
-msgstr ""
-
-#: ../fdroidserver/publish.py
-#, python-brace-format
-msgid "Refusing to sign '{path}', file exists in both {dir1} and {dir2} folder."
-msgstr ""
-
-#: ../fdroidserver/verify.py
-msgid "Remove source tarball and any APKs if successfully verified."
+#: ../fdroidserver/stats.py
+msgid "Recalculate aggregate stats - use when changes have been made that would invalidate old cached data."
 msgstr ""
 
 #: ../fdroidserver/common.py
 msgid "Removing specified files"
 msgstr ""
 
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Removing {path}\""
-msgstr ""
-
 #: ../fdroidserver/update.py
 msgid "Rename APK files that do not match package.name_123.apk"
 msgstr ""
 
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "RepoType {type} is deprecated, please switch to git."
+#: ../fdroidserver/update.py
+msgid "Report on build data status"
+msgstr ""
+
+#: ../fdroidserver/build.py
+msgid "Reset and create a brand new build server, even if the existing one appears to be ok."
 msgstr ""
 
 #: ../fdroidserver/nightly.py
@@ -1501,13 +1488,12 @@ msgstr ""
 msgid "Restrict output to warnings and errors"
 msgstr ""
 
-#: ../fdroidserver/net.py
-#, python-format
-msgid "Retrying failed download: %s"
+#: ../fdroid ../fdroidserver/__main__.py
+msgid "Rewrite all the metadata files"
 msgstr ""
 
-#: ../fdroidserver/__main__.py
-msgid "Rewrite all the metadata files"
+#: ../fdroidserver/rewritemeta.py
+msgid "Rewrite to a specific format: "
 msgstr ""
 
 #: ../fdroidserver/rewritemeta.py
@@ -1515,20 +1501,20 @@ msgstr ""
 msgid "Rewriting '{appid}'"
 msgstr ""
 
-#: ../fdroidserver/checkupdates.py
-msgid "Run on git repo that has uncommitted changes"
+#: ../fdroidserver/rewritemeta.py
+#, python-brace-format
+msgid "Rewriting '{appid}' to '{path}'"
 msgstr ""
 
-#: ../fdroidserver/nightly.py
-#, python-brace-format
-msgid "Run over {cibase} to find -debug.apk. and skip repo_basedir {repo_basedir}"
+#: ../fdroidserver/checkupdates.py
+msgid "Run on git repo that has uncommitted changes"
 msgstr ""
 
 #: ../fdroidserver/lint.py
 msgid "Run rewritemeta to fix formatting"
 msgstr ""
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 msgid "Running first pass with MD5 checking disabled"
 msgstr ""
 
@@ -1537,24 +1523,18 @@ msgstr ""
 msgid "Running wget in {path}"
 msgstr ""
 
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "SHA-256 of {url} does not match entry!"
+#: ../fdroidserver/dscanner.py
+msgid "Scan only the latest version of each package"
 msgstr ""
 
 #: ../fdroidserver/build.py
 msgid "Scan the resulting APK(s) for known non-free classes."
 msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Scan the source code of a package"
 msgstr ""
 
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Scanner found {count} problems in {apk}"
-msgstr ""
-
 #: ../fdroidserver/scanner.py
 #, python-brace-format
 msgid "Scanner found {count} problems in {appid}:"
@@ -1572,19 +1552,6 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: ../fdroidserver/scanner.py
-msgid "Scanning APK for extra signing blocks."
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "Scanning APK with dexdump for known non-free classes."
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Set NDK {release} ({version}) up"
-msgstr ""
-
 #: ../fdroidserver/common.py
 msgid "Set clock to that time using:"
 msgstr ""
@@ -1598,7 +1565,7 @@ msgstr ""
 msgid "Set open file limit to {integer}"
 msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Set up an app build for a nightly build repo"
 msgstr ""
 
@@ -1611,11 +1578,18 @@ msgstr ""
 msgid "Setting {0} sec timeout for this build"
 msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroidserver/build.py
+msgid "Setup an emulator, install the APK on it and perform a Drozer scan"
+msgstr ""
+
+msgid "Setup an emulator, install the apk on it and perform a drozer scan"
+msgstr ""
+
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Sign and place packages in the repo"
 msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Sign indexes created using update --nosign"
 msgstr ""
 
@@ -1628,11 +1602,6 @@ msgstr ""
 msgid "Skipping '{apkfilename}' with invalid signature!"
 msgstr ""
 
-#: ../fdroidserver/deploy.py ../fdroidserver/index.py
-#, python-format
-msgid "Skipping GitLab Pages mirror because the repo is too large (>%.2fGB)!"
-msgstr ""
-
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Skipping index generation for {appid}"
@@ -1648,14 +1617,23 @@ msgstr ""
 msgid "Skipping {appid}: disabled"
 msgstr ""
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/scanner.py
+#, python-brace-format
+msgid "Skipping {appid}: no builds specified"
+msgstr ""
+
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 msgid "Specify a local folder to sync the repo to"
 msgstr ""
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 msgid "Specify an identity file to provide to SSH for rsyncing"
 msgstr ""
 
+#: ../fdroidserver/build.py
+msgid "Specify that we're running on the build server"
+msgstr ""
+
 #: ../fdroidserver/nightly.py
 msgid "Specify which debug keystore file to use."
 msgstr ""
@@ -1664,6 +1642,11 @@ msgstr ""
 msgid "Spew out even more information than normal"
 msgstr ""
 
+#: ../fdroidserver/nightly.py
+#, python-brace-format
+msgid "Striping mystery signature from {apkfilename}"
+msgstr ""
+
 #: ../fdroidserver/nightly.py
 #, python-brace-format
 msgid "Stripping mystery signature from {apkfilename}"
@@ -1684,22 +1667,10 @@ msgstr ""
 msgid "System clock is older than date in {path}!"
 msgstr ""
 
-#: ../fdroidserver/checkupdates.py
-msgid "Tags update mode only works for git, hg, bzr and git-svn repositories currently"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "Tags update mode used in git-svn, but the repo was not set up with tags"
-msgstr ""
-
 #: ../fdroidserver/build.py
 msgid "Test mode - put output in the tmp directory only, and always build, even if the output already exists."
 msgstr ""
 
-#: ../fdroidserver/index.py
-msgid "The \"qrcode\" Python package is not installed (e.g. apt-get install python3-qrcode)!"
-msgstr ""
-
 #. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
 #: ../fdroidserver/update.py
 #, python-brace-format
@@ -1718,10 +1689,18 @@ msgstr ""
 msgid "The file to be included in the repo (path or glob)"
 msgstr ""
 
+#: ../fdroidserver/deploy.py
+msgid "The only commands currently supported are 'init' and 'update'"
+msgstr ""
+
 #: ../fdroidserver/index.py
 msgid "The repository's fingerprint does not match."
 msgstr ""
 
+#: ../fdroidserver/common.py
+msgid "The repository's index could not be verified."
+msgstr ""
+
 #: ../fdroidserver/deploy.py
 #, python-brace-format
 msgid "The root dir for local_copy_dir \"{path}\" does not exist!"
@@ -1735,37 +1714,13 @@ msgstr ""
 msgid "These are the apps that have been archived from the main repo."
 msgstr ""
 
-#: ../fdroidserver/mirror.py
-msgid "This command should never be used to mirror f-droid.org! A full copy requires more than 600GB."
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "This is a repository of apps to be used with F-Droid. Applications in this repository are either official binaries built by the original application developers, or are binaries built from source by the admin of f-droid.org using the tools on https://gitlab.com/fdroid."
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 #, python-format
 msgid "This repo already has local metadata: %s"
 msgstr ""
 
-#: ../fdroidserver/init.py
-#, python-format
-msgid ""
-"To complete the setup, add your APKs to \"%s\"\n"
-"then run \"fdroid update -c; fdroid update\".  You might also want to edit\n"
-"\"config.yml\" to set the URL, repo name, and more.  You should also set up\n"
-"a signing key (a temporary one might have been automatically generated).\n"
-"\n"
-"For more info: https://f-droid.org/docs/Setup_an_F-Droid_App_Repo\n"
-"and https://f-droid.org/docs/Signing_Process"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "To use awsbucket, awssecretkey and awsaccesskeyid must also be set in config.yml!"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "To use rclone, rclone_config and awsbucket must be set in config.yml!"
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
+msgid "To use awsbucket, awssecretkey and awsaccesskeyid must also be set in config.py!"
 msgstr ""
 
 #: ../fdroidserver/lint.py
@@ -1776,6 +1731,10 @@ msgstr ""
 msgid "URL shorteners should not be used"
 msgstr ""
 
+#: ../fdroidserver/metadata.py
+msgid "URL title is just the URL, use brackets: [URL]"
+msgstr ""
+
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "URL {url} in Description: {error}"
@@ -1789,15 +1748,16 @@ msgstr ""
 msgid "Unexpected license tag \"{}\"! Only use license tags configured in your config file"
 msgstr ""
 
-#: ../fdroidserver/common.py
+#: ../fdroidserver/metadata.py
 #, python-brace-format
-msgid "Unknown entry {key} in {configname}"
+msgid "Unexpected text on same line as {field} in {linedesc}"
 msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Unknown exception found!"
 msgstr ""
 
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "Unknown file '{filename}' in build '{versionName}'"
@@ -1808,6 +1768,11 @@ msgstr ""
 msgid "Unknown metadata format: %s"
 msgstr ""
 
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Unknown metadata format: {path}"
+msgstr ""
+
 #: ../fdroidserver/metadata.py
 #, python-brace-format
 msgid "Unknown metadata format: {path} (use: *.yml)"
@@ -1817,6 +1782,10 @@ msgstr ""
 msgid "Unknown version of aapt, might cause problems: "
 msgstr ""
 
+#: ../fdroidserver/lint.py
+msgid "Unlinkified link - use [http://foo.bar Link title] or [http://foo.bar]"
+msgstr ""
+
 #: ../fdroidserver/lint.py
 msgid "Unnecessary leading space"
 msgstr ""
@@ -1830,12 +1799,20 @@ msgstr ""
 msgid "Unrecognised app field '{fieldname}' in '{path}'"
 msgstr ""
 
+#: ../fdroidserver/metadata.py
+msgid "Unrecognised app field: "
+msgstr ""
+
 #: ../fdroidserver/metadata.py
 #, python-brace-format
 msgid "Unrecognised build flag '{build_flag}' in '{path}'"
 msgstr ""
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Unrecognised field '{field}' in {linedesc}"
+msgstr ""
+
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Unsupported file type \"{extension}\" for repo graphic"
@@ -1846,6 +1823,29 @@ msgstr ""
 msgid "Unsupported graphics file found: {path}"
 msgstr ""
 
+#: ../fdroidserver/rewritemeta.py
+#, python-brace-format
+msgid "Unsupported metadata format, use: --to [{supported}]"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+msgid "Unterminated ]"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+msgid "Unterminated ]]"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Unterminated build in {name}"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Unterminated continuation in {name}"
+msgstr ""
+
 #: ../fdroidserver/lint.py
 #, python-format
 msgid "Unused extlib at %s"
@@ -1866,25 +1866,27 @@ msgstr ""
 msgid "Unused scanignore path: %s"
 msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Update repo information for new packages"
 msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Update the binary transparency log for a URL"
 msgstr ""
 
+#: ../fdroid ../fdroidserver/__main__.py
+msgid "Update the stats of the repo"
+msgstr ""
+
+#: ../fdroidserver/update.py ../fdroidserver/build.py
+msgid "Update the wiki"
+msgstr ""
+
 #: ../fdroidserver/checkupdates.py
 #, python-brace-format
 msgid "UpdateCheckData has invalid URL: {url}"
 msgstr ""
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "UpdateCheckData must match the version code as integer (\\d or [0-9]): {codeex}"
-msgstr ""
-
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "UpdateCheckData must use HTTPS URL: {url}"
@@ -1896,10 +1898,14 @@ msgid "UpdateCheckData not a valid URL: {url}"
 msgstr ""
 
 #: ../fdroidserver/lint.py
-msgid "UpdateCheckMode is set but it looks like checkupdates hasn't been run yet."
+msgid "UpdateCheckMode is set but it looks like checkupdates hasn't been run yet"
+msgstr ""
+
+#. Translators: https://developer.android.com/studio/build/application-id
+#: ../fdroidserver/lint.py
+msgid "UpdateCheckName is set to the known application ID - it can be removed"
 msgstr ""
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
 #: ../fdroidserver/lint.py
 msgid "UpdateCheckName is set to the known application ID, it can be removed"
 msgstr ""
@@ -1914,8 +1920,19 @@ msgstr ""
 msgid "Uploading {apkfilename} to virustotal"
 msgstr ""
 
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "Usage"
+msgstr ""
+
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, python-format
+msgid "Usage: %s\n"
+msgstr ""
+
 #: ../fdroidserver/lint.py
-msgid "Use /HEAD instead of /master or /main to point at a file in the default branch"
+msgid "Use /HEAD instead of /master to point at a file in the default branch"
 msgstr ""
 
 #: ../fdroidserver/update.py
@@ -1930,14 +1947,12 @@ msgstr ""
 msgid "Use date from APK instead of current time for newly added APKs"
 msgstr ""
 
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Using \"{path}\" for configuring s3cmd."
+msgid "Use date from apk instead of current time for newly added apks"
 msgstr ""
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
-msgid "Using \"{path}\" for syncing with remote storage."
+msgid "Using \"{path}\" for configuring s3cmd."
 msgstr ""
 
 #: ../fdroidserver/common.py
@@ -1948,17 +1963,13 @@ msgstr ""
 msgid "Using APK Signature v3"
 msgstr ""
 
-#: ../fdroidserver/common.py
-msgid "Using JAR Signature"
-msgstr ""
-
 #: ../fdroidserver/common.py
 msgid "Using Java's jarsigner, not recommended for verifying APKs! Use apksigner"
 msgstr ""
 
-#: ../fdroidserver/metadata.py
+#: ../fdroidserver/common.py
 #, python-brace-format
-msgid "Using blank dictionary instead of contents of {path}!"
+msgid "Using androguard from \"{path}\""
 msgstr ""
 
 #: ../fdroidserver/init.py
@@ -1966,17 +1977,12 @@ msgstr ""
 msgid "Using existing keystore \"{path}\""
 msgstr ""
 
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Using rclone to sync with: {url}"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Using s3cmd to sync with: {url}"
 msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Valid commands are:"
 msgstr ""
 
@@ -1984,7 +1990,7 @@ msgstr ""
 msgid "Verify against locally cached copy rather than redownloading."
 msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Verify the integrity of downloaded packages"
 msgstr ""
 
@@ -1992,28 +1998,15 @@ msgstr ""
 msgid "Verifying index signature:"
 msgstr ""
 
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "Verifying package {path} with apksigner."
-msgstr ""
-
 #: ../fdroidserver/deploy.py
 #, python-brace-format
 msgid "VirusTotal API key cannot upload files larger than 32MB, use {url} to upload {path}."
 msgstr ""
 
-#: ../fdroidserver/nightly.py
-msgid "WARNING: only public git repos are supported!"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Warn about possible metadata errors"
 msgstr ""
 
-#: ../fdroidserver/scanner.py
-msgid "WebAssembly binary file"
-msgstr ""
-
 #: ../fdroidserver/update.py
 msgid "When configured for signed indexes, create only unsigned indexes at this stage"
 msgstr ""
@@ -2022,16 +2015,7 @@ msgstr ""
 msgid "When linting the entire repository yamllint is disabled by default. This option forces yamllint regardless."
 msgstr ""
 
-#: ../fdroidserver/publish.py
-msgid "When signing or verifying fails, exit with an error code."
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "Would you like to download and install F-Droid.apk via adb? (YES/no)"
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "Would you like to download the app(s) from f-droid.org? (YES/no)"
+msgid "X.509 'Distiguished Name' used when generating keys"
 msgstr ""
 
 #: ../fdroidserver/init.py
@@ -2046,11 +2030,6 @@ msgstr ""
 msgid "ZIP file archive"
 msgstr ""
 
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "adb reports {serial} is \"{status}\"!"
-msgstr ""
-
 #: ../fdroidserver/nightly.py
 #, python-brace-format
 msgid "adding IdentityFile to {path}"
@@ -2061,66 +2040,70 @@ msgstr ""
 msgid "adding to {name}: {path}"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "ambiguous option: %(option)s could match %(matches)s"
 msgstr ""
 
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "apksigner in build-tools;{version} passes APKs with invalid v3 signatures, ignoring."
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "apksigner not found! Cannot sign or verify modern APKs"
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, python-format
+msgid "ambiguous option: %s (%s?)"
 msgstr ""
 
 #: ../fdroidserver/common.py
 msgid "apksigner not found, it's required for signing!"
 msgstr ""
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/checkupdates.py ../fdroidserver/lint.py
-#: ../fdroidserver/rewritemeta.py
+#: ../fdroidserver/lint.py ../fdroidserver/rewritemeta.py
+#: ../fdroidserver/checkupdates.py
 msgid "application ID of file to operate on"
 msgstr ""
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/build.py ../fdroidserver/install.py
-#: ../fdroidserver/publish.py ../fdroidserver/scanner.py
-#: ../fdroidserver/verify.py
+#: ../fdroidserver/verify.py ../fdroidserver/publish.py
+#: ../fdroidserver/build.py ../fdroidserver/scanner.py
+#: ../fdroidserver/install.py
 msgid "application ID with optional versionCode in the form APPID[:VERCODE]"
 msgstr ""
 
-#: ../fdroidserver/common.py
-msgid "archive_url needs to end with /archive"
+#: ../fdroidserver/lint.py ../fdroidserver/rewritemeta.py
+msgid "applicationId in the form APPID"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: ../fdroidserver/checkupdates.py
+msgid "applicationId to check for updates"
+msgstr ""
+
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
+#: ../fdroidserver/verify.py ../fdroidserver/publish.py
+#: ../fdroidserver/dscanner.py ../fdroidserver/build.py
+#: ../fdroidserver/scanner.py ../fdroidserver/install.py
+msgid "applicationId with optional versionCode in the form APPID[:VERCODE]"
+msgstr ""
+
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "argument \"-\" with mode %r"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "argument %(argument_name)s: %(message)s"
-msgstr ""
-
 #: ../fdroidserver/nightly.py
 msgid "attempting bare SSH connection to test deploy key:"
 msgstr ""
 
+#: ../fdroidserver/nightly.py
+msgid "attempting bare ssh connection to test deploy key:"
+msgstr ""
+
 #: ../fdroidserver/common.py
 msgid "can not parse scrlib spec (not a string): '{}'"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
-msgid "can't open '%(filename)s': %(error)s"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "can't open non-https url: '{};"
+msgid "can't open '%s': %s"
 msgstr ""
 
 #: ../fdroidserver/build.py
@@ -2128,11 +2111,13 @@ msgstr ""
 msgid "cannot find required srclibs: \"{path}\""
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "cannot have multiple subparser arguments"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "cannot merge actions - two groups are named %r"
 msgstr ""
@@ -2146,11 +2131,21 @@ msgstr ""
 msgid "cloning {url}"
 msgstr ""
 
+#: ../fdroidserver/deploy.py
+msgid "command to execute, either 'init' or 'update'"
+msgstr ""
+
 #: ../fdroidserver/__main__.py
 msgid "commands from plugin modules:"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "complex"
+msgstr ""
+
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "conflicting option string: %s"
 msgid_plural "conflicting option strings: %s"
@@ -2158,14 +2153,9 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "conflicting subparser alias: %s"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "conflicting subparser: %s"
+#: ../fdroidserver/nightly.py
+#, python-brace-format
+msgid "copying {apkfilename} into {path}"
 msgstr ""
 
 #: ../fdroidserver/metadata.py
@@ -2174,11 +2164,11 @@ msgid "could not parse '{path}'"
 msgstr ""
 
 #: ../fdroidserver/common.py
-msgid "could not parse srclib spec (no name specified): '{}'"
+msgid "could not parse srclib spec (no ref specified): '{}'"
 msgstr ""
 
 #: ../fdroidserver/common.py
-msgid "could not parse srclib spec (no ref specified): '{}'"
+msgid "could not parse srclib spec (too many '@' signs): '{}'"
 msgstr ""
 
 #: ../fdroidserver/nightly.py
@@ -2186,18 +2176,14 @@ msgstr ""
 msgid "created {path}"
 msgstr ""
 
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "current version is newer: old vercode={old}, new vercode={new}"
-msgstr ""
-
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "deleting: repo/{apkfilename}"
 msgstr ""
 
-#: ../fdroidserver/scanner.py
-msgid "dependency file without lock"
+#: ../fdroidserver/common.py
+#, python-brace-format
+msgid "deployed build logs to '{path}'"
 msgstr ""
 
 #: ../fdroidserver/common.py
@@ -2205,24 +2191,18 @@ msgstr ""
 msgid "deployed process log {path} to {dest}"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "dest= is required for options like %r"
 msgstr ""
 
-#: ../fdroidserver/scanner.py
-msgid "downloading '{}'"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "downloading scanner signatures from '{}' failed"
-msgstr ""
-
 #: ../fdroidserver/scanner.py
 msgid "executable binary, possibly code"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "expected %s argument"
 msgid_plural "expected %s arguments"
@@ -2230,24 +2210,41 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "expected at least one argument"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "expected at most one argument"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "expected one argument"
 msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroidserver/common.py
+#, python-brace-format
+msgid "failed deploying build logs to '{path}'"
+msgstr ""
+
+#: ../fdroid
+msgid "fdroid [-h|--help|--version] <command> [<args>]"
+msgstr ""
+
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "fdroid [<command>] [-h|--help|--version|<args>]"
 msgstr ""
 
-#: ../fdroidserver/scanner.py
-msgid "fetch the latest version of signatures from the web"
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "floating-point"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+msgid "force errors to be warnings, or ignore"
 msgstr ""
 
 #: ../fdroidserver/metadata.py
@@ -2262,7 +2259,8 @@ msgstr ""
 msgid "gzip file archive"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "ignored explicit argument %r"
 msgstr ""
@@ -2271,39 +2269,35 @@ msgstr ""
 msgid "index-v1 must have a signature, use `fdroid signindex` to create it!"
 msgstr ""
 
-#: ../fdroidserver/index.py
-msgid "index-v2 must have a signature, use `fdroid signindex` to create it!"
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "integer"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "invalid %(type)s value: %(value)r"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "invalid choice: %(value)r (choose from %(choices)s)"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "invalid conflict_resolution value: %r"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "invalid option string %(option)r: must start with a character %(prefix_chars)r"
 msgstr ""
 
-#: ../fdroidserver/common.py
-msgid "ipfs_cid not found, skipping CIDv1 generation"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "latest build recipe is newer: old vercode={old}, new vercode={new}"
-msgstr ""
-
 #: ../fdroidserver/deploy.py
 #, python-brace-format
 msgid "local_copy_dir does not end with \"fdroid\", perhaps you meant: \"{path}\""
@@ -2322,20 +2316,11 @@ msgstr ""
 msgid "mirror '%s' does not end with 'fdroid'!"
 msgstr ""
 
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "mirrors set twice, in config.yml and {path}!"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "mutually exclusive arguments must be optional"
 msgstr ""
 
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "next {name} cache update due in {time}"
-msgstr ""
-
 #: ../fdroidserver/mirror.py
 #, python-brace-format
 msgid "no \"icon\" in {appid}"
@@ -2345,26 +2330,88 @@ msgstr ""
 msgid "no APK supplied"
 msgstr ""
 
-#: ../fdroidserver/checkupdates.py
-msgid "no version information found"
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, python-format
+msgid "no such option: %s"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: ../fdroid ../fdroidserver/__main__.py
+msgid "no version info found!"
+msgstr ""
+
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "not allowed with argument %s"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "one of the arguments %s is required"
 msgstr ""
 
-#: ../fdroidserver/common.py ../fdroidserver/index.py
+#: ../fdroidserver/index.py ../fdroidserver/common.py
 msgid "only accepts strings, lists, and tuples"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
-msgid "options"
+#: ../fdroidserver/install.py
+#, python-format
+msgid "option %s: If you really want to install all the signed apps, use --all"
+msgstr ""
+
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, python-format
+msgid "option %s: invalid %s value: %r"
+msgstr ""
+
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, python-format
+msgid "option %s: invalid choice: %r (choose from %s)"
+msgstr ""
+
+#: /usr/lib/python3.5/getopt.py /usr/lib/python3.6/getopt.py
+#: /usr/lib/python3.7/getopt.py
+#, python-format
+msgid "option -%s not recognized"
+msgstr ""
+
+#: /usr/lib/python3.5/getopt.py /usr/lib/python3.6/getopt.py
+#: /usr/lib/python3.7/getopt.py
+#, python-format
+msgid "option -%s requires argument"
+msgstr ""
+
+#: /usr/lib/python3.5/getopt.py /usr/lib/python3.6/getopt.py
+#: /usr/lib/python3.7/getopt.py
+#, python-format
+msgid "option --%s must not have an argument"
+msgstr ""
+
+#: /usr/lib/python3.5/getopt.py /usr/lib/python3.6/getopt.py
+#: /usr/lib/python3.7/getopt.py
+#, python-format
+msgid "option --%s not a unique prefix"
+msgstr ""
+
+#: /usr/lib/python3.5/getopt.py /usr/lib/python3.6/getopt.py
+#: /usr/lib/python3.7/getopt.py
+#, python-format
+msgid "option --%s not recognized"
+msgstr ""
+
+#: /usr/lib/python3.5/getopt.py /usr/lib/python3.6/getopt.py
+#: /usr/lib/python3.7/getopt.py
+#, python-format
+msgid "option --%s requires argument"
+msgstr ""
+
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
+msgid "optional arguments"
 msgstr ""
 
 #: ../fdroidserver/nightly.py
@@ -2372,7 +2419,8 @@ msgstr ""
 msgid "overwriting existing {path}"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "positional arguments"
 msgstr ""
 
@@ -2381,53 +2429,42 @@ msgstr ""
 msgid "process log deploy {path} to {dest} failed!"
 msgstr ""
 
-#: ../fdroidserver/build.py
-msgid "reference binary missing signature"
-msgstr ""
-
 #: ../fdroidserver/signatures.py
 #, python-brace-format
 msgid "refuse downloading via insecure HTTP connection (use HTTPS or specify --no-https-check): {apkfilename}"
 msgstr ""
 
+#: ../fdroidserver/signatures.py
+#, python-brace-format
+msgid "refuse downloading via insecure http connection (use https or specify --no-https-check): {apkfilename}"
+msgstr ""
+
 #: ../fdroidserver/index.py
 #, python-format
-msgid "repo_icon \"repo/icons/%s\" does not exist, generating placeholder."
+msgid "repo_icon %s does not exist, generating placeholder."
 msgstr ""
 
-#: ../fdroidserver/common.py
-msgid "repo_url needs to end with /repo"
+#: ../fdroidserver/metadata.py
+msgid "ruamel.yaml not installed, can not write metadata."
 msgstr ""
 
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "rsync is missing or broken: {error}"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "s3cmd sync indexes {path} to {url} and delete"
 msgstr ""
 
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "s3cmd syncs indexes from {path} to {url} and deletes removed"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "scanner cache is malformed! You can clear it with: '{clear}'"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "serverwebroot: path does not end with \"fdroid\", perhaps you meant one of these:"
-msgstr ""
-
 #: ../fdroidserver/scanner.py
 msgid "shared library"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "show program's version number and exit"
+msgstr ""
+
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.5/optparse.py
+#: /usr/lib/python3.6/argparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/argparse.py /usr/lib/python3.7/optparse.py
 msgid "show this help message and exit"
 msgstr ""
 
@@ -2456,31 +2493,31 @@ msgstr ""
 msgid "static library"
 msgstr ""
 
-#: ../fdroidserver/build.py
+#: ../fdroidserver/common.py
 #, python-brace-format
-msgid "supplied reference binary has allowed signer {signer}"
+msgid "supplied timestamp value '{timestamp}' is not a unix timestamp"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "the following arguments are required: %s"
 msgstr ""
 
-#: ../fdroidserver/install.py
-msgid "true"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "unexpected option string: %s"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "unknown parser %(parser_name)r (choices: %(choices)s)"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "unrecognized arguments: %s"
 msgstr ""
@@ -2490,11 +2527,16 @@ msgstr ""
 msgid "unsafe permissions on '{config_file}' (should be 0600)!"
 msgstr ""
 
-#: ../fdroidserver/__main__.py /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py ../fdroid
+#: /usr/lib/python3.7/argparse.py ../fdroidserver/__main__.py
 msgid "usage: "
 msgstr ""
 
-#: ../fdroidserver/deploy.py
+#: ../fdroid
+msgid "usage: fdroid [-h|--help|--version] <command> [<args>]"
+msgstr ""
+
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "using Apache libcloud to sync with {url}"
 msgstr ""
@@ -2503,8 +2545,8 @@ msgstr ""
 msgid "virustotal.com is rate limiting, waiting to retry..."
 msgstr ""
 
-#: ../fdroidserver/install.py
-msgid "yes"
+#: ../fdroidserver/update.py
+msgid "wiki support is deprecated and will be removed in the next release!"
 msgstr ""
 
 #: ../fdroidserver/publish.py
@@ -2520,19 +2562,31 @@ msgstr[2] ""
 msgid "{apkfilename} ({appid}) has no metadata!"
 msgstr ""
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
+#: ../fdroidserver/update.py
+#, python-brace-format
+msgid "{apkfilename} has multiple {name} files, looks like Master Key exploit!"
+msgstr ""
+
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "{apkfilename}'s AndroidManifest.xml has a bad date: "
 msgstr ""
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "{appid} does not have a name! Using application ID instead."
 msgstr ""
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
+#: ../fdroidserver/update.py
+#, python-brace-format
+msgid "{appid} does not have a name! Using package name instead."
+msgstr ""
+
+#: ../fdroidserver/update.py
+#, python-brace-format
+msgid "{appid} from {path} is not a valid Android Package Name!"
+msgstr ""
+
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "{appid} from {path} is not a valid Android application ID!"
@@ -2543,16 +2597,12 @@ msgstr ""
 msgid "{appid} from {path} is not a valid Java Package Name!"
 msgstr ""
 
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{appid} has both APKs and files: {files}"
-msgstr ""
-
 #: ../fdroidserver/mirror.py
 #, python-brace-format
 msgid "{appid} is missing {name}"
 msgstr ""
 
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "{appid}: Unknown extlib {path} in build '{versionName}'"
@@ -2580,7 +2630,7 @@ msgstr ""
 
 #: ../fdroidserver/metadata.py
 #, python-brace-format
-msgid "{build_flag} must be list or string, found: {value}"
+msgid "{field} not terminated in {name}"
 msgstr ""
 
 #: ../fdroidserver/metadata.py
@@ -2590,15 +2640,10 @@ msgstr ""
 
 #: ../fdroidserver/update.py
 #, python-brace-format
-msgid "{name} \"{section}/icons/{path}\" does not exist! Check \"config.yml\"."
+msgid "{name} \"{path}\" does not exist! Correct it in config.py."
 msgstr ""
 
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{path1} is a duplicate of {path2}, remove one!"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 #, python-brace-format
 msgid "{path} already exists, ignoring import results!"
 msgstr ""
@@ -2613,36 +2658,6 @@ msgstr ""
 msgid "{path} has bad file signature \"{pattern}\", possible Janus exploit!"
 msgstr ""
 
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "{path} has been flagged by virustotal {count} times:"
-msgstr ""
-
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "{path} has the wrong fingerprint ({fingerprint})!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "{path} is not \"key: value\" dict, but a {datatype}!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "{path} is not a standard config file!"
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "{path} is not list, but a {datatype}!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "{path} is not {expected_type}, but a {datatype}!"
-msgstr ""
-
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "{path} is zero size!"
@@ -2653,22 +2668,12 @@ msgstr ""
 msgid "{path} more than 200MB, manually upload: {url}"
 msgstr ""
 
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "{path}: \"{code}\" is not a valid ISO_3166-1 alpha-2 country code!"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{path}: {error}"
-msgstr ""
-
 #: ../fdroidserver/mirror.py
 #, python-brace-format
 msgid "{url} does not end with \"fdroid\", check the URL path!"
 msgstr ""
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/common.py
 #, python-brace-format
 msgid "{url} does not start with \"http\"!"
 msgstr ""
diff --git a/locale/sq/LC_MESSAGES/fdroidserver.po b/locale/sq/LC_MESSAGES/fdroidserver.po
index efa0401b..9e0c98ae 100644
--- a/locale/sq/LC_MESSAGES/fdroidserver.po
+++ b/locale/sq/LC_MESSAGES/fdroidserver.po
@@ -1,13 +1,13 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# Besnik Bleta <besnik@programeshqip.org>, 2020, 2021, 2022, 2023, 2024, 2025.
-# Hans-Christoph Steiner <hans@guardianproject.info>, 2020, 2021, 2024.
+# Besnik Bleta <besnik@programeshqip.org>, 2020.
+# Hans-Christoph Steiner <hans@guardianproject.info>, 2020.
 msgid ""
 msgstr ""
 "Project-Id-Version: fdroidserver 1.0.6-349-g907c04ea\n"
 "Report-Msgid-Bugs-To: https://gitlab.com/fdroid/fdroidserver/issues\n"
-"POT-Creation-Date: 2025-06-25 09:52+0200\n"
-"PO-Revision-Date: 2025-03-26 21:33+0000\n"
+"POT-Creation-Date: 2020-10-21 18:05+0200\n"
+"PO-Revision-Date: 2020-11-14 21:55+0000\n"
 "Last-Translator: Besnik Bleta <besnik@programeshqip.org>\n"
 "Language-Team: Albanian <https://hosted.weblate.org/projects/f-droid/fdroidserver/sq/>\n"
 "Language: sq\n"
@@ -15,7 +15,31 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 5.11-dev\n"
+"X-Generator: Weblate 4.4-dev\n"
+
+#: ../fdroidserver/common.py
+msgid ""
+"\n"
+"        This is a repository of apps to be used with FDroid. Applications in this\n"
+"        repository are either official binaries built by the original application\n"
+"        developers, or are binaries built from source by f-droid.org using the\n"
+"        tools on https://gitlab.com/fdroid.\n"
+"        "
+msgstr ""
+"\n"
+"        Kjo është një depo aplikacionesh për t’u përdorur me FDroid. Applikacionet\n"
+"        në këtë depo ose janë dyorë zyrtarë të montuar nga zhvilluesit e aplikacionit\n"
+"        origjinal, ose janë dyorë të montuar nga burimi prej f-droid.org duke përdorur\n"
+"        mjetet në https://gitlab.com/fdroid.\n"
+"        "
+
+#: ../fdroidserver/nightly.py
+msgid ""
+"\n"
+"SSH Public Key to be used as Deploy Key:"
+msgstr ""
+"\n"
+"Kyç SSH Publik për t’u përdorur si Kyç Sendërtimesh:"
 
 #: ../fdroidserver/nightly.py
 msgid ""
@@ -37,16 +61,7 @@ msgstr ""
 #: ../fdroidserver/lint.py
 #, python-format
 msgid "\"%s/\" has no matching metadata file!"
-msgstr "“%s/”\" s’ka kartelë tejtëdhënash me përputhje!"
-
-#: ../fdroidserver/index.py
-msgid "\"isPrimary\" key should not be added to mirrors!"
-msgstr "Kyçi “isPrimary” s’duhet shtuar te pasqyra!"
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "\"local_copy_dir\" {path} does not exist!"
-msgstr "“local_copy_dir” {path} s’ekziston!"
+msgstr "\"%s/\" s’ka kartel tejtëdhënash me përputhje!"
 
 #: ../fdroidserver/install.py
 #, python-brace-format
@@ -55,97 +70,137 @@ msgstr "'{apkfilename}' është tashmë e instaluar në {dev}."
 
 #: ../fdroidserver/update.py
 #, python-brace-format
-msgid "\"{path}\" contains recent {name} ({version})"
-msgstr "“{path}” përmban {name} të freskët ({version})"
+msgid "\"{path}\" contains outdated {name} ({version})"
+msgstr "\"{path}\" përmban {name} të vjetruar ({version})"
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/update.py
+#, python-brace-format
+msgid "\"{path}\" contains recent {name} ({version})"
+msgstr "\"{path}\" përmban {name} të freskët ({version})"
+
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "\"{path}\" exists but s3cmd is not installed!"
-msgstr "“{path}” ekziston, por s3cmd s’është e instaluar!"
+msgstr "\"{path}\" ekziston, por s3cmd s’është e instaluar!"
 
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "\"{path}\" is not a supported file format (use: metadata/*.yml)"
-msgstr "“{path}” s’është format kartelash i mbuluar (përdorni: metadata/*.yml)"
+msgstr "\"{path}\" s’është format kartelash i mbuluar (përdorni: metadata/*.yml)"
 
-#: ../fdroidserver/update.py
+#: ../fdroidserver/metadata.py
 #, python-brace-format
-msgid "\"{path}\" is signed by a key that is not allowed:"
-msgstr "“{path}” është nënshkruar me një kyç që s’lejohet:"
+msgid "\"{path}\" is not an accepted format, convert to: {formats}"
+msgstr "\"{path}\" s’është në një format të pranuar, shndërrojeni në: {formats}"
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/common.py
 #, python-brace-format
 msgid "\"{url}\" is not a valid URL!"
-msgstr "“{url}” s’është URL e vlefshme!"
+msgstr "\"{url}\" s’është URL e vlefshme!"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, python-format
+msgid "%(option)s option requires %(number)d argument"
+msgid_plural "%(option)s option requires %(number)d arguments"
+msgstr[0] "Mundësi %(option)s lyp %(number)d argument"
+msgstr[1] "Mundësi %(option)s lyp %(number)d argumente"
+
+#: ../fdroidserver/mirror.py
+#, python-format
+msgid "%(prog)s [options] url"
+msgstr "%(prog)s [mundësi] url"
+
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "%(prog)s: error: %(message)s\n"
 msgstr "%(prog)s: gabim: %(message)s\n"
 
-#: ../fdroidserver/publish.py
-#, python-format
-msgid "%d APKs failed to be signed or verified!"
-msgstr "S’u arrit të nënshkruhen ose verifikohen %d APK!"
-
 #: ../fdroidserver/scanner.py
 #, python-format
 msgid "%d problems found"
 msgstr "U gjetën %d probleme"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "%prog [options]"
+msgstr "%prog [mundësi]"
+
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "%r is not callable"
 msgstr "%r s’mund të thirret"
 
-#: ../fdroidserver/signindex.py
-#, python-format
-msgid "%s did not produce a dict!"
-msgstr "%s s’prodhoi një “dict”!"
-
-#: ../fdroidserver/signindex.py
-#, python-format
-msgid "%s has bad SHA-256: %s"
-msgstr "%s ka SHA-256 të gabuar: %s"
-
 #: ../fdroidserver/lint.py
 #, python-format
 msgid "%s is not an accepted build field"
 msgstr "%s s’është fushë e pranuar montimi"
 
-#: ../fdroidserver/common.py
-msgid "'keypass' not found in config.yml!"
-msgstr "S’u gjet 'keypass' në config.yml!"
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, python-format
+msgid "%s option does not take a value"
+msgstr "Mundësia %s s’merr ndonjë vlerë"
+
+#: ../fdroidserver/index.py ../fdroidserver/common.py
+msgid "'keypass' not found in config.py!"
+msgstr "S’u gjet 'keypass' në config.py!"
 
 #: ../fdroidserver/common.py
 msgid "'keystore' is NONE and 'smartcardoptions' is blank!"
 msgstr "'keystore' është NONE dhe 'smartcardoptions' është e zbrazët!"
 
-#: ../fdroidserver/common.py
-msgid "'keystore' not found in config.yml!"
-msgstr "S’u gjet 'keystore' në config.yml!"
+#: ../fdroidserver/index.py ../fdroidserver/common.py
+msgid "'keystore' not found in config.py!"
+msgstr "S’u gjet 'keystore' në config.py!"
 
-#: ../fdroidserver/common.py
-msgid "'keystorepass' not found in config.yml!"
-msgstr "S’u gjet 'keystorepass' te config.yml!"
+#: ../fdroidserver/index.py ../fdroidserver/common.py
+msgid "'keystorepass' not found in config.py!"
+msgstr "S’u gjet 'keystorepass' te config.py!"
 
-#: ../fdroidserver/common.py
-msgid "'repo_keyalias' not found in config.yml!"
-msgstr "S’u gjet 'repo_keyalias' te config.yml!"
+#: ../fdroidserver/index.py ../fdroidserver/common.py
+msgid "'repo_keyalias' not found in config.py!"
+msgstr "S’u gjet 'repo_keyalias' te config.py!"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "'required' is an invalid argument for positionals"
 msgstr "'required' është argument i pavlefshëm për pozicionalë"
 
 #: ../fdroidserver/common.py
-msgid "'sdk_path' not set in config.yml!"
-msgstr "'sdk_path' te 'config.yml' s’është ujdisur!"
+msgid "'sdk_path' not set in 'config.py'!"
+msgstr "'sdk_path' te 'config.py' s’është ujdisur!"
+
+#. Translators: "build-tools" is the file name of a package from
+#. Google, it is part of the Android SDK. So it probably shouldn't be
+#. translated or transliterated.
+#: ../fdroidserver/common.py
+#, python-brace-format
+msgid "'{aapt}' is too old, fdroid requires build-tools-23.0.0 or newer!"
+msgstr "'{aapt}' është shumë i vjetër, fdroid lyp build-tools-23.0.0 ose më të ri!"
 
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "'{aapt}' is too old, fdroid requires build-tools-{version} or newer!"
 msgstr "'{aapt}' është shumë i vjetër, fdroid lyp build-tools-{version} ose më të ri!"
 
+#: ../fdroidserver/install.py
+#, python-brace-format
+msgid "'{apkfilename}' is already installed on {dev}."
+msgstr "'{apkfilename}' është tashmë e instaluar në {dev}."
+
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "'{field}' in {linedesc} is obsolete, see docs for current fields:"
+msgstr "'{field}' te {linedesc} është e vjetruar, për fushat në përdorim, shihni dokumentimin:"
+
+#: ../fdroidserver/common.py
+#, python-brace-format
+msgid "'{field}' will be in random order! Use () or [] brackets if order is important!"
+msgstr "'{field}' do të jetë sipas një rendi kuturu! Nëse rendi është i rëndësishëm, përdorni kllapa () ose []!"
+
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "'{path}' failed to execute!"
@@ -153,32 +208,23 @@ msgstr "S’u arrit të përmbushet '{path}'!"
 
 #: ../fdroidserver/metadata.py
 #, python-brace-format
-msgid "'{path}' has invalid format, it should be a dictionary!"
-msgstr "'{path}' ka format të pavlefshëm, duhet të jetë një fjalor!"
-
-#: ../fdroidserver/lint.py ../fdroidserver/metadata.py
-#, python-brace-format
 msgid "'{value}' is not a valid {field} in {appid}. Regex pattern: {pattern}"
 msgstr "'{value}' s’është një {field} e vlefshme te {appid}. Rregullsi shprehjeje të rregullt: {pattern}"
 
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "'{value}' is not a valid {field}, should be {pattern}"
-msgstr "'{value}' s’është një {field} e vlefshme, duhet të jetë {pattern}"
-
-#: ../fdroidserver/checkupdates.py
-msgid "--merge-request only runs on a single appid!"
-msgstr "--merge-request xhiron vetëm me një appid!"
-
 #: ../fdroidserver/checkupdates.py
 #, python-brace-format
 msgid "...checkupdate failed for {appid} : {error}"
 msgstr "…checkupdate dështoi për {appid} : {error}"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid ".__call__() not defined"
 msgstr ".__call__() e pacaktuar"
 
+#: ../fdroidserver/metadata.py
+msgid ".fdroid.txt is not supported!  Convert to .fdroid.yml or .fdroid.json."
+msgstr ".fdroid.txt nuk mbulohet!  Shndërrojeni në .fdroid.yml ose .fdroid.json."
+
 #: ../fdroidserver/lint.py
 msgid "/issues is missing"
 msgstr "/issues mungon"
@@ -187,15 +233,14 @@ msgstr "/issues mungon"
 msgid "A URL is required as an argument!"
 msgstr "Lypset një URL si argument!"
 
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "APK signatures have different certificates in {path}:"
-msgstr "Nënshkrimet APK kanë dëshmi të ndryshme te {path}:"
-
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Add PGP signatures using GnuPG for packages in repo"
 msgstr "Shtoni për paketa në depo nënshkrime PGP duke përdorur GnuPG-në"
 
+#: ../fdroid ../fdroidserver/__main__.py
+msgid "Add a new application from its source code"
+msgstr "Shtoni një aplikacion të ri që prej kodit të tij burim"
+
 #: ../fdroidserver/update.py
 msgid "Add a repo signing key to an unsigned repo"
 msgstr "Shtoni te një depo e panënshkruar një kyç nënshkrimi depoje"
@@ -213,11 +258,7 @@ msgstr "Po shtohet depo e re për vetëm {name}"
 msgid "Alias of the repo signing key in the keystore"
 msgstr "Alias i kyçit të nënshkrimeve të depos te depo kyçesh"
 
-#: ../fdroidserver/build.py
-msgid "AllowedAPKSigningKeys missing but reference binary supplied"
-msgstr "Mungon AllowedAPKSigningKeys, por u dha dyor reference"
-
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "Allows a different revision (or git branch) to be specified for the initial import"
 msgstr "Lejon të specifikohet një rishikim tjetër (ose kryeni “git branch”) për importimin fillestar"
 
@@ -241,10 +282,14 @@ msgstr "Kartelë APK Android"
 msgid "Android DEX code"
 msgstr "Kod DEX Android"
 
-#: ../fdroidserver/init.py
+#: ../fdroidserver/common.py ../fdroidserver/build.py
 #, python-brace-format
-msgid "Android SDK not found at {path}!"
-msgstr "S’u gjet SDK Android-i në {path}!"
+msgid "Android SDK '{path}' does not have '{dirname}' installed!"
+msgstr "Android SDK '{path}' s’ka '{dirname}' të instaluar!"
+
+#: ../fdroidserver/common.py
+msgid "Android SDK not found!"
+msgstr "S’u gjet SDK Android-i!"
 
 #: ../fdroidserver/common.py
 #, python-brace-format
@@ -256,28 +301,23 @@ msgstr "Shtegu Android SDK '{path}' s’ekziston!"
 msgid "Android SDK path '{path}' is not a directory!"
 msgstr "Shtegu Android SDK '{path}' s’është drejtori!"
 
+#. Translators: "build-tools" is the file name of a package from
+#. Google, it is part of the Android SDK. So it probably shouldn't be
+#. translated or transliterated.
 #: ../fdroidserver/common.py
 #, python-brace-format
-msgid "Android SDK tool {cmd} not found!"
-msgstr "S’u gjet {cmd} mjeti SDK-je Android!"
+msgid "Android build-tools path '{path}' does not exist!"
+msgstr "Shtegu për build-tools Android '{path}' s’ekziston!"
 
-#: ../fdroidserver/lint.py
-msgid "App has Binaries but does not have corresponding AllowedAPKSigningKeys to pin certificate."
-msgstr "Aplikacioni ka Dyorë, por s’ka AllowedAPKSigningKeys përkatës për të fiksuar dëshmi."
-
-#: ../fdroidserver/lint.py
-msgid "App has NoSourceSince or ArchivePolicy \"0 versions\" or 0 but AutoUpdateMode or UpdateCheckMode are not None"
-msgstr "Aplikacioni ka NoSourceSince ose ArchivePolicy “0 versione”, ose 0, por AutoUpdateMode ose UpdateCheckMode janë vënë si “Asnjë”"
+#: ../fdroidserver/update.py
+msgid "AndroidManifest.xml has no date"
+msgstr "AndroidManifest.xml s’ka datë"
 
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "App is in '{repo}' but has a link to {url}"
 msgstr "Aplikacioni gjendet në '{repo}' por ka një lidhje te {url}"
 
-#: ../fdroidserver/lint.py
-msgid "App version has binary but does not have corresponding AllowedAPKSigningKeys to pin certificate."
-msgstr "Aplikacioni ka dyor, por s’ka AllowedAPKSigningKeys përkatës për të fiksuar dëshmi."
-
 #: ../fdroidserver/lint.py
 msgid "Appending .git is not necessary"
 msgstr "S’është i nevojshëm shtimi i .git nga pas"
@@ -287,27 +327,11 @@ msgstr "S’është i nevojshëm shtimi i .git nga pas"
 msgid "Archiving {apkfilename} with invalid signature!"
 msgstr "Po arkivohet {apkfilename} me nënshkrim të pavlefshëm!"
 
-#: ../fdroidserver/lint.py
-msgid "AutoUpdateMode with UpdateCheckMode: HTTP must have a pattern."
-msgstr "AutoUpdateMode me UpdateCheckMode: HTTP duhet të ketë një rregullsi."
-
-#: ../fdroidserver/install.py
-msgid "Automatic no to all prompts."
-msgstr "“Jo” e automatizuar për krejt hapat."
-
-#: ../fdroidserver/install.py
-msgid "Automatic yes to all prompts."
-msgstr "“Po” e automatizuar për krejt hapat."
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "Bad entry type \"{mirrortype}\" in mirrors config: {mirror}"
-msgstr "Lloj i gabuar zëri “{mirrortype}” në formësim pasqyrash: {mirror}"
-
 #: ../fdroidserver/mirror.py
 msgid "Base URL to mirror, can include the index signing key using the query string: ?fingerprint="
 msgstr "URL bazë për t’u pasqyruar, mund të përfshijë kyçin e nënshkrimit të treguesit që përdor vargun e kërkimi: ?fingerprint="
 
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "Branch '{branch}' used as commit in build '{versionName}'"
@@ -323,7 +347,7 @@ msgstr "Dega '{branch}' u përdorur si “commit” në srclib '{srclib}'"
 msgid "Broken symlink: {path}"
 msgstr "Simlidhje e dëmtuar: {path}"
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Build a package from source"
 msgstr "Montoni një paketë nga burimi"
 
@@ -343,14 +367,15 @@ msgstr "Depoja git e tejtëdhënave të montimit ka ndryshime të paparashtruara
 msgid "Build only the latest version of each package"
 msgstr "Monto vetëm versionin më të ri të çdo pakete"
 
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Build should have comma-separated versionName and versionCode, not \"{value}\", in {linedesc}"
+msgstr "Montimi duhet të ketë versionName dhe versionCode ndarë me presje, jo \"{value}\", te {linedesc}"
+
 #: ../fdroidserver/init.py
 #, python-format
 msgid "Built repo based in \"%s\" with this config:"
-msgstr "Depo montimesh e bazua në “%s” me këtë formësim:"
-
-#: ../fdroidserver/checkupdates.py
-msgid "Can't auto-update app with no CurrentVersionCode"
-msgstr "S’kryhet dot “auto-update app” pa CurrentVersionCode"
+msgstr "Depo montimesh e bazua në \"%s\" me këtë formësim:"
 
 #: ../fdroidserver/build.py
 msgid "Can't build due to {} error while scanning"
@@ -358,55 +383,71 @@ msgid_plural "Can't build due to {} errors while scanning"
 msgstr[0] "S’montohet dot, për shkak të {} gabimi teksa skanohej"
 msgstr[1] "S’montohet dot, për shkak të {} gabimeve teksa skanohej"
 
-#: ../fdroidserver/common.py
-#, fuzzy, python-brace-format
-msgid "Cannot read {path}: {error}"
-msgstr "S’u arrit të lexohej {path}: {error}"
+#: ../fdroidserver/vmtools.py
+#, python-brace-format
+msgid "Cannot read \"{path}\"!"
+msgstr "S’lexohet dot \"${path}\"!"
+
+#. Translators: https://developer.android.com/studio/build/application-id
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Cannot resolve application ID {appid}"
+msgstr "S’ftillohet dot ID aplikacioni {appid}"
 
 #: ../fdroidserver/rewritemeta.py
 #, python-brace-format
 msgid "Cannot rewrite \"{path}\""
-msgstr "S’rishkruhet dot “{path}”"
+msgstr "S’rishkruhet dot \"{path}\""
+
+#: ../fdroidserver/rewritemeta.py
+msgid "Cannot use --list and --to at the same time"
+msgstr "S’mund të përdoret --list dhe --to në të njëjtën kohë"
+
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Cannot write \"{path}\", not an accepted format, use: {formats}"
+msgstr "S’shkruhet dot \"{path}\", s’është format i pranuar, përdorni: {formats}"
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
 #: ../fdroidserver/lint.py
 #, python-format
 msgid "Categories '%s' is not valid"
 msgstr "Kategoritë '%s' s’janë të vlefshme"
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
 #: ../fdroidserver/lint.py
 msgid "Categories are not set"
 msgstr "S’janë ujdisur kategori"
 
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "Category \"{category}\" defined but not used for any apps!"
-msgstr "Kategori “{category}” e përkufizuar, por jo e përdorur për ndonjë aplikacion!"
-
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Check for updates to applications"
 msgstr "Kontrollo për përditësime aplikacionesh"
 
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Checking archiving for {appid} - apks:{integer}, keepversions:{keep}, archapks:{arch}"
-msgstr "Po kontrollohet arkivimi për {appid} - apks:{integer}, keepversions:{keep}, archapks:{arch}"
+msgstr "Po kontrollohet arkivimi përr {appid} - apks:{integer}, keepversions:{keep}, archapks:{arch}"
+
+#: ../fdroidserver/dscanner.py
+msgid "Clean after all scans have finished"
+msgstr "Pastroje, pasi të kenë përfunduar krejt skanimet"
+
+#: ../fdroidserver/dscanner.py
+msgid "Clean before the scans start and rebuild the container"
+msgstr "Pastrojeni përpara se të fillojnë skanimet dhe të rimontohet kontejneri"
+
+#: ../fdroidserver/dscanner.py
+msgid "Clean up all containers and then exit"
+msgstr "Pastroji krejt kontejnerët dhe mandej dil"
 
 #: ../fdroidserver/update.py
 msgid "Clean update - don't uses caches, reprocess all APKs"
-msgstr "Përditësim nha e para - mos përdor fshehtina, ripërpuno krejt APK-të"
+msgstr "Përditësim na e para - nuk përdor fshehtina, ripërpuno krejt APK-të"
 
-#: ../fdroidserver/common.py
-msgid "Color the log output"
-msgstr "Ngjyros ç’jep regjistri"
-
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "Comma separated list of categories."
 msgstr "Listë kategorish ndarë me presje."
 
-#: ../fdroidserver/__main__.py
-#, python-format
+#: ../fdroid ../fdroidserver/__main__.py
+#, c-format, python-format
 msgid "Command '%s' not recognised.\n"
 msgstr "Urdhër '%s' jo i pranuar.\n"
 
@@ -414,15 +455,6 @@ msgstr "Urdhër '%s' jo i pranuar.\n"
 msgid "Commit changes"
 msgstr "Depozito ndryshimet"
 
-#: ../fdroidserver/checkupdates.py
-msgid "Commit changes, push, then make a merge request"
-msgstr "Parashtro ndryshimet, depozitoji, mandej bëj një kërkesë për përzierje"
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Conflicting \"{field}\" definitions between .yml and localized files:"
-msgstr "Përkufizime “{field}” me përplasje, mes kartelash .yml dhe të përkthyerash:"
-
 #: ../fdroidserver/__main__.py
 msgid "Conflicting arguments: '--verbose' and '--quiet' can not be specified at the same time."
 msgstr "Argumente që përplasen: '--verbose' dhe '--quiet' s’mund të përdoren në të njëjtën kohë."
@@ -432,15 +464,13 @@ msgstr "Argumente që përplasen: '--verbose' dhe '--quiet' s’mund të përdor
 msgid "Could not find '{command}' on your system"
 msgstr "Në sistemin tuaj s’u gjet '{command}'"
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "Could not find latest version code"
-msgstr "S’u gjet dot kod i versionit më të ri"
+msgstr "S’ u gjet dot kod i versionit më të ri"
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "Could not find latest version name"
-msgstr "S’u gjet dot emër i versionit më të ri"
+msgstr "S’ u gjet dot emër i versionit më të ri"
 
 #: ../fdroidserver/update.py
 #, python-brace-format
@@ -448,52 +478,60 @@ msgid "Could not find {path} to remove it"
 msgstr "S’u gjet dot {path} për ta hequr"
 
 #: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Could not open APK {path} for analysis: "
-msgstr "S’u hap dot kartela APK {path} për analizim : "
+msgid "Could not open apk file for analysis"
+msgstr "S’u hap dot kartela apk për analizim"
 
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "Could not parse size \"{size}\", wrong type \"{type}\""
-msgstr "S’u përtyp dot madhësia “{size}”, lloj i gabuar “{type}”"
+msgstr "S’u përtyp dot madhësia \"{size}\", lloj i gabuar \"{type}\""
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/import_subcommand.py
+#. Translators: https://developer.android.com/studio/build/application-id
+#: ../fdroidserver/import.py
 msgid "Couldn't find Application ID"
 msgstr "S’u gjet dot ID Aplikacione"
 
-#: ../fdroidserver/checkupdates.py
-msgid "Couldn't find any version information"
-msgstr "S’u gjet dot ndonjë hollësi versioni"
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
+#: ../fdroidserver/import.py
+msgid "Couldn't find latest version code"
+msgstr "S’ u gjet dot kod i versionit më të ri"
 
-#: ../fdroidserver/checkupdates.py
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
+#: ../fdroidserver/import.py
+msgid "Couldn't find latest version name"
+msgstr "S’ u gjet dot emër versioni më të ri"
+
+#: ../fdroidserver/import.py
 msgid "Couldn't find package ID"
 msgstr "S’u gjet dot ID pakete"
 
 #: ../fdroidserver/update.py
 msgid "Cowardily refusing to overwrite existing signing key setup!"
-msgstr "Po refuzohet me burracakëri të mbishkruhet ujdisje ekzistuese kyçesh nënshkrimi!"
+msgstr ""
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/update.py
+msgid "Create a repo signing key in a keystore"
+msgstr "Krijoni një kyç nënshkrimi depoje në një depo kyçesh"
+
+#: ../fdroidserver/update.py
+msgid "Create skeleton metadata files that are missing"
+msgstr "Krijoni kartela tejtëdhënash skeleton që mungojnë"
+
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Created new container \"{name}\""
-msgstr "U krijua kontejner i ri “{name}”"
+msgstr "U krijua kontejner i ri \"{name}\""
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Creating \"{path}\" for configuring s3cmd."
-msgstr "Po krijohet “{path}” për formësim të s3cmd."
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Creating empty {config_file}"
-msgstr "Po krijohet '{config_file}' e zbrazët"
+msgstr "Po krijohet \"{path}\" për formësim të s3cmd."
 
 #: ../fdroidserver/publish.py
 msgid "Creating log directory"
 msgstr "Po krijohet drejtori regjistrash"
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Creating new S3 bucket: {url}"
 msgstr "Po krijohet S3 bucket i ri: {url}"
@@ -506,7 +544,8 @@ msgstr "Po krijohet drejtori përfundimesh"
 msgid "Creating signed index with this key (SHA256):"
 msgstr "Po krijohet tregues i nënshkruar me këtë kyç (SHA256):"
 
-#: ../fdroidserver/publish.py ../fdroidserver/verify.py
+#: ../fdroidserver/import.py ../fdroidserver/verify.py
+#: ../fdroidserver/publish.py
 msgid "Creating temporary directory"
 msgstr "Po krijohet drejtori e përkohshme"
 
@@ -551,22 +590,17 @@ msgstr "Përmbledhja '%s' është thjesht përmbledhja e aplikacionit"
 msgid "Description has a duplicate line"
 msgstr "Përshkrimi ka një rresht të përsëdytur"
 
+#: ../fdroidserver/lint.py
+#, python-format
+msgid "Description has a list (%s) but it isn't bulleted (*) nor numbered (#)"
+msgstr "Përshkrimi ka një listë (%s), por kjo s’është as me toptha (*), as e numërtuar (#)"
+
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "Description of length {length} is over the {limit} char limit"
 msgstr "Përshkrimi me gjatësi {length} është mbi kufirin prej {limit} shenjash"
 
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Did you mean config/{name}.yml?"
-msgstr "Mos kishit në mendje config/{name}.yml?"
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Did you mean {code}?"
-msgstr "Mos kishit në mendje {code}?"
-
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "Do not add 'disable:' to the generated build entries"
 msgstr "Mos shtoni 'disable:' te zëra të prodhuar të montimit"
 
@@ -577,7 +611,7 @@ msgstr "Mos i vendos kartelat e reja te depoja"
 #: ../fdroidserver/mirror.py
 #, python-brace-format
 msgid "Do not include \"{path}\" in URL!"
-msgstr "Mos përfshi “{path}” në URL!"
+msgstr "Mos përfshi \"{path}\" në URL!"
 
 #: ../fdroidserver/init.py
 msgid "Do not prompt for Android SDK path, just fail"
@@ -591,25 +625,30 @@ msgstr "Mos i hiq kyçet private të prodhuar nga depo kyçesh"
 msgid "Don't create a source tarball, useful when testing a build"
 msgstr "Mos krijo një paketë tar burimi, e dobishme kur testohet një montim"
 
+#: ../fdroidserver/stats.py
+msgid "Don't do anything logs-related"
+msgstr "Mos bëj gjë që lidhet me regjistrat"
+
 #: ../fdroidserver/build.py
 msgid "Don't refresh the repository, useful when testing a build with no internet connection"
 msgstr "Mos rifresko depon, e dobishme kur testohet një montim pa lidhje internet"
 
 #: ../fdroidserver/deploy.py ../fdroidserver/nightly.py
+#: ../fdroidserver/upload.py
 msgid "Don't use rsync checksums"
 msgstr "Mos përdorni checksum-e rsync-u"
 
-#: ../fdroidserver/install.py
-msgid "Download F-Droid.apk using mirrors that leak less to the network"
-msgstr "Shkarkojeni F-Droid.apk duke përdorur pasqyra që kanë më pak rrjedhje te rrjeti"
-
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Download complete mirrors of small repos"
 msgstr "Shkarko pasqyra të plota deposh të vogla"
 
+#: ../fdroidserver/stats.py
+msgid "Download logs we don't have"
+msgstr "Shkarkoni regjistra që s’i kemi"
+
 #: ../fdroidserver/common.py
 msgid "Downloading the repository already failed once, not trying again."
-msgstr "Shkarkimi i depos dështoi një herë, s’po riprovohet."
+msgstr "Shkarkimi i depos dështoi një herë, nuk po riprovohet."
 
 #: ../fdroidserver/verify.py
 #, python-brace-format
@@ -618,56 +657,38 @@ msgstr "Shkarkimi i {url} dështoi. {error}"
 
 #: ../fdroidserver/metadata.py
 #, python-brace-format
-msgid "Duplicate Anti-Feature declaration at {path} was ignored!"
-msgstr "U shpërfill deklarim i përsëdytur Anti-Veçorie te {path}!"
-
-#: ../fdroidserver/index.py
-#, python-format
-msgid "Duplicate entry \"%s\" in mirrors config!"
-msgstr "Zë i përsëdytur “%s” në formësim pasqyrash!"
+msgid "Duplicate build recipe found for versionCode {versionCode} in {linedesc}"
+msgstr "U gjet përsëdytje recete montimi për versionCode {versionCode} te {linedesc}"
 
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "Duplicate link in '{field}': {url}"
 msgstr "Lidhje e përsëdytur te '{field}': {url}"
 
-#: ../fdroidserver/common.py
-#, python-format
-msgid "ERROR: %(message)s"
-msgstr "GABIM: %(message)s"
+#: ../fdroid
+msgid "Dynamically scan APKs post build"
+msgstr "Skano dinamikisht APK-ra pas montimi"
 
 #: ../fdroidserver/__main__.py
 msgid "ERROR: The \"server\" subcommand has been removed, use \"deploy\"!"
-msgstr "GABIM: Nënurdhri “server” është hequr, përdorni “deploy”!"
+msgstr "GABIM: Nënurdhri \"server\" është hequr, përdorni \"deploy\"!"
+
+#: ../fdroidserver/mirror.py
+msgid ""
+"ERROR: this command should never be used to mirror f-droid.org!\n"
+"A full mirror of f-droid.org requires more than 200GB."
+msgstr ""
+"GABIM: ky urdhër s’duhet përdorur kurrë për krijimin e një pasqyre të f-droid.org!\n"
+"Një pasqyrë e plotë e f-droid.org lyp më tepër se 200GB."
 
 #: ../fdroidserver/nightly.py
 msgid "ERROR: unsupported CI type, patches welcome!"
 msgstr "GABIM: lloj CI i pambuluar, arnimet janë të mirëpritura!"
 
-#: ../fdroidserver/nightly.py
-#, python-format
-msgid "ERROR: unsupported git host \"%s\", patches welcome!"
-msgstr "GABIM: strehë git “%s” që nuk mbulohet, arnimet janë të mirëpritura!"
-
-#: ../fdroidserver/lint.py
+#: ../fdroidserver/metadata.py
 #, python-brace-format
-msgid "ERROR: {key} in {path} is not \"archive\" or \"repo\"!"
-msgstr "GABIM: {key} te {path} s’është “archive” apo “repo”!"
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "ERROR: {key} not a valid key!"
-msgstr "GABIM: {key} s’është kyç i vlefshëm!"
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "ERROR: {key}'s value should be of type {t}!"
-msgstr "GABIM: Vlera e {key} duhet të jetë e llojit {t}!"
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "ERROR: {key}:{subkey} in {path} is not in allowed keys: {allowed_keys}!"
-msgstr "GABIM: {key}:{subkey} te {path} s’është te kyçet e lejuar: {allowed_keys}!"
+msgid "Empty build flag at {linedesc}"
+msgstr "Flamurkë e zbrazët montimi te {linedesc}"
 
 #: ../fdroidserver/__main__.py
 #, python-brace-format
@@ -683,40 +704,20 @@ msgstr ""
 "Jepni shtegun për te Android SDK (%s) këtu:\n"
 "> "
 
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Environment variable {var} from {configname} is not set!"
-msgstr "S’është ujdisur ndryshore {var} nga {configname}!"
+#: ../fdroidserver/deploy.py ../fdroidserver/checkupdates.py
+#: ../fdroidserver/upload.py
+#, python-format
+msgid "Error while attempting to publish log: %s"
+msgstr "Gabim gjatë përpjekjes për botim regjistri: %s"
 
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Environment variable {{env: {var}}} is not set!"
-msgstr "S’është ujdisur ndryshore {{env: {var}}}!"
-
-#: ../fdroidserver/deploy.py
-msgid "Error deploying 'github_releases', {} not present. (You might need to run `fdroid update` first.)"
-msgstr "Gabim në sendërtim të 'github_releases', {} s’është e pranishme. (Mund t’ju duhet të xhironi `fdroid update` së pari.)"
-
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py ../fdroidserver/common.py
 msgid "Error while getting repo address"
 msgstr "Gabim teksa merrej adresë depoje"
 
-#: ../fdroidserver/scanner.py
-msgid "Exit with a non-zero code if problems were found"
-msgstr "Dil me një kod jozero, nëse gjenden probleme"
-
-#: ../fdroidserver/__main__.py
-msgid "Extract application metadata from a source repository"
-msgstr "Përftoji tejtëdhënat e aplikacionit prej një depoje burim"
-
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Extract signatures from APKs"
 msgstr "Përfto nënshkrime prej APK-sh"
 
-#: ../fdroidserver/install.py
-msgid "F-Droid.apk could not be downloaded from any known source!"
-msgstr "F-Droid.apk s’u shkarkua dot nga ndonjë burim i njohur!"
-
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Failed copying {path}: {error}"
@@ -737,34 +738,42 @@ msgstr "S’u arrit të lexohej {path}: {error}"
 msgid "Failed resizing {path}: {error}"
 msgstr "S’u arrit të ripërmasohej {path}: {error}"
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/publish.py
+msgid "Failed to align application"
+msgstr ""
+
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Failed to create S3 bucket: {url}"
 msgstr "S’u arrit të krijohej bucket S3: {url}"
 
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Failed to get APK information, deleting {path}"
-msgstr "S’u arrit të merren të dhëna APK-je, po fshihet {path}"
+#: ../fdroidserver/common.py
+msgid "Failed to get APK manifest information"
+msgstr "S’u arrit të merren të dhëna manifesti APK-je"
 
 #: ../fdroidserver/update.py
 #, python-brace-format
-msgid "Failed to get APK information, skipping {path}"
-msgstr "S’u arrit të merren të dhëna APK-je, po anashkalohet {path}"
+msgid "Failed to get apk information, deleting {path}"
+msgstr "S’u arrit të merren të dhëna apk-je, po fshihet {path}"
 
 #: ../fdroidserver/update.py
-msgid "Failed to get APK signing key fingerprint"
-msgstr "S’u arrit të merren shenja gishtash kyçi nënshkrimi APK-je"
+#, python-brace-format
+msgid "Failed to get apk information, skipping {path}"
+msgstr "S’u arrit të merren të dhëna apk-je, po anashkalohet {path}"
 
 #: ../fdroidserver/install.py
 #, python-brace-format
 msgid "Failed to install '{apkfilename}' on {dev}: {error}"
 msgstr "S’u arrit të instalohej '{apkfilename}' në {dev}: {error}"
 
-#: ../fdroidserver/common.py
+#: ../fdroidserver/publish.py ../fdroidserver/common.py
 msgid "Failed to sign application"
 msgstr "S’u arrit të nënshkruhej aplikacioni"
 
+#: ../fdroidserver/common.py
+msgid "Failed to zipalign application"
+msgstr ""
+
 #: ../fdroidserver/build.py
 #, python-brace-format
 msgid "Fetched buildserverid from VM: {buildserverid}"
@@ -780,12 +789,21 @@ msgstr "U sollën nënshkrime për '{apkfilename}' -> '{sigdir}'"
 msgid "File disappeared while processing it: {path}"
 msgstr "Kartela u zhduk teksa përpunohej: {path}"
 
-#: ../fdroidserver/build.py ../fdroidserver/install.py
-#: ../fdroidserver/rewritemeta.py ../fdroidserver/scanner.py
-#: ../fdroidserver/update.py
+#: ../fdroidserver/verify.py ../fdroidserver/stats.py ../fdroidserver/update.py
+#: ../fdroidserver/rewritemeta.py ../fdroidserver/build.py
+#: ../fdroidserver/checkupdates.py ../fdroidserver/scanner.py
+#: ../fdroidserver/install.py
 msgid "Finished"
 msgstr "Përfundoi"
 
+#: ../fdroidserver/lint.py
+msgid "Flattr donation methods belong in the FlattrID flag"
+msgstr "Metodat e dhurimit përmes Flattr-i i takojnë flamurkës FlattrID"
+
+#: ../fdroidserver/lint.py
+msgid "Flattr donation methods belong in the FlattrID: field"
+msgstr "Metodat e dhurimit përmes Flattr-i i takojnë fushës FlattrID:"
+
 #: ../fdroidserver/lint.py
 msgid "Forbidden HTML tags"
 msgstr "Etiketa HTML të ndaluara"
@@ -801,34 +819,31 @@ msgstr "Detyro ndaljen e montimit pas {0} sek. mbarimi kohe!"
 
 #: ../fdroidserver/scanner.py
 msgid "Force scan of disabled apps and builds."
-msgstr "Detyro skanim aplikacionesh dhe montimesh të çaktivizuara."
+msgstr ""
 
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Found \"{path}\" graphic without metadata for app \"{name}\"!"
-msgstr "U gjet grafik “{path}” pa tejtëdhëna për aplikacionin “{name}”!"
+msgstr "U gjet grafik \"{path}\" pa tejtëdhëna për aplikacionin \"{name}\"!"
 
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Found bad funding file \"{path}\" for \"{name}\":"
-msgstr "U gjet kartelë e dëmtuar themeli “{path}” për “{name}”:"
+msgstr ""
 
 #: ../fdroidserver/common.py
 msgid "Found invalid appids in arguments"
 msgstr "U gjetën appid-e të pavlefshëm te argumente"
 
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
 #: ../fdroidserver/common.py
 msgid "Found invalid versionCodes for some apps"
 msgstr "U gjetën versionCodes të pavlefshëm për disa aplikacione"
 
 #: ../fdroidserver/common.py
-#, python-brace-format
+#, fuzzy, python-brace-format
 msgid "Found multiple JAR Signature Block Files in {path}"
-msgstr "Te {path} u gjetën Kartela të shumta JAR Blloqesh Nënshkrimi"
-
-#: ../fdroidserver/common.py
-msgid "Found multiple Signer Certificates!"
-msgstr "U gjetën Dëshmi të shumta Nënshkruesi!"
+msgstr "U gjetën dëshmi të shumta nënshkrimi te {path}"
 
 #: ../fdroidserver/metadata.py
 #, python-brace-format
@@ -839,6 +854,11 @@ msgstr "U gjetën kartela të shumta tejtëdhënash për {appid}"
 msgid "Found multiple signing certificates for repository."
 msgstr "U gjetën dëshmi të shumta nënshkrimi për depon."
 
+#: ../fdroidserver/update.py
+#, python-brace-format
+msgid "Found multiple signing certificates in {path}"
+msgstr "U gjetën dëshmi të shumta nënshkrimi te {path}"
+
 #: ../fdroidserver/index.py
 msgid "Found no signing certificates for repository."
 msgstr "S’u gjetën dëshmi nënshkrimi për depon."
@@ -846,23 +866,13 @@ msgstr "S’u gjetën dëshmi nënshkrimi për depon."
 #: ../fdroidserver/lint.py
 #, python-format
 msgid "Found non-file at %s"
-msgstr "U gjet jo-kartelë te %s"
+msgstr ""
 
 #: ../fdroidserver/deploy.py
 #, python-brace-format
 msgid "Found {apkfilename} at {url}"
 msgstr "U gjet {apkfilename} te {url}"
 
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Found {count} problems in {filename}"
-msgstr "U gjetën {count} probleme te {filename}"
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Found {count} warnings in {filename}"
-msgstr "U gjetën {count} sinjalizime te {filename}"
-
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Generated skeleton metadata for {appid}"
@@ -881,21 +891,19 @@ msgstr "Veprimi “git clean” dështoi"
 msgid "Git fetch failed"
 msgstr "Veprimi “git fetch” dështoi"
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
+#: ../fdroidserver/common.py
+msgid "Git remote set-head failed"
+msgstr "Veprimi “git remote set-head” dështoi"
+
 #: ../fdroidserver/common.py
 #, python-format
 msgid "Git remote set-head failed: \"%s\""
-msgstr "Veprimi “git remote set-head” dështoi: “%s”"
+msgstr "Veprimi “git remote set-head” dështoi: \"%s\""
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
 #: ../fdroidserver/common.py
 msgid "Git reset failed"
 msgstr "Veprimi “git reset” dështoi"
 
-#: ../fdroidserver/common.py
-msgid "Git submodule deinit failed"
-msgstr "Veprimi “git submodule deinit” dështoi"
-
 #: ../fdroidserver/common.py
 msgid "Git submodule sync failed"
 msgstr "Veprimi “git submodule sync” dështoi"
@@ -927,16 +935,6 @@ msgstr "Po shpërfillet '{field}' te tejtëdhëna '{metapath}', ngaqë është n
 msgid "Ignoring FUNDING.yml entry longer than 2048: %s"
 msgstr "Po shpërfillen zëra FUNDING.yml më të gjatë se 2048: %s"
 
-#: ../fdroidserver/update.py
-#, python-format
-msgid "Ignoring bad element in manifest: %s"
-msgstr "Po shpërfillet element i gabuar në manifest: %s"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Ignoring deprecated {oldfile}, use {newfile}!"
-msgstr "Po shpërfillet {oldfile} e nxjerrë nga përdorimi, përdorni {newfile}!"
-
 #: ../fdroidserver/index.py
 msgid "Ignoring package without metadata: "
 msgstr "Po shpërfillet paketë pa tejtëdhëna: "
@@ -946,6 +944,11 @@ msgstr "Po shpërfillet paketë pa tejtëdhëna: "
 msgid "Ignoring stale cache data for {apkfilename}"
 msgstr "Po shpërfillen të dhëna të ndenjura fshehtine për {apkfilename}"
 
+#: ../fdroidserver/rewritemeta.py
+#, python-brace-format
+msgid "Ignoring {ext} file at '{path}'"
+msgstr "Po shpërfillet kartelë {ext} te '{path}'"
+
 #: ../fdroidserver/update.py
 msgid "Include APKs that are signed with disabled algorithms like MD5"
 msgstr "Përfshi APKra që janë nënshkruar me algoritme të çaktivizuar, bie fjala, me MD5"
@@ -956,22 +959,12 @@ msgstr "Përfshi te pasqyra kartela .asc nënshkrimi PGP"
 
 #: ../fdroidserver/mirror.py
 msgid "Include the build logs in the mirror"
-msgstr "Përfshi te pasqyra regjistrat e montimeve"
+msgstr "Përfshi te pasqyra regjistrat e montimive"
 
 #: ../fdroidserver/mirror.py
 msgid "Include the source tarballs in the mirror"
 msgstr "Përfshi te pasqyra paketa tarball"
 
-#: ../fdroidserver/metadata.py
-#, python-format
-msgid "Including metadata from %s@%s"
-msgstr "Me përfshirje tejtëdhënash nga %s@%s"
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Including metadata from {path}"
-msgstr "Me përfshirje tejtëdhënash nga {path}"
-
 #: ../fdroidserver/common.py
 msgid "Initialising submodules"
 msgstr "Po gatiten nënmodule"
@@ -980,7 +973,7 @@ msgstr "Po gatiten nënmodule"
 msgid "Install all signed applications available"
 msgstr "Instalo krejt aplikacionet e nënshkruara që mundet"
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Install built packages on devices"
 msgstr "Instalo në pajisje paketat montuara"
 
@@ -989,12 +982,22 @@ msgstr "Instalo në pajisje paketat montuara"
 msgid "Installing %s..."
 msgstr "Po instalohet %s…"
 
+#: ../fdroidserver/install.py
+#, python-format
+msgid "Installing %s…"
+msgstr "Po instalohet %s…"
+
 #: ../fdroidserver/install.py
 #, python-brace-format
 msgid "Installing '{apkfilename}' on {dev}..."
 msgstr "Po instalohet '{apkfilename}' në {dev}…"
 
-#: ../fdroidserver/__main__.py
+#: ../fdroidserver/install.py
+#, python-brace-format
+msgid "Installing '{apkfilename}' on {dev}…"
+msgstr "Po instalohet '{apkfilename}' në {dev}…"
+
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Interact with the repo HTTP server"
 msgstr "Ndërveproni me shërbyesin HTTP të depos"
 
@@ -1002,36 +1005,53 @@ msgstr "Ndërveproni me shërbyesin HTTP të depos"
 msgid "Invalid APK"
 msgstr "APK e pavlefshme"
 
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "Invalid AutoUpdateMode: {mode}"
-msgstr "AutoUpdateMode e Pavlefshme: {mode}"
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "Invalid UpdateCheckMode: {mode}"
-msgstr "UpdateCheckMode i pavlefshëm: {mode}"
-
-#: ../fdroidserver/checkupdates.py
+#: ../fdroidserver/lint.py ../fdroidserver/checkupdates.py
 #, python-brace-format
 msgid "Invalid VercodeOperation: {field}"
 msgstr "VercodeOperationi pavlefshëm: {field}"
 
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Invalid VercodeOperation: {invalid_ops}"
-msgstr "VercodeOperation i pavlefshëm: {invalid_ops}"
-
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "Invalid application ID {appid}"
 msgstr "ID e pavlefshme aplikacioni {appid}"
 
+#: ../fdroidserver/metadata.py
+#, python-format
+msgid "Invalid boolean '%s'"
+msgstr "Bulean i pavlefshëm '%s'"
+
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Invalid build flag at {line} in {linedesc}"
+msgstr "Flamurkë e pavlefshme montimi te {line} në {linedesc}"
+
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Invalid build format: {value} in {name}"
+msgstr "Format i pavlefshëm montimesh: {value} në {name}"
+
 #: ../fdroidserver/lint.py
 msgid "Invalid bulleted list"
 msgstr "Listë me toptha e pavlefshme"
 
+#: ../fdroidserver/lint.py
+#, python-format
+msgid "Invalid license tag \"%s\"! Use only tags from https://spdx.org/license-list"
+msgstr "Etiketë e pavlefshme licence \"%s\"! Përdorni vetëm etiketa nga https://spdx.org/license-list"
+
+#: ../fdroidserver/lint.py
+msgid "Invalid link - use [http://foo.bar Link title] or [http://foo.bar]"
+msgstr "Lidhje e pavlefshme - përdorni [http://lidhja_që_na_intereson Lidhje titull] ose [http://lidhja_që_na_intereson]"
+
+#: ../fdroidserver/metadata.py
+#, python-format
+msgid "Invalid metadata in %s:%d"
+msgstr "Tejtëdhëna të pavlefshme te %s:%d"
+
+#: ../fdroidserver/metadata.py
+msgid "Invalid metadata in: "
+msgstr "Tejtëdhëna të pavlefshme te: "
+
 #: ../fdroidserver/common.py
 #, python-format
 msgid "Invalid name for published file: %s"
@@ -1039,8 +1059,8 @@ msgstr "Emër i pavlefshëm për kartelë të botuar: %s"
 
 #: ../fdroidserver/common.py
 #, python-brace-format
-msgid "Invalid ndk: entry in build: \"{ndk}\""
-msgstr "Zë ndk: i pavlefshëm në montim: \"{ndk}\""
+msgid "Invalid package name {0}"
+msgstr "Emër i pavlefshëm pakete {0}"
 
 #: ../fdroidserver/common.py
 #, python-brace-format
@@ -1062,6 +1082,11 @@ msgstr "Tejtëdhëna srclib të pavlefshme: s’u përtyp dot '{file}'"
 msgid "Invalid srclib metadata: unknown key '{key}' in '{file}'"
 msgstr "Tejtëdhëna srclib të pavlefshme: kyçi panjohur '{key}' te kartela '{file}'"
 
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Invalid versionCode: \"{versionCode}\" is not an integer!"
+msgstr "versionCode i pavlefshëm: \"{versionCode}\" s’është numër i plotë!"
+
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "JAR signature failed to verify: {path}"
@@ -1076,8 +1101,8 @@ msgstr "Nënshkrimi JAR u verifikua: {path}"
 msgid "Java JAR file"
 msgstr "Kartelë JAR Java"
 
-#: ../fdroidserver/mirror.py ../fdroidserver/publish.py
-#: ../fdroidserver/update.py
+#: ../fdroidserver/publish.py ../fdroidserver/update.py
+#: ../fdroidserver/mirror.py
 msgid "Java JDK not found! Install in standard location or set java_paths!"
 msgstr "S’u gjet Java JDK! Instalojeni në vendndodhje standarde ose caktoni java_paths!"
 
@@ -1093,19 +1118,10 @@ msgstr "S’u gjet Java jarsigner! Instalojeni në vendndodhje standarde ose cak
 msgid "Javascript in HTML src attributes"
 msgstr "Javascript në atribute src HTML"
 
-#: ../fdroidserver/build.py
-#, python-brace-format
-msgid "Keeping failed build \"{apkfilename}\""
-msgstr "Po mbahet montim i dështuar “{apkfilename}”"
-
 #: ../fdroidserver/init.py
 msgid "Keystore for signing key:\t"
 msgstr "Depo kyçesh për kyç nënshkrimi:\t"
 
-#: ../fdroidserver/lint.py
-msgid "Known debug key is used in AllowedAPKSigningKeys: "
-msgstr "Te AllowedAPKSigningKeys është përdorur kyç i ditur diagnostikimi: "
-
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "Last used commit '{commit}' looks like a tag, but UpdateCheckMode is '{ucm}'"
@@ -1115,9 +1131,13 @@ msgstr "Parashtrimi '{commit}' i përdorur së fundi duket si etiketë, por si U
 msgid "Liberapay donation methods belong in the Liberapay: field"
 msgstr "Metodat e dhurimit përmes Liberapay i takojnë fushës Liberapay:"
 
+#: ../fdroidserver/lint.py
+msgid "Liberapay donation methods belong in the LiberapayID flag"
+msgstr "Metodat e dhurimit përmes Liberapay i takojnë flamurkës Liberapay"
+
 #: ../fdroidserver/rewritemeta.py
-msgid "List files that would be reformatted (dry run)"
-msgstr "Paraqit kartela që do të duhej të riformatoheshin (dry run)"
+msgid "List files that would be reformatted"
+msgstr "Paraqit kartela që do të riformatoheshin"
 
 #: ../fdroidserver/lint.py
 msgid "Locale included in f-droid.org URL"
@@ -1135,16 +1155,6 @@ msgstr "Pasqyra depoje të keqformuara."
 msgid "Malformed serverwebroot line:"
 msgstr "Rresht serverwebroot i keqformuar:"
 
-#: ../fdroidserver/scanner.py
-#, python-format
-msgid "Max recursion depth in ZIP file reached: %s"
-msgstr "U mbërrit në thellësi maksimum rekursive te kartelë ZIP: %s"
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "Mirror config for {url} contains \"isPrimary\" key!"
-msgstr "Formësimi i pasqyrës për {url} përmban kyç “isPrimary”!"
-
 #: ../fdroidserver/mirror.py
 msgid "Mirror the full repo and archive, all file types."
 msgstr "Pasqyro depon e plotë dhe arkivin, krejt llojet e kartelave."
@@ -1153,30 +1163,31 @@ msgstr "Pasqyro depon e plotë dhe arkivin, krejt llojet e kartelave."
 msgid "Missing output directory"
 msgstr "Mungon drejtori përfundimesh"
 
-#: ../fdroidserver/metadata.py
-msgid "Moving Anti-Features declarations to localized files:"
-msgstr "Po kalohen pohime Anti-Features te kartela të përkthyera:"
-
-#: ../fdroidserver/index.py
-msgid "Neither \"repo_pubkey\" nor \"keystorepass\" set in config.yml"
-msgstr "Te config.yml s’është ujdisur as “repo_pubkey”, as “keystorepass”"
-
-#: ../fdroidserver/verify.py
+#: ../fdroidserver/lint.py
 #, python-format
-msgid "No APK for package: %s"
-msgstr "S’ka APK për paketën: %s"
+msgid "Name '%s' is just the auto name - remove it"
+msgstr "Emri '%s' është thjesht emër i automatizuar - hiqeni"
+
+#: ../fdroidserver/common.py
+msgid "No 'config.py' found, using defaults."
+msgstr "S’u gjet 'config.py', po përdoren parazgjedhjet."
 
 #: ../fdroidserver/common.py
 msgid "No Android SDK found!"
 msgstr "S’u gjet SDK Android!"
 
+#: ../fdroidserver/import.py
+msgid "No android or kivy project could be found. Specify --subdir?"
+msgstr "S’u gjet dot projekt android ose kivy. Të specifikohet --subdir?"
+
 #: ../fdroidserver/install.py
 msgid "No attached devices found"
 msgstr "S’u gjetën pajisje të bashkëngjitura"
 
-#: ../fdroidserver/install.py
-msgid "No devices found for `adb install`! Please plug one in."
-msgstr "S’u gjetën pajisje për `adb install`! Ju lutemi, vendosni një të tillë."
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "No commit specified for {versionName} in {linedesc}"
+msgstr "Te {linedesc} s’ka parashtrim të specifikuar për {versionName}"
 
 #: ../fdroidserver/index.py
 msgid "No fingerprint in URL."
@@ -1186,23 +1197,15 @@ msgstr "S’ka shenja gishtash te URL-ja."
 msgid "No git submodules available"
 msgstr "S’ka “git submodules”"
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
+#, fuzzy
 msgid "No gradle project could be found. Specify --subdir?"
-msgstr "S’u gjet dot projekt gradle. Të specifikohet --subdir?"
+msgstr "S’u gjet dot projekt android ose kivy. Të specifikohet --subdir?"
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py ../fdroidserver/common.py
 msgid "No information found."
 msgstr "S’u gjetën të dhëna."
 
-#: ../fdroidserver/checkupdates.py
-msgid "No matching tags found"
-msgstr "S’u gjetën etiketa me përputhje"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "No minimum SDK version found in {0}, using default (3)."
-msgstr "Te {0} s’u gjet version minimum SDK-je, po përdoret parazgjedhja (3)."
-
 #: ../fdroidserver/lint.py
 msgid "No need to specify that the app is Free Software"
 msgstr "S’ka nevojë të specifikohet që aplikacioni është Software i Lirë"
@@ -1212,8 +1215,8 @@ msgid "No need to specify that the app is for Android"
 msgstr "S’ka nevojë të specifikohet që aplikacioni është për Android"
 
 #: ../fdroidserver/deploy.py
-msgid "No option set! Edit your config.yml to set at least one of these:"
-msgstr "S’ka mundësi të ujdisur! Përpunoni config.yml tuaj që të ujdisni të paktën një prej:"
+msgid "No option set! Edit your config.py to set at least one of these:"
+msgstr "S’ka mundësi të ujdisur! Përpunoni config.py tuaj që të ujdisni të paktën një prej:"
 
 #: ../fdroidserver/common.py
 msgid "No packages specified"
@@ -1221,14 +1224,14 @@ msgstr "S’u specifikuan paketa"
 
 #: ../fdroidserver/install.py
 #, python-format
-msgid "No signed APK available for %s"
-msgstr "S’ka të gatshme APK të nënshkruara për %s"
+msgid "No signed apk available for %s"
+msgstr "S’ka të gatshme apk të nënshkruara për %s"
 
 #: ../fdroidserver/install.py
 msgid "No signed output directory - nothing to do"
 msgstr "S’ka drejtori output-i të nënshkruar - s’ka ç’bëhet"
 
-#: ../fdroidserver/common.py
+#: ../fdroidserver/update.py ../fdroidserver/common.py
 #, python-brace-format
 msgid "No signing certificates found in {path}"
 msgstr "S’u gjetën dëshmi nënshkrimi te {path}"
@@ -1238,26 +1241,19 @@ msgstr "S’u gjetën dëshmi nënshkrimi te {path}"
 msgid "No such package: %s"
 msgstr "S’ka paketë të tillë: %s"
 
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "No such versionCode {versionCode} for app {appid}"
 msgstr "S’ka versionCode {versionCode} për aplikacionin {appid}"
 
-#: ../fdroidserver/checkupdates.py
-msgid "No tags found"
-msgstr "S’u gjetën etiketa"
-
-#: ../fdroidserver/publish.py ../fdroidserver/verify.py
+#: ../fdroidserver/verify.py ../fdroidserver/publish.py
 msgid "No unsigned directory - nothing to do"
 msgstr "S’ka drejtori të panënshkruar - s’ka ç’bëhet"
 
-#: ../fdroidserver/__main__.py
-msgid "No version information could be found."
-msgstr "S’u gjetën hollësi versioni."
-
 #: ../fdroidserver/common.py
 msgid "Not a valid size definition: \"{}\""
-msgstr "Përkufizim jo i vlefshëm për madhësinë: “{}”"
+msgstr "Përkufizim jo i vlefshëm për madhësinë: \"{}\""
 
 #: ../fdroidserver/signindex.py
 msgid "Nothing to do"
@@ -1269,9 +1265,10 @@ msgid "Nothing to do for {appid}."
 msgstr "S’ka ç’bëhet për {appid}."
 
 #: ../fdroidserver/init.py
-msgid "Now set these in config.yml:"
-msgstr "Tani, ujdisini këto te config.yml:"
+msgid "Now set these in config.py:"
+msgstr "Tani, ujdisini këto te config.py:"
 
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "OBB file has newer versionCode({integer}) than any APK:"
@@ -1279,7 +1276,7 @@ msgstr "Kartela OBB ka versionCode({integer}) më të ri se sa cilado APK:"
 
 #: ../fdroidserver/update.py
 msgid "OBB filename must start with \"main.\" or \"patch.\":"
-msgstr "Emri i kartelës OBB duhet të fillojë me “main.” ose “patch.”:"
+msgstr "Emri i kartelës OBB duhet të fillojë me \"main.\" ose \"patch.\":"
 
 #: ../fdroidserver/update.py
 msgid "OBB's packagename does not match a supported APK:"
@@ -1289,28 +1286,23 @@ msgstr "packagename i OBB-së nuk përputhet me ndonjë APK të mbuluar:"
 msgid "Offline machine, skipping git mirror generation until `fdroid deploy`"
 msgstr "Makinë jo në linjë, po anashkalohet prodhim pasqyre git, deri sa `fdroid deploy`"
 
-#: ../fdroidserver/deploy.py
-msgid "One of the 'github_releases' config items is missing the 'packageNames' value. skipping ..."
-msgstr "Një nga zërat e formësimit të 'github_releases'mungon te vlera 'packageNames' value. Po anashkalohet…"
+#: ../fdroidserver/common.py
+#, python-brace-format
+msgid "Old APK signature failed to verify: {path}"
+msgstr "S’u arrit të verifikohej nënshkrim i vjetër APK-je: {path}"
 
-#: ../fdroidserver/deploy.py
-msgid "One of the 'github_releases' config items is missing the 'projectUrl' value. skipping ..."
-msgstr "Njërit prej zërave të formësimit të 'github_releases' i mungon vlera 'projectUrl'. Po anashkalohet…"
+#: ../fdroid ../fdroidserver/__main__.py
+msgid "Old, deprecated name for fdroid deploy"
+msgstr "Emër i vjetër, i nxjerrë nga përdorimi për sendërtim fdroid"
 
-#: ../fdroidserver/deploy.py
-msgid "One of the 'github_releases' config items is missing the 'token' value. skipping ..."
-msgstr "Një nga zërat e formësimit të 'github_releases' mungon te vlera 'token' value. Po anashkalohet…"
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Only PNG and JPEG are supported for graphics, found: {path}"
 msgstr "Si formate grafike mbulohen vetëm PNG dhe JPEG, u gjet: {path}"
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/common.py
-msgid "Only accepts a single key \"env\""
-msgstr "Pranon vetëm një “env” të vetëm kyçi"
+#: ../fdroidserver/checkupdates.py
+msgid "Only print differences with the Play Store"
+msgstr "Shtyp vetëm dallimet me Play Store-in"
 
 #: ../fdroidserver/checkupdates.py
 msgid "Only process apps with auto-updates"
@@ -1320,6 +1312,11 @@ msgstr "Kryeje vetëm për aplikacione me vetëpërditësime"
 msgid "OpenCollective donation methods belong in the OpenCollective: field"
 msgstr "Metodat e dhurimit përmes OpenCollective i takojnë fushës OpenCollective:"
 
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "Options"
+msgstr "Mundësi"
+
 #: ../fdroidserver/verify.py
 msgid "Output JSON report to file named after APK."
 msgstr "Hidhe raportin JSON te kartelë e emërtuar sipas APK-sh."
@@ -1328,25 +1325,29 @@ msgstr "Hidhe raportin JSON te kartelë e emërtuar sipas APK-sh."
 msgid "Output JSON to stdout."
 msgstr ""
 
-#: ../fdroidserver/checkupdates.py ../fdroidserver/gpgsign.py
-#: ../fdroidserver/publish.py ../fdroidserver/signindex.py
-#: ../fdroidserver/update.py
+#: ../fdroidserver/gpgsign.py ../fdroidserver/publish.py
+#: ../fdroidserver/update.py ../fdroidserver/signindex.py
+#: ../fdroidserver/checkupdates.py
 msgid "Outputting JSON"
 msgstr ""
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "Overall license of the project."
 msgstr "Licenca e përgjithshme e projektit."
 
+#: ../fdroidserver/dscanner.py
+msgid "Override path for repo APKs (default: ./repo)"
+msgstr "Shteg anashkalimi për APK-ra depoje (parazgjedhje: ./repo)"
+
 #: ../fdroidserver/index.py
 #, python-brace-format
 msgid "Overriding blank versionName in {apkfilename} from metadata: {version}"
 msgstr "Po anashkalohet versionName i zbrazët te {apkfilename} prej tejtëdhënash: {version}"
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 #, python-brace-format
 msgid "Package \"{appid}\" already exists"
-msgstr "Paketa “{appid}” ekziston tashmë"
+msgstr "Paketa \"{appid}\" ekziston tashmë"
 
 #: ../fdroidserver/common.py
 #, python-brace-format
@@ -1357,10 +1358,13 @@ msgstr "Po përtypet manifest te '{path}'"
 msgid "Password required with username"
 msgstr "Me emrin e përdoruesit lypset fjalëkalim"
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "Path to main Android project subdirectory, if not in root."
 msgstr "Shteg për te nëndrejtoria e projektit kryesor Android, në mos qoftë rrënja."
 
+msgid "Path to main android project subdirectory, if not in root."
+msgstr "Shteg për te nëndrejtoria e projektit kryesor android, në mos qoftë rrënja."
+
 #: ../fdroidserver/init.py
 msgid "Path to the Android SDK (sometimes set in ANDROID_HOME)"
 msgstr "Shteg për te SDK Android-i (ndonjëherë caktuar te ANDROID_HOME)"
@@ -1373,19 +1377,21 @@ msgstr "Shteg për te depo git për t’u përdorur si regjistri"
 msgid "Path to the keystore for the repo signing key"
 msgstr "Shteg për te depo kyçesh për kyçin e nënshkrimit të depos"
 
+#: ../fdroidserver/dscanner.py
+msgid "Prepare Drozer to run a scan"
+msgstr "Përgatite Drozer-in të bëjë një skanim"
+
+msgid "Prepare drozer to run a scan"
+msgstr "Përgatite Drozer-in të kryejë një skanim"
+
 #: ../fdroidserver/nightly.py
 msgid "Print the secret variable to the terminal for easy copy/paste"
 msgstr "Shtype ndryshoren e fshehtë te terminali, për kopjim/ngjitje të kollajtë"
 
-#: ../fdroidserver/install.py
+#: ../fdroidserver/metadata.py
 #, python-brace-format
-msgid "Privacy mode was enabled based on your locale ({country_code})."
-msgstr "Mënyra “Privatësi” qe aktivizuar bazuar në vendoren tuaj ({country_code})."
-
-#: ../fdroidserver/scanner.py
-#, python-format
-msgid "Problem with ZIP file: %s, error %s"
-msgstr "Problem me kartelën ZIP: %s, gabim %s"
+msgid "Problem with description of {appid}: {error}"
+msgstr "Problem me përshkrimin e {appid}: {error}"
 
 #: ../fdroidserver/common.py
 #, python-brace-format
@@ -1410,7 +1416,11 @@ msgstr "Po përpunohet {appid}"
 msgid "Produce human-readable XML/JSON for index files"
 msgstr "Për kartela treguesish, prodho XML/JSON të lexueshëm nga syri njerëzor"
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/update.py
+msgid "Produce human-readable index.xml"
+msgstr "Prodho index.xml të lexueshme nga syri njerëzor"
+
+#: ../fdroidserver/import.py
 msgid "Project URL to import from."
 msgstr "URL prej nga të importohet projekt."
 
@@ -1422,25 +1432,21 @@ msgstr "Pikësimi duhet shmangur"
 msgid "Push the log to this git remote repository"
 msgstr "Kryej <em>push</em> të regjistrit te kjo depo e largët git"
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Pushing binary transparency log to {url}"
 msgstr ""
 
-#: ../fdroidserver/deploy.py
-msgid "Pushing to remote server failed!"
-msgstr "Depozitimi te shërbyesi i largët dështoi!"
-
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Pushing to {url}"
 msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Quickly start a new repository"
 msgstr "Filloni shpejt e shpejt një depo të re"
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Read all the metadata files and exit"
 msgstr "Lexo krejt kartelat e tejtëdhënave dhe dil"
 
@@ -1451,12 +1457,14 @@ msgstr "Po lexohet '{config_file}'"
 
 #: ../fdroidserver/common.py
 #, python-brace-format
-msgid "Reading packageName/versionCode/versionName failed, APK invalid: '{apkfilename}'"
-msgstr "Leximi i packageName/versionCode/versionName dështoi, APK e pavlefshme: '{apkfilename}'"
+msgid "Reading minSdkVersion failed: \"{apkfilename}\""
+msgstr "Leximi i minSdkVersion dështoi: \"{apkfilename}\""
 
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
+#. https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
 #: ../fdroidserver/common.py
 #, python-brace-format
-msgid "Reading packageName/versionCode/versionName failed,APK invalid: '{apkfilename}'"
+msgid "Reading packageName/versionCode/versionName failed, APK invalid: '{apkfilename}'"
 msgstr "Leximi i packageName/versionCode/versionName dështoi, APK e pavlefshme: '{apkfilename}'"
 
 #: ../fdroidserver/update.py
@@ -1464,36 +1472,25 @@ msgstr "Leximi i packageName/versionCode/versionName dështoi, APK e pavlefshme:
 msgid "Reading {apkfilename} from cache"
 msgstr "Po lexohet {apkfilename} prej fshehtine"
 
-#: ../fdroidserver/build.py
-msgid "Refresh and cache scanner rules and signatures from the network"
-msgstr "Rifresko dhe ruaj në fshehtinë rregulla skaneri nga rrjeti"
-
-#: ../fdroidserver/publish.py
-#, python-brace-format
-msgid "Refusing to sign '{path}', file exists in both {dir1} and {dir2} folder."
-msgstr "S’po pranohet të nënshkruhet '{path}', kartela ekziston te të dyja dosjet, {dir1} dhe {dir2}."
-
-#: ../fdroidserver/verify.py
-msgid "Remove source tarball and any APKs if successfully verified."
-msgstr "Hiqni paketimin e burimit dhe çfarëdo APK-sh, nëse verifikimi është i suksesshëm."
+#: ../fdroidserver/stats.py
+msgid "Recalculate aggregate stats - use when changes have been made that would invalidate old cached data."
+msgstr "Rinjehso statistika përmbledhëse - përdoreni kur janë bërë ndryshime të cilat mund të bënin të pavlefshme të dhëna të vjetra të ruajtura në fshehtinë."
 
 #: ../fdroidserver/common.py
 msgid "Removing specified files"
 msgstr "Po hiqen kartelat e treguara"
 
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Removing {path}\""
-msgstr "Po hiqet {path}\""
-
 #: ../fdroidserver/update.py
 msgid "Rename APK files that do not match package.name_123.apk"
 msgstr "Riemërtoni kartelat APK që nuk përputhen me package.name_123.apk"
 
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "RepoType {type} is deprecated, please switch to git."
-msgstr ""
+#: ../fdroidserver/update.py
+msgid "Report on build data status"
+msgstr "Raport mbi gjendje të dhënash montimi"
+
+#: ../fdroidserver/build.py
+msgid "Reset and create a brand new build server, even if the existing one appears to be ok."
+msgstr "Zeroje dhe krijo një shërbyes montimesh të ri fringo, edhe nëse ai ekzistuesi duket të jetë në rregull."
 
 #: ../fdroidserver/nightly.py
 #, python-brace-format
@@ -1508,34 +1505,33 @@ msgstr "Ripërmaso krejt ikonat që tejkalojnë madhësinë maksimum në piksel
 msgid "Restrict output to warnings and errors"
 msgstr "Kufizoje output-in në sinjalizime dhe gabime"
 
-#: ../fdroidserver/net.py
-#, python-format
-msgid "Retrying failed download: %s"
-msgstr "Po riprovohet shkarkim i dështuar: %s"
-
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Rewrite all the metadata files"
 msgstr "Rishkruaj krejt kartelat e tejtëdhënave"
 
+#: ../fdroidserver/rewritemeta.py
+msgid "Rewrite to a specific format: "
+msgstr "Rishkruajeni në një format specifik: "
+
 #: ../fdroidserver/rewritemeta.py
 #, python-brace-format
 msgid "Rewriting '{appid}'"
 msgstr "Po rishkruhet '{appid}'"
 
+#: ../fdroidserver/rewritemeta.py
+#, python-brace-format
+msgid "Rewriting '{appid}' to '{path}'"
+msgstr "Po rishkruhet '{appid}' te '{path}'"
+
 #: ../fdroidserver/checkupdates.py
 msgid "Run on git repo that has uncommitted changes"
 msgstr "Xhirojeni në depo git që ka ndryshime të padepozituara te dega vendore"
 
-#: ../fdroidserver/nightly.py
-#, python-brace-format
-msgid "Run over {cibase} to find -debug.apk. and skip repo_basedir {repo_basedir}"
-msgstr "Kalo nëpër {cibase} për të gjetur -debug.apk. dhe anashkalo repo_basedir {repo_basedir}"
-
 #: ../fdroidserver/lint.py
 msgid "Run rewritemeta to fix formatting"
 msgstr "Që të ndreqet formatimi, xhironi rewritemeta"
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 msgid "Running first pass with MD5 checking disabled"
 msgstr "Po xhirohet kalimi i parë me kontrollin MD5 të çaktivizuar"
 
@@ -1544,28 +1540,22 @@ msgstr "Po xhirohet kalimi i parë me kontrollin MD5 të çaktivizuar"
 msgid "Running wget in {path}"
 msgstr "Po xhirohet wget te {path}"
 
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "SHA-256 of {url} does not match entry!"
-msgstr "SHA-256 e {url} nuk përkon me zërin!"
+#: ../fdroidserver/dscanner.py
+msgid "Scan only the latest version of each package"
+msgstr "Skano vetëm versionin më të ri të çdo pakete"
 
 #: ../fdroidserver/build.py
 msgid "Scan the resulting APK(s) for known non-free classes."
 msgstr "Kontrollo për klasa jo të lira të ditura APK-në(të) e prodhuara."
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Scan the source code of a package"
 msgstr "Skanoni kodin burim të një pakete"
 
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Scanner found {count} problems in {apk}"
-msgstr "Kontrolli gjeti {count} probleme te {apk}"
-
 #: ../fdroidserver/scanner.py
 #, python-brace-format
 msgid "Scanner found {count} problems in {appid}:"
-msgstr "Kontrolli gjeti {count} probleme te {appid}:"
+msgstr "Skaneri gjeti {count} probleme te {appid}:"
 
 #: ../fdroidserver/scanner.py
 #, python-brace-format
@@ -1575,21 +1565,8 @@ msgstr "Kontrolli gjeti {count} probleme te {appid}:{versionCode}:"
 #: ../fdroidserver/build.py
 msgid "Scanner found {} problem"
 msgid_plural "Scanner found {} problems"
-msgstr[0] "Kontrolli gjeti {} problem"
-msgstr[1] "Kontrolli gjeti {} probleme"
-
-#: ../fdroidserver/scanner.py
-msgid "Scanning APK for extra signing blocks."
-msgstr "Po kontrollohet te APK për blloqe ekstra nënshkrimi."
-
-#: ../fdroidserver/scanner.py
-msgid "Scanning APK with dexdump for known non-free classes."
-msgstr "Po kontrollohet APK me “dexdump” për klasa të ditura jo të lira."
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Set NDK {release} ({version}) up"
-msgstr ""
+msgstr[0] "Skaneri gjeti {} problem"
+msgstr[1] "Skaneri gjeti {} probleme"
 
 #: ../fdroidserver/common.py
 msgid "Set clock to that time using:"
@@ -1604,7 +1581,7 @@ msgstr "Caktoni numër maksimum hedhjesh në qarkullim, përpara se të arkivohe
 msgid "Set open file limit to {integer}"
 msgstr "Si kufi hapjeje kartele cakto {integer}"
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Set up an app build for a nightly build repo"
 msgstr "Ujdisni një montim aplikacioni për një depo montimesh të përnatshme"
 
@@ -1617,11 +1594,18 @@ msgstr "Dështoi ujdisje kufiri hapjesh kartelash: "
 msgid "Setting {0} sec timeout for this build"
 msgstr "Po ujdiset mbarim kohe {0} sekonda për këtë montim"
 
-#: ../fdroidserver/__main__.py
+#: ../fdroidserver/build.py
+msgid "Setup an emulator, install the APK on it and perform a Drozer scan"
+msgstr "Ujdisni një emulues, instaloni në të APK-në dhe kryeni një skanim Drozer"
+
+msgid "Setup an emulator, install the apk on it and perform a drozer scan"
+msgstr "Ujdisni një emulues, instaloni në të APK-në dhe kryeni një skanim Drozer"
+
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Sign and place packages in the repo"
 msgstr "Nënshkruani dhe vendosni paketa te depoja"
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Sign indexes created using update --nosign"
 msgstr "Tregues nënshkrimi të krijuar duke përdorur “update --nosign”"
 
@@ -1634,11 +1618,6 @@ msgstr "Anashkalo skanimin e kodit burim për dyorë dhe probleme të tjera"
 msgid "Skipping '{apkfilename}' with invalid signature!"
 msgstr "Po anashkalohet '{apkfilename}' me nënshkrim i pavlefshëm!"
 
-#: ../fdroidserver/deploy.py ../fdroidserver/index.py
-#, python-format
-msgid "Skipping GitLab Pages mirror because the repo is too large (>%.2fGB)!"
-msgstr "Po anashkalohet pasqyrë GitLab Pages, ngaqë depoja është shumë e madhe (>%.2fGB)!"
-
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Skipping index generation for {appid}"
@@ -1654,14 +1633,23 @@ msgstr "Po anashkalohet {apkfilename} me nënshkrim të pavlefshëm!"
 msgid "Skipping {appid}: disabled"
 msgstr "Po anashkalohet {appid}: e çaktivizuar"
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/scanner.py
+#, python-brace-format
+msgid "Skipping {appid}: no builds specified"
+msgstr "Po anashkalohet {appid}: s’u specifikuan montime"
+
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 msgid "Specify a local folder to sync the repo to"
 msgstr "Specifikoni një dosje vendore te e cila të njëkohësohet depoja"
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 msgid "Specify an identity file to provide to SSH for rsyncing"
 msgstr "Specifikoni një kartelë identiteti për t’ia furnizuar SSH-s për njëkohësim me rsync-un"
 
+#: ../fdroidserver/build.py
+msgid "Specify that we're running on the build server"
+msgstr "Specifiko që po xhirojmë te shërbyesi i montimeve"
+
 #: ../fdroidserver/nightly.py
 msgid "Specify which debug keystore file to use."
 msgstr "Specifikoni cila kartelë depoje kyçesh diagnostikimesh të përdoret."
@@ -1670,10 +1658,15 @@ msgstr "Specifikoni cila kartelë depoje kyçesh diagnostikimesh të përdoret."
 msgid "Spew out even more information than normal"
 msgstr "U la të rrjedhë edhe më tepër informacion se sa normalisht"
 
+#: ../fdroidserver/nightly.py
+#, python-brace-format
+msgid "Striping mystery signature from {apkfilename}"
+msgstr "Po hiqet nënshkrim misterioz nga {apkfilename}"
+
 #: ../fdroidserver/nightly.py
 #, python-brace-format
 msgid "Stripping mystery signature from {apkfilename}"
-msgstr "Po hiqet nënshkrim i mistershëm prej {apkfilename}"
+msgstr "Stripping mystery signature from {apkfilename}"
 
 #: ../fdroidserver/lint.py
 #, python-format
@@ -1690,27 +1683,15 @@ msgstr "Përmbledhja me gjatësi {length} është mbi kufirin prej {limit} shenj
 msgid "System clock is older than date in {path}!"
 msgstr "Ora e sistemit është më herët se sa data në {path}!"
 
-#: ../fdroidserver/checkupdates.py
-msgid "Tags update mode only works for git, hg, bzr and git-svn repositories currently"
-msgstr "Aktualisht, mënyra “tags update” funksionon vetëm për depo git, hg, bzr dhe git-svn"
-
-#: ../fdroidserver/checkupdates.py
-msgid "Tags update mode used in git-svn, but the repo was not set up with tags"
-msgstr "U përdor mënyra “tags update” në git-svn, por depoja s’qe ujdisur me etiketa"
-
 #: ../fdroidserver/build.py
 msgid "Test mode - put output in the tmp directory only, and always build, even if the output already exists."
 msgstr "Mënyra testim - hidhe output-in vetëm te drejtoria tmp, dhe monto përherë, edhe nëse output-i ekziston tashmë."
 
-#: ../fdroidserver/index.py
-msgid "The \"qrcode\" Python package is not installed (e.g. apt-get install python3-qrcode)!"
-msgstr "Paketa Python “qrcode” s’është e instaluar (p.sh., apt-get install python3-qrcode)!"
-
 #. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "The OBB version code must come after \"{name}.\":"
-msgstr "Kodi për versionin OBB duhet të vijë pas “{name}.”:"
+msgstr "Kodi për versionin OBB duhet të vijë pas \"{name}.\":"
 
 #: ../fdroidserver/btlog.py
 msgid "The base URL for the repo to log (default: https://f-droid.org)"
@@ -1724,14 +1705,22 @@ msgstr "Drejtoria ku të shkruhet pasqyra"
 msgid "The file to be included in the repo (path or glob)"
 msgstr "Kartela që duhet përfshirë te depoja (shteg ose shenjë e gjithëpushtetshme)"
 
+#: ../fdroidserver/deploy.py
+msgid "The only commands currently supported are 'init' and 'update'"
+msgstr "Urdhrat e vetme të mbuluara janë 'init' dhe 'update'"
+
 #: ../fdroidserver/index.py
 msgid "The repository's fingerprint does not match."
 msgstr "Shenjat e gishtave të depos nuk përputhen."
 
+#: ../fdroidserver/common.py
+msgid "The repository's index could not be verified."
+msgstr "Treguesi i depos s’u verifikua dot."
+
 #: ../fdroidserver/deploy.py
 #, python-brace-format
 msgid "The root dir for local_copy_dir \"{path}\" does not exist!"
-msgstr "Drejtoria rrënjë për local_copy_dir “{path}” s’ekziston!"
+msgstr "Drejtoria rrënjë për local_copy_dir \"{path}\" s’ekziston!"
 
 #: ../fdroidserver/publish.py
 msgid "There is a keyalias collision - publishing halted"
@@ -1741,46 +1730,14 @@ msgstr "Ka një përplasje keyalias-i - botimi u ndal"
 msgid "These are the apps that have been archived from the main repo."
 msgstr "Këto janë aplikacionet që janë arkivuar nga depoja kryesore."
 
-#: ../fdroidserver/mirror.py
-msgid "This command should never be used to mirror f-droid.org! A full copy requires more than 600GB."
-msgstr "Ky urdhër s’duhet përdorur kurrë për krijimin e një pasqyre të f-droid.org! Një kopje e plotë lyp më tepër se 600GB."
-
-#: ../fdroidserver/common.py
-msgid "This is a repository of apps to be used with F-Droid. Applications in this repository are either official binaries built by the original application developers, or are binaries built from source by the admin of f-droid.org using the tools on https://gitlab.com/fdroid."
-msgstr "Kjo është një depo aplikacionesh për t’u përdorur me F-Droid. Aplikacionet në këtë depo ose janë dyorë zyrtarë të montuar nga zhvilluesit e aplikacionit origjinal, ose janë dyorë të montuar nga burimi prej f-droid.org duke përdorur mjetet në https://gitlab.com/fdroid."
-
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 #, python-format
 msgid "This repo already has local metadata: %s"
 msgstr "Kjo depo ka tashmë tejtëdhëna vendore: %s"
 
-#: ../fdroidserver/init.py
-#, python-format
-msgid ""
-"To complete the setup, add your APKs to \"%s\"\n"
-"then run \"fdroid update -c; fdroid update\".  You might also want to edit\n"
-"\"config.yml\" to set the URL, repo name, and more.  You should also set up\n"
-"a signing key (a temporary one might have been automatically generated).\n"
-"\n"
-"For more info: https://f-droid.org/docs/Setup_an_F-Droid_App_Repo\n"
-"and https://f-droid.org/docs/Signing_Process"
-msgstr ""
-"Që të plotësoni ujdisjen, shtojini APK-të tuaja te “%s”,\n"
-"mandej kryeni “fdroid update -c; fdroid update”.  Mund të doni edhe\n"
-"të përpunoni “config.yml”, për të caktuar URL-në, emrin e depos, etj.\n"
-"Duhet të ujdisni edhe një kyç nënshkrimesh (një i tillë i përkohshëm\n"
-"mund të jetë prodhuar automatikisht).\n"
-"\n"
-"Për më tepër hollësi: https://f-droid.org/docs/Setup_an_F-Droid_App_Repo\n"
-"dhe https://f-droid.org/docs/Signing_Process"
-
-#: ../fdroidserver/deploy.py
-msgid "To use awsbucket, awssecretkey and awsaccesskeyid must also be set in config.yml!"
-msgstr "Për të përdorur awsbucket, te config.yml duhen ujdisur edhe awssecretkey dhe awsaccesskey!"
-
-#: ../fdroidserver/deploy.py
-msgid "To use rclone, rclone_config and awsbucket must be set in config.yml!"
-msgstr "Që të përdorni rclone, rclone_config dhe awsbucket duhen ujdisur te config.yml!"
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
+msgid "To use awsbucket, awssecretkey and awsaccesskeyid must also be set in config.py!"
+msgstr "Për të përdorur awsbucket, te config.py duhen ujdisur edhe awssecretkey dhe awsaccesskey!"
 
 #: ../fdroidserver/lint.py
 msgid "URL must start with https:// or http://"
@@ -1790,6 +1747,10 @@ msgstr "URL-ja duhet të fillojë me https:// ose http://"
 msgid "URL shorteners should not be used"
 msgstr "S’duhen përdorur shkurtues URL-sh"
 
+#: ../fdroidserver/metadata.py
+msgid "URL title is just the URL, use brackets: [URL]"
+msgstr "Titulli i URL-së është thjesht URL-ja, përdorni kllapa: [URL]"
+
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "URL {url} in Description: {error}"
@@ -1797,21 +1758,22 @@ msgstr "URL {url} te Përshkrim: {error}"
 
 #: ../fdroidserver/lint.py
 msgid "Unexpected license tag \"{}\"! Only use FSF or OSI approved tags from https://spdx.org/license-list"
-msgstr "Etiketë licence “{}” e papritur! Përdorni vetëm etiketa të miratuara nga FSF ose OSI, prej https://spdx.org/license-list"
+msgstr "Etiketë licence \"{}\" e papritur! Përdorni vetëm etiketa të miratuara nga FSF ose OSI, prej https://spdx.org/license-list"
 
 #: ../fdroidserver/lint.py
 msgid "Unexpected license tag \"{}\"! Only use license tags configured in your config file"
-msgstr "Etiketë e papritur licence “{}”! Përdorni vetëm etiketa licencash të formësuara te kartela e formësimit tuaj"
+msgstr "Etiketë e papritur licence \"{}\"! Përdorni vetëm etiketa licencash të formësuara te kartela e formësimit tuaj"
 
-#: ../fdroidserver/common.py
+#: ../fdroidserver/metadata.py
 #, python-brace-format
-msgid "Unknown entry {key} in {configname}"
-msgstr "Zë i panjohur {key} në {configname}"
+msgid "Unexpected text on same line as {field} in {linedesc}"
+msgstr "Tekst i papritur në të njëjtin rresht me {field} te {linedesc}"
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Unknown exception found!"
 msgstr "U gjet përjashtim i panjohur!"
 
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "Unknown file '{filename}' in build '{versionName}'"
@@ -1822,6 +1784,11 @@ msgstr "Kartelë e panjohur '{filename}' te montimi '{versionName}'"
 msgid "Unknown metadata format: %s"
 msgstr "Format i panjohur tejtëdhënash: %s"
 
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Unknown metadata format: {path}"
+msgstr "Format i panjohur tejtëdhënash: {path}"
+
 #: ../fdroidserver/metadata.py
 #, python-brace-format
 msgid "Unknown metadata format: {path} (use: *.yml)"
@@ -1831,6 +1798,10 @@ msgstr "Format i panjohur tejtëdhënash: {path} (përdorni: *.yml)"
 msgid "Unknown version of aapt, might cause problems: "
 msgstr "Version i panjohur i aapt-së, mund të sjellë probleme: "
 
+#: ../fdroidserver/lint.py
+msgid "Unlinkified link - use [http://foo.bar Link title] or [http://foo.bar]"
+msgstr "Lidhje e cila është hequr nga lidhje - përdorni [http://lidhja_që_na_intereson Lidhje titull] ose [http://lidhja_që_na_intereson]"
+
 #: ../fdroidserver/lint.py
 msgid "Unnecessary leading space"
 msgstr "Hapësirë e panevojshme në fillim"
@@ -1844,22 +1815,53 @@ msgstr "Hapësirë e panevojshme në fund"
 msgid "Unrecognised app field '{fieldname}' in '{path}'"
 msgstr "Fushë aplikacioni jo e pranuar '{fieldname}' te '{path}'"
 
+#: ../fdroidserver/metadata.py
+msgid "Unrecognised app field: "
+msgstr "Fushë aplikacioni jo e pranuar: "
+
 #: ../fdroidserver/metadata.py
 #, python-brace-format
 msgid "Unrecognised build flag '{build_flag}' in '{path}'"
 msgstr "Flamurkë e jo e pranuar montimi '{build_flag}' te '{path}'"
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Unrecognised field '{field}' in {linedesc}"
+msgstr "Fushë jo e pranuar '{field}' te {linedesc}"
+
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Unsupported file type \"{extension}\" for repo graphic"
-msgstr "Lloj i pambuluar kartele “{extension}” për grafik depoje"
+msgstr "Lloj i pambuluar kartele \"{extension}\" për grafik depoje"
 
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Unsupported graphics file found: {path}"
 msgstr "U gjet kartelë e pambuluar grafike: {path}"
 
+#: ../fdroidserver/rewritemeta.py
+#, python-brace-format
+msgid "Unsupported metadata format, use: --to [{supported}]"
+msgstr "Format tejtëdhënash i pambuluar, përdorni: --to [{supported}]"
+
+#: ../fdroidserver/metadata.py
+msgid "Unterminated ]"
+msgstr "] e papërfunduar"
+
+#: ../fdroidserver/metadata.py
+msgid "Unterminated ]]"
+msgstr "]] të papërfunduara"
+
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Unterminated build in {name}"
+msgstr "Montim i papërfunduar në {name}"
+
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Unterminated continuation in {name}"
+msgstr "Vazhdim i papërfunduar në {name}"
+
 #: ../fdroidserver/lint.py
 #, python-format
 msgid "Unused extlib at %s"
@@ -1880,25 +1882,27 @@ msgstr "Shteg scandelete i papërdorur: %s"
 msgid "Unused scanignore path: %s"
 msgstr "Shteg scanignore i papërdorur: %s"
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Update repo information for new packages"
 msgstr "Përditësoni të dhëna depoje për paketa të reja"
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Update the binary transparency log for a URL"
 msgstr "Përditësoni regjistrin e transparencës së dyorit për një URL"
 
+#: ../fdroid ../fdroidserver/__main__.py
+msgid "Update the stats of the repo"
+msgstr "Përditëso statistikat e depos"
+
+#: ../fdroidserver/update.py ../fdroidserver/build.py
+msgid "Update the wiki"
+msgstr "Përditësoni wiki-n"
+
 #: ../fdroidserver/checkupdates.py
 #, python-brace-format
 msgid "UpdateCheckData has invalid URL: {url}"
 msgstr "UpdateCheckData ka URL të pavlefshme: {url}"
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "UpdateCheckData must match the version code as integer (\\d or [0-9]): {codeex}"
-msgstr "UpdateCheckData duhet të përputhet me kodin e versionit si numër i plotë (\\d, ose [0-9]): {codeex}"
-
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "UpdateCheckData must use HTTPS URL: {url}"
@@ -1910,10 +1914,14 @@ msgid "UpdateCheckData not a valid URL: {url}"
 msgstr "UpdateCheckData s’është URL e vlefshme: {url}"
 
 #: ../fdroidserver/lint.py
-msgid "UpdateCheckMode is set but it looks like checkupdates hasn't been run yet."
-msgstr "UpdateCheckMode është ujdisur, por duket sikur checkupdates s’është xhiruar ende."
+msgid "UpdateCheckMode is set but it looks like checkupdates hasn't been run yet"
+msgstr "UpdateCheckMode është ujdisur, por duket sikur checkupdates s’është xhiruar ende"
+
+#. Translators: https://developer.android.com/studio/build/application-id
+#: ../fdroidserver/lint.py
+msgid "UpdateCheckName is set to the known application ID - it can be removed"
+msgstr "Si UpdateCheckName është caktuar ID-ja e aplikacionit të njohur - s’mund të hiqet"
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
 #: ../fdroidserver/lint.py
 msgid "UpdateCheckName is set to the known application ID, it can be removed"
 msgstr "Si UpdateCheckName është caktuar ID aplikacioni të njohur - s’mund të hiqet"
@@ -1928,9 +1936,20 @@ msgstr "Po ngarkohet {apkfilename} te androidobservatory.org"
 msgid "Uploading {apkfilename} to virustotal"
 msgstr "Po ngarkohet {apkfilename} to virustotal"
 
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "Usage"
+msgstr "Përdorim"
+
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, python-format
+msgid "Usage: %s\n"
+msgstr "Përdorim: %s\n"
+
 #: ../fdroidserver/lint.py
-msgid "Use /HEAD instead of /master or /main to point at a file in the default branch"
-msgstr "Për të treguar një kartelë te dega parazgjedhje, përdorni /HEAD, në vend se /master apo /main"
+msgid "Use /HEAD instead of /master to point at a file in the default branch"
+msgstr "Për të treguar një kartelë te dega parazgjedhje, përdorni /HEAD, në vend se /master"
 
 #: ../fdroidserver/update.py
 msgid "Use `fdroid update -c` to create it."
@@ -1944,15 +1963,13 @@ msgstr "Përdor shërbyes montimesh"
 msgid "Use date from APK instead of current time for newly added APKs"
 msgstr "Për APK-ra të shtuara rishtazi, përdor datë prej APK-je, në vend se kohën e tanishme"
 
-#: ../fdroidserver/deploy.py
+msgid "Use date from apk instead of current time for newly added apks"
+msgstr "Për APK-ra të shtuara rishtazi, përdor datë prej APK-je, në vend se të kohës së tanishme"
+
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Using \"{path}\" for configuring s3cmd."
-msgstr "Po përdoret “{path}” për formësim të s3cmd."
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Using \"{path}\" for syncing with remote storage."
-msgstr "Po përdoret “{path}” për njëkohësim me depozitë të largët."
+msgstr "Po përdoret \"{path}\" për formësim të s3cmd."
 
 #: ../fdroidserver/common.py
 msgid "Using APK Signature v2"
@@ -1963,34 +1980,25 @@ msgid "Using APK Signature v3"
 msgstr "Po përdoret Nënshkrimi APK-je v3"
 
 #: ../fdroidserver/common.py
-msgid "Using JAR Signature"
-msgstr "Po përdoret Nënshkrim JAR"
+msgid "Using Java's jarsigner, not recommended for verifying APKs! Use apksigner"
+msgstr "Po përdoret jarsigner Java, nuk rekomandohet për verifikim APK-sh! Përdorni apksigner"
 
 #: ../fdroidserver/common.py
-msgid "Using Java's jarsigner, not recommended for verifying APKs! Use apksigner"
-msgstr "Po përdoret jarsigner Java, s’rekomandohet për verifikim APK-sh! Përdorni apksigner"
-
-#: ../fdroidserver/metadata.py
 #, python-brace-format
-msgid "Using blank dictionary instead of contents of {path}!"
-msgstr "Po përdoret fjalor i zbrazët, në vend se lënda e {path}!"
+msgid "Using androguard from \"{path}\""
+msgstr "Po përdoret androguard prej \"{path}\""
 
 #: ../fdroidserver/init.py
 #, python-brace-format
 msgid "Using existing keystore \"{path}\""
-msgstr "Po përdoret depo ekzistuese kyçesh “{path}”"
+msgstr "Po përdoret depo ekzistuese kyçesh \"{path}\""
 
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Using rclone to sync with: {url}"
-msgstr "Po përdoret rclone për njëkohësim me: {url}"
-
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Using s3cmd to sync with: {url}"
 msgstr "Po përdoret s3cmd për njëkohësim me: {url}"
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Valid commands are:"
 msgstr "Urdhrat e vlefshëm janë:"
 
@@ -1998,7 +2006,7 @@ msgstr "Urdhrat e vlefshëm janë:"
 msgid "Verify against locally cached copy rather than redownloading."
 msgstr "Verifikoje ndaj një kopjeje të ruajtur lokalisht në fshehtinë, në vend se ta rishkarkosh."
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Verify the integrity of downloaded packages"
 msgstr "Verifikoni integritetin e paketave të shkarkuara"
 
@@ -2006,28 +2014,15 @@ msgstr "Verifikoni integritetin e paketave të shkarkuara"
 msgid "Verifying index signature:"
 msgstr "Po verifikohet nënshkrim treguesi:"
 
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "Verifying package {path} with apksigner."
-msgstr "Po verifikohet paketë {path} me apksigner."
-
 #: ../fdroidserver/deploy.py
 #, python-brace-format
 msgid "VirusTotal API key cannot upload files larger than 32MB, use {url} to upload {path}."
 msgstr "Kyçi API VirusTotal s’mund të ngarkojë kartela më të mëdha se 2MB, përdorni {url} që të ngarkoni {path}."
 
-#: ../fdroidserver/nightly.py
-msgid "WARNING: only public git repos are supported!"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Warn about possible metadata errors"
 msgstr "Sinjalizo rreth gabimesh të mundshëm tejtëdhënash"
 
-#: ../fdroidserver/scanner.py
-msgid "WebAssembly binary file"
-msgstr "Kartelë dyore WebAssembly"
-
 #: ../fdroidserver/update.py
 msgid "When configured for signed indexes, create only unsigned indexes at this stage"
 msgstr "Kur është formësuar për tregues të nënshkruar, në këtë fazë krijo vetëm tregues të panënshkruar"
@@ -2036,17 +2031,8 @@ msgstr "Kur është formësuar për tregues të nënshkruar, në këtë fazë kr
 msgid "When linting the entire repository yamllint is disabled by default. This option forces yamllint regardless."
 msgstr ""
 
-#: ../fdroidserver/publish.py
-msgid "When signing or verifying fails, exit with an error code."
-msgstr "Kur nënshkrimi, ose verifikimi dështon, dil me një kod gabimi."
-
-#: ../fdroidserver/install.py
-msgid "Would you like to download and install F-Droid.apk via adb? (YES/no)"
-msgstr "Doni të shkarkohet dhe instalohet F-Droid.apk përmes adb-je? (PO/jo)"
-
-#: ../fdroidserver/install.py
-msgid "Would you like to download the app(s) from f-droid.org? (YES/no)"
-msgstr "Doni të shkarkohet aplikacioni(et) që nga f-droid.org? (PO/jo)"
+msgid "X.509 'Distiguished Name' used when generating keys"
+msgstr "X.509 'Distinguished Name' i përdorur teksa prodhoheshin kyçe"
 
 #: ../fdroidserver/init.py
 msgid "X.509 'Distinguished Name' used when generating keys"
@@ -2060,11 +2046,6 @@ msgstr "Mund të përdorni ANDROID_HOME që të caktoni shtegun për te SDK-ja j
 msgid "ZIP file archive"
 msgstr "Arkiv kartelash ZIP"
 
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "adb reports {serial} is \"{status}\"!"
-msgstr "adb-ja njofton se {serial} është “{status}”!"
-
 #: ../fdroidserver/nightly.py
 #, python-brace-format
 msgid "adding IdentityFile to {path}"
@@ -2075,78 +2056,84 @@ msgstr "po shtohet IdentityFile te {path}"
 msgid "adding to {name}: {path}"
 msgstr "po shtohet te {name}: {path}"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "ambiguous option: %(option)s could match %(matches)s"
 msgstr "mundësi e dykuptimtë: %(option)s mund të përputhej me %(matches)s"
 
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "apksigner in build-tools;{version} passes APKs with invalid v3 signatures, ignoring."
-msgstr "apksigner te build-tools;{version} përcjell APK-ra ne nënshkrime v3 të pavlefshme, po shpërfillet."
-
-#: ../fdroidserver/common.py
-msgid "apksigner not found! Cannot sign or verify modern APKs"
-msgstr "S’u gjet apksigner! S’nënshkruhen ose verifikohen dot APK-ra moderne"
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, python-format
+msgid "ambiguous option: %s (%s?)"
+msgstr "mundësi e dykuptimtë: %s (%s?)"
 
 #: ../fdroidserver/common.py
 msgid "apksigner not found, it's required for signing!"
 msgstr "S’u gjet apksigner, është i domosdoshëm për nënshkrim!"
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/checkupdates.py ../fdroidserver/lint.py
-#: ../fdroidserver/rewritemeta.py
+#: ../fdroidserver/lint.py ../fdroidserver/rewritemeta.py
+#: ../fdroidserver/checkupdates.py
 msgid "application ID of file to operate on"
 msgstr "ID aplikacioni e kartelës mbi të cilën të veprohet"
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/build.py ../fdroidserver/install.py
-#: ../fdroidserver/publish.py ../fdroidserver/scanner.py
-#: ../fdroidserver/verify.py
+#: ../fdroidserver/verify.py ../fdroidserver/publish.py
+#: ../fdroidserver/build.py ../fdroidserver/scanner.py
+#: ../fdroidserver/install.py
 msgid "application ID with optional versionCode in the form APPID[:VERCODE]"
 msgstr "ID aplikacioni me versionCode opsional në formën APPID[:VERCODE]"
 
-#: ../fdroidserver/common.py
-msgid "archive_url needs to end with /archive"
-msgstr "archive_url lypset të përfundojë me /archive"
+#: ../fdroidserver/lint.py ../fdroidserver/rewritemeta.py
+msgid "applicationId in the form APPID"
+msgstr "applicationId në formën e APPID"
 
-#: /usr/lib/python3.11/argparse.py
+#: ../fdroidserver/checkupdates.py
+msgid "applicationId to check for updates"
+msgstr "applicationId për të cilin të kontrollohet për përditësime"
+
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
+#: ../fdroidserver/verify.py ../fdroidserver/publish.py
+#: ../fdroidserver/dscanner.py ../fdroidserver/build.py
+#: ../fdroidserver/scanner.py ../fdroidserver/install.py
+msgid "applicationId with optional versionCode in the form APPID[:VERCODE]"
+msgstr "applicationId me versionCode opsional në formën APPID[:VERCODE]"
+
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "argument \"-\" with mode %r"
-msgstr "argument “-” me mënyrën %r"
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "argument %(argument_name)s: %(message)s"
-msgstr "argument %(argument_name)s: %(message)s"
+msgstr "argument \"-\" me mënyrën %r"
 
 #: ../fdroidserver/nightly.py
 msgid "attempting bare SSH connection to test deploy key:"
 msgstr "po tentohet lidhje SSH e zhveshur, për të testuar kyç sendërtimesh:"
 
+#: ../fdroidserver/nightly.py
+msgid "attempting bare ssh connection to test deploy key:"
+msgstr "po tentohet lidhje ssh e zhveshur, për të testuar kyç sendërtimesh:"
+
 #: ../fdroidserver/common.py
 msgid "can not parse scrlib spec (not a string): '{}'"
 msgstr "s’përtyp dot specifikim scrlib (s’është një varg): '{}'"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
-msgid "can't open '%(filename)s': %(error)s"
-msgstr "s’hapet dot '%(filename)s': %(error)s"
-
-#: ../fdroidserver/scanner.py
-msgid "can't open non-https url: '{};"
-msgstr "s’mund të hapet url jo https: '{};"
+msgid "can't open '%s': %s"
+msgstr "s’hapet dot '%s': %s"
 
 #: ../fdroidserver/build.py
 #, python-brace-format
 msgid "cannot find required srclibs: \"{path}\""
-msgstr "s’gjenden dot srclibs të domosdoshme: “{path}”"
+msgstr "s’gjenden dot srclibs të domosdoshme: \"{path}\""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "cannot have multiple subparser arguments"
 msgstr "s’mund të kihen argumente të shumtë për subparser"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "cannot merge actions - two groups are named %r"
 msgstr "s’mund të përzihen veprimet - ka dy grupe të quajtur %r"
@@ -2160,107 +2147,119 @@ msgstr "s’mund të botohet përditësim, e ujdisët kyçin e sendërtimit?"
 msgid "cloning {url}"
 msgstr "po klonohet {url}"
 
+#: ../fdroidserver/deploy.py
+msgid "command to execute, either 'init' or 'update'"
+msgstr "urdhër për t’u ekzekutuar, ose 'init', ose 'update'"
+
 #: ../fdroidserver/__main__.py
 msgid "commands from plugin modules:"
 msgstr "urdhra prej modulesh shtojce:"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "complex"
+msgstr ""
+
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "conflicting option string: %s"
 msgid_plural "conflicting option strings: %s"
 msgstr[0] "varg mundësie me përplasje: %s"
 msgstr[1] "vargje mundësish me përplasje: %s"
 
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "conflicting subparser alias: %s"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "conflicting subparser: %s"
-msgstr ""
+#: ../fdroidserver/nightly.py
+#, python-brace-format
+msgid "copying {apkfilename} into {path}"
+msgstr "po kopjohet {apkfilename} te {path}"
 
 #: ../fdroidserver/metadata.py
 #, python-brace-format
 msgid "could not parse '{path}'"
 msgstr "s’u përtyp dot '{path}'"
 
-#: ../fdroidserver/common.py
-msgid "could not parse srclib spec (no name specified): '{}'"
-msgstr "s’u përtyp dot specifikim scrlib (s’u dha emër): '{}'"
-
 #: ../fdroidserver/common.py
 msgid "could not parse srclib spec (no ref specified): '{}'"
 msgstr "s’u përtyp dot specifikim scrlib (s’u dha referencë): '{}'"
 
+#: ../fdroidserver/common.py
+msgid "could not parse srclib spec (too many '@' signs): '{}'"
+msgstr "s’u përtyp dot specifikim scrlib (shumë shenja '@'): '{}'"
+
 #: ../fdroidserver/nightly.py
 #, python-brace-format
 msgid "created {path}"
 msgstr "u krijua {path}"
 
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "current version is newer: old vercode={old}, new vercode={new}"
-msgstr "versioni i tanishëm është më i ri: kod versioni të vjetër={old}, kod versioni të ri={new}"
-
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "deleting: repo/{apkfilename}"
 msgstr "po fshihet: repo/{apkfilename}"
 
-#: ../fdroidserver/scanner.py
-msgid "dependency file without lock"
-msgstr "kartelë varësie pa kyç"
+#: ../fdroidserver/common.py
+#, python-brace-format
+msgid "deployed build logs to '{path}'"
+msgstr "u vunë regjistra montimi te '{path}'"
 
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "deployed process log {path} to {dest}"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "dest= is required for options like %r"
 msgstr "dest= është e domosdoshme për mundësi si %r"
 
-#: ../fdroidserver/scanner.py
-msgid "downloading '{}'"
-msgstr "po shkarkohet “{}”"
-
-#: ../fdroidserver/scanner.py
-msgid "downloading scanner signatures from '{}' failed"
-msgstr "dështoi shkarkimi i nënshkrimeve të kontrollorit prej “{}”"
-
 #: ../fdroidserver/scanner.py
 msgid "executable binary, possibly code"
 msgstr "dyor i ekzekutueshëm, ka gjasa të jetë kod"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "expected %s argument"
 msgid_plural "expected %s arguments"
 msgstr[0] "pritej %s argument"
 msgstr[1] "priteshin %s argumente"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "expected at least one argument"
 msgstr "pritej e pakta një argument"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "expected at most one argument"
 msgstr "pritej e shumta një argument"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "expected one argument"
 msgstr "pritej një argument"
 
-#: ../fdroidserver/__main__.py
+#: ../fdroidserver/common.py
+#, python-brace-format
+msgid "failed deploying build logs to '{path}'"
+msgstr "s’u arrit të hidhen regjistrat e montimeve te '{path}'"
+
+#: ../fdroid
+msgid "fdroid [-h|--help|--version] <command> [<args>]"
+msgstr "fdroid [-h|--help|--version] <urdhër> [<argumente>]"
+
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "fdroid [<command>] [-h|--help|--version|<args>]"
 msgstr "fdroid [<urdhër>] [-h|--help|--version|<argumente>]"
 
-#: ../fdroidserver/scanner.py
-msgid "fetch the latest version of signatures from the web"
-msgstr "sill nga interneti versionin më të ri të nënshkrimeve"
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "floating-point"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+msgid "force errors to be warnings, or ignore"
+msgstr "bëji detyrimisht gabimet të jenë sinjalizime, ose shpërfilli"
 
 #: ../fdroidserver/metadata.py
 msgid "force metadata errors (default) to be warnings, or to be ignored."
@@ -2274,7 +2273,8 @@ msgstr "veprimi “git svn clone” dështoi"
 msgid "gzip file archive"
 msgstr "Arkiv gzip kartelash"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "ignored explicit argument %r"
 msgstr "u shpërfill argumenti eksplicit %r"
@@ -2283,43 +2283,39 @@ msgstr "u shpërfill argumenti eksplicit %r"
 msgid "index-v1 must have a signature, use `fdroid signindex` to create it!"
 msgstr "index-v1 duhet të ketë një nënshkrim, përdorni `fdroid signindex` për ta krijuar!"
 
-#: ../fdroidserver/index.py
-msgid "index-v2 must have a signature, use `fdroid signindex` to create it!"
-msgstr "index-v2 duhet të ketë një nënshkrim, përdorni `fdroid signindex` për ta krijuar!"
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "integer"
+msgstr "numër i plotë"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "invalid %(type)s value: %(value)r"
 msgstr "vlerë %(type)s e pavlefshme: %(value)r"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "invalid choice: %(value)r (choose from %(choices)s)"
 msgstr "zgjedhje e pavlefshme: %(value)r (zgjidhni nga %(choices)s)"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "invalid conflict_resolution value: %r"
 msgstr "vlerë e pavlefshme conflict_resolution: %r"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "invalid option string %(option)r: must start with a character %(prefix_chars)r"
 msgstr "varg i pavlefshëm mundësie %(option)r: duhet të fillojë me një shenjë %(prefix_chars)r"
 
-#: ../fdroidserver/common.py
-msgid "ipfs_cid not found, skipping CIDv1 generation"
-msgstr "S’u gjet ipfs_cid, po anashkalohet prodhimi i CIDv1"
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "latest build recipe is newer: old vercode={old}, new vercode={new}"
-msgstr "udhëzimet e fundit për montimin janë më të reja: kod versioni të vjetër={old}, kod versioni të ri={new}"
-
 #: ../fdroidserver/deploy.py
 #, python-brace-format
 msgid "local_copy_dir does not end with \"fdroid\", perhaps you meant: \"{path}\""
-msgstr "local_copy_dir does s’mbaron me “fdroid”, ndoshta kishit në mendje: “{path}”"
+msgstr "local_copy_dir does s’mbaron me \"fdroid\", ndoshta kishit në mendje: \"{path}\""
 
 #: ../fdroidserver/deploy.py
 msgid "local_copy_dir must be an absolute path!"
@@ -2334,57 +2330,111 @@ msgstr "local_copy_dir duhet të jetë një drejtori, jo një kartelë!"
 msgid "mirror '%s' does not end with 'fdroid'!"
 msgstr "pasqyra '%s' s’përfundon me 'fdroid'!"
 
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "mirrors set twice, in config.yml and {path}!"
-msgstr "pasqyra të ujdisura dy herë, te config.yml dhe {path}!"
-
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "mutually exclusive arguments must be optional"
 msgstr "argumentet që përjashtojnë njëri-tjetrin duhet të jenë opsionalë"
 
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "next {name} cache update due in {time}"
-msgstr "përditësim pasues i fshehtinës {name} për {time}"
-
 #: ../fdroidserver/mirror.py
 #, python-brace-format
 msgid "no \"icon\" in {appid}"
-msgstr "s’ka “icon” te {appid}"
+msgstr "s’ka \"icon\" te {appid}"
 
 #: ../fdroidserver/signatures.py
 msgid "no APK supplied"
 msgstr "s’u dha APK"
 
-#: ../fdroidserver/checkupdates.py
-msgid "no version information found"
-msgstr "s’u gjetën hollësi versioni"
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, python-format
+msgid "no such option: %s"
+msgstr "s’ka mundësi të tillë: %s"
 
-#: /usr/lib/python3.11/argparse.py
+#: ../fdroid ../fdroidserver/__main__.py
+msgid "no version info found!"
+msgstr "s’u gjetën të dhëna versioni!"
+
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "not allowed with argument %s"
 msgstr "e palejuar me argumentin %s"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "one of the arguments %s is required"
 msgstr "një nga argumentet %s është i domosdoshëm"
 
-#: ../fdroidserver/common.py ../fdroidserver/index.py
+#: ../fdroidserver/index.py ../fdroidserver/common.py
 msgid "only accepts strings, lists, and tuples"
 msgstr "prano vetëm vargje, lista dhe dyshe"
 
-#: /usr/lib/python3.11/argparse.py
-msgid "options"
-msgstr "mundësi"
+#: ../fdroidserver/install.py
+#, python-format
+msgid "option %s: If you really want to install all the signed apps, use --all"
+msgstr "mundësi %s: Nëse doni vërtet të instaloni krejt aplikacionet e nënshkruar, përdorni --all"
+
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, python-format
+msgid "option %s: invalid %s value: %r"
+msgstr "mundësi %s: vlerë %s e pavlefshme: %r"
+
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, python-format
+msgid "option %s: invalid choice: %r (choose from %s)"
+msgstr "mundësia %s: zgjedhje e pavlefshme: %r (zgjidhni nga %s)"
+
+#: /usr/lib/python3.5/getopt.py /usr/lib/python3.6/getopt.py
+#: /usr/lib/python3.7/getopt.py
+#, python-format
+msgid "option -%s not recognized"
+msgstr "mundësi -%s jo e pranuar"
+
+#: /usr/lib/python3.5/getopt.py /usr/lib/python3.6/getopt.py
+#: /usr/lib/python3.7/getopt.py
+#, python-format
+msgid "option -%s requires argument"
+msgstr "mundësia -%s lyp argument"
+
+#: /usr/lib/python3.5/getopt.py /usr/lib/python3.6/getopt.py
+#: /usr/lib/python3.7/getopt.py
+#, python-format
+msgid "option --%s must not have an argument"
+msgstr "mundësia --%s s’duhet të ketë një argument"
+
+#: /usr/lib/python3.5/getopt.py /usr/lib/python3.6/getopt.py
+#: /usr/lib/python3.7/getopt.py
+#, python-format
+msgid "option --%s not a unique prefix"
+msgstr "mundësia --%s s’është parashtesë unike"
+
+#: /usr/lib/python3.5/getopt.py /usr/lib/python3.6/getopt.py
+#: /usr/lib/python3.7/getopt.py
+#, python-format
+msgid "option --%s not recognized"
+msgstr "mundësi --%s e papranuar"
+
+#: /usr/lib/python3.5/getopt.py /usr/lib/python3.6/getopt.py
+#: /usr/lib/python3.7/getopt.py
+#, python-format
+msgid "option --%s requires argument"
+msgstr "mundësia --%s lyp argument"
+
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
+msgid "optional arguments"
+msgstr "argumente opsionalë"
 
 #: ../fdroidserver/nightly.py
 #, python-brace-format
 msgid "overwriting existing {path}"
 msgstr "po mbishkruhet {path} ekzistues"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "positional arguments"
 msgstr "argumente pozicionalë"
 
@@ -2393,53 +2443,42 @@ msgstr "argumente pozicionalë"
 msgid "process log deploy {path} to {dest} failed!"
 msgstr ""
 
-#: ../fdroidserver/build.py
-msgid "reference binary missing signature"
-msgstr "dyorit të refrencës i mungon nënshkrimi"
-
 #: ../fdroidserver/signatures.py
 #, python-brace-format
 msgid "refuse downloading via insecure HTTP connection (use HTTPS or specify --no-https-check): {apkfilename}"
 msgstr "refuzo shkarkim përmes lidhjeje HTTP të pasigurt (përdorni HTTPS ose specifikoni --no-https-check): {apkfilename}"
 
+#: ../fdroidserver/signatures.py
+#, python-brace-format
+msgid "refuse downloading via insecure http connection (use https or specify --no-https-check): {apkfilename}"
+msgstr "mos pranon shkarkim përmes lidhjeje http të pasigurt (përdorni https ose specifikoni --no-https-check): {apkfilename}"
+
 #: ../fdroidserver/index.py
 #, python-format
-msgid "repo_icon \"repo/icons/%s\" does not exist, generating placeholder."
-msgstr "repo_icon “repo/icons/%s” s’ekziston, po prodhohet vendmbajtëse."
+msgid "repo_icon %s does not exist, generating placeholder."
+msgstr "repo_icon %s s’ekziston, po prodhohet vendmbajtëse."
 
-#: ../fdroidserver/common.py
-msgid "repo_url needs to end with /repo"
-msgstr "repo_url lypset të përfundojë me /repo"
+#: ../fdroidserver/metadata.py
+msgid "ruamel.yaml not installed, can not write metadata."
+msgstr "ruamel.yaml s’është i instalaur, s’mund të shkruhen tejtëdhëna."
 
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "rsync is missing or broken: {error}"
-msgstr "rsync-u mungon, ose është i dëmtuar: {error}"
-
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "s3cmd sync indexes {path} to {url} and delete"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "s3cmd syncs indexes from {path} to {url} and deletes removed"
-msgstr "s3cmd njëkohëson tregues nga {path} te {url} dhe fshin të hequrit"
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "scanner cache is malformed! You can clear it with: '{clear}'"
-msgstr "fshehtina e kontrollorit është e keqformuar! Mund ta spastroni me: “{clear}”"
-
-#: ../fdroidserver/deploy.py
-msgid "serverwebroot: path does not end with \"fdroid\", perhaps you meant one of these:"
-msgstr "serverwebroot: shtegu nuk mbaron me “fdroid”, ndoshta kishit në mendje një nga këto:"
+msgstr "s3cmd sync indexes {path} to {url} and delete"
 
 #: ../fdroidserver/scanner.py
 msgid "shared library"
 msgstr "librari e përbashkët"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "show program's version number and exit"
+msgstr "shfaq numër versioni programi dhe dil"
+
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.5/optparse.py
+#: /usr/lib/python3.6/argparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/argparse.py /usr/lib/python3.7/optparse.py
 msgid "show this help message and exit"
 msgstr "shfaq këtë mesazh ndihme dhe dil"
 
@@ -2468,31 +2507,31 @@ msgstr "srclibs-it i mungon emër dhe/ose @"
 msgid "static library"
 msgstr "librari statike"
 
-#: ../fdroidserver/build.py
+#: ../fdroidserver/common.py
 #, python-brace-format
-msgid "supplied reference binary has allowed signer {signer}"
-msgstr ""
+msgid "supplied timestamp value '{timestamp}' is not a unix timestamp"
+msgstr "vlera '{timestamp}' e dhënë për vulën kohore s’është vulë kohore Unix"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "the following arguments are required: %s"
 msgstr "argumentet vijuese janë të domosdoshëm: %s"
 
-#: ../fdroidserver/install.py
-msgid "true"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "unexpected option string: %s"
 msgstr "varg i papritur mundësie: %s"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "unknown parser %(parser_name)r (choices: %(choices)s)"
 msgstr "përtypës i panjohur %(parser_name)r (choices: %(choices)s)"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "unrecognized arguments: %s"
 msgstr "argumente të papranuar: %s"
@@ -2502,22 +2541,27 @@ msgstr "argumente të papranuar: %s"
 msgid "unsafe permissions on '{config_file}' (should be 0600)!"
 msgstr "leje jo të parrezikshme mbi '{config_file}' (duhet të ishin 0600)!"
 
-#: ../fdroidserver/__main__.py /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py ../fdroid
+#: /usr/lib/python3.7/argparse.py ../fdroidserver/__main__.py
 msgid "usage: "
 msgstr "përdorimi: "
 
-#: ../fdroidserver/deploy.py
+#: ../fdroid
+msgid "usage: fdroid [-h|--help|--version] <command> [<args>]"
+msgstr "përdorimi: fdroid [-h|--help|--version] <urdhër> [<argumente>]"
+
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "using Apache libcloud to sync with {url}"
 msgstr "po përdoret Apache libcloud për njëkohësim me {url}"
 
 #: ../fdroidserver/deploy.py
 msgid "virustotal.com is rate limiting, waiting to retry..."
-msgstr "virustotal.com i kufizon shpejtësitë, po pritet për riprovim…"
+msgstr ""
 
-#: ../fdroidserver/install.py
-msgid "yes"
-msgstr "po"
+#: ../fdroidserver/update.py
+msgid "wiki support is deprecated and will be removed in the next release!"
+msgstr "Mbulimi për wiki është nxjerrë nga përdorimi dhe do të hiqet në hedhjen e ardhshme në qarkullim!"
 
 #: ../fdroidserver/publish.py
 #, python-brace-format
@@ -2531,19 +2575,31 @@ msgstr[1] "{0} aplikacione, {1} aliase kyçi"
 msgid "{apkfilename} ({appid}) has no metadata!"
 msgstr "{apkfilename} ({appid}) s’ka tejtëdhëna!"
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
+#: ../fdroidserver/update.py
+#, python-brace-format
+msgid "{apkfilename} has multiple {name} files, looks like Master Key exploit!"
+msgstr "{apkfilename} ka shumë kartela {name}, duket si rreng me Kyçin e Përgjithshëm!"
+
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "{apkfilename}'s AndroidManifest.xml has a bad date: "
 msgstr "AndroidManifest.xml e {apkfilename} ka një datë të gabuar: "
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "{appid} does not have a name! Using application ID instead."
 msgstr "{appid} s’ka emër! Në vend të tij po përdoret ID aplikacioni."
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
+#: ../fdroidserver/update.py
+#, python-brace-format
+msgid "{appid} does not have a name! Using package name instead."
+msgstr "{appid} s’ka emër! Në vend të tij po përdoret emër pakete."
+
+#: ../fdroidserver/update.py
+#, python-brace-format
+msgid "{appid} from {path} is not a valid Android Package Name!"
+msgstr "{appid} prej {path} s’është Emër i vlefshëm Pakete Android!"
+
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "{appid} from {path} is not a valid Android application ID!"
@@ -2554,16 +2610,12 @@ msgstr "{appid} prej {path} s’është ID e vlefshme aplikacioni Android!"
 msgid "{appid} from {path} is not a valid Java Package Name!"
 msgstr "{appid} prej {path} s;është Emër i vlefshëm Pakete Java!"
 
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{appid} has both APKs and files: {files}"
-msgstr "{appid} ka nga të dyja, APK-ra dhe kartela: {files}"
-
 #: ../fdroidserver/mirror.py
 #, python-brace-format
 msgid "{appid} is missing {name}"
 msgstr "{appid} i mungon {name}"
 
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "{appid}: Unknown extlib {path} in build '{versionName}'"
@@ -2577,7 +2629,7 @@ msgstr "{appid}: s’u specifikuan montime, po xhirohet me gjendjen e tanishme t
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "{appid}: {field} must be a '{type}', but it is a '{fieldtype}!'"
-msgstr "{appid}: {field} duhet të jetë një '{type}', por është një '{fieldtype}!'"
+msgstr "{appid}: {field} duhet të jetë një '{type}', po është një '{fieldtype}!'"
 
 #: ../fdroidserver/lint.py
 #, python-brace-format
@@ -2591,8 +2643,8 @@ msgstr "{build_flag} duhet të jetë numër i plotë, u gjet: {value}"
 
 #: ../fdroidserver/metadata.py
 #, python-brace-format
-msgid "{build_flag} must be list or string, found: {value}"
-msgstr "{build_flag} duhet të jetë listë, ose varg, u gjet: {value}"
+msgid "{field} not terminated in {name}"
+msgstr "{field} e papërfunduar te {name}"
 
 #: ../fdroidserver/metadata.py
 #, python-brace-format
@@ -2601,15 +2653,10 @@ msgstr "{file} është e zbrazët ose e dëmtuar!"
 
 #: ../fdroidserver/update.py
 #, python-brace-format
-msgid "{name} \"{section}/icons/{path}\" does not exist! Check \"config.yml\"."
-msgstr "{name} “{section}/icons/{path}” s’ekziston! Kontrolloni “config.yml”."
+msgid "{name} \"{path}\" does not exist! Correct it in config.py."
+msgstr "{name} \"{path}\" s’ekziston! Ndreqeni te config.py."
 
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{path1} is a duplicate of {path2}, remove one!"
-msgstr "{path1} është përsëdytje e {path2}, hiqeni njërin!"
-
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 #, python-brace-format
 msgid "{path} already exists, ignoring import results!"
 msgstr "{path} ekziston tashmë, po shpërfillen përfundimet e importimit!"
@@ -2622,37 +2669,7 @@ msgstr "{path} s’ekziston!  Krijojeni duke xhiruar:"
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "{path} has bad file signature \"{pattern}\", possible Janus exploit!"
-msgstr "{path} ka “{pattern}” të gabuar nënshkrimi kartele, ka gjasa të jetë rreng Janus!"
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "{path} has been flagged by virustotal {count} times:"
-msgstr "për {path} ka {count} herë sinjalizime nga virustotal:"
-
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "{path} has the wrong fingerprint ({fingerprint})!"
-msgstr "{path} ka shenja gishtash të gabuara ({fingerprint})!"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "{path} is not \"key: value\" dict, but a {datatype}!"
-msgstr "{path} s’është “key: value”, por një {datatype}!"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "{path} is not a standard config file!"
-msgstr "{path} s’është kartelë standarde formësimi!"
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "{path} is not list, but a {datatype}!"
-msgstr "{path} s’është listë, por një {datatype}!"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "{path} is not {expected_type}, but a {datatype}!"
-msgstr "{path} s’është {expected_type}, por një {datatype}!"
+msgstr "{path} ka \"{pattern}\" të gabuar nënshkrimi kartele, ka gjasa të jetë rreng Janus!"
 
 #: ../fdroidserver/update.py
 #, python-brace-format
@@ -2664,25 +2681,15 @@ msgstr "{path} është me madhësi zero!"
 msgid "{path} more than 200MB, manually upload: {url}"
 msgstr "{path} më tepër se 200MB, ngarkojeni dorazi: {url}"
 
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "{path}: \"{code}\" is not a valid ISO_3166-1 alpha-2 country code!"
-msgstr "{path}: “{code}” s’është kod i vlefshëm vendi ISO_3166-1 alpha-2!"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{path}: {error}"
-msgstr "{path}: {error}"
-
 #: ../fdroidserver/mirror.py
 #, python-brace-format
 msgid "{url} does not end with \"fdroid\", check the URL path!"
-msgstr "{url} s’përfundon me “fdroid”, kontrolloni shtegun e URL-së!"
+msgstr "{url} s’përfundon me \"fdroid\", kontrolloni shtegun e URL-së!"
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/common.py
 #, python-brace-format
 msgid "{url} does not start with \"http\"!"
-msgstr "{url} s’fillon me “http”!"
+msgstr "{url} nuk fillon me \"http\"!"
 
 #: ../fdroidserver/build.py
 msgid "{} build failed"
@@ -2695,3 +2702,9 @@ msgid "{} build succeeded"
 msgid_plural "{} builds succeeded"
 msgstr[0] "{} doli me sukses"
 msgstr[1] "{} dolën me sukses"
+
+#~ msgid "Cannot find a packageName for {path}!"
+#~ msgstr "S’gjendet dot një packageName për {path}!"
+
+#~ msgid "Cannot find an appid for {path}!"
+#~ msgstr "S’gjendet dot një appid për {path}!"
diff --git a/locale/sr/LC_MESSAGES/fdroidserver.po b/locale/sr/LC_MESSAGES/fdroidserver.po
deleted file mode 100644
index 5413ac1d..00000000
--- a/locale/sr/LC_MESSAGES/fdroidserver.po
+++ /dev/null
@@ -1,2705 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# This file is put in the public domain.
-# Саша Петровић <salepetronije@gmail.com>, 2022.
-# Đorđe Vasiljević <djordje.vasiljevich@gmail.com>, 2022.
-# Reno Tx <renotx@users.noreply.hosted.weblate.org>, 2024.
-# Hans-Christoph Steiner <hans@guardianproject.info>, 2024.
-msgid ""
-msgstr ""
-"Project-Id-Version: fdroidserver 2.1b0\n"
-"Report-Msgid-Bugs-To: https://gitlab.com/fdroid/fdroidserver/issues\n"
-"POT-Creation-Date: 2025-06-25 09:52+0200\n"
-"PO-Revision-Date: 2024-12-30 22:00+0000\n"
-"Last-Translator: Reno Tx <renotx@users.noreply.hosted.weblate.org>\n"
-"Language-Team: Serbian <https://hosted.weblate.org/projects/f-droid/fdroidserver/sr/>\n"
-"Language: sr\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-"X-Generator: Weblate 5.10-dev\n"
-
-#: ../fdroidserver/nightly.py
-msgid ""
-"\n"
-"SSH public key to be used as deploy key:"
-msgstr ""
-"\n"
-"SSH јавни кључ који ће се користити као кључ за распоређивање:"
-
-#: ../fdroidserver/nightly.py
-#, python-brace-format
-msgid ""
-"\n"
-"{path} encoded for the DEBUG_KEYSTORE secret variable:"
-msgstr ""
-"\n"
-"{path} енкодовано за DEBUG_KEYSTORE тајну променљиву:"
-
-#: ../fdroidserver/lint.py
-#, python-format
-msgid "\"%s/\" has no matching metadata file!"
-msgstr "Датотека метаподатака за „%s/“ не постоји!"
-
-#: ../fdroidserver/index.py
-msgid "\"isPrimary\" key should not be added to mirrors!"
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "\"local_copy_dir\" {path} does not exist!"
-msgstr "\"local_copy_dir\" {path} не постоји!"
-
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "\"{apkfilename}\" is already installed on {dev}."
-msgstr "\"{apkfilename}\" је већ инсталиран на {dev}."
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "\"{path}\" contains recent {name} ({version})"
-msgstr "\"{path}\" садржи недавни {name} ({version})"
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "\"{path}\" exists but s3cmd is not installed!"
-msgstr "\"{path}\" постоји, али s3cmd није инсталиран!"
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "\"{path}\" is not a supported file format (use: metadata/*.yml)"
-msgstr "„{path}“ није подржани формат фајла (користи: metadata/*.yml)"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "\"{path}\" is signed by a key that is not allowed:"
-msgstr "„{path}” је потписан кључем који није дозвољен:"
-
-#: ../fdroidserver/import_subcommand.py
-#, python-brace-format
-msgid "\"{url}\" is not a valid URL!"
-msgstr "\"{url}\" није валидан URL!"
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "%(prog)s: error: %(message)s\n"
-msgstr "%(prog)s: грешка: %(message)s\n"
-
-#: ../fdroidserver/publish.py
-#, python-format
-msgid "%d APKs failed to be signed or verified!"
-msgstr "%d АПК-ова није успело да се потпише или верификује!"
-
-#: ../fdroidserver/scanner.py
-#, python-format
-msgid "%d problems found"
-msgstr "%d проблема пронађено"
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "%r is not callable"
-msgstr "%r није могуће позвати"
-
-#: ../fdroidserver/signindex.py
-#, python-format
-msgid "%s did not produce a dict!"
-msgstr "%s није произвео речник!"
-
-#: ../fdroidserver/signindex.py
-#, python-format
-msgid "%s has bad SHA-256: %s"
-msgstr "%s има лош SHA-256: %s"
-
-#: ../fdroidserver/lint.py
-#, python-format
-msgid "%s is not an accepted build field"
-msgstr "%s није прихваћено поље за градњу"
-
-#: ../fdroidserver/common.py
-msgid "'keypass' not found in config.yml!"
-msgstr "'keypass' није пронађен у config.yml!"
-
-#: ../fdroidserver/common.py
-msgid "'keystore' is NONE and 'smartcardoptions' is blank!"
-msgstr "'keystore' је НИШТА и 'smartcardoptions' је празно!"
-
-#: ../fdroidserver/common.py
-msgid "'keystore' not found in config.yml!"
-msgstr "'keystore' није пронађен у config.yml!"
-
-#: ../fdroidserver/common.py
-msgid "'keystorepass' not found in config.yml!"
-msgstr "'keystorepass' није пронађен у config.yml!"
-
-#: ../fdroidserver/common.py
-msgid "'repo_keyalias' not found in config.yml!"
-msgstr "'repo_keyalias' није пронађен у config.yml!"
-
-#: /usr/lib/python3.11/argparse.py
-msgid "'required' is an invalid argument for positionals"
-msgstr "'захтевано' је неважећи аргумент за позиционе параметре"
-
-#: ../fdroidserver/common.py
-msgid "'sdk_path' not set in config.yml!"
-msgstr "'путања_до_сдк' није постављена у config.yml!"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "'{aapt}' is too old, fdroid requires build-tools-{version} or newer!"
-msgstr "'{aapt}' је превише стар, fdroid захтева build-tools-{version} или новији!"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "'{path}' failed to execute!"
-msgstr "'{path}' није успео да се изврши!"
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "'{path}' has invalid format, it should be a dictionary!"
-msgstr "'{path}' има неважећи формат, треба да буде речник!"
-
-#: ../fdroidserver/lint.py ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "'{value}' is not a valid {field} in {appid}. Regex pattern: {pattern}"
-msgstr "'{value}' није валидан {field} у {appid}. Регекспатерн: {pattern}"
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "'{value}' is not a valid {field}, should be {pattern}"
-msgstr "'{value}' није важећи {field}, треба да буде {pattern}"
-
-#: ../fdroidserver/checkupdates.py
-msgid "--merge-request only runs on a single appid!"
-msgstr "--merge-request се извршава само на једној апликацији!"
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "...checkupdate failed for {appid} : {error}"
-msgstr "...провера ажурирања није успела за {appid} : {error}"
-
-#: /usr/lib/python3.11/argparse.py
-msgid ".__call__() not defined"
-msgstr ".__call__() није дефинисано"
-
-#: ../fdroidserver/lint.py
-msgid "/issues is missing"
-msgstr "/issues недостаје"
-
-#: ../fdroidserver/mirror.py
-msgid "A URL is required as an argument!"
-msgstr "Потребан је URL као аргумент!"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "APK signatures have different certificates in {path}:"
-msgstr "Потписи АПК-ова имају различите сертификате у {path}:"
-
-#: ../fdroidserver/__main__.py
-msgid "Add PGP signatures using GnuPG for packages in repo"
-msgstr "Додај PGP потписе користећи GnuPG за пакете у репоу"
-
-#: ../fdroidserver/update.py
-msgid "Add a repo signing key to an unsigned repo"
-msgstr "Додајте кључ за потписивање репо-а у непотписани репо"
-
-#: ../fdroidserver/update.py
-msgid "Add skeleton metadata files for APKs that are missing them"
-msgstr "Додај метафајлове скелета за APK-ове који их немају"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Adding new repo for only {name}"
-msgstr "Додавање новог репозиторијума само за {name}"
-
-#: ../fdroidserver/init.py
-msgid "Alias of the repo signing key in the keystore"
-msgstr "Алијас репо кључа за потписивање у кејстору"
-
-#: ../fdroidserver/build.py
-msgid "AllowedAPKSigningKeys missing but reference binary supplied"
-msgstr "AllowedAPKSigningKeys недостаје али је референтни бинарни фајл обезбеђен"
-
-#: ../fdroidserver/import_subcommand.py
-msgid "Allows a different revision (or git branch) to be specified for the initial import"
-msgstr "Омогућава да се друга ревизија (или git грана) одреди за почетни увоз"
-
-#: ../fdroidserver/mirror.py
-msgid "Also mirror the full archive section"
-msgstr "Такође огледало целог архива секције"
-
-#: ../fdroidserver/lint.py
-msgid "Also warn about formatting issues, like rewritemeta -l"
-msgstr "Такође упозори на проблеме са форматирањем, на пример rewritemeta -l"
-
-#: ../fdroidserver/scanner.py
-msgid "Android AAR library"
-msgstr "Андроид AAR библиотека"
-
-#: ../fdroidserver/scanner.py
-msgid "Android APK file"
-msgstr "Андроид АПК фајл"
-
-#: ../fdroidserver/scanner.py
-msgid "Android DEX code"
-msgstr "Андроид DEX код"
-
-#: ../fdroidserver/init.py
-#, python-brace-format
-msgid "Android SDK not found at {path}!"
-msgstr "Андроид SDK није пронађен на {path}!"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Android SDK path '{path}' does not exist!"
-msgstr "Андроид СДК пут '{path}' не постоји!"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Android SDK path '{path}' is not a directory!"
-msgstr "Путања Android SDK-а '{path}' није директоријум!"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Android SDK tool {cmd} not found!"
-msgstr "Андроид СДК алат {cmd} није пронађен!"
-
-#: ../fdroidserver/lint.py
-msgid "App has Binaries but does not have corresponding AllowedAPKSigningKeys to pin certificate."
-msgstr "Апликација има бинарне фајлове али нема одговарајуће AllowedAPKSigningKeys за пиновање сертификата."
-
-#: ../fdroidserver/lint.py
-msgid "App has NoSourceSince or ArchivePolicy \"0 versions\" or 0 but AutoUpdateMode or UpdateCheckMode are not None"
-msgstr "Апликација има NoSourceSince или ArchivePolicy \"0 верзија\" или 0, али AutoUpdateMode или UpdateCheckMode нису None"
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "App is in '{repo}' but has a link to {url}"
-msgstr "Апликација је у '{repo}' али има линк ка {url}"
-
-#: ../fdroidserver/lint.py
-msgid "App version has binary but does not have corresponding AllowedAPKSigningKeys to pin certificate."
-msgstr "Апликација има бинарни фајл, али нема одговарајуће AllowedAPKSigningKeys за пин сертификат."
-
-#: ../fdroidserver/lint.py
-msgid "Appending .git is not necessary"
-msgstr "Додавање .git није потребно"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Archiving {apkfilename} with invalid signature!"
-msgstr "Архивирање {apkfilename} са неважећим потписом!"
-
-#: ../fdroidserver/lint.py
-msgid "AutoUpdateMode with UpdateCheckMode: HTTP must have a pattern."
-msgstr "AutoUpdateMode са UpdateCheckMode: HTTP мора имати образац."
-
-#: ../fdroidserver/install.py
-msgid "Automatic no to all prompts."
-msgstr "Аутоматски одговори \"не\" на све упите."
-
-#: ../fdroidserver/install.py
-msgid "Automatic yes to all prompts."
-msgstr "Аутоматски одговори \"да\" на све упите."
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "Bad entry type \"{mirrortype}\" in mirrors config: {mirror}"
-msgstr "Лош тип уноса \"{mirrortype}\" у конфигурацији огледала: {mirror}"
-
-#: ../fdroidserver/mirror.py
-msgid "Base URL to mirror, can include the index signing key using the query string: ?fingerprint="
-msgstr "Основни URL за огледало, може укључивати кључ за потписивање индекса користећи упит низ: ?fingerprint="
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Branch '{branch}' used as commit in build '{versionName}'"
-msgstr "Грана '⸮ {branch}⸮' коришћена као commit у изради '⸮ {versionName}⸮'"
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Branch '{branch}' used as commit in srclib '{srclib}'"
-msgstr "Грана '{branch}' коришћена као commit у srclib '{srclib}'"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Broken symlink: {path}"
-msgstr "Прекинута симболичка веза: {path}"
-
-#: ../fdroidserver/__main__.py
-msgid "Build a package from source"
-msgstr "Изградите пакет из извора"
-
-#: ../fdroidserver/build.py
-msgid "Build all applications available"
-msgstr "Израдите све доступне апликације"
-
-#: ../fdroidserver/lint.py
-msgid "Build generated by `fdroid import` - remove disable line once ready"
-msgstr "Градња генерисана помоћу `fdroid import` - уклоните линију за онемогућавање када буде спремно"
-
-#: ../fdroidserver/checkupdates.py
-msgid "Build metadata git repo has uncommited changes!"
-msgstr "Мета подаци грађења git репозиторијума имају непослате промене!"
-
-#: ../fdroidserver/build.py
-msgid "Build only the latest version of each package"
-msgstr "Градите само најновију верзију сваког пакета"
-
-#: ../fdroidserver/init.py
-#, python-format
-msgid "Built repo based in \"%s\" with this config:"
-msgstr "Изграђен репозиторијум заснован на \"%s\" са овом конфигурацијом:"
-
-#: ../fdroidserver/checkupdates.py
-msgid "Can't auto-update app with no CurrentVersionCode"
-msgstr "Не могу да аутоматски ажурирам апликацију без тренутног кода верзије"
-
-#: ../fdroidserver/build.py
-msgid "Can't build due to {} error while scanning"
-msgid_plural "Can't build due to {} errors while scanning"
-msgstr[0] "Не може се изградити због {} грешке приликом скенирања"
-msgstr[1] "Не може се изградити због {} грешке приликом скенирања"
-msgstr[2] "Не може се изградити због {} грешака приликом скенирања"
-
-#: ../fdroidserver/common.py
-#, fuzzy, python-brace-format
-msgid "Cannot read {path}: {error}"
-msgstr "Није успело читање {path}: {error}"
-
-#: ../fdroidserver/rewritemeta.py
-#, python-brace-format
-msgid "Cannot rewrite \"{path}\""
-msgstr "Не могу да препишем \"{path}\""
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
-#: ../fdroidserver/lint.py
-#, python-format
-msgid "Categories '%s' is not valid"
-msgstr "Категорије '%s' нису важеће"
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
-#: ../fdroidserver/lint.py
-msgid "Categories are not set"
-msgstr "Категорије нису подешене"
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "Category \"{category}\" defined but not used for any apps!"
-msgstr "Категорија \"{category}\" је дефинисана, али није коришћена за ниједну апликацију!"
-
-#: ../fdroidserver/__main__.py
-msgid "Check for updates to applications"
-msgstr "Проверите да ли постоје ажурирања за апликације"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Checking archiving for {appid} - apks:{integer}, keepversions:{keep}, archapks:{arch}"
-msgstr "Провера архивирања за {appid} - апк-и:{integer}, чувајверзије:{keep}, архапк-и:{arch}"
-
-#: ../fdroidserver/update.py
-msgid "Clean update - don't uses caches, reprocess all APKs"
-msgstr "Чисто ажурирање – не користите кешеве, поново обрађујте све АПК-ове"
-
-#: ../fdroidserver/common.py
-msgid "Color the log output"
-msgstr "Бојење излазних логова"
-
-#: ../fdroidserver/import_subcommand.py
-msgid "Comma separated list of categories."
-msgstr "Запета раздвојена листа категорија."
-
-#: ../fdroidserver/__main__.py
-#, python-format
-msgid "Command '%s' not recognised.\n"
-msgstr "Наредба „%s” није препозната.\n"
-
-#: ../fdroidserver/checkupdates.py
-msgid "Commit changes"
-msgstr "Потврди измене"
-
-#: ../fdroidserver/checkupdates.py
-msgid "Commit changes, push, then make a merge request"
-msgstr "Уређивање промена, пуш, затим направите захтев за спајање"
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Conflicting \"{field}\" definitions between .yml and localized files:"
-msgstr "Конфликтне дефиниције \"{field}\" између .yml и локализованих фајлова:"
-
-#: ../fdroidserver/__main__.py
-msgid "Conflicting arguments: '--verbose' and '--quiet' can not be specified at the same time."
-msgstr "Контрадикторни аргументи: '--verbose' и '--quiet' не могу бити наведени у исто време."
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Could not find '{command}' on your system"
-msgstr "Није могуће пронаћи '{command}' на вашем систему"
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/import_subcommand.py
-msgid "Could not find latest version code"
-msgstr "Није могуће пронаћи најновији верзијски код"
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
-#: ../fdroidserver/import_subcommand.py
-msgid "Could not find latest version name"
-msgstr "Није могуће пронаћи назив најновије верзије"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Could not find {path} to remove it"
-msgstr "Није могуће пронаћи {path} да би се уклонио"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Could not open APK {path} for analysis: "
-msgstr "Није могуће отворити APK {path} за анализу: "
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Could not parse size \"{size}\", wrong type \"{type}\""
-msgstr "Није могуће парсовање величине \"{size}\", погрешан тип \"{type}\""
-
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/import_subcommand.py
-msgid "Couldn't find Application ID"
-msgstr "Није пронађен ИД апликације"
-
-#: ../fdroidserver/checkupdates.py
-msgid "Couldn't find any version information"
-msgstr "Није могуће пронаћи информације о верзији"
-
-#: ../fdroidserver/checkupdates.py
-msgid "Couldn't find package ID"
-msgstr "Није могуће пронаћи ID пакета"
-
-#: ../fdroidserver/update.py
-msgid "Cowardily refusing to overwrite existing signing key setup!"
-msgstr "Кукавички одбија да препише постојећу конфигурацију кључа за потписивање!"
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Created new container \"{name}\""
-msgstr "Креиран нови контејнер \"{name}\""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Creating \"{path}\" for configuring s3cmd."
-msgstr "Креирање \"{path}\" за конфигурацију s3cmd."
-
-#: ../fdroidserver/common.py
-#, fuzzy, python-brace-format
-msgid "Creating empty {config_file}"
-msgstr "Читање '{config_file}'"
-
-#: ../fdroidserver/publish.py
-msgid "Creating log directory"
-msgstr "Креирање директоријума за записе"
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Creating new S3 bucket: {url}"
-msgstr "Прављење новог S3 кофера: {url}"
-
-#: ../fdroidserver/publish.py
-msgid "Creating output directory"
-msgstr "Креирање директоријума за излаз"
-
-#: ../fdroidserver/index.py
-msgid "Creating signed index with this key (SHA256):"
-msgstr "Креирање потписаног индекса са овим кључем (SHA256):"
-
-#: ../fdroidserver/publish.py ../fdroidserver/verify.py
-msgid "Creating temporary directory"
-msgstr "Прављење привременог директоријума"
-
-#: ../fdroidserver/index.py
-msgid "Creating unsigned index in preparation for signing"
-msgstr "Креирање непотписаног индекса у припреми за потписивање"
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "CurrentVersionCode {cv} is less than oldest build entry {versionCode}"
-msgstr "ТренутниКодВерзије {cv} је мањи од најстарије верзије {versionCode}"
-
-#: ../fdroidserver/nightly.py
-msgid "DEBUG_KEYSTORE is not set or the value is incomplete"
-msgstr "DEBUG_KEYSTORE није подешен или је вредност непотпуна"
-
-#: ../fdroidserver/update.py
-msgid "Delete APKs and/or OBBs without metadata from the repo"
-msgstr "Обришите APKs и/или OBBs без метаподатака из репозиторијума"
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Deleting archive, repo is too big ({size} max {limit})"
-msgstr "Брисање архива, репозиторијум је превелик ({size} макс {limit})"
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Deleting git-mirror history, repo is too big ({size} max {limit})"
-msgstr "Брисање историје git-mirror, репозиторијум је превелик ({size} максимално {limit})"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Deleting unknown file: {path}"
-msgstr "Брисање непознате датотеке: {path}"
-
-#: ../fdroidserver/lint.py
-#, python-format
-msgid "Description '%s' is just the app's summary"
-msgstr "Опис '%s' је само сажетак апликације"
-
-#: ../fdroidserver/lint.py
-msgid "Description has a duplicate line"
-msgstr "Опис има дупликатну линију"
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Description of length {length} is over the {limit} char limit"
-msgstr "Опис дужине {length} је преко ограничења од {limit} карактера"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Did you mean config/{name}.yml?"
-msgstr "Да ли сте мислили config/{name}.yml?"
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Did you mean {code}?"
-msgstr "Да ли сте мислили {code}?"
-
-#: ../fdroidserver/import_subcommand.py
-msgid "Do not add 'disable:' to the generated build entries"
-msgstr "Не додавај 'disable:' у генерисане уносе за изградњу"
-
-#: ../fdroidserver/nightly.py
-msgid "Do not deploy the new files to the repo"
-msgstr "Не постављајте нове фајлове у репозиторијум"
-
-#: ../fdroidserver/mirror.py
-#, python-brace-format
-msgid "Do not include \"{path}\" in URL!"
-msgstr "Не укључуј \"{path}\" у URL!"
-
-#: ../fdroidserver/init.py
-msgid "Do not prompt for Android SDK path, just fail"
-msgstr "Не тражите путању за Android SDK, само неуспешно наставите"
-
-#: ../fdroidserver/nightly.py
-msgid "Do not remove the private keys generated from the keystore"
-msgstr "Не уклањајте приватне кључеве генерисане из кејстора"
-
-#: ../fdroidserver/build.py
-msgid "Don't create a source tarball, useful when testing a build"
-msgstr "Не правите изворну tar.gz архиву, корисно када тестирате изградњу"
-
-#: ../fdroidserver/build.py
-msgid "Don't refresh the repository, useful when testing a build with no internet connection"
-msgstr "Не освежавајте репозиторијум, корисно када тестирате билд без интернет конекције"
-
-#: ../fdroidserver/deploy.py ../fdroidserver/nightly.py
-msgid "Don't use rsync checksums"
-msgstr "Не користите rsync чексуме"
-
-#: ../fdroidserver/install.py
-msgid "Download F-Droid.apk using mirrors that leak less to the network"
-msgstr "Преузмите F-Droid.apk користећи огледала која мање цуре у мрежу"
-
-#: ../fdroidserver/__main__.py
-msgid "Download complete mirrors of small repos"
-msgstr "Преузмите комплетне огледале малих репоа"
-
-#: ../fdroidserver/common.py
-msgid "Downloading the repository already failed once, not trying again."
-msgstr "Преузимање складишта је већ једном неуспело, не покушавам поново."
-
-#: ../fdroidserver/verify.py
-#, python-brace-format
-msgid "Downloading {url} failed. {error}"
-msgstr "Преузимање {url} није успело. {error}"
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Duplicate Anti-Feature declaration at {path} was ignored!"
-msgstr "Дуплирана декларација Анти-Функције на {path} је игнорисана!"
-
-#: ../fdroidserver/index.py
-#, python-format
-msgid "Duplicate entry \"%s\" in mirrors config!"
-msgstr "Дуплирани унос \"%s\" у конфигурацији огледала!"
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Duplicate link in '{field}': {url}"
-msgstr "Дуплирани линк у '{field}': {url}"
-
-#: ../fdroidserver/common.py
-#, python-format
-msgid "ERROR: %(message)s"
-msgstr "ГРЕШКА: %(message)s"
-
-#: ../fdroidserver/__main__.py
-msgid "ERROR: The \"server\" subcommand has been removed, use \"deploy\"!"
-msgstr "ГРЕШКА: Подкоманда „server“ је уклоњена, користите „deploy“!"
-
-#: ../fdroidserver/nightly.py
-msgid "ERROR: unsupported CI type, patches welcome!"
-msgstr "ГРЕШКА: неподржани тип CI, закрпе добродошле!"
-
-#: ../fdroidserver/nightly.py
-#, python-format
-msgid "ERROR: unsupported git host \"%s\", patches welcome!"
-msgstr "ГРЕШКА: неподржан git домаћин \"%s\", закрпе су добродошле!"
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "ERROR: {key} in {path} is not \"archive\" or \"repo\"!"
-msgstr "ERROR: {key} у {path} није \"archive\" или \"repo\"!"
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "ERROR: {key} not a valid key!"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "ERROR: {key}'s value should be of type {t}!"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "ERROR: {key}:{subkey} in {path} is not in allowed keys: {allowed_keys}!"
-msgstr "ERROR: {key}:{subkey} у {path} није у дозвољеним кључевима: {allowed_keys}!"
-
-#: ../fdroidserver/__main__.py
-#, python-brace-format
-msgid "Encoding is set to '{enc}' fdroid might run into encoding issues. Please set it to 'UTF-8' for best results."
-msgstr "Кодирање је подешено на „{enc}“ fdroid може наићи на проблеме са кодирањем. Молимо вас да га подесите на „UTF-8“ за најбоље резултате."
-
-#: ../fdroidserver/init.py
-#, python-format
-msgid ""
-"Enter the path to the Android SDK (%s) here:\n"
-"> "
-msgstr ""
-"Унесите путању до Android SDK (%s) овде:\n"
-"> "
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Environment variable {var} from {configname} is not set!"
-msgstr "Еколошка променљива {var} из {configname} није подешена!"
-
-#: ../fdroidserver/common.py
-#, fuzzy, python-brace-format
-msgid "Environment variable {{env: {var}}} is not set!"
-msgstr "Еколошка променљива {var} из {configname} није подешена!"
-
-#: ../fdroidserver/deploy.py
-msgid "Error deploying 'github_releases', {} not present. (You might need to run `fdroid update` first.)"
-msgstr "Error deploying 'github_releases', {} није присутан. (Можда треба прво да покренете `fdroid update`.)"
-
-#: ../fdroidserver/import_subcommand.py
-msgid "Error while getting repo address"
-msgstr "Грешка при добијању адресе репозиторијума"
-
-#: ../fdroidserver/scanner.py
-msgid "Exit with a non-zero code if problems were found"
-msgstr "Излаз са ненултим кодом ако су пронађени проблеми"
-
-#: ../fdroidserver/__main__.py
-msgid "Extract application metadata from a source repository"
-msgstr "Извлачење метаподатака апликације из изворног репозиторијума"
-
-#: ../fdroidserver/__main__.py
-msgid "Extract signatures from APKs"
-msgstr "Извуците потписе из АПК-ова"
-
-#: ../fdroidserver/install.py
-msgid "F-Droid.apk could not be downloaded from any known source!"
-msgstr "F-Droid.apk није могао да се преузме са било ког познатог извора!"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Failed copying {path}: {error}"
-msgstr "Неуспело копирање {path}: {error}"
-
-#: ../fdroidserver/signatures.py
-#, python-brace-format
-msgid "Failed fetching signatures for '{apkfilename}': {error}"
-msgstr "Неуспешно преузимање потписа за '{apkfilename}': {error}"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Failed reading {path}: {error}"
-msgstr "Није успело читање {path}: {error}"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Failed resizing {path}: {error}"
-msgstr "Неуспешно мењање величине {path}: {error}"
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Failed to create S3 bucket: {url}"
-msgstr "Неуспело креирање S3 кофера: {url}"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Failed to get APK information, deleting {path}"
-msgstr "Неуспешно добијање информација о APK, брисање {path}"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Failed to get APK information, skipping {path}"
-msgstr "Није успело преузимање информација о APK, прескакање {path}"
-
-#: ../fdroidserver/update.py
-msgid "Failed to get APK signing key fingerprint"
-msgstr "Није успело добијање отиска кључа за потписивање APK"
-
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "Failed to install '{apkfilename}' on {dev}: {error}"
-msgstr "Инсталација '{apkfilename}' на {dev} није успела: {error}"
-
-#: ../fdroidserver/common.py
-msgid "Failed to sign application"
-msgstr "Неуспешно потписивање апликације"
-
-#: ../fdroidserver/build.py
-#, python-brace-format
-msgid "Fetched buildserverid from VM: {buildserverid}"
-msgstr "Пронађен id сервера за изградњу из VM-а: {buildserverid}"
-
-#: ../fdroidserver/signatures.py
-#, python-brace-format
-msgid "Fetched signatures for '{apkfilename}' -> '{sigdir}'"
-msgstr "Преузети потписи за '{apkfilename}' -> '{sigdir}'"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "File disappeared while processing it: {path}"
-msgstr "Фајл је нестао током обраде: {path}"
-
-#: ../fdroidserver/build.py ../fdroidserver/install.py
-#: ../fdroidserver/rewritemeta.py ../fdroidserver/scanner.py
-#: ../fdroidserver/update.py
-msgid "Finished"
-msgstr "Завршено"
-
-#: ../fdroidserver/lint.py
-msgid "Forbidden HTML tags"
-msgstr "Забрањене HTML ознаке"
-
-#: ../fdroidserver/build.py
-msgid "Force build of disabled apps, and carries on regardless of scan problems. Only allowed in test mode."
-msgstr "Присилна изградња онемогућених апликација и наставак без обзира на проблеме са скенирањем. Дозвољено само у тест режиму."
-
-#: ../fdroidserver/build.py
-#, python-brace-format
-msgid "Force halting build after {0} sec timeout!"
-msgstr "Прекид изградње након {0} сек временског ограничења!"
-
-#: ../fdroidserver/scanner.py
-msgid "Force scan of disabled apps and builds."
-msgstr "Присилно скенирање онемогућених апликација и градњи."
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Found \"{path}\" graphic without metadata for app \"{name}\"!"
-msgstr "Пронађена је \"{path}\" графика без метаподатака за апликацију \"{name}\"!"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Found bad funding file \"{path}\" for \"{name}\":"
-msgstr "Пронађена лоша датотека за финансирање \"{path}\" за \"{name}\":"
-
-#: ../fdroidserver/common.py
-msgid "Found invalid appids in arguments"
-msgstr "Пронађени неважећи ID-еви апликација у аргументима"
-
-#: ../fdroidserver/common.py
-msgid "Found invalid versionCodes for some apps"
-msgstr "Пронађени неважећи верзијски кодови за неке апликације"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Found multiple JAR Signature Block Files in {path}"
-msgstr "Пронађено више JAR датотека са блоковима потписа у {path}"
-
-#: ../fdroidserver/common.py
-msgid "Found multiple Signer Certificates!"
-msgstr "Пронађено више потписних сертификата!"
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Found multiple metadata files for {appid}"
-msgstr "Пронађено више метаподатотека за {appid}"
-
-#: ../fdroidserver/index.py
-msgid "Found multiple signing certificates for repository."
-msgstr "Пронађено је више сертификата за потписивање за репозиторијум."
-
-#: ../fdroidserver/index.py
-msgid "Found no signing certificates for repository."
-msgstr "Нису пронађени сертификати за потписивање за депо."
-
-#: ../fdroidserver/lint.py
-#, python-format
-msgid "Found non-file at %s"
-msgstr "Није пронађена датотека на %s"
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Found {apkfilename} at {url}"
-msgstr "Пронађен {apkfilename} на {url}"
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Found {count} problems in {filename}"
-msgstr "Пронађено {count} проблема у {filename}"
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Found {count} warnings in {filename}"
-msgstr "Пронађено {count} упозорења у {filename}"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Generated skeleton metadata for {appid}"
-msgstr "Генерисани метаподаци скелета за {appid}"
-
-#: ../fdroidserver/common.py
-#, python-format
-msgid "Git checkout of '%s' failed"
-msgstr "Провера стања Git-а за '%s' није успела"
-
-#: ../fdroidserver/common.py
-msgid "Git clean failed"
-msgstr "Гит чишћење није успело"
-
-#: ../fdroidserver/common.py
-msgid "Git fetch failed"
-msgstr "Преузимање из Гит-а није успело"
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/common.py
-#, python-format
-msgid "Git remote set-head failed: \"%s\""
-msgstr "Git remote set-head неуспешан: \"%s\""
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/common.py
-msgid "Git reset failed"
-msgstr "Гит ресет није успео"
-
-#: ../fdroidserver/common.py
-msgid "Git submodule deinit failed"
-msgstr "Git submodule deinit није успео"
-
-#: ../fdroidserver/common.py
-msgid "Git submodule sync failed"
-msgstr "Гит подмодул синхронизовање није успело"
-
-#: ../fdroidserver/common.py
-msgid "Git submodule update failed"
-msgstr "Ажурирање гит подмодула није успело"
-
-#: ../fdroidserver/common.py
-msgid "HTTPS must be used with Subversion URLs!"
-msgstr "HTTPS мора да се користи са Subversion URL-овима!"
-
-#: ../fdroidserver/deploy.py
-msgid "If a git mirror gets to big, allow the archive to be deleted"
-msgstr "Ако git огледало постане превелико, дозволите да архиву обришемо"
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "If this upload fails, try manually uploading to {url}"
-msgstr "Ако овај пренос не успе, покушајте ручно да отпремите на {url}"
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Ignoring '{field}' in '{metapath}' metadata because it is deprecated."
-msgstr "Игнорисање '{field}' у '{metapath}' метаподацима јер је застарело."
-
-#: ../fdroidserver/update.py
-#, python-format
-msgid "Ignoring FUNDING.yml entry longer than 2048: %s"
-msgstr "Игнорисање FUNDING.yml уноса дужег од 2048: %s"
-
-#: ../fdroidserver/update.py
-#, python-format
-msgid "Ignoring bad element in manifest: %s"
-msgstr "Игнорисање лошег елемента у манифесту: %s"
-
-#: ../fdroidserver/common.py
-#, fuzzy, python-brace-format
-msgid "Ignoring deprecated {oldfile}, use {newfile}!"
-msgstr "{oldfile} је застарео, користите {newfile}"
-
-#: ../fdroidserver/index.py
-msgid "Ignoring package without metadata: "
-msgstr "Игнорисање пакета без метаподатака: "
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Ignoring stale cache data for {apkfilename}"
-msgstr "Игнорисање застарелих кеш података за {apkfilename}"
-
-#: ../fdroidserver/update.py
-msgid "Include APKs that are signed with disabled algorithms like MD5"
-msgstr "Укључи АПК-ове који су потписани алгоритмима који су искључени, као што је MD5"
-
-#: ../fdroidserver/mirror.py
-msgid "Include the PGP signature .asc files in the mirror"
-msgstr "Укључите ПГП серификат .асц фајлове у огледало"
-
-#: ../fdroidserver/mirror.py
-msgid "Include the build logs in the mirror"
-msgstr "Укључи логове грађења у огледало"
-
-#: ../fdroidserver/mirror.py
-msgid "Include the source tarballs in the mirror"
-msgstr "Укључите изворне тарболове у огледало"
-
-#: ../fdroidserver/metadata.py
-#, python-format
-msgid "Including metadata from %s@%s"
-msgstr "Укључујући метаподатке из %s@%s"
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Including metadata from {path}"
-msgstr "Укључујући метаподатке из {path}"
-
-#: ../fdroidserver/common.py
-msgid "Initialising submodules"
-msgstr "Иницијализација подмодула"
-
-#: ../fdroidserver/install.py
-msgid "Install all signed applications available"
-msgstr "Инсталирајте све доступне потписане апликације"
-
-#: ../fdroidserver/__main__.py
-msgid "Install built packages on devices"
-msgstr "Инсталирајте изграђене пакете на уређајима"
-
-#: ../fdroidserver/install.py
-#, python-format
-msgid "Installing %s..."
-msgstr "Инсталирање %s..."
-
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "Installing '{apkfilename}' on {dev}..."
-msgstr "Инсталирање '{apkfilename}' на {dev}..."
-
-#: ../fdroidserver/__main__.py
-msgid "Interact with the repo HTTP server"
-msgstr "Интеракција са HTTP сервером репозиторијума"
-
-#: ../fdroidserver/update.py
-msgid "Invalid APK"
-msgstr "Неважећи APK"
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "Invalid AutoUpdateMode: {mode}"
-msgstr "Неважећи AutoUpdateMode: {mode}"
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "Invalid UpdateCheckMode: {mode}"
-msgstr "Неважећи UpdateCheckMode: {mode}"
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "Invalid VercodeOperation: {field}"
-msgstr "Неважећа VercodeOperation: {field}"
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Invalid VercodeOperation: {invalid_ops}"
-msgstr "Неважећа VercodeOperation: {invalid_ops}"
-
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Invalid application ID {appid}"
-msgstr "Неважећи идентификациони број апликације {appid}"
-
-#: ../fdroidserver/lint.py
-msgid "Invalid bulleted list"
-msgstr "Неисправна наменска листа"
-
-#: ../fdroidserver/common.py
-#, python-format
-msgid "Invalid name for published file: %s"
-msgstr "Неважеће име за објављени фајл: %s"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Invalid ndk: entry in build: \"{ndk}\""
-msgstr "Невалидан ndk: унос у изградњи: \"{ndk}\""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Invalid redirect to non-HTTPS: {before} -> {after} "
-msgstr "Неважећи преусмеравање на не-HTTPS: {before} -> {after} "
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Invalid scrlib metadata: '{file}' does not exist"
-msgstr "Неважећи scrlib метаподаци: '{file}' не постоји"
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Invalid srclib metadata: could not parse '{file}'"
-msgstr "Неправилна srclib мета подаци: није могуће анализирати '{file}'"
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Invalid srclib metadata: unknown key '{key}' in '{file}'"
-msgstr "Неправилна srclib мета подаци: непознати кључ '{key}' у '{file}'"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "JAR signature failed to verify: {path}"
-msgstr "Потпис JAR-а није успео да се верификује: {path}"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "JAR signature verified: {path}"
-msgstr "Потпис JAR-а верификован: {path}"
-
-#: ../fdroidserver/scanner.py
-msgid "Java JAR file"
-msgstr "Java JAR файл"
-
-#: ../fdroidserver/mirror.py ../fdroidserver/publish.py
-#: ../fdroidserver/update.py
-msgid "Java JDK not found! Install in standard location or set java_paths!"
-msgstr "Java JDK није пронађен! Инсталирајте у стандардној локацији или поставите java_paths!"
-
-#: ../fdroidserver/scanner.py
-msgid "Java compiled class"
-msgstr "Java компилирана класа"
-
-#: ../fdroidserver/signindex.py
-msgid "Java jarsigner not found! Install in standard location or set java_paths!"
-msgstr "Java jarsigner није пронађен! Инсталирајте на стандардној локацији или поставите java_paths!"
-
-#: ../fdroidserver/lint.py
-msgid "Javascript in HTML src attributes"
-msgstr "Javascript у HTML src атрибутима"
-
-#: ../fdroidserver/build.py
-#, python-brace-format
-msgid "Keeping failed build \"{apkfilename}\""
-msgstr "Чување неуспеле градње \"{apkfilename}\""
-
-#: ../fdroidserver/init.py
-msgid "Keystore for signing key:\t"
-msgstr "Кејстр за потписивање кључа:\t"
-
-#: ../fdroidserver/lint.py
-msgid "Known debug key is used in AllowedAPKSigningKeys: "
-msgstr "Познати дебаг кључ се користи у AllowedAPKSigningKeys: "
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Last used commit '{commit}' looks like a tag, but UpdateCheckMode is '{ucm}'"
-msgstr "Последњи коришћени комит '{commit}' изгледа као ознака, али је UpdateCheckMode '{ucm}'"
-
-#: ../fdroidserver/lint.py
-msgid "Liberapay donation methods belong in the Liberapay: field"
-msgstr "Методе донација на Liberapay спадају у поље: Liberapay"
-
-#: ../fdroidserver/rewritemeta.py
-msgid "List files that would be reformatted (dry run)"
-msgstr "Наведите датотеке које ће бити реформиране (суви тренутак)"
-
-#: ../fdroidserver/lint.py
-msgid "Locale included in f-droid.org URL"
-msgstr "Локација укључена у f-droid.org УРЛ"
-
-#: ../fdroidserver/build.py
-msgid "Make the build stop on exceptions"
-msgstr "Зауставите изградњу на изузетцима"
-
-#: ../fdroidserver/index.py
-msgid "Malformed repository mirrors."
-msgstr "Неправилно обликовани огледи репозиторијума."
-
-#: ../fdroidserver/deploy.py
-msgid "Malformed serverwebroot line:"
-msgstr "Неисправна линија серверског корена веба:"
-
-#: ../fdroidserver/scanner.py
-#, python-format
-msgid "Max recursion depth in ZIP file reached: %s"
-msgstr "Достигнута максимална дубина рекурзије у ZIP датотеци: %s"
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "Mirror config for {url} contains \"isPrimary\" key!"
-msgstr ""
-
-#: ../fdroidserver/mirror.py
-msgid "Mirror the full repo and archive, all file types."
-msgstr "Зерклите потпуну репозиторyју и архиву, све типове фајлова."
-
-#: ../fdroidserver/gpgsign.py
-msgid "Missing output directory"
-msgstr "Недостаје директоријум за излаз"
-
-#: ../fdroidserver/metadata.py
-msgid "Moving Anti-Features declarations to localized files:"
-msgstr "Премештање декларација Анти-Функција у локализоване фајлове:"
-
-#: ../fdroidserver/index.py
-msgid "Neither \"repo_pubkey\" nor \"keystorepass\" set in config.yml"
-msgstr "Ни \"repo_pubkey\" ни \"keystorepass\" нису постављени у config.yml"
-
-#: ../fdroidserver/verify.py
-#, python-format
-msgid "No APK for package: %s"
-msgstr "Нема APK-а за пакет: %s"
-
-#: ../fdroidserver/common.py
-msgid "No Android SDK found!"
-msgstr "Нема пронађеног Android SDK!"
-
-#: ../fdroidserver/install.py
-msgid "No attached devices found"
-msgstr "Није пронађен ниједан прикључени уређај"
-
-#: ../fdroidserver/install.py
-msgid "No devices found for `adb install`! Please plug one in."
-msgstr "Нема пронађених уређаја за `adb install`! Молимо вас, уметните један."
-
-#: ../fdroidserver/index.py
-msgid "No fingerprint in URL."
-msgstr "Нема отиска прста у УРЛ-у."
-
-#: ../fdroidserver/common.py
-msgid "No git submodules available"
-msgstr "Нема git подмодула доступних"
-
-#: ../fdroidserver/import_subcommand.py
-msgid "No gradle project could be found. Specify --subdir?"
-msgstr "Није могуће пронаћи gradle пројекат. Укажите --subdir?"
-
-#: ../fdroidserver/import_subcommand.py
-msgid "No information found."
-msgstr "Нема информација."
-
-#: ../fdroidserver/checkupdates.py
-msgid "No matching tags found"
-msgstr "Нема одговарајућих ознака"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "No minimum SDK version found in {0}, using default (3)."
-msgstr "Није пронађена минимална верзија SDK у {0}, користи се подразумевана (3)."
-
-#: ../fdroidserver/lint.py
-msgid "No need to specify that the app is Free Software"
-msgstr "Нема потребе да се наводи да је апликација Слободан Софтвер"
-
-#: ../fdroidserver/lint.py
-msgid "No need to specify that the app is for Android"
-msgstr "Нема потребе да се наводи да је апликација за Андроид"
-
-#: ../fdroidserver/deploy.py
-msgid "No option set! Edit your config.yml to set at least one of these:"
-msgstr "Нема подешавања! Измените ваш config.yml да поставите барем једну од ових:"
-
-#: ../fdroidserver/common.py
-msgid "No packages specified"
-msgstr "Нема наведених пакета"
-
-#: ../fdroidserver/install.py
-#, python-format
-msgid "No signed APK available for %s"
-msgstr "Нема потписаног APK-а доступног за %s"
-
-#: ../fdroidserver/install.py
-msgid "No signed output directory - nothing to do"
-msgstr "Нема потписаног излазаног директоријума - ништа за рад"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "No signing certificates found in {path}"
-msgstr "Нема сертификата за потпис у {path}"
-
-#: ../fdroidserver/common.py
-#, python-format
-msgid "No such package: %s"
-msgstr "Нема пакета: %s"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "No such versionCode {versionCode} for app {appid}"
-msgstr "Нема таквог versionCode {versionCode} за апликацију {appid}"
-
-#: ../fdroidserver/checkupdates.py
-msgid "No tags found"
-msgstr "Није пронађена ниједна ознака"
-
-#: ../fdroidserver/publish.py ../fdroidserver/verify.py
-msgid "No unsigned directory - nothing to do"
-msgstr "Нема непотписаног каталога - ништа не треба да се ради"
-
-#: ../fdroidserver/__main__.py
-msgid "No version information could be found."
-msgstr "Није пронађена информација о верзији."
-
-#: ../fdroidserver/common.py
-msgid "Not a valid size definition: \"{}\""
-msgstr "Није важећа дефиниција величине: \"{}\""
-
-#: ../fdroidserver/signindex.py
-msgid "Nothing to do"
-msgstr "Ништа за raditi"
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "Nothing to do for {appid}."
-msgstr "Ништа за радити за {appid}."
-
-#: ../fdroidserver/init.py
-msgid "Now set these in config.yml:"
-msgstr "Сада поставите ове у config.yml:"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "OBB file has newer versionCode({integer}) than any APK:"
-msgstr "OBB фајл има новији versionCode({integer}) од било ког APK:"
-
-#: ../fdroidserver/update.py
-msgid "OBB filename must start with \"main.\" or \"patch.\":"
-msgstr "ОББ име фајла мора почети са \"main.\" или \"patch.\":"
-
-#: ../fdroidserver/update.py
-msgid "OBB's packagename does not match a supported APK:"
-msgstr "Име пакета OBB не одговара подржаном APK-у:"
-
-#: ../fdroidserver/deploy.py
-msgid "Offline machine, skipping git mirror generation until `fdroid deploy`"
-msgstr "Оффлайн машина, прескочено генерисање git огледала до `fdroid deploy`"
-
-#: ../fdroidserver/deploy.py
-msgid "One of the 'github_releases' config items is missing the 'packageNames' value. skipping ..."
-msgstr "Једна од 'github_releases' конфигурационих ставки нема 'packageNames' вредност. прескакање ..."
-
-#: ../fdroidserver/deploy.py
-msgid "One of the 'github_releases' config items is missing the 'projectUrl' value. skipping ..."
-msgstr "Једна од 'github_releases' конфигурационих ставки недостаје 'projectUrl' вредност. прескакање ..."
-
-#: ../fdroidserver/deploy.py
-msgid "One of the 'github_releases' config items is missing the 'token' value. skipping ..."
-msgstr "Једна од 'github_releases' конфигурационих ставки нема 'token' вредност. прескакање ..."
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Only PNG and JPEG are supported for graphics, found: {path}"
-msgstr "Само PNG и JPEG су подржани за графику, нађено: {path}"
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/common.py
-msgid "Only accepts a single key \"env\""
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "Only process apps with auto-updates"
-msgstr "Само процесирај апликације са автоматским ажурирањима"
-
-#: ../fdroidserver/lint.py
-msgid "OpenCollective donation methods belong in the OpenCollective: field"
-msgstr "Методе донација OpenCollective припадају OpenCollective: пољу"
-
-#: ../fdroidserver/verify.py
-msgid "Output JSON report to file named after APK."
-msgstr "Извештај у JSON формату сачувај у датотеку именовану по APK."
-
-#: ../fdroidserver/scanner.py
-msgid "Output JSON to stdout."
-msgstr "Излаз JSON на стандардни излаз."
-
-#: ../fdroidserver/checkupdates.py ../fdroidserver/gpgsign.py
-#: ../fdroidserver/publish.py ../fdroidserver/signindex.py
-#: ../fdroidserver/update.py
-msgid "Outputting JSON"
-msgstr "Излаз у JSON"
-
-#: ../fdroidserver/import_subcommand.py
-msgid "Overall license of the project."
-msgstr "Општа Lizenzа пројекта."
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "Overriding blank versionName in {apkfilename} from metadata: {version}"
-msgstr "Превазилажење пусте верзије име у {apkfilename} из метаподатака: {version}"
-
-#: ../fdroidserver/import_subcommand.py
-#, python-brace-format
-msgid "Package \"{appid}\" already exists"
-msgstr "Пакет \"{appid}\" већ постоји"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Parsing manifest at '{path}'"
-msgstr "Парсирање манифеста на '{path}'"
-
-#: ../fdroidserver/common.py
-msgid "Password required with username"
-msgstr "Потребна лозинка са корисничким именом"
-
-#: ../fdroidserver/import_subcommand.py
-msgid "Path to main Android project subdirectory, if not in root."
-msgstr "Пут до главне подкатегорије Android пројекта, ако није у корену."
-
-#: ../fdroidserver/init.py
-msgid "Path to the Android SDK (sometimes set in ANDROID_HOME)"
-msgstr "Пут до Android SDK (понекад подешен у ANDROID_HOME)"
-
-#: ../fdroidserver/btlog.py
-msgid "Path to the git repo to use as the log"
-msgstr "Пут до git репозиторијума који ће се користити као лог"
-
-#: ../fdroidserver/init.py
-msgid "Path to the keystore for the repo signing key"
-msgstr "Путања до хранионице за кључ потписивања репозиторијума"
-
-#: ../fdroidserver/nightly.py
-msgid "Print the secret variable to the terminal for easy copy/paste"
-msgstr "Штампај тајну променљиву на терминал за лако копирање/налепљивање"
-
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "Privacy mode was enabled based on your locale ({country_code})."
-msgstr "Режим приватности је омогућен на основу ваше локације ({country_code})."
-
-#: ../fdroidserver/scanner.py
-#, python-format
-msgid "Problem with ZIP file: %s, error %s"
-msgstr "Проблем са ZIP датотеком: %s, грешка %s"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Problem with xml at '{path}'"
-msgstr "Проблем са xml на '{path}'"
-
-#: ../fdroidserver/checkupdates.py
-msgid "Process auto-updates"
-msgstr "Процес аутоматских ажурирања"
-
-#: ../fdroidserver/publish.py ../fdroidserver/update.py
-#, python-brace-format
-msgid "Processing {apkfilename}"
-msgstr "Обрада {apkfilename}"
-
-#: ../fdroidserver/checkupdates.py ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Processing {appid}"
-msgstr "Обрада {appid}"
-
-#: ../fdroidserver/update.py
-msgid "Produce human-readable XML/JSON for index files"
-msgstr "Произвести људски читљив XML/JSON за индексе датотека"
-
-#: ../fdroidserver/import_subcommand.py
-msgid "Project URL to import from."
-msgstr "Пројектна УРЛ адреса за импортовање."
-
-#: ../fdroidserver/lint.py
-msgid "Punctuation should be avoided"
-msgstr "Знакови интерпункције треба да се избегавају"
-
-#: ../fdroidserver/btlog.py
-msgid "Push the log to this git remote repository"
-msgstr "Пошаљи лог у ову гит даљинску репозиторијум"
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Pushing binary transparency log to {url}"
-msgstr "Притискање логова бинарне транспарентности на {url}"
-
-#: ../fdroidserver/deploy.py
-msgid "Pushing to remote server failed!"
-msgstr "Слање на удаљени сервер није успело!"
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Pushing to {url}"
-msgstr "Турење на {url}"
-
-#: ../fdroidserver/__main__.py
-msgid "Quickly start a new repository"
-msgstr "Брзо покрените нови репозиторијум"
-
-#: ../fdroidserver/__main__.py
-msgid "Read all the metadata files and exit"
-msgstr "Прочитајте све метаподаатке и изађите"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Reading '{config_file}'"
-msgstr "Читање '{config_file}'"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Reading packageName/versionCode/versionName failed, APK invalid: '{apkfilename}'"
-msgstr "Читање packageName/versionCode/versionName није успело, APK неважећи: '{apkfilename}'"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Reading packageName/versionCode/versionName failed,APK invalid: '{apkfilename}'"
-msgstr "Читање packageName/versionCode/versionName није успело, APK је неважећи: '{apkfilename}'"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Reading {apkfilename} from cache"
-msgstr "Читање {apkfilename} из кеша→"
-
-#: ../fdroidserver/build.py
-msgid "Refresh and cache scanner rules and signatures from the network"
-msgstr "Освежите и кеширајте правила и потписе скенера са мреже"
-
-#: ../fdroidserver/publish.py
-#, python-brace-format
-msgid "Refusing to sign '{path}', file exists in both {dir1} and {dir2} folder."
-msgstr ""
-
-#: ../fdroidserver/verify.py
-msgid "Remove source tarball and any APKs if successfully verified."
-msgstr "Уклони изворни tarball и све APK-ове ако су успешно проверени."
-
-#: ../fdroidserver/common.py
-msgid "Removing specified files"
-msgstr "Уклањање наведених датотека"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Removing {path}\""
-msgstr "Уклањање {path}"
-
-#: ../fdroidserver/update.py
-msgid "Rename APK files that do not match package.name_123.apk"
-msgstr "Преименујте APK фајлове који не одговарају package.name_123.apk"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "RepoType {type} is deprecated, please switch to git."
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-#, python-brace-format
-msgid "Resigning {apkfilename} with provided debug.keystore"
-msgstr "Резање {apkfilename} са обезбеђеним debug.keystore"
-
-#: ../fdroidserver/update.py
-msgid "Resize all the icons exceeding the max pixel size and exit"
-msgstr "Промени величину свих икона које прелазе максималну величину у пикселима и изађи"
-
-#: ../fdroidserver/common.py
-msgid "Restrict output to warnings and errors"
-msgstr "Ограничите излаз на упозорења и грешке"
-
-#: ../fdroidserver/net.py
-#, python-format
-msgid "Retrying failed download: %s"
-msgstr "Поновно покушавање неуспелог преузимања: %s"
-
-#: ../fdroidserver/__main__.py
-msgid "Rewrite all the metadata files"
-msgstr "Преупишите све метаподатке"
-
-#: ../fdroidserver/rewritemeta.py
-#, python-brace-format
-msgid "Rewriting '{appid}'"
-msgstr "Преиспитивање '{appid}'"
-
-#: ../fdroidserver/checkupdates.py
-msgid "Run on git repo that has uncommitted changes"
-msgstr "Покрени на git репозиторијуму који има неконтролисане промене"
-
-#: ../fdroidserver/nightly.py
-#, python-brace-format
-msgid "Run over {cibase} to find -debug.apk. and skip repo_basedir {repo_basedir}"
-msgstr "Покрените преко {cibase} да пронађете -debug.apk. и прескочите repo_basedir {repo_basedir}"
-
-#: ../fdroidserver/lint.py
-msgid "Run rewritemeta to fix formatting"
-msgstr "Покрените rewritemeta да исправите форматирање"
-
-#: ../fdroidserver/deploy.py
-msgid "Running first pass with MD5 checking disabled"
-msgstr "Ручно извршавање првог пролаза са MD5 проверама онемогућеним"
-
-#: ../fdroidserver/mirror.py
-#, python-brace-format
-msgid "Running wget in {path}"
-msgstr "Покретање wget у {path}"
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "SHA-256 of {url} does not match entry!"
-msgstr "SHA-256 од {url} не одговара уносу!"
-
-#: ../fdroidserver/build.py
-msgid "Scan the resulting APK(s) for known non-free classes."
-msgstr "Скенирајте добијене APK-ове за познате небесплатне класe."
-
-#: ../fdroidserver/__main__.py
-msgid "Scan the source code of a package"
-msgstr "Скенирајте изворни код пакета"
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Scanner found {count} problems in {apk}"
-msgstr "Скенирање је пронашло {count} проблема у {apk}"
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Scanner found {count} problems in {appid}:"
-msgstr "Скенер је пронашао {count} проблема у {appid}:"
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Scanner found {count} problems in {appid}:{versionCode}:"
-msgstr "Скенирање је пронашло {count} проблема у {appid}:{versionCode}:"
-
-#: ../fdroidserver/build.py
-msgid "Scanner found {} problem"
-msgid_plural "Scanner found {} problems"
-msgstr[0] "Скенирање је пронашло {} проблем"
-msgstr[1] "Скенирање је пронашло {} проблема"
-msgstr[2] "Скенирање је пронашло {} проблема"
-
-#: ../fdroidserver/scanner.py
-msgid "Scanning APK for extra signing blocks."
-msgstr "Сkeniranje АПК-а за додатне блокове потписивања."
-
-#: ../fdroidserver/scanner.py
-msgid "Scanning APK with dexdump for known non-free classes."
-msgstr "Скенирање APK са dexdump за познате неслободне класе."
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Set NDK {release} ({version}) up"
-msgstr "Поставите NDK {release} ({version}) нагоре"
-
-#: ../fdroidserver/common.py
-msgid "Set clock to that time using:"
-msgstr "Поставите сат на то време користећи:"
-
-#: ../fdroidserver/nightly.py
-msgid "Set maximum releases in repo before older ones are archived"
-msgstr "Поставите максимални број издања у репозиторијуму пре него што старија буду архивирана"
-
-#: ../fdroidserver/build.py
-#, python-brace-format
-msgid "Set open file limit to {integer}"
-msgstr "Поставите лимит за отворене фајлове на {integer}"
-
-#: ../fdroidserver/__main__.py
-msgid "Set up an app build for a nightly build repo"
-msgstr "Подесите апликацију за изградњу за репозиториј ноћних изградњи"
-
-#: ../fdroidserver/build.py
-msgid "Setting open file limit failed: "
-msgstr "Постављање лимита за отворене фајлове је неуспело: "
-
-#: ../fdroidserver/build.py
-#, python-brace-format
-msgid "Setting {0} sec timeout for this build"
-msgstr "Постављање таймаута од {0} секунди за овај билд"
-
-#: ../fdroidserver/__main__.py
-msgid "Sign and place packages in the repo"
-msgstr "Потпишите и положите пакете у репо"
-
-#: ../fdroidserver/__main__.py
-msgid "Sign indexes created using update --nosign"
-msgstr "Индекс потписа креиран користећи update --nosign"
-
-#: ../fdroidserver/build.py
-msgid "Skip scanning the source code for binaries and other problems"
-msgstr "Прескочи скенирање изворног кода за бинарне датотеке и друге проблеме"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Skipping '{apkfilename}' with invalid signature!"
-msgstr "Пропуштање '{apkfilename}' са неважећим потписом!"
-
-#: ../fdroidserver/deploy.py ../fdroidserver/index.py
-#, python-format
-msgid "Skipping GitLab Pages mirror because the repo is too large (>%.2fGB)!"
-msgstr "Прескакање GitLab Pages огледала јер је репозиторијум превелики (>%.2fGB)!"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Skipping index generation for {appid}"
-msgstr "Пређите преко генерисања индекса за {appid}"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Skipping {apkfilename} with invalid signature!"
-msgstr "Прескакам {apkfilename} са неважећим потписом!"
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Skipping {appid}: disabled"
-msgstr "Прескочи {appid}: онемогућено"
-
-#: ../fdroidserver/deploy.py
-msgid "Specify a local folder to sync the repo to"
-msgstr "Одредите локалну фасциклу за синхронизацију репозиторијума"
-
-#: ../fdroidserver/deploy.py
-msgid "Specify an identity file to provide to SSH for rsyncing"
-msgstr "Наведите датотеку идентитета коју ћете употредити за SSH приликом rsync-а"
-
-#: ../fdroidserver/nightly.py
-msgid "Specify which debug keystore file to use."
-msgstr "Наведи који debug keystore фајл да се користи."
-
-#: ../fdroidserver/common.py
-msgid "Spew out even more information than normal"
-msgstr "Испљунути још више информација него обично"
-
-#: ../fdroidserver/nightly.py
-#, python-brace-format
-msgid "Stripping mystery signature from {apkfilename}"
-msgstr "Скидање мистериозног потписа са {apkfilename}"
-
-#: ../fdroidserver/lint.py
-#, python-format
-msgid "Summary '%s' is just the app's name"
-msgstr "Сажетак '%s' је само име апликације"
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Summary of length {length} is over the {limit} char limit"
-msgstr "Резиме дужине {length} премашује {limit} знакова"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "System clock is older than date in {path}!"
-msgstr "Системски сат је старији од датума у {path}!"
-
-#: ../fdroidserver/checkupdates.py
-msgid "Tags update mode only works for git, hg, bzr and git-svn repositories currently"
-msgstr "Режим ажурирања етикета тренутно ради само за git, hg, bzr и git-svn репозиторијуме"
-
-#: ../fdroidserver/checkupdates.py
-msgid "Tags update mode used in git-svn, but the repo was not set up with tags"
-msgstr "Режим ажурирања ознака коришћен у git-svn, али репо није подешен са ознакама"
-
-#: ../fdroidserver/build.py
-msgid "Test mode - put output in the tmp directory only, and always build, even if the output already exists."
-msgstr "Тест режим - стави излаз у tmp директоријум само, и увек компајлирај, чак и ако излаз већ постоји."
-
-#: ../fdroidserver/index.py
-msgid "The \"qrcode\" Python package is not installed (e.g. apt-get install python3-qrcode)!"
-msgstr ""
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "The OBB version code must come after \"{name}.\":"
-msgstr "Код верзије OBB мора бити након \"{name}.\":"
-
-#: ../fdroidserver/btlog.py
-msgid "The base URL for the repo to log (default: https://f-droid.org)"
-msgstr "Основни URL за репо за логовање (подразумевано: https://f-droid.org)"
-
-#: ../fdroidserver/mirror.py
-msgid "The directory to write the mirror to"
-msgstr "Директоријум у који ће се написати огледало"
-
-#: ../fdroidserver/nightly.py
-msgid "The file to be included in the repo (path or glob)"
-msgstr "Фајл који треба да буде укључен у репо (путања или глоб)"
-
-#: ../fdroidserver/index.py
-msgid "The repository's fingerprint does not match."
-msgstr "Отисак репозиторијума се не поклапа."
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "The root dir for local_copy_dir \"{path}\" does not exist!"
-msgstr "Коренски директоријум за local_copy_dir \"{path}\" не постоји!"
-
-#: ../fdroidserver/publish.py
-msgid "There is a keyalias collision - publishing halted"
-msgstr "Дошло је до колизије кључа - објављивање је обустављено"
-
-#: ../fdroidserver/common.py
-msgid "These are the apps that have been archived from the main repo."
-msgstr "Ово су апликације које су архивиране из главног репозиторијума."
-
-#: ../fdroidserver/mirror.py
-msgid "This command should never be used to mirror f-droid.org! A full copy requires more than 600GB."
-msgstr "Ова команда никада не би требало да се користи за огледало f-droid.org! Пуна копија захтева више од 600GB."
-
-#: ../fdroidserver/common.py
-msgid "This is a repository of apps to be used with F-Droid. Applications in this repository are either official binaries built by the original application developers, or are binaries built from source by the admin of f-droid.org using the tools on https://gitlab.com/fdroid."
-msgstr "Ово је репозиторијум апликација које се користе са F-Droid. Апликације у овом репозиторијуму су или званичне бинарне верзије које су развили оригинални програмери апликација, или су бинарне верзије састављене из извора од стране администратора f-droid.org коришћењем алата на https://gitlab.com/fdroid."
-
-#: ../fdroidserver/import_subcommand.py
-#, python-format
-msgid "This repo already has local metadata: %s"
-msgstr "Овај репо већ има локалне метаподатке: %s"
-
-#: ../fdroidserver/init.py
-#, python-format
-msgid ""
-"To complete the setup, add your APKs to \"%s\"\n"
-"then run \"fdroid update -c; fdroid update\".  You might also want to edit\n"
-"\"config.yml\" to set the URL, repo name, and more.  You should also set up\n"
-"a signing key (a temporary one might have been automatically generated).\n"
-"\n"
-"For more info: https://f-droid.org/docs/Setup_an_F-Droid_App_Repo\n"
-"and https://f-droid.org/docs/Signing_Process"
-msgstr ""
-"Да бисте завршили подешавање, додајте своје АПК-ове у \"%s\"  \n"
-"затим покрените \"fdroid update -c; fdroid update\".  Такође можете желети да измените  \n"
-"\"config.yml\" да поставите УРЛ, име репозиторију и још много тога.  Такође бисте требали  \n"
-"наподесити кључ за потписивање (можда је привремени већ аутоматски генерисан).  \n"
-"  \n"
-"За више информација: https://f-droid.org/docs/Setup_an_F-Droid_App_Repo  \n"
-"и https://f-droid.org/docs/Signing_Process"
-
-#: ../fdroidserver/deploy.py
-msgid "To use awsbucket, awssecretkey and awsaccesskeyid must also be set in config.yml!"
-msgstr "Да бисте користили awsbucket, awssecretkey и awsaccesskeyid морају бити подешени у config.yml!"
-
-#: ../fdroidserver/deploy.py
-msgid "To use rclone, rclone_config and awsbucket must be set in config.yml!"
-msgstr "Да бисте користили rclone, rclone_config и awsbucket морају бити подешени у config.yml!"
-
-#: ../fdroidserver/lint.py
-msgid "URL must start with https:// or http://"
-msgstr "URL мора почети са https:// или http://"
-
-#: ../fdroidserver/lint.py
-msgid "URL shorteners should not be used"
-msgstr "URL скраћивачи не би требало да се користе"
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "URL {url} in Description: {error}"
-msgstr "URL {url} у Опису: {error}"
-
-#: ../fdroidserver/lint.py
-msgid "Unexpected license tag \"{}\"! Only use FSF or OSI approved tags from https://spdx.org/license-list"
-msgstr "Неочекивана ознака лиценце \"{}\"! Користите само ознаке одобрене од стране FSF или OSI са https://spdx.org/license-list"
-
-#: ../fdroidserver/lint.py
-msgid "Unexpected license tag \"{}\"! Only use license tags configured in your config file"
-msgstr "Неочекивана ознака лиценце \"{}\"! Користите само ознаке лиценце конфигурисане у вашем конфигурационом фајлу"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Unknown entry {key} in {configname}"
-msgstr "Непознати унос {key} у {configname}"
-
-#: ../fdroidserver/__main__.py
-msgid "Unknown exception found!"
-msgstr "Непозната изузетна ситуација пронађена!"
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Unknown file '{filename}' in build '{versionName}'"
-msgstr "Непозната датотека '{filename}' у изградњи '{versionName}'"
-
-#: ../fdroidserver/metadata.py
-#, python-format
-msgid "Unknown metadata format: %s"
-msgstr "Непознати формат метаподатака: %s"
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Unknown metadata format: {path} (use: *.yml)"
-msgstr "Непознат формат метаподатака: {path} (користи: *.yml)"
-
-#: ../fdroidserver/common.py
-msgid "Unknown version of aapt, might cause problems: "
-msgstr "Непозната верзија aapt, може изазвати проблеме: "
-
-#: ../fdroidserver/lint.py
-msgid "Unnecessary leading space"
-msgstr "Непотребан водећи размак"
-
-#: ../fdroidserver/lint.py
-msgid "Unnecessary trailing space"
-msgstr "Непотребан завршни размак"
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Unrecognised app field '{fieldname}' in '{path}'"
-msgstr "Непознато поље апликације '{fieldname}' у '{path}'"
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Unrecognised build flag '{build_flag}' in '{path}'"
-msgstr "Непозната застава изградње '{build_flag}' у '{path}'"
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Unsupported file type \"{extension}\" for repo graphic"
-msgstr "Неподржани тип датотеке \"{extension}\" за графику репозиторијума"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Unsupported graphics file found: {path}"
-msgstr "Пронађена неподржана графичка датотека: {path}"
-
-#: ../fdroidserver/lint.py
-#, python-format
-msgid "Unused extlib at %s"
-msgstr "Некоришћена екстерна библиотека на %s"
-
-#: ../fdroidserver/lint.py
-#, python-format
-msgid "Unused file at %s"
-msgstr "Некоришћена датотека на %s"
-
-#: ../fdroidserver/scanner.py
-#, python-format
-msgid "Unused scandelete path: %s"
-msgstr "Некоришћена путања за брисање скенирања: %s"
-
-#: ../fdroidserver/scanner.py
-#, python-format
-msgid "Unused scanignore path: %s"
-msgstr "Некоришћена путања за игнорисање скенирања: %s"
-
-#: ../fdroidserver/__main__.py
-msgid "Update repo information for new packages"
-msgstr "Ажурирање информација о репозиторијуму за нове пакете"
-
-#: ../fdroidserver/__main__.py
-msgid "Update the binary transparency log for a URL"
-msgstr "Ажурирање дневника транспарентности бинарних датотека за URL"
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "UpdateCheckData has invalid URL: {url}"
-msgstr "UpdateCheckData има неважећи URL: {url}"
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "UpdateCheckData must match the version code as integer (\\d or [0-9]): {codeex}"
-msgstr "UpdateCheckData мора одговарати верзионом коду као цео број (\\d или [0-9]): {codeex}"
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "UpdateCheckData must use HTTPS URL: {url}"
-msgstr "UpdateCheckData мора користити HTTPS URL: {url}"
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "UpdateCheckData not a valid URL: {url}"
-msgstr "UpdateCheckData није важећи URL: {url}"
-
-#: ../fdroidserver/lint.py
-msgid "UpdateCheckMode is set but it looks like checkupdates hasn't been run yet."
-msgstr "UpdateCheckMode је подешен, али изгледа да checkupdates још није покренут."
-
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/lint.py
-msgid "UpdateCheckName is set to the known application ID, it can be removed"
-msgstr "UpdateCheckName је постављен на познати ID апликације, може се уклонити"
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Uploading {apkfilename} to androidobservatory.org"
-msgstr "Отпремање {apkfilename} на androidobservatory.org"
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Uploading {apkfilename} to virustotal"
-msgstr "Отпремање {apkfilename} на virustotal"
-
-#: ../fdroidserver/lint.py
-msgid "Use /HEAD instead of /master or /main to point at a file in the default branch"
-msgstr "Користите /HEAD уместо /master или /main да покажете на фајл у подразумеваној грани"
-
-#: ../fdroidserver/update.py
-msgid "Use `fdroid update -c` to create it."
-msgstr "Користи `fdroid update -c` да је креираш."
-
-#: ../fdroidserver/build.py
-msgid "Use build server"
-msgstr "Користи сервер за изградњу"
-
-#: ../fdroidserver/update.py
-msgid "Use date from APK instead of current time for newly added APKs"
-msgstr "Користи датум из APK уместо тренутног времена за ново додате APK-ове"
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Using \"{path}\" for configuring s3cmd."
-msgstr "Користим \"{path}\" за конфигурисање s3cmd."
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Using \"{path}\" for syncing with remote storage."
-msgstr "Користим \"{path}\" за синхронизацију са удаљеним складиштем."
-
-#: ../fdroidserver/common.py
-msgid "Using APK Signature v2"
-msgstr "Користим APK Signature v2"
-
-#: ../fdroidserver/common.py
-msgid "Using APK Signature v3"
-msgstr "Користим APK Signature v3"
-
-#: ../fdroidserver/common.py
-msgid "Using JAR Signature"
-msgstr "Коришћење JAR потписа"
-
-#: ../fdroidserver/common.py
-msgid "Using Java's jarsigner, not recommended for verifying APKs! Use apksigner"
-msgstr "Користим Java's jarsigner, не препоручује се за верификацију APK-ова! Користи apksigner"
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Using blank dictionary instead of contents of {path}!"
-msgstr "Коришћење празног речника уместо садржаја {path}!"
-
-#: ../fdroidserver/init.py
-#, python-brace-format
-msgid "Using existing keystore \"{path}\""
-msgstr "Користим постојећи keystore \"{path}\""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Using rclone to sync with: {url}"
-msgstr "Користим rclone за синхронизацију са: {url}"
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Using s3cmd to sync with: {url}"
-msgstr "Користим s3cmd за синхронизацију са: {url}"
-
-#: ../fdroidserver/__main__.py
-msgid "Valid commands are:"
-msgstr "Важеће команде су:"
-
-#: ../fdroidserver/verify.py
-msgid "Verify against locally cached copy rather than redownloading."
-msgstr "Верификуј против локално кеширане копије уместо поновног преузимања."
-
-#: ../fdroidserver/__main__.py
-msgid "Verify the integrity of downloaded packages"
-msgstr "Верификуј интегритет преузетих пакета"
-
-#: ../fdroidserver/index.py
-msgid "Verifying index signature:"
-msgstr "Верификација потписа индекса:"
-
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "Verifying package {path} with apksigner."
-msgstr "Провера пакета {path} са apksigner."
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "VirusTotal API key cannot upload files larger than 32MB, use {url} to upload {path}."
-msgstr "VirusTotal API кључ не може отпремити датотеке веће од 32MB, користи {url} за отпремање {path}."
-
-#: ../fdroidserver/nightly.py
-msgid "WARNING: only public git repos are supported!"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Warn about possible metadata errors"
-msgstr "Упозорење о могућим грешкама у метаподацима"
-
-#: ../fdroidserver/scanner.py
-msgid "WebAssembly binary file"
-msgstr "ВебАсембли бинарни фајл"
-
-#: ../fdroidserver/update.py
-msgid "When configured for signed indexes, create only unsigned indexes at this stage"
-msgstr "Када је конфигурисано за потписане индексе, креирај само непотписане индексе у овој фази"
-
-#: ../fdroidserver/lint.py
-msgid "When linting the entire repository yamllint is disabled by default. This option forces yamllint regardless."
-msgstr "Када се врши провера целог репозиторијума, yamllint је подразумевано онемогућен. Ова опција приморава yamllint без обзира на то."
-
-#: ../fdroidserver/publish.py
-msgid "When signing or verifying fails, exit with an error code."
-msgstr "Када потписивање или верификација не успеју, излазите са кодом грешке."
-
-#: ../fdroidserver/install.py
-msgid "Would you like to download and install F-Droid.apk via adb? (YES/no)"
-msgstr "Да ли желите да преузмете и инсталирате F-Droid.apk преко adb? (ДА/не)"
-
-#: ../fdroidserver/install.py
-msgid "Would you like to download the app(s) from f-droid.org? (YES/no)"
-msgstr "Да ли желите да преузмете апликацију(е) са f-droid.org? (ДА/не)"
-
-#: ../fdroidserver/init.py
-msgid "X.509 'Distinguished Name' used when generating keys"
-msgstr "X.509 'Distinguished Name' коришћен приликом генерисања кључева"
-
-#: ../fdroidserver/common.py
-msgid "You can use ANDROID_HOME to set the path to your SDK, i.e.:"
-msgstr "Можеш користити ANDROID_HOME да подесиш путању до свог SDK, тј.:"
-
-#: ../fdroidserver/scanner.py
-msgid "ZIP file archive"
-msgstr "ZIP архивска датотека"
-
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "adb reports {serial} is \"{status}\"!"
-msgstr "adb пријављује {serial} је \"{status}\"!"
-
-#: ../fdroidserver/nightly.py
-#, python-brace-format
-msgid "adding IdentityFile to {path}"
-msgstr "додавање IdentityFile у {path}"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "adding to {name}: {path}"
-msgstr "додавање у {name}: {path}"
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "ambiguous option: %(option)s could match %(matches)s"
-msgstr "нејасна опција: %(option)s може одговарати %(matches)s"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "apksigner in build-tools;{version} passes APKs with invalid v3 signatures, ignoring."
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "apksigner not found! Cannot sign or verify modern APKs"
-msgstr "apksigner није пронађен! Не могу да потпишем или проверим модерне APK-ове"
-
-#: ../fdroidserver/common.py
-msgid "apksigner not found, it's required for signing!"
-msgstr "apksigner није пронађен, потребан је за потписивање!"
-
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/checkupdates.py ../fdroidserver/lint.py
-#: ../fdroidserver/rewritemeta.py
-msgid "application ID of file to operate on"
-msgstr "ID апликације датотеке за рад"
-
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/build.py ../fdroidserver/install.py
-#: ../fdroidserver/publish.py ../fdroidserver/scanner.py
-#: ../fdroidserver/verify.py
-msgid "application ID with optional versionCode in the form APPID[:VERCODE]"
-msgstr "ID апликације са опционим versionCode у облику APPID[:VERCODE]"
-
-#: ../fdroidserver/common.py
-msgid "archive_url needs to end with /archive"
-msgstr "archive_url мора да се завршава са /archive"
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "argument \"-\" with mode %r"
-msgstr "аргумент \"-\" са модом %r"
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "argument %(argument_name)s: %(message)s"
-msgstr "аргумент %(argument_name)s: %(message)s"
-
-#: ../fdroidserver/nightly.py
-msgid "attempting bare SSH connection to test deploy key:"
-msgstr "покушавам SSH везу без кључа да тестирам deploy кључ:"
-
-#: ../fdroidserver/common.py
-msgid "can not parse scrlib spec (not a string): '{}'"
-msgstr "не могу да парсирам scrlib спецификацију (није стринг): '{}'"
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "can't open '%(filename)s': %(error)s"
-msgstr "не могу да отворим '%(filename)s': %(error)s"
-
-#: ../fdroidserver/scanner.py
-msgid "can't open non-https url: '{};"
-msgstr "не могу да отворим non-https url: '{};"
-
-#: ../fdroidserver/build.py
-#, python-brace-format
-msgid "cannot find required srclibs: \"{path}\""
-msgstr "не могу да пронађем потребне srclibs: \"{path}\""
-
-#: /usr/lib/python3.11/argparse.py
-msgid "cannot have multiple subparser arguments"
-msgstr "не могу имати више аргумената подпарсера"
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "cannot merge actions - two groups are named %r"
-msgstr "не могу спојити акције - две групе се зову %r"
-
-#: ../fdroidserver/nightly.py
-msgid "cannot publish update, did you set the deploy key?"
-msgstr "не могу објавити ажурирање, да ли сте поставили deploy кључ?"
-
-#: ../fdroidserver/nightly.py
-#, python-brace-format
-msgid "cloning {url}"
-msgstr "клонирам {url}"
-
-#: ../fdroidserver/__main__.py
-msgid "commands from plugin modules:"
-msgstr "команде из plugin модула:"
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "conflicting option string: %s"
-msgid_plural "conflicting option strings: %s"
-msgstr[0] "конфликтна опција стринг: %s"
-msgstr[1] "конфликтна опција стринга: %s"
-msgstr[2] "конфликтна опција стрингова: %s"
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "conflicting subparser alias: %s"
-msgstr "конфликтни алиас подпарсера: %s"
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "conflicting subparser: %s"
-msgstr "конфликтни подпарсер: %s"
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "could not parse '{path}'"
-msgstr "не могу да парсирам '{path}'"
-
-#: ../fdroidserver/common.py
-msgid "could not parse srclib spec (no name specified): '{}'"
-msgstr "није могуће парсирати srclib спецификацију (није наведено име): '{}'"
-
-#: ../fdroidserver/common.py
-msgid "could not parse srclib spec (no ref specified): '{}'"
-msgstr "не могу да парсирам srclib спецификацију (није наведена референца): '{}'"
-
-#: ../fdroidserver/nightly.py
-#, python-brace-format
-msgid "created {path}"
-msgstr "креирано {path}"
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "current version is newer: old vercode={old}, new vercode={new}"
-msgstr "тренутна верзија је новија: стара верзија={old}, нова верзија={new}"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "deleting: repo/{apkfilename}"
-msgstr "бришем: repo/{apkfilename}"
-
-#: ../fdroidserver/scanner.py
-msgid "dependency file without lock"
-msgstr "фајл зависности без закључавања"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "deployed process log {path} to {dest}"
-msgstr "постављен лог процеса {path} на {dest}"
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "dest= is required for options like %r"
-msgstr "dest= је потребан за опције као што је %r"
-
-#: ../fdroidserver/scanner.py
-msgid "downloading '{}'"
-msgstr "преузимање '{}'"
-
-#: ../fdroidserver/scanner.py
-msgid "downloading scanner signatures from '{}' failed"
-msgstr "преузимање потписа скенера са '{}' није успело"
-
-#: ../fdroidserver/scanner.py
-msgid "executable binary, possibly code"
-msgstr "извршни бинарни фајл, могуће код"
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "expected %s argument"
-msgid_plural "expected %s arguments"
-msgstr[0] "очекиван %s аргумент"
-msgstr[1] "очекивана %s аргумента"
-msgstr[2] "очекивано %s аргумената"
-
-#: /usr/lib/python3.11/argparse.py
-msgid "expected at least one argument"
-msgstr "очекиван бар један аргумент"
-
-#: /usr/lib/python3.11/argparse.py
-msgid "expected at most one argument"
-msgstr "очекиван највише један аргумент"
-
-#: /usr/lib/python3.11/argparse.py
-msgid "expected one argument"
-msgstr "очекиван један аргумент"
-
-#: ../fdroidserver/__main__.py
-msgid "fdroid [<command>] [-h|--help|--version|<args>]"
-msgstr "fdroid [<команда>] [-h|--help|--version|<args>]"
-
-#: ../fdroidserver/scanner.py
-msgid "fetch the latest version of signatures from the web"
-msgstr "преузмите најновију верзију потписа са веба"
-
-#: ../fdroidserver/metadata.py
-msgid "force metadata errors (default) to be warnings, or to be ignored."
-msgstr "форсирај грешке метаподатака (подразумевано) да буду упозорења, или да буду игнорисане."
-
-#: ../fdroidserver/common.py
-msgid "git svn clone failed"
-msgstr "git svn clone није успео"
-
-#: ../fdroidserver/scanner.py
-msgid "gzip file archive"
-msgstr "gzip архива датотека"
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "ignored explicit argument %r"
-msgstr "игнорисан експлицитан аргумент %r"
-
-#: ../fdroidserver/index.py
-msgid "index-v1 must have a signature, use `fdroid signindex` to create it!"
-msgstr "index-v1 мора имати потпис, користите `fdroid signindex` да га креирате!"
-
-#: ../fdroidserver/index.py
-msgid "index-v2 must have a signature, use `fdroid signindex` to create it!"
-msgstr "index-v2 мора имати потпис, користите `fdroid signindex` да га направите!"
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "invalid %(type)s value: %(value)r"
-msgstr "неважећа %(type)s вредност: %(value)r"
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "invalid choice: %(value)r (choose from %(choices)s)"
-msgstr "неважећи избор: %(value)r (изаберите из %(choices)s)"
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "invalid conflict_resolution value: %r"
-msgstr "неважећа conflict_resolution вредност: %r"
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "invalid option string %(option)r: must start with a character %(prefix_chars)r"
-msgstr "неважећа опција стринг %(option)r: мора почети са карактером %(prefix_chars)r"
-
-#: ../fdroidserver/common.py
-msgid "ipfs_cid not found, skipping CIDv1 generation"
-msgstr "ipfs_cid није пронађен, прескачем генерисање CIDv1"
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "latest build recipe is newer: old vercode={old}, new vercode={new}"
-msgstr "најновији рецепт за изградњу је новији: стара верзија={old}, нова верзија={new}"
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "local_copy_dir does not end with \"fdroid\", perhaps you meant: \"{path}\""
-msgstr "local_copy_dir не завршава се са \"fdroid\", можда сте мислили: \"{path}\""
-
-#: ../fdroidserver/deploy.py
-msgid "local_copy_dir must be an absolute path!"
-msgstr "local_copy_dir мора бити апсолутна путања!"
-
-#: ../fdroidserver/deploy.py
-msgid "local_copy_dir must be directory, not a file!"
-msgstr "local_copy_dir мора бити директоријум, а не датотека!"
-
-#: ../fdroidserver/index.py
-#, python-format
-msgid "mirror '%s' does not end with 'fdroid'!"
-msgstr "огледало '%s' се не завршава са 'fdroid'!"
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "mirrors set twice, in config.yml and {path}!"
-msgstr "огледала су постављена два пута, у config.yml и {path}!"
-
-#: /usr/lib/python3.11/argparse.py
-msgid "mutually exclusive arguments must be optional"
-msgstr "међусобно искључиви аргументи морају бити опционални"
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "next {name} cache update due in {time}"
-msgstr "следеће ажурирање кеша {name} је за {time}"
-
-#: ../fdroidserver/mirror.py
-#, python-brace-format
-msgid "no \"icon\" in {appid}"
-msgstr "нема \"иконе\" у {appid}"
-
-#: ../fdroidserver/signatures.py
-msgid "no APK supplied"
-msgstr "нема достављеног APK-а"
-
-#: ../fdroidserver/checkupdates.py
-msgid "no version information found"
-msgstr "није пронађена информација о верзијама"
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "not allowed with argument %s"
-msgstr "није дозвољено са аргументом %s"
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "one of the arguments %s is required"
-msgstr "један од аргумената %s је обавезан"
-
-#: ../fdroidserver/common.py ../fdroidserver/index.py
-msgid "only accepts strings, lists, and tuples"
-msgstr "прихвата само стрингове, листе и тапл"
-
-#: /usr/lib/python3.11/argparse.py
-msgid "options"
-msgstr "опције"
-
-#: ../fdroidserver/nightly.py
-#, python-brace-format
-msgid "overwriting existing {path}"
-msgstr "преписивање постојећег {path}"
-
-#: /usr/lib/python3.11/argparse.py
-msgid "positional arguments"
-msgstr "позициони аргументи"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "process log deploy {path} to {dest} failed!"
-msgstr "процес лог распоређивање {path} у {dest} није успело!"
-
-#: ../fdroidserver/build.py
-msgid "reference binary missing signature"
-msgstr "референтни бинарни фајл недостаје потпис"
-
-#: ../fdroidserver/signatures.py
-#, python-brace-format
-msgid "refuse downloading via insecure HTTP connection (use HTTPS or specify --no-https-check): {apkfilename}"
-msgstr "одбијам преузимање преко несигурне HTTP везе (користите HTTPS или наведите --no-https-check): {apkfilename}"
-
-#: ../fdroidserver/index.py
-#, python-format
-msgid "repo_icon \"repo/icons/%s\" does not exist, generating placeholder."
-msgstr "repo_icon \"repo/icons/%s\" не постоји, генерише се привремена икона."
-
-#: ../fdroidserver/common.py
-msgid "repo_url needs to end with /repo"
-msgstr "repo_url мора да се завршава са /repo"
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "rsync is missing or broken: {error}"
-msgstr "rsync недостаје или је покварен: {error}"
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "s3cmd sync indexes {path} to {url} and delete"
-msgstr "s3cmd синхронизује индексе {path} са {url} и брише"
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "s3cmd syncs indexes from {path} to {url} and deletes removed"
-msgstr "s3cmd синхронизује индексе из {path} у {url} и брише уклоњене"
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "scanner cache is malformed! You can clear it with: '{clear}'"
-msgstr "кеш скенера је неисправан! Можете га обрисати са: '{clear}'"
-
-#: ../fdroidserver/deploy.py
-msgid "serverwebroot: path does not end with \"fdroid\", perhaps you meant one of these:"
-msgstr "serverwebroot: путања се не завршава са \"fdroid\", можда сте мислили на једну од ових:"
-
-#: ../fdroidserver/scanner.py
-msgid "shared library"
-msgstr "дељена библиотека"
-
-#: /usr/lib/python3.11/argparse.py
-msgid "show this help message and exit"
-msgstr "прикажи ову поруку помоћи и изађи"
-
-#: ../fdroidserver/signatures.py
-msgid "signed APK, either a file-path or HTTPS URL."
-msgstr "потписан APK, или путања до фајла или HTTPS URL."
-
-#: ../fdroidserver/common.py
-msgid "skip deploying full build logs: log content is empty"
-msgstr "прескакање распоређивања комплетних логова изградње: садржај лога је празан"
-
-#: ../fdroidserver/common.py
-msgid "skip deploying full build logs: not enabled in config"
-msgstr "прескакање распоређивања комплетних логова изградње: није омогућено у конфигурацији"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "skipping source tarball: {path}"
-msgstr "прескакање изворног тарбала: {path}"
-
-#: ../fdroidserver/lint.py
-msgid "srclibs missing name and/or @"
-msgstr "srclibs недостаје име и/или @"
-
-#: ../fdroidserver/scanner.py
-msgid "static library"
-msgstr "статичка библиотека"
-
-#: ../fdroidserver/build.py
-#, python-brace-format
-msgid "supplied reference binary has allowed signer {signer}"
-msgstr "достављени референтни бинарни фајл има дозвољеног потписника {signer}"
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "the following arguments are required: %s"
-msgstr "следећи аргументи су обавезни: %s"
-
-#: ../fdroidserver/install.py
-msgid "true"
-msgstr "истина"
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "unexpected option string: %s"
-msgstr "неочекивана опција стринг: %s"
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "unknown parser %(parser_name)r (choices: %(choices)s)"
-msgstr "непознат парсер %(parser_name)r (избори: %(choices)s)"
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "unrecognized arguments: %s"
-msgstr "непрепознати аргументи: %s"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "unsafe permissions on '{config_file}' (should be 0600)!"
-msgstr "небезбедне дозволе на '{config_file}' (требало би да буду 0600)!"
-
-#: ../fdroidserver/__main__.py /usr/lib/python3.11/argparse.py
-msgid "usage: "
-msgstr "употреба: "
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "using Apache libcloud to sync with {url}"
-msgstr "користећи Apache libcloud за синхронизацију са {url}"
-
-#: ../fdroidserver/deploy.py
-msgid "virustotal.com is rate limiting, waiting to retry..."
-msgstr "virustotal.com ограничава брзину, чекање на поновни покушај..."
-
-#: ../fdroidserver/install.py
-msgid "yes"
-msgstr "да"
-
-#: ../fdroidserver/publish.py
-#, python-brace-format
-msgid "{0} app, {1} key aliases"
-msgid_plural "{0} apps, {1} key aliases"
-msgstr[0] "{0} апликација, {1} кључних алијаса"
-msgstr[1] "{0} апликације, {1} кључних алијаса"
-msgstr[2] "{0} апликација, {1} кључних алијаса"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{apkfilename} ({appid}) has no metadata!"
-msgstr "{apkfilename} ({appid}) нема метаподатке!"
-
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{apkfilename}'s AndroidManifest.xml has a bad date: "
-msgstr "{apkfilename}'s AndroidManifest.xml има лош датум: "
-
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{appid} does not have a name! Using application ID instead."
-msgstr "{appid} нема име! Користи се ID апликације уместо тога."
-
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{appid} from {path} is not a valid Android application ID!"
-msgstr "{appid} из {path} није важећи Android ID апликације!"
-
-#: ../fdroidserver/metadata.py ../fdroidserver/update.py
-#, python-brace-format
-msgid "{appid} from {path} is not a valid Java Package Name!"
-msgstr "{appid} из {path} није важеће име Java пакета!"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{appid} has both APKs and files: {files}"
-msgstr "{appid} има и APK-ове и фајлове: {files}"
-
-#: ../fdroidserver/mirror.py
-#, python-brace-format
-msgid "{appid} is missing {name}"
-msgstr "{appid} недостаје {name}"
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "{appid}: Unknown extlib {path} in build '{versionName}'"
-msgstr "{appid}: Непознати extlib {path} у изградњи '{versionName}'"
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "{appid}: no builds specified, running on current source state"
-msgstr "{appid}: нису наведене изградње, ради се на тренутном изворном стању"
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "{appid}: {field} must be a '{type}', but it is a '{fieldtype}!'"
-msgstr "{appid}: {field} мора бити '{type}', али је '{fieldtype}!'"
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "{appid}: {field} must be a '{type}', but it is a '{fieldtype}'!"
-msgstr "{appid}: {field} мора бити '{type}', али је '{fieldtype}'!"
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "{build_flag} must be an integer, found: {value}"
-msgstr "{build_flag} мора бити цео број, пронађено: {value}"
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "{build_flag} must be list or string, found: {value}"
-msgstr "{build_flag} мора бити листа или стринг, пронађено: {value}"
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "{file} is blank or corrupt!"
-msgstr "{file} је празан или оштећен!"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{name} \"{section}/icons/{path}\" does not exist! Check \"config.yml\"."
-msgstr "{name} \"{section}/icons/{path}\" не постоји! Проверите \"config.yml\"."
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{path1} is a duplicate of {path2}, remove one!"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
-#, python-brace-format
-msgid "{path} already exists, ignoring import results!"
-msgstr "{path} већ постоји, игноришем резултате увоза!"
-
-#: ../fdroidserver/nightly.py
-#, python-brace-format
-msgid "{path} does not exist!  Create it by running:"
-msgstr "{path} не постоји! Направите га покретањем:"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{path} has bad file signature \"{pattern}\", possible Janus exploit!"
-msgstr "{path} има лош потпис датотеке \"{pattern}\", могући Janus експлоат!"
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "{path} has been flagged by virustotal {count} times:"
-msgstr "{path} је означен од стране virustotal {count} пута:"
-
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "{path} has the wrong fingerprint ({fingerprint})!"
-msgstr "{path} има погрешан отисак прста ({fingerprint})!"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "{path} is not \"key: value\" dict, but a {datatype}!"
-msgstr "{path} није \"кључ: вредност\" речник, већ {datatype}!"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "{path} is not a standard config file!"
-msgstr "{path} није стандардни конфигурациони фајл!"
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "{path} is not list, but a {datatype}!"
-msgstr "{path} није листа, већ {datatype}!"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "{path} is not {expected_type}, but a {datatype}!"
-msgstr "{path} није {expected_type}, већ {datatype}!"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{path} is zero size!"
-msgstr "{path} је нулте величине!"
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "{path} more than 200MB, manually upload: {url}"
-msgstr "{path} је већи од 200MB, ручно отпремите: {url}"
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "{path}: \"{code}\" is not a valid ISO_3166-1 alpha-2 country code!"
-msgstr "{path}: \"{code}\" није важећи ISO_3166-1 alpha-2 код државе!"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{path}: {error}"
-msgstr "{path}: {error}"
-
-#: ../fdroidserver/mirror.py
-#, python-brace-format
-msgid "{url} does not end with \"fdroid\", check the URL path!"
-msgstr "{url} се не завршава са \"fdroid\", проверите URL путању!"
-
-#: ../fdroidserver/import_subcommand.py
-#, python-brace-format
-msgid "{url} does not start with \"http\"!"
-msgstr "{url} не почиње са \"http\"!"
-
-#: ../fdroidserver/build.py
-msgid "{} build failed"
-msgid_plural "{} builds failed"
-msgstr[0] "{} изградња није успела"
-msgstr[1] "{} изградње нису успеле"
-msgstr[2] "{} изградњи није успело"
-
-#: ../fdroidserver/build.py
-msgid "{} build succeeded"
-msgid_plural "{} builds succeeded"
-msgstr[0] "{} изградња је успела"
-msgstr[1] "{} изградње су успеле"
-msgstr[2] "{} изградњи је успело"
diff --git a/locale/sv/LC_MESSAGES/fdroidserver.po b/locale/sv/LC_MESSAGES/fdroidserver.po
index a0928312..d3e6bac7 100644
--- a/locale/sv/LC_MESSAGES/fdroidserver.po
+++ b/locale/sv/LC_MESSAGES/fdroidserver.po
@@ -1,33 +1,42 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
 # Hans-Christoph Steiner <hans@guardianproject.info>, 2020.
-# Elias Mårtenson <elias@dhsdevelopments.com>, 2021.
-# Joel A <joeax910@student.liu.se>, 2021.
-# Kristoffer Grundström <swedishsailfishosuser@tutanota.com>, 2021, 2024, 2025.
-# "P.O" <rasmusson.mikael@protonmail.com>, 2023.
-# Marcus skoding <ggd7cnc9m@mozmail.com>, 2025.
 msgid ""
 msgstr ""
 "Project-Id-Version: fdroidserver 1.0.0-95-gd7af22b\n"
 "Report-Msgid-Bugs-To: https://gitlab.com/fdroid/fdroidserver/issues\n"
-"POT-Creation-Date: 2025-06-25 09:52+0200\n"
-"PO-Revision-Date: 2025-03-17 21:44+0000\n"
-"Last-Translator: Kristoffer Grundström <swedishsailfishosuser@tutanota.com>\n"
+"POT-Creation-Date: 2020-10-21 18:05+0200\n"
+"PO-Revision-Date: 2020-11-10 16:21+0000\n"
+"Last-Translator: Hans-Christoph Steiner <hans@guardianproject.info>\n"
 "Language-Team: Swedish <https://hosted.weblate.org/projects/f-droid/fdroidserver/sv/>\n"
 "Language: sv\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 5.11-dev\n"
+"X-Generator: Weblate 4.4-dev\n"
+
+#: ../fdroidserver/common.py
+msgid ""
+"\n"
+"        This is a repository of apps to be used with FDroid. Applications in this\n"
+"        repository are either official binaries built by the original application\n"
+"        developers, or are binaries built from source by f-droid.org using the\n"
+"        tools on https://gitlab.com/fdroid.\n"
+"        "
+msgstr ""
+
+#: ../fdroidserver/nightly.py
+msgid ""
+"\n"
+"SSH Public Key to be used as Deploy Key:"
+msgstr ""
 
 #: ../fdroidserver/nightly.py
 msgid ""
 "\n"
 "SSH public key to be used as deploy key:"
 msgstr ""
-"\n"
-"Offentlig SSH-nyckel som ska användas som distributionsnyckel:"
 
 #: ../fdroidserver/nightly.py
 #, python-brace-format
@@ -35,121 +44,150 @@ msgid ""
 "\n"
 "{path} encoded for the DEBUG_KEYSTORE secret variable:"
 msgstr ""
-"\n"
-"{path} kodad för den hemliga variabeln DEBUG_KEYSTORE:"
 
 #: ../fdroidserver/lint.py
 #, python-format
 msgid "\"%s/\" has no matching metadata file!"
-msgstr "\"%s/\" har ingen matchande meta-datafil!"
-
-#: ../fdroidserver/index.py
-msgid "\"isPrimary\" key should not be added to mirrors!"
 msgstr ""
 
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "\"local_copy_dir\" {path} does not exist!"
-msgstr "\"local_copy_dir\" {path} finns inte!"
-
 #: ../fdroidserver/install.py
-#, python-brace-format
+#, fuzzy, python-brace-format
 msgid "\"{apkfilename}\" is already installed on {dev}."
-msgstr "'{apkfilename}' är redan installerad i {dev}."
+msgstr "'{apkfilename}' är redan installerad på {dev}."
+
+#: ../fdroidserver/update.py
+#, python-brace-format
+msgid "\"{path}\" contains outdated {name} ({version})"
+msgstr ""
 
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "\"{path}\" contains recent {name} ({version})"
-msgstr "\"{path}\" innehåller senaste {name} ({version})"
+msgstr ""
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "\"{path}\" exists but s3cmd is not installed!"
-msgstr "\"{path}\" existerar, men s3cmd är inte installerat!"
+msgstr ""
 
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "\"{path}\" is not a supported file format (use: metadata/*.yml)"
-msgstr "\"{path}\" är inte ett filformat som stöds (använd: metadata/*.yml)"
+msgstr ""
 
-#: ../fdroidserver/update.py
+#: ../fdroidserver/metadata.py
 #, python-brace-format
-msgid "\"{path}\" is signed by a key that is not allowed:"
-msgstr "\"{path}\" är signerad av en nyckel som inte är tillåten:"
+msgid "\"{path}\" is not an accepted format, convert to: {formats}"
+msgstr ""
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/common.py
 #, python-brace-format
 msgid "\"{url}\" is not a valid URL!"
-msgstr "\"{url}\" är inte en giltig URL!"
+msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, python-format
+msgid "%(option)s option requires %(number)d argument"
+msgid_plural "%(option)s option requires %(number)d arguments"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../fdroidserver/mirror.py
+#, python-format
+msgid "%(prog)s [options] url"
+msgstr ""
+
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "%(prog)s: error: %(message)s\n"
 msgstr "%(prog)s: fel: %(message)s\n"
 
-#: ../fdroidserver/publish.py
-#, python-format
-msgid "%d APKs failed to be signed or verified!"
-msgstr "%d APK:er kunde inte signeras eller verifieras!"
-
 #: ../fdroidserver/scanner.py
 #, python-format
 msgid "%d problems found"
 msgstr "%d problem hittades"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "%prog [options]"
+msgstr "%prog [alternativ]"
+
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "%r is not callable"
 msgstr "%r kan inte kallas"
 
-#: ../fdroidserver/signindex.py
-#, python-format
-msgid "%s did not produce a dict!"
-msgstr "%s producerade inte en dict!"
-
-#: ../fdroidserver/signindex.py
-#, python-format
-msgid "%s has bad SHA-256: %s"
-msgstr "%s har felaktig SHA-256: %s"
-
 #: ../fdroidserver/lint.py
 #, python-format
 msgid "%s is not an accepted build field"
 msgstr "%s är inte ett acceptabelt byggnationsfält"
 
-#: ../fdroidserver/common.py
-msgid "'keypass' not found in config.yml!"
-msgstr "'keypass' hittades inte i config.yml!"
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, python-format
+msgid "%s option does not take a value"
+msgstr ""
+
+#: ../fdroidserver/index.py ../fdroidserver/common.py
+msgid "'keypass' not found in config.py!"
+msgstr ""
 
 #: ../fdroidserver/common.py
 msgid "'keystore' is NONE and 'smartcardoptions' is blank!"
-msgstr "'keystore' är NONE och 'smartcardoptions' är tomt!"
+msgstr ""
 
-#: ../fdroidserver/common.py
-msgid "'keystore' not found in config.yml!"
-msgstr "'keystore' hittades inte i config.yml!"
+#: ../fdroidserver/index.py ../fdroidserver/common.py
+msgid "'keystore' not found in config.py!"
+msgstr ""
 
-#: ../fdroidserver/common.py
-msgid "'keystorepass' not found in config.yml!"
-msgstr "'keystorepass' hittades inte i config.yml!"
+#: ../fdroidserver/index.py ../fdroidserver/common.py
+msgid "'keystorepass' not found in config.py!"
+msgstr ""
 
-#: ../fdroidserver/common.py
-msgid "'repo_keyalias' not found in config.yml!"
-msgstr "'repo_keyalias' hittades inte i config.yml!"
+#: ../fdroidserver/index.py ../fdroidserver/common.py
+msgid "'repo_keyalias' not found in config.py!"
+msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "'required' is an invalid argument for positionals"
 msgstr ""
 
 #: ../fdroidserver/common.py
-msgid "'sdk_path' not set in config.yml!"
-msgstr "'sdk_path' är inte inställt i config.yml!"
+msgid "'sdk_path' not set in 'config.py'!"
+msgstr ""
+
+#. Translators: "build-tools" is the file name of a package from
+#. Google, it is part of the Android SDK. So it probably shouldn't be
+#. translated or transliterated.
+#: ../fdroidserver/common.py
+#, python-brace-format
+msgid "'{aapt}' is too old, fdroid requires build-tools-23.0.0 or newer!"
+msgstr "{aapt} är för gammal, fdroid kräver build-tools-23.0.0 eller nyare!"
 
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "'{aapt}' is too old, fdroid requires build-tools-{version} or newer!"
 msgstr "{aapt} är för gammal, fdroid kräver build-tools-{version} eller nyare!"
 
+#: ../fdroidserver/install.py
+#, python-brace-format
+msgid "'{apkfilename}' is already installed on {dev}."
+msgstr "'{apkfilename}' är redan installerad på {dev}."
+
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "'{field}' in {linedesc} is obsolete, see docs for current fields:"
+msgstr ""
+
+#: ../fdroidserver/common.py
+#, python-brace-format
+msgid "'{field}' will be in random order! Use () or [] brackets if order is important!"
+msgstr ""
+
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "'{path}' failed to execute!"
@@ -157,49 +195,39 @@ msgstr "Misslyckades med att köra '{path}'!"
 
 #: ../fdroidserver/metadata.py
 #, python-brace-format
-msgid "'{path}' has invalid format, it should be a dictionary!"
-msgstr ""
-
-#: ../fdroidserver/lint.py ../fdroidserver/metadata.py
-#, python-brace-format
 msgid "'{value}' is not a valid {field} in {appid}. Regex pattern: {pattern}"
 msgstr "'{value}' är inte ett giltigt {field} i {appid}. Regex-mönster: {pattern}"
 
-#: ../fdroidserver/metadata.py
-#, fuzzy, python-brace-format
-msgid "'{value}' is not a valid {field}, should be {pattern}"
-msgstr "'{value}' är inte ett giltigt {field} i {appid}. Regex-mönster: {pattern}"
-
-#: ../fdroidserver/checkupdates.py
-msgid "--merge-request only runs on a single appid!"
-msgstr ""
-
 #: ../fdroidserver/checkupdates.py
 #, python-brace-format
 msgid "...checkupdate failed for {appid} : {error}"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid ".__call__() not defined"
 msgstr ".__call__() angavs inte"
 
+#: ../fdroidserver/metadata.py
+msgid ".fdroid.txt is not supported!  Convert to .fdroid.yml or .fdroid.json."
+msgstr ""
+
 #: ../fdroidserver/lint.py
 msgid "/issues is missing"
 msgstr "/issues saknas"
 
 #: ../fdroidserver/mirror.py
 msgid "A URL is required as an argument!"
-msgstr "En URL krävs som ett argument!"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "APK signatures have different certificates in {path}:"
 msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Add PGP signatures using GnuPG for packages in repo"
 msgstr ""
 
+#: ../fdroid ../fdroidserver/__main__.py
+msgid "Add a new application from its source code"
+msgstr "Lägg till en ny applikation från dess källkod"
+
 #: ../fdroidserver/update.py
 msgid "Add a repo signing key to an unsigned repo"
 msgstr ""
@@ -217,11 +245,7 @@ msgstr ""
 msgid "Alias of the repo signing key in the keystore"
 msgstr ""
 
-#: ../fdroidserver/build.py
-msgid "AllowedAPKSigningKeys missing but reference binary supplied"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "Allows a different revision (or git branch) to be specified for the initial import"
 msgstr ""
 
@@ -235,19 +259,23 @@ msgstr ""
 
 #: ../fdroidserver/scanner.py
 msgid "Android AAR library"
-msgstr "AAR-bibliotek för Android"
+msgstr ""
 
 #: ../fdroidserver/scanner.py
 msgid "Android APK file"
-msgstr "Android APK-fil"
+msgstr ""
 
 #: ../fdroidserver/scanner.py
 msgid "Android DEX code"
-msgstr "DEX-kod för Android"
+msgstr ""
 
-#: ../fdroidserver/init.py
+#: ../fdroidserver/common.py ../fdroidserver/build.py
 #, python-brace-format
-msgid "Android SDK not found at {path}!"
+msgid "Android SDK '{path}' does not have '{dirname}' installed!"
+msgstr ""
+
+#: ../fdroidserver/common.py
+msgid "Android SDK not found!"
 msgstr ""
 
 #: ../fdroidserver/common.py
@@ -260,17 +288,16 @@ msgstr ""
 msgid "Android SDK path '{path}' is not a directory!"
 msgstr ""
 
+#. Translators: "build-tools" is the file name of a package from
+#. Google, it is part of the Android SDK. So it probably shouldn't be
+#. translated or transliterated.
 #: ../fdroidserver/common.py
 #, python-brace-format
-msgid "Android SDK tool {cmd} not found!"
+msgid "Android build-tools path '{path}' does not exist!"
 msgstr ""
 
-#: ../fdroidserver/lint.py
-msgid "App has Binaries but does not have corresponding AllowedAPKSigningKeys to pin certificate."
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "App has NoSourceSince or ArchivePolicy \"0 versions\" or 0 but AutoUpdateMode or UpdateCheckMode are not None"
+#: ../fdroidserver/update.py
+msgid "AndroidManifest.xml has no date"
 msgstr ""
 
 #: ../fdroidserver/lint.py
@@ -278,10 +305,6 @@ msgstr ""
 msgid "App is in '{repo}' but has a link to {url}"
 msgstr ""
 
-#: ../fdroidserver/lint.py
-msgid "App version has binary but does not have corresponding AllowedAPKSigningKeys to pin certificate."
-msgstr ""
-
 #: ../fdroidserver/lint.py
 msgid "Appending .git is not necessary"
 msgstr ""
@@ -291,27 +314,11 @@ msgstr ""
 msgid "Archiving {apkfilename} with invalid signature!"
 msgstr ""
 
-#: ../fdroidserver/lint.py
-msgid "AutoUpdateMode with UpdateCheckMode: HTTP must have a pattern."
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "Automatic no to all prompts."
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "Automatic yes to all prompts."
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "Bad entry type \"{mirrortype}\" in mirrors config: {mirror}"
-msgstr ""
-
 #: ../fdroidserver/mirror.py
 msgid "Base URL to mirror, can include the index signing key using the query string: ?fingerprint="
 msgstr ""
 
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "Branch '{branch}' used as commit in build '{versionName}'"
@@ -325,9 +332,9 @@ msgstr ""
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Broken symlink: {path}"
-msgstr "Trasig symlink: {path}"
+msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Build a package from source"
 msgstr "Bygg ett paket från källa"
 
@@ -347,48 +354,57 @@ msgstr ""
 msgid "Build only the latest version of each package"
 msgstr ""
 
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Build should have comma-separated versionName and versionCode, not \"{value}\", in {linedesc}"
+msgstr ""
+
 #: ../fdroidserver/init.py
 #, python-format
 msgid "Built repo based in \"%s\" with this config:"
 msgstr ""
 
-#: ../fdroidserver/checkupdates.py
-msgid "Can't auto-update app with no CurrentVersionCode"
-msgstr ""
-
 #: ../fdroidserver/build.py
 msgid "Can't build due to {} error while scanning"
 msgid_plural "Can't build due to {} errors while scanning"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../fdroidserver/common.py
-#, fuzzy, python-brace-format
-msgid "Cannot read {path}: {error}"
-msgstr "{path}: {error}"
+#: ../fdroidserver/vmtools.py
+#, python-brace-format
+msgid "Cannot read \"{path}\"!"
+msgstr ""
+
+#. Translators: https://developer.android.com/studio/build/application-id
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Cannot resolve application ID {appid}"
+msgstr ""
 
 #: ../fdroidserver/rewritemeta.py
 #, python-brace-format
 msgid "Cannot rewrite \"{path}\""
-msgstr "Kan inte skriva om \"{path}\""
+msgstr ""
+
+#: ../fdroidserver/rewritemeta.py
+msgid "Cannot use --list and --to at the same time"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Cannot write \"{path}\", not an accepted format, use: {formats}"
+msgstr ""
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
 #: ../fdroidserver/lint.py
 #, python-format
 msgid "Categories '%s' is not valid"
 msgstr ""
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
 #: ../fdroidserver/lint.py
 msgid "Categories are not set"
 msgstr ""
 
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "Category \"{category}\" defined but not used for any apps!"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Check for updates to applications"
 msgstr "Kontrollera efter uppdateringar av appar"
 
@@ -397,34 +413,33 @@ msgstr "Kontrollera efter uppdateringar av appar"
 msgid "Checking archiving for {appid} - apks:{integer}, keepversions:{keep}, archapks:{arch}"
 msgstr ""
 
+#: ../fdroidserver/dscanner.py
+msgid "Clean after all scans have finished"
+msgstr ""
+
+#: ../fdroidserver/dscanner.py
+msgid "Clean before the scans start and rebuild the container"
+msgstr ""
+
+#: ../fdroidserver/dscanner.py
+msgid "Clean up all containers and then exit"
+msgstr ""
+
 #: ../fdroidserver/update.py
 msgid "Clean update - don't uses caches, reprocess all APKs"
 msgstr ""
 
-#: ../fdroidserver/common.py
-msgid "Color the log output"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "Comma separated list of categories."
 msgstr ""
 
-#: ../fdroidserver/__main__.py
-#, python-format
+#: ../fdroid ../fdroidserver/__main__.py
+#, c-format, python-format
 msgid "Command '%s' not recognised.\n"
 msgstr "Kommandot '%s' känns inte igen.\n"
 
 #: ../fdroidserver/checkupdates.py
 msgid "Commit changes"
-msgstr "Skicka in ändringar"
-
-#: ../fdroidserver/checkupdates.py
-msgid "Commit changes, push, then make a merge request"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Conflicting \"{field}\" definitions between .yml and localized files:"
 msgstr ""
 
 #: ../fdroidserver/__main__.py
@@ -436,13 +451,11 @@ msgstr ""
 msgid "Could not find '{command}' on your system"
 msgstr ""
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "Could not find latest version code"
 msgstr ""
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "Could not find latest version name"
 msgstr ""
 
@@ -452,8 +465,7 @@ msgid "Could not find {path} to remove it"
 msgstr ""
 
 #: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Could not open APK {path} for analysis: "
+msgid "Could not open apk file for analysis"
 msgstr ""
 
 #: ../fdroidserver/common.py
@@ -461,43 +473,52 @@ msgstr ""
 msgid "Could not parse size \"{size}\", wrong type \"{type}\""
 msgstr ""
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/import_subcommand.py
+#. Translators: https://developer.android.com/studio/build/application-id
+#: ../fdroidserver/import.py
 msgid "Couldn't find Application ID"
 msgstr ""
 
-#: ../fdroidserver/checkupdates.py
-msgid "Couldn't find any version information"
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
+#: ../fdroidserver/import.py
+msgid "Couldn't find latest version code"
 msgstr ""
 
-#: ../fdroidserver/checkupdates.py
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
+#: ../fdroidserver/import.py
+msgid "Couldn't find latest version name"
+msgstr ""
+
+#: ../fdroidserver/import.py
 msgid "Couldn't find package ID"
-msgstr "Kunde inte hitta paketets ID"
+msgstr ""
 
 #: ../fdroidserver/update.py
 msgid "Cowardily refusing to overwrite existing signing key setup!"
 msgstr ""
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/update.py
+msgid "Create a repo signing key in a keystore"
+msgstr ""
+
+#: ../fdroidserver/update.py
+msgid "Create skeleton metadata files that are missing"
+msgstr "Skapa skelettmetadatafiler som saknas"
+
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Created new container \"{name}\""
 msgstr ""
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Creating \"{path}\" for configuring s3cmd."
 msgstr ""
 
-#: ../fdroidserver/common.py
-#, fuzzy, python-brace-format
-msgid "Creating empty {config_file}"
-msgstr "Läser '{config_file}'"
-
 #: ../fdroidserver/publish.py
 msgid "Creating log directory"
 msgstr ""
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Creating new S3 bucket: {url}"
 msgstr ""
@@ -510,7 +531,8 @@ msgstr ""
 msgid "Creating signed index with this key (SHA256):"
 msgstr ""
 
-#: ../fdroidserver/publish.py ../fdroidserver/verify.py
+#: ../fdroidserver/import.py ../fdroidserver/verify.py
+#: ../fdroidserver/publish.py
 msgid "Creating temporary directory"
 msgstr ""
 
@@ -544,7 +566,7 @@ msgstr ""
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Deleting unknown file: {path}"
-msgstr "Tar bort okänd fil: {path}"
+msgstr ""
 
 #: ../fdroidserver/lint.py
 #, python-format
@@ -556,21 +578,16 @@ msgid "Description has a duplicate line"
 msgstr ""
 
 #: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Description of length {length} is over the {limit} char limit"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Did you mean config/{name}.yml?"
+#, python-format
+msgid "Description has a list (%s) but it isn't bulleted (*) nor numbered (#)"
 msgstr ""
 
 #: ../fdroidserver/lint.py
 #, python-brace-format
-msgid "Did you mean {code}?"
+msgid "Description of length {length} is over the {limit} char limit"
 msgstr ""
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "Do not add 'disable:' to the generated build entries"
 msgstr ""
 
@@ -595,20 +612,25 @@ msgstr ""
 msgid "Don't create a source tarball, useful when testing a build"
 msgstr ""
 
+#: ../fdroidserver/stats.py
+msgid "Don't do anything logs-related"
+msgstr ""
+
 #: ../fdroidserver/build.py
 msgid "Don't refresh the repository, useful when testing a build with no internet connection"
 msgstr ""
 
 #: ../fdroidserver/deploy.py ../fdroidserver/nightly.py
+#: ../fdroidserver/upload.py
 msgid "Don't use rsync checksums"
 msgstr ""
 
-#: ../fdroidserver/install.py
-msgid "Download F-Droid.apk using mirrors that leak less to the network"
+#: ../fdroid ../fdroidserver/__main__.py
+msgid "Download complete mirrors of small repos"
 msgstr ""
 
-#: ../fdroidserver/__main__.py
-msgid "Download complete mirrors of small repos"
+#: ../fdroidserver/stats.py
+msgid "Download logs we don't have"
 msgstr ""
 
 #: ../fdroidserver/common.py
@@ -622,12 +644,7 @@ msgstr ""
 
 #: ../fdroidserver/metadata.py
 #, python-brace-format
-msgid "Duplicate Anti-Feature declaration at {path} was ignored!"
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-format
-msgid "Duplicate entry \"%s\" in mirrors config!"
+msgid "Duplicate build recipe found for versionCode {versionCode} in {linedesc}"
 msgstr ""
 
 #: ../fdroidserver/lint.py
@@ -635,42 +652,27 @@ msgstr ""
 msgid "Duplicate link in '{field}': {url}"
 msgstr ""
 
-#: ../fdroidserver/common.py
-#, python-format
-msgid "ERROR: %(message)s"
-msgstr "FEL: %(message)s"
+#: ../fdroid
+msgid "Dynamically scan APKs post build"
+msgstr ""
 
 #: ../fdroidserver/__main__.py
 msgid "ERROR: The \"server\" subcommand has been removed, use \"deploy\"!"
 msgstr ""
 
+#: ../fdroidserver/mirror.py
+msgid ""
+"ERROR: this command should never be used to mirror f-droid.org!\n"
+"A full mirror of f-droid.org requires more than 200GB."
+msgstr ""
+
 #: ../fdroidserver/nightly.py
 msgid "ERROR: unsupported CI type, patches welcome!"
 msgstr ""
 
-#: ../fdroidserver/nightly.py
-#, python-format
-msgid "ERROR: unsupported git host \"%s\", patches welcome!"
-msgstr ""
-
-#: ../fdroidserver/lint.py
+#: ../fdroidserver/metadata.py
 #, python-brace-format
-msgid "ERROR: {key} in {path} is not \"archive\" or \"repo\"!"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "ERROR: {key} not a valid key!"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "ERROR: {key}'s value should be of type {t}!"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "ERROR: {key}:{subkey} in {path} is not in allowed keys: {allowed_keys}!"
+msgid "Empty build flag at {linedesc}"
 msgstr ""
 
 #: ../fdroidserver/__main__.py
@@ -685,38 +687,18 @@ msgid ""
 "> "
 msgstr ""
 
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Environment variable {var} from {configname} is not set!"
+#: ../fdroidserver/deploy.py ../fdroidserver/checkupdates.py
+#: ../fdroidserver/upload.py
+#, python-format
+msgid "Error while attempting to publish log: %s"
 msgstr ""
 
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Environment variable {{env: {var}}} is not set!"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "Error deploying 'github_releases', {} not present. (You might need to run `fdroid update` first.)"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py ../fdroidserver/common.py
 msgid "Error while getting repo address"
 msgstr ""
 
-#: ../fdroidserver/scanner.py
-msgid "Exit with a non-zero code if problems were found"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Extract application metadata from a source repository"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Extract signatures from APKs"
-msgstr "Extrahera signaturer från APK:er"
-
-#: ../fdroidserver/install.py
-msgid "F-Droid.apk could not be downloaded from any known source!"
 msgstr ""
 
 #: ../fdroidserver/update.py
@@ -739,23 +721,27 @@ msgstr ""
 msgid "Failed resizing {path}: {error}"
 msgstr ""
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/publish.py
+msgid "Failed to align application"
+msgstr ""
+
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Failed to create S3 bucket: {url}"
 msgstr ""
 
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Failed to get APK information, deleting {path}"
+#: ../fdroidserver/common.py
+msgid "Failed to get APK manifest information"
 msgstr ""
 
 #: ../fdroidserver/update.py
 #, python-brace-format
-msgid "Failed to get APK information, skipping {path}"
+msgid "Failed to get apk information, deleting {path}"
 msgstr ""
 
 #: ../fdroidserver/update.py
-msgid "Failed to get APK signing key fingerprint"
+#, python-brace-format
+msgid "Failed to get apk information, skipping {path}"
 msgstr ""
 
 #: ../fdroidserver/install.py
@@ -763,10 +749,14 @@ msgstr ""
 msgid "Failed to install '{apkfilename}' on {dev}: {error}"
 msgstr ""
 
-#: ../fdroidserver/common.py
+#: ../fdroidserver/publish.py ../fdroidserver/common.py
 msgid "Failed to sign application"
 msgstr ""
 
+#: ../fdroidserver/common.py
+msgid "Failed to zipalign application"
+msgstr ""
+
 #: ../fdroidserver/build.py
 #, python-brace-format
 msgid "Fetched buildserverid from VM: {buildserverid}"
@@ -782,15 +772,24 @@ msgstr ""
 msgid "File disappeared while processing it: {path}"
 msgstr ""
 
-#: ../fdroidserver/build.py ../fdroidserver/install.py
-#: ../fdroidserver/rewritemeta.py ../fdroidserver/scanner.py
-#: ../fdroidserver/update.py
+#: ../fdroidserver/verify.py ../fdroidserver/stats.py ../fdroidserver/update.py
+#: ../fdroidserver/rewritemeta.py ../fdroidserver/build.py
+#: ../fdroidserver/checkupdates.py ../fdroidserver/scanner.py
+#: ../fdroidserver/install.py
 msgid "Finished"
 msgstr ""
 
+#: ../fdroidserver/lint.py
+msgid "Flattr donation methods belong in the FlattrID flag"
+msgstr ""
+
+#: ../fdroidserver/lint.py
+msgid "Flattr donation methods belong in the FlattrID: field"
+msgstr ""
+
 #: ../fdroidserver/lint.py
 msgid "Forbidden HTML tags"
-msgstr "Förbjudna HTML-taggar"
+msgstr ""
 
 #: ../fdroidserver/build.py
 msgid "Force build of disabled apps, and carries on regardless of scan problems. Only allowed in test mode."
@@ -819,6 +818,7 @@ msgstr ""
 msgid "Found invalid appids in arguments"
 msgstr ""
 
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
 #: ../fdroidserver/common.py
 msgid "Found invalid versionCodes for some apps"
 msgstr ""
@@ -828,10 +828,6 @@ msgstr ""
 msgid "Found multiple JAR Signature Block Files in {path}"
 msgstr ""
 
-#: ../fdroidserver/common.py
-msgid "Found multiple Signer Certificates!"
-msgstr ""
-
 #: ../fdroidserver/metadata.py
 #, python-brace-format
 msgid "Found multiple metadata files for {appid}"
@@ -841,6 +837,11 @@ msgstr ""
 msgid "Found multiple signing certificates for repository."
 msgstr ""
 
+#: ../fdroidserver/update.py
+#, python-brace-format
+msgid "Found multiple signing certificates in {path}"
+msgstr ""
+
 #: ../fdroidserver/index.py
 msgid "Found no signing certificates for repository."
 msgstr ""
@@ -855,16 +856,6 @@ msgstr ""
 msgid "Found {apkfilename} at {url}"
 msgstr ""
 
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Found {count} problems in {filename}"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Found {count} warnings in {filename}"
-msgstr ""
-
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Generated skeleton metadata for {appid}"
@@ -883,21 +874,19 @@ msgstr ""
 msgid "Git fetch failed"
 msgstr ""
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
+#: ../fdroidserver/common.py
+msgid "Git remote set-head failed"
+msgstr ""
+
 #: ../fdroidserver/common.py
 #, python-format
 msgid "Git remote set-head failed: \"%s\""
 msgstr ""
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
 #: ../fdroidserver/common.py
 msgid "Git reset failed"
 msgstr ""
 
-#: ../fdroidserver/common.py
-msgid "Git submodule deinit failed"
-msgstr ""
-
 #: ../fdroidserver/common.py
 msgid "Git submodule sync failed"
 msgstr ""
@@ -929,16 +918,6 @@ msgstr ""
 msgid "Ignoring FUNDING.yml entry longer than 2048: %s"
 msgstr ""
 
-#: ../fdroidserver/update.py
-#, python-format
-msgid "Ignoring bad element in manifest: %s"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Ignoring deprecated {oldfile}, use {newfile}!"
-msgstr ""
-
 #: ../fdroidserver/index.py
 msgid "Ignoring package without metadata: "
 msgstr ""
@@ -948,6 +927,11 @@ msgstr ""
 msgid "Ignoring stale cache data for {apkfilename}"
 msgstr ""
 
+#: ../fdroidserver/rewritemeta.py
+#, python-brace-format
+msgid "Ignoring {ext} file at '{path}'"
+msgstr ""
+
 #: ../fdroidserver/update.py
 msgid "Include APKs that are signed with disabled algorithms like MD5"
 msgstr ""
@@ -964,16 +948,6 @@ msgstr ""
 msgid "Include the source tarballs in the mirror"
 msgstr ""
 
-#: ../fdroidserver/metadata.py
-#, python-format
-msgid "Including metadata from %s@%s"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Including metadata from {path}"
-msgstr ""
-
 #: ../fdroidserver/common.py
 msgid "Initialising submodules"
 msgstr ""
@@ -982,58 +956,85 @@ msgstr ""
 msgid "Install all signed applications available"
 msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Install built packages on devices"
 msgstr "Installera byggda paket på enheter"
 
 #: ../fdroidserver/install.py
 #, python-format
 msgid "Installing %s..."
-msgstr "Installerar %s..."
+msgstr ""
+
+#: ../fdroidserver/install.py
+#, python-format
+msgid "Installing %s…"
+msgstr ""
 
 #: ../fdroidserver/install.py
 #, python-brace-format
 msgid "Installing '{apkfilename}' on {dev}..."
 msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroidserver/install.py
+#, python-brace-format
+msgid "Installing '{apkfilename}' on {dev}…"
+msgstr ""
+
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Interact with the repo HTTP server"
 msgstr "Interagera med förrådets HTTP-servern"
 
 #: ../fdroidserver/update.py
 msgid "Invalid APK"
-msgstr "Ogiltig APK"
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "Invalid AutoUpdateMode: {mode}"
 msgstr ""
 
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "Invalid UpdateCheckMode: {mode}"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
+#: ../fdroidserver/lint.py ../fdroidserver/checkupdates.py
 #, python-brace-format
 msgid "Invalid VercodeOperation: {field}"
 msgstr ""
 
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Invalid VercodeOperation: {invalid_ops}"
-msgstr ""
-
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "Invalid application ID {appid}"
 msgstr ""
 
+#: ../fdroidserver/metadata.py
+#, python-format
+msgid "Invalid boolean '%s'"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Invalid build flag at {line} in {linedesc}"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Invalid build format: {value} in {name}"
+msgstr ""
+
 #: ../fdroidserver/lint.py
 msgid "Invalid bulleted list"
 msgstr ""
 
+#: ../fdroidserver/lint.py
+#, python-format
+msgid "Invalid license tag \"%s\"! Use only tags from https://spdx.org/license-list"
+msgstr ""
+
+#: ../fdroidserver/lint.py
+msgid "Invalid link - use [http://foo.bar Link title] or [http://foo.bar]"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+#, python-format
+msgid "Invalid metadata in %s:%d"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+msgid "Invalid metadata in: "
+msgstr ""
+
 #: ../fdroidserver/common.py
 #, python-format
 msgid "Invalid name for published file: %s"
@@ -1041,7 +1042,7 @@ msgstr ""
 
 #: ../fdroidserver/common.py
 #, python-brace-format
-msgid "Invalid ndk: entry in build: \"{ndk}\""
+msgid "Invalid package name {0}"
 msgstr ""
 
 #: ../fdroidserver/common.py
@@ -1064,6 +1065,11 @@ msgstr ""
 msgid "Invalid srclib metadata: unknown key '{key}' in '{file}'"
 msgstr ""
 
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Invalid versionCode: \"{versionCode}\" is not an integer!"
+msgstr ""
+
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "JAR signature failed to verify: {path}"
@@ -1076,10 +1082,10 @@ msgstr ""
 
 #: ../fdroidserver/scanner.py
 msgid "Java JAR file"
-msgstr "JAR-file för Java"
+msgstr ""
 
-#: ../fdroidserver/mirror.py ../fdroidserver/publish.py
-#: ../fdroidserver/update.py
+#: ../fdroidserver/publish.py ../fdroidserver/update.py
+#: ../fdroidserver/mirror.py
 msgid "Java JDK not found! Install in standard location or set java_paths!"
 msgstr ""
 
@@ -1095,19 +1101,10 @@ msgstr ""
 msgid "Javascript in HTML src attributes"
 msgstr ""
 
-#: ../fdroidserver/build.py
-#, python-brace-format
-msgid "Keeping failed build \"{apkfilename}\""
-msgstr ""
-
 #: ../fdroidserver/init.py
 msgid "Keystore for signing key:\t"
 msgstr ""
 
-#: ../fdroidserver/lint.py
-msgid "Known debug key is used in AllowedAPKSigningKeys: "
-msgstr ""
-
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "Last used commit '{commit}' looks like a tag, but UpdateCheckMode is '{ucm}'"
@@ -1117,8 +1114,12 @@ msgstr ""
 msgid "Liberapay donation methods belong in the Liberapay: field"
 msgstr ""
 
+#: ../fdroidserver/lint.py
+msgid "Liberapay donation methods belong in the LiberapayID flag"
+msgstr ""
+
 #: ../fdroidserver/rewritemeta.py
-msgid "List files that would be reformatted (dry run)"
+msgid "List files that would be reformatted"
 msgstr ""
 
 #: ../fdroidserver/lint.py
@@ -1137,16 +1138,6 @@ msgstr ""
 msgid "Malformed serverwebroot line:"
 msgstr ""
 
-#: ../fdroidserver/scanner.py
-#, python-format
-msgid "Max recursion depth in ZIP file reached: %s"
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "Mirror config for {url} contains \"isPrimary\" key!"
-msgstr ""
-
 #: ../fdroidserver/mirror.py
 msgid "Mirror the full repo and archive, all file types."
 msgstr ""
@@ -1155,29 +1146,30 @@ msgstr ""
 msgid "Missing output directory"
 msgstr ""
 
-#: ../fdroidserver/metadata.py
-msgid "Moving Anti-Features declarations to localized files:"
-msgstr ""
-
-#: ../fdroidserver/index.py
-msgid "Neither \"repo_pubkey\" nor \"keystorepass\" set in config.yml"
-msgstr ""
-
-#: ../fdroidserver/verify.py
+#: ../fdroidserver/lint.py
 #, python-format
-msgid "No APK for package: %s"
+msgid "Name '%s' is just the auto name - remove it"
+msgstr ""
+
+#: ../fdroidserver/common.py
+msgid "No 'config.py' found, using defaults."
 msgstr ""
 
 #: ../fdroidserver/common.py
 msgid "No Android SDK found!"
 msgstr ""
 
+#: ../fdroidserver/import.py
+msgid "No android or kivy project could be found. Specify --subdir?"
+msgstr ""
+
 #: ../fdroidserver/install.py
 msgid "No attached devices found"
 msgstr ""
 
-#: ../fdroidserver/install.py
-msgid "No devices found for `adb install`! Please plug one in."
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "No commit specified for {versionName} in {linedesc}"
 msgstr ""
 
 #: ../fdroidserver/index.py
@@ -1188,21 +1180,12 @@ msgstr ""
 msgid "No git submodules available"
 msgstr ""
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "No gradle project could be found. Specify --subdir?"
 msgstr ""
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py ../fdroidserver/common.py
 msgid "No information found."
-msgstr "Ingen information hittades."
-
-#: ../fdroidserver/checkupdates.py
-msgid "No matching tags found"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "No minimum SDK version found in {0}, using default (3)."
 msgstr ""
 
 #: ../fdroidserver/lint.py
@@ -1214,23 +1197,23 @@ msgid "No need to specify that the app is for Android"
 msgstr ""
 
 #: ../fdroidserver/deploy.py
-msgid "No option set! Edit your config.yml to set at least one of these:"
+msgid "No option set! Edit your config.py to set at least one of these:"
 msgstr ""
 
 #: ../fdroidserver/common.py
 msgid "No packages specified"
-msgstr "Inga paket angavs"
+msgstr ""
 
 #: ../fdroidserver/install.py
 #, python-format
-msgid "No signed APK available for %s"
+msgid "No signed apk available for %s"
 msgstr ""
 
 #: ../fdroidserver/install.py
 msgid "No signed output directory - nothing to do"
 msgstr ""
 
-#: ../fdroidserver/common.py
+#: ../fdroidserver/update.py ../fdroidserver/common.py
 #, python-brace-format
 msgid "No signing certificates found in {path}"
 msgstr ""
@@ -1240,30 +1223,23 @@ msgstr ""
 msgid "No such package: %s"
 msgstr ""
 
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "No such versionCode {versionCode} for app {appid}"
 msgstr ""
 
-#: ../fdroidserver/checkupdates.py
-msgid "No tags found"
-msgstr "Inga taggar hittades"
-
-#: ../fdroidserver/publish.py ../fdroidserver/verify.py
+#: ../fdroidserver/verify.py ../fdroidserver/publish.py
 msgid "No unsigned directory - nothing to do"
 msgstr ""
 
-#: ../fdroidserver/__main__.py
-msgid "No version information could be found."
-msgstr ""
-
 #: ../fdroidserver/common.py
 msgid "Not a valid size definition: \"{}\""
 msgstr ""
 
 #: ../fdroidserver/signindex.py
 msgid "Nothing to do"
-msgstr "Inget att göra"
+msgstr ""
 
 #: ../fdroidserver/checkupdates.py
 #, python-brace-format
@@ -1271,9 +1247,10 @@ msgid "Nothing to do for {appid}."
 msgstr ""
 
 #: ../fdroidserver/init.py
-msgid "Now set these in config.yml:"
+msgid "Now set these in config.py:"
 msgstr ""
 
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "OBB file has newer versionCode({integer}) than any APK:"
@@ -1291,27 +1268,22 @@ msgstr ""
 msgid "Offline machine, skipping git mirror generation until `fdroid deploy`"
 msgstr ""
 
-#: ../fdroidserver/deploy.py
-msgid "One of the 'github_releases' config items is missing the 'packageNames' value. skipping ..."
+#: ../fdroidserver/common.py
+#, python-brace-format
+msgid "Old APK signature failed to verify: {path}"
 msgstr ""
 
-#: ../fdroidserver/deploy.py
-msgid "One of the 'github_releases' config items is missing the 'projectUrl' value. skipping ..."
+#: ../fdroid ../fdroidserver/__main__.py
+msgid "Old, deprecated name for fdroid deploy"
 msgstr ""
 
-#: ../fdroidserver/deploy.py
-msgid "One of the 'github_releases' config items is missing the 'token' value. skipping ..."
-msgstr ""
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Only PNG and JPEG are supported for graphics, found: {path}"
 msgstr ""
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/common.py
-msgid "Only accepts a single key \"env\""
+#: ../fdroidserver/checkupdates.py
+msgid "Only print differences with the Play Store"
 msgstr ""
 
 #: ../fdroidserver/checkupdates.py
@@ -1322,6 +1294,11 @@ msgstr ""
 msgid "OpenCollective donation methods belong in the OpenCollective: field"
 msgstr ""
 
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "Options"
+msgstr "Alternativ"
+
 #: ../fdroidserver/verify.py
 msgid "Output JSON report to file named after APK."
 msgstr ""
@@ -1330,22 +1307,26 @@ msgstr ""
 msgid "Output JSON to stdout."
 msgstr ""
 
-#: ../fdroidserver/checkupdates.py ../fdroidserver/gpgsign.py
-#: ../fdroidserver/publish.py ../fdroidserver/signindex.py
-#: ../fdroidserver/update.py
+#: ../fdroidserver/gpgsign.py ../fdroidserver/publish.py
+#: ../fdroidserver/update.py ../fdroidserver/signindex.py
+#: ../fdroidserver/checkupdates.py
 msgid "Outputting JSON"
 msgstr ""
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "Overall license of the project."
 msgstr ""
 
+#: ../fdroidserver/dscanner.py
+msgid "Override path for repo APKs (default: ./repo)"
+msgstr ""
+
 #: ../fdroidserver/index.py
 #, python-brace-format
 msgid "Overriding blank versionName in {apkfilename} from metadata: {version}"
 msgstr ""
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 #, python-brace-format
 msgid "Package \"{appid}\" already exists"
 msgstr ""
@@ -1359,10 +1340,13 @@ msgstr ""
 msgid "Password required with username"
 msgstr ""
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "Path to main Android project subdirectory, if not in root."
 msgstr ""
 
+msgid "Path to main android project subdirectory, if not in root."
+msgstr ""
+
 #: ../fdroidserver/init.py
 msgid "Path to the Android SDK (sometimes set in ANDROID_HOME)"
 msgstr ""
@@ -1375,18 +1359,20 @@ msgstr ""
 msgid "Path to the keystore for the repo signing key"
 msgstr ""
 
+#: ../fdroidserver/dscanner.py
+msgid "Prepare Drozer to run a scan"
+msgstr ""
+
+msgid "Prepare drozer to run a scan"
+msgstr ""
+
 #: ../fdroidserver/nightly.py
 msgid "Print the secret variable to the terminal for easy copy/paste"
 msgstr ""
 
-#: ../fdroidserver/install.py
+#: ../fdroidserver/metadata.py
 #, python-brace-format
-msgid "Privacy mode was enabled based on your locale ({country_code})."
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-format
-msgid "Problem with ZIP file: %s, error %s"
+msgid "Problem with description of {appid}: {error}"
 msgstr ""
 
 #: ../fdroidserver/common.py
@@ -1406,13 +1392,17 @@ msgstr ""
 #: ../fdroidserver/checkupdates.py ../fdroidserver/scanner.py
 #, python-brace-format
 msgid "Processing {appid}"
-msgstr "Behandlar {appid}"
+msgstr ""
 
 #: ../fdroidserver/update.py
 msgid "Produce human-readable XML/JSON for index files"
 msgstr ""
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/update.py
+msgid "Produce human-readable index.xml"
+msgstr "Producera mänskligt läsbar index.xml"
+
+#: ../fdroidserver/import.py
 msgid "Project URL to import from."
 msgstr ""
 
@@ -1424,41 +1414,39 @@ msgstr ""
 msgid "Push the log to this git remote repository"
 msgstr ""
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Pushing binary transparency log to {url}"
 msgstr ""
 
-#: ../fdroidserver/deploy.py
-msgid "Pushing to remote server failed!"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Pushing to {url}"
 msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Quickly start a new repository"
 msgstr "Starta snabbt ett nytt förråd"
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Read all the metadata files and exit"
 msgstr "Läs alla metadatafiler och avsluta"
 
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "Reading '{config_file}'"
-msgstr "Läser '{config_file}'"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Reading packageName/versionCode/versionName failed, APK invalid: '{apkfilename}'"
 msgstr ""
 
 #: ../fdroidserver/common.py
 #, python-brace-format
-msgid "Reading packageName/versionCode/versionName failed,APK invalid: '{apkfilename}'"
+msgid "Reading minSdkVersion failed: \"{apkfilename}\""
+msgstr ""
+
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
+#. https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
+#: ../fdroidserver/common.py
+#, python-brace-format
+msgid "Reading packageName/versionCode/versionName failed, APK invalid: '{apkfilename}'"
 msgstr ""
 
 #: ../fdroidserver/update.py
@@ -1466,35 +1454,24 @@ msgstr ""
 msgid "Reading {apkfilename} from cache"
 msgstr ""
 
-#: ../fdroidserver/build.py
-msgid "Refresh and cache scanner rules and signatures from the network"
-msgstr ""
-
-#: ../fdroidserver/publish.py
-#, python-brace-format
-msgid "Refusing to sign '{path}', file exists in both {dir1} and {dir2} folder."
-msgstr ""
-
-#: ../fdroidserver/verify.py
-msgid "Remove source tarball and any APKs if successfully verified."
+#: ../fdroidserver/stats.py
+msgid "Recalculate aggregate stats - use when changes have been made that would invalidate old cached data."
 msgstr ""
 
 #: ../fdroidserver/common.py
 msgid "Removing specified files"
-msgstr "Tar bort angivna filer"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Removing {path}\""
-msgstr "Tar bort {path}''"
+msgstr ""
 
 #: ../fdroidserver/update.py
 msgid "Rename APK files that do not match package.name_123.apk"
 msgstr "Byt namn på APK-filer som inte matchar paket.namn_123.apk"
 
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "RepoType {type} is deprecated, please switch to git."
+#: ../fdroidserver/update.py
+msgid "Report on build data status"
+msgstr ""
+
+#: ../fdroidserver/build.py
+msgid "Reset and create a brand new build server, even if the existing one appears to be ok."
 msgstr ""
 
 #: ../fdroidserver/nightly.py
@@ -1510,34 +1487,33 @@ msgstr ""
 msgid "Restrict output to warnings and errors"
 msgstr ""
 
-#: ../fdroidserver/net.py
-#, python-format
-msgid "Retrying failed download: %s"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Rewrite all the metadata files"
 msgstr "Skriv om alla metadatafiler"
 
+#: ../fdroidserver/rewritemeta.py
+msgid "Rewrite to a specific format: "
+msgstr ""
+
 #: ../fdroidserver/rewritemeta.py
 #, python-brace-format
 msgid "Rewriting '{appid}'"
-msgstr "Skriver om '{appid}'"
+msgstr ""
+
+#: ../fdroidserver/rewritemeta.py
+#, python-brace-format
+msgid "Rewriting '{appid}' to '{path}'"
+msgstr ""
 
 #: ../fdroidserver/checkupdates.py
 msgid "Run on git repo that has uncommitted changes"
 msgstr ""
 
-#: ../fdroidserver/nightly.py
-#, python-brace-format
-msgid "Run over {cibase} to find -debug.apk. and skip repo_basedir {repo_basedir}"
-msgstr ""
-
 #: ../fdroidserver/lint.py
 msgid "Run rewritemeta to fix formatting"
 msgstr ""
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 msgid "Running first pass with MD5 checking disabled"
 msgstr ""
 
@@ -1546,24 +1522,18 @@ msgstr ""
 msgid "Running wget in {path}"
 msgstr ""
 
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "SHA-256 of {url} does not match entry!"
+#: ../fdroidserver/dscanner.py
+msgid "Scan only the latest version of each package"
 msgstr ""
 
 #: ../fdroidserver/build.py
 msgid "Scan the resulting APK(s) for known non-free classes."
 msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Scan the source code of a package"
 msgstr "Skanna källkoden för ett paket"
 
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Scanner found {count} problems in {apk}"
-msgstr ""
-
 #: ../fdroidserver/scanner.py
 #, python-brace-format
 msgid "Scanner found {count} problems in {appid}:"
@@ -1580,19 +1550,6 @@ msgid_plural "Scanner found {} problems"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../fdroidserver/scanner.py
-msgid "Scanning APK for extra signing blocks."
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "Scanning APK with dexdump for known non-free classes."
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Set NDK {release} ({version}) up"
-msgstr ""
-
 #: ../fdroidserver/common.py
 msgid "Set clock to that time using:"
 msgstr ""
@@ -1606,7 +1563,7 @@ msgstr ""
 msgid "Set open file limit to {integer}"
 msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Set up an app build for a nightly build repo"
 msgstr ""
 
@@ -1619,13 +1576,20 @@ msgstr ""
 msgid "Setting {0} sec timeout for this build"
 msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroidserver/build.py
+msgid "Setup an emulator, install the APK on it and perform a Drozer scan"
+msgstr ""
+
+msgid "Setup an emulator, install the apk on it and perform a drozer scan"
+msgstr ""
+
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Sign and place packages in the repo"
 msgstr "Signera och placera paket i förrådet"
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Sign indexes created using update --nosign"
-msgstr "Signera index som har skapats med att använda update --nosign"
+msgstr ""
 
 #: ../fdroidserver/build.py
 msgid "Skip scanning the source code for binaries and other problems"
@@ -1636,11 +1600,6 @@ msgstr ""
 msgid "Skipping '{apkfilename}' with invalid signature!"
 msgstr ""
 
-#: ../fdroidserver/deploy.py ../fdroidserver/index.py
-#, python-format
-msgid "Skipping GitLab Pages mirror because the repo is too large (>%.2fGB)!"
-msgstr ""
-
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Skipping index generation for {appid}"
@@ -1654,16 +1613,25 @@ msgstr ""
 #: ../fdroidserver/scanner.py
 #, python-brace-format
 msgid "Skipping {appid}: disabled"
-msgstr "Hoppar över {appid}: avstängd"
+msgstr ""
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/scanner.py
+#, python-brace-format
+msgid "Skipping {appid}: no builds specified"
+msgstr ""
+
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 msgid "Specify a local folder to sync the repo to"
 msgstr ""
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 msgid "Specify an identity file to provide to SSH for rsyncing"
 msgstr ""
 
+#: ../fdroidserver/build.py
+msgid "Specify that we're running on the build server"
+msgstr ""
+
 #: ../fdroidserver/nightly.py
 msgid "Specify which debug keystore file to use."
 msgstr ""
@@ -1672,6 +1640,11 @@ msgstr ""
 msgid "Spew out even more information than normal"
 msgstr ""
 
+#: ../fdroidserver/nightly.py
+#, python-brace-format
+msgid "Striping mystery signature from {apkfilename}"
+msgstr ""
+
 #: ../fdroidserver/nightly.py
 #, python-brace-format
 msgid "Stripping mystery signature from {apkfilename}"
@@ -1692,22 +1665,10 @@ msgstr ""
 msgid "System clock is older than date in {path}!"
 msgstr ""
 
-#: ../fdroidserver/checkupdates.py
-msgid "Tags update mode only works for git, hg, bzr and git-svn repositories currently"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "Tags update mode used in git-svn, but the repo was not set up with tags"
-msgstr ""
-
 #: ../fdroidserver/build.py
 msgid "Test mode - put output in the tmp directory only, and always build, even if the output already exists."
 msgstr ""
 
-#: ../fdroidserver/index.py
-msgid "The \"qrcode\" Python package is not installed (e.g. apt-get install python3-qrcode)!"
-msgstr ""
-
 #. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
 #: ../fdroidserver/update.py
 #, python-brace-format
@@ -1726,10 +1687,18 @@ msgstr ""
 msgid "The file to be included in the repo (path or glob)"
 msgstr ""
 
+#: ../fdroidserver/deploy.py
+msgid "The only commands currently supported are 'init' and 'update'"
+msgstr ""
+
 #: ../fdroidserver/index.py
 msgid "The repository's fingerprint does not match."
 msgstr ""
 
+#: ../fdroidserver/common.py
+msgid "The repository's index could not be verified."
+msgstr ""
+
 #: ../fdroidserver/deploy.py
 #, python-brace-format
 msgid "The root dir for local_copy_dir \"{path}\" does not exist!"
@@ -1743,37 +1712,13 @@ msgstr ""
 msgid "These are the apps that have been archived from the main repo."
 msgstr ""
 
-#: ../fdroidserver/mirror.py
-msgid "This command should never be used to mirror f-droid.org! A full copy requires more than 600GB."
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "This is a repository of apps to be used with F-Droid. Applications in this repository are either official binaries built by the original application developers, or are binaries built from source by the admin of f-droid.org using the tools on https://gitlab.com/fdroid."
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 #, python-format
 msgid "This repo already has local metadata: %s"
 msgstr ""
 
-#: ../fdroidserver/init.py
-#, python-format
-msgid ""
-"To complete the setup, add your APKs to \"%s\"\n"
-"then run \"fdroid update -c; fdroid update\".  You might also want to edit\n"
-"\"config.yml\" to set the URL, repo name, and more.  You should also set up\n"
-"a signing key (a temporary one might have been automatically generated).\n"
-"\n"
-"For more info: https://f-droid.org/docs/Setup_an_F-Droid_App_Repo\n"
-"and https://f-droid.org/docs/Signing_Process"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "To use awsbucket, awssecretkey and awsaccesskeyid must also be set in config.yml!"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "To use rclone, rclone_config and awsbucket must be set in config.yml!"
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
+msgid "To use awsbucket, awssecretkey and awsaccesskeyid must also be set in config.py!"
 msgstr ""
 
 #: ../fdroidserver/lint.py
@@ -1784,6 +1729,10 @@ msgstr ""
 msgid "URL shorteners should not be used"
 msgstr ""
 
+#: ../fdroidserver/metadata.py
+msgid "URL title is just the URL, use brackets: [URL]"
+msgstr ""
+
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "URL {url} in Description: {error}"
@@ -1797,15 +1746,16 @@ msgstr ""
 msgid "Unexpected license tag \"{}\"! Only use license tags configured in your config file"
 msgstr ""
 
-#: ../fdroidserver/common.py
+#: ../fdroidserver/metadata.py
 #, python-brace-format
-msgid "Unknown entry {key} in {configname}"
+msgid "Unexpected text on same line as {field} in {linedesc}"
 msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Unknown exception found!"
 msgstr "Okänt undantag hittades!"
 
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "Unknown file '{filename}' in build '{versionName}'"
@@ -1816,6 +1766,11 @@ msgstr ""
 msgid "Unknown metadata format: %s"
 msgstr ""
 
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Unknown metadata format: {path}"
+msgstr ""
+
 #: ../fdroidserver/metadata.py
 #, python-brace-format
 msgid "Unknown metadata format: {path} (use: *.yml)"
@@ -1825,6 +1780,10 @@ msgstr ""
 msgid "Unknown version of aapt, might cause problems: "
 msgstr ""
 
+#: ../fdroidserver/lint.py
+msgid "Unlinkified link - use [http://foo.bar Link title] or [http://foo.bar]"
+msgstr ""
+
 #: ../fdroidserver/lint.py
 msgid "Unnecessary leading space"
 msgstr ""
@@ -1838,12 +1797,20 @@ msgstr ""
 msgid "Unrecognised app field '{fieldname}' in '{path}'"
 msgstr ""
 
+#: ../fdroidserver/metadata.py
+msgid "Unrecognised app field: "
+msgstr ""
+
 #: ../fdroidserver/metadata.py
 #, python-brace-format
 msgid "Unrecognised build flag '{build_flag}' in '{path}'"
 msgstr ""
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Unrecognised field '{field}' in {linedesc}"
+msgstr ""
+
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Unsupported file type \"{extension}\" for repo graphic"
@@ -1854,6 +1821,29 @@ msgstr ""
 msgid "Unsupported graphics file found: {path}"
 msgstr ""
 
+#: ../fdroidserver/rewritemeta.py
+#, python-brace-format
+msgid "Unsupported metadata format, use: --to [{supported}]"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+msgid "Unterminated ]"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+msgid "Unterminated ]]"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Unterminated build in {name}"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Unterminated continuation in {name}"
+msgstr ""
+
 #: ../fdroidserver/lint.py
 #, python-format
 msgid "Unused extlib at %s"
@@ -1874,25 +1864,27 @@ msgstr ""
 msgid "Unused scanignore path: %s"
 msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Update repo information for new packages"
 msgstr "Uppdatera förrådinformation för nya paket"
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Update the binary transparency log for a URL"
-msgstr "Uppdatera binärens genomskinliga logg för en URL"
+msgstr ""
+
+#: ../fdroid ../fdroidserver/__main__.py
+msgid "Update the stats of the repo"
+msgstr ""
+
+#: ../fdroidserver/update.py ../fdroidserver/build.py
+msgid "Update the wiki"
+msgstr ""
 
 #: ../fdroidserver/checkupdates.py
 #, python-brace-format
 msgid "UpdateCheckData has invalid URL: {url}"
 msgstr ""
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "UpdateCheckData must match the version code as integer (\\d or [0-9]): {codeex}"
-msgstr ""
-
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "UpdateCheckData must use HTTPS URL: {url}"
@@ -1904,10 +1896,14 @@ msgid "UpdateCheckData not a valid URL: {url}"
 msgstr ""
 
 #: ../fdroidserver/lint.py
-msgid "UpdateCheckMode is set but it looks like checkupdates hasn't been run yet."
+msgid "UpdateCheckMode is set but it looks like checkupdates hasn't been run yet"
+msgstr ""
+
+#. Translators: https://developer.android.com/studio/build/application-id
+#: ../fdroidserver/lint.py
+msgid "UpdateCheckName is set to the known application ID - it can be removed"
 msgstr ""
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
 #: ../fdroidserver/lint.py
 msgid "UpdateCheckName is set to the known application ID, it can be removed"
 msgstr ""
@@ -1922,8 +1918,19 @@ msgstr ""
 msgid "Uploading {apkfilename} to virustotal"
 msgstr ""
 
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "Usage"
+msgstr "Användning"
+
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, python-format
+msgid "Usage: %s\n"
+msgstr "Användning: %s\n"
+
 #: ../fdroidserver/lint.py
-msgid "Use /HEAD instead of /master or /main to point at a file in the default branch"
+msgid "Use /HEAD instead of /master to point at a file in the default branch"
 msgstr ""
 
 #: ../fdroidserver/update.py
@@ -1938,14 +1945,12 @@ msgstr ""
 msgid "Use date from APK instead of current time for newly added APKs"
 msgstr ""
 
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Using \"{path}\" for configuring s3cmd."
+msgid "Use date from apk instead of current time for newly added apks"
 msgstr ""
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
-msgid "Using \"{path}\" for syncing with remote storage."
+msgid "Using \"{path}\" for configuring s3cmd."
 msgstr ""
 
 #: ../fdroidserver/common.py
@@ -1956,17 +1961,13 @@ msgstr ""
 msgid "Using APK Signature v3"
 msgstr ""
 
-#: ../fdroidserver/common.py
-msgid "Using JAR Signature"
-msgstr "Använder JAR-signatur"
-
 #: ../fdroidserver/common.py
 msgid "Using Java's jarsigner, not recommended for verifying APKs! Use apksigner"
 msgstr ""
 
-#: ../fdroidserver/metadata.py
+#: ../fdroidserver/common.py
 #, python-brace-format
-msgid "Using blank dictionary instead of contents of {path}!"
+msgid "Using androguard from \"{path}\""
 msgstr ""
 
 #: ../fdroidserver/init.py
@@ -1974,17 +1975,12 @@ msgstr ""
 msgid "Using existing keystore \"{path}\""
 msgstr ""
 
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Using rclone to sync with: {url}"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Using s3cmd to sync with: {url}"
 msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Valid commands are:"
 msgstr "Giltiga kommandon är:"
 
@@ -1992,34 +1988,21 @@ msgstr "Giltiga kommandon är:"
 msgid "Verify against locally cached copy rather than redownloading."
 msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Verify the integrity of downloaded packages"
-msgstr "Verifiera integriteten hos de nedladdade paketen"
+msgstr ""
 
 #: ../fdroidserver/index.py
 msgid "Verifying index signature:"
 msgstr ""
 
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "Verifying package {path} with apksigner."
-msgstr ""
-
 #: ../fdroidserver/deploy.py
 #, python-brace-format
 msgid "VirusTotal API key cannot upload files larger than 32MB, use {url} to upload {path}."
 msgstr ""
 
-#: ../fdroidserver/nightly.py
-msgid "WARNING: only public git repos are supported!"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Warn about possible metadata errors"
-msgstr "Visa varningar vid möjliga metadatafel"
-
-#: ../fdroidserver/scanner.py
-msgid "WebAssembly binary file"
 msgstr ""
 
 #: ../fdroidserver/update.py
@@ -2030,16 +2013,7 @@ msgstr ""
 msgid "When linting the entire repository yamllint is disabled by default. This option forces yamllint regardless."
 msgstr ""
 
-#: ../fdroidserver/publish.py
-msgid "When signing or verifying fails, exit with an error code."
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "Would you like to download and install F-Droid.apk via adb? (YES/no)"
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "Would you like to download the app(s) from f-droid.org? (YES/no)"
+msgid "X.509 'Distiguished Name' used when generating keys"
 msgstr ""
 
 #: ../fdroidserver/init.py
@@ -2052,11 +2026,6 @@ msgstr ""
 
 #: ../fdroidserver/scanner.py
 msgid "ZIP file archive"
-msgstr "ZIP-filarkiv"
-
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "adb reports {serial} is \"{status}\"!"
 msgstr ""
 
 #: ../fdroidserver/nightly.py
@@ -2069,66 +2038,70 @@ msgstr ""
 msgid "adding to {name}: {path}"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "ambiguous option: %(option)s could match %(matches)s"
-msgstr "tvetydigt alternativ: %(option)s kunde motsvara %(matches)s"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "apksigner in build-tools;{version} passes APKs with invalid v3 signatures, ignoring."
 msgstr ""
 
-#: ../fdroidserver/common.py
-msgid "apksigner not found! Cannot sign or verify modern APKs"
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, python-format
+msgid "ambiguous option: %s (%s?)"
 msgstr ""
 
 #: ../fdroidserver/common.py
 msgid "apksigner not found, it's required for signing!"
 msgstr ""
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/checkupdates.py ../fdroidserver/lint.py
-#: ../fdroidserver/rewritemeta.py
+#: ../fdroidserver/lint.py ../fdroidserver/rewritemeta.py
+#: ../fdroidserver/checkupdates.py
 msgid "application ID of file to operate on"
 msgstr ""
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/build.py ../fdroidserver/install.py
-#: ../fdroidserver/publish.py ../fdroidserver/scanner.py
-#: ../fdroidserver/verify.py
+#: ../fdroidserver/verify.py ../fdroidserver/publish.py
+#: ../fdroidserver/build.py ../fdroidserver/scanner.py
+#: ../fdroidserver/install.py
 msgid "application ID with optional versionCode in the form APPID[:VERCODE]"
 msgstr ""
 
-#: ../fdroidserver/common.py
-msgid "archive_url needs to end with /archive"
+#: ../fdroidserver/lint.py ../fdroidserver/rewritemeta.py
+msgid "applicationId in the form APPID"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: ../fdroidserver/checkupdates.py
+msgid "applicationId to check for updates"
+msgstr ""
+
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
+#: ../fdroidserver/verify.py ../fdroidserver/publish.py
+#: ../fdroidserver/dscanner.py ../fdroidserver/build.py
+#: ../fdroidserver/scanner.py ../fdroidserver/install.py
+msgid "applicationId with optional versionCode in the form APPID[:VERCODE]"
+msgstr ""
+
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "argument \"-\" with mode %r"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "argument %(argument_name)s: %(message)s"
-msgstr ""
-
 #: ../fdroidserver/nightly.py
 msgid "attempting bare SSH connection to test deploy key:"
 msgstr ""
 
+#: ../fdroidserver/nightly.py
+msgid "attempting bare ssh connection to test deploy key:"
+msgstr ""
+
 #: ../fdroidserver/common.py
 msgid "can not parse scrlib spec (not a string): '{}'"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
-msgid "can't open '%(filename)s': %(error)s"
-msgstr "kan inte öppna '%(filename)s': %(error)s"
-
-#: ../fdroidserver/scanner.py
-msgid "can't open non-https url: '{};"
+msgid "can't open '%s': %s"
 msgstr ""
 
 #: ../fdroidserver/build.py
@@ -2136,11 +2109,13 @@ msgstr ""
 msgid "cannot find required srclibs: \"{path}\""
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "cannot have multiple subparser arguments"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "cannot merge actions - two groups are named %r"
 msgstr ""
@@ -2152,27 +2127,32 @@ msgstr ""
 #: ../fdroidserver/nightly.py
 #, python-brace-format
 msgid "cloning {url}"
-msgstr "klonar {url}"
+msgstr ""
+
+#: ../fdroidserver/deploy.py
+msgid "command to execute, either 'init' or 'update'"
+msgstr ""
 
 #: ../fdroidserver/__main__.py
 msgid "commands from plugin modules:"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "complex"
+msgstr ""
+
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "conflicting option string: %s"
 msgid_plural "conflicting option strings: %s"
 msgstr[0] ""
 msgstr[1] ""
 
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "conflicting subparser alias: %s"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "conflicting subparser: %s"
+#: ../fdroidserver/nightly.py
+#, python-brace-format
+msgid "copying {apkfilename} into {path}"
 msgstr ""
 
 #: ../fdroidserver/metadata.py
@@ -2181,30 +2161,26 @@ msgid "could not parse '{path}'"
 msgstr ""
 
 #: ../fdroidserver/common.py
-msgid "could not parse srclib spec (no name specified): '{}'"
+msgid "could not parse srclib spec (no ref specified): '{}'"
 msgstr ""
 
 #: ../fdroidserver/common.py
-msgid "could not parse srclib spec (no ref specified): '{}'"
+msgid "could not parse srclib spec (too many '@' signs): '{}'"
 msgstr ""
 
 #: ../fdroidserver/nightly.py
 #, python-brace-format
 msgid "created {path}"
-msgstr "skapade {path}"
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "current version is newer: old vercode={old}, new vercode={new}"
 msgstr ""
 
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "deleting: repo/{apkfilename}"
-msgstr "tar bort: repo/{apkfilename}"
+msgstr ""
 
-#: ../fdroidserver/scanner.py
-msgid "dependency file without lock"
+#: ../fdroidserver/common.py
+#, python-brace-format
+msgid "deployed build logs to '{path}'"
 msgstr ""
 
 #: ../fdroidserver/common.py
@@ -2212,48 +2188,59 @@ msgstr ""
 msgid "deployed process log {path} to {dest}"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "dest= is required for options like %r"
 msgstr ""
 
-#: ../fdroidserver/scanner.py
-msgid "downloading '{}'"
-msgstr "hämtar '{}'"
-
-#: ../fdroidserver/scanner.py
-msgid "downloading scanner signatures from '{}' failed"
-msgstr ""
-
 #: ../fdroidserver/scanner.py
 msgid "executable binary, possibly code"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "expected %s argument"
 msgid_plural "expected %s arguments"
 msgstr[0] ""
 msgstr[1] ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "expected at least one argument"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "expected at most one argument"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "expected one argument"
-msgstr "ett argument förväntades"
+msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroidserver/common.py
+#, python-brace-format
+msgid "failed deploying build logs to '{path}'"
+msgstr ""
+
+#: ../fdroid
+msgid "fdroid [-h|--help|--version] <command> [<args>]"
+msgstr ""
+
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "fdroid [<command>] [-h|--help|--version|<args>]"
 msgstr ""
 
-#: ../fdroidserver/scanner.py
-msgid "fetch the latest version of signatures from the web"
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "floating-point"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+msgid "force errors to be warnings, or ignore"
 msgstr ""
 
 #: ../fdroidserver/metadata.py
@@ -2266,9 +2253,10 @@ msgstr ""
 
 #: ../fdroidserver/scanner.py
 msgid "gzip file archive"
-msgstr "gzip-filarkiv"
+msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "ignored explicit argument %r"
 msgstr ""
@@ -2277,39 +2265,35 @@ msgstr ""
 msgid "index-v1 must have a signature, use `fdroid signindex` to create it!"
 msgstr ""
 
-#: ../fdroidserver/index.py
-msgid "index-v2 must have a signature, use `fdroid signindex` to create it!"
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "integer"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "invalid %(type)s value: %(value)r"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "invalid choice: %(value)r (choose from %(choices)s)"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "invalid conflict_resolution value: %r"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "invalid option string %(option)r: must start with a character %(prefix_chars)r"
 msgstr ""
 
-#: ../fdroidserver/common.py
-msgid "ipfs_cid not found, skipping CIDv1 generation"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "latest build recipe is newer: old vercode={old}, new vercode={new}"
-msgstr ""
-
 #: ../fdroidserver/deploy.py
 #, python-brace-format
 msgid "local_copy_dir does not end with \"fdroid\", perhaps you meant: \"{path}\""
@@ -2328,20 +2312,11 @@ msgstr ""
 msgid "mirror '%s' does not end with 'fdroid'!"
 msgstr ""
 
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "mirrors set twice, in config.yml and {path}!"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "mutually exclusive arguments must be optional"
 msgstr ""
 
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "next {name} cache update due in {time}"
-msgstr ""
-
 #: ../fdroidserver/mirror.py
 #, python-brace-format
 msgid "no \"icon\" in {appid}"
@@ -2349,92 +2324,143 @@ msgstr ""
 
 #: ../fdroidserver/signatures.py
 msgid "no APK supplied"
-msgstr "ingen APK tillhandahölls"
-
-#: ../fdroidserver/checkupdates.py
-msgid "no version information found"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, python-format
+msgid "no such option: %s"
+msgstr ""
+
+#: ../fdroid ../fdroidserver/__main__.py
+msgid "no version info found!"
+msgstr ""
+
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "not allowed with argument %s"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "one of the arguments %s is required"
 msgstr ""
 
-#: ../fdroidserver/common.py ../fdroidserver/index.py
+#: ../fdroidserver/index.py ../fdroidserver/common.py
 msgid "only accepts strings, lists, and tuples"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
-#, fuzzy
-msgid "options"
-msgstr "Alternativ"
+#: ../fdroidserver/install.py
+#, python-format
+msgid "option %s: If you really want to install all the signed apps, use --all"
+msgstr ""
+
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, python-format
+msgid "option %s: invalid %s value: %r"
+msgstr ""
+
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, python-format
+msgid "option %s: invalid choice: %r (choose from %s)"
+msgstr ""
+
+#: /usr/lib/python3.5/getopt.py /usr/lib/python3.6/getopt.py
+#: /usr/lib/python3.7/getopt.py
+#, python-format
+msgid "option -%s not recognized"
+msgstr "alternativet -%s kändes inte igen"
+
+#: /usr/lib/python3.5/getopt.py /usr/lib/python3.6/getopt.py
+#: /usr/lib/python3.7/getopt.py
+#, python-format
+msgid "option -%s requires argument"
+msgstr "alternativet -%s kräver argument"
+
+#: /usr/lib/python3.5/getopt.py /usr/lib/python3.6/getopt.py
+#: /usr/lib/python3.7/getopt.py
+#, python-format
+msgid "option --%s must not have an argument"
+msgstr ""
+
+#: /usr/lib/python3.5/getopt.py /usr/lib/python3.6/getopt.py
+#: /usr/lib/python3.7/getopt.py
+#, python-format
+msgid "option --%s not a unique prefix"
+msgstr ""
+
+#: /usr/lib/python3.5/getopt.py /usr/lib/python3.6/getopt.py
+#: /usr/lib/python3.7/getopt.py
+#, python-format
+msgid "option --%s not recognized"
+msgstr "alternativet --%s kändes inte igen"
+
+#: /usr/lib/python3.5/getopt.py /usr/lib/python3.6/getopt.py
+#: /usr/lib/python3.7/getopt.py
+#, python-format
+msgid "option --%s requires argument"
+msgstr ""
+
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
+msgid "optional arguments"
+msgstr "alternativa argument"
 
 #: ../fdroidserver/nightly.py
 #, python-brace-format
 msgid "overwriting existing {path}"
-msgstr "skriver över befintlig {path}"
+msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "positional arguments"
-msgstr "positionella argument"
+msgstr ""
 
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "process log deploy {path} to {dest} failed!"
 msgstr ""
 
-#: ../fdroidserver/build.py
-msgid "reference binary missing signature"
-msgstr ""
-
 #: ../fdroidserver/signatures.py
 #, python-brace-format
 msgid "refuse downloading via insecure HTTP connection (use HTTPS or specify --no-https-check): {apkfilename}"
 msgstr ""
 
+#: ../fdroidserver/signatures.py
+#, python-brace-format
+msgid "refuse downloading via insecure http connection (use https or specify --no-https-check): {apkfilename}"
+msgstr ""
+
 #: ../fdroidserver/index.py
 #, python-format
-msgid "repo_icon \"repo/icons/%s\" does not exist, generating placeholder."
+msgid "repo_icon %s does not exist, generating placeholder."
 msgstr ""
 
-#: ../fdroidserver/common.py
-msgid "repo_url needs to end with /repo"
+#: ../fdroidserver/metadata.py
+msgid "ruamel.yaml not installed, can not write metadata."
 msgstr ""
 
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "rsync is missing or broken: {error}"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "s3cmd sync indexes {path} to {url} and delete"
 msgstr ""
 
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "s3cmd syncs indexes from {path} to {url} and deletes removed"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "scanner cache is malformed! You can clear it with: '{clear}'"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "serverwebroot: path does not end with \"fdroid\", perhaps you meant one of these:"
-msgstr ""
-
 #: ../fdroidserver/scanner.py
 msgid "shared library"
-msgstr "delat bibliotek"
+msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "show program's version number and exit"
+msgstr "visa programmets versionsnummer och avsluta"
+
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.5/optparse.py
+#: /usr/lib/python3.6/argparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/argparse.py /usr/lib/python3.7/optparse.py
 msgid "show this help message and exit"
 msgstr "visa det här hjälpmeddelandet och avsluta"
 
@@ -2461,47 +2487,52 @@ msgstr ""
 
 #: ../fdroidserver/scanner.py
 msgid "static library"
-msgstr "statiskt bibliotek"
-
-#: ../fdroidserver/build.py
-#, python-brace-format
-msgid "supplied reference binary has allowed signer {signer}"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: ../fdroidserver/common.py
+#, python-brace-format
+msgid "supplied timestamp value '{timestamp}' is not a unix timestamp"
+msgstr ""
+
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "the following arguments are required: %s"
-msgstr "följande argument krävs: %s"
-
-#: ../fdroidserver/install.py
-msgid "true"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "unexpected option string: %s"
-msgstr "oväntad alternativ-sträng: %s"
+msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "unknown parser %(parser_name)r (choices: %(choices)s)"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "unrecognized arguments: %s"
-msgstr "argumenten känns inte igen: %s"
+msgstr ""
 
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "unsafe permissions on '{config_file}' (should be 0600)!"
-msgstr "o-säkra behörigheter på '{config_file}' (borde vara 0600)!"
+msgstr ""
 
-#: ../fdroidserver/__main__.py /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py ../fdroid
+#: /usr/lib/python3.7/argparse.py ../fdroidserver/__main__.py
 msgid "usage: "
 msgstr "användning: "
 
-#: ../fdroidserver/deploy.py
+#: ../fdroid
+msgid "usage: fdroid [-h|--help|--version] <command> [<args>]"
+msgstr "användning: fdroid [-h|--help|--version] <command> [<args>]"
+
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "using Apache libcloud to sync with {url}"
 msgstr ""
@@ -2510,9 +2541,9 @@ msgstr ""
 msgid "virustotal.com is rate limiting, waiting to retry..."
 msgstr ""
 
-#: ../fdroidserver/install.py
-msgid "yes"
-msgstr "ja"
+#: ../fdroidserver/update.py
+msgid "wiki support is deprecated and will be removed in the next release!"
+msgstr ""
 
 #: ../fdroidserver/publish.py
 #, python-brace-format
@@ -2526,19 +2557,31 @@ msgstr[1] ""
 msgid "{apkfilename} ({appid}) has no metadata!"
 msgstr "{apkfilename}{appid} har ingen metadata!"
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
+#: ../fdroidserver/update.py
+#, python-brace-format
+msgid "{apkfilename} has multiple {name} files, looks like Master Key exploit!"
+msgstr ""
+
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "{apkfilename}'s AndroidManifest.xml has a bad date: "
 msgstr ""
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "{appid} does not have a name! Using application ID instead."
 msgstr ""
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
+#: ../fdroidserver/update.py
+#, python-brace-format
+msgid "{appid} does not have a name! Using package name instead."
+msgstr ""
+
+#: ../fdroidserver/update.py
+#, python-brace-format
+msgid "{appid} from {path} is not a valid Android Package Name!"
+msgstr ""
+
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "{appid} from {path} is not a valid Android application ID!"
@@ -2549,16 +2592,12 @@ msgstr ""
 msgid "{appid} from {path} is not a valid Java Package Name!"
 msgstr ""
 
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{appid} has both APKs and files: {files}"
-msgstr ""
-
 #: ../fdroidserver/mirror.py
 #, python-brace-format
 msgid "{appid} is missing {name}"
 msgstr "{appid}saknas {name}"
 
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "{appid}: Unknown extlib {path} in build '{versionName}'"
@@ -2586,7 +2625,7 @@ msgstr ""
 
 #: ../fdroidserver/metadata.py
 #, python-brace-format
-msgid "{build_flag} must be list or string, found: {value}"
+msgid "{field} not terminated in {name}"
 msgstr ""
 
 #: ../fdroidserver/metadata.py
@@ -2596,15 +2635,10 @@ msgstr ""
 
 #: ../fdroidserver/update.py
 #, python-brace-format
-msgid "{name} \"{section}/icons/{path}\" does not exist! Check \"config.yml\"."
+msgid "{name} \"{path}\" does not exist! Correct it in config.py."
 msgstr ""
 
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{path1} is a duplicate of {path2}, remove one!"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 #, python-brace-format
 msgid "{path} already exists, ignoring import results!"
 msgstr ""
@@ -2619,36 +2653,6 @@ msgstr ""
 msgid "{path} has bad file signature \"{pattern}\", possible Janus exploit!"
 msgstr ""
 
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "{path} has been flagged by virustotal {count} times:"
-msgstr ""
-
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "{path} has the wrong fingerprint ({fingerprint})!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "{path} is not \"key: value\" dict, but a {datatype}!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, fuzzy, python-brace-format
-msgid "{path} is not a standard config file!"
-msgstr "'sdk_path' är inte inställt i config.yml!"
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "{path} is not list, but a {datatype}!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "{path} is not {expected_type}, but a {datatype}!"
-msgstr ""
-
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "{path} is zero size!"
@@ -2659,22 +2663,12 @@ msgstr ""
 msgid "{path} more than 200MB, manually upload: {url}"
 msgstr ""
 
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "{path}: \"{code}\" is not a valid ISO_3166-1 alpha-2 country code!"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{path}: {error}"
-msgstr "{path}: {error}"
-
 #: ../fdroidserver/mirror.py
 #, python-brace-format
 msgid "{url} does not end with \"fdroid\", check the URL path!"
 msgstr ""
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/common.py
 #, python-brace-format
 msgid "{url} does not start with \"http\"!"
 msgstr ""
diff --git a/locale/sw/LC_MESSAGES/fdroidserver.po b/locale/sw/LC_MESSAGES/fdroidserver.po
deleted file mode 100644
index 3ddf8eb8..00000000
--- a/locale/sw/LC_MESSAGES/fdroidserver.po
+++ /dev/null
@@ -1,2698 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# This file is put in the public domain.
-# Test Account <ta2464666@gmail.com>, 2024.
-# abelbiwott-dev <abelbiwott@outlook.com>, 2024.
-# paul mayero <pmmayero@gmail.com>, 2024.
-msgid ""
-msgstr ""
-"Project-Id-Version: fdroidserver 2.3a1\n"
-"Report-Msgid-Bugs-To: https://gitlab.com/fdroid/fdroidserver/issues\n"
-"POT-Creation-Date: 2025-06-25 09:52+0200\n"
-"PO-Revision-Date: 2024-09-08 11:09+0000\n"
-"Last-Translator: abelbiwott-dev <abelbiwott@outlook.com>\n"
-"Language-Team: Swahili <https://hosted.weblate.org/projects/f-droid/fdroidserver/sw/>\n"
-"Language: sw\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 5.8-dev\n"
-
-#: ../fdroidserver/nightly.py
-msgid ""
-"\n"
-"SSH public key to be used as deploy key:"
-msgstr ""
-"\n"
-"Kitufe cha umma cha SSH kitatumika kama ufunguo wa kupeleka:"
-
-#: ../fdroidserver/nightly.py
-#, python-brace-format
-msgid ""
-"\n"
-"{path} encoded for the DEBUG_KEYSTORE secret variable:"
-msgstr ""
-"\n"
-"{path} iliyosimbwa kwa utofauti wa siri wa DEBUG_KEYSTORE:"
-
-#: ../fdroidserver/lint.py
-#, python-format
-msgid "\"%s/\" has no matching metadata file!"
-msgstr "\"%s/\" haina faili ya metadata inayolingana!"
-
-#: ../fdroidserver/index.py
-msgid "\"isPrimary\" key should not be added to mirrors!"
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "\"local_copy_dir\" {path} does not exist!"
-msgstr "\"local_copy_dir\" {path} haipo!"
-
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "\"{apkfilename}\" is already installed on {dev}."
-msgstr "Tayari \"{apkfilename}\" imesakinishwa kwenye {dev}."
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "\"{path}\" contains recent {name} ({version})"
-msgstr "\"{path}\" ina {name} ({version}) ya hivi majuzi"
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "\"{path}\" exists but s3cmd is not installed!"
-msgstr "\"{path}\" ipo lakini s3cmd haijasakinishwa!"
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "\"{path}\" is not a supported file format (use: metadata/*.yml)"
-msgstr "\"{path}\" si muundo wa faili inayokubalika (tumia: metadata/*.yml)"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "\"{path}\" is signed by a key that is not allowed:"
-msgstr "\"{path}\" imetiwa saini na ufunguo ambao hauruhusiwi:"
-
-#: ../fdroidserver/import_subcommand.py
-#, python-brace-format
-msgid "\"{url}\" is not a valid URL!"
-msgstr "\"{url}\" si URL halali!"
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "%(prog)s: error: %(message)s\n"
-msgstr "%(prog)s: kasoro: %(message)s\n"
-
-#: ../fdroidserver/publish.py
-#, python-format
-msgid "%d APKs failed to be signed or verified!"
-msgstr "APK %d hazijatiwa saini au kuthibitishwa!"
-
-#: ../fdroidserver/scanner.py
-#, python-format
-msgid "%d problems found"
-msgstr "%d matatizo yamepatikana"
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "%r is not callable"
-msgstr "%r haiwezi kuitwa"
-
-#: ../fdroidserver/signindex.py
-#, python-format
-msgid "%s did not produce a dict!"
-msgstr "%s haikutoa \"dict\"!"
-
-#: ../fdroidserver/signindex.py
-#, python-format
-msgid "%s has bad SHA-256: %s"
-msgstr "%s ina SHA-256 mbaya: %s"
-
-#: ../fdroidserver/lint.py
-#, python-format
-msgid "%s is not an accepted build field"
-msgstr "%s sio sehemu ya kujenga inayokubalika"
-
-#: ../fdroidserver/common.py
-msgid "'keypass' not found in config.yml!"
-msgstr "'keypass' haipatikani kwenye config.yml!"
-
-#: ../fdroidserver/common.py
-msgid "'keystore' is NONE and 'smartcardoptions' is blank!"
-msgstr "'keystore' HAKUNA na 'smartcardoptions' ni tupu!"
-
-#: ../fdroidserver/common.py
-msgid "'keystore' not found in config.yml!"
-msgstr "'keystore' haipatikani kwenye config.yml!"
-
-#: ../fdroidserver/common.py
-msgid "'keystorepass' not found in config.yml!"
-msgstr "'keystorepass' haipatikani kwenye config.yml!"
-
-#: ../fdroidserver/common.py
-msgid "'repo_keyalias' not found in config.yml!"
-msgstr "'repo_keyalias' haipatikani kwenye config.yml!"
-
-#: /usr/lib/python3.11/argparse.py
-msgid "'required' is an invalid argument for positionals"
-msgstr "\"required\" ni hoja batili kwa vipengee vya nafasi"
-
-#: ../fdroidserver/common.py
-msgid "'sdk_path' not set in config.yml!"
-msgstr "'sdk_path' haijawekwa kwenye config.yml!"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "'{aapt}' is too old, fdroid requires build-tools-{version} or newer!"
-msgstr "'{aapt}' ni ya zamani sana, fdroid inahitaji zana za kujenga-{version} au mpya!"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "'{path}' failed to execute!"
-msgstr "{path} imeshindwa kutekeleza!"
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "'{path}' has invalid format, it should be a dictionary!"
-msgstr "'{path}' ina muundo batili, inapaswa kuwa kamusi!"
-
-#: ../fdroidserver/lint.py ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "'{value}' is not a valid {field} in {appid}. Regex pattern: {pattern}"
-msgstr "'{value}' si {field} halali katika {appid}. Muundo wa regex: {pattern}"
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "'{value}' is not a valid {field}, should be {pattern}"
-msgstr "'{value}' si {field} halali, inapaswa kuwa {pattern}"
-
-#: ../fdroidserver/checkupdates.py
-msgid "--merge-request only runs on a single appid!"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "...checkupdate failed for {appid} : {error}"
-msgstr "...sasisho la ukaguzi limeshindwa la{appid} : {error}"
-
-#: /usr/lib/python3.11/argparse.py
-msgid ".__call__() not defined"
-msgstr ".__call__() haijafafanuliwa"
-
-#: ../fdroidserver/lint.py
-msgid "/issues is missing"
-msgstr "/issues haipo"
-
-#: ../fdroidserver/mirror.py
-msgid "A URL is required as an argument!"
-msgstr "URL inahitajika kama hoja!"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "APK signatures have different certificates in {path}:"
-msgstr "Sahihi za APK zina vyeti tofauti katika {path}:"
-
-#: ../fdroidserver/__main__.py
-msgid "Add PGP signatures using GnuPG for packages in repo"
-msgstr "Ongeza saini za PGP kwa kutumia GnuPG kwa vifurushi kwenye ghala"
-
-#: ../fdroidserver/update.py
-msgid "Add a repo signing key to an unsigned repo"
-msgstr "Ongeza kitufe cha kusaini ghala kwenye ghala ambayo haijatiwa saini"
-
-#: ../fdroidserver/update.py
-msgid "Add skeleton metadata files for APKs that are missing them"
-msgstr "Ongeza faili za metadata za kiunzi za APK ambazo hazina"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Adding new repo for only {name}"
-msgstr "Kuongeza ghala mpya kwa {name} pekee"
-
-#: ../fdroidserver/init.py
-msgid "Alias of the repo signing key in the keystore"
-msgstr "Lakabu la ufunguo wa kusaini ghala kwenye duka la vitufe"
-
-#: ../fdroidserver/build.py
-msgid "AllowedAPKSigningKeys missing but reference binary supplied"
-msgstr "AllowedAPKSigningKeys haipo lakini binari ya marejeleo imewasilishwa"
-
-#: ../fdroidserver/import_subcommand.py
-msgid "Allows a different revision (or git branch) to be specified for the initial import"
-msgstr "Inaruhusu marekebisho tofauti (au tawi la git) litajwe kwa uagizaji wa awali"
-
-#: ../fdroidserver/mirror.py
-msgid "Also mirror the full archive section"
-msgstr "Pia onyesha sehemu kamili ya kumbukumbu"
-
-#: ../fdroidserver/lint.py
-msgid "Also warn about formatting issues, like rewritemeta -l"
-msgstr "Pia onya kuhusu masuala ya uumbizaji, kama rewritemeta -l"
-
-#: ../fdroidserver/scanner.py
-msgid "Android AAR library"
-msgstr "Maktaba ya Android AAR"
-
-#: ../fdroidserver/scanner.py
-msgid "Android APK file"
-msgstr "faili ya APK ya Android"
-
-#: ../fdroidserver/scanner.py
-msgid "Android DEX code"
-msgstr "Msimbo wa DEX ya Android"
-
-#: ../fdroidserver/init.py
-#, python-brace-format
-msgid "Android SDK not found at {path}!"
-msgstr "SDK ya Android haipatikani katika {path}!"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Android SDK path '{path}' does not exist!"
-msgstr "Njia ya SDK ya android {path} haipo!"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Android SDK path '{path}' is not a directory!"
-msgstr "Njia ya SDK ya Android {path} sio saraka!"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Android SDK tool {cmd} not found!"
-msgstr "Zana ya SDK ya Android {cmd} haijapatikana!"
-
-#: ../fdroidserver/lint.py
-msgid "App has Binaries but does not have corresponding AllowedAPKSigningKeys to pin certificate."
-msgstr "Apu ina Binari lakini haina AllowedAPKSigningKeys zinazolingana ili kubandika cheti."
-
-#: ../fdroidserver/lint.py
-msgid "App has NoSourceSince or ArchivePolicy \"0 versions\" or 0 but AutoUpdateMode or UpdateCheckMode are not None"
-msgstr "Apu ina NoSourceSince au ArchivePolicy \"matoleo 0\" au 0 lakini AutoUpdateMode au UpdateCheckMode sio Hakuna"
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "App is in '{repo}' but has a link to {url}"
-msgstr "Apu iko katika {repo} lakini ina kiungo cha {url}"
-
-#: ../fdroidserver/lint.py
-msgid "App version has binary but does not have corresponding AllowedAPKSigningKeys to pin certificate."
-msgstr "Toleo la Apu ina binari lakini haina AllowedAPKSigningKeys inayolingana ili kubandika cheti."
-
-#: ../fdroidserver/lint.py
-msgid "Appending .git is not necessary"
-msgstr "Kuambata .git sio lazima"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Archiving {apkfilename} with invalid signature!"
-msgstr "Kuhifadhi {apkfilename} yenye saini batili!"
-
-#: ../fdroidserver/lint.py
-msgid "AutoUpdateMode with UpdateCheckMode: HTTP must have a pattern."
-msgstr "AutoUpdateMode na UpdateCheckMode: HTTP lazima iwe na mpangilio."
-
-#: ../fdroidserver/install.py
-msgid "Automatic no to all prompts."
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "Automatic yes to all prompts."
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "Bad entry type \"{mirrortype}\" in mirrors config: {mirror}"
-msgstr "Aina mbaya ya ingizo \"{mirrortype}\" katika usanidi wa vioo: {mirror}"
-
-#: ../fdroidserver/mirror.py
-msgid "Base URL to mirror, can include the index signing key using the query string: ?fingerprint="
-msgstr "URL ya msingi ya kioo, inaweza kujumuisha ufunguo wa saini ya faharasa kwa kutumia mfuatano wa saili: ?fingerprint="
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Branch '{branch}' used as commit in build '{versionName}'"
-msgstr "Tawi '{branch}' limetumika kupeleka katika ujenzi wa '{versionName}'"
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Branch '{branch}' used as commit in srclib '{srclib}'"
-msgstr "Tawi {branch} linalotumika kama commit katika srclib '{srclib}'"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Broken symlink: {path}"
-msgstr "symlink iliyovunjika: {path}"
-
-#: ../fdroidserver/__main__.py
-msgid "Build a package from source"
-msgstr "Unda kifurushi kutoka kwa chanzo"
-
-#: ../fdroidserver/build.py
-msgid "Build all applications available"
-msgstr "Jenga apu zote zinazopatikana"
-
-#: ../fdroidserver/lint.py
-msgid "Build generated by `fdroid import` - remove disable line once ready"
-msgstr "Jenga linalotokana na `fdroid import` - ondoa laini ya kulemaza mara tu ikiwa tayari"
-
-#: ../fdroidserver/checkupdates.py
-msgid "Build metadata git repo has uncommited changes!"
-msgstr "Jenga ghala ya metadata ya git ina mabadiliko ambayo hayajahifadhiwa!"
-
-#: ../fdroidserver/build.py
-msgid "Build only the latest version of each package"
-msgstr "Jenga toleo la karibuni pekee la kila kifurishi"
-
-#: ../fdroidserver/init.py
-#, python-format
-msgid "Built repo based in \"%s\" with this config:"
-msgstr "Imejenga ghala yenye msingi katika \"%s\" na usanidi huu:"
-
-#: ../fdroidserver/checkupdates.py
-msgid "Can't auto-update app with no CurrentVersionCode"
-msgstr "Haiwezi kusasisha apu kiotomatiki ikiwa haina CurrentVersionCode"
-
-#: ../fdroidserver/build.py
-msgid "Can't build due to {} error while scanning"
-msgid_plural "Can't build due to {} errors while scanning"
-msgstr[0] "Haiwezi kujenga kutokana na kosa la {} wakati wa uchanganuzi"
-msgstr[1] "Haiwezi kujenga kutokana na makosa ya {} wakati wa uchanganuzi"
-
-#: ../fdroidserver/common.py
-#, fuzzy, python-brace-format
-msgid "Cannot read {path}: {error}"
-msgstr "Imeshindwa kusoma {path}: {error}"
-
-#: ../fdroidserver/rewritemeta.py
-#, python-brace-format
-msgid "Cannot rewrite \"{path}\""
-msgstr "Haiwezi kuandika upya \"{path}\""
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
-#: ../fdroidserver/lint.py
-#, python-format
-msgid "Categories '%s' is not valid"
-msgstr "Makundi ‘%s’ sio halali"
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
-#: ../fdroidserver/lint.py
-msgid "Categories are not set"
-msgstr "Makundi hayajawekwa"
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "Category \"{category}\" defined but not used for any apps!"
-msgstr "Makundi \"{category}\" yamefafanuliwa lakini haitumiki kwa apu yoyote!"
-
-#: ../fdroidserver/__main__.py
-msgid "Check for updates to applications"
-msgstr "Angalia masasisho ya programu"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Checking archiving for {appid} - apks:{integer}, keepversions:{keep}, archapks:{arch}"
-msgstr "Kuangalia uhifadhi kwa {appid} - apks:{integer}, keepversions: {keep}, archapks: {arch}"
-
-#: ../fdroidserver/update.py
-msgid "Clean update - don't uses caches, reprocess all APKs"
-msgstr "Sasisho safi - usitumie cache, chakata tena APK zote"
-
-#: ../fdroidserver/common.py
-msgid "Color the log output"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
-msgid "Comma separated list of categories."
-msgstr "Orodha ya makundi iliyotenganishwa kwa koma."
-
-#: ../fdroidserver/__main__.py
-#, python-format
-msgid "Command '%s' not recognised.\n"
-msgstr "Amri '%s' haitambuliki.\n"
-
-#: ../fdroidserver/checkupdates.py
-msgid "Commit changes"
-msgstr "Fanya mabadiliko"
-
-#: ../fdroidserver/checkupdates.py
-msgid "Commit changes, push, then make a merge request"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Conflicting \"{field}\" definitions between .yml and localized files:"
-msgstr "Ukinzani kati ya ufafanuzi wa \"{field}\" kati ya .yml na faili zilizojanibishwa:"
-
-#: ../fdroidserver/__main__.py
-msgid "Conflicting arguments: '--verbose' and '--quiet' can not be specified at the same time."
-msgstr "Hoja zinazokinzana: '--verbose' na '--quiet' haiwezi kubainishwa kwa wakati mmoja."
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Could not find '{command}' on your system"
-msgstr "Haikuweza kupata '{command}' kwenya mfumo wako"
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/import_subcommand.py
-msgid "Could not find latest version code"
-msgstr "Haikuweza kupata msimbo wa toleo wa hivi karibuni"
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
-#: ../fdroidserver/import_subcommand.py
-msgid "Could not find latest version name"
-msgstr "Haikuweza kupata jina la toleo la hivi karibuni"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Could not find {path} to remove it"
-msgstr "Haikuweza kupata {path} ili kuiondoa"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Could not open APK {path} for analysis: "
-msgstr "Haikuweza kufungua APK {path} kwa uchambuzi: "
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Could not parse size \"{size}\", wrong type \"{type}\""
-msgstr "Haikuweza kuchanganua ukubwa \"{size}\", aina isiyo sahihi \"{type}\""
-
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/import_subcommand.py
-msgid "Couldn't find Application ID"
-msgstr "Haikuweza kupata Kitambulisho cha apu"
-
-#: ../fdroidserver/checkupdates.py
-msgid "Couldn't find any version information"
-msgstr "Haikuweza kupata habari yoyote ya toleo"
-
-#: ../fdroidserver/checkupdates.py
-msgid "Couldn't find package ID"
-msgstr "Haikuweza kupata kitambulisho cha kifurushi"
-
-#: ../fdroidserver/update.py
-msgid "Cowardily refusing to overwrite existing signing key setup!"
-msgstr "Kwa uoga inakataa kuandika upya usanidi wa ufunguo wa saini uliopo!"
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Created new container \"{name}\""
-msgstr "Imeunda kontena mpya \"{name}\""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Creating \"{path}\" for configuring s3cmd."
-msgstr "Kuunda \"{path}\" kwa ajili ya kusanidi s3cmd."
-
-#: ../fdroidserver/common.py
-#, fuzzy, python-brace-format
-msgid "Creating empty {config_file}"
-msgstr "Kusoma '{config_file}'"
-
-#: ../fdroidserver/publish.py
-msgid "Creating log directory"
-msgstr "Inaunda saraka ya kumbukumbu"
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Creating new S3 bucket: {url}"
-msgstr "Inaunda ndoo mpya ya S3: {url}"
-
-#: ../fdroidserver/publish.py
-msgid "Creating output directory"
-msgstr "Inaunda saraka ya pato"
-
-#: ../fdroidserver/index.py
-msgid "Creating signed index with this key (SHA256):"
-msgstr "Inaunda kielezo kilichotiwa sahihi na ufunguo huu (SHA256):"
-
-#: ../fdroidserver/publish.py ../fdroidserver/verify.py
-msgid "Creating temporary directory"
-msgstr "Inaunda saraka ya muda mfupi"
-
-#: ../fdroidserver/index.py
-msgid "Creating unsigned index in preparation for signing"
-msgstr "Inaunda kielezo isiyotiwa sahihi kwa maandalizi ya kutiwa sahihi"
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "CurrentVersionCode {cv} is less than oldest build entry {versionCode}"
-msgstr "CurrentVersionCode {cv} ni chini kuliko kuingia ya ujenzi wa zamani {versionCode}"
-
-#: ../fdroidserver/nightly.py
-msgid "DEBUG_KEYSTORE is not set or the value is incomplete"
-msgstr "DEBUG_KEYSTORE haijawekwa au thamani yake haijakamilika"
-
-#: ../fdroidserver/update.py
-msgid "Delete APKs and/or OBBs without metadata from the repo"
-msgstr "Futa APK na/au OBB bila metadata kutoka kwa ghala"
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Deleting archive, repo is too big ({size} max {limit})"
-msgstr "Kufuta kumbukumbu, ghala ni kubwa mno ({size} upeo {limit})"
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Deleting git-mirror history, repo is too big ({size} max {limit})"
-msgstr "Kufuta historia ya git-mirror, ghala ni kubwa mno ({size} upeo {limit})"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Deleting unknown file: {path}"
-msgstr "Kufuta faili isiyojulikana: {path}"
-
-#: ../fdroidserver/lint.py
-#, python-format
-msgid "Description '%s' is just the app's summary"
-msgstr "Maelezo %s ni muhtasari ya apu tu"
-
-#: ../fdroidserver/lint.py
-msgid "Description has a duplicate line"
-msgstr "Maelezo ina mstari wa nakala"
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Description of length {length} is over the {limit} char limit"
-msgstr "Maelezo ya urefu {length} iko juu ya {limit} kikomo cha char"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Did you mean config/{name}.yml?"
-msgstr "Je, ulimaanisha config/{name}.yml?"
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Did you mean {code}?"
-msgstr "Je, ulimaanisha {code}?"
-
-#: ../fdroidserver/import_subcommand.py
-msgid "Do not add 'disable:' to the generated build entries"
-msgstr "Usiongeze 'disable:' kwa maingizo ya kujenga yaliyotokana nayo"
-
-#: ../fdroidserver/nightly.py
-msgid "Do not deploy the new files to the repo"
-msgstr "Usipeleke faili mpya kwenye ghala"
-
-#: ../fdroidserver/mirror.py
-#, python-brace-format
-msgid "Do not include \"{path}\" in URL!"
-msgstr "Usijumuishe \"{path}\" katika URL!"
-
-#: ../fdroidserver/init.py
-msgid "Do not prompt for Android SDK path, just fail"
-msgstr "Usiulize kuhusu njia ya SDK ya Android, feli tu"
-
-#: ../fdroidserver/nightly.py
-msgid "Do not remove the private keys generated from the keystore"
-msgstr "Usiondoe funguo za kibinafsi zilizotokana na keystore"
-
-#: ../fdroidserver/build.py
-msgid "Don't create a source tarball, useful when testing a build"
-msgstr "Usiunde tarball ya chanzo, muhimu wakati wa kujaribu jengo"
-
-#: ../fdroidserver/build.py
-msgid "Don't refresh the repository, useful when testing a build with no internet connection"
-msgstr "Usionyeshe upya ghala hio, muhimu wakati wa kujaribu jengo isiyo na muunganisho wa mtandao"
-
-#: ../fdroidserver/deploy.py ../fdroidserver/nightly.py
-msgid "Don't use rsync checksums"
-msgstr "Usitumie rsync checksums"
-
-#: ../fdroidserver/install.py
-msgid "Download F-Droid.apk using mirrors that leak less to the network"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Download complete mirrors of small repos"
-msgstr "Pakua vioo kamili vya maghala madogo"
-
-#: ../fdroidserver/common.py
-msgid "Downloading the repository already failed once, not trying again."
-msgstr "Kupakua ghala hio tayari imefeli mara moja, haijaribu tena."
-
-#: ../fdroidserver/verify.py
-#, python-brace-format
-msgid "Downloading {url} failed. {error}"
-msgstr "Kupakua {url} kulifeli. {error}"
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Duplicate Anti-Feature declaration at {path} was ignored!"
-msgstr "Nakala ingine ya tamko la kipengele kisichopendelewa katika {path} ilipuuzwa!"
-
-#: ../fdroidserver/index.py
-#, python-format
-msgid "Duplicate entry \"%s\" in mirrors config!"
-msgstr "Nakala ingine ya kuingia \"%s\" katika vioo vya usanidi!"
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Duplicate link in '{field}': {url}"
-msgstr "Nakala ingine ya kiungo katika '{field}': {url}"
-
-#: ../fdroidserver/common.py
-#, python-format
-msgid "ERROR: %(message)s"
-msgstr "HITILAFU: %(message)s"
-
-#: ../fdroidserver/__main__.py
-msgid "ERROR: The \"server\" subcommand has been removed, use \"deploy\"!"
-msgstr "HITILAFU: Amri ndogo ya \"server\" imetolewa, tumia \"deploy\"!"
-
-#: ../fdroidserver/nightly.py
-msgid "ERROR: unsupported CI type, patches welcome!"
-msgstr "HITILAFU: aina ya CI isiyoungwa mkono, marekebisho yanakaribishwa!"
-
-#: ../fdroidserver/nightly.py
-#, python-format
-msgid "ERROR: unsupported git host \"%s\", patches welcome!"
-msgstr "HITILAFU: mwenyeji wa git isiyoungwa mkono \"%s\", marekebisho yanakaribishwa!"
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "ERROR: {key} in {path} is not \"archive\" or \"repo\"!"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "ERROR: {key} not a valid key!"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "ERROR: {key}'s value should be of type {t}!"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "ERROR: {key}:{subkey} in {path} is not in allowed keys: {allowed_keys}!"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-#, python-brace-format
-msgid "Encoding is set to '{enc}' fdroid might run into encoding issues. Please set it to 'UTF-8' for best results."
-msgstr "Usimbaji umewekwa kwa '{enc}' fdroid yaweza kupata matatizo ya usimbaji. Tafadhali iweke kwenye 'UTF-8' kwa matokeo bora."
-
-#: ../fdroidserver/init.py
-#, python-format
-msgid ""
-"Enter the path to the Android SDK (%s) here:\n"
-"> "
-msgstr ""
-"Ingiza njia ya SDK ya Android (%s) hapa:\n"
-"> "
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Environment variable {var} from {configname} is not set!"
-msgstr "Vigezo vya mazingira {var} kutoka {configname} haijawekwa!"
-
-#: ../fdroidserver/common.py
-#, fuzzy, python-brace-format
-msgid "Environment variable {{env: {var}}} is not set!"
-msgstr "Vigezo vya mazingira {var} kutoka {configname} haijawekwa!"
-
-#: ../fdroidserver/deploy.py
-msgid "Error deploying 'github_releases', {} not present. (You might need to run `fdroid update` first.)"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
-msgid "Error while getting repo address"
-msgstr "Kuna hitilafu wakati wa kupata anwani ya ghala"
-
-#: ../fdroidserver/scanner.py
-msgid "Exit with a non-zero code if problems were found"
-msgstr "Ondoka na msimbo usio wa sufuri ikiwa matatizo yalipatikana"
-
-#: ../fdroidserver/__main__.py
-msgid "Extract application metadata from a source repository"
-msgstr "Pata metadata ya apu kutoka kwa ghala ya chanzo"
-
-#: ../fdroidserver/__main__.py
-msgid "Extract signatures from APKs"
-msgstr "Pata sahihi kutoka kwa APKs"
-
-#: ../fdroidserver/install.py
-msgid "F-Droid.apk could not be downloaded from any known source!"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Failed copying {path}: {error}"
-msgstr "Imeshindwa kunakili {path}:{error}"
-
-#: ../fdroidserver/signatures.py
-#, python-brace-format
-msgid "Failed fetching signatures for '{apkfilename}': {error}"
-msgstr "Imeshindwa kupakua sahihi za '{apkfilename}':{error}"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Failed reading {path}: {error}"
-msgstr "Imeshindwa kusoma {path}: {error}"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Failed resizing {path}: {error}"
-msgstr "Imeshindwa kubadilisha ukubwa {path}: {error}"
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Failed to create S3 bucket: {url}"
-msgstr "Imeshindwa kuunda ndoo ya S3: {url}"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Failed to get APK information, deleting {path}"
-msgstr "Imeshindwa kupata maelezo ya APK, kufuta {path}"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Failed to get APK information, skipping {path}"
-msgstr "Imeshindwa kupata maelezo ya APK. inaruka {path}"
-
-#: ../fdroidserver/update.py
-msgid "Failed to get APK signing key fingerprint"
-msgstr "Imeshindwa kupata alama ya kidole ya ufunguo wa kusaini APK"
-
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "Failed to install '{apkfilename}' on {dev}: {error}"
-msgstr "Imeshindwa kusimika '{apkfilename}' kwenye {dev}: {error}"
-
-#: ../fdroidserver/common.py
-msgid "Failed to sign application"
-msgstr "Imeshindwa kusaini apu"
-
-#: ../fdroidserver/build.py
-#, python-brace-format
-msgid "Fetched buildserverid from VM: {buildserverid}"
-msgstr "buildserverid imepakiwa kutoka kwa VM: {buildserverid}"
-
-#: ../fdroidserver/signatures.py
-#, python-brace-format
-msgid "Fetched signatures for '{apkfilename}' -> '{sigdir}'"
-msgstr "Saini zimepakiwa kwa '{apkfilename}' -> '{sigdir}'"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "File disappeared while processing it: {path}"
-msgstr "Faili ilipotea wakati wa kuichakata: {path}"
-
-#: ../fdroidserver/build.py ../fdroidserver/install.py
-#: ../fdroidserver/rewritemeta.py ../fdroidserver/scanner.py
-#: ../fdroidserver/update.py
-msgid "Finished"
-msgstr "Imekamilika"
-
-#: ../fdroidserver/lint.py
-msgid "Forbidden HTML tags"
-msgstr "Tagi za HTML zilizokatazwa"
-
-#: ../fdroidserver/build.py
-msgid "Force build of disabled apps, and carries on regardless of scan problems. Only allowed in test mode."
-msgstr "Kulazimisha ujenzi wa apu zilizozimwa, na kuendelea bila kujali matatizo ya uchanganuzi. Inaruhusiwa tu katika hali ya majaribio."
-
-#: ../fdroidserver/build.py
-#, python-brace-format
-msgid "Force halting build after {0} sec timeout!"
-msgstr "Kulazimisha kusitisha ujenzi baada ya muda wa sekunde {0} kumalizika!"
-
-#: ../fdroidserver/scanner.py
-msgid "Force scan of disabled apps and builds."
-msgstr "Kulazimisha kuchanganua kwa apu zilizozimwa na kujenga."
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Found \"{path}\" graphic without metadata for app \"{name}\"!"
-msgstr "Imepata mchoro wa \"{path}\" bila metadata kwa apu \"{name}\"!"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Found bad funding file \"{path}\" for \"{name}\":"
-msgstr "Imepata faili ya fedha mbaya \"{path}\" ya \"{name}\":"
-
-#: ../fdroidserver/common.py
-msgid "Found invalid appids in arguments"
-msgstr "Imepata appids batili katika hoja"
-
-#: ../fdroidserver/common.py
-msgid "Found invalid versionCodes for some apps"
-msgstr "Ilipata versionCodes batili katika baadhi ya apu"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Found multiple JAR Signature Block Files in {path}"
-msgstr "Imepata faili nyingi za JAR Signature Block katika {path}"
-
-#: ../fdroidserver/common.py
-msgid "Found multiple Signer Certificates!"
-msgstr "Imepata Vyeti vingi vya Signer!"
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Found multiple metadata files for {appid}"
-msgstr "Imepata faili nyingi za metadata kwa {appid}"
-
-#: ../fdroidserver/index.py
-msgid "Found multiple signing certificates for repository."
-msgstr "Imepata vyeti vingi vya kusaini ya ghala."
-
-#: ../fdroidserver/index.py
-msgid "Found no signing certificates for repository."
-msgstr "Haikupata vyeti vyovyote vya kusaini ya ghala."
-
-#: ../fdroidserver/lint.py
-#, python-format
-msgid "Found non-file at %s"
-msgstr "Imepata kitu kisicho faili katika %s"
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Found {apkfilename} at {url}"
-msgstr "Imepata {apkfilename} katika {url}"
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Found {count} problems in {filename}"
-msgstr "Imepata matatizo ya {count} katika {filename}"
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Found {count} warnings in {filename}"
-msgstr "Imepata onyo {count} katika {filename}"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Generated skeleton metadata for {appid}"
-msgstr "Imeunda metadata ya kiunzi kwa {appid}"
-
-#: ../fdroidserver/common.py
-#, python-format
-msgid "Git checkout of '%s' failed"
-msgstr "Git toa ya '%s' ilishindwa"
-
-#: ../fdroidserver/common.py
-msgid "Git clean failed"
-msgstr "Git clean imeshindwa"
-
-#: ../fdroidserver/common.py
-msgid "Git fetch failed"
-msgstr "Git fetch imeshindwa"
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/common.py
-#, python-format
-msgid "Git remote set-head failed: \"%s\""
-msgstr "Git remote set-head imeshindwa: \"%s\""
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/common.py
-msgid "Git reset failed"
-msgstr "Git reset imeshindwa"
-
-#: ../fdroidserver/common.py
-msgid "Git submodule deinit failed"
-msgstr "Git submodule deinit imefeli"
-
-#: ../fdroidserver/common.py
-msgid "Git submodule sync failed"
-msgstr "Git Submodule sync imefeli"
-
-#: ../fdroidserver/common.py
-msgid "Git submodule update failed"
-msgstr "Git submodule update imefeli"
-
-#: ../fdroidserver/common.py
-msgid "HTTPS must be used with Subversion URLs!"
-msgstr "HTTPS lazima zitumike na URL za Subversion!"
-
-#: ../fdroidserver/deploy.py
-msgid "If a git mirror gets to big, allow the archive to be deleted"
-msgstr "Ikiwa kioo cha git kinakua kikubwa, ruhusu kumbukumbu ifutwe"
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "If this upload fails, try manually uploading to {url}"
-msgstr "Ikiwa kupakia hii inafeli, jaribu kupakia mwenyewe kwa {url}"
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Ignoring '{field}' in '{metapath}' metadata because it is deprecated."
-msgstr "Inapuuza '{field}' katika metadata ya '{metapath}' kwa sababu imepitwa na wakati."
-
-#: ../fdroidserver/update.py
-#, python-format
-msgid "Ignoring FUNDING.yml entry longer than 2048: %s"
-msgstr "Inapuuza ingizo la FUNDING.yml iliyo ndefu kuliko 2048: %s"
-
-#: ../fdroidserver/update.py
-#, python-format
-msgid "Ignoring bad element in manifest: %s"
-msgstr "Inapuuza kipengele kibaya katika manifest: %s"
-
-#: ../fdroidserver/common.py
-#, fuzzy, python-brace-format
-msgid "Ignoring deprecated {oldfile}, use {newfile}!"
-msgstr "{oldfile} imewacha kutumika, tumia {newfile}"
-
-#: ../fdroidserver/index.py
-msgid "Ignoring package without metadata: "
-msgstr "Inapuuza kifurushi kisicho na metadata: "
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Ignoring stale cache data for {apkfilename}"
-msgstr "Inapuuza data ya cache isiyo na maana kwa {apkfilename}"
-
-#: ../fdroidserver/update.py
-msgid "Include APKs that are signed with disabled algorithms like MD5"
-msgstr "Jumuisha APK ambazo zimesainiwa na algoriti zilizozimwa kama MD5"
-
-#: ../fdroidserver/mirror.py
-msgid "Include the PGP signature .asc files in the mirror"
-msgstr "Jumuisha faili za sahihi za PGP .asc kwenye kioo"
-
-#: ../fdroidserver/mirror.py
-msgid "Include the build logs in the mirror"
-msgstr "Jumuisha logi za ujenzi kwenye kioo"
-
-#: ../fdroidserver/mirror.py
-msgid "Include the source tarballs in the mirror"
-msgstr "Jumuisha tarballs za chanzo kwenye kioo"
-
-#: ../fdroidserver/metadata.py
-#, python-format
-msgid "Including metadata from %s@%s"
-msgstr "Inajumuisha metadata kutoka %s@%s"
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Including metadata from {path}"
-msgstr "Inajumuisha metadata kutoka {path}"
-
-#: ../fdroidserver/common.py
-msgid "Initialising submodules"
-msgstr "Kuanzisha submodules"
-
-#: ../fdroidserver/install.py
-msgid "Install all signed applications available"
-msgstr "Simika apu zote zilizosainiwa zinazopatikana"
-
-#: ../fdroidserver/__main__.py
-msgid "Install built packages on devices"
-msgstr "Sakinisha vifurushi kwenye vifaa"
-
-#: ../fdroidserver/install.py
-#, python-format
-msgid "Installing %s..."
-msgstr "Inasimika %s..."
-
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "Installing '{apkfilename}' on {dev}..."
-msgstr "Inasimika '{apkfilename}' kwenye {dev}..."
-
-#: ../fdroidserver/__main__.py
-msgid "Interact with the repo HTTP server"
-msgstr "Wasiliana na seva ya ghala ya HTTP"
-
-#: ../fdroidserver/update.py
-msgid "Invalid APK"
-msgstr "APK batili"
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "Invalid AutoUpdateMode: {mode}"
-msgstr "AutoUpdateMode batili: {mode}"
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "Invalid UpdateCheckMode: {mode}"
-msgstr "UpdateCheckMode batili: {mode}"
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "Invalid VercodeOperation: {field}"
-msgstr "VercodeOperation batili: {field}"
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Invalid VercodeOperation: {invalid_ops}"
-msgstr "VercodeOperation batili: {invalid_ops}"
-
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Invalid application ID {appid}"
-msgstr "Kitambulisho batili cha apu {appid}"
-
-#: ../fdroidserver/lint.py
-msgid "Invalid bulleted list"
-msgstr "Orodha ya vitone batili"
-
-#: ../fdroidserver/common.py
-#, python-format
-msgid "Invalid name for published file: %s"
-msgstr "Jina batili kwa faili zilizochapishwa: %s"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Invalid ndk: entry in build: \"{ndk}\""
-msgstr "ndk batili: ingizo la jenga: \"{ndk}\""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Invalid redirect to non-HTTPS: {before} -> {after} "
-msgstr "Elekezo mpya batili kwa non-HTTPS:{before} -> {after} "
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Invalid scrlib metadata: '{file}' does not exist"
-msgstr "metadata ya scrlib batili: '{file}' haipo"
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Invalid srclib metadata: could not parse '{file}'"
-msgstr "Metadata ya srclib batili: haikuweza kuchambua '{file}'"
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Invalid srclib metadata: unknown key '{key}' in '{file}'"
-msgstr "Metadata batili ya srclib: ufunguo usiojulikana '{key}' katika '{file}'"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "JAR signature failed to verify: {path}"
-msgstr "Uthibitisho wa sahihi wa JAR ulishindwa: {path}"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "JAR signature verified: {path}"
-msgstr "Sahihi ya JAR imethibitishwa: {path}"
-
-#: ../fdroidserver/scanner.py
-msgid "Java JAR file"
-msgstr "Faili ya JAR ya Java"
-
-#: ../fdroidserver/mirror.py ../fdroidserver/publish.py
-#: ../fdroidserver/update.py
-msgid "Java JDK not found! Install in standard location or set java_paths!"
-msgstr "JDK ya Java haijapatikana! Simika katika sehemu ya kiwango au seti java_paths!"
-
-#: ../fdroidserver/scanner.py
-msgid "Java compiled class"
-msgstr "Darasa lililokusanywa la Java"
-
-#: ../fdroidserver/signindex.py
-msgid "Java jarsigner not found! Install in standard location or set java_paths!"
-msgstr "jarsigner ya Java haijapatikana! Simika katika sehemu ya kawaida au seti java_paths!"
-
-#: ../fdroidserver/lint.py
-msgid "Javascript in HTML src attributes"
-msgstr "Javascript katika sifa za HTML src"
-
-#: ../fdroidserver/build.py
-#, python-brace-format
-msgid "Keeping failed build \"{apkfilename}\""
-msgstr "Kuweka jenga zilizofeli \"{apkfilename}\""
-
-#: ../fdroidserver/init.py
-msgid "Keystore for signing key:\t"
-msgstr "Hifadhi ya ufunguo ya kusaini ufunguo:\t"
-
-#: ../fdroidserver/lint.py
-msgid "Known debug key is used in AllowedAPKSigningKeys: "
-msgstr "Ufunguo wa utatuzi unaojulikana inatumika kwa AllowedAPKSigningKeys: "
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Last used commit '{commit}' looks like a tag, but UpdateCheckMode is '{ucm}'"
-msgstr "Mabadiliko ya mwisho yaliyotumika ya '{commit}' yanafanana na tagi, lakini UpdateCheckMode ni '{ucm}'"
-
-#: ../fdroidserver/lint.py
-msgid "Liberapay donation methods belong in the Liberapay: field"
-msgstr "Njia za mchango ya Liberapay ipo ndani ya Liberapay: field"
-
-#: ../fdroidserver/rewritemeta.py
-msgid "List files that would be reformatted (dry run)"
-msgstr "Orodhesha faili ambazo zitarekebishwa muundo (dry run)"
-
-#: ../fdroidserver/lint.py
-msgid "Locale included in f-droid.org URL"
-msgstr "Eneo limejumuishwa katika URL ya f-droid.org"
-
-#: ../fdroidserver/build.py
-msgid "Make the build stop on exceptions"
-msgstr "Fanya ujenzi kuacha kwa ubaguzi"
-
-#: ../fdroidserver/index.py
-msgid "Malformed repository mirrors."
-msgstr "Vioo vya ghala yenye umbo mbovu."
-
-#: ../fdroidserver/deploy.py
-msgid "Malformed serverwebroot line:"
-msgstr "Laini ya serverwebroot yenye umbo bovu:"
-
-#: ../fdroidserver/scanner.py
-#, python-format
-msgid "Max recursion depth in ZIP file reached: %s"
-msgstr "Upeo wa kina cha urejeshaji katika faili ya ZIP umefikiwa: %s"
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "Mirror config for {url} contains \"isPrimary\" key!"
-msgstr ""
-
-#: ../fdroidserver/mirror.py
-msgid "Mirror the full repo and archive, all file types."
-msgstr "Akisi ghala mzima na uhifadhi, aina zote za faili."
-
-#: ../fdroidserver/gpgsign.py
-msgid "Missing output directory"
-msgstr "Saraka ya pato haipo"
-
-#: ../fdroidserver/metadata.py
-msgid "Moving Anti-Features declarations to localized files:"
-msgstr "Inasongesha tamko la Anti-Features hadi kwa faili zilizolocaliziwa:"
-
-#: ../fdroidserver/index.py
-msgid "Neither \"repo_pubkey\" nor \"keystorepass\" set in config.yml"
-msgstr "Si \"repo_pubkey\" wala \"keystorepass\" iliyowekwa kwenye config.yml"
-
-#: ../fdroidserver/verify.py
-#, python-format
-msgid "No APK for package: %s"
-msgstr "Hakuna APK ya kifurushi: %s"
-
-#: ../fdroidserver/common.py
-msgid "No Android SDK found!"
-msgstr "Hakuna SDK ya Android Iliyopatikana!"
-
-#: ../fdroidserver/install.py
-msgid "No attached devices found"
-msgstr "Hakuna vifaa vilivyoambatanishwa vimepatikana"
-
-#: ../fdroidserver/install.py
-msgid "No devices found for `adb install`! Please plug one in."
-msgstr ""
-
-#: ../fdroidserver/index.py
-msgid "No fingerprint in URL."
-msgstr "Hakuna alama ya kidole kwenye URL."
-
-#: ../fdroidserver/common.py
-msgid "No git submodules available"
-msgstr "Hakuna submodule za git inayopatikana"
-
-#: ../fdroidserver/import_subcommand.py
-msgid "No gradle project could be found. Specify --subdir?"
-msgstr "Hakuna mradi wa gradle imeweza kupatikana. Bainisha --subdir?"
-
-#: ../fdroidserver/import_subcommand.py
-msgid "No information found."
-msgstr "Hakuna taarifa imepatikana."
-
-#: ../fdroidserver/checkupdates.py
-msgid "No matching tags found"
-msgstr "Hakuna tagi zimepatikana zinazolingana"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "No minimum SDK version found in {0}, using default (3)."
-msgstr "Hakuna toleo la chini zaidi la SDK limepatikana katika {0}, kutumia chaguo-msingi (3)."
-
-#: ../fdroidserver/lint.py
-msgid "No need to specify that the app is Free Software"
-msgstr "Hakuna haja ya kubainisha kuwa apu ni apu Huru"
-
-#: ../fdroidserver/lint.py
-msgid "No need to specify that the app is for Android"
-msgstr "Hiana haja ya kubainisha kuwa apu hio ni ya Android"
-
-#: ../fdroidserver/deploy.py
-msgid "No option set! Edit your config.yml to set at least one of these:"
-msgstr "Hakuna chaguo lililowekwa! Hariri config.yml iweke angalau moja ya hizi:"
-
-#: ../fdroidserver/common.py
-msgid "No packages specified"
-msgstr "Hakuna vifurishi vilivyobainishwa"
-
-#: ../fdroidserver/install.py
-#, python-format
-msgid "No signed APK available for %s"
-msgstr "Hakuna APK iliyosainiwa inayopatikana ya %s"
-
-#: ../fdroidserver/install.py
-msgid "No signed output directory - nothing to do"
-msgstr "Hakuna saraka la pato lililosainiwa - hakuna cha kufanya"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "No signing certificates found in {path}"
-msgstr "Hakuna vyeti vya kusaini vimepatikana katika {path}"
-
-#: ../fdroidserver/common.py
-#, python-format
-msgid "No such package: %s"
-msgstr "Hakuna kifurushi kama vile: %s"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "No such versionCode {versionCode} for app {appid}"
-msgstr "Hakuna versionCode kama hio {versionCode} kwa apu {appid}"
-
-#: ../fdroidserver/checkupdates.py
-msgid "No tags found"
-msgstr "Hakuna vishikozo vilivyopatikana"
-
-#: ../fdroidserver/publish.py ../fdroidserver/verify.py
-msgid "No unsigned directory - nothing to do"
-msgstr "Hakuna saraka isiyotiwa saini - hakuna la kufanya"
-
-#: ../fdroidserver/__main__.py
-msgid "No version information could be found."
-msgstr "Hakuna taarifa ya toleo iliyoweza kupatikana."
-
-#: ../fdroidserver/common.py
-msgid "Not a valid size definition: \"{}\""
-msgstr "Sio ufafanuzi halali wa ukubwa: \"{}\""
-
-#: ../fdroidserver/signindex.py
-msgid "Nothing to do"
-msgstr "Hakuna la kufanya"
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "Nothing to do for {appid}."
-msgstr "Hakuna la kufanya kwa {appid}."
-
-#: ../fdroidserver/init.py
-msgid "Now set these in config.yml:"
-msgstr "Sasa seti hizi katika config.yml:"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "OBB file has newer versionCode({integer}) than any APK:"
-msgstr "Faili ya OBB ina versionCode mpya ({integer}) kuliko APK yoyote:"
-
-#: ../fdroidserver/update.py
-msgid "OBB filename must start with \"main.\" or \"patch.\":"
-msgstr "Jina la faili ya OBB lazima ianze na \"main.\" au \"patch.\":"
-
-#: ../fdroidserver/update.py
-msgid "OBB's packagename does not match a supported APK:"
-msgstr "Jina la kifurushi cha OBB hailingani na APK inayoungwa mkono:"
-
-#: ../fdroidserver/deploy.py
-msgid "Offline machine, skipping git mirror generation until `fdroid deploy`"
-msgstr "Machini iliyo nje ya mtandao, inapuuza uundaji wa kioo cha git mpaka 'fdroid deploy'"
-
-#: ../fdroidserver/deploy.py
-msgid "One of the 'github_releases' config items is missing the 'packageNames' value. skipping ..."
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "One of the 'github_releases' config items is missing the 'projectUrl' value. skipping ..."
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "One of the 'github_releases' config items is missing the 'token' value. skipping ..."
-msgstr ""
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Only PNG and JPEG are supported for graphics, found: {path}"
-msgstr "PNG na JPEG pekee zinakubalika katika mchoro, zimepata: {path}"
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/common.py
-msgid "Only accepts a single key \"env\""
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "Only process apps with auto-updates"
-msgstr "Chakata apu zilizo na masasisho ya kiotomatiki pekee"
-
-#: ../fdroidserver/lint.py
-msgid "OpenCollective donation methods belong in the OpenCollective: field"
-msgstr "Njia za Mchango wa OpenCollective inapatikana kwenye OpenCollective: uwanja"
-
-#: ../fdroidserver/verify.py
-msgid "Output JSON report to file named after APK."
-msgstr "Toa ripoti ya JSON kwa faili iliyopewa jina la APK."
-
-#: ../fdroidserver/scanner.py
-msgid "Output JSON to stdout."
-msgstr "Toa JSON kwa stdout."
-
-#: ../fdroidserver/checkupdates.py ../fdroidserver/gpgsign.py
-#: ../fdroidserver/publish.py ../fdroidserver/signindex.py
-#: ../fdroidserver/update.py
-msgid "Outputting JSON"
-msgstr "Kuzalisha JSON"
-
-#: ../fdroidserver/import_subcommand.py
-msgid "Overall license of the project."
-msgstr "Leseni ya jumla ya mradi ."
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "Overriding blank versionName in {apkfilename} from metadata: {version}"
-msgstr "Kubatilisha toleo la jina tupu katika {apkfilename} kutoka kwa metadata: {version}"
-
-#: ../fdroidserver/import_subcommand.py
-#, python-brace-format
-msgid "Package \"{appid}\" already exists"
-msgstr "Kifurushi \"{appid}\" tayari kipo"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Parsing manifest at '{path}'"
-msgstr "Kuchambua manifest katika '{path}'"
-
-#: ../fdroidserver/common.py
-msgid "Password required with username"
-msgstr "Nenosiri linahitajika pamoja na jina la mtumiaji"
-
-#: ../fdroidserver/import_subcommand.py
-msgid "Path to main Android project subdirectory, if not in root."
-msgstr "Ielekeze kwenye saraka ndogo ya mradi kuu wa Android, ikiwa haipo kwenye mzizi."
-
-#: ../fdroidserver/init.py
-msgid "Path to the Android SDK (sometimes set in ANDROID_HOME)"
-msgstr "Ielekeze kwa SDK ya Android (mara nyingine husetiwa katika ANDROID_HOME)"
-
-#: ../fdroidserver/btlog.py
-msgid "Path to the git repo to use as the log"
-msgstr "Ielekeze kwa ghala ya git ili kutumia kama logi"
-
-#: ../fdroidserver/init.py
-msgid "Path to the keystore for the repo signing key"
-msgstr "Ielekeze kwa keystore kwa ufunguo wa kusaini ghala"
-
-#: ../fdroidserver/nightly.py
-msgid "Print the secret variable to the terminal for easy copy/paste"
-msgstr "Chapisha kigezo hicho cha siri kwa kidirisha cha amri kwa urahisi wa kunakili/kubandika"
-
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "Privacy mode was enabled based on your locale ({country_code})."
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-format
-msgid "Problem with ZIP file: %s, error %s"
-msgstr "Tatizo na faili ya ZIP:%s, hitilafu %s"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Problem with xml at '{path}'"
-msgstr "Tatiza na xml katika '{path}'"
-
-#: ../fdroidserver/checkupdates.py
-msgid "Process auto-updates"
-msgstr "Chakata masasisho ya kiotomatiki"
-
-#: ../fdroidserver/publish.py ../fdroidserver/update.py
-#, python-brace-format
-msgid "Processing {apkfilename}"
-msgstr "Kuchakata {apkfilename}"
-
-#: ../fdroidserver/checkupdates.py ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Processing {appid}"
-msgstr "Kuchakata {appid}"
-
-#: ../fdroidserver/update.py
-msgid "Produce human-readable XML/JSON for index files"
-msgstr "Chakata XML/JSON inayosomeka na binadamu kwa faili za index"
-
-#: ../fdroidserver/import_subcommand.py
-msgid "Project URL to import from."
-msgstr "URL ya Mradi wa kuagiza kutoka."
-
-#: ../fdroidserver/lint.py
-msgid "Punctuation should be avoided"
-msgstr "Uakifishaji unapaswa kuepukwa"
-
-#: ../fdroidserver/btlog.py
-msgid "Push the log to this git remote repository"
-msgstr "Sukuma logi hio kwa ghala hili la mbali la git"
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Pushing binary transparency log to {url}"
-msgstr "Kusukuma logi ya uwazi ya binari kwa {url}"
-
-#: ../fdroidserver/deploy.py
-msgid "Pushing to remote server failed!"
-msgstr "Kusukuma kwa seva ya mbali imefeli!"
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Pushing to {url}"
-msgstr "Kusukuma kwa {url}"
-
-#: ../fdroidserver/__main__.py
-msgid "Quickly start a new repository"
-msgstr "Anzisha ghala mpya kwa haraka"
-
-#: ../fdroidserver/__main__.py
-msgid "Read all the metadata files and exit"
-msgstr "Soma faili zote za metadata na uondoke"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Reading '{config_file}'"
-msgstr "Kusoma '{config_file}'"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Reading packageName/versionCode/versionName failed, APK invalid: '{apkfilename}'"
-msgstr "Kusoma packageName/versionCode/versionName ilifeli, APK batili: '{apkfilename}'"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Reading packageName/versionCode/versionName failed,APK invalid: '{apkfilename}'"
-msgstr "Kusoma packageName/versionCode/versionName ilifeli,APK batili: '{apkfilename}'"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Reading {apkfilename} from cache"
-msgstr "Kusoma {apkfilename} kutoka kwa hifadhi ya muda"
-
-#: ../fdroidserver/build.py
-msgid "Refresh and cache scanner rules and signatures from the network"
-msgstr "Onyesha upya na uweke kwenye hifadhi ya muda kanuni za skana na sahihi kutoka kwenye mtandao"
-
-#: ../fdroidserver/publish.py
-#, python-brace-format
-msgid "Refusing to sign '{path}', file exists in both {dir1} and {dir2} folder."
-msgstr ""
-
-#: ../fdroidserver/verify.py
-msgid "Remove source tarball and any APKs if successfully verified."
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "Removing specified files"
-msgstr "Kuondoa faili zilizobainishwa"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Removing {path}\""
-msgstr "Kuondoa {path}\""
-
-#: ../fdroidserver/update.py
-msgid "Rename APK files that do not match package.name_123.apk"
-msgstr "Badilisha jina la faili za APK ambazo hazilingani na package.name_123.apk"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "RepoType {type} is deprecated, please switch to git."
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-#, python-brace-format
-msgid "Resigning {apkfilename} with provided debug.keystore"
-msgstr "Saini upya {apkfilename} kwa debug.keystore ulizopewa"
-
-#: ../fdroidserver/update.py
-msgid "Resize all the icons exceeding the max pixel size and exit"
-msgstr "Badilisha ukubwa wa ikoni zote zinazopita saizi kubwa ya pixel kisha uondoke"
-
-#: ../fdroidserver/common.py
-msgid "Restrict output to warnings and errors"
-msgstr "Zuia pato iwe onyo na hitilafu"
-
-#: ../fdroidserver/net.py
-#, python-format
-msgid "Retrying failed download: %s"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Rewrite all the metadata files"
-msgstr "Andika upya faili zote za metadata"
-
-#: ../fdroidserver/rewritemeta.py
-#, python-brace-format
-msgid "Rewriting '{appid}'"
-msgstr "Kuandika upya '{appid}'"
-
-#: ../fdroidserver/checkupdates.py
-msgid "Run on git repo that has uncommitted changes"
-msgstr "Endesha kwenye ghala la git ambalo lina mabadiliko yasiyohifadhiwa"
-
-#: ../fdroidserver/nightly.py
-#, python-brace-format
-msgid "Run over {cibase} to find -debug.apk. and skip repo_basedir {repo_basedir}"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "Run rewritemeta to fix formatting"
-msgstr "Tekeleza rewritemeta ili kurekebisha uumbizaji"
-
-#: ../fdroidserver/deploy.py
-msgid "Running first pass with MD5 checking disabled"
-msgstr "Kutekeleza pasi ya kwanza na kuangalia kwa MD5 ikiwa imezimwa"
-
-#: ../fdroidserver/mirror.py
-#, python-brace-format
-msgid "Running wget in {path}"
-msgstr "Kuendesha wget katika {path}"
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "SHA-256 of {url} does not match entry!"
-msgstr "SHA-256 ya {url} hailingani ingizo!"
-
-#: ../fdroidserver/build.py
-msgid "Scan the resulting APK(s) for known non-free classes."
-msgstr "Changanua APK zilizotokana na mchakato kwa madarasa yasiyo huru yanayojulikana."
-
-#: ../fdroidserver/__main__.py
-msgid "Scan the source code of a package"
-msgstr "Changanua msimbo chanzo cha kifurushi"
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Scanner found {count} problems in {apk}"
-msgstr "Skena imepata matatizo {count} katika {apk}"
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Scanner found {count} problems in {appid}:"
-msgstr "Skena imepata matatizo {count} katika {appid}:"
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Scanner found {count} problems in {appid}:{versionCode}:"
-msgstr "Skena imepata matatizo {count} katika {appid}:{versionCode}:"
-
-#: ../fdroidserver/build.py
-msgid "Scanner found {} problem"
-msgid_plural "Scanner found {} problems"
-msgstr[0] "Skena imepata tatizo {}"
-msgstr[1] "Skena zimepata matatizo {}"
-
-#: ../fdroidserver/scanner.py
-msgid "Scanning APK for extra signing blocks."
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "Scanning APK with dexdump for known non-free classes."
-msgstr "Kuchanganua APK kwa kutumia dexdump kwa madarasa yanayojulikana kuwa si huru."
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Set NDK {release} ({version}) up"
-msgstr "Seti {release} ya NDK ( {version}) iwe juu"
-
-#: ../fdroidserver/common.py
-msgid "Set clock to that time using:"
-msgstr "Weka saa kwa wakati huo ukitumia:"
-
-#: ../fdroidserver/nightly.py
-msgid "Set maximum releases in repo before older ones are archived"
-msgstr "Weka idadi ya juu ya matoleo katika ghala kabla zile mzee zimehifadhiwa kwenye kumbukumbu"
-
-#: ../fdroidserver/build.py
-#, python-brace-format
-msgid "Set open file limit to {integer}"
-msgstr "Weka kikomo cha faili iliyo wazi kwa {integer}"
-
-#: ../fdroidserver/__main__.py
-msgid "Set up an app build for a nightly build repo"
-msgstr "Sanidisha ujenzi wa apu kwa ajili ya ghala la ujenzi wa usiku"
-
-#: ../fdroidserver/build.py
-msgid "Setting open file limit failed: "
-msgstr "Weka kikomo cha faili iliyo wazi imefeli: "
-
-#: ../fdroidserver/build.py
-#, python-brace-format
-msgid "Setting {0} sec timeout for this build"
-msgstr "Kuweka muda wa sekunde {0} kwa ajili ya ujenzi huu"
-
-#: ../fdroidserver/__main__.py
-msgid "Sign and place packages in the repo"
-msgstr "Saini na uweke vifurushi kwenye ghala"
-
-#: ../fdroidserver/__main__.py
-msgid "Sign indexes created using update --nosign"
-msgstr "Saini faharasa zilizoundwa kwa kutumia sasisho --nosign"
-
-#: ../fdroidserver/build.py
-msgid "Skip scanning the source code for binaries and other problems"
-msgstr "Ruka kuchanganua msimbo wa chanzo kwa binari na tatizo zingine"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Skipping '{apkfilename}' with invalid signature!"
-msgstr "Kuruka '{apkfilename}' iliyo na saini batili!"
-
-#: ../fdroidserver/deploy.py ../fdroidserver/index.py
-#, python-format
-msgid "Skipping GitLab Pages mirror because the repo is too large (>%.2fGB)!"
-msgstr "Kuruka kioo cha GitLab Pages kwa sababu ghala ni kubwa mno (>%.2fGB)!"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Skipping index generation for {appid}"
-msgstr "Inaruka uzalishaji wa faharasa kwa {appid}"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Skipping {apkfilename} with invalid signature!"
-msgstr "Inaruka {apkfilename} yenye saini batili!"
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Skipping {appid}: disabled"
-msgstr "Inaruka {appid}: Imezimwa"
-
-#: ../fdroidserver/deploy.py
-msgid "Specify a local folder to sync the repo to"
-msgstr "Bainisha folda ya ndani ya kusawazisha hio ghala kwa"
-
-#: ../fdroidserver/deploy.py
-msgid "Specify an identity file to provide to SSH for rsyncing"
-msgstr "Bainisha faili ya kutambuliwa ili kutoa kwa SSH kwa ajili ya kusawazisha tena"
-
-#: ../fdroidserver/nightly.py
-msgid "Specify which debug keystore file to use."
-msgstr "Bainisha ni faili ya ufunguo wa debug wa kijaribio kutumia."
-
-#: ../fdroidserver/common.py
-msgid "Spew out even more information than normal"
-msgstr "Toa habari hata zaidi ya kawaida"
-
-#: ../fdroidserver/nightly.py
-#, python-brace-format
-msgid "Stripping mystery signature from {apkfilename}"
-msgstr "Kuondoa saini ya siri kutoka {apkfilename}"
-
-#: ../fdroidserver/lint.py
-#, python-format
-msgid "Summary '%s' is just the app's name"
-msgstr "Muhtasari '%s' ni jina tu ya apu hio"
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Summary of length {length} is over the {limit} char limit"
-msgstr "Muhtasari wa urefu {length} ni juu ya {limit} kikomo cha char"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "System clock is older than date in {path}!"
-msgstr "Saa ya mfumo ni mzee kuliko tarehe katika {path}!"
-
-#: ../fdroidserver/checkupdates.py
-msgid "Tags update mode only works for git, hg, bzr and git-svn repositories currently"
-msgstr "Modi ya sasisho la tagi inafanya kazi tu kwa ghala za git,hg, bzr na git-svn kwa sasa"
-
-#: ../fdroidserver/checkupdates.py
-msgid "Tags update mode used in git-svn, but the repo was not set up with tags"
-msgstr "Hali ya usasisho ya tagi imetumika katika git-svn, lakini ghala haikusetiwa kwa kutumia tagi"
-
-#: ../fdroidserver/build.py
-msgid "Test mode - put output in the tmp directory only, and always build, even if the output already exists."
-msgstr "Hali ya majaribio - weka pato kwenye saraka ya tmp pekee, na uunde kila mara, hata kama pato tayari ipo."
-
-#: ../fdroidserver/index.py
-msgid "The \"qrcode\" Python package is not installed (e.g. apt-get install python3-qrcode)!"
-msgstr ""
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "The OBB version code must come after \"{name}.\":"
-msgstr "Msimbo wa toleo la OBB lazima ije baada ya \"{name}.\":"
-
-#: ../fdroidserver/btlog.py
-msgid "The base URL for the repo to log (default: https://f-droid.org)"
-msgstr "URL ya msingi kwa ghala hio kuweka kwenye logi (default: https://f-droid.org)"
-
-#: ../fdroidserver/mirror.py
-msgid "The directory to write the mirror to"
-msgstr "Saraka ya kuandika kioo hicho kwa"
-
-#: ../fdroidserver/nightly.py
-msgid "The file to be included in the repo (path or glob)"
-msgstr "Faili hio ya kujumuishwa kwenye ghala (path or glob)"
-
-#: ../fdroidserver/index.py
-msgid "The repository's fingerprint does not match."
-msgstr "Alama ya kidole ya ghala hailingani."
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "The root dir for local_copy_dir \"{path}\" does not exist!"
-msgstr "Saraka ya mzizi ya local_copy_dir \"{path}\" haipo!"
-
-#: ../fdroidserver/publish.py
-msgid "There is a keyalias collision - publishing halted"
-msgstr "Kuna mgongano wa keyalias - uchapishaji umesitishwa"
-
-#: ../fdroidserver/common.py
-msgid "These are the apps that have been archived from the main repo."
-msgstr "Hizi ndizo apu zilizohifadhiwa kwenye kumbukumbu kutoka kwa ghala kuu."
-
-#: ../fdroidserver/mirror.py
-msgid "This command should never be used to mirror f-droid.org! A full copy requires more than 600GB."
-msgstr "Amri hii haipaswi kamwe kutumika kuakisa f-droid.org! Nakala mzima inahitaji juu ya 600GB."
-
-#: ../fdroidserver/common.py
-msgid "This is a repository of apps to be used with F-Droid. Applications in this repository are either official binaries built by the original application developers, or are binaries built from source by the admin of f-droid.org using the tools on https://gitlab.com/fdroid."
-msgstr "Hii ni ghala ya apu ya kutumika na F-Droid. Apu katika ghala hii ni binaries rasmi zilizojengwa na wasanidi wa asili wa apu, au binaires zilizoundwa kutoka kwa chanzo na admin ya f-droid.org kutumia vifaa kwenye https://gitlab.com/fdroid."
-
-#: ../fdroidserver/import_subcommand.py
-#, python-format
-msgid "This repo already has local metadata: %s"
-msgstr "Ghala hii tayari in metadata ya ndani: %s"
-
-#: ../fdroidserver/init.py
-#, python-format
-msgid ""
-"To complete the setup, add your APKs to \"%s\"\n"
-"then run \"fdroid update -c; fdroid update\".  You might also want to edit\n"
-"\"config.yml\" to set the URL, repo name, and more.  You should also set up\n"
-"a signing key (a temporary one might have been automatically generated).\n"
-"\n"
-"For more info: https://f-droid.org/docs/Setup_an_F-Droid_App_Repo\n"
-"and https://f-droid.org/docs/Signing_Process"
-msgstr ""
-"Ili kumaliza unsanidi huo, ongeza APK zako kwa \"%s\"\n"
-"kisha kimbiza \"fdroid update -c; fdroid update\".  Unawezataka pia kuhariri\n"
-"\"config.yml\" ili kuseti URL, jina ya ghala, na zaidi.  Unapaswa pia kusanidi\n"
-"ufunguo wa kusaini (ya muda unawezakua umezalishwa kiotomatiki).\n"
-"\n"
-"Kwa maelezo zaidi: https://f-droid.org/docs/Setup_an_F-Droid_App_Repo\n"
-"na https://f-droid.org/docs/Signing_Process"
-
-#: ../fdroidserver/deploy.py
-msgid "To use awsbucket, awssecretkey and awsaccesskeyid must also be set in config.yml!"
-msgstr "Ili kutumia awsbucket, awssecretkey na awsaccesskeiid lazima pia iwekwe katika config.yml!"
-
-#: ../fdroidserver/deploy.py
-#, fuzzy
-msgid "To use rclone, rclone_config and awsbucket must be set in config.yml!"
-msgstr "Ili kutumia awsbucket, awssecretkey na awsaccesskeiid lazima pia iwekwe katika config.yml!"
-
-#: ../fdroidserver/lint.py
-msgid "URL must start with https:// or http://"
-msgstr "URL lazima ianze na https:// or http://"
-
-#: ../fdroidserver/lint.py
-msgid "URL shorteners should not be used"
-msgstr "Vifupishaji vya URL havipaswi kutumika"
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "URL {url} in Description: {error}"
-msgstr "URL {url} katika Maelezo:{error}"
-
-#: ../fdroidserver/lint.py
-msgid "Unexpected license tag \"{}\"! Only use FSF or OSI approved tags from https://spdx.org/license-list"
-msgstr "tagi ya leseni lisilotarajiwa \"{}\"! Tumia pekee tagi zilizoidhinishwa na FSF au OSI kutoka https://spdx.org/license-list"
-
-#: ../fdroidserver/lint.py
-msgid "Unexpected license tag \"{}\"! Only use license tags configured in your config file"
-msgstr "tagi ya leseni isiyotarajiwa \"{}\"! Tumia pekee tagi za leseni zilizosanidiwa katika faili yako ya usanidi"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Unknown entry {key} in {configname}"
-msgstr "ingilio lisilojulikana {key} katika {configname}"
-
-#: ../fdroidserver/__main__.py
-msgid "Unknown exception found!"
-msgstr "Kighairi kisichojulikana kimepatikana!"
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Unknown file '{filename}' in build '{versionName}'"
-msgstr "Faili isiyojulikana '{filename}' katika jenga '{versionName}'"
-
-#: ../fdroidserver/metadata.py
-#, python-format
-msgid "Unknown metadata format: %s"
-msgstr "Muundo wa metadata usiojulikana: %s"
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Unknown metadata format: {path} (use: *.yml)"
-msgstr "Muundo wa metadata usiojulikana: {path} (tumia: *.yml)"
-
-#: ../fdroidserver/common.py
-msgid "Unknown version of aapt, might cause problems: "
-msgstr "Toleo lisilojulikana la aapt, linaweza kuleta matatizo: "
-
-#: ../fdroidserver/lint.py
-msgid "Unnecessary leading space"
-msgstr "Nafasi ya mwanzo isiyo ya lazima"
-
-#: ../fdroidserver/lint.py
-msgid "Unnecessary trailing space"
-msgstr "Nafasi ya mwisho isiyo ya lazima"
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Unrecognised app field '{fieldname}' in '{path}'"
-msgstr "Nafasi ya apu isiyotambulika '{fieldname}' katika '{path}'"
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Unrecognised build flag '{build_flag}' in '{path}'"
-msgstr "Bendera ya kujenga isiyotambulika '{build_flag}' katika '{path}'"
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Unsupported file type \"{extension}\" for repo graphic"
-msgstr "Aina ya faili isiyoungwa mkono \"{extension}\" kwa ghala la mchoro"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Unsupported graphics file found: {path}"
-msgstr "Faili ya michoro isiyoungwa mkono imepatikana: {path}"
-
-#: ../fdroidserver/lint.py
-#, python-format
-msgid "Unused extlib at %s"
-msgstr "extlib isiyotumika katika %s"
-
-#: ../fdroidserver/lint.py
-#, python-format
-msgid "Unused file at %s"
-msgstr "Faili lisilotumika katika %s"
-
-#: ../fdroidserver/scanner.py
-#, python-format
-msgid "Unused scandelete path: %s"
-msgstr "Njia ya scandelete isiyotumika: %s"
-
-#: ../fdroidserver/scanner.py
-#, python-format
-msgid "Unused scanignore path: %s"
-msgstr "Njia ya scanignore isiyotumika: %s"
-
-#: ../fdroidserver/__main__.py
-msgid "Update repo information for new packages"
-msgstr "Sasisha maelezo ya repo kwa vifurushi vipya"
-
-#: ../fdroidserver/__main__.py
-msgid "Update the binary transparency log for a URL"
-msgstr "Sasisha logi ya uwazi ya binary kwa URL"
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "UpdateCheckData has invalid URL: {url}"
-msgstr "UpdateCheckData ina URL batili: {url}"
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "UpdateCheckData must match the version code as integer (\\d or [0-9]): {codeex}"
-msgstr "UpdateCheckData lazima ilingane na msimbo wa toleo kama nambari kamili (\\d or [0-9]): {codeex}"
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "UpdateCheckData must use HTTPS URL: {url}"
-msgstr "UpdateCheckData lazima itumie URL ya HTTPS: {url}"
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "UpdateCheckData not a valid URL: {url}"
-msgstr "UpdateCheckData si URL iliyo halali: {url}"
-
-#: ../fdroidserver/lint.py
-msgid "UpdateCheckMode is set but it looks like checkupdates hasn't been run yet."
-msgstr "UpdateCheckMode imewekwa lakini inaonekana kama checkupdates haijaendeshwa bado."
-
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/lint.py
-msgid "UpdateCheckName is set to the known application ID, it can be removed"
-msgstr "UpdateCheckName imewekwa katika kitambulisho cha apu kinachojulikana, inaweza kutolewa"
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Uploading {apkfilename} to androidobservatory.org"
-msgstr "Kupakia {apkfilename} kwa androidobservatory.org"
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Uploading {apkfilename} to virustotal"
-msgstr "Kupakia {apkfilename} kwa virustotal"
-
-#: ../fdroidserver/lint.py
-msgid "Use /HEAD instead of /master or /main to point at a file in the default branch"
-msgstr "Tumia /HEAD badala ya /master au /main kuashiria faili kwenye tawi la msingi"
-
-#: ../fdroidserver/update.py
-msgid "Use `fdroid update -c` to create it."
-msgstr "Tumia `fdroid update -C` kuiunda."
-
-#: ../fdroidserver/build.py
-msgid "Use build server"
-msgstr "Tumia seva ya ujenzi"
-
-#: ../fdroidserver/update.py
-msgid "Use date from APK instead of current time for newly added APKs"
-msgstr "Tumia tarehe kutoka APK badala ya wakati uliopo kwa APK mpya zilizoongezwa"
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Using \"{path}\" for configuring s3cmd."
-msgstr "Kutumia \"{path}\" kusanidi s3cmd."
-
-#: ../fdroidserver/deploy.py
-#, fuzzy, python-brace-format
-msgid "Using \"{path}\" for syncing with remote storage."
-msgstr "Kutumia \"{path}\" kusanidi s3cmd."
-
-#: ../fdroidserver/common.py
-msgid "Using APK Signature v2"
-msgstr "Kutumia Sahihi ya APK toleo la 2"
-
-#: ../fdroidserver/common.py
-msgid "Using APK Signature v3"
-msgstr "Kutumia Sahihi ya APK toleo la 3"
-
-#: ../fdroidserver/common.py
-msgid "Using JAR Signature"
-msgstr "Kutumia saini ya JAR"
-
-#: ../fdroidserver/common.py
-msgid "Using Java's jarsigner, not recommended for verifying APKs! Use apksigner"
-msgstr "Kutumia jarsigner ya Java, haipendekezwi kwa kuthibitisha APK! Tumia apksigner"
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Using blank dictionary instead of contents of {path}!"
-msgstr "Kutumia kamusi tupu badala ya maudhui ya {path}!"
-
-#: ../fdroidserver/init.py
-#, python-brace-format
-msgid "Using existing keystore \"{path}\""
-msgstr "Kutumia keystore iliyopo \"{path}\""
-
-#: ../fdroidserver/deploy.py
-#, fuzzy, python-brace-format
-msgid "Using rclone to sync with: {url}"
-msgstr "Kutumia s3cmd kusawazisha na: {url}"
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Using s3cmd to sync with: {url}"
-msgstr "Kutumia s3cmd kusawazisha na: {url}"
-
-#: ../fdroidserver/__main__.py
-msgid "Valid commands are:"
-msgstr "Amri halali ni:"
-
-#: ../fdroidserver/verify.py
-msgid "Verify against locally cached copy rather than redownloading."
-msgstr "Thibitisha dhidi ya nakala iliyoakibishwa ndani afadhali kuliko kupakua upya."
-
-#: ../fdroidserver/__main__.py
-msgid "Verify the integrity of downloaded packages"
-msgstr "Thibitisha uadilifu wa furushi zilizopakuliwa"
-
-#: ../fdroidserver/index.py
-msgid "Verifying index signature:"
-msgstr "Kuthibitisha saini ya faharasa:"
-
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "Verifying package {path} with apksigner."
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "VirusTotal API key cannot upload files larger than 32MB, use {url} to upload {path}."
-msgstr "Ufunguo wa API ya VirusTotal haiwezi kupakia faili zaidi ya 32MB, tumia {url} kupakia {path}."
-
-#: ../fdroidserver/nightly.py
-msgid "WARNING: only public git repos are supported!"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Warn about possible metadata errors"
-msgstr "Onya kuhusu hitilafu ya metadata yanayoweza kutokea"
-
-#: ../fdroidserver/scanner.py
-msgid "WebAssembly binary file"
-msgstr ""
-
-#: ../fdroidserver/update.py
-msgid "When configured for signed indexes, create only unsigned indexes at this stage"
-msgstr "Ikiwa imesanidiwa kwa faharasa zilizosainiwa, unda pekee faharasa zisizosainiwa katika hatua hii"
-
-#: ../fdroidserver/lint.py
-msgid "When linting the entire repository yamllint is disabled by default. This option forces yamllint regardless."
-msgstr "Wakati unapochambua msimbo wa ghala mzima yamllint inalemazwa kwa chaguo msingi. Chaguo hili linalazimisha yamllint bila kujali."
-
-#: ../fdroidserver/publish.py
-msgid "When signing or verifying fails, exit with an error code."
-msgstr "Wakati kusaini au kuthibitisha umefeli, toka na msimbo wa hitilafu."
-
-#: ../fdroidserver/install.py
-msgid "Would you like to download and install F-Droid.apk via adb? (YES/no)"
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "Would you like to download the app(s) from f-droid.org? (YES/no)"
-msgstr ""
-
-#: ../fdroidserver/init.py
-msgid "X.509 'Distinguished Name' used when generating keys"
-msgstr "X.509 'Distinguished Name' inayotumika wakati wa kuzalisha funguo"
-
-#: ../fdroidserver/common.py
-msgid "You can use ANDROID_HOME to set the path to your SDK, i.e.:"
-msgstr "Unaweza kutumia ANDROID_HOME kuseti njia ya SDK yako, kwa mfano:"
-
-#: ../fdroidserver/scanner.py
-msgid "ZIP file archive"
-msgstr "kumbukumbu ya faili ya ZIP"
-
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "adb reports {serial} is \"{status}\"!"
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-#, python-brace-format
-msgid "adding IdentityFile to {path}"
-msgstr "Inaongeza IdentityFile kwa {path}"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "adding to {name}: {path}"
-msgstr "Inaongeza kwa {name}: {path}"
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "ambiguous option: %(option)s could match %(matches)s"
-msgstr "chaguo lisiloeleweka: %(option)s linaweza kulingana na %(matches)s"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "apksigner in build-tools;{version} passes APKs with invalid v3 signatures, ignoring."
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "apksigner not found! Cannot sign or verify modern APKs"
-msgstr "apksigner haijapatikana! Haiwezi kusaini au kutibitisha APK ya kisasa"
-
-#: ../fdroidserver/common.py
-msgid "apksigner not found, it's required for signing!"
-msgstr "apksigner haikupatikana, inahitajika kwa ajili ya kusaini!"
-
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/checkupdates.py ../fdroidserver/lint.py
-#: ../fdroidserver/rewritemeta.py
-msgid "application ID of file to operate on"
-msgstr "Kitambulisho cha apu cha faili kufanyia kazi"
-
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/build.py ../fdroidserver/install.py
-#: ../fdroidserver/publish.py ../fdroidserver/scanner.py
-#: ../fdroidserver/verify.py
-msgid "application ID with optional versionCode in the form APPID[:VERCODE]"
-msgstr "Kitambulisho cha apu yenye versionCode iliyo ya hiari katika fomu APPID[:VERCODE]"
-
-#: ../fdroidserver/common.py
-msgid "archive_url needs to end with /archive"
-msgstr "archive_url inahitaji kumalizia na /archive"
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "argument \"-\" with mode %r"
-msgstr "hoja \"-\" na modi %r"
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "argument %(argument_name)s: %(message)s"
-msgstr "hoja %(argument_name)s: %(message)s"
-
-#: ../fdroidserver/nightly.py
-msgid "attempting bare SSH connection to test deploy key:"
-msgstr "inajaribu uhusiano wa SSH ulio tupu ili kujaribu ufunguo wa kupeleka:"
-
-#: ../fdroidserver/common.py
-msgid "can not parse scrlib spec (not a string): '{}'"
-msgstr "Haiwezi kuchanganua speci ya scrlib (sio kamba): '{}'"
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "can't open '%(filename)s': %(error)s"
-msgstr "Haiwezi kufungua '%(filename)s':%(error)s"
-
-#: ../fdroidserver/scanner.py
-msgid "can't open non-https url: '{};"
-msgstr "Haiwezi kufungua URL isiyo ya https: '{};"
-
-#: ../fdroidserver/build.py
-#, python-brace-format
-msgid "cannot find required srclibs: \"{path}\""
-msgstr "Haiwezi kupata srclibs inayohitajika: \"{path}\""
-
-#: /usr/lib/python3.11/argparse.py
-msgid "cannot have multiple subparser arguments"
-msgstr "Haiwezi kuwa na hoja za subparser nyingi"
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "cannot merge actions - two groups are named %r"
-msgstr "Haiwezi kuunganisha vitendo - vikundi viwili vimepewa jina %r"
-
-#: ../fdroidserver/nightly.py
-msgid "cannot publish update, did you set the deploy key?"
-msgstr "Haiwezi kuchapisha sasisho, je, uliseti ufunguo wa kupeleka?"
-
-#: ../fdroidserver/nightly.py
-#, python-brace-format
-msgid "cloning {url}"
-msgstr "kukaririsha {url}"
-
-#: ../fdroidserver/__main__.py
-msgid "commands from plugin modules:"
-msgstr "amri kutoka kwa kiunzi huru cha programu-jalizi:"
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "conflicting option string: %s"
-msgid_plural "conflicting option strings: %s"
-msgstr[0] "kamba ya chaguo inayokinzana: %s"
-msgstr[1] "kamba za chaguo zinazokinzana: %s"
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "conflicting subparser alias: %s"
-msgstr "lakabu la subparser inayokinzana: %s"
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "conflicting subparser: %s"
-msgstr "subparser inayokinzana: %s"
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "could not parse '{path}'"
-msgstr "haikuweza kuchanganua '{path}'"
-
-#: ../fdroidserver/common.py
-msgid "could not parse srclib spec (no name specified): '{}'"
-msgstr "haikuweza kuchanganua specifisheni ya srclib (hakuna jina limebainishwa): '{}'"
-
-#: ../fdroidserver/common.py
-msgid "could not parse srclib spec (no ref specified): '{}'"
-msgstr "haikuweza kuchanganua specifisheni ya srclib (hakuna rejeleo limebainishwa): '{}'"
-
-#: ../fdroidserver/nightly.py
-#, python-brace-format
-msgid "created {path}"
-msgstr "iliunda {path}"
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "current version is newer: old vercode={old}, new vercode={new}"
-msgstr "toleo la sasa ni jipya: old vercode={old}, new vercode={new}"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "deleting: repo/{apkfilename}"
-msgstr "kufuta: ghala/{apkfilename}"
-
-#: ../fdroidserver/scanner.py
-msgid "dependency file without lock"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "deployed process log {path} to {dest}"
-msgstr "logi ya mchakato uliosambazwa {path} hadi {dest}"
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "dest= is required for options like %r"
-msgstr "dest= inahitajika kwa chaguo kama %r"
-
-#: ../fdroidserver/scanner.py
-msgid "downloading '{}'"
-msgstr "Inapakua '{}'"
-
-#: ../fdroidserver/scanner.py
-msgid "downloading scanner signatures from '{}' failed"
-msgstr "Inapakua sahihi za skena kutoka '{}' imefeli"
-
-#: ../fdroidserver/scanner.py
-msgid "executable binary, possibly code"
-msgstr "binari inayoweza kutekelezwa, ikiwezekana msimbo"
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "expected %s argument"
-msgid_plural "expected %s arguments"
-msgstr[0] "hoja %s iliyotarajiwa"
-msgstr[1] "hoja %s zilizotarajiwa"
-
-#: /usr/lib/python3.11/argparse.py
-msgid "expected at least one argument"
-msgstr "ilitarajia angalau hoja moja"
-
-#: /usr/lib/python3.11/argparse.py
-msgid "expected at most one argument"
-msgstr "Imetarajiwa isiwe zaidi ya hoja moja"
-
-#: /usr/lib/python3.11/argparse.py
-msgid "expected one argument"
-msgstr "Ilitarajia hoja moja"
-
-#: ../fdroidserver/__main__.py
-msgid "fdroid [<command>] [-h|--help|--version|<args>]"
-msgstr "fdroid [<command>] [-h|--msaada|--toleo|<args>]"
-
-#: ../fdroidserver/scanner.py
-msgid "fetch the latest version of signatures from the web"
-msgstr "Pakua toleo jipya zaidi za saini kutoka kwenye mtandao"
-
-#: ../fdroidserver/metadata.py
-msgid "force metadata errors (default) to be warnings, or to be ignored."
-msgstr "lazimisha hitilafu za metadata (chaguo msingi) ziwe maonyo, au ziwe za kupuuzwa."
-
-#: ../fdroidserver/common.py
-msgid "git svn clone failed"
-msgstr "svn clone ya git ilifeli"
-
-#: ../fdroidserver/scanner.py
-msgid "gzip file archive"
-msgstr "kumbukumbu ya faili ya gzip"
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "ignored explicit argument %r"
-msgstr "Ilipuuza hoja ya dhahiri %r"
-
-#: ../fdroidserver/index.py
-msgid "index-v1 must have a signature, use `fdroid signindex` to create it!"
-msgstr "index-v1 lazima iwe na saini, tumia `fdroid signindex` kuiunda!"
-
-#: ../fdroidserver/index.py
-msgid "index-v2 must have a signature, use `fdroid signindex` to create it!"
-msgstr "index-v2 lazima iwe na saini, tumia `fdroid signindex` kuiunda!"
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "invalid %(type)s value: %(value)r"
-msgstr "Thamani batili ya %(type)s: %(value)r"
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "invalid choice: %(value)r (choose from %(choices)s)"
-msgstr "chaguo iliyo batili: %(value)r (chagua kutoka %(choices)s)"
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "invalid conflict_resolution value: %r"
-msgstr "thamani ya conflict_resolution iliyo batili: %r"
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "invalid option string %(option)r: must start with a character %(prefix_chars)r"
-msgstr "kamba ya chaguo iliyo batili %(option)r: lazima ianze na char %(prefix_chars)r"
-
-#: ../fdroidserver/common.py
-msgid "ipfs_cid not found, skipping CIDv1 generation"
-msgstr "ipfs haikupatikana, inaruka kuzalisha CIDcv1"
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "latest build recipe is newer: old vercode={old}, new vercode={new}"
-msgstr "mbinu ya jenga ya hivi karibuni ni mpya zaidi: old vercode={old}, new vercode={new}"
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "local_copy_dir does not end with \"fdroid\", perhaps you meant: \"{path}\""
-msgstr "local_copy_dir haikiwishi na \"fdroid\", labda ulimanisha: {path}"
-
-#: ../fdroidserver/deploy.py
-msgid "local_copy_dir must be an absolute path!"
-msgstr "local_copy_dir lazima iwe njia kamili!"
-
-#: ../fdroidserver/deploy.py
-msgid "local_copy_dir must be directory, not a file!"
-msgstr "local_copy_dir lazima iwe saraka, si faili!"
-
-#: ../fdroidserver/index.py
-#, python-format
-msgid "mirror '%s' does not end with 'fdroid'!"
-msgstr "kioo %s haikwishia na 'fdroid'!"
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "mirrors set twice, in config.yml and {path}!"
-msgstr "vioo vimesetiwa mara mbili, katika config.yml na {path}!"
-
-#: /usr/lib/python3.11/argparse.py
-msgid "mutually exclusive arguments must be optional"
-msgstr "Hoja zinazokinzana lazima ziwe za hiari"
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "next {name} cache update due in {time}"
-msgstr "sasisho ya cache Ijayo {name} inatakiwa katika {time}"
-
-#: ../fdroidserver/mirror.py
-#, python-brace-format
-msgid "no \"icon\" in {appid}"
-msgstr "hakuna \"icon\" katika {appid}"
-
-#: ../fdroidserver/signatures.py
-msgid "no APK supplied"
-msgstr "hakuna APK iliyowasilishwa"
-
-#: ../fdroidserver/checkupdates.py
-msgid "no version information found"
-msgstr "hakuna maelezo ya toleo zimepatikana"
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "not allowed with argument %s"
-msgstr "haikubaliki na hoja %s"
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "one of the arguments %s is required"
-msgstr "moja ya hoja %s inahitajika"
-
-#: ../fdroidserver/common.py ../fdroidserver/index.py
-msgid "only accepts strings, lists, and tuples"
-msgstr "inakubali pekee kamba, orodha, na jozi"
-
-#: /usr/lib/python3.11/argparse.py
-msgid "options"
-msgstr "uchaguzi"
-
-#: ../fdroidserver/nightly.py
-#, python-brace-format
-msgid "overwriting existing {path}"
-msgstr "inaandika upya {path} iliyopo"
-
-#: /usr/lib/python3.11/argparse.py
-msgid "positional arguments"
-msgstr "hoja ya msimamo"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "process log deploy {path} to {dest} failed!"
-msgstr "Mchakato wa kupeleka kwa logi {path} kwa {dest} imefeli!"
-
-#: ../fdroidserver/build.py
-msgid "reference binary missing signature"
-msgstr "binari ya rejeleo inakosa saini"
-
-#: ../fdroidserver/signatures.py
-#, python-brace-format
-msgid "refuse downloading via insecure HTTP connection (use HTTPS or specify --no-https-check): {apkfilename}"
-msgstr "kataa kupakua kupitia muunganisho wa HTTP isiyo salama (tumia HTTPS au bainisha --no-https-check):{apkfilename}"
-
-#: ../fdroidserver/index.py
-#, python-format
-msgid "repo_icon \"repo/icons/%s\" does not exist, generating placeholder."
-msgstr "repo_icon \"repo/icons/%s\" haipo, inazalisha kishika nafasi."
-
-#: ../fdroidserver/common.py
-msgid "repo_url needs to end with /repo"
-msgstr "repo_url ina haja ya kuisha na /ghala"
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "rsync is missing or broken: {error}"
-msgstr "rsync inakosa au imevunjika: {error}"
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "s3cmd sync indexes {path} to {url} and delete"
-msgstr "s3cmd kusawazisha indexes {path} hadi {url} na kufuta"
-
-#: ../fdroidserver/deploy.py
-#, fuzzy, python-brace-format
-msgid "s3cmd syncs indexes from {path} to {url} and deletes removed"
-msgstr "s3cmd kusawazisha indexes {path} hadi {url} na kufuta"
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "scanner cache is malformed! You can clear it with: '{clear}'"
-msgstr "cache ya skana in umbo bovu! Unaweza kufuta kwa: '{clear}'"
-
-#: ../fdroidserver/deploy.py
-msgid "serverwebroot: path does not end with \"fdroid\", perhaps you meant one of these:"
-msgstr "serverwebroot: njia haikamiliki na \"fdroid\", labda ulimaanisha moja kati ya hizi:"
-
-#: ../fdroidserver/scanner.py
-msgid "shared library"
-msgstr "maktaba inayoshirikishwa"
-
-#: /usr/lib/python3.11/argparse.py
-msgid "show this help message and exit"
-msgstr "onyesha ujumbe huu wa usaidizi na uondoke"
-
-#: ../fdroidserver/signatures.py
-msgid "signed APK, either a file-path or HTTPS URL."
-msgstr "APK iliyosainiwa, aidha file-path au HTTPS URL."
-
-#: ../fdroidserver/common.py
-msgid "skip deploying full build logs: log content is empty"
-msgstr "ruka kupeleka logi kamili za jenga: maudhui ya logi ni tupu"
-
-#: ../fdroidserver/common.py
-msgid "skip deploying full build logs: not enabled in config"
-msgstr "ruka kupeleka logi kamili za jenga: haijawezeshwa kwa config"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "skipping source tarball: {path}"
-msgstr "inaruka tarball ya chanzo: {path}"
-
-#: ../fdroidserver/lint.py
-msgid "srclibs missing name and/or @"
-msgstr "srclibs inakosa jina na/au @"
-
-#: ../fdroidserver/scanner.py
-msgid "static library"
-msgstr "maktaba tuli"
-
-#: ../fdroidserver/build.py
-#, python-brace-format
-msgid "supplied reference binary has allowed signer {signer}"
-msgstr "binari ya rejeleo lililowasilishwa imeruhusu signer {signer}"
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "the following arguments are required: %s"
-msgstr "hoja zifuatazo zinahitajika: %s"
-
-#: ../fdroidserver/install.py
-msgid "true"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "unexpected option string: %s"
-msgstr "Chaguo lisilotarajiwa: %s"
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "unknown parser %(parser_name)r (choices: %(choices)s)"
-msgstr "kichanganuzi isiyojulikana %(parser_name)r (chaguo: %(choices)s)"
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "unrecognized arguments: %s"
-msgstr "hoja zisizotambulika: %s"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "unsafe permissions on '{config_file}' (should be 0600)!"
-msgstr "ruhusa zisizo salama kwenye '{config_file}' (inapaswa kuwa 0600)!"
-
-#: ../fdroidserver/__main__.py /usr/lib/python3.11/argparse.py
-msgid "usage: "
-msgstr "matumizi: "
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "using Apache libcloud to sync with {url}"
-msgstr "kutumia Apache libcloud kulandanisha na {url}"
-
-#: ../fdroidserver/deploy.py
-msgid "virustotal.com is rate limiting, waiting to retry..."
-msgstr "virustotal.com inapunguza kiwango, inangojea kujaribu tena..."
-
-#: ../fdroidserver/install.py
-msgid "yes"
-msgstr ""
-
-#: ../fdroidserver/publish.py
-#, python-brace-format
-msgid "{0} app, {1} key aliases"
-msgid_plural "{0} apps, {1} key aliases"
-msgstr[0] "apu {0}, lakabu muhimu{1}"
-msgstr[1] "apu {0}, lakabu muhimu{1}"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{apkfilename} ({appid}) has no metadata!"
-msgstr "{apkfilename} ({appid}) haina metadata!"
-
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{apkfilename}'s AndroidManifest.xml has a bad date: "
-msgstr "AndroidManifest.xml ya {apkfilename} ina tarehe mbaya: "
-
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{appid} does not have a name! Using application ID instead."
-msgstr "{appid} haina jina! Inatumia kitambulisho cha apu badala yake."
-
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{appid} from {path} is not a valid Android application ID!"
-msgstr "{appid} kutoka {path} si kitambulisho halali cha apu ya Android!"
-
-#: ../fdroidserver/metadata.py ../fdroidserver/update.py
-#, python-brace-format
-msgid "{appid} from {path} is not a valid Java Package Name!"
-msgstr "{appid} kutoka {path} sio Jina halali la kifurushi cha Java!"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{appid} has both APKs and files: {files}"
-msgstr "{appid} ina vyote viwili APK pamoja na faili: {files}"
-
-#: ../fdroidserver/mirror.py
-#, python-brace-format
-msgid "{appid} is missing {name}"
-msgstr "{appid} inakosa {name}"
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "{appid}: Unknown extlib {path} in build '{versionName}'"
-msgstr "{appid}: extlib isiyojulikana {path} katika jenga '{versionName}'"
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "{appid}: no builds specified, running on current source state"
-msgstr "{appid}: hakuna jenga zilizobainishwa, inaendeshwa kwa hali ya sasa ya chanzo"
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "{appid}: {field} must be a '{type}', but it is a '{fieldtype}!'"
-msgstr "{appid}: {field} lazima iwe '{type}', bali ni '{fieldtype}!'"
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "{appid}: {field} must be a '{type}', but it is a '{fieldtype}'!"
-msgstr "{appid}: {field} lazima iwe '{type}', bali ni '{fieldtype}'!"
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "{build_flag} must be an integer, found: {value}"
-msgstr "{build_flag} lazima iwe nambari kamili, imepatikana: {value}"
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "{build_flag} must be list or string, found: {value}"
-msgstr "{build_flag} lazima iwe orodha au kamba, imepatikana: {value}"
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "{file} is blank or corrupt!"
-msgstr "{file} ni tupu au fisadi!"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{name} \"{section}/icons/{path}\" does not exist! Check \"config.yml\"."
-msgstr "{name} \"{section}/icons/{path}\" haipo! Angalia \"config.yml\"."
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{path1} is a duplicate of {path2}, remove one!"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
-#, python-brace-format
-msgid "{path} already exists, ignoring import results!"
-msgstr "{path} tayari ipo, inapuuza matokeo ya uingizaji!"
-
-#: ../fdroidserver/nightly.py
-#, python-brace-format
-msgid "{path} does not exist!  Create it by running:"
-msgstr "{path} haipo!  Iunde kwa kuendesha:"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{path} has bad file signature \"{pattern}\", possible Janus exploit!"
-msgstr "{path} ina saini mbaya ya faili \"{pattern}\", Uwezekano wa kunyonywa la Janus!"
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "{path} has been flagged by virustotal {count} times:"
-msgstr "{path} imealamishwa na virustotal mara {count}:"
-
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "{path} has the wrong fingerprint ({fingerprint})!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "{path} is not \"key: value\" dict, but a {datatype}!"
-msgstr "{path} sio \"key: value\" dict, lakini ni {datatype}!"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "{path} is not a standard config file!"
-msgstr "{path} sio faili ya usanidi ulio na kiwango!"
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "{path} is not list, but a {datatype}!"
-msgstr "{path} sio orodha, lakini ni {datatype}!"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "{path} is not {expected_type}, but a {datatype}!"
-msgstr "{path} sio {expected_type}, lakini ni {datatype}!"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{path} is zero size!"
-msgstr "{path} ni saizi ya sifuri!"
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "{path} more than 200MB, manually upload: {url}"
-msgstr "{path} zaidi ya 200MB , pakia kwa mkono: {url}"
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "{path}: \"{code}\" is not a valid ISO_3166-1 alpha-2 country code!"
-msgstr "{path}: \"{code}\" msimbo wa nchi ya ISO_3166-1 alpha-2 ni batili!"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{path}: {error}"
-msgstr "{path}: {error}"
-
-#: ../fdroidserver/mirror.py
-#, python-brace-format
-msgid "{url} does not end with \"fdroid\", check the URL path!"
-msgstr "{url} haimaliziki na \"fdroid\", angalia njia ya URL!"
-
-#: ../fdroidserver/import_subcommand.py
-#, python-brace-format
-msgid "{url} does not start with \"http\"!"
-msgstr "{url} haianzi na \"http\"!"
-
-#: ../fdroidserver/build.py
-msgid "{} build failed"
-msgid_plural "{} builds failed"
-msgstr[0] "{} jenga imefeli"
-msgstr[1] "{} jenga zimefeli"
-
-#: ../fdroidserver/build.py
-msgid "{} build succeeded"
-msgid_plural "{} builds succeeded"
-msgstr[0] "{} jenga imefaulu"
-msgstr[1] "{} jenga zimefaulu"
diff --git a/locale/ta/LC_MESSAGES/fdroidserver.po b/locale/ta/LC_MESSAGES/fdroidserver.po
deleted file mode 100644
index 0661e420..00000000
--- a/locale/ta/LC_MESSAGES/fdroidserver.po
+++ /dev/null
@@ -1,2698 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# This file is put in the public domain.
-# K.B.Dharun Krishna <kbdharunkrishna@gmail.com>, 2022.
-# Naveen <naveen.sakthivel@tutanota.com>, 2024.
-# தமிழ்நேரம் <anishprabu.t@gmail.com>, 2024.
-# Hans-Christoph Steiner <hans@guardianproject.info>, 2025.
-msgid ""
-msgstr ""
-"Project-Id-Version: fdroidserver 2.1-273-g54e84d87\n"
-"Report-Msgid-Bugs-To: https://gitlab.com/fdroid/fdroidserver/issues\n"
-"POT-Creation-Date: 2025-06-25 09:52+0200\n"
-"PO-Revision-Date: 2025-01-20 14:04+0000\n"
-"Last-Translator: Hans-Christoph Steiner <hans@guardianproject.info>\n"
-"Language-Team: Tamil <https://hosted.weblate.org/projects/f-droid/fdroidserver/ta/>\n"
-"Language: ta\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 5.10-dev\n"
-
-#: ../fdroidserver/nightly.py
-msgid ""
-"\n"
-"SSH public key to be used as deploy key:"
-msgstr ""
-"\n"
-"பாஓடு பொது விசை வரிசைப்படுத்தல் விசையாகப் பயன்படுத்தப்பட வேண்டும்:"
-
-#: ../fdroidserver/nightly.py
-#, python-brace-format
-msgid ""
-"\n"
-"{path} encoded for the DEBUG_KEYSTORE secret variable:"
-msgstr ""
-"\n"
-"{path} பிழைத்திருத்த_கிச்டோர் ரகசிய மாறிக்குக் குறியாக்கம் செய்யப்பட்டுள்ளது:"
-
-#: ../fdroidserver/lint.py
-#, python-format
-msgid "\"%s/\" has no matching metadata file!"
-msgstr "\"%s/\" க்கு பொருந்தக்கூடிய மேனிலை தரவு கோப்பு இல்லை!"
-
-#: ../fdroidserver/index.py
-msgid "\"isPrimary\" key should not be added to mirrors!"
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "\"local_copy_dir\" {path} does not exist!"
-msgstr "\"local_copy_dir\" {path} இல்லை!"
-
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "\"{apkfilename}\" is already installed on {dev}."
-msgstr "\"{apkfilename}\" ஏற்கனவே {dev} இல் நிறுவப்பட்டுள்ளது."
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "\"{path}\" contains recent {name} ({version})"
-msgstr "\"{path}\" அண்மைக் கால {name} ({version})"
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "\"{path}\" exists but s3cmd is not installed!"
-msgstr "\"{path}\" உள்ளது, ஆனால் S3CMD நிறுவப்படவில்லை!"
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "\"{path}\" is not a supported file format (use: metadata/*.yml)"
-msgstr "\"{path}\" என்பது ஒரு உதவி கோப்பு வடிவம் அல்ல (பயன்பாடு: மெட்டாடேட்டா/*.yml)"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "\"{path}\" is signed by a key that is not allowed:"
-msgstr "\"{path}\" அனுமதிக்கப்படாத ஒரு விசையால் கையொப்பமிடப்பட்டுள்ளது:"
-
-#: ../fdroidserver/import_subcommand.py
-#, python-brace-format
-msgid "\"{url}\" is not a valid URL!"
-msgstr "\"{url}\" சரியான முகவரி அல்ல!"
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "%(prog)s: error: %(message)s\n"
-msgstr "%(prog)s: பிழை: %(message)s\n"
-
-#: ../fdroidserver/publish.py
-#, python-format
-msgid "%d APKs failed to be signed or verified!"
-msgstr "%d apks கையொப்பமிடவோ சரிபார்க்கவோ தோல்வியுற்றது!"
-
-#: ../fdroidserver/scanner.py
-#, python-format
-msgid "%d problems found"
-msgstr "%d சிக்கல்கள் காணப்படுகின்றன"
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "%r is not callable"
-msgstr "%r அழைக்க முடியாது"
-
-#: ../fdroidserver/signindex.py
-#, python-format
-msgid "%s did not produce a dict!"
-msgstr "%s ஒரு கட்டளையை உருவாக்கவில்லை!"
-
-#: ../fdroidserver/signindex.py
-#, python-format
-msgid "%s has bad SHA-256: %s"
-msgstr "%s மோசமான SHA-256: %s"
-
-#: ../fdroidserver/lint.py
-#, python-format
-msgid "%s is not an accepted build field"
-msgstr "%s ஏற்றுக்கொள்ளப்பட்ட கட்டட புலம் அல்ல"
-
-#: ../fdroidserver/common.py
-msgid "'keypass' not found in config.yml!"
-msgstr "config.yml இல் 'கீபாச்' காணப்படவில்லை!"
-
-#: ../fdroidserver/common.py
-msgid "'keystore' is NONE and 'smartcardoptions' is blank!"
-msgstr "'கீச்டோர்' எதுவுமில்லை, 'அறிவுள்ள கார்டோப்சன்ச்' காலியாக உள்ளது!"
-
-#: ../fdroidserver/common.py
-msgid "'keystore' not found in config.yml!"
-msgstr "'கீச்டோர்' config.yml இல் காணப்படவில்லை!"
-
-#: ../fdroidserver/common.py
-msgid "'keystorepass' not found in config.yml!"
-msgstr "'கீச்டோர்பாச்' config.yml இல் காணப்படவில்லை!"
-
-#: ../fdroidserver/common.py
-msgid "'repo_keyalias' not found in config.yml!"
-msgstr "config.yml இல் 'ரெப்போ_காலியாச்' காணப்படவில்லை!"
-
-#: /usr/lib/python3.11/argparse.py
-msgid "'required' is an invalid argument for positionals"
-msgstr "'தேவை' என்பது நிலைப்பாடுகளுக்கு தவறான வாதமாகும்"
-
-#: ../fdroidserver/common.py
-msgid "'sdk_path' not set in config.yml!"
-msgstr "'sdk_path' config.yml இல் அமைக்கப்படவில்லை!"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "'{aapt}' is too old, fdroid requires build-tools-{version} or newer!"
-msgstr "'{aapt}' மிகவும் பழையது, fdroid க்கு கட்டிய-கருவிகள்-{version} அல்லது புதியவை தேவை!"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "'{path}' failed to execute!"
-msgstr "'{path}' செயல்படுத்தத் தவறிவிட்டது!"
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "'{path}' has invalid format, it should be a dictionary!"
-msgstr "'{path}' தவறான வடிவத்தைக் கொண்டுள்ளது, அது ஒரு அகராதியாக இருக்க வேண்டும்!"
-
-#: ../fdroidserver/lint.py ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "'{value}' is not a valid {field} in {appid}. Regex pattern: {pattern}"
-msgstr "'{value}' என்பது {appid} இல் செல்லுபடியாகும் {field} அல்ல. ரீசெக்ச் முறை: {pattern}"
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "'{value}' is not a valid {field}, should be {pattern}"
-msgstr "'{value}' என்பது செல்லுபடியாகும் {field} அல்ல, {pattern} ஆக இருக்க வேண்டும்"
-
-#: ../fdroidserver/checkupdates.py
-msgid "--merge-request only runs on a single appid!"
-msgstr "-மெர்ச்-கோருதல் ஒரு பயன்பாட்டில் மட்டுமே இயங்குகிறது!"
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "...checkupdate failed for {appid} : {error}"
-msgstr "... {appid}: {error} க்கு செக்அப்டேட் தோல்வியுற்றது"
-
-#: /usr/lib/python3.11/argparse.py
-msgid ".__call__() not defined"
-msgstr ".__ அழைப்பு __ () வரையறுக்கப்படவில்லை"
-
-#: ../fdroidserver/lint.py
-msgid "/issues is missing"
-msgstr "/சிக்கல்கள் இல்லை"
-
-#: ../fdroidserver/mirror.py
-msgid "A URL is required as an argument!"
-msgstr "ஒரு வாதமாக ஒரு முகவரி தேவை!"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "APK signatures have different certificates in {path}:"
-msgstr "APK கையொப்பங்கள் {path} இல் வெவ்வேறு சான்றிதழ்களைக் கொண்டுள்ளன:"
-
-#: ../fdroidserver/__main__.py
-msgid "Add PGP signatures using GnuPG for packages in repo"
-msgstr "ரெப்போவில் உள்ள தொகுப்புகளுக்கு GNUPG ஐப் பயன்படுத்தி PGP கையொப்பங்களைச் சேர்க்கவும்"
-
-#: ../fdroidserver/update.py
-msgid "Add a repo signing key to an unsigned repo"
-msgstr "கையொப்பமிடாத ரெப்போவுக்கு ரெப்போ கையொப்பமிடும் விசையைச் சேர்க்கவும்"
-
-#: ../fdroidserver/update.py
-msgid "Add skeleton metadata files for APKs that are missing them"
-msgstr "காணாமல் போன APK களுக்கு எலும்புக்கூடு மேனிலை தரவு கோப்புகளைச் சேர்க்கவும்"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Adding new repo for only {name}"
-msgstr "புதிய ரெப்போவை {name} க்கு மட்டுமே சேர்ப்பது"
-
-#: ../fdroidserver/init.py
-msgid "Alias of the repo signing key in the keystore"
-msgstr "கீச்டோரில் ரெப்போ கையொப்பமிடும் விசையின் மாற்றுப்பெயர்"
-
-#: ../fdroidserver/build.py
-msgid "AllowedAPKSigningKeys missing but reference binary supplied"
-msgstr "Lentapcigningkeys காணவில்லை, ஆனால் குறிப்பு பைனரி வழங்கப்பட்டது"
-
-#: ../fdroidserver/import_subcommand.py
-msgid "Allows a different revision (or git branch) to be specified for the initial import"
-msgstr "ஆரம்ப இறக்குமதிக்கு வேறு திருத்தம் (அல்லது அறிவிலி கிளை) குறிப்பிட அனுமதிக்கிறது"
-
-#: ../fdroidserver/mirror.py
-msgid "Also mirror the full archive section"
-msgstr "முழு காப்பக பகுதியையும் பிரதிபலிக்கிறது"
-
-#: ../fdroidserver/lint.py
-msgid "Also warn about formatting issues, like rewritemeta -l"
-msgstr "மறுபயன்பாடு -எல் போன்ற சிக்கல்களை வடிவமைத்தல் பற்றியும் எச்சரிக்கவும்"
-
-#: ../fdroidserver/scanner.py
-msgid "Android AAR library"
-msgstr "ஆண்ட்ராய்டு AAR நூலகம்"
-
-#: ../fdroidserver/scanner.py
-msgid "Android APK file"
-msgstr "ஆண்ட்ராய்டு APK கோப்பு"
-
-#: ../fdroidserver/scanner.py
-msgid "Android DEX code"
-msgstr "ஆண்ட்ராய்டு DEX குறியீடு"
-
-#: ../fdroidserver/init.py
-#, python-brace-format
-msgid "Android SDK not found at {path}!"
-msgstr "ஆண்ட்ராய்டு SDK {path} இல் காணப்படவில்லை!"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Android SDK path '{path}' does not exist!"
-msgstr "ஆண்ட்ராய்டு SDK பாதை '{path}' இல்லை!"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Android SDK path '{path}' is not a directory!"
-msgstr "ஆண்ட்ராய்டு SDK பாதை '{path}' ஒரு அடைவு அல்ல!"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Android SDK tool {cmd} not found!"
-msgstr "ஆண்ட்ராய்டு SDK கருவிகள் {cmd} கிடைக்கவில்லை!"
-
-#: ../fdroidserver/lint.py
-msgid "App has Binaries but does not have corresponding AllowedAPKSigningKeys to pin certificate."
-msgstr "பயன்பாட்டில் பைனரிகள் உள்ளன, ஆனால் சான்றிதழுடன் தொடர்புடைய AllowedAPKSigningKeys இல்லை."
-
-#: ../fdroidserver/lint.py
-msgid "App has NoSourceSince or ArchivePolicy \"0 versions\" or 0 but AutoUpdateMode or UpdateCheckMode are not None"
-msgstr "பயன்பாட்டில் Nosourcencence அல்லது காப்பகப் போலிசி \"0 பதிப்புகள்\" அல்லது 0 உள்ளது, ஆனால் ஆட்டோப்டேட்மோட் அல்லது புதுப்பிப்பு தொழில்நுட்பம் எதுவும் இல்லை"
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "App is in '{repo}' but has a link to {url}"
-msgstr "பயன்பாடு '{repo}' இல் உள்ளது, ஆனால் {url} க்கான இணைப்பைக் கொண்டுள்ளது"
-
-#: ../fdroidserver/lint.py
-msgid "App version has binary but does not have corresponding AllowedAPKSigningKeys to pin certificate."
-msgstr "பயன்பாட்டு பதிப்பில் பைனரி உள்ளது, ஆனால் பின் சான்றிதழுடன் தொடர்புடைய AllowedAPKSigningKeys இல்லை."
-
-#: ../fdroidserver/lint.py
-msgid "Appending .git is not necessary"
-msgstr "சேர்ப்பது .git தேவையில்லை"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Archiving {apkfilename} with invalid signature!"
-msgstr "தவறான கையொப்பத்துடன் காப்பக {apkfilename}!"
-
-#: ../fdroidserver/lint.py
-msgid "AutoUpdateMode with UpdateCheckMode: HTTP must have a pattern."
-msgstr "புதுப்பிப்பு தொழில்நுட்பம் கொண்ட ஆட்டோப்டேட்மோட்: HTTP ஒரு வடிவத்தைக் கொண்டிருக்க வேண்டும்."
-
-#: ../fdroidserver/install.py
-msgid "Automatic no to all prompts."
-msgstr "எல்லா தூண்டுதல்களுக்கும் தானியங்கி இல்லை."
-
-#: ../fdroidserver/install.py
-msgid "Automatic yes to all prompts."
-msgstr "எல்லா தூண்டுதல்களுக்கும் தானியங்கி ஆம்."
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "Bad entry type \"{mirrortype}\" in mirrors config: {mirror}"
-msgstr "கண்ணாடியில் \"{mirrortype}\" மோசமான நுழைவு வகை: {mirror}"
-
-#: ../fdroidserver/mirror.py
-msgid "Base URL to mirror, can include the index signing key using the query string: ?fingerprint="
-msgstr "அடிப்படை முகவரி கண்ணாடிக்கு, வினவல் சரம் பயன்படுத்தி குறியீட்டு கையொப்பமிடும் விசையை சேர்க்கலாம்:? கைரேகை ="
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Branch '{branch}' used as commit in build '{versionName}'"
-msgstr "கிளை '{branch}' '{versionName}'கட்டமைப்பில் உறுதிமொழியாக பயன்படுத்தப்படுகிறது"
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Branch '{branch}' used as commit in srclib '{srclib}'"
-msgstr "கிளை '{branch}' '{srclib}'இல் உறுதிமொழியாக பயன்படுத்தப்படுகிறது"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Broken symlink: {path}"
-msgstr "உடைந்த சிம்லிங்க்: {path}"
-
-#: ../fdroidserver/__main__.py
-msgid "Build a package from source"
-msgstr "மூலத்திலிருந்து ஒரு தொகுப்பை உருவாக்குங்கள்"
-
-#: ../fdroidserver/build.py
-msgid "Build all applications available"
-msgstr "கிடைக்கக்கூடிய அனைத்து பயன்பாடுகளையும் உருவாக்குங்கள்"
-
-#: ../fdroidserver/lint.py
-msgid "Build generated by `fdroid import` - remove disable line once ready"
-msgstr "`Fdroid இறக்குமதி` மூலம் உருவாக்கப்பட்ட உருவாக்கு - ஆயத்தம் செய்தவுடன் முடக்கு வரியை அகற்றவும்"
-
-#: ../fdroidserver/checkupdates.py
-msgid "Build metadata git repo has uncommited changes!"
-msgstr "மேனிலை தரவு அறிவிலி ரெப்போ உருவாக்கப்படாத மாற்றங்களைக் கொண்டுள்ளது!"
-
-#: ../fdroidserver/build.py
-msgid "Build only the latest version of each package"
-msgstr "ஒவ்வொரு தொகுப்பின் அண்மைக் கால பதிப்பை மட்டுமே உருவாக்குங்கள்"
-
-#: ../fdroidserver/init.py
-#, python-format
-msgid "Built repo based in \"%s\" with this config:"
-msgstr "இந்த உள்ளமைவுடன் \"%s\" அடிப்படையில் ரெப்போ கட்டப்பட்டது:"
-
-#: ../fdroidserver/checkupdates.py
-msgid "Can't auto-update app with no CurrentVersionCode"
-msgstr "CurrentVersionCode இல்லாமல் பயன்பாட்டை தானாக புதுப்பிக்க முடியாது"
-
-#: ../fdroidserver/build.py
-msgid "Can't build due to {} error while scanning"
-msgid_plural "Can't build due to {} errors while scanning"
-msgstr[0] "ச்கேன் செய்யும் போது {} பிழை காரணமாக உருவாக்க முடியாது"
-msgstr[1] "ச்கேன் செய்யும் போது {} பிழைகள் காரணமாக உருவாக்க முடியாது"
-
-#: ../fdroidserver/common.py
-#, fuzzy, python-brace-format
-msgid "Cannot read {path}: {error}"
-msgstr "தோல்வியுற்ற வாசிப்பு {path}: {error}"
-
-#: ../fdroidserver/rewritemeta.py
-#, python-brace-format
-msgid "Cannot rewrite \"{path}\""
-msgstr "\"{path}\" ஐ மீண்டும் எழுத முடியாது"
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
-#: ../fdroidserver/lint.py
-#, python-format
-msgid "Categories '%s' is not valid"
-msgstr "வகைகள் '%s' செல்லுபடியாகாது"
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
-#: ../fdroidserver/lint.py
-msgid "Categories are not set"
-msgstr "வகைகள் அமைக்கப்படவில்லை"
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "Category \"{category}\" defined but not used for any apps!"
-msgstr "வகை \"{category}\" வரையறுக்கப்பட்டுள்ளது, ஆனால் எந்த பயன்பாடுகளுக்கும் பயன்படுத்தப்படவில்லை!"
-
-#: ../fdroidserver/__main__.py
-msgid "Check for updates to applications"
-msgstr "பயன்பாடுகளுக்கான புதுப்பிப்புகளைச் சரிபார்க்கவும்"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Checking archiving for {appid} - apks:{integer}, keepversions:{keep}, archapks:{arch}"
-msgstr "{appid} க்கான காப்பகத்தை சரிபார்க்கிறது- பயன்பாடுகள்: {integer}, காப்புபதிப்புகள்: {keep}, காப்பகங்கள்: {arch}"
-
-#: ../fdroidserver/update.py
-msgid "Clean update - don't uses caches, reprocess all APKs"
-msgstr "தூய்மையான புதுப்பிப்பு - தற்காலிக சேமிப்பைப் பயன்படுத்த வேண்டாம், அனைத்து APK ஐ மீண்டும் செயலாக்குங்கள்"
-
-#: ../fdroidserver/common.py
-msgid "Color the log output"
-msgstr "பதிவு வெளியீட்டை வண்ணமயமாக்கவும்"
-
-#: ../fdroidserver/import_subcommand.py
-msgid "Comma separated list of categories."
-msgstr "கமா பிரிக்கப்பட்ட வகைகளின் பட்டியல்."
-
-#: ../fdroidserver/__main__.py
-#, python-format
-msgid "Command '%s' not recognised.\n"
-msgstr "'%s' கட்டளை அங்கீகரிக்கப்படவில்லை.\n"
-
-#: ../fdroidserver/checkupdates.py
-msgid "Commit changes"
-msgstr "மாற்றங்களைச் செய்யுங்கள்"
-
-#: ../fdroidserver/checkupdates.py
-msgid "Commit changes, push, then make a merge request"
-msgstr "மாற்றங்களைச் செய்யுங்கள், தள்ளுங்கள், பின்னர் ஒன்றிணைக்கும் கோரிக்கையை உருவாக்குங்கள்"
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Conflicting \"{field}\" definitions between .yml and localized files:"
-msgstr ".Yml மற்றும் உள்ளூர்மயமாக்கப்பட்ட கோப்புகளுக்கு இடையில் முரண்பட்ட \"{field}\" வரையறைகள்:"
-
-#: ../fdroidserver/__main__.py
-msgid "Conflicting arguments: '--verbose' and '--quiet' can not be specified at the same time."
-msgstr "முரண்பட்ட வாதங்கள்: '--verbose' மற்றும் '--quiet' ஒரே நேரத்தில் குறிப்பிட முடியாது."
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Could not find '{command}' on your system"
-msgstr "உங்கள் கணினியில் '{command}' கண்டுபிடிக்க முடியவில்லை"
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/import_subcommand.py
-msgid "Could not find latest version code"
-msgstr "அண்மைக் கால பதிப்பு குறியீட்டைக் கண்டுபிடிக்க முடியவில்லை"
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
-#: ../fdroidserver/import_subcommand.py
-msgid "Could not find latest version name"
-msgstr "அண்மைக் கால பதிப்பு பெயரைக் கண்டுபிடிக்க முடியவில்லை"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Could not find {path} to remove it"
-msgstr "அதை அகற்ற {path} கண்டுபிடிக்க முடியவில்லை"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Could not open APK {path} for analysis: "
-msgstr "பகுப்பாய்விற்கு பயன்பாடு {path}ஐ திறக்க முடியவில்லை: "
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Could not parse size \"{size}\", wrong type \"{type}\""
-msgstr "அளவை \"{size}\", தவறான வகை \"{type}\""
-
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/import_subcommand.py
-msgid "Couldn't find Application ID"
-msgstr "பயன்பாட்டு ஐடியைக் கண்டுபிடிக்க முடியவில்லை"
-
-#: ../fdroidserver/checkupdates.py
-msgid "Couldn't find any version information"
-msgstr "எந்த பதிப்பு தகவலையும் கண்டுபிடிக்க முடியவில்லை"
-
-#: ../fdroidserver/checkupdates.py
-msgid "Couldn't find package ID"
-msgstr "தொகுப்பு ஐடியைக் கண்டுபிடிக்க முடியவில்லை"
-
-#: ../fdroidserver/update.py
-msgid "Cowardily refusing to overwrite existing signing key setup!"
-msgstr "ஏற்கனவே கையொப்பமிடும் விசை அமைப்பை மேலெழுத மறுக்கிறது!"
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Created new container \"{name}\""
-msgstr "புதிய கொள்கலனை உருவாக்கியது \"{name}\""
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Creating \"{path}\" for configuring s3cmd."
-msgstr "S3CMD ஐ கட்டமைக்க \"{path}\" ஐ உருவாக்குதல்."
-
-#: ../fdroidserver/common.py
-#, fuzzy, python-brace-format
-msgid "Creating empty {config_file}"
-msgstr "'{config_file}'"
-
-#: ../fdroidserver/publish.py
-msgid "Creating log directory"
-msgstr "பதிவு கோப்பகத்தை உருவாக்குதல்"
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Creating new S3 bucket: {url}"
-msgstr "புதிய எச் 3 வாளியை உருவாக்குதல்: {url}"
-
-#: ../fdroidserver/publish.py
-msgid "Creating output directory"
-msgstr "வெளியீட்டு கோப்பகத்தை உருவாக்குதல்"
-
-#: ../fdroidserver/index.py
-msgid "Creating signed index with this key (SHA256):"
-msgstr "இந்த விசையுடன் கையொப்பமிடப்பட்ட குறியீட்டை உருவாக்குதல் (SHA256):"
-
-#: ../fdroidserver/publish.py ../fdroidserver/verify.py
-msgid "Creating temporary directory"
-msgstr "தற்காலிக கோப்பகத்தை உருவாக்குதல்"
-
-#: ../fdroidserver/index.py
-msgid "Creating unsigned index in preparation for signing"
-msgstr "கையொப்பமிடுவதற்கான தயாரிப்பில் கையொப்பமிடாத குறியீட்டை உருவாக்குதல்"
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "CurrentVersionCode {cv} is less than oldest build entry {versionCode}"
-msgstr "CurrentVersionCode {cv} மிகப் பழமையான உருவாக்க நுழைவு {versionCode} ஐ விட குறைவாக உள்ளது"
-
-#: ../fdroidserver/nightly.py
-msgid "DEBUG_KEYSTORE is not set or the value is incomplete"
-msgstr "Debug_keystore அமைக்கப்படவில்லை அல்லது மதிப்பு முழுமையடையாது"
-
-#: ../fdroidserver/update.py
-msgid "Delete APKs and/or OBBs without metadata from the repo"
-msgstr "ரெப்போவிலிருந்து மேனிலை தரவு இல்லாமல் APKS மற்றும்/அல்லது OBB களை நீக்கு"
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Deleting archive, repo is too big ({size} max {limit})"
-msgstr "காப்பகத்தை நீக்குதல், ரெப்போ மிகப் பெரியது ({size} அதிகபட்சம் {limit})"
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Deleting git-mirror history, repo is too big ({size} max {limit})"
-msgstr "கிட்-மிரர் வரலாற்றை நீக்குதல், ரெப்போ மிகப் பெரியது ({size} அதிகபட்சம் {limit})"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Deleting unknown file: {path}"
-msgstr "அறியப்படாத கோப்பை நீக்குதல்: {path}"
-
-#: ../fdroidserver/lint.py
-#, python-format
-msgid "Description '%s' is just the app's summary"
-msgstr "விளக்கம் '%s' என்பது பயன்பாட்டின் சுருக்கம்"
-
-#: ../fdroidserver/lint.py
-msgid "Description has a duplicate line"
-msgstr "விளக்கம் ஒரு நகல் கோடு உள்ளது"
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Description of length {length} is over the {limit} char limit"
-msgstr "நீளம் {length} இன் விளக்கம் {limit} கரி வரம்புக்கு மேல் உள்ளது"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Did you mean config/{name}.yml?"
-msgstr "நீங்கள் கட்டமைப்பு/{name}.yml?"
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Did you mean {code}?"
-msgstr "நீங்கள் {code} என்று சொன்னீர்களா?"
-
-#: ../fdroidserver/import_subcommand.py
-msgid "Do not add 'disable:' to the generated build entries"
-msgstr "உருவாக்கப்பட்ட உருவாக்க உள்ளீடுகளுக்கு 'முடக்கு:' ஐ முடக்க வேண்டாம்"
-
-#: ../fdroidserver/nightly.py
-msgid "Do not deploy the new files to the repo"
-msgstr "புதிய கோப்புகளை ரெப்போவுக்கு பயன்படுத்த வேண்டாம்"
-
-#: ../fdroidserver/mirror.py
-#, python-brace-format
-msgid "Do not include \"{path}\" in URL!"
-msgstr "முகவரி இல் \"{path}\" சேர்க்க வேண்டாம்!"
-
-#: ../fdroidserver/init.py
-msgid "Do not prompt for Android SDK path, just fail"
-msgstr "ஆண்ட்ராய்டு SDK பாதைக்கு கேட்க வேண்டாம், தோல்வியடைகிறது"
-
-#: ../fdroidserver/nightly.py
-msgid "Do not remove the private keys generated from the keystore"
-msgstr "கீச்டோரிலிருந்து உருவாக்கப்பட்ட தனிப்பட்ட விசைகளை அகற்ற வேண்டாம்"
-
-#: ../fdroidserver/build.py
-msgid "Don't create a source tarball, useful when testing a build"
-msgstr "ஒரு மூலத்தை உருவாக்க வேண்டாம், ஒரு கட்டமைப்பைச் சோதிக்கும்போது பயனுள்ளதாக இருக்கும்"
-
-#: ../fdroidserver/build.py
-msgid "Don't refresh the repository, useful when testing a build with no internet connection"
-msgstr "இணைய இணைப்பு இல்லாத கட்டமைப்பைச் சோதிக்கும்போது பயனுள்ளதாக இருக்கும் களஞ்சியத்தை புதுப்பிக்க வேண்டாம்"
-
-#: ../fdroidserver/deploy.py ../fdroidserver/nightly.py
-msgid "Don't use rsync checksums"
-msgstr "RSYNC CHECKSUMS ஐப் பயன்படுத்த வேண்டாம்"
-
-#: ../fdroidserver/install.py
-msgid "Download F-Droid.apk using mirrors that leak less to the network"
-msgstr "நெட்வொர்க்கில் குறைவாக கசியும் கண்ணாடியைப் பயன்படுத்தி f-droid.apk ஐப் பதிவிறக்கவும்"
-
-#: ../fdroidserver/__main__.py
-msgid "Download complete mirrors of small repos"
-msgstr "சிறிய களஞ்சியங்களின் முழுமையான கண்ணாடியைப் பதிவிறக்கவும்"
-
-#: ../fdroidserver/common.py
-msgid "Downloading the repository already failed once, not trying again."
-msgstr "களஞ்சியத்தை பதிவிறக்குவது ஏற்கனவே ஒரு முறை தோல்வியடைந்தது, மீண்டும் முயற்சிக்கவில்லை."
-
-#: ../fdroidserver/verify.py
-#, python-brace-format
-msgid "Downloading {url} failed. {error}"
-msgstr "பதிவிறக்கம் {url} தோல்வியுற்றது. {error}"
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Duplicate Anti-Feature declaration at {path} was ignored!"
-msgstr "{path} இல் நகல்-அம்ச எதிர்ப்பு அறிவிப்பு புறக்கணிக்கப்பட்டது!"
-
-#: ../fdroidserver/index.py
-#, python-format
-msgid "Duplicate entry \"%s\" in mirrors config!"
-msgstr "கண்ணாடிகள் கட்டமைப்பில் நகல் நுழைவு \"%s\"!"
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Duplicate link in '{field}': {url}"
-msgstr "'{field}' இல் நகல் இணைப்பு: {url}"
-
-#: ../fdroidserver/common.py
-#, python-format
-msgid "ERROR: %(message)s"
-msgstr "பிழை: %(message)s"
-
-#: ../fdroidserver/__main__.py
-msgid "ERROR: The \"server\" subcommand has been removed, use \"deploy\"!"
-msgstr "பிழை: \"சேவையகம்\" துணைக்குழு அகற்றப்பட்டது, \"வரிசைப்படுத்தல்\" ஐப் பயன்படுத்தவும்!"
-
-#: ../fdroidserver/nightly.py
-msgid "ERROR: unsupported CI type, patches welcome!"
-msgstr "பிழை: ஆதரிக்கப்படாத தொஒ வகை, திட்டுகள் வரவேற்கப்படுகின்றன!"
-
-#: ../fdroidserver/nightly.py
-#, python-format
-msgid "ERROR: unsupported git host \"%s\", patches welcome!"
-msgstr "பிழை: ஆதரிக்கப்படாத அறிவிலி புரவலன் \"%s\", திட்டுகள் வரவேற்கப்படுகின்றன!"
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "ERROR: {key} in {path} is not \"archive\" or \"repo\"!"
-msgstr "பிழை: {path} இல் {key} என்பது \"காப்பகம்\" அல்லது \"ரெப்போ\" அல்ல!"
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "ERROR: {key} not a valid key!"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "ERROR: {key}'s value should be of type {t}!"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "ERROR: {key}:{subkey} in {path} is not in allowed keys: {allowed_keys}!"
-msgstr "பிழை: {key}: {path} இல் {subkey} அனுமதிக்கப்பட்ட விசைகளில் இல்லை: {allowed_keys}!"
-
-#: ../fdroidserver/__main__.py
-#, python-brace-format
-msgid "Encoding is set to '{enc}' fdroid might run into encoding issues. Please set it to 'UTF-8' for best results."
-msgstr "குறியாக்கம் '{enc}' fdroid என அமைக்கப்பட்டுள்ளது. சிறந்த முடிவுகளுக்கு அதை 'UTF-8' என அமைக்கவும்."
-
-#: ../fdroidserver/init.py
-#, python-format
-msgid ""
-"Enter the path to the Android SDK (%s) here:\n"
-"> "
-msgstr ""
-"ஆண்ட்ராய்டு SDK (%s) க்கு பாதையை இங்கே உள்ளிடவும்:\n"
-" > "
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Environment variable {var} from {configname} is not set!"
-msgstr "{configname} இருந்து இலிருந்து சுற்றுச்சூழல் மாறி {var} அமைக்கப்படவில்லை!"
-
-#: ../fdroidserver/common.py
-#, fuzzy, python-brace-format
-msgid "Environment variable {{env: {var}}} is not set!"
-msgstr "{configname} இருந்து இலிருந்து சுற்றுச்சூழல் மாறி {var} அமைக்கப்படவில்லை!"
-
-#: ../fdroidserver/deploy.py
-msgid "Error deploying 'github_releases', {} not present. (You might need to run `fdroid update` first.)"
-msgstr "'Github_Releases' ஐ வரிசைப்படுத்துவதில் பிழை, {} இல்லை. (நீங்கள் முதலில் `fdroid புதுப்பிப்பை இயக்க வேண்டியிருக்கலாம்.)"
-
-#: ../fdroidserver/import_subcommand.py
-msgid "Error while getting repo address"
-msgstr "ரெப்போ முகவரியைப் பெறும்போது பிழை"
-
-#: ../fdroidserver/scanner.py
-msgid "Exit with a non-zero code if problems were found"
-msgstr "சிக்கல்கள் கண்டுபிடிக்கப்பட்டால் பூச்சியமற்ற குறியீட்டைக் கொண்டு வெளியேறவும்"
-
-#: ../fdroidserver/__main__.py
-msgid "Extract application metadata from a source repository"
-msgstr "மூல களஞ்சியத்திலிருந்து பயன்பாட்டு மெட்டாடேட்டாவை பிரித்தெடுக்கவும்"
-
-#: ../fdroidserver/__main__.py
-msgid "Extract signatures from APKs"
-msgstr "APK இலிருந்து கையொப்பத்தை பிரித்தெடுக்கவும்"
-
-#: ../fdroidserver/install.py
-msgid "F-Droid.apk could not be downloaded from any known source!"
-msgstr "அறியப்பட்ட எந்த மூலத்திலிருந்தும் f-droid.apk ஐ பதிவிறக்கம் செய்ய முடியவில்லை!"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Failed copying {path}: {error}"
-msgstr "தோல்வியுற்ற நகலெடுப்பதில் {path}: {error}"
-
-#: ../fdroidserver/signatures.py
-#, python-brace-format
-msgid "Failed fetching signatures for '{apkfilename}': {error}"
-msgstr "'{apkfilename}' க்கான கையொப்பங்களைப் பெறுவதில் தோல்வி: {error}"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Failed reading {path}: {error}"
-msgstr "தோல்வியுற்ற வாசிப்பு {path}: {error}"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Failed resizing {path}: {error}"
-msgstr "மறுஅளவு தோல்வியுற்றது {path}: {error}"
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Failed to create S3 bucket: {url}"
-msgstr "S3 வாளியை உருவாக்குவதில் தோல்வி: {url}"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Failed to get APK information, deleting {path}"
-msgstr "APK தகவல்களைப் பெறுவதில் தோல்வி, {path} நீக்குதல்"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Failed to get APK information, skipping {path}"
-msgstr "APK தகவல்களைப் பெறுவதில் தோல்வி, {path}யைத் தவிர்ப்பது"
-
-#: ../fdroidserver/update.py
-msgid "Failed to get APK signing key fingerprint"
-msgstr "முக்கிய கைரேகை கையொப்பமிடுவதில் தோல்வி"
-
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "Failed to install '{apkfilename}' on {dev}: {error}"
-msgstr "{dev} இல் '{apkfilename}' ஐ நிறுவுவதில் தோல்வி: {error}"
-
-#: ../fdroidserver/common.py
-msgid "Failed to sign application"
-msgstr "விண்ணப்பத்தில் கையெழுத்திடுவதில் தோல்வி"
-
-#: ../fdroidserver/build.py
-#, python-brace-format
-msgid "Fetched buildserverid from VM: {buildserverid}"
-msgstr "VM இலிருந்து சேவையக ஐடியை உருவாக்குதல்: {buildserverid}"
-
-#: ../fdroidserver/signatures.py
-#, python-brace-format
-msgid "Fetched signatures for '{apkfilename}' -> '{sigdir}'"
-msgstr "'{apkfilename}' -> '{sigdir}' க்கான கையொப்பங்களைப் பெற்றது"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "File disappeared while processing it: {path}"
-msgstr "அதை செயலாக்கும்போது கோப்பு மறைந்தது: {path}"
-
-#: ../fdroidserver/build.py ../fdroidserver/install.py
-#: ../fdroidserver/rewritemeta.py ../fdroidserver/scanner.py
-#: ../fdroidserver/update.py
-msgid "Finished"
-msgstr "முடிந்தது"
-
-#: ../fdroidserver/lint.py
-msgid "Forbidden HTML tags"
-msgstr "தடைசெய்யப்பட்ட உஉகுமொ குறிச்சொற்கள்"
-
-#: ../fdroidserver/build.py
-msgid "Force build of disabled apps, and carries on regardless of scan problems. Only allowed in test mode."
-msgstr "ஊனமுற்ற பயன்பாடுகளை கட்டாயப்படுத்துகிறது, மேலும் ச்கேன் சிக்கல்களைப் பொருட்படுத்தாமல். சோதனை பயன்முறையில் மட்டுமே அனுமதிக்கப்படுகிறது."
-
-#: ../fdroidserver/build.py
-#, python-brace-format
-msgid "Force halting build after {0} sec timeout!"
-msgstr "{0} நொடி காலக்கெடுவுக்குப் பிறகு கட்டமைப்பை கட்டாயப்படுத்துதல்!"
-
-#: ../fdroidserver/scanner.py
-msgid "Force scan of disabled apps and builds."
-msgstr "ஊனமுற்ற பயன்பாடுகள் மற்றும் கட்டமைப்புகளை ச்கேன் செய்யுங்கள்."
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Found \"{path}\" graphic without metadata for app \"{name}\"!"
-msgstr "பயன்பாட்டிற்கான மேனிலை தரவு இல்லாமல் \"{path}\" கிராஃபிக் கிடைத்தது \"{name}\"!"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Found bad funding file \"{path}\" for \"{name}\":"
-msgstr "\"{name}\" க்கு \"{path}\" மோசமான பொருள் கோப்பு கிடைத்தது:"
-
-#: ../fdroidserver/common.py
-msgid "Found invalid appids in arguments"
-msgstr "வாதங்களில் தவறான பயன்பாடுகளைக் கண்டறிந்தது"
-
-#: ../fdroidserver/common.py
-msgid "Found invalid versionCodes for some apps"
-msgstr "சில பயன்பாடுகளுக்கான தவறான பதிப்புக் குறியீடுகளைக் கண்டறிந்தது"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Found multiple JAR Signature Block Files in {path}"
-msgstr "{path} இல் பல குடுவை கையொப்பம் தொகுதி கோப்புகள் கிடைத்தன"
-
-#: ../fdroidserver/common.py
-msgid "Found multiple Signer Certificates!"
-msgstr "பல கையொப்ப சான்றிதழ்கள் கிடைத்தன!"
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Found multiple metadata files for {appid}"
-msgstr "{appid} க்கான பல மேனிலை தரவு கோப்புகள் கிடைத்தன"
-
-#: ../fdroidserver/index.py
-msgid "Found multiple signing certificates for repository."
-msgstr "களஞ்சியத்திற்கான பல கையொப்பமிடும் சான்றிதழ்கள் கண்டறியப்பட்டன."
-
-#: ../fdroidserver/index.py
-msgid "Found no signing certificates for repository."
-msgstr "களஞ்சியத்திற்கான கையொப்பமிடும் சான்றிதழ்கள் எதுவும் கிடைக்கவில்லை."
-
-#: ../fdroidserver/lint.py
-#, python-format
-msgid "Found non-file at %s"
-msgstr "%s இல் கோப்பு அல்லாதது"
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Found {apkfilename} at {url}"
-msgstr "{url} இல் {apkfilename} காணப்பட்டது"
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Found {count} problems in {filename}"
-msgstr "{filename} இல் {count} சிக்கல்கள் காணப்பட்டன"
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Found {count} warnings in {filename}"
-msgstr "{filename} இல் {count} எச்சரிக்கைகள் கிடைத்தன"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Generated skeleton metadata for {appid}"
-msgstr "{appid} க்காக உருவாக்கப்பட்ட எலும்புக்கூடு மேனிலை தரவு"
-
-#: ../fdroidserver/common.py
-#, python-format
-msgid "Git checkout of '%s' failed"
-msgstr "'%s' இன் அறிவிலி புதுப்பிப்பு தோல்வியடைந்தது"
-
-#: ../fdroidserver/common.py
-msgid "Git clean failed"
-msgstr "அறிவிலி தூய்மையான தோல்வியுற்றது"
-
-#: ../fdroidserver/common.py
-msgid "Git fetch failed"
-msgstr "Git fetch தோல்வியுற்றது"
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/common.py
-#, python-format
-msgid "Git remote set-head failed: \"%s\""
-msgstr "அறிவிலி ரிமோட் செட்-எட் தோல்வியடைந்தது: \"%s\""
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/common.py
-msgid "Git reset failed"
-msgstr "அறிவிலி மீட்டமைப்பு தோல்வியடைந்தது"
-
-#: ../fdroidserver/common.py
-msgid "Git submodule deinit failed"
-msgstr "Git சப்மோடூல் டீனிட் தோல்வியடைந்தது"
-
-#: ../fdroidserver/common.py
-msgid "Git submodule sync failed"
-msgstr "Git சப்மோடூல் ஒத்திசைவு தோல்வியடைந்தது"
-
-#: ../fdroidserver/common.py
-msgid "Git submodule update failed"
-msgstr "Git சப்மோடூல் புதுப்பிப்பு தோல்வியடைந்தது"
-
-#: ../fdroidserver/common.py
-msgid "HTTPS must be used with Subversion URLs!"
-msgstr "HTTP கள் சப்வர்சன் முகவரி களுடன் பயன்படுத்தப்பட வேண்டும்!"
-
-#: ../fdroidserver/deploy.py
-msgid "If a git mirror gets to big, allow the archive to be deleted"
-msgstr "ஒரு அறிவிலி கண்ணாடி பெரியதாகிவிட்டால், காப்பகத்தை நீக்க அனுமதிக்கவும்"
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "If this upload fails, try manually uploading to {url}"
-msgstr "இந்த பதிவேற்றம் தோல்வியுற்றால், {url} பெறுநர் க்கு கைமுறையாக பதிவேற்ற முயற்சிக்கவும்"
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Ignoring '{field}' in '{metapath}' metadata because it is deprecated."
-msgstr "'{field}' இல் '{metapath}' மெட்டாடேட்டாவில் புறக்கணிக்கப்படுவதால் அது நீக்கப்பட்டது."
-
-#: ../fdroidserver/update.py
-#, python-format
-msgid "Ignoring FUNDING.yml entry longer than 2048: %s"
-msgstr "நிதியுதவியை புறக்கணித்தல். 2048 ஐ விட நீண்ட காலமாக நுழைவு: %s"
-
-#: ../fdroidserver/update.py
-#, python-format
-msgid "Ignoring bad element in manifest: %s"
-msgstr "வெளிப்படையான மோசமான உறுப்பை புறக்கணித்தல்: %s"
-
-#: ../fdroidserver/common.py
-#, fuzzy, python-brace-format
-msgid "Ignoring deprecated {oldfile}, use {newfile}!"
-msgstr "{oldfile} நீக்கப்பட்டது, {newfile} ஐப் பயன்படுத்தவும்"
-
-#: ../fdroidserver/index.py
-msgid "Ignoring package without metadata: "
-msgstr "மேனிலை தரவு இல்லாமல் தொகுப்பைப் புறக்கணித்தல்: "
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Ignoring stale cache data for {apkfilename}"
-msgstr "{apkfilename}க்கான பழைய கேச் தரவைப் புறக்கணித்தல்"
-
-#: ../fdroidserver/update.py
-msgid "Include APKs that are signed with disabled algorithms like MD5"
-msgstr "MD5 போன்ற ஊனமுற்ற வழிமுறைகளுடன் கையொப்பமிடப்பட்ட APK கள் சேர்க்கவும்"
-
-#: ../fdroidserver/mirror.py
-msgid "Include the PGP signature .asc files in the mirror"
-msgstr "கண்ணாடியில் பிசிபி கையொப்பம் .ஆச்க் கோப்புகளைச் சேர்க்கவும்"
-
-#: ../fdroidserver/mirror.py
-msgid "Include the build logs in the mirror"
-msgstr "கண்ணாடியில் உருவாக்க பதிவுகளைச் சேர்க்கவும்"
-
-#: ../fdroidserver/mirror.py
-msgid "Include the source tarballs in the mirror"
-msgstr "கண்ணாடியில் மூல டார்பால்சைச் சேர்க்கவும்"
-
-#: ../fdroidserver/metadata.py
-#, python-format
-msgid "Including metadata from %s@%s"
-msgstr "%s@ %s இலிருந்து மேனிலை தரவு உட்பட"
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Including metadata from {path}"
-msgstr "{path} இருந்து இலிருந்து மேனிலை தரவு உட்பட"
-
-#: ../fdroidserver/common.py
-msgid "Initialising submodules"
-msgstr "துணைமோடல்களைத் தொடங்குதல்"
-
-#: ../fdroidserver/install.py
-msgid "Install all signed applications available"
-msgstr "கிடைக்கக்கூடிய அனைத்து கையொப்பமிடப்பட்ட பயன்பாடுகளையும் நிறுவவும்"
-
-#: ../fdroidserver/__main__.py
-msgid "Install built packages on devices"
-msgstr "சாதனங்களில் கட்டப்பட்ட தொகுப்புகளை நிறுவவும்"
-
-#: ../fdroidserver/install.py
-#, python-format
-msgid "Installing %s..."
-msgstr "%s நிறுவுதல் ..."
-
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "Installing '{apkfilename}' on {dev}..."
-msgstr "{dev} இல் '{apkfilename}' ஐ நிறுவுதல் ..."
-
-#: ../fdroidserver/__main__.py
-msgid "Interact with the repo HTTP server"
-msgstr "ரெப்போ HTTP சேவையகத்துடன் தொடர்பு கொள்ளுங்கள்"
-
-#: ../fdroidserver/update.py
-msgid "Invalid APK"
-msgstr "தவறான APK"
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "Invalid AutoUpdateMode: {mode}"
-msgstr "தவறான AutoupDateMode: {mode}"
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "Invalid UpdateCheckMode: {mode}"
-msgstr "தவறான புதுப்பிப்பு சோதனை: {mode}"
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "Invalid VercodeOperation: {field}"
-msgstr "தவறான VERCODEOPERATION: {field}"
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Invalid VercodeOperation: {invalid_ops}"
-msgstr "தவறான VERCODEOPERATION: {invalid_ops}"
-
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Invalid application ID {appid}"
-msgstr "தவறான பயன்பாட்டு ஐடி {appid}"
-
-#: ../fdroidserver/lint.py
-msgid "Invalid bulleted list"
-msgstr "தவறான புல்லட் பட்டியல்"
-
-#: ../fdroidserver/common.py
-#, python-format
-msgid "Invalid name for published file: %s"
-msgstr "வெளியிடப்பட்ட கோப்பிற்கான தவறான பெயர்: %s"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Invalid ndk: entry in build: \"{ndk}\""
-msgstr "தவறான NDK: கட்டமைப்பில் நுழைவு: \"{ndk}\""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Invalid redirect to non-HTTPS: {before} -> {after} "
-msgstr "Https அல்லாதவர்களுக்கு தவறான திருப்பி விடுங்கள்: {before} -> {after} "
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Invalid scrlib metadata: '{file}' does not exist"
-msgstr "தவறான ச்க்ர்லிப் மெட்டாடேட்டா: '{file}' இல்லை"
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Invalid srclib metadata: could not parse '{file}'"
-msgstr "தவறான SRCLIB மெட்டாடேட்டா: '{file}'"
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Invalid srclib metadata: unknown key '{key}' in '{file}'"
-msgstr "தவறான SRCLIB மெட்டாடேட்டா: அறியப்படாத விசை '{key}' இல் '{file}'"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "JAR signature failed to verify: {path}"
-msgstr "சார் கையொப்பம் சரிபார்க்கத் தவறிவிட்டது: {path}"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "JAR signature verified: {path}"
-msgstr "சார் கையொப்பம் சரிபார்க்கப்பட்டது: {path}"
-
-#: ../fdroidserver/scanner.py
-msgid "Java JAR file"
-msgstr "சாவா குடுவை கோப்பு"
-
-#: ../fdroidserver/mirror.py ../fdroidserver/publish.py
-#: ../fdroidserver/update.py
-msgid "Java JDK not found! Install in standard location or set java_paths!"
-msgstr "சாவா சே.டி.கே கண்டுபிடிக்கப்படவில்லை! நிலையான இடத்தில் நிறுவவும் அல்லது சாவா_பாத்களை அமைக்கவும்!"
-
-#: ../fdroidserver/scanner.py
-msgid "Java compiled class"
-msgstr "சாவா தொகுக்கப்பட்ட வகுப்பு"
-
-#: ../fdroidserver/signindex.py
-msgid "Java jarsigner not found! Install in standard location or set java_paths!"
-msgstr "சாவா சார்சிக்னர் கண்டுபிடிக்கப்படவில்லை! நிலையான இடத்தில் நிறுவவும் அல்லது சாவா_பாத்களை அமைக்கவும்!"
-
-#: ../fdroidserver/lint.py
-msgid "Javascript in HTML src attributes"
-msgstr "உஉகுமொ SRC பண்புகளில் சாவாச்கிரிப்ட்"
-
-#: ../fdroidserver/build.py
-#, python-brace-format
-msgid "Keeping failed build \"{apkfilename}\""
-msgstr "தோல்வியுற்ற கட்டமைப்பை வைத்திருத்தல் \"{apkfilename}\""
-
-#: ../fdroidserver/init.py
-msgid "Keystore for signing key:\t"
-msgstr "விசையை கையொப்பமிடுவதற்கான கீச்டோர்:\t"
-
-#: ../fdroidserver/lint.py
-msgid "Known debug key is used in AllowedAPKSigningKeys: "
-msgstr "அறியப்பட்ட பிழைத்திருத்த விசை Lentappasigningkeys இல் பயன்படுத்தப்படுகிறது: "
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Last used commit '{commit}' looks like a tag, but UpdateCheckMode is '{ucm}'"
-msgstr "கடைசியாக பயன்படுத்தப்பட்ட கமிட் '{commit}' ஒரு குறிச்சொல்லாகத் தெரிகிறது, ஆனால் புதுப்பிப்பு தொழில்நுட்பம் '{ucm}'"
-
-#: ../fdroidserver/lint.py
-msgid "Liberapay donation methods belong in the Liberapay: field"
-msgstr "லிபராபே நன்கொடை முறைகள் லைபர்பே: புலம்"
-
-#: ../fdroidserver/rewritemeta.py
-msgid "List files that would be reformatted (dry run)"
-msgstr "மறுவடிவமைக்கப்படும் கோப்புகளை பட்டியலிடுங்கள் (உலர் ரன்)"
-
-#: ../fdroidserver/lint.py
-msgid "Locale included in f-droid.org URL"
-msgstr "F-droid.org முகவரி இல் சேர்க்கப்பட்டுள்ளது"
-
-#: ../fdroidserver/build.py
-msgid "Make the build stop on exceptions"
-msgstr "விதிவிலக்குகளில் கட்டமைப்பை நிறுத்துங்கள்"
-
-#: ../fdroidserver/index.py
-msgid "Malformed repository mirrors."
-msgstr "தவறாக களஞ்சிய கண்ணாடிகள்."
-
-#: ../fdroidserver/deploy.py
-msgid "Malformed serverwebroot line:"
-msgstr "தவறாக சேவையகமானது:"
-
-#: ../fdroidserver/scanner.py
-#, python-format
-msgid "Max recursion depth in ZIP file reached: %s"
-msgstr "சிப் கோப்பில் அதிகபட்ச மறுசீரமைப்பு ஆழம் எட்டப்பட்டது: %s"
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "Mirror config for {url} contains \"isPrimary\" key!"
-msgstr ""
-
-#: ../fdroidserver/mirror.py
-msgid "Mirror the full repo and archive, all file types."
-msgstr "முழு ரெப்போ மற்றும் காப்பகத்தை பிரதிபலிக்கவும், அனைத்து கோப்பு வகைகளிலும்."
-
-#: ../fdroidserver/gpgsign.py
-msgid "Missing output directory"
-msgstr "வெளியீட்டு அடைவு இல்லை"
-
-#: ../fdroidserver/metadata.py
-msgid "Moving Anti-Features declarations to localized files:"
-msgstr "நற்பொருத்தம் எதிர்ப்பு அறிவிப்புகளை உள்ளூர்மயமாக்கப்பட்ட கோப்புகளுக்கு நகர்த்துவது:"
-
-#: ../fdroidserver/index.py
-msgid "Neither \"repo_pubkey\" nor \"keystorepass\" set in config.yml"
-msgstr "Config.yml இல் \"REPO_PUBKEY\" அல்லது \"கீச்டோர்பாச்\" எதுவும் அமைக்கப்படவில்லை"
-
-#: ../fdroidserver/verify.py
-#, python-format
-msgid "No APK for package: %s"
-msgstr "தொகுப்புக்கு APK இல்லை: %s"
-
-#: ../fdroidserver/common.py
-msgid "No Android SDK found!"
-msgstr "ஆண்ட்ராய்டு SDK எதுவும் கிடைக்கவில்லை!"
-
-#: ../fdroidserver/install.py
-msgid "No attached devices found"
-msgstr "இணைக்கப்பட்ட சாதனங்கள் எதுவும் கிடைக்கவில்லை"
-
-#: ../fdroidserver/install.py
-msgid "No devices found for `adb install`! Please plug one in."
-msgstr "`ADB Install` க்காக எந்த சாதனங்களும் கிடைக்கவில்லை! ஒன்றை செருகவும்."
-
-#: ../fdroidserver/index.py
-msgid "No fingerprint in URL."
-msgstr "முகவரி இல் கைரேகை இல்லை."
-
-#: ../fdroidserver/common.py
-msgid "No git submodules available"
-msgstr "அறிவிலி சப்மோடூல்கள் எதுவும் கிடைக்கவில்லை"
-
-#: ../fdroidserver/import_subcommand.py
-msgid "No gradle project could be found. Specify --subdir?"
-msgstr "கிரேடில் திட்டத்தைக் காண முடியவில்லை. -சப்பரைக் குறிப்பிடவா?"
-
-#: ../fdroidserver/import_subcommand.py
-msgid "No information found."
-msgstr "எந்த தகவலும் கிடைக்கவில்லை."
-
-#: ../fdroidserver/checkupdates.py
-msgid "No matching tags found"
-msgstr "பொருந்தக்கூடிய குறிச்சொற்கள் எதுவும் கிடைக்கவில்லை"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "No minimum SDK version found in {0}, using default (3)."
-msgstr "இயல்புநிலை (3) ஐப் பயன்படுத்தி குறைந்தபட்ச SDK பதிப்பு {0} at இல் காணப்படவில்லை."
-
-#: ../fdroidserver/lint.py
-msgid "No need to specify that the app is Free Software"
-msgstr "பயன்பாடு இலவச மென்பொருள் என்பதை குறிப்பிட தேவையில்லை"
-
-#: ../fdroidserver/lint.py
-msgid "No need to specify that the app is for Android"
-msgstr "பயன்பாடு ஆண்ட்ராய்டு க்கானது என்பதை குறிப்பிட தேவையில்லை"
-
-#: ../fdroidserver/deploy.py
-msgid "No option set! Edit your config.yml to set at least one of these:"
-msgstr "விருப்பத்தேர்வு தொகுப்பு இல்லை! இவற்றில் குறைந்தபட்சம் ஒன்றை அமைக்க உங்கள் config.yml ஐத் திருத்தவும்:"
-
-#: ../fdroidserver/common.py
-msgid "No packages specified"
-msgstr "தொகுப்புகள் எதுவும் குறிப்பிடப்படவில்லை"
-
-#: ../fdroidserver/install.py
-#, python-format
-msgid "No signed APK available for %s"
-msgstr "%s க்கு கையொப்பமிடப்பட்ட APK கிடைக்கவில்லை"
-
-#: ../fdroidserver/install.py
-msgid "No signed output directory - nothing to do"
-msgstr "கையொப்பமிடப்பட்ட வெளியீட்டு அடைவு இல்லை - எதுவும் செய்ய எதுவும் இல்லை"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "No signing certificates found in {path}"
-msgstr "{path} இல் கையொப்பமிடும் சான்றிதழ்கள் இல்லை"
-
-#: ../fdroidserver/common.py
-#, python-format
-msgid "No such package: %s"
-msgstr "அத்தகைய தொகுப்பு இல்லை: %s"
-
-#: ../fdroidserver/common.py
-#, fuzzy, python-brace-format
-msgid "No such versionCode {versionCode} for app {appid}"
-msgstr "பயன்பாட்டிற்கு அத்தகைய பதிப்பு குறியீடு பதிப்பு குறியீடு {versionCode}"
-
-#: ../fdroidserver/checkupdates.py
-msgid "No tags found"
-msgstr "குறிச்சொற்கள் எதுவும் கிடைக்கவில்லை"
-
-#: ../fdroidserver/publish.py ../fdroidserver/verify.py
-msgid "No unsigned directory - nothing to do"
-msgstr "கையொப்பமிடாத அடைவு இல்லை - எதுவும் செய்ய முடியாது"
-
-#: ../fdroidserver/__main__.py
-msgid "No version information could be found."
-msgstr "பதிப்பு தகவல்களைக் காண முடியவில்லை."
-
-#: ../fdroidserver/common.py
-msgid "Not a valid size definition: \"{}\""
-msgstr "சரியான அளவு வரையறை அல்ல: \"{}\""
-
-#: ../fdroidserver/signindex.py
-msgid "Nothing to do"
-msgstr "செய்ய எதுவும் இல்லை"
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "Nothing to do for {appid}."
-msgstr "{appid}க்கு எதுவும் செய்ய முடியாது."
-
-#: ../fdroidserver/init.py
-msgid "Now set these in config.yml:"
-msgstr "இப்போது இவற்றை config.yml இல் அமைக்கவும்:"
-
-#: ../fdroidserver/update.py
-#, fuzzy, python-brace-format
-msgid "OBB file has newer versionCode({integer}) than any APK:"
-msgstr "OBB கோப்பில் எந்த APK ஐ விட புதிய பதிப்பு குறியீடு ({முழு எண்) உள்ளது:"
-
-#: ../fdroidserver/update.py
-msgid "OBB filename must start with \"main.\" or \"patch.\":"
-msgstr "OBB கோப்பு பெயர் \"முதன்மையான\" உடன் தொடங்க வேண்டும். அல்லது \"இணைப்பு.\":"
-
-#: ../fdroidserver/update.py
-msgid "OBB's packagename does not match a supported APK:"
-msgstr "OBB இன் பேக்கசெனேம் ஆதரிக்கப்பட்ட APK உடன் பொருந்தவில்லை:"
-
-#: ../fdroidserver/deploy.py
-msgid "Offline machine, skipping git mirror generation until `fdroid deploy`"
-msgstr "இணைப்பில்லாத இயந்திரம், அறிவிலி மிரர் தலைமுறையை `fdroid வரிசைப்படுத்தல்` வரை தவிர்க்கவும்"
-
-#: ../fdroidserver/deploy.py
-msgid "One of the 'github_releases' config items is missing the 'packageNames' value. skipping ..."
-msgstr "'Github_releases' கட்டமைப்பு உருப்படிகளில் ஒன்று 'பேக்கசெனேம்ச்' மதிப்பைக் காணவில்லை. ச்கிப்பிங் ..."
-
-#: ../fdroidserver/deploy.py
-msgid "One of the 'github_releases' config items is missing the 'projectUrl' value. skipping ..."
-msgstr "'Github_releases' கட்டமைப்பு உருப்படிகளில் ஒன்று 'ProjectURL' மதிப்பைக் காணவில்லை. ச்கிப்பிங் ..."
-
-#: ../fdroidserver/deploy.py
-msgid "One of the 'github_releases' config items is missing the 'token' value. skipping ..."
-msgstr "'Github_releases' கட்டமைப்பு உருப்படிகளில் ஒன்று 'கிள்ளாக்கு' மதிப்பைக் காணவில்லை. ச்கிப்பிங் ..."
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Only PNG and JPEG are supported for graphics, found: {path}"
-msgstr "கிராபிக்ச் மற்றும் காணப்படும் பி.என்.சி மற்றும் சே.பி.சி மட்டுமே ஆதரிக்கப்படுகின்றன: {path}"
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/common.py
-msgid "Only accepts a single key \"env\""
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "Only process apps with auto-updates"
-msgstr "தானியங்கு புதுப்பிப்புகளுடன் பயன்பாடுகளை மட்டுமே செயலாக்கவும்"
-
-#: ../fdroidserver/lint.py
-msgid "OpenCollective donation methods belong in the OpenCollective: field"
-msgstr "OpenCollective நன்கொடை முறைகள் OpenCollective: புலம்"
-
-#: ../fdroidserver/verify.py
-msgid "Output JSON report to file named after APK."
-msgstr "APK இன் பெயரிடப்பட்ட தாக்கல் சாதொபொகு அறிக்கை."
-
-#: ../fdroidserver/scanner.py
-msgid "Output JSON to stdout."
-msgstr "சாதொபொகு க்கு நிலைவெளிக்கு வெளியீடு."
-
-#: ../fdroidserver/checkupdates.py ../fdroidserver/gpgsign.py
-#: ../fdroidserver/publish.py ../fdroidserver/signindex.py
-#: ../fdroidserver/update.py
-msgid "Outputting JSON"
-msgstr "சாதொபொகு ஐ வெளியிடுகிறது"
-
-#: ../fdroidserver/import_subcommand.py
-msgid "Overall license of the project."
-msgstr "திட்டத்தின் ஒட்டுமொத்த உரிமம்."
-
-#: ../fdroidserver/index.py
-#, fuzzy, python-brace-format
-msgid "Overriding blank versionName in {apkfilename} from metadata: {version}"
-msgstr "மெட்டாடேட்டாவிலிருந்து {apkfilename} இல் வெற்று பதிப்பு பெயர்:{version}"
-
-#: ../fdroidserver/import_subcommand.py
-#, python-brace-format
-msgid "Package \"{appid}\" already exists"
-msgstr "தொகுப்பு \"{appid}\" ஏற்கனவே உள்ளது"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Parsing manifest at '{path}'"
-msgstr "'{path}' இல் மேனிஃபெச்டை பாகுபடுத்துதல்"
-
-#: ../fdroidserver/common.py
-msgid "Password required with username"
-msgstr "பயனர்பெயருடன் கடவுச்சொல் தேவை"
-
-#: ../fdroidserver/import_subcommand.py
-msgid "Path to main Android project subdirectory, if not in root."
-msgstr "முதன்மையான ஆண்ட்ராய்டு திட்ட துணை அடைவுக்கான பாதை, வேரில் இல்லையென்றால்."
-
-#: ../fdroidserver/init.py
-msgid "Path to the Android SDK (sometimes set in ANDROID_HOME)"
-msgstr "ஆண்ட்ராய்டு SDK க்கான பாதை (சில நேரங்களில் Android_home இல் அமைக்கப்படுகிறது)"
-
-#: ../fdroidserver/btlog.py
-msgid "Path to the git repo to use as the log"
-msgstr "பதிவாக பயன்படுத்த அறிவிலி ரெப்போவுக்கான பாதை"
-
-#: ../fdroidserver/init.py
-msgid "Path to the keystore for the repo signing key"
-msgstr "ரெப்போ கையொப்பமிடும் விசைக்கான கீச்டோருக்கு பாதை"
-
-#: ../fdroidserver/nightly.py
-msgid "Print the secret variable to the terminal for easy copy/paste"
-msgstr "எளிதான நகல்/பேச்டுக்காக ரகசிய மாறியை முனையத்திற்கு அச்சிடுக"
-
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "Privacy mode was enabled based on your locale ({country_code})."
-msgstr "உங்கள் இருப்பிடத்தின் அடிப்படையில் தனியுரிமை பயன்முறை இயக்கப்பட்டது ({country_code})."
-
-#: ../fdroidserver/scanner.py
-#, python-format
-msgid "Problem with ZIP file: %s, error %s"
-msgstr "சிப் கோப்பில் சிக்கல்: %s, பிழை %s"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Problem with xml at '{path}'"
-msgstr "'{path}' இல் எக்ச்எம்எல் சிக்கல்"
-
-#: ../fdroidserver/checkupdates.py
-msgid "Process auto-updates"
-msgstr "தானாக புதுப்பிப்புகளை செயலாக்கவும்"
-
-#: ../fdroidserver/publish.py ../fdroidserver/update.py
-#, python-brace-format
-msgid "Processing {apkfilename}"
-msgstr "செயலாக்கம் {apkfilename}"
-
-#: ../fdroidserver/checkupdates.py ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Processing {appid}"
-msgstr "செயலாக்கம் {appid}"
-
-#: ../fdroidserver/update.py
-msgid "Produce human-readable XML/JSON for index files"
-msgstr "குறியீட்டு கோப்புகளுக்கு மனிதனால் படிக்கக்கூடிய XML/JSON ஐ உருவாக்குங்கள்"
-
-#: ../fdroidserver/import_subcommand.py
-msgid "Project URL to import from."
-msgstr "இறக்குமதி செய்ய திட்ட முகவரி."
-
-#: ../fdroidserver/lint.py
-msgid "Punctuation should be avoided"
-msgstr "நிறுத்தற்குறி தவிர்க்கப்பட வேண்டும்"
-
-#: ../fdroidserver/btlog.py
-msgid "Push the log to this git remote repository"
-msgstr "இந்த அறிவிலி ரிமோட் களஞ்சியத்திற்கு பதிவை அழுத்தவும்"
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Pushing binary transparency log to {url}"
-msgstr "பைனரி வெளிப்படைத்தன்மை பதிவை {url}க்கு தள்ளுகிறது"
-
-#: ../fdroidserver/deploy.py
-msgid "Pushing to remote server failed!"
-msgstr "தொலை சேவையகத்திற்கு தள்ளுவது தோல்வியடைந்தது!"
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Pushing to {url}"
-msgstr "{url}க்கு தள்ளுதல்"
-
-#: ../fdroidserver/__main__.py
-msgid "Quickly start a new repository"
-msgstr "விரைவாக ஒரு புதிய களஞ்சியத்தைத் தொடங்கவும்"
-
-#: ../fdroidserver/__main__.py
-msgid "Read all the metadata files and exit"
-msgstr "அனைத்து மேனிலை தரவு கோப்புகளையும் படித்து வெளியேறவும்"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Reading '{config_file}'"
-msgstr "'{config_file}'"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Reading packageName/versionCode/versionName failed, APK invalid: '{apkfilename}'"
-msgstr "பேக்கசெனேம்/பதிப்பு குறியீடு/பதிப்பு பெயர் தோல்வியுற்றது, APK தவறானது: '{apkfilename}'"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Reading packageName/versionCode/versionName failed,APK invalid: '{apkfilename}'"
-msgstr "பேக்கசெனேம்/பதிப்பு குறியீடு/பதிப்பு பெயர் தோல்வியுற்றது, APK தவறானது: '{apkfilename}'"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Reading {apkfilename} from cache"
-msgstr "தற்காலிக சேமிப்பிலிருந்து {apkfilename} படித்தல்"
-
-#: ../fdroidserver/build.py
-msgid "Refresh and cache scanner rules and signatures from the network"
-msgstr "நெட்வொர்க்கிலிருந்து ச்கேனர் விதிகள் மற்றும் கையொப்பங்களை புதுப்பித்து கேச்"
-
-#: ../fdroidserver/publish.py
-#, python-brace-format
-msgid "Refusing to sign '{path}', file exists in both {dir1} and {dir2} folder."
-msgstr ""
-
-#: ../fdroidserver/verify.py
-msgid "Remove source tarball and any APKs if successfully verified."
-msgstr "வெற்றிகரமாக சரிபார்க்கப்பட்டால் மூல நாடாகாப்பகபந்து மற்றும் ஏதேனும் APK களை அகற்றவும்."
-
-#: ../fdroidserver/common.py
-msgid "Removing specified files"
-msgstr "குறிப்பிட்ட கோப்புகளை நீக்குதல்"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Removing {path}\""
-msgstr "{path} \"ஐ நீக்குதல்"
-
-#: ../fdroidserver/update.py
-msgid "Rename APK files that do not match package.name_123.apk"
-msgstr "தொகுப்புடன் பொருந்தாத APK கோப்புகளை மறுபெயரிடுங்கள். NAME_123.APK"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "RepoType {type} is deprecated, please switch to git."
-msgstr ""
-
-#: ../fdroidserver/nightly.py
-#, python-brace-format
-msgid "Resigning {apkfilename} with provided debug.keystore"
-msgstr "வழங்கப்பட்ட பிழைத்திருத்தத்துடன் {apkfilename} இருந்து ராசினாமா"
-
-#: ../fdroidserver/update.py
-msgid "Resize all the icons exceeding the max pixel size and exit"
-msgstr "அதிகபட்ச படப்புள்ளி அளவைத் தாண்டி அனைத்து ஐகான்களையும் மறுஅளவிடுங்கள்"
-
-#: ../fdroidserver/common.py
-msgid "Restrict output to warnings and errors"
-msgstr "எச்சரிக்கைகள் மற்றும் பிழைகளுக்கு வெளியீட்டை கட்டுப்படுத்துங்கள்"
-
-#: ../fdroidserver/net.py
-#, python-format
-msgid "Retrying failed download: %s"
-msgstr "திரும்பப்பெறுவது தோல்வியுற்ற பதிவிறக்க: %s"
-
-#: ../fdroidserver/__main__.py
-msgid "Rewrite all the metadata files"
-msgstr "அனைத்து மேனிலை தரவு கோப்புகளையும் மீண்டும் எழுதவும்"
-
-#: ../fdroidserver/rewritemeta.py
-#, python-brace-format
-msgid "Rewriting '{appid}'"
-msgstr "'{appid}' ஐ மீண்டும் எழுதுதல்"
-
-#: ../fdroidserver/checkupdates.py
-msgid "Run on git repo that has uncommitted changes"
-msgstr "மாற்றப்படாத மாற்றங்களைக் கொண்ட அறிவிலி ரெப்போவில் இயக்கவும்"
-
-#: ../fdroidserver/nightly.py
-#, python-brace-format
-msgid "Run over {cibase} to find -debug.apk. and skip repo_basedir {repo_basedir}"
-msgstr "-Debug.apk ஐக் கண்டுபிடிக்க {cibase}க்கு மேல் இயக்கவும். மற்றும் Repo_basedir {repo_basedir} ஐத் தவிர்"
-
-#: ../fdroidserver/lint.py
-msgid "Run rewritemeta to fix formatting"
-msgstr "வடிவமைப்பை சரிசெய்ய மீண்டும் எழுதுங்கள்"
-
-#: ../fdroidserver/deploy.py
-msgid "Running first pass with MD5 checking disabled"
-msgstr "MD5 உடன் முதல் மொழி இயக்குகிறது"
-
-#: ../fdroidserver/mirror.py
-#, python-brace-format
-msgid "Running wget in {path}"
-msgstr "{path} இல் wget ஐ இயக்குகிறது"
-
-#: ../fdroidserver/index.py
-#, fuzzy, python-brace-format
-msgid "SHA-256 of {url} does not match entry!"
-msgstr "{url} of இன் SHA-256 நுழைவு பொருந்தவில்லை!"
-
-#: ../fdroidserver/build.py
-msgid "Scan the resulting APK(s) for known non-free classes."
-msgstr "அறியப்படாத இலவச வகுப்புகளுக்கு இதன் விளைவாக வரும் APK (களை) ச்கேன் செய்யுங்கள்."
-
-#: ../fdroidserver/__main__.py
-msgid "Scan the source code of a package"
-msgstr "ஒரு தொகுப்பின் மூலக் குறியீட்டை ச்கேன் செய்யுங்கள்"
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Scanner found {count} problems in {apk}"
-msgstr "ச்கேனர் {apk} இல் {count} சிக்கல்கள் காணப்பட்டது"
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Scanner found {count} problems in {appid}:"
-msgstr "ச்கேனர் {count} சிக்கல்கள் {appid}:"
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Scanner found {count} problems in {appid}:{versionCode}:"
-msgstr "ச்கேனர் {count} சிக்கல்கள் {appid}: {versionCode}:"
-
-#: ../fdroidserver/build.py
-msgid "Scanner found {} problem"
-msgid_plural "Scanner found {} problems"
-msgstr[0] "ச்கேனர் கண்டறிந்தது {} சிக்கல்"
-msgstr[1] "ச்கேனர் கண்டறிந்தது {} சிக்கல்கள்"
-
-#: ../fdroidserver/scanner.py
-msgid "Scanning APK for extra signing blocks."
-msgstr "கூடுதல் கையொப்பமிடும் தொகுதிகளுக்கு APK ஐ ச்கேன் செய்கிறது."
-
-#: ../fdroidserver/scanner.py
-msgid "Scanning APK with dexdump for known non-free classes."
-msgstr "அறியப்படாத இல்லாத வகுப்புகளுக்கு டெக்ச்டம்புடன் APK ஐ ச்கேன் செய்கிறது."
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Set NDK {release} ({version}) up"
-msgstr "NDK {release} ({version}) மேலே அமைக்கவும்"
-
-#: ../fdroidserver/common.py
-msgid "Set clock to that time using:"
-msgstr "அந்த நேரத்தில் கடிகாரத்தை அமைக்கவும்:"
-
-#: ../fdroidserver/nightly.py
-msgid "Set maximum releases in repo before older ones are archived"
-msgstr "பழையவை காப்பகப்படுத்தப்படுவதற்கு முன்பு ரெப்போவில் அதிகபட்ச வெளியீடுகளை அமைக்கவும்"
-
-#: ../fdroidserver/build.py
-#, python-brace-format
-msgid "Set open file limit to {integer}"
-msgstr "திறந்த கோப்பு வரம்பை {integer} என அமைக்கவும்"
-
-#: ../fdroidserver/__main__.py
-msgid "Set up an app build for a nightly build repo"
-msgstr "ஒரு இரவு உருவாக்க ரெப்போவுக்கு ஒரு பயன்பாட்டு உருவாக்கத்தை அமைக்கவும்"
-
-#: ../fdroidserver/build.py
-msgid "Setting open file limit failed: "
-msgstr "திறந்த கோப்பு வரம்பை அமைப்பது தோல்வியடைந்தது: "
-
-#: ../fdroidserver/build.py
-#, python-brace-format
-msgid "Setting {0} sec timeout for this build"
-msgstr "இந்த கட்டமைப்பிற்கான {0} நொடி நேரத்தை அமைத்தல்"
-
-#: ../fdroidserver/__main__.py
-msgid "Sign and place packages in the repo"
-msgstr "ரெப்போவில் கையொப்பமிட்டு தொகுப்புகளை வைக்கவும்"
-
-#: ../fdroidserver/__main__.py
-msgid "Sign indexes created using update --nosign"
-msgstr "புதுப்பிப்பு --nosign ஐப் பயன்படுத்தி உருவாக்கப்பட்ட குறியீடுகள்"
-
-#: ../fdroidserver/build.py
-msgid "Skip scanning the source code for binaries and other problems"
-msgstr "பைனரிகள் மற்றும் பிற சிக்கல்களுக்கான மூலக் குறியீட்டை ச்கேன் செய்வதைத் தவிர்க்கவும்"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Skipping '{apkfilename}' with invalid signature!"
-msgstr "தவறான கையொப்பத்துடன் '{apkfilename}' ஐத் தவிர்ப்பது!"
-
-#: ../fdroidserver/deploy.py ../fdroidserver/index.py
-#, python-format
-msgid "Skipping GitLab Pages mirror because the repo is too large (>%.2fGB)!"
-msgstr "ரெப்போ மிகப் பெரியதாக இருப்பதால் அறிவிலிஆய்வு பக்கங்களைத் தவிர்ப்பது (>%.2fgb)!"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Skipping index generation for {appid}"
-msgstr "{appid}க்கான குறியீட்டு தலைமுறையைத் தவிர்க்கிறது"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Skipping {apkfilename} with invalid signature!"
-msgstr "தவறான கையொப்பத்துடன் {apkfilename} ஐத் தவிர்ப்பது!"
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Skipping {appid}: disabled"
-msgstr "{appid}: முடக்கப்பட்டது"
-
-#: ../fdroidserver/deploy.py
-msgid "Specify a local folder to sync the repo to"
-msgstr "ரெப்போவை ஒத்திசைக்க உள்ளக கோப்புறையைக் குறிப்பிடவும்"
-
-#: ../fdroidserver/deploy.py
-msgid "Specify an identity file to provide to SSH for rsyncing"
-msgstr "RSyncing க்கு பாஓடு க்கு வழங்க அடையாளக் கோப்பைக் குறிப்பிடவும்"
-
-#: ../fdroidserver/nightly.py
-msgid "Specify which debug keystore file to use."
-msgstr "எந்த பிழைத்திருத்த கீச்டோர் கோப்பைப் பயன்படுத்த வேண்டும் என்பதைக் குறிப்பிடவும்."
-
-#: ../fdroidserver/common.py
-msgid "Spew out even more information than normal"
-msgstr "இயல்பை விட அதிகமான தகவல்களைத் தூண்டவும்"
-
-#: ../fdroidserver/nightly.py
-#, python-brace-format
-msgid "Stripping mystery signature from {apkfilename}"
-msgstr "{apkfilename} இருந்து இலிருந்து மர்ம கையொப்பத்தை அகற்றுதல்"
-
-#: ../fdroidserver/lint.py
-#, python-format
-msgid "Summary '%s' is just the app's name"
-msgstr "சுருக்கம் '%s' என்பது பயன்பாட்டின் பெயர்"
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Summary of length {length} is over the {limit} char limit"
-msgstr "நீளத்தின் சுருக்கம் {length} {limit} எழுத்து வரம்புக்கு மேல் உள்ளது"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "System clock is older than date in {path}!"
-msgstr "கணினி கடிகாரம் {path} இல் தேதியை விட பழையது!"
-
-#: ../fdroidserver/checkupdates.py
-msgid "Tags update mode only works for git, hg, bzr and git-svn repositories currently"
-msgstr "குறிச்சொற்கள் புதுப்பிப்பு பயன்முறை தற்போது git, Hg, BZR மற்றும் GIT-SVN களஞ்சியங்களுக்கு மட்டுமே வேலை செய்கிறது"
-
-#: ../fdroidserver/checkupdates.py
-msgid "Tags update mode used in git-svn, but the repo was not set up with tags"
-msgstr "குறிச்சொற்கள் git-svn இல் பயன்படுத்தப்படும் புதுப்பிப்பு பயன்முறை, ஆனால் ரெப்போ குறிச்சொற்களுடன் அமைக்கப்படவில்லை"
-
-#: ../fdroidserver/build.py
-msgid "Test mode - put output in the tmp directory only, and always build, even if the output already exists."
-msgstr "சோதனை பயன்முறை - வெளியீடு ஏற்கனவே இருந்தாலும், வெளியீட்டை மட்டும் வைக்கவும், எப்போதும் உருவாக்குங்கள்."
-
-#: ../fdroidserver/index.py
-msgid "The \"qrcode\" Python package is not installed (e.g. apt-get install python3-qrcode)!"
-msgstr ""
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "The OBB version code must come after \"{name}.\":"
-msgstr "OBB பதிப்பு குறியீடு \"{name}\" க்குப் பிறகு வர வேண்டும்.::::"
-
-#: ../fdroidserver/btlog.py
-msgid "The base URL for the repo to log (default: https://f-droid.org)"
-msgstr "ரெப்போவுக்கான அடிப்படை முகவரி (இயல்புநிலை: https://f-droid.org)"
-
-#: ../fdroidserver/mirror.py
-msgid "The directory to write the mirror to"
-msgstr "கண்ணாடியை எழுதும் அடைவு"
-
-#: ../fdroidserver/nightly.py
-msgid "The file to be included in the repo (path or glob)"
-msgstr "ரெப்போவில் சேர்க்கப்பட வேண்டிய கோப்பு (பாதை அல்லது குளோப்)"
-
-#: ../fdroidserver/index.py
-msgid "The repository's fingerprint does not match."
-msgstr "களஞ்சியத்தின் கைரேகை பொருந்தவில்லை."
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "The root dir for local_copy_dir \"{path}\" does not exist!"
-msgstr "லோக்கல்_கோபி_டிர் \"{path}\" க்கான ரூட் டிர் இல்லை!"
-
-#: ../fdroidserver/publish.py
-msgid "There is a keyalias collision - publishing halted"
-msgstr "ஒரு கீயாலியாச் மோதல் உள்ளது - வெளியீடு நிறுத்தப்பட்டது"
-
-#: ../fdroidserver/common.py
-msgid "These are the apps that have been archived from the main repo."
-msgstr "முதன்மையான ரெப்போவிலிருந்து காப்பகப்படுத்தப்பட்ட பயன்பாடுகள் இவை."
-
-#: ../fdroidserver/mirror.py
-msgid "This command should never be used to mirror f-droid.org! A full copy requires more than 600GB."
-msgstr "F-droid.org ஐ பிரதிபலிக்க இந்த கட்டளை ஒருபோதும் பயன்படுத்தப்படக்கூடாது! ஒரு முழு நகலுக்கு 600 சிபிக்கு மேல் தேவைப்படுகிறது."
-
-#: ../fdroidserver/common.py
-msgid "This is a repository of apps to be used with F-Droid. Applications in this repository are either official binaries built by the original application developers, or are binaries built from source by the admin of f-droid.org using the tools on https://gitlab.com/fdroid."
-msgstr "இது எஃப்-டிராய்டுடன் பயன்படுத்தப்பட வேண்டிய பயன்பாடுகளின் களஞ்சியமாகும். இந்த களஞ்சியத்தில் உள்ள பயன்பாடுகள் அசல் பயன்பாட்டு உருவாக்குநர்களால் கட்டப்பட்ட உத்தியோகபூர்வ பைனரிகள், அல்லது https://gitlab.com/fdroid இல் உள்ள கருவிகளைப் பயன்படுத்தி f-droid.org இன் நிர்வாகியால் மூலத்திலிருந்து கட்டப்பட்ட பைனரிகள்."
-
-#: ../fdroidserver/import_subcommand.py
-#, python-format
-msgid "This repo already has local metadata: %s"
-msgstr "இந்த ரெப்போவில் ஏற்கனவே உள்ளக மேனிலை தரவு உள்ளது: %s"
-
-#: ../fdroidserver/init.py
-#, python-format
-msgid ""
-"To complete the setup, add your APKs to \"%s\"\n"
-"then run \"fdroid update -c; fdroid update\".  You might also want to edit\n"
-"\"config.yml\" to set the URL, repo name, and more.  You should also set up\n"
-"a signing key (a temporary one might have been automatically generated).\n"
-"\n"
-"For more info: https://f-droid.org/docs/Setup_an_F-Droid_App_Repo\n"
-"and https://f-droid.org/docs/Signing_Process"
-msgstr ""
-"அமைப்பை முடிக்க, உங்கள் APKS ஐ \"%s\" இல் சேர்க்கவும்\n"
-" பின்னர் \"fdroid புதுப்பிப்பு -c; fdroid Update\" ஐ இயக்கவும். நீங்கள் திருத்தவும் விரும்பலாம்\n"
-" முகவரி, களஞ்சி பெயர் மற்றும் பலவற்றை அமைக்க \"config.yml\". நீங்கள் அமைக்க வேண்டும்\n"
-" கையொப்பமிடும் விசை (தற்காலிகமானது தானாகவே உருவாக்கப்பட்டிருக்கலாம்).\n"
-"\n"
-" மேலும் தகவலுக்கு: https://f-droid.org/docs/setup_an_f-droid_app_repo\n"
-" மற்றும் https://f-droid.org/docs/signing_process"
-
-#: ../fdroidserver/deploy.py
-msgid "To use awsbucket, awssecretkey and awsaccesskeyid must also be set in config.yml!"
-msgstr "AWSBUCKET, AWSSECRETKEY மற்றும் AWSACCESSKEYID ஐப் பயன்படுத்தவும் config.yml இல் அமைக்கப்பட வேண்டும்!"
-
-#: ../fdroidserver/deploy.py
-msgid "To use rclone, rclone_config and awsbucket must be set in config.yml!"
-msgstr "RCLONE ஐப் பயன்படுத்த, RCLONE_CONFIG மற்றும் AWSBUCKET ஆகியவை config.yml இல் அமைக்கப்பட வேண்டும்!"
-
-#: ../fdroidserver/lint.py
-msgid "URL must start with https:// or http://"
-msgstr "முகவரி https: // அல்லது http: // உடன் தொடங்க வேண்டும்"
-
-#: ../fdroidserver/lint.py
-msgid "URL shorteners should not be used"
-msgstr "முகவரி சுருக்கங்கள் பயன்படுத்தப்படக்கூடாது"
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "URL {url} in Description: {error}"
-msgstr "விளக்கத்தில் முகவரி {url}: {error}"
-
-#: ../fdroidserver/lint.py
-msgid "Unexpected license tag \"{}\"! Only use FSF or OSI approved tags from https://spdx.org/license-list"
-msgstr "எதிர்பாராத உரிமக் குறிச்சொல் \"{}\"! Https://spdx.org/license-list இலிருந்து FSF அல்லது OSI அங்கீகரிக்கப்பட்ட குறிச்சொற்களை மட்டுமே பயன்படுத்தவும்"
-
-#: ../fdroidserver/lint.py
-msgid "Unexpected license tag \"{}\"! Only use license tags configured in your config file"
-msgstr "எதிர்பாராத உரிமக் குறிச்சொல் \"{}\"! உங்கள் கட்டமைப்பு கோப்பில் கட்டமைக்கப்பட்ட உரிமக் குறிச்சொற்களை மட்டுமே பயன்படுத்தவும்"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Unknown entry {key} in {configname}"
-msgstr "{configname} இல் அறியப்படாத நுழைவு {key}"
-
-#: ../fdroidserver/__main__.py
-msgid "Unknown exception found!"
-msgstr "அறியப்படாத விதிவிலக்கு கண்டறியப்பட்டது!"
-
-#: ../fdroidserver/lint.py
-#, fuzzy, python-brace-format
-msgid "Unknown file '{filename}' in build '{versionName}'"
-msgstr "அறியப்படாத கோப்பு '{filename}'"
-
-#: ../fdroidserver/metadata.py
-#, python-format
-msgid "Unknown metadata format: %s"
-msgstr "அறியப்படாத மேனிலை தரவு வடிவம்: %s"
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Unknown metadata format: {path} (use: *.yml)"
-msgstr "அறியப்படாத மேனிலை தரவு வடிவம்: {path} (பயன்பாடு: *.yml)"
-
-#: ../fdroidserver/common.py
-msgid "Unknown version of aapt, might cause problems: "
-msgstr "AAPT இன் அறியப்படாத பதிப்பு, சிக்கல்களை ஏற்படுத்தக்கூடும்: "
-
-#: ../fdroidserver/lint.py
-msgid "Unnecessary leading space"
-msgstr "தேவையற்ற முன்னணி இடம்"
-
-#: ../fdroidserver/lint.py
-msgid "Unnecessary trailing space"
-msgstr "தேவையற்ற பின்தங்கிய இடம்"
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Unrecognised app field '{fieldname}' in '{path}'"
-msgstr "அங்கீகரிக்கப்படாத பயன்பாட்டு புலம் '{fieldname}' '{path}'"
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Unrecognised build flag '{build_flag}' in '{path}'"
-msgstr "அங்கீகரிக்கப்படாத கட்டமைப்புக் கொடி '{build_flag}' '{path}'"
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Unsupported file type \"{extension}\" for repo graphic"
-msgstr "ரெப்போ கிராஃபிக் நிறுவனத்திற்கு ஆதரிக்கப்படாத கோப்பு வகை \"{extension}\""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Unsupported graphics file found: {path}"
-msgstr "ஆதரிக்கப்படாத கிராபிக்ச் கோப்பு காணப்படுகிறது: {path}"
-
-#: ../fdroidserver/lint.py
-#, python-format
-msgid "Unused extlib at %s"
-msgstr "பயன்படுத்தப்படாத எக்ச்ட்லிப் %s"
-
-#: ../fdroidserver/lint.py
-#, python-format
-msgid "Unused file at %s"
-msgstr "%s இல் பயன்படுத்தப்படாத கோப்பு"
-
-#: ../fdroidserver/scanner.py
-#, python-format
-msgid "Unused scandelete path: %s"
-msgstr "பயன்படுத்தப்படாத ச்கேண்டிலெட் பாதை: %s"
-
-#: ../fdroidserver/scanner.py
-#, python-format
-msgid "Unused scanignore path: %s"
-msgstr "பயன்படுத்தப்படாத ச்கேனிக்னர் பாதை: %s"
-
-#: ../fdroidserver/__main__.py
-msgid "Update repo information for new packages"
-msgstr "புதிய தொகுப்புகளுக்கான ரெப்போ தகவல்களைப் புதுப்பிக்கவும்"
-
-#: ../fdroidserver/__main__.py
-msgid "Update the binary transparency log for a URL"
-msgstr "முகவரி க்கான பைனரி வெளிப்படைத்தன்மை பதிவைப் புதுப்பிக்கவும்"
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "UpdateCheckData has invalid URL: {url}"
-msgstr "UpdateCheckData இல் தவறான முகவரி உள்ளது: {url}"
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "UpdateCheckData must match the version code as integer (\\d or [0-9]): {codeex}"
-msgstr "UpdateCheckData பதிப்பு குறியீட்டை முழு எண் (\\ டி அல்லது [0-9]) உடன் பொருத்த வேண்டும்: {codeex}"
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "UpdateCheckData must use HTTPS URL: {url}"
-msgstr "UpdateCheckData https முகவரி ஐப் பயன்படுத்த வேண்டும்: {url}"
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "UpdateCheckData not a valid URL: {url}"
-msgstr "புதுப்பிப்பு தொழில்நுட்பம் செல்லுபடியாகும் முகவரி அல்ல: {url}"
-
-#: ../fdroidserver/lint.py
-msgid "UpdateCheckMode is set but it looks like checkupdates hasn't been run yet."
-msgstr "UpdateCheckMode அமைக்கப்பட்டுள்ளது, ஆனால் சரிபார்ப்புகள் இன்னும் இயக்கப்படவில்லை என்று தெரிகிறது."
-
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/lint.py
-msgid "UpdateCheckName is set to the known application ID, it can be removed"
-msgstr "புதுப்பிப்பு சோதனை பெயர் அறியப்பட்ட பயன்பாட்டு ஐடிக்கு அமைக்கப்பட்டுள்ளது, அதை அகற்றலாம்"
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Uploading {apkfilename} to androidobservatory.org"
-msgstr "Uploading {apkfilename} பெறுநர் androidobservatory.org"
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Uploading {apkfilename} to virustotal"
-msgstr "Uploading {apkfilename} பெறுநர் virustotal"
-
-#: ../fdroidserver/lint.py
-msgid "Use /HEAD instead of /master or /main to point at a file in the default branch"
-msgstr "Use /HEAD instead of /master or /main பெறுநர் புள்ளியம் at a கோப்பு in the இயல்புநிலை branch"
-
-#: ../fdroidserver/update.py
-msgid "Use `fdroid update -c` to create it."
-msgstr "Use `fdroid புதுப்பிப்பு -c` பெறுநர் create it."
-
-#: ../fdroidserver/build.py
-msgid "Use build server"
-msgstr "Use உருவாக்கு சேவையகம்"
-
-#: ../fdroidserver/update.py
-msgid "Use date from APK instead of current time for newly added APKs"
-msgstr "Use திகதி இருந்து APK instead of மின்னோட்ட்ம், ஓட்டம் time க்கு newly added APKs"
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Using \"{path}\" for configuring s3cmd."
-msgstr "Using \"{path}\" க்கு configuring s3cmd."
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Using \"{path}\" for syncing with remote storage."
-msgstr "Using \"{path}\" க்கு syncing with remote storage."
-
-#: ../fdroidserver/common.py
-msgid "Using APK Signature v2"
-msgstr "APK கையொப்பம் V2 ஐப் பயன்படுத்துதல்"
-
-#: ../fdroidserver/common.py
-msgid "Using APK Signature v3"
-msgstr "சாப்பிங் ஏபிசி கையொப்பம்"
-
-#: ../fdroidserver/common.py
-msgid "Using JAR Signature"
-msgstr "குடுவை கையொப்பத்தைப் பயன்படுத்துதல்"
-
-#: ../fdroidserver/common.py
-msgid "Using Java's jarsigner, not recommended for verifying APKs! Use apksigner"
-msgstr "சாவாவின் சார்சிக்னரைப் பயன்படுத்துதல், APKS ஐ சரிபார்க்க பரிந்துரைக்கப்படவில்லை! Apksigner ஐப் பயன்படுத்தவும்"
-
-#: ../fdroidserver/metadata.py
-#, fuzzy, python-brace-format
-msgid "Using blank dictionary instead of contents of {path}!"
-msgstr "{பாதை of இன் உள்ளடக்கங்களுக்கு பதிலாக வெற்று அகராதியைப் பயன்படுத்துதல்!"
-
-#: ../fdroidserver/init.py
-#, python-brace-format
-msgid "Using existing keystore \"{path}\""
-msgstr "இருக்கும் கீச்டோர் \"{path}\" ஐப் பயன்படுத்துதல்"
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Using rclone to sync with: {url}"
-msgstr "Using rclone பெறுநர் sync with: {url}"
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Using s3cmd to sync with: {url}"
-msgstr "Using s3cmd பெறுநர் sync with: {url}"
-
-#: ../fdroidserver/__main__.py
-msgid "Valid commands are:"
-msgstr "செல்லுபடியாகும் கட்டளைகள் பின்வருமாறு:"
-
-#: ../fdroidserver/verify.py
-msgid "Verify against locally cached copy rather than redownloading."
-msgstr "Verify against locally cached நகலெடு rather than redownloading."
-
-#: ../fdroidserver/__main__.py
-msgid "Verify the integrity of downloaded packages"
-msgstr "பதிவிறக்கம் செய்யப்பட்ட தொகுப்புகளின் ஒருமைப்பாட்டை சரிபார்க்கவும்"
-
-#: ../fdroidserver/index.py
-msgid "Verifying index signature:"
-msgstr "குறியீட்டு கையொப்பத்தை சரிபார்க்கிறது:"
-
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "Verifying package {path} with apksigner."
-msgstr "Apksigner உடன் தொகுப்பு {path} ஐ சரிபார்க்கிறது."
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "VirusTotal API key cannot upload files larger than 32MB, use {url} to upload {path}."
-msgstr "வைரச்டோட்டல் பநிஇ விசையை 32MB ஐ விட பெரிய கோப்புகளை பதிவேற்ற முடியாது, {path} பதிவேற்ற {url} ஐப் பயன்படுத்தவும்."
-
-#: ../fdroidserver/nightly.py
-msgid "WARNING: only public git repos are supported!"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Warn about possible metadata errors"
-msgstr "சாத்தியமான மேனிலை தரவு பிழைகள் குறித்து எச்சரிக்கவும்"
-
-#: ../fdroidserver/scanner.py
-msgid "WebAssembly binary file"
-msgstr "வெபாசெம்பிளி பைனரி கோப்பு"
-
-#: ../fdroidserver/update.py
-msgid "When configured for signed indexes, create only unsigned indexes at this stage"
-msgstr "கையொப்பமிடப்பட்ட குறியீடுகளுக்கு கட்டமைக்கப்படும்போது, இந்த கட்டத்தில் கையொப்பமிடப்படாத குறியீடுகளை மட்டுமே உருவாக்கவும்"
-
-#: ../fdroidserver/lint.py
-msgid "When linting the entire repository yamllint is disabled by default. This option forces yamllint regardless."
-msgstr "முழு களஞ்சியத்தையும் யம்லின்ட் இயல்புநிலையாக முடக்கும்போது முடக்கப்படுகிறது. இந்த விருப்பம் யம்லின்ட்டைப் பொருட்படுத்தாமல் கட்டாயப்படுத்துகிறது."
-
-#: ../fdroidserver/publish.py
-msgid "When signing or verifying fails, exit with an error code."
-msgstr "கையொப்பமிடும்போது அல்லது சரிபார்க்கும்போது தோல்வியுற்றால், பிழைக் குறியீட்டைக் கொண்டு வெளியேறவும்."
-
-#: ../fdroidserver/install.py
-msgid "Would you like to download and install F-Droid.apk via adb? (YES/no)"
-msgstr "ADB வழியாக f-droid.apk ஐ பதிவிறக்கம் செய்து நிறுவ விரும்புகிறீர்களா? (ஆம்/இல்லை)"
-
-#: ../fdroidserver/install.py
-msgid "Would you like to download the app(s) from f-droid.org? (YES/no)"
-msgstr "F-droid.org இலிருந்து பயன்பாட்டை (களை) பதிவிறக்கம் செய்ய விரும்புகிறீர்களா? (ஆம்/இல்லை)"
-
-#: ../fdroidserver/init.py
-msgid "X.509 'Distinguished Name' used when generating keys"
-msgstr "X.509 'விசித்திரமான பெயர்' விசைகளை உருவாக்கும் போது பயன்படுத்தப்படுகிறது"
-
-#: ../fdroidserver/common.py
-msgid "You can use ANDROID_HOME to set the path to your SDK, i.e.:"
-msgstr "உங்கள் SDK க்கான பாதையை அமைக்க நீங்கள் Android_home ஐப் பயன்படுத்தலாம், அதாவது:"
-
-#: ../fdroidserver/scanner.py
-msgid "ZIP file archive"
-msgstr "சிப் கோப்பு காப்பகம்"
-
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "adb reports {serial} is \"{status}\"!"
-msgstr "ADB அறிக்கைகள் {serial} என்பது \"{status}\"!"
-
-#: ../fdroidserver/nightly.py
-#, python-brace-format
-msgid "adding IdentityFile to {path}"
-msgstr "{path} க்கு அடையாள கோப்பைச் சேர்ப்பது"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "adding to {name}: {path}"
-msgstr "{name}: {path} உடன் சேர்க்கிறது"
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "ambiguous option: %(option)s could match %(matches)s"
-msgstr "தெளிவற்ற விருப்பம்: %(option)s %(matches)s உடன் பொருந்தக்கூடும்"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "apksigner in build-tools;{version} passes APKs with invalid v3 signatures, ignoring."
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "apksigner not found! Cannot sign or verify modern APKs"
-msgstr "apksigner கண்டுபிடிக்கப்படவில்லை! நவீன APK களை கையொப்பமிடவோ சரிபார்க்கவோ முடியாது"
-
-#: ../fdroidserver/common.py
-msgid "apksigner not found, it's required for signing!"
-msgstr "apksigner கண்டுபிடிக்கப்படவில்லை, கையெழுத்திட இது தேவை!"
-
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/checkupdates.py ../fdroidserver/lint.py
-#: ../fdroidserver/rewritemeta.py
-msgid "application ID of file to operate on"
-msgstr "இயக்க வேண்டிய கோப்பின் பயன்பாட்டு ஐடி"
-
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/build.py ../fdroidserver/install.py
-#: ../fdroidserver/publish.py ../fdroidserver/scanner.py
-#: ../fdroidserver/verify.py
-msgid "application ID with optional versionCode in the form APPID[:VERCODE]"
-msgstr "Appid [: VERCODE] படிவத்தில் விருப்ப பதிப்பு குறியீட்டைக் கொண்ட பயன்பாட்டு ஐடி"
-
-#: ../fdroidserver/common.py
-msgid "archive_url needs to end with /archive"
-msgstr "காப்பகம்_ஆர்ல் /காப்பகத்துடன் முடிவடைய வேண்டும்"
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "argument \"-\" with mode %r"
-msgstr "உரையாடல் \"-\" பயன்முறையுடன் %r"
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "argument %(argument_name)s: %(message)s"
-msgstr "உரையாடல் %(argument_name)s: %(message)s"
-
-#: ../fdroidserver/nightly.py
-msgid "attempting bare SSH connection to test deploy key:"
-msgstr "சோதனை வரிசைப்படுத்துவதற்கு வெற்று பாஓடு இணைப்பை முயற்சிக்கிறது:"
-
-#: ../fdroidserver/common.py
-msgid "can not parse scrlib spec (not a string): '{}'"
-msgstr "ச்க்ர்லிப் ச்பெக்கை அலச முடியாது (ஒரு சரம் அல்ல): '{}'"
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "can't open '%(filename)s': %(error)s"
-msgstr "' %(error)s கள்' ஐ திறக்க முடியாது: %(filename)s"
-
-#: ../fdroidserver/scanner.py
-msgid "can't open non-https url: '{};"
-msgstr "HTTPS அல்லாத முகவரி ஐ திறக்க முடியாது: '{};"
-
-#: ../fdroidserver/build.py
-#, python-brace-format
-msgid "cannot find required srclibs: \"{path}\""
-msgstr "தேவையான SRCLIBS ஐக் கண்டுபிடிக்க முடியவில்லை: \"{path}\""
-
-#: /usr/lib/python3.11/argparse.py
-msgid "cannot have multiple subparser arguments"
-msgstr "பல சப் பார்சர் வாதங்கள் இருக்க முடியாது"
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "cannot merge actions - two groups are named %r"
-msgstr "செயல்களை ஒன்றிணைக்க முடியாது - இரண்டு குழுக்களுக்கு %r என்று பெயரிடப்பட்டுள்ளது"
-
-#: ../fdroidserver/nightly.py
-msgid "cannot publish update, did you set the deploy key?"
-msgstr "புதுப்பிப்பை வெளியிட முடியாது, நீங்கள் வரிசைப்படுத்தல் விசையை அமைத்தீர்களா?"
-
-#: ../fdroidserver/nightly.py
-#, python-brace-format
-msgid "cloning {url}"
-msgstr "குளோனிங் {url}"
-
-#: ../fdroidserver/__main__.py
-msgid "commands from plugin modules:"
-msgstr "சொருகி தொகுதிகளிலிருந்து கட்டளைகள்:"
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "conflicting option string: %s"
-msgid_plural "conflicting option strings: %s"
-msgstr[0] "முரண்பட்ட விருப்ப சரம்: %s"
-msgstr[1] "முரண்பட்ட விருப்ப சரங்கள்: %s"
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "conflicting subparser alias: %s"
-msgstr "முரண்பட்ட சப் பார்சர் மாற்றுப்பெயர்: %s"
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "conflicting subparser: %s"
-msgstr "முரண்பட்ட சப்சர்: %s"
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "could not parse '{path}'"
-msgstr "'{path}'"
-
-#: ../fdroidserver/common.py
-msgid "could not parse srclib spec (no name specified): '{}'"
-msgstr "SRCLIB ச்பெக்கை அலச முடியவில்லை (பெயர் குறிப்பிடப்படவில்லை): '{}'"
-
-#: ../fdroidserver/common.py
-msgid "could not parse srclib spec (no ref specified): '{}'"
-msgstr "SRCLIB ச்பெக்கை அலச முடியவில்லை (குறிப்பு எதுவும் குறிப்பிடப்படவில்லை): '{}'"
-
-#: ../fdroidserver/nightly.py
-#, python-brace-format
-msgid "created {path}"
-msgstr "உருவாக்கப்பட்டது {path}"
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "current version is newer: old vercode={old}, new vercode={new}"
-msgstr "தற்போதைய பதிப்பு புதியது: பழைய வெர்கோட் = {old}, புதிய வெர்கோட் = {new}"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "deleting: repo/{apkfilename}"
-msgstr "நீக்குதல்: ரெப்போ/{apkfilename}"
-
-#: ../fdroidserver/scanner.py
-msgid "dependency file without lock"
-msgstr "பூட்டு இல்லாமல் சார்பு கோப்பு"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "deployed process log {path} to {dest}"
-msgstr "பயன்படுத்தப்பட்ட செயல்முறை பதிவு {path} முதல் {dest} வரை"
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "dest= is required for options like %r"
-msgstr "%r போன்ற விருப்பங்களுக்கு DEST = தேவை"
-
-#: ../fdroidserver/scanner.py
-msgid "downloading '{}'"
-msgstr "'{}' பதிவிறக்குகிறது"
-
-#: ../fdroidserver/scanner.py
-msgid "downloading scanner signatures from '{}' failed"
-msgstr "'{}' இலிருந்து ச்கேனர் கையொப்பங்களைப் பதிவிறக்குவது தோல்வியடைந்தது"
-
-#: ../fdroidserver/scanner.py
-msgid "executable binary, possibly code"
-msgstr "இயங்கக்கூடிய பைனரி, ஒருவேளை குறியீடு"
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "expected %s argument"
-msgid_plural "expected %s arguments"
-msgstr[0] "எதிர்பார்க்கப்படும் %s உரையாடல்"
-msgstr[1] "எதிர்பார்க்கப்படும் %s வாதங்கள்"
-
-#: /usr/lib/python3.11/argparse.py
-msgid "expected at least one argument"
-msgstr "குறைந்தது ஒரு வாதத்தை எதிர்பார்க்கலாம்"
-
-#: /usr/lib/python3.11/argparse.py
-msgid "expected at most one argument"
-msgstr "பெரும்பாலான ஒரு வாதத்தில் எதிர்பார்க்கப்படுகிறது"
-
-#: /usr/lib/python3.11/argparse.py
-msgid "expected one argument"
-msgstr "ஒரு வாதத்தை எதிர்பார்க்கலாம்"
-
-#: ../fdroidserver/__main__.py
-msgid "fdroid [<command>] [-h|--help|--version|<args>]"
-msgstr "fdroid [<கட்டளை>] [-h |--help | --version | <args>]]"
-
-#: ../fdroidserver/scanner.py
-msgid "fetch the latest version of signatures from the web"
-msgstr "வலையிலிருந்து கையொப்பங்களின் அண்மைக் கால பதிப்பைப் பெறுங்கள்"
-
-#: ../fdroidserver/metadata.py
-msgid "force metadata errors (default) to be warnings, or to be ignored."
-msgstr "மேனிலை தரவு பிழைகள் (இயல்புநிலை) எச்சரிக்கைகள் அல்லது புறக்கணிக்கப்பட வேண்டும்."
-
-#: ../fdroidserver/common.py
-msgid "git svn clone failed"
-msgstr "அறிவிலி எச்.வி.என் நகலி தோல்வியடைந்தது"
-
-#: ../fdroidserver/scanner.py
-msgid "gzip file archive"
-msgstr "GZIP கோப்பு காப்பகம்"
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "ignored explicit argument %r"
-msgstr "புறக்கணிக்கப்பட்ட வெளிப்படையான உரையாடல் %r"
-
-#: ../fdroidserver/index.py
-msgid "index-v1 must have a signature, use `fdroid signindex` to create it!"
-msgstr "Index-V1 ஒரு கையொப்பத்தைக் கொண்டிருக்க வேண்டும், அதை உருவாக்க `fdroid சிக்னின்டெக்ச்` ஐப் பயன்படுத்தவும்!"
-
-#: ../fdroidserver/index.py
-msgid "index-v2 must have a signature, use `fdroid signindex` to create it!"
-msgstr "Index-V2 ஒரு கையொப்பத்தைக் கொண்டிருக்க வேண்டும், அதை உருவாக்க `fdroid சிக்னின்டெக்ச்` ஐப் பயன்படுத்தவும்!"
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "invalid %(type)s value: %(value)r"
-msgstr "தவறான %(type)s மதிப்பு: %(value)r"
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "invalid choice: %(value)r (choose from %(choices)s)"
-msgstr "தவறான தேர்வு: %(value)r ஆர் ( %(choices)s இலிருந்து தேர்வு செய்யவும்)"
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "invalid conflict_resolution value: %r"
-msgstr "தவறான மோதல்_ -ரசல் மதிப்பு: %r"
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "invalid option string %(option)r: must start with a character %(prefix_chars)r"
-msgstr "தவறான விருப்பத்தேர்வு சரம் %(option)r ஆர்: ஒரு எழுத்துக்குறி %(prefix_chars)r ஆர் உடன் தொடங்க வேண்டும்"
-
-#: ../fdroidserver/common.py
-msgid "ipfs_cid not found, skipping CIDv1 generation"
-msgstr "IPFS_CID கண்டுபிடிக்கப்படவில்லை, CIDV1 தலைமுறையைத் தவிர்க்கிறது"
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "latest build recipe is newer: old vercode={old}, new vercode={new}"
-msgstr "அண்மைக் கால உருவாக்க செய்முறை ஒருபோதும் இல்லை: பழைய வெராகோட் = {old}, புதிய வெராக்கோட் = {new}"
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "local_copy_dir does not end with \"fdroid\", perhaps you meant: \"{path}\""
-msgstr "Local_copy_dir \"fdroid\" உடன் முடிவடையாது, ஒருவேளை நீங்கள் அர்த்தம்: \"{path}\""
-
-#: ../fdroidserver/deploy.py
-msgid "local_copy_dir must be an absolute path!"
-msgstr "local_copy_dir ஒரு முழுமையான பாதையாக இருக்க வேண்டும்!"
-
-#: ../fdroidserver/deploy.py
-msgid "local_copy_dir must be directory, not a file!"
-msgstr "local_copy_dir கோப்பகமாக இருக்க வேண்டும், ஒரு கோப்பு அல்ல!"
-
-#: ../fdroidserver/index.py
-#, python-format
-msgid "mirror '%s' does not end with 'fdroid'!"
-msgstr "கண்ணாடியின் '%s' 'fdroid' உடன் முடிவடையாது!"
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "mirrors set twice, in config.yml and {path}!"
-msgstr "கண்ணாடிகள் இரண்டு முறை அமைக்கப்பட்டன, config.yml மற்றும் {path}!"
-
-#: /usr/lib/python3.11/argparse.py
-msgid "mutually exclusive arguments must be optional"
-msgstr "பரச்பர வாதங்கள் விருப்பமாக இருக்க வேண்டும்"
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "next {name} cache update due in {time}"
-msgstr "அடுத்து {name} கேச் புதுப்பிப்பு {time}"
-
-#: ../fdroidserver/mirror.py
-#, python-brace-format
-msgid "no \"icon\" in {appid}"
-msgstr "{appid} in இல் \"படவுரு\" இல்லை"
-
-#: ../fdroidserver/signatures.py
-msgid "no APK supplied"
-msgstr "APK வழங்கப்படவில்லை"
-
-#: ../fdroidserver/checkupdates.py
-msgid "no version information found"
-msgstr "பதிப்பு தகவல்கள் எதுவும் கிடைக்கவில்லை"
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "not allowed with argument %s"
-msgstr "உரையாடல் %s உடன் அனுமதிக்கப்படவில்லை"
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "one of the arguments %s is required"
-msgstr "%s வாதங்களில் ஒன்று தேவை"
-
-#: ../fdroidserver/common.py ../fdroidserver/index.py
-msgid "only accepts strings, lists, and tuples"
-msgstr "சரங்கள், பட்டியல்கள் மற்றும் டூப்பிள்களை மட்டுமே ஏற்றுக்கொள்கிறது"
-
-#: /usr/lib/python3.11/argparse.py
-msgid "options"
-msgstr "விருப்பங்கள்"
-
-#: ../fdroidserver/nightly.py
-#, python-brace-format
-msgid "overwriting existing {path}"
-msgstr "இருக்கும் {path} ஐ மேலெழுதும்"
-
-#: /usr/lib/python3.11/argparse.py
-msgid "positional arguments"
-msgstr "நிலை வாதங்கள்"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "process log deploy {path} to {dest} failed!"
-msgstr "செயல்முறை பதிவு {path} முதல் {dest} தோல்வியுற்றது!"
-
-#: ../fdroidserver/build.py
-msgid "reference binary missing signature"
-msgstr "குறிப்பு பைனரி காணாமல் போன கையொப்பம்"
-
-#: ../fdroidserver/signatures.py
-#, python-brace-format
-msgid "refuse downloading via insecure HTTP connection (use HTTPS or specify --no-https-check): {apkfilename}"
-msgstr "பாதுகாப்பற்ற HTTP இணைப்பு வழியாக பதிவிறக்குவதை மறுக்கவும் (https ஐப் பயன்படுத்தவும் அல்லது-no-https-check ஐக் குறிப்பிடவும்): {apkfilename}"
-
-#: ../fdroidserver/index.py
-#, python-format
-msgid "repo_icon \"repo/icons/%s\" does not exist, generating placeholder."
-msgstr "ரெப்போ_கான் \"ரெப்போ/ஐகான்கள்/%s\" இல்லை, ஒதுக்கீட்டு ஒதுக்கிடத்தை உருவாக்குகிறது."
-
-#: ../fdroidserver/common.py
-msgid "repo_url needs to end with /repo"
-msgstr "ரெப்போ_ஆர்ல் /ரெப்போவுடன் முடிவடைய வேண்டும்"
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "rsync is missing or broken: {error}"
-msgstr "RSYNC காணவில்லை அல்லது உடைந்தது: {error}"
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "s3cmd sync indexes {path} to {url} and delete"
-msgstr "S3CMD ஒத்திசைவு குறியீடுகள் {path} முதல் {url} மற்றும் நீக்கு"
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "s3cmd syncs indexes from {path} to {url} and deletes removed"
-msgstr "S3CMD ஒத்திசைவு குறியீடுகளை {path} முதல் {url} வரை ஒத்திசைத்து நீக்கப்பட்டது"
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "scanner cache is malformed! You can clear it with: '{clear}'"
-msgstr "ச்கேனர் கேச் தவறாக உள்ளது! நீங்கள் அதை அழிக்கலாம்: '{clear}'"
-
-#: ../fdroidserver/deploy.py
-msgid "serverwebroot: path does not end with \"fdroid\", perhaps you meant one of these:"
-msgstr "ServerWebroot: பாதை \"fdroid\" உடன் முடிவடையாது, ஒருவேளை நீங்கள் இவற்றில் ஒன்றைக் குறிக்கிறீர்கள்:"
-
-#: ../fdroidserver/scanner.py
-msgid "shared library"
-msgstr "பகிரப்பட்ட நூலகம்"
-
-#: /usr/lib/python3.11/argparse.py
-msgid "show this help message and exit"
-msgstr "இந்த உதவி செய்தியை காட்டிவிட்டு வெளியேறு"
-
-#: ../fdroidserver/signatures.py
-msgid "signed APK, either a file-path or HTTPS URL."
-msgstr "கையொப்பமிடப்பட்ட APK, ஒரு கோப்பு-பாதை அல்லது HTTPS முகவரி."
-
-#: ../fdroidserver/common.py
-msgid "skip deploying full build logs: log content is empty"
-msgstr "முழு உருவாக்க பதிவுகளை வரிசைப்படுத்துவதைத் தவிர்க்கவும்: பதிவு உள்ளடக்கம் காலியாக உள்ளது"
-
-#: ../fdroidserver/common.py
-msgid "skip deploying full build logs: not enabled in config"
-msgstr "முழு உருவாக்க பதிவுகளை வரிசைப்படுத்துவதைத் தவிர்க்கவும்: கட்டமைப்பில் இயக்கப்படவில்லை"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "skipping source tarball: {path}"
-msgstr "மூல நாடாகாப்பகபந்து தவிர்த்து: {path}"
-
-#: ../fdroidserver/lint.py
-msgid "srclibs missing name and/or @"
-msgstr "Srclibs பெயர் காணவில்லை மற்றும்/அல்லது @"
-
-#: ../fdroidserver/scanner.py
-msgid "static library"
-msgstr "நிலையான நூலகம்"
-
-#: ../fdroidserver/build.py
-#, python-brace-format
-msgid "supplied reference binary has allowed signer {signer}"
-msgstr "வழங்கப்பட்ட குறிப்பு பைனரி கையொப்பத்தை அனுமதித்துள்ளது {signer}"
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "the following arguments are required: %s"
-msgstr "பின்வரும் வாதங்கள் தேவை: %s"
-
-#: ../fdroidserver/install.py
-msgid "true"
-msgstr "உண்மை"
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "unexpected option string: %s"
-msgstr "எதிர்பாராத விருப்ப சரம்: %s"
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "unknown parser %(parser_name)r (choices: %(choices)s)"
-msgstr "அறியப்படாத பாகுபடுத்தி %(parser_name)r (தேர்வுகள்: %(choices)s)"
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "unrecognized arguments: %s"
-msgstr "அங்கீகரிக்கப்படாத வாதங்கள்: %s"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "unsafe permissions on '{config_file}' (should be 0600)!"
-msgstr "'{config_file}' இல் பாதுகாப்பற்ற அனுமதிகள் (0600 ஆக இருக்க வேண்டும்)!"
-
-#: ../fdroidserver/__main__.py /usr/lib/python3.11/argparse.py
-msgid "usage: "
-msgstr "பயன்பாடு: "
-
-#: ../fdroidserver/deploy.py
-#, fuzzy, python-brace-format
-msgid "using Apache libcloud to sync with {url}"
-msgstr "{url} both உடன் ஒத்திசைக்க அப்பாச்சி லிப்குட்டைப் பயன்படுத்துதல்"
-
-#: ../fdroidserver/deploy.py
-msgid "virustotal.com is rate limiting, waiting to retry..."
-msgstr "wirustotal.com என்பது விகிதத்தைக் கட்டுப்படுத்துகிறது, மீண்டும் முயற்சிக்க காத்திருக்கிறது ..."
-
-#: ../fdroidserver/install.py
-msgid "yes"
-msgstr "ஆம்"
-
-#: ../fdroidserver/publish.py
-#, python-brace-format
-msgid "{0} app, {1} key aliases"
-msgid_plural "{0} apps, {1} key aliases"
-msgstr[0] "{0} பயன்பாடு, {1} முக்கிய மாற்றுப்பெயர்கள்"
-msgstr[1] "{0} பயன்பாடுகள், {1} முக்கிய மாற்றுப்பெயர்கள்"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{apkfilename} ({appid}) has no metadata!"
-msgstr "{apkfilename} ({appid}) மேனிலை தரவு இல்லை!"
-
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{apkfilename}'s AndroidManifest.xml has a bad date: "
-msgstr "{apkfilename} இன் androidmanifest.xml க்கு மோசமான தேதி உள்ளது: "
-
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{appid} does not have a name! Using application ID instead."
-msgstr "{appid} ஒரு பெயர் இல்லை! அதற்கு பதிலாக பயன்பாட்டு ஐடியைப் பயன்படுத்துதல்."
-
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{appid} from {path} is not a valid Android application ID!"
-msgstr "{path} இல் இருந்து {appid} என்பது செல்லுபடியாகும் ஆண்ட்ராய்டு பயன்பாட்டு ஐடி அல்ல!"
-
-#: ../fdroidserver/metadata.py ../fdroidserver/update.py
-#, python-brace-format
-msgid "{appid} from {path} is not a valid Java Package Name!"
-msgstr "{path} இல் இருந்து {appid} என்பது செல்லுபடியாகும் சாவா தொகுப்பு பெயர் அல்ல!"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{appid} has both APKs and files: {files}"
-msgstr "{appid} பயன்பாடுகள் மற்றும் கோப்புகள் இரண்டையும் கொண்டுள்ளது: {files}"
-
-#: ../fdroidserver/mirror.py
-#, python-brace-format
-msgid "{appid} is missing {name}"
-msgstr "{appid} காணவில்லை {name}"
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "{appid}: Unknown extlib {path} in build '{versionName}'"
-msgstr "{appid}: அறியப்படாத எக்ச்ட்லிப் {path} உருவாக்க '{versionName}'"
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "{appid}: no builds specified, running on current source state"
-msgstr "{appid}: தற்போதைய மூல நிலையில் இயங்காத கட்டமைப்புகள் எதுவும் குறிப்பிடப்படவில்லை"
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "{appid}: {field} must be a '{type}', but it is a '{fieldtype}!'"
-msgstr "{appid}: {field} ஒரு '{type}' ஆக இருக்க வேண்டும், ஆனால் அது ஒரு '{fieldtype}!'"
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "{appid}: {field} must be a '{type}', but it is a '{fieldtype}'!"
-msgstr "{appid}: {field} ஒரு '{type}' ஆக இருக்க வேண்டும், ஆனால் அது ஒரு '{fieldtype}'!"
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "{build_flag} must be an integer, found: {value}"
-msgstr "{build_flag} ஒரு முழு எண்ணாக இருக்க வேண்டும், காணப்படுகிறது: {value}"
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "{build_flag} must be list or string, found: {value}"
-msgstr "{build_flag} பட்டியல் அல்லது சரம் இருக்க வேண்டும், காணப்படுகிறது: {value}"
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "{file} is blank or corrupt!"
-msgstr "{file} வெற்று அல்லது ஊழல் நிறைந்தது!"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{name} \"{section}/icons/{path}\" does not exist! Check \"config.yml\"."
-msgstr "{name} \"{section}/ஐகான்கள்/{path}\" இல்லை! \"Config.yml\" ஐ சரிபார்க்கவும்."
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{path1} is a duplicate of {path2}, remove one!"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
-#, python-brace-format
-msgid "{path} already exists, ignoring import results!"
-msgstr "{path} ஏற்கனவே உள்ளது, இறக்குமதி முடிவுகளை புறக்கணிக்கிறது!"
-
-#: ../fdroidserver/nightly.py
-#, python-brace-format
-msgid "{path} does not exist!  Create it by running:"
-msgstr "{path} இல்லை! இயங்குவதன் மூலம் அதை உருவாக்கவும்:"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{path} has bad file signature \"{pattern}\", possible Janus exploit!"
-msgstr "{path} மோசமான கோப்பு கையொப்பம் \"{pattern}\", சாத்தியமான சானச் சுரண்டல்!"
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "{path} has been flagged by virustotal {count} times:"
-msgstr "{path} வைரச்டோட்டல் {count} முறை கொடியிடப்பட்டுள்ளது:"
-
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "{path} has the wrong fingerprint ({fingerprint})!"
-msgstr "{path} தவறான கைரேகை ({fingerprint}) உள்ளது!"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "{path} is not \"key: value\" dict, but a {datatype}!"
-msgstr "{path} என்பது \"விசை: மதிப்பு\" கட்டளை அல்ல, ஆனால் ஒரு {datatype}!"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "{path} is not a standard config file!"
-msgstr "{path} என்பது ஒரு நிலையான கட்டமைப்பு கோப்பு அல்ல!"
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "{path} is not list, but a {datatype}!"
-msgstr "{path} என்பது பட்டியல் அல்ல, ஆனால் ஒரு {datatype}!"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "{path} is not {expected_type}, but a {datatype}!"
-msgstr "{path} என்பது {expected_type} அல்ல, ஆனால் ஒரு {datatype}!"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{path} is zero size!"
-msgstr "{path} என்பது சுழிய அளவு!"
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "{path} more than 200MB, manually upload: {url}"
-msgstr "{path} 200MB க்கும் அதிகமான, கைமுறையாக பதிவேற்றுதல்: {url}"
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "{path}: \"{code}\" is not a valid ISO_3166-1 alpha-2 country code!"
-msgstr "{path}: \"{code}\" என்பது செல்லுபடியாகும் ஐஎச்ஓ_3166-1 ஆல்பா -2 நாட்டு குறியீடு அல்ல!"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{path}: {error}"
-msgstr "{path}: {error}"
-
-#: ../fdroidserver/mirror.py
-#, python-brace-format
-msgid "{url} does not end with \"fdroid\", check the URL path!"
-msgstr "{url} \"fdroid\" உடன் முடிவடையாது, முகவரி பாதையை சரிபார்க்கவும்!"
-
-#: ../fdroidserver/import_subcommand.py
-#, python-brace-format
-msgid "{url} does not start with \"http\"!"
-msgstr "{url} \"http\" உடன் தொடங்காது!"
-
-#: ../fdroidserver/build.py
-msgid "{} build failed"
-msgid_plural "{} builds failed"
-msgstr[0] "{} கட்டிடம் தோல்வியடைந்தது"
-msgstr[1] "{} கட்டமைப்புகள் தோல்வியுற்றன"
-
-#: ../fdroidserver/build.py
-msgid "{} build succeeded"
-msgid_plural "{} builds succeeded"
-msgstr[0] "{} உருவாக்கம் செய் பெற்றது"
-msgstr[1] "{} கட்டடங்கள் செய் பெற்றன"
diff --git a/locale/tr/LC_MESSAGES/fdroidserver.po b/locale/tr/LC_MESSAGES/fdroidserver.po
index b3bbe3d5..6647b393 100644
--- a/locale/tr/LC_MESSAGES/fdroidserver.po
+++ b/locale/tr/LC_MESSAGES/fdroidserver.po
@@ -1,26 +1,44 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Free Software Foundation, Inc.
-# Oğuz Ersen <oguzersen@protonmail.com>, 2020, 2021, 2022.
-# Orhan <orya@pm.me>, 2021.
-# Oğuz Ersen <oguz@ersen.moe>, 2022, 2023, 2024.
-# Bai <batuhanakkurt000@gmail.com>, 2023.
-# "M. Fatih Uluçam" <mulucam@gmail.com>, 2025.
-# Nuri KÜÇÜKLER <enatsek@gmail.com>, 2025.
-# Bora Atıcı <boratici.acc@gmail.com>, 2025.
+# Oğuz Ersen <oguzersen@protonmail.com>, 2020.
 msgid ""
 msgstr ""
 "Project-Id-Version: fdroidserver 0.9\n"
 "Report-Msgid-Bugs-To: https://gitlab.com/fdroid/fdroidserver/issues\n"
-"POT-Creation-Date: 2025-06-25 09:52+0200\n"
-"PO-Revision-Date: 2025-05-26 22:01+0000\n"
-"Last-Translator: Bora Atıcı <boratici.acc@gmail.com>\n"
+"POT-Creation-Date: 2020-10-21 18:05+0200\n"
+"PO-Revision-Date: 2020-10-22 17:26+0000\n"
+"Last-Translator: Oğuz Ersen <oguzersen@protonmail.com>\n"
 "Language-Team: Turkish <https://hosted.weblate.org/projects/f-droid/fdroidserver/tr/>\n"
 "Language: tr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 5.12-dev\n"
+"X-Generator: Weblate 4.3.1\n"
+
+#: ../fdroidserver/common.py
+msgid ""
+"\n"
+"        This is a repository of apps to be used with FDroid. Applications in this\n"
+"        repository are either official binaries built by the original application\n"
+"        developers, or are binaries built from source by f-droid.org using the\n"
+"        tools on https://gitlab.com/fdroid.\n"
+"        "
+msgstr ""
+"\n"
+"        Bu, FDroid ile kullanılacak uygulamaların bir deposudur. Bu depodaki\n"
+"        uygulamalar ya gerçek uygulama geliştiricileri tarafından oluşturulan\n"
+"        resmi ikili dosyalardır ya da https://gitlab.com/fdroid adresindeki araçlar\n"
+"        kullanılarak f-droid.org tarafından kaynaktan oluşturulan ikili dosyalardır.\n"
+"        "
+
+#: ../fdroidserver/nightly.py
+msgid ""
+"\n"
+"SSH Public Key to be used as Deploy Key:"
+msgstr ""
+"\n"
+"Dağıtım Anahtarı olarak kullanılacak SSH Açık Anahtar:"
 
 #: ../fdroidserver/nightly.py
 msgid ""
@@ -44,26 +62,22 @@ msgstr ""
 msgid "\"%s/\" has no matching metadata file!"
 msgstr "\"%s/\" eşleşen üst veri dosyasına sahip değil!"
 
-#: ../fdroidserver/index.py
-msgid "\"isPrimary\" key should not be added to mirrors!"
-msgstr "\"isPrimary\" anahtarı yansılara eklenmemelidir!"
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "\"local_copy_dir\" {path} does not exist!"
-msgstr "\"local_copy_dir\" {path} mevcut değil!"
-
 #: ../fdroidserver/install.py
 #, python-brace-format
 msgid "\"{apkfilename}\" is already installed on {dev}."
 msgstr "\"{apkfilename}\" zaten {dev} üzerinde kurulu."
 
+#: ../fdroidserver/update.py
+#, python-brace-format
+msgid "\"{path}\" contains outdated {name} ({version})"
+msgstr "\"{path}\" tarihi geçmiş {name} ({version}) içeriyor"
+
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "\"{path}\" contains recent {name} ({version})"
 msgstr "\"{path}\" en son {name} ({version}) içeriyor"
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "\"{path}\" exists but s3cmd is not installed!"
 msgstr "\"{path}\" var ancak s3cmd kurulu değil!"
@@ -73,84 +87,119 @@ msgstr "\"{path}\" var ancak s3cmd kurulu değil!"
 msgid "\"{path}\" is not a supported file format (use: metadata/*.yml)"
 msgstr "\"{path}\" desteklenen bir dosya biçimi değil (şunu kullanın: metadata/*.yml)"
 
-#: ../fdroidserver/update.py
+#: ../fdroidserver/metadata.py
 #, python-brace-format
-msgid "\"{path}\" is signed by a key that is not allowed:"
-msgstr "\"{path}\", izin verilmeyen bir anahtarla imzalandı:"
+msgid "\"{path}\" is not an accepted format, convert to: {formats}"
+msgstr "\"{path}\" kabul edilebilir bir biçim değil, şuna dönüştürün: {formats}"
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/common.py
 #, python-brace-format
 msgid "\"{url}\" is not a valid URL!"
 msgstr "\"{url}\" geçerli bir URL değil!"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, python-format
+msgid "%(option)s option requires %(number)d argument"
+msgid_plural "%(option)s option requires %(number)d arguments"
+msgstr[0] "%(option)s seçeneği %(number)d argüman gerektirir"
+msgstr[1] "%(option)s seçeneği %(number)d argüman gerektirir"
+
+#: ../fdroidserver/mirror.py
+#, python-format
+msgid "%(prog)s [options] url"
+msgstr "%(prog)s [seçenekler] url"
+
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "%(prog)s: error: %(message)s\n"
 msgstr "%(prog)s: hata: %(message)s\n"
 
-#: ../fdroidserver/publish.py
-#, python-format
-msgid "%d APKs failed to be signed or verified!"
-msgstr "%d APK imzalanamadı veya doğrulanamadı!"
-
 #: ../fdroidserver/scanner.py
 #, python-format
 msgid "%d problems found"
 msgstr "%d sorun bulundu"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "%prog [options]"
+msgstr "%prog [seçenekler]"
+
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "%r is not callable"
 msgstr "%r çağrılabilir değil"
 
-#: ../fdroidserver/signindex.py
-#, python-format
-msgid "%s did not produce a dict!"
-msgstr "%s bir sözlük üretmedi!"
-
-#: ../fdroidserver/signindex.py
-#, python-format
-msgid "%s has bad SHA-256: %s"
-msgstr "%s bozuk SHA-256'ya sahip: %s"
-
 #: ../fdroidserver/lint.py
 #, python-format
 msgid "%s is not an accepted build field"
 msgstr "%s kabul edilen bir inşa alanı değil"
 
-#: ../fdroidserver/common.py
-msgid "'keypass' not found in config.yml!"
-msgstr "'keypass' config.yml içinde bulunamadı!"
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, python-format
+msgid "%s option does not take a value"
+msgstr "%s seçeneği bir değer almaz"
+
+#: ../fdroidserver/index.py ../fdroidserver/common.py
+msgid "'keypass' not found in config.py!"
+msgstr "'keypass' config.py içinde bulunamadı!"
 
 #: ../fdroidserver/common.py
 msgid "'keystore' is NONE and 'smartcardoptions' is blank!"
 msgstr "'keystore' seçeneği NONE ve 'smartcardoptions' seçeneği boş!"
 
-#: ../fdroidserver/common.py
-msgid "'keystore' not found in config.yml!"
-msgstr "'keystore' config.yml içinde bulunamadı!"
+#: ../fdroidserver/index.py ../fdroidserver/common.py
+msgid "'keystore' not found in config.py!"
+msgstr "'keystore' config.py içinde bulunamadı!"
 
-#: ../fdroidserver/common.py
-msgid "'keystorepass' not found in config.yml!"
-msgstr "'keystorepass' config.yml içinde bulunamadı!"
+#: ../fdroidserver/index.py ../fdroidserver/common.py
+msgid "'keystorepass' not found in config.py!"
+msgstr "'keystorepass' config.py içinde bulunamadı!"
 
-#: ../fdroidserver/common.py
-msgid "'repo_keyalias' not found in config.yml!"
-msgstr "'repo_keyalias' config.yml içinde bulunamadı!"
+#: ../fdroidserver/index.py ../fdroidserver/common.py
+msgid "'repo_keyalias' not found in config.py!"
+msgstr "'repo_keyalias' config.py içinde bulunamadı!"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "'required' is an invalid argument for positionals"
 msgstr "'required' positionals için geçersiz bir argüman"
 
 #: ../fdroidserver/common.py
-msgid "'sdk_path' not set in config.yml!"
-msgstr "'sdk_path' config.yml içinde ayarlı değil!"
+msgid "'sdk_path' not set in 'config.py'!"
+msgstr "'sdk_path' 'config.py' içinde ayarlı değil!"
+
+#. Translators: "build-tools" is the file name of a package from
+#. Google, it is part of the Android SDK. So it probably shouldn't be
+#. translated or transliterated.
+#: ../fdroidserver/common.py
+#, python-brace-format
+msgid "'{aapt}' is too old, fdroid requires build-tools-23.0.0 or newer!"
+msgstr "'{aapt}' çok eski, fdroid build-tools-23.0.0 veya daha yenisini gerektirir!"
 
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "'{aapt}' is too old, fdroid requires build-tools-{version} or newer!"
 msgstr "'{aapt}' çok eski, fdroid build-tools-{version} veya daha yenisini gerektirir!"
 
+#: ../fdroidserver/install.py
+#, python-brace-format
+msgid "'{apkfilename}' is already installed on {dev}."
+msgstr "'{apkfilename}' zaten {dev} üzerinde kurulu."
+
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "'{field}' in {linedesc} is obsolete, see docs for current fields:"
+msgstr "{linedesc}'deki '{field}' eski, geçerli alanlar için dokümanlara bakınız:"
+
+#: ../fdroidserver/common.py
+#, python-brace-format
+msgid "'{field}' will be in random order! Use () or [] brackets if order is important!"
+msgstr "'{field}' rastgele sırada olacak! Sıra önemliyse () veya [] parantez kullanın!"
+
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "'{path}' failed to execute!"
@@ -158,32 +207,23 @@ msgstr "'{path}' yürütülemedi!"
 
 #: ../fdroidserver/metadata.py
 #, python-brace-format
-msgid "'{path}' has invalid format, it should be a dictionary!"
-msgstr "'{path}' geçersiz biçime sahip, bir sözlük olmalı!"
-
-#: ../fdroidserver/lint.py ../fdroidserver/metadata.py
-#, python-brace-format
 msgid "'{value}' is not a valid {field} in {appid}. Regex pattern: {pattern}"
 msgstr "'{value}' {appid} içinde geçerli {field} değil. Regex ifadesi: {pattern}"
 
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "'{value}' is not a valid {field}, should be {pattern}"
-msgstr "'{value}' geçerli bir {field} değil, {pattern} olmalı"
-
-#: ../fdroidserver/checkupdates.py
-msgid "--merge-request only runs on a single appid!"
-msgstr "--merge-request yalnızca tek bir uygulama kimliğinde çalışır!"
-
 #: ../fdroidserver/checkupdates.py
 #, python-brace-format
 msgid "...checkupdate failed for {appid} : {error}"
 msgstr ".. .checkupdate {appid} için başarısız oldu: {error}"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid ".__call__() not defined"
 msgstr ".__call__() tanımlı değil"
 
+#: ../fdroidserver/metadata.py
+msgid ".fdroid.txt is not supported!  Convert to .fdroid.yml or .fdroid.json."
+msgstr ".fdroid.txt desteklenmiyor! .fdroid.yml ya da .fdroid.json dönüştürün."
+
 #: ../fdroidserver/lint.py
 msgid "/issues is missing"
 msgstr "/issues eksik"
@@ -192,15 +232,14 @@ msgstr "/issues eksik"
 msgid "A URL is required as an argument!"
 msgstr "Bir URL, argüman olarak gereklidir!"
 
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "APK signatures have different certificates in {path}:"
-msgstr "APK imzalarının {path} içinde farklı sertifikaları var:"
-
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Add PGP signatures using GnuPG for packages in repo"
 msgstr "Depodaki paketler için GnuPG ile PGP imzaları ekle"
 
+#: ../fdroid ../fdroidserver/__main__.py
+msgid "Add a new application from its source code"
+msgstr "Kaynak kodundan yeni bir uygulama ekle"
+
 #: ../fdroidserver/update.py
 msgid "Add a repo signing key to an unsigned repo"
 msgstr "İmzalanmamış bir depoya, depo imzalama anahtarı ekleyin"
@@ -218,11 +257,7 @@ msgstr "Yalnızca {name} için yeni depo ekleniyor"
 msgid "Alias of the repo signing key in the keystore"
 msgstr "Depo imzalama anahtarının anahtar deposundaki takma adı"
 
-#: ../fdroidserver/build.py
-msgid "AllowedAPKSigningKeys missing but reference binary supplied"
-msgstr "AllowedAPKSigningKeys eksik ancak referans ikili dosyası sağlandı"
-
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "Allows a different revision (or git branch) to be specified for the initial import"
 msgstr "İlk içe aktarım için farklı bir revizyonun (veya git dalının) belirtilmesine izin verir"
 
@@ -246,10 +281,14 @@ msgstr "Android APK dosyası"
 msgid "Android DEX code"
 msgstr "Android DEX kodu"
 
-#: ../fdroidserver/init.py
+#: ../fdroidserver/common.py ../fdroidserver/build.py
 #, python-brace-format
-msgid "Android SDK not found at {path}!"
-msgstr "Android SDK {path} konumunda bulunamadı!"
+msgid "Android SDK '{path}' does not have '{dirname}' installed!"
+msgstr "Android SDK '{path}' içinde '{dirname}' kurulu değil!"
+
+#: ../fdroidserver/common.py
+msgid "Android SDK not found!"
+msgstr "Android SDK bulunamadı!"
 
 #: ../fdroidserver/common.py
 #, python-brace-format
@@ -261,28 +300,23 @@ msgstr "Android SDK konumu '{path}' yok!"
 msgid "Android SDK path '{path}' is not a directory!"
 msgstr "Android SDK yolu '{path}' bir dizin değil!"
 
+#. Translators: "build-tools" is the file name of a package from
+#. Google, it is part of the Android SDK. So it probably shouldn't be
+#. translated or transliterated.
 #: ../fdroidserver/common.py
 #, python-brace-format
-msgid "Android SDK tool {cmd} not found!"
-msgstr "Android SDK aracı {cmd} bulunamadı!"
+msgid "Android build-tools path '{path}' does not exist!"
+msgstr "Android oluşturma araçları yolu '{path}' mevcut değil!"
 
-#: ../fdroidserver/lint.py
-msgid "App has Binaries but does not have corresponding AllowedAPKSigningKeys to pin certificate."
-msgstr "Uygulama İkili Dosyalara sahip ancak sertifikayı sabitlemek için karşılık gelen AllowedAPKSigningKeys'e sahip değil."
-
-#: ../fdroidserver/lint.py
-msgid "App has NoSourceSince or ArchivePolicy \"0 versions\" or 0 but AutoUpdateMode or UpdateCheckMode are not None"
-msgstr "Uygulamanın NoSourceSince veya ArchivePolicy \"0 sürümü\" var ya da 0 var ama AutoUpdateMode veya UpdateCheckMode Yok değil"
+#: ../fdroidserver/update.py
+msgid "AndroidManifest.xml has no date"
+msgstr "AndroidManifest.xml dosyasının tarihi yok"
 
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "App is in '{repo}' but has a link to {url}"
 msgstr "Uygulama '{repo}' içinde ancak {url} adresine bir bağlantısı var"
 
-#: ../fdroidserver/lint.py
-msgid "App version has binary but does not have corresponding AllowedAPKSigningKeys to pin certificate."
-msgstr "Uygulama sürümü ikili dosyaya sahip ancak sertifikayı sabitlemek için karşılık gelen AllowedAPKSigningKeys'e sahip değil."
-
 #: ../fdroidserver/lint.py
 msgid "Appending .git is not necessary"
 msgstr "Ekleme .gıt gerekli değildir"
@@ -292,27 +326,11 @@ msgstr "Ekleme .gıt gerekli değildir"
 msgid "Archiving {apkfilename} with invalid signature!"
 msgstr "Geçersiz imza ile {apkfilename} arşivleme!"
 
-#: ../fdroidserver/lint.py
-msgid "AutoUpdateMode with UpdateCheckMode: HTTP must have a pattern."
-msgstr "UpdateCheckMode ile AutoUpdateMode: HTTP bir desene sahip olmalıdır."
-
-#: ../fdroidserver/install.py
-msgid "Automatic no to all prompts."
-msgstr "Bütün sorulara otomatik olarak hayır."
-
-#: ../fdroidserver/install.py
-msgid "Automatic yes to all prompts."
-msgstr "Bütün sorulara otomatik olarak evet."
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "Bad entry type \"{mirrortype}\" in mirrors config: {mirror}"
-msgstr "Aynalar yapılandırmasında hatalı giriş türü \"{mirrortype}\": {mirror}"
-
 #: ../fdroidserver/mirror.py
 msgid "Base URL to mirror, can include the index signing key using the query string: ?fingerprint="
 msgstr "Yansının temel URL'si, 'şu sorgu dizgisini kullanarak indeks imzalama anahtarını içerebilir: ?fingerprint="
 
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "Branch '{branch}' used as commit in build '{versionName}'"
@@ -326,11 +344,11 @@ msgstr "Srclib '{srclib}' içine işleme için dal '{branch}' kullanıldı"
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Broken symlink: {path}"
-msgstr "Bozuk sembolik bağlantı: {path}"
+msgstr "Bozuk simgesel bağlantı: {path}"
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Build a package from source"
-msgstr "Kaynaktan bir paket oluştur"
+msgstr "Kaynaktan bir paket inşa et"
 
 #: ../fdroidserver/build.py
 msgid "Build all applications available"
@@ -348,48 +366,57 @@ msgstr "Yapı metadata git repo, değişiklik yapılmadı!"
 msgid "Build only the latest version of each package"
 msgstr "Her paketin sadece son sürümünü inşa et"
 
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Build should have comma-separated versionName and versionCode, not \"{value}\", in {linedesc}"
+msgstr "İnşa virgülle ayrılmış versionName ve versionCode içermeli, {linedesc} içinde \"{value}\" değil"
+
 #: ../fdroidserver/init.py
 #, python-format
 msgid "Built repo based in \"%s\" with this config:"
 msgstr "Depo \"%s\" tabanında bu yapılandırma ile inşa edildi:"
 
-#: ../fdroidserver/checkupdates.py
-msgid "Can't auto-update app with no CurrentVersionCode"
-msgstr "CurrentVersionCode olmadan uygulama otomatik olarak güncellenemiyor"
-
 #: ../fdroidserver/build.py
 msgid "Can't build due to {} error while scanning"
 msgid_plural "Can't build due to {} errors while scanning"
 msgstr[0] "Tarama sırasında {} hata nedeniyle inşa edilemiyor"
 msgstr[1] "Tarama sırasında {} hata nedeniyle inşa edilemiyor"
 
-#: ../fdroidserver/common.py
-#, fuzzy, python-brace-format
-msgid "Cannot read {path}: {error}"
-msgstr "{path} okunamadı: {error}"
+#: ../fdroidserver/vmtools.py
+#, python-brace-format
+msgid "Cannot read \"{path}\"!"
+msgstr "\"{path}\" okunamıyor!"
+
+#. Translators: https://developer.android.com/studio/build/application-id
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Cannot resolve application ID {appid}"
+msgstr "Uygulama kimliği {appid} çözümlenemiyor"
 
 #: ../fdroidserver/rewritemeta.py
 #, python-brace-format
 msgid "Cannot rewrite \"{path}\""
 msgstr "\"{path}\" yeniden yazılamıyor"
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
+#: ../fdroidserver/rewritemeta.py
+msgid "Cannot use --list and --to at the same time"
+msgstr "--list ve --to aynı anda kullanılamaz"
+
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Cannot write \"{path}\", not an accepted format, use: {formats}"
+msgstr "\"{path}\" yazılamıyor, kabul edilen bir biçim değil, {formats} kullanın"
+
 #: ../fdroidserver/lint.py
 #, python-format
 msgid "Categories '%s' is not valid"
 msgstr "'%s' kategorileri geçersiz"
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
 #: ../fdroidserver/lint.py
 msgid "Categories are not set"
 msgstr "Kategoriler ayarlı değil"
 
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "Category \"{category}\" defined but not used for any apps!"
-msgstr "\"{category}\" kategorisi tanımlanmış ancak herhangi bir uygulama için kullanılmıyor!"
-
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Check for updates to applications"
 msgstr "Uygulama güncellemelerini denetle"
 
@@ -398,36 +425,35 @@ msgstr "Uygulama güncellemelerini denetle"
 msgid "Checking archiving for {appid} - apks:{integer}, keepversions:{keep}, archapks:{arch}"
 msgstr "{appid} için arşivleme denetleniyor - apks:{integer}, keepversions:{keep}, archapks:{arch}"
 
+#: ../fdroidserver/dscanner.py
+msgid "Clean after all scans have finished"
+msgstr "Tüm taramalar bitince temizle"
+
+#: ../fdroidserver/dscanner.py
+msgid "Clean before the scans start and rebuild the container"
+msgstr "Taramalar başlamadan önce temizle ve kapsayıcıyı yeniden inşa et"
+
+#: ../fdroidserver/dscanner.py
+msgid "Clean up all containers and then exit"
+msgstr "Bütün kapsayıcılar temizle ve sonra çık"
+
 #: ../fdroidserver/update.py
 msgid "Clean update - don't uses caches, reprocess all APKs"
 msgstr "Temiz güncelleme - önbellekleri kullanmaz, tüm APKları yeniden işler"
 
-#: ../fdroidserver/common.py
-msgid "Color the log output"
-msgstr "Günlük çıktısını renklendir"
-
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "Comma separated list of categories."
 msgstr "Kategorilerin virgülle ayrılmış listesi."
 
-#: ../fdroidserver/__main__.py
-#, python-format
+#: ../fdroid ../fdroidserver/__main__.py
+#, c-format, python-format
 msgid "Command '%s' not recognised.\n"
-msgstr "'%s' komutu tanınmıyor.\n"
+msgstr "Komut '%s' tanınmıyor.\n"
 
 #: ../fdroidserver/checkupdates.py
 msgid "Commit changes"
 msgstr "Değişiklikleri işle"
 
-#: ../fdroidserver/checkupdates.py
-msgid "Commit changes, push, then make a merge request"
-msgstr "Değişiklikleri uygula, yükle ve bir birleştirme isteği yap"
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Conflicting \"{field}\" definitions between .yml and localized files:"
-msgstr ".yml ve yerelleştirilmiş dosyalar arasında çakışan \"{field}\" tanımları:"
-
 #: ../fdroidserver/__main__.py
 msgid "Conflicting arguments: '--verbose' and '--quiet' can not be specified at the same time."
 msgstr "Çakışan argümanlar: '--verbose' ve '--quiet' aynı anda belirtilemez."
@@ -437,13 +463,11 @@ msgstr "Çakışan argümanlar: '--verbose' ve '--quiet' aynı anda belirtilemez
 msgid "Could not find '{command}' on your system"
 msgstr "'{command}' sisteminizde bulunamadı"
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "Could not find latest version code"
 msgstr "Son sürüm kodu bulunamadı"
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "Could not find latest version name"
 msgstr "Son sürüm adı bulunamadı"
 
@@ -453,25 +477,30 @@ msgid "Could not find {path} to remove it"
 msgstr "Kaldırmak için {path} bulunamadı"
 
 #: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Could not open APK {path} for analysis: "
-msgstr "İnceleme için APK {path} açılamadı: "
+msgid "Could not open apk file for analysis"
+msgstr "İnceleme için apk dosyası açılamadı"
 
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "Could not parse size \"{size}\", wrong type \"{type}\""
 msgstr "\"{size}\" boyutu ayrıştırılamadı, yanlış tür \"{type}\""
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/import_subcommand.py
+#. Translators: https://developer.android.com/studio/build/application-id
+#: ../fdroidserver/import.py
 msgid "Couldn't find Application ID"
 msgstr "Uygulama kimliği bulunamadı"
 
-#: ../fdroidserver/checkupdates.py
-msgid "Couldn't find any version information"
-msgstr "Herhangi bir sürüm bilgisi bulunamadı"
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
+#: ../fdroidserver/import.py
+msgid "Couldn't find latest version code"
+msgstr "Son sürüm kodu bulunamadı"
 
-#: ../fdroidserver/checkupdates.py
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
+#: ../fdroidserver/import.py
+msgid "Couldn't find latest version name"
+msgstr "Son sürüm adı bulunamadı"
+
+#: ../fdroidserver/import.py
 msgid "Couldn't find package ID"
 msgstr "Paket ID bulunamadı"
 
@@ -479,26 +508,29 @@ msgstr "Paket ID bulunamadı"
 msgid "Cowardily refusing to overwrite existing signing key setup!"
 msgstr "Var olan imza anahtarı kurulumunun üzerine yazma korkakça reddediliyor!"
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/update.py
+msgid "Create a repo signing key in a keystore"
+msgstr "Bir anahtar deposunda, depo imzalama anahtarı yaratır"
+
+#: ../fdroidserver/update.py
+msgid "Create skeleton metadata files that are missing"
+msgstr "Eksik olan iskelet üst veri dosyalarını yarat"
+
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Created new container \"{name}\""
 msgstr "Yeni kapsayıcı \"{name}\" oluşturuldu"
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Creating \"{path}\" for configuring s3cmd."
 msgstr "s3cmd yapılandırması için \"{path}\" oluşturuluyor."
 
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Creating empty {config_file}"
-msgstr "Boş {config_file} oluşturuluyor"
-
 #: ../fdroidserver/publish.py
 msgid "Creating log directory"
 msgstr "Günlük dizini oluşturuluyor"
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Creating new S3 bucket: {url}"
 msgstr "Yeni S3 kovası oluşturuluyor: {url}"
@@ -511,7 +543,8 @@ msgstr "Çıktı dizini oluşturuluyor"
 msgid "Creating signed index with this key (SHA256):"
 msgstr "Bu anahtarla (SHA256) imzalı indeks oluşturuluyor:"
 
-#: ../fdroidserver/publish.py ../fdroidserver/verify.py
+#: ../fdroidserver/import.py ../fdroidserver/verify.py
+#: ../fdroidserver/publish.py
 msgid "Creating temporary directory"
 msgstr "Geçici dizin oluşturuluyor"
 
@@ -530,7 +563,7 @@ msgstr "DEBUG_KEYSTORE ayarlı değil veya değer eksik"
 
 #: ../fdroidserver/update.py
 msgid "Delete APKs and/or OBBs without metadata from the repo"
-msgstr "Depoda üst verisi olmayan APK ve/veya OBB dosyalarını sil"
+msgstr "Depodan üst verisi olmayan APKları ve/veya OBBleri sil"
 
 #: ../fdroidserver/deploy.py
 #, python-brace-format
@@ -556,22 +589,17 @@ msgstr "Açıklama '%s' yalnızca uygulamanın özeti"
 msgid "Description has a duplicate line"
 msgstr "Açıklamanın yinelenen satırı var"
 
+#: ../fdroidserver/lint.py
+#, python-format
+msgid "Description has a list (%s) but it isn't bulleted (*) nor numbered (#)"
+msgstr "Açıklamanın bir listesi (%s) var fakat madde imli (*) veya numaralı(#) değil"
+
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "Description of length {length} is over the {limit} char limit"
 msgstr "{length} uzunluğundaki açıklama, {limit} karakter sınırının üstünde"
 
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Did you mean config/{name}.yml?"
-msgstr "config/{name}.yml mı demek istediniz?"
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Did you mean {code}?"
-msgstr "{code} mi demek istediniz?"
-
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "Do not add 'disable:' to the generated build entries"
 msgstr "Oluşturulan derleme girdilerine 'disable:' ekleme"
 
@@ -596,22 +624,27 @@ msgstr "Anahtar deposundan oluşturulan özel anahtarları kaldırmayın"
 msgid "Don't create a source tarball, useful when testing a build"
 msgstr "Bir kaynak tar dosyası yaratma, bir inşa sınanırken yararlıdır"
 
+#: ../fdroidserver/stats.py
+msgid "Don't do anything logs-related"
+msgstr "Günlüklerle ilgili bir şey yapma"
+
 #: ../fdroidserver/build.py
 msgid "Don't refresh the repository, useful when testing a build with no internet connection"
 msgstr "Depoyu yenileme, bir inşa internet bağlantısı olmadan sınanırken yararlıdır"
 
 #: ../fdroidserver/deploy.py ../fdroidserver/nightly.py
+#: ../fdroidserver/upload.py
 msgid "Don't use rsync checksums"
 msgstr "Rsync sağlama toplamlarını kullanma"
 
-#: ../fdroidserver/install.py
-msgid "Download F-Droid.apk using mirrors that leak less to the network"
-msgstr "F-Droid.apk'yı ağa az bilgi sızdıracak şekilde indir"
-
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Download complete mirrors of small repos"
 msgstr "Küçük depoların tam yansımasını indir"
 
+#: ../fdroidserver/stats.py
+msgid "Download logs we don't have"
+msgstr "Bizde olmayan günlükleri indir"
+
 #: ../fdroidserver/common.py
 msgid "Downloading the repository already failed once, not trying again."
 msgstr "Depoyu indirmek zaten bir kez başarısız oldu, tekrar denenmiyor."
@@ -623,56 +656,38 @@ msgstr "{url} indirme başarısız. {error}"
 
 #: ../fdroidserver/metadata.py
 #, python-brace-format
-msgid "Duplicate Anti-Feature declaration at {path} was ignored!"
-msgstr "{path} adresindeki yinelenen Anti-Özellik bildirimi göz ardı edildi!"
-
-#: ../fdroidserver/index.py
-#, python-format
-msgid "Duplicate entry \"%s\" in mirrors config!"
-msgstr "Aynalar yapılandırmasında yinelenen \"%s\" girişi!"
+msgid "Duplicate build recipe found for versionCode {versionCode} in {linedesc}"
+msgstr "{linedesc} içinde versionCode{versionCode} için yinelenen inşa tarifi bulundu"
 
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "Duplicate link in '{field}': {url}"
 msgstr "'{field}' içinde yinelenen bağlantı: {url}"
 
-#: ../fdroidserver/common.py
-#, python-format
-msgid "ERROR: %(message)s"
-msgstr "HATA: %(message)s"
+#: ../fdroid
+msgid "Dynamically scan APKs post build"
+msgstr "İnşa sonrası APKları dinamik olarak tara"
 
 #: ../fdroidserver/__main__.py
 msgid "ERROR: The \"server\" subcommand has been removed, use \"deploy\"!"
 msgstr "HATA: \"server\" alt komutu kaldırıldı, \"deploy\" kullanın!"
 
+#: ../fdroidserver/mirror.py
+msgid ""
+"ERROR: this command should never be used to mirror f-droid.org!\n"
+"A full mirror of f-droid.org requires more than 200GB."
+msgstr ""
+"HATA: bu komut asla f-droid.org'u yansıtmak için kullanılmamalıdır!\n"
+"f-droid.org'un tam bir yansıması 200GB'tan çok yer gerektirir."
+
 #: ../fdroidserver/nightly.py
 msgid "ERROR: unsupported CI type, patches welcome!"
 msgstr "HATA: desteklenmeyen CI türü, yama gönderebilirsiniz!"
 
-#: ../fdroidserver/nightly.py
-#, python-format
-msgid "ERROR: unsupported git host \"%s\", patches welcome!"
-msgstr "HATA: desteklenmeyen git ana makinesi \"%s\", yama gönderebilirsiniz!"
-
-#: ../fdroidserver/lint.py
+#: ../fdroidserver/metadata.py
 #, python-brace-format
-msgid "ERROR: {key} in {path} is not \"archive\" or \"repo\"!"
-msgstr "HATA: {path} içindeki {key} \"archive\" veya \"repo\" değil!"
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "ERROR: {key} not a valid key!"
-msgstr "HATA: {key} geçerli bir anahtar değil!"
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "ERROR: {key}'s value should be of type {t}!"
-msgstr "Hata: {key} anahtarının değeri {t} tipinde olmalı!"
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "ERROR: {key}:{subkey} in {path} is not in allowed keys: {allowed_keys}!"
-msgstr "HATA: {path} içindeki {key}:{subkey} izin verilen anahtarlar içinde değil: {allowed_keys}!"
+msgid "Empty build flag at {linedesc}"
+msgstr "{linedesc} satırında boş inşa bayrağı"
 
 #: ../fdroidserver/__main__.py
 #, python-brace-format
@@ -688,40 +703,20 @@ msgstr ""
 "Android SDK (%s) konumunu buraya girin:\n"
 "> "
 
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Environment variable {var} from {configname} is not set!"
-msgstr "{configname} içinden {var} ortam değişkeni ayarlı değil!"
+#: ../fdroidserver/deploy.py ../fdroidserver/checkupdates.py
+#: ../fdroidserver/upload.py
+#, python-format
+msgid "Error while attempting to publish log: %s"
+msgstr "Günlük yayımlamaya çalışırken hata: %s"
 
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Environment variable {{env: {var}}} is not set!"
-msgstr "Ortam değişkeni {{env: {var}}} ayarlanmadı!"
-
-#: ../fdroidserver/deploy.py
-msgid "Error deploying 'github_releases', {} not present. (You might need to run `fdroid update` first.)"
-msgstr "'github_releases' dağıtılırken hata oluştu, {} yok. (Önce `fdroid update` komutunu çalıştırmanız gerekebilir.)"
-
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py ../fdroidserver/common.py
 msgid "Error while getting repo address"
 msgstr "Depo adresi alınırken hata"
 
-#: ../fdroidserver/scanner.py
-msgid "Exit with a non-zero code if problems were found"
-msgstr "Sorun bulunursa sıfır olmayan bir kodla çıkın"
-
-#: ../fdroidserver/__main__.py
-msgid "Extract application metadata from a source repository"
-msgstr "Bir kaynak depodan uygulama üst verilerini ayıkla"
-
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Extract signatures from APKs"
 msgstr "APK'lardan imzaları ayıkla"
 
-#: ../fdroidserver/install.py
-msgid "F-Droid.apk could not be downloaded from any known source!"
-msgstr "F-Droid.apk bilinen kaynakların hiç birinden indirilemedi!"
-
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Failed copying {path}: {error}"
@@ -742,34 +737,42 @@ msgstr "{path} okunamadı: {error}"
 msgid "Failed resizing {path}: {error}"
 msgstr "{path} yeniden boyutlandırılamadı: {error}"
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/publish.py
+msgid "Failed to align application"
+msgstr "Uygulama hizalama başarısız oldu"
+
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Failed to create S3 bucket: {url}"
 msgstr "S3 kovası oluşturulamadı: {url}"
 
+#: ../fdroidserver/common.py
+msgid "Failed to get APK manifest information"
+msgstr "APK bildirim bilgileri alınamadı"
+
 #: ../fdroidserver/update.py
 #, python-brace-format
-msgid "Failed to get APK information, deleting {path}"
+msgid "Failed to get apk information, deleting {path}"
 msgstr "APK bilgisi alınamadı, {path} siliniyor"
 
 #: ../fdroidserver/update.py
 #, python-brace-format
-msgid "Failed to get APK information, skipping {path}"
+msgid "Failed to get apk information, skipping {path}"
 msgstr "APK bilgisi alınamadı, {path} atlanıyor"
 
-#: ../fdroidserver/update.py
-msgid "Failed to get APK signing key fingerprint"
-msgstr "APK imzalama anahtarı parmak izi alınamadı"
-
 #: ../fdroidserver/install.py
 #, python-brace-format
 msgid "Failed to install '{apkfilename}' on {dev}: {error}"
 msgstr "'{apkfilename}' {dev} üstüne kurulamadı: {error}"
 
-#: ../fdroidserver/common.py
+#: ../fdroidserver/publish.py ../fdroidserver/common.py
 msgid "Failed to sign application"
 msgstr "Uygulama imzalanamadı"
 
+#: ../fdroidserver/common.py
+msgid "Failed to zipalign application"
+msgstr "Uygulama zipalign başarısız oldu"
+
 #: ../fdroidserver/build.py
 #, python-brace-format
 msgid "Fetched buildserverid from VM: {buildserverid}"
@@ -785,12 +788,21 @@ msgstr "'{apkfilename}' için imzalar alındı -> '{sigdir}'"
 msgid "File disappeared while processing it: {path}"
 msgstr "Dosya işlenirken kayboldu: {path}"
 
-#: ../fdroidserver/build.py ../fdroidserver/install.py
-#: ../fdroidserver/rewritemeta.py ../fdroidserver/scanner.py
-#: ../fdroidserver/update.py
+#: ../fdroidserver/verify.py ../fdroidserver/stats.py ../fdroidserver/update.py
+#: ../fdroidserver/rewritemeta.py ../fdroidserver/build.py
+#: ../fdroidserver/checkupdates.py ../fdroidserver/scanner.py
+#: ../fdroidserver/install.py
 msgid "Finished"
 msgstr "Tamamlandı"
 
+#: ../fdroidserver/lint.py
+msgid "Flattr donation methods belong in the FlattrID flag"
+msgstr "Flattr bağış yöntemleri FlattrID bayrağında olmalı"
+
+#: ../fdroidserver/lint.py
+msgid "Flattr donation methods belong in the FlattrID: field"
+msgstr "Flattr bağış yöntemleri FlattrID: alanında olmalı"
+
 #: ../fdroidserver/lint.py
 msgid "Forbidden HTML tags"
 msgstr "Yasaklı HTML etiketleri"
@@ -822,6 +834,7 @@ msgstr "\"{name}\" için hatalı ödeme dosyası \"{path}\" bulundu:"
 msgid "Found invalid appids in arguments"
 msgstr "Argümanda geçersiz appid'ler bulundu"
 
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
 #: ../fdroidserver/common.py
 msgid "Found invalid versionCodes for some apps"
 msgstr "Bazı uygulamalar için geçersiz versionCodes bulundu"
@@ -831,10 +844,6 @@ msgstr "Bazı uygulamalar için geçersiz versionCodes bulundu"
 msgid "Found multiple JAR Signature Block Files in {path}"
 msgstr "{path} içinde birden fazla JAR İmza Blok Dosyası bulundu"
 
-#: ../fdroidserver/common.py
-msgid "Found multiple Signer Certificates!"
-msgstr "Birden çok imzalama sertifikası bulundu!"
-
 #: ../fdroidserver/metadata.py
 #, python-brace-format
 msgid "Found multiple metadata files for {appid}"
@@ -844,6 +853,11 @@ msgstr "{appid} için birden çok üst veri dosyası bulundu"
 msgid "Found multiple signing certificates for repository."
 msgstr "Depo için birden çok imzalama sertifikası bulundu."
 
+#: ../fdroidserver/update.py
+#, python-brace-format
+msgid "Found multiple signing certificates in {path}"
+msgstr "{path} içinde birden çok imzalama sertifikası bulundu"
+
 #: ../fdroidserver/index.py
 msgid "Found no signing certificates for repository."
 msgstr "Depo için imzalama sertifikaları bulunmadı."
@@ -858,16 +872,6 @@ msgstr "%s konumunda dosya olmayan bulundu"
 msgid "Found {apkfilename} at {url}"
 msgstr "{url} adresinde {apkfilename} bulundu"
 
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Found {count} problems in {filename}"
-msgstr "{filename} içinde {count} sorun bulundu"
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Found {count} warnings in {filename}"
-msgstr "{filename} içinde {count} uyarı bulundu"
-
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Generated skeleton metadata for {appid}"
@@ -886,21 +890,19 @@ msgstr "Git clean başarısız"
 msgid "Git fetch failed"
 msgstr "Git fetch başarısız"
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
+#: ../fdroidserver/common.py
+msgid "Git remote set-head failed"
+msgstr "Git remote set-head başarısız"
+
 #: ../fdroidserver/common.py
 #, python-format
 msgid "Git remote set-head failed: \"%s\""
 msgstr "Git remote set-head başarısız: \"%s\""
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
 #: ../fdroidserver/common.py
 msgid "Git reset failed"
 msgstr "Git reset başarısız"
 
-#: ../fdroidserver/common.py
-msgid "Git submodule deinit failed"
-msgstr "Git alt modülü iptali başarısız oldu"
-
 #: ../fdroidserver/common.py
 msgid "Git submodule sync failed"
 msgstr "Git alt modülü eşzamanlaması başarısız oldu"
@@ -932,16 +934,6 @@ msgstr "Kullanımdan kaldırıldığı için '{metapath}' üst verilerindeki '{f
 msgid "Ignoring FUNDING.yml entry longer than 2048: %s"
 msgstr "2048'den uzun FUNDING.yml girdisi yok sayılıyor: %s"
 
-#: ../fdroidserver/update.py
-#, python-format
-msgid "Ignoring bad element in manifest: %s"
-msgstr "Manifestteki hatalı öğe yok sayılıyor: %s"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Ignoring deprecated {oldfile}, use {newfile}!"
-msgstr "{oldfile} kullanımdan kaldırıldı, {newfile} kullanın!"
-
 #: ../fdroidserver/index.py
 msgid "Ignoring package without metadata: "
 msgstr "Üst verisiz paket yok sayılıyor: "
@@ -951,6 +943,11 @@ msgstr "Üst verisiz paket yok sayılıyor: "
 msgid "Ignoring stale cache data for {apkfilename}"
 msgstr "{apkfilename} için eskimiş önbellek verisi yok sayılıyor"
 
+#: ../fdroidserver/rewritemeta.py
+#, python-brace-format
+msgid "Ignoring {ext} file at '{path}'"
+msgstr "'{path}' konumundaki {ext} dosyası yok sayılıyor"
+
 #: ../fdroidserver/update.py
 msgid "Include APKs that are signed with disabled algorithms like MD5"
 msgstr "MD5 gibi devre dışı algoritmalarla imzalanmış APK'ları dahil et"
@@ -967,16 +964,6 @@ msgstr "Derleme günlüklerini yansıya dahil et"
 msgid "Include the source tarballs in the mirror"
 msgstr "Kaynak tar arşivlerini yansıya dahil et"
 
-#: ../fdroidserver/metadata.py
-#, python-format
-msgid "Including metadata from %s@%s"
-msgstr "%s@%s üst verileri dahil ediliyor"
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Including metadata from {path}"
-msgstr "{path} üst verileri dahil ediliyor"
-
 #: ../fdroidserver/common.py
 msgid "Initialising submodules"
 msgstr "Alt modüller başlatılıyor"
@@ -985,21 +972,31 @@ msgstr "Alt modüller başlatılıyor"
 msgid "Install all signed applications available"
 msgstr "Kullanılabilir tüm imzalı uygulamaları kur"
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Install built packages on devices"
-msgstr "Oluşturulan paketleri aygıtlara kur"
+msgstr "İnşa edilen paketleri aygıtlara kur"
 
 #: ../fdroidserver/install.py
 #, python-format
 msgid "Installing %s..."
 msgstr "%s kuruluyor..."
 
+#: ../fdroidserver/install.py
+#, python-format
+msgid "Installing %s…"
+msgstr "%s kuruluyor…"
+
 #: ../fdroidserver/install.py
 #, python-brace-format
 msgid "Installing '{apkfilename}' on {dev}..."
 msgstr "{dev} üzerinde '{apkfilename}' kuruluyor..."
 
-#: ../fdroidserver/__main__.py
+#: ../fdroidserver/install.py
+#, python-brace-format
+msgid "Installing '{apkfilename}' on {dev}…"
+msgstr "'{apkfilename}' {dev} üstüne kuruluyor…"
+
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Interact with the repo HTTP server"
 msgstr "Depo HTTP sunucusu ile etkileşim kur"
 
@@ -1007,36 +1004,53 @@ msgstr "Depo HTTP sunucusu ile etkileşim kur"
 msgid "Invalid APK"
 msgstr "Geçersiz APK"
 
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "Invalid AutoUpdateMode: {mode}"
-msgstr "Geçersiz AutoUpdateMode: {mode}"
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "Invalid UpdateCheckMode: {mode}"
-msgstr "Geçersiz UpdateCheckMode: {mode}"
-
-#: ../fdroidserver/checkupdates.py
+#: ../fdroidserver/lint.py ../fdroidserver/checkupdates.py
 #, python-brace-format
 msgid "Invalid VercodeOperation: {field}"
 msgstr "Geçersiz Vercode İşlemi: {field}"
 
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Invalid VercodeOperation: {invalid_ops}"
-msgstr "Geçersiz VercodeOperation: {invalid_ops}"
-
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "Invalid application ID {appid}"
 msgstr "Geçersiz uygulama kimliği {appid}"
 
+#: ../fdroidserver/metadata.py
+#, python-format
+msgid "Invalid boolean '%s'"
+msgstr "Geçersiz boole '%s'"
+
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Invalid build flag at {line} in {linedesc}"
+msgstr "{linedesc} içinde {line} üstünde geçersiz inşa bayrağı"
+
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Invalid build format: {value} in {name}"
+msgstr "Geçersiz inşa biçimi: {name} içinde {value}"
+
 #: ../fdroidserver/lint.py
 msgid "Invalid bulleted list"
 msgstr "Geçersiz madde imli liste"
 
+#: ../fdroidserver/lint.py
+#, python-format
+msgid "Invalid license tag \"%s\"! Use only tags from https://spdx.org/license-list"
+msgstr "Geçersiz lisans etiketi \"%s\"! Yalnızca https://spdx.org/license-list adresindeki etiketleri kullanın"
+
+#: ../fdroidserver/lint.py
+msgid "Invalid link - use [http://foo.bar Link title] or [http://foo.bar]"
+msgstr "Geçersiz bağlantı - [http://foo.bar Bağlantı başlığı] veya [http://foo.bar] kullanın"
+
+#: ../fdroidserver/metadata.py
+#, python-format
+msgid "Invalid metadata in %s:%d"
+msgstr "%s:%d içinde geçersiz üst veri"
+
+#: ../fdroidserver/metadata.py
+msgid "Invalid metadata in: "
+msgstr "Geçersiz üst veri: "
+
 #: ../fdroidserver/common.py
 #, python-format
 msgid "Invalid name for published file: %s"
@@ -1044,8 +1058,8 @@ msgstr "Yayımlanmış dosya için geçersiz ad: %s"
 
 #: ../fdroidserver/common.py
 #, python-brace-format
-msgid "Invalid ndk: entry in build: \"{ndk}\""
-msgstr "Geçersiz ndk: yapıdaki değer: \"{ndk}\""
+msgid "Invalid package name {0}"
+msgstr "Geçersiz paket adı {0}"
 
 #: ../fdroidserver/common.py
 #, python-brace-format
@@ -1067,6 +1081,11 @@ msgstr "Geçersiz srclib üst verisi: '{file}' ayrıştırılamadı"
 msgid "Invalid srclib metadata: unknown key '{key}' in '{file}'"
 msgstr "Geçersiz srclib üst verisi: '{file}' içinde bilinmeyen anahtar '{key}'"
 
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Invalid versionCode: \"{versionCode}\" is not an integer!"
+msgstr "Geçersiz versionCode: \"{versionCode}\" bir tamsayı değil!"
+
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "JAR signature failed to verify: {path}"
@@ -1081,8 +1100,8 @@ msgstr "JAR imzası doğrulandı: {path}"
 msgid "Java JAR file"
 msgstr "Java JAR dosyası"
 
-#: ../fdroidserver/mirror.py ../fdroidserver/publish.py
-#: ../fdroidserver/update.py
+#: ../fdroidserver/publish.py ../fdroidserver/update.py
+#: ../fdroidserver/mirror.py
 msgid "Java JDK not found! Install in standard location or set java_paths!"
 msgstr "Java JDK bulunmadı! Standart konumda kurun veya java_paths'i ayarlayın!"
 
@@ -1098,19 +1117,10 @@ msgstr "Java jarsigner bulunamadı! Standart konuma kurun veya java_path ayarlay
 msgid "Javascript in HTML src attributes"
 msgstr "HTML src özniteliklerinde javascript"
 
-#: ../fdroidserver/build.py
-#, python-brace-format
-msgid "Keeping failed build \"{apkfilename}\""
-msgstr "Başarısız yapı \"{apkfilename}\" tutuluyor"
-
 #: ../fdroidserver/init.py
 msgid "Keystore for signing key:\t"
 msgstr "İmzalama için anahtar deposu:\t"
 
-#: ../fdroidserver/lint.py
-msgid "Known debug key is used in AllowedAPKSigningKeys: "
-msgstr "AllowedAPKSigningKeys içinde bilinen hata ayıklama anahtarı kullanılıyor: "
-
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "Last used commit '{commit}' looks like a tag, but UpdateCheckMode is '{ucm}'"
@@ -1120,9 +1130,13 @@ msgstr "Son kullanılan işleme '{commit}' bir etiket gibi görünüyor, ama Upd
 msgid "Liberapay donation methods belong in the Liberapay: field"
 msgstr "Liberapay bağış yöntemleri Liberapay: alanında olmalı"
 
+#: ../fdroidserver/lint.py
+msgid "Liberapay donation methods belong in the LiberapayID flag"
+msgstr "Liberapay bağış yöntemleri LiberapayID bayrağında olmalı"
+
 #: ../fdroidserver/rewritemeta.py
-msgid "List files that would be reformatted (dry run)"
-msgstr "Yeniden biçimlendirilecek olan dosyaları listele (deneme çalışması)"
+msgid "List files that would be reformatted"
+msgstr "Yeniden biçimlendirilecek olan dosyaları listele"
 
 #: ../fdroidserver/lint.py
 msgid "Locale included in f-droid.org URL"
@@ -1140,16 +1154,6 @@ msgstr "Bozuk depo yansımaları."
 msgid "Malformed serverwebroot line:"
 msgstr "Bozuk serverwebroot satırı:"
 
-#: ../fdroidserver/scanner.py
-#, python-format
-msgid "Max recursion depth in ZIP file reached: %s"
-msgstr "ZIP dosyasında azami özyineleme derinliğine ulaşıldı: %s"
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "Mirror config for {url} contains \"isPrimary\" key!"
-msgstr "{url} için yansı yapılandırması \"isPrimary\" anahtarını içeriyor!"
-
 #: ../fdroidserver/mirror.py
 msgid "Mirror the full repo and archive, all file types."
 msgstr "Tüm dosya türlerini, tam depoyu ve arşivi yansıla."
@@ -1158,30 +1162,31 @@ msgstr "Tüm dosya türlerini, tam depoyu ve arşivi yansıla."
 msgid "Missing output directory"
 msgstr "Eksik çıktı dizini"
 
-#: ../fdroidserver/metadata.py
-msgid "Moving Anti-Features declarations to localized files:"
-msgstr "Anti-Özellik bildirimlerinin yerelleştirilmiş dosyalara taşınıyor:"
-
-#: ../fdroidserver/index.py
-msgid "Neither \"repo_pubkey\" nor \"keystorepass\" set in config.yml"
-msgstr "config.yml dosyasında ne \"repo_pubkey\" ne de \"keystorepass\" ayarlandı"
-
-#: ../fdroidserver/verify.py
+#: ../fdroidserver/lint.py
 #, python-format
-msgid "No APK for package: %s"
-msgstr "Paket için APK yok: %s"
+msgid "Name '%s' is just the auto name - remove it"
+msgstr "Ad '%s' yalnızca kendiliğinden bir ad - kaldırın"
+
+#: ../fdroidserver/common.py
+msgid "No 'config.py' found, using defaults."
+msgstr "'config.py' bulunamadı, öntanımlılar kullanılıyor."
 
 #: ../fdroidserver/common.py
 msgid "No Android SDK found!"
 msgstr "Android SDK bulunamadı!"
 
+#: ../fdroidserver/import.py
+msgid "No android or kivy project could be found. Specify --subdir?"
+msgstr "Android veya kivy projesi bulunamadı. --subdir belirtin?"
+
 #: ../fdroidserver/install.py
 msgid "No attached devices found"
 msgstr "Bağlı aygıt bulunamadı"
 
-#: ../fdroidserver/install.py
-msgid "No devices found for `adb install`! Please plug one in."
-msgstr "`adb install` için aygıt bulunamadı! Lütfen bir tane takın."
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "No commit specified for {versionName} in {linedesc}"
+msgstr "{linedesc} içindeki {versionName} için belirtilen işleme yok"
 
 #: ../fdroidserver/index.py
 msgid "No fingerprint in URL."
@@ -1191,23 +1196,14 @@ msgstr "URL'de parmak izi yok."
 msgid "No git submodules available"
 msgstr "Kullanılabilir git alt modülü yok"
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "No gradle project could be found. Specify --subdir?"
 msgstr "Gradle projesi bulunamadı. --subdir belirtin?"
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py ../fdroidserver/common.py
 msgid "No information found."
 msgstr "Bilgi bulunamadı."
 
-#: ../fdroidserver/checkupdates.py
-msgid "No matching tags found"
-msgstr "Eşleşen etiket bulunamadı"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "No minimum SDK version found in {0}, using default (3)."
-msgstr "{0} içinde en düşük SDK sürümü bulunamadı, öntanımlı değer kullanılıyor (3)."
-
 #: ../fdroidserver/lint.py
 msgid "No need to specify that the app is Free Software"
 msgstr "Uygulamanın Özgür Yazılım olduğunu belirtmeye gerek yok"
@@ -1217,8 +1213,8 @@ msgid "No need to specify that the app is for Android"
 msgstr "Uygulamanın Android için olduğunu belirtmeye gerek yok"
 
 #: ../fdroidserver/deploy.py
-msgid "No option set! Edit your config.yml to set at least one of these:"
-msgstr "Ayarlı seçenek yok! Sunlardan en az birini ayarlamak için config.yml dosyanızı düzenleyin:"
+msgid "No option set! Edit your config.py to set at least one of these:"
+msgstr "Ayarlı seçenek yok! Sunlardan en az birini ayarlamak için config.py dosyanızı düzenleyin:"
 
 #: ../fdroidserver/common.py
 msgid "No packages specified"
@@ -1226,14 +1222,14 @@ msgstr "Belirtilen paket yok"
 
 #: ../fdroidserver/install.py
 #, python-format
-msgid "No signed APK available for %s"
+msgid "No signed apk available for %s"
 msgstr "%s için kullanılabilir imzalanmış APK yok"
 
 #: ../fdroidserver/install.py
 msgid "No signed output directory - nothing to do"
 msgstr "İmzalanmış çıktı dizini yok - yapılacak işlem yok"
 
-#: ../fdroidserver/common.py
+#: ../fdroidserver/update.py ../fdroidserver/common.py
 #, python-brace-format
 msgid "No signing certificates found in {path}"
 msgstr "{path} içinde imzalama sertifikaları bulunamadı"
@@ -1243,23 +1239,16 @@ msgstr "{path} içinde imzalama sertifikaları bulunamadı"
 msgid "No such package: %s"
 msgstr "Böyle bir paket yok: %s"
 
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "No such versionCode {versionCode} for app {appid}"
 msgstr "Uygulama {appid} için böyle bir versionCode {versionCode} yok"
 
-#: ../fdroidserver/checkupdates.py
-msgid "No tags found"
-msgstr "Etiket bulunamadı"
-
-#: ../fdroidserver/publish.py ../fdroidserver/verify.py
+#: ../fdroidserver/verify.py ../fdroidserver/publish.py
 msgid "No unsigned directory - nothing to do"
 msgstr "İmzalanmamış dizin yok - yapılacak işlem yok"
 
-#: ../fdroidserver/__main__.py
-msgid "No version information could be found."
-msgstr "Sürüm bilgisi bulunamadı."
-
 #: ../fdroidserver/common.py
 msgid "Not a valid size definition: \"{}\""
 msgstr "Geçerli bir boyut tanımı değil: \"{}\""
@@ -1274,9 +1263,10 @@ msgid "Nothing to do for {appid}."
 msgstr "{appid} için yapılacak işlem yok."
 
 #: ../fdroidserver/init.py
-msgid "Now set these in config.yml:"
-msgstr "Şimdi bunları config.yml içinde ayarlayın:"
+msgid "Now set these in config.py:"
+msgstr "Şimdi bunları config.py içinde ayarlayın:"
 
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "OBB file has newer versionCode({integer}) than any APK:"
@@ -1294,28 +1284,23 @@ msgstr "OBB'ın packagename değeri desteklenen APK ile eşleşmiyor:"
 msgid "Offline machine, skipping git mirror generation until `fdroid deploy`"
 msgstr "Çevrim dışı makine, `fdroid deploy` komutuna kadar git yansı oluşturma atlanıyor"
 
-#: ../fdroidserver/deploy.py
-msgid "One of the 'github_releases' config items is missing the 'packageNames' value. skipping ..."
-msgstr "'github_releases' yapılandırma ögelerinden birinde 'packageNames' değeri eksik. atlanıyor..."
+#: ../fdroidserver/common.py
+#, python-brace-format
+msgid "Old APK signature failed to verify: {path}"
+msgstr "Eski APK imzası doğrulanamadı: {path}"
 
-#: ../fdroidserver/deploy.py
-msgid "One of the 'github_releases' config items is missing the 'projectUrl' value. skipping ..."
-msgstr "'github_releases' yapılandırma ögelerinden birinde 'projectUrl' değeri eksik. atlanıyor..."
+#: ../fdroid ../fdroidserver/__main__.py
+msgid "Old, deprecated name for fdroid deploy"
+msgstr "Fdroid dağıtımı için eski, kullanımdan kaldırılmış isim"
 
-#: ../fdroidserver/deploy.py
-msgid "One of the 'github_releases' config items is missing the 'token' value. skipping ..."
-msgstr "'github_releases' yapılandırma ögelerinden birinde 'token' değeri eksik. atlanıyor..."
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Only PNG and JPEG are supported for graphics, found: {path}"
 msgstr "Grafikler için yalnızca PNG ve JPEG desteklenir, bulunan: {path}"
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/common.py
-msgid "Only accepts a single key \"env\""
-msgstr "Sadece bir tane anahtar \"env\" kabul edilir"
+#: ../fdroidserver/checkupdates.py
+msgid "Only print differences with the Play Store"
+msgstr "Yalnızca Play Store ile olan farkları yazdır"
 
 #: ../fdroidserver/checkupdates.py
 msgid "Only process apps with auto-updates"
@@ -1325,6 +1310,11 @@ msgstr "Yalnızca kendiliğinden güncellemesi olan uygulamaları işle"
 msgid "OpenCollective donation methods belong in the OpenCollective: field"
 msgstr "OpenCollective bağış yöntemleri OpenCollective: alanında olmalı"
 
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "Options"
+msgstr "Seçenekler"
+
 #: ../fdroidserver/verify.py
 msgid "Output JSON report to file named after APK."
 msgstr "APK'den sonra adlandırılmış dosyaya JSON raporu yazdırın."
@@ -1333,22 +1323,26 @@ msgstr "APK'den sonra adlandırılmış dosyaya JSON raporu yazdırın."
 msgid "Output JSON to stdout."
 msgstr "Standart çıkışa JSON yazdır."
 
-#: ../fdroidserver/checkupdates.py ../fdroidserver/gpgsign.py
-#: ../fdroidserver/publish.py ../fdroidserver/signindex.py
-#: ../fdroidserver/update.py
+#: ../fdroidserver/gpgsign.py ../fdroidserver/publish.py
+#: ../fdroidserver/update.py ../fdroidserver/signindex.py
+#: ../fdroidserver/checkupdates.py
 msgid "Outputting JSON"
 msgstr "JSON yazdırılıyor"
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "Overall license of the project."
 msgstr "Projenin genel lisansı."
 
+#: ../fdroidserver/dscanner.py
+msgid "Override path for repo APKs (default: ./repo)"
+msgstr "Depo APK'ları için konumu geçersiz kıl (öntanımlı olarak: ./repo)"
+
 #: ../fdroidserver/index.py
 #, python-brace-format
 msgid "Overriding blank versionName in {apkfilename} from metadata: {version}"
 msgstr "{apkfilename} içindeki boş versionName değerine üst verideki yazılıyor: {version}"
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 #, python-brace-format
 msgid "Package \"{appid}\" already exists"
 msgstr "\"{appid}\" paketi zaten var"
@@ -1362,10 +1356,13 @@ msgstr "'{path}' konumundaki bildirim ayrıştırılıyor"
 msgid "Password required with username"
 msgstr "Kullanıcı adıyla parola gerekli"
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "Path to main Android project subdirectory, if not in root."
 msgstr "Kökte değilse, ana Android proje alt dizininin konumu."
 
+msgid "Path to main android project subdirectory, if not in root."
+msgstr "Kökte değilse, ana Android proje alt dizininin konumu."
+
 #: ../fdroidserver/init.py
 msgid "Path to the Android SDK (sometimes set in ANDROID_HOME)"
 msgstr "Android SDK konumu (bazen ANDROID_HOME'da ayarlıdır)"
@@ -1378,19 +1375,21 @@ msgstr "Günlük olarak kullanılacak git deposunun konumu"
 msgid "Path to the keystore for the repo signing key"
 msgstr "Depo imzalama anahtarı için anahtar deposunun konumu"
 
+#: ../fdroidserver/dscanner.py
+msgid "Prepare Drozer to run a scan"
+msgstr "Drozer'i bir tarama çalıştırmak için hazırla"
+
+msgid "Prepare drozer to run a scan"
+msgstr "Drozer'i bir tarama çalıştırmak için hazırla"
+
 #: ../fdroidserver/nightly.py
 msgid "Print the secret variable to the terminal for easy copy/paste"
 msgstr "Kolay kopyala yapıştır için gizli değişkeni terminale yaz"
 
-#: ../fdroidserver/install.py
+#: ../fdroidserver/metadata.py
 #, python-brace-format
-msgid "Privacy mode was enabled based on your locale ({country_code})."
-msgstr "Yerel ayarınız ({country_code}) baz alınarak gizlilik kipi etkinleştirildi."
-
-#: ../fdroidserver/scanner.py
-#, python-format
-msgid "Problem with ZIP file: %s, error %s"
-msgstr "ZIP dosyası ile ilgili sorun: %s, hata %s"
+msgid "Problem with description of {appid}: {error}"
+msgstr "{appid} açıklamasıyla ilgili sorun: {error}"
 
 #: ../fdroidserver/common.py
 #, python-brace-format
@@ -1415,7 +1414,11 @@ msgstr "{appid} işleniyor"
 msgid "Produce human-readable XML/JSON for index files"
 msgstr "İndeks dosyaları için okunabilir XML/JSON üret"
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/update.py
+msgid "Produce human-readable index.xml"
+msgstr "Okunabilir index.xml üret"
+
+#: ../fdroidserver/import.py
 msgid "Project URL to import from."
 msgstr "İçe aktarma için proje URL'si."
 
@@ -1427,25 +1430,21 @@ msgstr "Noktalama işaretlerinden kaçınılmalı"
 msgid "Push the log to this git remote repository"
 msgstr "Günlüğü bu git uzak deposuna it"
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Pushing binary transparency log to {url}"
 msgstr "İkili şeffaflık günlüğü {url} konumuna gönderiliyor"
 
-#: ../fdroidserver/deploy.py
-msgid "Pushing to remote server failed!"
-msgstr "Uzak sunucuya gönderme başarısız oldu!"
-
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Pushing to {url}"
 msgstr "{url} adresine itiliyor"
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Quickly start a new repository"
 msgstr "Hızlıca yeni bir depo başlat"
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Read all the metadata files and exit"
 msgstr "Tüm üst veri dosyalarını oku ve çık"
 
@@ -1456,12 +1455,14 @@ msgstr "'{config_file}' okunuyor"
 
 #: ../fdroidserver/common.py
 #, python-brace-format
-msgid "Reading packageName/versionCode/versionName failed, APK invalid: '{apkfilename}'"
-msgstr "packageName/versionCode/versionName okuma başarısız, APK geçersiz: '{apkfilename}'"
+msgid "Reading minSdkVersion failed: \"{apkfilename}\""
+msgstr "minSdkVersion okuma başarısız: \"{apkfilename}\""
 
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
+#. https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
 #: ../fdroidserver/common.py
 #, python-brace-format
-msgid "Reading packageName/versionCode/versionName failed,APK invalid: '{apkfilename}'"
+msgid "Reading packageName/versionCode/versionName failed, APK invalid: '{apkfilename}'"
 msgstr "packageName/versionCode/versionName okuma başarısız, APK geçersiz: '{apkfilename}'"
 
 #: ../fdroidserver/update.py
@@ -1469,36 +1470,25 @@ msgstr "packageName/versionCode/versionName okuma başarısız, APK geçersiz: '
 msgid "Reading {apkfilename} from cache"
 msgstr "{apkfilename} önbellekten okunuyor"
 
-#: ../fdroidserver/build.py
-msgid "Refresh and cache scanner rules and signatures from the network"
-msgstr "Tarayıcı kurallarını ve imzalarını ağdan yenile ve önbelleğe al"
-
-#: ../fdroidserver/publish.py
-#, python-brace-format
-msgid "Refusing to sign '{path}', file exists in both {dir1} and {dir2} folder."
-msgstr "'{path}' imzalanması reddedildi, dosya hem {dir1} hem de {dir2} dizininde yer alıyor."
-
-#: ../fdroidserver/verify.py
-msgid "Remove source tarball and any APKs if successfully verified."
-msgstr "Başarıyla doğrulanmışsa, kaynak sıkıştırılmış dosyayı ve var olan bütün APK'ları kaldır."
+#: ../fdroidserver/stats.py
+msgid "Recalculate aggregate stats - use when changes have been made that would invalidate old cached data."
+msgstr "Toplam istatistikleri yeniden hesapla - eski önbelleklenen veriyi geçersiz kılacak değişiklikler yapıldığında kullan."
 
 #: ../fdroidserver/common.py
 msgid "Removing specified files"
 msgstr "Belirtilen dosyalar kaldırılıyor"
 
 #: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Removing {path}\""
-msgstr "\"{path}\" kaldırılıyor"
+msgid "Rename APK files that do not match package.name_123.apk"
+msgstr "paket.ad_123.apk ile eşleşmeyen tüm APK dosyalarını yeniden adlandır"
 
 #: ../fdroidserver/update.py
-msgid "Rename APK files that do not match package.name_123.apk"
-msgstr "paket.adı_123.apk örüntüsüyle eşleşmeyen tüm APK dosyalarını yeniden adlandır"
+msgid "Report on build data status"
+msgstr "İnşa veri durumunu bildir"
 
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "RepoType {type} is deprecated, please switch to git."
-msgstr ""
+#: ../fdroidserver/build.py
+msgid "Reset and create a brand new build server, even if the existing one appears to be ok."
+msgstr "Sıfırla ve yeni bir inşa sunucusu yarat, var olan iyi görünüyor olsa bile."
 
 #: ../fdroidserver/nightly.py
 #, python-brace-format
@@ -1513,34 +1503,33 @@ msgstr "Piksel boyut sınırını aşan tüm simgeleri yeniden boyutlandır ve 
 msgid "Restrict output to warnings and errors"
 msgstr "Çıkışı uyarılara ve hatalara kısıtla"
 
-#: ../fdroidserver/net.py
-#, python-format
-msgid "Retrying failed download: %s"
-msgstr "Başarısız indirme tekrar deneniyor: %s"
-
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Rewrite all the metadata files"
 msgstr "Tüm üst veri dosyalarını yeniden yaz"
 
+#: ../fdroidserver/rewritemeta.py
+msgid "Rewrite to a specific format: "
+msgstr "Belirli bir biçimde yeniden yaz: "
+
 #: ../fdroidserver/rewritemeta.py
 #, python-brace-format
 msgid "Rewriting '{appid}'"
 msgstr "'{appid}' yeniden yazılıyor"
 
+#: ../fdroidserver/rewritemeta.py
+#, python-brace-format
+msgid "Rewriting '{appid}' to '{path}'"
+msgstr "'{appid}' '{path}' konumuna yeniden yazılıyor"
+
 #: ../fdroidserver/checkupdates.py
 msgid "Run on git repo that has uncommitted changes"
 msgstr "Değişiklikleri olmayan git repo üzerinde çalış"
 
-#: ../fdroidserver/nightly.py
-#, python-brace-format
-msgid "Run over {cibase} to find -debug.apk. and skip repo_basedir {repo_basedir}"
-msgstr "-debug.apk'yı bulmak için {cibase} üzerinden çalıştırın ve {repo_basedir} repo_basedir'i atlayın"
-
 #: ../fdroidserver/lint.py
 msgid "Run rewritemeta to fix formatting"
 msgstr "Biçimlemeyi düzeltmek için rewritemeta çalıştır"
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 msgid "Running first pass with MD5 checking disabled"
 msgstr "İlk geçiş MD5 doğrulama olmadan çalıştırılıyor"
 
@@ -1549,24 +1538,18 @@ msgstr "İlk geçiş MD5 doğrulama olmadan çalıştırılıyor"
 msgid "Running wget in {path}"
 msgstr "{path} konumunda wget çalıştırılıyor"
 
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "SHA-256 of {url} does not match entry!"
-msgstr "{url}'nin SHA-256'sı girişle eşleşmiyor!"
+#: ../fdroidserver/dscanner.py
+msgid "Scan only the latest version of each package"
+msgstr "Her paketin sadece en son sürümünü tara"
 
 #: ../fdroidserver/build.py
 msgid "Scan the resulting APK(s) for known non-free classes."
 msgstr "Bilinen özgür olmayan sınıflar için ortaya çıkan APK'leri tara."
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Scan the source code of a package"
 msgstr "Bir paketin kaynak kodunu tara"
 
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Scanner found {count} problems in {apk}"
-msgstr "Tarayıcı {apk} içinde {count} sorun buldu"
-
 #: ../fdroidserver/scanner.py
 #, python-brace-format
 msgid "Scanner found {count} problems in {appid}:"
@@ -1583,19 +1566,6 @@ msgid_plural "Scanner found {} problems"
 msgstr[0] "Tarayıcı {} sorun buldu"
 msgstr[1] "Tarayıcı {} sorun buldu"
 
-#: ../fdroidserver/scanner.py
-msgid "Scanning APK for extra signing blocks."
-msgstr "APK'daki ekstra imzalama blokları taranıyor."
-
-#: ../fdroidserver/scanner.py
-msgid "Scanning APK with dexdump for known non-free classes."
-msgstr "Bilinen özgür olmayan sınıflar için dexdump ile APK taranıyor."
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Set NDK {release} ({version}) up"
-msgstr "NDK {release} ({version}) kuruldu"
-
 #: ../fdroidserver/common.py
 msgid "Set clock to that time using:"
 msgstr "Saati o zamana şunu kullanarak ayarla:"
@@ -1609,7 +1579,7 @@ msgstr "Eskileri arşivlenmeden önce depodaki en yüksek sürümleri ayarla"
 msgid "Set open file limit to {integer}"
 msgstr "Açık dosya sınırını {integer} olarak ayarla"
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Set up an app build for a nightly build repo"
 msgstr "Gecelik bir inşa deposu için bir uygulama inşası kurun"
 
@@ -1622,11 +1592,18 @@ msgstr "Açık dosya sınırı ayarı başarısız: "
 msgid "Setting {0} sec timeout for this build"
 msgstr "Bu inşa için {0} sn zaman aşımı ayarlanıyor"
 
-#: ../fdroidserver/__main__.py
+#: ../fdroidserver/build.py
+msgid "Setup an emulator, install the APK on it and perform a Drozer scan"
+msgstr "Bir emülatör kur, APKyı ona kur ve bir Drozer taraması yap"
+
+msgid "Setup an emulator, install the apk on it and perform a drozer scan"
+msgstr "Bir emülatör kur, APKyı ona kur ve bir Drozer taraması yap"
+
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Sign and place packages in the repo"
 msgstr "Paketleri imzala ve depoya yerleştir"
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Sign indexes created using update --nosign"
 msgstr "update --nosign ile yaratılan indeksleri imzala"
 
@@ -1639,11 +1616,6 @@ msgstr "Kaynak kodu, çalıştırılabilir dosyalar ve diğer sorunlar için tar
 msgid "Skipping '{apkfilename}' with invalid signature!"
 msgstr "Geçersiz imzalı '{apkfilename}' atlanıyor!"
 
-#: ../fdroidserver/deploy.py ../fdroidserver/index.py
-#, python-format
-msgid "Skipping GitLab Pages mirror because the repo is too large (>%.2fGB)!"
-msgstr "Depo çok büyük olduğundan (>%.2fGB) GitLab Sayfaları yansısı atlanıyor!"
-
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Skipping index generation for {appid}"
@@ -1659,14 +1631,23 @@ msgstr "Geçersiz imzalı {apkfilename} atlanıyor!"
 msgid "Skipping {appid}: disabled"
 msgstr "{appid} atlanıyor: devre dışı"
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/scanner.py
+#, python-brace-format
+msgid "Skipping {appid}: no builds specified"
+msgstr "{appid} atlanıyor: belirtilmiş inşa yok"
+
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 msgid "Specify a local folder to sync the repo to"
 msgstr "Deponun eşleneceği yerel bir klasör belirtin"
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 msgid "Specify an identity file to provide to SSH for rsyncing"
 msgstr "Rsync için SSH'a sağlanacak bir kimlik dosyası belirtin"
 
+#: ../fdroidserver/build.py
+msgid "Specify that we're running on the build server"
+msgstr "İnşa sunucusunda çalıştığımızı belirtin"
+
 #: ../fdroidserver/nightly.py
 msgid "Specify which debug keystore file to use."
 msgstr "Kullanılacak hata ayıklama anahtar deposu dosyasını belirtin."
@@ -1675,6 +1656,11 @@ msgstr "Kullanılacak hata ayıklama anahtar deposu dosyasını belirtin."
 msgid "Spew out even more information than normal"
 msgstr "Olağandan daha da çok bilgi çıkart"
 
+#: ../fdroidserver/nightly.py
+#, python-brace-format
+msgid "Striping mystery signature from {apkfilename}"
+msgstr "Gizemli imza {apkfilename} dosyasından kaldırılıyor"
+
 #: ../fdroidserver/nightly.py
 #, python-brace-format
 msgid "Stripping mystery signature from {apkfilename}"
@@ -1695,22 +1681,10 @@ msgstr "{length} uzunluğundaki özet, {limit} karakter sınırının üstünde"
 msgid "System clock is older than date in {path}!"
 msgstr "Sistem saati {path} konumundaki tarihten daha eski!"
 
-#: ../fdroidserver/checkupdates.py
-msgid "Tags update mode only works for git, hg, bzr and git-svn repositories currently"
-msgstr "Etiket güncelleme modu şu anda yalnızca git, hg, bzr ve git-svn depoları için çalışıyor"
-
-#: ../fdroidserver/checkupdates.py
-msgid "Tags update mode used in git-svn, but the repo was not set up with tags"
-msgstr "git-svn'de etiket güncelleme modu kullanıldı, ancak depo etiketlerle ayarlanmadı"
-
 #: ../fdroidserver/build.py
 msgid "Test mode - put output in the tmp directory only, and always build, even if the output already exists."
 msgstr "Sınama kipi - çıkışı sadece tmp dizinine koy, ve her zaman inşa et, çıkış zaten var olsa bile."
 
-#: ../fdroidserver/index.py
-msgid "The \"qrcode\" Python package is not installed (e.g. apt-get install python3-qrcode)!"
-msgstr "\"qrcode\" Python paketi kurulu değil (yüklemek için: apt-get install python3-qrcode)!"
-
 #. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
 #: ../fdroidserver/update.py
 #, python-brace-format
@@ -1729,10 +1703,18 @@ msgstr "Yansımanın yazılacağı dizin"
 msgid "The file to be included in the repo (path or glob)"
 msgstr "Repo'ya dahil edilecek dosya (yol veya glob)"
 
+#: ../fdroidserver/deploy.py
+msgid "The only commands currently supported are 'init' and 'update'"
+msgstr "Şu anda desteklenen komutlar sadece 'init' ve 'update'"
+
 #: ../fdroidserver/index.py
 msgid "The repository's fingerprint does not match."
 msgstr "Deponun parmak izi eşleşmiyor."
 
+#: ../fdroidserver/common.py
+msgid "The repository's index could not be verified."
+msgstr "Deponun indeksi doğrulanamıyor."
+
 #: ../fdroidserver/deploy.py
 #, python-brace-format
 msgid "The root dir for local_copy_dir \"{path}\" does not exist!"
@@ -1746,45 +1728,14 @@ msgstr "Bir keyalias çakışması var - yayımlama durdu"
 msgid "These are the apps that have been archived from the main repo."
 msgstr "Bunlar ana depodan arşivlenmiş uygulamalardır."
 
-#: ../fdroidserver/mirror.py
-msgid "This command should never be used to mirror f-droid.org! A full copy requires more than 600GB."
-msgstr "Bu komut asla f-droid.org'u yansıtmak için kullanılmamalıdır! Tam bir kopya 600GB'tan çok yer gerektirir."
-
-#: ../fdroidserver/common.py
-msgid "This is a repository of apps to be used with F-Droid. Applications in this repository are either official binaries built by the original application developers, or are binaries built from source by the admin of f-droid.org using the tools on https://gitlab.com/fdroid."
-msgstr "Bu, F-Droid ile kullanılacak uygulamaların bir deposudur. Bu depodaki uygulamalar ya gerçek uygulama geliştiricileri tarafından oluşturulan resmi ikili dosyalardır ya da https://gitlab.com/fdroid adresindeki araçlar kullanılarak f-droid.org yöneticisi tarafından kaynaktan oluşturulan ikili dosyalardır."
-
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 #, python-format
 msgid "This repo already has local metadata: %s"
 msgstr "Bu deponun zaten yerel üst verisi var: %s"
 
-#: ../fdroidserver/init.py
-#, python-format
-msgid ""
-"To complete the setup, add your APKs to \"%s\"\n"
-"then run \"fdroid update -c; fdroid update\".  You might also want to edit\n"
-"\"config.yml\" to set the URL, repo name, and more.  You should also set up\n"
-"a signing key (a temporary one might have been automatically generated).\n"
-"\n"
-"For more info: https://f-droid.org/docs/Setup_an_F-Droid_App_Repo\n"
-"and https://f-droid.org/docs/Signing_Process"
-msgstr ""
-"Kurulumu tamamlamak için APK'larınızı \"%s\" içine\n"
-"ekleyin ve ardından \"fdroid update -c; fdroid update\" komutunu çalıştırın.  URL'yi, depo\n"
-"adını ve daha fazlasını ayarlamak için \"config.yml\" dosyasını da düzenlemek isteyebilirsiniz.\n"
-"Ayrıca bir imzalama anahtarı da ayarlamalısınız (geçici bir anahtar otomatik olarak oluşturulmuş olabilir).\n"
-"\n"
-"Daha fazla bilgi için: https://f-droid.org/docs/Setup_an_F-Droid_App_Repo\n"
-"ve https://f-droid.org/docs/Signing_Process"
-
-#: ../fdroidserver/deploy.py
-msgid "To use awsbucket, awssecretkey and awsaccesskeyid must also be set in config.yml!"
-msgstr "Awsbucket kullanmak için, awssecretkey ve awsaccesskeyid de config.yml içinde ayarlanmalı!"
-
-#: ../fdroidserver/deploy.py
-msgid "To use rclone, rclone_config and awsbucket must be set in config.yml!"
-msgstr "rclone kullanmak için, rclone_config ve awsbucket config.yml içinde ayarlanmalı!"
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
+msgid "To use awsbucket, awssecretkey and awsaccesskeyid must also be set in config.py!"
+msgstr "Awsbucket kullanmak için, awssecretkey ve awsaccesskeyid de config.py içinde ayarlanmalı!"
 
 #: ../fdroidserver/lint.py
 msgid "URL must start with https:// or http://"
@@ -1794,6 +1745,10 @@ msgstr "URL https:// veya http:// ile başlamalı"
 msgid "URL shorteners should not be used"
 msgstr "URL kısaltıcılar kullanılmamalı"
 
+#: ../fdroidserver/metadata.py
+msgid "URL title is just the URL, use brackets: [URL]"
+msgstr "URL başlığı yalnızca URL, köşeli ayraç kullanın: [URL]"
+
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "URL {url} in Description: {error}"
@@ -1807,15 +1762,16 @@ msgstr "Beklenmeyen lisans etiketi \"{}\"! Yalnızca https://spdx.org/license-li
 msgid "Unexpected license tag \"{}\"! Only use license tags configured in your config file"
 msgstr "Beklenmeyen lisans etiketi \"{}\"! Yalnızca yapılandırma dosyanızda yapılandırılan lisans etiketlerini kullanın"
 
-#: ../fdroidserver/common.py
+#: ../fdroidserver/metadata.py
 #, python-brace-format
-msgid "Unknown entry {key} in {configname}"
-msgstr "{configname} içinde bilinmeyen girdi {key}"
+msgid "Unexpected text on same line as {field} in {linedesc}"
+msgstr "{linedesc} içinde {field} ile aynı satırda beklenmeyen metin"
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Unknown exception found!"
-msgstr "Bilinmeyen istisna bulundu!"
+msgstr "Bilinmeyen özel durum bulundu!"
 
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "Unknown file '{filename}' in build '{versionName}'"
@@ -1826,6 +1782,11 @@ msgstr "İnşa '{versionName}' içinde bilinmeyen dosya '{filename}'"
 msgid "Unknown metadata format: %s"
 msgstr "Bilinmeyen üst veri biçimi: %s"
 
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Unknown metadata format: {path}"
+msgstr "Bilinmeyen üst veri biçimi: {path}"
+
 #: ../fdroidserver/metadata.py
 #, python-brace-format
 msgid "Unknown metadata format: {path} (use: *.yml)"
@@ -1835,6 +1796,10 @@ msgstr "Bilinmeyen üst veri biçimi: {path} (şunu kullanın: *.yml)"
 msgid "Unknown version of aapt, might cause problems: "
 msgstr "aapt'nin bilinmeyen sürümü, soruna neden olabilir: "
 
+#: ../fdroidserver/lint.py
+msgid "Unlinkified link - use [http://foo.bar Link title] or [http://foo.bar]"
+msgstr "Bağlantı yapılmamış bağlantı - [http://foo.bar Başlık] veya [http://foo.bar] kullanın"
+
 #: ../fdroidserver/lint.py
 msgid "Unnecessary leading space"
 msgstr "Gereksiz ön boşluk"
@@ -1848,12 +1813,20 @@ msgstr "Gereksiz son boşluk"
 msgid "Unrecognised app field '{fieldname}' in '{path}'"
 msgstr "'{path}'deki tanınmayan uygulama alanı '{fieldname}'"
 
+#: ../fdroidserver/metadata.py
+msgid "Unrecognised app field: "
+msgstr "Tanınmayan uygulama alanı: "
+
 #: ../fdroidserver/metadata.py
 #, python-brace-format
 msgid "Unrecognised build flag '{build_flag}' in '{path}'"
 msgstr "'{path}'de tanınmayan yapı bayrağı '{build_flag}'"
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Unrecognised field '{field}' in {linedesc}"
+msgstr "{linedesc} içinde tanınmayan alan '{field}'"
+
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Unsupported file type \"{extension}\" for repo graphic"
@@ -1864,6 +1837,29 @@ msgstr "Depo grafiği için desteklenmeyen dosya türü \"{extension}\""
 msgid "Unsupported graphics file found: {path}"
 msgstr "Desteklenmeyen grafik dosyası bulundu: {path}"
 
+#: ../fdroidserver/rewritemeta.py
+#, python-brace-format
+msgid "Unsupported metadata format, use: --to [{supported}]"
+msgstr "Desteklenmeyen üst veri biçimi, --to [{supported}] kullanın"
+
+#: ../fdroidserver/metadata.py
+msgid "Unterminated ]"
+msgstr "Sonlandırılmamış ]"
+
+#: ../fdroidserver/metadata.py
+msgid "Unterminated ]]"
+msgstr "Sonlandırılmamış ]]"
+
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Unterminated build in {name}"
+msgstr "{name} içinde sonlandırılmamış inşa"
+
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Unterminated continuation in {name}"
+msgstr "{name} içinde sonlandırılmamış devam"
+
 #: ../fdroidserver/lint.py
 #, python-format
 msgid "Unused extlib at %s"
@@ -1884,25 +1880,27 @@ msgstr "Kullanılmayan scandelete yolu: %s"
 msgid "Unused scanignore path: %s"
 msgstr "Kullanılmayan scanignore yolu: %s"
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Update repo information for new packages"
 msgstr "Yeni paketler için depo bilgisini güncelle"
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Update the binary transparency log for a URL"
 msgstr "Bir URL için çalıştırılabilir şeffaflık günlüğünü güncelle"
 
+#: ../fdroid ../fdroidserver/__main__.py
+msgid "Update the stats of the repo"
+msgstr "Depo istatistikleri güncelleştir"
+
+#: ../fdroidserver/update.py ../fdroidserver/build.py
+msgid "Update the wiki"
+msgstr "Viki'yi güncelle"
+
 #: ../fdroidserver/checkupdates.py
 #, python-brace-format
 msgid "UpdateCheckData has invalid URL: {url}"
 msgstr "UpdateCheckData geçersiz URL'ye sahip: {url}"
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "UpdateCheckData must match the version code as integer (\\d or [0-9]): {codeex}"
-msgstr "UpdateCheckData tam sayı olarak sürüm koduyla eşleşmelidir (\\d veya [0-9]): {codeex}"
-
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "UpdateCheckData must use HTTPS URL: {url}"
@@ -1914,10 +1912,14 @@ msgid "UpdateCheckData not a valid URL: {url}"
 msgstr "UpdateCheckData geçerli bir URL değil: {url}"
 
 #: ../fdroidserver/lint.py
-msgid "UpdateCheckMode is set but it looks like checkupdates hasn't been run yet."
-msgstr "UpdateCheckMode ayarlı ancak checkupdates henüz çalıştırılmamış gibi görünüyor."
+msgid "UpdateCheckMode is set but it looks like checkupdates hasn't been run yet"
+msgstr "UpdateCheckMode ayarlı ancak checkupdates henüz çalıştırılmamış gibi görünüyor"
+
+#. Translators: https://developer.android.com/studio/build/application-id
+#: ../fdroidserver/lint.py
+msgid "UpdateCheckName is set to the known application ID - it can be removed"
+msgstr "UpdateCheckName bilinen uygulama kimliğine ayarlı - kaldırılabilir"
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
 #: ../fdroidserver/lint.py
 msgid "UpdateCheckName is set to the known application ID, it can be removed"
 msgstr "UpdateCheckName bilinen uygulama kimliğine ayarlı - kaldırılabilir"
@@ -1932,9 +1934,20 @@ msgstr "{apkfilename}, androidobservatory.org'a yükleniyor"
 msgid "Uploading {apkfilename} to virustotal"
 msgstr "{apkfilename} virustotal'e yükleniyor"
 
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "Usage"
+msgstr "Kullanım"
+
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, python-format
+msgid "Usage: %s\n"
+msgstr "Kullanım: %s\n"
+
 #: ../fdroidserver/lint.py
-msgid "Use /HEAD instead of /master or /main to point at a file in the default branch"
-msgstr "Öntanımlı daldaki bir dosyaya işaret etmek için /master veya /main yerine /HEAD kullanın"
+msgid "Use /HEAD instead of /master to point at a file in the default branch"
+msgstr "Öntanımlı daldaki bir dosyaya işaret etmek için /master yerine /HEAD kullanın"
 
 #: ../fdroidserver/update.py
 msgid "Use `fdroid update -c` to create it."
@@ -1948,16 +1961,14 @@ msgstr "İnşa sunucusu kullan"
 msgid "Use date from APK instead of current time for newly added APKs"
 msgstr "Yeni eklenen APKlar için o anki zaman yerine APK'daki tarihi kullan"
 
-#: ../fdroidserver/deploy.py
+msgid "Use date from apk instead of current time for newly added apks"
+msgstr "Yeni eklenen APKlar için o anki zaman yerine APK tarihini kullan"
+
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Using \"{path}\" for configuring s3cmd."
 msgstr "s3cmd yapılandırması için \"{path}\" kullanılıyor."
 
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Using \"{path}\" for syncing with remote storage."
-msgstr "Uzak depolama ile eşitlemek için \"{path}\" kullanılıyor."
-
 #: ../fdroidserver/common.py
 msgid "Using APK Signature v2"
 msgstr "APK İmza v2 kullanılıyor"
@@ -1966,35 +1977,26 @@ msgstr "APK İmza v2 kullanılıyor"
 msgid "Using APK Signature v3"
 msgstr "APK İmza v3 kullanılıyor"
 
-#: ../fdroidserver/common.py
-msgid "Using JAR Signature"
-msgstr "JAR İmza kullanılıyor"
-
 #: ../fdroidserver/common.py
 msgid "Using Java's jarsigner, not recommended for verifying APKs! Use apksigner"
 msgstr "Java'nın jarsigner'ı kullanılıyor, APK'ları doğrulamak için önerilmez! apksigner'ı kullanın"
 
-#: ../fdroidserver/metadata.py
+#: ../fdroidserver/common.py
 #, python-brace-format
-msgid "Using blank dictionary instead of contents of {path}!"
-msgstr "{path} içeriği yerine boş sözlük kullanılıyor!"
+msgid "Using androguard from \"{path}\""
+msgstr "\"{path}\" adresinden androguard'ı kullanıyor"
 
 #: ../fdroidserver/init.py
 #, python-brace-format
 msgid "Using existing keystore \"{path}\""
 msgstr "Var olan anahtar deposu \"{path}\" kullanılıyor"
 
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Using rclone to sync with: {url}"
-msgstr "{url} ile eşitleme için rclone kullanılıyor"
-
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Using s3cmd to sync with: {url}"
 msgstr "{url} ile eşitleme için s3cmd kullanılıyor"
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Valid commands are:"
 msgstr "Geçerli komutlar:"
 
@@ -2002,7 +2004,7 @@ msgstr "Geçerli komutlar:"
 msgid "Verify against locally cached copy rather than redownloading."
 msgstr "Yeniden yükleme yerine yerel olarak önbelleğe alınmış kopyaya karşı doğrulayın."
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Verify the integrity of downloaded packages"
 msgstr "İndirilen paketlerin bütünlüğünü doğrula"
 
@@ -2010,28 +2012,15 @@ msgstr "İndirilen paketlerin bütünlüğünü doğrula"
 msgid "Verifying index signature:"
 msgstr "İndeks imzası doğrulanıyor:"
 
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "Verifying package {path} with apksigner."
-msgstr "{path} paketi apksigner ile doğrulanıyor."
-
 #: ../fdroidserver/deploy.py
 #, python-brace-format
 msgid "VirusTotal API key cannot upload files larger than 32MB, use {url} to upload {path}."
 msgstr "VirusTotal API anahtarı 32MB'den büyük dosyaları yükleyemiyor, {path} yüklemek için {url} kullanın."
 
-#: ../fdroidserver/nightly.py
-msgid "WARNING: only public git repos are supported!"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Warn about possible metadata errors"
 msgstr "Olası üst veri hataları hakkında uyar"
 
-#: ../fdroidserver/scanner.py
-msgid "WebAssembly binary file"
-msgstr "WebAssembly ikilik dosyası"
-
 #: ../fdroidserver/update.py
 msgid "When configured for signed indexes, create only unsigned indexes at this stage"
 msgstr "İmzalı indeksler için yapılandırıldığında, bu aşamada sadece imzasız indeksleri yarat"
@@ -2040,17 +2029,8 @@ msgstr "İmzalı indeksler için yapılandırıldığında, bu aşamada sadece i
 msgid "When linting the entire repository yamllint is disabled by default. This option forces yamllint regardless."
 msgstr "Tüm depo denetlenirken yamllint öntanımlı olarak devre dışı bırakılır. Bu seçenek, yamllint kullanımını ne olursa olsun zorlar."
 
-#: ../fdroidserver/publish.py
-msgid "When signing or verifying fails, exit with an error code."
-msgstr "İmzalama veya doğrulama başarısız olduğunda, bir hata koduyla çık."
-
-#: ../fdroidserver/install.py
-msgid "Would you like to download and install F-Droid.apk via adb? (YES/no)"
-msgstr "F-Droid.apk'nın adb aracılığıyla indirilmesini ve yüklenmesini ister misiniz? (EVET/hayır)"
-
-#: ../fdroidserver/install.py
-msgid "Would you like to download the app(s) from f-droid.org? (YES/no)"
-msgstr "Uygulamaları f-droid.org adresinden indirmek ister misiniz? (EVET/hayır)"
+msgid "X.509 'Distiguished Name' used when generating keys"
+msgstr "Anahtarlar üretilirken X.509 'Distinguished Name' kullanılır"
 
 #: ../fdroidserver/init.py
 msgid "X.509 'Distinguished Name' used when generating keys"
@@ -2064,11 +2044,6 @@ msgstr "SDK'nızın konumunu ayarlamak için ANDROID_HOME'u kullanabilirsiniz:"
 msgid "ZIP file archive"
 msgstr "ZIP dosya arşivi"
 
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "adb reports {serial} is \"{status}\"!"
-msgstr "adb {serial} için {status} durumunu veriyor!"
-
 #: ../fdroidserver/nightly.py
 #, python-brace-format
 msgid "adding IdentityFile to {path}"
@@ -2079,78 +2054,84 @@ msgstr "IdentityFile {path} konumuna ekleniyor"
 msgid "adding to {name}: {path}"
 msgstr "{name} adına ekleniyor: {path}"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "ambiguous option: %(option)s could match %(matches)s"
 msgstr "belirsiz şeçenek: %(option)s ile %(matches)s eşleşebilir"
 
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "apksigner in build-tools;{version} passes APKs with invalid v3 signatures, ignoring."
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "apksigner not found! Cannot sign or verify modern APKs"
-msgstr "apksigner bulunamadı! Modern APK'lar imzalanamıyor veya doğrulanamıyor"
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, python-format
+msgid "ambiguous option: %s (%s?)"
+msgstr "belirsiz şeçenek: %s (%s?)"
 
 #: ../fdroidserver/common.py
 msgid "apksigner not found, it's required for signing!"
 msgstr "apksigner bulunamadı, imzalamak için gereklidir!"
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/checkupdates.py ../fdroidserver/lint.py
-#: ../fdroidserver/rewritemeta.py
+#: ../fdroidserver/lint.py ../fdroidserver/rewritemeta.py
+#: ../fdroidserver/checkupdates.py
 msgid "application ID of file to operate on"
 msgstr "üzerinde işlem yapılacak dosyanın uygulama kimliği"
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/build.py ../fdroidserver/install.py
-#: ../fdroidserver/publish.py ../fdroidserver/scanner.py
-#: ../fdroidserver/verify.py
+#: ../fdroidserver/verify.py ../fdroidserver/publish.py
+#: ../fdroidserver/build.py ../fdroidserver/scanner.py
+#: ../fdroidserver/install.py
 msgid "application ID with optional versionCode in the form APPID[:VERCODE]"
 msgstr "UYGULAMA_KİMLİĞİ[:SÜRÜM_KODU] biçiminde isteğe bağlı versionCode ile uygulama kimliği"
 
-#: ../fdroidserver/common.py
-msgid "archive_url needs to end with /archive"
-msgstr "archive_url'nin /archive ile bitmesi gerekiyor"
+#: ../fdroidserver/lint.py ../fdroidserver/rewritemeta.py
+msgid "applicationId in the form APPID"
+msgstr "APPID biçiminde applicationId"
 
-#: /usr/lib/python3.11/argparse.py
+#: ../fdroidserver/checkupdates.py
+msgid "applicationId to check for updates"
+msgstr "Güncellemeleri denetlemek için applicationId"
+
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
+#: ../fdroidserver/verify.py ../fdroidserver/publish.py
+#: ../fdroidserver/dscanner.py ../fdroidserver/build.py
+#: ../fdroidserver/scanner.py ../fdroidserver/install.py
+msgid "applicationId with optional versionCode in the form APPID[:VERCODE]"
+msgstr "APPID[:VERCODE] biçiminde applicationId, isteğe bağlı versionCode ile"
+
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "argument \"-\" with mode %r"
 msgstr "%r kipiyle \"-\" argümanı"
 
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "argument %(argument_name)s: %(message)s"
-msgstr "argüman %(argument_name)s: %(message)s"
-
 #: ../fdroidserver/nightly.py
 msgid "attempting bare SSH connection to test deploy key:"
 msgstr "Dağıtım anahtarını sınamak için çıplak SSH bağlantısı deneniyor:"
 
+#: ../fdroidserver/nightly.py
+msgid "attempting bare ssh connection to test deploy key:"
+msgstr "Dağıtım anahtarını sınamak için çıplak ssh bağlantısı deneniyor:"
+
 #: ../fdroidserver/common.py
 msgid "can not parse scrlib spec (not a string): '{}'"
 msgstr "scrlib belirtimi ayrıştırılamıyor (bir dizge değil): '{}'"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
-msgid "can't open '%(filename)s': %(error)s"
-msgstr "'%(filename)s' açılamıyor: %(error)s"
-
-#: ../fdroidserver/scanner.py
-msgid "can't open non-https url: '{};"
-msgstr "https olmayan url açılamıyor: '{};"
+msgid "can't open '%s': %s"
+msgstr "'%s' açılamıyor: %s"
 
 #: ../fdroidserver/build.py
 #, python-brace-format
 msgid "cannot find required srclibs: \"{path}\""
 msgstr "gerekli srclibs bulunamıyor: \"{path}\""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "cannot have multiple subparser arguments"
 msgstr "birden çok alt-ayrıştırıcı argümanı verilemez"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "cannot merge actions - two groups are named %r"
 msgstr "eylemler birleştirilemiyor - %r adlı iki grup"
@@ -2164,107 +2145,119 @@ msgstr "güncelleme yayımlanamıyor, dağıtım anahtarını ayarladınız mı?
 msgid "cloning {url}"
 msgstr "{url} klonlanıyor"
 
+#: ../fdroidserver/deploy.py
+msgid "command to execute, either 'init' or 'update'"
+msgstr "çalıştırılacak komut, 'init' ya da 'update'"
+
 #: ../fdroidserver/__main__.py
 msgid "commands from plugin modules:"
 msgstr "eklenti modüllerinden komutlar:"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "complex"
+msgstr "karmaşık"
+
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "conflicting option string: %s"
 msgid_plural "conflicting option strings: %s"
 msgstr[0] "çakışan seçenek satırı: %s"
 msgstr[1] "çakışan seçenek satırları: %s"
 
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "conflicting subparser alias: %s"
-msgstr "çakışan alt ayrıştırıcı takma adı: %s"
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "conflicting subparser: %s"
-msgstr "çakışan alt ayrıştırıcı: %s"
+#: ../fdroidserver/nightly.py
+#, python-brace-format
+msgid "copying {apkfilename} into {path}"
+msgstr "{apkfilename} {path} içine kopyalanıyor"
 
 #: ../fdroidserver/metadata.py
 #, python-brace-format
 msgid "could not parse '{path}'"
 msgstr "'{path}' ayrıştırılamadı"
 
-#: ../fdroidserver/common.py
-msgid "could not parse srclib spec (no name specified): '{}'"
-msgstr "srclib belirtimi ayrıştırılamadı (ad belirtilmedi): '{}'"
-
 #: ../fdroidserver/common.py
 msgid "could not parse srclib spec (no ref specified): '{}'"
 msgstr "srclib belirtimi ayrıştırılamadı (referans belirtilmedi): '{}'"
 
+#: ../fdroidserver/common.py
+msgid "could not parse srclib spec (too many '@' signs): '{}'"
+msgstr "srclib belirtimi ayrıştırılamadı (çok fazla '@' işareti): '{}'"
+
 #: ../fdroidserver/nightly.py
 #, python-brace-format
 msgid "created {path}"
 msgstr "{path} oluşturuldu"
 
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "current version is newer: old vercode={old}, new vercode={new}"
-msgstr "şu anki sürüm daha yeni: eski sürüm kodu={old}, yeni sürüm kodu={new}"
-
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "deleting: repo/{apkfilename}"
 msgstr "siliniyor: repo/{apkfilename}"
 
-#: ../fdroidserver/scanner.py
-msgid "dependency file without lock"
-msgstr "kilitsiz bağımlılık dosyası"
+#: ../fdroidserver/common.py
+#, python-brace-format
+msgid "deployed build logs to '{path}'"
+msgstr "'{path}' için günlükleri oluşturdu"
 
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "deployed process log {path} to {dest}"
 msgstr "{path} işlem günlüğü {dest}'e dağıtıldı"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "dest= is required for options like %r"
 msgstr "dest= %r gibi seçenekler için gerekli"
 
-#: ../fdroidserver/scanner.py
-msgid "downloading '{}'"
-msgstr "'{}' indiriliyor"
-
-#: ../fdroidserver/scanner.py
-msgid "downloading scanner signatures from '{}' failed"
-msgstr "'{}' tarayıcı imzalarının indirilmesi başarısız oldu"
-
 #: ../fdroidserver/scanner.py
 msgid "executable binary, possibly code"
 msgstr "çalıştırılabilir ikili dosya, muhtemelen kod"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "expected %s argument"
 msgid_plural "expected %s arguments"
 msgstr[0] "beklenen %s argümandı"
 msgstr[1] "beklenen %s argümandı"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "expected at least one argument"
 msgstr "beklenen en az bir argümandı"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "expected at most one argument"
 msgstr "beklenen en çok bir argümandı"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "expected one argument"
 msgstr "beklenen bir argümandı"
 
-#: ../fdroidserver/__main__.py
+#: ../fdroidserver/common.py
+#, python-brace-format
+msgid "failed deploying build logs to '{path}'"
+msgstr "inşa günlükleri '{path}' konumuna konuşlanamadı"
+
+#: ../fdroid
+msgid "fdroid [-h|--help|--version] <command> [<args>]"
+msgstr "fdroid [-h|--help|--version] <komut>[<argümanlar>]"
+
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "fdroid [<command>] [-h|--help|--version|<args>]"
 msgstr "fdroid [<komut>] [-h|--help|--version|<argümanlar>]"
 
-#: ../fdroidserver/scanner.py
-msgid "fetch the latest version of signatures from the web"
-msgstr "imzaların en son sürümünü internetten al"
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "floating-point"
+msgstr "kayan nokta"
+
+#: ../fdroidserver/metadata.py
+msgid "force errors to be warnings, or ignore"
+msgstr "hataları uyarı olmaya zorla veya yok say"
 
 #: ../fdroidserver/metadata.py
 msgid "force metadata errors (default) to be warnings, or to be ignored."
@@ -2278,7 +2271,8 @@ msgstr "git svn clone başarısız"
 msgid "gzip file archive"
 msgstr "gzip dosya arşivi"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "ignored explicit argument %r"
 msgstr "açık argüman %r yok sayıldı"
@@ -2287,39 +2281,35 @@ msgstr "açık argüman %r yok sayıldı"
 msgid "index-v1 must have a signature, use `fdroid signindex` to create it!"
 msgstr "index-v1 bir imzaya sahip olmalı, oluşturmak için `fdroid signindex` kullanın!"
 
-#: ../fdroidserver/index.py
-msgid "index-v2 must have a signature, use `fdroid signindex` to create it!"
-msgstr "index-v2 bir imzaya sahip olmalı, oluşturmak için `fdroid signindex` kullanın!"
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "integer"
+msgstr "tamsayı"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "invalid %(type)s value: %(value)r"
 msgstr "geçersiz %(type)s değeri: %(value)r"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "invalid choice: %(value)r (choose from %(choices)s)"
 msgstr "geçersiz seçim: %(value)r (%(choices)s içinden seçin)"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "invalid conflict_resolution value: %r"
 msgstr "geçersiz conflict_resolution değeri: %r"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "invalid option string %(option)r: must start with a character %(prefix_chars)r"
 msgstr "geçersiz seçenek satırı %(option)r: %(prefix_chars)r karakteri ile başlamalı"
 
-#: ../fdroidserver/common.py
-msgid "ipfs_cid not found, skipping CIDv1 generation"
-msgstr "ipfs_cid bulunamadı, CIDv1 oluşturma atlanıyor"
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "latest build recipe is newer: old vercode={old}, new vercode={new}"
-msgstr "en son yapı tarifi daha yeni: eski sürüm kodu={old}, yeni sürüm kodu={new}"
-
 #: ../fdroidserver/deploy.py
 #, python-brace-format
 msgid "local_copy_dir does not end with \"fdroid\", perhaps you meant: \"{path}\""
@@ -2338,20 +2328,11 @@ msgstr "local_copy_dir bir dizin olmalı, dosya değil!"
 msgid "mirror '%s' does not end with 'fdroid'!"
 msgstr "Yansıma '%s' 'fdroid' ile bitmiyor!"
 
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "mirrors set twice, in config.yml and {path}!"
-msgstr "yansı iki defa ayarlandı, config.yml ve {path} içinde!"
-
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "mutually exclusive arguments must be optional"
 msgstr "birbirinden bağımsız argümanlar isteğe bağlı olmalıdır"
 
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "next {name} cache update due in {time}"
-msgstr "sonraki {name} önbellek güncellemesi {time} içinde"
-
 #: ../fdroidserver/mirror.py
 #, python-brace-format
 msgid "no \"icon\" in {appid}"
@@ -2361,34 +2342,97 @@ msgstr "{appid} içinde simge yok"
 msgid "no APK supplied"
 msgstr "APK sağlanmadı"
 
-#: ../fdroidserver/checkupdates.py
-msgid "no version information found"
-msgstr "sürüm bilgisi bulunamadı"
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, python-format
+msgid "no such option: %s"
+msgstr "böyle bir şeçenek yok: %s"
 
-#: /usr/lib/python3.11/argparse.py
+#: ../fdroid ../fdroidserver/__main__.py
+msgid "no version info found!"
+msgstr "Sürüm bilgisi bulunamadı!"
+
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "not allowed with argument %s"
 msgstr "argüman %s ile izin verilmez"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "one of the arguments %s is required"
 msgstr "%s argümanlarından biri gerekli"
 
-#: ../fdroidserver/common.py ../fdroidserver/index.py
+#: ../fdroidserver/index.py ../fdroidserver/common.py
 msgid "only accepts strings, lists, and tuples"
 msgstr "yalnızca dizgileri, listeleri ve demetleri (tuple) kabul eder"
 
-#: /usr/lib/python3.11/argparse.py
-msgid "options"
-msgstr "seçenekler"
+#: ../fdroidserver/install.py
+#, python-format
+msgid "option %s: If you really want to install all the signed apps, use --all"
+msgstr "seçenek %s: Tüm imzalı uygulamaları gerçekten kurmak istiyorsanız, --all kullanın"
+
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, python-format
+msgid "option %s: invalid %s value: %r"
+msgstr "seçenek %s: geçersiz %s değeri: %r"
+
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, python-format
+msgid "option %s: invalid choice: %r (choose from %s)"
+msgstr "seçenek %s: geçersiz seçim: %r (%s içinden seçin)"
+
+#: /usr/lib/python3.5/getopt.py /usr/lib/python3.6/getopt.py
+#: /usr/lib/python3.7/getopt.py
+#, python-format
+msgid "option -%s not recognized"
+msgstr "seçenek -%s tanınmıyor"
+
+#: /usr/lib/python3.5/getopt.py /usr/lib/python3.6/getopt.py
+#: /usr/lib/python3.7/getopt.py
+#, python-format
+msgid "option -%s requires argument"
+msgstr "şeçenek -%s argüman gerektirir"
+
+#: /usr/lib/python3.5/getopt.py /usr/lib/python3.6/getopt.py
+#: /usr/lib/python3.7/getopt.py
+#, python-format
+msgid "option --%s must not have an argument"
+msgstr "--%s seçeneğinin argümanı olmamalı"
+
+#: /usr/lib/python3.5/getopt.py /usr/lib/python3.6/getopt.py
+#: /usr/lib/python3.7/getopt.py
+#, python-format
+msgid "option --%s not a unique prefix"
+msgstr "--%s seçeneği tekil ön ek değil"
+
+#: /usr/lib/python3.5/getopt.py /usr/lib/python3.6/getopt.py
+#: /usr/lib/python3.7/getopt.py
+#, python-format
+msgid "option --%s not recognized"
+msgstr "seçenek --%s tanınmıyor"
+
+#: /usr/lib/python3.5/getopt.py /usr/lib/python3.6/getopt.py
+#: /usr/lib/python3.7/getopt.py
+#, python-format
+msgid "option --%s requires argument"
+msgstr "--%s seçeneği argüman gerektirir"
+
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
+msgid "optional arguments"
+msgstr "isteğe bağlı argümanlar"
 
 #: ../fdroidserver/nightly.py
 #, python-brace-format
 msgid "overwriting existing {path}"
 msgstr "var olan {path} üzerine yazılıyor"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "positional arguments"
 msgstr "konumsal argümanlar"
 
@@ -2397,53 +2441,42 @@ msgstr "konumsal argümanlar"
 msgid "process log deploy {path} to {dest} failed!"
 msgstr "{path} işlem günlüğünü {dest}'e dağıtma başarısız oldu!"
 
-#: ../fdroidserver/build.py
-msgid "reference binary missing signature"
-msgstr "referans ikili eksik imza"
-
 #: ../fdroidserver/signatures.py
 #, python-brace-format
 msgid "refuse downloading via insecure HTTP connection (use HTTPS or specify --no-https-check): {apkfilename}"
 msgstr "güvensiz HTTP bağlantısı ile indirmeyi reddet (HTTPS kullanın veya --no-https-check belirtin): {apkfilename}"
 
+#: ../fdroidserver/signatures.py
+#, python-brace-format
+msgid "refuse downloading via insecure http connection (use https or specify --no-https-check): {apkfilename}"
+msgstr "güvensiz http bağlantısı ile indirmeyi reddet (https kullanın veya --no-https-check belirtin): {apkfilename}"
+
 #: ../fdroidserver/index.py
 #, python-format
-msgid "repo_icon \"repo/icons/%s\" does not exist, generating placeholder."
-msgstr "repo_icon \"repo/icons/%s\" yok, yer tutucu oluşturuyor."
+msgid "repo_icon %s does not exist, generating placeholder."
+msgstr "repo_icon %s mevcut değil, yer tutucu oluşturuyor."
 
-#: ../fdroidserver/common.py
-msgid "repo_url needs to end with /repo"
-msgstr "repo_url'nin /repo ile bitmesi gerekiyor"
+#: ../fdroidserver/metadata.py
+msgid "ruamel.yaml not installed, can not write metadata."
+msgstr "ruamel.yaml kurulu değil, üst veriler yazılamıyor."
 
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "rsync is missing or broken: {error}"
-msgstr "rsync eksik veya bozuk: {error}"
-
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "s3cmd sync indexes {path} to {url} and delete"
 msgstr "s3cmd sync {path} konumunu {url} adresine indeksler ve siler"
 
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "s3cmd syncs indexes from {path} to {url} and deletes removed"
-msgstr "s3cmd {path} ile {url} arasındaki dizinleri indeksler ve kaldırılanları siler"
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "scanner cache is malformed! You can clear it with: '{clear}'"
-msgstr "tarayıcı önbelleği bozuk! Şu şekilde temizleyebilirsiniz: '{clear}'"
-
-#: ../fdroidserver/deploy.py
-msgid "serverwebroot: path does not end with \"fdroid\", perhaps you meant one of these:"
-msgstr "serverwebroot: yol \"fdroid\" ile sonlanmıyor, belki de bunlardan birini demek istediniz:"
-
 #: ../fdroidserver/scanner.py
 msgid "shared library"
 msgstr "paylaşımlı kütüphane"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "show program's version number and exit"
+msgstr "programın sürüm numarasını göster ve çık"
+
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.5/optparse.py
+#: /usr/lib/python3.6/argparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/argparse.py /usr/lib/python3.7/optparse.py
 msgid "show this help message and exit"
 msgstr "bu yardım yazısını göster ve çık"
 
@@ -2472,31 +2505,31 @@ msgstr "srclibs'de ad ve/veya @ eksik"
 msgid "static library"
 msgstr "statik kütüphane"
 
-#: ../fdroidserver/build.py
+#: ../fdroidserver/common.py
 #, python-brace-format
-msgid "supplied reference binary has allowed signer {signer}"
-msgstr "sağlanan referans ikilisi {signer} imzalayana izin verdi"
+msgid "supplied timestamp value '{timestamp}' is not a unix timestamp"
+msgstr "sağlanan zaman damgası değeri '{timestamp}' bir unix zaman damgası değil"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "the following arguments are required: %s"
 msgstr "şu argümanlar gerekli: %s"
 
-#: ../fdroidserver/install.py
-msgid "true"
-msgstr "doğru"
-
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "unexpected option string: %s"
 msgstr "beklenmeyen seçenek satırı: %s"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "unknown parser %(parser_name)r (choices: %(choices)s)"
 msgstr "bilinmeyen ayrıştırıcı %(parser_name)r (seçenekler: %(choices)s)"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "unrecognized arguments: %s"
 msgstr "tanınmayan argümanlar: %s"
@@ -2506,11 +2539,16 @@ msgstr "tanınmayan argümanlar: %s"
 msgid "unsafe permissions on '{config_file}' (should be 0600)!"
 msgstr "'{config_file}' üzerinde güvenli olmayan izinler (0600 olmalı)!"
 
-#: ../fdroidserver/__main__.py /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py ../fdroid
+#: /usr/lib/python3.7/argparse.py ../fdroidserver/__main__.py
 msgid "usage: "
 msgstr "kullanım: "
 
-#: ../fdroidserver/deploy.py
+#: ../fdroid
+msgid "usage: fdroid [-h|--help|--version] <command> [<args>]"
+msgstr "kullanım: fdroid [-h|--help|--version] <komut>[<argümanlar>]"
+
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "using Apache libcloud to sync with {url}"
 msgstr "{url} ile eşitleme için Apache libcloud kullanılıyor"
@@ -2519,9 +2557,9 @@ msgstr "{url} ile eşitleme için Apache libcloud kullanılıyor"
 msgid "virustotal.com is rate limiting, waiting to retry..."
 msgstr "virustotal.com hızı sınırlıyor, yeniden deneme bekleniyor..."
 
-#: ../fdroidserver/install.py
-msgid "yes"
-msgstr "evet"
+#: ../fdroidserver/update.py
+msgid "wiki support is deprecated and will be removed in the next release!"
+msgstr "wiki desteği kullanımdan kaldırıldı ve bir sonraki sürümde kaldırılacak!"
 
 #: ../fdroidserver/publish.py
 #, python-brace-format
@@ -2535,19 +2573,31 @@ msgstr[1] "{0} uygulama, {1} anahtar adı"
 msgid "{apkfilename} ({appid}) has no metadata!"
 msgstr "{apkfilename}{appid} üst verisi yok!"
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
+#: ../fdroidserver/update.py
+#, python-brace-format
+msgid "{apkfilename} has multiple {name} files, looks like Master Key exploit!"
+msgstr "{apkfilename} içinde birden çok {name} dosyası var, Master Key istisamarı gibi görünüyor!"
+
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "{apkfilename}'s AndroidManifest.xml has a bad date: "
 msgstr "{apkfilename} içindeki AndroidManifest.xml tarihi bozuk: "
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "{appid} does not have a name! Using application ID instead."
 msgstr "{appid} bir ada sahip değil! Bunun yerine uygulama kimliği kullanılıyor."
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
+#: ../fdroidserver/update.py
+#, python-brace-format
+msgid "{appid} does not have a name! Using package name instead."
+msgstr "{appid} adsız! Onun yerine paket adı kullanılıyor."
+
+#: ../fdroidserver/update.py
+#, python-brace-format
+msgid "{appid} from {path} is not a valid Android Package Name!"
+msgstr "{path}'den {appid} geçerli bir Android Paket Adı değil!"
+
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "{appid} from {path} is not a valid Android application ID!"
@@ -2558,16 +2608,12 @@ msgstr "{path}'den {appid} geçerli bir Android uygulama kimliği değil!"
 msgid "{appid} from {path} is not a valid Java Package Name!"
 msgstr "{path}'den {appid} geçerli bir Java Paket Adı değil!"
 
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{appid} has both APKs and files: {files}"
-msgstr "{appid} hem APK hem de dosyalara sahip: {files}"
-
 #: ../fdroidserver/mirror.py
 #, python-brace-format
 msgid "{appid} is missing {name}"
 msgstr "{appid} içinde {name} eksik"
 
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "{appid}: Unknown extlib {path} in build '{versionName}'"
@@ -2595,8 +2641,8 @@ msgstr "{build_flag} bir tam sayı olmalıdır, bulunan: {value}"
 
 #: ../fdroidserver/metadata.py
 #, python-brace-format
-msgid "{build_flag} must be list or string, found: {value}"
-msgstr "{build_flag} liste veya dize olmalıdır, bulunan: {value}"
+msgid "{field} not terminated in {name}"
+msgstr "{field} alanı {name} içinde sonlandırılmamış"
 
 #: ../fdroidserver/metadata.py
 #, python-brace-format
@@ -2605,15 +2651,10 @@ msgstr "{file} boş veya bozuk!"
 
 #: ../fdroidserver/update.py
 #, python-brace-format
-msgid "{name} \"{section}/icons/{path}\" does not exist! Check \"config.yml\"."
-msgstr "{name} \"{section}/icons/{path}\" yok! config.yml içinde düzeltin."
+msgid "{name} \"{path}\" does not exist! Correct it in config.py."
+msgstr "{name} \"{path}\" yok! config.py içinde düzeltin."
 
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{path1} is a duplicate of {path2}, remove one!"
-msgstr "{path1}, {path2} 'in bir kopyasıdır, birini kaldırın!"
-
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 #, python-brace-format
 msgid "{path} already exists, ignoring import results!"
 msgstr "{path} zaten var, içe aktarma sonuçları yok sayılıyor!"
@@ -2626,37 +2667,7 @@ msgstr "{path} yok!  Şunu çalıştırarak oluşturun:"
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "{path} has bad file signature \"{pattern}\", possible Janus exploit!"
-msgstr "{path} konumunun bozuk imzası \"{pattern}\" var, olası Janus istismarı!"
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "{path} has been flagged by virustotal {count} times:"
-msgstr "{path} virustotal tarafından {count} defa işaretlendi:"
-
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "{path} has the wrong fingerprint ({fingerprint})!"
-msgstr "{path} yanlış {fingerprint} parmak izine sahip!"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "{path} is not \"key: value\" dict, but a {datatype}!"
-msgstr "{path} \"anahtar: değer\" sözlüğü değil, ancak {datatype}!"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "{path} is not a standard config file!"
-msgstr "{path} standart bir yapılandırma dosyası değil!"
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "{path} is not list, but a {datatype}!"
-msgstr "{path} liste değil, ancak {datatype}!"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "{path} is not {expected_type}, but a {datatype}!"
-msgstr "{path} {expected_type} değil, ancak {datatype}!"
+msgstr "{path} konumunun bozum imzası \"{pattern}\" var, olası Janus istismarı!"
 
 #: ../fdroidserver/update.py
 #, python-brace-format
@@ -2668,22 +2679,12 @@ msgstr "{path} boyutu sıfır!"
 msgid "{path} more than 200MB, manually upload: {url}"
 msgstr "{path} 200MB'den fazla, elle yükleyin: {url}"
 
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "{path}: \"{code}\" is not a valid ISO_3166-1 alpha-2 country code!"
-msgstr "{path}: \"{code}\" geçerli bir ISO_3166-1 alpha-2 ülke kodu değil!"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{path}: {error}"
-msgstr "{path}: {error}"
-
 #: ../fdroidserver/mirror.py
 #, python-brace-format
 msgid "{url} does not end with \"fdroid\", check the URL path!"
 msgstr "{url} \"fdroid\" ile bitmiyor, URL konumunu doğrulayın!"
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/common.py
 #, python-brace-format
 msgid "{url} does not start with \"http\"!"
 msgstr "{url} \"http\" ile başlamıyor!"
@@ -2699,3 +2700,46 @@ msgid "{} build succeeded"
 msgid_plural "{} builds succeeded"
 msgstr[0] "{} inşa başarılı"
 msgstr[1] "{} inşa başarılı"
+
+#, fuzzy
+#~ msgid "Add PGP signatures for packages in repo using GnuPG"
+#~ msgstr "Depodaki paketler için GPG imzaları ekle"
+
+#~ msgid "Add gpg signatures for packages in repo"
+#~ msgstr "Depodaki paketler için GPG imzaları ekle"
+
+#~ msgid "Android Build Tools path '{path}' does not exist!"
+#~ msgstr "Android Build Tools konumu '{path}' yok!"
+
+#~ msgid "Cannot find a packageName for {path}!"
+#~ msgstr "{path} için bir packageName bulunamıyor!"
+
+#~ msgid "Cannot find an appid for {path}!"
+#~ msgstr "{path} için bir appid bulunamıyor!"
+
+#~ msgid "Clean update - don't uses caches, reprocess all apks"
+#~ msgstr "Temiz güncelleme - önbellekleri kullanmaz, tüm APKları yeniden işler"
+
+#~ msgid "Interactively ask about things that need updating."
+#~ msgstr "Güncelleme gerektiren şeyler hakkında etkileşimli olarak sor."
+
+#~ msgid "Specify editor to use in interactive mode. Default "
+#~ msgstr "Etkileşimli kipte kullanılacak editörü belirtin. Öntanımlı "
+
+#~ msgid "Specify editor to use in interactive mode. Default %s"
+#~ msgstr "Etkileşimli kipte kullanılacak editörü belirtin. Öntanımlı %s"
+
+#~ msgid "Specify editor to use in interactive mode. Default is {path}"
+#~ msgstr "Etkileşimli kipte kullanılacak düzenleyiciyi belirtin. Öntanımlı olan {path}"
+
+#~ msgid "app-id in the form APPID"
+#~ msgstr "APPID biçiminde app-id"
+
+#~ msgid "app-id to check for updates"
+#~ msgstr "Güncellemeleri denetlemek için app-id"
+
+#~ msgid "app-id with optional versionCode in the form APPID[:VERCODE]"
+#~ msgstr "APPID[:VERCODE] biçiminde app-id, isteğe bağlı versionCode ile"
+
+#~ msgid "app-id with optional versioncode in the form APPID[:VERCODE]"
+#~ msgstr "APPID[:VERCODE] biçiminde app-id, isteğe bağlı versioncode ile"
diff --git a/locale/tzm/LC_MESSAGES/fdroidserver.po b/locale/tzm/LC_MESSAGES/fdroidserver.po
index fcfc7527..4b29af0f 100644
--- a/locale/tzm/LC_MESSAGES/fdroidserver.po
+++ b/locale/tzm/LC_MESSAGES/fdroidserver.po
@@ -5,16 +5,31 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fdroidserver 1.1-681-gc19e8952\n"
 "Report-Msgid-Bugs-To: https://gitlab.com/fdroid/fdroidserver/issues\n"
-"POT-Creation-Date: 2025-06-25 09:52+0200\n"
-"PO-Revision-Date: 2020-10-29 08:32+0000\n"
-"Last-Translator: Hakim Oubouali <hakim.oubouali.skr@gmail.com>\n"
-"Language-Team: Central Atlas Tamazight <https://hosted.weblate.org/projects/f-droid/fdroidserver/tzm/>\n"
+"POT-Creation-Date: 2020-10-21 18:05+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
 "Language: tzm\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n >= 2 && (n < 11 || n > 99);\n"
-"X-Generator: Weblate 4.3.2-dev\n"
+
+#: ../fdroidserver/common.py
+msgid ""
+"\n"
+"        This is a repository of apps to be used with FDroid. Applications in this\n"
+"        repository are either official binaries built by the original application\n"
+"        developers, or are binaries built from source by f-droid.org using the\n"
+"        tools on https://gitlab.com/fdroid.\n"
+"        "
+msgstr ""
+
+#: ../fdroidserver/nightly.py
+msgid ""
+"\n"
+"SSH Public Key to be used as Deploy Key:"
+msgstr ""
 
 #: ../fdroidserver/nightly.py
 msgid ""
@@ -34,26 +49,22 @@ msgstr ""
 msgid "\"%s/\" has no matching metadata file!"
 msgstr ""
 
-#: ../fdroidserver/index.py
-msgid "\"isPrimary\" key should not be added to mirrors!"
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "\"local_copy_dir\" {path} does not exist!"
-msgstr ""
-
 #: ../fdroidserver/install.py
 #, python-brace-format
 msgid "\"{apkfilename}\" is already installed on {dev}."
 msgstr ""
 
+#: ../fdroidserver/update.py
+#, python-brace-format
+msgid "\"{path}\" contains outdated {name} ({version})"
+msgstr ""
+
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "\"{path}\" contains recent {name} ({version})"
 msgstr ""
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "\"{path}\" exists but s3cmd is not installed!"
 msgstr ""
@@ -63,24 +74,33 @@ msgstr ""
 msgid "\"{path}\" is not a supported file format (use: metadata/*.yml)"
 msgstr ""
 
-#: ../fdroidserver/update.py
+#: ../fdroidserver/metadata.py
 #, python-brace-format
-msgid "\"{path}\" is signed by a key that is not allowed:"
+msgid "\"{path}\" is not an accepted format, convert to: {formats}"
 msgstr ""
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/common.py
 #, python-brace-format
 msgid "\"{url}\" is not a valid URL!"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, python-format
+msgid "%(option)s option requires %(number)d argument"
+msgid_plural "%(option)s option requires %(number)d arguments"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../fdroidserver/mirror.py
+#, python-format
+msgid "%(prog)s [options] url"
+msgstr ""
+
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "%(prog)s: error: %(message)s\n"
-msgstr "%(prog)s: tazgalt: %(message)s\n"
-
-#: ../fdroidserver/publish.py
-#, python-format
-msgid "%d APKs failed to be signed or verified!"
 msgstr ""
 
 #: ../fdroidserver/scanner.py
@@ -88,52 +108,63 @@ msgstr ""
 msgid "%d problems found"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "%prog [options]"
+msgstr ""
+
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "%r is not callable"
 msgstr ""
 
-#: ../fdroidserver/signindex.py
-#, python-format
-msgid "%s did not produce a dict!"
-msgstr ""
-
-#: ../fdroidserver/signindex.py
-#, python-format
-msgid "%s has bad SHA-256: %s"
-msgstr ""
-
 #: ../fdroidserver/lint.py
 #, python-format
 msgid "%s is not an accepted build field"
 msgstr ""
 
-#: ../fdroidserver/common.py
-msgid "'keypass' not found in config.yml!"
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, python-format
+msgid "%s option does not take a value"
+msgstr ""
+
+#: ../fdroidserver/index.py ../fdroidserver/common.py
+msgid "'keypass' not found in config.py!"
 msgstr ""
 
 #: ../fdroidserver/common.py
 msgid "'keystore' is NONE and 'smartcardoptions' is blank!"
 msgstr ""
 
-#: ../fdroidserver/common.py
-msgid "'keystore' not found in config.yml!"
+#: ../fdroidserver/index.py ../fdroidserver/common.py
+msgid "'keystore' not found in config.py!"
 msgstr ""
 
-#: ../fdroidserver/common.py
-msgid "'keystorepass' not found in config.yml!"
+#: ../fdroidserver/index.py ../fdroidserver/common.py
+msgid "'keystorepass' not found in config.py!"
 msgstr ""
 
-#: ../fdroidserver/common.py
-msgid "'repo_keyalias' not found in config.yml!"
+#: ../fdroidserver/index.py ../fdroidserver/common.py
+msgid "'repo_keyalias' not found in config.py!"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "'required' is an invalid argument for positionals"
 msgstr ""
 
 #: ../fdroidserver/common.py
-msgid "'sdk_path' not set in config.yml!"
+msgid "'sdk_path' not set in 'config.py'!"
+msgstr ""
+
+#. Translators: "build-tools" is the file name of a package from
+#. Google, it is part of the Android SDK. So it probably shouldn't be
+#. translated or transliterated.
+#: ../fdroidserver/common.py
+#, python-brace-format
+msgid "'{aapt}' is too old, fdroid requires build-tools-23.0.0 or newer!"
 msgstr ""
 
 #: ../fdroidserver/common.py
@@ -141,6 +172,21 @@ msgstr ""
 msgid "'{aapt}' is too old, fdroid requires build-tools-{version} or newer!"
 msgstr ""
 
+#: ../fdroidserver/install.py
+#, python-brace-format
+msgid "'{apkfilename}' is already installed on {dev}."
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "'{field}' in {linedesc} is obsolete, see docs for current fields:"
+msgstr ""
+
+#: ../fdroidserver/common.py
+#, python-brace-format
+msgid "'{field}' will be in random order! Use () or [] brackets if order is important!"
+msgstr ""
+
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "'{path}' failed to execute!"
@@ -148,32 +194,23 @@ msgstr ""
 
 #: ../fdroidserver/metadata.py
 #, python-brace-format
-msgid "'{path}' has invalid format, it should be a dictionary!"
-msgstr ""
-
-#: ../fdroidserver/lint.py ../fdroidserver/metadata.py
-#, python-brace-format
 msgid "'{value}' is not a valid {field} in {appid}. Regex pattern: {pattern}"
 msgstr ""
 
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "'{value}' is not a valid {field}, should be {pattern}"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "--merge-request only runs on a single appid!"
-msgstr ""
-
 #: ../fdroidserver/checkupdates.py
 #, python-brace-format
 msgid "...checkupdate failed for {appid} : {error}"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid ".__call__() not defined"
 msgstr ""
 
+#: ../fdroidserver/metadata.py
+msgid ".fdroid.txt is not supported!  Convert to .fdroid.yml or .fdroid.json."
+msgstr ""
+
 #: ../fdroidserver/lint.py
 msgid "/issues is missing"
 msgstr ""
@@ -182,13 +219,12 @@ msgstr ""
 msgid "A URL is required as an argument!"
 msgstr ""
 
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "APK signatures have different certificates in {path}:"
+#: ../fdroid ../fdroidserver/__main__.py
+msgid "Add PGP signatures using GnuPG for packages in repo"
 msgstr ""
 
-#: ../fdroidserver/__main__.py
-msgid "Add PGP signatures using GnuPG for packages in repo"
+#: ../fdroid ../fdroidserver/__main__.py
+msgid "Add a new application from its source code"
 msgstr ""
 
 #: ../fdroidserver/update.py
@@ -208,11 +244,7 @@ msgstr ""
 msgid "Alias of the repo signing key in the keystore"
 msgstr ""
 
-#: ../fdroidserver/build.py
-msgid "AllowedAPKSigningKeys missing but reference binary supplied"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "Allows a different revision (or git branch) to be specified for the initial import"
 msgstr ""
 
@@ -236,9 +268,13 @@ msgstr ""
 msgid "Android DEX code"
 msgstr ""
 
-#: ../fdroidserver/init.py
+#: ../fdroidserver/common.py ../fdroidserver/build.py
 #, python-brace-format
-msgid "Android SDK not found at {path}!"
+msgid "Android SDK '{path}' does not have '{dirname}' installed!"
+msgstr ""
+
+#: ../fdroidserver/common.py
+msgid "Android SDK not found!"
 msgstr ""
 
 #: ../fdroidserver/common.py
@@ -251,17 +287,16 @@ msgstr ""
 msgid "Android SDK path '{path}' is not a directory!"
 msgstr ""
 
+#. Translators: "build-tools" is the file name of a package from
+#. Google, it is part of the Android SDK. So it probably shouldn't be
+#. translated or transliterated.
 #: ../fdroidserver/common.py
 #, python-brace-format
-msgid "Android SDK tool {cmd} not found!"
+msgid "Android build-tools path '{path}' does not exist!"
 msgstr ""
 
-#: ../fdroidserver/lint.py
-msgid "App has Binaries but does not have corresponding AllowedAPKSigningKeys to pin certificate."
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "App has NoSourceSince or ArchivePolicy \"0 versions\" or 0 but AutoUpdateMode or UpdateCheckMode are not None"
+#: ../fdroidserver/update.py
+msgid "AndroidManifest.xml has no date"
 msgstr ""
 
 #: ../fdroidserver/lint.py
@@ -269,10 +304,6 @@ msgstr ""
 msgid "App is in '{repo}' but has a link to {url}"
 msgstr ""
 
-#: ../fdroidserver/lint.py
-msgid "App version has binary but does not have corresponding AllowedAPKSigningKeys to pin certificate."
-msgstr ""
-
 #: ../fdroidserver/lint.py
 msgid "Appending .git is not necessary"
 msgstr ""
@@ -282,27 +313,11 @@ msgstr ""
 msgid "Archiving {apkfilename} with invalid signature!"
 msgstr ""
 
-#: ../fdroidserver/lint.py
-msgid "AutoUpdateMode with UpdateCheckMode: HTTP must have a pattern."
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "Automatic no to all prompts."
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "Automatic yes to all prompts."
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "Bad entry type \"{mirrortype}\" in mirrors config: {mirror}"
-msgstr ""
-
 #: ../fdroidserver/mirror.py
 msgid "Base URL to mirror, can include the index signing key using the query string: ?fingerprint="
 msgstr ""
 
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "Branch '{branch}' used as commit in build '{versionName}'"
@@ -318,7 +333,7 @@ msgstr ""
 msgid "Broken symlink: {path}"
 msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Build a package from source"
 msgstr ""
 
@@ -338,24 +353,31 @@ msgstr ""
 msgid "Build only the latest version of each package"
 msgstr ""
 
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Build should have comma-separated versionName and versionCode, not \"{value}\", in {linedesc}"
+msgstr ""
+
 #: ../fdroidserver/init.py
 #, python-format
 msgid "Built repo based in \"%s\" with this config:"
 msgstr ""
 
-#: ../fdroidserver/checkupdates.py
-msgid "Can't auto-update app with no CurrentVersionCode"
-msgstr ""
-
 #: ../fdroidserver/build.py
 msgid "Can't build due to {} error while scanning"
 msgid_plural "Can't build due to {} errors while scanning"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../fdroidserver/common.py
+#: ../fdroidserver/vmtools.py
 #, python-brace-format
-msgid "Cannot read {path}: {error}"
+msgid "Cannot read \"{path}\"!"
+msgstr ""
+
+#. Translators: https://developer.android.com/studio/build/application-id
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Cannot resolve application ID {appid}"
 msgstr ""
 
 #: ../fdroidserver/rewritemeta.py
@@ -363,23 +385,25 @@ msgstr ""
 msgid "Cannot rewrite \"{path}\""
 msgstr ""
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
+#: ../fdroidserver/rewritemeta.py
+msgid "Cannot use --list and --to at the same time"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Cannot write \"{path}\", not an accepted format, use: {formats}"
+msgstr ""
+
 #: ../fdroidserver/lint.py
 #, python-format
 msgid "Categories '%s' is not valid"
 msgstr ""
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
 #: ../fdroidserver/lint.py
 msgid "Categories are not set"
 msgstr ""
 
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "Category \"{category}\" defined but not used for any apps!"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Check for updates to applications"
 msgstr ""
 
@@ -388,20 +412,28 @@ msgstr ""
 msgid "Checking archiving for {appid} - apks:{integer}, keepversions:{keep}, archapks:{arch}"
 msgstr ""
 
+#: ../fdroidserver/dscanner.py
+msgid "Clean after all scans have finished"
+msgstr ""
+
+#: ../fdroidserver/dscanner.py
+msgid "Clean before the scans start and rebuild the container"
+msgstr ""
+
+#: ../fdroidserver/dscanner.py
+msgid "Clean up all containers and then exit"
+msgstr ""
+
 #: ../fdroidserver/update.py
 msgid "Clean update - don't uses caches, reprocess all APKs"
 msgstr ""
 
-#: ../fdroidserver/common.py
-msgid "Color the log output"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "Comma separated list of categories."
 msgstr ""
 
-#: ../fdroidserver/__main__.py
-#, python-format
+#: ../fdroid ../fdroidserver/__main__.py
+#, c-format, python-format
 msgid "Command '%s' not recognised.\n"
 msgstr ""
 
@@ -409,15 +441,6 @@ msgstr ""
 msgid "Commit changes"
 msgstr ""
 
-#: ../fdroidserver/checkupdates.py
-msgid "Commit changes, push, then make a merge request"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Conflicting \"{field}\" definitions between .yml and localized files:"
-msgstr ""
-
 #: ../fdroidserver/__main__.py
 msgid "Conflicting arguments: '--verbose' and '--quiet' can not be specified at the same time."
 msgstr ""
@@ -427,13 +450,11 @@ msgstr ""
 msgid "Could not find '{command}' on your system"
 msgstr ""
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "Could not find latest version code"
 msgstr ""
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "Could not find latest version name"
 msgstr ""
 
@@ -443,8 +464,7 @@ msgid "Could not find {path} to remove it"
 msgstr ""
 
 #: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Could not open APK {path} for analysis: "
+msgid "Could not open apk file for analysis"
 msgstr ""
 
 #: ../fdroidserver/common.py
@@ -452,16 +472,22 @@ msgstr ""
 msgid "Could not parse size \"{size}\", wrong type \"{type}\""
 msgstr ""
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/import_subcommand.py
+#. Translators: https://developer.android.com/studio/build/application-id
+#: ../fdroidserver/import.py
 msgid "Couldn't find Application ID"
 msgstr ""
 
-#: ../fdroidserver/checkupdates.py
-msgid "Couldn't find any version information"
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
+#: ../fdroidserver/import.py
+msgid "Couldn't find latest version code"
 msgstr ""
 
-#: ../fdroidserver/checkupdates.py
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
+#: ../fdroidserver/import.py
+msgid "Couldn't find latest version name"
+msgstr ""
+
+#: ../fdroidserver/import.py
 msgid "Couldn't find package ID"
 msgstr ""
 
@@ -469,26 +495,29 @@ msgstr ""
 msgid "Cowardily refusing to overwrite existing signing key setup!"
 msgstr ""
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/update.py
+msgid "Create a repo signing key in a keystore"
+msgstr ""
+
+#: ../fdroidserver/update.py
+msgid "Create skeleton metadata files that are missing"
+msgstr ""
+
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Created new container \"{name}\""
 msgstr ""
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Creating \"{path}\" for configuring s3cmd."
 msgstr ""
 
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Creating empty {config_file}"
-msgstr ""
-
 #: ../fdroidserver/publish.py
 msgid "Creating log directory"
 msgstr ""
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Creating new S3 bucket: {url}"
 msgstr ""
@@ -501,7 +530,8 @@ msgstr ""
 msgid "Creating signed index with this key (SHA256):"
 msgstr ""
 
-#: ../fdroidserver/publish.py ../fdroidserver/verify.py
+#: ../fdroidserver/import.py ../fdroidserver/verify.py
+#: ../fdroidserver/publish.py
 msgid "Creating temporary directory"
 msgstr ""
 
@@ -547,21 +577,16 @@ msgid "Description has a duplicate line"
 msgstr ""
 
 #: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Description of length {length} is over the {limit} char limit"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Did you mean config/{name}.yml?"
+#, python-format
+msgid "Description has a list (%s) but it isn't bulleted (*) nor numbered (#)"
 msgstr ""
 
 #: ../fdroidserver/lint.py
 #, python-brace-format
-msgid "Did you mean {code}?"
+msgid "Description of length {length} is over the {limit} char limit"
 msgstr ""
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "Do not add 'disable:' to the generated build entries"
 msgstr ""
 
@@ -586,20 +611,25 @@ msgstr ""
 msgid "Don't create a source tarball, useful when testing a build"
 msgstr ""
 
+#: ../fdroidserver/stats.py
+msgid "Don't do anything logs-related"
+msgstr ""
+
 #: ../fdroidserver/build.py
 msgid "Don't refresh the repository, useful when testing a build with no internet connection"
 msgstr ""
 
 #: ../fdroidserver/deploy.py ../fdroidserver/nightly.py
+#: ../fdroidserver/upload.py
 msgid "Don't use rsync checksums"
 msgstr ""
 
-#: ../fdroidserver/install.py
-msgid "Download F-Droid.apk using mirrors that leak less to the network"
+#: ../fdroid ../fdroidserver/__main__.py
+msgid "Download complete mirrors of small repos"
 msgstr ""
 
-#: ../fdroidserver/__main__.py
-msgid "Download complete mirrors of small repos"
+#: ../fdroidserver/stats.py
+msgid "Download logs we don't have"
 msgstr ""
 
 #: ../fdroidserver/common.py
@@ -613,12 +643,7 @@ msgstr ""
 
 #: ../fdroidserver/metadata.py
 #, python-brace-format
-msgid "Duplicate Anti-Feature declaration at {path} was ignored!"
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-format
-msgid "Duplicate entry \"%s\" in mirrors config!"
+msgid "Duplicate build recipe found for versionCode {versionCode} in {linedesc}"
 msgstr ""
 
 #: ../fdroidserver/lint.py
@@ -626,42 +651,27 @@ msgstr ""
 msgid "Duplicate link in '{field}': {url}"
 msgstr ""
 
-#: ../fdroidserver/common.py
-#, python-format
-msgid "ERROR: %(message)s"
+#: ../fdroid
+msgid "Dynamically scan APKs post build"
 msgstr ""
 
 #: ../fdroidserver/__main__.py
 msgid "ERROR: The \"server\" subcommand has been removed, use \"deploy\"!"
 msgstr ""
 
+#: ../fdroidserver/mirror.py
+msgid ""
+"ERROR: this command should never be used to mirror f-droid.org!\n"
+"A full mirror of f-droid.org requires more than 200GB."
+msgstr ""
+
 #: ../fdroidserver/nightly.py
 msgid "ERROR: unsupported CI type, patches welcome!"
 msgstr ""
 
-#: ../fdroidserver/nightly.py
-#, python-format
-msgid "ERROR: unsupported git host \"%s\", patches welcome!"
-msgstr ""
-
-#: ../fdroidserver/lint.py
+#: ../fdroidserver/metadata.py
 #, python-brace-format
-msgid "ERROR: {key} in {path} is not \"archive\" or \"repo\"!"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "ERROR: {key} not a valid key!"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "ERROR: {key}'s value should be of type {t}!"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "ERROR: {key}:{subkey} in {path} is not in allowed keys: {allowed_keys}!"
+msgid "Empty build flag at {linedesc}"
 msgstr ""
 
 #: ../fdroidserver/__main__.py
@@ -676,40 +686,20 @@ msgid ""
 "> "
 msgstr ""
 
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Environment variable {var} from {configname} is not set!"
+#: ../fdroidserver/deploy.py ../fdroidserver/checkupdates.py
+#: ../fdroidserver/upload.py
+#, python-format
+msgid "Error while attempting to publish log: %s"
 msgstr ""
 
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Environment variable {{env: {var}}} is not set!"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "Error deploying 'github_releases', {} not present. (You might need to run `fdroid update` first.)"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py ../fdroidserver/common.py
 msgid "Error while getting repo address"
 msgstr ""
 
-#: ../fdroidserver/scanner.py
-msgid "Exit with a non-zero code if problems were found"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Extract application metadata from a source repository"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Extract signatures from APKs"
 msgstr ""
 
-#: ../fdroidserver/install.py
-msgid "F-Droid.apk could not be downloaded from any known source!"
-msgstr ""
-
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Failed copying {path}: {error}"
@@ -730,23 +720,27 @@ msgstr ""
 msgid "Failed resizing {path}: {error}"
 msgstr ""
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/publish.py
+msgid "Failed to align application"
+msgstr ""
+
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Failed to create S3 bucket: {url}"
 msgstr ""
 
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Failed to get APK information, deleting {path}"
+#: ../fdroidserver/common.py
+msgid "Failed to get APK manifest information"
 msgstr ""
 
 #: ../fdroidserver/update.py
 #, python-brace-format
-msgid "Failed to get APK information, skipping {path}"
+msgid "Failed to get apk information, deleting {path}"
 msgstr ""
 
 #: ../fdroidserver/update.py
-msgid "Failed to get APK signing key fingerprint"
+#, python-brace-format
+msgid "Failed to get apk information, skipping {path}"
 msgstr ""
 
 #: ../fdroidserver/install.py
@@ -754,10 +748,14 @@ msgstr ""
 msgid "Failed to install '{apkfilename}' on {dev}: {error}"
 msgstr ""
 
-#: ../fdroidserver/common.py
+#: ../fdroidserver/publish.py ../fdroidserver/common.py
 msgid "Failed to sign application"
 msgstr ""
 
+#: ../fdroidserver/common.py
+msgid "Failed to zipalign application"
+msgstr ""
+
 #: ../fdroidserver/build.py
 #, python-brace-format
 msgid "Fetched buildserverid from VM: {buildserverid}"
@@ -773,12 +771,21 @@ msgstr ""
 msgid "File disappeared while processing it: {path}"
 msgstr ""
 
-#: ../fdroidserver/build.py ../fdroidserver/install.py
-#: ../fdroidserver/rewritemeta.py ../fdroidserver/scanner.py
-#: ../fdroidserver/update.py
+#: ../fdroidserver/verify.py ../fdroidserver/stats.py ../fdroidserver/update.py
+#: ../fdroidserver/rewritemeta.py ../fdroidserver/build.py
+#: ../fdroidserver/checkupdates.py ../fdroidserver/scanner.py
+#: ../fdroidserver/install.py
 msgid "Finished"
 msgstr ""
 
+#: ../fdroidserver/lint.py
+msgid "Flattr donation methods belong in the FlattrID flag"
+msgstr ""
+
+#: ../fdroidserver/lint.py
+msgid "Flattr donation methods belong in the FlattrID: field"
+msgstr ""
+
 #: ../fdroidserver/lint.py
 msgid "Forbidden HTML tags"
 msgstr ""
@@ -810,6 +817,7 @@ msgstr ""
 msgid "Found invalid appids in arguments"
 msgstr ""
 
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
 #: ../fdroidserver/common.py
 msgid "Found invalid versionCodes for some apps"
 msgstr ""
@@ -819,10 +827,6 @@ msgstr ""
 msgid "Found multiple JAR Signature Block Files in {path}"
 msgstr ""
 
-#: ../fdroidserver/common.py
-msgid "Found multiple Signer Certificates!"
-msgstr ""
-
 #: ../fdroidserver/metadata.py
 #, python-brace-format
 msgid "Found multiple metadata files for {appid}"
@@ -832,6 +836,11 @@ msgstr ""
 msgid "Found multiple signing certificates for repository."
 msgstr ""
 
+#: ../fdroidserver/update.py
+#, python-brace-format
+msgid "Found multiple signing certificates in {path}"
+msgstr ""
+
 #: ../fdroidserver/index.py
 msgid "Found no signing certificates for repository."
 msgstr ""
@@ -846,16 +855,6 @@ msgstr ""
 msgid "Found {apkfilename} at {url}"
 msgstr ""
 
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Found {count} problems in {filename}"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Found {count} warnings in {filename}"
-msgstr ""
-
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Generated skeleton metadata for {appid}"
@@ -874,21 +873,19 @@ msgstr ""
 msgid "Git fetch failed"
 msgstr ""
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
+#: ../fdroidserver/common.py
+msgid "Git remote set-head failed"
+msgstr ""
+
 #: ../fdroidserver/common.py
 #, python-format
 msgid "Git remote set-head failed: \"%s\""
 msgstr ""
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
 #: ../fdroidserver/common.py
 msgid "Git reset failed"
 msgstr ""
 
-#: ../fdroidserver/common.py
-msgid "Git submodule deinit failed"
-msgstr ""
-
 #: ../fdroidserver/common.py
 msgid "Git submodule sync failed"
 msgstr ""
@@ -920,16 +917,6 @@ msgstr ""
 msgid "Ignoring FUNDING.yml entry longer than 2048: %s"
 msgstr ""
 
-#: ../fdroidserver/update.py
-#, python-format
-msgid "Ignoring bad element in manifest: %s"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Ignoring deprecated {oldfile}, use {newfile}!"
-msgstr ""
-
 #: ../fdroidserver/index.py
 msgid "Ignoring package without metadata: "
 msgstr ""
@@ -939,6 +926,11 @@ msgstr ""
 msgid "Ignoring stale cache data for {apkfilename}"
 msgstr ""
 
+#: ../fdroidserver/rewritemeta.py
+#, python-brace-format
+msgid "Ignoring {ext} file at '{path}'"
+msgstr ""
+
 #: ../fdroidserver/update.py
 msgid "Include APKs that are signed with disabled algorithms like MD5"
 msgstr ""
@@ -955,16 +947,6 @@ msgstr ""
 msgid "Include the source tarballs in the mirror"
 msgstr ""
 
-#: ../fdroidserver/metadata.py
-#, python-format
-msgid "Including metadata from %s@%s"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Including metadata from {path}"
-msgstr ""
-
 #: ../fdroidserver/common.py
 msgid "Initialising submodules"
 msgstr ""
@@ -973,7 +955,7 @@ msgstr ""
 msgid "Install all signed applications available"
 msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Install built packages on devices"
 msgstr ""
 
@@ -982,12 +964,22 @@ msgstr ""
 msgid "Installing %s..."
 msgstr ""
 
+#: ../fdroidserver/install.py
+#, python-format
+msgid "Installing %s…"
+msgstr ""
+
 #: ../fdroidserver/install.py
 #, python-brace-format
 msgid "Installing '{apkfilename}' on {dev}..."
 msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroidserver/install.py
+#, python-brace-format
+msgid "Installing '{apkfilename}' on {dev}…"
+msgstr ""
+
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Interact with the repo HTTP server"
 msgstr ""
 
@@ -995,36 +987,53 @@ msgstr ""
 msgid "Invalid APK"
 msgstr ""
 
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "Invalid AutoUpdateMode: {mode}"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "Invalid UpdateCheckMode: {mode}"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
+#: ../fdroidserver/lint.py ../fdroidserver/checkupdates.py
 #, python-brace-format
 msgid "Invalid VercodeOperation: {field}"
 msgstr ""
 
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Invalid VercodeOperation: {invalid_ops}"
-msgstr ""
-
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "Invalid application ID {appid}"
 msgstr ""
 
+#: ../fdroidserver/metadata.py
+#, python-format
+msgid "Invalid boolean '%s'"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Invalid build flag at {line} in {linedesc}"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Invalid build format: {value} in {name}"
+msgstr ""
+
 #: ../fdroidserver/lint.py
 msgid "Invalid bulleted list"
 msgstr ""
 
+#: ../fdroidserver/lint.py
+#, python-format
+msgid "Invalid license tag \"%s\"! Use only tags from https://spdx.org/license-list"
+msgstr ""
+
+#: ../fdroidserver/lint.py
+msgid "Invalid link - use [http://foo.bar Link title] or [http://foo.bar]"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+#, python-format
+msgid "Invalid metadata in %s:%d"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+msgid "Invalid metadata in: "
+msgstr ""
+
 #: ../fdroidserver/common.py
 #, python-format
 msgid "Invalid name for published file: %s"
@@ -1032,7 +1041,7 @@ msgstr ""
 
 #: ../fdroidserver/common.py
 #, python-brace-format
-msgid "Invalid ndk: entry in build: \"{ndk}\""
+msgid "Invalid package name {0}"
 msgstr ""
 
 #: ../fdroidserver/common.py
@@ -1055,6 +1064,11 @@ msgstr ""
 msgid "Invalid srclib metadata: unknown key '{key}' in '{file}'"
 msgstr ""
 
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Invalid versionCode: \"{versionCode}\" is not an integer!"
+msgstr ""
+
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "JAR signature failed to verify: {path}"
@@ -1069,8 +1083,8 @@ msgstr ""
 msgid "Java JAR file"
 msgstr ""
 
-#: ../fdroidserver/mirror.py ../fdroidserver/publish.py
-#: ../fdroidserver/update.py
+#: ../fdroidserver/publish.py ../fdroidserver/update.py
+#: ../fdroidserver/mirror.py
 msgid "Java JDK not found! Install in standard location or set java_paths!"
 msgstr ""
 
@@ -1086,19 +1100,10 @@ msgstr ""
 msgid "Javascript in HTML src attributes"
 msgstr ""
 
-#: ../fdroidserver/build.py
-#, python-brace-format
-msgid "Keeping failed build \"{apkfilename}\""
-msgstr ""
-
 #: ../fdroidserver/init.py
 msgid "Keystore for signing key:\t"
 msgstr ""
 
-#: ../fdroidserver/lint.py
-msgid "Known debug key is used in AllowedAPKSigningKeys: "
-msgstr ""
-
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "Last used commit '{commit}' looks like a tag, but UpdateCheckMode is '{ucm}'"
@@ -1108,8 +1113,12 @@ msgstr ""
 msgid "Liberapay donation methods belong in the Liberapay: field"
 msgstr ""
 
+#: ../fdroidserver/lint.py
+msgid "Liberapay donation methods belong in the LiberapayID flag"
+msgstr ""
+
 #: ../fdroidserver/rewritemeta.py
-msgid "List files that would be reformatted (dry run)"
+msgid "List files that would be reformatted"
 msgstr ""
 
 #: ../fdroidserver/lint.py
@@ -1128,16 +1137,6 @@ msgstr ""
 msgid "Malformed serverwebroot line:"
 msgstr ""
 
-#: ../fdroidserver/scanner.py
-#, python-format
-msgid "Max recursion depth in ZIP file reached: %s"
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "Mirror config for {url} contains \"isPrimary\" key!"
-msgstr ""
-
 #: ../fdroidserver/mirror.py
 msgid "Mirror the full repo and archive, all file types."
 msgstr ""
@@ -1146,29 +1145,30 @@ msgstr ""
 msgid "Missing output directory"
 msgstr ""
 
-#: ../fdroidserver/metadata.py
-msgid "Moving Anti-Features declarations to localized files:"
-msgstr ""
-
-#: ../fdroidserver/index.py
-msgid "Neither \"repo_pubkey\" nor \"keystorepass\" set in config.yml"
-msgstr ""
-
-#: ../fdroidserver/verify.py
+#: ../fdroidserver/lint.py
 #, python-format
-msgid "No APK for package: %s"
+msgid "Name '%s' is just the auto name - remove it"
+msgstr ""
+
+#: ../fdroidserver/common.py
+msgid "No 'config.py' found, using defaults."
 msgstr ""
 
 #: ../fdroidserver/common.py
 msgid "No Android SDK found!"
 msgstr ""
 
+#: ../fdroidserver/import.py
+msgid "No android or kivy project could be found. Specify --subdir?"
+msgstr ""
+
 #: ../fdroidserver/install.py
 msgid "No attached devices found"
 msgstr ""
 
-#: ../fdroidserver/install.py
-msgid "No devices found for `adb install`! Please plug one in."
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "No commit specified for {versionName} in {linedesc}"
 msgstr ""
 
 #: ../fdroidserver/index.py
@@ -1179,23 +1179,14 @@ msgstr ""
 msgid "No git submodules available"
 msgstr ""
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "No gradle project could be found. Specify --subdir?"
 msgstr ""
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py ../fdroidserver/common.py
 msgid "No information found."
 msgstr ""
 
-#: ../fdroidserver/checkupdates.py
-msgid "No matching tags found"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "No minimum SDK version found in {0}, using default (3)."
-msgstr ""
-
 #: ../fdroidserver/lint.py
 msgid "No need to specify that the app is Free Software"
 msgstr ""
@@ -1205,7 +1196,7 @@ msgid "No need to specify that the app is for Android"
 msgstr ""
 
 #: ../fdroidserver/deploy.py
-msgid "No option set! Edit your config.yml to set at least one of these:"
+msgid "No option set! Edit your config.py to set at least one of these:"
 msgstr ""
 
 #: ../fdroidserver/common.py
@@ -1214,14 +1205,14 @@ msgstr ""
 
 #: ../fdroidserver/install.py
 #, python-format
-msgid "No signed APK available for %s"
+msgid "No signed apk available for %s"
 msgstr ""
 
 #: ../fdroidserver/install.py
 msgid "No signed output directory - nothing to do"
 msgstr ""
 
-#: ../fdroidserver/common.py
+#: ../fdroidserver/update.py ../fdroidserver/common.py
 #, python-brace-format
 msgid "No signing certificates found in {path}"
 msgstr ""
@@ -1231,23 +1222,16 @@ msgstr ""
 msgid "No such package: %s"
 msgstr ""
 
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "No such versionCode {versionCode} for app {appid}"
 msgstr ""
 
-#: ../fdroidserver/checkupdates.py
-msgid "No tags found"
-msgstr ""
-
-#: ../fdroidserver/publish.py ../fdroidserver/verify.py
+#: ../fdroidserver/verify.py ../fdroidserver/publish.py
 msgid "No unsigned directory - nothing to do"
 msgstr ""
 
-#: ../fdroidserver/__main__.py
-msgid "No version information could be found."
-msgstr ""
-
 #: ../fdroidserver/common.py
 msgid "Not a valid size definition: \"{}\""
 msgstr ""
@@ -1262,9 +1246,10 @@ msgid "Nothing to do for {appid}."
 msgstr ""
 
 #: ../fdroidserver/init.py
-msgid "Now set these in config.yml:"
+msgid "Now set these in config.py:"
 msgstr ""
 
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "OBB file has newer versionCode({integer}) than any APK:"
@@ -1282,27 +1267,22 @@ msgstr ""
 msgid "Offline machine, skipping git mirror generation until `fdroid deploy`"
 msgstr ""
 
-#: ../fdroidserver/deploy.py
-msgid "One of the 'github_releases' config items is missing the 'packageNames' value. skipping ..."
+#: ../fdroidserver/common.py
+#, python-brace-format
+msgid "Old APK signature failed to verify: {path}"
 msgstr ""
 
-#: ../fdroidserver/deploy.py
-msgid "One of the 'github_releases' config items is missing the 'projectUrl' value. skipping ..."
+#: ../fdroid ../fdroidserver/__main__.py
+msgid "Old, deprecated name for fdroid deploy"
 msgstr ""
 
-#: ../fdroidserver/deploy.py
-msgid "One of the 'github_releases' config items is missing the 'token' value. skipping ..."
-msgstr ""
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Only PNG and JPEG are supported for graphics, found: {path}"
 msgstr ""
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/common.py
-msgid "Only accepts a single key \"env\""
+#: ../fdroidserver/checkupdates.py
+msgid "Only print differences with the Play Store"
 msgstr ""
 
 #: ../fdroidserver/checkupdates.py
@@ -1313,6 +1293,11 @@ msgstr ""
 msgid "OpenCollective donation methods belong in the OpenCollective: field"
 msgstr ""
 
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "Options"
+msgstr ""
+
 #: ../fdroidserver/verify.py
 msgid "Output JSON report to file named after APK."
 msgstr ""
@@ -1321,22 +1306,26 @@ msgstr ""
 msgid "Output JSON to stdout."
 msgstr ""
 
-#: ../fdroidserver/checkupdates.py ../fdroidserver/gpgsign.py
-#: ../fdroidserver/publish.py ../fdroidserver/signindex.py
-#: ../fdroidserver/update.py
+#: ../fdroidserver/gpgsign.py ../fdroidserver/publish.py
+#: ../fdroidserver/update.py ../fdroidserver/signindex.py
+#: ../fdroidserver/checkupdates.py
 msgid "Outputting JSON"
 msgstr ""
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "Overall license of the project."
 msgstr ""
 
+#: ../fdroidserver/dscanner.py
+msgid "Override path for repo APKs (default: ./repo)"
+msgstr ""
+
 #: ../fdroidserver/index.py
 #, python-brace-format
 msgid "Overriding blank versionName in {apkfilename} from metadata: {version}"
 msgstr ""
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 #, python-brace-format
 msgid "Package \"{appid}\" already exists"
 msgstr ""
@@ -1350,10 +1339,13 @@ msgstr ""
 msgid "Password required with username"
 msgstr ""
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "Path to main Android project subdirectory, if not in root."
 msgstr ""
 
+msgid "Path to main android project subdirectory, if not in root."
+msgstr ""
+
 #: ../fdroidserver/init.py
 msgid "Path to the Android SDK (sometimes set in ANDROID_HOME)"
 msgstr ""
@@ -1366,18 +1358,20 @@ msgstr ""
 msgid "Path to the keystore for the repo signing key"
 msgstr ""
 
+#: ../fdroidserver/dscanner.py
+msgid "Prepare Drozer to run a scan"
+msgstr ""
+
+msgid "Prepare drozer to run a scan"
+msgstr ""
+
 #: ../fdroidserver/nightly.py
 msgid "Print the secret variable to the terminal for easy copy/paste"
 msgstr ""
 
-#: ../fdroidserver/install.py
+#: ../fdroidserver/metadata.py
 #, python-brace-format
-msgid "Privacy mode was enabled based on your locale ({country_code})."
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-format
-msgid "Problem with ZIP file: %s, error %s"
+msgid "Problem with description of {appid}: {error}"
 msgstr ""
 
 #: ../fdroidserver/common.py
@@ -1403,7 +1397,11 @@ msgstr ""
 msgid "Produce human-readable XML/JSON for index files"
 msgstr ""
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/update.py
+msgid "Produce human-readable index.xml"
+msgstr ""
+
+#: ../fdroidserver/import.py
 msgid "Project URL to import from."
 msgstr ""
 
@@ -1415,25 +1413,21 @@ msgstr ""
 msgid "Push the log to this git remote repository"
 msgstr ""
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Pushing binary transparency log to {url}"
 msgstr ""
 
-#: ../fdroidserver/deploy.py
-msgid "Pushing to remote server failed!"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Pushing to {url}"
 msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Quickly start a new repository"
 msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Read all the metadata files and exit"
 msgstr ""
 
@@ -1444,12 +1438,14 @@ msgstr ""
 
 #: ../fdroidserver/common.py
 #, python-brace-format
-msgid "Reading packageName/versionCode/versionName failed, APK invalid: '{apkfilename}'"
+msgid "Reading minSdkVersion failed: \"{apkfilename}\""
 msgstr ""
 
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
+#. https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
 #: ../fdroidserver/common.py
 #, python-brace-format
-msgid "Reading packageName/versionCode/versionName failed,APK invalid: '{apkfilename}'"
+msgid "Reading packageName/versionCode/versionName failed, APK invalid: '{apkfilename}'"
 msgstr ""
 
 #: ../fdroidserver/update.py
@@ -1457,35 +1453,24 @@ msgstr ""
 msgid "Reading {apkfilename} from cache"
 msgstr ""
 
-#: ../fdroidserver/build.py
-msgid "Refresh and cache scanner rules and signatures from the network"
-msgstr ""
-
-#: ../fdroidserver/publish.py
-#, python-brace-format
-msgid "Refusing to sign '{path}', file exists in both {dir1} and {dir2} folder."
-msgstr ""
-
-#: ../fdroidserver/verify.py
-msgid "Remove source tarball and any APKs if successfully verified."
+#: ../fdroidserver/stats.py
+msgid "Recalculate aggregate stats - use when changes have been made that would invalidate old cached data."
 msgstr ""
 
 #: ../fdroidserver/common.py
 msgid "Removing specified files"
 msgstr ""
 
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Removing {path}\""
-msgstr ""
-
 #: ../fdroidserver/update.py
 msgid "Rename APK files that do not match package.name_123.apk"
 msgstr ""
 
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "RepoType {type} is deprecated, please switch to git."
+#: ../fdroidserver/update.py
+msgid "Report on build data status"
+msgstr ""
+
+#: ../fdroidserver/build.py
+msgid "Reset and create a brand new build server, even if the existing one appears to be ok."
 msgstr ""
 
 #: ../fdroidserver/nightly.py
@@ -1501,13 +1486,12 @@ msgstr ""
 msgid "Restrict output to warnings and errors"
 msgstr ""
 
-#: ../fdroidserver/net.py
-#, python-format
-msgid "Retrying failed download: %s"
+#: ../fdroid ../fdroidserver/__main__.py
+msgid "Rewrite all the metadata files"
 msgstr ""
 
-#: ../fdroidserver/__main__.py
-msgid "Rewrite all the metadata files"
+#: ../fdroidserver/rewritemeta.py
+msgid "Rewrite to a specific format: "
 msgstr ""
 
 #: ../fdroidserver/rewritemeta.py
@@ -1515,20 +1499,20 @@ msgstr ""
 msgid "Rewriting '{appid}'"
 msgstr ""
 
-#: ../fdroidserver/checkupdates.py
-msgid "Run on git repo that has uncommitted changes"
+#: ../fdroidserver/rewritemeta.py
+#, python-brace-format
+msgid "Rewriting '{appid}' to '{path}'"
 msgstr ""
 
-#: ../fdroidserver/nightly.py
-#, python-brace-format
-msgid "Run over {cibase} to find -debug.apk. and skip repo_basedir {repo_basedir}"
+#: ../fdroidserver/checkupdates.py
+msgid "Run on git repo that has uncommitted changes"
 msgstr ""
 
 #: ../fdroidserver/lint.py
 msgid "Run rewritemeta to fix formatting"
 msgstr ""
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 msgid "Running first pass with MD5 checking disabled"
 msgstr ""
 
@@ -1537,24 +1521,18 @@ msgstr ""
 msgid "Running wget in {path}"
 msgstr ""
 
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "SHA-256 of {url} does not match entry!"
+#: ../fdroidserver/dscanner.py
+msgid "Scan only the latest version of each package"
 msgstr ""
 
 #: ../fdroidserver/build.py
 msgid "Scan the resulting APK(s) for known non-free classes."
 msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Scan the source code of a package"
 msgstr ""
 
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Scanner found {count} problems in {apk}"
-msgstr ""
-
 #: ../fdroidserver/scanner.py
 #, python-brace-format
 msgid "Scanner found {count} problems in {appid}:"
@@ -1571,19 +1549,6 @@ msgid_plural "Scanner found {} problems"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../fdroidserver/scanner.py
-msgid "Scanning APK for extra signing blocks."
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "Scanning APK with dexdump for known non-free classes."
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Set NDK {release} ({version}) up"
-msgstr ""
-
 #: ../fdroidserver/common.py
 msgid "Set clock to that time using:"
 msgstr ""
@@ -1597,7 +1562,7 @@ msgstr ""
 msgid "Set open file limit to {integer}"
 msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Set up an app build for a nightly build repo"
 msgstr ""
 
@@ -1610,11 +1575,18 @@ msgstr ""
 msgid "Setting {0} sec timeout for this build"
 msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroidserver/build.py
+msgid "Setup an emulator, install the APK on it and perform a Drozer scan"
+msgstr ""
+
+msgid "Setup an emulator, install the apk on it and perform a drozer scan"
+msgstr ""
+
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Sign and place packages in the repo"
 msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Sign indexes created using update --nosign"
 msgstr ""
 
@@ -1627,11 +1599,6 @@ msgstr ""
 msgid "Skipping '{apkfilename}' with invalid signature!"
 msgstr ""
 
-#: ../fdroidserver/deploy.py ../fdroidserver/index.py
-#, python-format
-msgid "Skipping GitLab Pages mirror because the repo is too large (>%.2fGB)!"
-msgstr ""
-
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Skipping index generation for {appid}"
@@ -1647,14 +1614,23 @@ msgstr ""
 msgid "Skipping {appid}: disabled"
 msgstr ""
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/scanner.py
+#, python-brace-format
+msgid "Skipping {appid}: no builds specified"
+msgstr ""
+
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 msgid "Specify a local folder to sync the repo to"
 msgstr ""
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 msgid "Specify an identity file to provide to SSH for rsyncing"
 msgstr ""
 
+#: ../fdroidserver/build.py
+msgid "Specify that we're running on the build server"
+msgstr ""
+
 #: ../fdroidserver/nightly.py
 msgid "Specify which debug keystore file to use."
 msgstr ""
@@ -1663,6 +1639,11 @@ msgstr ""
 msgid "Spew out even more information than normal"
 msgstr ""
 
+#: ../fdroidserver/nightly.py
+#, python-brace-format
+msgid "Striping mystery signature from {apkfilename}"
+msgstr ""
+
 #: ../fdroidserver/nightly.py
 #, python-brace-format
 msgid "Stripping mystery signature from {apkfilename}"
@@ -1683,22 +1664,10 @@ msgstr ""
 msgid "System clock is older than date in {path}!"
 msgstr ""
 
-#: ../fdroidserver/checkupdates.py
-msgid "Tags update mode only works for git, hg, bzr and git-svn repositories currently"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "Tags update mode used in git-svn, but the repo was not set up with tags"
-msgstr ""
-
 #: ../fdroidserver/build.py
 msgid "Test mode - put output in the tmp directory only, and always build, even if the output already exists."
 msgstr ""
 
-#: ../fdroidserver/index.py
-msgid "The \"qrcode\" Python package is not installed (e.g. apt-get install python3-qrcode)!"
-msgstr ""
-
 #. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
 #: ../fdroidserver/update.py
 #, python-brace-format
@@ -1717,10 +1686,18 @@ msgstr ""
 msgid "The file to be included in the repo (path or glob)"
 msgstr ""
 
+#: ../fdroidserver/deploy.py
+msgid "The only commands currently supported are 'init' and 'update'"
+msgstr ""
+
 #: ../fdroidserver/index.py
 msgid "The repository's fingerprint does not match."
 msgstr ""
 
+#: ../fdroidserver/common.py
+msgid "The repository's index could not be verified."
+msgstr ""
+
 #: ../fdroidserver/deploy.py
 #, python-brace-format
 msgid "The root dir for local_copy_dir \"{path}\" does not exist!"
@@ -1734,37 +1711,13 @@ msgstr ""
 msgid "These are the apps that have been archived from the main repo."
 msgstr ""
 
-#: ../fdroidserver/mirror.py
-msgid "This command should never be used to mirror f-droid.org! A full copy requires more than 600GB."
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "This is a repository of apps to be used with F-Droid. Applications in this repository are either official binaries built by the original application developers, or are binaries built from source by the admin of f-droid.org using the tools on https://gitlab.com/fdroid."
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 #, python-format
 msgid "This repo already has local metadata: %s"
 msgstr ""
 
-#: ../fdroidserver/init.py
-#, python-format
-msgid ""
-"To complete the setup, add your APKs to \"%s\"\n"
-"then run \"fdroid update -c; fdroid update\".  You might also want to edit\n"
-"\"config.yml\" to set the URL, repo name, and more.  You should also set up\n"
-"a signing key (a temporary one might have been automatically generated).\n"
-"\n"
-"For more info: https://f-droid.org/docs/Setup_an_F-Droid_App_Repo\n"
-"and https://f-droid.org/docs/Signing_Process"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "To use awsbucket, awssecretkey and awsaccesskeyid must also be set in config.yml!"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "To use rclone, rclone_config and awsbucket must be set in config.yml!"
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
+msgid "To use awsbucket, awssecretkey and awsaccesskeyid must also be set in config.py!"
 msgstr ""
 
 #: ../fdroidserver/lint.py
@@ -1775,6 +1728,10 @@ msgstr ""
 msgid "URL shorteners should not be used"
 msgstr ""
 
+#: ../fdroidserver/metadata.py
+msgid "URL title is just the URL, use brackets: [URL]"
+msgstr ""
+
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "URL {url} in Description: {error}"
@@ -1788,15 +1745,16 @@ msgstr ""
 msgid "Unexpected license tag \"{}\"! Only use license tags configured in your config file"
 msgstr ""
 
-#: ../fdroidserver/common.py
+#: ../fdroidserver/metadata.py
 #, python-brace-format
-msgid "Unknown entry {key} in {configname}"
+msgid "Unexpected text on same line as {field} in {linedesc}"
 msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Unknown exception found!"
 msgstr ""
 
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "Unknown file '{filename}' in build '{versionName}'"
@@ -1807,6 +1765,11 @@ msgstr ""
 msgid "Unknown metadata format: %s"
 msgstr ""
 
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Unknown metadata format: {path}"
+msgstr ""
+
 #: ../fdroidserver/metadata.py
 #, python-brace-format
 msgid "Unknown metadata format: {path} (use: *.yml)"
@@ -1816,6 +1779,10 @@ msgstr ""
 msgid "Unknown version of aapt, might cause problems: "
 msgstr ""
 
+#: ../fdroidserver/lint.py
+msgid "Unlinkified link - use [http://foo.bar Link title] or [http://foo.bar]"
+msgstr ""
+
 #: ../fdroidserver/lint.py
 msgid "Unnecessary leading space"
 msgstr ""
@@ -1829,12 +1796,20 @@ msgstr ""
 msgid "Unrecognised app field '{fieldname}' in '{path}'"
 msgstr ""
 
+#: ../fdroidserver/metadata.py
+msgid "Unrecognised app field: "
+msgstr ""
+
 #: ../fdroidserver/metadata.py
 #, python-brace-format
 msgid "Unrecognised build flag '{build_flag}' in '{path}'"
 msgstr ""
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Unrecognised field '{field}' in {linedesc}"
+msgstr ""
+
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Unsupported file type \"{extension}\" for repo graphic"
@@ -1845,6 +1820,29 @@ msgstr ""
 msgid "Unsupported graphics file found: {path}"
 msgstr ""
 
+#: ../fdroidserver/rewritemeta.py
+#, python-brace-format
+msgid "Unsupported metadata format, use: --to [{supported}]"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+msgid "Unterminated ]"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+msgid "Unterminated ]]"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Unterminated build in {name}"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Unterminated continuation in {name}"
+msgstr ""
+
 #: ../fdroidserver/lint.py
 #, python-format
 msgid "Unused extlib at %s"
@@ -1865,25 +1863,27 @@ msgstr ""
 msgid "Unused scanignore path: %s"
 msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Update repo information for new packages"
 msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Update the binary transparency log for a URL"
 msgstr ""
 
+#: ../fdroid ../fdroidserver/__main__.py
+msgid "Update the stats of the repo"
+msgstr ""
+
+#: ../fdroidserver/update.py ../fdroidserver/build.py
+msgid "Update the wiki"
+msgstr ""
+
 #: ../fdroidserver/checkupdates.py
 #, python-brace-format
 msgid "UpdateCheckData has invalid URL: {url}"
 msgstr ""
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "UpdateCheckData must match the version code as integer (\\d or [0-9]): {codeex}"
-msgstr ""
-
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "UpdateCheckData must use HTTPS URL: {url}"
@@ -1895,10 +1895,14 @@ msgid "UpdateCheckData not a valid URL: {url}"
 msgstr ""
 
 #: ../fdroidserver/lint.py
-msgid "UpdateCheckMode is set but it looks like checkupdates hasn't been run yet."
+msgid "UpdateCheckMode is set but it looks like checkupdates hasn't been run yet"
+msgstr ""
+
+#. Translators: https://developer.android.com/studio/build/application-id
+#: ../fdroidserver/lint.py
+msgid "UpdateCheckName is set to the known application ID - it can be removed"
 msgstr ""
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
 #: ../fdroidserver/lint.py
 msgid "UpdateCheckName is set to the known application ID, it can be removed"
 msgstr ""
@@ -1913,8 +1917,19 @@ msgstr ""
 msgid "Uploading {apkfilename} to virustotal"
 msgstr ""
 
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "Usage"
+msgstr ""
+
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, python-format
+msgid "Usage: %s\n"
+msgstr ""
+
 #: ../fdroidserver/lint.py
-msgid "Use /HEAD instead of /master or /main to point at a file in the default branch"
+msgid "Use /HEAD instead of /master to point at a file in the default branch"
 msgstr ""
 
 #: ../fdroidserver/update.py
@@ -1929,14 +1944,12 @@ msgstr ""
 msgid "Use date from APK instead of current time for newly added APKs"
 msgstr ""
 
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Using \"{path}\" for configuring s3cmd."
+msgid "Use date from apk instead of current time for newly added apks"
 msgstr ""
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
-msgid "Using \"{path}\" for syncing with remote storage."
+msgid "Using \"{path}\" for configuring s3cmd."
 msgstr ""
 
 #: ../fdroidserver/common.py
@@ -1947,17 +1960,13 @@ msgstr ""
 msgid "Using APK Signature v3"
 msgstr ""
 
-#: ../fdroidserver/common.py
-msgid "Using JAR Signature"
-msgstr ""
-
 #: ../fdroidserver/common.py
 msgid "Using Java's jarsigner, not recommended for verifying APKs! Use apksigner"
 msgstr ""
 
-#: ../fdroidserver/metadata.py
+#: ../fdroidserver/common.py
 #, python-brace-format
-msgid "Using blank dictionary instead of contents of {path}!"
+msgid "Using androguard from \"{path}\""
 msgstr ""
 
 #: ../fdroidserver/init.py
@@ -1965,17 +1974,12 @@ msgstr ""
 msgid "Using existing keystore \"{path}\""
 msgstr ""
 
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Using rclone to sync with: {url}"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Using s3cmd to sync with: {url}"
 msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Valid commands are:"
 msgstr ""
 
@@ -1983,7 +1987,7 @@ msgstr ""
 msgid "Verify against locally cached copy rather than redownloading."
 msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Verify the integrity of downloaded packages"
 msgstr ""
 
@@ -1991,28 +1995,15 @@ msgstr ""
 msgid "Verifying index signature:"
 msgstr ""
 
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "Verifying package {path} with apksigner."
-msgstr ""
-
 #: ../fdroidserver/deploy.py
 #, python-brace-format
 msgid "VirusTotal API key cannot upload files larger than 32MB, use {url} to upload {path}."
 msgstr ""
 
-#: ../fdroidserver/nightly.py
-msgid "WARNING: only public git repos are supported!"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Warn about possible metadata errors"
 msgstr ""
 
-#: ../fdroidserver/scanner.py
-msgid "WebAssembly binary file"
-msgstr ""
-
 #: ../fdroidserver/update.py
 msgid "When configured for signed indexes, create only unsigned indexes at this stage"
 msgstr ""
@@ -2021,16 +2012,7 @@ msgstr ""
 msgid "When linting the entire repository yamllint is disabled by default. This option forces yamllint regardless."
 msgstr ""
 
-#: ../fdroidserver/publish.py
-msgid "When signing or verifying fails, exit with an error code."
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "Would you like to download and install F-Droid.apk via adb? (YES/no)"
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "Would you like to download the app(s) from f-droid.org? (YES/no)"
+msgid "X.509 'Distiguished Name' used when generating keys"
 msgstr ""
 
 #: ../fdroidserver/init.py
@@ -2045,11 +2027,6 @@ msgstr ""
 msgid "ZIP file archive"
 msgstr ""
 
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "adb reports {serial} is \"{status}\"!"
-msgstr ""
-
 #: ../fdroidserver/nightly.py
 #, python-brace-format
 msgid "adding IdentityFile to {path}"
@@ -2060,66 +2037,70 @@ msgstr ""
 msgid "adding to {name}: {path}"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "ambiguous option: %(option)s could match %(matches)s"
 msgstr ""
 
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "apksigner in build-tools;{version} passes APKs with invalid v3 signatures, ignoring."
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "apksigner not found! Cannot sign or verify modern APKs"
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, python-format
+msgid "ambiguous option: %s (%s?)"
 msgstr ""
 
 #: ../fdroidserver/common.py
 msgid "apksigner not found, it's required for signing!"
 msgstr ""
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/checkupdates.py ../fdroidserver/lint.py
-#: ../fdroidserver/rewritemeta.py
+#: ../fdroidserver/lint.py ../fdroidserver/rewritemeta.py
+#: ../fdroidserver/checkupdates.py
 msgid "application ID of file to operate on"
 msgstr ""
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/build.py ../fdroidserver/install.py
-#: ../fdroidserver/publish.py ../fdroidserver/scanner.py
-#: ../fdroidserver/verify.py
+#: ../fdroidserver/verify.py ../fdroidserver/publish.py
+#: ../fdroidserver/build.py ../fdroidserver/scanner.py
+#: ../fdroidserver/install.py
 msgid "application ID with optional versionCode in the form APPID[:VERCODE]"
 msgstr ""
 
-#: ../fdroidserver/common.py
-msgid "archive_url needs to end with /archive"
+#: ../fdroidserver/lint.py ../fdroidserver/rewritemeta.py
+msgid "applicationId in the form APPID"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: ../fdroidserver/checkupdates.py
+msgid "applicationId to check for updates"
+msgstr ""
+
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
+#: ../fdroidserver/verify.py ../fdroidserver/publish.py
+#: ../fdroidserver/dscanner.py ../fdroidserver/build.py
+#: ../fdroidserver/scanner.py ../fdroidserver/install.py
+msgid "applicationId with optional versionCode in the form APPID[:VERCODE]"
+msgstr ""
+
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "argument \"-\" with mode %r"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "argument %(argument_name)s: %(message)s"
-msgstr ""
-
 #: ../fdroidserver/nightly.py
 msgid "attempting bare SSH connection to test deploy key:"
 msgstr ""
 
+#: ../fdroidserver/nightly.py
+msgid "attempting bare ssh connection to test deploy key:"
+msgstr ""
+
 #: ../fdroidserver/common.py
 msgid "can not parse scrlib spec (not a string): '{}'"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
-msgid "can't open '%(filename)s': %(error)s"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "can't open non-https url: '{};"
+msgid "can't open '%s': %s"
 msgstr ""
 
 #: ../fdroidserver/build.py
@@ -2127,11 +2108,13 @@ msgstr ""
 msgid "cannot find required srclibs: \"{path}\""
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "cannot have multiple subparser arguments"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "cannot merge actions - two groups are named %r"
 msgstr ""
@@ -2145,25 +2128,30 @@ msgstr ""
 msgid "cloning {url}"
 msgstr ""
 
+#: ../fdroidserver/deploy.py
+msgid "command to execute, either 'init' or 'update'"
+msgstr ""
+
 #: ../fdroidserver/__main__.py
 msgid "commands from plugin modules:"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "complex"
+msgstr ""
+
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "conflicting option string: %s"
 msgid_plural "conflicting option strings: %s"
 msgstr[0] ""
 msgstr[1] ""
 
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "conflicting subparser alias: %s"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "conflicting subparser: %s"
+#: ../fdroidserver/nightly.py
+#, python-brace-format
+msgid "copying {apkfilename} into {path}"
 msgstr ""
 
 #: ../fdroidserver/metadata.py
@@ -2172,11 +2160,11 @@ msgid "could not parse '{path}'"
 msgstr ""
 
 #: ../fdroidserver/common.py
-msgid "could not parse srclib spec (no name specified): '{}'"
+msgid "could not parse srclib spec (no ref specified): '{}'"
 msgstr ""
 
 #: ../fdroidserver/common.py
-msgid "could not parse srclib spec (no ref specified): '{}'"
+msgid "could not parse srclib spec (too many '@' signs): '{}'"
 msgstr ""
 
 #: ../fdroidserver/nightly.py
@@ -2184,18 +2172,14 @@ msgstr ""
 msgid "created {path}"
 msgstr ""
 
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "current version is newer: old vercode={old}, new vercode={new}"
-msgstr ""
-
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "deleting: repo/{apkfilename}"
 msgstr ""
 
-#: ../fdroidserver/scanner.py
-msgid "dependency file without lock"
+#: ../fdroidserver/common.py
+#, python-brace-format
+msgid "deployed build logs to '{path}'"
 msgstr ""
 
 #: ../fdroidserver/common.py
@@ -2203,48 +2187,59 @@ msgstr ""
 msgid "deployed process log {path} to {dest}"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "dest= is required for options like %r"
 msgstr ""
 
-#: ../fdroidserver/scanner.py
-msgid "downloading '{}'"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "downloading scanner signatures from '{}' failed"
-msgstr ""
-
 #: ../fdroidserver/scanner.py
 msgid "executable binary, possibly code"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "expected %s argument"
 msgid_plural "expected %s arguments"
 msgstr[0] ""
 msgstr[1] ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "expected at least one argument"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "expected at most one argument"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "expected one argument"
 msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroidserver/common.py
+#, python-brace-format
+msgid "failed deploying build logs to '{path}'"
+msgstr ""
+
+#: ../fdroid
+msgid "fdroid [-h|--help|--version] <command> [<args>]"
+msgstr ""
+
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "fdroid [<command>] [-h|--help|--version|<args>]"
 msgstr ""
 
-#: ../fdroidserver/scanner.py
-msgid "fetch the latest version of signatures from the web"
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "floating-point"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+msgid "force errors to be warnings, or ignore"
 msgstr ""
 
 #: ../fdroidserver/metadata.py
@@ -2259,7 +2254,8 @@ msgstr ""
 msgid "gzip file archive"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "ignored explicit argument %r"
 msgstr ""
@@ -2268,39 +2264,35 @@ msgstr ""
 msgid "index-v1 must have a signature, use `fdroid signindex` to create it!"
 msgstr ""
 
-#: ../fdroidserver/index.py
-msgid "index-v2 must have a signature, use `fdroid signindex` to create it!"
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "integer"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "invalid %(type)s value: %(value)r"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "invalid choice: %(value)r (choose from %(choices)s)"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "invalid conflict_resolution value: %r"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "invalid option string %(option)r: must start with a character %(prefix_chars)r"
 msgstr ""
 
-#: ../fdroidserver/common.py
-msgid "ipfs_cid not found, skipping CIDv1 generation"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "latest build recipe is newer: old vercode={old}, new vercode={new}"
-msgstr ""
-
 #: ../fdroidserver/deploy.py
 #, python-brace-format
 msgid "local_copy_dir does not end with \"fdroid\", perhaps you meant: \"{path}\""
@@ -2319,20 +2311,11 @@ msgstr ""
 msgid "mirror '%s' does not end with 'fdroid'!"
 msgstr ""
 
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "mirrors set twice, in config.yml and {path}!"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "mutually exclusive arguments must be optional"
 msgstr ""
 
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "next {name} cache update due in {time}"
-msgstr ""
-
 #: ../fdroidserver/mirror.py
 #, python-brace-format
 msgid "no \"icon\" in {appid}"
@@ -2342,35 +2325,97 @@ msgstr ""
 msgid "no APK supplied"
 msgstr ""
 
-#: ../fdroidserver/checkupdates.py
-msgid "no version information found"
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, python-format
+msgid "no such option: %s"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: ../fdroid ../fdroidserver/__main__.py
+msgid "no version info found!"
+msgstr ""
+
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "not allowed with argument %s"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "one of the arguments %s is required"
 msgstr ""
 
-#: ../fdroidserver/common.py ../fdroidserver/index.py
+#: ../fdroidserver/index.py ../fdroidserver/common.py
 msgid "only accepts strings, lists, and tuples"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
-#, fuzzy
-msgid "options"
-msgstr "Tidɣrin"
+#: ../fdroidserver/install.py
+#, python-format
+msgid "option %s: If you really want to install all the signed apps, use --all"
+msgstr ""
+
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, python-format
+msgid "option %s: invalid %s value: %r"
+msgstr ""
+
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, python-format
+msgid "option %s: invalid choice: %r (choose from %s)"
+msgstr ""
+
+#: /usr/lib/python3.5/getopt.py /usr/lib/python3.6/getopt.py
+#: /usr/lib/python3.7/getopt.py
+#, python-format
+msgid "option -%s not recognized"
+msgstr ""
+
+#: /usr/lib/python3.5/getopt.py /usr/lib/python3.6/getopt.py
+#: /usr/lib/python3.7/getopt.py
+#, python-format
+msgid "option -%s requires argument"
+msgstr ""
+
+#: /usr/lib/python3.5/getopt.py /usr/lib/python3.6/getopt.py
+#: /usr/lib/python3.7/getopt.py
+#, python-format
+msgid "option --%s must not have an argument"
+msgstr ""
+
+#: /usr/lib/python3.5/getopt.py /usr/lib/python3.6/getopt.py
+#: /usr/lib/python3.7/getopt.py
+#, python-format
+msgid "option --%s not a unique prefix"
+msgstr ""
+
+#: /usr/lib/python3.5/getopt.py /usr/lib/python3.6/getopt.py
+#: /usr/lib/python3.7/getopt.py
+#, python-format
+msgid "option --%s not recognized"
+msgstr ""
+
+#: /usr/lib/python3.5/getopt.py /usr/lib/python3.6/getopt.py
+#: /usr/lib/python3.7/getopt.py
+#, python-format
+msgid "option --%s requires argument"
+msgstr ""
+
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
+msgid "optional arguments"
+msgstr ""
 
 #: ../fdroidserver/nightly.py
 #, python-brace-format
 msgid "overwriting existing {path}"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "positional arguments"
 msgstr ""
 
@@ -2379,53 +2424,42 @@ msgstr ""
 msgid "process log deploy {path} to {dest} failed!"
 msgstr ""
 
-#: ../fdroidserver/build.py
-msgid "reference binary missing signature"
-msgstr ""
-
 #: ../fdroidserver/signatures.py
 #, python-brace-format
 msgid "refuse downloading via insecure HTTP connection (use HTTPS or specify --no-https-check): {apkfilename}"
 msgstr ""
 
+#: ../fdroidserver/signatures.py
+#, python-brace-format
+msgid "refuse downloading via insecure http connection (use https or specify --no-https-check): {apkfilename}"
+msgstr ""
+
 #: ../fdroidserver/index.py
 #, python-format
-msgid "repo_icon \"repo/icons/%s\" does not exist, generating placeholder."
+msgid "repo_icon %s does not exist, generating placeholder."
 msgstr ""
 
-#: ../fdroidserver/common.py
-msgid "repo_url needs to end with /repo"
+#: ../fdroidserver/metadata.py
+msgid "ruamel.yaml not installed, can not write metadata."
 msgstr ""
 
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "rsync is missing or broken: {error}"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "s3cmd sync indexes {path} to {url} and delete"
 msgstr ""
 
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "s3cmd syncs indexes from {path} to {url} and deletes removed"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "scanner cache is malformed! You can clear it with: '{clear}'"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "serverwebroot: path does not end with \"fdroid\", perhaps you meant one of these:"
-msgstr ""
-
 #: ../fdroidserver/scanner.py
 msgid "shared library"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "show program's version number and exit"
+msgstr ""
+
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.5/optparse.py
+#: /usr/lib/python3.6/argparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/argparse.py /usr/lib/python3.7/optparse.py
 msgid "show this help message and exit"
 msgstr ""
 
@@ -2454,31 +2488,31 @@ msgstr ""
 msgid "static library"
 msgstr ""
 
-#: ../fdroidserver/build.py
+#: ../fdroidserver/common.py
 #, python-brace-format
-msgid "supplied reference binary has allowed signer {signer}"
+msgid "supplied timestamp value '{timestamp}' is not a unix timestamp"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "the following arguments are required: %s"
 msgstr ""
 
-#: ../fdroidserver/install.py
-msgid "true"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "unexpected option string: %s"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "unknown parser %(parser_name)r (choices: %(choices)s)"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "unrecognized arguments: %s"
 msgstr ""
@@ -2488,11 +2522,16 @@ msgstr ""
 msgid "unsafe permissions on '{config_file}' (should be 0600)!"
 msgstr ""
 
-#: ../fdroidserver/__main__.py /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py ../fdroid
+#: /usr/lib/python3.7/argparse.py ../fdroidserver/__main__.py
 msgid "usage: "
 msgstr ""
 
-#: ../fdroidserver/deploy.py
+#: ../fdroid
+msgid "usage: fdroid [-h|--help|--version] <command> [<args>]"
+msgstr ""
+
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "using Apache libcloud to sync with {url}"
 msgstr ""
@@ -2501,8 +2540,8 @@ msgstr ""
 msgid "virustotal.com is rate limiting, waiting to retry..."
 msgstr ""
 
-#: ../fdroidserver/install.py
-msgid "yes"
+#: ../fdroidserver/update.py
+msgid "wiki support is deprecated and will be removed in the next release!"
 msgstr ""
 
 #: ../fdroidserver/publish.py
@@ -2517,19 +2556,31 @@ msgstr[1] ""
 msgid "{apkfilename} ({appid}) has no metadata!"
 msgstr ""
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
+#: ../fdroidserver/update.py
+#, python-brace-format
+msgid "{apkfilename} has multiple {name} files, looks like Master Key exploit!"
+msgstr ""
+
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "{apkfilename}'s AndroidManifest.xml has a bad date: "
 msgstr ""
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "{appid} does not have a name! Using application ID instead."
 msgstr ""
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
+#: ../fdroidserver/update.py
+#, python-brace-format
+msgid "{appid} does not have a name! Using package name instead."
+msgstr ""
+
+#: ../fdroidserver/update.py
+#, python-brace-format
+msgid "{appid} from {path} is not a valid Android Package Name!"
+msgstr ""
+
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "{appid} from {path} is not a valid Android application ID!"
@@ -2540,16 +2591,12 @@ msgstr ""
 msgid "{appid} from {path} is not a valid Java Package Name!"
 msgstr ""
 
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{appid} has both APKs and files: {files}"
-msgstr ""
-
 #: ../fdroidserver/mirror.py
 #, python-brace-format
 msgid "{appid} is missing {name}"
 msgstr ""
 
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "{appid}: Unknown extlib {path} in build '{versionName}'"
@@ -2577,7 +2624,7 @@ msgstr ""
 
 #: ../fdroidserver/metadata.py
 #, python-brace-format
-msgid "{build_flag} must be list or string, found: {value}"
+msgid "{field} not terminated in {name}"
 msgstr ""
 
 #: ../fdroidserver/metadata.py
@@ -2587,15 +2634,10 @@ msgstr ""
 
 #: ../fdroidserver/update.py
 #, python-brace-format
-msgid "{name} \"{section}/icons/{path}\" does not exist! Check \"config.yml\"."
+msgid "{name} \"{path}\" does not exist! Correct it in config.py."
 msgstr ""
 
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{path1} is a duplicate of {path2}, remove one!"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 #, python-brace-format
 msgid "{path} already exists, ignoring import results!"
 msgstr ""
@@ -2610,36 +2652,6 @@ msgstr ""
 msgid "{path} has bad file signature \"{pattern}\", possible Janus exploit!"
 msgstr ""
 
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "{path} has been flagged by virustotal {count} times:"
-msgstr ""
-
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "{path} has the wrong fingerprint ({fingerprint})!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "{path} is not \"key: value\" dict, but a {datatype}!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "{path} is not a standard config file!"
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "{path} is not list, but a {datatype}!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "{path} is not {expected_type}, but a {datatype}!"
-msgstr ""
-
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "{path} is zero size!"
@@ -2650,22 +2662,12 @@ msgstr ""
 msgid "{path} more than 200MB, manually upload: {url}"
 msgstr ""
 
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "{path}: \"{code}\" is not a valid ISO_3166-1 alpha-2 country code!"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{path}: {error}"
-msgstr ""
-
 #: ../fdroidserver/mirror.py
 #, python-brace-format
 msgid "{url} does not end with \"fdroid\", check the URL path!"
 msgstr ""
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/common.py
 #, python-brace-format
 msgid "{url} does not start with \"http\"!"
 msgstr ""
diff --git a/locale/ug/LC_MESSAGES/fdroidserver.po b/locale/ug/LC_MESSAGES/fdroidserver.po
index 82346c03..c3fa98a6 100644
--- a/locale/ug/LC_MESSAGES/fdroidserver.po
+++ b/locale/ug/LC_MESSAGES/fdroidserver.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fdroidserver 1.0.0-95-gd7af22b\n"
 "Report-Msgid-Bugs-To: https://gitlab.com/fdroid/fdroidserver/issues\n"
-"POT-Creation-Date: 2025-06-25 09:52+0200\n"
+"POT-Creation-Date: 2020-10-21 18:05+0200\n"
 "PO-Revision-Date: 2018-06-08 03:44+0000\n"
 "Last-Translator: ۋولقان <nureliosman@gmail.com>\n"
 "Language-Team: Uyghur <https://hosted.weblate.org/projects/f-droid/fdroidserver/ug/>\n"
@@ -17,6 +17,22 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 3.0\n"
 
+#: ../fdroidserver/common.py
+msgid ""
+"\n"
+"        This is a repository of apps to be used with FDroid. Applications in this\n"
+"        repository are either official binaries built by the original application\n"
+"        developers, or are binaries built from source by f-droid.org using the\n"
+"        tools on https://gitlab.com/fdroid.\n"
+"        "
+msgstr ""
+
+#: ../fdroidserver/nightly.py
+msgid ""
+"\n"
+"SSH Public Key to be used as Deploy Key:"
+msgstr ""
+
 #: ../fdroidserver/nightly.py
 msgid ""
 "\n"
@@ -35,26 +51,22 @@ msgstr ""
 msgid "\"%s/\" has no matching metadata file!"
 msgstr ""
 
-#: ../fdroidserver/index.py
-msgid "\"isPrimary\" key should not be added to mirrors!"
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "\"local_copy_dir\" {path} does not exist!"
-msgstr ""
-
 #: ../fdroidserver/install.py
 #, python-brace-format
 msgid "\"{apkfilename}\" is already installed on {dev}."
 msgstr ""
 
+#: ../fdroidserver/update.py
+#, python-brace-format
+msgid "\"{path}\" contains outdated {name} ({version})"
+msgstr ""
+
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "\"{path}\" contains recent {name} ({version})"
 msgstr ""
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "\"{path}\" exists but s3cmd is not installed!"
 msgstr ""
@@ -64,24 +76,33 @@ msgstr ""
 msgid "\"{path}\" is not a supported file format (use: metadata/*.yml)"
 msgstr ""
 
-#: ../fdroidserver/update.py
+#: ../fdroidserver/metadata.py
 #, python-brace-format
-msgid "\"{path}\" is signed by a key that is not allowed:"
+msgid "\"{path}\" is not an accepted format, convert to: {formats}"
 msgstr ""
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/common.py
 #, python-brace-format
 msgid "\"{url}\" is not a valid URL!"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
 #, python-format
-msgid "%(prog)s: error: %(message)s\n"
+msgid "%(option)s option requires %(number)d argument"
+msgid_plural "%(option)s option requires %(number)d arguments"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../fdroidserver/mirror.py
+#, python-format
+msgid "%(prog)s [options] url"
 msgstr ""
 
-#: ../fdroidserver/publish.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
-msgid "%d APKs failed to be signed or verified!"
+msgid "%(prog)s: error: %(message)s\n"
 msgstr ""
 
 #: ../fdroidserver/scanner.py
@@ -89,52 +110,63 @@ msgstr ""
 msgid "%d problems found"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "%prog [options]"
+msgstr ""
+
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "%r is not callable"
 msgstr ""
 
-#: ../fdroidserver/signindex.py
-#, python-format
-msgid "%s did not produce a dict!"
-msgstr ""
-
-#: ../fdroidserver/signindex.py
-#, python-format
-msgid "%s has bad SHA-256: %s"
-msgstr ""
-
 #: ../fdroidserver/lint.py
 #, python-format
 msgid "%s is not an accepted build field"
 msgstr ""
 
-#: ../fdroidserver/common.py
-msgid "'keypass' not found in config.yml!"
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, python-format
+msgid "%s option does not take a value"
+msgstr ""
+
+#: ../fdroidserver/index.py ../fdroidserver/common.py
+msgid "'keypass' not found in config.py!"
 msgstr ""
 
 #: ../fdroidserver/common.py
 msgid "'keystore' is NONE and 'smartcardoptions' is blank!"
 msgstr ""
 
-#: ../fdroidserver/common.py
-msgid "'keystore' not found in config.yml!"
+#: ../fdroidserver/index.py ../fdroidserver/common.py
+msgid "'keystore' not found in config.py!"
 msgstr ""
 
-#: ../fdroidserver/common.py
-msgid "'keystorepass' not found in config.yml!"
+#: ../fdroidserver/index.py ../fdroidserver/common.py
+msgid "'keystorepass' not found in config.py!"
 msgstr ""
 
-#: ../fdroidserver/common.py
-msgid "'repo_keyalias' not found in config.yml!"
+#: ../fdroidserver/index.py ../fdroidserver/common.py
+msgid "'repo_keyalias' not found in config.py!"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "'required' is an invalid argument for positionals"
 msgstr ""
 
 #: ../fdroidserver/common.py
-msgid "'sdk_path' not set in config.yml!"
+msgid "'sdk_path' not set in 'config.py'!"
+msgstr ""
+
+#. Translators: "build-tools" is the file name of a package from
+#. Google, it is part of the Android SDK. So it probably shouldn't be
+#. translated or transliterated.
+#: ../fdroidserver/common.py
+#, python-brace-format
+msgid "'{aapt}' is too old, fdroid requires build-tools-23.0.0 or newer!"
 msgstr ""
 
 #: ../fdroidserver/common.py
@@ -142,6 +174,21 @@ msgstr ""
 msgid "'{aapt}' is too old, fdroid requires build-tools-{version} or newer!"
 msgstr ""
 
+#: ../fdroidserver/install.py
+#, python-brace-format
+msgid "'{apkfilename}' is already installed on {dev}."
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "'{field}' in {linedesc} is obsolete, see docs for current fields:"
+msgstr ""
+
+#: ../fdroidserver/common.py
+#, python-brace-format
+msgid "'{field}' will be in random order! Use () or [] brackets if order is important!"
+msgstr ""
+
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "'{path}' failed to execute!"
@@ -149,32 +196,23 @@ msgstr ""
 
 #: ../fdroidserver/metadata.py
 #, python-brace-format
-msgid "'{path}' has invalid format, it should be a dictionary!"
-msgstr ""
-
-#: ../fdroidserver/lint.py ../fdroidserver/metadata.py
-#, python-brace-format
 msgid "'{value}' is not a valid {field} in {appid}. Regex pattern: {pattern}"
 msgstr ""
 
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "'{value}' is not a valid {field}, should be {pattern}"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "--merge-request only runs on a single appid!"
-msgstr ""
-
 #: ../fdroidserver/checkupdates.py
 #, python-brace-format
 msgid "...checkupdate failed for {appid} : {error}"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid ".__call__() not defined"
 msgstr ""
 
+#: ../fdroidserver/metadata.py
+msgid ".fdroid.txt is not supported!  Convert to .fdroid.yml or .fdroid.json."
+msgstr ""
+
 #: ../fdroidserver/lint.py
 msgid "/issues is missing"
 msgstr ""
@@ -183,13 +221,12 @@ msgstr ""
 msgid "A URL is required as an argument!"
 msgstr ""
 
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "APK signatures have different certificates in {path}:"
+#: ../fdroid ../fdroidserver/__main__.py
+msgid "Add PGP signatures using GnuPG for packages in repo"
 msgstr ""
 
-#: ../fdroidserver/__main__.py
-msgid "Add PGP signatures using GnuPG for packages in repo"
+#: ../fdroid ../fdroidserver/__main__.py
+msgid "Add a new application from its source code"
 msgstr ""
 
 #: ../fdroidserver/update.py
@@ -209,11 +246,7 @@ msgstr ""
 msgid "Alias of the repo signing key in the keystore"
 msgstr ""
 
-#: ../fdroidserver/build.py
-msgid "AllowedAPKSigningKeys missing but reference binary supplied"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "Allows a different revision (or git branch) to be specified for the initial import"
 msgstr ""
 
@@ -237,9 +270,13 @@ msgstr ""
 msgid "Android DEX code"
 msgstr ""
 
-#: ../fdroidserver/init.py
+#: ../fdroidserver/common.py ../fdroidserver/build.py
 #, python-brace-format
-msgid "Android SDK not found at {path}!"
+msgid "Android SDK '{path}' does not have '{dirname}' installed!"
+msgstr ""
+
+#: ../fdroidserver/common.py
+msgid "Android SDK not found!"
 msgstr ""
 
 #: ../fdroidserver/common.py
@@ -252,17 +289,16 @@ msgstr ""
 msgid "Android SDK path '{path}' is not a directory!"
 msgstr ""
 
+#. Translators: "build-tools" is the file name of a package from
+#. Google, it is part of the Android SDK. So it probably shouldn't be
+#. translated or transliterated.
 #: ../fdroidserver/common.py
 #, python-brace-format
-msgid "Android SDK tool {cmd} not found!"
+msgid "Android build-tools path '{path}' does not exist!"
 msgstr ""
 
-#: ../fdroidserver/lint.py
-msgid "App has Binaries but does not have corresponding AllowedAPKSigningKeys to pin certificate."
-msgstr ""
-
-#: ../fdroidserver/lint.py
-msgid "App has NoSourceSince or ArchivePolicy \"0 versions\" or 0 but AutoUpdateMode or UpdateCheckMode are not None"
+#: ../fdroidserver/update.py
+msgid "AndroidManifest.xml has no date"
 msgstr ""
 
 #: ../fdroidserver/lint.py
@@ -270,10 +306,6 @@ msgstr ""
 msgid "App is in '{repo}' but has a link to {url}"
 msgstr ""
 
-#: ../fdroidserver/lint.py
-msgid "App version has binary but does not have corresponding AllowedAPKSigningKeys to pin certificate."
-msgstr ""
-
 #: ../fdroidserver/lint.py
 msgid "Appending .git is not necessary"
 msgstr ""
@@ -283,27 +315,11 @@ msgstr ""
 msgid "Archiving {apkfilename} with invalid signature!"
 msgstr ""
 
-#: ../fdroidserver/lint.py
-msgid "AutoUpdateMode with UpdateCheckMode: HTTP must have a pattern."
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "Automatic no to all prompts."
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "Automatic yes to all prompts."
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "Bad entry type \"{mirrortype}\" in mirrors config: {mirror}"
-msgstr ""
-
 #: ../fdroidserver/mirror.py
 msgid "Base URL to mirror, can include the index signing key using the query string: ?fingerprint="
 msgstr ""
 
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "Branch '{branch}' used as commit in build '{versionName}'"
@@ -319,7 +335,7 @@ msgstr ""
 msgid "Broken symlink: {path}"
 msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Build a package from source"
 msgstr "مەنبەدىن بىر بوغچا قۇرۇش"
 
@@ -339,24 +355,31 @@ msgstr ""
 msgid "Build only the latest version of each package"
 msgstr ""
 
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Build should have comma-separated versionName and versionCode, not \"{value}\", in {linedesc}"
+msgstr ""
+
 #: ../fdroidserver/init.py
 #, python-format
 msgid "Built repo based in \"%s\" with this config:"
 msgstr ""
 
-#: ../fdroidserver/checkupdates.py
-msgid "Can't auto-update app with no CurrentVersionCode"
-msgstr ""
-
 #: ../fdroidserver/build.py
 msgid "Can't build due to {} error while scanning"
 msgid_plural "Can't build due to {} errors while scanning"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../fdroidserver/common.py
+#: ../fdroidserver/vmtools.py
 #, python-brace-format
-msgid "Cannot read {path}: {error}"
+msgid "Cannot read \"{path}\"!"
+msgstr ""
+
+#. Translators: https://developer.android.com/studio/build/application-id
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Cannot resolve application ID {appid}"
 msgstr ""
 
 #: ../fdroidserver/rewritemeta.py
@@ -364,23 +387,25 @@ msgstr ""
 msgid "Cannot rewrite \"{path}\""
 msgstr ""
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
+#: ../fdroidserver/rewritemeta.py
+msgid "Cannot use --list and --to at the same time"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Cannot write \"{path}\", not an accepted format, use: {formats}"
+msgstr ""
+
 #: ../fdroidserver/lint.py
 #, fuzzy, python-format
 msgid "Categories '%s' is not valid"
 msgstr "تۈرلەر قۇرۇلمىغان '%s'"
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
 #: ../fdroidserver/lint.py
 msgid "Categories are not set"
 msgstr "تۈرلەر قۇرۇلمىغان"
 
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "Category \"{category}\" defined but not used for any apps!"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Check for updates to applications"
 msgstr ""
 
@@ -389,20 +414,28 @@ msgstr ""
 msgid "Checking archiving for {appid} - apks:{integer}, keepversions:{keep}, archapks:{arch}"
 msgstr ""
 
+#: ../fdroidserver/dscanner.py
+msgid "Clean after all scans have finished"
+msgstr ""
+
+#: ../fdroidserver/dscanner.py
+msgid "Clean before the scans start and rebuild the container"
+msgstr ""
+
+#: ../fdroidserver/dscanner.py
+msgid "Clean up all containers and then exit"
+msgstr ""
+
 #: ../fdroidserver/update.py
 msgid "Clean update - don't uses caches, reprocess all APKs"
 msgstr ""
 
-#: ../fdroidserver/common.py
-msgid "Color the log output"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "Comma separated list of categories."
 msgstr ""
 
-#: ../fdroidserver/__main__.py
-#, python-format
+#: ../fdroid ../fdroidserver/__main__.py
+#, c-format, python-format
 msgid "Command '%s' not recognised.\n"
 msgstr ""
 
@@ -410,15 +443,6 @@ msgstr ""
 msgid "Commit changes"
 msgstr ""
 
-#: ../fdroidserver/checkupdates.py
-msgid "Commit changes, push, then make a merge request"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Conflicting \"{field}\" definitions between .yml and localized files:"
-msgstr ""
-
 #: ../fdroidserver/__main__.py
 msgid "Conflicting arguments: '--verbose' and '--quiet' can not be specified at the same time."
 msgstr ""
@@ -428,13 +452,11 @@ msgstr ""
 msgid "Could not find '{command}' on your system"
 msgstr ""
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "Could not find latest version code"
 msgstr ""
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "Could not find latest version name"
 msgstr ""
 
@@ -444,8 +466,7 @@ msgid "Could not find {path} to remove it"
 msgstr ""
 
 #: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Could not open APK {path} for analysis: "
+msgid "Could not open apk file for analysis"
 msgstr ""
 
 #: ../fdroidserver/common.py
@@ -453,16 +474,22 @@ msgstr ""
 msgid "Could not parse size \"{size}\", wrong type \"{type}\""
 msgstr ""
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/import_subcommand.py
+#. Translators: https://developer.android.com/studio/build/application-id
+#: ../fdroidserver/import.py
 msgid "Couldn't find Application ID"
 msgstr ""
 
-#: ../fdroidserver/checkupdates.py
-msgid "Couldn't find any version information"
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
+#: ../fdroidserver/import.py
+msgid "Couldn't find latest version code"
 msgstr ""
 
-#: ../fdroidserver/checkupdates.py
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
+#: ../fdroidserver/import.py
+msgid "Couldn't find latest version name"
+msgstr ""
+
+#: ../fdroidserver/import.py
 msgid "Couldn't find package ID"
 msgstr ""
 
@@ -470,26 +497,29 @@ msgstr ""
 msgid "Cowardily refusing to overwrite existing signing key setup!"
 msgstr ""
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/update.py
+msgid "Create a repo signing key in a keystore"
+msgstr ""
+
+#: ../fdroidserver/update.py
+msgid "Create skeleton metadata files that are missing"
+msgstr ""
+
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Created new container \"{name}\""
 msgstr ""
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Creating \"{path}\" for configuring s3cmd."
 msgstr ""
 
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Creating empty {config_file}"
-msgstr ""
-
 #: ../fdroidserver/publish.py
 msgid "Creating log directory"
 msgstr ""
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Creating new S3 bucket: {url}"
 msgstr ""
@@ -502,7 +532,8 @@ msgstr ""
 msgid "Creating signed index with this key (SHA256):"
 msgstr ""
 
-#: ../fdroidserver/publish.py ../fdroidserver/verify.py
+#: ../fdroidserver/import.py ../fdroidserver/verify.py
+#: ../fdroidserver/publish.py
 msgid "Creating temporary directory"
 msgstr ""
 
@@ -548,21 +579,16 @@ msgid "Description has a duplicate line"
 msgstr ""
 
 #: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Description of length {length} is over the {limit} char limit"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Did you mean config/{name}.yml?"
+#, python-format
+msgid "Description has a list (%s) but it isn't bulleted (*) nor numbered (#)"
 msgstr ""
 
 #: ../fdroidserver/lint.py
 #, python-brace-format
-msgid "Did you mean {code}?"
+msgid "Description of length {length} is over the {limit} char limit"
 msgstr ""
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "Do not add 'disable:' to the generated build entries"
 msgstr ""
 
@@ -587,20 +613,25 @@ msgstr ""
 msgid "Don't create a source tarball, useful when testing a build"
 msgstr ""
 
+#: ../fdroidserver/stats.py
+msgid "Don't do anything logs-related"
+msgstr ""
+
 #: ../fdroidserver/build.py
 msgid "Don't refresh the repository, useful when testing a build with no internet connection"
 msgstr ""
 
 #: ../fdroidserver/deploy.py ../fdroidserver/nightly.py
+#: ../fdroidserver/upload.py
 msgid "Don't use rsync checksums"
 msgstr ""
 
-#: ../fdroidserver/install.py
-msgid "Download F-Droid.apk using mirrors that leak less to the network"
+#: ../fdroid ../fdroidserver/__main__.py
+msgid "Download complete mirrors of small repos"
 msgstr ""
 
-#: ../fdroidserver/__main__.py
-msgid "Download complete mirrors of small repos"
+#: ../fdroidserver/stats.py
+msgid "Download logs we don't have"
 msgstr ""
 
 #: ../fdroidserver/common.py
@@ -614,12 +645,7 @@ msgstr ""
 
 #: ../fdroidserver/metadata.py
 #, python-brace-format
-msgid "Duplicate Anti-Feature declaration at {path} was ignored!"
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-format
-msgid "Duplicate entry \"%s\" in mirrors config!"
+msgid "Duplicate build recipe found for versionCode {versionCode} in {linedesc}"
 msgstr ""
 
 #: ../fdroidserver/lint.py
@@ -627,42 +653,27 @@ msgstr ""
 msgid "Duplicate link in '{field}': {url}"
 msgstr ""
 
-#: ../fdroidserver/common.py
-#, python-format
-msgid "ERROR: %(message)s"
+#: ../fdroid
+msgid "Dynamically scan APKs post build"
 msgstr ""
 
 #: ../fdroidserver/__main__.py
 msgid "ERROR: The \"server\" subcommand has been removed, use \"deploy\"!"
 msgstr ""
 
+#: ../fdroidserver/mirror.py
+msgid ""
+"ERROR: this command should never be used to mirror f-droid.org!\n"
+"A full mirror of f-droid.org requires more than 200GB."
+msgstr ""
+
 #: ../fdroidserver/nightly.py
 msgid "ERROR: unsupported CI type, patches welcome!"
 msgstr ""
 
-#: ../fdroidserver/nightly.py
-#, python-format
-msgid "ERROR: unsupported git host \"%s\", patches welcome!"
-msgstr ""
-
-#: ../fdroidserver/lint.py
+#: ../fdroidserver/metadata.py
 #, python-brace-format
-msgid "ERROR: {key} in {path} is not \"archive\" or \"repo\"!"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "ERROR: {key} not a valid key!"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "ERROR: {key}'s value should be of type {t}!"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "ERROR: {key}:{subkey} in {path} is not in allowed keys: {allowed_keys}!"
+msgid "Empty build flag at {linedesc}"
 msgstr ""
 
 #: ../fdroidserver/__main__.py
@@ -677,40 +688,20 @@ msgid ""
 "> "
 msgstr ""
 
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Environment variable {var} from {configname} is not set!"
+#: ../fdroidserver/deploy.py ../fdroidserver/checkupdates.py
+#: ../fdroidserver/upload.py
+#, python-format
+msgid "Error while attempting to publish log: %s"
 msgstr ""
 
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Environment variable {{env: {var}}} is not set!"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "Error deploying 'github_releases', {} not present. (You might need to run `fdroid update` first.)"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py ../fdroidserver/common.py
 msgid "Error while getting repo address"
 msgstr ""
 
-#: ../fdroidserver/scanner.py
-msgid "Exit with a non-zero code if problems were found"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
-msgid "Extract application metadata from a source repository"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Extract signatures from APKs"
 msgstr ""
 
-#: ../fdroidserver/install.py
-msgid "F-Droid.apk could not be downloaded from any known source!"
-msgstr ""
-
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Failed copying {path}: {error}"
@@ -731,23 +722,27 @@ msgstr ""
 msgid "Failed resizing {path}: {error}"
 msgstr ""
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/publish.py
+msgid "Failed to align application"
+msgstr ""
+
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Failed to create S3 bucket: {url}"
 msgstr ""
 
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Failed to get APK information, deleting {path}"
+#: ../fdroidserver/common.py
+msgid "Failed to get APK manifest information"
 msgstr ""
 
 #: ../fdroidserver/update.py
 #, python-brace-format
-msgid "Failed to get APK information, skipping {path}"
+msgid "Failed to get apk information, deleting {path}"
 msgstr ""
 
 #: ../fdroidserver/update.py
-msgid "Failed to get APK signing key fingerprint"
+#, python-brace-format
+msgid "Failed to get apk information, skipping {path}"
 msgstr ""
 
 #: ../fdroidserver/install.py
@@ -755,10 +750,14 @@ msgstr ""
 msgid "Failed to install '{apkfilename}' on {dev}: {error}"
 msgstr ""
 
-#: ../fdroidserver/common.py
+#: ../fdroidserver/publish.py ../fdroidserver/common.py
 msgid "Failed to sign application"
 msgstr ""
 
+#: ../fdroidserver/common.py
+msgid "Failed to zipalign application"
+msgstr ""
+
 #: ../fdroidserver/build.py
 #, python-brace-format
 msgid "Fetched buildserverid from VM: {buildserverid}"
@@ -774,12 +773,21 @@ msgstr ""
 msgid "File disappeared while processing it: {path}"
 msgstr ""
 
-#: ../fdroidserver/build.py ../fdroidserver/install.py
-#: ../fdroidserver/rewritemeta.py ../fdroidserver/scanner.py
-#: ../fdroidserver/update.py
+#: ../fdroidserver/verify.py ../fdroidserver/stats.py ../fdroidserver/update.py
+#: ../fdroidserver/rewritemeta.py ../fdroidserver/build.py
+#: ../fdroidserver/checkupdates.py ../fdroidserver/scanner.py
+#: ../fdroidserver/install.py
 msgid "Finished"
 msgstr ""
 
+#: ../fdroidserver/lint.py
+msgid "Flattr donation methods belong in the FlattrID flag"
+msgstr ""
+
+#: ../fdroidserver/lint.py
+msgid "Flattr donation methods belong in the FlattrID: field"
+msgstr ""
+
 #: ../fdroidserver/lint.py
 msgid "Forbidden HTML tags"
 msgstr ""
@@ -811,6 +819,7 @@ msgstr ""
 msgid "Found invalid appids in arguments"
 msgstr ""
 
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
 #: ../fdroidserver/common.py
 msgid "Found invalid versionCodes for some apps"
 msgstr ""
@@ -820,10 +829,6 @@ msgstr ""
 msgid "Found multiple JAR Signature Block Files in {path}"
 msgstr ""
 
-#: ../fdroidserver/common.py
-msgid "Found multiple Signer Certificates!"
-msgstr ""
-
 #: ../fdroidserver/metadata.py
 #, python-brace-format
 msgid "Found multiple metadata files for {appid}"
@@ -833,6 +838,11 @@ msgstr ""
 msgid "Found multiple signing certificates for repository."
 msgstr ""
 
+#: ../fdroidserver/update.py
+#, python-brace-format
+msgid "Found multiple signing certificates in {path}"
+msgstr ""
+
 #: ../fdroidserver/index.py
 msgid "Found no signing certificates for repository."
 msgstr ""
@@ -847,16 +857,6 @@ msgstr ""
 msgid "Found {apkfilename} at {url}"
 msgstr ""
 
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Found {count} problems in {filename}"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Found {count} warnings in {filename}"
-msgstr ""
-
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Generated skeleton metadata for {appid}"
@@ -875,21 +875,19 @@ msgstr ""
 msgid "Git fetch failed"
 msgstr ""
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
+#: ../fdroidserver/common.py
+msgid "Git remote set-head failed"
+msgstr ""
+
 #: ../fdroidserver/common.py
 #, python-format
 msgid "Git remote set-head failed: \"%s\""
 msgstr ""
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
 #: ../fdroidserver/common.py
 msgid "Git reset failed"
 msgstr ""
 
-#: ../fdroidserver/common.py
-msgid "Git submodule deinit failed"
-msgstr ""
-
 #: ../fdroidserver/common.py
 msgid "Git submodule sync failed"
 msgstr ""
@@ -921,16 +919,6 @@ msgstr ""
 msgid "Ignoring FUNDING.yml entry longer than 2048: %s"
 msgstr ""
 
-#: ../fdroidserver/update.py
-#, python-format
-msgid "Ignoring bad element in manifest: %s"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Ignoring deprecated {oldfile}, use {newfile}!"
-msgstr ""
-
 #: ../fdroidserver/index.py
 msgid "Ignoring package without metadata: "
 msgstr ""
@@ -940,6 +928,11 @@ msgstr ""
 msgid "Ignoring stale cache data for {apkfilename}"
 msgstr ""
 
+#: ../fdroidserver/rewritemeta.py
+#, python-brace-format
+msgid "Ignoring {ext} file at '{path}'"
+msgstr ""
+
 #: ../fdroidserver/update.py
 msgid "Include APKs that are signed with disabled algorithms like MD5"
 msgstr ""
@@ -956,16 +949,6 @@ msgstr ""
 msgid "Include the source tarballs in the mirror"
 msgstr ""
 
-#: ../fdroidserver/metadata.py
-#, python-format
-msgid "Including metadata from %s@%s"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Including metadata from {path}"
-msgstr ""
-
 #: ../fdroidserver/common.py
 msgid "Initialising submodules"
 msgstr ""
@@ -974,7 +957,7 @@ msgstr ""
 msgid "Install all signed applications available"
 msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Install built packages on devices"
 msgstr ""
 
@@ -983,12 +966,22 @@ msgstr ""
 msgid "Installing %s..."
 msgstr ""
 
+#: ../fdroidserver/install.py
+#, python-format
+msgid "Installing %s…"
+msgstr ""
+
 #: ../fdroidserver/install.py
 #, python-brace-format
 msgid "Installing '{apkfilename}' on {dev}..."
 msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroidserver/install.py
+#, python-brace-format
+msgid "Installing '{apkfilename}' on {dev}…"
+msgstr ""
+
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Interact with the repo HTTP server"
 msgstr ""
 
@@ -996,36 +989,53 @@ msgstr ""
 msgid "Invalid APK"
 msgstr ""
 
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "Invalid AutoUpdateMode: {mode}"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "Invalid UpdateCheckMode: {mode}"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
+#: ../fdroidserver/lint.py ../fdroidserver/checkupdates.py
 #, python-brace-format
 msgid "Invalid VercodeOperation: {field}"
 msgstr ""
 
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Invalid VercodeOperation: {invalid_ops}"
-msgstr ""
-
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
 #: ../fdroidserver/common.py
 #, fuzzy, python-brace-format
 msgid "Invalid application ID {appid}"
 msgstr "{appid} ئىچىدە \"سىنبەلگە\" تېپىلمىدى"
 
+#: ../fdroidserver/metadata.py
+#, python-format
+msgid "Invalid boolean '%s'"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Invalid build flag at {line} in {linedesc}"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Invalid build format: {value} in {name}"
+msgstr ""
+
 #: ../fdroidserver/lint.py
 msgid "Invalid bulleted list"
 msgstr ""
 
+#: ../fdroidserver/lint.py
+#, python-format
+msgid "Invalid license tag \"%s\"! Use only tags from https://spdx.org/license-list"
+msgstr ""
+
+#: ../fdroidserver/lint.py
+msgid "Invalid link - use [http://foo.bar Link title] or [http://foo.bar]"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+#, python-format
+msgid "Invalid metadata in %s:%d"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+msgid "Invalid metadata in: "
+msgstr ""
+
 #: ../fdroidserver/common.py
 #, python-format
 msgid "Invalid name for published file: %s"
@@ -1033,7 +1043,7 @@ msgstr ""
 
 #: ../fdroidserver/common.py
 #, python-brace-format
-msgid "Invalid ndk: entry in build: \"{ndk}\""
+msgid "Invalid package name {0}"
 msgstr ""
 
 #: ../fdroidserver/common.py
@@ -1056,6 +1066,11 @@ msgstr ""
 msgid "Invalid srclib metadata: unknown key '{key}' in '{file}'"
 msgstr ""
 
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Invalid versionCode: \"{versionCode}\" is not an integer!"
+msgstr ""
+
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "JAR signature failed to verify: {path}"
@@ -1070,8 +1085,8 @@ msgstr ""
 msgid "Java JAR file"
 msgstr ""
 
-#: ../fdroidserver/mirror.py ../fdroidserver/publish.py
-#: ../fdroidserver/update.py
+#: ../fdroidserver/publish.py ../fdroidserver/update.py
+#: ../fdroidserver/mirror.py
 msgid "Java JDK not found! Install in standard location or set java_paths!"
 msgstr ""
 
@@ -1087,19 +1102,10 @@ msgstr ""
 msgid "Javascript in HTML src attributes"
 msgstr ""
 
-#: ../fdroidserver/build.py
-#, python-brace-format
-msgid "Keeping failed build \"{apkfilename}\""
-msgstr ""
-
 #: ../fdroidserver/init.py
 msgid "Keystore for signing key:\t"
 msgstr ""
 
-#: ../fdroidserver/lint.py
-msgid "Known debug key is used in AllowedAPKSigningKeys: "
-msgstr ""
-
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "Last used commit '{commit}' looks like a tag, but UpdateCheckMode is '{ucm}'"
@@ -1109,8 +1115,12 @@ msgstr ""
 msgid "Liberapay donation methods belong in the Liberapay: field"
 msgstr ""
 
+#: ../fdroidserver/lint.py
+msgid "Liberapay donation methods belong in the LiberapayID flag"
+msgstr ""
+
 #: ../fdroidserver/rewritemeta.py
-msgid "List files that would be reformatted (dry run)"
+msgid "List files that would be reformatted"
 msgstr ""
 
 #: ../fdroidserver/lint.py
@@ -1129,16 +1139,6 @@ msgstr ""
 msgid "Malformed serverwebroot line:"
 msgstr ""
 
-#: ../fdroidserver/scanner.py
-#, python-format
-msgid "Max recursion depth in ZIP file reached: %s"
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "Mirror config for {url} contains \"isPrimary\" key!"
-msgstr ""
-
 #: ../fdroidserver/mirror.py
 msgid "Mirror the full repo and archive, all file types."
 msgstr ""
@@ -1147,29 +1147,30 @@ msgstr ""
 msgid "Missing output directory"
 msgstr ""
 
-#: ../fdroidserver/metadata.py
-msgid "Moving Anti-Features declarations to localized files:"
-msgstr ""
-
-#: ../fdroidserver/index.py
-msgid "Neither \"repo_pubkey\" nor \"keystorepass\" set in config.yml"
-msgstr ""
-
-#: ../fdroidserver/verify.py
+#: ../fdroidserver/lint.py
 #, python-format
-msgid "No APK for package: %s"
+msgid "Name '%s' is just the auto name - remove it"
+msgstr ""
+
+#: ../fdroidserver/common.py
+msgid "No 'config.py' found, using defaults."
 msgstr ""
 
 #: ../fdroidserver/common.py
 msgid "No Android SDK found!"
 msgstr ""
 
+#: ../fdroidserver/import.py
+msgid "No android or kivy project could be found. Specify --subdir?"
+msgstr ""
+
 #: ../fdroidserver/install.py
 msgid "No attached devices found"
 msgstr ""
 
-#: ../fdroidserver/install.py
-msgid "No devices found for `adb install`! Please plug one in."
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "No commit specified for {versionName} in {linedesc}"
 msgstr ""
 
 #: ../fdroidserver/index.py
@@ -1180,23 +1181,14 @@ msgstr ""
 msgid "No git submodules available"
 msgstr ""
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "No gradle project could be found. Specify --subdir?"
 msgstr ""
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py ../fdroidserver/common.py
 msgid "No information found."
 msgstr ""
 
-#: ../fdroidserver/checkupdates.py
-msgid "No matching tags found"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "No minimum SDK version found in {0}, using default (3)."
-msgstr ""
-
 #: ../fdroidserver/lint.py
 msgid "No need to specify that the app is Free Software"
 msgstr ""
@@ -1206,7 +1198,7 @@ msgid "No need to specify that the app is for Android"
 msgstr ""
 
 #: ../fdroidserver/deploy.py
-msgid "No option set! Edit your config.yml to set at least one of these:"
+msgid "No option set! Edit your config.py to set at least one of these:"
 msgstr ""
 
 #: ../fdroidserver/common.py
@@ -1215,14 +1207,14 @@ msgstr ""
 
 #: ../fdroidserver/install.py
 #, python-format
-msgid "No signed APK available for %s"
+msgid "No signed apk available for %s"
 msgstr ""
 
 #: ../fdroidserver/install.py
 msgid "No signed output directory - nothing to do"
 msgstr ""
 
-#: ../fdroidserver/common.py
+#: ../fdroidserver/update.py ../fdroidserver/common.py
 #, python-brace-format
 msgid "No signing certificates found in {path}"
 msgstr ""
@@ -1232,24 +1224,16 @@ msgstr ""
 msgid "No such package: %s"
 msgstr ""
 
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "No such versionCode {versionCode} for app {appid}"
 msgstr ""
 
-#: ../fdroidserver/checkupdates.py
-msgid "No tags found"
-msgstr ""
-
-#: ../fdroidserver/publish.py ../fdroidserver/verify.py
+#: ../fdroidserver/verify.py ../fdroidserver/publish.py
 msgid "No unsigned directory - nothing to do"
 msgstr ""
 
-#: ../fdroidserver/__main__.py
-#, fuzzy
-msgid "No version information could be found."
-msgstr "نەشىر ئۇچۇرى تېپىلمىدى!"
-
 #: ../fdroidserver/common.py
 msgid "Not a valid size definition: \"{}\""
 msgstr ""
@@ -1264,9 +1248,10 @@ msgid "Nothing to do for {appid}."
 msgstr ""
 
 #: ../fdroidserver/init.py
-msgid "Now set these in config.yml:"
+msgid "Now set these in config.py:"
 msgstr ""
 
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "OBB file has newer versionCode({integer}) than any APK:"
@@ -1284,27 +1269,22 @@ msgstr ""
 msgid "Offline machine, skipping git mirror generation until `fdroid deploy`"
 msgstr ""
 
-#: ../fdroidserver/deploy.py
-msgid "One of the 'github_releases' config items is missing the 'packageNames' value. skipping ..."
+#: ../fdroidserver/common.py
+#, python-brace-format
+msgid "Old APK signature failed to verify: {path}"
 msgstr ""
 
-#: ../fdroidserver/deploy.py
-msgid "One of the 'github_releases' config items is missing the 'projectUrl' value. skipping ..."
+#: ../fdroid ../fdroidserver/__main__.py
+msgid "Old, deprecated name for fdroid deploy"
 msgstr ""
 
-#: ../fdroidserver/deploy.py
-msgid "One of the 'github_releases' config items is missing the 'token' value. skipping ..."
-msgstr ""
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Only PNG and JPEG are supported for graphics, found: {path}"
 msgstr ""
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/common.py
-msgid "Only accepts a single key \"env\""
+#: ../fdroidserver/checkupdates.py
+msgid "Only print differences with the Play Store"
 msgstr ""
 
 #: ../fdroidserver/checkupdates.py
@@ -1315,6 +1295,11 @@ msgstr ""
 msgid "OpenCollective donation methods belong in the OpenCollective: field"
 msgstr ""
 
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "Options"
+msgstr ""
+
 #: ../fdroidserver/verify.py
 msgid "Output JSON report to file named after APK."
 msgstr ""
@@ -1323,22 +1308,26 @@ msgstr ""
 msgid "Output JSON to stdout."
 msgstr ""
 
-#: ../fdroidserver/checkupdates.py ../fdroidserver/gpgsign.py
-#: ../fdroidserver/publish.py ../fdroidserver/signindex.py
-#: ../fdroidserver/update.py
+#: ../fdroidserver/gpgsign.py ../fdroidserver/publish.py
+#: ../fdroidserver/update.py ../fdroidserver/signindex.py
+#: ../fdroidserver/checkupdates.py
 msgid "Outputting JSON"
 msgstr ""
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "Overall license of the project."
 msgstr ""
 
+#: ../fdroidserver/dscanner.py
+msgid "Override path for repo APKs (default: ./repo)"
+msgstr ""
+
 #: ../fdroidserver/index.py
 #, python-brace-format
 msgid "Overriding blank versionName in {apkfilename} from metadata: {version}"
 msgstr ""
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 #, python-brace-format
 msgid "Package \"{appid}\" already exists"
 msgstr ""
@@ -1352,10 +1341,13 @@ msgstr ""
 msgid "Password required with username"
 msgstr ""
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "Path to main Android project subdirectory, if not in root."
 msgstr ""
 
+msgid "Path to main android project subdirectory, if not in root."
+msgstr ""
+
 #: ../fdroidserver/init.py
 msgid "Path to the Android SDK (sometimes set in ANDROID_HOME)"
 msgstr ""
@@ -1368,18 +1360,20 @@ msgstr ""
 msgid "Path to the keystore for the repo signing key"
 msgstr ""
 
+#: ../fdroidserver/dscanner.py
+msgid "Prepare Drozer to run a scan"
+msgstr ""
+
+msgid "Prepare drozer to run a scan"
+msgstr ""
+
 #: ../fdroidserver/nightly.py
 msgid "Print the secret variable to the terminal for easy copy/paste"
 msgstr ""
 
-#: ../fdroidserver/install.py
+#: ../fdroidserver/metadata.py
 #, python-brace-format
-msgid "Privacy mode was enabled based on your locale ({country_code})."
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-format
-msgid "Problem with ZIP file: %s, error %s"
+msgid "Problem with description of {appid}: {error}"
 msgstr ""
 
 #: ../fdroidserver/common.py
@@ -1405,7 +1399,11 @@ msgstr ""
 msgid "Produce human-readable XML/JSON for index files"
 msgstr ""
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/update.py
+msgid "Produce human-readable index.xml"
+msgstr ""
+
+#: ../fdroidserver/import.py
 msgid "Project URL to import from."
 msgstr ""
 
@@ -1417,25 +1415,21 @@ msgstr ""
 msgid "Push the log to this git remote repository"
 msgstr ""
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Pushing binary transparency log to {url}"
 msgstr ""
 
-#: ../fdroidserver/deploy.py
-msgid "Pushing to remote server failed!"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Pushing to {url}"
 msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Quickly start a new repository"
 msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Read all the metadata files and exit"
 msgstr ""
 
@@ -1446,12 +1440,14 @@ msgstr ""
 
 #: ../fdroidserver/common.py
 #, python-brace-format
-msgid "Reading packageName/versionCode/versionName failed, APK invalid: '{apkfilename}'"
+msgid "Reading minSdkVersion failed: \"{apkfilename}\""
 msgstr ""
 
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
+#. https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
 #: ../fdroidserver/common.py
 #, python-brace-format
-msgid "Reading packageName/versionCode/versionName failed,APK invalid: '{apkfilename}'"
+msgid "Reading packageName/versionCode/versionName failed, APK invalid: '{apkfilename}'"
 msgstr ""
 
 #: ../fdroidserver/update.py
@@ -1459,35 +1455,24 @@ msgstr ""
 msgid "Reading {apkfilename} from cache"
 msgstr ""
 
-#: ../fdroidserver/build.py
-msgid "Refresh and cache scanner rules and signatures from the network"
-msgstr ""
-
-#: ../fdroidserver/publish.py
-#, python-brace-format
-msgid "Refusing to sign '{path}', file exists in both {dir1} and {dir2} folder."
-msgstr ""
-
-#: ../fdroidserver/verify.py
-msgid "Remove source tarball and any APKs if successfully verified."
+#: ../fdroidserver/stats.py
+msgid "Recalculate aggregate stats - use when changes have been made that would invalidate old cached data."
 msgstr ""
 
 #: ../fdroidserver/common.py
 msgid "Removing specified files"
 msgstr ""
 
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Removing {path}\""
-msgstr ""
-
 #: ../fdroidserver/update.py
 msgid "Rename APK files that do not match package.name_123.apk"
 msgstr ""
 
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "RepoType {type} is deprecated, please switch to git."
+#: ../fdroidserver/update.py
+msgid "Report on build data status"
+msgstr ""
+
+#: ../fdroidserver/build.py
+msgid "Reset and create a brand new build server, even if the existing one appears to be ok."
 msgstr ""
 
 #: ../fdroidserver/nightly.py
@@ -1503,13 +1488,12 @@ msgstr ""
 msgid "Restrict output to warnings and errors"
 msgstr ""
 
-#: ../fdroidserver/net.py
-#, python-format
-msgid "Retrying failed download: %s"
+#: ../fdroid ../fdroidserver/__main__.py
+msgid "Rewrite all the metadata files"
 msgstr ""
 
-#: ../fdroidserver/__main__.py
-msgid "Rewrite all the metadata files"
+#: ../fdroidserver/rewritemeta.py
+msgid "Rewrite to a specific format: "
 msgstr ""
 
 #: ../fdroidserver/rewritemeta.py
@@ -1517,20 +1501,20 @@ msgstr ""
 msgid "Rewriting '{appid}'"
 msgstr ""
 
-#: ../fdroidserver/checkupdates.py
-msgid "Run on git repo that has uncommitted changes"
+#: ../fdroidserver/rewritemeta.py
+#, python-brace-format
+msgid "Rewriting '{appid}' to '{path}'"
 msgstr ""
 
-#: ../fdroidserver/nightly.py
-#, python-brace-format
-msgid "Run over {cibase} to find -debug.apk. and skip repo_basedir {repo_basedir}"
+#: ../fdroidserver/checkupdates.py
+msgid "Run on git repo that has uncommitted changes"
 msgstr ""
 
 #: ../fdroidserver/lint.py
 msgid "Run rewritemeta to fix formatting"
 msgstr ""
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 msgid "Running first pass with MD5 checking disabled"
 msgstr ""
 
@@ -1539,24 +1523,18 @@ msgstr ""
 msgid "Running wget in {path}"
 msgstr ""
 
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "SHA-256 of {url} does not match entry!"
+#: ../fdroidserver/dscanner.py
+msgid "Scan only the latest version of each package"
 msgstr ""
 
 #: ../fdroidserver/build.py
 msgid "Scan the resulting APK(s) for known non-free classes."
 msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Scan the source code of a package"
 msgstr ""
 
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Scanner found {count} problems in {apk}"
-msgstr ""
-
 #: ../fdroidserver/scanner.py
 #, python-brace-format
 msgid "Scanner found {count} problems in {appid}:"
@@ -1573,19 +1551,6 @@ msgid_plural "Scanner found {} problems"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../fdroidserver/scanner.py
-msgid "Scanning APK for extra signing blocks."
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "Scanning APK with dexdump for known non-free classes."
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Set NDK {release} ({version}) up"
-msgstr ""
-
 #: ../fdroidserver/common.py
 msgid "Set clock to that time using:"
 msgstr ""
@@ -1599,7 +1564,7 @@ msgstr ""
 msgid "Set open file limit to {integer}"
 msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Set up an app build for a nightly build repo"
 msgstr ""
 
@@ -1612,11 +1577,18 @@ msgstr ""
 msgid "Setting {0} sec timeout for this build"
 msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroidserver/build.py
+msgid "Setup an emulator, install the APK on it and perform a Drozer scan"
+msgstr ""
+
+msgid "Setup an emulator, install the apk on it and perform a drozer scan"
+msgstr ""
+
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Sign and place packages in the repo"
 msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Sign indexes created using update --nosign"
 msgstr ""
 
@@ -1629,11 +1601,6 @@ msgstr ""
 msgid "Skipping '{apkfilename}' with invalid signature!"
 msgstr ""
 
-#: ../fdroidserver/deploy.py ../fdroidserver/index.py
-#, python-format
-msgid "Skipping GitLab Pages mirror because the repo is too large (>%.2fGB)!"
-msgstr ""
-
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Skipping index generation for {appid}"
@@ -1649,14 +1616,23 @@ msgstr ""
 msgid "Skipping {appid}: disabled"
 msgstr ""
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/scanner.py
+#, python-brace-format
+msgid "Skipping {appid}: no builds specified"
+msgstr ""
+
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 msgid "Specify a local folder to sync the repo to"
 msgstr ""
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 msgid "Specify an identity file to provide to SSH for rsyncing"
 msgstr ""
 
+#: ../fdroidserver/build.py
+msgid "Specify that we're running on the build server"
+msgstr ""
+
 #: ../fdroidserver/nightly.py
 msgid "Specify which debug keystore file to use."
 msgstr ""
@@ -1665,6 +1641,11 @@ msgstr ""
 msgid "Spew out even more information than normal"
 msgstr ""
 
+#: ../fdroidserver/nightly.py
+#, python-brace-format
+msgid "Striping mystery signature from {apkfilename}"
+msgstr ""
+
 #: ../fdroidserver/nightly.py
 #, python-brace-format
 msgid "Stripping mystery signature from {apkfilename}"
@@ -1685,22 +1666,10 @@ msgstr ""
 msgid "System clock is older than date in {path}!"
 msgstr ""
 
-#: ../fdroidserver/checkupdates.py
-msgid "Tags update mode only works for git, hg, bzr and git-svn repositories currently"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-msgid "Tags update mode used in git-svn, but the repo was not set up with tags"
-msgstr ""
-
 #: ../fdroidserver/build.py
 msgid "Test mode - put output in the tmp directory only, and always build, even if the output already exists."
 msgstr ""
 
-#: ../fdroidserver/index.py
-msgid "The \"qrcode\" Python package is not installed (e.g. apt-get install python3-qrcode)!"
-msgstr ""
-
 #. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
 #: ../fdroidserver/update.py
 #, python-brace-format
@@ -1719,10 +1688,18 @@ msgstr ""
 msgid "The file to be included in the repo (path or glob)"
 msgstr ""
 
+#: ../fdroidserver/deploy.py
+msgid "The only commands currently supported are 'init' and 'update'"
+msgstr ""
+
 #: ../fdroidserver/index.py
 msgid "The repository's fingerprint does not match."
 msgstr ""
 
+#: ../fdroidserver/common.py
+msgid "The repository's index could not be verified."
+msgstr ""
+
 #: ../fdroidserver/deploy.py
 #, python-brace-format
 msgid "The root dir for local_copy_dir \"{path}\" does not exist!"
@@ -1736,37 +1713,13 @@ msgstr ""
 msgid "These are the apps that have been archived from the main repo."
 msgstr ""
 
-#: ../fdroidserver/mirror.py
-msgid "This command should never be used to mirror f-droid.org! A full copy requires more than 600GB."
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "This is a repository of apps to be used with F-Droid. Applications in this repository are either official binaries built by the original application developers, or are binaries built from source by the admin of f-droid.org using the tools on https://gitlab.com/fdroid."
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 #, python-format
 msgid "This repo already has local metadata: %s"
 msgstr ""
 
-#: ../fdroidserver/init.py
-#, python-format
-msgid ""
-"To complete the setup, add your APKs to \"%s\"\n"
-"then run \"fdroid update -c; fdroid update\".  You might also want to edit\n"
-"\"config.yml\" to set the URL, repo name, and more.  You should also set up\n"
-"a signing key (a temporary one might have been automatically generated).\n"
-"\n"
-"For more info: https://f-droid.org/docs/Setup_an_F-Droid_App_Repo\n"
-"and https://f-droid.org/docs/Signing_Process"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "To use awsbucket, awssecretkey and awsaccesskeyid must also be set in config.yml!"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "To use rclone, rclone_config and awsbucket must be set in config.yml!"
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
+msgid "To use awsbucket, awssecretkey and awsaccesskeyid must also be set in config.py!"
 msgstr ""
 
 #: ../fdroidserver/lint.py
@@ -1777,6 +1730,10 @@ msgstr ""
 msgid "URL shorteners should not be used"
 msgstr ""
 
+#: ../fdroidserver/metadata.py
+msgid "URL title is just the URL, use brackets: [URL]"
+msgstr ""
+
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "URL {url} in Description: {error}"
@@ -1790,15 +1747,16 @@ msgstr ""
 msgid "Unexpected license tag \"{}\"! Only use license tags configured in your config file"
 msgstr ""
 
-#: ../fdroidserver/common.py
+#: ../fdroidserver/metadata.py
 #, python-brace-format
-msgid "Unknown entry {key} in {configname}"
+msgid "Unexpected text on same line as {field} in {linedesc}"
 msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Unknown exception found!"
 msgstr ""
 
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "Unknown file '{filename}' in build '{versionName}'"
@@ -1809,6 +1767,11 @@ msgstr ""
 msgid "Unknown metadata format: %s"
 msgstr ""
 
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Unknown metadata format: {path}"
+msgstr ""
+
 #: ../fdroidserver/metadata.py
 #, python-brace-format
 msgid "Unknown metadata format: {path} (use: *.yml)"
@@ -1818,6 +1781,10 @@ msgstr ""
 msgid "Unknown version of aapt, might cause problems: "
 msgstr ""
 
+#: ../fdroidserver/lint.py
+msgid "Unlinkified link - use [http://foo.bar Link title] or [http://foo.bar]"
+msgstr ""
+
 #: ../fdroidserver/lint.py
 msgid "Unnecessary leading space"
 msgstr ""
@@ -1831,12 +1798,20 @@ msgstr ""
 msgid "Unrecognised app field '{fieldname}' in '{path}'"
 msgstr ""
 
+#: ../fdroidserver/metadata.py
+msgid "Unrecognised app field: "
+msgstr ""
+
 #: ../fdroidserver/metadata.py
 #, python-brace-format
 msgid "Unrecognised build flag '{build_flag}' in '{path}'"
 msgstr ""
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Unrecognised field '{field}' in {linedesc}"
+msgstr ""
+
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Unsupported file type \"{extension}\" for repo graphic"
@@ -1847,6 +1822,29 @@ msgstr ""
 msgid "Unsupported graphics file found: {path}"
 msgstr ""
 
+#: ../fdroidserver/rewritemeta.py
+#, python-brace-format
+msgid "Unsupported metadata format, use: --to [{supported}]"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+msgid "Unterminated ]"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+msgid "Unterminated ]]"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Unterminated build in {name}"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Unterminated continuation in {name}"
+msgstr ""
+
 #: ../fdroidserver/lint.py
 #, python-format
 msgid "Unused extlib at %s"
@@ -1867,25 +1865,27 @@ msgstr ""
 msgid "Unused scanignore path: %s"
 msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Update repo information for new packages"
 msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Update the binary transparency log for a URL"
 msgstr ""
 
+#: ../fdroid ../fdroidserver/__main__.py
+msgid "Update the stats of the repo"
+msgstr ""
+
+#: ../fdroidserver/update.py ../fdroidserver/build.py
+msgid "Update the wiki"
+msgstr ""
+
 #: ../fdroidserver/checkupdates.py
 #, python-brace-format
 msgid "UpdateCheckData has invalid URL: {url}"
 msgstr ""
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "UpdateCheckData must match the version code as integer (\\d or [0-9]): {codeex}"
-msgstr ""
-
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "UpdateCheckData must use HTTPS URL: {url}"
@@ -1897,10 +1897,14 @@ msgid "UpdateCheckData not a valid URL: {url}"
 msgstr ""
 
 #: ../fdroidserver/lint.py
-msgid "UpdateCheckMode is set but it looks like checkupdates hasn't been run yet."
+msgid "UpdateCheckMode is set but it looks like checkupdates hasn't been run yet"
+msgstr ""
+
+#. Translators: https://developer.android.com/studio/build/application-id
+#: ../fdroidserver/lint.py
+msgid "UpdateCheckName is set to the known application ID - it can be removed"
 msgstr ""
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
 #: ../fdroidserver/lint.py
 msgid "UpdateCheckName is set to the known application ID, it can be removed"
 msgstr ""
@@ -1915,8 +1919,19 @@ msgstr ""
 msgid "Uploading {apkfilename} to virustotal"
 msgstr ""
 
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "Usage"
+msgstr ""
+
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, python-format
+msgid "Usage: %s\n"
+msgstr ""
+
 #: ../fdroidserver/lint.py
-msgid "Use /HEAD instead of /master or /main to point at a file in the default branch"
+msgid "Use /HEAD instead of /master to point at a file in the default branch"
 msgstr ""
 
 #: ../fdroidserver/update.py
@@ -1931,14 +1946,12 @@ msgstr ""
 msgid "Use date from APK instead of current time for newly added APKs"
 msgstr ""
 
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Using \"{path}\" for configuring s3cmd."
+msgid "Use date from apk instead of current time for newly added apks"
 msgstr ""
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
-msgid "Using \"{path}\" for syncing with remote storage."
+msgid "Using \"{path}\" for configuring s3cmd."
 msgstr ""
 
 #: ../fdroidserver/common.py
@@ -1949,17 +1962,13 @@ msgstr ""
 msgid "Using APK Signature v3"
 msgstr ""
 
-#: ../fdroidserver/common.py
-msgid "Using JAR Signature"
-msgstr ""
-
 #: ../fdroidserver/common.py
 msgid "Using Java's jarsigner, not recommended for verifying APKs! Use apksigner"
 msgstr ""
 
-#: ../fdroidserver/metadata.py
+#: ../fdroidserver/common.py
 #, python-brace-format
-msgid "Using blank dictionary instead of contents of {path}!"
+msgid "Using androguard from \"{path}\""
 msgstr ""
 
 #: ../fdroidserver/init.py
@@ -1967,17 +1976,12 @@ msgstr ""
 msgid "Using existing keystore \"{path}\""
 msgstr ""
 
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Using rclone to sync with: {url}"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Using s3cmd to sync with: {url}"
 msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Valid commands are:"
 msgstr ""
 
@@ -1985,7 +1989,7 @@ msgstr ""
 msgid "Verify against locally cached copy rather than redownloading."
 msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Verify the integrity of downloaded packages"
 msgstr ""
 
@@ -1993,28 +1997,15 @@ msgstr ""
 msgid "Verifying index signature:"
 msgstr ""
 
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "Verifying package {path} with apksigner."
-msgstr ""
-
 #: ../fdroidserver/deploy.py
 #, python-brace-format
 msgid "VirusTotal API key cannot upload files larger than 32MB, use {url} to upload {path}."
 msgstr ""
 
-#: ../fdroidserver/nightly.py
-msgid "WARNING: only public git repos are supported!"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Warn about possible metadata errors"
 msgstr ""
 
-#: ../fdroidserver/scanner.py
-msgid "WebAssembly binary file"
-msgstr ""
-
 #: ../fdroidserver/update.py
 msgid "When configured for signed indexes, create only unsigned indexes at this stage"
 msgstr ""
@@ -2023,16 +2014,7 @@ msgstr ""
 msgid "When linting the entire repository yamllint is disabled by default. This option forces yamllint regardless."
 msgstr ""
 
-#: ../fdroidserver/publish.py
-msgid "When signing or verifying fails, exit with an error code."
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "Would you like to download and install F-Droid.apk via adb? (YES/no)"
-msgstr ""
-
-#: ../fdroidserver/install.py
-msgid "Would you like to download the app(s) from f-droid.org? (YES/no)"
+msgid "X.509 'Distiguished Name' used when generating keys"
 msgstr ""
 
 #: ../fdroidserver/init.py
@@ -2047,11 +2029,6 @@ msgstr ""
 msgid "ZIP file archive"
 msgstr ""
 
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "adb reports {serial} is \"{status}\"!"
-msgstr ""
-
 #: ../fdroidserver/nightly.py
 #, python-brace-format
 msgid "adding IdentityFile to {path}"
@@ -2062,66 +2039,70 @@ msgstr ""
 msgid "adding to {name}: {path}"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "ambiguous option: %(option)s could match %(matches)s"
 msgstr ""
 
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "apksigner in build-tools;{version} passes APKs with invalid v3 signatures, ignoring."
-msgstr ""
-
-#: ../fdroidserver/common.py
-msgid "apksigner not found! Cannot sign or verify modern APKs"
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, python-format
+msgid "ambiguous option: %s (%s?)"
 msgstr ""
 
 #: ../fdroidserver/common.py
 msgid "apksigner not found, it's required for signing!"
 msgstr ""
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/checkupdates.py ../fdroidserver/lint.py
-#: ../fdroidserver/rewritemeta.py
+#: ../fdroidserver/lint.py ../fdroidserver/rewritemeta.py
+#: ../fdroidserver/checkupdates.py
 msgid "application ID of file to operate on"
 msgstr ""
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/build.py ../fdroidserver/install.py
-#: ../fdroidserver/publish.py ../fdroidserver/scanner.py
-#: ../fdroidserver/verify.py
+#: ../fdroidserver/verify.py ../fdroidserver/publish.py
+#: ../fdroidserver/build.py ../fdroidserver/scanner.py
+#: ../fdroidserver/install.py
 msgid "application ID with optional versionCode in the form APPID[:VERCODE]"
 msgstr ""
 
-#: ../fdroidserver/common.py
-msgid "archive_url needs to end with /archive"
+#: ../fdroidserver/lint.py ../fdroidserver/rewritemeta.py
+msgid "applicationId in the form APPID"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: ../fdroidserver/checkupdates.py
+msgid "applicationId to check for updates"
+msgstr ""
+
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
+#: ../fdroidserver/verify.py ../fdroidserver/publish.py
+#: ../fdroidserver/dscanner.py ../fdroidserver/build.py
+#: ../fdroidserver/scanner.py ../fdroidserver/install.py
+msgid "applicationId with optional versionCode in the form APPID[:VERCODE]"
+msgstr ""
+
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "argument \"-\" with mode %r"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "argument %(argument_name)s: %(message)s"
-msgstr ""
-
 #: ../fdroidserver/nightly.py
 msgid "attempting bare SSH connection to test deploy key:"
 msgstr ""
 
+#: ../fdroidserver/nightly.py
+msgid "attempting bare ssh connection to test deploy key:"
+msgstr ""
+
 #: ../fdroidserver/common.py
 msgid "can not parse scrlib spec (not a string): '{}'"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
-msgid "can't open '%(filename)s': %(error)s"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "can't open non-https url: '{};"
+msgid "can't open '%s': %s"
 msgstr ""
 
 #: ../fdroidserver/build.py
@@ -2129,11 +2110,13 @@ msgstr ""
 msgid "cannot find required srclibs: \"{path}\""
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "cannot have multiple subparser arguments"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "cannot merge actions - two groups are named %r"
 msgstr ""
@@ -2147,25 +2130,30 @@ msgstr ""
 msgid "cloning {url}"
 msgstr ""
 
+#: ../fdroidserver/deploy.py
+msgid "command to execute, either 'init' or 'update'"
+msgstr ""
+
 #: ../fdroidserver/__main__.py
 msgid "commands from plugin modules:"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "complex"
+msgstr ""
+
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "conflicting option string: %s"
 msgid_plural "conflicting option strings: %s"
 msgstr[0] ""
 msgstr[1] ""
 
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "conflicting subparser alias: %s"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "conflicting subparser: %s"
+#: ../fdroidserver/nightly.py
+#, python-brace-format
+msgid "copying {apkfilename} into {path}"
 msgstr ""
 
 #: ../fdroidserver/metadata.py
@@ -2174,11 +2162,11 @@ msgid "could not parse '{path}'"
 msgstr ""
 
 #: ../fdroidserver/common.py
-msgid "could not parse srclib spec (no name specified): '{}'"
+msgid "could not parse srclib spec (no ref specified): '{}'"
 msgstr ""
 
 #: ../fdroidserver/common.py
-msgid "could not parse srclib spec (no ref specified): '{}'"
+msgid "could not parse srclib spec (too many '@' signs): '{}'"
 msgstr ""
 
 #: ../fdroidserver/nightly.py
@@ -2186,18 +2174,14 @@ msgstr ""
 msgid "created {path}"
 msgstr ""
 
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "current version is newer: old vercode={old}, new vercode={new}"
-msgstr ""
-
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "deleting: repo/{apkfilename}"
 msgstr ""
 
-#: ../fdroidserver/scanner.py
-msgid "dependency file without lock"
+#: ../fdroidserver/common.py
+#, python-brace-format
+msgid "deployed build logs to '{path}'"
 msgstr ""
 
 #: ../fdroidserver/common.py
@@ -2205,48 +2189,59 @@ msgstr ""
 msgid "deployed process log {path} to {dest}"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "dest= is required for options like %r"
 msgstr ""
 
-#: ../fdroidserver/scanner.py
-msgid "downloading '{}'"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-msgid "downloading scanner signatures from '{}' failed"
-msgstr ""
-
 #: ../fdroidserver/scanner.py
 msgid "executable binary, possibly code"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "expected %s argument"
 msgid_plural "expected %s arguments"
 msgstr[0] ""
 msgstr[1] ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "expected at least one argument"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "expected at most one argument"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "expected one argument"
 msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroidserver/common.py
+#, python-brace-format
+msgid "failed deploying build logs to '{path}'"
+msgstr ""
+
+#: ../fdroid
+msgid "fdroid [-h|--help|--version] <command> [<args>]"
+msgstr ""
+
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "fdroid [<command>] [-h|--help|--version|<args>]"
 msgstr ""
 
-#: ../fdroidserver/scanner.py
-msgid "fetch the latest version of signatures from the web"
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "floating-point"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+msgid "force errors to be warnings, or ignore"
 msgstr ""
 
 #: ../fdroidserver/metadata.py
@@ -2261,7 +2256,8 @@ msgstr ""
 msgid "gzip file archive"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "ignored explicit argument %r"
 msgstr ""
@@ -2270,39 +2266,35 @@ msgstr ""
 msgid "index-v1 must have a signature, use `fdroid signindex` to create it!"
 msgstr ""
 
-#: ../fdroidserver/index.py
-msgid "index-v2 must have a signature, use `fdroid signindex` to create it!"
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "integer"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "invalid %(type)s value: %(value)r"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "invalid choice: %(value)r (choose from %(choices)s)"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "invalid conflict_resolution value: %r"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "invalid option string %(option)r: must start with a character %(prefix_chars)r"
 msgstr ""
 
-#: ../fdroidserver/common.py
-msgid "ipfs_cid not found, skipping CIDv1 generation"
-msgstr ""
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "latest build recipe is newer: old vercode={old}, new vercode={new}"
-msgstr ""
-
 #: ../fdroidserver/deploy.py
 #, python-brace-format
 msgid "local_copy_dir does not end with \"fdroid\", perhaps you meant: \"{path}\""
@@ -2321,20 +2313,11 @@ msgstr ""
 msgid "mirror '%s' does not end with 'fdroid'!"
 msgstr ""
 
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "mirrors set twice, in config.yml and {path}!"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "mutually exclusive arguments must be optional"
 msgstr ""
 
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "next {name} cache update due in {time}"
-msgstr ""
-
 #: ../fdroidserver/mirror.py
 #, python-brace-format
 msgid "no \"icon\" in {appid}"
@@ -2344,27 +2327,88 @@ msgstr "{appid} ئىچىدە \"سىنبەلگە\" تېپىلمىدى"
 msgid "no APK supplied"
 msgstr "ھېچقانداق APK تەمىنلەنمىگەن"
 
-#: ../fdroidserver/checkupdates.py
-#, fuzzy
-msgid "no version information found"
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, python-format
+msgid "no such option: %s"
+msgstr ""
+
+#: ../fdroid ../fdroidserver/__main__.py
+msgid "no version info found!"
 msgstr "نەشىر ئۇچۇرى تېپىلمىدى!"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "not allowed with argument %s"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "one of the arguments %s is required"
 msgstr ""
 
-#: ../fdroidserver/common.py ../fdroidserver/index.py
+#: ../fdroidserver/index.py ../fdroidserver/common.py
 msgid "only accepts strings, lists, and tuples"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
-msgid "options"
+#: ../fdroidserver/install.py
+#, python-format
+msgid "option %s: If you really want to install all the signed apps, use --all"
+msgstr ""
+
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, python-format
+msgid "option %s: invalid %s value: %r"
+msgstr ""
+
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, python-format
+msgid "option %s: invalid choice: %r (choose from %s)"
+msgstr ""
+
+#: /usr/lib/python3.5/getopt.py /usr/lib/python3.6/getopt.py
+#: /usr/lib/python3.7/getopt.py
+#, python-format
+msgid "option -%s not recognized"
+msgstr ""
+
+#: /usr/lib/python3.5/getopt.py /usr/lib/python3.6/getopt.py
+#: /usr/lib/python3.7/getopt.py
+#, python-format
+msgid "option -%s requires argument"
+msgstr ""
+
+#: /usr/lib/python3.5/getopt.py /usr/lib/python3.6/getopt.py
+#: /usr/lib/python3.7/getopt.py
+#, python-format
+msgid "option --%s must not have an argument"
+msgstr ""
+
+#: /usr/lib/python3.5/getopt.py /usr/lib/python3.6/getopt.py
+#: /usr/lib/python3.7/getopt.py
+#, python-format
+msgid "option --%s not a unique prefix"
+msgstr ""
+
+#: /usr/lib/python3.5/getopt.py /usr/lib/python3.6/getopt.py
+#: /usr/lib/python3.7/getopt.py
+#, python-format
+msgid "option --%s not recognized"
+msgstr ""
+
+#: /usr/lib/python3.5/getopt.py /usr/lib/python3.6/getopt.py
+#: /usr/lib/python3.7/getopt.py
+#, python-format
+msgid "option --%s requires argument"
+msgstr ""
+
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
+msgid "optional arguments"
 msgstr ""
 
 #: ../fdroidserver/nightly.py
@@ -2372,7 +2416,8 @@ msgstr ""
 msgid "overwriting existing {path}"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "positional arguments"
 msgstr ""
 
@@ -2381,53 +2426,42 @@ msgstr ""
 msgid "process log deploy {path} to {dest} failed!"
 msgstr ""
 
-#: ../fdroidserver/build.py
-msgid "reference binary missing signature"
-msgstr ""
-
 #: ../fdroidserver/signatures.py
 #, python-brace-format
 msgid "refuse downloading via insecure HTTP connection (use HTTPS or specify --no-https-check): {apkfilename}"
 msgstr ""
 
+#: ../fdroidserver/signatures.py
+#, python-brace-format
+msgid "refuse downloading via insecure http connection (use https or specify --no-https-check): {apkfilename}"
+msgstr ""
+
 #: ../fdroidserver/index.py
 #, python-format
-msgid "repo_icon \"repo/icons/%s\" does not exist, generating placeholder."
+msgid "repo_icon %s does not exist, generating placeholder."
 msgstr ""
 
-#: ../fdroidserver/common.py
-msgid "repo_url needs to end with /repo"
+#: ../fdroidserver/metadata.py
+msgid "ruamel.yaml not installed, can not write metadata."
 msgstr ""
 
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "rsync is missing or broken: {error}"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "s3cmd sync indexes {path} to {url} and delete"
 msgstr ""
 
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "s3cmd syncs indexes from {path} to {url} and deletes removed"
-msgstr ""
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "scanner cache is malformed! You can clear it with: '{clear}'"
-msgstr ""
-
-#: ../fdroidserver/deploy.py
-msgid "serverwebroot: path does not end with \"fdroid\", perhaps you meant one of these:"
-msgstr ""
-
 #: ../fdroidserver/scanner.py
 msgid "shared library"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "show program's version number and exit"
+msgstr ""
+
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.5/optparse.py
+#: /usr/lib/python3.6/argparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/argparse.py /usr/lib/python3.7/optparse.py
 msgid "show this help message and exit"
 msgstr ""
 
@@ -2456,31 +2490,31 @@ msgstr ""
 msgid "static library"
 msgstr ""
 
-#: ../fdroidserver/build.py
+#: ../fdroidserver/common.py
 #, python-brace-format
-msgid "supplied reference binary has allowed signer {signer}"
+msgid "supplied timestamp value '{timestamp}' is not a unix timestamp"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "the following arguments are required: %s"
 msgstr ""
 
-#: ../fdroidserver/install.py
-msgid "true"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "unexpected option string: %s"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "unknown parser %(parser_name)r (choices: %(choices)s)"
 msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "unrecognized arguments: %s"
 msgstr ""
@@ -2490,11 +2524,16 @@ msgstr ""
 msgid "unsafe permissions on '{config_file}' (should be 0600)!"
 msgstr ""
 
-#: ../fdroidserver/__main__.py /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py ../fdroid
+#: /usr/lib/python3.7/argparse.py ../fdroidserver/__main__.py
 msgid "usage: "
 msgstr ""
 
-#: ../fdroidserver/deploy.py
+#: ../fdroid
+msgid "usage: fdroid [-h|--help|--version] <command> [<args>]"
+msgstr ""
+
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "using Apache libcloud to sync with {url}"
 msgstr ""
@@ -2503,8 +2542,8 @@ msgstr ""
 msgid "virustotal.com is rate limiting, waiting to retry..."
 msgstr ""
 
-#: ../fdroidserver/install.py
-msgid "yes"
+#: ../fdroidserver/update.py
+msgid "wiki support is deprecated and will be removed in the next release!"
 msgstr ""
 
 #: ../fdroidserver/publish.py
@@ -2519,19 +2558,31 @@ msgstr[1] ""
 msgid "{apkfilename} ({appid}) has no metadata!"
 msgstr ""
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
+#: ../fdroidserver/update.py
+#, python-brace-format
+msgid "{apkfilename} has multiple {name} files, looks like Master Key exploit!"
+msgstr ""
+
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "{apkfilename}'s AndroidManifest.xml has a bad date: "
 msgstr ""
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "{appid} does not have a name! Using application ID instead."
 msgstr ""
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
+#: ../fdroidserver/update.py
+#, python-brace-format
+msgid "{appid} does not have a name! Using package name instead."
+msgstr ""
+
+#: ../fdroidserver/update.py
+#, python-brace-format
+msgid "{appid} from {path} is not a valid Android Package Name!"
+msgstr ""
+
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "{appid} from {path} is not a valid Android application ID!"
@@ -2542,16 +2593,12 @@ msgstr ""
 msgid "{appid} from {path} is not a valid Java Package Name!"
 msgstr ""
 
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{appid} has both APKs and files: {files}"
-msgstr ""
-
 #: ../fdroidserver/mirror.py
 #, python-brace-format
 msgid "{appid} is missing {name}"
 msgstr ""
 
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "{appid}: Unknown extlib {path} in build '{versionName}'"
@@ -2579,7 +2626,7 @@ msgstr ""
 
 #: ../fdroidserver/metadata.py
 #, python-brace-format
-msgid "{build_flag} must be list or string, found: {value}"
+msgid "{field} not terminated in {name}"
 msgstr ""
 
 #: ../fdroidserver/metadata.py
@@ -2589,15 +2636,10 @@ msgstr ""
 
 #: ../fdroidserver/update.py
 #, python-brace-format
-msgid "{name} \"{section}/icons/{path}\" does not exist! Check \"config.yml\"."
+msgid "{name} \"{path}\" does not exist! Correct it in config.py."
 msgstr ""
 
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{path1} is a duplicate of {path2}, remove one!"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 #, python-brace-format
 msgid "{path} already exists, ignoring import results!"
 msgstr ""
@@ -2612,36 +2654,6 @@ msgstr ""
 msgid "{path} has bad file signature \"{pattern}\", possible Janus exploit!"
 msgstr ""
 
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "{path} has been flagged by virustotal {count} times:"
-msgstr ""
-
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "{path} has the wrong fingerprint ({fingerprint})!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "{path} is not \"key: value\" dict, but a {datatype}!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "{path} is not a standard config file!"
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "{path} is not list, but a {datatype}!"
-msgstr ""
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "{path} is not {expected_type}, but a {datatype}!"
-msgstr ""
-
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "{path} is zero size!"
@@ -2652,22 +2664,12 @@ msgstr ""
 msgid "{path} more than 200MB, manually upload: {url}"
 msgstr ""
 
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "{path}: \"{code}\" is not a valid ISO_3166-1 alpha-2 country code!"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{path}: {error}"
-msgstr ""
-
 #: ../fdroidserver/mirror.py
 #, python-brace-format
 msgid "{url} does not end with \"fdroid\", check the URL path!"
 msgstr ""
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/common.py
 #, python-brace-format
 msgid "{url} does not start with \"http\"!"
 msgstr ""
diff --git a/locale/uk/LC_MESSAGES/fdroidserver.po b/locale/uk/LC_MESSAGES/fdroidserver.po
index 822f3358..e6c4460a 100644
--- a/locale/uk/LC_MESSAGES/fdroidserver.po
+++ b/locale/uk/LC_MESSAGES/fdroidserver.po
@@ -2,31 +2,45 @@
 # Copyright (C) YEAR Free Software Foundation, Inc.
 # Hans-Christoph Steiner <hans@guardianproject.info>, 2020.
 # ihor_ck <igor_ck@outlook.com>, 2020.
-# Ihor Hordiichuk <igor_ck@outlook.com>, 2020, 2021, 2022, 2023, 2024, 2025.
-# Tymofij Lytvynenko <till.svit@gmail.com>, 2021.
-# DankXylese <dankxylese@slapmywang.com>, 2021.
-# Dan <denqwerta@gmail.com>, 2022.
-# Sergii Horichenko <m@sgg.im>, 2023.
-# Макар Разин <makarrazin14@gmail.com>, 2023.
-# Tymofii Lytvynenko <till.svit@gmail.com>, 2024.
-# Fqwe1 <Fqwe1@users.noreply.hosted.weblate.org>, 2024.
-# Nazar <balaraz@tuta.io>, 2024.
-# Максим Горпиніч <mgorpinic2005@gmail.com>, 2024.
-# Максим Горпиніч <maksimgorpinic2005a@gmail.com>, 2025.
+# Ihor Hordiichuk <igor_ck@outlook.com>, 2020.
 msgid ""
 msgstr ""
 "Project-Id-Version: fdroidserver 0.9\n"
 "Report-Msgid-Bugs-To: https://gitlab.com/fdroid/fdroidserver/issues\n"
-"POT-Creation-Date: 2025-06-25 09:52+0200\n"
-"PO-Revision-Date: 2025-03-27 19:35+0000\n"
+"POT-Creation-Date: 2020-10-21 18:05+0200\n"
+"PO-Revision-Date: 2020-10-22 17:26+0000\n"
 "Last-Translator: Ihor Hordiichuk <igor_ck@outlook.com>\n"
 "Language-Team: Ukrainian <https://hosted.weblate.org/projects/f-droid/fdroidserver/uk/>\n"
 "Language: uk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-"X-Generator: Weblate 5.11-dev\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"X-Generator: Weblate 4.3.1\n"
+
+#: ../fdroidserver/common.py
+msgid ""
+"\n"
+"        This is a repository of apps to be used with FDroid. Applications in this\n"
+"        repository are either official binaries built by the original application\n"
+"        developers, or are binaries built from source by f-droid.org using the\n"
+"        tools on https://gitlab.com/fdroid.\n"
+"        "
+msgstr ""
+"\n"
+"        Це сховище застосунків для використання з FDroid. Застосунки в цьому\n"
+"        сховищі — це або офіційні двійкові файли, побудовані за розробниками оригінального\n"
+"        застосунку, або двійкові файли, побудовані з джерела f-droid.org за допомогою\n"
+"        інструментів з https://gitlab.com/fdroid.\n"
+"        "
+
+#: ../fdroidserver/nightly.py
+msgid ""
+"\n"
+"SSH Public Key to be used as Deploy Key:"
+msgstr ""
+"\n"
+"Громадський ключ SSH буде використино як постановчий ключ (Deploy Key):"
 
 #: ../fdroidserver/nightly.py
 msgid ""
@@ -50,26 +64,22 @@ msgstr ""
 msgid "\"%s/\" has no matching metadata file!"
 msgstr "\"%s/\" не має відповідного файлу метаданих!"
 
-#: ../fdroidserver/index.py
-msgid "\"isPrimary\" key should not be added to mirrors!"
-msgstr "Ключ \"isPrimary\" не слід додавати до дзеркал!"
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "\"local_copy_dir\" {path} does not exist!"
-msgstr "\"local_copy_dir\" {path} не існує!"
-
 #: ../fdroidserver/install.py
 #, python-brace-format
 msgid "\"{apkfilename}\" is already installed on {dev}."
 msgstr "\"{apkfilename}\" вже встановлено на {dev}."
 
+#: ../fdroidserver/update.py
+#, python-brace-format
+msgid "\"{path}\" contains outdated {name} ({version})"
+msgstr "\"{path}\" містить застарілу {name}{version}"
+
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "\"{path}\" contains recent {name} ({version})"
 msgstr "\"{path}\" містить найновішу {name}{version}"
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "\"{path}\" exists but s3cmd is not installed!"
 msgstr "\"{path}\" існує, але s3cmd не встановлений!"
@@ -79,84 +89,120 @@ msgstr "\"{path}\" існує, але s3cmd не встановлений!"
 msgid "\"{path}\" is not a supported file format (use: metadata/*.yml)"
 msgstr "\"{path}\" має непідтримуваний формат (скористайтеся: metadata/*.yml)"
 
-#: ../fdroidserver/update.py
+#: ../fdroidserver/metadata.py
 #, python-brace-format
-msgid "\"{path}\" is signed by a key that is not allowed:"
-msgstr "«{path}» підписано не дозволеним ключем:"
+msgid "\"{path}\" is not an accepted format, convert to: {formats}"
+msgstr "\"{path}\" має непідтримуваний формат, конвертувати до: {formats}"
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/common.py
 #, python-brace-format
 msgid "\"{url}\" is not a valid URL!"
 msgstr "\"{url}\" є недійсною URL-адресою!"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, python-format
+msgid "%(option)s option requires %(number)d argument"
+msgid_plural "%(option)s option requires %(number)d arguments"
+msgstr[0] "%(option)s параметр вимагає %(number)d аргумент"
+msgstr[1] "%(option)s параметр вимагає %(number)d аргументи"
+msgstr[2] "%(option)s параметр вимагає %(number)d аргументів"
+
+#: ../fdroidserver/mirror.py
+#, python-format
+msgid "%(prog)s [options] url"
+msgstr "%(prog)s url [можливості]"
+
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "%(prog)s: error: %(message)s\n"
 msgstr "%(prog)s: помилка: %(message)s\n"
 
-#: ../fdroidserver/publish.py
-#, python-format
-msgid "%d APKs failed to be signed or verified!"
-msgstr "%d APK не вдалося підписати або перевірити!"
-
 #: ../fdroidserver/scanner.py
 #, python-format
 msgid "%d problems found"
 msgstr "%d знайдено проблем"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "%prog [options]"
+msgstr "%prog [параметри]"
+
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "%r is not callable"
 msgstr "%r не можна викликати"
 
-#: ../fdroidserver/signindex.py
-#, python-format
-msgid "%s did not produce a dict!"
-msgstr "%s не створює dict!"
-
-#: ../fdroidserver/signindex.py
-#, python-format
-msgid "%s has bad SHA-256: %s"
-msgstr "%s має неправильний SHA-256: %s"
-
 #: ../fdroidserver/lint.py
 #, python-format
 msgid "%s is not an accepted build field"
 msgstr "%s не є прийнятним полем для створення"
 
-#: ../fdroidserver/common.py
-msgid "'keypass' not found in config.yml!"
-msgstr "'keypass' не знайдено в config.yml!"
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, python-format
+msgid "%s option does not take a value"
+msgstr "%s параметр не приймає значення"
+
+#: ../fdroidserver/index.py ../fdroidserver/common.py
+msgid "'keypass' not found in config.py!"
+msgstr "'keypass' не знайдено в config.py!"
 
 #: ../fdroidserver/common.py
 msgid "'keystore' is NONE and 'smartcardoptions' is blank!"
 msgstr "'keystore' — NONE і 'smartcardoptions' порожній!"
 
-#: ../fdroidserver/common.py
-msgid "'keystore' not found in config.yml!"
-msgstr "'keystore' не знайдено в config.yml!"
+#: ../fdroidserver/index.py ../fdroidserver/common.py
+msgid "'keystore' not found in config.py!"
+msgstr "'keystore' не знайдено в config.py!"
 
-#: ../fdroidserver/common.py
-msgid "'keystorepass' not found in config.yml!"
-msgstr "'keystorepass' не знайдено в config.yml!"
+#: ../fdroidserver/index.py ../fdroidserver/common.py
+msgid "'keystorepass' not found in config.py!"
+msgstr "'keystorepass' не знайдено в config.py!"
 
-#: ../fdroidserver/common.py
-msgid "'repo_keyalias' not found in config.yml!"
-msgstr "'repo_keyalias' не знайдено в config.yml!"
+#: ../fdroidserver/index.py ../fdroidserver/common.py
+msgid "'repo_keyalias' not found in config.py!"
+msgstr "'repo_keyalias' не знайдено в config.py!"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "'required' is an invalid argument for positionals"
 msgstr "'required' недійсний аргумент для позицій"
 
 #: ../fdroidserver/common.py
-msgid "'sdk_path' not set in config.yml!"
-msgstr "'sdk_path' не встановлено в config.yml!"
+msgid "'sdk_path' not set in 'config.py'!"
+msgstr "'sdk_path' не встановлено в 'config.py'!"
+
+#. Translators: "build-tools" is the file name of a package from
+#. Google, it is part of the Android SDK. So it probably shouldn't be
+#. translated or transliterated.
+#: ../fdroidserver/common.py
+#, python-brace-format
+msgid "'{aapt}' is too old, fdroid requires build-tools-23.0.0 or newer!"
+msgstr "'{aapt}' занадто старий, fdroid вимагає build-tools-23.0.0 або новіших!"
 
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "'{aapt}' is too old, fdroid requires build-tools-{version} or newer!"
 msgstr "'{aapt}' занадто старий, fdroid вимагає build-tools-{version} або новіший!"
 
+#: ../fdroidserver/install.py
+#, python-brace-format
+msgid "'{apkfilename}' is already installed on {dev}."
+msgstr "'{apkfilename}' вже встановлено на {dev}."
+
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "'{field}' in {linedesc} is obsolete, see docs for current fields:"
+msgstr "'{field}' у {linedesc} застаріло, поточні поля вказано в документації:"
+
+#: ../fdroidserver/common.py
+#, python-brace-format
+msgid "'{field}' will be in random order! Use () or [] brackets if order is important!"
+msgstr "'{field}' буде у довільному порядкові! Використовуйте () або [], якщо порядок є важливим!"
+
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "'{path}' failed to execute!"
@@ -164,32 +210,23 @@ msgstr "'{path}' не вдалося виконати!"
 
 #: ../fdroidserver/metadata.py
 #, python-brace-format
-msgid "'{path}' has invalid format, it should be a dictionary!"
-msgstr "'{path}' має недійсний формат, це має бути словник!"
-
-#: ../fdroidserver/lint.py ../fdroidserver/metadata.py
-#, python-brace-format
 msgid "'{value}' is not a valid {field} in {appid}. Regex pattern: {pattern}"
 msgstr "'{value}' не є правильним {field} у {appid}. Правильний приклад: {pattern}"
 
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "'{value}' is not a valid {field}, should be {pattern}"
-msgstr "'{value}' не є дійсним {field}, має бути {pattern}"
-
-#: ../fdroidserver/checkupdates.py
-msgid "--merge-request only runs on a single appid!"
-msgstr "--merge-request працює лише в одній програмі!"
-
 #: ../fdroidserver/checkupdates.py
 #, python-brace-format
 msgid "...checkupdate failed for {appid} : {error}"
 msgstr "... checkupdate не вдалося для {appid} : {error}"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid ".__call__() not defined"
 msgstr ".__call__() не визначено"
 
+#: ../fdroidserver/metadata.py
+msgid ".fdroid.txt is not supported!  Convert to .fdroid.yml or .fdroid.json."
+msgstr ". fdroid.txt не підтримується!  Конвертувати в. fdroid.yml або. fdroid.json."
+
 #: ../fdroidserver/lint.py
 msgid "/issues is missing"
 msgstr "/issues відсутній"
@@ -198,18 +235,17 @@ msgstr "/issues відсутній"
 msgid "A URL is required as an argument!"
 msgstr "URL потребується як аргумент!"
 
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "APK signatures have different certificates in {path}:"
-msgstr "APK-підписи мають різні сертифікати у {path}:"
-
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Add PGP signatures using GnuPG for packages in repo"
-msgstr "Додати підписи GnuPG для пакунків у репозиторії"
+msgstr "Додати підписи GnuPG для пакетів у сховищеві"
+
+#: ../fdroid ../fdroidserver/__main__.py
+msgid "Add a new application from its source code"
+msgstr "Додайте новий застосунку зі свого вихідного коду"
 
 #: ../fdroidserver/update.py
 msgid "Add a repo signing key to an unsigned repo"
-msgstr "Створіть ключ підписування репозиторіїв до непідписаного репозиторію"
+msgstr "Створіть ключ підписування сховищ до непідписаного сховища"
 
 #: ../fdroidserver/update.py
 msgid "Add skeleton metadata files for APKs that are missing them"
@@ -218,17 +254,13 @@ msgstr "Додати тулуб файлових метаданих файлів
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Adding new repo for only {name}"
-msgstr "Додати новий репозиторій лише для {name}"
+msgstr "Додати нове сховище лише для {name}"
 
 #: ../fdroidserver/init.py
 msgid "Alias of the repo signing key in the keystore"
-msgstr "Псевдонім підписного ключа репозиторію у сховищі ключів"
+msgstr "Псевдонім підписного ключа сховища у сховищі ключів"
 
-#: ../fdroidserver/build.py
-msgid "AllowedAPKSigningKeys missing but reference binary supplied"
-msgstr "AllowedAPKSigningKeys відсутні, але надається посилання на двійковий файл"
-
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "Allows a different revision (or git branch) to be specified for the initial import"
 msgstr "Дозволяє вказати іншу версію (або git гілку) для початкового імпорту"
 
@@ -252,10 +284,14 @@ msgstr "Файл Android APK"
 msgid "Android DEX code"
 msgstr "Код Android DEX"
 
-#: ../fdroidserver/init.py
+#: ../fdroidserver/common.py ../fdroidserver/build.py
 #, python-brace-format
-msgid "Android SDK not found at {path}!"
-msgstr "Android SDK не знайдено в {path}!"
+msgid "Android SDK '{path}' does not have '{dirname}' installed!"
+msgstr "Android SDK '{path}' '{dirname}' не встановлено!"
+
+#: ../fdroidserver/common.py
+msgid "Android SDK not found!"
+msgstr "Android SDK не знайдено!"
 
 #: ../fdroidserver/common.py
 #, python-brace-format
@@ -267,28 +303,23 @@ msgstr "Android SDK шлях '{path}' не існує!"
 msgid "Android SDK path '{path}' is not a directory!"
 msgstr "Android SDK шлях '{path}' це не каталог!"
 
+#. Translators: "build-tools" is the file name of a package from
+#. Google, it is part of the Android SDK. So it probably shouldn't be
+#. translated or transliterated.
 #: ../fdroidserver/common.py
 #, python-brace-format
-msgid "Android SDK tool {cmd} not found!"
-msgstr "Інструмент Android SDK {cmd} не знайдено!"
+msgid "Android build-tools path '{path}' does not exist!"
+msgstr "Шлях андроїдових build-tools '{path}' не існує!"
 
-#: ../fdroidserver/lint.py
-msgid "App has Binaries but does not have corresponding AllowedAPKSigningKeys to pin certificate."
-msgstr "Програма має двійкові файли, але не має відповідних AllowedAPKSigningKeys для закріплення сертифіката."
-
-#: ../fdroidserver/lint.py
-msgid "App has NoSourceSince or ArchivePolicy \"0 versions\" or 0 but AutoUpdateMode or UpdateCheckMode are not None"
-msgstr "Застосунок має NoSourceSince або ArchivePolicy «0 версій», але AutoUpdateMode або UpdateCheckMode не дорівнюють None"
+#: ../fdroidserver/update.py
+msgid "AndroidManifest.xml has no date"
+msgstr "AndroidManifest.xml не має дати"
 
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "App is in '{repo}' but has a link to {url}"
 msgstr "Застосунок '{repo}' але має ланку до {url}"
 
-#: ../fdroidserver/lint.py
-msgid "App version has binary but does not have corresponding AllowedAPKSigningKeys to pin certificate."
-msgstr "Версія програми має двійковий код, але не має відповідних AllowedAPKSigningKeys для закріплення сертифіката."
-
 #: ../fdroidserver/lint.py
 msgid "Appending .git is not necessary"
 msgstr "Додавання .git не потрібно"
@@ -298,27 +329,11 @@ msgstr "Додавання .git не потрібно"
 msgid "Archiving {apkfilename} with invalid signature!"
 msgstr "Архівую {apkfilename} з неправильним підписом!"
 
-#: ../fdroidserver/lint.py
-msgid "AutoUpdateMode with UpdateCheckMode: HTTP must have a pattern."
-msgstr "AutoUpdateMode з UpdateCheckMode: HTTP повинен мати шаблон."
-
-#: ../fdroidserver/install.py
-msgid "Automatic no to all prompts."
-msgstr "Автоматичне ні для всіх підказок."
-
-#: ../fdroidserver/install.py
-msgid "Automatic yes to all prompts."
-msgstr "Автоматичне «так» на всі підказки."
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "Bad entry type \"{mirrortype}\" in mirrors config: {mirror}"
-msgstr "Неправильний тип запису \"{mirrortype}\" у конфігурації дзеркал: {mirror}"
-
 #: ../fdroidserver/mirror.py
 msgid "Base URL to mirror, can include the index signing key using the query string: ?fingerprint="
 msgstr "Базова URL-адреса для дзеркала може містити ключ підпису індексу за допомогою рядка запиту: ?fingerprint="
 
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "Branch '{branch}' used as commit in build '{versionName}'"
@@ -334,9 +349,9 @@ msgstr "Гілка '{branch}' використовується як поданн
 msgid "Broken symlink: {path}"
 msgstr "Недійсне посилання: {path}"
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Build a package from source"
-msgstr "Зібрати пакунок з джерела"
+msgstr "Побудуйте пакет з джерела"
 
 #: ../fdroidserver/build.py
 msgid "Build all applications available"
@@ -348,20 +363,21 @@ msgstr "Збірку, створено за допомогою `fdroid import` -
 
 #: ../fdroidserver/checkupdates.py
 msgid "Build metadata git repo has uncommited changes!"
-msgstr "У git-репозиторії з метаданими збірки є незбережені зміни!"
+msgstr "У сховищі з метаданими збірки є незбережені зміни!"
 
 #: ../fdroidserver/build.py
 msgid "Build only the latest version of each package"
-msgstr "Побудуйте лише найновішу версію кожного пакунка"
+msgstr "Створіть лише останню версію кожного пакета"
+
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Build should have comma-separated versionName and versionCode, not \"{value}\", in {linedesc}"
+msgstr "Для побудови необхідно розділяти versionName і versionCode комою. Ви вказали \"{value}\" в рядку {linedesc}"
 
 #: ../fdroidserver/init.py
 #, python-format
 msgid "Built repo based in \"%s\" with this config:"
-msgstr "Вбудований репозиторій створено у \"%s\" на основі конфігурації:"
-
-#: ../fdroidserver/checkupdates.py
-msgid "Can't auto-update app with no CurrentVersionCode"
-msgstr "Автооновлення застосунку без CurrentVersionCode неможливе"
+msgstr "Вбудоване сховище створено у \"%s\" на основі конфігурації:"
 
 #: ../fdroidserver/build.py
 msgid "Can't build due to {} error while scanning"
@@ -370,55 +386,71 @@ msgstr[0] "Неможливо створити через {} помилку пі
 msgstr[1] "Неможливо створити через {} помилки під час сканування"
 msgstr[2] "Неможливо створити через {} помилок під час сканування"
 
-#: ../fdroidserver/common.py
-#, fuzzy, python-brace-format
-msgid "Cannot read {path}: {error}"
-msgstr "Не вдалося розпізнати {path}: {error}"
+#: ../fdroidserver/vmtools.py
+#, python-brace-format
+msgid "Cannot read \"{path}\"!"
+msgstr "Неправильно вказано шлях \"{path}\"!"
+
+#. Translators: https://developer.android.com/studio/build/application-id
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Cannot resolve application ID {appid}"
+msgstr "Неможливо розв'язати id застосунку {appid}"
 
 #: ../fdroidserver/rewritemeta.py
 #, python-brace-format
 msgid "Cannot rewrite \"{path}\""
 msgstr "Не вдалося перезаписати шлях \"{path}\""
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
+#: ../fdroidserver/rewritemeta.py
+msgid "Cannot use --list and --to at the same time"
+msgstr "Не можна одночасно використовувати --list та --to"
+
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Cannot write \"{path}\", not an accepted format, use: {formats}"
+msgstr "Неможливо записати \"{path}\", не прийнятний формат, використовуйте: {formats}"
+
 #: ../fdroidserver/lint.py
 #, python-format
 msgid "Categories '%s' is not valid"
 msgstr "Категорія '%s' неприпустима"
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
 #: ../fdroidserver/lint.py
 msgid "Categories are not set"
 msgstr "Категорії не встановлено"
 
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "Category \"{category}\" defined but not used for any apps!"
-msgstr "Категорія «{category}» визначена, але не використовується для жодного застосунку!"
-
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Check for updates to applications"
 msgstr "Перевірте наявність оновлень для застосунків"
 
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Checking archiving for {appid} - apks:{integer}, keepversions:{keep}, archapks:{arch}"
-msgstr "Перевірка архівації на {appid} — apks:{integer}, keepversions:{keep}, archapks:{arch}"
+msgstr "Перевірка архівації на {appid} - apks:{integer}, keepversions:{keep}, archapks:{arch}"
+
+#: ../fdroidserver/dscanner.py
+msgid "Clean after all scans have finished"
+msgstr "Очистити після завершення сканування"
+
+#: ../fdroidserver/dscanner.py
+msgid "Clean before the scans start and rebuild the container"
+msgstr "Очистити перед початком сканування і перебудуйте контейнер"
+
+#: ../fdroidserver/dscanner.py
+msgid "Clean up all containers and then exit"
+msgstr "Очистити усі контейнери, а потім вийти"
 
 #: ../fdroidserver/update.py
 msgid "Clean update - don't uses caches, reprocess all APKs"
 msgstr "Очистити оновлення - не використовує кеш, повторно обробляє всі APK"
 
-#: ../fdroidserver/common.py
-msgid "Color the log output"
-msgstr "Розфарбуйте результат журналу"
-
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "Comma separated list of categories."
 msgstr "Список категорій, розділених комами."
 
-#: ../fdroidserver/__main__.py
-#, python-format
+#: ../fdroid ../fdroidserver/__main__.py
+#, c-format, python-format
 msgid "Command '%s' not recognised.\n"
 msgstr "Команда '%s' не визнана.\n"
 
@@ -426,15 +458,6 @@ msgstr "Команда '%s' не визнана.\n"
 msgid "Commit changes"
 msgstr "Прийняти зміни"
 
-#: ../fdroidserver/checkupdates.py
-msgid "Commit changes, push, then make a merge request"
-msgstr "Зафіксуйте зміни, натисніть, а потім зробіть запит на злиття"
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Conflicting \"{field}\" definitions between .yml and localized files:"
-msgstr "Конфлікт визначень \"{field}\" між .yml і локалізованими файлами:"
-
 #: ../fdroidserver/__main__.py
 msgid "Conflicting arguments: '--verbose' and '--quiet' can not be specified at the same time."
 msgstr "Конфліктні аргументи: \"---verbose\" і \"--quiet\" не можна вказати одночасно."
@@ -444,13 +467,11 @@ msgstr "Конфліктні аргументи: \"---verbose\" і \"--quiet\" 
 msgid "Could not find '{command}' on your system"
 msgstr "Не вдалося знайти '{command}' у вашій системі"
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "Could not find latest version code"
 msgstr "Не вдалося знайти останню версію коду"
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "Could not find latest version name"
 msgstr "Не вдалося знайти найновішу назву версії"
 
@@ -460,52 +481,60 @@ msgid "Could not find {path} to remove it"
 msgstr "Не вдалося знайти шлях {path}, щоб вилучити його"
 
 #: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Could not open APK {path} for analysis: "
-msgstr "Не вдалося відкрити файл APK {path} для аналізу: "
+msgid "Could not open apk file for analysis"
+msgstr "Не вдалося відкрити файл apk для аналізу"
 
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "Could not parse size \"{size}\", wrong type \"{type}\""
 msgstr "Не вдалося проаналізувати розмір \"{size}\", неправильний тип \"{type}\""
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/import_subcommand.py
+#. Translators: https://developer.android.com/studio/build/application-id
+#: ../fdroidserver/import.py
 msgid "Couldn't find Application ID"
 msgstr "Не вдалося знайти ID застосунку"
 
-#: ../fdroidserver/checkupdates.py
-msgid "Couldn't find any version information"
-msgstr "Не вдалося знайти відомості про версію"
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
+#: ../fdroidserver/import.py
+msgid "Couldn't find latest version code"
+msgstr "Не вдається знайти останню версію коду"
 
-#: ../fdroidserver/checkupdates.py
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
+#: ../fdroidserver/import.py
+msgid "Couldn't find latest version name"
+msgstr "Не вдається знайти найновішу назву версії"
+
+#: ../fdroidserver/import.py
 msgid "Couldn't find package ID"
-msgstr "Не вдається знайти ідентифікатор пакунка"
+msgstr "Не вдається знайти ідентифікатор пакета"
 
 #: ../fdroidserver/update.py
 msgid "Cowardily refusing to overwrite existing signing key setup!"
 msgstr "Боязно трохи, ми відмовляємося перезаписувати наявний ключ підписування!"
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/update.py
+msgid "Create a repo signing key in a keystore"
+msgstr "Створіть ключ підписування сховищ у сховищі ключів"
+
+#: ../fdroidserver/update.py
+msgid "Create skeleton metadata files that are missing"
+msgstr "Створення скелетів файлів метаданих, які відсутні"
+
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Created new container \"{name}\""
 msgstr "Створено новий контейнер \"{name}\""
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Creating \"{path}\" for configuring s3cmd."
 msgstr "Створення \"{path}\" для налаштування s3cmd."
 
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Creating empty {config_file}"
-msgstr "Створення порожнього {config_file}"
-
 #: ../fdroidserver/publish.py
 msgid "Creating log directory"
 msgstr "Створення каталогу журналу"
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Creating new S3 bucket: {url}"
 msgstr "Створення нового блоку S3: {url}"
@@ -518,7 +547,8 @@ msgstr "Створення вихідного каталогу"
 msgid "Creating signed index with this key (SHA256):"
 msgstr "Створення підписаного індексу за допомогою цієї клавіші (SHA256):"
 
-#: ../fdroidserver/publish.py ../fdroidserver/verify.py
+#: ../fdroidserver/import.py ../fdroidserver/verify.py
+#: ../fdroidserver/publish.py
 msgid "Creating temporary directory"
 msgstr "Створення тимчасового каталогу"
 
@@ -537,17 +567,17 @@ msgstr "DEBUG_KEYSTORE не встановлено або значення є н
 
 #: ../fdroidserver/update.py
 msgid "Delete APKs and/or OBBs without metadata from the repo"
-msgstr "Видалити APK та/або OBB без метаданих з репозиторію"
+msgstr "Видалити APKs і/або OBBs без метаданих зі сховища"
 
 #: ../fdroidserver/deploy.py
 #, python-brace-format
 msgid "Deleting archive, repo is too big ({size} max {limit})"
-msgstr "Видалення архіву, репозиторій завеликий ({size} макс. {limit})"
+msgstr "Видалення архіву, сховище завелике ({size} макс. {limit})"
 
 #: ../fdroidserver/deploy.py
 #, python-brace-format
 msgid "Deleting git-mirror history, repo is too big ({size} max {limit})"
-msgstr "Видалення історії git-mirror, репозиторій завеликий ({size} макс {limit})"
+msgstr "Видалення історії git-mirror, сховище завелике ({size} макс {limit})"
 
 #: ../fdroidserver/update.py
 #, python-brace-format
@@ -563,28 +593,23 @@ msgstr "Опис '%s' є лише резюме застосунку"
 msgid "Description has a duplicate line"
 msgstr "Опис містить дублікат рядка"
 
+#: ../fdroidserver/lint.py
+#, python-format
+msgid "Description has a list (%s) but it isn't bulleted (*) nor numbered (#)"
+msgstr "Опис містить список (%s) але не маркірований (*) і не пронумерований (#)"
+
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "Description of length {length} is over the {limit} char limit"
 msgstr "Довжина опису {length} перевищує ліміт {limit}"
 
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Did you mean config/{name}.yml?"
-msgstr "Ви мали на увазі config/{name}.yml?"
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Did you mean {code}?"
-msgstr "Ви мали на увазі {code}?"
-
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "Do not add 'disable:' to the generated build entries"
 msgstr "Не додавайте 'disable:' до створених записів збірки"
 
 #: ../fdroidserver/nightly.py
 msgid "Do not deploy the new files to the repo"
-msgstr "Не розміщувати нові файли до репозиторію одразу"
+msgstr "Не розміщувати нові файли до сховища одразу"
 
 #: ../fdroidserver/mirror.py
 #, python-brace-format
@@ -597,31 +622,36 @@ msgstr "Не точний шлях Android SDK, просто збій"
 
 #: ../fdroidserver/nightly.py
 msgid "Do not remove the private keys generated from the keystore"
-msgstr "Не вилучайте приватні ключі, утворені у сховищі ключів"
+msgstr "Не видаляйте приватні ключі, утворені у сховищі ключів"
 
 #: ../fdroidserver/build.py
 msgid "Don't create a source tarball, useful when testing a build"
 msgstr "Не створюйте вихідний код, корисно під час тестування створення"
 
+#: ../fdroidserver/stats.py
+msgid "Don't do anything logs-related"
+msgstr "Не робіть нічого пов'язаного з журналами"
+
 #: ../fdroidserver/build.py
 msgid "Don't refresh the repository, useful when testing a build with no internet connection"
-msgstr "Не оновлюйте репозиторій, корисно під час тестування створення без з'єднання з Інтернетом"
+msgstr "Не оновлюйте сховище, корисне під час тестування створення без підключення до Інтернету"
 
 #: ../fdroidserver/deploy.py ../fdroidserver/nightly.py
+#: ../fdroidserver/upload.py
 msgid "Don't use rsync checksums"
 msgstr "Не використовуйте контрольні суми rsync"
 
-#: ../fdroidserver/install.py
-msgid "Download F-Droid.apk using mirrors that leak less to the network"
-msgstr "Завантажуйте F-Droid.apk за допомогою дзеркал, які менше витікають у мережу"
-
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Download complete mirrors of small repos"
-msgstr "Завантажувати повноцінні дзеркала невеликих репозиторіїв"
+msgstr "Завантажувати повноцінні дзеркала невеликих сховищ"
+
+#: ../fdroidserver/stats.py
+msgid "Download logs we don't have"
+msgstr "Журналів завантаження у нас немає"
 
 #: ../fdroidserver/common.py
 msgid "Downloading the repository already failed once, not trying again."
-msgstr "Завантаження репозиторію вже не вдалося, не намагайтеся знову."
+msgstr "Завантаження сховища вже не вдалося, не намагайтеся знову."
 
 #: ../fdroidserver/verify.py
 #, python-brace-format
@@ -630,56 +660,38 @@ msgstr "Завантаження {url} не вдалося. {error}"
 
 #: ../fdroidserver/metadata.py
 #, python-brace-format
-msgid "Duplicate Anti-Feature declaration at {path} was ignored!"
-msgstr "Дубльована декларація небажаних функцій у {path} була проігнорована!"
-
-#: ../fdroidserver/index.py
-#, python-format
-msgid "Duplicate entry \"%s\" in mirrors config!"
-msgstr "Дубльований запис \"%s\" у конфігурації дзеркал!"
+msgid "Duplicate build recipe found for versionCode {versionCode} in {linedesc}"
+msgstr "Подвоєний рецепт збірки, знайдено для versionCode {versionCode} у {linedesc}"
 
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "Duplicate link in '{field}': {url}"
 msgstr "Дублікат посилання в '{field}': {url}"
 
-#: ../fdroidserver/common.py
-#, python-format
-msgid "ERROR: %(message)s"
-msgstr "ПОМИЛКА: %(message)s"
+#: ../fdroid
+msgid "Dynamically scan APKs post build"
+msgstr "Динамічно сканувати створення білдового допису APKs"
 
 #: ../fdroidserver/__main__.py
 msgid "ERROR: The \"server\" subcommand has been removed, use \"deploy\"!"
 msgstr "ПОМИЛКА: Підкоманду \"server\" вилучено, використовуйте \"deploy\"!"
 
+#: ../fdroidserver/mirror.py
+msgid ""
+"ERROR: this command should never be used to mirror f-droid.org!\n"
+"A full mirror of f-droid.org requires more than 200GB."
+msgstr ""
+"ПОМИЛКА: ця команда ніколи не повинна використовуватися для створення дзеркала f-droid.org!\n"
+"Повне дзеркало f-droid.org вимагає понад 200GB."
+
 #: ../fdroidserver/nightly.py
 msgid "ERROR: unsupported CI type, patches welcome!"
 msgstr "ПОМИЛКА: непідтримуваний вид CI, виправлення вітається!"
 
-#: ../fdroidserver/nightly.py
-#, python-format
-msgid "ERROR: unsupported git host \"%s\", patches welcome!"
-msgstr "ПОМИЛКА: непідтримуваний git-хост «%s», виправлення вітаються!"
-
-#: ../fdroidserver/lint.py
+#: ../fdroidserver/metadata.py
 #, python-brace-format
-msgid "ERROR: {key} in {path} is not \"archive\" or \"repo\"!"
-msgstr "Помилка: {key} в {path} це не «архів» чи «репозиторій»!"
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "ERROR: {key} not a valid key!"
-msgstr "ПОМИЛКА: {key} недійсний ключ!"
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "ERROR: {key}'s value should be of type {t}!"
-msgstr "ПОМИЛКА: значення {key} має бути типу {t}!"
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "ERROR: {key}:{subkey} in {path} is not in allowed keys: {allowed_keys}!"
-msgstr "Помилка: {key}:{subkey} в {path} немає серед дозволених ключів: {allowed_keys}!"
+msgid "Empty build flag at {linedesc}"
+msgstr "Порожній прапорець збірки на {linedesc}"
 
 #: ../fdroidserver/__main__.py
 #, python-brace-format
@@ -695,40 +707,20 @@ msgstr ""
 "Введіть шлях до Android SDK (%s) тут:\n"
 "> "
 
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Environment variable {var} from {configname} is not set!"
-msgstr "Змінну середовища {var} від {configname} не налаштованоно!"
+#: ../fdroidserver/deploy.py ../fdroidserver/checkupdates.py
+#: ../fdroidserver/upload.py
+#, python-format
+msgid "Error while attempting to publish log: %s"
+msgstr "Помилка під час отримання адреси сховища: %s"
 
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Environment variable {{env: {var}}} is not set!"
-msgstr "Змінна середовища {{env: {var}}} не встановлена!"
-
-#: ../fdroidserver/deploy.py
-msgid "Error deploying 'github_releases', {} not present. (You might need to run `fdroid update` first.)"
-msgstr "Помилка розгортання 'github_releases', {} відсутній. (Можливо вам потрібно спочатку виконати `fdroid update`.)"
-
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py ../fdroidserver/common.py
 msgid "Error while getting repo address"
-msgstr "Помилка отримання адреси репозиторію"
+msgstr "Помилка отримання адреси сховища"
 
-#: ../fdroidserver/scanner.py
-msgid "Exit with a non-zero code if problems were found"
-msgstr "Вихід із ненульовим кодом, якщо виявлено проблеми"
-
-#: ../fdroidserver/__main__.py
-msgid "Extract application metadata from a source repository"
-msgstr "Витяг метаданих застосунку з вихідного репозиторію"
-
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Extract signatures from APKs"
 msgstr "Експортування підписів з APK"
 
-#: ../fdroidserver/install.py
-msgid "F-Droid.apk could not be downloaded from any known source!"
-msgstr "F-Droid.apk не вдалося завантажити з жодного відомого джерела!"
-
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Failed copying {path}: {error}"
@@ -749,34 +741,42 @@ msgstr "Не вдалося розпізнати {path}: {error}"
 msgid "Failed resizing {path}: {error}"
 msgstr "Не вдалося змінити розмір {path}: {error}"
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/publish.py
+msgid "Failed to align application"
+msgstr "Не вдалося оптимізувати (align) застосунок"
+
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Failed to create S3 bucket: {url}"
 msgstr "Не вдалося створити сигмент S3: {url}"
 
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Failed to get APK information, deleting {path}"
-msgstr "Не вдалося отримати подробиці про APK, {path} буде видалено"
+#: ../fdroidserver/common.py
+msgid "Failed to get APK manifest information"
+msgstr "Не вдалося отримати подробиці про APK"
 
 #: ../fdroidserver/update.py
 #, python-brace-format
-msgid "Failed to get APK information, skipping {path}"
-msgstr "Не вдалося отримати подробиці про APK, {path} буде пропущено"
+msgid "Failed to get apk information, deleting {path}"
+msgstr "Не вдалося отримати подробиці про apk, {path} буде видалено"
 
 #: ../fdroidserver/update.py
-msgid "Failed to get APK signing key fingerprint"
-msgstr "Не вдалося отримати відбиток ключа підпису APK"
+#, python-brace-format
+msgid "Failed to get apk information, skipping {path}"
+msgstr "Не вдалося отримати подробиці про apk, {path} буде пропущено"
 
 #: ../fdroidserver/install.py
 #, python-brace-format
 msgid "Failed to install '{apkfilename}' on {dev}: {error}"
 msgstr "Не вдалося встановити '{apkfilename}' в {dev}: {error}"
 
-#: ../fdroidserver/common.py
+#: ../fdroidserver/publish.py ../fdroidserver/common.py
 msgid "Failed to sign application"
 msgstr "Не вдалося підписати застосунок"
 
+#: ../fdroidserver/common.py
+msgid "Failed to zipalign application"
+msgstr "Не вдалося оптимізувати (zipalign) застосунок"
+
 #: ../fdroidserver/build.py
 #, python-brace-format
 msgid "Fetched buildserverid from VM: {buildserverid}"
@@ -792,12 +792,21 @@ msgstr "Отримані підписи для '{apkfilename}' -> '{sigdir}'"
 msgid "File disappeared while processing it: {path}"
 msgstr "Файл зник під час його обробки: {path}"
 
-#: ../fdroidserver/build.py ../fdroidserver/install.py
-#: ../fdroidserver/rewritemeta.py ../fdroidserver/scanner.py
-#: ../fdroidserver/update.py
+#: ../fdroidserver/verify.py ../fdroidserver/stats.py ../fdroidserver/update.py
+#: ../fdroidserver/rewritemeta.py ../fdroidserver/build.py
+#: ../fdroidserver/checkupdates.py ../fdroidserver/scanner.py
+#: ../fdroidserver/install.py
 msgid "Finished"
 msgstr "Готово"
 
+#: ../fdroidserver/lint.py
+msgid "Flattr donation methods belong in the FlattrID flag"
+msgstr "Методи допомоги Flattr належать до прапора FlattrID"
+
+#: ../fdroidserver/lint.py
+msgid "Flattr donation methods belong in the FlattrID: field"
+msgstr "Належний до FlattrID метод допомоги Flattr: не вдалося"
+
 #: ../fdroidserver/lint.py
 msgid "Forbidden HTML tags"
 msgstr "Заборонені мітки HTML"
@@ -829,6 +838,7 @@ msgstr "Знайдено пошкоджений файл фінансуванн
 msgid "Found invalid appids in arguments"
 msgstr "Знайдено недійсні прикладні програми в аргументах"
 
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
 #: ../fdroidserver/common.py
 msgid "Found invalid versionCodes for some apps"
 msgstr "Знайдено недійсні версії коду для деяких застосунків"
@@ -838,10 +848,6 @@ msgstr "Знайдено недійсні версії коду для деяк
 msgid "Found multiple JAR Signature Block Files in {path}"
 msgstr "Знайдено кілька файлів блоку підписів JAR у {path}"
 
-#: ../fdroidserver/common.py
-msgid "Found multiple Signer Certificates!"
-msgstr "Знайдено декілька сертифікатів підписувача!"
-
 #: ../fdroidserver/metadata.py
 #, python-brace-format
 msgid "Found multiple metadata files for {appid}"
@@ -849,11 +855,16 @@ msgstr "Знайдено кілька файлів метаданих для {ap
 
 #: ../fdroidserver/index.py
 msgid "Found multiple signing certificates for repository."
-msgstr "Знайдено кілька сертифікатів підписування для репозиторію."
+msgstr "Знайдено кілька сертифікатів підписування для сховища."
+
+#: ../fdroidserver/update.py
+#, python-brace-format
+msgid "Found multiple signing certificates in {path}"
+msgstr "Знайдено кілька сертифікатів для підписання на {path}"
 
 #: ../fdroidserver/index.py
 msgid "Found no signing certificates for repository."
-msgstr "Не знайдено сертифікатів підписування для репозиторію."
+msgstr "Не знайдено сертифікатів підписування для сховища."
 
 #: ../fdroidserver/lint.py
 #, python-format
@@ -865,16 +876,6 @@ msgstr "Знайдено не файл у %s"
 msgid "Found {apkfilename} at {url}"
 msgstr "Знайдено {apkfilename} у {url}"
 
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Found {count} problems in {filename}"
-msgstr "Виявлено {count} проблем у {filename}"
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Found {count} warnings in {filename}"
-msgstr "Знайдено {count} попередження в {filename}"
-
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Generated skeleton metadata for {appid}"
@@ -893,21 +894,19 @@ msgstr "Очистити Git невдалося"
 msgid "Git fetch failed"
 msgstr "Git вибірка не вдалася"
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
+#: ../fdroidserver/common.py
+msgid "Git remote set-head failed"
+msgstr "Не вдалося встановити пульт дистанційного керування Git"
+
 #: ../fdroidserver/common.py
 #, python-format
 msgid "Git remote set-head failed: \"%s\""
-msgstr "Помилка налаштування remote set-head для Git: «%s»"
+msgstr "Помилка зовнішнього налаштування Git: \"%s\""
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
 #: ../fdroidserver/common.py
 msgid "Git reset failed"
 msgstr "Скидання Git не вдалося"
 
-#: ../fdroidserver/common.py
-msgid "Git submodule deinit failed"
-msgstr "Не вдалося деініціалізувати підмодуль Git"
-
 #: ../fdroidserver/common.py
 msgid "Git submodule sync failed"
 msgstr "Не вдалося синхронізувати підмодуль Git"
@@ -939,16 +938,6 @@ msgstr "Нехтування метаданими '{field}' у метадани
 msgid "Ignoring FUNDING.yml entry longer than 2048: %s"
 msgstr "Нехтування записом FUNDING.yml з датою після 2048 року: %s"
 
-#: ../fdroidserver/update.py
-#, python-format
-msgid "Ignoring bad element in manifest: %s"
-msgstr "Ігнорування поганого елемента в маніфесті: %s"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Ignoring deprecated {oldfile}, use {newfile}!"
-msgstr "Ігноруючи застарілий {oldfile}, використовуйте {newfile}!"
-
 #: ../fdroidserver/index.py
 msgid "Ignoring package without metadata: "
 msgstr "Нехтування пакунком без метаданих: "
@@ -958,6 +947,11 @@ msgstr "Нехтування пакунком без метаданих: "
 msgid "Ignoring stale cache data for {apkfilename}"
 msgstr "Нехтування застарілим кешем для {apkfilename}"
 
+#: ../fdroidserver/rewritemeta.py
+#, python-brace-format
+msgid "Ignoring {ext} file at '{path}'"
+msgstr "Нехтування файлом {ext} у '{path}'"
+
 #: ../fdroidserver/update.py
 msgid "Include APKs that are signed with disabled algorithms like MD5"
 msgstr "Включити APK, які підписані без алгоритмів, таких як MD5"
@@ -974,16 +968,6 @@ msgstr "Включити журнали збірки в дзеркало"
 msgid "Include the source tarballs in the mirror"
 msgstr "Включити джерело tarballs в дзеркало"
 
-#: ../fdroidserver/metadata.py
-#, python-format
-msgid "Including metadata from %s@%s"
-msgstr "Включно з метаданими від %s@%s"
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Including metadata from {path}"
-msgstr "Включно з метаданими з {path}"
-
 #: ../fdroidserver/common.py
 msgid "Initialising submodules"
 msgstr "Під'єднання підмодулів"
@@ -992,58 +976,85 @@ msgstr "Під'єднання підмодулів"
 msgid "Install all signed applications available"
 msgstr "Встановити всі доступні підписані застосунки"
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Install built packages on devices"
-msgstr "Встановити побудовані пакунки на пристрої"
+msgstr "Встановити побудовані пакети на пристрої"
 
 #: ../fdroidserver/install.py
 #, python-format
 msgid "Installing %s..."
 msgstr "Встановлення %s..."
 
+#: ../fdroidserver/install.py
+#, python-format
+msgid "Installing %s…"
+msgstr "Встановлення %s…"
+
 #: ../fdroidserver/install.py
 #, python-brace-format
 msgid "Installing '{apkfilename}' on {dev}..."
 msgstr "Встановлення '{apkfilename}' на {dev}..."
 
-#: ../fdroidserver/__main__.py
+#: ../fdroidserver/install.py
+#, python-brace-format
+msgid "Installing '{apkfilename}' on {dev}…"
+msgstr "Встановлення '{apkfilename}' на {dev}…"
+
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Interact with the repo HTTP server"
-msgstr "Взаємодія з HTTP-сервером репозиторію"
+msgstr "Взаємодія з HTTP-сервером сховища"
 
 #: ../fdroidserver/update.py
 msgid "Invalid APK"
 msgstr "Недійсний APK"
 
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "Invalid AutoUpdateMode: {mode}"
-msgstr "Неприпустимий AutoUpdateMode: {mode}"
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "Invalid UpdateCheckMode: {mode}"
-msgstr "Неприпустимий UpdateCheckMode: {mode}"
-
-#: ../fdroidserver/checkupdates.py
+#: ../fdroidserver/lint.py ../fdroidserver/checkupdates.py
 #, python-brace-format
 msgid "Invalid VercodeOperation: {field}"
 msgstr "Недійсна VercodeOperation: {field}"
 
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Invalid VercodeOperation: {invalid_ops}"
-msgstr "Недійсна VercodeOperation: {invalid_ops}"
-
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "Invalid application ID {appid}"
 msgstr "Недійсний ID застосунку {appid}"
 
+#: ../fdroidserver/metadata.py
+#, python-format
+msgid "Invalid boolean '%s'"
+msgstr "Недійсний логічний '%s'"
+
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Invalid build flag at {line} in {linedesc}"
+msgstr "Недійсний прапорець збірки у рядку {line} в {linedesc}"
+
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Invalid build format: {value} in {name}"
+msgstr "Недійсний формат збірки: {value} у {name}"
+
 #: ../fdroidserver/lint.py
 msgid "Invalid bulleted list"
 msgstr "Недійсний розмічений список"
 
+#: ../fdroidserver/lint.py
+#, python-format
+msgid "Invalid license tag \"%s\"! Use only tags from https://spdx.org/license-list"
+msgstr "Недійсна мітка ліцензії \"%s\"! Використовуйте лише мітки з https://spdx.org/license-list"
+
+#: ../fdroidserver/lint.py
+msgid "Invalid link - use [http://foo.bar Link title] or [http://foo.bar]"
+msgstr "Недійсне посилання — використовуйте [http://foo.bar текст посилання] чи [http://foo.bar]"
+
+#: ../fdroidserver/metadata.py
+#, python-format
+msgid "Invalid metadata in %s:%d"
+msgstr "Недійсні метадані у %s: %d"
+
+#: ../fdroidserver/metadata.py
+msgid "Invalid metadata in: "
+msgstr "Недійсні метадані в: "
+
 #: ../fdroidserver/common.py
 #, python-format
 msgid "Invalid name for published file: %s"
@@ -1051,8 +1062,8 @@ msgstr "Неправильне ім'я для оприлюдненого фай
 
 #: ../fdroidserver/common.py
 #, python-brace-format
-msgid "Invalid ndk: entry in build: \"{ndk}\""
-msgstr "Неприпустимий ndk: запис у збірці: \"{ndk}\""
+msgid "Invalid package name {0}"
+msgstr "Неправильна назва пакунку {0}"
 
 #: ../fdroidserver/common.py
 #, python-brace-format
@@ -1074,6 +1085,11 @@ msgstr "Неправильні метадані srclib: не вдалося зч
 msgid "Invalid srclib metadata: unknown key '{key}' in '{file}'"
 msgstr "Неприпустимі метадані srclib: невідомий ключ '{key}' у '{file}'"
 
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Invalid versionCode: \"{versionCode}\" is not an integer!"
+msgstr "Недійсний versionCode: \"{versionCode}\" не є цілим числом!"
+
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "JAR signature failed to verify: {path}"
@@ -1088,8 +1104,8 @@ msgstr "Підтверджено підпис JAR: {path}"
 msgid "Java JAR file"
 msgstr "Файл Java JAR"
 
-#: ../fdroidserver/mirror.py ../fdroidserver/publish.py
-#: ../fdroidserver/update.py
+#: ../fdroidserver/publish.py ../fdroidserver/update.py
+#: ../fdroidserver/mirror.py
 msgid "Java JDK not found! Install in standard location or set java_paths!"
 msgstr "Java JDK не знайдено! Встановіть в усталеному розташуванні або встановіть java_paths!"
 
@@ -1105,19 +1121,10 @@ msgstr "Jarsigner Java не знайдено! Встановіть в устал
 msgid "Javascript in HTML src attributes"
 msgstr "В атрибутах джерельного HTML коду міститься Javascript"
 
-#: ../fdroidserver/build.py
-#, python-brace-format
-msgid "Keeping failed build \"{apkfilename}\""
-msgstr "Зберігання невдалої збірки \"{apkfilename}\""
-
 #: ../fdroidserver/init.py
 msgid "Keystore for signing key:\t"
 msgstr "Шлях до сховища ключів для ключа підпису сховища\t"
 
-#: ../fdroidserver/lint.py
-msgid "Known debug key is used in AllowedAPKSigningKeys: "
-msgstr "Відомий ключ налагодження використовується в AllowedAPKSigningKeys: "
-
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "Last used commit '{commit}' looks like a tag, but UpdateCheckMode is '{ucm}'"
@@ -1127,9 +1134,13 @@ msgstr "Останнє подання '{commit}' виглядає як мітк
 msgid "Liberapay donation methods belong in the Liberapay: field"
 msgstr "Належний до Liberapay метод допомоги Liberapay: не вдалося"
 
+#: ../fdroidserver/lint.py
+msgid "Liberapay donation methods belong in the LiberapayID flag"
+msgstr "Методи допомоги Flattr належать до прапора FlattrID"
+
 #: ../fdroidserver/rewritemeta.py
-msgid "List files that would be reformatted (dry run)"
-msgstr "Список файлів, які будуть переформатовані (пробний запуск)"
+msgid "List files that would be reformatted"
+msgstr "Список файлів, які будуть переформатовані"
 
 #: ../fdroidserver/lint.py
 msgid "Locale included in f-droid.org URL"
@@ -1141,54 +1152,45 @@ msgstr "Зробити зупинку створення за винятками
 
 #: ../fdroidserver/index.py
 msgid "Malformed repository mirrors."
-msgstr "Несправні дзеркала репозиторію."
+msgstr "Несправні дзеркала сховища."
 
 #: ../fdroidserver/deploy.py
 msgid "Malformed serverwebroot line:"
 msgstr "Несправний шлях serverwebroot:"
 
-#: ../fdroidserver/scanner.py
-#, python-format
-msgid "Max recursion depth in ZIP file reached: %s"
-msgstr "Досягнуто максимальної глибини рекурсії у ZIP-файлі: %s"
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "Mirror config for {url} contains \"isPrimary\" key!"
-msgstr "Конфігурація дзеркала для {url} містить ключ \"isPrimary\"!"
-
 #: ../fdroidserver/mirror.py
 msgid "Mirror the full repo and archive, all file types."
-msgstr "Дзеркало всього репозиторію та архіву всіх типів файлів."
+msgstr "Дзеркало всього сховища та архіву всіх типів файлів."
 
 #: ../fdroidserver/gpgsign.py
 msgid "Missing output directory"
 msgstr "Відсутній вихідний шлях"
 
-#: ../fdroidserver/metadata.py
-msgid "Moving Anti-Features declarations to localized files:"
-msgstr "Переміщення декларацій небажаних функцій до локалізованих файлів:"
-
-#: ../fdroidserver/index.py
-msgid "Neither \"repo_pubkey\" nor \"keystorepass\" set in config.yml"
-msgstr "Ні \"repo_pubkey\", ні \"keystorepass\" не встановлені в config.yml"
-
-#: ../fdroidserver/verify.py
+#: ../fdroidserver/lint.py
 #, python-format
-msgid "No APK for package: %s"
-msgstr "Немає APK для пакунка: %s"
+msgid "Name '%s' is just the auto name - remove it"
+msgstr "Назву '%s' — створено самочинно, вилучіть її"
+
+#: ../fdroidserver/common.py
+msgid "No 'config.py' found, using defaults."
+msgstr "Не знайдено 'config.py', використовуючи типові налаштування."
 
 #: ../fdroidserver/common.py
 msgid "No Android SDK found!"
 msgstr "Не знайдено Android SDK!"
 
+#: ../fdroidserver/import.py
+msgid "No android or kivy project could be found. Specify --subdir?"
+msgstr "Не знайдено жодного Android чи kivy проєкту. Вказати його у --subdir?"
+
 #: ../fdroidserver/install.py
 msgid "No attached devices found"
 msgstr "Не знайдено приєднаних пристроїв"
 
-#: ../fdroidserver/install.py
-msgid "No devices found for `adb install`! Please plug one in."
-msgstr "Не знайдено пристроїв для `adb install`! Будь ласка, підключіть один."
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "No commit specified for {versionName} in {linedesc}"
+msgstr "У версії {linedesc} не вказано поданнь для {versionName}"
 
 #: ../fdroidserver/index.py
 msgid "No fingerprint in URL."
@@ -1198,23 +1200,14 @@ msgstr "Немає власного цифрового відбитка в URL-
 msgid "No git submodules available"
 msgstr "Немає доступних підмодулів git"
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "No gradle project could be found. Specify --subdir?"
 msgstr "Не знайдено жодного проєкту gradle. Вказати його у --subdir?"
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py ../fdroidserver/common.py
 msgid "No information found."
 msgstr "Подробиць не знайдено."
 
-#: ../fdroidserver/checkupdates.py
-msgid "No matching tags found"
-msgstr "Не знайдено відповідних тегів"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "No minimum SDK version found in {0}, using default (3)."
-msgstr "У {0} не знайдено мінімальної версії SDK, усталено (3)."
-
 #: ../fdroidserver/lint.py
 msgid "No need to specify that the app is Free Software"
 msgstr "Не має потреби вказувати, що застосунок є вільним ПЗ"
@@ -1224,8 +1217,8 @@ msgid "No need to specify that the app is for Android"
 msgstr "Не має потреби вказувати, що застосунок призначено для Android"
 
 #: ../fdroidserver/deploy.py
-msgid "No option set! Edit your config.yml to set at least one of these:"
-msgstr "Недостатньо параметрів! Змініть свій config.yml, щоб встановити принаймні один з цих:"
+msgid "No option set! Edit your config.py to set at least one of these:"
+msgstr "Недостатньо параметрів! Змініть свій config.py, щоб встановити принаймні один з цих:"
 
 #: ../fdroidserver/common.py
 msgid "No packages specified"
@@ -1233,14 +1226,14 @@ msgstr "Пакунків не вказано"
 
 #: ../fdroidserver/install.py
 #, python-format
-msgid "No signed APK available for %s"
-msgstr "Немає підписаних APK для %s"
+msgid "No signed apk available for %s"
+msgstr "Немає підписаних apk для %s"
 
 #: ../fdroidserver/install.py
 msgid "No signed output directory - nothing to do"
 msgstr "Немає підписаного вихідного шляху — нічого виконувати"
 
-#: ../fdroidserver/common.py
+#: ../fdroidserver/update.py ../fdroidserver/common.py
 #, python-brace-format
 msgid "No signing certificates found in {path}"
 msgstr "У {path} не знайдено сертифікатів для підписання"
@@ -1250,23 +1243,16 @@ msgstr "У {path} не знайдено сертифікатів для підп
 msgid "No such package: %s"
 msgstr "Такого пакунка немає: %s"
 
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "No such versionCode {versionCode} for app {appid}"
 msgstr "Немає такого versionCode {versionCode} для застосунку {appid}"
 
-#: ../fdroidserver/checkupdates.py
-msgid "No tags found"
-msgstr "Теги не знайдено"
-
-#: ../fdroidserver/publish.py ../fdroidserver/verify.py
+#: ../fdroidserver/verify.py ../fdroidserver/publish.py
 msgid "No unsigned directory - nothing to do"
 msgstr "Немає непідписаної теки — нічого виконувати"
 
-#: ../fdroidserver/__main__.py
-msgid "No version information could be found."
-msgstr "Не вдалося знайти відомості про версію."
-
 #: ../fdroidserver/common.py
 msgid "Not a valid size definition: \"{}\""
 msgstr "Недійсне визначення розміру: \"{}\""
@@ -1281,9 +1267,10 @@ msgid "Nothing to do for {appid}."
 msgstr "Для {appid} нічого виконувати."
 
 #: ../fdroidserver/init.py
-msgid "Now set these in config.yml:"
-msgstr "Тепер встановіть їх у config.yml:"
+msgid "Now set these in config.py:"
+msgstr "Тепер встановіть їх у config.py:"
 
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "OBB file has newer versionCode({integer}) than any APK:"
@@ -1295,34 +1282,29 @@ msgstr "Назва файлу OBB повинна починатися з \"main.
 
 #: ../fdroidserver/update.py
 msgid "OBB's packagename does not match a supported APK:"
-msgstr "Назва пакунка OBB не відповідає підтримуваному APK:"
+msgstr "Назва пакунку OBB не відповідає підтримуваному APK:"
 
 #: ../fdroidserver/deploy.py
 msgid "Offline machine, skipping git mirror generation until `fdroid deploy`"
-msgstr "Автономна машина, пропускання генерування дзеркал git до `fdroid deploy`"
+msgstr "Автономна машина, пропускання генерації дзеркал git до `fdroid deploy`"
 
-#: ../fdroidserver/deploy.py
-msgid "One of the 'github_releases' config items is missing the 'packageNames' value. skipping ..."
-msgstr "В одному з елементів конфігурації 'github_releases' відсутнє значення 'packageNames'. пропущено ..."
+#: ../fdroidserver/common.py
+#, python-brace-format
+msgid "Old APK signature failed to verify: {path}"
+msgstr "Не вдалося підтвердити старий підпис APK: {path}"
 
-#: ../fdroidserver/deploy.py
-msgid "One of the 'github_releases' config items is missing the 'projectUrl' value. skipping ..."
-msgstr "В одному з елементів конфігурації 'github_releases' відсутнє значення 'projectUrl'. пропущено ..."
+#: ../fdroid ../fdroidserver/__main__.py
+msgid "Old, deprecated name for fdroid deploy"
+msgstr "Застаріла назва розгортання (deploy) fdroid"
 
-#: ../fdroidserver/deploy.py
-msgid "One of the 'github_releases' config items is missing the 'token' value. skipping ..."
-msgstr "В одному з елементів конфігурації 'github_releases' відсутнє значення 'token'. пропущено ..."
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Only PNG and JPEG are supported for graphics, found: {path}"
 msgstr "Підтримуються лише PNG та JPEG зображення, знайдено: {path}"
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/common.py
-msgid "Only accepts a single key \"env\""
-msgstr "Приймає лише один ключ \"env\""
+#: ../fdroidserver/checkupdates.py
+msgid "Only print differences with the Play Store"
+msgstr "Друкувати відмінності тільки з Play Store"
 
 #: ../fdroidserver/checkupdates.py
 msgid "Only process apps with auto-updates"
@@ -1332,6 +1314,11 @@ msgstr "Обробляти застосунки лише за допомогою
 msgid "OpenCollective donation methods belong in the OpenCollective: field"
 msgstr "Належний до OpenCollective метод допомоги OpenCollective: не вдалося"
 
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "Options"
+msgstr "Параметри"
+
 #: ../fdroidserver/verify.py
 msgid "Output JSON report to file named after APK."
 msgstr "Виведіть JSON-звіт у назві файлу APK."
@@ -1340,22 +1327,26 @@ msgstr "Виведіть JSON-звіт у назві файлу APK."
 msgid "Output JSON to stdout."
 msgstr "Вивід JSON на stdout."
 
-#: ../fdroidserver/checkupdates.py ../fdroidserver/gpgsign.py
-#: ../fdroidserver/publish.py ../fdroidserver/signindex.py
-#: ../fdroidserver/update.py
+#: ../fdroidserver/gpgsign.py ../fdroidserver/publish.py
+#: ../fdroidserver/update.py ../fdroidserver/signindex.py
+#: ../fdroidserver/checkupdates.py
 msgid "Outputting JSON"
 msgstr "Вивід JSON"
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "Overall license of the project."
-msgstr "Загальна ліцензія проєкту."
+msgstr "Загальна ліцензія проекту."
+
+#: ../fdroidserver/dscanner.py
+msgid "Override path for repo APKs (default: ./repo)"
+msgstr "Перевизначити шлях для сховища APK-файлів (типово: ./repo)"
 
 #: ../fdroidserver/index.py
 #, python-brace-format
 msgid "Overriding blank versionName in {apkfilename} from metadata: {version}"
 msgstr "Перезапис порожнього versionName у {apkfilename} з метаданих: {version}"
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 #, python-brace-format
 msgid "Package \"{appid}\" already exists"
 msgstr "Пакунок \"{appid}\" вже існує"
@@ -1367,37 +1358,42 @@ msgstr "Читання маніфесту у '{path}'"
 
 #: ../fdroidserver/common.py
 msgid "Password required with username"
-msgstr "Потрібен пароль з іменем користувача"
+msgstr "Потрібен парольіз іменем користувача"
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "Path to main Android project subdirectory, if not in root."
 msgstr "Шлях до основного підкаталогу проєкту Android, якщо не в кореневому каталозі."
 
+msgid "Path to main android project subdirectory, if not in root."
+msgstr "Шлях до основного підкаталогу андроїда, якщо не в кореневому каталозі."
+
 #: ../fdroidserver/init.py
 msgid "Path to the Android SDK (sometimes set in ANDROID_HOME)"
 msgstr "Шлях до Android SDK (іноді встановлено в ANDROID_HOME)"
 
 #: ../fdroidserver/btlog.py
 msgid "Path to the git repo to use as the log"
-msgstr "Шлях до git-репозиторію, який використовується для журналювання"
+msgstr "Шлях до сховища git, яке використовується для входу"
 
 #: ../fdroidserver/init.py
 msgid "Path to the keystore for the repo signing key"
-msgstr "Шлях до сховища ключів для підписного ключа репозиторію"
+msgstr "Шлях до сховища ключа для підписного ключа сховища"
+
+#: ../fdroidserver/dscanner.py
+msgid "Prepare Drozer to run a scan"
+msgstr "Підготувати Drozer до початку сканування"
+
+msgid "Prepare drozer to run a scan"
+msgstr "Підготувати drozer для запуску сканування"
 
 #: ../fdroidserver/nightly.py
 msgid "Print the secret variable to the terminal for easy copy/paste"
 msgstr "Вивести таємну змінну до термінала для легкого копіювання/вставлення"
 
-#: ../fdroidserver/install.py
+#: ../fdroidserver/metadata.py
 #, python-brace-format
-msgid "Privacy mode was enabled based on your locale ({country_code})."
-msgstr "Режим конфіденційності було ввімкнено на основі вашої мови ({country_code})."
-
-#: ../fdroidserver/scanner.py
-#, python-format
-msgid "Problem with ZIP file: %s, error %s"
-msgstr "Проблема з ZIP файлом: %s, помилка %s"
+msgid "Problem with description of {appid}: {error}"
+msgstr "Проблема з описом {appid}: {error}"
 
 #: ../fdroidserver/common.py
 #, python-brace-format
@@ -1422,9 +1418,13 @@ msgstr "Обробка {appid}"
 msgid "Produce human-readable XML/JSON for index files"
 msgstr "Створити доступний для читання людиною XML/JSON для індексування файлів"
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/update.py
+msgid "Produce human-readable index.xml"
+msgstr "Створити зручний для сприйняття index.xml"
+
+#: ../fdroidserver/import.py
 msgid "Project URL to import from."
-msgstr "URL-адреса проєкту для імпорту."
+msgstr "URL-адреса проекту для імпорту."
 
 #: ../fdroidserver/lint.py
 msgid "Punctuation should be avoided"
@@ -1432,27 +1432,23 @@ msgstr "Слід уникати пунктуації"
 
 #: ../fdroidserver/btlog.py
 msgid "Push the log to this git remote repository"
-msgstr "Надіслати журнал цього віддаленого репозиторію git"
+msgstr "Натисніть вхід цього віддаленого сховища git"
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Pushing binary transparency log to {url}"
 msgstr "Оновити двійковий журнал прозорості для {url}"
 
-#: ../fdroidserver/deploy.py
-msgid "Pushing to remote server failed!"
-msgstr "Не вдалося передати на віддалений сервер!"
-
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Pushing to {url}"
-msgstr "Передано до {url}"
+msgstr "Оприлюднення до {url}"
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Quickly start a new repository"
-msgstr "Швидкий запуск нового репозиторія"
+msgstr "Швидкий запуск нового сховища"
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Read all the metadata files and exit"
 msgstr "Прочитайте всі файли метаданих і вийдіть"
 
@@ -1463,49 +1459,40 @@ msgstr "Читання '{config_file}'"
 
 #: ../fdroidserver/common.py
 #, python-brace-format
-msgid "Reading packageName/versionCode/versionName failed, APK invalid: '{apkfilename}'"
-msgstr "Помилка packageName/versionCode/versionName, APK недійсне: '{apkfilename}'"
+msgid "Reading minSdkVersion failed: \"{apkfilename}\""
+msgstr "Не вдалося прочитати minSdkVersion: \"{apkfilename}\""
 
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
+#. https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
 #: ../fdroidserver/common.py
 #, python-brace-format
-msgid "Reading packageName/versionCode/versionName failed,APK invalid: '{apkfilename}'"
-msgstr "Не вдалося прочитати packageName/versionCode/versionName failed, APK недійсний: '{apkfilename}'"
+msgid "Reading packageName/versionCode/versionName failed, APK invalid: '{apkfilename}'"
+msgstr "Помилка packageName/versionCode/versionName, APK недійсне: '{apkfilename}'"
 
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Reading {apkfilename} from cache"
 msgstr "Читання {apkfilename} з кешу"
 
-#: ../fdroidserver/build.py
-msgid "Refresh and cache scanner rules and signatures from the network"
-msgstr "Оновлення та кешування правил і сигнатур сканера з мережі"
-
-#: ../fdroidserver/publish.py
-#, python-brace-format
-msgid "Refusing to sign '{path}', file exists in both {dir1} and {dir2} folder."
-msgstr "Відмова підписати '{path}', файл існує в теках {dir1} і {dir2}."
-
-#: ../fdroidserver/verify.py
-msgid "Remove source tarball and any APKs if successfully verified."
-msgstr "Видаліть вихідний архів та будь-які файли APK, якщо успішно перевірено."
+#: ../fdroidserver/stats.py
+msgid "Recalculate aggregate stats - use when changes have been made that would invalidate old cached data."
+msgstr "Перерахуйте сукупну статистику - використовуйте, коли були внесені зміни, які призведуть до втрати старих кешованих даних."
 
 #: ../fdroidserver/common.py
 msgid "Removing specified files"
 msgstr "Вилучення вказаних файлів"
 
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Removing {path}\""
-msgstr "Вилучення {path}\""
-
 #: ../fdroidserver/update.py
 msgid "Rename APK files that do not match package.name_123.apk"
 msgstr "Перейменування файлів APK, які не відповідають package.name_123.apk"
 
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "RepoType {type} is deprecated, please switch to git."
-msgstr ""
+#: ../fdroidserver/update.py
+msgid "Report on build data status"
+msgstr "Звіт про статус створення даних"
+
+#: ../fdroidserver/build.py
+msgid "Reset and create a brand new build server, even if the existing one appears to be ok."
+msgstr "Перезавантажте та створіть новий сервер створення, навіть якщо наявний існує."
 
 #: ../fdroidserver/nightly.py
 #, python-brace-format
@@ -1514,40 +1501,39 @@ msgstr "Повторне підписання {apkfilename} з наданим de
 
 #: ../fdroidserver/update.py
 msgid "Resize all the icons exceeding the max pixel size and exit"
-msgstr "Змінити розмір усіх піктограм, що перевищують максимальний розмір у пікселях та вийти"
+msgstr "Змінити розмір усіх значків, що перевищують максимальний розмір пікселя та вийти"
 
 #: ../fdroidserver/common.py
 msgid "Restrict output to warnings and errors"
 msgstr "Обмеження виводу на попередження і помилки"
 
-#: ../fdroidserver/net.py
-#, python-format
-msgid "Retrying failed download: %s"
-msgstr "Повторна спроба невдалого завантаження: %s"
-
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Rewrite all the metadata files"
 msgstr "Перепишіть усі файли метаданих"
 
+#: ../fdroidserver/rewritemeta.py
+msgid "Rewrite to a specific format: "
+msgstr "Переписати в певний формат: "
+
 #: ../fdroidserver/rewritemeta.py
 #, python-brace-format
 msgid "Rewriting '{appid}'"
 msgstr "Перезапис '{appid}'"
 
+#: ../fdroidserver/rewritemeta.py
+#, python-brace-format
+msgid "Rewriting '{appid}' to '{path}'"
+msgstr "Перезапис '{appid}' на '{path}'"
+
 #: ../fdroidserver/checkupdates.py
 msgid "Run on git repo that has uncommitted changes"
-msgstr "Запустити для git-репозиторію з неподаними змінами"
-
-#: ../fdroidserver/nightly.py
-#, python-brace-format
-msgid "Run over {cibase} to find -debug.apk. and skip repo_basedir {repo_basedir}"
-msgstr "Виконайте команду {cibase}, щоб знайти -debug.apk. і пропустіть repo_basedir {repo_basedir}"
+msgstr "Запустити на git сховище, яке не подало зміни"
 
 #: ../fdroidserver/lint.py
 msgid "Run rewritemeta to fix formatting"
-msgstr "Запустити rewritemeta, щоб виправити форматування"
+msgstr "Запустити rewritemeta виправити форматування"
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 msgid "Running first pass with MD5 checking disabled"
 msgstr "Запуск першого проходу з вимкненою перевіркою MD5"
 
@@ -1556,23 +1542,17 @@ msgstr "Запуск першого проходу з вимкненою пер
 msgid "Running wget in {path}"
 msgstr "Запуск wget у {path}"
 
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "SHA-256 of {url} does not match entry!"
-msgstr "SHA-256 {url} не відповідає запису!"
+#: ../fdroidserver/dscanner.py
+msgid "Scan only the latest version of each package"
+msgstr "Сканувати лише останню версію кожного пакета"
 
 #: ../fdroidserver/build.py
 msgid "Scan the resulting APK(s) for known non-free classes."
 msgstr "Перевірити отриманий файл APK на наявність відомих невільних класів."
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Scan the source code of a package"
-msgstr "Сканування початкового коду пакунка"
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Scanner found {count} problems in {apk}"
-msgstr "Зчитувач знайшов {count} проблеми в {apk}"
+msgstr "Сканування вихідного коду пакета"
 
 #: ../fdroidserver/scanner.py
 #, python-brace-format
@@ -1591,35 +1571,22 @@ msgstr[0] "Знайдено {} проблему"
 msgstr[1] "Знайдено {} проблеми"
 msgstr[2] "Знайдено {} проблем"
 
-#: ../fdroidserver/scanner.py
-msgid "Scanning APK for extra signing blocks."
-msgstr "Сканування APK на наявність додаткових блоків підпису."
-
-#: ../fdroidserver/scanner.py
-msgid "Scanning APK with dexdump for known non-free classes."
-msgstr "Сканування APK за допомогою dexdump на наявність відомих невільних класів."
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Set NDK {release} ({version}) up"
-msgstr "Установити NDK {release} ({version})"
-
 #: ../fdroidserver/common.py
 msgid "Set clock to that time using:"
 msgstr "Встановіть годинник на цей час, використовуючи:"
 
 #: ../fdroidserver/nightly.py
 msgid "Set maximum releases in repo before older ones are archived"
-msgstr "Встановити найбільшу кількість випусків у репозиторії перед архівуванням старих"
+msgstr "Встановити найбільшу кількість випусків у сховищі перед архівуванням старих"
 
 #: ../fdroidserver/build.py
 #, python-brace-format
 msgid "Set open file limit to {integer}"
 msgstr "Встановити обмеження відкритого файлу на {integer}"
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Set up an app build for a nightly build repo"
-msgstr "Налаштувати застосунок для збірки репозиторію в нічний час"
+msgstr "Налаштувати застосунок для збірки сховища в нічний час"
 
 #: ../fdroidserver/build.py
 msgid "Setting open file limit failed: "
@@ -1630,28 +1597,30 @@ msgstr "Не вдалося встановити обмеження кілько
 msgid "Setting {0} sec timeout for this build"
 msgstr "Час очікування для цієї збірки становить {0}"
 
-#: ../fdroidserver/__main__.py
-msgid "Sign and place packages in the repo"
-msgstr "Записати та розмістити пакунки в репозиторії"
+#: ../fdroidserver/build.py
+msgid "Setup an emulator, install the APK on it and perform a Drozer scan"
+msgstr "Налаштуйте емулятор, встановіть на нього APK та виконайте сканування з Drozer"
 
-#: ../fdroidserver/__main__.py
+msgid "Setup an emulator, install the apk on it and perform a drozer scan"
+msgstr "Налаштуйте емулятор, встановіть apk на нього та виконайте drozer сканування"
+
+#: ../fdroid ../fdroidserver/__main__.py
+msgid "Sign and place packages in the repo"
+msgstr "Записати та розмістити пакети у сховищеві"
+
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Sign indexes created using update --nosign"
 msgstr "Запис індексів, створених за допомогою update --nosign"
 
 #: ../fdroidserver/build.py
 msgid "Skip scanning the source code for binaries and other problems"
-msgstr "Пропустити сканування початкового коду на наявність двійкових файлів та інших проблем"
+msgstr "Пропустити сканування вихідного коду для двійкових файлів та інших проблем"
 
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Skipping '{apkfilename}' with invalid signature!"
 msgstr "Недійсний підпис '{apkfilename}', пропускаємо!"
 
-#: ../fdroidserver/deploy.py ../fdroidserver/index.py
-#, python-format
-msgid "Skipping GitLab Pages mirror because the repo is too large (>%.2fGB)!"
-msgstr "Пропуск дзеркала GitLab Pages через завеликий розмір репозиторію (>%.2fГБ)!"
-
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Skipping index generation for {appid}"
@@ -1667,14 +1636,23 @@ msgstr "Недійсний підпис {apkfilename}, пропускаємо!"
 msgid "Skipping {appid}: disabled"
 msgstr "Пропуск {appid}: вимкнено"
 
-#: ../fdroidserver/deploy.py
-msgid "Specify a local folder to sync the repo to"
-msgstr "Вкажіть локальну теку, щоб синхронізувати репозиторій у"
+#: ../fdroidserver/scanner.py
+#, python-brace-format
+msgid "Skipping {appid}: no builds specified"
+msgstr "Пропуск {appid}: жодних збірок не вказано"
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
+msgid "Specify a local folder to sync the repo to"
+msgstr "Вкажіть локальну теку, аби синхронізувати сховище у"
+
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 msgid "Specify an identity file to provide to SSH for rsyncing"
 msgstr "Вкажіть файл ідентифікатора для надання SSH для rsyncing"
 
+#: ../fdroidserver/build.py
+msgid "Specify that we're running on the build server"
+msgstr "Вкажіть, що ми працюємо на сервері створення"
+
 #: ../fdroidserver/nightly.py
 msgid "Specify which debug keystore file to use."
 msgstr "Вкажіть, який файл зневадження сховища ключів застосовувати."
@@ -1683,6 +1661,11 @@ msgstr "Вкажіть, який файл зневадження сховища
 msgid "Spew out even more information than normal"
 msgstr "Випишіть ще більше даних, ніж звичайно"
 
+#: ../fdroidserver/nightly.py
+#, python-brace-format
+msgid "Striping mystery signature from {apkfilename}"
+msgstr "Видалення невідомого підпису для {apkfilename}"
+
 #: ../fdroidserver/nightly.py
 #, python-brace-format
 msgid "Stripping mystery signature from {apkfilename}"
@@ -1703,22 +1686,10 @@ msgstr "Довжина опису {length} перевищує обмеження
 msgid "System clock is older than date in {path}!"
 msgstr "Системний годинник відстає від date в {path}!"
 
-#: ../fdroidserver/checkupdates.py
-msgid "Tags update mode only works for git, hg, bzr and git-svn repositories currently"
-msgstr "Режим оновлення тегів наразі працює лише для репозиторіїв git, hg, bzr та git-svn"
-
-#: ../fdroidserver/checkupdates.py
-msgid "Tags update mode used in git-svn, but the repo was not set up with tags"
-msgstr "Режим оновлення тегів, який використовується в git-svn, але репозиторій не було налаштовано за допомогою тегів"
-
 #: ../fdroidserver/build.py
 msgid "Test mode - put output in the tmp directory only, and always build, even if the output already exists."
 msgstr "Тестовий режим - надсилайте випуск лише в каталозі tmp і завжди створюйте його, навіть якщо випуск вже існує."
 
-#: ../fdroidserver/index.py
-msgid "The \"qrcode\" Python package is not installed (e.g. apt-get install python3-qrcode)!"
-msgstr "Пакет Python \"qrcode\" не встановлено (наприклад, apt-get install python3-qrcode)!"
-
 #. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
 #: ../fdroidserver/update.py
 #, python-brace-format
@@ -1727,7 +1698,7 @@ msgstr "Код версії OBB повинен надходити після \"{
 
 #: ../fdroidserver/btlog.py
 msgid "The base URL for the repo to log (default: https://f-droid.org)"
-msgstr "Базова URL-адреса для входу до репозиторію (типово: https://f-droid.org)"
+msgstr "Базова URL-адреса для входу до сховища (усталено: https://f-droid.org)"
 
 #: ../fdroidserver/mirror.py
 msgid "The directory to write the mirror to"
@@ -1735,11 +1706,19 @@ msgstr "Каталог для запису дзеркала"
 
 #: ../fdroidserver/nightly.py
 msgid "The file to be included in the repo (path or glob)"
-msgstr "Файл, який слід включити до репозиторію (шлях чи шаблон шляху)"
+msgstr "Файл, який слід включити до сховища (шлях чи шаблон шляху)"
+
+#: ../fdroidserver/deploy.py
+msgid "The only commands currently supported are 'init' and 'update'"
+msgstr "Підтримуються лише команди 'init' або 'update'"
 
 #: ../fdroidserver/index.py
 msgid "The repository's fingerprint does not match."
-msgstr "Цифровий відбиток репозиторію не збігається."
+msgstr "Цифровий відбиток сховища не збігається."
+
+#: ../fdroidserver/common.py
+msgid "The repository's index could not be verified."
+msgstr "Не вдалося перевірити індекс сховища."
 
 #: ../fdroidserver/deploy.py
 #, python-brace-format
@@ -1752,47 +1731,16 @@ msgstr "Відбулося зіткнення keyalias ключів - припи
 
 #: ../fdroidserver/common.py
 msgid "These are the apps that have been archived from the main repo."
-msgstr "Ці застосунки, заархівовано з основного репозиторію."
+msgstr "Це застосунки, заархівовані з основного сховища."
 
-#: ../fdroidserver/mirror.py
-msgid "This command should never be used to mirror f-droid.org! A full copy requires more than 600GB."
-msgstr "Цю команду ніколи не слід використовувати для віддзеркалення f-droid.org! Для повної копії потрібно понад 600 ГБ."
-
-#: ../fdroidserver/common.py
-msgid "This is a repository of apps to be used with F-Droid. Applications in this repository are either official binaries built by the original application developers, or are binaries built from source by the admin of f-droid.org using the tools on https://gitlab.com/fdroid."
-msgstr "Цей репозиторій застосунків для використання з FDroid. Застосунки в цьому репозиторії — це або офіційні двійкові файли, побудовані розробниками оригінального застосунку, або двійкові файли, побудовані з джерела f-droid.org за допомогою інструментів з https://gitlab.com/fdroid."
-
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 #, python-format
 msgid "This repo already has local metadata: %s"
-msgstr "Репозиторій вже має локальні метадані: %s"
+msgstr "Сховище вже має локальні метадані: %s"
 
-#: ../fdroidserver/init.py
-#, python-format
-msgid ""
-"To complete the setup, add your APKs to \"%s\"\n"
-"then run \"fdroid update -c; fdroid update\".  You might also want to edit\n"
-"\"config.yml\" to set the URL, repo name, and more.  You should also set up\n"
-"a signing key (a temporary one might have been automatically generated).\n"
-"\n"
-"For more info: https://f-droid.org/docs/Setup_an_F-Droid_App_Repo\n"
-"and https://f-droid.org/docs/Signing_Process"
-msgstr ""
-"Щоб завершити налаштування, додайте свої файли .apk до «%s»\n"
-"потім запустіть \"fdroid update -c; fdroid update\". Ви також можете відредагувати\n"
-"\"config.yml\", щоб установити URL-адресу, назву репозиторію тощо. Ви також повинні\n"
-"налаштувати ключ підпису (тимчасовий ключ може бути створено автоматично).\n"
-"\n"
-"Докладніше: : https://f-droid.org/docs/Setup_an_F-Droid_App_Repo\n"
-"and https://f-droid.org/docs/Signing_Process"
-
-#: ../fdroidserver/deploy.py
-msgid "To use awsbucket, awssecretkey and awsaccesskeyid must also be set in config.yml!"
-msgstr "Для використання awsbucket, awssecretkey та awsaccesskeyid також слід налаштувати config.yml!"
-
-#: ../fdroidserver/deploy.py
-msgid "To use rclone, rclone_config and awsbucket must be set in config.yml!"
-msgstr "Для використання rclone у файлі config.yml мають бути встановлені параметри rclone_config та awsbucket!"
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
+msgid "To use awsbucket, awssecretkey and awsaccesskeyid must also be set in config.py!"
+msgstr "Для використання awsbucket, awssecretkey та awsaccesskeyid також слід налаштувати config.py!"
 
 #: ../fdroidserver/lint.py
 msgid "URL must start with https:// or http://"
@@ -1800,7 +1748,11 @@ msgstr "URL-адреса має починатися з https:// або http://"
 
 #: ../fdroidserver/lint.py
 msgid "URL shorteners should not be used"
-msgstr "Вкорочувачі URL-адрес не варто використовувати"
+msgstr "Скорочувачі URL-адрес не варто використовувати"
+
+#: ../fdroidserver/metadata.py
+msgid "URL title is just the URL, use brackets: [URL]"
+msgstr "Заголовок URL - це лише текст URL, користуйтеся дужками: [URL]"
 
 #: ../fdroidserver/lint.py
 #, python-brace-format
@@ -1815,15 +1767,16 @@ msgstr "Недійсна мітка ліцензії \"{}\"! Використо
 msgid "Unexpected license tag \"{}\"! Only use license tags configured in your config file"
 msgstr "Неочікувана мітка ліцензії \"{}\"! Використовуйте лише мітки ліцензій, налаштовані у файлі налаштувань"
 
-#: ../fdroidserver/common.py
+#: ../fdroidserver/metadata.py
 #, python-brace-format
-msgid "Unknown entry {key} in {configname}"
-msgstr "Невідомий запис {key} у {configname}"
+msgid "Unexpected text on same line as {field} in {linedesc}"
+msgstr "Несподіваний текст у тому ж рядку, що і {field} у {linedesc}"
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Unknown exception found!"
 msgstr "Виявлено невідому виняткову ситуацію!"
 
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "Unknown file '{filename}' in build '{versionName}'"
@@ -1834,6 +1787,11 @@ msgstr "Невідомий файл '{filename}' в збірці '{versionName}'
 msgid "Unknown metadata format: %s"
 msgstr "Невідомий формат метаданих: %s"
 
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Unknown metadata format: {path}"
+msgstr "Створення скелетів файлів метаданих: {path}"
+
 #: ../fdroidserver/metadata.py
 #, python-brace-format
 msgid "Unknown metadata format: {path} (use: *.yml)"
@@ -1843,6 +1801,10 @@ msgstr "Невідомий формат метаданих: {path} (викори
 msgid "Unknown version of aapt, might cause problems: "
 msgstr "Невідома версія aapt, може спричинити складнощі: "
 
+#: ../fdroidserver/lint.py
+msgid "Unlinkified link - use [http://foo.bar Link title] or [http://foo.bar]"
+msgstr "Неправильне посилання - використовуйте [http://foo.bar текст посилання] чи [http://foo.bar]"
+
 #: ../fdroidserver/lint.py
 msgid "Unnecessary leading space"
 msgstr "Непотрібна прогалина на початку рядка"
@@ -1856,22 +1818,53 @@ msgstr "Зайва прогалина в кінці"
 msgid "Unrecognised app field '{fieldname}' in '{path}'"
 msgstr "Нерозпізнане поле застосунку '{fieldname}' в '{path}'"
 
+#: ../fdroidserver/metadata.py
+msgid "Unrecognised app field: "
+msgstr "Нерозпізнане поле застосунку: "
+
 #: ../fdroidserver/metadata.py
 #, python-brace-format
 msgid "Unrecognised build flag '{build_flag}' in '{path}'"
 msgstr "Нерозпізнаний прапорець збірки '{build_flag}' у '{path}'"
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Unrecognised field '{field}' in {linedesc}"
+msgstr "Нерозпізнане поле '{field}' у {linedesc}"
+
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Unsupported file type \"{extension}\" for repo graphic"
-msgstr "Тип файлу не підтримується \"{extension}\" для репозиторію графіки"
+msgstr "Файловий тип не підтримується \"{extension}\" для сховища графіки"
 
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Unsupported graphics file found: {path}"
 msgstr "Знайдено непідтримуване зображення: {path}"
 
+#: ../fdroidserver/rewritemeta.py
+#, python-brace-format
+msgid "Unsupported metadata format, use: --to [{supported}]"
+msgstr "Непідтримуваний формат метаданих, використовуйте: --to [{supported}]"
+
+#: ../fdroidserver/metadata.py
+msgid "Unterminated ]"
+msgstr "Пропущено дужку - ]"
+
+#: ../fdroidserver/metadata.py
+msgid "Unterminated ]]"
+msgstr "Пропущено подвійну дужку - ]]"
+
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Unterminated build in {name}"
+msgstr "Невстановлена збірка в {name}"
+
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Unterminated continuation in {name}"
+msgstr "Незавершене продовження рядка у {name}"
+
 #: ../fdroidserver/lint.py
 #, python-format
 msgid "Unused extlib at %s"
@@ -1892,25 +1885,27 @@ msgstr "Невикористаний шлях scandelete: %s"
 msgid "Unused scanignore path: %s"
 msgstr "Невикористаний шлях scanignore: %s"
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Update repo information for new packages"
-msgstr "Оновіть дані репозиторію для нових пакунків"
+msgstr "Оновіть інформацію сховища для нових пакетів"
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Update the binary transparency log for a URL"
 msgstr "Оновити бінарний журнал прозорості для URL-адреси"
 
+#: ../fdroid ../fdroidserver/__main__.py
+msgid "Update the stats of the repo"
+msgstr "Оновити статистику сховища"
+
+#: ../fdroidserver/update.py ../fdroidserver/build.py
+msgid "Update the wiki"
+msgstr "Оновити вікі"
+
 #: ../fdroidserver/checkupdates.py
 #, python-brace-format
 msgid "UpdateCheckData has invalid URL: {url}"
 msgstr "UpdateCheckData має недійсну URL-адресу: {url}"
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "UpdateCheckData must match the version code as integer (\\d or [0-9]): {codeex}"
-msgstr "UpdateCheckData повинен відповідати коду версії як ціле число (\\d або [0-9]): {codeex}"
-
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "UpdateCheckData must use HTTPS URL: {url}"
@@ -1922,10 +1917,14 @@ msgid "UpdateCheckData not a valid URL: {url}"
 msgstr "UpdateCheckData не є дійсною URL-адресою: {url}"
 
 #: ../fdroidserver/lint.py
-msgid "UpdateCheckMode is set but it looks like checkupdates hasn't been run yet."
-msgstr "UpdateCheckMode налаштовано, але схоже, що команду checkupdates ще не запущено."
+msgid "UpdateCheckMode is set but it looks like checkupdates hasn't been run yet"
+msgstr "Режим перевірки оновлень встановлено, але схоже, що ще не запущено перевірку"
+
+#. Translators: https://developer.android.com/studio/build/application-id
+#: ../fdroidserver/lint.py
+msgid "UpdateCheckName is set to the known application ID - it can be removed"
+msgstr "Назву застосунку для перевірки оновлень встановлено на відомий ID застосунку — його можна буде вилучити"
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
 #: ../fdroidserver/lint.py
 msgid "UpdateCheckName is set to the known application ID, it can be removed"
 msgstr "Назву застосунку для перевірки оновлень встановлено на відомий ID застосунку — його можна буде вилучити"
@@ -1940,9 +1939,20 @@ msgstr "Завантаження {apkfilename} на androidobservatory.org"
 msgid "Uploading {apkfilename} to virustotal"
 msgstr "Завантаження {apkfilename} до virustotal"
 
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "Usage"
+msgstr "Використання"
+
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, python-format
+msgid "Usage: %s\n"
+msgstr "Використання: %s\n"
+
 #: ../fdroidserver/lint.py
-msgid "Use /HEAD instead of /master or /main to point at a file in the default branch"
-msgstr "Використовуйте /HEAD замість /master або /main, щоб вказати на файл у типовій гілці"
+msgid "Use /HEAD instead of /master to point at a file in the default branch"
+msgstr "Використовуйте /HEAD замість /master для вказання на файл типовій гілці"
 
 #: ../fdroidserver/update.py
 msgid "Use `fdroid update -c` to create it."
@@ -1956,16 +1966,14 @@ msgstr "Використовуйте сервер створення"
 msgid "Use date from APK instead of current time for newly added APKs"
 msgstr "Використовуйте дату з APK замість поточного часу для нових доданих APK"
 
-#: ../fdroidserver/deploy.py
+msgid "Use date from apk instead of current time for newly added apks"
+msgstr "Використовуйте дату з apk, замість поточного часу для нових доданих apks"
+
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Using \"{path}\" for configuring s3cmd."
 msgstr "Використання \"{path}\" для налаштування s3cmd."
 
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Using \"{path}\" for syncing with remote storage."
-msgstr "\"{path}\" використовується для синхронізації з віддаленим сховищем."
-
 #: ../fdroidserver/common.py
 msgid "Using APK Signature v2"
 msgstr "Використання підпису APK v2"
@@ -1974,35 +1982,26 @@ msgstr "Використання підпису APK v2"
 msgid "Using APK Signature v3"
 msgstr "Використання підпису APK v3"
 
-#: ../fdroidserver/common.py
-msgid "Using JAR Signature"
-msgstr "Використання JAR-підпису"
-
 #: ../fdroidserver/common.py
 msgid "Using Java's jarsigner, not recommended for verifying APKs! Use apksigner"
 msgstr "Не варто перевіряти APK за допомогою jarsigner Java! Користуйтеся apksigner"
 
-#: ../fdroidserver/metadata.py
+#: ../fdroidserver/common.py
 #, python-brace-format
-msgid "Using blank dictionary instead of contents of {path}!"
-msgstr "Використання порожнього словника замість вмісту {path}!"
+msgid "Using androguard from \"{path}\""
+msgstr "Використання androguard від \"{path}\""
 
 #: ../fdroidserver/init.py
 #, python-brace-format
 msgid "Using existing keystore \"{path}\""
 msgstr "Застосування наявного сховища ключів \"{path}\""
 
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Using rclone to sync with: {url}"
-msgstr "Використовується rsync для синхронізації з: {url}"
-
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Using s3cmd to sync with: {url}"
 msgstr "Використовувати s3cmd для синхронізації з: {url}"
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Valid commands are:"
 msgstr "Дійсні команди:"
 
@@ -2010,55 +2009,33 @@ msgstr "Дійсні команди:"
 msgid "Verify against locally cached copy rather than redownloading."
 msgstr "Перевіряти, за допомогою локальної кешованої копії замість повторного завантаження."
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Verify the integrity of downloaded packages"
-msgstr "Перевірте цілісність завантажених пакунків"
+msgstr "Перевірте цілісність завантажених пакетів"
 
 #: ../fdroidserver/index.py
 msgid "Verifying index signature:"
 msgstr "Перевірка підпису індексу:"
 
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "Verifying package {path} with apksigner."
-msgstr "Перевірка пакета {path} за допомогою apksigner."
-
 #: ../fdroidserver/deploy.py
 #, python-brace-format
 msgid "VirusTotal API key cannot upload files larger than 32MB, use {url} to upload {path}."
 msgstr "Ключ API VirusTotal не може завантажити файли, розмір яких понад 32 МБ, використовуйте {url} для завантаження {path}."
 
-#: ../fdroidserver/nightly.py
-msgid "WARNING: only public git repos are supported!"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Warn about possible metadata errors"
 msgstr "Попереджати про можливі помилки метаданих"
 
-#: ../fdroidserver/scanner.py
-msgid "WebAssembly binary file"
-msgstr "Бінарний файл WebAssembly"
-
 #: ../fdroidserver/update.py
 msgid "When configured for signed indexes, create only unsigned indexes at this stage"
 msgstr "Коли налаштовано для підписаних індексів, на цьому етапі створюйте лише непідписані індекси"
 
 #: ../fdroidserver/lint.py
 msgid "When linting the entire repository yamllint is disabled by default. This option forces yamllint regardless."
-msgstr "Під час перевірки всього репозиторію, yamllint типово вимкнено. Цей параметр змушує нехтувати yamllint."
+msgstr "Під час перевірки всього сховища, yamllint типово вимкнено. Цей параметр змушує нехтувати yamllint."
 
-#: ../fdroidserver/publish.py
-msgid "When signing or verifying fails, exit with an error code."
-msgstr "Якщо підписати або перевірити не вдається, виходить з кодом помилки."
-
-#: ../fdroidserver/install.py
-msgid "Would you like to download and install F-Droid.apk via adb? (YES/no)"
-msgstr "Бажаєте завантажити та встановити F-Droid.apk через adb? (ТАК/Ні)"
-
-#: ../fdroidserver/install.py
-msgid "Would you like to download the app(s) from f-droid.org? (YES/no)"
-msgstr "Бажаєте завантажити програму(и) з f-droid.org? (ТАК/Ні)"
+msgid "X.509 'Distiguished Name' used when generating keys"
+msgstr "X.509 'Distiguished Name' використовується при створенні ключів"
 
 #: ../fdroidserver/init.py
 msgid "X.509 'Distinguished Name' used when generating keys"
@@ -2072,11 +2049,6 @@ msgstr "За допомогою ANDROID_HOME можна встановити ш
 msgid "ZIP file archive"
 msgstr "ZIP-архів"
 
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "adb reports {serial} is \"{status}\"!"
-msgstr "adb звітує {serial} як \"{status}\"!"
-
 #: ../fdroidserver/nightly.py
 #, python-brace-format
 msgid "adding IdentityFile to {path}"
@@ -2087,78 +2059,84 @@ msgstr "додавання IdentityFile до {path}"
 msgid "adding to {name}: {path}"
 msgstr "додавання до {name}: {path}"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "ambiguous option: %(option)s could match %(matches)s"
 msgstr "неоднозначний параметр: %(option)s може відповідати %(matches)s"
 
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "apksigner in build-tools;{version} passes APKs with invalid v3 signatures, ignoring."
-msgstr "apksigner в інструментах побудови; {version} передає APK із недійсними підписами v3, ігноруючи."
-
-#: ../fdroidserver/common.py
-msgid "apksigner not found! Cannot sign or verify modern APKs"
-msgstr "apksigner не знайдено! Не вдалося підписати або перевірити актуальні файли APK"
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, python-format
+msgid "ambiguous option: %s (%s?)"
+msgstr "неоднозначний параметр: %s (%s?)"
 
 #: ../fdroidserver/common.py
 msgid "apksigner not found, it's required for signing!"
 msgstr "apksigner не знайдено, це потрібно для підписання!"
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/checkupdates.py ../fdroidserver/lint.py
-#: ../fdroidserver/rewritemeta.py
+#: ../fdroidserver/lint.py ../fdroidserver/rewritemeta.py
+#: ../fdroidserver/checkupdates.py
 msgid "application ID of file to operate on"
 msgstr "application ID файлу застосунку для роботи на"
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/build.py ../fdroidserver/install.py
-#: ../fdroidserver/publish.py ../fdroidserver/scanner.py
-#: ../fdroidserver/verify.py
+#: ../fdroidserver/verify.py ../fdroidserver/publish.py
+#: ../fdroidserver/build.py ../fdroidserver/scanner.py
+#: ../fdroidserver/install.py
 msgid "application ID with optional versionCode in the form APPID[:VERCODE]"
 msgstr "ID застосунку з необов'язковим versionCode у формі APPID[:VERCODE]"
 
-#: ../fdroidserver/common.py
-msgid "archive_url needs to end with /archive"
-msgstr "archive_url має закінчуватися на /archive"
+#: ../fdroidserver/lint.py ../fdroidserver/rewritemeta.py
+msgid "applicationId in the form APPID"
+msgstr "applicationId у формі APPID"
 
-#: /usr/lib/python3.11/argparse.py
+#: ../fdroidserver/checkupdates.py
+msgid "applicationId to check for updates"
+msgstr "applicationId для перевірки наявності оновлень"
+
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
+#: ../fdroidserver/verify.py ../fdroidserver/publish.py
+#: ../fdroidserver/dscanner.py ../fdroidserver/build.py
+#: ../fdroidserver/scanner.py ../fdroidserver/install.py
+msgid "applicationId with optional versionCode in the form APPID[:VERCODE]"
+msgstr "applicationId з необов'язковим versionCode у формі APPID[:VERCODE]"
+
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "argument \"-\" with mode %r"
 msgstr "аргумент \"-\" в режимі %r"
 
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "argument %(argument_name)s: %(message)s"
-msgstr "аргумент %(argument_name)s: %(message)s"
-
 #: ../fdroidserver/nightly.py
 msgid "attempting bare SSH connection to test deploy key:"
 msgstr "спроба відкритого з'єднання ssh для перевірки ключа розгортання:"
 
+#: ../fdroidserver/nightly.py
+msgid "attempting bare ssh connection to test deploy key:"
+msgstr "спроба відкритого з'єднання ssh для перевірки ключа розгортання:"
+
 #: ../fdroidserver/common.py
 msgid "can not parse scrlib spec (not a string): '{}'"
 msgstr "не вдається проаналізувати специфікацію scrlib (не рядок): '{}'"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
-msgid "can't open '%(filename)s': %(error)s"
-msgstr "не вдалося відкрити «%(filename)s»: %(error)s"
-
-#: ../fdroidserver/scanner.py
-msgid "can't open non-https url: '{};"
-msgstr "не вдалося відкрити не-https url: '{};"
+msgid "can't open '%s': %s"
+msgstr "не може відкрити '%s': %s"
 
 #: ../fdroidserver/build.py
 #, python-brace-format
 msgid "cannot find required srclibs: \"{path}\""
 msgstr "не вдалося знайти потрібні srclibs: \"{path}\""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "cannot have multiple subparser arguments"
 msgstr "не може мати кілька аргументів підпарсера"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "cannot merge actions - two groups are named %r"
 msgstr "не може об'єднати дії - дві групи мають ім'я %r"
@@ -2172,11 +2150,21 @@ msgstr "не вдалося оприлюднити оновлення. Ви вс
 msgid "cloning {url}"
 msgstr "клонування {url}"
 
+#: ../fdroidserver/deploy.py
+msgid "command to execute, either 'init' or 'update'"
+msgstr "команда виконати, 'init' або 'update'"
+
 #: ../fdroidserver/__main__.py
 msgid "commands from plugin modules:"
 msgstr "команди з модулів плагіна:"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "complex"
+msgstr "complex"
+
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "conflicting option string: %s"
 msgid_plural "conflicting option strings: %s"
@@ -2184,71 +2172,56 @@ msgstr[0] "суперечний рядок параметра: %s"
 msgstr[1] "суперечних рядка параметра: %s"
 msgstr[2] "суперечних рядків параметра: %s"
 
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "conflicting subparser alias: %s"
-msgstr "конфліктний псевдонім субпарсера: %s"
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "conflicting subparser: %s"
-msgstr "конфліктний субпарсер: %s"
+#: ../fdroidserver/nightly.py
+#, python-brace-format
+msgid "copying {apkfilename} into {path}"
+msgstr "копіювання {apkfilename} у {path}"
 
 #: ../fdroidserver/metadata.py
 #, python-brace-format
 msgid "could not parse '{path}'"
 msgstr "не вдалося проаналізувати '{path}'"
 
-#: ../fdroidserver/common.py
-msgid "could not parse srclib spec (no name specified): '{}'"
-msgstr "не вдалося розібрати специфікацію srclib (не вказано назву): '{}'"
-
 #: ../fdroidserver/common.py
 msgid "could not parse srclib spec (no ref specified): '{}'"
 msgstr "не вдалося проаналізувати специфікацію srclib (посилання не вказано): '{}'"
 
+#: ../fdroidserver/common.py
+msgid "could not parse srclib spec (too many '@' signs): '{}'"
+msgstr "не вдалося проаналізувати специфікацію srclib (занадто багато знаків '@'): '{}'"
+
 #: ../fdroidserver/nightly.py
 #, python-brace-format
 msgid "created {path}"
 msgstr "створено {path}"
 
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "current version is newer: old vercode={old}, new vercode={new}"
-msgstr "поточна версія новіша: застаріла vercode={old}, нова vercode={new}"
-
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "deleting: repo/{apkfilename}"
-msgstr "видалення: репозиторій/{apkfilename}"
+msgstr "видалення: сховище/{apkfilename}"
 
-#: ../fdroidserver/scanner.py
-msgid "dependency file without lock"
-msgstr "файл залежності без блокування"
+#: ../fdroidserver/common.py
+#, python-brace-format
+msgid "deployed build logs to '{path}'"
+msgstr "розгорнуто журнали збірки до '{path}'"
 
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "deployed process log {path} to {dest}"
 msgstr "розгорнуто журнал процесів {path} до {dest}"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "dest= is required for options like %r"
 msgstr "dest= потрібен для таких варіантів, як %r"
 
-#: ../fdroidserver/scanner.py
-msgid "downloading '{}'"
-msgstr "завантаження '{}'"
-
-#: ../fdroidserver/scanner.py
-msgid "downloading scanner signatures from '{}' failed"
-msgstr "не вдалося завантажити підписи сканера з '{}'"
-
 #: ../fdroidserver/scanner.py
 msgid "executable binary, possibly code"
 msgstr "виконуваний двійковий файл, можливо, код"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "expected %s argument"
 msgid_plural "expected %s arguments"
@@ -2256,25 +2229,42 @@ msgstr[0] "очікується %s аргумент"
 msgstr[1] "очікується %s аргументи"
 msgstr[2] "очікується %s аргументів"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "expected at least one argument"
 msgstr "очікується хоча б один аргумент"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "expected at most one argument"
 msgstr "очікується не більше одного аргументу"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "expected one argument"
 msgstr "очікується один аргумент"
 
-#: ../fdroidserver/__main__.py
+#: ../fdroidserver/common.py
+#, python-brace-format
+msgid "failed deploying build logs to '{path}'"
+msgstr "не вдалося розгорнути журнали збірки до '{path}'"
+
+#: ../fdroid
+msgid "fdroid [-h|--help|--version] <command> [<args>]"
+msgstr "fdroid [-h|--help|--version] <команда> [<аргументи>]"
+
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "fdroid [<command>] [-h|--help|--version|<args>]"
 msgstr "fdroid [<команда>] [-h|--help|--version|<аргументи>]"
 
-#: ../fdroidserver/scanner.py
-msgid "fetch the latest version of signatures from the web"
-msgstr "отримати останню версію підписів з інтернету"
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "floating-point"
+msgstr "з комою, що плаває"
+
+#: ../fdroidserver/metadata.py
+msgid "force errors to be warnings, or ignore"
+msgstr "примусити попереджувати помилки, або ігнорувати"
 
 #: ../fdroidserver/metadata.py
 msgid "force metadata errors (default) to be warnings, or to be ignored."
@@ -2288,7 +2278,8 @@ msgstr "Не вдалося клонувати git svn"
 msgid "gzip file archive"
 msgstr "gzip-архів"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "ignored explicit argument %r"
 msgstr "нехтується явний аргумент %r"
@@ -2297,39 +2288,35 @@ msgstr "нехтується явний аргумент %r"
 msgid "index-v1 must have a signature, use `fdroid signindex` to create it!"
 msgstr "index-v1 повинен мати підпис, використовуйте `fdroid signindex`, щоб створити його!"
 
-#: ../fdroidserver/index.py
-msgid "index-v2 must have a signature, use `fdroid signindex` to create it!"
-msgstr "index-v2 повинен мати підпис, використовуйте `fdroid signindex`, щоб створити його!"
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "integer"
+msgstr "ціле число"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "invalid %(type)s value: %(value)r"
 msgstr "недійсне %(type)s значення: %(value)r"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "invalid choice: %(value)r (choose from %(choices)s)"
 msgstr "неправильний вибір: %(value)r (варто обрати з %(choices)s)"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "invalid conflict_resolution value: %r"
 msgstr "недійсне значення conflict_resolution: %r"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "invalid option string %(option)r: must start with a character %(prefix_chars)r"
 msgstr "неправильний рядок параметра %(option)r: повинен починатися зі знаку %(prefix_chars)r"
 
-#: ../fdroidserver/common.py
-msgid "ipfs_cid not found, skipping CIDv1 generation"
-msgstr "ipfs_cid не знайдено, пропускаємо генерацію CIDv1"
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "latest build recipe is newer: old vercode={old}, new vercode={new}"
-msgstr "остання подана збірка новіша: застаріла vercode={old}, нова vercode={new}"
-
 #: ../fdroidserver/deploy.py
 #, python-brace-format
 msgid "local_copy_dir does not end with \"fdroid\", perhaps you meant: \"{path}\""
@@ -2348,20 +2335,11 @@ msgstr "local_copy_dir мусить бути текою, не файлом!"
 msgid "mirror '%s' does not end with 'fdroid'!"
 msgstr "дзеркало '%s' не закінчується на 'fdroid'!"
 
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "mirrors set twice, in config.yml and {path}!"
-msgstr "дзеркала задано двічі, в config.yml та {path}!"
-
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "mutually exclusive arguments must be optional"
 msgstr "взаємозаперечні аргументи повинні бути необов'язковими"
 
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "next {name} cache update due in {time}"
-msgstr "наступне оновлення кешу {name} відбудеться {time}"
-
 #: ../fdroidserver/mirror.py
 #, python-brace-format
 msgid "no \"icon\" in {appid}"
@@ -2371,34 +2349,97 @@ msgstr "не має \"icon\" у {appid}"
 msgid "no APK supplied"
 msgstr "APK не надано"
 
-#: ../fdroidserver/checkupdates.py
-msgid "no version information found"
-msgstr "не знайдено відомостей про версію"
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, python-format
+msgid "no such option: %s"
+msgstr "такого параметру немає: %s"
 
-#: /usr/lib/python3.11/argparse.py
+#: ../fdroid ../fdroidserver/__main__.py
+msgid "no version info found!"
+msgstr "не вдалося визначити версію!"
+
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "not allowed with argument %s"
 msgstr "не дозволено з аргументом %s"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "one of the arguments %s is required"
 msgstr "потрібен один з аргументів %s"
 
-#: ../fdroidserver/common.py ../fdroidserver/index.py
+#: ../fdroidserver/index.py ../fdroidserver/common.py
 msgid "only accepts strings, lists, and tuples"
 msgstr "приймає лише рядки, списки та кортежі"
 
-#: /usr/lib/python3.11/argparse.py
-msgid "options"
-msgstr "параметри"
+#: ../fdroidserver/install.py
+#, python-format
+msgid "option %s: If you really want to install all the signed apps, use --all"
+msgstr "параметр %s: Якщо ви дійсно хочете встановити всі підписані застосунки, використовуйте --all"
+
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, python-format
+msgid "option %s: invalid %s value: %r"
+msgstr "параметр %s: недійсне %s значення: %r"
+
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, python-format
+msgid "option %s: invalid choice: %r (choose from %s)"
+msgstr "для параметра %s: неправильний вибір: %r (вибрати з %s)"
+
+#: /usr/lib/python3.5/getopt.py /usr/lib/python3.6/getopt.py
+#: /usr/lib/python3.7/getopt.py
+#, python-format
+msgid "option -%s not recognized"
+msgstr "параметр -%s не розпізнано"
+
+#: /usr/lib/python3.5/getopt.py /usr/lib/python3.6/getopt.py
+#: /usr/lib/python3.7/getopt.py
+#, python-format
+msgid "option -%s requires argument"
+msgstr "параметр -%s потрібен аргумент"
+
+#: /usr/lib/python3.5/getopt.py /usr/lib/python3.6/getopt.py
+#: /usr/lib/python3.7/getopt.py
+#, python-format
+msgid "option --%s must not have an argument"
+msgstr "параметр --%s не має аргументу"
+
+#: /usr/lib/python3.5/getopt.py /usr/lib/python3.6/getopt.py
+#: /usr/lib/python3.7/getopt.py
+#, python-format
+msgid "option --%s not a unique prefix"
+msgstr "параметр --%s не унікальний префікс"
+
+#: /usr/lib/python3.5/getopt.py /usr/lib/python3.6/getopt.py
+#: /usr/lib/python3.7/getopt.py
+#, python-format
+msgid "option --%s not recognized"
+msgstr "параметр --%s не визнано"
+
+#: /usr/lib/python3.5/getopt.py /usr/lib/python3.6/getopt.py
+#: /usr/lib/python3.7/getopt.py
+#, python-format
+msgid "option --%s requires argument"
+msgstr "параметр --%s потрібен аргумент"
+
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
+msgid "optional arguments"
+msgstr "необов'язкові аргументи"
 
 #: ../fdroidserver/nightly.py
 #, python-brace-format
 msgid "overwriting existing {path}"
 msgstr "перезаписування наявного шляху {path}"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "positional arguments"
 msgstr "позиційні аргументи"
 
@@ -2407,63 +2448,52 @@ msgstr "позиційні аргументи"
 msgid "process log deploy {path} to {dest} failed!"
 msgstr "не вдалося розгорнути журнал процесів {path} до {dest}!"
 
-#: ../fdroidserver/build.py
-msgid "reference binary missing signature"
-msgstr "еталонний двійковий файл з відсутнім підписом"
-
 #: ../fdroidserver/signatures.py
 #, python-brace-format
 msgid "refuse downloading via insecure HTTP connection (use HTTPS or specify --no-https-check): {apkfilename}"
 msgstr "відмовитись від завантаження через небезпечне з'єднання HTTP (користати HTTPS чи вказати --no-https-check): {apkfilename}"
 
+#: ../fdroidserver/signatures.py
+#, python-brace-format
+msgid "refuse downloading via insecure http connection (use https or specify --no-https-check): {apkfilename}"
+msgstr "відмовитись від завантаження через незахищене з'єднання http (користати https чи вказати --no-https-check): {apkfilename}"
+
 #: ../fdroidserver/index.py
 #, python-format
-msgid "repo_icon \"repo/icons/%s\" does not exist, generating placeholder."
-msgstr "repo_icon \"repo/icons/%s\" не існує, створення заповнювача."
+msgid "repo_icon %s does not exist, generating placeholder."
+msgstr "repo_icon %s не існує, створення заповнювача."
 
-#: ../fdroidserver/common.py
-msgid "repo_url needs to end with /repo"
-msgstr "repo_url повинен закінчуватися на /repo"
+#: ../fdroidserver/metadata.py
+msgid "ruamel.yaml not installed, can not write metadata."
+msgstr "ruamel.yaml не встановлено, не вдається записати метадані."
 
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "rsync is missing or broken: {error}"
-msgstr "rsync відсутній або несправний: {error}"
-
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "s3cmd sync indexes {path} to {url} and delete"
 msgstr "s3cmd синхронізувати індекси з {path} до {url} та видалити"
 
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "s3cmd syncs indexes from {path} to {url} and deletes removed"
-msgstr "s3cmd синхронізує індекси з {path} до {url} і видаляє вилучені"
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "scanner cache is malformed! You can clear it with: '{clear}'"
-msgstr "кеш сканера пошкоджено! Ви можете очистити його за допомогою: '{clear}'"
-
-#: ../fdroidserver/deploy.py
-msgid "serverwebroot: path does not end with \"fdroid\", perhaps you meant one of these:"
-msgstr "serverwebroot: шлях не закінчується на «fdroid», можливо, ви мали на увазі один з цих:"
-
 #: ../fdroidserver/scanner.py
 msgid "shared library"
 msgstr "спільна бібліотека"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "show program's version number and exit"
+msgstr "показати номер версії програми та вийти"
+
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.5/optparse.py
+#: /usr/lib/python3.6/argparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/argparse.py /usr/lib/python3.7/optparse.py
 msgid "show this help message and exit"
 msgstr "показати довідку та вийти"
 
 #: ../fdroidserver/signatures.py
 msgid "signed APK, either a file-path or HTTPS URL."
-msgstr "підписаний APK файл, шлях до файлу або URL-адреса HTTPS."
+msgstr "підписаний APK файл, шлях до файлу або URL-адреса HTTPS)."
 
 #: ../fdroidserver/common.py
 msgid "skip deploying full build logs: log content is empty"
-msgstr "пропустити розгортання всіх журналів збірки: журнал порожній"
+msgstr "пропустити розгортання усіх журналів збірки: журнал порожній"
 
 #: ../fdroidserver/common.py
 msgid "skip deploying full build logs: not enabled in config"
@@ -2482,31 +2512,31 @@ msgstr "srclibs відсутнє ім’я та/чи @"
 msgid "static library"
 msgstr "статична бібліотека"
 
-#: ../fdroidserver/build.py
+#: ../fdroidserver/common.py
 #, python-brace-format
-msgid "supplied reference binary has allowed signer {signer}"
-msgstr "наданий еталонний двійковий файл дозволив підписувачу {signer}"
+msgid "supplied timestamp value '{timestamp}' is not a unix timestamp"
+msgstr "надане значення часової позначки '{timestamp}' не є часовою міткою Unix"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "the following arguments are required: %s"
 msgstr "такі аргументи зобов'язані: %s"
 
-#: ../fdroidserver/install.py
-msgid "true"
-msgstr "правда"
-
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "unexpected option string: %s"
 msgstr "неочікуваний рядок параметрів: %s"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "unknown parser %(parser_name)r (choices: %(choices)s)"
 msgstr "невідомий парсер %(parser_name)r (варто вибрати: %(choices)s)"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "unrecognized arguments: %s"
 msgstr "нерозпізнані аргументи: %s"
@@ -2516,11 +2546,16 @@ msgstr "нерозпізнані аргументи: %s"
 msgid "unsafe permissions on '{config_file}' (should be 0600)!"
 msgstr "небезпечні дозволи на '{config_file}' (should be 0600)!"
 
-#: ../fdroidserver/__main__.py /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py ../fdroid
+#: /usr/lib/python3.7/argparse.py ../fdroidserver/__main__.py
 msgid "usage: "
 msgstr "використання: "
 
-#: ../fdroidserver/deploy.py
+#: ../fdroid
+msgid "usage: fdroid [-h|--help|--version] <command> [<args>]"
+msgstr "використання: fdroid [-h|--help|--version] <команда> [<аргументи>]"
+
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "using Apache libcloud to sync with {url}"
 msgstr "Apache libcloud: синхронізація з {url}"
@@ -2529,9 +2564,9 @@ msgstr "Apache libcloud: синхронізація з {url}"
 msgid "virustotal.com is rate limiting, waiting to retry..."
 msgstr "virustotal.com обмежує швидкість, очікування повторної спроби..."
 
-#: ../fdroidserver/install.py
-msgid "yes"
-msgstr "так"
+#: ../fdroidserver/update.py
+msgid "wiki support is deprecated and will be removed in the next release!"
+msgstr "підтримка wiki застаріла і буде вилучена у наступному випуску!"
 
 #: ../fdroidserver/publish.py
 #, python-brace-format
@@ -2539,26 +2574,38 @@ msgid "{0} app, {1} key aliases"
 msgid_plural "{0} apps, {1} key aliases"
 msgstr[0] "{0} застосунок, {1} alias ключів"
 msgstr[1] "{0} застосунки, {1} alias ключів"
-msgstr[2] "{0} застосунків, {1} alias ключів"
+msgstr[2] "{0} застосунків, {1} {1} alias ключів"
 
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "{apkfilename} ({appid}) has no metadata!"
 msgstr "{apkfilename} ({appid}) не має метаданих!"
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
+#: ../fdroidserver/update.py
+#, python-brace-format
+msgid "{apkfilename} has multiple {name} files, looks like Master Key exploit!"
+msgstr "{apkfilename} має декілька {name} файлів, схоже на використання проблеми безпеки Master Key!"
+
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "{apkfilename}'s AndroidManifest.xml has a bad date: "
 msgstr "AndroidManifest.xml застосунка {apkfilename} має неправильну дату: "
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "{appid} does not have a name! Using application ID instead."
 msgstr "{appid} не має назви! Застосовуватиметься ID застосунку."
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
+#: ../fdroidserver/update.py
+#, python-brace-format
+msgid "{appid} does not have a name! Using package name instead."
+msgstr "{appid} не має назви! Використовуватимуться назви пакунку."
+
+#: ../fdroidserver/update.py
+#, python-brace-format
+msgid "{appid} from {path} is not a valid Android Package Name!"
+msgstr "{appid} з {path} є недійсною назвою пакунка Android!"
+
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "{appid} from {path} is not a valid Android application ID!"
@@ -2569,16 +2616,12 @@ msgstr "{appid} з {path} є недійсним ID застосунку Android!
 msgid "{appid} from {path} is not a valid Java Package Name!"
 msgstr "{appid} з {path} є недійсною назвою пакунка Java!"
 
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{appid} has both APKs and files: {files}"
-msgstr "{appid} має APK і файли: {files}"
-
 #: ../fdroidserver/mirror.py
 #, python-brace-format
 msgid "{appid} is missing {name}"
 msgstr "У {appid} немає {name}"
 
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "{appid}: Unknown extlib {path} in build '{versionName}'"
@@ -2606,8 +2649,8 @@ msgstr "{build_flag} має бути цілим числом, знайдено:
 
 #: ../fdroidserver/metadata.py
 #, python-brace-format
-msgid "{build_flag} must be list or string, found: {value}"
-msgstr "{build_flag} має бути списком або рядком, знайдено: {value}"
+msgid "{field} not terminated in {name}"
+msgstr "{field} не припинено в {name}"
 
 #: ../fdroidserver/metadata.py
 #, python-brace-format
@@ -2616,15 +2659,10 @@ msgstr "{file} порожній або пошкоджений!"
 
 #: ../fdroidserver/update.py
 #, python-brace-format
-msgid "{name} \"{section}/icons/{path}\" does not exist! Check \"config.yml\"."
-msgstr "{name} \"{section}/icons/{path}\" не існує! Виправте його в \"config.yml\"."
+msgid "{name} \"{path}\" does not exist! Correct it in config.py."
+msgstr "{name} \"{path}\" не існує! Виправте його в config.py."
 
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{path1} is a duplicate of {path2}, remove one!"
-msgstr "{path1} є дублікатом {path2}, видаліть один з них!"
-
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 #, python-brace-format
 msgid "{path} already exists, ignoring import results!"
 msgstr "{path} вже існує, нехтування результатами імпорту!"
@@ -2639,36 +2677,6 @@ msgstr "{path} не існує! Створіть його, запустивши:
 msgid "{path} has bad file signature \"{pattern}\", possible Janus exploit!"
 msgstr "{path}: недійсний підпис \"{pattern}\". Виглядає підозріло і схоже на спробу порушення безпеки Janus exploit!"
 
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "{path} has been flagged by virustotal {count} times:"
-msgstr "{path} було позначено virustotal {count} разів:"
-
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "{path} has the wrong fingerprint ({fingerprint})!"
-msgstr "{path} має неправильний відбиток пальця ({fingerprint})!"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "{path} is not \"key: value\" dict, but a {datatype}!"
-msgstr "{path} - це не словник «ключ: значення», а {datatype}!"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "{path} is not a standard config file!"
-msgstr "{path} не є стандартним конфігураційним файлом!"
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "{path} is not list, but a {datatype}!"
-msgstr "{path} - це не список, а {datatype}!"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "{path} is not {expected_type}, but a {datatype}!"
-msgstr "{path} - це не {expected_type}, а {datatype}!"
-
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "{path} is zero size!"
@@ -2679,22 +2687,12 @@ msgstr "{path} не має розміру!"
 msgid "{path} more than 200MB, manually upload: {url}"
 msgstr "{path} понад 200 МБ, вивантажити власноруч: {url}"
 
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "{path}: \"{code}\" is not a valid ISO_3166-1 alpha-2 country code!"
-msgstr "{path}: «{code}» не є дійсним кодом країни за стандартом ISO_3166-1 alpha-2!"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{path}: {error}"
-msgstr "{path}: {error}"
-
 #: ../fdroidserver/mirror.py
 #, python-brace-format
 msgid "{url} does not end with \"fdroid\", check the URL path!"
 msgstr "{url} не закінчується на \"fdroid\", перевірте шлях URL!"
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/common.py
 #, python-brace-format
 msgid "{url} does not start with \"http\"!"
 msgstr "{url} не починається на \"http\"!"
@@ -2702,9 +2700,9 @@ msgstr "{url} не починається на \"http\"!"
 #: ../fdroidserver/build.py
 msgid "{} build failed"
 msgid_plural "{} builds failed"
-msgstr[0] "{} не вдалося зібрати"
-msgstr[1] "{} не вдалося зібрати"
-msgstr[2] "{} не вдалося зібрати"
+msgstr[0] "{} не вдалося створити"
+msgstr[1] "{} не вдалося створити"
+msgstr[2] "{} не вдалося створити"
 
 #: ../fdroidserver/build.py
 msgid "{} build succeeded"
@@ -2712,3 +2710,48 @@ msgid_plural "{} builds succeeded"
 msgstr[0] "{} зібрано успішно"
 msgstr[1] "{} зібрано успішно"
 msgstr[2] "{} зібрано успішно"
+
+#, fuzzy
+#~ msgid "Add PGP signatures for packages in repo using GnuPG"
+#~ msgstr "Додайте підписи gpg для пакетів у репозиторії"
+
+#~ msgid "Add gpg signatures for packages in repo"
+#~ msgstr "Додайте підписи gpg для пакетів у репозиторії"
+
+#~ msgid "Android Build Tools path '{path}' does not exist!"
+#~ msgstr "Шлях '{path}' до інструментів створення Android не існує!"
+
+#~ msgid "Cannot find a packageName for {path}!"
+#~ msgstr "Неможливо знайти packageName за шляхом {path}!"
+
+#~ msgid "Cannot find an appid for {path}!"
+#~ msgstr "Не вдається знайти appid за шляхом {path}!"
+
+#~ msgid "Clean update - don't uses caches, reprocess all apks"
+#~ msgstr "Очистити оновлення - не використовує кеш, повторно обробляє всі apks"
+
+#~ msgid "Interactively ask about things that need updating."
+#~ msgstr "Інтерактивно запитайте про речі, які потребують оновлення."
+
+#, fuzzy
+#~ msgid "Specify editor to use in interactive mode. Default "
+#~ msgstr "Вкажіть редактор для використання в інтерактивному режимі. За замовчуванням %s"
+
+#~ msgid "Specify editor to use in interactive mode. Default %s"
+#~ msgstr "Вкажіть редактор для використання в інтерактивному режимі. За замовчуванням %s"
+
+#, fuzzy
+#~ msgid "Specify editor to use in interactive mode. Default is {path}"
+#~ msgstr "Вкажіть редактор для використання в інтерактивному режимі. За замовчуванням %s"
+
+#~ msgid "app-id in the form APPID"
+#~ msgstr "app-id у формі APPID"
+
+#~ msgid "app-id to check for updates"
+#~ msgstr "app-id для перевірки наявність оновлень"
+
+#~ msgid "app-id with optional versionCode in the form APPID[:VERCODE]"
+#~ msgstr "app-id з необов'язковою версією коду у формі APPID[:VERCODE]"
+
+#~ msgid "app-id with optional versioncode in the form APPID[:VERCODE]"
+#~ msgstr "app-id з необов'язковим кодом версії у формі APPID[:VERCODE]"
diff --git a/locale/zh_Hans/LC_MESSAGES/fdroidserver.po b/locale/zh_Hans/LC_MESSAGES/fdroidserver.po
index 6bb2b142..6a658488 100644
--- a/locale/zh_Hans/LC_MESSAGES/fdroidserver.po
+++ b/locale/zh_Hans/LC_MESSAGES/fdroidserver.po
@@ -2,53 +2,41 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # ERDwaYbR <weblate.uu@vvvvv5.uu.me>, 2020.
-# Trey Yang <stevsfy@gmail.com>, 2020, 2022.
+# Trey Yang <stevsfy@gmail.com>, 2020.
 # taiyuan <1006333969@qq.com>, 2020.
-# Eric <spice2wolf@gmail.com>, 2020, 2021.
-# Carlos <linghao.zhang@protonmail.com>, 2021.
-# Hans-Christoph Steiner <hans@guardianproject.info>, 2021.
-# Liu Tao <lyuutau@outlook.com>, 2021.
-# 世界 <i@nekox.me>, 2021.
-# ZZY2357 <ZZY2357@outlook.com>, 2021.
-# yahoo～～ <xll520yzl@gmail.com>, 2021.
-# Liu Wenyuan <15816141883@163.com>, 2021.
-# JY3 <GeeyunJY3@gmail.com>, 2021, 2022.
-# Eric <alchemillatruth@purelymail.com>, 2022.
-# shenzhui007 <12231252@bjtu.edu.cn>, 2022.
-# linsui <linsui@inbox.lv>, 2022, 2024.
-# YangYulin <yylteam@icloud.com>, 2022.
-# Yang Yulin <yylteam@icloud.com>, 2022.
-# yangyangdaji <1504305527@qq.com>, 2022.
-# Yang Yulin <yylteam@hotmail.com>, 2022.
-# Eric <hamburger1024@mailbox.org>, 2022.
-# Xu ZhuoHan <yylteam@hotmail.com>, 2022.
-# Xiang Heng Wei <yylteam@hotmail.com>, 2022, 2023, 2024.
-# RainSlide <RainSlide@outlook.com>, 2023.
-# Eric <hamburger2048@users.noreply.hosted.weblate.org>, 2023.
-# Max Xie <monyxie@gmail.com>, 2023.
-# Kingo Bingo <bingokingosoft@gmail.com>, 2023.
-# zhiqi <lzqlzq21@gmail.com>, 2023.
-# David Jiang <david.jiang2024@gmail.com>, 2023.
-# ALoLo_527 <ALoLo@users.noreply.hosted.weblate.org>, 2024.
-# 大王叫我来巡山 <hamburger2048@users.noreply.hosted.weblate.org>, 2024, 2025.
-# chumoer <k17733196511@gmail.com>, 2024.
-# Wang <wang@plasma.ac.cn>, 2024.
-# Lily Chou <lily-develop@outlook.com>, 2024.
-# ygsk10 <yogaskung@protonmail.ch>, 2024.
+# Eric <spice2wolf@gmail.com>, 2020.
 msgid ""
 msgstr ""
 "Project-Id-Version: fdroidserver 0.9\n"
 "Report-Msgid-Bugs-To: https://gitlab.com/fdroid/fdroidserver/issues\n"
-"POT-Creation-Date: 2025-06-25 09:52+0200\n"
-"PO-Revision-Date: 2025-03-26 10:00+0000\n"
-"Last-Translator: 大王叫我来巡山 <hamburger2048@users.noreply.hosted.weblate.org>\n"
-"Language-Team: Chinese (Simplified Han script) <https://hosted.weblate.org/projects/f-droid/fdroidserver/zh_Hans/>\n"
+"POT-Creation-Date: 2020-10-21 18:05+0200\n"
+"PO-Revision-Date: 2020-10-08 06:06+0000\n"
+"Last-Translator: Eric <spice2wolf@gmail.com>\n"
+"Language-Team: Chinese (Simplified) <https://hosted.weblate.org/projects/f-droid/fdroidserver/zh_Hans/>\n"
 "Language: zh_Hans\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Weblate 5.11-dev\n"
+"X-Generator: Weblate 4.3-dev\n"
+
+#: ../fdroidserver/common.py
+msgid ""
+"\n"
+"        This is a repository of apps to be used with FDroid. Applications in this\n"
+"        repository are either official binaries built by the original application\n"
+"        developers, or are binaries built from source by f-droid.org using the\n"
+"        tools on https://gitlab.com/fdroid.\n"
+"        "
+msgstr ""
+
+#: ../fdroidserver/nightly.py
+msgid ""
+"\n"
+"SSH Public Key to be used as Deploy Key:"
+msgstr ""
+"\n"
+"SSH 公钥被用来作为布署密钥："
 
 #: ../fdroidserver/nightly.py
 msgid ""
@@ -56,7 +44,7 @@ msgid ""
 "SSH public key to be used as deploy key:"
 msgstr ""
 "\n"
-"用作布署密钥的 SSH 公钥:"
+"SSH 公钥将被用作布署密钥："
 
 #: ../fdroidserver/nightly.py
 #, python-brace-format
@@ -65,194 +53,210 @@ msgid ""
 "{path} encoded for the DEBUG_KEYSTORE secret variable:"
 msgstr ""
 "\n"
-"编码的 DEBUG_KEYSTORE {path} 秘密变量:"
+"编给DEBUG_KEYSTORE秘密变量的{path}："
 
 #: ../fdroidserver/lint.py
 #, python-format
 msgid "\"%s/\" has no matching metadata file!"
-msgstr "\"%s/\" 没有与之匹配的元数据文件!"
-
-#: ../fdroidserver/index.py
-msgid "\"isPrimary\" key should not be added to mirrors!"
-msgstr "\"isPrimary\" 密钥不应被添加到镜像！"
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "\"local_copy_dir\" {path} does not exist!"
-msgstr "\"local_copy_dir\" {path} 不存在！"
+msgstr "\"%s/\" 没有匹配的元数据文件!"
 
 #: ../fdroidserver/install.py
 #, python-brace-format
 msgid "\"{apkfilename}\" is already installed on {dev}."
-msgstr "'{apkfilename}' 已安装在 {dev} 上."
+msgstr "'{apkfilename}'已安装在{dev}上。"
+
+#: ../fdroidserver/update.py
+#, python-brace-format
+msgid "\"{path}\" contains outdated {name} ({version})"
+msgstr "\"{path}\" 包含过时的 {name} ({version})"
 
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "\"{path}\" contains recent {name} ({version})"
 msgstr "\"{path}\" 包含近期的 {name} ({version})"
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "\"{path}\" exists but s3cmd is not installed!"
-msgstr "\"{path}\" 存在, 但 s3cmd 未安装!"
+msgstr "\"{path}\"存在，但未安装 s3cmd！"
 
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "\"{path}\" is not a supported file format (use: metadata/*.yml)"
-msgstr "\"{path}\" 不是受支持的文件格式（请用：metadata/*.yml）"
+msgstr "\"{path}\"不是可接受的文件格式 （使用：metadata/*.yml）"
 
-#: ../fdroidserver/update.py
+#: ../fdroidserver/metadata.py
 #, python-brace-format
-msgid "\"{path}\" is signed by a key that is not allowed:"
-msgstr "\"{path}\" 由不允许的密钥所签署："
+msgid "\"{path}\" is not an accepted format, convert to: {formats}"
+msgstr "\"{path}\" 不是可接受的格式, 需转换成 : {formats}"
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/common.py
 #, python-brace-format
 msgid "\"{url}\" is not a valid URL!"
-msgstr "\"{url}\" 不是有效的链接!"
+msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, python-format
+msgid "%(option)s option requires %(number)d argument"
+msgid_plural "%(option)s option requires %(number)d arguments"
+msgstr[0] "%(option)s 选项需要 %(number)d 个参数"
+
+#: ../fdroidserver/mirror.py
+#, python-format
+msgid "%(prog)s [options] url"
+msgstr "%(prog)s [选项] url"
+
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "%(prog)s: error: %(message)s\n"
-msgstr "%(prog)s：错误：%(message)s\n"
-
-#: ../fdroidserver/publish.py
-#, python-format
-msgid "%d APKs failed to be signed or verified!"
-msgstr "%d 个 APK 无法签名或验证！"
+msgstr "%(prog)s: 错误: %(message)s\n"
 
 #: ../fdroidserver/scanner.py
 #, python-format
 msgid "%d problems found"
 msgstr "发现 %d 个问题"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "%prog [options]"
+msgstr "100%prog [选项]"
+
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "%r is not callable"
-msgstr "%r 不可调用"
-
-#: ../fdroidserver/signindex.py
-#, python-format
-msgid "%s did not produce a dict!"
-msgstr "%s 未能产生字典！"
-
-#: ../fdroidserver/signindex.py
-#, python-format
-msgid "%s has bad SHA-256: %s"
-msgstr "%s 的 SHA-256 值不正确：%s"
+msgstr "%r 不是可调用的"
 
 #: ../fdroidserver/lint.py
 #, python-format
 msgid "%s is not an accepted build field"
-msgstr "%s 不是一个被接受的构建字段"
+msgstr "%s 不是可接受的构建字段"
 
-#: ../fdroidserver/common.py
-msgid "'keypass' not found in config.yml!"
-msgstr "config.yml 中找不到 'keypass'!"
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, python-format
+msgid "%s option does not take a value"
+msgstr "%s 选项不采用值"
+
+#: ../fdroidserver/index.py ../fdroidserver/common.py
+msgid "'keypass' not found in config.py!"
+msgstr "config.py中找不到'keypass'！"
 
 #: ../fdroidserver/common.py
 msgid "'keystore' is NONE and 'smartcardoptions' is blank!"
-msgstr "'keystore' 没有赋值, 'smartcardoptions' 为空 !"
+msgstr ""
 
-#: ../fdroidserver/common.py
-msgid "'keystore' not found in config.yml!"
-msgstr "config.yml 中找不到 'keystore'!"
+#: ../fdroidserver/index.py ../fdroidserver/common.py
+msgid "'keystore' not found in config.py!"
+msgstr "config.py中找不到'keypass'！"
 
-#: ../fdroidserver/common.py
-msgid "'keystorepass' not found in config.yml!"
-msgstr "config.yml 中找不到 'keystorepass'!"
+#: ../fdroidserver/index.py ../fdroidserver/common.py
+msgid "'keystorepass' not found in config.py!"
+msgstr "config.py中找不到'keystorepass'！"
 
-#: ../fdroidserver/common.py
-msgid "'repo_keyalias' not found in config.yml!"
-msgstr "config.yml 中找不到 'repo_keyalias'!"
+#: ../fdroidserver/index.py ../fdroidserver/common.py
+msgid "'repo_keyalias' not found in config.py!"
+msgstr "config.py中找不到'repo_keyalias'！"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "'required' is an invalid argument for positionals"
-msgstr "'required' 是位置的无效参数"
+msgstr "'required'是无效的位置参数"
 
 #: ../fdroidserver/common.py
-msgid "'sdk_path' not set in config.yml!"
-msgstr "未在 config.yml 中设置 'sdk_path'!"
+msgid "'sdk_path' not set in 'config.py'!"
+msgstr "未在“ config.py”中设置“ sdk_path”！"
+
+#. Translators: "build-tools" is the file name of a package from
+#. Google, it is part of the Android SDK. So it probably shouldn't be
+#. translated or transliterated.
+#: ../fdroidserver/common.py
+#, python-brace-format
+msgid "'{aapt}' is too old, fdroid requires build-tools-23.0.0 or newer!"
+msgstr "'{aapt}'太旧，fdroid需要build-tools-23.0.0或更高版本！"
 
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "'{aapt}' is too old, fdroid requires build-tools-{version} or newer!"
-msgstr "'{aapt}' 太旧, F-Droid 需要 build-tools-{version} 或更新的版本!"
+msgstr "'{aapt}'太旧，fdroid需要build-tools- {version}或更高版本！"
+
+#: ../fdroidserver/install.py
+#, python-brace-format
+msgid "'{apkfilename}' is already installed on {dev}."
+msgstr "'{apkfilename}'已安装在{dev}上。"
+
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "'{field}' in {linedesc} is obsolete, see docs for current fields:"
+msgstr "{linedesc}中的'{field}'已过时，请参阅文档以获取当前字段："
+
+#: ../fdroidserver/common.py
+#, python-brace-format
+msgid "'{field}' will be in random order! Use () or [] brackets if order is important!"
+msgstr "“ {field}”将随机排列！如果顺序很重要，请使用（）或[]括号！"
 
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "'{path}' failed to execute!"
-msgstr "'{path}' 执行失败!"
+msgstr "'{path}'执行失败!"
 
 #: ../fdroidserver/metadata.py
 #, python-brace-format
-msgid "'{path}' has invalid format, it should be a dictionary!"
-msgstr "'{path}' 是无效格式, 它应该是字典!"
-
-#: ../fdroidserver/lint.py ../fdroidserver/metadata.py
-#, python-brace-format
 msgid "'{value}' is not a valid {field} in {appid}. Regex pattern: {pattern}"
-msgstr "'{value}' 不是 {appid} 之有效 {field}. 正则表达式: {pattern}"
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "'{value}' is not a valid {field}, should be {pattern}"
-msgstr "'{value}' 不是有效 {field}，应为 {pattern}"
-
-#: ../fdroidserver/checkupdates.py
-msgid "--merge-request only runs on a single appid!"
-msgstr "--merge-request 只运行在单个 appid 上！"
+msgstr "'{value}'不是{appid}的一个有效{field}。正则表达式模式：{pattern}"
 
 #: ../fdroidserver/checkupdates.py
 #, python-brace-format
 msgid "...checkupdate failed for {appid} : {error}"
-msgstr "…为 {appid} 检查更新失败: {error}"
+msgstr "... {appid}的checkupdate失败：{error}"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid ".__call__() not defined"
 msgstr ".__call__() 未定义"
 
+#: ../fdroidserver/metadata.py
+msgid ".fdroid.txt is not supported!  Convert to .fdroid.yml or .fdroid.json."
+msgstr "不支持.fdroid.txt！转换为.fdroid.yml或.fdroid.json。"
+
 #: ../fdroidserver/lint.py
 msgid "/issues is missing"
-msgstr "路径缺少 /issues ( 译者注: 此处仅支持 github 或 gitlab 之 issues 链接 )"
+msgstr "/问题丢失"
 
 #: ../fdroidserver/mirror.py
 msgid "A URL is required as an argument!"
-msgstr "需要有一个链接作为参数!"
+msgstr "需要有URL为参数！"
 
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "APK signatures have different certificates in {path}:"
-msgstr "APK 签名在 {path} 中有不同的证书："
-
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Add PGP signatures using GnuPG for packages in repo"
-msgstr "使用 GnuPG 为存储库之软件包添加 PGP 签名"
+msgstr "添加 gpg 签名至资源库软件包"
+
+#: ../fdroid ../fdroidserver/__main__.py
+msgid "Add a new application from its source code"
+msgstr "从源码添加新的应用程序"
 
 #: ../fdroidserver/update.py
 msgid "Add a repo signing key to an unsigned repo"
-msgstr "添加存储库签名密钥到未签名的存储库"
+msgstr "给未签署的资源库添加一个资源库签署密匙"
 
 #: ../fdroidserver/update.py
 msgid "Add skeleton metadata files for APKs that are missing them"
-msgstr "为缺少主干元数据文件的 APK 添加这些文件"
+msgstr "为缺少骨架元数据文件的 APK 添加这些文件"
 
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Adding new repo for only {name}"
-msgstr "仅为 {name} 添加新存储库"
+msgstr "仅为 {name} 添加新资源库"
 
 #: ../fdroidserver/init.py
 msgid "Alias of the repo signing key in the keystore"
-msgstr "密钥库中存储库签名密钥的别名"
+msgstr "密钥存储中资源库签名密钥的别名"
 
-#: ../fdroidserver/build.py
-msgid "AllowedAPKSigningKeys missing but reference binary supplied"
-msgstr "缺少 AllowedAPKSigningKeys，但提供了参考二进制文件"
-
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "Allows a different revision (or git branch) to be specified for the initial import"
-msgstr "可让运行初始导入时指定不同修订 ( 或 git 分支 )"
+msgstr "可让运行初始导入时指定不同修订（或 git 分支）"
 
 #: ../fdroidserver/mirror.py
 msgid "Also mirror the full archive section"
@@ -260,185 +264,185 @@ msgstr "同时对存档部分完整镜像"
 
 #: ../fdroidserver/lint.py
 msgid "Also warn about formatting issues, like rewritemeta -l"
-msgstr "同时警告格式问题, 如同 rewritemeta -l"
+msgstr "同时提示格式问题，如 rewritemeta -l"
 
 #: ../fdroidserver/scanner.py
 msgid "Android AAR library"
-msgstr "Android AAR 库"
+msgstr ""
 
 #: ../fdroidserver/scanner.py
 msgid "Android APK file"
-msgstr "Android APK 文件"
+msgstr ""
 
 #: ../fdroidserver/scanner.py
 msgid "Android DEX code"
-msgstr "Android DEX 代码"
+msgstr "安卓DEX代码"
 
-#: ../fdroidserver/init.py
+#: ../fdroidserver/common.py ../fdroidserver/build.py
 #, python-brace-format
-msgid "Android SDK not found at {path}!"
-msgstr "未在 {path} 中找到 Android SDK!"
+msgid "Android SDK '{path}' does not have '{dirname}' installed!"
+msgstr "Android SDK‘{path}’未安装‘{dirname}’！"
+
+#: ../fdroidserver/common.py
+msgid "Android SDK not found!"
+msgstr "未找到 Android SDK！"
 
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "Android SDK path '{path}' does not exist!"
-msgstr "Android SDK 路径 {path} 不存在!"
+msgstr "Android SDK路径“ {path}”不存在！"
 
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "Android SDK path '{path}' is not a directory!"
-msgstr "Android SDK 路径 '{path}' 不是目录!"
+msgstr "Android SDK路径'{path}'不是目录！"
 
+#. Translators: "build-tools" is the file name of a package from
+#. Google, it is part of the Android SDK. So it probably shouldn't be
+#. translated or transliterated.
 #: ../fdroidserver/common.py
 #, python-brace-format
-msgid "Android SDK tool {cmd} not found!"
-msgstr "没找到 Android SDK 工具 {cmd}！"
+msgid "Android build-tools path '{path}' does not exist!"
+msgstr "Android构建工具路径“ {path}”不存在！"
 
-#: ../fdroidserver/lint.py
-msgid "App has Binaries but does not have corresponding AllowedAPKSigningKeys to pin certificate."
-msgstr "应用具有二进制文件，但没有相应的AllowedAPKSigningKeys 来固定证书。"
-
-#: ../fdroidserver/lint.py
-msgid "App has NoSourceSince or ArchivePolicy \"0 versions\" or 0 but AutoUpdateMode or UpdateCheckMode are not None"
-msgstr "APK 有 NoSourceSince 或 ArchivePolicy \"0 versions\" 或 0 但 AutoUpdateMode 或 UpdateCheckMode 不是 None"
+#: ../fdroidserver/update.py
+msgid "AndroidManifest.xml has no date"
+msgstr "AndroidManifest.xml没有日期"
 
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "App is in '{repo}' but has a link to {url}"
-msgstr "应用 在 '{repo}' 中, 但有一个链接到 {url}"
-
-#: ../fdroidserver/lint.py
-msgid "App version has binary but does not have corresponding AllowedAPKSigningKeys to pin certificate."
-msgstr "应用版本具有二进制文件，但没有相应的 AllowedAPKSigningKeys 来固定证书。"
+msgstr "应用程序在\"{repo}\"，但有一个链接到{url}"
 
 #: ../fdroidserver/lint.py
 msgid "Appending .git is not necessary"
-msgstr "不需要附加 .git"
+msgstr "不需要附加.git"
 
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Archiving {apkfilename} with invalid signature!"
-msgstr "正使用无效签名归档 {apkfilename}!"
-
-#: ../fdroidserver/lint.py
-msgid "AutoUpdateMode with UpdateCheckMode: HTTP must have a pattern."
-msgstr "AutoUpdateMode 和 UpdateCheckMode：HTTP 必须有一个模式。"
-
-#: ../fdroidserver/install.py
-msgid "Automatic no to all prompts."
-msgstr "对所有提示自动回复 no。"
-
-#: ../fdroidserver/install.py
-msgid "Automatic yes to all prompts."
-msgstr "对所有提示自动回复 yes。"
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "Bad entry type \"{mirrortype}\" in mirrors config: {mirror}"
-msgstr "镜像配置中的错误条目类型“{mirrortype}”：{mirror}"
+msgstr "正使用无效签名归档{apkfilename}！"
 
 #: ../fdroidserver/mirror.py
 msgid "Base URL to mirror, can include the index signing key using the query string: ?fingerprint="
-msgstr "镜像的基本链接可以使用此请求参数包含索引签名键: ?fingerprint="
+msgstr ""
 
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "Branch '{branch}' used as commit in build '{versionName}'"
-msgstr "分支 '{branch}' 在构建 '{versionName}' 时被用作相应的提交"
+msgstr ""
 
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "Branch '{branch}' used as commit in srclib '{srclib}'"
-msgstr "分支 '{branch}' 在源码库 '{srclib}' 里被用作相应的提交"
+msgstr ""
 
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Broken symlink: {path}"
-msgstr "断开的符号链接: {path}"
+msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Build a package from source"
-msgstr "从源代码构建安装包"
+msgstr "从源生成包"
 
 #: ../fdroidserver/build.py
 msgid "Build all applications available"
-msgstr "构建全部可用应用"
+msgstr "编译全部可用应用程序"
 
 #: ../fdroidserver/lint.py
 msgid "Build generated by `fdroid import` - remove disable line once ready"
-msgstr "由 'fdroid import' 生成的构建 - 一旦准备就绪将删除禁用行"
+msgstr ""
 
 #: ../fdroidserver/checkupdates.py
 msgid "Build metadata git repo has uncommited changes!"
-msgstr "构建元数据 git 存储库包含未提交的更改!"
+msgstr ""
 
 #: ../fdroidserver/build.py
 msgid "Build only the latest version of each package"
-msgstr "仅编译每个应用的最新版本"
+msgstr "仅编译每个包的最新版本"
+
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Build should have comma-separated versionName and versionCode, not \"{value}\", in {linedesc}"
+msgstr ""
 
 #: ../fdroidserver/init.py
 #, python-format
 msgid "Built repo based in \"%s\" with this config:"
-msgstr "使用此配置并基于 \"%s\" 的构建存储库："
-
-#: ../fdroidserver/checkupdates.py
-msgid "Can't auto-update app with no CurrentVersionCode"
-msgstr "在没有CurrentVersionCode的情况下不能自动更新应用"
+msgstr ""
 
 #: ../fdroidserver/build.py
 msgid "Can't build due to {} error while scanning"
 msgid_plural "Can't build due to {} errors while scanning"
-msgstr[0] "因扫描时的{}错误而无法构建"
+msgstr[0] ""
 
-#: ../fdroidserver/common.py
-#, fuzzy, python-brace-format
-msgid "Cannot read {path}: {error}"
-msgstr "读取 {path} 失败：{error}"
+#: ../fdroidserver/vmtools.py
+#, python-brace-format
+msgid "Cannot read \"{path}\"!"
+msgstr ""
+
+#. Translators: https://developer.android.com/studio/build/application-id
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Cannot resolve application ID {appid}"
+msgstr ""
 
 #: ../fdroidserver/rewritemeta.py
 #, python-brace-format
 msgid "Cannot rewrite \"{path}\""
-msgstr "无法重写 {path}"
+msgstr ""
+
+#: ../fdroidserver/rewritemeta.py
+msgid "Cannot use --list and --to at the same time"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Cannot write \"{path}\", not an accepted format, use: {formats}"
+msgstr ""
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
 #: ../fdroidserver/lint.py
 #, python-format
 msgid "Categories '%s' is not valid"
-msgstr "类别 '%s' 无效"
+msgstr ""
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
 #: ../fdroidserver/lint.py
 msgid "Categories are not set"
-msgstr "没有设置类别"
+msgstr ""
 
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "Category \"{category}\" defined but not used for any apps!"
-msgstr "类别“{category}”已定义，但未被用于任何应用！"
-
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Check for updates to applications"
-msgstr "检查应用的更新"
+msgstr "检查应用更新"
 
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Checking archiving for {appid} - apks:{integer}, keepversions:{keep}, archapks:{arch}"
-msgstr "正为 {appid} 检查存档: 安装包: {integer}, 保留版本数: {keep}, 架构安装包: {arch}"
+msgstr ""
+
+#: ../fdroidserver/dscanner.py
+msgid "Clean after all scans have finished"
+msgstr "扫描全部完成后清除"
+
+#: ../fdroidserver/dscanner.py
+msgid "Clean before the scans start and rebuild the container"
+msgstr "在扫描启动和容器重新编译之前清除"
+
+#: ../fdroidserver/dscanner.py
+msgid "Clean up all containers and then exit"
+msgstr "清除所有容器，然后退出"
 
 #: ../fdroidserver/update.py
 msgid "Clean update - don't uses caches, reprocess all APKs"
-msgstr "干净的更新 - 不使用缓存，重新处理全部 APK 文件"
+msgstr "干净更新- 不用缓存，重新处理全部 APK文件"
 
-#: ../fdroidserver/common.py
-msgid "Color the log output"
-msgstr "给日志输出添加颜色"
-
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "Comma separated list of categories."
 msgstr "逗号分割的目录列表。"
 
-#: ../fdroidserver/__main__.py
-#, python-format
+#: ../fdroid ../fdroidserver/__main__.py
+#, c-format, python-format
 msgid "Command '%s' not recognised.\n"
 msgstr "无法识别命令 '%s'。\n"
 
@@ -446,170 +450,163 @@ msgstr "无法识别命令 '%s'。\n"
 msgid "Commit changes"
 msgstr "提交更改"
 
-#: ../fdroidserver/checkupdates.py
-msgid "Commit changes, push, then make a merge request"
-msgstr "提交改动、推动，然后提出合并请求"
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Conflicting \"{field}\" definitions between .yml and localized files:"
-msgstr ".yml 和本地化文件之间的“{field}”定义冲突："
-
 #: ../fdroidserver/__main__.py
 msgid "Conflicting arguments: '--verbose' and '--quiet' can not be specified at the same time."
-msgstr "冲突的参数: '--verbose' 和 '--quiet' 不能被同时使用."
+msgstr ""
 
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "Could not find '{command}' on your system"
-msgstr "在您的系统中无法找到 '{command}'"
+msgstr ""
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "Could not find latest version code"
 msgstr "找不到最新版本代码"
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "Could not find latest version name"
 msgstr "找不到最新的版本名"
 
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Could not find {path} to remove it"
-msgstr "找不到 {path} 以移除"
+msgstr ""
 
 #: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Could not open APK {path} for analysis: "
-msgstr "无法打开 apk 文件 {path} 用于分析: "
+msgid "Could not open apk file for analysis"
+msgstr ""
 
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "Could not parse size \"{size}\", wrong type \"{type}\""
-msgstr "无法解析大小 \"{size}\", 错误类型 \"{type}\""
+msgstr ""
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/import_subcommand.py
+#. Translators: https://developer.android.com/studio/build/application-id
+#: ../fdroidserver/import.py
 msgid "Couldn't find Application ID"
-msgstr "找不到应用ID"
+msgstr "找不到应用程序ID"
 
-#: ../fdroidserver/checkupdates.py
-msgid "Couldn't find any version information"
-msgstr "无法找到任何的版本信息"
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
+#: ../fdroidserver/import.py
+msgid "Couldn't find latest version code"
+msgstr ""
 
-#: ../fdroidserver/checkupdates.py
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
+#: ../fdroidserver/import.py
+msgid "Couldn't find latest version name"
+msgstr ""
+
+#: ../fdroidserver/import.py
 msgid "Couldn't find package ID"
-msgstr "找不到安装包 ID"
+msgstr ""
 
 #: ../fdroidserver/update.py
 msgid "Cowardily refusing to overwrite existing signing key setup!"
-msgstr "拒绝覆盖现有的签署密钥设置!"
+msgstr ""
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/update.py
+msgid "Create a repo signing key in a keystore"
+msgstr "在密钥存储中创建资源库签名密钥"
+
+#: ../fdroidserver/update.py
+msgid "Create skeleton metadata files that are missing"
+msgstr "创建缺少的主干元数据文件"
+
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Created new container \"{name}\""
-msgstr "创建新容器 \"{name}\""
+msgstr ""
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Creating \"{path}\" for configuring s3cmd."
-msgstr "创建用于配置 s3cmd 的 \"{path}\"。"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Creating empty {config_file}"
-msgstr "正在创建空的 {config_file} 文件"
+msgstr ""
 
 #: ../fdroidserver/publish.py
 msgid "Creating log directory"
-msgstr "创建日志目录"
+msgstr ""
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Creating new S3 bucket: {url}"
-msgstr "创建新的 S3 存储桶：{url}"
+msgstr ""
 
 #: ../fdroidserver/publish.py
 msgid "Creating output directory"
-msgstr "创建输出目录"
+msgstr ""
 
 #: ../fdroidserver/index.py
 msgid "Creating signed index with this key (SHA256):"
-msgstr "使用此密钥 (SHA256) 创建签名索引："
+msgstr ""
 
-#: ../fdroidserver/publish.py ../fdroidserver/verify.py
+#: ../fdroidserver/import.py ../fdroidserver/verify.py
+#: ../fdroidserver/publish.py
 msgid "Creating temporary directory"
-msgstr "创建临时目录"
+msgstr ""
 
 #: ../fdroidserver/index.py
 msgid "Creating unsigned index in preparation for signing"
-msgstr "创建未签名的索引以准备签名"
+msgstr ""
 
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "CurrentVersionCode {cv} is less than oldest build entry {versionCode}"
-msgstr "当前版本代码 {cv} 小于最旧的构建 {versionCode}"
+msgstr ""
 
 #: ../fdroidserver/nightly.py
 msgid "DEBUG_KEYSTORE is not set or the value is incomplete"
-msgstr "DEBUG_KEYSTORE 未被设置或不完整"
+msgstr ""
 
 #: ../fdroidserver/update.py
 msgid "Delete APKs and/or OBBs without metadata from the repo"
-msgstr "从存储库中删除没有元数据的 APK 和 OBB"
+msgstr "从资源库中删除没有元数据的 APK 和 OBB"
 
 #: ../fdroidserver/deploy.py
 #, python-brace-format
 msgid "Deleting archive, repo is too big ({size} max {limit})"
-msgstr "存储库过大，将删除存档（大小 {size}，限制 {limit}）"
+msgstr ""
 
 #: ../fdroidserver/deploy.py
 #, python-brace-format
 msgid "Deleting git-mirror history, repo is too big ({size} max {limit})"
-msgstr "存储库过大，将删除镜像历史（大小 {size}，限制 {limit}）"
+msgstr ""
 
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Deleting unknown file: {path}"
-msgstr "删除未知文件： {path}"
+msgstr ""
 
 #: ../fdroidserver/lint.py
 #, python-format
 msgid "Description '%s' is just the app's summary"
-msgstr "简介“%s”与应用的概括文字相同"
+msgstr ""
 
 #: ../fdroidserver/lint.py
 msgid "Description has a duplicate line"
-msgstr "简介有重复行"
+msgstr ""
+
+#: ../fdroidserver/lint.py
+#, python-format
+msgid "Description has a list (%s) but it isn't bulleted (*) nor numbered (#)"
+msgstr ""
 
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "Description of length {length} is over the {limit} char limit"
-msgstr "简介长度 {length} 超过 {limit} 字限制"
+msgstr ""
 
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Did you mean config/{name}.yml?"
-msgstr "您是指 config/{name}.yml 吗？"
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Did you mean {code}?"
-msgstr "您是指 {code} 吗？"
-
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "Do not add 'disable:' to the generated build entries"
-msgstr "不要给生成的构建项添加 'disable:'"
+msgstr ""
 
 #: ../fdroidserver/nightly.py
 msgid "Do not deploy the new files to the repo"
-msgstr "不要给这个仓库部署新文件"
+msgstr ""
 
 #: ../fdroidserver/mirror.py
 #, python-brace-format
 msgid "Do not include \"{path}\" in URL!"
-msgstr "不要在链接中包含“{path}”！"
+msgstr ""
 
 #: ../fdroidserver/init.py
 msgid "Do not prompt for Android SDK path, just fail"
@@ -617,94 +614,79 @@ msgstr "不提示输入 Android SDK 路径，仅显示失败"
 
 #: ../fdroidserver/nightly.py
 msgid "Do not remove the private keys generated from the keystore"
-msgstr "不要从密钥库删除已生成的私钥"
+msgstr ""
 
 #: ../fdroidserver/build.py
 msgid "Don't create a source tarball, useful when testing a build"
 msgstr "不创建源码 tarball 文件，便于内部版本测试"
 
+#: ../fdroidserver/stats.py
+msgid "Don't do anything logs-related"
+msgstr "请勿做任何日志相关的操作"
+
 #: ../fdroidserver/build.py
 msgid "Don't refresh the repository, useful when testing a build with no internet connection"
 msgstr "不刷新资源库，便于没有互联网时的内部版本测试"
 
 #: ../fdroidserver/deploy.py ../fdroidserver/nightly.py
+#: ../fdroidserver/upload.py
 msgid "Don't use rsync checksums"
 msgstr "请勿使用 rsync 校验和"
 
-#: ../fdroidserver/install.py
-msgid "Download F-Droid.apk using mirrors that leak less to the network"
-msgstr "使用向网络泄露较少信息的镜像下载 F-Droid apk"
-
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Download complete mirrors of small repos"
-msgstr "下载小型仓库的完整镜像"
+msgstr ""
+
+#: ../fdroidserver/stats.py
+msgid "Download logs we don't have"
+msgstr "下载当前没有的日志"
 
 #: ../fdroidserver/common.py
 msgid "Downloading the repository already failed once, not trying again."
-msgstr "下载仓库已经失败了一次，不再尝试。"
+msgstr ""
 
 #: ../fdroidserver/verify.py
 #, python-brace-format
 msgid "Downloading {url} failed. {error}"
-msgstr "{url} 下载失败。{error}"
+msgstr ""
 
 #: ../fdroidserver/metadata.py
 #, python-brace-format
-msgid "Duplicate Anti-Feature declaration at {path} was ignored!"
-msgstr "{path} 处的重复负面特征声明被忽略！"
-
-#: ../fdroidserver/index.py
-#, python-format
-msgid "Duplicate entry \"%s\" in mirrors config!"
-msgstr "镜像配置中的重复条目“%s”！"
+msgid "Duplicate build recipe found for versionCode {versionCode} in {linedesc}"
+msgstr ""
 
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "Duplicate link in '{field}': {url}"
-msgstr "“{field}”中有重复的链接：{url}"
+msgstr ""
 
-#: ../fdroidserver/common.py
-#, python-format
-msgid "ERROR: %(message)s"
-msgstr "错误：%(message)s"
+#: ../fdroid
+msgid "Dynamically scan APKs post build"
+msgstr "动态扫描已编译的 APKs"
 
 #: ../fdroidserver/__main__.py
 msgid "ERROR: The \"server\" subcommand has been removed, use \"deploy\"!"
-msgstr "错误：\"server\" 子命令已被删除，请使用 \"deploy\"！"
+msgstr ""
+
+#: ../fdroidserver/mirror.py
+msgid ""
+"ERROR: this command should never be used to mirror f-droid.org!\n"
+"A full mirror of f-droid.org requires more than 200GB."
+msgstr ""
 
 #: ../fdroidserver/nightly.py
 msgid "ERROR: unsupported CI type, patches welcome!"
-msgstr "错误：不支持的 CI 类型，欢迎提交补丁添加支持！"
+msgstr ""
 
-#: ../fdroidserver/nightly.py
-#, python-format
-msgid "ERROR: unsupported git host \"%s\", patches welcome!"
-msgstr "错误：不支持的 git 主机类型 \"%s\"，欢迎提交补丁添加支持！"
-
-#: ../fdroidserver/lint.py
+#: ../fdroidserver/metadata.py
 #, python-brace-format
-msgid "ERROR: {key} in {path} is not \"archive\" or \"repo\"!"
-msgstr "错误: {path}中的{key}不是“archive”或“repo”！"
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "ERROR: {key} not a valid key!"
-msgstr "错误：{key} 不是有效的密钥！"
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "ERROR: {key}'s value should be of type {t}!"
-msgstr "错误：{key} 的值的类型应为 {t}！"
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "ERROR: {key}:{subkey} in {path} is not in allowed keys: {allowed_keys}!"
-msgstr "错误: {path}中的{key}:{subkey}不再被允许的值的范围内: {allowed_keys}！"
+msgid "Empty build flag at {linedesc}"
+msgstr ""
 
 #: ../fdroidserver/__main__.py
 #, python-brace-format
 msgid "Encoding is set to '{enc}' fdroid might run into encoding issues. Please set it to 'UTF-8' for best results."
-msgstr "编码被设置为“{enc}”，可能会导致 fdroid 出现编码问题。为了最佳效果，请将其更改为“UTF-8”。"
+msgstr ""
 
 #: ../fdroidserver/init.py
 #, python-format
@@ -712,115 +694,110 @@ msgid ""
 "Enter the path to the Android SDK (%s) here:\n"
 "> "
 msgstr ""
-"请在此处输入 Android SDK（%s）的路径：\n"
-"> "
 
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Environment variable {var} from {configname} is not set!"
-msgstr "没有设置 {configname} 中的环境变量 {var}！"
+#: ../fdroidserver/deploy.py ../fdroidserver/checkupdates.py
+#: ../fdroidserver/upload.py
+#, python-format
+msgid "Error while attempting to publish log: %s"
+msgstr ""
 
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Environment variable {{env: {var}}} is not set!"
-msgstr "没有设置环境变量 {{env: {var}}} ！"
-
-#: ../fdroidserver/deploy.py
-msgid "Error deploying 'github_releases', {} not present. (You might need to run `fdroid update` first.)"
-msgstr "部署'github_releases'错误，{}没有出现。(你可能需要先运行`fdroid update`)"
-
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py ../fdroidserver/common.py
 msgid "Error while getting repo address"
-msgstr "获取存储库地址时出错"
+msgstr ""
 
-#: ../fdroidserver/scanner.py
-msgid "Exit with a non-zero code if problems were found"
-msgstr "如果发现问题，则以非零代码退出"
-
-#: ../fdroidserver/__main__.py
-msgid "Extract application metadata from a source repository"
-msgstr "从源存储库中提取应用元数据"
-
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Extract signatures from APKs"
-msgstr "从 APK 中提取签名"
-
-#: ../fdroidserver/install.py
-msgid "F-Droid.apk could not be downloaded from any known source!"
-msgstr "无法从任何已知的来源下载 F-Droid apk！"
+msgstr ""
 
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Failed copying {path}: {error}"
-msgstr "复制 {path} 失败：{error}"
+msgstr ""
 
 #: ../fdroidserver/signatures.py
 #, python-brace-format
 msgid "Failed fetching signatures for '{apkfilename}': {error}"
-msgstr "获取 '{apkfilename}' 的签名时出错：{error}"
+msgstr ""
 
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Failed reading {path}: {error}"
-msgstr "读取 {path} 失败：{error}"
+msgstr ""
 
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Failed resizing {path}: {error}"
-msgstr "缩放 {path} 失败：{error}"
+msgstr ""
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/publish.py
+msgid "Failed to align application"
+msgstr "未能匹配应用程序"
+
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Failed to create S3 bucket: {url}"
-msgstr "创建亚马逊简易储存服务失败：{url}"
+msgstr ""
+
+#: ../fdroidserver/common.py
+msgid "Failed to get APK manifest information"
+msgstr ""
 
 #: ../fdroidserver/update.py
 #, python-brace-format
-msgid "Failed to get APK information, deleting {path}"
-msgstr "获取 APK 信息失败，正在删除 {path}"
+msgid "Failed to get apk information, deleting {path}"
+msgstr ""
 
 #: ../fdroidserver/update.py
 #, python-brace-format
-msgid "Failed to get APK information, skipping {path}"
-msgstr "获取APK信息失败，跳过{path}"
-
-#: ../fdroidserver/update.py
-msgid "Failed to get APK signing key fingerprint"
-msgstr "未能获取APK签名密钥指纹"
+msgid "Failed to get apk information, skipping {path}"
+msgstr ""
 
 #: ../fdroidserver/install.py
 #, python-brace-format
 msgid "Failed to install '{apkfilename}' on {dev}: {error}"
-msgstr "无法在 {dev} 上安装 '{apkfilename}'：{error}"
+msgstr ""
+
+#: ../fdroidserver/publish.py ../fdroidserver/common.py
+msgid "Failed to sign application"
+msgstr ""
 
 #: ../fdroidserver/common.py
-msgid "Failed to sign application"
-msgstr "未能对应用进行签名"
+msgid "Failed to zipalign application"
+msgstr "未能归档对齐（zipalign）应用程序"
 
 #: ../fdroidserver/build.py
 #, python-brace-format
 msgid "Fetched buildserverid from VM: {buildserverid}"
-msgstr "从虚拟机获取了buildserverid：{buildserverid}"
+msgstr ""
 
 #: ../fdroidserver/signatures.py
 #, python-brace-format
 msgid "Fetched signatures for '{apkfilename}' -> '{sigdir}'"
-msgstr "获取了'{apkfilename}'的签名-> '{sigdir}'"
+msgstr ""
 
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "File disappeared while processing it: {path}"
-msgstr "文件在处理时消失： {path}"
+msgstr ""
 
-#: ../fdroidserver/build.py ../fdroidserver/install.py
-#: ../fdroidserver/rewritemeta.py ../fdroidserver/scanner.py
-#: ../fdroidserver/update.py
+#: ../fdroidserver/verify.py ../fdroidserver/stats.py ../fdroidserver/update.py
+#: ../fdroidserver/rewritemeta.py ../fdroidserver/build.py
+#: ../fdroidserver/checkupdates.py ../fdroidserver/scanner.py
+#: ../fdroidserver/install.py
 msgid "Finished"
-msgstr "已完成"
+msgstr ""
+
+#: ../fdroidserver/lint.py
+msgid "Flattr donation methods belong in the FlattrID flag"
+msgstr ""
+
+#: ../fdroidserver/lint.py
+msgid "Flattr donation methods belong in the FlattrID: field"
+msgstr ""
 
 #: ../fdroidserver/lint.py
 msgid "Forbidden HTML tags"
-msgstr "禁止的HTML标签"
+msgstr ""
 
 #: ../fdroidserver/build.py
 msgid "Force build of disabled apps, and carries on regardless of scan problems. Only allowed in test mode."
@@ -829,255 +806,257 @@ msgstr "强制编译已禁用应用，忽略扫描出错。仅用于测试模式
 #: ../fdroidserver/build.py
 #, python-brace-format
 msgid "Force halting build after {0} sec timeout!"
-msgstr "在{0}秒超时后强制停止构建!"
+msgstr ""
 
 #: ../fdroidserver/scanner.py
 msgid "Force scan of disabled apps and builds."
-msgstr "强制扫描已禁用的应用和内部版本。"
+msgstr ""
 
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Found \"{path}\" graphic without metadata for app \"{name}\"!"
-msgstr "为应用“{name}”找到了没有元数据的“{path}”图形！"
+msgstr ""
 
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Found bad funding file \"{path}\" for \"{name}\":"
-msgstr "为“{name}”找到了错误的资金文件“{path}”："
+msgstr ""
 
 #: ../fdroidserver/common.py
 msgid "Found invalid appids in arguments"
-msgstr "在参数中发现无效的appids"
+msgstr ""
 
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
 #: ../fdroidserver/common.py
 msgid "Found invalid versionCodes for some apps"
-msgstr "发现某些应用的版本代码无效"
+msgstr ""
 
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "Found multiple JAR Signature Block Files in {path}"
-msgstr "在{path}中发现多个JAR签名块文件"
-
-#: ../fdroidserver/common.py
-msgid "Found multiple Signer Certificates!"
-msgstr "找到了多个签署者证书！"
+msgstr ""
 
 #: ../fdroidserver/metadata.py
 #, python-brace-format
 msgid "Found multiple metadata files for {appid}"
-msgstr "找到多个 {appid} 的元数据文件"
+msgstr "找到多个{appid}的元数据文件"
 
 #: ../fdroidserver/index.py
 msgid "Found multiple signing certificates for repository."
-msgstr "发现存储库的多个签名证书。"
+msgstr ""
+
+#: ../fdroidserver/update.py
+#, python-brace-format
+msgid "Found multiple signing certificates in {path}"
+msgstr ""
 
 #: ../fdroidserver/index.py
 msgid "Found no signing certificates for repository."
-msgstr "未找到存储库的签名证书。"
+msgstr ""
 
 #: ../fdroidserver/lint.py
 #, python-format
 msgid "Found non-file at %s"
-msgstr "在%s处发现非文件"
+msgstr ""
 
 #: ../fdroidserver/deploy.py
 #, python-brace-format
 msgid "Found {apkfilename} at {url}"
-msgstr "在{url}发现{apkfilename}"
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Found {count} problems in {filename}"
-msgstr "发现了 {count} 个问题，扫描对象 {filename}"
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Found {count} warnings in {filename}"
-msgstr "发现了 {count} 个警告，扫描对象 {filename}"
+msgstr ""
 
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Generated skeleton metadata for {appid}"
-msgstr "已生成 {appid} 的主干元数据"
+msgstr "生成了{appid}的骨架元数据"
 
 #: ../fdroidserver/common.py
 #, python-format
 msgid "Git checkout of '%s' failed"
-msgstr "'%s' 的 Git 签出失败"
+msgstr ""
 
 #: ../fdroidserver/common.py
 msgid "Git clean failed"
-msgstr "Git clean 失败"
+msgstr ""
 
 #: ../fdroidserver/common.py
 msgid "Git fetch failed"
-msgstr "Git fetch 失败"
+msgstr ""
+
+#: ../fdroidserver/common.py
+msgid "Git remote set-head failed"
+msgstr ""
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
 #: ../fdroidserver/common.py
 #, python-format
 msgid "Git remote set-head failed: \"%s\""
-msgstr "Git remote set-head 失败：\"%s\""
+msgstr ""
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
 #: ../fdroidserver/common.py
 msgid "Git reset failed"
-msgstr "Git reset 失败"
-
-#: ../fdroidserver/common.py
-msgid "Git submodule deinit failed"
-msgstr "Git 子模块去初始化失败"
+msgstr ""
 
 #: ../fdroidserver/common.py
 msgid "Git submodule sync failed"
-msgstr "Git 子模块同步失败"
+msgstr ""
 
 #: ../fdroidserver/common.py
 msgid "Git submodule update failed"
-msgstr "Git 子模块更新失败"
+msgstr ""
 
 #: ../fdroidserver/common.py
 msgid "HTTPS must be used with Subversion URLs!"
-msgstr "HTTPS 必须与 Subversion URL 一起使用！"
+msgstr ""
 
 #: ../fdroidserver/deploy.py
 msgid "If a git mirror gets to big, allow the archive to be deleted"
-msgstr "如果 git 镜像变大，允许删除存档"
+msgstr ""
 
 #: ../fdroidserver/deploy.py
 #, python-brace-format
 msgid "If this upload fails, try manually uploading to {url}"
-msgstr "如果此上传失败，请尝试手动上传到 {url}"
+msgstr ""
 
 #: ../fdroidserver/metadata.py
 #, python-brace-format
 msgid "Ignoring '{field}' in '{metapath}' metadata because it is deprecated."
-msgstr "忽略“{metapath}”元数据中的“{field}”，因为它已被弃用。"
+msgstr ""
 
 #: ../fdroidserver/update.py
 #, python-format
 msgid "Ignoring FUNDING.yml entry longer than 2048: %s"
-msgstr "忽略超过 2048 的 FUNDING.yml 条目：%s"
-
-#: ../fdroidserver/update.py
-#, python-format
-msgid "Ignoring bad element in manifest: %s"
-msgstr "忽略清单中的错误元素： %s"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Ignoring deprecated {oldfile}, use {newfile}!"
-msgstr "正在忽略已弃用的 {oldfile} 文件，请使用 {newfile}！"
+msgstr ""
 
 #: ../fdroidserver/index.py
 msgid "Ignoring package without metadata: "
-msgstr "忽略没有元数据的包： "
+msgstr ""
 
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Ignoring stale cache data for {apkfilename}"
-msgstr "忽略 {apkfilename} 的过时缓存数据"
+msgstr ""
+
+#: ../fdroidserver/rewritemeta.py
+#, python-brace-format
+msgid "Ignoring {ext} file at '{path}'"
+msgstr ""
 
 #: ../fdroidserver/update.py
 msgid "Include APKs that are signed with disabled algorithms like MD5"
-msgstr "包括使用已禁用的算法（如 MD5）签名的 APK"
+msgstr ""
 
 #: ../fdroidserver/mirror.py
 msgid "Include the PGP signature .asc files in the mirror"
-msgstr "在镜像中包含 PGP 签名 .asc 文件"
+msgstr ""
 
 #: ../fdroidserver/mirror.py
 msgid "Include the build logs in the mirror"
-msgstr "在镜像中包含构建日志"
+msgstr ""
 
 #: ../fdroidserver/mirror.py
 msgid "Include the source tarballs in the mirror"
-msgstr "在镜像中包含源 tarball"
-
-#: ../fdroidserver/metadata.py
-#, python-format
-msgid "Including metadata from %s@%s"
-msgstr "包括来自 %s@%s 的元数据"
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Including metadata from {path}"
-msgstr "包含来自 {path} 的元数据"
+msgstr ""
 
 #: ../fdroidserver/common.py
 msgid "Initialising submodules"
-msgstr "初始化子模块"
+msgstr ""
 
 #: ../fdroidserver/install.py
 msgid "Install all signed applications available"
 msgstr "安装全部可用的已签名应用"
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Install built packages on devices"
-msgstr "在设备上安装生成的安装包"
+msgstr "在设备上安装生成包"
 
 #: ../fdroidserver/install.py
 #, python-format
 msgid "Installing %s..."
-msgstr "正在安装 %s..."
+msgstr ""
+
+#: ../fdroidserver/install.py
+#, python-format
+msgid "Installing %s…"
+msgstr ""
 
 #: ../fdroidserver/install.py
 #, python-brace-format
 msgid "Installing '{apkfilename}' on {dev}..."
-msgstr "在 {dev} 上安装“{apkfilename}”..."
+msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroidserver/install.py
+#, python-brace-format
+msgid "Installing '{apkfilename}' on {dev}…"
+msgstr ""
+
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Interact with the repo HTTP server"
-msgstr "与存储库 HTTP 服务器互动"
+msgstr "与资源库 HTTP 服务器互动"
 
 #: ../fdroidserver/update.py
 msgid "Invalid APK"
-msgstr "无效的 APK"
+msgstr ""
 
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "Invalid AutoUpdateMode: {mode}"
-msgstr "无效的 AutoUpdateMode： {mode}"
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "Invalid UpdateCheckMode: {mode}"
-msgstr "无效的 UpdateCheckMode：{mode}"
-
-#: ../fdroidserver/checkupdates.py
+#: ../fdroidserver/lint.py ../fdroidserver/checkupdates.py
 #, python-brace-format
 msgid "Invalid VercodeOperation: {field}"
-msgstr "无效的 VercodeOperation：{field}"
+msgstr ""
 
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Invalid VercodeOperation: {invalid_ops}"
-msgstr "无效的 VercodeOperation：{invalid_ops}"
-
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "Invalid application ID {appid}"
-msgstr "无效的应用 ID {appid}"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+#, python-format
+msgid "Invalid boolean '%s'"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Invalid build flag at {line} in {linedesc}"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Invalid build format: {value} in {name}"
+msgstr ""
 
 #: ../fdroidserver/lint.py
 msgid "Invalid bulleted list"
-msgstr "无效的项目符号列表"
+msgstr ""
+
+#: ../fdroidserver/lint.py
+#, python-format
+msgid "Invalid license tag \"%s\"! Use only tags from https://spdx.org/license-list"
+msgstr ""
+
+#: ../fdroidserver/lint.py
+msgid "Invalid link - use [http://foo.bar Link title] or [http://foo.bar]"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+#, python-format
+msgid "Invalid metadata in %s:%d"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+msgid "Invalid metadata in: "
+msgstr ""
 
 #: ../fdroidserver/common.py
 #, python-format
 msgid "Invalid name for published file: %s"
-msgstr "已发布文件的名称无效： %s"
+msgstr ""
 
 #: ../fdroidserver/common.py
 #, python-brace-format
-msgid "Invalid ndk: entry in build: \"{ndk}\""
-msgstr "ndk 无效：构建中的条目：“{ndk}”"
+msgid "Invalid package name {0}"
+msgstr ""
 
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "Invalid redirect to non-HTTPS: {before} -> {after} "
-msgstr "无效的重定向至非 HTTPS： {before} -> {after} "
+msgstr ""
 
 #: ../fdroidserver/metadata.py
 #, python-brace-format
@@ -1087,73 +1066,73 @@ msgstr "无效的scrlib元数据：'{file}'不存在"
 #: ../fdroidserver/metadata.py
 #, python-brace-format
 msgid "Invalid srclib metadata: could not parse '{file}'"
-msgstr "无效的 srclib 元数据：无法解析“{file}”"
+msgstr ""
 
 #: ../fdroidserver/metadata.py
 #, python-brace-format
 msgid "Invalid srclib metadata: unknown key '{key}' in '{file}'"
-msgstr "无效的 srclib 元数据：“{file}”中的未知键“{key}”"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Invalid versionCode: \"{versionCode}\" is not an integer!"
+msgstr ""
 
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "JAR signature failed to verify: {path}"
-msgstr "无法验证 JAR 签名：{path}"
+msgstr ""
 
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "JAR signature verified: {path}"
-msgstr "已验证的 JAR 签名：{path}"
+msgstr ""
 
 #: ../fdroidserver/scanner.py
 msgid "Java JAR file"
-msgstr "Java JAR 文件"
+msgstr ""
 
-#: ../fdroidserver/mirror.py ../fdroidserver/publish.py
-#: ../fdroidserver/update.py
+#: ../fdroidserver/publish.py ../fdroidserver/update.py
+#: ../fdroidserver/mirror.py
 msgid "Java JDK not found! Install in standard location or set java_paths!"
-msgstr "未找到 Java JDK！安装在标准位置或设置java_paths！"
+msgstr ""
 
 #: ../fdroidserver/scanner.py
 msgid "Java compiled class"
-msgstr "Java 编译类"
+msgstr ""
 
 #: ../fdroidserver/signindex.py
 msgid "Java jarsigner not found! Install in standard location or set java_paths!"
-msgstr "未找到 Java jarsigner！安装在标准位置或设置java_paths！"
+msgstr ""
 
 #: ../fdroidserver/lint.py
 msgid "Javascript in HTML src attributes"
-msgstr "HTML src 属性中的 Javascript"
-
-#: ../fdroidserver/build.py
-#, python-brace-format
-msgid "Keeping failed build \"{apkfilename}\""
-msgstr "保持失败的生成“{apkfilename}”"
+msgstr ""
 
 #: ../fdroidserver/init.py
 msgid "Keystore for signing key:\t"
 msgstr "签名密钥的密钥库:\t"
 
-#: ../fdroidserver/lint.py
-msgid "Known debug key is used in AllowedAPKSigningKeys: "
-msgstr "AllowedAPKSigningKeys 中使用的已知调试密钥： "
-
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "Last used commit '{commit}' looks like a tag, but UpdateCheckMode is '{ucm}'"
-msgstr "最后使用的提交 '{commit}' 看起来像一个标签，但 UpdateCheckMode 是 '{ucm}'"
+msgstr ""
 
 #: ../fdroidserver/lint.py
 msgid "Liberapay donation methods belong in the Liberapay: field"
-msgstr "Liberapay 捐赠方式属于 Liberapay: 字段"
+msgstr ""
+
+#: ../fdroidserver/lint.py
+msgid "Liberapay donation methods belong in the LiberapayID flag"
+msgstr ""
 
 #: ../fdroidserver/rewritemeta.py
-msgid "List files that would be reformatted (dry run)"
-msgstr "列出将被重新设定格式的文件 (dry run)"
+msgid "List files that would be reformatted"
+msgstr "列出全部需重新设定格式的文件"
 
 #: ../fdroidserver/lint.py
 msgid "Locale included in f-droid.org URL"
-msgstr "包含在 f-droid.org URL 中的区域设置"
+msgstr ""
 
 #: ../fdroidserver/build.py
 msgid "Make the build stop on exceptions"
@@ -1161,188 +1140,159 @@ msgstr "异常时中止编译"
 
 #: ../fdroidserver/index.py
 msgid "Malformed repository mirrors."
-msgstr "格式错误的存储库镜像。"
+msgstr ""
 
 #: ../fdroidserver/deploy.py
 msgid "Malformed serverwebroot line:"
-msgstr "格式错误的服务器网络根行："
-
-#: ../fdroidserver/scanner.py
-#, python-format
-msgid "Max recursion depth in ZIP file reached: %s"
-msgstr "达到 ZIP 文件中的最大递归深度：%s"
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "Mirror config for {url} contains \"isPrimary\" key!"
-msgstr "{url} 的镜像配置包含 \"isPrimary\" 密钥！"
+msgstr ""
 
 #: ../fdroidserver/mirror.py
 msgid "Mirror the full repo and archive, all file types."
-msgstr "镜像完整存储库和存档，所有文件类型。"
+msgstr ""
 
 #: ../fdroidserver/gpgsign.py
 msgid "Missing output directory"
-msgstr "缺少输出目录"
+msgstr ""
 
-#: ../fdroidserver/metadata.py
-msgid "Moving Anti-Features declarations to localized files:"
-msgstr "将负面特征声明移动到本地化文件："
-
-#: ../fdroidserver/index.py
-msgid "Neither \"repo_pubkey\" nor \"keystorepass\" set in config.yml"
-msgstr "config.yml 中既没有设置“repo_pubkey”也没有设置“keystorepass”"
-
-#: ../fdroidserver/verify.py
+#: ../fdroidserver/lint.py
 #, python-format
-msgid "No APK for package: %s"
-msgstr "没有 APK 安装包： %s"
+msgid "Name '%s' is just the auto name - remove it"
+msgstr ""
+
+#: ../fdroidserver/common.py
+msgid "No 'config.py' found, using defaults."
+msgstr ""
 
 #: ../fdroidserver/common.py
 msgid "No Android SDK found!"
-msgstr "未找到 Android SDK！"
+msgstr ""
+
+#: ../fdroidserver/import.py
+msgid "No android or kivy project could be found. Specify --subdir?"
+msgstr ""
 
 #: ../fdroidserver/install.py
 msgid "No attached devices found"
-msgstr "未找到连接的设备"
+msgstr ""
 
-#: ../fdroidserver/install.py
-msgid "No devices found for `adb install`! Please plug one in."
-msgstr "没有找到 `adb install` 设备！请插入一台设备。"
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "No commit specified for {versionName} in {linedesc}"
+msgstr ""
 
 #: ../fdroidserver/index.py
 msgid "No fingerprint in URL."
-msgstr "URL 中没有指纹。"
+msgstr ""
 
 #: ../fdroidserver/common.py
 msgid "No git submodules available"
-msgstr "没有可用的 git 子模块"
+msgstr ""
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "No gradle project could be found. Specify --subdir?"
-msgstr "找不到任何 gradle 项目。指定 --subdir？"
+msgstr ""
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py ../fdroidserver/common.py
 msgid "No information found."
-msgstr "未找到任何信息。"
-
-#: ../fdroidserver/checkupdates.py
-msgid "No matching tags found"
-msgstr "未找到匹配的标签"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "No minimum SDK version found in {0}, using default (3)."
-msgstr "在 {0} 中找不到最低 SDK 版本，使用默认值 （3）。"
+msgstr ""
 
 #: ../fdroidserver/lint.py
 msgid "No need to specify that the app is Free Software"
-msgstr "不需要说明该应用是自由软件"
+msgstr ""
 
 #: ../fdroidserver/lint.py
 msgid "No need to specify that the app is for Android"
-msgstr "不需要说明该应用是用于安卓的"
+msgstr ""
 
 #: ../fdroidserver/deploy.py
-msgid "No option set! Edit your config.yml to set at least one of these:"
-msgstr "未设置选项！编辑您的 config.yml 以设置以下至少一个："
+msgid "No option set! Edit your config.py to set at least one of these:"
+msgstr ""
 
 #: ../fdroidserver/common.py
 msgid "No packages specified"
-msgstr "未指定包"
+msgstr ""
 
 #: ../fdroidserver/install.py
 #, python-format
-msgid "No signed APK available for %s"
-msgstr "%s 没有可用的签名 APK"
+msgid "No signed apk available for %s"
+msgstr ""
 
 #: ../fdroidserver/install.py
 msgid "No signed output directory - nothing to do"
-msgstr "无签名输出目录 - 无任何操作"
+msgstr ""
 
-#: ../fdroidserver/common.py
+#: ../fdroidserver/update.py ../fdroidserver/common.py
 #, python-brace-format
 msgid "No signing certificates found in {path}"
-msgstr "在 {path} 中找不到签名证书"
+msgstr ""
 
 #: ../fdroidserver/common.py
 #, python-format
 msgid "No such package: %s"
-msgstr "没有这样的包：%s"
+msgstr ""
 
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "No such versionCode {versionCode} for app {appid}"
-msgstr "应用 {appid} 没有此类版本代码 {versionCode}"
+msgstr ""
 
-#: ../fdroidserver/checkupdates.py
-msgid "No tags found"
-msgstr "未找到标签"
-
-#: ../fdroidserver/publish.py ../fdroidserver/verify.py
+#: ../fdroidserver/verify.py ../fdroidserver/publish.py
 msgid "No unsigned directory - nothing to do"
-msgstr "没有未签名的目录 - 无操作"
-
-#: ../fdroidserver/__main__.py
-msgid "No version information could be found."
-msgstr "找不到版本信息。"
+msgstr ""
 
 #: ../fdroidserver/common.py
 msgid "Not a valid size definition: \"{}\""
-msgstr "不是有效的大小定义：“{}”"
+msgstr ""
 
 #: ../fdroidserver/signindex.py
 msgid "Nothing to do"
-msgstr "无操作"
+msgstr ""
 
 #: ../fdroidserver/checkupdates.py
 #, python-brace-format
 msgid "Nothing to do for {appid}."
-msgstr "对 {appid} 无任何可操作。"
+msgstr ""
 
 #: ../fdroidserver/init.py
-msgid "Now set these in config.yml:"
-msgstr "现在在 config.yml 中设置这些："
+msgid "Now set these in config.py:"
+msgstr ""
 
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "OBB file has newer versionCode({integer}) than any APK:"
-msgstr "OBB 文件的版本代码（{integer}）比任何 APK 都要新："
+msgstr ""
 
 #: ../fdroidserver/update.py
 msgid "OBB filename must start with \"main.\" or \"patch.\":"
-msgstr "OBB 文件名必须以“main.”或“patch.”开头："
+msgstr ""
 
 #: ../fdroidserver/update.py
 msgid "OBB's packagename does not match a supported APK:"
-msgstr "OBB 的软件包名称与受支持的 APK 不匹配："
+msgstr ""
 
 #: ../fdroidserver/deploy.py
 msgid "Offline machine, skipping git mirror generation until `fdroid deploy`"
-msgstr "脱机计算机，跳过 git 镜像生成直到 `fdroid deploy`"
+msgstr ""
 
-#: ../fdroidserver/deploy.py
-msgid "One of the 'github_releases' config items is missing the 'packageNames' value. skipping ..."
-msgstr "其中一个 'github_releases'配置项缺失'packageNames'值。跳过..."
+#: ../fdroidserver/common.py
+#, python-brace-format
+msgid "Old APK signature failed to verify: {path}"
+msgstr ""
 
-#: ../fdroidserver/deploy.py
-msgid "One of the 'github_releases' config items is missing the 'projectUrl' value. skipping ..."
-msgstr "其中一个 'github_releases'配置项缺失'projectUrl'值。跳过..."
+#: ../fdroid ../fdroidserver/__main__.py
+msgid "Old, deprecated name for fdroid deploy"
+msgstr ""
 
-#: ../fdroidserver/deploy.py
-msgid "One of the 'github_releases' config items is missing the 'token' value. skipping ..."
-msgstr "其中一个 'github_releases'配置项缺失'token'值。跳过..."
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Only PNG and JPEG are supported for graphics, found: {path}"
-msgstr "图形仅支持 PNG 和 JPEG，发现：{path}"
+msgstr ""
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/common.py
-msgid "Only accepts a single key \"env\""
-msgstr "只接受单一密钥 “env\""
+#: ../fdroidserver/checkupdates.py
+msgid "Only print differences with the Play Store"
+msgstr "仅输出与 Play Store 的差异"
 
 #: ../fdroidserver/checkupdates.py
 msgid "Only process apps with auto-updates"
@@ -1350,49 +1300,61 @@ msgstr "仅处理使用自动更新的应用"
 
 #: ../fdroidserver/lint.py
 msgid "OpenCollective donation methods belong in the OpenCollective: field"
-msgstr "OpenCollective 捐赠方法属于 OpenCollective: 字段"
+msgstr ""
+
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "Options"
+msgstr "选项"
 
 #: ../fdroidserver/verify.py
 msgid "Output JSON report to file named after APK."
-msgstr "将 JSON 报告输出到以 APK 命名的文件。"
+msgstr ""
 
 #: ../fdroidserver/scanner.py
 msgid "Output JSON to stdout."
-msgstr "将 JSON 输出到标准输出。"
+msgstr ""
 
-#: ../fdroidserver/checkupdates.py ../fdroidserver/gpgsign.py
-#: ../fdroidserver/publish.py ../fdroidserver/signindex.py
-#: ../fdroidserver/update.py
+#: ../fdroidserver/gpgsign.py ../fdroidserver/publish.py
+#: ../fdroidserver/update.py ../fdroidserver/signindex.py
+#: ../fdroidserver/checkupdates.py
 msgid "Outputting JSON"
-msgstr "输出 JSON"
+msgstr ""
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "Overall license of the project."
 msgstr "项目总体许可证。"
 
+#: ../fdroidserver/dscanner.py
+msgid "Override path for repo APKs (default: ./repo)"
+msgstr "覆盖资源库 APK 路径（默认为 ./repo）"
+
 #: ../fdroidserver/index.py
 #, python-brace-format
 msgid "Overriding blank versionName in {apkfilename} from metadata: {version}"
-msgstr "从元数据覆盖 {apkfilename} 中的空白版本名称：{version}"
+msgstr ""
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 #, python-brace-format
 msgid "Package \"{appid}\" already exists"
-msgstr "包“{appid}”已经存在"
+msgstr ""
 
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "Parsing manifest at '{path}'"
-msgstr "在“{path}”处解析清单"
+msgstr ""
 
 #: ../fdroidserver/common.py
 msgid "Password required with username"
-msgstr "需要密码和用户名"
+msgstr ""
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "Path to main Android project subdirectory, if not in root."
 msgstr "主Android项目子目录的路径(如果不是根目录)."
 
+msgid "Path to main android project subdirectory, if not in root."
+msgstr "如果不是位于根目录，路径为 android 主项目的子目录。"
+
 #: ../fdroidserver/init.py
 msgid "Path to the Android SDK (sometimes set in ANDROID_HOME)"
 msgstr "Android SDK 路径（有时在 ANDROID_HOME 中设置）"
@@ -1405,24 +1367,26 @@ msgstr "使用的 git 资源库路径在日志上"
 msgid "Path to the keystore for the repo signing key"
 msgstr "资源库签名密钥的密钥存储(keystore)路径"
 
+#: ../fdroidserver/dscanner.py
+msgid "Prepare Drozer to run a scan"
+msgstr "准备Drozer进行扫描"
+
+msgid "Prepare drozer to run a scan"
+msgstr "准备运行 drozer 扫描"
+
 #: ../fdroidserver/nightly.py
 msgid "Print the secret variable to the terminal for easy copy/paste"
-msgstr "将秘密变量打印到终端以便于复制/粘贴"
+msgstr ""
 
-#: ../fdroidserver/install.py
+#: ../fdroidserver/metadata.py
 #, python-brace-format
-msgid "Privacy mode was enabled based on your locale ({country_code})."
-msgstr "根据你的语言环境（{country_code}）启用了隐私模式。"
-
-#: ../fdroidserver/scanner.py
-#, python-format
-msgid "Problem with ZIP file: %s, error %s"
-msgstr "ZIP 文件问题：%s，错误 %s"
+msgid "Problem with description of {appid}: {error}"
+msgstr ""
 
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "Problem with xml at '{path}'"
-msgstr "'{path}' 处的 xml 问题"
+msgstr ""
 
 #: ../fdroidserver/checkupdates.py
 msgid "Process auto-updates"
@@ -1431,106 +1395,97 @@ msgstr "处理自动更新"
 #: ../fdroidserver/publish.py ../fdroidserver/update.py
 #, python-brace-format
 msgid "Processing {apkfilename}"
-msgstr "处理 {apkfilename}"
+msgstr ""
 
 #: ../fdroidserver/checkupdates.py ../fdroidserver/scanner.py
 #, python-brace-format
 msgid "Processing {appid}"
-msgstr "处理 {appid}"
+msgstr ""
 
 #: ../fdroidserver/update.py
 msgid "Produce human-readable XML/JSON for index files"
 msgstr "为索引文件生成人类可读的XML/JSON"
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/update.py
+msgid "Produce human-readable index.xml"
+msgstr "生成用户可读的 index.xml"
+
+#: ../fdroidserver/import.py
 msgid "Project URL to import from."
 msgstr "项目 URL 导入位置。"
 
 #: ../fdroidserver/lint.py
 msgid "Punctuation should be avoided"
-msgstr "应避免使用标点符号"
+msgstr ""
 
 #: ../fdroidserver/btlog.py
 msgid "Push the log to this git remote repository"
 msgstr "拖送日志至 git 远程资源库"
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Pushing binary transparency log to {url}"
 msgstr "正推送二进制文件透明日志到{url}"
 
-#: ../fdroidserver/deploy.py
-msgid "Pushing to remote server failed!"
-msgstr "推送到远程服务器失败了！"
-
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Pushing to {url}"
-msgstr "正在推送至 {url}"
+msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Quickly start a new repository"
-msgstr "快速新建存储库"
+msgstr "快速新建资源库"
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Read all the metadata files and exit"
 msgstr "读取全部元数据文件并退出"
 
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "Reading '{config_file}'"
-msgstr "读取 '{config_file}'"
+msgstr ""
 
+#: ../fdroidserver/common.py
+#, python-brace-format
+msgid "Reading minSdkVersion failed: \"{apkfilename}\""
+msgstr ""
+
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
+#. https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "Reading packageName/versionCode/versionName failed, APK invalid: '{apkfilename}'"
-msgstr "读取 packageName/versionCode/versionName 失败，APK 无效：'{apkfilename}'"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Reading packageName/versionCode/versionName failed,APK invalid: '{apkfilename}'"
-msgstr "读取 packageName/versionCode/versionName 失败，APK 无效：'{apkfilename}'"
+msgstr ""
 
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Reading {apkfilename} from cache"
-msgstr "从缓存读取 {apkfilename}"
+msgstr ""
 
-#: ../fdroidserver/build.py
-msgid "Refresh and cache scanner rules and signatures from the network"
-msgstr "刷新和缓存来自网络的扫描程序规则和签名"
-
-#: ../fdroidserver/publish.py
-#, python-brace-format
-msgid "Refusing to sign '{path}', file exists in both {dir1} and {dir2} folder."
-msgstr "拒绝签署 '{path}'，文件同时存在于文件夹 {dir1} 和 {dir2}。"
-
-#: ../fdroidserver/verify.py
-msgid "Remove source tarball and any APKs if successfully verified."
-msgstr "若验证成功删除源 tarball 和任何 APK 文件。"
+#: ../fdroidserver/stats.py
+msgid "Recalculate aggregate stats - use when changes have been made that would invalidate old cached data."
+msgstr "重新计算聚合统计数据-当已经做出更改而导致旧的缓存数据无效时使用。"
 
 #: ../fdroidserver/common.py
 msgid "Removing specified files"
-msgstr "删除指定文件"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Removing {path}\""
-msgstr "删除 {path}\""
+msgstr ""
 
 #: ../fdroidserver/update.py
 msgid "Rename APK files that do not match package.name_123.apk"
-msgstr "重命名文件名不符合 package.name_123.apk 的 APK 文件"
+msgstr "对于文件名不符合 package.name_123.apk 的文件进行重命名"
 
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "RepoType {type} is deprecated, please switch to git."
-msgstr ""
+#: ../fdroidserver/update.py
+msgid "Report on build data status"
+msgstr "报告编译数据状态"
+
+#: ../fdroidserver/build.py
+msgid "Reset and create a brand new build server, even if the existing one appears to be ok."
+msgstr "即使已有服务器看起来运行正常，请重置并创建一个全新的编译服务器。"
 
 #: ../fdroidserver/nightly.py
 #, python-brace-format
 msgid "Resigning {apkfilename} with provided debug.keystore"
-msgstr "使用提供的 debug.keystore 重签名 {apkfilename}"
+msgstr ""
 
 #: ../fdroidserver/update.py
 msgid "Resize all the icons exceeding the max pixel size and exit"
@@ -1540,121 +1495,108 @@ msgstr "对超过像素大小上限的全部图标进行尺寸调整，然后退
 msgid "Restrict output to warnings and errors"
 msgstr "仅输出警告和出错信息"
 
-#: ../fdroidserver/net.py
-#, python-format
-msgid "Retrying failed download: %s"
-msgstr "正在重试失败的下载：%s"
-
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Rewrite all the metadata files"
-msgstr "重写所有元数据文件"
+msgstr "重写全部元数据文件"
+
+#: ../fdroidserver/rewritemeta.py
+msgid "Rewrite to a specific format: "
+msgstr "重写为特定格式： "
 
 #: ../fdroidserver/rewritemeta.py
 #, python-brace-format
 msgid "Rewriting '{appid}'"
-msgstr "重写 '{appid}'"
+msgstr ""
+
+#: ../fdroidserver/rewritemeta.py
+#, python-brace-format
+msgid "Rewriting '{appid}' to '{path}'"
+msgstr ""
 
 #: ../fdroidserver/checkupdates.py
 msgid "Run on git repo that has uncommitted changes"
-msgstr "在具有未提交更改的 git 存储库上运行"
-
-#: ../fdroidserver/nightly.py
-#, python-brace-format
-msgid "Run over {cibase} to find -debug.apk. and skip repo_basedir {repo_basedir}"
-msgstr "在{cibase}中挨个寻找 -debug.apk，并跳过了仓库目录{repo_basedir}"
+msgstr ""
 
 #: ../fdroidserver/lint.py
 msgid "Run rewritemeta to fix formatting"
 msgstr "运行“重写元数据”(rewritemeta)修复格式"
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 msgid "Running first pass with MD5 checking disabled"
-msgstr "禁用 MD5 检查并运行第一遍"
+msgstr ""
 
 #: ../fdroidserver/mirror.py
 #, python-brace-format
 msgid "Running wget in {path}"
-msgstr "在 {path} 中运行 wget"
+msgstr ""
 
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "SHA-256 of {url} does not match entry!"
-msgstr "{url} 的 SHA-256 与条目不匹配！"
+#: ../fdroidserver/dscanner.py
+msgid "Scan only the latest version of each package"
+msgstr "仅扫描每个包的最新版本"
 
 #: ../fdroidserver/build.py
 msgid "Scan the resulting APK(s) for known non-free classes."
-msgstr "扫描产生的 APK(s) 是否有已知的非自由类。"
+msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Scan the source code of a package"
-msgstr "扫描一个应用的源代码"
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Scanner found {count} problems in {apk}"
-msgstr "扫描仪发现了 {count} 个问题，扫描对象 {apk}"
+msgstr "扫描包源码"
 
 #: ../fdroidserver/scanner.py
 #, python-brace-format
 msgid "Scanner found {count} problems in {appid}:"
-msgstr "扫描仪在 {appid} 中发现 {count} 个问题："
+msgstr ""
 
 #: ../fdroidserver/scanner.py
 #, python-brace-format
 msgid "Scanner found {count} problems in {appid}:{versionCode}:"
-msgstr "扫描仪在 {appid}:{versionCode} 中发现 {count} 个问题："
+msgstr ""
 
 #: ../fdroidserver/build.py
 msgid "Scanner found {} problem"
 msgid_plural "Scanner found {} problems"
-msgstr[0] "扫描仪发现 {} 个问题"
-
-#: ../fdroidserver/scanner.py
-msgid "Scanning APK for extra signing blocks."
-msgstr "正在扫描 APK 是否有额外的签名块。"
-
-#: ../fdroidserver/scanner.py
-msgid "Scanning APK with dexdump for known non-free classes."
-msgstr "使用 dexdump 扫描 APK 以查找已知的非自由类。"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Set NDK {release} ({version}) up"
-msgstr "设置 NDK {release} ({version})"
+msgstr[0] ""
 
 #: ../fdroidserver/common.py
 msgid "Set clock to that time using:"
-msgstr "使用以下方法将时钟设置为该时间："
+msgstr ""
 
 #: ../fdroidserver/nightly.py
 msgid "Set maximum releases in repo before older ones are archived"
-msgstr "在存档旧版本之前，在存储库中设置最大版本数"
+msgstr ""
 
 #: ../fdroidserver/build.py
 #, python-brace-format
 msgid "Set open file limit to {integer}"
-msgstr "将打开文件限制设置为 {integer}"
+msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Set up an app build for a nightly build repo"
-msgstr "为每日构建存储库设置应用构建"
+msgstr ""
 
 #: ../fdroidserver/build.py
 msgid "Setting open file limit failed: "
-msgstr "设置打开文件限制失败： "
+msgstr ""
 
 #: ../fdroidserver/build.py
 #, python-brace-format
 msgid "Setting {0} sec timeout for this build"
-msgstr "为此构建设置 {0} 秒超时"
+msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroidserver/build.py
+msgid "Setup an emulator, install the APK on it and perform a Drozer scan"
+msgstr "设置一个模拟器，在其中安装APK并执行Drozer扫描"
+
+msgid "Setup an emulator, install the apk on it and perform a drozer scan"
+msgstr "设置一个模拟器，然后在其中安装 apk 并执行 drozer 扫描"
+
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Sign and place packages in the repo"
-msgstr "对包进行签名并将其加入存储库"
+msgstr "对包进行签名并将其加入资源库"
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Sign indexes created using update --nosign"
-msgstr "签名使用 update --nosign 创建的索引"
+msgstr "签署使用更新创建的索引 --nosign"
 
 #: ../fdroidserver/build.py
 msgid "Skip scanning the source code for binaries and other problems"
@@ -1663,85 +1605,82 @@ msgstr "跳过二进制源码扫描和其他问题"
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Skipping '{apkfilename}' with invalid signature!"
-msgstr "跳过签名无效的“{apkfilename}”！"
-
-#: ../fdroidserver/deploy.py ../fdroidserver/index.py
-#, python-format
-msgid "Skipping GitLab Pages mirror because the repo is too large (>%.2fGB)!"
-msgstr "跳过 GitLab 页面镜像，因为存储库太大（> %.2fGB）！"
+msgstr ""
 
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Skipping index generation for {appid}"
-msgstr "跳过 {appid} 的索引生成"
+msgstr ""
 
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Skipping {apkfilename} with invalid signature!"
-msgstr "跳过 {apkfilename} ，签名无效！"
+msgstr ""
 
 #: ../fdroidserver/scanner.py
 #, python-brace-format
 msgid "Skipping {appid}: disabled"
-msgstr "正在跳过 {appid}：已禁用"
+msgstr ""
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/scanner.py
+#, python-brace-format
+msgid "Skipping {appid}: no builds specified"
+msgstr ""
+
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 msgid "Specify a local folder to sync the repo to"
 msgstr "指定资源库同步的本地文件夹"
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 msgid "Specify an identity file to provide to SSH for rsyncing"
 msgstr "指定 rsync 同步时 SSH 所用的标识文件"
 
+#: ../fdroidserver/build.py
+msgid "Specify that we're running on the build server"
+msgstr "指定在编译服务器上运行"
+
 #: ../fdroidserver/nightly.py
 msgid "Specify which debug keystore file to use."
-msgstr "指定要使用的调试密钥库文件。"
+msgstr ""
 
 #: ../fdroidserver/common.py
 msgid "Spew out even more information than normal"
 msgstr "比一般情况输出更多的信息"
 
+#: ../fdroidserver/nightly.py
+#, python-brace-format
+msgid "Striping mystery signature from {apkfilename}"
+msgstr ""
+
 #: ../fdroidserver/nightly.py
 #, python-brace-format
 msgid "Stripping mystery signature from {apkfilename}"
-msgstr "从 {apkfilename} 中剥离神秘签名"
+msgstr ""
 
 #: ../fdroidserver/lint.py
 #, python-format
 msgid "Summary '%s' is just the app's name"
-msgstr "摘要“%s”只是应用的名称"
+msgstr ""
 
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "Summary of length {length} is over the {limit} char limit"
-msgstr "长度摘要 {length} 超过 {limit} 字符限制"
+msgstr ""
 
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "System clock is older than date in {path}!"
-msgstr "系统时钟早于 {path} 中的日期！"
-
-#: ../fdroidserver/checkupdates.py
-msgid "Tags update mode only works for git, hg, bzr and git-svn repositories currently"
-msgstr "标签更新模式目前仅适用于 git、hg、bzr 和 git-svn 存储库"
-
-#: ../fdroidserver/checkupdates.py
-msgid "Tags update mode used in git-svn, but the repo was not set up with tags"
-msgstr "git-svn 中使用的标记更新模式，但未使用标记设置存储库"
+msgstr ""
 
 #: ../fdroidserver/build.py
 msgid "Test mode - put output in the tmp directory only, and always build, even if the output already exists."
 msgstr "测试模式：仅将输出保存至 tmp 目录，即使输出已存在，仍然编译。"
 
-#: ../fdroidserver/index.py
-msgid "The \"qrcode\" Python package is not installed (e.g. apt-get install python3-qrcode)!"
-msgstr "\"qrcode\" Python 包未安装 （如 apt-get install python3-qrcode）！"
-
 #. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "The OBB version code must come after \"{name}.\":"
-msgstr "OBB 版本号必须位于“{name}”之后："
+msgstr ""
 
 #: ../fdroidserver/btlog.py
 msgid "The base URL for the repo to log (default: https://f-droid.org)"
@@ -1749,108 +1688,95 @@ msgstr "资源库基 URL的日志（默认为 https://f-droid.org）"
 
 #: ../fdroidserver/mirror.py
 msgid "The directory to write the mirror to"
-msgstr "写入镜像的目录"
+msgstr ""
 
 #: ../fdroidserver/nightly.py
 msgid "The file to be included in the repo (path or glob)"
-msgstr "要包含在存储库中的文件（path 或 glob）"
+msgstr ""
+
+#: ../fdroidserver/deploy.py
+msgid "The only commands currently supported are 'init' and 'update'"
+msgstr "当前支持的命令只有'init'和'update'"
 
 #: ../fdroidserver/index.py
 msgid "The repository's fingerprint does not match."
-msgstr "存储库的指纹不匹配。"
+msgstr ""
+
+#: ../fdroidserver/common.py
+msgid "The repository's index could not be verified."
+msgstr ""
 
 #: ../fdroidserver/deploy.py
 #, python-brace-format
 msgid "The root dir for local_copy_dir \"{path}\" does not exist!"
-msgstr "local_copy_dir“{path}”的根目录不存在！"
+msgstr ""
 
 #: ../fdroidserver/publish.py
 msgid "There is a keyalias collision - publishing halted"
-msgstr "存在密钥别名冲突 - 发布已停止"
+msgstr ""
 
 #: ../fdroidserver/common.py
 msgid "These are the apps that have been archived from the main repo."
-msgstr "这些是已从主存储库存档的应用。"
+msgstr ""
 
-#: ../fdroidserver/mirror.py
-msgid "This command should never be used to mirror f-droid.org! A full copy requires more than 600GB."
-msgstr "此命令永远不应该被用来镜像 f-droid.org！完整的拷贝需要至少 600GB。"
-
-#: ../fdroidserver/common.py
-msgid "This is a repository of apps to be used with F-Droid. Applications in this repository are either official binaries built by the original application developers, or are binaries built from source by the admin of f-droid.org using the tools on https://gitlab.com/fdroid."
-msgstr "这是一个与F-Droid一起使用的应用的存储库。这个存储库中的应用要么是原应用开发者构建的官方二进制文件，要么是 f-droid.org 的管理员使用 https://gitlab.com/fdroid 上的工具从源代码构建而来的二进制文件。"
-
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 #, python-format
 msgid "This repo already has local metadata: %s"
-msgstr "此存储库已具有本地元数据：%s"
-
-#: ../fdroidserver/init.py
-#, python-format
-msgid ""
-"To complete the setup, add your APKs to \"%s\"\n"
-"then run \"fdroid update -c; fdroid update\".  You might also want to edit\n"
-"\"config.yml\" to set the URL, repo name, and more.  You should also set up\n"
-"a signing key (a temporary one might have been automatically generated).\n"
-"\n"
-"For more info: https://f-droid.org/docs/Setup_an_F-Droid_App_Repo\n"
-"and https://f-droid.org/docs/Signing_Process"
 msgstr ""
-"要完成设置，请将您的 APK 添加到“%s”\n"
-"然后运行“FDrod 更新 -C;FDroid更新”。 您可能还想编辑\n"
-"“config.yml”来设置 URL、存储库名称等。 您还应该设置\n"
-"签名密钥（可能已自动生成临时密钥）。\n"
-"\n"
-"更多信息： https://f-droid.org/docs/Setup_an_F-Droid_App_Repo\n"
-"和 https://f-droid.org/docs/Signing_Process"
 
-#: ../fdroidserver/deploy.py
-msgid "To use awsbucket, awssecretkey and awsaccesskeyid must also be set in config.yml!"
-msgstr "要使用 awsbucket，还必须在 config.yml 中设置 awssecretkey 和 awsaccesskeyid！"
-
-#: ../fdroidserver/deploy.py
-msgid "To use rclone, rclone_config and awsbucket must be set in config.yml!"
-msgstr "要使用 rclone，必须在 config.yml 中设置 rclone_config 和 awsbucket！"
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
+msgid "To use awsbucket, awssecretkey and awsaccesskeyid must also be set in config.py!"
+msgstr ""
 
 #: ../fdroidserver/lint.py
 msgid "URL must start with https:// or http://"
-msgstr "网址必须以 https:// 或 http:// 开头"
+msgstr ""
 
 #: ../fdroidserver/lint.py
 msgid "URL shorteners should not be used"
-msgstr "不应使用 URL 缩短器"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+msgid "URL title is just the URL, use brackets: [URL]"
+msgstr ""
 
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "URL {url} in Description: {error}"
-msgstr "描述中的网址 {url}：{error}"
+msgstr ""
 
 #: ../fdroidserver/lint.py
 msgid "Unexpected license tag \"{}\"! Only use FSF or OSI approved tags from https://spdx.org/license-list"
-msgstr "意外的许可证标签“{}”！仅使用来自 https://spdx.org/license-list 的 FSF 或 OSI 批准的标签"
+msgstr ""
 
 #: ../fdroidserver/lint.py
 msgid "Unexpected license tag \"{}\"! Only use license tags configured in your config file"
-msgstr "意外的许可证标签“{}”！仅使用配置文件中配置的许可证标记"
+msgstr ""
 
-#: ../fdroidserver/common.py
+#: ../fdroidserver/metadata.py
 #, python-brace-format
-msgid "Unknown entry {key} in {configname}"
-msgstr "{configname} 中的未知条目 {key}"
+msgid "Unexpected text on same line as {field} in {linedesc}"
+msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Unknown exception found!"
 msgstr "发生未知异常！"
 
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "Unknown file '{filename}' in build '{versionName}'"
-msgstr "在构建版本 '{versionName}' 中出现了未知文件 '{filename}'"
+msgstr ""
 
 #: ../fdroidserver/metadata.py
 #, python-format
 msgid "Unknown metadata format: %s"
-msgstr "未知元数据格式：%s"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Unknown metadata format: {path}"
+msgstr "未知元数据格式：{path}"
 
 #: ../fdroidserver/metadata.py
 #, python-brace-format
@@ -1859,75 +1785,112 @@ msgstr "未知元数据格式：{path} (使用:*.yml)"
 
 #: ../fdroidserver/common.py
 msgid "Unknown version of aapt, might cause problems: "
-msgstr "未知版本的 aapt，可能会导致问题： "
+msgstr ""
+
+#: ../fdroidserver/lint.py
+msgid "Unlinkified link - use [http://foo.bar Link title] or [http://foo.bar]"
+msgstr ""
 
 #: ../fdroidserver/lint.py
 msgid "Unnecessary leading space"
-msgstr "不必要的前置空格"
+msgstr ""
 
 #: ../fdroidserver/lint.py
 msgid "Unnecessary trailing space"
-msgstr "不必要的尾随空格"
+msgstr ""
 
 #: ../fdroidserver/metadata.py
 #, python-brace-format
 msgid "Unrecognised app field '{fieldname}' in '{path}'"
-msgstr "'{path}' 中存在无法识别的应用栏目 '{fieldname}'"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+msgid "Unrecognised app field: "
+msgstr ""
 
 #: ../fdroidserver/metadata.py
 #, python-brace-format
 msgid "Unrecognised build flag '{build_flag}' in '{path}'"
-msgstr "'{path}' 中有无法识别的构建 flag '{build_flag}'"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Unrecognised field '{field}' in {linedesc}"
+msgstr ""
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Unsupported file type \"{extension}\" for repo graphic"
-msgstr "存储库图形不支持的文件类型“{extension}”"
+msgstr ""
 
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Unsupported graphics file found: {path}"
-msgstr "发现不支持的图形文件：{path}"
+msgstr ""
+
+#: ../fdroidserver/rewritemeta.py
+#, python-brace-format
+msgid "Unsupported metadata format, use: --to [{supported}]"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+msgid "Unterminated ]"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+msgid "Unterminated ]]"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Unterminated build in {name}"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Unterminated continuation in {name}"
+msgstr ""
 
 #: ../fdroidserver/lint.py
 #, python-format
 msgid "Unused extlib at %s"
-msgstr "%s 处未使用的扩展库"
+msgstr ""
 
 #: ../fdroidserver/lint.py
 #, python-format
 msgid "Unused file at %s"
-msgstr "%s 处未使用的文件"
+msgstr ""
 
 #: ../fdroidserver/scanner.py
 #, python-format
 msgid "Unused scandelete path: %s"
-msgstr "未使用的扫描删除路径： %s"
+msgstr ""
 
 #: ../fdroidserver/scanner.py
 #, python-format
 msgid "Unused scanignore path: %s"
-msgstr "未使用的扫描忽略路径： %s"
+msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Update repo information for new packages"
-msgstr "更新新包的存储库信息"
+msgstr "更新新包的资源库信息"
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Update the binary transparency log for a URL"
 msgstr "更新 URL 的二进制透明度日志"
 
+#: ../fdroid ../fdroidserver/__main__.py
+msgid "Update the stats of the repo"
+msgstr "更新资源库统计信息"
+
+#: ../fdroidserver/update.py ../fdroidserver/build.py
+msgid "Update the wiki"
+msgstr "更新维基页面"
+
 #: ../fdroidserver/checkupdates.py
 #, python-brace-format
 msgid "UpdateCheckData has invalid URL: {url}"
-msgstr "UpdateCheckData 具有无效的 URL：{url}"
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "UpdateCheckData must match the version code as integer (\\d or [0-9]): {codeex}"
-msgstr "UpdateCheckData 必须以整数（\\d 或 [0-9]）的形式匹配版本代码：{codeex}"
+msgstr ""
 
 #: ../fdroidserver/lint.py
 #, python-brace-format
@@ -1937,34 +1900,49 @@ msgstr "UpdateCheckData必须使用HTTPS URL:{url}"
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "UpdateCheckData not a valid URL: {url}"
-msgstr "UpdateCheckData 不是有效的网址：{url}"
+msgstr ""
 
 #: ../fdroidserver/lint.py
-msgid "UpdateCheckMode is set but it looks like checkupdates hasn't been run yet."
-msgstr "UpdateCheckMode 已设置，但看起来尚未运行检查更新。"
+msgid "UpdateCheckMode is set but it looks like checkupdates hasn't been run yet"
+msgstr ""
+
+#. Translators: https://developer.android.com/studio/build/application-id
+#: ../fdroidserver/lint.py
+msgid "UpdateCheckName is set to the known application ID - it can be removed"
+msgstr ""
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
 #: ../fdroidserver/lint.py
 msgid "UpdateCheckName is set to the known application ID, it can be removed"
-msgstr "UpdateCheckName 已设置为已知的应用 ID，可以将其删除"
+msgstr ""
 
 #: ../fdroidserver/deploy.py
 #, python-brace-format
 msgid "Uploading {apkfilename} to androidobservatory.org"
-msgstr "上传 {apkfilename} 到 androidobservatory.org"
+msgstr ""
 
 #: ../fdroidserver/deploy.py
 #, python-brace-format
 msgid "Uploading {apkfilename} to virustotal"
-msgstr "上传 {apkfilename} 到 virustotal"
+msgstr ""
+
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "Usage"
+msgstr "用法"
+
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, python-format
+msgid "Usage: %s\n"
+msgstr "用法：%s\n"
 
 #: ../fdroidserver/lint.py
-msgid "Use /HEAD instead of /master or /main to point at a file in the default branch"
-msgstr "使用 /HEAD 而不是 /master 或 /main 来指向默认分支中的文件"
+msgid "Use /HEAD instead of /master to point at a file in the default branch"
+msgstr ""
 
 #: ../fdroidserver/update.py
 msgid "Use `fdroid update -c` to create it."
-msgstr "使用 `fdroid update -c` 命令以创建它。"
+msgstr ""
 
 #: ../fdroidserver/build.py
 msgid "Use build server"
@@ -1972,55 +1950,44 @@ msgstr "使用编译服务器"
 
 #: ../fdroidserver/update.py
 msgid "Use date from APK instead of current time for newly added APKs"
-msgstr "对于新添加的 APK 文件，使用来自 APK 文件的时间，而非当前时间"
+msgstr "对于新添加的 apk 文件，使用来自 apk 文件的时间，而非当前时间"
 
-#: ../fdroidserver/deploy.py
+msgid "Use date from apk instead of current time for newly added apks"
+msgstr "对于最新添加的 apk，使用来自 apk 的日期，而不是当前时间"
+
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Using \"{path}\" for configuring s3cmd."
-msgstr "使用“{path}”配置 s3cmd。"
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Using \"{path}\" for syncing with remote storage."
-msgstr "使用 \"{path}\" 用于和远程存储同步。"
+msgstr ""
 
 #: ../fdroidserver/common.py
 msgid "Using APK Signature v2"
-msgstr "使用 APK 签名 v2"
+msgstr ""
 
 #: ../fdroidserver/common.py
 msgid "Using APK Signature v3"
-msgstr "使用 APK 签名 v3"
-
-#: ../fdroidserver/common.py
-msgid "Using JAR Signature"
-msgstr "使用 JAR 签名"
+msgstr ""
 
 #: ../fdroidserver/common.py
 msgid "Using Java's jarsigner, not recommended for verifying APKs! Use apksigner"
-msgstr "不建议使用 Java 的 jar 签名器来验证 APK！使用 apk 签名器"
+msgstr ""
 
-#: ../fdroidserver/metadata.py
+#: ../fdroidserver/common.py
 #, python-brace-format
-msgid "Using blank dictionary instead of contents of {path}!"
-msgstr "使用空白字典而不是 {path} 的内容！"
+msgid "Using androguard from \"{path}\""
+msgstr ""
 
 #: ../fdroidserver/init.py
 #, python-brace-format
 msgid "Using existing keystore \"{path}\""
-msgstr "使用现有密钥库“{path}”"
+msgstr ""
 
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "Using rclone to sync with: {url}"
-msgstr "使用 rclone 进行同步：{url}"
-
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Using s3cmd to sync with: {url}"
 msgstr "正使用 s3cmd 与 {url} 同步"
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Valid commands are:"
 msgstr "有效的命令为："
 
@@ -2028,7 +1995,7 @@ msgstr "有效的命令为："
 msgid "Verify against locally cached copy rather than redownloading."
 msgstr "和本地缓存的副本进行验证，而不是重新下载。"
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Verify the integrity of downloaded packages"
 msgstr "验证已下载包的完整性"
 
@@ -2036,27 +2003,14 @@ msgstr "验证已下载包的完整性"
 msgid "Verifying index signature:"
 msgstr "验证目录签名中："
 
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "Verifying package {path} with apksigner."
-msgstr "使用 apksigner 验证包 {path}。"
-
 #: ../fdroidserver/deploy.py
 #, python-brace-format
 msgid "VirusTotal API key cannot upload files larger than 32MB, use {url} to upload {path}."
-msgstr "VirusTotal 的 API 密钥无法用于上传大于 32MB 的文件，请使用 {url} 上传 {path}。"
-
-#: ../fdroidserver/nightly.py
-msgid "WARNING: only public git repos are supported!"
 msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Warn about possible metadata errors"
-msgstr "警告元数据中可能存在的错误"
-
-#: ../fdroidserver/scanner.py
-msgid "WebAssembly binary file"
-msgstr "WebAssembly 二进制文件"
+msgstr "有关元数据可能错误的警告"
 
 #: ../fdroidserver/update.py
 msgid "When configured for signed indexes, create only unsigned indexes at this stage"
@@ -2064,19 +2018,10 @@ msgstr "如果已配置为使用签名索引，该阶段仅创建未签名索引
 
 #: ../fdroidserver/lint.py
 msgid "When linting the entire repository yamllint is disabled by default. This option forces yamllint regardless."
-msgstr "对整个版本库进行 lint 时，默认禁用 yamllint。 无论如何，该选项都会强制 yamllint。"
+msgstr ""
 
-#: ../fdroidserver/publish.py
-msgid "When signing or verifying fails, exit with an error code."
-msgstr "签名或验证失败时，退出并显示错误代码。"
-
-#: ../fdroidserver/install.py
-msgid "Would you like to download and install F-Droid.apk via adb? (YES/no)"
-msgstr "你要通过 adb 下载并安装 F-Droid apk 吗？(YES/no)"
-
-#: ../fdroidserver/install.py
-msgid "Would you like to download the app(s) from f-droid.org? (YES/no)"
-msgstr "你要从 f-droid 下载应用吗？(YES/no)"
+msgid "X.509 'Distiguished Name' used when generating keys"
+msgstr "X.509 生成密钥时所用的“可分辨名称”"
 
 #: ../fdroidserver/init.py
 msgid "X.509 'Distinguished Name' used when generating keys"
@@ -2084,265 +2029,275 @@ msgstr "生成密钥时使用了X.509 ‘可识别名’"
 
 #: ../fdroidserver/common.py
 msgid "You can use ANDROID_HOME to set the path to your SDK, i.e.:"
-msgstr "您可以使用 ANDROID_HOME 设置 SDK 的路径，也就是说："
+msgstr ""
 
 #: ../fdroidserver/scanner.py
 msgid "ZIP file archive"
-msgstr "ZIP 压缩包"
-
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "adb reports {serial} is \"{status}\"!"
-msgstr "adb 报告 {serial} 为 \"{status}\"状态！"
+msgstr ""
 
 #: ../fdroidserver/nightly.py
 #, python-brace-format
 msgid "adding IdentityFile to {path}"
-msgstr "将 IdentityFile 添加到 {path}"
+msgstr ""
 
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "adding to {name}: {path}"
-msgstr "添加到 {name}： {path}"
+msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "ambiguous option: %(option)s could match %(matches)s"
-msgstr "模糊的选项：%(option)s 可以相配 %(matches)s"
+msgstr "模糊选项：%(option)s 可以相配 %(matches)s"
 
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "apksigner in build-tools;{version} passes APKs with invalid v3 signatures, ignoring."
-msgstr "{version} 版本 build-tools 中的 apksigner 不处理带无效 v3 签名的 APK 文件，忽略中。"
-
-#: ../fdroidserver/common.py
-msgid "apksigner not found! Cannot sign or verify modern APKs"
-msgstr "找不到 APK 签名器！无法对新式 APK 进行签名或验证"
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, python-format
+msgid "ambiguous option: %s (%s?)"
+msgstr "不明确的选项：%s(%s?)"
 
 #: ../fdroidserver/common.py
 msgid "apksigner not found, it's required for signing!"
-msgstr "找不到 APK 签名器，这是签名所必需的！"
+msgstr ""
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/checkupdates.py ../fdroidserver/lint.py
-#: ../fdroidserver/rewritemeta.py
+#: ../fdroidserver/lint.py ../fdroidserver/rewritemeta.py
+#: ../fdroidserver/checkupdates.py
 msgid "application ID of file to operate on"
-msgstr "要操作的文件的应用ID"
+msgstr "要操作的文件的应用程序ID"
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/build.py ../fdroidserver/install.py
-#: ../fdroidserver/publish.py ../fdroidserver/scanner.py
-#: ../fdroidserver/verify.py
+#: ../fdroidserver/verify.py ../fdroidserver/publish.py
+#: ../fdroidserver/build.py ../fdroidserver/scanner.py
+#: ../fdroidserver/install.py
 msgid "application ID with optional versionCode in the form APPID[:VERCODE]"
-msgstr "带APPID[:VERCODE]格式可选的versionCode的应用 ID"
+msgstr "带APPID[:VERCODE]格式可选的versionCode的应用程序 ID"
 
-#: ../fdroidserver/common.py
-msgid "archive_url needs to end with /archive"
-msgstr "archive_url 需要以 /archive 结尾"
+#: ../fdroidserver/lint.py ../fdroidserver/rewritemeta.py
+msgid "applicationId in the form APPID"
+msgstr "app-id，格式：APPID"
 
-#: /usr/lib/python3.11/argparse.py
+#: ../fdroidserver/checkupdates.py
+msgid "applicationId to check for updates"
+msgstr "检查更新的applicationId"
+
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
+#: ../fdroidserver/verify.py ../fdroidserver/publish.py
+#: ../fdroidserver/dscanner.py ../fdroidserver/build.py
+#: ../fdroidserver/scanner.py ../fdroidserver/install.py
+msgid "applicationId with optional versionCode in the form APPID[:VERCODE]"
+msgstr "带有可选 versionCode 的 app-id，格式：APPID[:VERCODE]"
+
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "argument \"-\" with mode %r"
-msgstr "参数 “-” 带有模式 %r"
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "argument %(argument_name)s: %(message)s"
-msgstr "参数 %(argument_name)s：%(message)s"
+msgstr ""
 
 #: ../fdroidserver/nightly.py
 msgid "attempting bare SSH connection to test deploy key:"
-msgstr "尝试使用裸 SSH 连接测试部署密钥："
+msgstr ""
+
+#: ../fdroidserver/nightly.py
+msgid "attempting bare ssh connection to test deploy key:"
+msgstr ""
 
 #: ../fdroidserver/common.py
 msgid "can not parse scrlib spec (not a string): '{}'"
-msgstr "无法解析 scrlib 规范（不是字符串）：“{}”"
+msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
-msgid "can't open '%(filename)s': %(error)s"
-msgstr "无法打开 '%(filename)s'：%(error)s"
-
-#: ../fdroidserver/scanner.py
-msgid "can't open non-https url: '{};"
-msgstr "无法打开非 HTTPS URL： '{};"
+msgid "can't open '%s': %s"
+msgstr "无法打开 '%s': %s"
 
 #: ../fdroidserver/build.py
 #, python-brace-format
 msgid "cannot find required srclibs: \"{path}\""
-msgstr "找不到所需的源库：“{path}”"
+msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "cannot have multiple subparser arguments"
-msgstr "不能有多个子解析器参数"
+msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "cannot merge actions - two groups are named %r"
-msgstr "无法合并操作 - 两个组被命名为 %r"
+msgstr ""
 
 #: ../fdroidserver/nightly.py
 msgid "cannot publish update, did you set the deploy key?"
-msgstr "无法发布更新，是否设置了部署密钥？"
+msgstr ""
 
 #: ../fdroidserver/nightly.py
 #, python-brace-format
 msgid "cloning {url}"
-msgstr "正在克隆 {url}"
+msgstr ""
+
+#: ../fdroidserver/deploy.py
+msgid "command to execute, either 'init' or 'update'"
+msgstr "执行命令：init 或 update"
 
 #: ../fdroidserver/__main__.py
 msgid "commands from plugin modules:"
-msgstr "来自插件模块的命令："
+msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "complex"
+msgstr ""
+
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "conflicting option string: %s"
 msgid_plural "conflicting option strings: %s"
-msgstr[0] "有冲突的选项字串：%s"
+msgstr[0] ""
 
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "conflicting subparser alias: %s"
-msgstr "有冲突的子解析器别名：%s"
-
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "conflicting subparser: %s"
-msgstr "有冲突的子解析器：%s"
+#: ../fdroidserver/nightly.py
+#, python-brace-format
+msgid "copying {apkfilename} into {path}"
+msgstr ""
 
 #: ../fdroidserver/metadata.py
 #, python-brace-format
 msgid "could not parse '{path}'"
-msgstr "无法解析 '{path}'"
-
-#: ../fdroidserver/common.py
-msgid "could not parse srclib spec (no name specified): '{}'"
-msgstr "无法解析 srclib 规范 (未指定名称): '{}'"
+msgstr ""
 
 #: ../fdroidserver/common.py
 msgid "could not parse srclib spec (no ref specified): '{}'"
-msgstr "无法解析 srclib 规范 (未指定 ref): '{}'"
+msgstr ""
+
+#: ../fdroidserver/common.py
+msgid "could not parse srclib spec (too many '@' signs): '{}'"
+msgstr ""
 
 #: ../fdroidserver/nightly.py
 #, python-brace-format
 msgid "created {path}"
-msgstr "已创建 {path}"
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "current version is newer: old vercode={old}, new vercode={new}"
-msgstr "当前版本较新：旧的 vercode={old}，新的 vercode={new}"
+msgstr ""
 
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "deleting: repo/{apkfilename}"
-msgstr "正在删除：repo/{apkfilename}"
+msgstr ""
 
-#: ../fdroidserver/scanner.py
-msgid "dependency file without lock"
-msgstr "没有锁的依赖文件"
+#: ../fdroidserver/common.py
+#, python-brace-format
+msgid "deployed build logs to '{path}'"
+msgstr ""
 
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "deployed process log {path} to {dest}"
-msgstr "已部署进程日志 {path} 到 {dest}"
+msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "dest= is required for options like %r"
-msgstr "对于像 %r 这样的选项，dest= 是必需的"
-
-#: ../fdroidserver/scanner.py
-msgid "downloading '{}'"
-msgstr "正在下载 '{}'"
-
-#: ../fdroidserver/scanner.py
-msgid "downloading scanner signatures from '{}' failed"
-msgstr "从 '{}' 下载扫描仪特征失败了"
+msgstr ""
 
 #: ../fdroidserver/scanner.py
 msgid "executable binary, possibly code"
-msgstr "可执行二进制文件，可能是代码"
+msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "expected %s argument"
 msgid_plural "expected %s arguments"
-msgstr[0] "预期的 %s 个参数"
+msgstr[0] ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "expected at least one argument"
-msgstr "预期至少有一个参数"
+msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "expected at most one argument"
-msgstr "预期最多有一个参数"
+msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "expected one argument"
-msgstr "预期的一个参数"
+msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroidserver/common.py
+#, python-brace-format
+msgid "failed deploying build logs to '{path}'"
+msgstr ""
+
+#: ../fdroid
+msgid "fdroid [-h|--help|--version] <command> [<args>]"
+msgstr "用法：fdroid [-h|--help|--version] <command> [<args>]"
+
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "fdroid [<command>] [-h|--help|--version|<args>]"
 msgstr "用法：fdroid [-h|--help|--version] <command> [<args>]"
 
-#: ../fdroidserver/scanner.py
-msgid "fetch the latest version of signatures from the web"
-msgstr "从网络获取最新版本的签名"
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "floating-point"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+msgid "force errors to be warnings, or ignore"
+msgstr "强制错误提示警告或忽略"
 
 #: ../fdroidserver/metadata.py
 msgid "force metadata errors (default) to be warnings, or to be ignored."
-msgstr "将元数据错误（默认）强制设为警告，或忽略。"
+msgstr "强制元数据错误(默认)为警告，或忽略。"
 
 #: ../fdroidserver/common.py
 msgid "git svn clone failed"
-msgstr "git svn 克隆失败"
+msgstr ""
 
 #: ../fdroidserver/scanner.py
 msgid "gzip file archive"
-msgstr "gzip 压缩包"
+msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "ignored explicit argument %r"
-msgstr "被忽略的显式参数 %r"
+msgstr ""
 
 #: ../fdroidserver/index.py
 msgid "index-v1 must have a signature, use `fdroid signindex` to create it!"
-msgstr "index-v1 必须有签名，使用 `fdroid signindex` 命令创建它！"
+msgstr ""
 
-#: ../fdroidserver/index.py
-msgid "index-v2 must have a signature, use `fdroid signindex` to create it!"
-msgstr "index-v2 必须有签名，使用 `fdroid signindex` 命令创建它！"
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "integer"
+msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "invalid %(type)s value: %(value)r"
-msgstr "无效 %(type)s 值: %(value)r"
+msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "invalid choice: %(value)r (choose from %(choices)s)"
-msgstr "无效选项：%(value)r (选取自 %(choices)s)"
+msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "invalid conflict_resolution value: %r"
-msgstr "冲突解决值无效: %r"
+msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "invalid option string %(option)r: must start with a character %(prefix_chars)r"
-msgstr "无效选项字符串 %(option)r: 必须以字符 %(prefix_chars)r 开头"
-
-#: ../fdroidserver/common.py
-msgid "ipfs_cid not found, skipping CIDv1 generation"
-msgstr "未找到 ipfs_cid，跳过 CIDv1 生成"
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "latest build recipe is newer: old vercode={old}, new vercode={new}"
-msgstr "最新的构建配方较新：旧的验证码={old}，新的验证码={new}"
+msgstr ""
 
 #: ../fdroidserver/deploy.py
 #, python-brace-format
@@ -2360,167 +2315,210 @@ msgstr "local_copy_dir必须是目录，不能是文件！"
 #: ../fdroidserver/index.py
 #, python-format
 msgid "mirror '%s' does not end with 'fdroid'!"
-msgstr "镜像 '%s' 不以 'fdroid'结尾!"
+msgstr ""
 
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "mirrors set twice, in config.yml and {path}!"
-msgstr "设置了两次镜像，分别在 config.xml 和 {path} 中!"
-
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "mutually exclusive arguments must be optional"
-msgstr "相互排斥的参数必须是可选的"
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "next {name} cache update due in {time}"
-msgstr "下次 {name} 缓存更新将在 {time} 内完成"
+msgstr ""
 
 #: ../fdroidserver/mirror.py
 #, python-brace-format
 msgid "no \"icon\" in {appid}"
-msgstr "{appid} 中没有 \"图标\""
+msgstr ""
 
 #: ../fdroidserver/signatures.py
 msgid "no APK supplied"
-msgstr "未提供 APK"
+msgstr ""
 
-#: ../fdroidserver/checkupdates.py
-msgid "no version information found"
-msgstr "没有找到版本信息"
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, python-format
+msgid "no such option: %s"
+msgstr "没有此选项：%s"
 
-#: /usr/lib/python3.11/argparse.py
+#: ../fdroid ../fdroidserver/__main__.py
+msgid "no version info found!"
+msgstr "没有找到版本信息！"
+
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "not allowed with argument %s"
-msgstr "不允许使用参数 %s"
+msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "one of the arguments %s is required"
-msgstr "其中一个参数 %s 是必需的"
+msgstr ""
 
-#: ../fdroidserver/common.py ../fdroidserver/index.py
+#: ../fdroidserver/index.py ../fdroidserver/common.py
 msgid "only accepts strings, lists, and tuples"
-msgstr "只接受字符串、列表和元组"
+msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
-msgid "options"
-msgstr "选项"
+#: ../fdroidserver/install.py
+#, python-format
+msgid "option %s: If you really want to install all the signed apps, use --all"
+msgstr ""
+
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, python-format
+msgid "option %s: invalid %s value: %r"
+msgstr ""
+
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, python-format
+msgid "option %s: invalid choice: %r (choose from %s)"
+msgstr ""
+
+#: /usr/lib/python3.5/getopt.py /usr/lib/python3.6/getopt.py
+#: /usr/lib/python3.7/getopt.py
+#, python-format
+msgid "option -%s not recognized"
+msgstr "无法识别命令 -%s"
+
+#: /usr/lib/python3.5/getopt.py /usr/lib/python3.6/getopt.py
+#: /usr/lib/python3.7/getopt.py
+#, python-format
+msgid "option -%s requires argument"
+msgstr "命令 -%s 需要参数"
+
+#: /usr/lib/python3.5/getopt.py /usr/lib/python3.6/getopt.py
+#: /usr/lib/python3.7/getopt.py
+#, python-format
+msgid "option --%s must not have an argument"
+msgstr "选项 --%s 不能有参数"
+
+#: /usr/lib/python3.5/getopt.py /usr/lib/python3.6/getopt.py
+#: /usr/lib/python3.7/getopt.py
+#, python-format
+msgid "option --%s not a unique prefix"
+msgstr "选项 --%s 不是独特的前缀"
+
+#: /usr/lib/python3.5/getopt.py /usr/lib/python3.6/getopt.py
+#: /usr/lib/python3.7/getopt.py
+#, python-format
+msgid "option --%s not recognized"
+msgstr "无法识别选项 -%s"
+
+#: /usr/lib/python3.5/getopt.py /usr/lib/python3.6/getopt.py
+#: /usr/lib/python3.7/getopt.py
+#, python-format
+msgid "option --%s requires argument"
+msgstr "选项 --%s 需要参数"
+
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
+msgid "optional arguments"
+msgstr "可用参数"
 
 #: ../fdroidserver/nightly.py
 #, python-brace-format
 msgid "overwriting existing {path}"
 msgstr "正在覆盖现有{path}"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "positional arguments"
 msgstr "位置参数"
 
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "process log deploy {path} to {dest} failed!"
-msgstr "进程日志将 {path} 部署到 {dest} 失败！"
-
-#: ../fdroidserver/build.py
-msgid "reference binary missing signature"
-msgstr "参考二进制缺少签名"
+msgstr ""
 
 #: ../fdroidserver/signatures.py
 #, python-brace-format
 msgid "refuse downloading via insecure HTTP connection (use HTTPS or specify --no-https-check): {apkfilename}"
-msgstr "拒绝通过不安全的 HTTP 连接下载（使用 HTTPS 或指定 --no-https-check）: {apkfilename}"
+msgstr ""
+
+#: ../fdroidserver/signatures.py
+#, python-brace-format
+msgid "refuse downloading via insecure http connection (use https or specify --no-https-check): {apkfilename}"
+msgstr ""
 
 #: ../fdroidserver/index.py
 #, python-format
-msgid "repo_icon \"repo/icons/%s\" does not exist, generating placeholder."
-msgstr "repo_icon \"repo/icons/%s\" 不存在，正在生成占位符。"
+msgid "repo_icon %s does not exist, generating placeholder."
+msgstr ""
 
-#: ../fdroidserver/common.py
-msgid "repo_url needs to end with /repo"
-msgstr "repo_url 需以 /repo 结尾"
+#: ../fdroidserver/metadata.py
+msgid "ruamel.yaml not installed, can not write metadata."
+msgstr ""
 
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "rsync is missing or broken: {error}"
-msgstr "rsync 丢失或损坏： {error}"
-
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "s3cmd sync indexes {path} to {url} and delete"
-msgstr "s3cmd 同步索引 {path} 至 {url} 并删除"
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "s3cmd syncs indexes from {path} to {url} and deletes removed"
-msgstr "s3cmd 将索引从 {path} 同步至 {url} 并删除已下架的"
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "scanner cache is malformed! You can clear it with: '{clear}'"
-msgstr "扫描仪缓存畸形！ 您可以使用他: '{clear}'"
-
-#: ../fdroidserver/deploy.py
-msgid "serverwebroot: path does not end with \"fdroid\", perhaps you meant one of these:"
-msgstr "serverwebroot：路径没有以 \"fdroid\"结尾，可能你想表达的是这些当中的一个："
+msgstr ""
 
 #: ../fdroidserver/scanner.py
 msgid "shared library"
-msgstr "共享库"
+msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "show program's version number and exit"
+msgstr "显示本程序的版本号并退出"
+
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.5/optparse.py
+#: /usr/lib/python3.6/argparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/argparse.py /usr/lib/python3.7/optparse.py
 msgid "show this help message and exit"
 msgstr "显示本帮助信息并退出"
 
 #: ../fdroidserver/signatures.py
 msgid "signed APK, either a file-path or HTTPS URL."
-msgstr "签名的 APK、文件路径或 HTTPS URL。"
+msgstr ""
 
 #: ../fdroidserver/common.py
 msgid "skip deploying full build logs: log content is empty"
-msgstr "跳过部署完整的构建日志：日志内容为空"
+msgstr ""
 
 #: ../fdroidserver/common.py
 msgid "skip deploying full build logs: not enabled in config"
-msgstr "跳过部署完整的构建日志：配置中未启用"
+msgstr ""
 
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "skipping source tarball: {path}"
-msgstr "跳过源代码压缩包：{path}"
+msgstr ""
 
 #: ../fdroidserver/lint.py
 msgid "srclibs missing name and/or @"
-msgstr "srclibs 缺少名称和/或 @"
+msgstr ""
 
 #: ../fdroidserver/scanner.py
 msgid "static library"
-msgstr "静态库"
+msgstr ""
 
-#: ../fdroidserver/build.py
+#: ../fdroidserver/common.py
 #, python-brace-format
-msgid "supplied reference binary has allowed signer {signer}"
-msgstr "所提供的参考二进制已允许签名者 {signer}"
+msgid "supplied timestamp value '{timestamp}' is not a unix timestamp"
+msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "the following arguments are required: %s"
-msgstr "需要此下参数：%s"
+msgstr "必须有此下参数：%s"
 
-#: ../fdroidserver/install.py
-msgid "true"
-msgstr "true"
-
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "unexpected option string: %s"
-msgstr "未预期的选项字符串：%s"
+msgstr "意料之外的选项字符串：%s"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "unknown parser %(parser_name)r (choices: %(choices)s)"
-msgstr "未知解析器 %(parser_name)r (选择: %(choices)s)"
+msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "unrecognized arguments: %s"
 msgstr "未识别的参数：%s"
@@ -2528,195 +2526,199 @@ msgstr "未识别的参数：%s"
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "unsafe permissions on '{config_file}' (should be 0600)!"
-msgstr "{config_file} 的文件权限不安全 ( 应该设为0600 ) !"
+msgstr "{config_file}有不安全的权限（应该是0600）!"
 
-#: ../fdroidserver/__main__.py /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py ../fdroid
+#: /usr/lib/python3.7/argparse.py ../fdroidserver/__main__.py
 msgid "usage: "
-msgstr "用法: "
+msgstr "用法： "
 
-#: ../fdroidserver/deploy.py
+#: ../fdroid
+msgid "usage: fdroid [-h|--help|--version] <command> [<args>]"
+msgstr "用法：fdroid [-h|--help|--version] <command> [<args>]"
+
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "using Apache libcloud to sync with {url}"
 msgstr "正在用Apache libcloud同步{url}"
 
 #: ../fdroidserver/deploy.py
 msgid "virustotal.com is rate limiting, waiting to retry..."
-msgstr "virustotal.com正在限制速率，等待重试..."
+msgstr ""
 
-#: ../fdroidserver/install.py
-msgid "yes"
-msgstr "yes"
+#: ../fdroidserver/update.py
+msgid "wiki support is deprecated and will be removed in the next release!"
+msgstr ""
 
 #: ../fdroidserver/publish.py
 #, python-brace-format
 msgid "{0} app, {1} key aliases"
 msgid_plural "{0} apps, {1} key aliases"
-msgstr[0] "{0} 应用, {1} 主要别名"
+msgstr[0] ""
 
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "{apkfilename} ({appid}) has no metadata!"
-msgstr "{apkfilename} ({appid})没有元数据！"
+msgstr ""
+
+#: ../fdroidserver/update.py
+#, python-brace-format
+msgid "{apkfilename} has multiple {name} files, looks like Master Key exploit!"
+msgstr ""
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "{apkfilename}'s AndroidManifest.xml has a bad date: "
-msgstr "{apkfilename}的 AndroidManifest.xml 有一个无效的日期: "
+msgstr ""
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "{appid} does not have a name! Using application ID instead."
-msgstr "{appid} 没有名字！ 使用 application ID 代替."
+msgstr ""
+
+#: ../fdroidserver/update.py
+#, python-brace-format
+msgid "{appid} does not have a name! Using package name instead."
+msgstr ""
+
+#: ../fdroidserver/update.py
+#, python-brace-format
+msgid "{appid} from {path} is not a valid Android Package Name!"
+msgstr ""
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "{appid} from {path} is not a valid Android application ID!"
-msgstr "{appid}来自{path}不是一个有效的Android应用ID！"
+msgstr ""
 
 #: ../fdroidserver/metadata.py ../fdroidserver/update.py
 #, python-brace-format
 msgid "{appid} from {path} is not a valid Java Package Name!"
-msgstr "{appid}来自{path}不是一个有效的Java安装包名称！"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{appid} has both APKs and files: {files}"
-msgstr "{appid}有两个apk文件：{files}"
+msgstr ""
 
 #: ../fdroidserver/mirror.py
 #, python-brace-format
 msgid "{appid} is missing {name}"
-msgstr "{appid}缺失了{name}"
+msgstr ""
 
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "{appid}: Unknown extlib {path} in build '{versionName}'"
-msgstr "{appid}：在构建版本‘{versionName}’时在{path}中遇到了未知的extlib"
+msgstr ""
 
 #: ../fdroidserver/scanner.py
 #, python-brace-format
 msgid "{appid}: no builds specified, running on current source state"
-msgstr "{appid}: 没有指定构建，在当前源码状态下运行"
+msgstr ""
 
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "{appid}: {field} must be a '{type}', but it is a '{fieldtype}!'"
-msgstr "{appid}：{field}必须为‘{type}’，但它是‘{fieldtype}！’"
+msgstr ""
 
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "{appid}: {field} must be a '{type}', but it is a '{fieldtype}'!"
-msgstr "{appid}：{field}必须为‘{type}’，但它是‘{fieldtype}’！"
+msgstr ""
 
 #: ../fdroidserver/metadata.py
 #, python-brace-format
 msgid "{build_flag} must be an integer, found: {value}"
-msgstr "{build_flag}变量必须为整型，但是找到了{value}"
+msgstr ""
 
 #: ../fdroidserver/metadata.py
 #, python-brace-format
-msgid "{build_flag} must be list or string, found: {value}"
-msgstr "{build_flag}变量必须为列表或字符串，但是找到了{value}"
+msgid "{field} not terminated in {name}"
+msgstr ""
 
 #: ../fdroidserver/metadata.py
 #, python-brace-format
 msgid "{file} is blank or corrupt!"
-msgstr "{file} 是空的或已损坏！"
+msgstr ""
 
 #: ../fdroidserver/update.py
 #, python-brace-format
-msgid "{name} \"{section}/icons/{path}\" does not exist! Check \"config.yml\"."
-msgstr "{name}的“{section}/icons/{path}”不存在！请检查配置文件“config.yml”。"
+msgid "{name} \"{path}\" does not exist! Correct it in config.py."
+msgstr ""
 
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{path1} is a duplicate of {path2}, remove one!"
-msgstr "{path1} 与 {path2} 重复，请删除一个！"
-
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 #, python-brace-format
 msgid "{path} already exists, ignoring import results!"
-msgstr "{path} 已经存在，忽略导入的结果！"
+msgstr ""
 
 #: ../fdroidserver/nightly.py
 #, python-brace-format
 msgid "{path} does not exist!  Create it by running:"
-msgstr "{path} 不存在！通过运行以下命令创建它："
+msgstr ""
 
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "{path} has bad file signature \"{pattern}\", possible Janus exploit!"
-msgstr "{path}有损坏的签名“{pattern}”，也许是Janus的漏洞！"
-
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "{path} has been flagged by virustotal {count} times:"
-msgstr "{path}被virustotal标记了{count}次："
-
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "{path} has the wrong fingerprint ({fingerprint})!"
-msgstr "{path} 有错误的指纹 ({fingerprint})！"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "{path} is not \"key: value\" dict, but a {datatype}!"
-msgstr "{path}不是“键：值”模式，而是一个{datatype}！"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "{path} is not a standard config file!"
-msgstr "{path} 不是标准的配置文件！"
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "{path} is not list, but a {datatype}!"
-msgstr "{path} 不是list，而是 {datatype}!"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "{path} is not {expected_type}, but a {datatype}!"
-msgstr "{path} 不是 {expected_type} 而是 {datatype}!"
+msgstr ""
 
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "{path} is zero size!"
-msgstr "{path}的大小为零！"
+msgstr ""
 
 #: ../fdroidserver/deploy.py
 #, python-brace-format
 msgid "{path} more than 200MB, manually upload: {url}"
-msgstr "{path}的大小超过200MB，请手动上传：{url}"
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "{path}: \"{code}\" is not a valid ISO_3166-1 alpha-2 country code!"
-msgstr "{path}: \"{code}\" 不是有效的ISO_3166-1 alpha-2国家代码！"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{path}: {error}"
-msgstr "{path}：{error}"
+msgstr ""
 
 #: ../fdroidserver/mirror.py
 #, python-brace-format
 msgid "{url} does not end with \"fdroid\", check the URL path!"
-msgstr "{url}不是以“fdroid”结尾的，请检查链接路径！"
+msgstr ""
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/common.py
 #, python-brace-format
 msgid "{url} does not start with \"http\"!"
-msgstr "{url}不是以“http”为开头！"
+msgstr ""
 
 #: ../fdroidserver/build.py
 msgid "{} build failed"
 msgid_plural "{} builds failed"
-msgstr[0] "{} 构建失败"
+msgstr[0] ""
 
 #: ../fdroidserver/build.py
 msgid "{} build succeeded"
 msgid_plural "{} builds succeeded"
-msgstr[0] "{} 构建成功"
+msgstr[0] ""
+
+#, fuzzy
+#~ msgid "Add PGP signatures for packages in repo using GnuPG"
+#~ msgstr "添加包 gpg 签名至资源库"
+
+#~ msgid "Add gpg signatures for packages in repo"
+#~ msgstr "添加包 gpg 签名至资源库"
+
+#~ msgid "Clean update - don't uses caches, reprocess all apks"
+#~ msgstr "清除更新：不用缓存，重新处理全部 apk"
+
+#~ msgid "Interactively ask about things that need updating."
+#~ msgstr "需更新事项的互动提示。"
+
+#, fuzzy
+#~ msgid "Specify editor to use in interactive mode. Default "
+#~ msgstr "指定编辑器使用互动模式。默认 %s"
+
+#~ msgid "Specify editor to use in interactive mode. Default %s"
+#~ msgstr "指定编辑器使用互动模式。默认 %s"
+
+#, fuzzy
+#~ msgid "Specify editor to use in interactive mode. Default is {path}"
+#~ msgstr "指定编辑器使用互动模式。默认 %s"
+
+#~ msgid "app-id in the form APPID"
+#~ msgstr "app-id，格式：APPID"
+
+#~ msgid "app-id to check for updates"
+#~ msgstr "app-id，用于检查更新"
+
+#~ msgid "app-id with optional versionCode in the form APPID[:VERCODE]"
+#~ msgstr "带有可选项 versionCode 的 app-id，格式：APPID[:VERCODE]"
+
+#~ msgid "app-id with optional versioncode in the form APPID[:VERCODE]"
+#~ msgstr "带有可选项 versioncode 的 app-id，格式：APPID[:VERCODE]"
diff --git a/locale/zh_Hant/LC_MESSAGES/fdroidserver.po b/locale/zh_Hant/LC_MESSAGES/fdroidserver.po
index e2358e7e..2894f7c0 100644
--- a/locale/zh_Hant/LC_MESSAGES/fdroidserver.po
+++ b/locale/zh_Hant/LC_MESSAGES/fdroidserver.po
@@ -1,34 +1,49 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Free Software Foundation, Inc.
 # Jeff Huang <s8321414@gmail.com>, 2020.
-# Hans-Christoph Steiner <hans@guardianproject.info>, 2020, 2021, 2022, 2024.
+# Hans-Christoph Steiner <hans@guardianproject.info>, 2020.
 # NightFeather <ss900328@gmail.com>, 2020.
-# ifurther <i.further.5.4@gmail.com>, 2021.
-# Stiffen <wchen01@fisher.edu>, 2021.
-# hugoalh <hugoalh@users.noreply.hosted.weblate.org>, 2024.
-# Peter Dave Hello <hsu@peterdavehello.org>, 2024.
 msgid ""
 msgstr ""
 "Project-Id-Version: fdroidserver 0.9\n"
 "Report-Msgid-Bugs-To: https://gitlab.com/fdroid/fdroidserver/issues\n"
-"POT-Creation-Date: 2025-06-25 09:52+0200\n"
-"PO-Revision-Date: 2024-11-26 15:16+0000\n"
-"Last-Translator: Peter Dave Hello <hsu@peterdavehello.org>\n"
-"Language-Team: Chinese (Traditional Han script) <https://hosted.weblate.org/projects/f-droid/fdroidserver/zh_Hant/>\n"
+"POT-Creation-Date: 2020-10-21 18:05+0200\n"
+"PO-Revision-Date: 2020-11-10 16:20+0000\n"
+"Last-Translator: Hans-Christoph Steiner <hans@guardianproject.info>\n"
+"Language-Team: Chinese (Traditional) <https://hosted.weblate.org/projects/f-droid/fdroidserver/zh_Hant/>\n"
 "Language: zh_Hant\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Weblate 5.9-dev\n"
+"X-Generator: Weblate 4.4-dev\n"
+
+#: ../fdroidserver/common.py
+msgid ""
+"\n"
+"        This is a repository of apps to be used with FDroid. Applications in this\n"
+"        repository are either official binaries built by the original application\n"
+"        developers, or are binaries built from source by f-droid.org using the\n"
+"        tools on https://gitlab.com/fdroid.\n"
+"        "
+msgstr ""
 
 #: ../fdroidserver/nightly.py
 msgid ""
 "\n"
+"SSH Public Key to be used as Deploy Key:"
+msgstr ""
+"\n"
+"SSH 公鑰被用來作為佈署密鑰："
+
+#: ../fdroidserver/nightly.py
+#, fuzzy
+msgid ""
+"\n"
 "SSH public key to be used as deploy key:"
 msgstr ""
 "\n"
-"SSH 公鑰被用來作為部署密鑰："
+"SSH 公鑰被用來作為佈署密鑰："
 
 #: ../fdroidserver/nightly.py
 #, python-brace-format
@@ -44,26 +59,22 @@ msgstr ""
 msgid "\"%s/\" has no matching metadata file!"
 msgstr "\"%s 1/\" 沒有符合的中介資料檔案！"
 
-#: ../fdroidserver/index.py
-msgid "\"isPrimary\" key should not be added to mirrors!"
-msgstr ""
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "\"local_copy_dir\" {path} does not exist!"
-msgstr "「local_copy_dir」{path} 不存在！"
-
 #: ../fdroidserver/install.py
-#, python-brace-format
+#, fuzzy, python-brace-format
 msgid "\"{apkfilename}\" is already installed on {dev}."
-msgstr "\"{apkfilename}\" 已經安裝在 {dev} 上了。"
+msgstr "'{apkfilename}' 已安裝在 {dev} 上。"
+
+#: ../fdroidserver/update.py
+#, python-brace-format
+msgid "\"{path}\" contains outdated {name} ({version})"
+msgstr "\"{path}\" 包含過時的 {name} ({version})"
 
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "\"{path}\" contains recent {name} ({version})"
 msgstr "\"{path}\" 包含近期的 {name} ({version})"
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "\"{path}\" exists but s3cmd is not installed!"
 msgstr "有 \"{path}\" 存在，但是沒有安裝 s3cmd！"
@@ -73,84 +84,118 @@ msgstr "有 \"{path}\" 存在，但是沒有安裝 s3cmd！"
 msgid "\"{path}\" is not a supported file format (use: metadata/*.yml)"
 msgstr "\"{path}\" 不是可接受的格式，轉換成： metadata/*.yml"
 
-#: ../fdroidserver/update.py
+#: ../fdroidserver/metadata.py
 #, python-brace-format
-msgid "\"{path}\" is signed by a key that is not allowed:"
-msgstr "「{path}」由不允許的金鑰簽署："
+msgid "\"{path}\" is not an accepted format, convert to: {formats}"
+msgstr "\"{path}\" 不是可接受的格式，轉換成： {formats}"
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/common.py
 #, python-brace-format
 msgid "\"{url}\" is not a valid URL!"
-msgstr "\"{url}\" 不是一個有效的網址!"
+msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, python-format
+msgid "%(option)s option requires %(number)d argument"
+msgid_plural "%(option)s option requires %(number)d arguments"
+msgstr[0] "%(option)s 的選項需要 %(number)d 參數"
+
+#: ../fdroidserver/mirror.py
+#, python-format
+msgid "%(prog)s [options] url"
+msgstr "%(prog)s [選項]"
+
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "%(prog)s: error: %(message)s\n"
 msgstr "%(prog)s：錯誤：%(message)s\n"
 
-#: ../fdroidserver/publish.py
-#, python-format
-msgid "%d APKs failed to be signed or verified!"
-msgstr "%d 個 APK 無法簽署或驗證！"
-
 #: ../fdroidserver/scanner.py
 #, python-format
 msgid "%d problems found"
 msgstr "發現 %d 個問題"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "%prog [options]"
+msgstr "%prog [選項]"
+
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "%r is not callable"
 msgstr "%r 不可呼叫"
 
-#: ../fdroidserver/signindex.py
-#, python-format
-msgid "%s did not produce a dict!"
-msgstr "%s 沒有產生字典！"
-
-#: ../fdroidserver/signindex.py
-#, python-format
-msgid "%s has bad SHA-256: %s"
-msgstr "%s 的 SHA-256 值不正確：%s"
-
 #: ../fdroidserver/lint.py
 #, python-format
 msgid "%s is not an accepted build field"
 msgstr "%s 為不可編譯欄位"
 
-#: ../fdroidserver/common.py
-msgid "'keypass' not found in config.yml!"
-msgstr "config.yml 找不到 'keypass'！"
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, python-format
+msgid "%s option does not take a value"
+msgstr "%s 選項不帶值"
+
+#: ../fdroidserver/index.py ../fdroidserver/common.py
+msgid "'keypass' not found in config.py!"
+msgstr "config.py 找不到 'keypass'！"
 
 #: ../fdroidserver/common.py
 msgid "'keystore' is NONE and 'smartcardoptions' is blank!"
-msgstr "沒有'keystore'， 而且'smartcardoptions'是空的!"
+msgstr ""
 
-#: ../fdroidserver/common.py
-msgid "'keystore' not found in config.yml!"
-msgstr "config.yml 找不到 'keystore'！"
+#: ../fdroidserver/index.py ../fdroidserver/common.py
+msgid "'keystore' not found in config.py!"
+msgstr "config.py 找不到 'keystore'！"
 
-#: ../fdroidserver/common.py
-msgid "'keystorepass' not found in config.yml!"
-msgstr "config.yml 找不到 'keystorepass'！"
+#: ../fdroidserver/index.py ../fdroidserver/common.py
+msgid "'keystorepass' not found in config.py!"
+msgstr "config.py 找不到 'keystorepass'！"
 
-#: ../fdroidserver/common.py
-msgid "'repo_keyalias' not found in config.yml!"
-msgstr "config.yml 找不到 'repo_keyalias'！"
+#: ../fdroidserver/index.py ../fdroidserver/common.py
+msgid "'repo_keyalias' not found in config.py!"
+msgstr "config.py 找不到 'repo_keyalias'！"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "'required' is an invalid argument for positionals"
 msgstr "這些地方的 '必填' 為無效引數"
 
 #: ../fdroidserver/common.py
-msgid "'sdk_path' not set in config.yml!"
-msgstr "未在 config.yml 中設定「sdk_path」！"
+msgid "'sdk_path' not set in 'config.py'!"
+msgstr "'config.py' 未設定 'sdk_path'！"
+
+#. Translators: "build-tools" is the file name of a package from
+#. Google, it is part of the Android SDK. So it probably shouldn't be
+#. translated or transliterated.
+#: ../fdroidserver/common.py
+#, python-brace-format
+msgid "'{aapt}' is too old, fdroid requires build-tools-23.0.0 or newer!"
+msgstr "'{aapt}' 太過老舊，fdroid 需要 build-tools-23.0.0 以上版本！"
 
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "'{aapt}' is too old, fdroid requires build-tools-{version} or newer!"
 msgstr "'{aapt}' 太過老舊，fdroid 需要 build-tools-{version} 或以上版本！"
 
+#: ../fdroidserver/install.py
+#, python-brace-format
+msgid "'{apkfilename}' is already installed on {dev}."
+msgstr "'{apkfilename}' 已安裝在 {dev} 上。"
+
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "'{field}' in {linedesc} is obsolete, see docs for current fields:"
+msgstr "在 {linedesc} 中的 '{field}' 已過時，檢視文件以取得目前的欄位："
+
+#: ../fdroidserver/common.py
+#, python-brace-format
+msgid "'{field}' will be in random order! Use () or [] brackets if order is important!"
+msgstr "'{field}'　將會隨機排列！如果次序重很重要，請使用 () 或 []符號！"
+
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "'{path}' failed to execute!"
@@ -158,32 +203,23 @@ msgstr "'{path}' 無法執行！"
 
 #: ../fdroidserver/metadata.py
 #, python-brace-format
-msgid "'{path}' has invalid format, it should be a dictionary!"
-msgstr "「{path}」的格式無效，它應該是一個字典！"
-
-#: ../fdroidserver/lint.py ../fdroidserver/metadata.py
-#, python-brace-format
 msgid "'{value}' is not a valid {field} in {appid}. Regex pattern: {pattern}"
 msgstr "{appid} 的 {value}' 為無效 {field}。正規表遠格式：{pattern}"
 
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "'{value}' is not a valid {field}, should be {pattern}"
-msgstr "「{value}」不是有效的 {field}，應該為 {pattern}"
-
-#: ../fdroidserver/checkupdates.py
-msgid "--merge-request only runs on a single appid!"
-msgstr ""
-
 #: ../fdroidserver/checkupdates.py
 #, python-brace-format
 msgid "...checkupdate failed for {appid} : {error}"
 msgstr "{appid} 檢查更新失敗：{error}"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid ".__call__() not defined"
 msgstr ".__call__() 未定義"
 
+#: ../fdroidserver/metadata.py
+msgid ".fdroid.txt is not supported!  Convert to .fdroid.yml or .fdroid.json."
+msgstr "不支援 .fdroid.txt！轉換為 .fdroid.yml 或 .fdroid.json。"
+
 #: ../fdroidserver/lint.py
 msgid "/issues is missing"
 msgstr "/issues 有遺漏"
@@ -192,15 +228,14 @@ msgstr "/issues 有遺漏"
 msgid "A URL is required as an argument!"
 msgstr "需要 URL 作為參數！"
 
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "APK signatures have different certificates in {path}:"
-msgstr "APK 簽章在 {path} 中有不同的憑證："
-
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Add PGP signatures using GnuPG for packages in repo"
 msgstr "在軟體庫中加入使用 GnuPG 套件包的 gpg 簽署"
 
+#: ../fdroid ../fdroidserver/__main__.py
+msgid "Add a new application from its source code"
+msgstr "從原始程式碼增加一個新的應用程式"
+
 #: ../fdroidserver/update.py
 msgid "Add a repo signing key to an unsigned repo"
 msgstr "增加一個軟體庫的簽署金鑰到未簽署的金鑰庫中"
@@ -218,11 +253,7 @@ msgstr "只為 {name} 新增軟體庫"
 msgid "Alias of the repo signing key in the keystore"
 msgstr "在金鑰庫裡軟體庫簽署金鑰的別名"
 
-#: ../fdroidserver/build.py
-msgid "AllowedAPKSigningKeys missing but reference binary supplied"
-msgstr "缺少 AllowedAPKSigningKeys，但是提供了參考二進位文件"
-
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "Allows a different revision (or git branch) to be specified for the initial import"
 msgstr "允許為初始匯入指定不同的校訂（或 git 分支）"
 
@@ -236,20 +267,25 @@ msgstr "還要提醒格式化問題，如 rewritemeta -l"
 
 #: ../fdroidserver/scanner.py
 msgid "Android AAR library"
-msgstr "Android AAR 程式庫"
+msgstr ""
 
 #: ../fdroidserver/scanner.py
 msgid "Android APK file"
-msgstr "Android APK 檔案"
+msgstr ""
 
 #: ../fdroidserver/scanner.py
+#, fuzzy
 msgid "Android DEX code"
-msgstr "Android DEX 程式碼"
+msgstr "未找到 Android SDK！"
 
-#: ../fdroidserver/init.py
+#: ../fdroidserver/common.py ../fdroidserver/build.py
 #, python-brace-format
-msgid "Android SDK not found at {path}!"
-msgstr "在{path}找不到Android SDK！"
+msgid "Android SDK '{path}' does not have '{dirname}' installed!"
+msgstr "Android SDK '{path}' 並未安裝 '{dirname}'！"
+
+#: ../fdroidserver/common.py
+msgid "Android SDK not found!"
+msgstr "找不到 Android SDK！"
 
 #: ../fdroidserver/common.py
 #, python-brace-format
@@ -261,28 +297,23 @@ msgstr "Android SDK 路徑 '{path}' 不存在！"
 msgid "Android SDK path '{path}' is not a directory!"
 msgstr "Android SDK 路徑 '{path}' 不是目錄資料夾！"
 
+#. Translators: "build-tools" is the file name of a package from
+#. Google, it is part of the Android SDK. So it probably shouldn't be
+#. translated or transliterated.
 #: ../fdroidserver/common.py
 #, python-brace-format
-msgid "Android SDK tool {cmd} not found!"
-msgstr "找不到 Android SDK 工具 {cmd}！"
+msgid "Android build-tools path '{path}' does not exist!"
+msgstr "Android build-tools 路徑 '{path}' 不存在！"
 
-#: ../fdroidserver/lint.py
-msgid "App has Binaries but does not have corresponding AllowedAPKSigningKeys to pin certificate."
-msgstr "應用程式具有二進位文件，但是沒有相應的 AllowedAPKSigningKeys 來固定憑證。"
-
-#: ../fdroidserver/lint.py
-msgid "App has NoSourceSince or ArchivePolicy \"0 versions\" or 0 but AutoUpdateMode or UpdateCheckMode are not None"
-msgstr "應用程式有 NoSourceSince 或 ArchivePolicy「0 versions」或「0」，但是 AutoUpdateMode 或 UpdateCheckMode 不是「None」"
+#: ../fdroidserver/update.py
+msgid "AndroidManifest.xml has no date"
+msgstr "AndroidManifest.xml 無日期"
 
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "App is in '{repo}' but has a link to {url}"
 msgstr "應用軟體在 '{repo}' 倉庫，但有一個 {url} 連結"
 
-#: ../fdroidserver/lint.py
-msgid "App version has binary but does not have corresponding AllowedAPKSigningKeys to pin certificate."
-msgstr "應用程式版本具有二進位文件，但是沒有相應的 AllowedAPKSigningKeys 來固定憑證。"
-
 #: ../fdroidserver/lint.py
 msgid "Appending .git is not necessary"
 msgstr "不必附加上 .git"
@@ -292,27 +323,11 @@ msgstr "不必附加上 .git"
 msgid "Archiving {apkfilename} with invalid signature!"
 msgstr "以無效的簽名歸檔 {apkfilename}！"
 
-#: ../fdroidserver/lint.py
-msgid "AutoUpdateMode with UpdateCheckMode: HTTP must have a pattern."
-msgstr "AutoUpdateMode 與 UpdateCheckMode：HTTP 必須有一個模式。"
-
-#: ../fdroidserver/install.py
-msgid "Automatic no to all prompts."
-msgstr "自動拒絕所有提示。"
-
-#: ../fdroidserver/install.py
-msgid "Automatic yes to all prompts."
-msgstr "自動同意所有提示。"
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "Bad entry type \"{mirrortype}\" in mirrors config: {mirror}"
-msgstr "鏡像配置中的錯誤條目類型「{mirrortype}」：{mirror}"
-
 #: ../fdroidserver/mirror.py
 msgid "Base URL to mirror, can include the index signing key using the query string: ?fingerprint="
 msgstr "基本的 URL 到鏡像，可以包含索引簽署金鑰使用查詢字串：?fingerprint="
 
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "Branch '{branch}' used as commit in build '{versionName}'"
@@ -326,9 +341,9 @@ msgstr "分支 '{branch}' 用於 srclib '{srclib}' 的提交"
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Broken symlink: {path}"
-msgstr "損壞的符號連結：{path}"
+msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Build a package from source"
 msgstr "從原始程式碼編譯成套裝軟體"
 
@@ -348,69 +363,86 @@ msgstr "構建詮釋資料 git 倉庫有未遞交的變更！"
 msgid "Build only the latest version of each package"
 msgstr "只構建每個套件包的最後版本"
 
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Build should have comma-separated versionName and versionCode, not \"{value}\", in {linedesc}"
+msgstr "在 {linedesc} 版本編譯的版本名稱和版本代號應以逗號分隔,而不是 \"{value}\""
+
 #: ../fdroidserver/init.py
 #, python-format
 msgid "Built repo based in \"%s\" with this config:"
 msgstr "軟體庫的編譯依照 \"%s\" 與此設定："
 
-#: ../fdroidserver/checkupdates.py
-msgid "Can't auto-update app with no CurrentVersionCode"
-msgstr "無法自動更新沒有 CurrentVersionCode 的應用程式"
-
 #: ../fdroidserver/build.py
 msgid "Can't build due to {} error while scanning"
 msgid_plural "Can't build due to {} errors while scanning"
 msgstr[0] "掃描時由於 {} 出錯，無法進行編譯"
 
-#: ../fdroidserver/common.py
+#: ../fdroidserver/vmtools.py
+#, python-brace-format
+msgid "Cannot read \"{path}\"!"
+msgstr "無法讀取 \"{path}\"！"
+
+#. Translators: https://developer.android.com/studio/build/application-id
+#: ../fdroidserver/metadata.py
 #, fuzzy, python-brace-format
-msgid "Cannot read {path}: {error}"
-msgstr "讀取 {path} 失敗：錯誤訊息{error}"
+msgid "Cannot resolve application ID {appid}"
+msgstr "無法解析 {appid} id"
 
 #: ../fdroidserver/rewritemeta.py
-#, python-brace-format
+#, fuzzy, python-brace-format
 msgid "Cannot rewrite \"{path}\""
-msgstr "無法重寫到 \"{path}\""
+msgstr "無法讀取 \"{path}\"！"
+
+#: ../fdroidserver/rewritemeta.py
+msgid "Cannot use --list and --to at the same time"
+msgstr "無法同時使用 --list 和 --to"
+
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Cannot write \"{path}\", not an accepted format, use: {formats}"
+msgstr "無法覆寫 \"{path}\"，其非允許的格式，請使用：{formats}"
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
 #: ../fdroidserver/lint.py
 #, python-format
 msgid "Categories '%s' is not valid"
 msgstr "'%s' 類別無效"
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
 #: ../fdroidserver/lint.py
 msgid "Categories are not set"
 msgstr "類別未設定"
 
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "Category \"{category}\" defined but not used for any apps!"
-msgstr "已定義類別「{category}」，但是未用於任何應用程式！"
-
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Check for updates to applications"
 msgstr "檢查應用程式更新"
 
 #: ../fdroidserver/update.py
-#, fuzzy, python-brace-format
+#, python-brace-format
 msgid "Checking archiving for {appid} - apks:{integer}, keepversions:{keep}, archapks:{arch}"
-msgstr "檢查 {appid} 的歸檔 - APKs:{integer}，keepversions:{keep}，archapks:{arch}"
+msgstr "檢查 {appid} 的歸檔 - apks:{integer}，keepversions:{keep}，archapks:{arch}"
+
+#: ../fdroidserver/dscanner.py
+msgid "Clean after all scans have finished"
+msgstr "所有掃描完成後清除"
+
+#: ../fdroidserver/dscanner.py
+msgid "Clean before the scans start and rebuild the container"
+msgstr "在掃描開始與重新構建容器之前清除"
+
+#: ../fdroidserver/dscanner.py
+msgid "Clean up all containers and then exit"
+msgstr "清除所有容器，然後退出"
 
 #: ../fdroidserver/update.py
 msgid "Clean update - don't uses caches, reprocess all APKs"
 msgstr "清除更新 - 不使用快取，重新處理全部的 APK"
 
-#: ../fdroidserver/common.py
-msgid "Color the log output"
-msgstr ""
-
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "Comma separated list of categories."
 msgstr "以逗號分隔類別清單。"
 
-#: ../fdroidserver/__main__.py
-#, python-format
+#: ../fdroid ../fdroidserver/__main__.py
+#, c-format, python-format
 msgid "Command '%s' not recognised.\n"
 msgstr "無法識別指令「%s」。\n"
 
@@ -418,32 +450,22 @@ msgstr "無法識別指令「%s」。\n"
 msgid "Commit changes"
 msgstr "提交變更"
 
-#: ../fdroidserver/checkupdates.py
-msgid "Commit changes, push, then make a merge request"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Conflicting \"{field}\" definitions between .yml and localized files:"
-msgstr ".yml 與本地化檔案之間的「{field}」定義衝突："
-
 #: ../fdroidserver/__main__.py
-#, fuzzy
 msgid "Conflicting arguments: '--verbose' and '--quiet' can not be specified at the same time."
-msgstr "衝突的參數：無法同時使用 '--verbose' 和 '--quiet' 參數。"
+msgstr ""
 
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "Could not find '{command}' on your system"
 msgstr "在您的系統上找不到 '{command}'"
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
+#, fuzzy
 msgid "Could not find latest version code"
-msgstr "找不到最新版本程式碼"
+msgstr "找到不最新版的代碼"
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
+#, fuzzy
 msgid "Could not find latest version name"
 msgstr "找不到最新版本名稱"
 
@@ -453,25 +475,31 @@ msgid "Could not find {path} to remove it"
 msgstr "無法找到 {path} 來移除"
 
 #: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Could not open APK {path} for analysis: "
-msgstr "無法開啟 APK 檔{path}案作分析 : "
+msgid "Could not open apk file for analysis"
+msgstr "無法開啟 apk 檔案作分析"
 
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "Could not parse size \"{size}\", wrong type \"{type}\""
-msgstr "無法解析大小「{size}」，錯誤類型「{type}」"
+msgstr ""
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/import_subcommand.py
+#. Translators: https://developer.android.com/studio/build/application-id
+#: ../fdroidserver/import.py
+#, fuzzy
 msgid "Couldn't find Application ID"
-msgstr "找不到應用程式 ID"
+msgstr "找不到包 ID"
 
-#: ../fdroidserver/checkupdates.py
-msgid "Couldn't find any version information"
-msgstr "找不到任何版本資訊"
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
+#: ../fdroidserver/import.py
+msgid "Couldn't find latest version code"
+msgstr "找到不最新版的代碼"
 
-#: ../fdroidserver/checkupdates.py
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
+#: ../fdroidserver/import.py
+msgid "Couldn't find latest version name"
+msgstr "找不到最新版本名稱"
+
+#: ../fdroidserver/import.py
 msgid "Couldn't find package ID"
 msgstr "找不到包 ID"
 
@@ -479,26 +507,29 @@ msgstr "找不到包 ID"
 msgid "Cowardily refusing to overwrite existing signing key setup!"
 msgstr "拒絕覆寫現有的簽署金鑰設定！"
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/update.py
+msgid "Create a repo signing key in a keystore"
+msgstr "在金鑰庫中建立一個軟體庫的簽署金鑰"
+
+#: ../fdroidserver/update.py
+msgid "Create skeleton metadata files that are missing"
+msgstr "建立缺少的骨幹中介資料檔案"
+
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Created new container \"{name}\""
 msgstr "建立新容器 \"{name}\""
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Creating \"{path}\" for configuring s3cmd."
 msgstr "正在建立組態 s3cmd 的 \"{path}\"。"
 
-#: ../fdroidserver/common.py
-#, fuzzy, python-brace-format
-msgid "Creating empty {config_file}"
-msgstr "讀取 '{config_file}' 中"
-
 #: ../fdroidserver/publish.py
 msgid "Creating log directory"
 msgstr "建立日誌目錄"
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Creating new S3 bucket: {url}"
 msgstr "建立新的 S3 bucket:{url}"
@@ -511,7 +542,8 @@ msgstr "建立輸出目錄"
 msgid "Creating signed index with this key (SHA256):"
 msgstr "用此密鑰 (SHA256) 來建立簽署的索引："
 
-#: ../fdroidserver/publish.py ../fdroidserver/verify.py
+#: ../fdroidserver/import.py ../fdroidserver/verify.py
+#: ../fdroidserver/publish.py
 msgid "Creating temporary directory"
 msgstr "建立臨時目錄"
 
@@ -535,12 +567,12 @@ msgstr "從軟體庫刪除缺少中介資料的 APK 和/或 OBB"
 #: ../fdroidserver/deploy.py
 #, python-brace-format
 msgid "Deleting archive, repo is too big ({size} max {limit})"
-msgstr "正在刪除存檔，軟體庫太大（{size}，最大 {limit}）"
+msgstr ""
 
 #: ../fdroidserver/deploy.py
 #, python-brace-format
 msgid "Deleting git-mirror history, repo is too big ({size} max {limit})"
-msgstr "正在刪除 git-mirror 歷史記錄，軟體庫太大（{size}，最大 {limit}）"
+msgstr ""
 
 #: ../fdroidserver/update.py
 #, python-brace-format
@@ -556,24 +588,19 @@ msgstr "描述 '%s' 僅為此應用的摘要"
 msgid "Description has a duplicate line"
 msgstr "描述中出現重覆行"
 
+#: ../fdroidserver/lint.py
+#, python-format
+msgid "Description has a list (%s) but it isn't bulleted (*) nor numbered (#)"
+msgstr "描述中有一個列表 (%s) 但它並未被編排 (*) 或作編號 (#)"
+
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "Description of length {length} is over the {limit} char limit"
 msgstr "描述的長度 {length} 已超過 {limit} 個字符限制"
 
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Did you mean config/{name}.yml?"
-msgstr "你是指 config/{name}.yml 嗎？"
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "Did you mean {code}?"
-msgstr "你是指 {code} 嗎？"
-
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "Do not add 'disable:' to the generated build entries"
-msgstr "不要將「disable:」加入到產生的建置條目中"
+msgstr ""
 
 #: ../fdroidserver/nightly.py
 msgid "Do not deploy the new files to the repo"
@@ -596,22 +623,27 @@ msgstr "不要移除從金鑰儲存生成的私密金鑰"
 msgid "Don't create a source tarball, useful when testing a build"
 msgstr "不要建立 tarball，在測試一個構建時很有用處"
 
+#: ../fdroidserver/stats.py
+msgid "Don't do anything logs-related"
+msgstr "不要做任何與日誌有關的事情"
+
 #: ../fdroidserver/build.py
 msgid "Don't refresh the repository, useful when testing a build with no internet connection"
 msgstr "不要更新軟體庫，在沒有網路連線時測試構建很有用"
 
 #: ../fdroidserver/deploy.py ../fdroidserver/nightly.py
+#: ../fdroidserver/upload.py
 msgid "Don't use rsync checksums"
 msgstr "不使用 rsync 檢驗和"
 
-#: ../fdroidserver/install.py
-msgid "Download F-Droid.apk using mirrors that leak less to the network"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Download complete mirrors of small repos"
 msgstr "下載小型軟體庫完整的鏡像"
 
+#: ../fdroidserver/stats.py
+msgid "Download logs we don't have"
+msgstr "下載我們沒有的日誌"
+
 #: ../fdroidserver/common.py
 msgid "Downloading the repository already failed once, not trying again."
 msgstr "下載軟體庫已失敗過一次，尚未重試。"
@@ -623,61 +655,43 @@ msgstr "{url} 下載失敗,錯誤訊息 {error}"
 
 #: ../fdroidserver/metadata.py
 #, python-brace-format
-msgid "Duplicate Anti-Feature declaration at {path} was ignored!"
-msgstr "{path} 中的重複反特徵宣告已被忽略！"
-
-#: ../fdroidserver/index.py
-#, python-format
-msgid "Duplicate entry \"%s\" in mirrors config!"
-msgstr "鏡像配置中存在重複條目「%s」！"
+msgid "Duplicate build recipe found for versionCode {versionCode} in {linedesc}"
+msgstr "在 {linedesc} 找到版本編號 {versionCode} 重複的編譯處方"
 
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "Duplicate link in '{field}': {url}"
 msgstr "'{field}' 有重複的連結：{url}"
 
-#: ../fdroidserver/common.py
-#, python-format
-msgid "ERROR: %(message)s"
-msgstr "錯誤：%(message)s"
+#: ../fdroid
+msgid "Dynamically scan APKs post build"
+msgstr "動態掃描建置後的 APK"
 
 #: ../fdroidserver/__main__.py
 msgid "ERROR: The \"server\" subcommand has been removed, use \"deploy\"!"
-msgstr "錯誤：「server」子指令已經刪除，請使用「deploy」！"
+msgstr ""
+
+#: ../fdroidserver/mirror.py
+msgid ""
+"ERROR: this command should never be used to mirror f-droid.org!\n"
+"A full mirror of f-droid.org requires more than 200GB."
+msgstr ""
+"錯誤：此命令絕不該用於鏡像 f-droid.org！\n"
+"完整的 f-droid.org 鏡像需要超過 200GB。"
 
 #: ../fdroidserver/nightly.py
 msgid "ERROR: unsupported CI type, patches welcome!"
 msgstr "出錯：未支援 CI 類型，歡迎補強！"
 
-#: ../fdroidserver/nightly.py
-#, python-format
-msgid "ERROR: unsupported git host \"%s\", patches welcome!"
-msgstr "錯誤：不支援的 git 主機「%s」，歡迎提交修補！"
-
-#: ../fdroidserver/lint.py
+#: ../fdroidserver/metadata.py
 #, python-brace-format
-msgid "ERROR: {key} in {path} is not \"archive\" or \"repo\"!"
-msgstr "錯誤：{path} 中的 {key} 不是「archive」或「repo」！"
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "ERROR: {key} not a valid key!"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "ERROR: {key}'s value should be of type {t}!"
-msgstr ""
-
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "ERROR: {key}:{subkey} in {path} is not in allowed keys: {allowed_keys}!"
-msgstr "錯誤：{path} 中的 {key}:{subkey} 不在允許的鍵值清單中：{allowed_keys}！"
+msgid "Empty build flag at {linedesc}"
+msgstr "{linedesc} 空白的編譯標誌"
 
 #: ../fdroidserver/__main__.py
 #, python-brace-format
 msgid "Encoding is set to '{enc}' fdroid might run into encoding issues. Please set it to 'UTF-8' for best results."
-msgstr "編碼被設定為「{enc}」fdroid 可能會遇到編碼問題。請將其設定為「UTF-8」以獲得最佳結果。"
+msgstr ""
 
 #: ../fdroidserver/init.py
 #, python-format
@@ -688,44 +702,24 @@ msgstr ""
 "請在此輸入 Android SDK (%s) 的路徑：\n"
 "> "
 
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Environment variable {var} from {configname} is not set!"
-msgstr "設定檔 {configname} 的環境變數 {var} 尚未設定！"
+#: ../fdroidserver/deploy.py ../fdroidserver/checkupdates.py
+#: ../fdroidserver/upload.py
+#, python-format
+msgid "Error while attempting to publish log: %s"
+msgstr "在嘗試刊登日誌時出錯：%s"
 
-#: ../fdroidserver/common.py
-#, fuzzy, python-brace-format
-msgid "Environment variable {{env: {var}}} is not set!"
-msgstr "設定檔 {configname} 的環境變數 {var} 尚未設定！"
-
-#: ../fdroidserver/deploy.py
-msgid "Error deploying 'github_releases', {} not present. (You might need to run `fdroid update` first.)"
-msgstr "部署「github_releases」時發生錯誤，找不到 {}。（您可能需要先執行 `fdroid update`。）"
-
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py ../fdroidserver/common.py
 msgid "Error while getting repo address"
 msgstr "在接取軟體庫的地址時出錯"
 
-#: ../fdroidserver/scanner.py
-msgid "Exit with a non-zero code if problems were found"
-msgstr "如果發現問題，則以非零代碼退出"
-
-#: ../fdroidserver/__main__.py
-msgid "Extract application metadata from a source repository"
-msgstr "從來源儲存庫中提取應用程式元數據"
-
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Extract signatures from APKs"
 msgstr "自 APKs 捽取出簽名"
 
-#: ../fdroidserver/install.py
-msgid "F-Droid.apk could not be downloaded from any known source!"
-msgstr "無法從任何已知來源下載 F-Droid.apk！"
-
 #: ../fdroidserver/update.py
-#, python-brace-format
+#, fuzzy, python-brace-format
 msgid "Failed copying {path}: {error}"
-msgstr "無法複製 {path}：{error}"
+msgstr "讀取 {path} 失敗：錯誤訊息{error}"
 
 #: ../fdroidserver/signatures.py
 #, python-brace-format
@@ -742,34 +736,42 @@ msgstr "讀取 {path} 失敗：錯誤訊息{error}"
 msgid "Failed resizing {path}: {error}"
 msgstr "{path} 無法調整大小：錯誤訊息 {error}"
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/publish.py
+msgid "Failed to align application"
+msgstr "校正應用程式失敗"
+
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Failed to create S3 bucket: {url}"
 msgstr "無法建立 S3 bucket : {url}"
 
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Failed to get APK information, deleting {path}"
-msgstr "無法取得 APK 資訊，刪除 {path}"
+#: ../fdroidserver/common.py
+msgid "Failed to get APK manifest information"
+msgstr "無法取得 APK 單號資訊"
 
 #: ../fdroidserver/update.py
 #, python-brace-format
-msgid "Failed to get APK information, skipping {path}"
-msgstr "無法取得 APK 資訊，略過 {path}"
+msgid "Failed to get apk information, deleting {path}"
+msgstr "無法取得 apk 資訊，刪除 {path}"
 
 #: ../fdroidserver/update.py
-msgid "Failed to get APK signing key fingerprint"
-msgstr "無法取得 APK 簽章金鑰指紋"
+#, python-brace-format
+msgid "Failed to get apk information, skipping {path}"
+msgstr "無法取得 apk 資訊，略過 {path}"
 
 #: ../fdroidserver/install.py
 #, python-brace-format
 msgid "Failed to install '{apkfilename}' on {dev}: {error}"
 msgstr "無法在 {dev} 安裝 '{apkfilename}'：{error}"
 
-#: ../fdroidserver/common.py
+#: ../fdroidserver/publish.py ../fdroidserver/common.py
 msgid "Failed to sign application"
 msgstr "無法簽署應用程式"
 
+#: ../fdroidserver/common.py
+msgid "Failed to zipalign application"
+msgstr "zipalign 應用程式失敗"
+
 #: ../fdroidserver/build.py
 #, python-brace-format
 msgid "Fetched buildserverid from VM: {buildserverid}"
@@ -783,14 +785,24 @@ msgstr "抓取 '{apkfilename}' 的簽署資料 -> '{sigdir}'"
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "File disappeared while processing it: {path}"
-msgstr "檔案在處理時消失：{path}"
+msgstr ""
 
-#: ../fdroidserver/build.py ../fdroidserver/install.py
-#: ../fdroidserver/rewritemeta.py ../fdroidserver/scanner.py
-#: ../fdroidserver/update.py
+#: ../fdroidserver/verify.py ../fdroidserver/stats.py ../fdroidserver/update.py
+#: ../fdroidserver/rewritemeta.py ../fdroidserver/build.py
+#: ../fdroidserver/checkupdates.py ../fdroidserver/scanner.py
+#: ../fdroidserver/install.py
 msgid "Finished"
 msgstr "已完成"
 
+#: ../fdroidserver/lint.py
+msgid "Flattr donation methods belong in the FlattrID flag"
+msgstr "Flattr 捐款方式在 FlattrID 標誌下"
+
+#: ../fdroidserver/lint.py
+#, fuzzy
+msgid "Flattr donation methods belong in the FlattrID: field"
+msgstr "Flattr 捐款方式在 FlattrID 標誌下"
+
 #: ../fdroidserver/lint.py
 msgid "Forbidden HTML tags"
 msgstr "禁用 HTML 標籤"
@@ -806,7 +818,7 @@ msgstr "在 {0} 秒超時後強制停止構建！"
 
 #: ../fdroidserver/scanner.py
 msgid "Force scan of disabled apps and builds."
-msgstr "強制掃描已停用的應用程式和建構。"
+msgstr ""
 
 #: ../fdroidserver/update.py
 #, python-brace-format
@@ -814,26 +826,23 @@ msgid "Found \"{path}\" graphic without metadata for app \"{name}\"!"
 msgstr "找到 \"{path}\" 圖像不包含 \"{name}\" 應用的中介資料！"
 
 #: ../fdroidserver/update.py
-#, fuzzy, python-brace-format
+#, python-brace-format
 msgid "Found bad funding file \"{path}\" for \"{name}\":"
-msgstr "找到了 \"{name}\" 的錯誤的籌款檔案 \"{path}\":"
+msgstr ""
 
 #: ../fdroidserver/common.py
 msgid "Found invalid appids in arguments"
 msgstr "引數中找到無效的 appids"
 
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
 #: ../fdroidserver/common.py
 msgid "Found invalid versionCodes for some apps"
 msgstr "有些應用的版本代號無效"
 
 #: ../fdroidserver/common.py
-#, python-brace-format
+#, fuzzy, python-brace-format
 msgid "Found multiple JAR Signature Block Files in {path}"
-msgstr "在 {path} 中找到多個 JAR 簽署區塊檔案"
-
-#: ../fdroidserver/common.py
-msgid "Found multiple Signer Certificates!"
-msgstr "找到多個簽署者憑證！"
+msgstr "{path} 找到多筆簽名證書"
 
 #: ../fdroidserver/metadata.py
 #, python-brace-format
@@ -844,6 +853,11 @@ msgstr "{appid} 找到多件中介資料檔案"
 msgid "Found multiple signing certificates for repository."
 msgstr "軟體庫找到多份簽署證書。"
 
+#: ../fdroidserver/update.py
+#, python-brace-format
+msgid "Found multiple signing certificates in {path}"
+msgstr "{path} 找到多筆簽名證書"
+
 #: ../fdroidserver/index.py
 msgid "Found no signing certificates for repository."
 msgstr "軟體庫查無簽名證書。"
@@ -856,17 +870,7 @@ msgstr "%s 中找到 non-file"
 #: ../fdroidserver/deploy.py
 #, python-brace-format
 msgid "Found {apkfilename} at {url}"
-msgstr "在 {url} 中找到 {apkfilename}"
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Found {count} problems in {filename}"
-msgstr "在 {filename} 中發現 {count} 個問題"
-
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "Found {count} warnings in {filename}"
-msgstr "在 {filename} 中找到 {count} 個警告"
+msgstr ""
 
 #: ../fdroidserver/update.py
 #, python-brace-format
@@ -886,21 +890,19 @@ msgstr "Git 清理失敗"
 msgid "Git fetch failed"
 msgstr "Git 抓取失敗"
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
+#: ../fdroidserver/common.py
+msgid "Git remote set-head failed"
+msgstr "Git 遠端 set-head 失敗"
+
 #: ../fdroidserver/common.py
 #, python-format
 msgid "Git remote set-head failed: \"%s\""
 msgstr "Git 遠端 set-head 失敗: \"%s\""
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
 #: ../fdroidserver/common.py
 msgid "Git reset failed"
 msgstr "Git 重置失敗"
 
-#: ../fdroidserver/common.py
-msgid "Git submodule deinit failed"
-msgstr "Git 子模組去初始化失敗"
-
 #: ../fdroidserver/common.py
 msgid "Git submodule sync failed"
 msgstr "Git 子模組同步失敗"
@@ -914,34 +916,23 @@ msgid "HTTPS must be used with Subversion URLs!"
 msgstr "HTTPS 必須與 Subversion 網址一起使用！"
 
 #: ../fdroidserver/deploy.py
-#, fuzzy
 msgid "If a git mirror gets to big, allow the archive to be deleted"
-msgstr "如果一個 git mirror 變得太大， 允許刪除該 git mirror 的檔案"
+msgstr ""
 
 #: ../fdroidserver/deploy.py
-#, fuzzy, python-brace-format
+#, python-brace-format
 msgid "If this upload fails, try manually uploading to {url}"
-msgstr "如果本次上傳失敗， 嘗試手動上傳至 {url}"
+msgstr ""
 
 #: ../fdroidserver/metadata.py
-#, fuzzy, python-brace-format
+#, python-brace-format
 msgid "Ignoring '{field}' in '{metapath}' metadata because it is deprecated."
-msgstr "忽略 '{metapath}' 中的 '{field}' ， 因為它已經過時了。"
+msgstr ""
 
 #: ../fdroidserver/update.py
 #, python-format
 msgid "Ignoring FUNDING.yml entry longer than 2048: %s"
-msgstr "忽略文檔 FUNDING.yml ， 文檔大小超過 2048: %s"
-
-#: ../fdroidserver/update.py
-#, python-format
-msgid "Ignoring bad element in manifest: %s"
-msgstr "忽略資訊清單中的無效元素：%s"
-
-#: ../fdroidserver/common.py
-#, fuzzy, python-brace-format
-msgid "Ignoring deprecated {oldfile}, use {newfile}!"
-msgstr "檔案 {oldfile} 已經過時了， 請使用檔案 {newfile}"
+msgstr ""
 
 #: ../fdroidserver/index.py
 msgid "Ignoring package without metadata: "
@@ -952,34 +943,26 @@ msgstr "忽略無中介資料的套件包： "
 msgid "Ignoring stale cache data for {apkfilename}"
 msgstr "忽略 {apkfilename} 陳舊的緩存資料"
 
+#: ../fdroidserver/rewritemeta.py
+#, python-brace-format
+msgid "Ignoring {ext} file at '{path}'"
+msgstr "忽略在 '{path}' 的 {ext} 檔案"
+
 #: ../fdroidserver/update.py
 msgid "Include APKs that are signed with disabled algorithms like MD5"
 msgstr "包含 APKs 其簽名為有弱點的演算法，如 MD5"
 
 #: ../fdroidserver/mirror.py
-#, fuzzy
 msgid "Include the PGP signature .asc files in the mirror"
-msgstr "在鏡像中加入 PGP 簽名和 .asc 文檔"
+msgstr ""
 
 #: ../fdroidserver/mirror.py
-#, fuzzy
 msgid "Include the build logs in the mirror"
-msgstr "在鏡像中加入編譯紀錄"
+msgstr ""
 
 #: ../fdroidserver/mirror.py
-#, fuzzy
 msgid "Include the source tarballs in the mirror"
-msgstr "在鏡像中加入軟體的源代碼包"
-
-#: ../fdroidserver/metadata.py
-#, python-format
-msgid "Including metadata from %s@%s"
-msgstr "正在匯入來自 %s@%s 的中繼資料"
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Including metadata from {path}"
-msgstr "正在匯入來自 {path} 的中繼資料"
+msgstr ""
 
 #: ../fdroidserver/common.py
 msgid "Initialising submodules"
@@ -989,21 +972,31 @@ msgstr "初始化子模組"
 msgid "Install all signed applications available"
 msgstr "安裝所有已簽署可用的應用程式"
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Install built packages on devices"
 msgstr "在裝置上安裝構建套件包"
 
 #: ../fdroidserver/install.py
 #, fuzzy, python-format
 msgid "Installing %s..."
-msgstr "正在安裝中 %s…"
+msgstr "安裝 %s…"
+
+#: ../fdroidserver/install.py
+#, python-format
+msgid "Installing %s…"
+msgstr "安裝 %s…"
 
 #: ../fdroidserver/install.py
 #, fuzzy, python-brace-format
 msgid "Installing '{apkfilename}' on {dev}..."
-msgstr "正在將軟體 '{apkfilename}' 安裝到設備 {dev} 上 ..."
+msgstr "在 {dev} 安裝 '{apkfilename}' …"
 
-#: ../fdroidserver/__main__.py
+#: ../fdroidserver/install.py
+#, python-brace-format
+msgid "Installing '{apkfilename}' on {dev}…"
+msgstr "在 {dev} 安裝 '{apkfilename}' …"
+
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Interact with the repo HTTP server"
 msgstr "與軟體庫 HTTP 伺服器互動"
 
@@ -1011,36 +1004,53 @@ msgstr "與軟體庫 HTTP 伺服器互動"
 msgid "Invalid APK"
 msgstr "無效的 APK"
 
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "Invalid AutoUpdateMode: {mode}"
-msgstr "無效的自動更新模式：{mode}"
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "Invalid UpdateCheckMode: {mode}"
-msgstr "無效的更新檢查模式：{mode}"
-
-#: ../fdroidserver/checkupdates.py
+#: ../fdroidserver/lint.py ../fdroidserver/checkupdates.py
 #, python-brace-format
 msgid "Invalid VercodeOperation: {field}"
 msgstr "無效的 VercodeOperation：{field}"
 
-#: ../fdroidserver/lint.py
-#, fuzzy, python-brace-format
-msgid "Invalid VercodeOperation: {invalid_ops}"
-msgstr "無效的 VercodeOperation：{invalid_ops}"
-
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
 #: ../fdroidserver/common.py
-#, fuzzy, python-brace-format
+#, python-brace-format
 msgid "Invalid application ID {appid}"
-msgstr "無效的 application ID {appid}"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+#, python-format
+msgid "Invalid boolean '%s'"
+msgstr "無效的布林 '%s'"
+
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Invalid build flag at {line} in {linedesc}"
+msgstr "{linedesc} 中在 {line} 行出現無效的編譯標誌"
+
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Invalid build format: {value} in {name}"
+msgstr "無效編譯格式：{name} 的 {value}"
 
 #: ../fdroidserver/lint.py
 msgid "Invalid bulleted list"
 msgstr "無效的排序列表"
 
+#: ../fdroidserver/lint.py
+#, python-format
+msgid "Invalid license tag \"%s\"! Use only tags from https://spdx.org/license-list"
+msgstr "無效的執照標籤 \"%s\"！請使用 https://spdx.org/license-list 標籤"
+
+#: ../fdroidserver/lint.py
+msgid "Invalid link - use [http://foo.bar Link title] or [http://foo.bar]"
+msgstr "無效連結 - 請使用 [http://foo.bar Link title] 或 [http://foo.bar]"
+
+#: ../fdroidserver/metadata.py
+#, python-format
+msgid "Invalid metadata in %s:%d"
+msgstr "%s 中有無效的中介資料 : %d"
+
+#: ../fdroidserver/metadata.py
+msgid "Invalid metadata in: "
+msgstr "無效的中介資料： "
+
 #: ../fdroidserver/common.py
 #, python-format
 msgid "Invalid name for published file: %s"
@@ -1048,8 +1058,8 @@ msgstr "無效的已發佈檔案名稱：%s"
 
 #: ../fdroidserver/common.py
 #, python-brace-format
-msgid "Invalid ndk: entry in build: \"{ndk}\""
-msgstr "建置設定中的 NDK 項目無效：「{ndk}」"
+msgid "Invalid package name {0}"
+msgstr "無效的套件包稱 {0}"
 
 #: ../fdroidserver/common.py
 #, python-brace-format
@@ -1057,19 +1067,24 @@ msgid "Invalid redirect to non-HTTPS: {before} -> {after} "
 msgstr "無效的重新導向到非 HTTPS：{before}->{after}。 "
 
 #: ../fdroidserver/metadata.py
-#, fuzzy, python-brace-format
+#, python-brace-format
 msgid "Invalid scrlib metadata: '{file}' does not exist"
-msgstr "無效的 scrlib metadata: 檔案 '{file}' 不存在"
+msgstr ""
 
 #: ../fdroidserver/metadata.py
-#, fuzzy, python-brace-format
+#, python-brace-format
 msgid "Invalid srclib metadata: could not parse '{file}'"
-msgstr "無效的 scrlib metadata: 無法解析檔案 '{file}'"
+msgstr ""
 
 #: ../fdroidserver/metadata.py
-#, fuzzy, python-brace-format
+#, python-brace-format
 msgid "Invalid srclib metadata: unknown key '{key}' in '{file}'"
-msgstr "無效的 scrlib metadata: 檔案 '{file}' 裡有未知的密鑰 '{key}'"
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Invalid versionCode: \"{versionCode}\" is not an integer!"
+msgstr "無效的版本代號：\"{versionCode}\" 不是整數！"
 
 #: ../fdroidserver/common.py
 #, python-brace-format
@@ -1082,19 +1097,17 @@ msgid "JAR signature verified: {path}"
 msgstr "JAR 簽名已驗證：{path}"
 
 #: ../fdroidserver/scanner.py
-#, fuzzy
 msgid "Java JAR file"
-msgstr "Java JAR 檔案"
+msgstr ""
 
-#: ../fdroidserver/mirror.py ../fdroidserver/publish.py
-#: ../fdroidserver/update.py
+#: ../fdroidserver/publish.py ../fdroidserver/update.py
+#: ../fdroidserver/mirror.py
 msgid "Java JDK not found! Install in standard location or set java_paths!"
 msgstr "找不到 Java JDK！請安裝在標準的位置或是設定 java_paths！"
 
 #: ../fdroidserver/scanner.py
-#, fuzzy
 msgid "Java compiled class"
-msgstr "Java .class 檔案"
+msgstr ""
 
 #: ../fdroidserver/signindex.py
 msgid "Java jarsigner not found! Install in standard location or set java_paths!"
@@ -1104,32 +1117,26 @@ msgstr "找不到 Java jarsigner！請安裝在標準的位置或是設定 java_
 msgid "Javascript in HTML src attributes"
 msgstr "JavaScript 在 HTML src 的屬性"
 
-#: ../fdroidserver/build.py
-#, fuzzy, python-brace-format
-msgid "Keeping failed build \"{apkfilename}\""
-msgstr "讀取 minSdkVersion 失敗：\"{apkfilename}\""
-
 #: ../fdroidserver/init.py
 msgid "Keystore for signing key:\t"
 msgstr "金鑰庫的簽署金鑰：\t"
 
-#: ../fdroidserver/lint.py
-msgid "Known debug key is used in AllowedAPKSigningKeys: "
-msgstr "在 AllowedAPKSigningKeys 中使用了已知的除錯金鑰： "
-
 #: ../fdroidserver/lint.py
 #, fuzzy, python-brace-format
 msgid "Last used commit '{commit}' looks like a tag, but UpdateCheckMode is '{ucm}'"
-msgstr "最近採用的提交 '{commit}' 似乎是一個標籤，但是更新的檢查模式為 '{ucm}'"
+msgstr "最近採用的提交 '{commit}' 似乎是一個標籤，但更新的檢查模式為 '{ucm}'"
 
 #: ../fdroidserver/lint.py
 #, fuzzy
 msgid "Liberapay donation methods belong in the Liberapay: field"
 msgstr "Liberapay 捐款方式在 LiberapayID 標誌下"
 
+#: ../fdroidserver/lint.py
+msgid "Liberapay donation methods belong in the LiberapayID flag"
+msgstr "Liberapay 捐款方式在 LiberapayID 標誌下"
+
 #: ../fdroidserver/rewritemeta.py
-#, fuzzy
-msgid "List files that would be reformatted (dry run)"
+msgid "List files that would be reformatted"
 msgstr "列出將重新格式化的檔案"
 
 #: ../fdroidserver/lint.py
@@ -1148,49 +1155,39 @@ msgstr "軟體庫鏡像異常。"
 msgid "Malformed serverwebroot line:"
 msgstr "異常的 serverwebroot 行："
 
-#: ../fdroidserver/scanner.py
-#, python-format
-msgid "Max recursion depth in ZIP file reached: %s"
-msgstr "已達到 ZIP 檔案中的最大遞迴深度：%s"
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "Mirror config for {url} contains \"isPrimary\" key!"
-msgstr ""
-
 #: ../fdroidserver/mirror.py
-#, fuzzy
 msgid "Mirror the full repo and archive, all file types."
-msgstr "保存整個軟體庫和檔案的副本， 所有的檔案格式 。"
+msgstr ""
 
 #: ../fdroidserver/gpgsign.py
 msgid "Missing output directory"
 msgstr "輸出目錄消失"
 
-#: ../fdroidserver/metadata.py
-msgid "Moving Anti-Features declarations to localized files:"
-msgstr "正在將反功能宣告移至本地化檔案："
+#: ../fdroidserver/lint.py
+#, python-format
+msgid "Name '%s' is just the auto name - remove it"
+msgstr "名稱 '%s' 為自動產生 - 請移除它"
 
-#: ../fdroidserver/index.py
-msgid "Neither \"repo_pubkey\" nor \"keystorepass\" set in config.yml"
-msgstr "在 config.yml 中未設定「repo_pubkey」或「keystorepass」"
-
-#: ../fdroidserver/verify.py
-#, fuzzy, python-format
-msgid "No APK for package: %s"
-msgstr "無此套件包：%s"
+#: ../fdroidserver/common.py
+msgid "No 'config.py' found, using defaults."
+msgstr "找不到 'config.py'，使用預設。"
 
 #: ../fdroidserver/common.py
 msgid "No Android SDK found!"
 msgstr "未找到 Android SDK！"
 
+#: ../fdroidserver/import.py
+msgid "No android or kivy project could be found. Specify --subdir?"
+msgstr "找無 android 或 kivy 專案。指定子目錄嗎？"
+
 #: ../fdroidserver/install.py
 msgid "No attached devices found"
 msgstr "查無附加的設備"
 
-#: ../fdroidserver/install.py
-msgid "No devices found for `adb install`! Please plug one in."
-msgstr "未找到可用於執行 `adb install` 的裝置！請連接一台裝置。"
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "No commit specified for {versionName} in {linedesc}"
+msgstr "{linedesc} 沒有指定給 {versionName} 的提交"
 
 #: ../fdroidserver/index.py
 msgid "No fingerprint in URL."
@@ -1200,25 +1197,15 @@ msgstr "在 URL 無指紋。"
 msgid "No git submodules available"
 msgstr "無可用的 git 子模組"
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 #, fuzzy
 msgid "No gradle project could be found. Specify --subdir?"
-msgstr "找不到任何 gradle 專案。 需要用參數 '--subdir' 指定子目錄嗎？"
+msgstr "找無 android 或 kivy 專案。指定子目錄嗎？"
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py ../fdroidserver/common.py
 msgid "No information found."
 msgstr "查無資訊。"
 
-#: ../fdroidserver/checkupdates.py
-#, fuzzy
-msgid "No matching tags found"
-msgstr "查無資訊"
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "No minimum SDK version found in {0}, using default (3)."
-msgstr "在 {0} 中找不到最低 SDK 版本，使用預設值 (3)。"
-
 #: ../fdroidserver/lint.py
 msgid "No need to specify that the app is Free Software"
 msgstr "不必要指明的應用程式為自由軟體"
@@ -1228,8 +1215,8 @@ msgid "No need to specify that the app is for Android"
 msgstr "不必指明該應用為 Android 版本"
 
 #: ../fdroidserver/deploy.py
-msgid "No option set! Edit your config.yml to set at least one of these:"
-msgstr "未設定選項！編輯 config.yml 檔，其中至少要設定一個："
+msgid "No option set! Edit your config.py to set at least one of these:"
+msgstr "未設定選項！編輯 config.py 檔，其中至少要設定一個："
 
 #: ../fdroidserver/common.py
 msgid "No packages specified"
@@ -1237,14 +1224,14 @@ msgstr "未指定套件"
 
 #: ../fdroidserver/install.py
 #, python-format
-msgid "No signed APK available for %s"
-msgstr "%s 沒有已簽署的 APK"
+msgid "No signed apk available for %s"
+msgstr "%s 沒有已簽署的 apk"
 
 #: ../fdroidserver/install.py
 msgid "No signed output directory - nothing to do"
 msgstr "輸出目錄無簽署 - 無須採取動作"
 
-#: ../fdroidserver/common.py
+#: ../fdroidserver/update.py ../fdroidserver/common.py
 #, python-brace-format
 msgid "No signing certificates found in {path}"
 msgstr "{path} 找不到簽署證書"
@@ -1254,29 +1241,19 @@ msgstr "{path} 找不到簽署證書"
 msgid "No such package: %s"
 msgstr "無此套件包：%s"
 
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
 #: ../fdroidserver/common.py
 #, python-brace-format
 msgid "No such versionCode {versionCode} for app {appid}"
 msgstr "應用 {appid} 無版本代號 {versionCode}"
 
-#: ../fdroidserver/checkupdates.py
-#, fuzzy
-msgid "No tags found"
-msgstr "查無附加的設備"
-
-#: ../fdroidserver/publish.py ../fdroidserver/verify.py
+#: ../fdroidserver/verify.py ../fdroidserver/publish.py
 msgid "No unsigned directory - nothing to do"
 msgstr "無未簽署目錄 - 無須採取行動"
 
-#: ../fdroidserver/__main__.py
-#, fuzzy
-msgid "No version information could be found."
-msgstr "未發現版本資訊"
-
 #: ../fdroidserver/common.py
-#, fuzzy
 msgid "Not a valid size definition: \"{}\""
-msgstr "檔案大小的定義是無效的: \"{}\""
+msgstr ""
 
 #: ../fdroidserver/signindex.py
 msgid "Nothing to do"
@@ -1288,9 +1265,10 @@ msgid "Nothing to do for {appid}."
 msgstr "{appid} 無須採取行動."
 
 #: ../fdroidserver/init.py
-msgid "Now set these in config.yml:"
-msgstr "現在設定這些在 config.yml 中："
+msgid "Now set these in config.py:"
+msgstr "現在設定這些在 config.py 中："
 
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "OBB file has newer versionCode({integer}) than any APK:"
@@ -1305,32 +1283,26 @@ msgid "OBB's packagename does not match a supported APK:"
 msgstr "OBB 的套件包名稱與支援的 APK 並不相符："
 
 #: ../fdroidserver/deploy.py
-#, fuzzy
 msgid "Offline machine, skipping git mirror generation until `fdroid deploy`"
-msgstr "因為機器是離線的， 跳過 git mirror 的生成直到 `fdroid deploy`"
+msgstr ""
 
-#: ../fdroidserver/deploy.py
-msgid "One of the 'github_releases' config items is missing the 'packageNames' value. skipping ..."
-msgstr "其中一個「github_releases」設定項目缺少「packageNames」值。略過..."
+#: ../fdroidserver/common.py
+#, python-brace-format
+msgid "Old APK signature failed to verify: {path}"
+msgstr "舊的 APK 簽名無法驗證：{path}"
 
-#: ../fdroidserver/deploy.py
-msgid "One of the 'github_releases' config items is missing the 'projectUrl' value. skipping ..."
-msgstr "其中一個「github_releases」設定項目缺少「projectUrl」值。略過..."
+#: ../fdroid ../fdroidserver/__main__.py
+msgid "Old, deprecated name for fdroid deploy"
+msgstr "舊的，棄用的 fdroid 部署名稱"
 
-#: ../fdroidserver/deploy.py
-msgid "One of the 'github_releases' config items is missing the 'token' value. skipping ..."
-msgstr "其中一個「github_releases」設定項目缺少「token」值。略過..."
-
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Only PNG and JPEG are supported for graphics, found: {path}"
 msgstr "圖像僅支援 PNG 和 JPEG，可在下方找到：{path}"
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/common.py
-msgid "Only accepts a single key \"env\""
-msgstr ""
+#: ../fdroidserver/checkupdates.py
+msgid "Only print differences with the Play Store"
+msgstr "僅印出與 Play Store 的不同處"
 
 #: ../fdroidserver/checkupdates.py
 msgid "Only process apps with auto-updates"
@@ -1339,37 +1311,44 @@ msgstr "只處理具有自動更新的應用程式"
 #: ../fdroidserver/lint.py
 #, fuzzy
 msgid "OpenCollective donation methods belong in the OpenCollective: field"
-msgstr "OpenCollective 的捐款方式在 OpenCollective: 的標誌下面"
+msgstr "Flattr 捐款方式在 FlattrID 標誌下"
+
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "Options"
+msgstr "選項"
 
 #: ../fdroidserver/verify.py
 msgid "Output JSON report to file named after APK."
-msgstr "將 json 報告輸出到以 APK 命名的檔案。"
+msgstr "將 json 報告輸出到以 apk 命名的檔案。"
 
 #: ../fdroidserver/scanner.py
-#, fuzzy
 msgid "Output JSON to stdout."
-msgstr "輸出 JSON 到 stdout 。"
+msgstr ""
 
-#: ../fdroidserver/checkupdates.py ../fdroidserver/gpgsign.py
-#: ../fdroidserver/publish.py ../fdroidserver/signindex.py
-#: ../fdroidserver/update.py
-#, fuzzy
+#: ../fdroidserver/gpgsign.py ../fdroidserver/publish.py
+#: ../fdroidserver/update.py ../fdroidserver/signindex.py
+#: ../fdroidserver/checkupdates.py
 msgid "Outputting JSON"
-msgstr "正在導出 JSON 中"
+msgstr ""
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "Overall license of the project."
 msgstr "該專案的整體授權。"
 
+#: ../fdroidserver/dscanner.py
+msgid "Override path for repo APKs (default: ./repo)"
+msgstr "覆蓋軟體庫 APK 的路徑 (預設：./repo)"
+
 #: ../fdroidserver/index.py
 #, python-brace-format
 msgid "Overriding blank versionName in {apkfilename} from metadata: {version}"
 msgstr "覆蓋在 {apkfilename} 中的空白 versionName 從詮釋資料：{version}"
 
-#: ../fdroidserver/import_subcommand.py
-#, fuzzy, python-brace-format
+#: ../fdroidserver/import.py
+#, python-brace-format
 msgid "Package \"{appid}\" already exists"
-msgstr "軟體 \"{appid}\" 已經存在了"
+msgstr ""
 
 #: ../fdroidserver/common.py
 #, python-brace-format
@@ -1380,10 +1359,13 @@ msgstr "解析 '{path}' 的單號"
 msgid "Password required with username"
 msgstr "用戶名稱須有密碼"
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 msgid "Path to main Android project subdirectory, if not in root."
 msgstr "如果不在根目錄下，路徑為 android 主要專案的子目錄。"
 
+msgid "Path to main android project subdirectory, if not in root."
+msgstr "如果不在根目錄下，路徑為 android 主要專案的子目錄。"
+
 #: ../fdroidserver/init.py
 msgid "Path to the Android SDK (sometimes set in ANDROID_HOME)"
 msgstr "Android SDK 的路徑（有時在 ANDROID_HOME 中設定）"
@@ -1396,19 +1378,21 @@ msgstr "到 git 軟體庫的路徑用在日誌"
 msgid "Path to the keystore for the repo signing key"
 msgstr "給軟體庫簽署金鑰的金鑰庫路徑"
 
+#: ../fdroidserver/dscanner.py
+msgid "Prepare Drozer to run a scan"
+msgstr "準備 drozer 以執行掃描"
+
+msgid "Prepare drozer to run a scan"
+msgstr "準備 drozer 以執行掃描"
+
 #: ../fdroidserver/nightly.py
 msgid "Print the secret variable to the terminal for easy copy/paste"
 msgstr "在終端機顥示祕密變數以便於複製/貼上"
 
-#: ../fdroidserver/install.py
+#: ../fdroidserver/metadata.py
 #, python-brace-format
-msgid "Privacy mode was enabled based on your locale ({country_code})."
-msgstr "已根據您的地區（{country_code}）啟用了隱私模式。"
-
-#: ../fdroidserver/scanner.py
-#, python-format
-msgid "Problem with ZIP file: %s, error %s"
-msgstr "ZIP 檔案出現問題：%s，錯誤 %s"
+msgid "Problem with description of {appid}: {error}"
+msgstr "{appid}的描述有問題：{error}"
 
 #: ../fdroidserver/common.py
 #, python-brace-format
@@ -1433,7 +1417,11 @@ msgstr "處理 {appid}"
 msgid "Produce human-readable XML/JSON for index files"
 msgstr "產生可讀懂的 XML/JSON 格式以進行檔案索引"
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/update.py
+msgid "Produce human-readable index.xml"
+msgstr "產生可讀懂的 index.xml 格式"
+
+#: ../fdroidserver/import.py
 msgid "Project URL to import from."
 msgstr "要導入的專案網址。"
 
@@ -1445,26 +1433,21 @@ msgstr "標點應予避免"
 msgid "Push the log to this git remote repository"
 msgstr "將日誌推送到 git 遠端軟體庫"
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Pushing binary transparency log to {url}"
 msgstr "推二進制的透明日誌到{url}"
 
-#: ../fdroidserver/deploy.py
-#, fuzzy
-msgid "Pushing to remote server failed!"
-msgstr "Git 遠端 set-head 失敗: \"%s\""
-
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Pushing to {url}"
 msgstr "發佈到 {url}"
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Quickly start a new repository"
 msgstr "快速啟動新的儲存庫"
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Read all the metadata files and exit"
 msgstr "讀取所有的中介資料檔案並退出"
 
@@ -1475,12 +1458,14 @@ msgstr "讀取 '{config_file}' 中"
 
 #: ../fdroidserver/common.py
 #, python-brace-format
-msgid "Reading packageName/versionCode/versionName failed, APK invalid: '{apkfilename}'"
-msgstr "讀取套件名稱/版本代碼/版本名稱 失敗，APK 無效：'{apkfilename}'"
+msgid "Reading minSdkVersion failed: \"{apkfilename}\""
+msgstr "讀取 minSdkVersion 失敗：\"{apkfilename}\""
 
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
+#. https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
 #: ../fdroidserver/common.py
-#, fuzzy, python-brace-format
-msgid "Reading packageName/versionCode/versionName failed,APK invalid: '{apkfilename}'"
+#, python-brace-format
+msgid "Reading packageName/versionCode/versionName failed, APK invalid: '{apkfilename}'"
 msgstr "讀取套件名稱/版本代碼/版本名稱 失敗，APK 無效：'{apkfilename}'"
 
 #: ../fdroidserver/update.py
@@ -1488,36 +1473,25 @@ msgstr "讀取套件名稱/版本代碼/版本名稱 失敗，APK 無效：'{apk
 msgid "Reading {apkfilename} from cache"
 msgstr "從緩存讀取 {apkfilename}"
 
-#: ../fdroidserver/build.py
-msgid "Refresh and cache scanner rules and signatures from the network"
-msgstr "從網路重新整理並快取掃描器規則與簽章"
-
-#: ../fdroidserver/publish.py
-#, python-brace-format
-msgid "Refusing to sign '{path}', file exists in both {dir1} and {dir2} folder."
-msgstr ""
-
-#: ../fdroidserver/verify.py
-msgid "Remove source tarball and any APKs if successfully verified."
-msgstr ""
+#: ../fdroidserver/stats.py
+msgid "Recalculate aggregate stats - use when changes have been made that would invalidate old cached data."
+msgstr "重新計算集合統計 - 使用時進行更改，這會使得舊的快取資料無效。"
 
 #: ../fdroidserver/common.py
 msgid "Removing specified files"
 msgstr "移除指定檔案"
 
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Removing {path}\""
-msgstr "正在移除 {path}\""
-
 #: ../fdroidserver/update.py
 msgid "Rename APK files that do not match package.name_123.apk"
 msgstr "為不符合 package.name_123.apk 格式的 APK 檔案更名"
 
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "RepoType {type} is deprecated, please switch to git."
-msgstr ""
+#: ../fdroidserver/update.py
+msgid "Report on build data status"
+msgstr "報告構建資料的狀態"
+
+#: ../fdroidserver/build.py
+msgid "Reset and create a brand new build server, even if the existing one appears to be ok."
+msgstr "即使現有的伺服器明顯是好的，仍重置並建立一個新的構建伺服器。"
 
 #: ../fdroidserver/nightly.py
 #, python-brace-format
@@ -1532,34 +1506,33 @@ msgstr "重設超過最大像素的所有圖示之尺寸並且退出"
 msgid "Restrict output to warnings and errors"
 msgstr "將輸出限定為警告和錯誤"
 
-#: ../fdroidserver/net.py
-#, python-format
-msgid "Retrying failed download: %s"
-msgstr ""
-
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Rewrite all the metadata files"
 msgstr "重寫所有的中介資料檔案"
 
+#: ../fdroidserver/rewritemeta.py
+msgid "Rewrite to a specific format: "
+msgstr "重寫為特定的格式： "
+
 #: ../fdroidserver/rewritemeta.py
 #, python-brace-format
 msgid "Rewriting '{appid}'"
 msgstr "重覆寫入 '{appid}'"
 
+#: ../fdroidserver/rewritemeta.py
+#, python-brace-format
+msgid "Rewriting '{appid}' to '{path}'"
+msgstr "把 '{appid}' 重寫到 '{path}'"
+
 #: ../fdroidserver/checkupdates.py
 msgid "Run on git repo that has uncommitted changes"
 msgstr "在有未遞交變更的 git 倉庫上執行"
 
-#: ../fdroidserver/nightly.py
-#, python-brace-format
-msgid "Run over {cibase} to find -debug.apk. and skip repo_basedir {repo_basedir}"
-msgstr "在 {cibase} 中尋找 -debug.apk，並略過 repo_basedir {repo_basedir}"
-
 #: ../fdroidserver/lint.py
 msgid "Run rewritemeta to fix formatting"
 msgstr "執行 rewritemeta 到固定格式"
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 msgid "Running first pass with MD5 checking disabled"
 msgstr "關閉 MD5 檢查以執行首次通過"
 
@@ -1568,25 +1541,18 @@ msgstr "關閉 MD5 檢查以執行首次通過"
 msgid "Running wget in {path}"
 msgstr "在 {path} 裡執行 wget"
 
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "SHA-256 of {url} does not match entry!"
-msgstr "{url} 的 SHA-256 與項目不符！"
+#: ../fdroidserver/dscanner.py
+msgid "Scan only the latest version of each package"
+msgstr "只掃描每個套件包的最新版本"
 
 #: ../fdroidserver/build.py
-#, fuzzy
 msgid "Scan the resulting APK(s) for known non-free classes."
-msgstr "在生成的 APK 檔案中掃描已知的閉源軟體 。"
+msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Scan the source code of a package"
 msgstr "掃描套件包的原始碼"
 
-#: ../fdroidserver/scanner.py
-#, fuzzy, python-brace-format
-msgid "Scanner found {count} problems in {apk}"
-msgstr "掃瞄器在 {apk} 發現{count} 個問題"
-
 #: ../fdroidserver/scanner.py
 #, python-brace-format
 msgid "Scanner found {count} problems in {appid}:"
@@ -1602,35 +1568,20 @@ msgid "Scanner found {} problem"
 msgid_plural "Scanner found {} problems"
 msgstr[0] "掃瞄器發現 {} 問題"
 
-#: ../fdroidserver/scanner.py
-msgid "Scanning APK for extra signing blocks."
-msgstr "正在掃描 APK 以檢查額外的簽章區塊。"
-
-#: ../fdroidserver/scanner.py
-#, fuzzy
-msgid "Scanning APK with dexdump for known non-free classes."
-msgstr "在生成的 APK 檔案中掃描已知的閉源軟體 。"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "Set NDK {release} ({version}) up"
-msgstr "正在設定 NDK {release}（{version}）"
-
 #: ../fdroidserver/common.py
 msgid "Set clock to that time using:"
 msgstr "設定時鐘到那時使用："
 
 #: ../fdroidserver/nightly.py
-#, fuzzy
 msgid "Set maximum releases in repo before older ones are archived"
-msgstr "先設置軟體庫的軟體最大釋出數， 再將舊軟體歸檔"
+msgstr ""
 
 #: ../fdroidserver/build.py
 #, python-brace-format
 msgid "Set open file limit to {integer}"
 msgstr "設定開啟的檔案限制為 {integer}"
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Set up an app build for a nightly build repo"
 msgstr "為非正式編譯庫建立一個應用編譯"
 
@@ -1643,11 +1594,18 @@ msgstr "設定開啟檔案的限制失敗： "
 msgid "Setting {0} sec timeout for this build"
 msgstr "為此構建設定 {0} 秒後超時"
 
-#: ../fdroidserver/__main__.py
+#: ../fdroidserver/build.py
+msgid "Setup an emulator, install the APK on it and perform a Drozer scan"
+msgstr "設置一個模擬器，在其上安裝 APK 並執行 drozer 掃描"
+
+msgid "Setup an emulator, install the apk on it and perform a drozer scan"
+msgstr "設置一個模擬器，在其上安裝 apk 並執行 drozer 掃描"
+
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Sign and place packages in the repo"
 msgstr "簽署並放置套件包在軟體庫中"
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Sign indexes created using update --nosign"
 msgstr "簽署使用更新建立的索引 --nosign"
 
@@ -1660,11 +1618,6 @@ msgstr "跳過掃描二進制碼和其它問題的原始碼"
 msgid "Skipping '{apkfilename}' with invalid signature!"
 msgstr "略過帶無效簽署的 '{apkfilename}'！"
 
-#: ../fdroidserver/deploy.py ../fdroidserver/index.py
-#, python-format
-msgid "Skipping GitLab Pages mirror because the repo is too large (>%.2fGB)!"
-msgstr "因儲存庫過大（>%.2fGB），略過 GitLab Pages 鏡像！"
-
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Skipping index generation for {appid}"
@@ -1680,14 +1633,23 @@ msgstr "略過無效簽名的 {apkfilename}！"
 msgid "Skipping {appid}: disabled"
 msgstr "略過 {appid}：關閉"
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/scanner.py
+#, python-brace-format
+msgid "Skipping {appid}: no builds specified"
+msgstr "略過 {appid}：無指定編譯"
+
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 msgid "Specify a local folder to sync the repo to"
 msgstr "指定要將軟體庫同步到本地的資料夾"
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 msgid "Specify an identity file to provide to SSH for rsyncing"
 msgstr "指定一個身份檔案以提供給 SSH 進行 rsync"
 
+#: ../fdroidserver/build.py
+msgid "Specify that we're running on the build server"
+msgstr "指定在構建伺服務器上運作"
+
 #: ../fdroidserver/nightly.py
 msgid "Specify which debug keystore file to use."
 msgstr "指定要使用哪個除錯金鑰庫檔。"
@@ -1696,10 +1658,15 @@ msgstr "指定要使用哪個除錯金鑰庫檔。"
 msgid "Spew out even more information than normal"
 msgstr "傾湧出比正常情況下更多的資訊"
 
+#: ../fdroidserver/nightly.py
+#, python-brace-format
+msgid "Striping mystery signature from {apkfilename}"
+msgstr "正從 {apkfilename} 除去隱秘簽名"
+
 #: ../fdroidserver/nightly.py
 #, fuzzy, python-brace-format
 msgid "Stripping mystery signature from {apkfilename}"
-msgstr "正從軟體 {apkfilename} 除去未知的簽名"
+msgstr "正從 {apkfilename} 除去隱秘簽名"
 
 #: ../fdroidserver/lint.py
 #, python-format
@@ -1716,22 +1683,10 @@ msgstr "摘要的長度 {length} 超過了字符 {limit} 限制"
 msgid "System clock is older than date in {path}!"
 msgstr "在 {path} 中的系統時鐘比日期早！"
 
-#: ../fdroidserver/checkupdates.py
-msgid "Tags update mode only works for git, hg, bzr and git-svn repositories currently"
-msgstr "標籤更新模式目前僅適用於 git、hg、bzr 與 git-svn 儲存庫"
-
-#: ../fdroidserver/checkupdates.py
-msgid "Tags update mode used in git-svn, but the repo was not set up with tags"
-msgstr "在 git-svn 中使用了標籤更新模式，但儲存庫未設定標籤"
-
 #: ../fdroidserver/build.py
 msgid "Test mode - put output in the tmp directory only, and always build, even if the output already exists."
 msgstr "測試模式 - 將輸出只放在 tmp 目錄中，即使輸出已經存在，仍然構建。"
 
-#: ../fdroidserver/index.py
-msgid "The \"qrcode\" Python package is not installed (e.g. apt-get install python3-qrcode)!"
-msgstr ""
-
 #. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
 #: ../fdroidserver/update.py
 #, python-brace-format
@@ -1750,10 +1705,18 @@ msgstr "寫入目錄的鏡像到"
 msgid "The file to be included in the repo (path or glob)"
 msgstr "包含在此軟體庫的檔案 (path 或 glob)"
 
+#: ../fdroidserver/deploy.py
+msgid "The only commands currently supported are 'init' and 'update'"
+msgstr "目前支援的命令僅 'init' 或 'update'"
+
 #: ../fdroidserver/index.py
 msgid "The repository's fingerprint does not match."
 msgstr "軟體庫的指紋並不相符。"
 
+#: ../fdroidserver/common.py
+msgid "The repository's index could not be verified."
+msgstr "軟體庫的索引無法被驗證。"
+
 #: ../fdroidserver/deploy.py
 #, python-brace-format
 msgid "The root dir for local_copy_dir \"{path}\" does not exist!"
@@ -1764,64 +1727,30 @@ msgid "There is a keyalias collision - publishing halted"
 msgstr "發生主要別名衝突 - 發佈中止"
 
 #: ../fdroidserver/common.py
-#, fuzzy
 msgid "These are the apps that have been archived from the main repo."
-msgstr "這些是從主軟體庫中歸檔的軟體。"
-
-#: ../fdroidserver/mirror.py
-#, fuzzy
-msgid "This command should never be used to mirror f-droid.org! A full copy requires more than 600GB."
 msgstr ""
-"錯誤：此命令絕不該用於鏡像 f-droid.org！\n"
-"完整的 f-droid.org 鏡像需要超過 200GB。"
 
-#: ../fdroidserver/common.py
-#, fuzzy
-msgid "This is a repository of apps to be used with F-Droid. Applications in this repository are either official binaries built by the original application developers, or are binaries built from source by the admin of f-droid.org using the tools on https://gitlab.com/fdroid."
-msgstr "這是一個和 F-Droid 配套使用的軟體庫。此軟體庫中包含由程式原開發者編譯製作而成的二進制包和由 fdroid.org 的管理員使用 https://gitlab.com/fdroid 上的開發者工具編譯製作而成的二進制包。"
-
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/import.py
 #, python-format
 msgid "This repo already has local metadata: %s"
 msgstr "這個軟體庫已有本地的中介資料：%s"
 
-#: ../fdroidserver/init.py
-#, python-format
-msgid ""
-"To complete the setup, add your APKs to \"%s\"\n"
-"then run \"fdroid update -c; fdroid update\".  You might also want to edit\n"
-"\"config.yml\" to set the URL, repo name, and more.  You should also set up\n"
-"a signing key (a temporary one might have been automatically generated).\n"
-"\n"
-"For more info: https://f-droid.org/docs/Setup_an_F-Droid_App_Repo\n"
-"and https://f-droid.org/docs/Signing_Process"
-msgstr ""
-"要完成設定，請將您的 APK 新增至「%s」\n"
-"然後執行「fdroid update -c; fdroid update」。您可能也想要編輯\n"
-"「config.yml」以設定網址、儲存庫名稱等。您還應該設定\n"
-"簽署金鑰（可能已自動產生一個暫時性的金鑰）。\n"
-"\n"
-"更多資訊請參考：https://f-droid.org/docs/Setup_an_F-Droid_App_Repo\n"
-"與 https://f-droid.org/docs/Signing_Process"
-
-#: ../fdroidserver/deploy.py
-msgid "To use awsbucket, awssecretkey and awsaccesskeyid must also be set in config.yml!"
-msgstr "要使用 awsbucket, awssecretkey 與 awsaccesskeyid 必須在 config.yml 進行設定！"
-
-#: ../fdroidserver/deploy.py
-#, fuzzy
-msgid "To use rclone, rclone_config and awsbucket must be set in config.yml!"
-msgstr "要使用 awsbucket, awssecretkey 與 awsaccesskeyid 必須在 config.yml 進行設定！"
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
+msgid "To use awsbucket, awssecretkey and awsaccesskeyid must also be set in config.py!"
+msgstr "要使用 awsbucket, awssecretkey 與 awsaccesskeyid 必須在 config.py 進行設定！"
 
 #: ../fdroidserver/lint.py
-#, fuzzy
 msgid "URL must start with https:// or http://"
-msgstr "URL 必須由 https:// 和 http:// 起頭"
+msgstr ""
 
 #: ../fdroidserver/lint.py
 msgid "URL shorteners should not be used"
 msgstr "不應使用 URL 縮短網址"
 
+#: ../fdroidserver/metadata.py
+msgid "URL title is just the URL, use brackets: [URL]"
+msgstr "URL 標題就是 URL，請用括號：[URL]"
+
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "URL {url} in Description: {error}"
@@ -1830,22 +1759,22 @@ msgstr "描述中的 URL {url} : {error}"
 #: ../fdroidserver/lint.py
 #, fuzzy
 msgid "Unexpected license tag \"{}\"! Only use FSF or OSI approved tags from https://spdx.org/license-list"
-msgstr "這個許可證標籤不符合預期 \"{}\"！ 只能使用 https://spdx.org/license-list 上的，經過 FSF 或 OSI 驗證的許可證標籤啦。"
+msgstr "無效的執照標籤 \"%s\"！請使用 https://spdx.org/license-list 標籤"
 
 #: ../fdroidserver/lint.py
-#, fuzzy
 msgid "Unexpected license tag \"{}\"! Only use license tags configured in your config file"
-msgstr "這個許可證標籤不符合預期 \"{}\"！ 只能使用你的配置文檔裡面配置好的許可證標籤啦"
+msgstr ""
 
-#: ../fdroidserver/common.py
-#, fuzzy, python-brace-format
-msgid "Unknown entry {key} in {configname}"
-msgstr "配置文檔 {configname} 裡面登記的密鑰 {key} 是未知的"
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Unexpected text on same line as {field} in {linedesc}"
+msgstr "在 {linedesc} 在同一行的 {field} 出現未預期的文字"
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Unknown exception found!"
 msgstr "發現未知的異常！"
 
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "Unknown file '{filename}' in build '{versionName}'"
@@ -1856,15 +1785,24 @@ msgstr "在 '{versionName}' 編譯出現不明的檔案 '{filename}'"
 msgid "Unknown metadata format: %s"
 msgstr "未知的中介資料格式：%s"
 
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Unknown metadata format: {path}"
+msgstr "未知的中介資料格式t：{path}"
+
 #: ../fdroidserver/metadata.py
 #, fuzzy, python-brace-format
 msgid "Unknown metadata format: {path} (use: *.yml)"
-msgstr "Metadata 的格式是未知的: 路徑: {path} （使用: *.yml）"
+msgstr "未知的中介資料格式t：{path}"
 
 #: ../fdroidserver/common.py
 msgid "Unknown version of aapt, might cause problems: "
 msgstr "不明的 aapt 版本，可能會出問題： "
 
+#: ../fdroidserver/lint.py
+msgid "Unlinkified link - use [http://foo.bar Link title] or [http://foo.bar]"
+msgstr "無連鏈的連結 - 使用 [http://foo.bar 鏈結標題] 或 [http://foo.bar]"
+
 #: ../fdroidserver/lint.py
 msgid "Unnecessary leading space"
 msgstr "不必要的前導空間"
@@ -1878,12 +1816,20 @@ msgstr "不必要的尾隨空間"
 msgid "Unrecognised app field '{fieldname}' in '{path}'"
 msgstr "在 '{path}' 中無法辨識的 app 欄位 '{fieldname}'"
 
+#: ../fdroidserver/metadata.py
+msgid "Unrecognised app field: "
+msgstr "無法辨識的 app 欄位： "
+
 #: ../fdroidserver/metadata.py
 #, python-brace-format
 msgid "Unrecognised build flag '{build_flag}' in '{path}'"
 msgstr "在 '{path}' 中無法辨識的構建旗標 '{build_flag}'"
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Unrecognised field '{field}' in {linedesc}"
+msgstr "在 {linedesc} 無法辨識的欄位 '{field}'"
+
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "Unsupported file type \"{extension}\" for repo graphic"
@@ -1894,6 +1840,29 @@ msgstr "用於軟體庫的圖片，不支援的檔案類型 \"{extension}\""
 msgid "Unsupported graphics file found: {path}"
 msgstr "找到不支援的圖形檔案：{path}"
 
+#: ../fdroidserver/rewritemeta.py
+#, python-brace-format
+msgid "Unsupported metadata format, use: --to [{supported}]"
+msgstr "未支援的中介資料格式，使用：--to [{supported}]"
+
+#: ../fdroidserver/metadata.py
+msgid "Unterminated ]"
+msgstr "未結束的 ]"
+
+#: ../fdroidserver/metadata.py
+msgid "Unterminated ]]"
+msgstr "未結束的 ]]"
+
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Unterminated build in {name}"
+msgstr "在 {name} 未結束的編譯"
+
+#: ../fdroidserver/metadata.py
+#, python-brace-format
+msgid "Unterminated continuation in {name}"
+msgstr "在 {name}未結束的續編"
+
 #: ../fdroidserver/lint.py
 #, python-format
 msgid "Unused extlib at %s"
@@ -1907,32 +1876,34 @@ msgstr "在 %s 未使用的檔案"
 #: ../fdroidserver/scanner.py
 #, fuzzy, python-format
 msgid "Unused scandelete path: %s"
-msgstr "路徑: %s 被標記為掃描並刪除，但並未執行"
+msgstr "在 %s 未使用的檔案"
 
 #: ../fdroidserver/scanner.py
 #, fuzzy, python-format
 msgid "Unused scanignore path: %s"
-msgstr "檔案路徑: %s 被標記為不掃描，但並未出現"
+msgstr "在 %s 未使用的檔案"
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Update repo information for new packages"
 msgstr "為新的套件包更新軟體庫資訊"
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Update the binary transparency log for a URL"
 msgstr "為網址更新二進制的透明日誌"
 
+#: ../fdroid ../fdroidserver/__main__.py
+msgid "Update the stats of the repo"
+msgstr "更新軟體庫的統計"
+
+#: ../fdroidserver/update.py ../fdroidserver/build.py
+msgid "Update the wiki"
+msgstr "更新維基百科"
+
 #: ../fdroidserver/checkupdates.py
 #, python-brace-format
 msgid "UpdateCheckData has invalid URL: {url}"
 msgstr "UpdateCheckData 有無效的 URL：{url}"
 
-#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
-#: ../fdroidserver/lint.py
-#, python-brace-format
-msgid "UpdateCheckData must match the version code as integer (\\d or [0-9]): {codeex}"
-msgstr "UpdateCheckData 必須符合整數版本代碼（\\d 或 [0-9]）：{codeex}"
-
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "UpdateCheckData must use HTTPS URL: {url}"
@@ -1944,28 +1915,43 @@ msgid "UpdateCheckData not a valid URL: {url}"
 msgstr "UpdateCheckData 不是有效的 URL：{url}"
 
 #: ../fdroidserver/lint.py
-msgid "UpdateCheckMode is set but it looks like checkupdates hasn't been run yet."
-msgstr "已設定 UpdateCheckMode，但似乎尚未執行 checkupdates。"
+msgid "UpdateCheckMode is set but it looks like checkupdates hasn't been run yet"
+msgstr "UpdateCheckMode 已被設定但它似乎尚未曾執行更新檢查"
+
+#. Translators: https://developer.android.com/studio/build/application-id
+#: ../fdroidserver/lint.py
+#, fuzzy
+msgid "UpdateCheckName is set to the known application ID - it can be removed"
+msgstr "更新 Check Name 被設定成已知的應用 id - 它可以被移除"
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
 #: ../fdroidserver/lint.py
 #, fuzzy
 msgid "UpdateCheckName is set to the known application ID, it can be removed"
-msgstr "UpdateCheckName 已經被設定成已知的 application id - 它可以被移除"
+msgstr "更新 Check Name 被設定成已知的應用 id - 它可以被移除"
 
 #: ../fdroidserver/deploy.py
-#, fuzzy, python-brace-format
+#, python-brace-format
 msgid "Uploading {apkfilename} to androidobservatory.org"
-msgstr "正在將軟體檔案 {apkfilename} 上傳到 androidobservatory.org"
+msgstr ""
 
 #: ../fdroidserver/deploy.py
 #, fuzzy, python-brace-format
 msgid "Uploading {apkfilename} to virustotal"
-msgstr "正在將軟體檔案 {apkfilename} 上傳到 virustotal"
+msgstr "從緩存讀取 {apkfilename}"
+
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "Usage"
+msgstr "使用方法"
+
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, python-format
+msgid "Usage: %s\n"
+msgstr "使用方法：%s\n"
 
 #: ../fdroidserver/lint.py
-#, fuzzy
-msgid "Use /HEAD instead of /master or /main to point at a file in the default branch"
+msgid "Use /HEAD instead of /master to point at a file in the default branch"
 msgstr "使用 /HEAD 取代 /master 來指向默認分支的一個檔案"
 
 #: ../fdroidserver/update.py
@@ -1980,56 +1966,42 @@ msgstr "使用構建伺服器"
 msgid "Use date from APK instead of current time for newly added APKs"
 msgstr "使用來自 APK 的日期，而不是新增之 APK 目前的時間"
 
-#: ../fdroidserver/deploy.py
+msgid "Use date from apk instead of current time for newly added apks"
+msgstr "新增的 apk 使用日期，來自 apk 而不是目前時間"
+
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Using \"{path}\" for configuring s3cmd."
 msgstr "使用 \"{path}\" 對 s3cmd 組態。"
 
-#: ../fdroidserver/deploy.py
-#, fuzzy, python-brace-format
-msgid "Using \"{path}\" for syncing with remote storage."
-msgstr "使用 \"{path}\" 對 s3cmd 組態。"
-
 #: ../fdroidserver/common.py
-#, fuzzy
 msgid "Using APK Signature v2"
-msgstr "使用 APK Signature v2"
+msgstr ""
 
 #: ../fdroidserver/common.py
-#, fuzzy
 msgid "Using APK Signature v3"
-msgstr "使用 APK Signature v3"
-
-#: ../fdroidserver/common.py
-#, fuzzy
-msgid "Using JAR Signature"
-msgstr "使用 APK Signature v2"
+msgstr ""
 
 #: ../fdroidserver/common.py
 msgid "Using Java's jarsigner, not recommended for verifying APKs! Use apksigner"
 msgstr "使用 Java 的 jarsigner，這並不建議用於驗證 APK！使用 apksigner"
 
-#: ../fdroidserver/metadata.py
+#: ../fdroidserver/common.py
 #, python-brace-format
-msgid "Using blank dictionary instead of contents of {path}!"
-msgstr "使用空白字典而非 {path} 的內容！"
+msgid "Using androguard from \"{path}\""
+msgstr "使用從「{path}」而來的 androguard"
 
 #: ../fdroidserver/init.py
 #, python-brace-format
 msgid "Using existing keystore \"{path}\""
 msgstr "使用現有的金鑰庫 \"{path}\""
 
-#: ../fdroidserver/deploy.py
-#, fuzzy, python-brace-format
-msgid "Using rclone to sync with: {url}"
-msgstr "使用 s3cmd 來同步：{url}"
-
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "Using s3cmd to sync with: {url}"
 msgstr "使用 s3cmd 來同步：{url}"
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Valid commands are:"
 msgstr "有效的指令是："
 
@@ -2037,7 +2009,7 @@ msgstr "有效的指令是："
 msgid "Verify against locally cached copy rather than redownloading."
 msgstr "使用本機快取複本來驗證而非重新下載。"
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Verify the integrity of downloaded packages"
 msgstr "驗證下載套裝軟體的完整性"
 
@@ -2045,48 +2017,25 @@ msgstr "驗證下載套裝軟體的完整性"
 msgid "Verifying index signature:"
 msgstr "正在驗證索引簽名："
 
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "Verifying package {path} with apksigner."
-msgstr "正在使用 apksigner 驗證套件 {path}。"
-
 #: ../fdroidserver/deploy.py
-#, fuzzy, python-brace-format
+#, python-brace-format
 msgid "VirusTotal API key cannot upload files larger than 32MB, use {url} to upload {path}."
-msgstr "VirusTotal API key 無法上傳大於 32MB 的檔案， 選擇使用 {url} 來上傳檔案 {path} 。"
-
-#: ../fdroidserver/nightly.py
-msgid "WARNING: only public git repos are supported!"
 msgstr ""
 
-#: ../fdroidserver/__main__.py
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "Warn about possible metadata errors"
 msgstr "關於中介資料可能錯誤的警告"
 
-#: ../fdroidserver/scanner.py
-msgid "WebAssembly binary file"
-msgstr "WebAssembly 二進位檔案"
-
 #: ../fdroidserver/update.py
 msgid "When configured for signed indexes, create only unsigned indexes at this stage"
 msgstr "當已組態為簽名的索引時，只能在此階段建立無簽名的索引"
 
 #: ../fdroidserver/lint.py
-#, fuzzy
 msgid "When linting the entire repository yamllint is disabled by default. This option forces yamllint regardless."
-msgstr "在默認情況下， 檢查整個軟體庫中的可疑代碼時不會檢查 yaml 檔案 （yamllint） 。 使用本選項將會忽略默認選項，在檢查整個軟體庫中的可疑代碼時強制檢查 yaml 檔案 （yamllint） 。"
+msgstr ""
 
-#: ../fdroidserver/publish.py
-msgid "When signing or verifying fails, exit with an error code."
-msgstr "當簽署或驗證失敗時，以錯誤碼結束。"
-
-#: ../fdroidserver/install.py
-msgid "Would you like to download and install F-Droid.apk via adb? (YES/no)"
-msgstr "您是否想透過 adb 下載並安裝 F-Droid.apk？（是/否）"
-
-#: ../fdroidserver/install.py
-msgid "Would you like to download the app(s) from f-droid.org? (YES/no)"
-msgstr "您是否想從 f-droid.org 下載應用程式？（是/否）"
+msgid "X.509 'Distiguished Name' used when generating keys"
+msgstr "產生金鑰時使用 X.509 '專有名稱'"
 
 #: ../fdroidserver/init.py
 msgid "X.509 'Distinguished Name' used when generating keys"
@@ -2097,14 +2046,8 @@ msgid "You can use ANDROID_HOME to set the path to your SDK, i.e.:"
 msgstr "可以使用 ANDROID_HOME 來設定 SDK 的路徑，i.e.："
 
 #: ../fdroidserver/scanner.py
-#, fuzzy
 msgid "ZIP file archive"
-msgstr "ZIP 壓縮檔案"
-
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "adb reports {serial} is \"{status}\"!"
-msgstr "adb 回報 {serial} 為「{status}」！"
+msgstr ""
 
 #: ../fdroidserver/nightly.py
 #, python-brace-format
@@ -2116,84 +2059,87 @@ msgstr "添增 IdentityFile 到 {path}"
 msgid "adding to {name}: {path}"
 msgstr "添加到 {name}：{path}"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "ambiguous option: %(option)s could match %(matches)s"
 msgstr "模糊選項：%(option)s 可以相配 %(matches)s"
 
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, python-format
+msgid "ambiguous option: %s (%s?)"
+msgstr "不明確的選項：%s (%s？)"
+
 #: ../fdroidserver/common.py
-#, python-brace-format
-msgid "apksigner in build-tools;{version} passes APKs with invalid v3 signatures, ignoring."
+msgid "apksigner not found, it's required for signing!"
 msgstr ""
 
-#: ../fdroidserver/common.py
-#, fuzzy
-msgid "apksigner not found! Cannot sign or verify modern APKs"
-msgstr "apksigner 不見了 ， 我們需要用它來生成數字簽名 ！"
-
-#: ../fdroidserver/common.py
-#, fuzzy
-msgid "apksigner not found, it's required for signing!"
-msgstr "apksigner 不見了 ， 我們需要用它來生成數字簽名 ！"
-
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/checkupdates.py ../fdroidserver/lint.py
-#: ../fdroidserver/rewritemeta.py
+#: ../fdroidserver/lint.py ../fdroidserver/rewritemeta.py
+#: ../fdroidserver/checkupdates.py
 #, fuzzy
 msgid "application ID of file to operate on"
-msgstr "從檔案的 application ID 著手"
+msgstr "以 applicationId 檢查更新"
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
-#: ../fdroidserver/build.py ../fdroidserver/install.py
-#: ../fdroidserver/publish.py ../fdroidserver/scanner.py
-#: ../fdroidserver/verify.py
+#: ../fdroidserver/verify.py ../fdroidserver/publish.py
+#: ../fdroidserver/build.py ../fdroidserver/scanner.py
+#: ../fdroidserver/install.py
 #, fuzzy
 msgid "application ID with optional versionCode in the form APPID[:VERCODE]"
-msgstr "application ID 具有任選的 versionCode 在此的格式為 APPID [:VERCODE]"
+msgstr "applicationId 具有任選的 versionCode 在此格式為 APPID [:VERCODE]"
 
-#: ../fdroidserver/common.py
-msgid "archive_url needs to end with /archive"
-msgstr "archive_url 必須以 /archive 結尾"
+#: ../fdroidserver/lint.py ../fdroidserver/rewritemeta.py
+msgid "applicationId in the form APPID"
+msgstr "applicationId 格式為 APPID"
 
-#: /usr/lib/python3.11/argparse.py
+#: ../fdroidserver/checkupdates.py
+msgid "applicationId to check for updates"
+msgstr "以 applicationId 檢查更新"
+
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vcode
+#: ../fdroidserver/verify.py ../fdroidserver/publish.py
+#: ../fdroidserver/dscanner.py ../fdroidserver/build.py
+#: ../fdroidserver/scanner.py ../fdroidserver/install.py
+msgid "applicationId with optional versionCode in the form APPID[:VERCODE]"
+msgstr "applicationId 具有任選的 versionCode 在此格式為 APPID [:VERCODE]"
+
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "argument \"-\" with mode %r"
 msgstr "引數 \"-\" 為帶 %r 模式"
 
-#: /usr/lib/python3.11/argparse.py
-#, python-format
-msgid "argument %(argument_name)s: %(message)s"
-msgstr "引數 %(argument_name)s：%(message)s"
-
 #: ../fdroidserver/nightly.py
 #, fuzzy
 msgid "attempting bare SSH connection to test deploy key:"
-msgstr "試圖用裸的 ssh 連線來測試佈署金鑰："
+msgstr "試圖顯露 ssh 連線來測試佈署金鑰："
+
+#: ../fdroidserver/nightly.py
+msgid "attempting bare ssh connection to test deploy key:"
+msgstr "試圖顯露 ssh 連線來測試佈署金鑰："
 
 #: ../fdroidserver/common.py
-#, fuzzy
 msgid "can not parse scrlib spec (not a string): '{}'"
-msgstr "無法解析 scrlib spec （不是字符）: '{}'"
+msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
-msgid "can't open '%(filename)s': %(error)s"
-msgstr "無法打開 '%(filename)s'：%(error)s"
-
-#: ../fdroidserver/scanner.py
-msgid "can't open non-https url: '{};"
-msgstr "無法開啟非 HTTPS 網址：'{};"
+msgid "can't open '%s': %s"
+msgstr "無法打開 '%s'：%s"
 
 #: ../fdroidserver/build.py
 #, fuzzy, python-brace-format
 msgid "cannot find required srclibs: \"{path}\""
-msgstr "找不到必須的 scrlibs: \"{path}\""
+msgstr "找不到 {path} 的 appid！"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "cannot have multiple subparser arguments"
 msgstr "無法有多個子解析器引數"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "cannot merge actions - two groups are named %r"
 msgstr "無法合併動作 - 二個群體被命名為 %r"
@@ -2207,110 +2153,117 @@ msgstr "無法發佈更新，是否正確地設定了佈署金鑰？"
 msgid "cloning {url}"
 msgstr "複製 {url}"
 
-#: ../fdroidserver/__main__.py
-#, fuzzy
-msgid "commands from plugin modules:"
-msgstr "來自插換式模塊的命令："
+#: ../fdroidserver/deploy.py
+msgid "command to execute, either 'init' or 'update'"
+msgstr "命令執行，'init' 或 'update' 中的任何一個"
 
-#: /usr/lib/python3.11/argparse.py
+#: ../fdroidserver/__main__.py
+msgid "commands from plugin modules:"
+msgstr ""
+
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "complex"
+msgstr "複雜"
+
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "conflicting option string: %s"
 msgid_plural "conflicting option strings: %s"
 msgstr[0] "相衝突的選項字串：%s"
 
-#: /usr/lib/python3.11/argparse.py
-#, fuzzy, python-format
-msgid "conflicting subparser alias: %s"
-msgstr "相衝突的選項字串：%s"
-
-#: /usr/lib/python3.11/argparse.py
-#, fuzzy, python-format
-msgid "conflicting subparser: %s"
-msgstr "相衝突的選項字串：%s"
+#: ../fdroidserver/nightly.py
+#, python-brace-format
+msgid "copying {apkfilename} into {path}"
+msgstr "複製 {apkfilename} 到 {path}"
 
 #: ../fdroidserver/metadata.py
-#, fuzzy, python-brace-format
+#, python-brace-format
 msgid "could not parse '{path}'"
-msgstr "無法解析 '{path}'"
+msgstr ""
 
 #: ../fdroidserver/common.py
-#, fuzzy
-msgid "could not parse srclib spec (no name specified): '{}'"
-msgstr "無法解析 scrlib spec （沒有指定參考文獻）： '{}'"
-
-#: ../fdroidserver/common.py
-#, fuzzy
 msgid "could not parse srclib spec (no ref specified): '{}'"
-msgstr "無法解析 scrlib spec （沒有指定參考文獻）： '{}'"
+msgstr ""
+
+#: ../fdroidserver/common.py
+msgid "could not parse srclib spec (too many '@' signs): '{}'"
+msgstr ""
 
 #: ../fdroidserver/nightly.py
 #, python-brace-format
 msgid "created {path}"
 msgstr "已建立 {path}"
 
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "current version is newer: old vercode={old}, new vercode={new}"
-msgstr "目前版本較新：舊版本代碼={old}，新版本代碼={new}"
-
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "deleting: repo/{apkfilename}"
 msgstr "刪除：repo/{apkfilename}"
 
-#: ../fdroidserver/scanner.py
-msgid "dependency file without lock"
-msgstr "依存檔案未上鎖"
+#: ../fdroidserver/common.py
+#, python-brace-format
+msgid "deployed build logs to '{path}'"
+msgstr "已將構建記錄部署到「{path}」"
 
 #: ../fdroidserver/common.py
-#, fuzzy, python-brace-format
+#, python-brace-format
 msgid "deployed process log {path} to {dest}"
-msgstr "將進程日誌 {path} 部署到 {dest}"
+msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "dest= is required for options like %r"
 msgstr "dest= 如 %r 選項為必須"
 
 #: ../fdroidserver/scanner.py
-msgid "downloading '{}'"
-msgstr "正在下載「{}」"
-
-#: ../fdroidserver/scanner.py
-#, fuzzy
-msgid "downloading scanner signatures from '{}' failed"
-msgstr "正從軟體 {apkfilename} 除去未知的簽名"
-
-#: ../fdroidserver/scanner.py
-#, fuzzy
 msgid "executable binary, possibly code"
-msgstr "可執行二進制檔案， 估計是代碼"
+msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "expected %s argument"
 msgid_plural "expected %s arguments"
 msgstr[0] "預期的 %s 引數"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "expected at least one argument"
 msgstr "預期至少有一個引數"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "expected at most one argument"
 msgstr "最多一個引數"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "expected one argument"
 msgstr "預期有一個引數"
 
-#: ../fdroidserver/__main__.py
+#: ../fdroidserver/common.py
+#, python-brace-format
+msgid "failed deploying build logs to '{path}'"
+msgstr "構建記錄部署到「{path}」失敗"
+
+#: ../fdroid
+msgid "fdroid [-h|--help|--version] <command> [<args>]"
+msgstr "用法：fdroid [-h|--help|--version] <命令> [<args>]"
+
+#: ../fdroid ../fdroidserver/__main__.py
 msgid "fdroid [<command>] [-h|--help|--version|<args>]"
 msgstr "用法：fdroid [-h|--help|--version] <命令> [<args>]"
 
-#: ../fdroidserver/scanner.py
-msgid "fetch the latest version of signatures from the web"
-msgstr "從網路擷取最新版本的簽章"
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "floating-point"
+msgstr "浮點"
+
+#: ../fdroidserver/metadata.py
+msgid "force errors to be warnings, or ignore"
+msgstr "強制錯誤警告或忽略"
 
 #: ../fdroidserver/metadata.py
 msgid "force metadata errors (default) to be warnings, or to be ignored."
@@ -2321,11 +2274,11 @@ msgid "git svn clone failed"
 msgstr "Git svn 複製失敗"
 
 #: ../fdroidserver/scanner.py
-#, fuzzy
 msgid "gzip file archive"
-msgstr "gzip 壓縮檔案"
+msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "ignored explicit argument %r"
 msgstr "被忽略的明確引數 %r"
@@ -2334,40 +2287,35 @@ msgstr "被忽略的明確引數 %r"
 msgid "index-v1 must have a signature, use `fdroid signindex` to create it!"
 msgstr "index-v1 必須要有簽名, 使用 `fdroid signindex`來建立一組簽名！"
 
-#: ../fdroidserver/index.py
-#, fuzzy
-msgid "index-v2 must have a signature, use `fdroid signindex` to create it!"
-msgstr "index-v1 必須要有簽名, 使用 `fdroid signindex`來建立一組簽名！"
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "integer"
+msgstr "整數"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "invalid %(type)s value: %(value)r"
 msgstr "無效 %(type)s 值：%(value)r"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "invalid choice: %(value)r (choose from %(choices)s)"
 msgstr "無效選項：%(value)r (選取自 %(choices)s)"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "invalid conflict_resolution value: %r"
 msgstr "無效 conflict_resolution 值：%r"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "invalid option string %(option)r: must start with a character %(prefix_chars)r"
 msgstr "無效的選項字串 %(option)r：必須以字符 %(prefix_chars)r為起頭"
 
-#: ../fdroidserver/common.py
-msgid "ipfs_cid not found, skipping CIDv1 generation"
-msgstr "找不到 ipfs_cid，略過 CIDv1 產生"
-
-#: ../fdroidserver/checkupdates.py
-#, python-brace-format
-msgid "latest build recipe is newer: old vercode={old}, new vercode={new}"
-msgstr "最新的建置配方較新：舊版本代碼={old}，新版本代碼={new}"
-
 #: ../fdroidserver/deploy.py
 #, python-brace-format
 msgid "local_copy_dir does not end with \"fdroid\", perhaps you meant: \"{path}\""
@@ -2386,20 +2334,11 @@ msgstr "local_copy_dir 為目錄，不是檔案！"
 msgid "mirror '%s' does not end with 'fdroid'!"
 msgstr "鏡像 '%s' 並不是以 'fdroid' 作結尾！"
 
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "mirrors set twice, in config.yml and {path}!"
-msgstr "設定了兩次鏡像，分別在 config.xml 和 {path} 中!"
-
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "mutually exclusive arguments must be optional"
 msgstr "相互獨佔的引數必須為可選的"
 
-#: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "next {name} cache update due in {time}"
-msgstr "下次 {name} 快取更新將於 {time} 進行"
-
 #: ../fdroidserver/mirror.py
 #, python-brace-format
 msgid "no \"icon\" in {appid}"
@@ -2409,92 +2348,141 @@ msgstr "在 {appid} 中沒有 \"icon\""
 msgid "no APK supplied"
 msgstr "無 APK 被供應"
 
-#: ../fdroidserver/checkupdates.py
-#, fuzzy
-msgid "no version information found"
-msgstr "未發現版本資訊"
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, python-format
+msgid "no such option: %s"
+msgstr "沒這樣的選項：%s"
 
-#: /usr/lib/python3.11/argparse.py
+#: ../fdroid ../fdroidserver/__main__.py
+msgid "no version info found!"
+msgstr "未發現版本資訊！"
+
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "not allowed with argument %s"
 msgstr "不許可帶引數 %s"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "one of the arguments %s is required"
 msgstr "引數 %s 必須要有一個"
 
-#: ../fdroidserver/common.py ../fdroidserver/index.py
+#: ../fdroidserver/index.py ../fdroidserver/common.py
 msgid "only accepts strings, lists, and tuples"
 msgstr "只接受字串,列表和元組"
 
-#: /usr/lib/python3.11/argparse.py
-#, fuzzy
-msgid "options"
-msgstr "選項"
+#: ../fdroidserver/install.py
+#, python-format
+msgid "option %s: If you really want to install all the signed apps, use --all"
+msgstr "選項 %s: 如果真要安裝全部的簽署應用, 請使用 --all"
+
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, python-format
+msgid "option %s: invalid %s value: %r"
+msgstr "選項 %s: 無效的 %s 值: %r"
+
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+#, python-format
+msgid "option %s: invalid choice: %r (choose from %s)"
+msgstr "選項 %s: 無效選項: %r (選自 %s )"
+
+#: /usr/lib/python3.5/getopt.py /usr/lib/python3.6/getopt.py
+#: /usr/lib/python3.7/getopt.py
+#, python-format
+msgid "option -%s not recognized"
+msgstr "不能識別選項 -%s"
+
+#: /usr/lib/python3.5/getopt.py /usr/lib/python3.6/getopt.py
+#: /usr/lib/python3.7/getopt.py
+#, python-format
+msgid "option -%s requires argument"
+msgstr "選項 -%s 需要參數"
+
+#: /usr/lib/python3.5/getopt.py /usr/lib/python3.6/getopt.py
+#: /usr/lib/python3.7/getopt.py
+#, python-format
+msgid "option --%s must not have an argument"
+msgstr "選項 --%s 不能有參數"
+
+#: /usr/lib/python3.5/getopt.py /usr/lib/python3.6/getopt.py
+#: /usr/lib/python3.7/getopt.py
+#, python-format
+msgid "option --%s not a unique prefix"
+msgstr "選項 --%s 不是單獨的字首"
+
+#: /usr/lib/python3.5/getopt.py /usr/lib/python3.6/getopt.py
+#: /usr/lib/python3.7/getopt.py
+#, python-format
+msgid "option --%s not recognized"
+msgstr "不能識別選項 --%s"
+
+#: /usr/lib/python3.5/getopt.py /usr/lib/python3.6/getopt.py
+#: /usr/lib/python3.7/getopt.py
+#, python-format
+msgid "option --%s requires argument"
+msgstr "選項 --%s 需要參數"
+
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
+msgid "optional arguments"
+msgstr "可選參數"
 
 #: ../fdroidserver/nightly.py
 #, python-brace-format
 msgid "overwriting existing {path}"
 msgstr "覆寫現有的 {path}"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 msgid "positional arguments"
 msgstr "位置參數"
 
 #: ../fdroidserver/common.py
-#, fuzzy, python-brace-format
+#, python-brace-format
 msgid "process log deploy {path} to {dest} failed!"
-msgstr "將進程日誌 {path} 部署到 {dest} 但失敗了！"
-
-#: ../fdroidserver/build.py
-msgid "reference binary missing signature"
-msgstr "參考二進位檔缺少簽章"
+msgstr ""
 
 #: ../fdroidserver/signatures.py
 #, python-brace-format
 msgid "refuse downloading via insecure HTTP connection (use HTTPS or specify --no-https-check): {apkfilename}"
 msgstr "拒絕透過不安全的 HTTP 連線下載 (使用 HTTPS 或指明 --no-https-check): {apkfilename}"
 
-#: ../fdroidserver/index.py
-#, fuzzy, python-format
-msgid "repo_icon \"repo/icons/%s\" does not exist, generating placeholder."
-msgstr "軟體庫圖標 （repo_icon）\"repo/icons/%s\" 不存在， 正在生成佔位用的圖標。"
-
-#: ../fdroidserver/common.py
-msgid "repo_url needs to end with /repo"
-msgstr "repo_url 必須以 /repo 結尾"
-
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/signatures.py
 #, python-brace-format
-msgid "rsync is missing or broken: {error}"
-msgstr "rsync 遺失或損壞：{error}"
+msgid "refuse downloading via insecure http connection (use https or specify --no-https-check): {apkfilename}"
+msgstr "拒絕透過不安全 http 連線下載 (使用 https 或指明 --no-https-check): {apkfilename}"
 
-#: ../fdroidserver/deploy.py
+#: ../fdroidserver/index.py
+#, python-format
+msgid "repo_icon %s does not exist, generating placeholder."
+msgstr ""
+
+#: ../fdroidserver/metadata.py
+msgid "ruamel.yaml not installed, can not write metadata."
+msgstr ""
+
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "s3cmd sync indexes {path} to {url} and delete"
 msgstr "s3cmd 同步索引 {path} 到 {url} 並刪除"
 
-#: ../fdroidserver/deploy.py
-#, fuzzy, python-brace-format
-msgid "s3cmd syncs indexes from {path} to {url} and deletes removed"
-msgstr "s3cmd 同步索引 {path} 到 {url} 並刪除"
-
 #: ../fdroidserver/scanner.py
-#, python-brace-format
-msgid "scanner cache is malformed! You can clear it with: '{clear}'"
-msgstr "掃描器快取格式錯誤！您可以使用以下指令清除它：'{clear}'"
-
-#: ../fdroidserver/deploy.py
-msgid "serverwebroot: path does not end with \"fdroid\", perhaps you meant one of these:"
-msgstr "serverwebroot: 路徑沒有以「fdroid」結尾，也許你想表達的是這些之一："
-
-#: ../fdroidserver/scanner.py
-#, fuzzy
 msgid "shared library"
-msgstr "共享庫 (shared library)"
+msgstr ""
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/optparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/optparse.py
+msgid "show program's version number and exit"
+msgstr "顯示程式的版本號碼並離開"
+
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.5/optparse.py
+#: /usr/lib/python3.6/argparse.py /usr/lib/python3.6/optparse.py
+#: /usr/lib/python3.7/argparse.py /usr/lib/python3.7/optparse.py
 msgid "show this help message and exit"
 msgstr "顯示此說明訊息並離開"
 
@@ -2520,35 +2508,34 @@ msgid "srclibs missing name and/or @"
 msgstr "srclibs 缺失名稱或 @"
 
 #: ../fdroidserver/scanner.py
-#, fuzzy
 msgid "static library"
-msgstr "靜態庫 (static library)"
+msgstr ""
 
-#: ../fdroidserver/build.py
+#: ../fdroidserver/common.py
 #, python-brace-format
-msgid "supplied reference binary has allowed signer {signer}"
-msgstr "提供的參考二進位檔具有允許的簽署者 {signer}"
+msgid "supplied timestamp value '{timestamp}' is not a unix timestamp"
+msgstr "提供的時間戳值「{timestamp}」並非 unix 時間戳"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "the following arguments are required: %s"
 msgstr "需要下列參數：%s"
 
-#: ../fdroidserver/install.py
-msgid "true"
-msgstr ""
-
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "unexpected option string: %s"
 msgstr "非預期選項字串： %s"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "unknown parser %(parser_name)r (choices: %(choices)s)"
 msgstr "不明解析器 %(parser_name)r (選項: %(choices)s)"
 
-#: /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
+#: /usr/lib/python3.7/argparse.py
 #, python-format
 msgid "unrecognized arguments: %s"
 msgstr "無法辨識的引數：%s"
@@ -2558,23 +2545,27 @@ msgstr "無法辨識的引數：%s"
 msgid "unsafe permissions on '{config_file}' (should be 0600)!"
 msgstr "'{config_file}' 檔案不安全的權限(應為 0600)！"
 
-#: ../fdroidserver/__main__.py /usr/lib/python3.11/argparse.py
+#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py ../fdroid
+#: /usr/lib/python3.7/argparse.py ../fdroidserver/__main__.py
 msgid "usage: "
 msgstr "使用方法： "
 
-#: ../fdroidserver/deploy.py
+#: ../fdroid
+msgid "usage: fdroid [-h|--help|--version] <command> [<args>]"
+msgstr "用法：fdroid [-h|--help|--version] <指令> [<args>]"
+
+#: ../fdroidserver/deploy.py ../fdroidserver/upload.py
 #, python-brace-format
 msgid "using Apache libcloud to sync with {url}"
 msgstr "使用 Apache libcloud 來同步 {url}"
 
 #: ../fdroidserver/deploy.py
-#, fuzzy
 msgid "virustotal.com is rate limiting, waiting to retry..."
-msgstr "因為 virustotal.com 正在限制收到請求的頻率， 這邊正在等待中， 過一會再試 ..."
+msgstr ""
 
-#: ../fdroidserver/install.py
-msgid "yes"
-msgstr "是"
+#: ../fdroidserver/update.py
+msgid "wiki support is deprecated and will be removed in the next release!"
+msgstr ""
 
 #: ../fdroidserver/publish.py
 #, python-brace-format
@@ -2587,39 +2578,47 @@ msgstr[0] "{0} 應用, {1} 主要別名"
 msgid "{apkfilename} ({appid}) has no metadata!"
 msgstr "{apkfilename} ({appid}) 沒有中介資料!"
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
+#: ../fdroidserver/update.py
+#, python-brace-format
+msgid "{apkfilename} has multiple {name} files, looks like Master Key exploit!"
+msgstr "{apkfilename} 有多個 {name} 檔案，看起來可能是主金鑰洩漏了！"
+
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "{apkfilename}'s AndroidManifest.xml has a bad date: "
 msgstr "{apkfilename} AndroidManifest.xml 有一個無效的日期： "
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
 #: ../fdroidserver/update.py
 #, fuzzy, python-brace-format
 msgid "{appid} does not have a name! Using application ID instead."
-msgstr "軟體 {appid} 沒有名字! 使用 application ID 代替。"
+msgstr "{appid}沒有名字! 使用套件名代替."
+
+#: ../fdroidserver/update.py
+#, python-brace-format
+msgid "{appid} does not have a name! Using package name instead."
+msgstr "{appid}沒有名字! 使用套件名代替."
+
+#: ../fdroidserver/update.py
+#, python-brace-format
+msgid "{appid} from {path} is not a valid Android Package Name!"
+msgstr "來自 {path} 的 {appid} 並不是一個有效的 android 套件名稱！"
 
-#. Translators: https://developer.android.com/build/configure-app-module#set-application-id
 #: ../fdroidserver/update.py
 #, fuzzy, python-brace-format
 msgid "{appid} from {path} is not a valid Android application ID!"
-msgstr "來自路徑 {path} 的 {appid} 並不是一個有效的 android application ID！"
+msgstr "來自 {path} 的 {appid} 並不是一個有效的 android 套件名稱！"
 
 #: ../fdroidserver/metadata.py ../fdroidserver/update.py
 #, python-brace-format
 msgid "{appid} from {path} is not a valid Java Package Name!"
 msgstr "來自 {path} 的 {appid} 並不是一個有效的 Java 套件名稱！"
 
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "{appid} has both APKs and files: {files}"
-msgstr "{appid} 同時具有 APK 和檔案：{files}"
-
 #: ../fdroidserver/mirror.py
 #, python-brace-format
 msgid "{appid} is missing {name}"
 msgstr "{appid} 缺少 {name}"
 
+#. Translators: https://developer.android.com/guide/topics/manifest/manifest-element.html#vname
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "{appid}: Unknown extlib {path} in build '{versionName}'"
@@ -2641,34 +2640,29 @@ msgid "{appid}: {field} must be a '{type}', but it is a '{fieldtype}'!"
 msgstr "{appid}：{field} 必須是一個 '{type}'，但它是一個 '{fieldtype}'！"
 
 #: ../fdroidserver/metadata.py
-#, fuzzy, python-brace-format
+#, python-brace-format
 msgid "{build_flag} must be an integer, found: {value}"
-msgstr "{build_flag} 必須是整數， 找到： {value}"
+msgstr ""
 
 #: ../fdroidserver/metadata.py
-#, fuzzy, python-brace-format
-msgid "{build_flag} must be list or string, found: {value}"
-msgstr "{build_flag} 必須是整數， 找到： {value}"
+#, python-brace-format
+msgid "{field} not terminated in {name}"
+msgstr "{field} 未終結在 {name}"
 
 #: ../fdroidserver/metadata.py
-#, fuzzy, python-brace-format
+#, python-brace-format
 msgid "{file} is blank or corrupt!"
-msgstr "檔案 {file} 是空的或損壞的 ！"
-
-#: ../fdroidserver/update.py
-#, fuzzy, python-brace-format
-msgid "{name} \"{section}/icons/{path}\" does not exist! Check \"config.yml\"."
-msgstr "{name} \"{section}/icons/{path}\" 不存在! 請檢查 \"config.yml\"."
+msgstr ""
 
 #: ../fdroidserver/update.py
 #, python-brace-format
-msgid "{path1} is a duplicate of {path2}, remove one!"
-msgstr ""
+msgid "{name} \"{path}\" does not exist! Correct it in config.py."
+msgstr "{name} \"{path}\" 不存在! 請更正 config.py."
 
-#: ../fdroidserver/import_subcommand.py
-#, fuzzy, python-brace-format
+#: ../fdroidserver/import.py
+#, python-brace-format
 msgid "{path} already exists, ignoring import results!"
-msgstr "路徑 {path} 已存在， 忽略導入的結果！"
+msgstr ""
 
 #: ../fdroidserver/nightly.py
 #, python-brace-format
@@ -2680,65 +2674,25 @@ msgstr "\"{path}\" 不存在！經由執行建立它："
 msgid "{path} has bad file signature \"{pattern}\", possible Janus exploit!"
 msgstr "{path} 有不正確的檔案簽章「{pattern}」，可能是 Janus 漏洞！"
 
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "{path} has been flagged by virustotal {count} times:"
-msgstr "{path} 已被 VirusTotal 標記 {count} 次："
-
-#: ../fdroidserver/install.py
-#, python-brace-format
-msgid "{path} has the wrong fingerprint ({fingerprint})!"
-msgstr "{path} 的指紋（{fingerprint}）不正確！"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "{path} is not \"key: value\" dict, but a {datatype}!"
-msgstr "{path} 不是「鍵：值」字典，而是一個 {datatype}！"
-
-#: ../fdroidserver/common.py
-#, fuzzy, python-brace-format
-msgid "{path} is not a standard config file!"
-msgstr "'config.yml' 未設定 'sdk_path'！"
-
-#: ../fdroidserver/index.py
-#, python-brace-format
-msgid "{path} is not list, but a {datatype}!"
-msgstr "{path} 不是清單，而是一個 {datatype}！"
-
-#: ../fdroidserver/common.py
-#, python-brace-format
-msgid "{path} is not {expected_type}, but a {datatype}!"
-msgstr "{path} 不是 {expected_type}，而是一個 {datatype}！"
-
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "{path} is zero size!"
 msgstr "{path} 為零尺寸!"
 
 #: ../fdroidserver/deploy.py
-#, fuzzy, python-brace-format
-msgid "{path} more than 200MB, manually upload: {url}"
-msgstr "檔案 {path} 大於 200MB ， 手動上傳： {url}"
-
-#: ../fdroidserver/lint.py
 #, python-brace-format
-msgid "{path}: \"{code}\" is not a valid ISO_3166-1 alpha-2 country code!"
-msgstr "{path}：「{code}」不是有效的 ISO 3166-1 alpha-2 國家代碼！"
-
-#: ../fdroidserver/update.py
-#, fuzzy, python-brace-format
-msgid "{path}: {error}"
-msgstr "讀取路徑 {path} 失敗：錯誤訊息{error}"
+msgid "{path} more than 200MB, manually upload: {url}"
+msgstr ""
 
 #: ../fdroidserver/mirror.py
 #, python-brace-format
 msgid "{url} does not end with \"fdroid\", check the URL path!"
 msgstr "{url} 未以 \"fdroid\" 結尾，檢查 URL 路徑！"
 
-#: ../fdroidserver/import_subcommand.py
+#: ../fdroidserver/common.py
 #, fuzzy, python-brace-format
 msgid "{url} does not start with \"http\"!"
-msgstr "{url} 未以 \"http\" 起頭 ！"
+msgstr "{url} 未以 \"fdroid\" 結尾，檢查 URL 路徑！"
 
 #: ../fdroidserver/build.py
 msgid "{} build failed"
@@ -2749,3 +2703,43 @@ msgstr[0] "{} 編譯失敗"
 msgid "{} build succeeded"
 msgid_plural "{} builds succeeded"
 msgstr[0] "{} 編譯成功"
+
+#, fuzzy
+#~ msgid "Add PGP signatures for packages in repo using GnuPG"
+#~ msgstr "在軟體倉庫中加入套件包的 gpg 簽署"
+
+#~ msgid "Add gpg signatures for packages in repo"
+#~ msgstr "在軟體倉庫中加入套件包的 gpg 簽署"
+
+#~ msgid "Cannot find a packageName for {path}!"
+#~ msgstr "路徑 {path} 找不到套件名稱！"
+
+#~ msgid "Cannot find an appid for {path}!"
+#~ msgstr "找不到 {path} 的 appid！"
+
+#~ msgid "Clean update - don't uses caches, reprocess all apks"
+#~ msgstr "清除更新 - 不使用快取，重新處理全部的 apk"
+
+#~ msgid "Interactively ask about things that need updating."
+#~ msgstr "以對話方式詢問需要更新的內容。"
+
+#~ msgid "Specify editor to use in interactive mode. Default "
+#~ msgstr "指定編輯器在交互模式使用。預設 "
+
+#~ msgid "Specify editor to use in interactive mode. Default %s"
+#~ msgstr "指定編輯器在互動模式使用。預設 %s"
+
+#~ msgid "Specify editor to use in interactive mode. Default is {path}"
+#~ msgstr "指定編輯器在互動模式使用。預設 {path}"
+
+#~ msgid "app-id in the form APPID"
+#~ msgstr "app-id，格式為 APPID"
+
+#~ msgid "app-id to check for updates"
+#~ msgstr "以 app-id 檢查更新"
+
+#~ msgid "app-id with optional versionCode in the form APPID[:VERCODE]"
+#~ msgstr "app-id 具有任選的 versionCode 在此格式為 APPID [:VERCODE]"
+
+#~ msgid "app-id with optional versioncode in the form APPID[:VERCODE]"
+#~ msgstr "app-id 具有任選的 versioncode 在此格式為 APPID [:VERCODE]"
diff --git a/makebuildserver b/makebuildserver
index 34962ca7..347c73fb 100755
--- a/makebuildserver
+++ b/makebuildserver
@@ -24,13 +24,9 @@ parser.add_option('-v', '--verbose', action="count", dest='verbosity', default=1
 parser.add_option('-q', action='store_const', const=0, dest='verbosity')
 parser.add_option("-c", "--clean", action="store_true", default=False,
                   help="Build from scratch, rather than attempting to update the existing server")
-parser.add_option('--skip-box-verification', action="store_true", default=False,
-                  help="""Skip verifying the downloaded base box.""")
 parser.add_option('--skip-cache-update', action="store_true", default=False,
                   help="""Skip downloading and checking cache."""
                        """This assumes that the cache is already downloaded completely.""")
-parser.add_option('--copy-caches-from-host', action="store_true", default=False,
-                  help="""Copy gradle and pip caches into the buildserver VM""")
 parser.add_option('--keep-box-file', action="store_true", default=False,
                   help="""Box file will not be deleted after adding it to box storage"""
                        """ (KVM-only).""")
@@ -47,56 +43,93 @@ logging.basicConfig(format=logformat, level=loglevel)
 
 tail = None
 
-BASEBOX_DEFAULT = 'debian/bookworm64'
-BASEBOX_VERSION_DEFAULT = "12.20250126.1"
+BASEBOX_DEFAULT = 'fdroid/basebox-stretch64'
+BASEBOX_VERSION_DEFAULT = '0.5.1'
 BASEBOX_CHECKSUMS = {
-    "12.20250126.1": {
-        "libvirt": {
-            "box.img": "64eb111ab8b0785253c7542caaa7f560d4532b8133266ec94804882d209017d3",
-            "Vagrantfile": "f9c6fcbb47a4d0d33eb066859c8e87efd642287a638bd7da69a9e7a6f25fec47",
-            "metadata.json": "20dc0268a79410dbf01c7e544ba5138f6f695a298b53c56c87a25f68c5031173",
+    '0.6.0': {
+        'libvirt': {
+            'box.img': '82c2c3548cf48f0f4c6601f40f8bec36ff37e9a74d6f717067a526250ad790ad',
+            'metadata.json': '9b5f62362ce3cd25c50881d8ae124879fc21ed4fdb16cc78d57058f116680f25',
+            'Vagrantfile': '4435901624f21dad201c3bd7f0d8d4ece842bc9fbbb70e312eee54f07173f24e',
         },
-        "virtualbox": {
-            "box.ovf": "d8493bdfc4c42b5f66b815efe2a90d20b639eb2ce12cc8c7c51a3039674d146a",
-            "box.vmdk": "6927001058f57b325544c399297c41ec9c6fbfc21cb764b58f2ff0495864a4fa",
-            "Vagrantfile": "0bbc2ae97668d8da27ab97b766752dcd0bf9e41900e21057de15a58ee7fae47d",
-            "metadata.json": "ffdaa989f2f6932cd8042e1102371f405cc7ad38e324210a1326192e4689e83a",
+        'vritualbox': {
+            'box-disk1.vmdk': '6b536f26dcee137aca9a3f5f6f20aef795193ef2e8c387a0ffbdb7c5fe2ec0fb',
+            'box.ovf': 'cbdd6315187d4ce8ff15ed5a00a2c8b0d33abe6b0356439ce4d8d9ac3724f875',
+            'metadata.json': '098439524f76cafe026140b787ca419297a055a3f6006b9d60e6d5326d18ba99',
+            'Vagrantfile': '95c64a0e82a6420845c05038c4c97b3aba629b09eb2b78e879423d06f6b54a54',
         }
     },
+    '0.5.1': {
+        'libvirt': {
+            'box.img': 'ad015940b866e36a593ef5fa0035ec6703f74a7f082ab76a1d2bd9463714cd4a',
+            'metadata.json': '5ced8ecf886722a5152095e099b778b1d2b859c2e1dcf834182274034b8a629d',
+            'Vagrantfile': 'cc7b8edb26481c158b2c28d15d32f7e146de892847c9308ac262678cf0ae8260',
+        },
+        'virtualbox': {
+            'box-disk1.vmdk': 'cba36a9c9814bdff9aabaea8786c27477ef8958cf6ee65ad844cb2726bdab93e',
+            'box.ovf': 'cbdd6315187d4ce8ff15ed5a00a2c8b0d33abe6b0356439ce4d8d9ac3724f875',
+            'metadata.json': '098439524f76cafe026140b787ca419297a055a3f6006b9d60e6d5326d18ba99',
+            'Vagrantfile': 'ae50c3d152c3016e853176005d1a5da7a8e6ae424c9074e93b1a1015aa2f2e14',
+        }
+    },
+    '0.5': {
+        'virtualbox': {
+            'box-disk1.vmdk': '8834d5eb78758437c2517f83282172fd5e3842d88f657d577592d0917cd02f89',
+            'box.ovf': 'cbdd6315187d4ce8ff15ed5a00a2c8b0d33abe6b0356439ce4d8d9ac3724f875',
+            'metadata.json': '098439524f76cafe026140b787ca419297a055a3f6006b9d60e6d5326d18ba99',
+            'Vagrantfile': 'ae50c3d152c3016e853176005d1a5da7a8e6ae424c9074e93b1a1015aa2f2e14',
+        },
+        'libvirt': {
+            'box.img': '2ef5f1fdc98c24a4f67cecb526d21e1d73dedf5a0072ceff528a0e75da3ff452',
+            'metadata.json': 'da79a5e2327dcf81a18a9d66a6e91205a20e440f23d3928e633fd39d60c641e5',
+            'Vagrantfile': 'cc7b8edb26481c158b2c28d15d32f7e146de892847c9308ac262678cf0ae8260',
+        }
+    },
+    '0.3': {
+        'libvirt': {
+            'box.img': '24f06f415dde4cdb01d68c904fc57386ea060ba7b94e700670c58694b3d3635e',
+            'metadata.json': '0965955659082fd2e67723deb3311ba253c96153d3176d856db1b3e6e461cf23',
+            'Vagrantfile': 'cc7b8edb26481c158b2c28d15d32f7e146de892847c9308ac262678cf0ae8260',
+        },
+        'virtualbox': {
+            'box-disk1.vmdk': '103114977f1a36f7121ef9b3a1495129baa10bfedfada61a13345c8863c4dcd6',
+            'box.ovf': '33a5fbaf3dba443237baefcba6d56ca7a76121ca530f1140aa8263a69d7d3695',
+            'metadata.json': '098439524f76cafe026140b787ca419297a055a3f6006b9d60e6d5326d18ba99',
+            'Vagrantfile': 'ae50c3d152c3016e853176005d1a5da7a8e6ae424c9074e93b1a1015aa2f2e14',
+        }
+    }
 }
 
-configfile = 'buildserver/Vagrantfile.yaml'
-if not os.path.exists(configfile):
-    logging.warning('%s does not exist, copying template file.' % configfile)
-    shutil.copy('examples/Vagrantfile.yaml', configfile)
-with open(configfile) as fp:
-    config = yaml.safe_load(fp)
-    if not isinstance(config, dict):
-        logging.info("config is empty or not a dict, using default.")
-        config = {}
-with open('buildserver/Vagrantfile') as fp:
-    m = re.search(r"""\.vm\.box\s*=\s*["'](.*)["']""", fp.read())
-    if not m:
-        logging.error('Cannot find box name in buildserver/Vagrantfile!')
-        sys.exit(1)
-    config['basebox'] = m.group(1)
-config['basebox_version'] = BASEBOX_VERSION_DEFAULT
-config['cachedir'] = os.path.join(os.getenv('HOME'), '.cache', 'fdroidserver')
+config = {
+    'basebox': BASEBOX_DEFAULT,
+    'debian_mirror': 'http://deb.debian.org/debian/',
+    'apt_package_cache': False,
+    'copy_caches_from_host': False,
+    'boot_timeout': 600,
+    'cachedir': os.path.join(os.getenv('HOME'), '.cache', 'fdroidserver'),
+    'cpus': 1,
+    'memory': 2048,
+    'hwvirtex': 'off',
+    'vm_provider': 'virtualbox',
+}
 
-show_config_deprecation = False
+# load config file, if present
 if os.path.exists('makebuildserver.config.py'):
-    show_config_deprecation = True
-    logging.error('makebuildserver.config.py exists!')
+    exec(compile(open('makebuildserver.config.py').read(), 'makebuildserver.config.py', 'exec'), config)
 elif os.path.exists('makebs.config.py'):
-    show_config_deprecation = True
     # this is the old name for the config file
-    logging.error('makebs.config.py exists!')
-if show_config_deprecation:
-    logging.error('Config is via %s and command line flags.' % configfile)
-    parser.print_help()
-    sys.exit(1)
-
-logging.debug("Vagrantfile.yaml parsed -> %s", json.dumps(config, indent=4, sort_keys=True))
+    exec(compile(open('makebs.config.py').read(), 'makebs.config.py', 'exec'), config)
+if '__builtins__' in config:
+    del(config['__builtins__'])  # added by compile/exec
+logging.debug("makebuildserver.config.py parsed -> %s", json.dumps(config, indent=4, sort_keys=True))
+if config['basebox'] == BASEBOX_DEFAULT and 'basebox_version' not in config:
+    config['basebox_version'] = BASEBOX_VERSION_DEFAULT
+# note: vagrant allows putting '/' into the name of a local box,
+# so this check is not completely relyable, but better than nothing
+if 'basebox_version' in config and 'basebox' in config and '/' not in config['basebox']:
+    logging.critical("Can not get version '{version}' for basebox '{box}', "
+                     "vagrant does not support versioning for locally added boxes."
+                     .format(box=config['basebox'], version=config['basebox_version']))
 
 # Update cached files.
 if not os.path.exists(config['cachedir']):
@@ -114,11 +147,282 @@ if config['vm_provider'] == 'libvirt':
         tmp = os.path.dirname(tmp)
     logging.debug('cache dir %s is accessible for libvirt vm.', config['cachedir'])
 
+if config['apt_package_cache']:
+    config['aptcachedir'] = config['cachedir'] + '/apt/archives'
+    logging.debug('aptcachedir is set to %s', config['aptcachedir'])
+    aptcachelock = os.path.join(config['aptcachedir'], 'lock')
+    if os.path.isfile(aptcachelock):
+        logging.info('apt cache dir is locked, removing lock')
+        os.remove(aptcachelock)
+    aptcachepartial = os.path.join(config['aptcachedir'], 'partial')
+    if os.path.isdir(aptcachepartial):
+        logging.info('removing partial downloads from apt cache dir')
+        shutil.rmtree(aptcachepartial)
+
 CACHE_FILES = [
-    ('https://services.gradle.org/distributions/gradle-6.8.3-bin.zip',
-     '7faa7198769f872826c8ef4f1450f839ec27f0b4d5d1e51bade63667cbccd205'),
-    ('https://services.gradle.org/distributions/gradle-7.0.2-bin.zip',
-     '0e46229820205440b48a5501122002842b82886e76af35f0f3a069243dca4b3c'),
+    # Don't update sdk tools beyond 25.2.5.
+    # Support for android update project has been removed and there is no replacement.
+    # Until we find a solution for that we need to stay at this revision.
+    ('https://dl.google.com/android/repository/tools_r25.2.5-linux.zip',
+     '577516819c8b5fae680f049d39014ff1ba4af870b687cab10595783e6f22d33e'),
+    ('https://dl.google.com/android/repository/android_m2repository_r47.zip',
+     'a3f91808dce50c1717737de90c18479ed3a78b147e06985247d138e7ab5123d0'),
+    ('https://dl.google.com/android/repository/android-2.1_r03.zip',
+     'b9cc140a9b879586181b22cfc7d4aa18b979251e16e9b17771c5d0acb71ba940'),
+    ('https://dl.google.com/android/repository/android-2.2_r03.zip',
+     '7c9ea1bd7cb225504bd085d7c93ae27d52bd88d29b621d28108f82fef68177c0'),
+    ('https://dl.google.com/android/repository/android-2.3.1_r02.zip',
+     'b2ab4896d0a4857e4f688f69eb08b0e1a8074709d4445a92a83ece7ec7cd198c'),
+    ('https://dl.google.com/android/repository/android-2.3.3_r02.zip',
+     '54bdb0f1ca06ba5747061ddeea20f431af72c448334fd4d3d7f84ea2ccd29fea'),
+    ('https://dl.google.com/android/repository/android-3.0_r02.zip',
+     '1cacae7b6e1b5a5d73c06f5d29d2ea92d16674df8fd5507681290e77d1647a1c'),
+    ('https://dl.google.com/android/repository/android-3.1_r03.zip',
+     '7570c86a86488a146aa2141a65a24d81800959c1907ff4f1d2c13bbafab230c5'),
+    ('https://dl.google.com/android/repository/android-3.2_r01.zip',
+     'ff6b26ad34d7060a72ba504b0314cef8ba3138005561705adec5ad470a073d9b'),
+    ('https://dl.google.com/android/repository/android-14_r04.zip',
+     'da1af15c77ba41d062eb6d0ef5921cc424ab6167587033b830609d65f04802b6'),
+    ('https://dl.google.com/android/repository/android-15_r05.zip',
+     '5bc1f93aae86b4336ffc4cae9eb8ec41a9a8fd677582dd86a9629798f019bed9'),
+    ('https://dl.google.com/android/repository/android-16_r05.zip',
+     'fd7f269a423d1f1d079eabf9f918ceab49108702a1c6bb2589d57c23393503d3'),
+    ('https://dl.google.com/android/repository/android-17_r03.zip',
+     'b66e73fb2639f8c916fde4369aa29012a5c531e156dbb205fe3788fe998fbbe8'),
+    ('https://dl.google.com/android/repository/android-18_r03.zip',
+     '166ae9cf299747a5faa8f04168f0ee47cd7466a975d8b44acaaa62a43e767568'),
+    ('https://dl.google.com/android/repository/android-19_r04.zip',
+     '5efc3a3a682c1d49128daddb6716c433edf16e63349f32959b6207524ac04039'),
+    ('https://dl.google.com/android/repository/android-20_r02.zip',
+     'ef08c453e16ab6e656cf5d9413ef61cb8c650607d33b24ee4ce08dafdfe965a7'),
+    ('https://dl.google.com/android/repository/android-21_r02.zip',
+     'a76cd7ad3080ac6ce9f037cb935b399a1bad396c0605d4ff42f693695f1dcefe'),
+    ('https://dl.google.com/android/repository/android-22_r02.zip',
+     '45eb581bbe53c9256f34c26b2cea919543c0079140897ac721cf88c0b9f6789e'),
+    ('https://dl.google.com/android/repository/platform-23_r03.zip',
+     '4b4bcddead3319708275c54c76294707bfaa953d767e34f1a5b599f3edd0076c'),
+    ('https://dl.google.com/android/repository/platform-24_r02.zip',
+     'f268f5945c6ece7ea95c1c252067280854d2a20da924e22ae4720287df8bdbc9'),
+    ('https://dl.google.com/android/repository/platform-25_r03.zip',
+     '9b742d34590fe73fb7229e34835ecffb1846ca389d9f924f0b2a37de525dc6b8'),
+    ('https://dl.google.com/android/repository/platform-26_r02.zip',
+     '2aafa7d19c5e9c4b643ee6ade3d85ef89dc2f79e8383efdb9baf7fddad74b52a'),
+    ('https://dl.google.com/android/repository/platform-27_r03.zip',
+     '020c4c090bc82ce87ebaae5d1a922e21b39a1d03c78ffa43f0c3e42fc7d28169'),
+    ('https://dl.google.com/android/repository/platform-28_r06.zip',
+     '8452dbbf9668a428abb243c4f02a943b7aa83af3cca627629a15c4c09f28e7bd'),
+    ('https://dl.google.com/android/repository/platform-29_r05.zip',
+     '951da8bf175254da74626824f919bd28def64f8828f29dd3b124a535cf4049d8'),
+    ('https://dl.google.com/android/repository/platform-30_r03.zip',
+     'f3f5b75744dbf6ee6ed3e8174a71e513bfee502d0bc3463ea97e517bff68d84e'),
+    ('https://dl.google.com/android/repository/build-tools_r19.1-linux.zip',
+     '3833b409f78c002a83244e220be380ea6fa44d604e0d47de4b7e5daefe7cd3f4'),
+    ('https://dl.google.com/android/repository/build-tools_r20-linux.zip',
+     '296e09d62095d80e6eaa06a64cfa4c6f9f317c2d67ad8da6514523ec66f5c871'),
+    ('https://dl.google.com/android/repository/build-tools_r21.1.2-linux.zip',
+     '3f88efc2d5316fb73f547f35b472610eed5e6f3f56762750ddad1c7d1d81660d'),
+    ('https://dl.google.com/android/repository/build-tools_r22.0.1-linux.zip',
+     '91e5524bf227aad1135ddd10905518ac49f74797d33d48920dcf8364b9fde214'),
+    ('https://dl.google.com/android/repository/build-tools_r23.0.1-linux.zip',
+     'e56b3ef7b760ad06a7cee9b2d52ba7f43133dcecedfa5357f8845b3a80aeeecf'),
+    ('https://dl.google.com/android/repository/build-tools_r23.0.2-linux.zip',
+     '82754f551a6e36eaf516fbdd00c95ff0ccd19f81d1e134125b6ac4916f7ed9b6'),
+    ('https://dl.google.com/android/repository/build-tools_r23.0.3-linux.zip',
+     'd961663d4a9e128841751c0156548a347c882c081c83942e53788d8949bf34e1'),
+    ('https://dl.google.com/android/repository/build-tools_r24-linux.zip',
+     'b4871f357224c5f660fd2bbee04d8c7d1c187eeddfd9702cc84503529e3b3724'),
+    ('https://dl.google.com/android/repository/build-tools_r24.0.1-linux.zip',
+     'a38ac637db357a31e33e38248399cb0edcc15040dca041370da38b6daf50c84d'),
+    ('https://dl.google.com/android/repository/build-tools_r24.0.2-linux.zip',
+     '924e29b8a189afbd119d44eae450fc0c9f197ed6f835df223931e45007987d95'),
+    ('https://dl.google.com/android/repository/build-tools_r24.0.3-linux.zip',
+     'f2c02eb1d7e41ce314b5dac50440e7595380c4dd45b41ea1d7b0f86e49516927'),
+    ('https://dl.google.com/android/repository/build-tools_r25-linux.zip',
+     '74eb6931fd7a56859bd8e35d8d73ca8fe7ba6bfd4b7ffe560fe58b7354f2e3aa'),
+    ('https://dl.google.com/android/repository/build-tools_r25.0.1-linux.zip',
+     '671b4e00f5b986c7355507c7024b725a4b4cadf11ca61fa5b1334ec6ea57d94f'),
+    ('https://dl.google.com/android/repository/build-tools_r25.0.2-linux.zip',
+     '1d7ac9b6def16fb0254ec23c135c02dd9f6908073352a20315a017e4b2a904b0'),
+    ('https://dl.google.com/android/repository/build-tools_r25.0.3-linux.zip',
+     '152c1b187947edd10c65af8b279d40321ecc106106323e53df3608e578042d65'),
+    ('https://dl.google.com/android/repository/build-tools_r26-linux.zip',
+     '7422682f92fb471d4aad4c053c9982a9a623377f9d5e4de7a73cd44ebf2f3c61'),
+    ('https://dl.google.com/android/repository/build-tools_r26.0.1-linux.zip',
+     'c8617f25a7de2aeb9ddcacf1aeb413e053d5ed5ef4a3f31fe0ce21d4428ee0ea'),
+    ('https://dl.google.com/android/repository/build-tools_r26.0.2-linux.zip',
+     'a752849fac85c4a7f9ea165ec8f367b0ebe8bbf6a1f33fc8605342be004231ce'),
+    ('https://dl.google.com/android/repository/build-tools_r26.0.3-linux.zip',
+     '5c250c602b1657c4c70a6078925e9e01e5714526b707309bc1c708be6137a4db'),
+    ('https://dl.google.com/android/repository/build-tools_r27-linux.zip',
+     '53d3322774a0bf229b372c0288108b4bfa27d74725fce8f0a3393e8df6b9ef22'),
+    ('https://dl.google.com/android/repository/build-tools_r27.0.1-linux.zip',
+     '2e8e0946e93af50667ae02ef200e81c1ac2269b59f14955397245e9e441e8b1e'),
+    ('https://dl.google.com/android/repository/build-tools_r27.0.2-linux.zip',
+     'e73674e065a93ffb05c30a15c8021c0d72ea7c3c206eb9020eb93e49e42ce851'),
+    ('https://dl.google.com/android/repository/build-tools_r27.0.3-linux.zip',
+     '5e1f4fc5203f13de120c56f9cc103bb2e57d940959547506196ab10ddc9e6b97'),
+    ('https://dl.google.com/android/repository/build-tools_r28-linux.zip',
+     'a7c6b73661836a6c50e32c06e7b8e8d6ef8c96f6812f269b9c90470dfb37753c'),
+    ('https://dl.google.com/android/repository/build-tools_r28.0.1-linux.zip',
+     '4825b52a6258a9c2ab073720a5e91e2fa81b552b48024ee81887b863397416af'),
+    ('https://dl.google.com/android/repository/build-tools_r28.0.2-linux.zip',
+     '12cebcafd8f30119c7ef53ffb3562a5b5b9f776c9399038587c18df44ea6452b'),
+    ('https://dl.google.com/android/repository/build-tools_r28.0.3-linux.zip',
+     '7954956a40633c88f693d638cbc23f68e9e2499dc7a4b7dfdaf6a3e91387749a'),
+    ('https://dl.google.com/android/repository/build-tools_r29.0.2-linux.zip',
+     '1e9393cbfd4a4b82e30e7f55ab38db4a5a3259db93d5821c63597bc74522fa08'),
+    ('https://dl.google.com/android/repository/build-tools_r29.0.3-linux.zip',
+     '5652d8cd5eaaade0b853bfe0ae6cbfa0706a6f70a0ebb25ca24a6f484ec3d855'),
+    ('https://dl.google.com/android/repository/build-tools_r30-linux.zip',
+     'ed3b7f9b2d15e90a12c2e739adb749d7d834e2f953e677380206bd14db135c6c'),
+    ('https://dl.google.com/android/repository/build-tools_r30.0.1-linux.zip',
+     '560eace2cc6ca16011fbb97c92c39aa0441d54dbfc13837dfbdb4a6bdf9c9da8'),
+    ('https://dl.google.com/android/repository/build-tools_r30.0.2-linux.zip',
+     '565af786dc0cc1941002174fb945122eabd080b222cd4c7c3d9a2ae0fabf5dc4'),
+    ('https://services.gradle.org/distributions/gradle-2.2.1-bin.zip',
+     '420aa50738299327b611c10b8304b749e8d3a579407ee9e755b15921d95ff418'),
+    ('https://services.gradle.org/distributions/gradle-2.3-bin.zip',
+     '010dd9f31849abc3d5644e282943b1c1c355f8e2635c5789833979ce590a3774'),
+    ('https://services.gradle.org/distributions/gradle-2.4-bin.zip',
+     'c4eaecc621a81f567ded1aede4a5ddb281cc02a03a6a87c4f5502add8fc2f16f'),
+    ('https://services.gradle.org/distributions/gradle-2.5-bin.zip',
+     '3f953e0cb14bb3f9ebbe11946e84071547bf5dfd575d90cfe9cc4e788da38555'),
+    ('https://services.gradle.org/distributions/gradle-2.6-bin.zip',
+     '18a98c560af231dfa0d3f8e0802c20103ae986f12428bb0a6f5396e8f14e9c83'),
+    ('https://services.gradle.org/distributions/gradle-2.7-bin.zip',
+     'cde43b90945b5304c43ee36e58aab4cc6fb3a3d5f9bd9449bb1709a68371cb06'),
+    ('https://services.gradle.org/distributions/gradle-2.8-bin.zip',
+     'a88db9c2f104defdaa8011c58cf6cda6c114298ae3695ecfb8beb30da3a903cb'),
+    ('https://services.gradle.org/distributions/gradle-2.9-bin.zip',
+     'c9159ec4362284c0a38d73237e224deae6139cbde0db4f0f44e1c7691dd3de2f'),
+    ('https://services.gradle.org/distributions/gradle-2.10-bin.zip',
+     '66406247f745fc6f05ab382d3f8d3e120c339f34ef54b86f6dc5f6efc18fbb13'),
+    ('https://services.gradle.org/distributions/gradle-2.11-bin.zip',
+     '8d7437082356c9fd6309a4479c8db307673965546daea445c6c72759cd6b1ed6'),
+    ('https://services.gradle.org/distributions/gradle-2.12-bin.zip',
+     'e77064981906cd0476ff1e0de3e6fef747bd18e140960f1915cca8ff6c33ab5c'),
+    ('https://services.gradle.org/distributions/gradle-2.13-bin.zip',
+     '0f665ec6a5a67865faf7ba0d825afb19c26705ea0597cec80dd191b0f2cbb664'),
+    ('https://services.gradle.org/distributions/gradle-2.14-bin.zip',
+     '993b4f33b652c689e9721917d8e021cab6bbd3eae81b39ab2fd46fdb19a928d5'),
+    ('https://services.gradle.org/distributions/gradle-2.14.1-bin.zip',
+     'cfc61eda71f2d12a572822644ce13d2919407595c2aec3e3566d2aab6f97ef39'),
+    ('https://services.gradle.org/distributions/gradle-3.0-bin.zip',
+     '39c906941a474444afbddc38144ed44166825acb0a57b0551dddb04bbf157f80'),
+    ('https://services.gradle.org/distributions/gradle-3.1-bin.zip',
+     'c7de3442432253525902f7e8d7eac8b5fd6ce1623f96d76916af6d0e383010fc'),
+    ('https://services.gradle.org/distributions/gradle-3.2-bin.zip',
+     '5321b36837226dc0377047a328f12010f42c7bf88ee4a3b1cee0c11040082935'),
+    ('https://services.gradle.org/distributions/gradle-3.2.1-bin.zip',
+     '9843a3654d3e57dce54db06d05f18b664b95c22bf90c6becccb61fc63ce60689'),
+    ('https://services.gradle.org/distributions/gradle-3.3-bin.zip',
+     'c58650c278d8cf0696cab65108ae3c8d95eea9c1938e0eb8b997095d5ca9a292'),
+    ('https://services.gradle.org/distributions/gradle-3.4-bin.zip',
+     '72d0cd4dcdd5e3be165eb7cd7bbd25cf8968baf400323d9ab1bba622c3f72205'),
+    ('https://services.gradle.org/distributions/gradle-3.4.1-bin.zip',
+     'db1db193d479cc1202be843f17e4526660cfb0b21b57d62f3a87f88c878af9b2'),
+    ('https://services.gradle.org/distributions/gradle-3.5-bin.zip',
+     '0b7450798c190ff76b9f9a3d02e18b33d94553f708ebc08ebe09bdf99111d110'),
+    ('https://services.gradle.org/distributions/gradle-3.5.1-bin.zip',
+     '8dce35f52d4c7b4a4946df73aa2830e76ba7148850753d8b5e94c5dc325ceef8'),
+    ('https://services.gradle.org/distributions/gradle-4.0-bin.zip',
+     '56bd2dde29ba2a93903c557da1745cafd72cdd8b6b0b83c05a40ed7896b79dfe'),
+    ('https://services.gradle.org/distributions/gradle-4.0.1-bin.zip',
+     'd717e46200d1359893f891dab047fdab98784143ac76861b53c50dbd03b44fd4'),
+    ('https://services.gradle.org/distributions/gradle-4.0.2-bin.zip',
+     '79ac421342bd11f6a4f404e0988baa9c1f5fabf07e3c6fa65b0c15c1c31dda22'),
+    ('https://services.gradle.org/distributions/gradle-4.1-bin.zip',
+     'd55dfa9cfb5a3da86a1c9e75bb0b9507f9a8c8c100793ccec7beb6e259f9ed43'),
+    ('https://services.gradle.org/distributions/gradle-4.2-bin.zip',
+     '515dd63d32e55a9c05667809c5e40a947529de3054444ad274b3b75af5582eae'),
+    ('https://downloads.gradle.org/distributions/gradle-4.2.1-bin.zip',
+     'b551cc04f2ca51c78dd14edb060621f0e5439bdfafa6fd167032a09ac708fbc0'),
+    ('https://downloads.gradle.org/distributions/gradle-4.3-bin.zip',
+     '8dcbf44eef92575b475dcb1ce12b5f19d38dc79e84c662670248dc8b8247654c'),
+    ('https://downloads.gradle.org/distributions/gradle-4.3.1-bin.zip',
+     '15ebe098ce0392a2d06d252bff24143cc88c4e963346582c8d88814758d93ac7'),
+    ('https://downloads.gradle.org/distributions/gradle-4.4-bin.zip',
+     'fa4873ae2c7f5e8c02ec6948ba95848cedced6134772a0169718eadcb39e0a2f'),
+    ('https://downloads.gradle.org/distributions/gradle-4.4.1-bin.zip',
+     'e7cf7d1853dfc30c1c44f571d3919eeeedef002823b66b6a988d27e919686389'),
+    ('https://downloads.gradle.org/distributions/gradle-4.5-bin.zip',
+     '03f2a43a314ff0fb843a85ef68078e06d181c4549c1e5fb983f289382b59b5e3'),
+    ('https://downloads.gradle.org/distributions/gradle-4.5.1-bin.zip',
+     '3e2ea0d8b96605b7c528768f646e0975bd9822f06df1f04a64fd279b1a17805e'),
+    ('https://downloads.gradle.org/distributions/gradle-4.6-bin.zip',
+     '98bd5fd2b30e070517e03c51cbb32beee3e2ee1a84003a5a5d748996d4b1b915'),
+    ('https://downloads.gradle.org/distributions/gradle-4.7-bin.zip',
+     'fca5087dc8b50c64655c000989635664a73b11b9bd3703c7d6cabd31b7dcdb04'),
+    ('https://downloads.gradle.org/distributions/gradle-4.8-bin.zip',
+     'f3e29692a8faa94eb0b02ebf36fa263a642b3ae8694ef806c45c345b8683f1ba'),
+    ('https://downloads.gradle.org/distributions/gradle-4.8.1-bin.zip',
+     'af334d994b5e69e439ab55b5d2b7d086da5ea6763d78054f49f147b06370ed71'),
+    ('https://downloads.gradle.org/distributions/gradle-4.9-bin.zip',
+     'e66e69dce8173dd2004b39ba93586a184628bc6c28461bc771d6835f7f9b0d28'),
+    ('https://downloads.gradle.org/distributions/gradle-4.10-bin.zip',
+     '248cfd92104ce12c5431ddb8309cf713fe58de8e330c63176543320022f59f18'),
+    ('https://downloads.gradle.org/distributions/gradle-4.10.1-bin.zip',
+     'e53ce3a01cf016b5d294eef20977ad4e3c13e761ac1e475f1ffad4c6141a92bd'),
+    ('https://downloads.gradle.org/distributions/gradle-4.10.2-bin.zip',
+     'b49c6da1b2cb67a0caf6c7480630b51c70a11ca2016ff2f555eaeda863143a29'),
+    ('https://downloads.gradle.org/distributions/gradle-4.10.3-bin.zip',
+     '8626cbf206b4e201ade7b87779090690447054bc93f052954c78480fa6ed186e'),
+    # Only add the latest point release of gradle to the default install.
+    # Other versions will be downloaded on demand.
+    ('https://downloads.gradle.org/distributions/gradle-5.0-bin.zip',
+     '6157ac9f3410bc63644625b3b3e9e96c963afd7910ae0697792db57813ee79a6'),
+    ('https://downloads.gradle.org/distributions/gradle-5.1.1-bin.zip',
+     '4953323605c5d7b89e97d0dc7779e275bccedefcdac090aec123375eae0cc798'),
+    ('https://downloads.gradle.org/distributions/gradle-5.2.1-bin.zip',
+     '748c33ff8d216736723be4037085b8dc342c6a0f309081acf682c9803e407357'),
+    ('https://downloads.gradle.org/distributions/gradle-5.3.1-bin.zip',
+     '1c59a17a054e9c82f0dd881871c9646e943ec4c71dd52ebc6137d17f82337436'),
+    ('https://downloads.gradle.org/distributions/gradle-5.4.1-bin.zip',
+     '7bdbad1e4f54f13c8a78abc00c26d44dd8709d4aedb704d913fb1bb78ac025dc'),
+    ('https://services.gradle.org/distributions/gradle-5.5.1-bin.zip',
+     '222a03fcf2fcaf3691767ce9549f78ebd4a77e73f9e23a396899fb70b420cd00'),
+    ('https://services.gradle.org/distributions/gradle-5.6.4-bin.zip',
+     '1f3067073041bc44554d0efe5d402a33bc3d3c93cc39ab684f308586d732a80d'),
+    ('https://services.gradle.org/distributions/gradle-6.0.1-bin.zip',
+     'd364b7098b9f2e58579a3603dc0a12a1991353ac58ed339316e6762b21efba44'),
+    ('https://services.gradle.org/distributions/gradle-6.1.1-bin.zip',
+     '9d94e6e4a28ad328072ef6e56bce79a810494ae756751fdcedffdeaf27c093b1'),
+    ('https://services.gradle.org/distributions/gradle-6.2.2-bin.zip',
+     '0f6ba231b986276d8221d7a870b4d98e0df76e6daf1f42e7c0baec5032fb7d17'),
+    ('https://services.gradle.org/distributions/gradle-6.3-bin.zip',
+     '038794feef1f4745c6347107b6726279d1c824f3fc634b60f86ace1e9fbd1768'),
+    ('https://services.gradle.org/distributions/gradle-6.4.1-bin.zip',
+     'e58cdff0cee6d9b422dcd08ebeb3177bc44eaa09bd9a2e838ff74c408fe1cbcd'),
+    ('https://services.gradle.org/distributions/gradle-6.5.1-bin.zip',
+     '50a7d30529fa939721fe9268a0205142f3f2302bcac5fb45b27a3902e58db54a'),
+    ('https://services.gradle.org/distributions/gradle-6.6.1-bin.zip',
+     '7873ed5287f47ca03549ab8dcb6dc877ac7f0e3d7b1eb12685161d10080910ac'),
+    ('https://services.gradle.org/distributions/gradle-6.7.1-bin.zip',
+     '3239b5ed86c3838a37d983ac100573f64c1f3fd8e1eb6c89fa5f9529b5ec091d'),
+    ('https://dl.google.com/android/ndk/android-ndk-r10e-linux-x86_64.bin',
+     '102d6723f67ff1384330d12c45854315d6452d6510286f4e5891e00a5a8f1d5a'),
+    ('https://dl.google.com/android/repository/android-ndk-r11c-linux-x86_64.zip',
+     'ba85dbe4d370e4de567222f73a3e034d85fc3011b3cbd90697f3e8dcace3ad94'),
+    ('https://dl.google.com/android/repository/android-ndk-r12b-linux-x86_64.zip',
+     'eafae2d614e5475a3bcfd7c5f201db5b963cc1290ee3e8ae791ff0c66757781e'),
+    ('https://dl.google.com/android/repository/android-ndk-r13b-linux-x86_64.zip',
+     '3524d7f8fca6dc0d8e7073a7ab7f76888780a22841a6641927123146c3ffd29c'),
+    ('https://dl.google.com/android/repository/android-ndk-r14b-linux-x86_64.zip',
+     '0ecc2017802924cf81fffc0f51d342e3e69de6343da892ac9fa1cd79bc106024'),
+    ('https://dl.google.com/android/repository/android-ndk-r15c-linux-x86_64.zip',
+     'f01788946733bf6294a36727b99366a18369904eb068a599dde8cca2c1d2ba3c'),
+    ('https://dl.google.com/android/repository/android-ndk-r16b-linux-x86_64.zip',
+     'bcdea4f5353773b2ffa85b5a9a2ae35544ce88ec5b507301d8cf6a76b765d901'),
+    ('https://dl.google.com/android/repository/android-ndk-r17c-linux-x86_64.zip',
+     '3f541adbd0330a9205ba12697f6d04ec90752c53d6b622101a2a8a856e816589'),
+    ('https://dl.google.com/android/repository/android-ndk-r18b-linux-x86_64.zip',
+     '4f61cbe4bbf6406aa5ef2ae871def78010eed6271af72de83f8bd0b07a9fd3fd'),
+    ('https://dl.google.com/android/repository/android-ndk-r19c-linux-x86_64.zip',
+     '4c62514ec9c2309315fd84da6d52465651cdb68605058f231f1e480fcf2692e1'),
+    ('https://dl.google.com/android/repository/android-ndk-r20b-linux-x86_64.zip',
+     '8381c440fe61fcbb01e209211ac01b519cd6adf51ab1c2281d5daad6ca4c8c8c'),
+    ('https://dl.google.com/android/repository/android-ndk-r21d-linux-x86_64.zip',
+     'dd6dc090b6e2580206c64bcee499bc16509a5d017c6952dcd2bed9072af67cbd'),
 ]
 
 
@@ -244,14 +548,17 @@ def main():
     # use VirtualBox software virtualization if hardware is not available,
     # like if this is being run in kvm or some other VM platform, like
     # http://jenkins.debian.net, the values are 'on' or 'off'
-    if config.get('hwvirtex') != 'off' and os.path.exists('/proc/cpuinfo'):
+    if sys.platform.startswith('darwin'):
+        # all < 10 year old Macs work, and OSX servers as VM host are very
+        # rare, but this could also be auto-detected if someone codes it
+        config['hwvirtex'] = 'on'
+        logging.info('platform is darwnin -> hwvirtex = \'on\'')
+    elif os.path.exists('/proc/cpuinfo'):
         with open('/proc/cpuinfo') as f:
             contents = f.read()
         if 'vmx' in contents or 'svm' in contents:
-            logging.debug('found \'vmx\' or \'svm\' in /proc/cpuinfo -> hwvirtex = \'on\'')
-        else:
-            logging.error('hwvirtex = \'on\' and no \'vmx\' or \'svm\' found in /proc/cpuinfo!')
-            sys.exit(1)
+            config['hwvirtex'] = 'on'
+            logging.info('found \'vmx\' or \'svm\' in /proc/cpuinfo -> hwvirtex = \'on\'')
 
     serverdir = os.path.join(os.getcwd(), 'buildserver')
     logfilename = os.path.join(serverdir, 'up.log')
@@ -262,7 +569,6 @@ def main():
     # https://phoenhex.re/2018-03-25/not-a-vagrant-bug
     os_env = os.environ.copy()
     os_env['VAGRANT_DISABLE_VBOXSYMLINKCREATE'] = '1'
-    os_env['VAGRANT_SERVER_URL'] = 'https://vagrantcloud.com/api/v2/vagrant'
     v.env = os_env
 
     if options.verbosity >= 2:
@@ -273,6 +579,27 @@ def main():
     if options.clean:
         vm.destroy()
 
+    # Check against the existing Vagrantfile.yaml, and if they differ, we
+    # need to create a new box:
+    vf = os.path.join(serverdir, 'Vagrantfile.yaml')
+    writevf = True
+    if os.path.exists(vf):
+        logging.info('Halting %s', serverdir)
+        v.halt()
+        with open(vf, 'r', encoding='utf-8') as f:
+            oldconfig = yaml.load(f)
+        if config != oldconfig:
+            logging.info("Server configuration has changed, rebuild from scratch is required")
+            vm.destroy()
+        else:
+            logging.info("Re-provisioning existing server")
+            writevf = False
+    else:
+        logging.info("No existing server - building from scratch")
+    if writevf:
+        with open(vf, 'w', encoding='utf-8') as f:
+            yaml.dump(config, f)
+
     # Check if selected provider is supported
     if config['vm_provider'] not in ['libvirt', 'virtualbox']:
         logging.critical("Currently selected VM provider '{vm_provider}' "
@@ -280,15 +607,27 @@ def main():
                          "virtualbox, libvirt)"
                          .format(vm_provider=config['cm_provider']))
         sys.exit(1)
+    # Check if selected basebox is available
+    available_boxes_by_provider = [x.name for x in v.box_list() if x.provider == config['vm_provider']]
+    if '/' not in config['basebox'] and config['basebox'] not in available_boxes_by_provider:
+        logging.critical("Vagrant box '{basebox}' not available "
+                         "for '{vm_provider}' VM provider. "
+                         "Please make sure it's added to vagrant. "
+                         "(If you need a basebox to begin with, "
+                         "here is how we're bootstrapping it: "
+                         "https://gitlab.com/fdroid/basebox)"
+                         .format(vm_provider=config['vm_provider'],
+                                 basebox=config['basebox']))
+        sys.exit(1)
 
-    # Download and verify pre-built Vagrant boxes
-    if not options.skip_box_verification:
+    # download and verfiy fdroid pre-built basebox
+    if config['basebox'] == BASEBOX_DEFAULT:
         buildserver_not_created = any([True for x in v.status() if x.state == 'not_created' and x.name == 'default'])
         if buildserver_not_created or options.clean:
             # make vagrant download and add basebox
-            target_basebox_installed = any([x for x in v.box_list() if x.name == config['basebox'] and x.provider == config['vm_provider'] and x.version == config['basebox_version']])
+            target_basebox_installed = any([x for x in v.box_list() if x.name == BASEBOX_DEFAULT and x.provider == config['vm_provider'] and x.version == config['basebox_version']])
             if not target_basebox_installed:
-                cmd = [shutil.which('vagrant'), 'box', 'add', config['basebox'],
+                cmd = [shutil.which('vagrant'), 'box', 'add', BASEBOX_DEFAULT,
                        '--box-version=' + config['basebox_version'],
                        '--provider=' + config['vm_provider']]
                 ret_val = subprocess.call(cmd)
@@ -300,7 +639,7 @@ def main():
                                              version=config['basebox_version']))
                     sys.exit(1)
             # verify box
-            if config['basebox_version'] not in BASEBOX_CHECKSUMS:
+            if config['basebox_version'] not in BASEBOX_CHECKSUMS.keys():
                 logging.critical("can not verify '{box}', "
                                  "unknown basebox version '{version}'"
                                  .format(box=config['basebox'],
@@ -309,7 +648,7 @@ def main():
             for filename, sha256 in BASEBOX_CHECKSUMS[config['basebox_version']][config['vm_provider']].items():
                 verify_file_sha256(os.path.join(get_vagrant_home(),
                                                 'boxes',
-                                                config['basebox'].replace('/', '-VAGRANTSLASH-'),
+                                                BASEBOX_DEFAULT.replace('/', '-VAGRANTSLASH-'),
                                                 config['basebox_version'],
                                                 config['vm_provider'],
                                                 filename),
@@ -319,6 +658,8 @@ def main():
                          .format(box=config['basebox'],
                                  provider=config['vm_provider'],
                                  version=config['basebox_version']))
+        else:
+            logging.debug('not updating basebox ...')
     else:
         logging.debug('using unverified basebox ...')
 
@@ -328,10 +669,10 @@ def main():
         v.up(provision=True)
     except subprocess.CalledProcessError:
         debug_log_vagrant_vm(serverdir, config)
-        logging.error("'vagrant up' failed. Consult %s", logfilename)
+        logging.error("'vagrant up' failed.")
         sys.exit(1)
 
-    if options.copy_caches_from_host:
+    if config['copy_caches_from_host']:
         ssh_config = v.ssh_config()
         user = re.search(r'User ([^ \n]+)', ssh_config).group(1)
         hostname = re.search(r'HostName ([^ \n]+)', ssh_config).group(1)
@@ -340,8 +681,6 @@ def main():
 
         for d in ('.m2', '.gradle/caches', '.gradle/wrapper', '.pip_download_cache'):
             fullpath = os.path.join(os.getenv('HOME'), d)
-            os.system('date')
-            print('rsyncing', fullpath, 'into VM')
             if os.path.isdir(fullpath):
                 ssh_command = ' '.join(('ssh -i {0} -p {1}'.format(key, port),
                                         '-o StrictHostKeyChecking=no',
@@ -360,6 +699,15 @@ def main():
         run_via_vagrant_ssh(v, ['rm', '-f', '~/.gradle/caches/modules-2/modules-2.lock'])
         run_via_vagrant_ssh(v, ['rm', '-fr', '~/.gradle/caches/*/plugin-resolution/'])
 
+    p = subprocess.Popen(['git', 'rev-parse', 'HEAD'], stdout=subprocess.PIPE,
+                         universal_newlines=True)
+    buildserverid = p.communicate()[0].strip()
+    logging.info("Writing buildserver ID ...ID is %s", buildserverid)
+    # sync data before we halt() the machine, we had an empty buildserverid otherwise
+    write_bsid_cmd = 'sh -c "echo \'{}\' >/home/vagrant/buildserverid; sync"'.format(buildserverid)
+    run_via_vagrant_ssh(v, write_bsid_cmd)
+    logging.debug("+ {}".format(write_bsid_cmd))
+
     logging.info("Stopping build server VM")
     v.halt()
 
@@ -368,7 +716,7 @@ def main():
     if os.path.exists(boxfile):
         os.remove(boxfile)
 
-    v.package(output=boxfile)
+    vm.package(output=boxfile)
 
     logging.info("Adding box")
     vm.box_add('buildserver', boxfile, force=True)
@@ -377,30 +725,11 @@ def main():
         logging.critical('could not add box \'%s\' as \'buildserver\', terminating', boxfile)
         sys.exit(1)
 
-    # Boxes are stored in two places when using vagrant-libvirt:
-    #
-    #  1. `vagrant box add` -> ~/.vagrant.d/boxes/buildserver/0/libvirt/
-    #  2. `vagrant up` -> /var/lib/libvirt/images/buildserver_vagrant_box_image_0_box.img
-    #
-    # If the second box is not cleaned up, then `fdroid build` will
-    # continue to use that one from the second location, thereby
-    # ignoring the updated one at the first location.  This process
-    # keeps the second one around until the new box is ready in case
-    # `fdroid build` is using it while this script is running.
-    img = 'buildserver_vagrant_box_image_0_box.img'
-    if os.path.exists(os.path.join('/var/lib/libvirt/images', img)):
-        subprocess.call(
-            ['virsh', '-c', 'qemu:///system', 'vol-delete', '--pool', 'default', '--vol', img]
-        )
-
     if not options.keep_box_file:
         logging.debug("""box added to vagrant, removing generated box file '%s'""",
                       boxfile)
         os.remove(boxfile)
 
-        # This was needed just to create the box, after that, it is unused.
-        vm.destroy()
-
 
 if __name__ == '__main__':
 
@@ -413,7 +742,7 @@ if __name__ == '__main__':
             virt = subprocess.check_output('/usr/bin/systemd-detect-virt').strip().decode('utf-8')
         except subprocess.CalledProcessError:
             virt = 'none'
-        if virt in ('qemu', 'kvm', 'bochs'):
+        if virt == 'qemu' or virt == 'kvm' or virt == 'bochs':
             logging.info('Running in a VM guest, defaulting to QEMU/KVM via libvirt')
             config['vm_provider'] = 'libvirt'
         elif virt != 'none':
diff --git a/pyproject.toml b/pyproject.toml
deleted file mode 100644
index c0ae09c9..00000000
--- a/pyproject.toml
+++ /dev/null
@@ -1,132 +0,0 @@
-# We ignore the following PEP8 warnings
-# * E123: closing bracket does not match indentation of opening bracket's line
-#   - Broken if multiple indentation levels start on a single line
-# * E203: whitespace before ':'
-#   - E203 is not PEP 8 compliant and conflict with black
-# * E402: module level import not at top of file
-#   - The tests use a little hack in order to cleanly import the
-#     fdroidserver package locally like a regular package.  pep8 doesn't
-#     see that, so this makes pep8 skip E402 on the test files that need
-#     that hack.
-# * E501: line too long (82 > 79 characters)
-#   - Recommended for readability but not enforced
-#   - Some lines are awkward to wrap around a char limit
-# * W503: line break before binary operator
-#   - Quite pedantic
-
-[tool.autopep8]
-ignore = "E123,E203,E402,E501,W503"
-
-[tool.black]
-skip-string-normalization = true
-target-version = ["py38"]
-include = '(^fdroid|\.pyi?)$'
-# These files will never be included in black runs.  To run black on
-# one of thes files, remove it from this list.
-force-exclude = '''(
-  \.direnv|\.eggs|\.git|\.hg|\.mypy_cache|\.nox|\.svn|\.tox|\.venv|venv|_build|buck-out|build|dist|__pypackages__
-  | docs/source/conf\.py
-  | examples/fdroid_export_keystore_to_nitrokey\.py
-  | examples/fdroid_exportkeystore\.py
-  | examples/fdroid_fetchsrclibs\.py
-  | examples/fdroid_nitrokeyimport\.py
-  | fdroidserver/__main__\.py
-  | fdroidserver/apksigcopier\.py
-  | fdroidserver/looseversion\.py
-  | fdroidserver/build\.py
-  | fdroidserver/checkupdates\.py
-  | fdroidserver/common\.py
-  | fdroidserver/index\.py
-  | fdroidserver/metadata\.py
-  | fdroidserver/update\.py
-  | fdroidserver/vmtools\.py
-  | tests/config\.py
-  | tests/extra/manual-vmtools-test\.py
-  | tests/gradle-release-checksums\.py
-  | tests/openssl-version-check-test\.py
-  | tests/valid-package-names/test\.py
-  | tests/test_common\.py
-  | tests/test_update\.py
-)$'''
-
-
-[tool.mypy]
-python_version = "3.9"
-
-files = "fdroidserver"
-
-# exclude vendored files
-exclude = "fdroidserver/(apksigcopier|looseversion).py"
-
-# this is de-facto the linter setting for this file
-warn_unused_configs = true
-
-# TODO: we should either upgrade the used packages to a version which includes type hints OR install/write stub packages for these libraries.
-# Further details here: https://mypy.readthedocs.io/en/stable/running_mypy.html#missing-type-hints-for-third-party-library
-ignore_missing_imports = true
-
-# ignore the [no-redef] errors, as they collide with the bandit "# nosec" exclusion (common.py)
-# unfortunately both tools expect their ignore flag as a comment in the same line
-# [misc] is ignored for the "incompatible import"
-# [arg-type] is ignored because when there are missing envs, everything will crash, not just the types
-disable_error_code = "no-redef, misc, arg-type"
-
-
-[tool.pylint.main]
-# Use multiple processes to speed up Pylint. Specifying 0 will auto-detect the
-# number of processors available to use, and will cap the count on Windows to
-# avoid hangs.
-jobs = 0
-
-# Minimum Python version to use for version dependent checks. Will default to the
-# version used to run pylint.
-py-version = "3.9"
-
-# Files or directories to be skipped. They should be base names, not paths.
-ignore = ["apksigcopier.py", "looseversion.py"]
-
-[tool.pylint."messages control"]
-# Only show warnings with the listed confidence levels. Leave empty to show all.
-# Valid levels: HIGH, CONTROL_FLOW, INFERENCE, INFERENCE_FAILURE, UNDEFINED.
-confidence = ["HIGH", "INFERENCE"]
-
-# Disable the message, report, category or checker with the given id(s). You can
-# either give multiple identifiers separated by comma (,) or put this option
-# multiple times (only on the command line, not in the configuration file where
-# it should appear only once). You can also use "--disable=all" to disable
-# everything first and then re-enable specific checks. For example, if you want
-# to run only the similarities checker, you can use "--disable=all
-# --enable=similarities". If you want to run only the classes checker, but have
-# no Warning level messages displayed, use "--disable=all --enable=classes
-# --disable=W".
-
-# TODO many of these could be fixed if someone wants to spend the time
-disable = [
-  "broad-exception-caught",
-  "broad-exception-raised",
-  "invalid-name",
-  "missing-class-docstring",
-  "missing-function-docstring",
-  "missing-module-docstring",
-  "no-else-continue",
-  "no-else-raise",
-  "no-else-return",
-  "subprocess-run-check",
-  "use-dict-literal",
-]
-
-
-[tool.pylint.miscellaneous]
-# List of note tags to take in consideration, separated by a comma.
-notes = ["FIXME", "XXX", "TODO"]
-
-[tool.pylint.refactoring]
-# Maximum number of nested blocks for function / method body
-max-nested-blocks = 5
-
-[tool.pylint.format]
-# Maximum number of characters on a single line.
-max-line-length = 88
-
-[tool.ruff.format]
-quote-style = "preserve"
diff --git a/setup.cfg b/setup.cfg
index bd613e73..81bcf8af 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,9 +1,10 @@
 [metadata]
 license_file = LICENSE
 
-# publish with: twine upload --sign dist/fdroidserver*.tar.gz
+# uploading here requires Python 3.5.3+ or setuptools 27+,
+# use instead: twine upload --sign dist/fdroidserver*.tar.gz
 [aliases]
-release = versioncheck sdist
+release = versioncheck compile_catalog sdist
 
 # All this below is for Babel config.  Ideally we would only use
 # Babel, but it is still missing some key features that gettext gives
@@ -38,20 +39,3 @@ output_dir = locale
 [compile_catalog]
 domain = fdroidserver
 directory = locale
-
-[pycodestyle]
-ignore = E123,E203,E402,E501,W503
-max-line-length = 88
-
-[flake8]
-ignore = E123,E203,E402,E501,W503
-max-line-length = 88
-
-# Settings for docstrings linter
-# we use numpy stlye https://numpydoc.readthedocs.io/en/latest/format.html
-# ignored errors are 
-# * D10*: Missing docstring *
-# * rest are the conventions which are ignored by numpy conventions according to http://www.pydocstyle.org/en/stable/error_codes.html 
-[pydocstyle]
-#convention = numpy # cannot be used in combination with ignore, so we list rules seperately.
-ignore = D100,D101,D102,D103,D104,D105,D106,D107,D203,D212,D213,D402,D413,D415,D416,D417
diff --git a/setup.py b/setup.py
index 5fa1c9b4..61475a4b 100755
--- a/setup.py
+++ b/setup.py
@@ -1,152 +1,105 @@
 #!/usr/bin/env python3
 
+from setuptools import Command
+from setuptools import setup
+import os
 import re
 import subprocess
 import sys
 
-from setuptools import Command, setup
-from setuptools.command.install import install
-
 
 class VersionCheckCommand(Command):
-    """Make sure git tag and version match before uploading."""
-
+    """Make sure git tag and version match before uploading"""
     user_options = []
 
     def initialize_options(self):
-        """Abstract method that is required to be overwritten."""
+        """Abstract method that is required to be overwritten"""
 
     def finalize_options(self):
-        """Abstract method that is required to be overwritten."""
+        """Abstract method that is required to be overwritten"""
 
     def run(self):
         version = self.distribution.get_version()
-        version_git = (
-            subprocess.check_output(['git', 'describe', '--tags', '--always'])
-            .rstrip()
-            .decode('utf-8')
-        )
+        version_git = subprocess.check_output(['git', 'describe', '--tags', '--always']).rstrip().decode('utf-8')
         if version != version_git:
-            print(
-                'ERROR: Release version mismatch! setup.py (%s) does not match git (%s)'
-                % (version, version_git)
-            )
+            print('ERROR: Release version mismatch! setup.py (%s) does not match git (%s)'
+                  % (version, version_git))
             sys.exit(1)
         print('Upload using: twine upload --sign dist/fdroidserver-%s.tar.gz' % version)
 
 
-class InstallWithCompile(install):
-    def run(self):
-        from babel.messages.frontend import compile_catalog
-
-        compiler = compile_catalog(self.distribution)
-        option_dict = self.distribution.get_option_dict('compile_catalog')
-        compiler.domain = [option_dict['domain'][1]]
-        compiler.directory = option_dict['directory'][1]
-        compiler.run()
-        super().run()
-
-
 def get_data_files():
+    # workaround issue on OSX or --user installs, where sys.prefix is not an installable location
+    if os.access(sys.prefix, os.W_OK | os.X_OK):
+        data_prefix = sys.prefix
+    else:
+        data_prefix = '.'
+
     data_files = []
     with open('MANIFEST.in') as fp:
         data = fp.read()
 
-    data_files.append(
-        ('share/doc/fdroidserver/examples', re.findall(r'include (examples/.*)', data))
-    )
-    data_files.append(
-        ('share/doc/fdroidserver/examples', ['buildserver/config.buildserver.yml'])
-    )
-
-    for d in re.findall(r'include (locale/.*)/fdroidserver\.po', data):
-        data_files.append(('share/' + d, [d + '/fdroidserver.mo']))
+    data_files.append((data_prefix + '/share/doc/fdroidserver/examples',
+                       ['buildserver/config.buildserver.yml', ]
+                       + re.findall(r'include (examples/.*)', data)))
 
+    for f in re.findall(r'include (locale/[a-z][a-z][a-zA-Z_]*/LC_MESSAGES/fdroidserver.mo)', data):
+        d = os.path.join(data_prefix, 'share', os.path.dirname(f))
+        data_files.append((d, [f, ]))
     return data_files
 
 
 with open("README.md", "r") as fh:
     long_description = fh.read()
 
-setup(
-    name='fdroidserver',
-    version='2.4.2',
-    description='F-Droid Server Tools',
-    long_description=long_description,
-    long_description_content_type='text/markdown',
-    author='The F-Droid Project',
-    author_email='team@f-droid.org',
-    url='https://f-droid.org',
-    license='AGPL-3.0',
-    packages=['fdroidserver', 'fdroidserver.asynchronousfilereader'],
-    entry_points={'console_scripts': ['fdroid=fdroidserver.__main__:main']},
-    data_files=get_data_files(),
-    python_requires='>=3.9',
-    cmdclass={
-        'versioncheck': VersionCheckCommand,
-        'install': InstallWithCompile,
-    },
-    setup_requires=[
-        'babel',
-    ],
-    install_requires=[
-        'platformdirs',
-        'androguard >= 3.3.5',
-        'asn1crypto',
-        # TODO use biplist on all platforms once IPA support is stable
-        'biplist ; sys_platform=="darwin"',
-        'clint',
-        'defusedxml',
-        'GitPython',
-        'oscrypto',
-        'paramiko',
-        'Pillow',
-        'puremagic',
-        'pycountry ; sys_platform=="darwin"',
-        'python-vagrant',
-        'PyYAML',
-        'qrcode',
-        'ruamel.yaml >= 0.15, < 0.17.22',
-        'requests >= 2.5.2, != 2.11.0, != 2.12.2, != 2.18.0',
-        'sdkmanager >= 0.6.4',
-        'yamllint',
-        'tomli >= 1.1.0; python_version < "3.11"',
-    ],
-    # Some requires are only needed for very limited cases:
-    # * biplist is only used for parsing Apple .ipa files
-    # * pycountry is only for linting config/mirrors.yml
-    # * python-magic is preferred when the C library libmagic is installed
-    extras_require={
-        'optional': [
-            'biplist',
-            'pycountry',
-            'python-magic',
-        ],
-        'test': ['pyjks', 'html5print', 'testcontainers[minio]'],
-        'docs': [
-            'sphinx',
-            'numpydoc',
-            'pydata_sphinx_theme',
-            'pydocstyle',
-        ],
-    },
-    classifiers=[
-        'Development Status :: 5 - Production/Stable',
-        'Intended Audience :: Developers',
-        'Intended Audience :: Information Technology',
-        'Intended Audience :: System Administrators',
-        'Intended Audience :: Telecommunications Industry',
-        'License :: OSI Approved :: GNU Affero General Public License v3 or later (AGPLv3+)',
-        'Operating System :: POSIX',
-        'Operating System :: MacOS :: MacOS X',
-        'Operating System :: Unix',
-        'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.9',
-        "Programming Language :: Python :: 3.10",
-        "Programming Language :: Python :: 3.11",
-        "Programming Language :: Python :: 3.12",
-        "Programming Language :: Python :: 3.13",
-        'Programming Language :: Python :: 3 :: Only',
-        'Topic :: Utilities',
-    ],
-)
+setup(name='fdroidserver',
+      version='2.0a4',
+      description='F-Droid Server Tools',
+      long_description=long_description,
+      long_description_content_type='text/markdown',
+      author='The F-Droid Project',
+      author_email='team@f-droid.org',
+      url='https://f-droid.org',
+      license='AGPL-3.0',
+      packages=['fdroidserver', 'fdroidserver.asynchronousfilereader'],
+      scripts=['fdroid', 'makebuildserver'],
+      data_files=get_data_files(),
+      python_requires='>=3.4',
+      cmdclass={'versioncheck': VersionCheckCommand},
+      setup_requires=[
+          'babel',
+      ],
+      install_requires=[
+          'androguard >= 3.1.0rc2, != 3.3.0, != 3.3.1, != 3.3.2',
+          'clint',
+          'defusedxml',
+          'GitPython',
+          'mwclient',
+          'paramiko',
+          'Pillow',
+          'apache-libcloud >= 0.14.1',
+          'pyasn1 >=0.4.1, < 0.5.0',
+          'pyasn1-modules >= 0.2.1, < 0.3',
+          'python-vagrant',
+          'PyYAML',
+          'qrcode',
+          'ruamel.yaml >= 0.15',
+          'requests >= 2.5.2, != 2.11.0, != 2.12.2, != 2.18.0',
+          'yamllint',
+      ],
+      extras_require={
+          'test': ['pyjks'],
+      },
+      classifiers=[
+          'Development Status :: 4 - Beta',
+          'Intended Audience :: Developers',
+          'Intended Audience :: Information Technology',
+          'Intended Audience :: System Administrators',
+          'Intended Audience :: Telecommunications Industry',
+          'License :: OSI Approved :: GNU Affero General Public License v3 or later (AGPLv3+)',
+          'Operating System :: POSIX',
+          'Operating System :: MacOS :: MacOS X',
+          'Operating System :: Unix',
+          'Topic :: Utilities',
+      ],
+      )
diff --git a/tests/SANAPPSI.RSA b/tests/SANAPPSI.RSA
deleted file mode 100644
index f727aa8b..00000000
Binary files a/tests/SANAPPSI.RSA and /dev/null differ
diff --git a/tests/SANAPPSI.SF b/tests/SANAPPSI.SF
deleted file mode 100644
index 6b32aa9f..00000000
--- a/tests/SANAPPSI.SF
+++ /dev/null
@@ -1,2044 +0,0 @@
-Signature-Version: 1.0
-SHA1-Digest-Manifest-Main-Attributes: j30fXwMuyUNMD8CkhJNLiV/4i5U=
-Created-By: 1.6.0_26 (Sun Microsystems Inc.)
-SHA1-Digest-Manifest: Xrxc4Hzyp+Hy2ZoUSqnJMMLl5rw=
-
-Name: res/drawable/listselector_black_other.xml
-SHA1-Digest: MWLw2UtkVO3XvB4pHy6n040Gf34=
-
-Name: res/drawable-xhdpi/abs__spinner_ab_pressed_holo_light.9.png
-SHA1-Digest: FzjmKCcidOTQaeqKDaRoIPDLRFs=
-
-Name: res/drawable-ldpi/plus.png
-SHA1-Digest: r3DiYpO4vOYO47rZrShRO0BFZhQ=
-
-Name: res/drawable-mdpi/abs__spinner_48_inner_holo.png
-SHA1-Digest: 2lkUs3xv5PleZLwoEPtjpQImnpc=
-
-Name: res/drawable-xhdpi/network_wifi4_s.png
-SHA1-Digest: c2Hm5mmx/ro6D0bz9joCoeKIY+U=
-
-Name: res/drawable-hdpi/abs__spinner_48_inner_holo.png
-SHA1-Digest: CJL2ghapGa7P/c4HGmlTyHSDmUc=
-
-Name: res/drawable/a02.png
-SHA1-Digest: dU9vOCVfKmxTs0qMgCGwiEr5VfQ=
-
-Name: assets/it/03started_IT.png
-SHA1-Digest: mEvR38lU22QT9wFqTmNXGf/nAbc=
-
-Name: res/drawable/listselector_other.xml
-SHA1-Digest: FBWpUfganAevEl3BAaG2T2jd5OI=
-
-Name: res/layout-v14/sherlock_spinner_item.xml
-SHA1-Digest: ql55eok+PCzt8roriI/o6DIfF9s=
-
-Name: res/drawable-mdpi/settings_dark.png
-SHA1-Digest: PlVxcR6DvmNgPigkGtKccKW7hoM=
-
-Name: res/drawable-xhdpi/abs__ab_bottom_solid_dark_holo.9.png
-SHA1-Digest: eFqrKbPnt4coIZuXeRDmTQ2udcQ=
-
-Name: res/drawable-xhdpi/abs__btn_cab_done_pressed_holo_light.9.png
-SHA1-Digest: JpDU0Y1y6F6Ao4HGBg4ANZRivB0=
-
-Name: assets/es/03started_SP.png
-SHA1-Digest: mK6LEVFjuqE64ggWQDhm5GVWLqc=
-
-Name: res/layout/file_grid_adapter_content.xml
-SHA1-Digest: JZ/eJGUIMqzhHUrOderuOCeg2Ro=
-
-Name: res/drawable-xhdpi/download_dark_green.png
-SHA1-Digest: 3tcdWbWCqGwItudsipwUQYQQKXE=
-
-Name: res/drawable-hdpi/abs__progress_secondary_holo_light.9.png
-SHA1-Digest: NclG74rMN1B0DgLYETLDBkWMcNc=
-
-Name: res/drawable/abs__textfield_searchview_right_holo_light.xml
-SHA1-Digest: DKiINexDf/h7yiK0i8DZ++4MCCc=
-
-Name: res/drawable-mdpi/abs__ic_go.png
-SHA1-Digest: gCn3z+l3jF6XzbJ1zu/I/cfOhic=
-
-Name: res/drawable-xhdpi/abs__cab_background_top_holo_dark.9.png
-SHA1-Digest: 0ea3duNXY0J43pi4kHjogRXDHVY=
-
-Name: res/drawable-hdpi/pause_notify.png
-SHA1-Digest: Qhmqe239fUV8+Q2i6vx/0MwbNw8=
-
-Name: res/drawable/abs__btn_cab_done_holo_dark.xml
-SHA1-Digest: LsfiS6IfaXG1BgUZ+g5yuauD4cA=
-
-Name: res/drawable-hdpi/abs__ab_stacked_transparent_light_holo.9.png
-SHA1-Digest: GAKCrxmGsKhItkNy1MAIS2q9vRA=
-
-Name: res/drawable-mdpi/abs__spinner_ab_default_holo_dark.9.png
-SHA1-Digest: LYrwN+jVXg8t1E/QWje1z3utYhE=
-
-Name: res/drawable-ldpi/download_dark_green.png
-SHA1-Digest: 2JmQLIwmNDTuthzVm8qusj0QAzQ=
-
-Name: res/drawable-mdpi/abs__dialog_full_holo_dark.9.png
-SHA1-Digest: 5kMok0yjau7mHw4vozq79vClj1g=
-
-Name: res/drawable-xhdpi/abs__spinner_ab_pressed_holo_dark.9.png
-SHA1-Digest: jZXAbmZiHofjvOsnjGZzKEalq7w=
-
-Name: res/drawable-xhdpi/abs__ab_stacked_transparent_dark_holo.9.png
-SHA1-Digest: Kpd0zjAsuYHF93rPn7rxNL79DQw=
-
-Name: res/drawable-xhdpi/abs__list_activated_holo.9.png
-SHA1-Digest: IfHC/OnL+3bB/ZxOyFCoy5EeBi8=
-
-Name: res/drawable-xhdpi/settings_downloads.png
-SHA1-Digest: SyHeNwSG7iddevDcS21xJZyhEqE=
-
-Name: assets/fr/03started_FR.png
-SHA1-Digest: 7QWErJW9xFOqIlNeRQdur7clgvs=
-
-Name: res/drawable-xhdpi/abs__ic_search_api_holo_light.png
-SHA1-Digest: zzViuA42kPy4ztuyd5jmb69h3UE=
-
-Name: res/drawable-mdpi/abs__cab_background_top_holo_dark.9.png
-SHA1-Digest: AD+zezNsMMkAj2PtUAJjMMu5iDY=
-
-Name: assets/de/05content_GR.png
-SHA1-Digest: 3RuvSnNJFASIQHTF9TYFtdsFCjQ=
-
-Name: res/drawable-hdpi/abs__list_focused_holo.9.png
-SHA1-Digest: cmzK05siG5gg/JMEX6gwLI8okTo=
-
-Name: res/drawable-mdpi/create_folder_dark.png
-SHA1-Digest: yKOjRyT+4K/ay5Zw/gHFGoi+K4o=
-
-Name: res/drawable-mdpi/abs__list_divider_holo_light.9.png
-SHA1-Digest: LYwCyBqiEztiFAeA4HH7i29QWHs=
-
-Name: assets/ru/04wifi_RUS.png
-SHA1-Digest: JPR+kz0ylNKA/oy4LgWuwP5ufxc=
-
-Name: res/drawable-mdpi/abs__ic_menu_moreoverflow_normal_holo_light.pn
- g
-SHA1-Digest: tsTtsbOvqALy3nQvq2fpTwpbKF4=
-
-Name: res/drawable-mdpi/upload2.png
-SHA1-Digest: Pb2KTktgUwbKIMnmJ8LFChJdQQc=
-
-Name: assets/ru/03started_RUS.png
-SHA1-Digest: sQ460pKsDXWNKbpYEPYuT7p93cc=
-
-Name: res/drawable-mdpi/delete_dark.png
-SHA1-Digest: lef06JOChh6NdiaUG66+16QSCbs=
-
-Name: res/drawable/dotted_line.png
-SHA1-Digest: 7tyBAkuG9ktS8DcJYsmC+/ADSf8=
-
-Name: res/drawable-xhdpi/wifi0_s.png
-SHA1-Digest: UTmCAMH3PBQG+QiuJPyMcK1tYD4=
-
-Name: res/drawable-hdpi/abs__list_selector_disabled_holo_dark.9.png
-SHA1-Digest: PSYxMX7M0Pyv7qDHlCHIX8N0vBM=
-
-Name: res/drawable-xhdpi/abs__dialog_full_holo_light.9.png
-SHA1-Digest: 9j/eomOMGL6s6MALfx6BoUqHpTE=
-
-Name: res/drawable-large-mdpi/icon.png
-SHA1-Digest: YujYD3yhWG67AgXqFkEaEcVKc60=
-
-Name: res/drawable-xhdpi/abs__ic_menu_share_holo_light.png
-SHA1-Digest: PkuNwXm1UGjUrzPA6Gd3SDdpl0M=
-
-Name: assets/zh_CN/04wifi_CHS.png
-SHA1-Digest: 31sTREsQW3QhXWsbeUXs+mDu4vc=
-
-Name: res/layout/file_picker_row.xml
-SHA1-Digest: 54eaz24HfzWyNXQ93Z45UaxSCh0=
-
-Name: res/drawable/abs__spinner_ab_holo_light.xml
-SHA1-Digest: fKUkdnpNhn2zLqG/TQcyrcRiBz0=
-
-Name: res/drawable-mdpi/abs__spinner_ab_pressed_holo_light.9.png
-SHA1-Digest: MXzCST6BJQJccxQfpI1YKs9soMA=
-
-Name: res/drawable-mdpi/abs__ab_solid_shadow_holo.9.png
-SHA1-Digest: hGrkC3VbA03lIpo5eAWAIKxUACA=
-
-Name: assets/it/02qsg_IT.png
-SHA1-Digest: nw6+ZqnhIDwdaMxlcQiUvYtMWbU=
-
-Name: res/drawable-ldpi/upload2_dark.png
-SHA1-Digest: O6MiwNx0hNWwhmLzI31w2i1pnbA=
-
-Name: res/drawable-xhdpi/abs__spinner_ab_default_holo_light.9.png
-SHA1-Digest: rN3ozv1THFWfASSLprLsIUefo8A=
-
-Name: assets/es/05content_SP.png
-SHA1-Digest: rCIAUYe9WpDtWEq+UVmOxd4Ty2w=
-
-Name: assets/ja/02qsg_JAP.png
-SHA1-Digest: lIymJ/HfciDGnsSJKzmBjko2YFU=
-
-Name: res/drawable-mdpi/list.png
-SHA1-Digest: xTtboHSYByS0OdKOg4C8LDx+xfE=
-
-Name: res/drawable-xhdpi/abs__textfield_search_default_holo_light.9.pn
- g
-SHA1-Digest: WtQajziBu+760kiReahU5rVLMqc=
-
-Name: res/drawable-ldpi/notify_a02.png
-SHA1-Digest: oRz9qSdhdyjiJD97U1n80cA6T+Y=
-
-Name: res/drawable/prompter_later_icon.png
-SHA1-Digest: xKAMzyWVvSUonv9TVwtit0FWBaI=
-
-Name: res/drawable-hdpi/abs__list_pressed_holo_dark.9.png
-SHA1-Digest: tyQ5tBsIsMFbB2+EYlw1QOfshGo=
-
-Name: res/drawable/abs__search_dropdown_light.xml
-SHA1-Digest: R3EDawEdTrc8ZZYB1Zq4EjdM+c4=
-
-Name: res/drawable-mdpi/abs__list_selector_disabled_holo_light.9.png
-SHA1-Digest: lUZ07f/+UGDoTLjAZkTwyDWPzS8=
-
-Name: res/drawable-hdpi/abs__dialog_full_holo_dark.9.png
-SHA1-Digest: NZL7OMl0qyFZYaVxYtgttwuB4EM=
-
-Name: res/drawable-xhdpi/abs__progress_primary_holo_light.9.png
-SHA1-Digest: gbM/209feahCWBSz/iSqM+5CQEs=
-
-Name: res/drawable-xhdpi/abs__ab_solid_light_holo.9.png
-SHA1-Digest: oEjEqrCMWcAZlrRm5r9CGgkfbhQ=
-
-Name: assets/it/04wifi_IT.png
-SHA1-Digest: 5jbrfUmBX17mcLNliKGbdePTuuM=
-
-Name: res/drawable/abs__activated_background_holo_dark.xml
-SHA1-Digest: zn1e13WcJRCRd6uIui2lRD/14ps=
-
-Name: res/drawable/a02_grey.png
-SHA1-Digest: aiVy0aSwrCmfwZTzviJwIi0joyc=
-
-Name: res/drawable/abs__list_selector_background_transition_holo_dark.
- xml
-SHA1-Digest: nkzZ+Yg/x4857LCaM82WB/8Bv5c=
-
-Name: res/drawable-hdpi/abs__ab_stacked_solid_light_holo.9.png
-SHA1-Digest: VYF3ilhVt0j4XUKE7/i+chELTwU=
-
-Name: res/layout/abs__action_bar_tab.xml
-SHA1-Digest: nGCpM62b21vr2fx48qzseI0Kh2I=
-
-Name: res/xml/settings_network.xml
-SHA1-Digest: Hm4f9jRc32zWhWt7e9ETUSndfqE=
-
-Name: res/drawable-hdpi/abs__cab_background_bottom_holo_dark.9.png
-SHA1-Digest: aXnONgY9LnlqGryUeUqgo7LOSQk=
-
-Name: res/xml/settings_preferred_networks.xml
-SHA1-Digest: aEPm2opo6kZzLtz/SJNIl/ArB7Y=
-
-Name: res/drawable-ldpi/upload_green_dark.png
-SHA1-Digest: qLBaMbh29jvLm4ew5T00JYe86nQ=
-
-Name: res/drawable-mdpi/abs__tab_selected_holo.9.png
-SHA1-Digest: L5T/evq3/QxvwsaGEbem7TflNV4=
-
-Name: assets/fr/02qsg_FR.png
-SHA1-Digest: Q+MQoQYdSNYOvrK67srWZxwyU0E=
-
-Name: res/drawable-xhdpi/device_grey.png
-SHA1-Digest: gJas9+8qpam8yBn92fLMZBfYV8U=
-
-Name: assets/de/02qsg_GR.png
-SHA1-Digest: I+lxqFyScw80Z4jZC3XllZI9tAA=
-
-Name: res/drawable-xhdpi/sidelink_s.png
-SHA1-Digest: YSdNBBj3Twhfakw5mUeob6xmqc8=
-
-Name: res/drawable-hdpi/abs__ic_ab_back_holo_light.png
-SHA1-Digest: CixL+v/te56l/tUQbDjX61YPV00=
-
-Name: res/drawable/abs__search_dropdown_dark.xml
-SHA1-Digest: NXhpyrdvsxnjMhZNexYVfesmAB8=
-
-Name: res/drawable-xhdpi/abs__spinner_ab_disabled_holo_light.9.png
-SHA1-Digest: pdDmHBXa98nEr/3He9uEXSLFC1o=
-
-Name: res/drawable/android_device.png
-SHA1-Digest: W27uCkolI+M1GLnyktdkl8krYXI=
-
-Name: res/drawable-hdpi/abs__textfield_search_selected_holo_dark.9.png
-SHA1-Digest: WBB4+CBudWVmh0lMMVXiNP0JDrU=
-
-Name: res/drawable-hdpi/create_folder_dark.png
-SHA1-Digest: xfti53azeNFBEjWPm6XrcR9T0F0=
-
-Name: res/drawable-hdpi/notify_a02s.png
-SHA1-Digest: oDMYbBNRJAL+bOpfej8MmSlfZHo=
-
-Name: res/drawable-xhdpi/network_wifi1_s.png
-SHA1-Digest: FG1rrohcnefatqyEAdRju68isFw=
-
-Name: res/layout/prompter.xml
-SHA1-Digest: Rd2/j3GAhWBT+9Oyfz+kFG9KZhE=
-
-Name: res/drawable-mdpi/notify_a02s.png
-SHA1-Digest: PYKLvezZQEZhduKHT29nBU36EJg=
-
-Name: res/drawable/action_bar_background.png
-SHA1-Digest: 2kRUSGiW40hppQWVem7dxmBZT9Q=
-
-Name: res/drawable-hdpi/list_dark.png
-SHA1-Digest: 0P1SngBpjnVfhE5k77fqPx+X4lQ=
-
-Name: res/drawable-hdpi/abs__btn_cab_done_pressed_holo_light.9.png
-SHA1-Digest: v8ypJ5NNRgssVGwciTAxLfTJimk=
-
-Name: res/drawable-mdpi/abs__textfield_search_selected_holo_dark.9.png
-SHA1-Digest: HCwKLtZvThjkFwM4ec23apOHRKY=
-
-Name: res/drawable/listselector_black.xml
-SHA1-Digest: Lu3YXjbTs+qeozbdQ6UFpHDFId4=
-
-Name: res/drawable-hdpi/abs__textfield_search_right_default_holo_dark.
- 9.png
-SHA1-Digest: 7QBkvHTf6LXBGN5pEiHf8O/eals=
-
-Name: res/layout/abs__activity_chooser_view_list_item.xml
-SHA1-Digest: 8DrPL6nrJch1r5jnnAUGfjufqPI=
-
-Name: res/drawable-hdpi/abs__ab_bottom_transparent_dark_holo.9.png
-SHA1-Digest: u1TLIRZlHuDUKJg9Zfw4ABuD/9E=
-
-Name: res/drawable-xhdpi/abs__ic_voice_search.png
-SHA1-Digest: +GD8FPK5NCAls40MvKX9/6/LJfQ=
-
-Name: res/drawable-hdpi/abs__textfield_search_right_selected_holo_dark
- .9.png
-SHA1-Digest: 2IeB+m0vaMbHMFjnOJGzaqY/h2w=
-
-Name: res/drawable-mdpi/settings.png
-SHA1-Digest: YqFHEtD+aqGYihfsfTGKo4Gg4s0=
-
-Name: res/drawable-xhdpi/abs__ab_transparent_dark_holo.9.png
-SHA1-Digest: vSauuGeIKSecU5a1hWJ2RNsNJzQ=
-
-Name: res/drawable-mdpi/notify_a01.png
-SHA1-Digest: qa8aM+G/X1hYqkwGexHSTACFGHc=
-
-Name: res/drawable-mdpi/abs__ic_search.png
-SHA1-Digest: BI0nScADeYpWWpMjIMAT2QY2Umw=
-
-Name: res/drawable-mdpi/abs__ic_clear_search_api_disabled_holo_light.p
- ng
-SHA1-Digest: NMg/ydr6pzg1YALEzBCxmkb7kxk=
-
-Name: res/drawable-xhdpi/wifi1_s.png
-SHA1-Digest: +PLjVt6M4emDQvfdVVLjRJeRjvQ=
-
-Name: res/drawable/file_xls.png
-SHA1-Digest: Pf4ayhW4F6PoGLfDrD0bylDULkI=
-
-Name: res/drawable/folder.png
-SHA1-Digest: azkcOt4V16v3sXfFKe0edzAI++o=
-
-Name: res/drawable-mdpi/download_dark.png
-SHA1-Digest: aWHXoyGEKbpj1DTEpRBkpMH6PmI=
-
-Name: res/drawable-mdpi/abs__ic_menu_share_holo_light.png
-SHA1-Digest: magQUaooCQ+JXt60vJsEvewVzkw=
-
-Name: res/drawable-hdpi/abs__list_divider_holo_light.9.png
-SHA1-Digest: dLGGprCGkct4687KEh113PTpG9c=
-
-Name: res/drawable/checked.png
-SHA1-Digest: YGmEtu098UIXrwUi+qILHOocWWk=
-
-Name: res/drawable-xhdpi/notify_a01.png
-SHA1-Digest: fZMn3IkFBOLUwLPbjCQAUj6fSv0=
-
-Name: assets/es/qsg.html
-SHA1-Digest: bZsWIJ91bpeFJSQ93S7g9re+sGU=
-
-Name: res/drawable/popup_shape.xml
-SHA1-Digest: i8MySzOa2xukP/5Wgjw1+BK5qi0=
-
-Name: res/drawable-hdpi/abs__btn_cab_done_focused_holo_light.9.png
-SHA1-Digest: IAoWDEN7FVuyVXzrbwlUiMvTm4A=
-
-Name: res/drawable/abs__item_background_holo_dark.xml
-SHA1-Digest: kvabXA9nk27AJ7fo9ZiEKSYhJUE=
-
-Name: res/layout/aircruzer_picker.xml
-SHA1-Digest: mUa4WrIKIRyAgLqYJ8iAu4NmHK8=
-
-Name: res/drawable-hdpi/abs__spinner_48_outer_holo.png
-SHA1-Digest: UkxSolG4Lj/7rurZhEafioc4GO0=
-
-Name: res/layout-large/music_land.xml
-SHA1-Digest: KlS9PoIMpn+lJLrPIhM73628RfU=
-
-Name: res/drawable-hdpi/abs__spinner_ab_default_holo_light.9.png
-SHA1-Digest: xkdHqtecCptSNAenCziCM6Dx9ug=
-
-Name: res/layout/gallery_picker.xml
-SHA1-Digest: 2iJUVwcyAZVxznNSVnTfV1LlsVc=
-
-Name: res/drawable-mdpi/abs__menu_dropdown_panel_holo_dark.9.png
-SHA1-Digest: xJpDBeVVHEAseQkRi1XAIGMriyA=
-
-Name: res/drawable-xhdpi/abs__spinner_ab_focused_holo_dark.9.png
-SHA1-Digest: 7mQl9j8Z+4d8toEFSV4DWOebffU=
-
-Name: res/drawable-xhdpi/abs__btn_cab_done_focused_holo_dark.9.png
-SHA1-Digest: fxJ1IQV5ASthEhtf9SO0AEDjv24=
-
-Name: res/layout/file_picker.xml
-SHA1-Digest: 7kw3j8NCvK5W62giTMuOIvC8T2E=
-
-Name: res/drawable-mdpi/abs__ic_ab_back_holo_dark.png
-SHA1-Digest: oLfC1AXlyDlkSM5ygmQMDvnKn+k=
-
-Name: res/drawable-ldpi/upload_green.png
-SHA1-Digest: PwNRr2W1ld44CJo390pLw13p4YI=
-
-Name: assets/fr/04wifi_FR.png
-SHA1-Digest: v3KvaQFnOnqzTYAXzp8amgwgRnQ=
-
-Name: res/drawable-xhdpi/abs__spinner_ab_disabled_holo_dark.9.png
-SHA1-Digest: wK6pwNPNoO+a3FlkoF9etbrUgak=
-
-Name: res/drawable-ldpi/download.png
-SHA1-Digest: 1f8VPGCHjHmxVYpgEn2PLCWoHBA=
-
-Name: res/layout/sherlock_spinner_dropdown_item.xml
-SHA1-Digest: 1cUUR7HCn106iA3nxGAf4gLC+Zs=
-
-Name: res/drawable/prompter_now_icon.png
-SHA1-Digest: Xl6Skkfd/1hmJ9pWgKx6fcJ5wV0=
-
-Name: res/drawable-xhdpi/abs__list_divider_holo_dark.9.png
-SHA1-Digest: 7MWXoXdFBtj0xevridg2MwrPea8=
-
-Name: res/drawable/sandisk_logo.png
-SHA1-Digest: qGLW0i4OsY8+etWOKh6/GSu/sbg=
-
-Name: res/drawable-mdpi/abs__ic_menu_share_holo_dark.png
-SHA1-Digest: KUK59sOtpbaNtfvXHu/d4jfjiLc=
-
-Name: res/drawable-xhdpi/abs__list_longpressed_holo.9.png
-SHA1-Digest: +gyZSFuut8L02SGSZyG5FJp9E+Q=
-
-Name: res/drawable-mdpi/refresh.png
-SHA1-Digest: CSig0drvev6druFbHw26duEWnFo=
-
-Name: res/drawable-v11/abs__progress_medium_holo.xml
-SHA1-Digest: LurSPK+0Yc5jfqHJsXs8SvPKWOM=
-
-Name: res/drawable/a02c_grey.png
-SHA1-Digest: 8n2IpMfIu7vjfIyAZTVWll9g8W8=
-
-Name: res/drawable-mdpi/notify_a02c.png
-SHA1-Digest: TBUp+3CWqRFDqdyemYTZvGngOEE=
-
-Name: assets/es/04wifi_SP.png
-SHA1-Digest: xt39BDWJq+w7ApRN9ETYkhDbWqE=
-
-Name: res/layout/abs__screen_action_bar.xml
-SHA1-Digest: UbWFvLTcPmF0fX/XOJ8qhqFOeuE=
-
-Name: res/drawable-mdpi/abs__dialog_full_holo_light.9.png
-SHA1-Digest: 30Fq6J0OLML2NvEWQAhQxTVZd5Y=
-
-Name: res/drawable-xhdpi/abs__btn_cab_done_pressed_holo_dark.9.png
-SHA1-Digest: xAFz3vWGpge38sxmXPLI27vEPuo=
-
-Name: res/drawable-hdpi/abs__ic_search.png
-SHA1-Digest: mmxhF1hpNdi0wm72NijW0w20Wxc=
-
-Name: res/layout/wep_password_alert.xml
-SHA1-Digest: Kaiw5ruYgDSd0vym8pT0gbSW2Ps=
-
-Name: res/drawable/abs__list_selector_holo_dark.xml
-SHA1-Digest: g79M/u/cZDt/7dZ55Jt1qvM6Suc=
-
-Name: res/drawable/listselector_focused.xml
-SHA1-Digest: h8p7/nYjxNaiu6hlXih1FQAk/0c=
-
-Name: res/layout-v14/sherlock_spinner_dropdown_item.xml
-SHA1-Digest: j2ApyFQZMBt+76GszojrnEGCZN8=
-
-Name: res/drawable/next_enabled.png
-SHA1-Digest: 9ICEJCjzSjugC9UrHVT9QZt9jWE=
-
-Name: res/drawable-xhdpi/network_wifi2.png
-SHA1-Digest: tTt97KZdQ1B3XABarNLU6AyigkQ=
-
-Name: res/drawable-hdpi/abs__textfield_search_selected_holo_light.9.pn
- g
-SHA1-Digest: LLpilWiHrYuALiQ/5iUQR5OPXf0=
-
-Name: res/layout/wifi_settings_warning.xml
-SHA1-Digest: kvnbz3CLSaBQAordW6dqNayZQM8=
-
-Name: assets/zh_CN/05content_CHS.png
-SHA1-Digest: Dlw67oaNJg6zEs7ffBGDMhHSfaE=
-
-Name: res/drawable-mdpi/abs__progress_secondary_holo_dark.9.png
-SHA1-Digest: /SAgp/k2IQYLgj++eNO4dKNGq5s=
-
-Name: res/drawable-mdpi/plus.png
-SHA1-Digest: lTvzNUMQaZsgu0mE9JTY2Qfx9Tg=
-
-Name: res/drawable-mdpi/abs__progress_secondary_holo_light.9.png
-SHA1-Digest: jFGNeShp/bv741EZVHK7OcedTqc=
-
-Name: res/drawable-hdpi/abs__menu_dropdown_panel_holo_dark.9.png
-SHA1-Digest: zrm68udX1iJ5dagtmsfWz7HTFXo=
-
-Name: res/drawable-xhdpi/abs__ic_menu_moreoverflow_normal_holo_dark.pn
- g
-SHA1-Digest: 1sb6CD9Si8eb/l514oNT+ScOJrQ=
-
-Name: res/drawable-hdpi/abs__ab_bottom_solid_dark_holo.9.png
-SHA1-Digest: UNxoaN6XzupxEBNdFCWbravjlHI=
-
-Name: res/drawable-hdpi/abs__ic_clear_normal.png
-SHA1-Digest: +TgrkKGRoFESWLJbCtYv3ujChX0=
-
-Name: assets/de/qsg.html
-SHA1-Digest: nHFEaNWoeHgEplG52NGG7RSRf4U=
-
-Name: assets/fr/qsg.html
-SHA1-Digest: CirZ/0A1w1cIHY5asuFquvSVut0=
-
-Name: res/drawable-xhdpi/abs__list_selector_disabled_holo_dark.9.png
-SHA1-Digest: /DYDUk9WKWg/XaPZlHYTRwCZQ78=
-
-Name: assets/ru/05content_RUS.png
-SHA1-Digest: s4Us4TagsG8KKT+RPj8WuF4r6So=
-
-Name: res/layout/aircruzer_adapter_content_favourite.xml
-SHA1-Digest: CWF6fC18Cnm53EfApkidk//Rel8=
-
-Name: res/drawable-mdpi/abs__list_pressed_holo_dark.9.png
-SHA1-Digest: MVZcqs4uf/1z86YrgdchuFApXFM=
-
-Name: res/drawable/high_white.png
-SHA1-Digest: T6mvyxxAO5uOQq8ea7Pc+L7Wvw4=
-
-Name: res/drawable-hdpi/icon.png
-SHA1-Digest: Xsnl13yqIhN0Yhcvt6sFGxiirOo=
-
-Name: res/drawable-hdpi/grid.png
-SHA1-Digest: mngmQBkqDkTgX8qlKQVqmMUeKDE=
-
-Name: res/drawable-mdpi/abs__ab_stacked_solid_light_holo.9.png
-SHA1-Digest: 0JeD4BWiJde5QSs8vsJGbSSRo9w=
-
-Name: res/drawable-ldpi/refresh.png
-SHA1-Digest: /tKyif+HMcLguuOSmjrHG/epHwM=
-
-Name: res/drawable-hdpi/select.png
-SHA1-Digest: VO6hSFGY0YHXhiTM6M/A3PGGpP8=
-
-Name: assets/it/01logo.png
-SHA1-Digest: RNSf8yo0o5QQ3BW+JNLGjlmkYXM=
-
-Name: res/drawable-hdpi/abs__cab_background_top_holo_dark.9.png
-SHA1-Digest: rf/kCJZARmuzLhNTzuiyPaOEskQ=
-
-Name: assets/en/05content.png
-SHA1-Digest: Li5BBPpeE7/LCDZt8u5kNtqYOwg=
-
-Name: res/drawable-hdpi/notify_a02c.png
-SHA1-Digest: Dh52ybGFrkCfij/0fI7PjnvaOc4=
-
-Name: res/drawable-xhdpi/abs__list_divider_holo_light.9.png
-SHA1-Digest: x9+PP/XbxupQBFw9ABGcxRaJgk8=
-
-Name: res/drawable-mdpi/abs__ab_stacked_solid_dark_holo.9.png
-SHA1-Digest: lI9GC0V2P8dv41uhoIPkw4Y6mZo=
-
-Name: res/drawable-mdpi/abs__ab_stacked_transparent_dark_holo.9.png
-SHA1-Digest: Kc817gaU1Y6yov4eCjYPnOidbls=
-
-Name: res/drawable-mdpi/abs__ic_voice_search_api_holo_light.png
-SHA1-Digest: 49Mq99v4olptPThmPP6j0nawT5w=
-
-Name: assets/en/01logo.png
-SHA1-Digest: P2VlOLMuEir8Gdy0m4iyp5dmmhg=
-
-Name: res/drawable-xhdpi/abs__dialog_full_holo_dark.9.png
-SHA1-Digest: 4nyi+mJAOsENtuCTXd465Y7Uq34=
-
-Name: assets/it/05content_IT.png
-SHA1-Digest: VScV9vj7O+YBpuD/KLtHeaDYgM8=
-
-Name: res/drawable-hdpi/abs__progress_primary_holo_dark.9.png
-SHA1-Digest: xXc1hIjT3vO67xsQT889wFhGrKs=
-
-Name: res/drawable-xhdpi/abs__ic_cab_done_holo_dark.png
-SHA1-Digest: 9ghTrZlcnowNCN7lR28T+hDGtx8=
-
-Name: res/drawable-hdpi/abs__ic_go.png
-SHA1-Digest: CWye9x3DUeO8YvBEl1yhf4hqaCE=
-
-Name: res/drawable-xhdpi/abs__ic_ab_back_holo_light.png
-SHA1-Digest: z0ke+ia8F5RJjuMHQV9UdRAL3P4=
-
-Name: res/drawable-xhdpi/abs__textfield_search_right_selected_holo_lig
- ht.9.png
-SHA1-Digest: tSHxYUUEcy8RD4s5TEbOlAEJfh0=
-
-Name: res/drawable/file_doc.png
-SHA1-Digest: 3hfZjdvB8ZWf5avOTl+z8c/Vkgc=
-
-Name: assets/ja/01logo.png
-SHA1-Digest: /kWuYVhfsI65oSZy3VdTB6LrflA=
-
-Name: res/drawable-mdpi/upload_green_dark.png
-SHA1-Digest: V1zUuj6ac7912Xmlzxeia6XbmJM=
-
-Name: assets/fr/01logo.png
-SHA1-Digest: tmDNQx2XK65qimY3EhcVQfGlMFQ=
-
-Name: assets/zh_TW/04wifi_CHT.png
-SHA1-Digest: L9fvKVAB54jMZtIe6oRsZGZRVxc=
-
-Name: res/drawable-xhdpi/abs__cab_background_bottom_holo_dark.9.png
-SHA1-Digest: AJF3Ifc4kOwddl5NuxnGmPnK7OU=
-
-Name: res/drawable-mdpi/abs__ab_transparent_light_holo.9.png
-SHA1-Digest: +sJdheZQoN+Dh1tRbjQLO8UssyE=
-
-Name: res/drawable-xhdpi/abs__btn_cab_done_focused_holo_light.9.png
-SHA1-Digest: j2PXHb9r4hT0LWIRTKUHxChl30c=
-
-Name: res/drawable-xhdpi/upload_green_dark.png
-SHA1-Digest: IbTADVnQwWLiu1l43ExAngRW8Dc=
-
-Name: res/drawable/movie_overlay.png
-SHA1-Digest: z2TC/ukywxRi53YxsD0tgyoK4us=
-
-Name: res/drawable-xhdpi/network_wifi1.png
-SHA1-Digest: 7PAxMoYaxPIPNGuREZCEEnRjRYc=
-
-Name: res/drawable-hdpi/abs__ab_solid_light_holo.9.png
-SHA1-Digest: 7J9Q5byq8vS6biNpHOPV7jomAk8=
-
-Name: assets/ru/02qsg_RUS.png
-SHA1-Digest: Kl1hRbcezp9vKUlIqxtzio5Ft58=
-
-Name: res/drawable-xhdpi/plus.png
-SHA1-Digest: rxqIzUjL1DFneMGTIZ0fuqCUUN4=
-
-Name: res/drawable-xhdpi/network_wifi2_s.png
-SHA1-Digest: J3h3K/KDENlGE3agp94SGGgVnWM=
-
-Name: res/drawable-hdpi/abs__spinner_ab_focused_holo_light.9.png
-SHA1-Digest: AQXKZr6CJIMys4qb8nRR6AwGmeI=
-
-Name: res/drawable-xhdpi/abs__progress_bg_holo_dark.9.png
-SHA1-Digest: mkjM/2bQaaMvKLY2Mu+dvCM66IQ=
-
-Name: res/drawable-xhdpi/list.png
-SHA1-Digest: zfCy6xQnp3SG6VbxFb07FLfVbcM=
-
-Name: res/drawable/a02s.png
-SHA1-Digest: GSeeNT/Is+ISxESrkcR/BkEIIhg=
-
-Name: res/drawable/a01_grey.png
-SHA1-Digest: o4x4egouND9Eg5F/V7gYepH8BN8=
-
-Name: res/layout/wifi_enable_alert.xml
-SHA1-Digest: FgLGchDLnLd7+qzxlJ2+7keKbRY=
-
-Name: res/drawable-hdpi/upload_green.png
-SHA1-Digest: XP257A4Y2Y6FUjE62C860jDOLY4=
-
-Name: res/drawable-xhdpi/abs__list_selector_disabled_holo_light.9.png
-SHA1-Digest: sJGoCoseoFVk5x28K8JfgpfauJU=
-
-Name: res/raw/wfd1080.df2
-SHA1-Digest: Ze7bkm1Xf+wAM3smectt968klJU=
-
-Name: res/layout/abs__search_dropdown_item_icons_2line.xml
-SHA1-Digest: 4yM8M6LQlEPx2E+FHxwod7YcekM=
-
-Name: res/layout/aircruzer_adapter_content.xml
-SHA1-Digest: 3qvJQmem0vvS/7ZR6cmu41EFTiY=
-
-Name: res/drawable/file_transfer_progress.xml
-SHA1-Digest: zB1xmdjVW6s5lICKEF8R1CvjR5U=
-
-Name: res/drawable-xhdpi/abs__tab_unselected_pressed_holo.9.png
-SHA1-Digest: 93qSifuDk+T5snBLIpvN4wO1K7U=
-
-Name: res/drawable-mdpi/abs__ab_bottom_transparent_light_holo.9.png
-SHA1-Digest: vubKHcANJCKtDTtxkgYFicJ4SNY=
-
-Name: res/drawable-mdpi/abs__ab_bottom_solid_inverse_holo.9.png
-SHA1-Digest: lkth7LAKOZYfoGCArce+VxCnMkE=
-
-Name: AndroidManifest.xml
-SHA1-Digest: 1Q6sDBqzh5rE3qugFvZGPvLd1XU=
-
-Name: res/drawable/listselector.xml
-SHA1-Digest: 3hAl/K8dWhvmmpXiOVOgNsm+r3c=
-
-Name: res/drawable-xhdpi/grid.png
-SHA1-Digest: v+u9B3UCpBYlFWM8jLqBkH+bYBc=
-
-Name: res/drawable-xhdpi/wifi3_s.png
-SHA1-Digest: RxU+HxB9gVfKWrvwmqxWnxyw2x8=
-
-Name: assets/ko/04wifi_KOR.png
-SHA1-Digest: GdSrIVVUgjwMHjdlzuj4wo6+I7I=
-
-Name: res/layout/network_adapter_content.xml
-SHA1-Digest: kZG1xqaJa5j9h4oUCh2HivuxkD4=
-
-Name: res/drawable-mdpi/grid_dark.png
-SHA1-Digest: H0+9LNUPoy819qukjO/zCq812yI=
-
-Name: res/drawable/close.png
-SHA1-Digest: CyX8gjcx2fMTrzKkUSeloiLvntA=
-
-Name: res/drawable-hdpi/abs__ab_transparent_light_holo.9.png
-SHA1-Digest: 4kTcWnz88o9/SYFJwj/yXDU8yEE=
-
-Name: res/layout/abs__list_menu_item_radio.xml
-SHA1-Digest: w+7s4YfCDkdrD+3Kd2/8Upoj5IA=
-
-Name: res/drawable-mdpi/abs__progress_bg_holo_light.9.png
-SHA1-Digest: xVHcWEktmp97Mv3RfXsYYUYbTZE=
-
-Name: classes.dex
-SHA1-Digest: 3km0wVfqQhtB471ajuKsk/KN6ik=
-
-Name: res/drawable/file_generic.png
-SHA1-Digest: g2sd8B1VVAF2jZIDPuREiP1OrfM=
-
-Name: res/drawable-hdpi/abs__ab_stacked_solid_dark_holo.9.png
-SHA1-Digest: UN6hqgMRSJHlLtONWT/5Dj1jldI=
-
-Name: res/drawable-xhdpi/pause_notify
-SHA1-Digest: QqGYzYpLgbJ/DYEo97b5qkriSss=
-
-Name: res/drawable-xhdpi/abs__ab_solid_dark_holo.9.png
-SHA1-Digest: jFrVTtT+2Gung7B7LdaO7zrVRCs=
-
-Name: res/drawable-xhdpi/settings_about.png
-SHA1-Digest: 1FNVYaUf6Q/xrQoIeUD72aYQOuE=
-
-Name: res/drawable-hdpi/settings.png
-SHA1-Digest: 6GK/sbX5QyQgjDZZ4r1w6UzrybU=
-
-Name: res/drawable-hdpi/abs__list_activated_holo.9.png
-SHA1-Digest: I5QuxwxZ7oH/jjm7tnyYPs5kGh4=
-
-Name: assets/zh_TW/qsg.html
-SHA1-Digest: pg0DYaTbVF+LvhneZsCK/Ucz0pY=
-
-Name: res/drawable-hdpi/abs__list_selector_disabled_holo_light.9.png
-SHA1-Digest: aHGtLDCWy+vhaDj0NTpqi86fqY8=
-
-Name: res/drawable-hdpi/upload2_dark.png
-SHA1-Digest: X9LMedqsA/ZvVUdh3Qu7hvBYGE0=
-
-Name: res/drawable-mdpi/abs__ab_solid_dark_holo.9.png
-SHA1-Digest: JA/enCGf3vLcIhBUD+ZyXReZbdA=
-
-Name: res/drawable/file_txt.png
-SHA1-Digest: 4emL5HYvYse7i3yqh7ckcaKlDJQ=
-
-Name: assets/ko/01logo.png
-SHA1-Digest: KITx/kNaTnhYUbCm08v6jANm6b4=
-
-Name: res/layout/abs__list_menu_item_icon.xml
-SHA1-Digest: A7MIR0vPrtL5J9AnNtIEnrB2h58=
-
-Name: res/color/abs__primary_text_disable_only_holo_dark.xml
-SHA1-Digest: N3cOSy8QRTwjEm+T8Vyr7f7m5vM=
-
-Name: res/drawable-xhdpi/abs__btn_cab_done_default_holo_dark.9.png
-SHA1-Digest: kSrvB3EWls1z+/3U+R3NgEiJtIQ=
-
-Name: res/drawable/phone_memory.png
-SHA1-Digest: Lzo4e5YM8LSI0J6AD9/Wm3flT3c=
-
-Name: res/drawable-ldpi/movie.png
-SHA1-Digest: 9QUv1g/c1L/X+774grvlhsRYFyw=
-
-Name: assets/it/qsg.html
-SHA1-Digest: M/tpiMIqBAHpWB6Xs+fYzvCPv24=
-
-Name: assets/ko/03started_KOR.png
-SHA1-Digest: /7pcS0DbudzUokivNnHhQpyn9vo=
-
-Name: res/drawable-hdpi/abs__cab_background_top_holo_light.9.png
-SHA1-Digest: xTKcdW1X3evtBeWUTRtQHGUmvPg=
-
-Name: res/drawable-ldpi/upload2.png
-SHA1-Digest: DMzgDh+wLox+OTp+CIL+ft2RONY=
-
-Name: res/drawable-mdpi/abs__ic_cab_done_holo_light.png
-SHA1-Digest: gEkAYxPguS0vwjdi5GNBkBtKy/c=
-
-Name: res/drawable-mdpi/abs__progress_primary_holo_light.9.png
-SHA1-Digest: dnKu/UA+XXZ6wxpF4RwPVuFfv1o=
-
-Name: res/drawable-mdpi/download_green.png
-SHA1-Digest: 7anCwJPhKan3u7r2hUfxECEa8Bg=
-
-Name: res/drawable-mdpi/abs__progress_primary_holo_dark.9.png
-SHA1-Digest: kzQLW28P8eWguDdlc8z7TZJH1NI=
-
-Name: res/drawable-ldpi/icon.png
-SHA1-Digest: Y2eY1QCqoql+tnKq3j92CqrYq+I=
-
-Name: res/drawable-xhdpi/abs__spinner_48_outer_holo.png
-SHA1-Digest: z8eDjuVkpuobA0RIVrS16o9J5Bk=
-
-Name: assets/ko/02qsg_KOR.png
-SHA1-Digest: KBeJT96DDIcncWn+3jlNnpTVhnQ=
-
-Name: assets/zh_TW/05content_CHT.png
-SHA1-Digest: d79KVFIyEH6iyDUsTSkxmXIi4FM=
-
-Name: res/drawable-xhdpi/sidelink.png
-SHA1-Digest: QpuIs015XEkg+CQyNlzlYVjwfJA=
-
-Name: res/drawable/charging_2.png
-SHA1-Digest: tRCy1BdHmg1HW46UxkPAHTywUFw=
-
-Name: res/drawable-xhdpi/abs__textfield_search_right_default_holo_ligh
- t.9.png
-SHA1-Digest: ZlENnTiHiVJnaXNDZziSFqGsy04=
-
-Name: res/drawable-mdpi/abs__progress_bg_holo_dark.9.png
-SHA1-Digest: sa9YmWZKkkpUQ2bim/IvHhRtTVc=
-
-Name: res/drawable-mdpi/abs__ab_bottom_transparent_dark_holo.9.png
-SHA1-Digest: TkJkUaylN89agUsoukHpqVXP8DQ=
-
-Name: res/drawable-xhdpi/abs__menu_dropdown_panel_holo_dark.9.png
-SHA1-Digest: ts+1yVv8L3pBUMna7Ynj/ql914g=
-
-Name: res/drawable-hdpi/abs__tab_selected_holo.9.png
-SHA1-Digest: kEcZGvbxtC+bZbKatmju03RhNRY=
-
-Name: res/layout-large/abs__action_mode_close_item.xml
-SHA1-Digest: Fpvreh8RqsZaupAX541M3lS2nJc=
-
-Name: res/drawable-mdpi/abs__spinner_ab_disabled_holo_light.9.png
-SHA1-Digest: B33L83GqHqw+54XJNHCEERj1J+4=
-
-Name: res/drawable-hdpi/abs__spinner_ab_pressed_holo_dark.9.png
-SHA1-Digest: GRtPmHKBT0GPZ09Wsdm3QBp8sf8=
-
-Name: res/drawable-hdpi/notify_a02.png
-SHA1-Digest: ZMmQ+l3zl+VAlPgNT6VPZpQyP2k=
-
-Name: res/layout/abs__dialog_title_holo.xml
-SHA1-Digest: fvAYG2/jNVDTJyw0zh2uuqEirgI=
-
-Name: res/drawable/abs__list_selector_background_transition_holo_light
- .xml
-SHA1-Digest: 5RlvHkuer3Si6PKrDVOiblzLKBg=
-
-Name: res/drawable/unchecked.png
-SHA1-Digest: 6kie/fO5imSzHMh8BvJHhzM6Mgo=
-
-Name: res/layout/settings_quick_start.xml
-SHA1-Digest: jcU39268CLX4fsu1zy9cE/Hjb5s=
-
-Name: res/drawable-mdpi/abs__ic_clear_normal.png
-SHA1-Digest: RYYQ9ky5+LbX58GkSGnq9am+1YQ=
-
-Name: res/xml/settings.xml
-SHA1-Digest: 5OP8tootKpWlqnA7SikzWuyknno=
-
-Name: res/drawable-hdpi/abs__ab_solid_dark_holo.9.png
-SHA1-Digest: LQeQB4SfeOCgaQHq+K6yaooPJA4=
-
-Name: res/drawable-xhdpi/abs__textfield_search_right_default_holo_dark
- .9.png
-SHA1-Digest: CUR20AnfKGpE6ZXBnCAmkld8mdU=
-
-Name: res/drawable-hdpi/abs__textfield_search_default_holo_light.9.png
-SHA1-Digest: 2e1Mor2JS0wSl3OmphZG535kkvE=
-
-Name: res/drawable-xhdpi/abs__ab_stacked_solid_dark_holo.9.png
-SHA1-Digest: T7wOXmWiHfzmkjzz0TfzB4wPVl8=
-
-Name: res/drawable-xhdpi/abs__ic_clear_search_api_holo_light.png
-SHA1-Digest: ALPTzi3RYWU+XkKuUFTrF2Yu+Qo=
-
-Name: res/drawable-mdpi/notify_a02.png
-SHA1-Digest: ch0TDRJtGTuqhLuIgoSPc/ogzQg=
-
-Name: res/drawable-xhdpi/settings_add_sidelink.png
-SHA1-Digest: rlkNafw0Cdbd9oevb3szbVs7xfU=
-
-Name: res/drawable-ldpi/delete.png
-SHA1-Digest: NT/6wAnfi2V3ythODSAy+EXKRwM=
-
-Name: res/drawable-xhdpi/refresh.png
-SHA1-Digest: bJzPCd5afynpWcACYMWvWPBEISE=
-
-Name: res/drawable-mdpi/download.png
-SHA1-Digest: ovU6EIzUCsuQKCYtcHOHLgY1NOc=
-
-Name: res/drawable-ldpi/settings_dark.png
-SHA1-Digest: dIU0DmABk6uuWPzLbIjUMemi1jg=
-
-Name: res/drawable-hdpi/abs__progress_primary_holo_light.9.png
-SHA1-Digest: gGaVM0Vmse4mOSdADodc6mtJFZg=
-
-Name: res/drawable/file_image.png
-SHA1-Digest: Ory2TMW7mANQ+kQBpXEkEmiATWs=
-
-Name: res/drawable-hdpi/abs__list_pressed_holo_light.9.png
-SHA1-Digest: lrdJqITpjN42AK/wk4XF5TW2F3o=
-
-Name: res/drawable/prev_disabled.png
-SHA1-Digest: RQdm581WhsrZBwC8HdzGWQQm1G4=
-
-Name: res/drawable/plus.png
-SHA1-Digest: pMpXmy+CndNOxwrr+B5J4w4iphw=
-
-Name: assets/zh_CN/qsg.html
-SHA1-Digest: oEkFXywdARdww0f2EOlovUG7jwg=
-
-Name: res/drawable-xhdpi/upload_green.png
-SHA1-Digest: krb7Ir2CQGe8ULAckNfpm6ViHeE=
-
-Name: res/layout/dont_show_again_alert.xml
-SHA1-Digest: 33C+BkPykj1hw1CHXjqpWdNCeTM=
-
-Name: res/drawable-hdpi/abs__ic_voice_search.png
-SHA1-Digest: xJSe4BJ4nYKbd+WcV1T2xS5C7Ow=
-
-Name: res/drawable-mdpi/upload_green.png
-SHA1-Digest: 0wmicv11B9J7nFOyGqz9buxoXHU=
-
-Name: assets/zh_TW/03started_CHT.png
-SHA1-Digest: 4thCG4SOiqQ/c7hXIFhi8lzR4ec=
-
-Name: res/drawable/abs__ic_clear.xml
-SHA1-Digest: AnjKtWthsqQULZk99/sIGJSnzAg=
-
-Name: res/drawable-xhdpi/done.png
-SHA1-Digest: qNLm+BKA2mTo5sucg1P47+sJCtY=
-
-Name: res/drawable-mdpi/abs__cab_background_top_holo_light.9.png
-SHA1-Digest: vpL96k3QycLONseeKSz3oaWx9eY=
-
-Name: res/drawable-hdpi/abs__ab_solid_shadow_holo.9.png
-SHA1-Digest: 6OZJVooibrgAG4so7MyBqyoZ1Rw=
-
-Name: res/layout/network_picker.xml
-SHA1-Digest: 8ucReCx0LTuK9A7tz2U98tkNo+k=
-
-Name: res/drawable-mdpi/abs__tab_selected_focused_holo.9.png
-SHA1-Digest: RjbehNC+s+86XH6BAkRT8tX87/s=
-
-Name: res/drawable-hdpi/grid_dark.png
-SHA1-Digest: bv/l0oNM/6xojmTDPG7Gsh7AwCE=
-
-Name: res/drawable-mdpi/abs__btn_cab_done_default_holo_dark.9.png
-SHA1-Digest: Ozw4TlLeSWs8hngXydrlW9kpIRg=
-
-Name: res/drawable-ldpi/list_dark.png
-SHA1-Digest: p8KD1grmc28ukpM5sEz6caaq5LA=
-
-Name: res/drawable-xhdpi/icon.png
-SHA1-Digest: aTowbLou/uvqaOWA3OeF8IkoVlA=
-
-Name: res/drawable-mdpi/abs__menu_dropdown_panel_holo_light.9.png
-SHA1-Digest: T50IgNiJErJZ5L3zMlptrDfcYkA=
-
-Name: res/drawable-mdpi/abs__btn_cab_done_default_holo_light.9.png
-SHA1-Digest: evd0EU/YZFFZwbRyq7iIZV65NZE=
-
-Name: res/drawable/abs__activated_background_holo_light.xml
-SHA1-Digest: FBWGpnGlMqY8RPrk+hRcFMf8KbI=
-
-Name: res/layout/file_adapter_content.xml
-SHA1-Digest: Gt3T5t94Q+r2QSrMG8iKqW0lLdo=
-
-Name: res/drawable-mdpi/abs__ic_menu_moreoverflow_normal_holo_dark.png
-SHA1-Digest: 0Aj78jP3sBP8PkkWsGNC1z2lOQE=
-
-Name: res/drawable-hdpi/refresh.png
-SHA1-Digest: S55rUzlaDEVRMYYFSX8zSshqW0A=
-
-Name: res/drawable-xhdpi/abs__btn_cab_done_default_holo_light.9.png
-SHA1-Digest: UrSk0ksmUU7GG5QwHZgVRtcqKN8=
-
-Name: res/drawable-xhdpi/download_dark.png
-SHA1-Digest: eETLMRWn4DkJ//FSRV0ex4z/7jY=
-
-Name: res/drawable-xhdpi/movie.png
-SHA1-Digest: UotaDgVtsouiUozS8pUwU5ljj/o=
-
-Name: res/drawable-xhdpi/network_wifi0.png
-SHA1-Digest: dHYVoH/BCSO1q3vLBeYsrdGMZiY=
-
-Name: res/drawable-xhdpi/abs__textfield_search_right_selected_holo_dar
- k.9.png
-SHA1-Digest: UZN37FsBXN6zAqAGuA/27ev7Abw=
-
-Name: res/drawable-xhdpi/music.png
-SHA1-Digest: AAXWmTvJGXynO8WP1WkGXZ/x4ko=
-
-Name: res/drawable-xhdpi/delete.png
-SHA1-Digest: Vl6ScT2fsW+vHHjFv3PVJQzQCDk=
-
-Name: res/drawable-hdpi/abs__ab_transparent_dark_holo.9.png
-SHA1-Digest: m5QFx1gdJhv0MAkVCkXC3cRnNfo=
-
-Name: res/drawable-hdpi/abs__cab_background_bottom_holo_light.9.png
-SHA1-Digest: fTxB+O/i4iEBg9WIU38rF2dXunA=
-
-Name: res/drawable-hdpi/abs__spinner_ab_default_holo_dark.9.png
-SHA1-Digest: 2rYQimeQPm5hvMbPTxBaNcQkQA8=
-
-Name: res/drawable-hdpi/abs__tab_selected_focused_holo.9.png
-SHA1-Digest: dSOC1a8cXwFnX0u71qyzWpi2+Zw=
-
-Name: res/drawable-xhdpi/list_dark.png
-SHA1-Digest: R/4Aglc02iaYKOMACASzxYmNSlY=
-
-Name: res/drawable-mdpi/abs__ic_clear_disabled.png
-SHA1-Digest: Ki2UTczwfwNOkUEnyx/NMm7GyGA=
-
-Name: res/layout/abs__action_mode_bar.xml
-SHA1-Digest: tlL9SCmRn+5lq0o5Z0a0+DhwpkU=
-
-Name: res/drawable-xhdpi/abs__list_pressed_holo_dark.9.png
-SHA1-Digest: U1NKbASgVgLDtGy9HhgJxUn2c4w=
-
-Name: res/drawable-xhdpi/abs__ic_go_search_api_holo_light.png
-SHA1-Digest: wzA+8Ljcy2akPbprGw4w32gdrOw=
-
-Name: res/drawable-xhdpi/abs__ic_menu_moreoverflow_normal_holo_light.p
- ng
-SHA1-Digest: H/D//hjVU/DU3NJd13C1gaei/M8=
-
-Name: res/layout/analytics.xml
-SHA1-Digest: dEyAiP1QhfHgDSpsT+hQgQSuOP4=
-
-Name: res/drawable-ldpi/notify_a02s.png
-SHA1-Digest: niCCuVt1iLzN0EJHqdNI8IIXig8=
-
-Name: res/drawable-hdpi/abs__ic_menu_share_holo_light.png
-SHA1-Digest: qvb0r6mGk80Hbb6FtXQyv/Sv5Uk=
-
-Name: res/layout/download_picker.xml
-SHA1-Digest: j8uGKAJBmGRmHupZJKakBCRzHoA=
-
-Name: res/layout/abs__activity_chooser_view.xml
-SHA1-Digest: b5/Pamx650HKd5U3sy4iCzf13dc=
-
-Name: res/drawable-ldpi/notify_a01.png
-SHA1-Digest: 0Jp6QN+2+5FQeG+U4PPtCZcfYpM=
-
-Name: res/drawable-xhdpi/abs__ic_voice_search_api_holo_light.png
-SHA1-Digest: YCTrsgeKIr16tx32cC2YhAOND+o=
-
-Name: res/drawable-xhdpi/abs__ab_share_pack_holo_dark.9.png
-SHA1-Digest: LWefLX40khiUm1NZGd3ArFBTvMw=
-
-Name: res/drawable-hdpi/abs__ic_clear_search_api_disabled_holo_light.p
- ng
-SHA1-Digest: EAwIyhomIP1ZkBoIYaX+LHCgXhI=
-
-Name: assets/ja/qsg.html
-SHA1-Digest: j2EJucBH5tk0BCbo75FTA1ePfFg=
-
-Name: assets/ko/05content_KOR.png
-SHA1-Digest: lhhRj1QrQodjajI3J2tMG8CKLxY=
-
-Name: assets/en/qsg.html
-SHA1-Digest: L4WyriSUCsuotT5sy/joXliau0s=
-
-Name: com/localytics/android/android_2.16.0.version
-SHA1-Digest: 8vmXA1CdlgR4L6RtCP55DSyi/6o=
-
-Name: res/drawable-mdpi/abs__list_activated_holo.9.png
-SHA1-Digest: k0KH726CtUSh87GvbE2iA7vlVBY=
-
-Name: res/layout/settings_about_eula.xml
-SHA1-Digest: alefGbVB6CyA22WkTaLFwNP72hk=
-
-Name: res/drawable-ldpi/grid_dark.png
-SHA1-Digest: XefQGtsfgQzsYdUwcCa4sCySJxQ=
-
-Name: res/drawable-mdpi/done.png
-SHA1-Digest: dRrB78Y6EuXJ33qlfvc8O3T58t8=
-
-Name: assets/ru/01logo.png
-SHA1-Digest: 9LYc9U94Zhdq0aSTWpN/gzvkJOE=
-
-Name: res/drawable-hdpi/abs__ic_clear_search_api_holo_light.png
-SHA1-Digest: vTnHJ3zZ/fr/BUGO7lumSG7aPN4=
-
-Name: assets/de/03started_GR.png
-SHA1-Digest: LoAnMO/v3ThsKZ35mOfAbgdwwvE=
-
-Name: res/layout/start.xml
-SHA1-Digest: 4Z6i8+u5RqhPBKgF7vLB9EHSG5A=
-
-Name: res/drawable-hdpi/abs__ic_clear_disabled.png
-SHA1-Digest: mCEgFmgmOmgpYrPjaKjE6mco9vA=
-
-Name: res/drawable/local_folder.png
-SHA1-Digest: 87+WOFlWO6AAwFEyFazCXftx/sU=
-
-Name: res/layout/settings_sidelink_help.xml
-SHA1-Digest: U6PICtVEJVadftRGi/mMeHvItKU=
-
-Name: assets/en/04wifi.png
-SHA1-Digest: i2oWpZvGaoh8D6oJOMSdY7XQm54=
-
-Name: assets/ja/05content_JAP.png
-SHA1-Digest: XhL+hEKCNQkd+aCd+kh+kyCQato=
-
-Name: res/drawable/abs__textfield_searchview_holo_dark.xml
-SHA1-Digest: lZ9XgP4ybfr9V8R6nQAyLqYJTSk=
-
-Name: res/drawable-hdpi/abs__spinner_ab_disabled_holo_dark.9.png
-SHA1-Digest: 291iL0AV8tlaZg9RNR0sVcA0Xz4=
-
-Name: assets/ja/03started_JAP.png
-SHA1-Digest: Iw2lUovNgd7BGpxpjXRMShkEqa4=
-
-Name: res/drawable-hdpi/download.png
-SHA1-Digest: 0tynPz2gqW7l1z6GZs+ZAsiZXQw=
-
-Name: res/drawable-mdpi/abs__cab_background_bottom_holo_dark.9.png
-SHA1-Digest: n3dtdQ9T0vK71LFyTnyarQ7fxZE=
-
-Name: res/layout/abs__popup_menu_item_layout.xml
-SHA1-Digest: v3o5lftz9eb9C7gT6rsrrJh9PWg=
-
-Name: res/layout/aircruzer_picker_help_dialog.xml
-SHA1-Digest: bQMriOAAryoYSY4CYQdJy7QTSR4=
-
-Name: res/drawable-ldpi/device_grey.png
-SHA1-Digest: EVLUj1xJ5UA9InvK9CjaCfXoWmQ=
-
-Name: res/drawable-hdpi/plus.png
-SHA1-Digest: kgWTdfQphEdmYLgU0sWg3SkQ1oA=
-
-Name: res/drawable/arrow.png
-SHA1-Digest: js2zkZOr1jN1onpDnHIRaCtRsas=
-
-Name: assets/de/01logo.png
-SHA1-Digest: qW7tfDCGqc4stdVQY6xKLJf+pHA=
-
-Name: res/drawable-xhdpi/wifi4_s.png
-SHA1-Digest: BMEFX0MtE3HXC/GuoyUbI2y9fAE=
-
-Name: res/drawable-hdpi/abs__progress_secondary_holo_dark.9.png
-SHA1-Digest: AMuJ/WfMGopnmJb+32Vz3m5Am1g=
-
-Name: res/drawable/no_internet.png
-SHA1-Digest: 6kFc/LiVNvdTd378J+EAjW73uas=
-
-Name: res/drawable-mdpi/abs__cab_background_bottom_holo_light.9.png
-SHA1-Digest: YAD+7uhwn3C0CEVGoxT7j8bucVQ=
-
-Name: res/drawable-hdpi/abs__ab_share_pack_holo_dark.9.png
-SHA1-Digest: buvtfh9lLA0kHo+UdZy9EgSy8oI=
-
-Name: res/drawable-xhdpi/abs__ic_search.png
-SHA1-Digest: kpW6HlG/LB21Na4Li7xUvCDGZgw=
-
-Name: res/drawable/listselector_selected.xml
-SHA1-Digest: HGReVF2qF/QDPhO7G7tzo21C+Dg=
-
-Name: res/layout/gallery_grid_adapter_content.xml
-SHA1-Digest: 5PeytUOBjqp3OmJp421OWJLTv/Q=
-
-Name: res/drawable-hdpi/list.png
-SHA1-Digest: TU1siR5UoHv45/k1KjVXqB+Cizo=
-
-Name: res/drawable-xhdpi/select.png
-SHA1-Digest: kWgP2Ind7BdBPAO4JA9P1i0IAqY=
-
-Name: res/drawable/charging_0.png
-SHA1-Digest: MdboS4toC08CAxgPCPbrln3YfhI=
-
-Name: res/drawable-xhdpi/upload2.png
-SHA1-Digest: AcbXC1MP2a2Zxgu+ykFuhML0Zrc=
-
-Name: res/drawable-xhdpi/abs__ab_bottom_solid_inverse_holo.9.png
-SHA1-Digest: 24/SkEr0uzW3efbr12bid3TOmc4=
-
-Name: res/drawable-hdpi/download_dark.png
-SHA1-Digest: qH6C5nIuc60QOU2tU6v4CZUtO/o=
-
-Name: res/layout-xlarge/abs__screen_action_bar.xml
-SHA1-Digest: tInI78ruYKzZFPwxS79mfk9uyfg=
-
-Name: res/drawable-xhdpi/abs__progress_bg_holo_light.9.png
-SHA1-Digest: 9YJMbOWf99gghxun1lt4eR+M5/0=
-
-Name: res/layout/aircruzer_adapter_content_section.xml
-SHA1-Digest: vOFOzGyr6DS5ZyG/4q9ZvwA2/CQ=
-
-Name: res/drawable/black.png
-SHA1-Digest: YnQOafsw9lxQswFN9ROfmopfVHI=
-
-Name: res/drawable-mdpi/abs__textfield_search_right_selected_holo_dark
- .9.png
-SHA1-Digest: z30TT9I43uVknBQFcYGozxadtKg=
-
-Name: res/drawable-hdpi/delete_dark.png
-SHA1-Digest: 5KT758/nYY+QwfbaHRwLsgb6RiM=
-
-Name: res/drawable-mdpi/abs__textfield_search_right_selected_holo_ligh
- t.9.png
-SHA1-Digest: 6SqUSlc7AzrADiM8+4UhC0SoNoI=
-
-Name: res/drawable-hdpi/abs__list_divider_holo_dark.9.png
-SHA1-Digest: YCNfTwWWU/kOX50OLTka+djt2a0=
-
-Name: res/drawable-xhdpi/upload2_dark.png
-SHA1-Digest: my824UVeH87Ig9Mjb22p+LmusVI=
-
-Name: res/layout/abs__action_bar_tab_bar_view.xml
-SHA1-Digest: qIFOunmTDNPoxbaXf5Ke+e1Z7/A=
-
-Name: res/drawable-xhdpi/abs__spinner_ab_focused_holo_light.9.png
-SHA1-Digest: EElqPd2sfc94OIfGfM2c6PFhdG0=
-
-Name: res/drawable/low_white.png
-SHA1-Digest: 1K7p7Su15oKaGUrSTjRCMjhkYhU=
-
-Name: res/layout/direct_connect_warning.xml
-SHA1-Digest: fA+3RHqNB1pnJ8jzWxre5c5Mkls=
-
-Name: res/layout/abs__screen_action_bar_overlay.xml
-SHA1-Digest: 3+QVbD58gDSSTchlepS0gA2xUIo=
-
-Name: res/drawable/play.png
-SHA1-Digest: rqy/bcqzDfq8czyEAPHFcrlQthA=
-
-Name: res/drawable-mdpi/abs__spinner_ab_focused_holo_light.9.png
-SHA1-Digest: RlKXmBRG932A/8TUkCqDEp/Oec8=
-
-Name: res/drawable/grey.png
-SHA1-Digest: IaZHlnMauSqa/dH4jDo4FCrK/LA=
-
-Name: res/drawable-mdpi/abs__ab_share_pack_holo_light.9.png
-SHA1-Digest: 5hykmbRZCNgaYVriQNRE6mXKEVw=
-
-Name: res/drawable-xhdpi/settings_dark.png
-SHA1-Digest: WDtudlc+u2w59KmlX6Xx4rGBli4=
-
-Name: res/drawable-mdpi/movie.png
-SHA1-Digest: OparaqzckIJwKZoZbSbh9m6azho=
-
-Name: res/drawable-xhdpi/abs__spinner_48_inner_holo.png
-SHA1-Digest: aZIHa9Czmu4cWLFew7pcXD4rkGc=
-
-Name: res/drawable/folder_up.png
-SHA1-Digest: zGiS10bWvYuuZkpL9DTRTlHDLvA=
-
-Name: res/drawable/pause.png
-SHA1-Digest: p/LZKuBdGLW7xRqzKTYjhcAaQx0=
-
-Name: res/drawable/a02c.png
-SHA1-Digest: txEZZCyYUl2zG05dSRtMgxehdYs=
-
-Name: res/drawable-ldpi/settings.png
-SHA1-Digest: 2u2hCuuJwOjloaeoY/GWcArWkEQ=
-
-Name: res/drawable-mdpi/abs__textfield_search_right_default_holo_light
- .9.png
-SHA1-Digest: SJw/VaVPuHa0U3ypOixHPXRhT6s=
-
-Name: res/drawable-xhdpi/settings_sidelink_grey.png
-SHA1-Digest: bvszkCqcT6b08gl54gBxZe9s9Xc=
-
-Name: res/drawable-xhdpi/settings_timer_grey.png
-SHA1-Digest: 8GV4CJNEGoP0aBcnmrB/GiMGSMw=
-
-Name: res/drawable-xhdpi/wifi1.png
-SHA1-Digest: V0mwPuqE+FwkmKAtWqI+COlgnOY=
-
-Name: res/drawable-mdpi/abs__btn_cab_done_pressed_holo_light.9.png
-SHA1-Digest: vLrFK/b+U1ubMj5LsccQrZPqhPI=
-
-Name: res/drawable-mdpi/upload2_dark.png
-SHA1-Digest: hO6TyHKEn/0pJY/QeUxOb3uHtFs=
-
-Name: res/drawable-mdpi/abs__ab_transparent_dark_holo.9.png
-SHA1-Digest: fFPUiwdMkRL8REn+TBfT9FX9St4=
-
-Name: res/drawable-hdpi/abs__spinner_ab_pressed_holo_light.9.png
-SHA1-Digest: GIl5naK+PDdSFWeTucie7Fi+y4g=
-
-Name: res/drawable/abs__textfield_searchview_holo_light.xml
-SHA1-Digest: VD8f3CF3zy2PqjZIXCkVHdU/AN0=
-
-Name: res/drawable-hdpi/abs__ic_ab_back_holo_dark.png
-SHA1-Digest: VDbZBKRiIQomKwJ0F40Cm1Sj5uY=
-
-Name: res/raw/wfd1080e.df2
-SHA1-Digest: sHEo1rEX5Mqidlpdt9sD+seOla4=
-
-Name: res/layout/music.xml
-SHA1-Digest: 2OopLHtVH5gXjrASxOl9UjK1LCQ=
-
-Name: res/raw/tf.properties
-SHA1-Digest: 6BRhUHhf+UzjzmmTNS1S4cucWWs=
-
-Name: res/drawable/abs__textfield_searchview_right_holo_dark.xml
-SHA1-Digest: oipbNanAw9eMKi1Qw+sRRlUUi3k=
-
-Name: res/drawable-mdpi/abs__ab_bottom_solid_dark_holo.9.png
-SHA1-Digest: p6tVNDTsfPGyFyOWCgiBaoFubkw=
-
-Name: res/drawable-xhdpi/delete_dark.png
-SHA1-Digest: ceF15u3WmpNaJ05eNU1WQ4Dv01E=
-
-Name: res/drawable/abs__progress_medium_holo.xml
-SHA1-Digest: trNhx12sy3B5XvcizljpAUZBHIk=
-
-Name: res/drawable-mdpi/abs__ab_solid_light_holo.9.png
-SHA1-Digest: cc9HP9JERZ4SEB2R/uVFpxvb0wc=
-
-Name: res/layout/abs__search_view.xml
-SHA1-Digest: Ndlm3XZmkd7Db9ZKJbWeJjSGt+A=
-
-Name: res/drawable-mdpi/icon.png
-SHA1-Digest: 7AsZxVhBGvf4wPHtlmnWNGqIYVM=
-
-Name: res/drawable-ldpi/list.png
-SHA1-Digest: /sqKL1CnKMdqxCPHVjUJmKsRDo4=
-
-Name: assets/zh_CN/02qsg_CHS.png
-SHA1-Digest: uTDpSJvBQ15kSO1snJHPQaJFpdw=
-
-Name: res/drawable-xhdpi/settings_network.png
-SHA1-Digest: KTUQfCPhDyIOe2Ppj1eDmaMrXFg=
-
-Name: res/drawable-xhdpi/settings_timer.png
-SHA1-Digest: pHrM3ucxoitKzGY4w2E6Hkjyvks=
-
-Name: assets/de/04wifi_GR.png
-SHA1-Digest: QXgViToZCxXJYiGeAt0jHJSbFnk=
-
-Name: res/drawable-ldpi/download_dark.png
-SHA1-Digest: 2B3FtazIkI9m4lpPTtnCOS+Uqm0=
-
-Name: res/layout/abs__action_menu_item_layout.xml
-SHA1-Digest: 93CV9NDXHj63/bMPoP4TODrHiNo=
-
-Name: res/drawable-mdpi/abs__list_focused_holo.9.png
-SHA1-Digest: 1b4m7iHvagnqjBF0Gnh86BXoTCk=
-
-Name: res/drawable-xhdpi/splash.png
-SHA1-Digest: LzyJobE3wHBtXSbxJxBg34YIRUo=
-
-Name: res/drawable-hdpi/abs__ic_menu_moreoverflow_normal_holo_light.pn
- g
-SHA1-Digest: 3HHEb108EIEBDzuTgU746xkNAyc=
-
-Name: res/drawable-xhdpi/network_wifi3.png
-SHA1-Digest: FJnZsm9LSNIMpxAKW/BuXJonAy8=
-
-Name: assets/en/02qsg.png
-SHA1-Digest: sEG/wup+akbOSY58s0hX7F6sG4U=
-
-Name: res/drawable-mdpi/abs__list_selector_disabled_holo_dark.9.png
-SHA1-Digest: MmgEts7b+pXpZo60FkneU4V9Ikk=
-
-Name: res/drawable/abs__tab_indicator_ab_holo.xml
-SHA1-Digest: b7UIuAS0Dejggi+d5oSd15fiAvo=
-
-Name: res/drawable/listselector_pressed.xml
-SHA1-Digest: x1zv0qC+0wa+TN4MwSANxttsZCY=
-
-Name: res/drawable-hdpi/abs__ab_share_pack_holo_light.9.png
-SHA1-Digest: +OAYzol7cPv79GCck1P8FViGZ6I=
-
-Name: res/drawable/file_png.png
-SHA1-Digest: Xl0BUMo9fGAOXIPgPCV6v9tNihw=
-
-Name: res/drawable/file_audio.png
-SHA1-Digest: lqiwfnPeLfN+K+IK9smgw9LdI6Y=
-
-Name: res/drawable-xhdpi/abs__ic_cab_done_holo_light.png
-SHA1-Digest: K2TYdGXesGTqgwQKZZjUuYN+FKo=
-
-Name: res/drawable-xhdpi/notify_a02.png
-SHA1-Digest: BDWoK0m9ZN//ZSTax3IjAhGF1Qs=
-
-Name: res/layout/wifi_password_alert.xml
-SHA1-Digest: fzM4SEwg2trrkgPTwe9KnnY94wo=
-
-Name: res/drawable-hdpi/abs__menu_dropdown_panel_holo_light.9.png
-SHA1-Digest: JtAGOrkjcRDhvzDp+tDWF0PB8Kg=
-
-Name: res/drawable-ldpi/create_folder.png
-SHA1-Digest: 4EnTKjDSCifHHQLfIQuBjlPUCfo=
-
-Name: res/layout/directory_adapter_content.xml
-SHA1-Digest: TUtHiiXlqbu950RmL1KxbLGcXOc=
-
-Name: res/drawable-xhdpi/abs__ic_ab_back_holo_dark.png
-SHA1-Digest: lSv/xuS4TTivmon6OOoCf+LZ674=
-
-Name: res/drawable-hdpi/abs__progress_bg_holo_light.9.png
-SHA1-Digest: CNd/vAB/oYwEmcSpXU/aAnYGokI=
-
-Name: res/drawable-hdpi/abs__progress_bg_holo_dark.9.png
-SHA1-Digest: Iw89Sp82/2Wj0jf2QyfcdVW4ePg=
-
-Name: res/drawable-mdpi/abs__ic_voice_search.png
-SHA1-Digest: 2cQ6aixRzb6Ul8O9p1mVDwf4ScA=
-
-Name: res/drawable-hdpi/abs__spinner_ab_focused_holo_dark.9.png
-SHA1-Digest: 9Qy3cVDSKr4octE+oPpmMxc3WbE=
-
-Name: res/drawable-hdpi/abs__list_longpressed_holo.9.png
-SHA1-Digest: ptbz3lQejuYwZajfM9QuW+tPTNo=
-
-Name: res/drawable-hdpi/abs__ic_menu_moreoverflow_normal_holo_dark.png
-SHA1-Digest: jmiYAK3bhvluugEnQppgwzIaO1I=
-
-Name: res/drawable/medium_white.png
-SHA1-Digest: O6bHBZhzTcLAtuTeFI5y+gm79Jg=
-
-Name: res/drawable/abs__item_background_holo_light.xml
-SHA1-Digest: WA7mgT2GElk7GkfzrytZKY+AKoY=
-
-Name: res/drawable-xhdpi/play_notify
-SHA1-Digest: owCE1vx8jJW2TwuANPXyPvF+3ec=
-
-Name: res/drawable-mdpi/abs__tab_selected_pressed_holo.9.png
-SHA1-Digest: 8GgxToDPNPXEylKDthpLy4Ick+4=
-
-Name: res/drawable-hdpi/done.png
-SHA1-Digest: d6dkBw8alNn6Id9nKA5gcknRaJI=
-
-Name: res/drawable-xhdpi/settings_security.png
-SHA1-Digest: HvbKAuHdGu4756CjvqJiSdO5+iA=
-
-Name: res/drawable/abs__btn_cab_done_holo_light.xml
-SHA1-Digest: b+Cr90laDoTc5pshyXL4QO1vuWE=
-
-Name: res/drawable-xhdpi/abs__ic_clear_disabled.png
-SHA1-Digest: ON7Cgoqj1QbPTbGfYNzqsOG+Yc4=
-
-Name: res/drawable-hdpi/download_dark_green.png
-SHA1-Digest: ZpkxcjGxOA8REafMEKrzIKaBS8I=
-
-Name: res/drawable-hdpi/abs__ab_bottom_solid_inverse_holo.9.png
-SHA1-Digest: i/uYhSEBxB7ovRwrIQwhBn7UXxE=
-
-Name: res/drawable-hdpi/abs__tab_selected_pressed_holo.9.png
-SHA1-Digest: Mf5vFOmXvP3L4a4yavvUzcmRIt8=
-
-Name: res/drawable-hdpi/abs__btn_cab_done_pressed_holo_dark.9.png
-SHA1-Digest: TZEzVRjCGPdf7ndrvVIwkRdTh3c=
-
-Name: res/drawable-xhdpi/connected.png
-SHA1-Digest: HREB+S4CHtoRyQ1u2/Jzp0H68yA=
-
-Name: res/drawable-ldpi/create_folder_dark.png
-SHA1-Digest: LvKzNGKfgbfeARVTfJjhnuUgqZ8=
-
-Name: res/drawable-xhdpi/abs__ic_clear_search_api_disabled_holo_light.
- png
-SHA1-Digest: 4dxIw+kLWuioJNO5uLBGXvWElrE=
-
-Name: res/drawable/popup_shape2.xml
-SHA1-Digest: U+KLl3TPDVOTOj/JnlH8HceMvrs=
-
-Name: res/drawable-mdpi/abs__textfield_search_right_default_holo_dark.
- 9.png
-SHA1-Digest: 8VagCEC6/bxS8EIG7vXlA3zIyLo=
-
-Name: res/drawable/blue.png
-SHA1-Digest: gs/siuek95dKch+pAv8rphP+rho=
-
-Name: res/layout/music_land.xml
-SHA1-Digest: EnbsCyHIpqnw/cpaYwzQWCIkFJM=
-
-Name: com/localytics/android/LICENSE
-SHA1-Digest: 4BcmJZv12VBnnPvyPDfhtrzWRzQ=
-
-Name: res/drawable-hdpi/abs__ab_stacked_transparent_dark_holo.9.png
-SHA1-Digest: GtmhIZtPpidOUSNn6lLVxhCaCCo=
-
-Name: res/layout/abs__list_menu_item_layout.xml
-SHA1-Digest: D/6MKz0WdxdHUY3mQrOf25dDegU=
-
-Name: res/drawable-ldpi/download_green.png
-SHA1-Digest: hJfnTiPcJw/DvBrbfuoH1jLmkf8=
-
-Name: res/drawable-xhdpi/abs__ab_stacked_solid_light_holo.9.png
-SHA1-Digest: 42971/d6vUeJwpIgA/Gna2Xuny8=
-
-Name: res/layout/abs__list_menu_item_checkbox.xml
-SHA1-Digest: 9geAr2WyoUVyLj8BV2Yu+r/k0LE=
-
-Name: res/drawable-mdpi/abs__spinner_ab_focused_holo_dark.9.png
-SHA1-Digest: zgXeuD+vtHQLeG2Fx0Z+o3WNMdQ=
-
-Name: res/drawable-mdpi/splash.png
-SHA1-Digest: lPdgz8+upRrYKwTC2CvqhbZHi0M=
-
-Name: res/drawable-hdpi/abs__textfield_search_right_default_holo_light
- .9.png
-SHA1-Digest: ULSjXVIfOXQcnuwbICfFh+SOOhw=
-
-Name: res/drawable-mdpi/abs__textfield_search_selected_holo_light.9.pn
- g
-SHA1-Digest: KGb4v13B/xvVShXDLo3AjuomrkY=
-
-Name: res/drawable/music_thumb.png
-SHA1-Digest: cgE5iK2JXMxiWDvXz0Ki67YaOXg=
-
-Name: res/drawable-xhdpi/network_wifi3_s.png
-SHA1-Digest: RWgn1emiga8Uhu7w1rUGse/iSnY=
-
-Name: res/drawable-ldpi/select_dark.png
-SHA1-Digest: KPP11g/89Ew0LoUPxCDJwVRVDXM=
-
-Name: res/drawable-hdpi/play_notify.png
-SHA1-Digest: YHAMAjbWFXrv1Eh1x2FxlPnFfk8=
-
-Name: res/drawable-xhdpi/abs__tab_selected_pressed_holo.9.png
-SHA1-Digest: qE6ZWVBFFV5unAqK1PvQv1Ern7Q=
-
-Name: res/drawable-hdpi/abs__textfield_search_right_selected_holo_ligh
- t.9.png
-SHA1-Digest: ebcbPkpiwha21xEUChjWbqxLHS0=
-
-Name: res/drawable/abs__list_selector_holo_light.xml
-SHA1-Digest: tB/l4CCgS0Wh5RIhmVPIYbk7RCA=
-
-Name: res/drawable-xhdpi/network_wifi4.png
-SHA1-Digest: tuGik8Wx6scGg9Ii0eRQj+8vEtM=
-
-Name: res/drawable/a02s_grey.png
-SHA1-Digest: 4FZw1xNuME04KC3S9kuIhbCXyEQ=
-
-Name: res/drawable-xlarge-hdpi/icon.png
-SHA1-Digest: vAYOXfhLgLKl72MHOqpn4/Kfn+M=
-
-Name: res/drawable-xhdpi/wifi3.png
-SHA1-Digest: bM1a2TY4H7myCHsfb8JsWFbk5gw=
-
-Name: res/drawable-hdpi/abs__dialog_full_holo_light.9.png
-SHA1-Digest: ZCSC9S6+GRAUiRe/f4jJy7XdSL8=
-
-Name: res/layout/aircruzer_adapter_content_local.xml
-SHA1-Digest: dkxhvXDAfYv+5/BiQLVbwQI2VSo=
-
-Name: res/drawable/charging_1.png
-SHA1-Digest: 83AW2LewcgO5yl1cBbLFTn4R+fM=
-
-Name: res/drawable-xhdpi/settings.png
-SHA1-Digest: bZkzyG0mdGDnG9zFWPR5dnQ6UM0=
-
-Name: res/drawable-ldpi/splash.png
-SHA1-Digest: LlkmGY/uHgyRIExv+JK6VWn/jGQ=
-
-Name: res/drawable-xhdpi/abs__list_focused_holo.9.png
-SHA1-Digest: 0mOu8ySPTJmpXlpXy7GxY1V24q4=
-
-Name: res/drawable-xhdpi/abs__list_pressed_holo_light.9.png
-SHA1-Digest: PX78/hIq2CPfClViMSNz77lrsyQ=
-
-Name: res/drawable-xhdpi/abs__progress_secondary_holo_light.9.png
-SHA1-Digest: cPjnoGeC0yi3ZMj8J8epbvvsY9I=
-
-Name: res/layout/abs__screen_simple_overlay_action_mode.xml
-SHA1-Digest: JDBEQ53itxIur9vO2Atn+8yJ7c8=
-
-Name: res/drawable-mdpi/abs__btn_cab_done_pressed_holo_dark.9.png
-SHA1-Digest: tNiemBq98Ef/8/SbxysQ0tq6SK4=
-
-Name: res/drawable-mdpi/create_folder.png
-SHA1-Digest: O21GsKo5pCcYVBU6psPUHbPovbo=
-
-Name: res/drawable/abs__ic_menu_moreoverflow_holo_dark.xml
-SHA1-Digest: yytAWQRt22+riAvgs/KwyMqUvQ4=
-
-Name: res/drawable-ldpi/grid.png
-SHA1-Digest: iNXgBO748cIsUiLwbRftq2SXRds=
-
-Name: res/drawable-mdpi/device_grey.png
-SHA1-Digest: RHXuHZm/A6qkIbhh92Nj1kpfyY0=
-
-Name: res/drawable-mdpi/play_notify.png
-SHA1-Digest: 0NqdGg8tJvp/Yhr52YdXbLor7t8=
-
-Name: res/drawable-hdpi/abs__textfield_search_default_holo_dark.9.png
-SHA1-Digest: LP7ewvwEXSoRqeZjIh4nOeaAtK8=
-
-Name: res/drawable-xhdpi/abs__tab_selected_focused_holo.9.png
-SHA1-Digest: kRe4KL9tEOxTt3bkKH9ClWLAUCE=
-
-Name: res/drawable-ldpi/select.png
-SHA1-Digest: 5RbbNoA818p1wtemKnXiPyU4qCg=
-
-Name: res/drawable-hdpi/delete.png
-SHA1-Digest: 5Bq2Ic1TDFy9EDte4VlaQ9rn4XU=
-
-Name: res/drawable/battery_grey.png
-SHA1-Digest: tsn4J4NlgqXxVjIp2W1wl0kXnIg=
-
-Name: res/xml/settings_about.xml
-SHA1-Digest: oMSFlToKbNQlcNx9b7XqE1vFQ+c=
-
-Name: res/drawable-hdpi/abs__ic_go_search_api_holo_light.png
-SHA1-Digest: 3vHQpcaPDNb6NwjQQWZxhxNJ+qc=
-
-Name: res/layout/aircruzer_adapter_content_none.xml
-SHA1-Digest: g0S8lGEdmybe9pLERtYIr+QCaY4=
-
-Name: res/drawable-mdpi/abs__list_longpressed_holo.9.png
-SHA1-Digest: ofVU9an1TNZwFC7R06NqpuPJPdQ=
-
-Name: res/drawable/abs__ic_clear_holo_light.xml
-SHA1-Digest: sAhzgH2jM2Kc7Y2iY5oBJmCG5GE=
-
-Name: res/drawable-ldpi/notify_a02c.png
-SHA1-Digest: SiX8FML4Qmck0hsqKpoXnJ7M/Sw=
-
-Name: res/drawable/check.png
-SHA1-Digest: KSW+XCCpV+qwJVdjGhwKsFSwbS8=
-
-Name: res/layout/abs__action_menu_layout.xml
-SHA1-Digest: mJKypCro6tPIH9JEh3UY3bEZGEI=
-
-Name: res/drawable/file_zip.png
-SHA1-Digest: NUpT9WWHpc2+ynz12nSVJjwKd0w=
-
-Name: res/drawable-xhdpi/abs__ab_bottom_solid_light_holo.9.png
-SHA1-Digest: Rk+UnlSVvdbnqPvNBdXZj8dcQQ0=
-
-Name: assets/es/01logo.png
-SHA1-Digest: 6lO2tdvGxHwanoenLLbvEsh80mc=
-
-Name: res/drawable-xhdpi/abs__progress_secondary_holo_dark.9.png
-SHA1-Digest: e5a8M4qM7fMxfi8+e2DXwULdfk0=
-
-Name: res/layout/sherlock_spinner_item.xml
-SHA1-Digest: xi/7SS4dFtpNDXRM2jsbqgXEltM=
-
-Name: res/layout/hidden_network.xml
-SHA1-Digest: hykpxnGRp26LCmYMH7WfD1+5ERw=
-
-Name: res/drawable-xhdpi/abs__ic_go.png
-SHA1-Digest: tINOgi0AQI11mwL/d1BPQRmhUdY=
-
-Name: res/drawable-ldpi/pause_notify
-SHA1-Digest: XiwedbO3Yy4d/iewdOxeAizPGII=
-
-Name: res/layout/splash.xml
-SHA1-Digest: /WB8Z6fSj+6dJTUbNNjBMJ9fT3E=
-
-Name: res/drawable-xhdpi/download.png
-SHA1-Digest: 3alYi8wYqlI5vcgPkrdg9IZElnY=
-
-Name: res/drawable-mdpi/abs__list_divider_holo_dark.9.png
-SHA1-Digest: Gd+qeBN+Z3tgHThuwqx4TQqImNs=
-
-Name: res/drawable-xhdpi/settings_reset.png
-SHA1-Digest: rLtEo4LohNmqxIh6jx9cRfbsvPQ=
-
-Name: res/drawable-mdpi/abs__tab_unselected_pressed_holo.9.png
-SHA1-Digest: kPvBAWN9SqQ9WZ8eBXVYJN/XHP8=
-
-Name: res/drawable/next_disabled.png
-SHA1-Digest: 4SrIAQ8IqbikAc/lXvPTTFA2sE0=
-
-Name: res/layout/abs__screen_simple.xml
-SHA1-Digest: YdjPW96dc/dh7hiPo0SqCP+C/XQ=
-
-Name: res/drawable-xhdpi/abs__ab_bottom_transparent_dark_holo.9.png
-SHA1-Digest: HaZOB2hoLzJiT9qTW+qyRWWKe88=
-
-Name: res/drawable-xhdpi/abs__ab_transparent_light_holo.9.png
-SHA1-Digest: WImLTFqzDvKO744H1EGNHKmlvLU=
-
-Name: res/xml/settings_feedback.xml
-SHA1-Digest: joazs6DwTqCGpix20gFyrqmfSmE=
-
-Name: res/drawable-xhdpi/abs__progress_primary_holo_dark.9.png
-SHA1-Digest: HLr/+AacVzhb/bgm8wqo5lkMmdQ=
-
-Name: res/drawable-mdpi/abs__ic_clear_search_api_holo_light.png
-SHA1-Digest: DKBAKHuPA9O+9U3MbN+9PMTd9xQ=
-
-Name: res/color/abs__primary_text_holo_light.xml
-SHA1-Digest: TMBEJ/Z81lGmX1DQM1OFwc0XHPM=
-
-Name: res/drawable/charging_3.png
-SHA1-Digest: xMFafkBI64FCG7RCF15slUvMvf4=
-
-Name: res/drawable-mdpi/abs__btn_cab_done_focused_holo_dark.9.png
-SHA1-Digest: qbSomUVZ3g5AkIAMKg2tBPBu5vs=
-
-Name: res/drawable-hdpi/abs__ab_bottom_solid_light_holo.9.png
-SHA1-Digest: FijKux+wp7sVe29uZWpywpBFs74=
-
-Name: res/drawable-xhdpi/settings_network_grey.png
-SHA1-Digest: OTJeILm9xSIiD1ZZeDnzmx7uAPo=
-
-Name: res/drawable-mdpi/abs__ic_search_api_holo_light.png
-SHA1-Digest: CsoOtUAuNL2i3uSajkq7Fj1fHQI=
-
-Name: res/drawable/file_video.png
-SHA1-Digest: ZKhuBm15KrQQmnCDgYH9pXvxs+A=
-
-Name: res/drawable/prev_enabled.png
-SHA1-Digest: 5GklvDtWPEtnzayUBXxC49h/igE=
-
-Name: res/layout/abs__action_bar_home.xml
-SHA1-Digest: KIYReYcyBICFmvLPVImAr7hKrQc=
-
-Name: res/layout/pictures.xml
-SHA1-Digest: Y+aGuOCtcygPgODqtlRDaLJ7rbM=
-
-Name: res/drawable/device_help.png
-SHA1-Digest: 7oy7tO6OC6/alEjvkRoaRe7CNDQ=
-
-Name: res/layout/file_transfer.xml
-SHA1-Digest: 5oSyGatb2Q33JeE/6jkaAYTIUa8=
-
-Name: res/layout-xlarge/abs__screen_action_bar_overlay.xml
-SHA1-Digest: L4rSLNSmnZnrmxkMEDyoFZ7hTz8=
-
-Name: resources.arsc
-SHA1-Digest: AOdcjOejlDj15vX8jZuEvNKoj0Y=
-
-Name: assets/ja/04wifi_JAP.png
-SHA1-Digest: Gkr2IGTYf5L5HbWPl/4qpHBxv0s=
-
-Name: res/drawable-mdpi/list_dark.png
-SHA1-Digest: HAgDWDwW1fCnKBvddNgdXRSrFFo=
-
-Name: res/drawable-xhdpi/abs__ab_bottom_transparent_light_holo.9.png
-SHA1-Digest: dsRruh5Id/KSS3uk7sx/eDAJ6D8=
-
-Name: assets/fr/05content_FR.png
-SHA1-Digest: WK6x6XeWxlkinLgf4mVFR2uYq9A=
-
-Name: res/drawable-xhdpi/select_dark.png
-SHA1-Digest: D4teduTfSRTar2n/cFBMdzxMdQ0=
-
-Name: res/drawable-mdpi/abs__list_pressed_holo_light.9.png
-SHA1-Digest: EhSQaJxdK46gwcaPHBdrPDX32g0=
-
-Name: res/drawable-hdpi/upload_green_dark.png
-SHA1-Digest: Gp22qIgeqXjcrw0W5lfX+v4iCJE=
-
-Name: res/drawable-hdpi/notify_a01.png
-SHA1-Digest: /9FXEmJVN4GfZwk4YF3uoIlEbS4=
-
-Name: res/drawable-xhdpi/wifi2.png
-SHA1-Digest: 95pF+tdEjBmdjL1gviqVJw6lDlM=
-
-Name: res/drawable-mdpi/abs__spinner_ab_disabled_holo_dark.9.png
-SHA1-Digest: pft58stbqE33Gn17frV/Ljb/Kzw=
-
-Name: assets/zh_TW/02qsg_CHT.png
-SHA1-Digest: sz4F8DYtnO3Lj4KgCvCo2JoPTjY=
-
-Name: res/drawable/abs__progress_horizontal_holo_dark.xml
-SHA1-Digest: /iEzfNZEugl/G6N8Qh681QQNPSc=
-
-Name: res/drawable-mdpi/abs__textfield_search_default_holo_light.9.png
-SHA1-Digest: CQ6w/WUKC9TGwDG4iBNIfwygOEY=
-
-Name: res/drawable-xhdpi/abs__spinner_ab_default_holo_dark.9.png
-SHA1-Digest: 4DLHmynxKoSzQ5KMSUXuBamO9Pk=
-
-Name: res/drawable/cancel_button.png
-SHA1-Digest: 2N+HXAEPUZlZFnYjEcWfYHtFD94=
-
-Name: res/drawable-xhdpi/settings_security_grey.png
-SHA1-Digest: N72L8sShlZ5DxtZwOqPAYxs9SbY=
-
-Name: res/drawable-mdpi/pause_notify.png
-SHA1-Digest: RU//matac19t0QA3+vQ+N63x9wM=
-
-Name: res/layout/abs__action_mode_close_item.xml
-SHA1-Digest: hwhqd7uq6RH+ijxf4Ab+Qk+IYXg=
-
-Name: res/drawable-ldpi/delete_dark.png
-SHA1-Digest: JgGw77odr4HQh8vs/uP2/afN+hc=
-
-Name: res/drawable-xhdpi/abs__menu_dropdown_panel_holo_light.9.png
-SHA1-Digest: pMm8lMp8FURZNb9srHCre3oiwJI=
-
-Name: res/drawable-hdpi/select_dark.png
-SHA1-Digest: WaA/n5tW3BNOTC1MxTx+6TohJnQ=
-
-Name: res/drawable-hdpi/abs__ic_search_api_holo_light.png
-SHA1-Digest: 15tQ2OsywNpdQGDL4yWxR3xWDMI=
-
-Name: res/drawable-mdpi/abs__spinner_48_outer_holo.png
-SHA1-Digest: E8JKf9W+nZlbdfhR4O6pmB6q14c=
-
-Name: assets/zh_TW/01logo.png
-SHA1-Digest: 0W1bsYYaXn4jKG5GA/iApSQvxGM=
-
-Name: res/drawable-xhdpi/abs__textfield_search_default_holo_dark.9.png
-SHA1-Digest: pUJrNEalrEwaKjtoYc52KMFxCMI=
-
-Name: res/drawable-xhdpi/notify_a02s.png
-SHA1-Digest: eQ47U1UQ29rnBMb/69rI2l3i+4I=
-
-Name: res/drawable-mdpi/abs__ic_ab_back_holo_light.png
-SHA1-Digest: 10yFmnAzVd9nqe/1O6tP08Wez+8=
-
-Name: res/drawable-hdpi/abs__tab_unselected_pressed_holo.9.png
-SHA1-Digest: Vpdsk41m+u+Wbl3upUMCWRcaeoY=
-
-Name: res/drawable-hdpi/abs__btn_cab_done_default_holo_dark.9.png
-SHA1-Digest: 9GJ7L2ZtqG84hy6LHRjFWwcdE/k=
-
-Name: res/drawable-hdpi/splash.png
-SHA1-Digest: 1Q50V2CQqHo3e85aCgLHO4grec8=
-
-Name: res/drawable-hdpi/abs__ic_menu_share_holo_dark.png
-SHA1-Digest: zAKWgUZl3wPFGrOGVpY70sUWvy8=
-
-Name: res/drawable-xhdpi/wifi2_s.png
-SHA1-Digest: 6q5ezoORs2l9OP8gvI08Uk13DBs=
-
-Name: res/drawable-hdpi/movie.png
-SHA1-Digest: 9+CtEKfcIiye8Sdj37EYQiTkaac=
-
-Name: res/drawable-hdpi/abs__ic_cab_done_holo_dark.png
-SHA1-Digest: Ero5pbYBER8pLL3KDqfMLnpZrB0=
-
-Name: res/drawable-xhdpi/create_folder.png
-SHA1-Digest: 6PHv1VvAF8whY89yk+r21vi1YeY=
-
-Name: assets/en/03started.png
-SHA1-Digest: YepkV8EGsV8FRDC1iK4W/5YTx24=
-
-Name: res/drawable-xhdpi/abs__ab_solid_shadow_holo.9.png
-SHA1-Digest: FJZmzxRSPFoBpogPOl83SIHWqpA=
-
-Name: res/drawable-mdpi/abs__ab_bottom_solid_light_holo.9.png
-SHA1-Digest: fOTKaFY42kIg155GSxafkHby9Ew=
-
-Name: res/drawable-xhdpi/abs__textfield_search_selected_holo_dark.9.pn
- g
-SHA1-Digest: A8dGiqWEuPdhlm8kq0ijFWmFcRE=
-
-Name: res/drawable-hdpi/abs__ab_bottom_transparent_light_holo.9.png
-SHA1-Digest: 4WNj5DtsCo/3Ywz8axx5PibIeR4=
-
-Name: res/drawable-hdpi/upload2.png
-SHA1-Digest: bZ7pi7b/pyEb0wVhSQapIn7OHXU=
-
-Name: res/drawable-hdpi/abs__spinner_ab_disabled_holo_light.9.png
-SHA1-Digest: t0M0ZoitoGmS8/fuC3/iZHwUQjA=
-
-Name: res/xml/settings_debug.xml
-SHA1-Digest: KIGMtGcGh0FMtnAm/36elR8mD+c=
-
-Name: res/drawable-xhdpi/abs__tab_selected_holo.9.png
-SHA1-Digest: sCAniYVYx5jXdqQhumf4Kn8uoHk=
-
-Name: res/drawable-hdpi/abs__btn_cab_done_focused_holo_dark.9.png
-SHA1-Digest: 4iHqV7E+BRvqEi6eouyDhUKu0/0=
-
-Name: res/drawable/abs__spinner_ab_holo_dark.xml
-SHA1-Digest: urMnXXwa6vOhuZDQh0y2OXC/IGM=
-
-Name: res/drawable-mdpi/abs__spinner_ab_default_holo_light.9.png
-SHA1-Digest: UMvtqC6hnVlluJzlyGv4xoHdabo=
-
-Name: assets/zh_CN/03started_CHS.png
-SHA1-Digest: 24aEpnmdCqGUtLPJLQQVtlXjgUI=
-
-Name: res/drawable/file_pdf.png
-SHA1-Digest: aX7qIO2ozG08Mnfv+Cltizw8al0=
-
-Name: res/drawable-hdpi/device_grey.png
-SHA1-Digest: ooCJs95RM1AyB+zYQ2p6l4Cqq0U=
-
-Name: assets/ko/qsg.html
-SHA1-Digest: e+SkNz6Jz3RFUYNR1viwovEWG/M=
-
-Name: res/drawable-large-hdpi/icon.png
-SHA1-Digest: DHU4AKxG4eEU6+qYyaGR19OUEDY=
-
-Name: res/drawable/abs__progress_horizontal_holo_light.xml
-SHA1-Digest: /L8kPO0mRknMvMwfLlIrUAaTTt8=
-
-Name: assets/ru/qsg.html
-SHA1-Digest: GBsPynPcCrrCo3Poo15DMu5tJUE=
-
-Name: res/drawable-mdpi/abs__ab_stacked_transparent_light_holo.9.png
-SHA1-Digest: EB0i/t/645Q1BJg7chPIn9oYscA=
-
-Name: res/drawable-xhdpi/abs__cab_background_bottom_holo_light.9.png
-SHA1-Digest: 8WG4say21Rxg04ifomofY/O/rTM=
-
-Name: res/drawable-xhdpi/abs__ab_share_pack_holo_light.9.png
-SHA1-Digest: umYg99YgbHOqlsvLBKv314XbJd4=
-
-Name: res/drawable-hdpi/settings_dark.png
-SHA1-Digest: 25yJZ+6TAJwiV+CoZLER9RHyVqI=
-
-Name: res/drawable-hdpi/abs__ic_cab_done_holo_light.png
-SHA1-Digest: zKfmdx+Pi5Y3QzyfnABhh0Y9JaM=
-
-Name: res/drawable/a01.png
-SHA1-Digest: qswVdcK/Mkcz7n7sMxsN/APEWnw=
-
-Name: res/drawable-hdpi/create_folder.png
-SHA1-Digest: UI9PaD3b04YPFzhQ8Y2J/e9hSK8=
-
-Name: res/layout/main.xml
-SHA1-Digest: kYzSlOcQwsIusv6X48t2TMsLx5s=
-
-Name: res/drawable-xhdpi/abs__cab_background_top_holo_light.9.png
-SHA1-Digest: 7wvjARiCpNkOl2QCtebZs8NrjLc=
-
-Name: res/drawable-ldpi/play_notify.png
-SHA1-Digest: SpG2XuOdBqgWwz/e7th+Yvz/kV4=
-
-Name: res/color/abs__primary_text_holo_dark.xml
-SHA1-Digest: HVRO2FBI+gYE9X5wemcGtM1oyaY=
-
-Name: res/drawable-xhdpi/grid_dark.png
-SHA1-Digest: ikU16xRrTT//SbcSEqF2Alz7SII=
-
-Name: res/drawable-mdpi/select.png
-SHA1-Digest: m8lLugXjSty3fTMFw/j1Pd0U808=
-
-Name: res/drawable-xhdpi/wifi0.png
-SHA1-Digest: vE1dCQihcOwp1E0FLLXAP5OrU2s=
-
-Name: res/drawable-xhdpi/download_green.png
-SHA1-Digest: /0uzvlJcozYhy15dMGyO2BTKn+o=
-
-Name: res/drawable/critical.png
-SHA1-Digest: GDnLJjl5ZEsh/grYG2qqucxq03s=
-
-Name: res/drawable-xhdpi/settings_sidelink.png
-SHA1-Digest: +4O2kFI+9KwZ/yWhZq8vZZC6s24=
-
-Name: res/drawable-mdpi/abs__textfield_search_default_holo_dark.9.png
-SHA1-Digest: JgbWimYZh49npVxJzioTzJx4xwA=
-
-Name: res/drawable-xhdpi/abs__ab_stacked_transparent_light_holo.9.png
-SHA1-Digest: 8H5fbl+EvKr+AasaFM+1NLJ2/8A=
-
-Name: res/color/abs__primary_text_disable_only_holo_light.xml
-SHA1-Digest: 0heuKJ50dGM08+pzBXy7qx+4hLE=
-
-Name: res/drawable-mdpi/download_dark_green.png
-SHA1-Digest: eKXyoxe0gMWi169cnUx4wLM6BAk=
-
-Name: res/drawable-xhdpi/abs__ic_menu_share_holo_dark.png
-SHA1-Digest: SbXpQTQd3txNn3aJ9x68LoTCQ88=
-
-Name: res/drawable-ldpi/done.png
-SHA1-Digest: sxs8KwhcexovGfsJ2H60BvZA8pw=
-
-Name: res/drawable-xhdpi/create_folder_dark.png
-SHA1-Digest: o4GIGaz/KT/UdmdB+ZIg/Vx7N8s=
-
-Name: res/drawable-xhdpi/network_wifi0_s.png
-SHA1-Digest: HLlFLOGbkebGqZ2sgSQNlyWAsjQ=
-
-Name: res/drawable-mdpi/abs__ic_cab_done_holo_dark.png
-SHA1-Digest: EI7CPUaZ64UwAcjU3VG8arft8MA=
-
-Name: res/layout/picture_loading.xml
-SHA1-Digest: iIrsj2N4XYlqAeaHNhUZPbTBLxk=
-
-Name: res/drawable/gallery.png
-SHA1-Digest: GIU7SukIY04mEdoD86nS30nWrbQ=
-
-Name: res/drawable-xhdpi/settings_guide.png
-SHA1-Digest: oCqrB34SPX9UDH1a6vOf0WGRTO0=
-
-Name: res/drawable-xhdpi/wifi4.png
-SHA1-Digest: tgswmOaliCmfGroGHukJCElVUqI=
-
-Name: res/drawable-hdpi/abs__btn_cab_done_default_holo_light.9.png
-SHA1-Digest: C3CVfhWItXYX5VuhOv3Tr987jDw=
-
-Name: res/drawable-hdpi/download_green.png
-SHA1-Digest: QwU5fEV+RKZj4KW8Gkv/Gg1U7G8=
-
-Name: res/drawable-mdpi/abs__btn_cab_done_focused_holo_light.9.png
-SHA1-Digest: Iv9+d8iSlqYeG85x2ip3PC+TXqI=
-
-Name: res/drawable-mdpi/abs__spinner_ab_pressed_holo_dark.9.png
-SHA1-Digest: RpjH9X9l7RTj4O0/ZHPnjRGjhAs=
-
-Name: res/layout/settings_about_legal.xml
-SHA1-Digest: bFk49aLNUT02gmUe7JByPrZ7fRg=
-
-Name: res/drawable/abs__ic_menu_moreoverflow_holo_light.xml
-SHA1-Digest: Ja+gNbfydTTC7nwqz11DWUjWIB4=
-
-Name: res/drawable-mdpi/delete.png
-SHA1-Digest: qU9mBiJ0EuVTFysrqEfWKMswSNU=
-
-Name: res/drawable-mdpi/grid.png
-SHA1-Digest: 0vdcIGnE4OzuZY+a+LApbhbdF7g=
-
-Name: res/drawable-mdpi/abs__ab_share_pack_holo_dark.9.png
-SHA1-Digest: 7bovMMzOcBf6/I9KeGe/Y4JP3PI=
-
-Name: res/drawable-mdpi/select_dark.png
-SHA1-Digest: sDraxyImpg7m/4NY9t3shPh/Vo8=
-
-Name: res/layout/wifi_disable_alert.xml
-SHA1-Digest: z24WubI/oVgvl3cuq4IrIElRQQ0=
-
-Name: res/layout/abs__simple_dropdown_hint.xml
-SHA1-Digest: kp6SNocIx2R9JCEDdpWBBqwH8Wo=
-
-Name: res/drawable-mdpi/abs__ic_go_search_api_holo_light.png
-SHA1-Digest: HZ81jf3SqGSNkfV8se4PJ1F8P+s=
-
-Name: res/drawable-hdpi/abs__ic_voice_search_api_holo_light.png
-SHA1-Digest: URoLFR3cGwtdIWQqefx4S2slI0A=
-
-Name: res/xml/settings_security.xml
-SHA1-Digest: VB8Ce9FvCDK7WIW86chUEw01LL8=
-
-Name: assets/zh_CN/01logo.png
-SHA1-Digest: nR5HoS3HmNUT/kIzIpsnRFfSee0=
-
-Name: res/drawable-xhdpi/notify_a02c.png
-SHA1-Digest: 0y+6sN1IBS2FJLTLeIx2rt7HVgw=
-
-Name: res/drawable-xhdpi/abs__textfield_search_selected_holo_light.9.p
- ng
-SHA1-Digest: /MUgBH/bN2XqWF5dFDTtW4fzSME=
-
-Name: res/layout-large/music.xml
-SHA1-Digest: D40k3DT5SqOIMlGEqsO8Sq8yRSM=
-
-Name: res/layout/abs__action_bar_title_item.xml
-SHA1-Digest: TsyxUMOCIBf9iqn7roo9cLWBpo4=
-
-Name: assets/es/02qsg_SP.png
-SHA1-Digest: DkZwBnDajGj5zCec27LuZV+C9MM=
-
diff --git a/tests/SystemWebView-repack.apk b/tests/SystemWebView-repack.apk
deleted file mode 100644
index 45b31280..00000000
Binary files a/tests/SystemWebView-repack.apk and /dev/null differ
diff --git a/tests/__init__.py b/tests/__init__.py
deleted file mode 100644
index e69de29b..00000000
diff --git a/tests/androguard_test.py b/tests/androguard_test.py
new file mode 100644
index 00000000..162dffb3
--- /dev/null
+++ b/tests/androguard_test.py
@@ -0,0 +1,88 @@
+#!/usr/bin/env python3
+
+import inspect
+import logging
+import optparse
+import os
+import sys
+import unittest
+
+localmodule = os.path.realpath(
+    os.path.join(os.path.dirname(inspect.getfile(inspect.currentframe())), '..'))
+print('localmodule: ' + localmodule)
+if localmodule not in sys.path:
+    sys.path.insert(0, localmodule)
+
+import fdroidserver.common
+import fdroidserver.metadata
+import fdroidserver.update
+
+
+class UpdateTest(unittest.TestCase):
+    '''fdroid androguard manual tests'''
+
+    def testScanMetadataAndroguardAAPT(self):
+
+        def _create_apkmetadata_object(apkName):
+            '''Create an empty apk metadata object'''
+            apk = {}
+            apk['apkName'] = apkName
+            apk['uses-permission'] = []
+            apk['uses-permission-sdk-23'] = []
+            apk['features'] = []
+            apk['icons_src'] = {}
+            return apk
+        
+        config = dict()
+        fdroidserver.common.fill_config_defaults(config)
+        fdroidserver.update.config = config
+        os.chdir(os.path.dirname(__file__))
+        if os.path.basename(os.getcwd()) != 'tests':
+            raise Exception('This test must be run in the "tests/" subdir')
+
+        config['ndk_paths'] = dict()
+        fdroidserver.common.config = config
+        fdroidserver.update.config = config
+
+        fdroidserver.update.options = type('', (), {})()
+        fdroidserver.update.options.clean = True
+        fdroidserver.update.options.delete_unknown = True
+
+        self.assertTrue(fdroidserver.common.SdkToolsPopen('aapt'))
+        try:
+            from androguard.core.bytecodes.apk import APK
+            dir(APK)
+        except ImportError:
+            raise Exception("androguard not installed!")
+
+        apkList = ['../info.guardianproject.urzip.apk', '../org.dyndns.fules.ck_20.apk']
+
+        for apkName in apkList:
+            logging.debug("Processing " + apkName)
+            apkfile = os.path.join('repo', apkName)
+
+            apkaapt = _create_apkmetadata_object(apkName)
+            logging.debug("Using AAPT for metadata")
+            fdroidserver.update.scan_apk_aapt(apkaapt, apkfile)
+            # avoid AAPT application name bug
+            del apkaapt['name']
+
+            apkandroguard = _create_apkmetadata_object(apkName)
+            logging.debug("Using androguard for metadata")
+            fdroidserver.update.scan_apk_androguard(apkandroguard, apkfile)
+            # avoid AAPT application name bug
+            del apkandroguard['name']
+
+            self.maxDiff = None
+            self.assertEqual(apkaapt, apkandroguard)
+
+
+if __name__ == "__main__":
+    parser = optparse.OptionParser()
+    parser.add_option("-v", "--verbose", action="store_true", default=False,
+                      help="Spew out even more information than normal")
+    (fdroidserver.common.options, args) = parser.parse_args(['--verbose'])
+
+    newSuite = unittest.TestSuite()
+    newSuite.addTest(unittest.makeSuite(UpdateTest))
+    unittest.main()
diff --git a/tests/aosp_testkey_debug.keystore b/tests/aosp_testkey_debug.keystore
deleted file mode 100644
index ecbdcb4d..00000000
Binary files a/tests/aosp_testkey_debug.keystore and /dev/null differ
diff --git a/tests/apk.embedded_1.apk b/tests/apk.embedded_1.apk
deleted file mode 100644
index f0dd47f0..00000000
Binary files a/tests/apk.embedded_1.apk and /dev/null differ
diff --git a/tests/build.TestCase b/tests/build.TestCase
new file mode 100755
index 00000000..a696f196
--- /dev/null
+++ b/tests/build.TestCase
@@ -0,0 +1,218 @@
+#!/usr/bin/env python3
+
+# http://www.drdobbs.com/testing/unit-testing-with-python/240165163
+
+import inspect
+import logging
+import optparse
+import os
+import shutil
+import sys
+import tempfile
+import textwrap
+import unittest
+from unittest import mock
+
+localmodule = os.path.realpath(
+    os.path.join(os.path.dirname(inspect.getfile(inspect.currentframe())), '..'))
+print('localmodule: ' + localmodule)
+if localmodule not in sys.path:
+    sys.path.insert(0, localmodule)
+
+import fdroidserver.build
+import fdroidserver.common
+import fdroidserver.metadata
+import fdroidserver.scanner
+
+
+class BuildTest(unittest.TestCase):
+    '''fdroidserver/build.py'''
+
+    def setUp(self):
+        logging.basicConfig(level=logging.DEBUG)
+        logger = logging.getLogger('androguard.axml')
+        logger.setLevel(logging.INFO)  # tame the axml debug messages
+        self.basedir = os.path.join(localmodule, 'tests')
+        self.tmpdir = os.path.abspath(os.path.join(self.basedir, '..', '.testfiles'))
+        if not os.path.exists(self.tmpdir):
+            os.makedirs(self.tmpdir)
+        os.chdir(self.basedir)
+
+    def test_get_apk_metadata(self):
+        config = dict()
+        fdroidserver.common.fill_config_defaults(config)
+        fdroidserver.common.config = config
+        fdroidserver.build.config = config
+        try:
+            config['aapt'] = fdroidserver.common.find_sdk_tools_cmd('aapt')
+        except fdroidserver.exception.FDroidException:
+            pass  # aapt is not required if androguard is present
+
+        testcases = [
+            ('repo/obb.main.twoversions_1101613.apk', 'obb.main.twoversions', '1101613', '0.1', None),
+            ('org.bitbucket.tickytacky.mirrormirror_1.apk', 'org.bitbucket.tickytacky.mirrormirror', '1', '1.0', None),
+            ('org.bitbucket.tickytacky.mirrormirror_2.apk', 'org.bitbucket.tickytacky.mirrormirror', '2', '1.0.1', None),
+            ('org.bitbucket.tickytacky.mirrormirror_3.apk', 'org.bitbucket.tickytacky.mirrormirror', '3', '1.0.2', None),
+            ('org.bitbucket.tickytacky.mirrormirror_4.apk', 'org.bitbucket.tickytacky.mirrormirror', '4', '1.0.3', None),
+            ('org.dyndns.fules.ck_20.apk', 'org.dyndns.fules.ck', '20', 'v1.6pre2',
+             ['arm64-v8a', 'armeabi', 'armeabi-v7a', 'mips', 'mips64', 'x86', 'x86_64']),
+            ('urzip.apk', 'info.guardianproject.urzip', '100', '0.1', None),
+            ('urzip-badcert.apk', 'info.guardianproject.urzip', '100', '0.1', None),
+            ('urzip-badsig.apk', 'info.guardianproject.urzip', '100', '0.1', None),
+            ('urzip-release.apk', 'info.guardianproject.urzip', '100', '0.1', None),
+            ('urzip-release-unsigned.apk', 'info.guardianproject.urzip', '100', '0.1', None),
+            ('repo/com.politedroid_3.apk', 'com.politedroid', '3', '1.2', None),
+            ('repo/com.politedroid_4.apk', 'com.politedroid', '4', '1.3', None),
+            ('repo/com.politedroid_5.apk', 'com.politedroid', '5', '1.4', None),
+            ('repo/com.politedroid_6.apk', 'com.politedroid', '6', '1.5', None),
+            ('repo/duplicate.permisssions_9999999.apk', 'duplicate.permisssions', '9999999', '', None),
+            ('repo/info.zwanenburg.caffeinetile_4.apk', 'info.zwanenburg.caffeinetile', '4', '1.3', None),
+            ('repo/obb.main.oldversion_1444412523.apk', 'obb.main.oldversion', '1444412523', '0.1', None),
+            ('repo/obb.mainpatch.current_1619_another-release-key.apk', 'obb.mainpatch.current', '1619', '0.1', None),
+            ('repo/obb.mainpatch.current_1619.apk', 'obb.mainpatch.current', '1619', '0.1', None),
+            ('repo/obb.main.twoversions_1101613.apk', 'obb.main.twoversions', '1101613', '0.1', None),
+            ('repo/obb.main.twoversions_1101615.apk', 'obb.main.twoversions', '1101615', '0.1', None),
+            ('repo/obb.main.twoversions_1101617.apk', 'obb.main.twoversions', '1101617', '0.1', None),
+            ('repo/urzip-; Рахма́, [rɐxˈmanʲɪnəf] سيرجي_رخمانينوف 谢·.apk', 'info.guardianproject.urzip', '100', '0.1', None),
+        ]
+        for apkfilename, appid, versionCode, versionName, nativecode in testcases:
+            app = fdroidserver.metadata.App()
+            app.id = appid
+            build = fdroidserver.metadata.Build()
+            build.buildjni = ['yes'] if nativecode else build.buildjni
+            build.versionCode = versionCode
+            build.versionName = versionName
+            vc, vn = fdroidserver.build.get_metadata_from_apk(app, build, apkfilename)
+            self.assertEqual(versionCode, vc)
+            self.assertEqual(versionName, vn)
+
+    def test_build_local_clean(self):
+        """Test if `fdroid build` cleans ant and gradle build products"""
+        testdir = tempfile.mkdtemp(prefix=inspect.currentframe().f_code.co_name, dir=self.tmpdir)
+        os.chdir(testdir)
+
+        config = dict()
+        fdroidserver.common.fill_config_defaults(config)
+        fdroidserver.common.config = config
+        fdroidserver.build.config = config
+        fdroidserver.build.options = mock.Mock()
+        fdroidserver.build.options.scan_binary = False
+        fdroidserver.build.options.notarball = True
+        fdroidserver.build.options.skipscan = False
+
+        app = fdroidserver.metadata.App()
+        app.id = 'mocked.app.id'
+        build = fdroidserver.metadata.Build()
+        build.commit = '1.0'
+        build.output = app.id + '.apk'
+        build.scandelete = ['baz.so']
+        build.scanignore = ['foo.aar']
+        build.versionCode = '1'
+        build.versionName = '1.0'
+        vcs = mock.Mock()
+
+        os.mkdir('reports')
+        os.mkdir('target')
+
+        for f in ('baz.so', 'foo.aar', 'gradle-wrapper.jar'):
+            with open(f, 'w') as fp:
+                fp.write('placeholder')
+            self.assertTrue(os.path.exists(f))
+
+        os.mkdir('build')
+        os.mkdir('build/reports')
+        with open('build.gradle', 'w') as fp:
+            fp.write('// placeholder')
+
+        os.mkdir('bin')
+        os.mkdir('gen')
+        with open('build.xml', 'w') as fp:
+            fp.write(textwrap.dedent(
+                """<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+                <project basedir="." default="clean" name="mockapp">
+                <target name="release"/>
+                <target name="clean"/>
+                </project>"""))
+
+        def make_fake_apk(output, build):
+            with open(build.output, 'w') as fp:
+                fp.write('APK PLACEHOLDER')
+            return output
+
+        with mock.patch('fdroidserver.common.replace_build_vars', wraps=make_fake_apk):
+            with mock.patch('fdroidserver.common.get_native_code', return_value='x86'):
+                with mock.patch('fdroidserver.common.get_apk_id',
+                                return_value=(app.id, build.versionCode, build.versionName)):
+                    with mock.patch('fdroidserver.common.is_apk_and_debuggable', return_value=False):
+                        fdroidserver.build.build_local(
+                            app, build, vcs,
+                            build_dir=testdir, output_dir=testdir,
+                            log_dir=None, srclib_dir=None, extlib_dir=None, tmp_dir=None,
+                            force=False, onserver=False, refresh=False
+                        )
+
+        self.assertTrue(os.path.exists('foo.aar'))
+        self.assertTrue(os.path.isdir('build'))
+        self.assertTrue(os.path.isdir('reports'))
+        self.assertTrue(os.path.isdir('target'))
+        self.assertFalse(os.path.exists('baz.so'))
+        self.assertFalse(os.path.exists('bin'))
+        self.assertFalse(os.path.exists('build/reports'))
+        self.assertFalse(os.path.exists('gen'))
+        self.assertFalse(os.path.exists('gradle-wrapper.jar'))
+
+    def test_scan_with_extlib(self):
+        testdir = tempfile.mkdtemp(prefix=inspect.currentframe().f_code.co_name, dir=self.tmpdir)
+        os.chdir(testdir)
+        os.mkdir("build")
+
+        config = dict()
+        config['sdk_path'] = os.getenv('ANDROID_HOME')
+        config['ndk_paths'] = {'r10d': os.getenv('ANDROID_NDK_HOME')}
+        fdroidserver.common.config = config
+        app = fdroidserver.metadata.App()
+        app.id = 'com.gpl.rpg.AndorsTrail'
+        build = fdroidserver.metadata.Build()
+        build.commit = 'master'
+        build.androidupdate = ['no']
+        os.makedirs("extlib/android")
+        # write a fake binary jar file the scanner should definitely error on
+        with open('extlib/android/android-support-v4r11.jar', 'wb') as file:
+            file.write(b'PK\x03\x04\x14\x00\x08\x00\x08\x00-\x0eiA\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\t\x00\x04\x00META-INF/\xfe\xca\x00\x00\x03\x00PK\x07\x08\x00\x00\x00\x00\x02\x00\x00\x00\x00\x00\x00\x00')
+
+        class FakeVcs():
+            # no need to change to the correct commit here
+            def gotorevision(self, rev, refresh=True):
+                pass
+
+            def getsrclib(self):
+                return None
+
+        # Test we trigger a scanner error without extlibs
+        build.extlibs = []
+        os.makedirs('build/libs')
+        shutil.copy('extlib/android/android-support-v4r11.jar', 'build/libs')
+        fdroidserver.common.prepare_source(FakeVcs(), app, build,
+                                           "build", "ignore", "extlib")
+        count = fdroidserver.scanner.scan_source("build", build)
+        self.assertEqual(1, count, "Should produce a scanner error without extlib")
+
+        # Now try again as an extlib
+        build.extlibs = ['android/android-support-v4r11.jar']
+        fdroidserver.common.prepare_source(FakeVcs(), app, build,
+                                           "build", "ignore", "extlib")
+        count = fdroidserver.scanner.scan_source("build", build)
+        self.assertEqual(0, count, "Shouldn't error on jar from extlib")
+
+
+if __name__ == "__main__":
+    os.chdir(os.path.dirname(__file__))
+
+    parser = optparse.OptionParser()
+    parser.add_option("-v", "--verbose", action="store_true", default=False,
+                      help="Spew out even more information than normal")
+    (fdroidserver.common.options, args) = parser.parse_args(['--verbose'])
+
+    newSuite = unittest.TestSuite()
+    newSuite.addTest(unittest.makeSuite(BuildTest))
+    unittest.main(failfast=False)
diff --git a/tests/build/info.guardianproject.urzip/.fdroid.yml b/tests/build/info.guardianproject.urzip/.fdroid.yml
deleted file mode 100644
index beea89be..00000000
--- a/tests/build/info.guardianproject.urzip/.fdroid.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-Summary: This should be overridden by metadata/info.guardianproject.urzip.yml
-Builds:
-  - versionCode: 50
diff --git a/tests/builder/Vagrantfile b/tests/builder/Vagrantfile
deleted file mode 100644
index 376a19c7..00000000
--- a/tests/builder/Vagrantfile
+++ /dev/null
@@ -1,12 +0,0 @@
-# generated file, do not change.
-# https://gitlab.com/fdroid/fdroid-bootstrap-buildserver/-/blob/c0762bf9398d0/provision.yml#L552
-
-Vagrant.configure("2") do |config|
-  config.vm.box = "buildserver"
-  config.vm.synced_folder ".", "/vagrant", disabled: true
-
-  config.vm.provider :libvirt do |libvirt|
-    libvirt.cpus = 24
-    libvirt.memory = 30720
-  end
-end
diff --git a/tests/checkupdates.TestCase b/tests/checkupdates.TestCase
new file mode 100755
index 00000000..7772dfa5
--- /dev/null
+++ b/tests/checkupdates.TestCase
@@ -0,0 +1,167 @@
+#!/usr/bin/env python3
+
+# http://www.drdobbs.com/testing/unit-testing-with-python/240165163
+
+import inspect
+import logging
+import optparse
+import os
+import sys
+import unittest
+from unittest import mock
+
+
+localmodule = os.path.realpath(
+    os.path.join(os.path.dirname(inspect.getfile(inspect.currentframe())), '..'))
+print('localmodule: ' + localmodule)
+if localmodule not in sys.path:
+    sys.path.insert(0, localmodule)
+
+import fdroidserver.checkupdates
+import fdroidserver.metadata
+from fdroidserver.exception import FDroidException
+
+
+class CheckupdatesTest(unittest.TestCase):
+    '''fdroidserver/checkupdates.py'''
+
+    def setUp(self):
+        logging.basicConfig(level=logging.DEBUG)
+        self.basedir = os.path.join(localmodule, 'tests')
+        self.tmpdir = os.path.abspath(os.path.join(self.basedir, '..', '.testfiles'))
+        if not os.path.exists(self.tmpdir):
+            os.makedirs(self.tmpdir)
+        os.chdir(self.basedir)
+
+    def test_autoupdatemode_no_suffix(self):
+        fdroidserver.checkupdates.options = mock.Mock()
+        fdroidserver.checkupdates.options.auto = 'bleh'
+        fdroidserver.checkupdates.config = {}
+
+        app = fdroidserver.metadata.App()
+        app.id = 'loop.starts.shooting'
+        app.metadatapath = 'metadata/' + app.id + '.yml'
+        app.CurrentVersion = '1.1.8-fdroid'
+        app.CurrentVersionCode = 10108
+        app.UpdateCheckMode = 'HTTP'
+        app.AutoUpdateMode = 'Version %v'
+
+        build = fdroidserver.metadata.Build()
+        build.versionCode = app.CurrentVersionCode
+        build.versionName = app.CurrentVersion
+        app.builds.append(build)
+
+        with mock.patch('fdroidserver.checkupdates.check_http', lambda app: ('1.1.9', 10109)):
+            with mock.patch('fdroidserver.metadata.write_metadata', mock.Mock()):
+                with mock.patch('subprocess.call', lambda cmd: 0):
+                    fdroidserver.checkupdates.checkupdates_app(app)
+                build = app.builds[-1]
+                self.assertEqual(build.versionName, '1.1.9')
+                self.assertEqual(build.commit, '1.1.9')
+
+    def test_autoupdatemode_suffix(self):
+        fdroidserver.checkupdates.options = mock.Mock()
+        fdroidserver.checkupdates.options.auto = 'bleh'
+        fdroidserver.checkupdates.config = {}
+
+        app = fdroidserver.metadata.App()
+        app.id = 'loop.starts.shooting'
+        app.metadatapath = 'metadata/' + app.id + '.yml'
+        app.CurrentVersion = '1.1.8-fdroid'
+        app.CurrentVersionCode = 10108
+        app.UpdateCheckMode = 'HTTP'
+        app.AutoUpdateMode = 'Version +.%c-fdroid v%v_%c'
+
+        build = fdroidserver.metadata.Build()
+        build.versionCode = app.CurrentVersionCode
+        build.versionName = app.CurrentVersion
+        app.builds.append(build)
+
+        with mock.patch('fdroidserver.checkupdates.check_http', lambda app: ('1.1.9', 10109)):
+            with mock.patch('fdroidserver.metadata.write_metadata', mock.Mock()):
+                with mock.patch('subprocess.call', lambda cmd: 0):
+                    fdroidserver.checkupdates.checkupdates_app(app)
+                build = app.builds[-1]
+                self.assertEqual(build.versionName, '1.1.9.10109-fdroid')
+                self.assertEqual(build.commit, 'v1.1.9_10109')
+
+    def test_checkupdates_app_http(self):
+        fdroidserver.checkupdates.options = mock.Mock()
+        fdroidserver.checkupdates.options.auto = 'bleh'
+        fdroidserver.checkupdates.config = {}
+
+        app = fdroidserver.metadata.App()
+        app.id = 'loop.starts.shooting'
+        app.metadatapath = 'metadata/' + app.id + '.yml'
+        app.CurrentVersionCode = 10108
+        app.UpdateCheckMode = 'HTTP'
+        app.UpdateCheckData = 'mock'
+
+        with mock.patch('fdroidserver.checkupdates.check_http', lambda app: (None, 'bla')):
+            fdroidserver.checkupdates.checkupdates_app(app)
+
+        with mock.patch('fdroidserver.checkupdates.check_http', lambda app: ('1.1.9', 10109)):
+            with mock.patch('fdroidserver.metadata.write_metadata', mock.Mock()) as wrmock:
+                with mock.patch('subprocess.call', lambda cmd: 0):
+                    fdroidserver.checkupdates.checkupdates_app(app)
+                wrmock.assert_called_with(app.metadatapath, app)
+
+    def test_check_http(self):
+        fdroidserver.checkupdates.options = mock.Mock()
+
+        app = fdroidserver.metadata.App()
+        app.id = 'loop.starts.shooting'
+        app.metadatapath = 'metadata/' + app.id + '.yml'
+        app.CurrentVersionCode = 10108
+        app.UpdateCheckMode = 'HTTP'
+        app.UpdateCheckData = 'https://a.net/b.txt|c(.*)|https://d.net/e.txt|v(.*)'
+        app.UpdateCheckIgnore = 'beta'
+
+        respmock = mock.Mock()
+        respmock.read = lambda: 'v1.1.9\nc10109'.encode('utf-8')
+        with mock.patch('urllib.request.urlopen', lambda a, b, c: respmock):
+            vername, vercode = fdroidserver.checkupdates.check_http(app)
+            self.assertEqual(vername, '1.1.9')
+            self.assertEqual(vercode, '10109')
+
+    def test_check_http_blocks_unknown_schemes(self):
+        app = fdroidserver.metadata.App()
+        for scheme in ('file', 'ssh', 'http', ';pwn'):
+            app.id = scheme
+            faked = scheme + '://fake.url/for/testing/scheme'
+            app.UpdateCheckData = faked + '|ignored|' + faked + '|ignored'
+            app.metadatapath = 'metadata/' + app.id + '.yml'
+            vername, vercode = fdroidserver.checkupdates.check_http(app)
+            self.assertIsNone(vername)
+            self.assertTrue(FDroidException.__name__ in vercode)
+
+    def test_check_http_ignore(self):
+        fdroidserver.checkupdates.options = mock.Mock()
+
+        app = fdroidserver.metadata.App()
+        app.id = 'loop.starts.shooting'
+        app.metadatapath = 'metadata/' + app.id + '.yml'
+        app.CurrentVersionCode = 10108
+        app.UpdateCheckMode = 'HTTP'
+        app.UpdateCheckData = 'https://a.net/b.txt|c(.*)|https://d.net/e.txt|v(.*)'
+        app.UpdateCheckIgnore = 'beta'
+
+        respmock = mock.Mock()
+        respmock.read = lambda: 'v1.1.9-beta\nc10109'.encode('utf-8')
+        with mock.patch('urllib.request.urlopen', lambda a, b, c: respmock):
+            vername, vercode = fdroidserver.checkupdates.check_http(app)
+            self.assertEqual(vername, None)
+            self.assertEqual(vercode, 'Version 1.1.9-beta is ignored')
+
+
+if __name__ == "__main__":
+    os.chdir(os.path.dirname(__file__))
+
+    parser = optparse.OptionParser()
+    parser.add_option("-v", "--verbose", action="store_true", default=False,
+                      help="Spew out even more information than normal")
+    (fdroidserver.common.options, args) = parser.parse_args(['--verbose'])
+
+    newSuite = unittest.TestSuite()
+    newSuite.addTest(unittest.makeSuite(CheckupdatesTest))
+    unittest.main(failfast=False)
diff --git a/tests/com.fake.IpaApp_1000000000001.ipa b/tests/com.fake.IpaApp_1000000000001.ipa
deleted file mode 100644
index d392cb94..00000000
Binary files a/tests/com.fake.IpaApp_1000000000001.ipa and /dev/null differ
diff --git a/tests/common.TestCase b/tests/common.TestCase
new file mode 100755
index 00000000..4ba80c0d
--- /dev/null
+++ b/tests/common.TestCase
@@ -0,0 +1,1564 @@
+#!/usr/bin/env python3
+
+# http://www.drdobbs.com/testing/unit-testing-with-python/240165163
+
+import difflib
+import glob
+import inspect
+import json
+import logging
+import optparse
+import os
+import re
+import shutil
+import subprocess
+import sys
+import tempfile
+import time
+import unittest
+import textwrap
+import yaml
+import gzip
+from zipfile import ZipFile
+from unittest import mock
+
+
+localmodule = os.path.realpath(
+    os.path.join(os.path.dirname(inspect.getfile(inspect.currentframe())), '..'))
+print('localmodule: ' + localmodule)
+if localmodule not in sys.path:
+    sys.path.insert(0, localmodule)
+
+import fdroidserver.index
+import fdroidserver.signindex
+import fdroidserver.common
+import fdroidserver.metadata
+from testcommon import TmpCwd
+from fdroidserver.exception import FDroidException, VCSException, MetaDataException
+
+
+class CommonTest(unittest.TestCase):
+    '''fdroidserver/common.py'''
+
+    def setUp(self):
+        logging.basicConfig(level=logging.DEBUG)
+        logger = logging.getLogger('androguard.axml')
+        logger.setLevel(logging.INFO)  # tame the axml debug messages
+        self.basedir = os.path.join(localmodule, 'tests')
+        self.tmpdir = os.path.abspath(os.path.join(self.basedir, '..', '.testfiles'))
+        if not os.path.exists(self.tmpdir):
+            os.makedirs(self.tmpdir)
+        os.chdir(self.basedir)
+        fdroidserver.common.config = None
+
+    def test_parse_human_readable_size(self):
+        for k, v in ((9827, 9827), (123.456, 123), ('123b', 123), ('1.2', 1),
+                     ('10.43 KiB', 10680), ('11GB', 11000000000), ('59kb', 59000),
+                     ('343.1 mb', 343100000), ('99.9GiB', 107266808217)):
+            self.assertEqual(fdroidserver.common.parse_human_readable_size(k), v)
+        for v in ((12, 123), '0xfff', [], None, '12,123', '123GG', '982374bb', self):
+            with self.assertRaises(ValueError):
+                fdroidserver.common.parse_human_readable_size(v)
+
+    def test_assert_config_keystore(self):
+        with tempfile.TemporaryDirectory() as tmpdir, TmpCwd(tmpdir):
+            with self.assertRaises(FDroidException):
+                fdroidserver.common.assert_config_keystore({})
+
+        with tempfile.TemporaryDirectory() as tmpdir, TmpCwd(tmpdir):
+            c = {'repo_keyalias': 'localhost',
+                 'keystore': 'keystore.jks',
+                 'keystorepass': '12345',
+                 'keypass': '12345'}
+            with open('keystore.jks', 'w'):
+                pass
+            fdroidserver.common.assert_config_keystore(c)
+
+    def _set_build_tools(self):
+        build_tools = os.path.join(fdroidserver.common.config['sdk_path'], 'build-tools')
+        if os.path.exists(build_tools):
+            for f in sorted(os.listdir(build_tools), reverse=True):
+                versioned = os.path.join(build_tools, f)
+                if os.path.isdir(versioned) \
+                        and os.path.isfile(os.path.join(versioned, 'apksigner')):
+                    break
+            return True
+        else:
+            print('no build-tools found: ' + build_tools)
+            return False
+
+    def _find_all(self):
+        tools = ['aapt', 'adb', 'zipalign']
+        if os.path.exists(os.path.join(os.getenv('ANDROID_HOME'), 'tools', 'android')):
+            tools.append('android')
+        for cmd in tools:
+            try:
+                path = fdroidserver.common.find_sdk_tools_cmd(cmd)
+                self.assertTrue(os.path.exists(path))
+                self.assertTrue(os.path.isfile(path))
+            except fdroidserver.exception.FDroidException:
+                pass
+
+    def test_find_sdk_tools_cmd(self):
+        fdroidserver.common.config = dict()
+        # TODO add this once everything works without sdk_path set in config
+        # self._find_all()
+        sdk_path = os.getenv('ANDROID_HOME')
+        if os.path.exists(sdk_path):
+            fdroidserver.common.config['sdk_path'] = sdk_path
+            build_tools = os.path.join(sdk_path, 'build-tools')
+            if self._set_build_tools() or os.path.exists('/usr/bin/aapt'):
+                self._find_all()
+            else:
+                print('no build-tools found: ' + build_tools)
+
+    def test_find_java_root_path(self):
+        testdir = tempfile.mkdtemp(prefix=inspect.currentframe().f_code.co_name, dir=self.tmpdir)
+        os.chdir(testdir)
+
+        all_pathlists = [
+            ([  # Debian
+                '/usr/lib/jvm/java-1.5.0-gcj-5-amd64',
+                '/usr/lib/jvm/java-8-openjdk-amd64',
+                '/usr/lib/jvm/java-1.8.0-openjdk-amd64',
+            ], '/usr/lib/jvm/java-8-openjdk-amd64'),
+            ([  # OSX
+                '/Library/Java/JavaVirtualMachines/jdk1.8.0_202.jdk',
+                '/Library/Java/JavaVirtualMachines/jdk1.8.0_45.jdk',
+                '/System/Library/Java/JavaVirtualMachines/jdk1.7.0_80.jdk',
+            ], '/Library/Java/JavaVirtualMachines/jdk1.8.0_202.jdk'),
+        ]
+
+        for pathlist, choice in all_pathlists:
+            # strip leading / to make relative paths to test without root
+            pathlist = [p[1:] for p in pathlist]
+
+            # create test file used in common._add_java_paths_to_config()
+            for p in pathlist:
+                if p.startswith('/System') or p.startswith('/Library'):
+                    basedir = os.path.join(p, 'Contents', 'Home', 'bin')
+                else:
+                    basedir = os.path.join(p, 'bin')
+                os.makedirs(basedir)
+                open(os.path.join(basedir, 'javac'), 'w').close()
+
+            config = dict()
+            config['java_paths'] = dict()
+            fdroidserver.common._add_java_paths_to_config(pathlist, config)
+            self.assertEqual(config['java_paths']['8'], choice[1:])
+
+    def test_is_apk_and_debuggable(self):
+        config = dict()
+        fdroidserver.common.fill_config_defaults(config)
+        fdroidserver.common.config = config
+
+        # these are set debuggable
+        testfiles = []
+        testfiles.append(os.path.join(self.basedir, 'urzip.apk'))
+        testfiles.append(os.path.join(self.basedir, 'urzip-badsig.apk'))
+        testfiles.append(os.path.join(self.basedir, 'urzip-badcert.apk'))
+        for apkfile in testfiles:
+            self.assertTrue(fdroidserver.common.is_apk_and_debuggable(apkfile),
+                            "debuggable APK state was not properly parsed!")
+
+        # these are set NOT debuggable
+        testfiles = []
+        testfiles.append(os.path.join(self.basedir, 'urzip-release.apk'))
+        testfiles.append(os.path.join(self.basedir, 'urzip-release-unsigned.apk'))
+        testfiles.append(os.path.join(self.basedir, 'v2.only.sig_2.apk'))
+        for apkfile in testfiles:
+            self.assertFalse(fdroidserver.common.is_apk_and_debuggable(apkfile),
+                             "debuggable APK state was not properly parsed!")
+
+    VALID_STRICT_PACKAGE_NAMES = [
+        "An.stop",
+        "SpeedoMeterApp.main",
+        "a2dp.Vol",
+        "au.com.darkside.XServer",
+        "click.dummer.UartSmartwatch",
+        "com.Bisha.TI89EmuDonation",
+        "com.MarcosDiez.shareviahttp",
+        "com.Pau.ImapNotes2",
+        "com.app.Zensuren",
+        "com.darshancomputing.BatteryIndicator",
+        "com.geecko.QuickLyric",
+        "com.genonbeta.TrebleShot",
+        "com.gpl.rpg.AndorsTrail",
+        "com.hobbyone.HashDroid",
+        "com.moez.QKSMS",
+        "com.platypus.SAnd",
+        "com.prhlt.aemus.Read4SpeechExperiments",
+        "de.syss.MifareClassicTool",
+        "org.fdroid.fdroid",
+        "org.f_droid.fdr0ID",
+    ]
+
+    def test_is_valid_package_name(self):
+        for name in self.VALID_STRICT_PACKAGE_NAMES + [
+                "_SpeedoMeterApp.main",
+                "05041684efd9b16c2888b1eddbadd0359f655f311b89bdd1737f560a10d20fb8"]:
+            self.assertTrue(fdroidserver.common.is_valid_package_name(name),
+                            "{0} should be a valid package name".format(name))
+        for name in ["0rg.fdroid.fdroid",
+                     ".f_droid.fdr0ID",
+                     "trailingdot.",
+                     "org.fdroid/fdroid",
+                     "/org.fdroid.fdroid"]:
+            self.assertFalse(fdroidserver.common.is_valid_package_name(name),
+                             "{0} should not be a valid package name".format(name))
+
+    def test_is_strict_application_id(self):
+        """see also tests/valid-package-names/"""
+        for name in self.VALID_STRICT_PACKAGE_NAMES:
+            self.assertTrue(fdroidserver.common.is_strict_application_id(name),
+                            "{0} should be a strict application id".format(name))
+        for name in ["0rg.fdroid.fdroid",
+                     ".f_droid.fdr0ID",
+                     "oneword",
+                     "trailingdot.",
+                     "cafebabe",
+                     "org.fdroid/fdroid",
+                     "/org.fdroid.fdroid",
+                     "_SpeedoMeterApp.main",
+                     "05041684efd9b16c2888b1eddbadd0359f655f311b89bdd1737f560a10d20fb8"]:
+            self.assertFalse(fdroidserver.common.is_strict_application_id(name),
+                             "{0} should not be a strict application id".format(name))
+
+    def test_prepare_sources(self):
+        testint = 99999999
+        teststr = 'FAKE_STR_FOR_TESTING'
+
+        testdir = tempfile.mkdtemp(prefix=inspect.currentframe().f_code.co_name, dir=self.tmpdir)
+        shutil.copytree(os.path.join(self.basedir, 'source-files'),
+                        os.path.join(testdir, 'source-files'))
+
+        fdroidclient_testdir = os.path.join(testdir, 'source-files', 'fdroid', 'fdroidclient')
+
+        config = dict()
+        config['sdk_path'] = os.getenv('ANDROID_HOME')
+        config['ndk_paths'] = {'r10d': os.getenv('ANDROID_NDK_HOME')}
+        fdroidserver.common.config = config
+        app = fdroidserver.metadata.App()
+        app.id = 'org.fdroid.froid'
+        build = fdroidserver.metadata.Build()
+        build.commit = 'master'
+        build.forceversion = True
+        build.forcevercode = True
+        build.gradle = ['yes']
+        build.target = 'android-' + str(testint)
+        build.versionName = teststr
+        build.versionCode = testint
+
+        class FakeVcs():
+            # no need to change to the correct commit here
+            def gotorevision(self, rev, refresh=True):
+                pass
+
+            # no srclib info needed, but it could be added...
+            def getsrclib(self):
+                return None
+
+        fdroidserver.common.prepare_source(FakeVcs(), app, build,
+                                           fdroidclient_testdir, fdroidclient_testdir, fdroidclient_testdir)
+
+        with open(os.path.join(fdroidclient_testdir, 'build.gradle'), 'r') as f:
+            filedata = f.read()
+        self.assertIsNotNone(re.search(r"\s+compileSdkVersion %s\s+" % testint, filedata))
+
+        with open(os.path.join(fdroidclient_testdir, 'AndroidManifest.xml')) as f:
+            filedata = f.read()
+        self.assertIsNone(re.search('android:debuggable', filedata))
+        self.assertIsNotNone(re.search('android:versionName="%s"' % build.versionName, filedata))
+        self.assertIsNotNone(re.search('android:versionCode="%s"' % build.versionCode, filedata))
+
+    def test_prepare_sources_with_prebuild_subdir(self):
+        testdir = tempfile.mkdtemp(prefix=inspect.currentframe().f_code.co_name, dir=self.tmpdir)
+        app_build_dir = os.path.join(testdir, 'build', 'com.example')
+        shutil.copytree(os.path.join(self.basedir, 'source-files', 'fdroid', 'fdroidclient'),
+                        app_build_dir)
+
+        subdir = 'baz/bar'
+        subdir_path = os.path.join(app_build_dir, subdir)
+        os.makedirs(subdir_path)
+        with open(os.path.join(subdir_path, 'build.gradle'), 'w') as fp:
+            fp.write('// just a test placeholder')
+
+        config = dict()
+        fdroidserver.common.fill_config_defaults(config)
+        fdroidserver.common.config = config
+
+        srclibname = 'FakeSrcLib'
+        srclib_testdir = os.path.join(testdir, 'build', 'srclib')
+        os.makedirs(os.path.join(srclib_testdir, srclibname, 'testdirshouldexist'))
+        fdroidserver.metadata.srclibs = {
+            srclibname: {
+                'RepoType': 'git',
+                'Repo': 'https://example.com/foo/fakesrclib',
+                'Subdir': None,
+                'Prepare': None,
+            }
+        }
+
+        app = fdroidserver.metadata.App()
+        app.id = 'app.has.srclibs'
+        build = fdroidserver.metadata.Build()
+        build.commit = 'master'
+        build.gradle = ['yes']
+        build.prebuild = 'test -d $$FakeSrcLib$$/testdirshouldexist'  # actual test condition
+        build.srclibs = [srclibname + '@1.2.3']
+        build.subdir = subdir
+        build.versionCode = 0xcafe
+        build.versionName = 'vCAFE'
+
+        class FakeVcs():
+            # no need to change to the correct commit here
+            def gotorevision(self, rev, refresh=True):
+                pass
+
+            # no srclib info needed, but it could be added...
+            def getsrclib(self):
+                return None
+
+        fdroidserver.common.prepare_source(FakeVcs(), app, build,
+                                           app_build_dir, srclib_testdir, app_build_dir,
+                                           onserver=True, refresh=False)  # do not clone in this test
+
+    def test_prepare_sources_refresh(self):
+        packageName = 'org.fdroid.ci.test.app'
+        testdir = tempfile.mkdtemp(prefix=inspect.currentframe().f_code.co_name, dir=self.tmpdir)
+        print('testdir', testdir)
+        os.chdir(testdir)
+        os.mkdir('build')
+        os.mkdir('metadata')
+
+        # use a local copy if available to avoid hitting the network
+        tmprepo = os.path.join(self.basedir, 'tmp', 'importer')
+        if os.path.exists(tmprepo):
+            git_url = tmprepo
+        else:
+            git_url = 'https://gitlab.com/fdroid/ci-test-app.git'
+
+        metadata = dict()
+        metadata['Description'] = 'This is just a test app'
+        metadata['RepoType'] = 'git'
+        metadata['Repo'] = git_url
+        with open(os.path.join('metadata', packageName + '.yml'), 'w') as fp:
+            yaml.dump(metadata, fp)
+
+        gitrepo = os.path.join(testdir, 'build', packageName)
+        vcs0 = fdroidserver.common.getvcs('git', git_url, gitrepo)
+        vcs0.gotorevision('0.3', refresh=True)
+        vcs1 = fdroidserver.common.getvcs('git', git_url, gitrepo)
+        vcs1.gotorevision('0.3', refresh=False)
+
+    def test_fdroid_popen_stderr_redirect(self):
+        config = dict()
+        fdroidserver.common.fill_config_defaults(config)
+        fdroidserver.common.config = config
+
+        commands = ['sh', '-c', 'echo stdout message && echo stderr message 1>&2']
+
+        p = fdroidserver.common.FDroidPopen(commands)
+        self.assertEqual(p.output, 'stdout message\nstderr message\n')
+
+        p = fdroidserver.common.FDroidPopen(commands, stderr_to_stdout=False)
+        self.assertEqual(p.output, 'stdout message\n')
+
+    def test_signjar(self):
+        fdroidserver.common.config = None
+        config = fdroidserver.common.read_config(fdroidserver.common.options)
+        config['jarsigner'] = fdroidserver.common.find_sdk_tools_cmd('jarsigner')
+        fdroidserver.common.config = config
+        fdroidserver.signindex.config = config
+
+        sourcedir = os.path.join(self.basedir, 'signindex')
+        testsdir = tempfile.mkdtemp(prefix=inspect.currentframe().f_code.co_name, dir=self.tmpdir)
+        for f in ('testy.jar', 'guardianproject.jar',):
+            sourcefile = os.path.join(sourcedir, f)
+            testfile = os.path.join(testsdir, f)
+            shutil.copy(sourcefile, testsdir)
+            fdroidserver.signindex.sign_jar(testfile)
+            # these should be resigned, and therefore different
+            self.assertNotEqual(open(sourcefile, 'rb').read(), open(testfile, 'rb').read())
+
+    def test_verify_apk_signature(self):
+        fdroidserver.common.config = None
+        config = fdroidserver.common.read_config(fdroidserver.common.options)
+        config['jarsigner'] = fdroidserver.common.find_sdk_tools_cmd('jarsigner')
+        fdroidserver.common.config = config
+
+        self.assertTrue(fdroidserver.common.verify_apk_signature('bad-unicode-πÇÇ现代通用字-български-عربي1.apk'))
+        if 'apksigner' in fdroidserver.common.config:  # apksigner considers MD5 signatures valid
+            self.assertTrue(fdroidserver.common.verify_apk_signature('org.bitbucket.tickytacky.mirrormirror_1.apk'))
+            self.assertTrue(fdroidserver.common.verify_apk_signature('org.bitbucket.tickytacky.mirrormirror_2.apk'))
+            self.assertTrue(fdroidserver.common.verify_apk_signature('org.bitbucket.tickytacky.mirrormirror_3.apk'))
+            self.assertTrue(fdroidserver.common.verify_apk_signature('org.bitbucket.tickytacky.mirrormirror_4.apk'))
+        else:
+            self.assertFalse(fdroidserver.common.verify_apk_signature('org.bitbucket.tickytacky.mirrormirror_1.apk'))
+            self.assertFalse(fdroidserver.common.verify_apk_signature('org.bitbucket.tickytacky.mirrormirror_2.apk'))
+            self.assertFalse(fdroidserver.common.verify_apk_signature('org.bitbucket.tickytacky.mirrormirror_3.apk'))
+            self.assertFalse(fdroidserver.common.verify_apk_signature('org.bitbucket.tickytacky.mirrormirror_4.apk'))
+        self.assertTrue(fdroidserver.common.verify_apk_signature('org.dyndns.fules.ck_20.apk'))
+        self.assertTrue(fdroidserver.common.verify_apk_signature('urzip.apk'))
+        self.assertFalse(fdroidserver.common.verify_apk_signature('urzip-badcert.apk'))
+        self.assertFalse(fdroidserver.common.verify_apk_signature('urzip-badsig.apk'))
+        self.assertTrue(fdroidserver.common.verify_apk_signature('urzip-release.apk'))
+        self.assertFalse(fdroidserver.common.verify_apk_signature('urzip-release-unsigned.apk'))
+
+    def test_verify_old_apk_signature(self):
+        fdroidserver.common.config = None
+        config = fdroidserver.common.read_config(fdroidserver.common.options)
+        config['jarsigner'] = fdroidserver.common.find_sdk_tools_cmd('jarsigner')
+        fdroidserver.common.config = config
+
+        self.assertTrue(fdroidserver.common.verify_old_apk_signature('bad-unicode-πÇÇ现代通用字-български-عربي1.apk'))
+        self.assertTrue(fdroidserver.common.verify_old_apk_signature('org.bitbucket.tickytacky.mirrormirror_1.apk'))
+        self.assertTrue(fdroidserver.common.verify_old_apk_signature('org.bitbucket.tickytacky.mirrormirror_2.apk'))
+        self.assertTrue(fdroidserver.common.verify_old_apk_signature('org.bitbucket.tickytacky.mirrormirror_3.apk'))
+        self.assertTrue(fdroidserver.common.verify_old_apk_signature('org.bitbucket.tickytacky.mirrormirror_4.apk'))
+        self.assertTrue(fdroidserver.common.verify_old_apk_signature('org.dyndns.fules.ck_20.apk'))
+        self.assertTrue(fdroidserver.common.verify_old_apk_signature('urzip.apk'))
+        self.assertFalse(fdroidserver.common.verify_old_apk_signature('urzip-badcert.apk'))
+        self.assertFalse(fdroidserver.common.verify_old_apk_signature('urzip-badsig.apk'))
+        self.assertTrue(fdroidserver.common.verify_old_apk_signature('urzip-release.apk'))
+        self.assertFalse(fdroidserver.common.verify_old_apk_signature('urzip-release-unsigned.apk'))
+
+    def test_verify_jar_signature_succeeds(self):
+        fdroidserver.common.config = None
+        config = fdroidserver.common.read_config(fdroidserver.common.options)
+        config['jarsigner'] = fdroidserver.common.find_sdk_tools_cmd('jarsigner')
+        fdroidserver.common.config = config
+        source_dir = os.path.join(self.basedir, 'signindex')
+        for f in ('testy.jar', 'guardianproject.jar'):
+            testfile = os.path.join(source_dir, f)
+            fdroidserver.common.verify_jar_signature(testfile)
+
+    def test_verify_jar_signature_fails(self):
+        fdroidserver.common.config = None
+        config = fdroidserver.common.read_config(fdroidserver.common.options)
+        config['jarsigner'] = fdroidserver.common.find_sdk_tools_cmd('jarsigner')
+        fdroidserver.common.config = config
+        source_dir = os.path.join(self.basedir, 'signindex')
+        testfile = os.path.join(source_dir, 'unsigned.jar')
+        with self.assertRaises(fdroidserver.index.VerificationException):
+            fdroidserver.common.verify_jar_signature(testfile)
+
+    def test_verify_apks(self):
+        fdroidserver.common.config = None
+        config = fdroidserver.common.read_config(fdroidserver.common.options)
+        config['jarsigner'] = fdroidserver.common.find_sdk_tools_cmd('jarsigner')
+        fdroidserver.common.config = config
+
+        sourceapk = os.path.join(self.basedir, 'urzip.apk')
+
+        testdir = tempfile.mkdtemp(prefix=inspect.currentframe().f_code.co_name, dir=self.tmpdir)
+        print('testdir', testdir)
+
+        copyapk = os.path.join(testdir, 'urzip-copy.apk')
+        shutil.copy(sourceapk, copyapk)
+        self.assertTrue(fdroidserver.common.verify_apk_signature(copyapk))
+        self.assertIsNone(fdroidserver.common.verify_apks(sourceapk, copyapk, self.tmpdir))
+
+        unsignedapk = os.path.join(testdir, 'urzip-unsigned.apk')
+        with ZipFile(sourceapk, 'r') as apk:
+            with ZipFile(unsignedapk, 'w') as testapk:
+                for info in apk.infolist():
+                    if not info.filename.startswith('META-INF/'):
+                        testapk.writestr(info, apk.read(info.filename))
+        self.assertIsNone(fdroidserver.common.verify_apks(sourceapk, unsignedapk, self.tmpdir))
+
+        twosigapk = os.path.join(testdir, 'urzip-twosig.apk')
+        otherapk = ZipFile(os.path.join(self.basedir, 'urzip-release.apk'), 'r')
+        with ZipFile(sourceapk, 'r') as apk:
+            with ZipFile(twosigapk, 'w') as testapk:
+                for info in apk.infolist():
+                    testapk.writestr(info, apk.read(info.filename))
+                    if info.filename.startswith('META-INF/'):
+                        testapk.writestr(info, otherapk.read(info.filename))
+        otherapk.close()
+        self.assertFalse(fdroidserver.common.verify_apk_signature(twosigapk))
+        self.assertIsNone(fdroidserver.common.verify_apks(sourceapk, twosigapk, self.tmpdir))
+
+    def test_write_to_config(self):
+        with tempfile.TemporaryDirectory() as tmpPath:
+            cfgPath = os.path.join(tmpPath, 'config.py')
+            with open(cfgPath, 'w') as f:
+                f.write(textwrap.dedent("""\
+                    # abc
+                    # test = 'example value'
+                    default_me= '%%%'
+
+                    # comment
+                    do_not_touch = "good value"
+                    default_me="!!!"
+
+                    key="123"    # inline"""))
+
+            cfg = {'key': '111', 'default_me_orig': 'orig'}
+            fdroidserver.common.write_to_config(cfg, 'key', config_file=cfgPath)
+            fdroidserver.common.write_to_config(cfg, 'default_me', config_file=cfgPath)
+            fdroidserver.common.write_to_config(cfg, 'test', value='test value', config_file=cfgPath)
+            fdroidserver.common.write_to_config(cfg, 'new_key', value='new', config_file=cfgPath)
+
+            with open(cfgPath, 'r') as f:
+                self.assertEqual(f.read(), textwrap.dedent("""\
+                    # abc
+                    test = 'test value'
+                    default_me = 'orig'
+
+                    # comment
+                    do_not_touch = "good value"
+
+                    key = "111"    # inline
+
+                    new_key = "new"
+                    """))
+
+    def test_write_to_config_when_empty(self):
+        with tempfile.TemporaryDirectory() as tmpPath:
+            cfgPath = os.path.join(tmpPath, 'config.py')
+            with open(cfgPath, 'w') as f:
+                pass
+            fdroidserver.common.write_to_config({}, 'key', 'val', cfgPath)
+            with open(cfgPath, 'r') as f:
+                self.assertEqual(f.read(), textwrap.dedent("""\
+
+                key = "val"
+                """))
+
+    def test_apk_name_regex(self):
+        good = [
+            'urzipπÇÇπÇÇ现代汉语通用字българскиعربي1234ö_-123456.apk',
+            'urzipπÇÇπÇÇ现代汉语通用字българскиعربي1234ö_123456_abcdef0.apk',
+            'urzip_-123456.apk',
+            'a0_0.apk',
+            'Z0_0.apk',
+            'a0_0_abcdef0.apk',
+            'a_a_a_a_0_abcdef0.apk',
+            'a_____0.apk',
+            'a_____123456_abcdef0.apk',
+            'org.fdroid.fdroid_123456.apk',
+            # valid, but "_99999" is part of packageName rather than versionCode
+            'org.fdroid.fdroid_99999_123456.apk',
+            # should be valid, but I can't figure out the regex since \w includes digits
+            # 'πÇÇπÇÇ现代汉语通用字българскиعربي1234ö_0_123bafd.apk',
+        ]
+        for name in good:
+            m = fdroidserver.common.APK_NAME_REGEX.match(name)
+            self.assertIsNotNone(m)
+            self.assertIn(m.group(2), ('-123456', '0', '123456'))
+            self.assertIn(m.group(3), ('abcdef0', None))
+
+        bad = [
+            'urzipπÇÇπÇÇ现代汉语通用字българскиعربي1234ö_123456_abcdefg.apk',
+            'urzip-_-198274.apk',
+            'urzip-_0_123bafd.apk',
+            'no spaces allowed_123.apk',
+            '0_0.apk',
+            '0_0_abcdef0.apk',
+        ]
+        for name in bad:
+            self.assertIsNone(fdroidserver.common.APK_NAME_REGEX.match(name))
+
+    def test_standard_file_name_regex(self):
+        good = [
+            'urzipπÇÇπÇÇ现代汉语通用字българскиعربي1234ö_-123456.mp3',
+            'urzipπÇÇπÇÇ现代汉语通用字българскиعربي1234ö_123456.mov',
+            'Document_-123456.pdf',
+            'WTF_0.MOV',
+            'Z0_0.ebk',
+            'a_a_a_a_0.txt',
+            'org.fdroid.fdroid.privileged.ota_123456.zip',
+            'πÇÇπÇÇ现代汉语通用字българскиعربي1234ö_0.jpeg',
+            'a_____0.PNG',
+            # valid, but "_99999" is part of packageName rather than versionCode
+            'a_____99999_123456.zip',
+            'org.fdroid.fdroid_99999_123456.zip',
+        ]
+        for name in good:
+            m = fdroidserver.common.STANDARD_FILE_NAME_REGEX.match(name)
+            self.assertIsNotNone(m)
+            self.assertIn(m.group(2), ('-123456', '0', '123456'))
+
+        bad = [
+            'urzipπÇÇπÇÇ现代汉语通用字българскиعربي1234ö_abcdefg.JPEG',
+            'urzip-_-198274.zip',
+            'urzip-_123bafd.pdf',
+            'no spaces allowed_123.foobar',
+            'a_____0.',
+        ]
+        for name in bad:
+            self.assertIsNone(fdroidserver.common.STANDARD_FILE_NAME_REGEX.match(name))
+
+    def test_apk_signer_fingerprint(self):
+
+        # fingerprints fetched with: keytool -printcert -file ____.RSA
+        testapks = (('repo/obb.main.oldversion_1444412523.apk',
+                     '818e469465f96b704e27be2fee4c63ab9f83ddf30e7a34c7371a4728d83b0bc1'),
+                    ('repo/obb.main.twoversions_1101613.apk',
+                     '32a23624c201b949f085996ba5ed53d40f703aca4989476949cae891022e0ed6'),
+                    ('repo/obb.main.twoversions_1101617.apk',
+                     '32a23624c201b949f085996ba5ed53d40f703aca4989476949cae891022e0ed6'))
+
+        for apkfile, keytoolcertfingerprint in testapks:
+            self.assertEqual(keytoolcertfingerprint,
+                             fdroidserver.common.apk_signer_fingerprint(apkfile))
+
+    def test_apk_signer_fingerprint_short(self):
+
+        # fingerprints fetched with: keytool -printcert -file ____.RSA
+        testapks = (('repo/obb.main.oldversion_1444412523.apk', '818e469'),
+                    ('repo/obb.main.twoversions_1101613.apk', '32a2362'),
+                    ('repo/obb.main.twoversions_1101617.apk', '32a2362'))
+
+        for apkfile, keytoolcertfingerprint in testapks:
+            self.assertEqual(keytoolcertfingerprint,
+                             fdroidserver.common.apk_signer_fingerprint_short(apkfile))
+
+    def test_sign_apk(self):
+        fdroidserver.common.config = None
+        config = fdroidserver.common.read_config(fdroidserver.common.options)
+        try:
+            fdroidserver.common.find_sdk_tools_cmd('zipalign')
+        except fdroidserver.exception.FDroidException:
+            self.skipTest('SKIPPING test_sign_apk, zipalign not installed!')
+
+        config['jarsigner'] = fdroidserver.common.find_sdk_tools_cmd('jarsigner')
+        config['keyalias'] = 'sova'
+        config['keystorepass'] = 'r9aquRHYoI8+dYz6jKrLntQ5/NJNASFBacJh7Jv2BlI='
+        config['keypass'] = 'r9aquRHYoI8+dYz6jKrLntQ5/NJNASFBacJh7Jv2BlI='
+        config['keystore'] = os.path.join(self.basedir, 'keystore.jks')
+        fdroidserver.common.config = config
+        fdroidserver.signindex.config = config
+
+        testdir = tempfile.mkdtemp(prefix=inspect.currentframe().f_code.co_name, dir=self.tmpdir)
+        unsigned = os.path.join(testdir, 'urzip-release-unsigned.apk')
+        signed = os.path.join(testdir, 'urzip-release.apk')
+        shutil.copy(os.path.join(self.basedir, 'urzip-release-unsigned.apk'), testdir)
+
+        self.assertFalse(fdroidserver.common.verify_apk_signature(unsigned))
+
+        fdroidserver.common.sign_apk(unsigned, signed, config['keyalias'])
+        self.assertTrue(os.path.isfile(signed))
+        self.assertFalse(os.path.isfile(unsigned))
+        self.assertTrue(fdroidserver.common.verify_apk_signature(signed))
+
+        # now sign an APK with minSdkVersion >= 18
+        unsigned = os.path.join(testdir, 'duplicate.permisssions_9999999-unsigned.apk')
+        signed = os.path.join(testdir, 'duplicate.permisssions_9999999.apk')
+        shutil.copy(os.path.join(self.basedir, 'repo', 'duplicate.permisssions_9999999.apk'),
+                    os.path.join(unsigned))
+        fdroidserver.common.apk_strip_v1_signatures(unsigned, strip_manifest=True)
+        fdroidserver.common.sign_apk(unsigned, signed, config['keyalias'])
+        self.assertTrue(os.path.isfile(signed))
+        self.assertFalse(os.path.isfile(unsigned))
+        self.assertTrue(fdroidserver.common.verify_apk_signature(signed))
+        self.assertEqual('18', fdroidserver.common._get_androguard_APK(signed).get_min_sdk_version())
+
+    def test_sign_apk_targetsdk_30(self):
+        fdroidserver.common.config = None
+        config = fdroidserver.common.read_config(fdroidserver.common.options)
+        if not fdroidserver.common.find_apksigner():
+            self.skipTest('SKIPPING as apksigner is not installed!')
+        config['jarsigner'] = fdroidserver.common.find_sdk_tools_cmd('jarsigner')
+        config['keyalias'] = 'sova'
+        config['keystorepass'] = 'r9aquRHYoI8+dYz6jKrLntQ5/NJNASFBacJh7Jv2BlI='
+        config['keypass'] = 'r9aquRHYoI8+dYz6jKrLntQ5/NJNASFBacJh7Jv2BlI='
+        config['keystore'] = os.path.join(self.basedir, 'keystore.jks')
+        testdir = tempfile.mkdtemp(prefix=inspect.currentframe().f_code.co_name, dir=self.tmpdir)
+
+        shutil.copy(os.path.join(self.basedir, 'minimal_targetsdk_30_unsigned.apk'), testdir)
+        unsigned = os.path.join(testdir, 'minimal_targetsdk_30_unsigned.apk')
+        signed = os.path.join(testdir, 'minimal_targetsdk_30.apk')
+
+        self.assertFalse(fdroidserver.common.verify_apk_signature(unsigned))
+        fdroidserver.common.sign_apk(unsigned, signed, config['keyalias'])
+
+        self.assertTrue(os.path.isfile(signed))
+        self.assertFalse(os.path.isfile(unsigned))
+        self.assertTrue(fdroidserver.common.verify_apk_signature(signed))
+        # verify it has a v2 signature
+        self.assertTrue(fdroidserver.common._get_androguard_APK(signed).is_signed_v2())
+
+    def test_sign_no_targetsdk(self):
+        fdroidserver.common.config = None
+        config = fdroidserver.common.read_config(fdroidserver.common.options)
+        if not fdroidserver.common.find_apksigner():
+            self.skipTest('SKIPPING as apksigner is not installed!')
+        config['jarsigner'] = fdroidserver.common.find_sdk_tools_cmd('jarsigner')
+        config['keyalias'] = 'sova'
+        config['keystorepass'] = 'r9aquRHYoI8+dYz6jKrLntQ5/NJNASFBacJh7Jv2BlI='
+        config['keypass'] = 'r9aquRHYoI8+dYz6jKrLntQ5/NJNASFBacJh7Jv2BlI='
+        config['keystore'] = os.path.join(self.basedir, 'keystore.jks')
+        testdir = tempfile.mkdtemp(prefix=inspect.currentframe().f_code.co_name, dir=self.tmpdir)
+
+        shutil.copy(os.path.join(self.basedir, 'no_targetsdk_minsdk30_unsigned.apk'), testdir)
+        unsigned = os.path.join(testdir, 'no_targetsdk_minsdk30_unsigned.apk')
+        signed = os.path.join(testdir, 'no_targetsdk_minsdk30_signed.apk')
+
+        fdroidserver.common.sign_apk(unsigned, signed, config['keyalias'])
+        self.assertTrue(fdroidserver.common.verify_apk_signature(signed))
+        self.assertTrue(fdroidserver.common._get_androguard_APK(signed).is_signed_v2())
+
+        shutil.copy(os.path.join(self.basedir, 'no_targetsdk_minsdk1_unsigned.apk'), testdir)
+        unsigned = os.path.join(testdir, 'no_targetsdk_minsdk1_unsigned.apk')
+        signed = os.path.join(testdir, 'no_targetsdk_minsdk1_signed.apk')
+
+        self.assertFalse(fdroidserver.common.verify_apk_signature(unsigned))
+        fdroidserver.common.sign_apk(unsigned, signed, config['keyalias'])
+
+        self.assertTrue(os.path.isfile(signed))
+        self.assertFalse(os.path.isfile(unsigned))
+        self.assertTrue(fdroidserver.common.verify_apk_signature(signed))
+
+    def test_get_apk_id(self):
+        config = dict()
+        fdroidserver.common.fill_config_defaults(config)
+        fdroidserver.common.config = config
+        self._set_build_tools()
+        try:
+            config['aapt'] = fdroidserver.common.find_sdk_tools_cmd('aapt')
+        except fdroidserver.exception.FDroidException:
+            pass  # aapt is not required if androguard is present
+
+        testcases = [
+            ('repo/obb.main.twoversions_1101613.apk', 'obb.main.twoversions', '1101613', '0.1'),
+            ('org.bitbucket.tickytacky.mirrormirror_1.apk', 'org.bitbucket.tickytacky.mirrormirror', '1', '1.0'),
+            ('org.bitbucket.tickytacky.mirrormirror_2.apk', 'org.bitbucket.tickytacky.mirrormirror', '2', '1.0.1'),
+            ('org.bitbucket.tickytacky.mirrormirror_3.apk', 'org.bitbucket.tickytacky.mirrormirror', '3', '1.0.2'),
+            ('org.bitbucket.tickytacky.mirrormirror_4.apk', 'org.bitbucket.tickytacky.mirrormirror', '4', '1.0.3'),
+            ('org.dyndns.fules.ck_20.apk', 'org.dyndns.fules.ck', '20', 'v1.6pre2'),
+            ('urzip.apk', 'info.guardianproject.urzip', '100', '0.1'),
+            ('urzip-badcert.apk', 'info.guardianproject.urzip', '100', '0.1'),
+            ('urzip-badsig.apk', 'info.guardianproject.urzip', '100', '0.1'),
+            ('urzip-release.apk', 'info.guardianproject.urzip', '100', '0.1'),
+            ('urzip-release-unsigned.apk', 'info.guardianproject.urzip', '100', '0.1'),
+            ('repo/com.politedroid_3.apk', 'com.politedroid', '3', '1.2'),
+            ('repo/com.politedroid_4.apk', 'com.politedroid', '4', '1.3'),
+            ('repo/com.politedroid_5.apk', 'com.politedroid', '5', '1.4'),
+            ('repo/com.politedroid_6.apk', 'com.politedroid', '6', '1.5'),
+            ('repo/duplicate.permisssions_9999999.apk', 'duplicate.permisssions', '9999999', ''),
+            ('repo/info.zwanenburg.caffeinetile_4.apk', 'info.zwanenburg.caffeinetile', '4', '1.3'),
+            ('repo/obb.main.oldversion_1444412523.apk', 'obb.main.oldversion', '1444412523', '0.1'),
+            ('repo/obb.mainpatch.current_1619_another-release-key.apk', 'obb.mainpatch.current', '1619', '0.1'),
+            ('repo/obb.mainpatch.current_1619.apk', 'obb.mainpatch.current', '1619', '0.1'),
+            ('repo/obb.main.twoversions_1101613.apk', 'obb.main.twoversions', '1101613', '0.1'),
+            ('repo/obb.main.twoversions_1101615.apk', 'obb.main.twoversions', '1101615', '0.1'),
+            ('repo/obb.main.twoversions_1101617.apk', 'obb.main.twoversions', '1101617', '0.1'),
+            ('repo/urzip-; Рахма́, [rɐxˈmanʲɪnəf] سيرجي_رخمانينوف 谢·.apk', 'info.guardianproject.urzip', '100', '0.1'),
+        ]
+        for apkfilename, appid, versionCode, versionName in testcases:
+            a, vc, vn = fdroidserver.common.get_apk_id(apkfilename)
+            self.assertEqual(appid, a, 'androguard appid parsing failed for ' + apkfilename)
+            self.assertEqual(versionName, vn, 'androguard versionName parsing failed for ' + apkfilename)
+            self.assertEqual(versionCode, vc, 'androguard versionCode parsing failed for ' + apkfilename)
+            if 'aapt' in config:
+                a, vc, vn = fdroidserver.common.get_apk_id_aapt(apkfilename)
+                self.assertEqual(appid, a, 'aapt appid parsing failed for ' + apkfilename)
+                self.assertEqual(versionCode, vc, 'aapt versionCode parsing failed for ' + apkfilename)
+                self.assertEqual(versionName, vn, 'aapt versionName parsing failed for ' + apkfilename)
+
+        with self.assertRaises(FDroidException):
+            fdroidserver.common.get_apk_id('nope')
+
+    def test_get_apk_id_aapt_regex(self):
+        files = glob.glob(os.path.join(self.basedir, 'build-tools', '[1-9]*.*', '*.txt'))
+        self.assertNotEqual(0, len(files))
+        for f in files:
+            appid, versionCode = os.path.splitext(os.path.basename(f))[0][12:].split('_')
+            with open(f) as fp:
+                m = fdroidserver.common.APK_ID_TRIPLET_REGEX.match(fp.read())
+                if m:
+                    self.assertEqual(appid, m.group(1))
+                    self.assertEqual(versionCode, m.group(2))
+                else:
+                    self.fail('could not parse aapt output: {}'.format(f))
+
+    def test_get_native_code(self):
+        testcases = [
+            ('repo/obb.main.twoversions_1101613.apk', []),
+            ('org.bitbucket.tickytacky.mirrormirror_1.apk', []),
+            ('org.bitbucket.tickytacky.mirrormirror_2.apk', []),
+            ('org.bitbucket.tickytacky.mirrormirror_3.apk', []),
+            ('org.bitbucket.tickytacky.mirrormirror_4.apk', []),
+            ('org.dyndns.fules.ck_20.apk', ['arm64-v8a', 'armeabi', 'armeabi-v7a', 'mips', 'mips64', 'x86', 'x86_64']),
+            ('urzip.apk', []),
+            ('urzip-badcert.apk', []),
+            ('urzip-badsig.apk', []),
+            ('urzip-release.apk', []),
+            ('urzip-release-unsigned.apk', []),
+            ('repo/com.politedroid_3.apk', []),
+            ('repo/com.politedroid_4.apk', []),
+            ('repo/com.politedroid_5.apk', []),
+            ('repo/com.politedroid_6.apk', []),
+            ('repo/duplicate.permisssions_9999999.apk', []),
+            ('repo/info.zwanenburg.caffeinetile_4.apk', []),
+            ('repo/obb.main.oldversion_1444412523.apk', []),
+            ('repo/obb.mainpatch.current_1619_another-release-key.apk', []),
+            ('repo/obb.mainpatch.current_1619.apk', []),
+            ('repo/obb.main.twoversions_1101613.apk', []),
+            ('repo/obb.main.twoversions_1101615.apk', []),
+            ('repo/obb.main.twoversions_1101617.apk', []),
+            ('repo/urzip-; Рахма́, [rɐxˈmanʲɪnəf] سيرجي_رخمانينوف 谢·.apk', []),
+        ]
+        for apkfilename, native_code in testcases:
+            nc = fdroidserver.common.get_native_code(apkfilename)
+            self.assertEqual(native_code, nc)
+
+    def test_get_sdkversions_androguard(self):
+        """This is a sanity test that androguard isn't broken"""
+        def get_minSdkVersion(apkfile):
+            apk = fdroidserver.common._get_androguard_APK(apkfile)
+            return fdroidserver.common.get_min_sdk_version(apk)
+
+        def get_targetSdkVersion(apkfile):
+            apk = fdroidserver.common._get_androguard_APK(apkfile)
+            return apk.get_effective_target_sdk_version()
+
+        self.assertEqual(4, get_minSdkVersion('bad-unicode-πÇÇ现代通用字-български-عربي1.apk'))
+        self.assertEqual(14, get_minSdkVersion('org.bitbucket.tickytacky.mirrormirror_1.apk'))
+        self.assertEqual(14, get_minSdkVersion('org.bitbucket.tickytacky.mirrormirror_2.apk'))
+        self.assertEqual(14, get_minSdkVersion('org.bitbucket.tickytacky.mirrormirror_3.apk'))
+        self.assertEqual(14, get_minSdkVersion('org.bitbucket.tickytacky.mirrormirror_4.apk'))
+        self.assertEqual(7, get_minSdkVersion('org.dyndns.fules.ck_20.apk'))
+        self.assertEqual(4, get_minSdkVersion('urzip.apk'))
+        self.assertEqual(4, get_minSdkVersion('urzip-badcert.apk'))
+        self.assertEqual(4, get_minSdkVersion('urzip-badsig.apk'))
+        self.assertEqual(4, get_minSdkVersion('urzip-release.apk'))
+        self.assertEqual(4, get_minSdkVersion('urzip-release-unsigned.apk'))
+        self.assertEqual(3, get_minSdkVersion('repo/com.politedroid_3.apk'))
+        self.assertEqual(3, get_minSdkVersion('repo/com.politedroid_4.apk'))
+        self.assertEqual(3, get_minSdkVersion('repo/com.politedroid_5.apk'))
+        self.assertEqual(14, get_minSdkVersion('repo/com.politedroid_6.apk'))
+        self.assertEqual(4, get_minSdkVersion('repo/obb.main.oldversion_1444412523.apk'))
+        self.assertEqual(4, get_minSdkVersion('repo/obb.mainpatch.current_1619_another-release-key.apk'))
+        self.assertEqual(4, get_minSdkVersion('repo/obb.mainpatch.current_1619.apk'))
+        self.assertEqual(4, get_minSdkVersion('repo/obb.main.twoversions_1101613.apk'))
+        self.assertEqual(4, get_minSdkVersion('repo/obb.main.twoversions_1101615.apk'))
+        self.assertEqual(4, get_minSdkVersion('repo/obb.main.twoversions_1101617.apk'))
+        self.assertEqual(4, get_minSdkVersion('repo/urzip-; Рахма́, [rɐxˈmanʲɪnəf] سيرجي_رخمانينوف 谢·.apk'))
+
+        self.assertEqual(30, get_targetSdkVersion('minimal_targetsdk_30_unsigned.apk'))
+        self.assertEqual(1, get_targetSdkVersion('no_targetsdk_minsdk1_unsigned.apk'))
+        self.assertEqual(30, get_targetSdkVersion('no_targetsdk_minsdk30_unsigned.apk'))
+
+    def test_apk_release_name(self):
+        appid, vercode, sigfp = fdroidserver.common.apk_parse_release_filename('com.serwylo.lexica_905.apk')
+        self.assertEqual(appid, 'com.serwylo.lexica')
+        self.assertEqual(vercode, '905')
+        self.assertEqual(sigfp, None)
+
+        appid, vercode, sigfp = fdroidserver.common.apk_parse_release_filename('com.serwylo.lexica_905_c82e0f6.apk')
+        self.assertEqual(appid, 'com.serwylo.lexica')
+        self.assertEqual(vercode, '905')
+        self.assertEqual(sigfp, 'c82e0f6')
+
+        appid, vercode, sigfp = fdroidserver.common.apk_parse_release_filename('beverly_hills-90210.apk')
+        self.assertEqual(appid, None)
+        self.assertEqual(vercode, None)
+        self.assertEqual(sigfp, None)
+
+    def test_metadata_find_developer_signature(self):
+        sig = fdroidserver.common.metadata_find_developer_signature('org.smssecure.smssecure')
+        self.assertEqual('b30bb971af0d134866e158ec748fcd553df97c150f58b0a963190bbafbeb0868', sig)
+
+    def test_parse_xml(self):
+        manifest = os.path.join('source-files', 'fdroid', 'fdroidclient', 'AndroidManifest.xml')
+        parsed = fdroidserver.common.parse_xml(manifest)
+        self.assertIsNotNone(parsed)
+        self.assertEqual(str(type(parsed)), "<class 'xml.etree.ElementTree.Element'>")
+
+    def test_parse_androidmanifests(self):
+        app = fdroidserver.metadata.App()
+        app.id = 'org.fdroid.fdroid'
+        paths = [
+            os.path.join('source-files', 'fdroid', 'fdroidclient', 'AndroidManifest.xml'),
+            os.path.join('source-files', 'fdroid', 'fdroidclient', 'build.gradle'),
+        ]
+        for path in paths:
+            self.assertTrue(os.path.isfile(path))
+        self.assertEqual(('0.94-test', '940', 'org.fdroid.fdroid'),
+                         fdroidserver.common.parse_androidmanifests(paths, app))
+
+        app = fdroidserver.metadata.App()
+        app.AutoName = 'android-chat'
+        app.RepoType = 'git'
+        url = 'https://github.com/wildfirechat/android-chat.git'
+        app.SourceCode = url.rstrip('.git')
+        app.Repo = url
+        paths = [
+            os.path.join('source-files', 'cn.wildfirechat.chat', 'avenginekit', 'build.gradle'),
+            os.path.join('source-files', 'cn.wildfirechat.chat', 'build.gradle'),
+            os.path.join('source-files', 'cn.wildfirechat.chat', 'client', 'build.gradle'),
+            os.path.join('source-files', 'cn.wildfirechat.chat', 'client', 'src', 'main', 'AndroidManifest.xml'),
+            os.path.join('source-files', 'cn.wildfirechat.chat', 'emojilibrary', 'build.gradle'),
+            os.path.join('source-files', 'cn.wildfirechat.chat', 'gradle', 'build_libraries.gradle'),
+            os.path.join('source-files', 'cn.wildfirechat.chat', 'imagepicker', 'build.gradle'),
+            os.path.join('source-files', 'cn.wildfirechat.chat', 'mars-core-release', 'build.gradle'),
+            os.path.join('source-files', 'cn.wildfirechat.chat', 'push', 'build.gradle'),
+            os.path.join('source-files', 'cn.wildfirechat.chat', 'settings.gradle'),
+            os.path.join('source-files', 'cn.wildfirechat.chat', 'chat', 'build.gradle'),
+        ]
+        for path in paths:
+            self.assertTrue(os.path.isfile(path))
+        self.assertEqual(('0.6.9', '23', 'cn.wildfirechat.chat'),
+                         fdroidserver.common.parse_androidmanifests(paths, app))
+
+        app = fdroidserver.metadata.App()
+        app.Repo = 'https://github.com/Integreight/1Sheeld-Android-App'
+        paths = [
+            os.path.join('source-files', 'com.integreight.onesheeld', 'pagerIndicator', 'src', 'main', 'AndroidManifest.xml'),
+            os.path.join('source-files', 'com.integreight.onesheeld', 'pagerIndicator', 'build.gradle'),
+            os.path.join('source-files', 'com.integreight.onesheeld', 'oneSheeld', 'src', 'main', 'AndroidManifest.xml'),
+            os.path.join('source-files', 'com.integreight.onesheeld', 'oneSheeld', 'build.gradle'),
+            os.path.join('source-files', 'com.integreight.onesheeld', 'localeapi', 'src', 'main', 'AndroidManifest.xml'),
+            os.path.join('source-files', 'com.integreight.onesheeld', 'localeapi', 'build.gradle'),
+            os.path.join('source-files', 'com.integreight.onesheeld', 'build.gradle'),
+            os.path.join('source-files', 'com.integreight.onesheeld', 'settings.gradle'),
+            os.path.join('source-files', 'com.integreight.onesheeld', 'quickReturnHeader', 'src', 'main', 'AndroidManifest.xml'),
+            os.path.join('source-files', 'com.integreight.onesheeld', 'quickReturnHeader', 'build.gradle'),
+            os.path.join('source-files', 'com.integreight.onesheeld', 'pullToRefreshlibrary', 'src', 'main', 'AndroidManifest.xml'),
+            os.path.join('source-files', 'com.integreight.onesheeld', 'pullToRefreshlibrary', 'build.gradle'),
+        ]
+        for path in paths:
+            self.assertTrue(os.path.isfile(path))
+        self.assertEqual(('1.9.0', '170521', 'com.integreight.onesheeld'),
+                         fdroidserver.common.parse_androidmanifests(paths, app))
+
+    def test_parse_androidmanifests_ignore(self):
+        app = fdroidserver.metadata.App()
+        app.id = 'org.fdroid.fdroid'
+        app.UpdateCheckIgnore = '-test'
+        paths = [
+            os.path.join('source-files', 'fdroid', 'fdroidclient', 'AndroidManifest.xml'),
+            os.path.join('source-files', 'fdroid', 'fdroidclient', 'build.gradle'),
+        ]
+        for path in paths:
+            self.assertTrue(os.path.isfile(path))
+        self.assertEqual(('Ignore', None, 'org.fdroid.fdroid'),
+                         fdroidserver.common.parse_androidmanifests(paths, app))
+
+    def test_parse_androidmanifests_with_flavor(self):
+        app = fdroidserver.metadata.App()
+        build = fdroidserver.metadata.Build()
+        build.gradle = ['devVersion']
+        app.builds = [build]
+        app.id = 'org.fdroid.fdroid.dev'
+        paths = [
+            os.path.join('source-files', 'fdroid', 'fdroidclient', 'AndroidManifest.xml'),
+            os.path.join('source-files', 'fdroid', 'fdroidclient', 'build.gradle'),
+        ]
+        for path in paths:
+            self.assertTrue(os.path.isfile(path))
+        self.assertEqual(('0.95-dev', '949', 'org.fdroid.fdroid.dev'),
+                         fdroidserver.common.parse_androidmanifests(paths, app))
+
+        app = fdroidserver.metadata.App()
+        build = fdroidserver.metadata.Build()
+        build.gradle = ['free']
+        app.builds = [build]
+        app.id = 'eu.siacs.conversations'
+        paths = [
+            os.path.join('source-files', 'eu.siacs.conversations', 'build.gradle'),
+        ]
+        for path in paths:
+            self.assertTrue(os.path.isfile(path))
+        self.assertEqual(('1.23.1', '245', 'eu.siacs.conversations'),
+                         fdroidserver.common.parse_androidmanifests(paths, app))
+
+        app = fdroidserver.metadata.App()
+        build = fdroidserver.metadata.Build()
+        build.gradle = ['generic']
+        app.builds = [build]
+        app.id = 'com.nextcloud.client'
+        paths = [
+            os.path.join('source-files', 'com.nextcloud.client', 'build.gradle'),
+        ]
+        for path in paths:
+            self.assertTrue(os.path.isfile(path))
+        self.assertEqual(('2.0.0', '20000099', 'com.nextcloud.client'),
+                         fdroidserver.common.parse_androidmanifests(paths, app))
+
+        app = fdroidserver.metadata.App()
+        build = fdroidserver.metadata.Build()
+        build.gradle = ['versionDev']
+        app.builds = [build]
+        app.id = 'com.nextcloud.android.beta'
+        paths = [
+            os.path.join('source-files', 'com.nextcloud.client', 'build.gradle'),
+        ]
+        for path in paths:
+            self.assertTrue(os.path.isfile(path))
+        self.assertEqual(('20171223', '20171223', 'com.nextcloud.android.beta'),
+                         fdroidserver.common.parse_androidmanifests(paths, app))
+
+        app = fdroidserver.metadata.App()
+        build = fdroidserver.metadata.Build()
+        build.gradle = ['standard']
+        app.builds = [build]
+        app.id = 'at.bitfire.davdroid'
+        paths = [
+            os.path.join('source-files', 'at.bitfire.davdroid', 'build.gradle'),
+        ]
+        for path in paths:
+            self.assertTrue(os.path.isfile(path))
+        self.assertEqual(('1.9.8.1-ose', '197', 'at.bitfire.davdroid'),
+                         fdroidserver.common.parse_androidmanifests(paths, app))
+
+        app = fdroidserver.metadata.App()
+        build = fdroidserver.metadata.Build()
+        build.gradle = ['libre']
+        app.builds = [build]
+        app.id = 'com.kunzisoft.fdroidtest.applicationidsuffix.libre'
+        paths = [
+            os.path.join('source-files', 'com.kunzisoft.testcase', 'build.gradle'),
+        ]
+        for path in paths:
+            self.assertTrue(os.path.isfile(path))
+        self.assertEqual(('1.0-libre', '1', 'com.kunzisoft.fdroidtest.applicationidsuffix.libre'),
+                         fdroidserver.common.parse_androidmanifests(paths, app))
+
+        app = fdroidserver.metadata.App()
+        build = fdroidserver.metadata.Build()
+        build.gradle = ['pro']
+        app.builds = [build]
+        app.id = 'com.kunzisoft.fdroidtest.applicationidsuffix.pro'
+        paths = [
+            os.path.join('source-files', 'com.kunzisoft.testcase', 'build.gradle'),
+        ]
+        for path in paths:
+            self.assertTrue(os.path.isfile(path))
+        self.assertEqual(('20180430-pro', '20180430', 'com.kunzisoft.fdroidtest.applicationidsuffix.pro'),
+                         fdroidserver.common.parse_androidmanifests(paths, app))
+
+        app = fdroidserver.metadata.App()
+        build = fdroidserver.metadata.Build()
+        build.gradle = ['free']
+        app.builds = [build]
+        app.id = 'com.kunzisoft.fdroidtest.applicationidsuffix'
+        paths = [
+            os.path.join('source-files', 'com.kunzisoft.testcase', 'build.gradle'),
+        ]
+        for path in paths:
+            self.assertTrue(os.path.isfile(path))
+        self.assertEqual(('1.0-free', '1', 'com.kunzisoft.fdroidtest.applicationidsuffix'),
+                         fdroidserver.common.parse_androidmanifests(paths, app))
+
+        app = fdroidserver.metadata.App()
+        build = fdroidserver.metadata.Build()
+        build.gradle = ['underscore']
+        app.builds = [build]
+        app.id = 'com.kunzisoft.fdroidtest.applicationidsuffix.underscore'
+        paths = [
+            os.path.join('source-files', 'com.kunzisoft.testcase', 'build.gradle'),
+        ]
+        for path in paths:
+            self.assertTrue(os.path.isfile(path))
+        self.assertEqual(('20180430-underscore', '2018_04_30', 'com.kunzisoft.fdroidtest.applicationidsuffix.underscore'),
+                         fdroidserver.common.parse_androidmanifests(paths, app))
+
+    def test_get_all_gradle_and_manifests(self):
+        a = fdroidserver.common.get_all_gradle_and_manifests(os.path.join('source-files', 'cn.wildfirechat.chat'))
+        paths = [
+            os.path.join('source-files', 'cn.wildfirechat.chat', 'avenginekit', 'build.gradle'),
+            os.path.join('source-files', 'cn.wildfirechat.chat', 'build.gradle'),
+            os.path.join('source-files', 'cn.wildfirechat.chat', 'chat', 'build.gradle'),
+            os.path.join('source-files', 'cn.wildfirechat.chat', 'client', 'build.gradle'),
+            os.path.join('source-files', 'cn.wildfirechat.chat', 'client', 'src', 'main', 'AndroidManifest.xml'),
+            os.path.join('source-files', 'cn.wildfirechat.chat', 'emojilibrary', 'build.gradle'),
+            os.path.join('source-files', 'cn.wildfirechat.chat', 'gradle', 'build_libraries.gradle'),
+            os.path.join('source-files', 'cn.wildfirechat.chat', 'imagepicker', 'build.gradle'),
+            os.path.join('source-files', 'cn.wildfirechat.chat', 'mars-core-release', 'build.gradle'),
+            os.path.join('source-files', 'cn.wildfirechat.chat', 'push', 'build.gradle'),
+            os.path.join('source-files', 'cn.wildfirechat.chat', 'settings.gradle'),
+        ]
+        self.assertEqual(sorted(paths), sorted(a))
+
+    def test_get_gradle_subdir(self):
+        subdirs = {
+            'cn.wildfirechat.chat': 'chat',
+            'com.anpmech.launcher': 'app',
+            'org.tasks': 'app',
+            'ut.ewh.audiometrytest': 'app',
+        }
+        for f in ('cn.wildfirechat.chat', 'com.anpmech.launcher', 'org.tasks', 'ut.ewh.audiometrytest'):
+            build_dir = os.path.join('source-files', f)
+            paths = fdroidserver.common.get_all_gradle_and_manifests(build_dir)
+            logging.info(paths)
+            subdir = fdroidserver.common.get_gradle_subdir(build_dir, paths)
+            self.assertEqual(subdirs[f], subdir)
+
+    def test_parse_srclib_spec_good(self):
+        self.assertEqual(fdroidserver.common.parse_srclib_spec('osmand-external-skia@android/oreo'),
+                         ('osmand-external-skia', 'android/oreo', None, None))
+        self.assertEqual(fdroidserver.common.parse_srclib_spec('1:appcompat@v7'),
+                         ('appcompat', 'v7', '1', None))
+        self.assertEqual(fdroidserver.common.parse_srclib_spec('1:Support/v7/appcompat@android-4.4_r1.1'),
+                         ('Support', 'android-4.4_r1.1', '1', 'v7/appcompat'))
+
+    def test_parse_srclib_spec_bad(self):
+        with self.assertRaises(MetaDataException):
+            self.assertEqual(fdroidserver.common.parse_srclib_spec(None))
+        with self.assertRaises(MetaDataException):
+            self.assertEqual(fdroidserver.common.parse_srclib_spec('no-ref'))
+        with self.assertRaises(MetaDataException):
+            self.assertEqual(fdroidserver.common.parse_srclib_spec('@multi@at-signs@'))
+
+    def test_bad_urls(self):
+        for url in ('asdf',
+                    'file://thing.git',
+                    'https:///github.com/my/project',
+                    'git:///so/many/slashes',
+                    'ssh:/notabug.org/missing/a/slash',
+                    'git:notabug.org/missing/some/slashes',
+                    'https//github.com/bar/baz'):
+            with self.assertRaises(ValueError):
+                fdroidserver.common.get_app_from_url(url)
+
+    def test_remove_signing_keys(self):
+        testdir = tempfile.mkdtemp(prefix=inspect.currentframe().f_code.co_name, dir=self.tmpdir)
+        print(testdir)
+        shutil.copytree(os.path.join(self.basedir, 'source-files'),
+                        os.path.join(testdir, 'source-files'))
+        os.chdir(testdir)
+        with_signingConfigs = [
+            'source-files/com.seafile.seadroid2/app/build.gradle',
+            'source-files/eu.siacs.conversations/build.gradle',
+            'source-files/info.guardianproject.ripple/build.gradle',
+            'source-files/open-keychain/open-keychain/build.gradle',
+            'source-files/open-keychain/open-keychain/OpenKeychain/build.gradle',
+            'source-files/org.tasks/app/build.gradle.kts',
+            'source-files/osmandapp/osmand/build.gradle',
+            'source-files/ut.ewh.audiometrytest/app/build.gradle',
+        ]
+        for f in with_signingConfigs:
+            build_dir = os.path.join(*f.split(os.sep)[:2])
+            if not os.path.isdir(build_dir):
+                continue
+            fdroidserver.common.remove_signing_keys(build_dir)
+            fromfile = os.path.join(self.basedir, f)
+            with open(f) as fp:
+                content = fp.read()
+            if 'signingConfig' in content:
+                with open(f) as fp:
+                    b = fp.readlines()
+                with open(fromfile) as fp:
+                    a = fp.readlines()
+                diff = difflib.unified_diff(a, b, fromfile, f)
+                sys.stdout.writelines(diff)
+                self.assertFalse(True)
+        do_not_modify = [
+            'source-files/Zillode/syncthing-silk/build.gradle',
+            'source-files/at.bitfire.davdroid/build.gradle',
+            'source-files/com.kunzisoft.testcase/build.gradle',
+            'source-files/com.nextcloud.client/build.gradle',
+            'source-files/fdroid/fdroidclient/build.gradle',
+            'source-files/firebase-suspect/app/build.gradle',
+            'source-files/firebase-suspect/build.gradle',
+            'source-files/firebase-whitelisted/app/build.gradle',
+            'source-files/firebase-whitelisted/build.gradle',
+            'source-files/org.mozilla.rocket/app/build.gradle',
+            'source-files/realm/react-native/android/build.gradle',
+            'triple-t-2/build/org.piwigo.android/app/build.gradle',
+        ]
+        for f in do_not_modify:
+            build_dir = os.path.join(*f.split(os.sep)[:2])
+            if not os.path.isdir(build_dir):
+                continue
+            fdroidserver.common.remove_signing_keys(build_dir)
+            fromfile = os.path.join(self.basedir, f)
+            with open(fromfile) as fp:
+                a = fp.readlines()
+            with open(f) as fp:
+                b = fp.readlines()
+            diff = list(difflib.unified_diff(a, b, fromfile, f))
+            self.assertEqual(0, len(diff), 'This file should not have been modified:\n' + ''.join(diff))
+
+    def test_calculate_math_string(self):
+        self.assertEqual(1234,
+                         fdroidserver.common.calculate_math_string('1234'))
+        self.assertEqual((1 + 1) * 2,
+                         fdroidserver.common.calculate_math_string('(1 + 1) * 2'))
+        self.assertEqual((1 - 1) * 2 + 3 * 1 - 1,
+                         fdroidserver.common.calculate_math_string('(1 - 1) * 2 + 3 * 1 - 1'))
+        self.assertEqual(0 - 12345,
+                         fdroidserver.common.calculate_math_string('0 - 12345'))
+        self.assertEqual(0xffff,
+                         fdroidserver.common.calculate_math_string('0xffff'))
+        self.assertEqual(0xcafe * 123,
+                         fdroidserver.common.calculate_math_string('0xcafe * 123'))
+        self.assertEqual(-1,
+                         fdroidserver.common.calculate_math_string('-1'))
+        with self.assertRaises(SyntaxError):
+            fdroidserver.common.calculate_math_string('__import__("urllib")')
+        with self.assertRaises(SyntaxError):
+            fdroidserver.common.calculate_math_string('self')
+        with self.assertRaises(SyntaxError):
+            fdroidserver.common.calculate_math_string('Ox9()')
+        with self.assertRaises(SyntaxError):
+            fdroidserver.common.calculate_math_string('1+1; print(1)')
+        with self.assertRaises(SyntaxError):
+            fdroidserver.common.calculate_math_string('1-1 # no comment')
+
+    def test_deploy_build_log_with_rsync_with_id_file(self):
+
+        mocklogcontent = bytes(textwrap.dedent("""\
+            build started
+            building...
+            build completed
+            profit!"""), 'utf-8')
+
+        fdroidserver.common.options = mock.Mock()
+        fdroidserver.common.options.verbose = False
+        fdroidserver.common.options.quiet = False
+        fdroidserver.common.config = {}
+        fdroidserver.common.config['serverwebroot'] = [
+            'example.com:/var/www/fdroid/',
+            'example.com:/var/www/fbot/']
+        fdroidserver.common.config['deploy_process_logs'] = True
+        fdroidserver.common.config['identity_file'] = 'ssh/id_rsa'
+
+        assert_subprocess_call_iteration = 0
+
+        def assert_subprocess_call(cmd):
+            nonlocal assert_subprocess_call_iteration
+            logging.debug(cmd)
+            if assert_subprocess_call_iteration == 0:
+                self.assertListEqual(['rsync',
+                                      '--archive',
+                                      '--delete-after',
+                                      '--safe-links',
+                                      '-e',
+                                      'ssh -oBatchMode=yes -oIdentitiesOnly=yes -i ssh/id_rsa',
+                                      cmd[6],
+                                      'example.com:/var/www/fdroid/repo/'],
+                                     cmd)
+                self.assertTrue(cmd[6].endswith('/com.example.app_4711.log.gz'))
+                with gzip.open(cmd[6], 'r') as f:
+                    self.assertTrue(f.read(), mocklogcontent)
+            elif assert_subprocess_call_iteration == 1:
+                self.assertListEqual(['rsync',
+                                      '--archive',
+                                      '--delete-after',
+                                      '--safe-links',
+                                      '-e',
+                                      'ssh -oBatchMode=yes -oIdentitiesOnly=yes -i ssh/id_rsa',
+                                      cmd[6],
+                                      'example.com:/var/www/fbot/repo/'],
+                                     cmd)
+                self.assertTrue(cmd[6].endswith('/com.example.app_4711.log.gz'))
+                with gzip.open(cmd[6], 'r') as f:
+                    self.assertTrue(f.read(), mocklogcontent)
+            else:
+                self.fail('unexpected subprocess.call invocation ({})'
+                          .format(assert_subprocess_call_iteration))
+            assert_subprocess_call_iteration += 1
+            return 0
+
+        with mock.patch('subprocess.call',
+                        side_effect=assert_subprocess_call):
+            with tempfile.TemporaryDirectory() as tmpdir, TmpCwd(tmpdir):
+                fdroidserver.common.deploy_build_log_with_rsync(
+                    'com.example.app', '4711', mocklogcontent)
+
+                expected_log_path = os.path.join(tmpdir, 'repo', 'com.example.app_4711.log.gz')
+                self.assertTrue(os.path.isfile(expected_log_path))
+                with gzip.open(expected_log_path, 'r') as f:
+                    self.assertEqual(f.read(), mocklogcontent)
+
+    def test_deploy_status_json(self):
+        testdir = tempfile.mkdtemp(prefix=inspect.currentframe().f_code.co_name, dir=self.tmpdir)
+
+        fakesubcommand = 'fakesubcommand'
+        fake_timestamp = 1234567890
+        fakeserver = 'example.com:/var/www/fbot/'
+        expected_dir = os.path.join(testdir, fakeserver.replace(':', ''), 'repo', 'status')
+
+        fdroidserver.common.options = mock.Mock()
+        fdroidserver.common.config = {}
+        fdroidserver.common.config['serverwebroot'] = [fakeserver]
+        fdroidserver.common.config['identity_file'] = 'ssh/id_rsa'
+
+        def assert_subprocess_call(cmd):
+            dest_path = os.path.join(testdir, cmd[-1].replace(':', ''))
+            if not os.path.exists(dest_path):
+                os.makedirs(dest_path)
+            return subprocess.run(cmd[:-1] + [dest_path]).returncode
+
+        with mock.patch('subprocess.call', side_effect=assert_subprocess_call):
+            with mock.patch.object(sys, 'argv', ['fdroid ' + fakesubcommand]):
+                output = fdroidserver.common.setup_status_output(time.localtime(fake_timestamp))
+                self.assertFalse(os.path.exists(os.path.join(expected_dir, 'running.json')))
+                with mock.patch.object(sys, 'argv', ['fdroid ' + fakesubcommand]):
+                    fdroidserver.common.write_status_json(output)
+                self.assertFalse(os.path.exists(os.path.join(expected_dir, fakesubcommand + '.json')))
+
+                fdroidserver.common.config['deploy_process_logs'] = True
+
+                output = fdroidserver.common.setup_status_output(time.localtime(fake_timestamp))
+                expected_path = os.path.join(expected_dir, 'running.json')
+                self.assertTrue(os.path.isfile(expected_path))
+                with open(expected_path) as fp:
+                    data = json.load(fp)
+                self.assertEqual(fake_timestamp * 1000, data['startTimestamp'])
+                self.assertFalse('endTimestamp' in data)
+
+                testvalue = 'asdfasd'
+                output['testvalue'] = testvalue
+
+                fdroidserver.common.write_status_json(output)
+                expected_path = os.path.join(expected_dir, fakesubcommand + '.json')
+                self.assertTrue(os.path.isfile(expected_path))
+                with open(expected_path) as fp:
+                    data = json.load(fp)
+                self.assertEqual(fake_timestamp * 1000, data['startTimestamp'])
+                self.assertTrue('endTimestamp' in data)
+                self.assertEqual(testvalue, output.get('testvalue'))
+
+    def test_string_is_integer(self):
+        self.assertTrue(fdroidserver.common.string_is_integer('0x10'))
+        self.assertTrue(fdroidserver.common.string_is_integer('010'))
+        self.assertTrue(fdroidserver.common.string_is_integer('123'))
+        self.assertFalse(fdroidserver.common.string_is_integer('0xgg'))
+        self.assertFalse(fdroidserver.common.string_is_integer('01g'))
+        self.assertFalse(fdroidserver.common.string_is_integer('o123'))
+
+    def test_version_code_string_to_int(self):
+        self.assertEqual(16, fdroidserver.common.version_code_string_to_int('0x10'))
+        self.assertEqual(198712389, fdroidserver.common.version_code_string_to_int('198712389'))
+        self.assertEqual(8, fdroidserver.common.version_code_string_to_int('0o10'))
+        self.assertEqual(10, fdroidserver.common.version_code_string_to_int('010'))
+        self.assertEqual(123, fdroidserver.common.version_code_string_to_int('0000123'))
+        self.assertEqual(-42, fdroidserver.common.version_code_string_to_int('-42'))
+
+    def test_getsrclibvcs(self):
+        fdroidserver.metadata.srclibs = {'somelib': {'RepoType': 'git'},
+                                         'yeslib': {'RepoType': 'hg'},
+                                         'nolib': {'RepoType': 'git-svn'}}
+        self.assertEqual(fdroidserver.common.getsrclibvcs('somelib'), 'git')
+        self.assertEqual(fdroidserver.common.getsrclibvcs('yeslib'), 'hg')
+        self.assertEqual(fdroidserver.common.getsrclibvcs('nolib'), 'git-svn')
+        with self.assertRaises(VCSException):
+            fdroidserver.common.getsrclibvcs('nonexistentlib')
+
+    def test_getsrclib_not_found(self):
+        fdroidserver.common.config = {'sdk_path': '',
+                                      'java_paths': {}}
+        fdroidserver.metadata.srclibs = {}
+
+        with self.assertRaisesRegex(VCSException, 'srclib SDL not found.'):
+            fdroidserver.common.getsrclib('SDL@release-2.0.3', 'srclib')
+
+    def test_getsrclib_gotorevision_raw(self):
+        fdroidserver.common.config = {'sdk_path': '',
+                                      'java_paths': {}}
+        fdroidserver.metadata.srclibs = {'SDL': {'RepoType': 'git',
+                                                 'Repo': ''}}
+
+        vcs = mock.Mock()
+
+        with tempfile.TemporaryDirectory() as tmpdir, TmpCwd(tmpdir):
+            os.makedirs(os.path.join('srclib', 'SDL'))
+            with mock.patch('fdroidserver.common.getvcs', return_value=vcs):
+                ret = fdroidserver.common.getsrclib('SDL', 'srclib', raw=True)
+                self.assertEqual(vcs.srclib, ('SDL', None, 'srclib/SDL'))
+                self.assertEqual(ret, vcs)
+
+    def test_getsrclib_gotorevision_ref(self):
+        fdroidserver.common.config = {'sdk_path': '',
+                                      'java_paths': {}}
+        fdroidserver.metadata.srclibs = {'ACRA': {'RepoType': 'git',
+                                                  'Repo': 'https://github.com/ACRA/acra.git',
+                                                  'Subdir': None,
+                                                  'Prepare': None}}
+
+        vcs = mock.Mock()
+        skm = mock.Mock()
+        dfm = mock.Mock()
+
+        with tempfile.TemporaryDirectory() as tmpdir, TmpCwd(tmpdir):
+            os.makedirs(os.path.join('srclib', 'ACRA'))
+            with mock.patch('fdroidserver.common.getvcs', return_value=vcs):
+                with mock.patch('fdroidserver.common.remove_signing_keys', skm):
+                    with mock.patch('fdroidserver.common.remove_debuggable_flags', dfm):
+                        ret = fdroidserver.common.getsrclib('ACRA@acra-4.6.2', 'srclib')
+                        self.assertEqual(vcs.srclib, ('ACRA', None, 'srclib/ACRA'))
+                        vcs.gotorevision.assert_called_once_with('acra-4.6.2', True)
+                        skm.assert_called_once_with('srclib/ACRA')
+                        dfm.assert_called_once_with('srclib/ACRA')
+                        self.assertEqual(ret, ('ACRA', None, 'srclib/ACRA'))
+
+    def test_run_yamllint_wellformed(self):
+        try:
+            import yamllint.config
+            yamllint.config  # make pyflakes ignore this
+        except ImportError:
+            self.skipTest('yamllint not installed')
+        with tempfile.TemporaryDirectory() as tmpdir, TmpCwd(tmpdir):
+            with open('wellformed.yml', 'w') as f:
+                f.write(textwrap.dedent('''\
+                    yaml:
+                        file:
+                            - for
+                            - test
+                        purposeses: true
+                    '''))
+            result = fdroidserver.common.run_yamllint('wellformed.yml')
+            self.assertEqual(result, '')
+
+    def test_run_yamllint_malformed(self):
+        try:
+            import yamllint.config
+            yamllint.config  # make pyflakes ignore this
+        except ImportError:
+            self.skipTest('yamllint not installed')
+        with tempfile.TemporaryDirectory() as tmpdir, TmpCwd(tmpdir):
+            with open('malformed.yml', 'w') as f:
+                f.write(textwrap.dedent('''\
+                    yaml:
+                          - that
+                     fails
+                          - test
+                    '''))
+            result = fdroidserver.common.run_yamllint('malformed.yml')
+            self.assertIsNotNone(result)
+            self.assertNotEqual(result, '')
+
+    def test_with_no_config(self):
+        """It should set defaults if no config file is found"""
+        testdir = tempfile.mkdtemp(prefix=inspect.currentframe().f_code.co_name, dir=self.tmpdir)
+        os.chdir(testdir)
+        self.assertFalse(os.path.exists('config.yml'))
+        self.assertFalse(os.path.exists('config.py'))
+        config = fdroidserver.common.read_config(fdroidserver.common.options)
+        self.assertEqual(None, config.get('apksigner'))
+        self.assertIsNotNone(config.get('char_limits'))
+
+    def test_with_config_yml(self):
+        """Make sure it is possible to use config.yml alone."""
+        testdir = tempfile.mkdtemp(prefix=inspect.currentframe().f_code.co_name, dir=self.tmpdir)
+        os.chdir(testdir)
+        with open('config.yml', 'w') as fp:
+            fp.write('apksigner: yml')
+        self.assertTrue(os.path.exists('config.yml'))
+        self.assertFalse(os.path.exists('config.py'))
+        config = fdroidserver.common.read_config(fdroidserver.common.options)
+        self.assertEqual('yml', config.get('apksigner'))
+
+    def test_with_config_yml_with_env_var(self):
+        """Make sure it is possible to use config.yml alone."""
+        testdir = tempfile.mkdtemp(prefix=inspect.currentframe().f_code.co_name, dir=self.tmpdir)
+        os.chdir(testdir)
+        os.environ['SECRET'] = 'mysecretpassword'
+        with open('config.yml', 'w') as fp:
+            fp.write("""keypass: {'env': 'SECRET'}""")
+        self.assertTrue(os.path.exists('config.yml'))
+        self.assertFalse(os.path.exists('config.py'))
+        config = fdroidserver.common.read_config(fdroidserver.common.options)
+        self.assertEqual(os.getenv('SECRET', 'fail'), config.get('keypass'))
+
+    def test_with_config_py(self):
+        """Make sure it is still possible to use config.py alone."""
+        testdir = tempfile.mkdtemp(prefix=inspect.currentframe().f_code.co_name, dir=self.tmpdir)
+        os.chdir(testdir)
+        with open('config.py', 'w') as fp:
+            fp.write('apksigner = "py"')
+        self.assertFalse(os.path.exists('config.yml'))
+        self.assertTrue(os.path.exists('config.py'))
+        config = fdroidserver.common.read_config(fdroidserver.common.options)
+        self.assertEqual("py", config.get('apksigner'))
+
+    def test_config_perm_warning(self):
+        """Exercise the code path that issues a warning about unsafe permissions."""
+        testdir = tempfile.mkdtemp(prefix=inspect.currentframe().f_code.co_name, dir=self.tmpdir)
+        os.chdir(testdir)
+        with open('config.yml', 'w') as fp:
+            fp.write('keystore: foo.jks')
+        self.assertTrue(os.path.exists(fp.name))
+        os.chmod(fp.name, 0o666)
+        fdroidserver.common.read_config(fdroidserver.common.options)
+        os.remove(fp.name)
+        fdroidserver.common.config = None
+
+        with open('config.py', 'w') as fp:
+            fp.write('keystore = "foo.jks"')
+        self.assertTrue(os.path.exists(fp.name))
+        os.chmod(fp.name, 0o666)
+        fdroidserver.common.read_config(fdroidserver.common.options)
+
+    def test_with_both_config_yml_py(self):
+        """If config.yml and config.py are present, config.py should be ignored."""
+        testdir = tempfile.mkdtemp(prefix=inspect.currentframe().f_code.co_name, dir=self.tmpdir)
+        os.chdir(testdir)
+        with open('config.yml', 'w') as fp:
+            fp.write('apksigner: yml')
+        with open('config.py', 'w') as fp:
+            fp.write('apksigner = "py"')
+        self.assertTrue(os.path.exists('config.yml'))
+        self.assertTrue(os.path.exists('config.py'))
+        config = fdroidserver.common.read_config(fdroidserver.common.options)
+        self.assertEqual('yml', config.get('apksigner'))
+
+    def test_write_to_config_yml(self):
+        testdir = tempfile.mkdtemp(prefix=inspect.currentframe().f_code.co_name, dir=self.tmpdir)
+        os.chdir(testdir)
+        with open('config.yml', 'w') as fp:
+            fp.write('apksigner: yml')
+        self.assertTrue(os.path.exists(fp.name))
+        self.assertFalse(os.path.exists('config.py'))
+        config = fdroidserver.common.read_config(fdroidserver.common.options)
+        self.assertFalse('keypass' in config)
+        self.assertEqual('yml', config.get('apksigner'))
+        fdroidserver.common.write_to_config(config, 'keypass', 'mysecretpassword')
+        with open(fp.name) as fp:
+            print(fp.read())
+        fdroidserver.common.config = None
+        config = fdroidserver.common.read_config(fdroidserver.common.options)
+        self.assertEqual('mysecretpassword', config['keypass'])
+
+    def test_write_to_config_py(self):
+        testdir = tempfile.mkdtemp(prefix=inspect.currentframe().f_code.co_name, dir=self.tmpdir)
+        os.chdir(testdir)
+        with open('config.py', 'w') as fp:
+            fp.write('apksigner = "py"')
+        self.assertTrue(os.path.exists(fp.name))
+        self.assertFalse(os.path.exists('config.yml'))
+        config = fdroidserver.common.read_config(fdroidserver.common.options)
+        self.assertFalse('keypass' in config)
+        self.assertEqual('py', config.get('apksigner'))
+        fdroidserver.common.write_to_config(config, 'keypass', 'mysecretpassword')
+        fdroidserver.common.config = None
+        config = fdroidserver.common.read_config(fdroidserver.common.options)
+        self.assertEqual('mysecretpassword', config['keypass'])
+
+    def test_config_dict_with_int_keys(self):
+        testdir = tempfile.mkdtemp(prefix=inspect.currentframe().f_code.co_name, dir=self.tmpdir)
+        os.chdir(testdir)
+        with open('config.yml', 'w') as fp:
+            fp.write('java_paths:\n  8: /usr/lib/jvm/java-8-openjdk\n')
+        self.assertTrue(os.path.exists(fp.name))
+        self.assertFalse(os.path.exists('config.py'))
+        config = fdroidserver.common.read_config(fdroidserver.common.options)
+        self.assertEqual('/usr/lib/jvm/java-8-openjdk', config.get('java_paths', {}).get('8'))
+
+    def test_loading_config_buildserver_yml(self):
+        """Smoke check to make sure this file is properly parsed"""
+        testdir = tempfile.mkdtemp(prefix=inspect.currentframe().f_code.co_name, dir=self.tmpdir)
+        os.chdir(testdir)
+        shutil.copy(os.path.join(self.basedir, '..', 'buildserver', 'config.buildserver.yml'),
+                    'config.yml')
+        self.assertFalse(os.path.exists('config.py'))
+        fdroidserver.common.read_config(fdroidserver.common.options)
+
+
+if __name__ == "__main__":
+    os.chdir(os.path.dirname(__file__))
+
+    parser = optparse.OptionParser()
+    parser.add_option("-v", "--verbose", action="store_true", default=False,
+                      help="Spew out even more information than normal")
+    (fdroidserver.common.options, args) = parser.parse_args(['--verbose'])
+
+    newSuite = unittest.TestSuite()
+    newSuite.addTest(unittest.makeSuite(CommonTest))
+    unittest.main(failfast=False)
diff --git a/tests/complete-ci-tests b/tests/complete-ci-tests
new file mode 100755
index 00000000..75fe515e
--- /dev/null
+++ b/tests/complete-ci-tests
@@ -0,0 +1,76 @@
+#!/bin/bash
+#
+# this is the script run by the Jenkins and gitlab-ci continuous integration
+# build services.  It is a thorough set of tests that runs all the tests using
+# the various methods of installing/running fdroidserver.  It is separate from
+# ./tests/run-tests because its too heavy for manual use.
+
+if [ `dirname $0` != "." ]; then
+    echo "only run this script like ./`basename $0`"
+    exit 1
+fi
+
+set -e
+set -x
+
+if [ -z $WORKSPACE ]; then
+    WORKSPACE=`cd $(dirname $0)/.. && pwd`
+    echo "Setting Workspace to $WORKSPACE"
+fi
+
+if [ -z $ANDROID_HOME ]; then
+    if [ -e ~/.android/bashrc ]; then
+        . ~/.android/bashrc
+    else
+        echo "ANDROID_HOME must be set!"
+        exit 1
+    fi
+fi
+
+if ! which pyvenv; then
+    echo "pyvenv required to run this test suite!"
+    exit 1
+fi
+
+apksource=$1
+
+#------------------------------------------------------------------------------#
+# cache pypi downloads
+if [ -z $PIP_DOWNLOAD_CACHE ]; then
+    export PIP_DOWNLOAD_CACHE=$HOME/.pip_download_cache
+fi
+
+#------------------------------------------------------------------------------#
+# run local tests, don't scan fdroidserver/ project for APKs
+
+cd $WORKSPACE/tests
+./run-tests $apksource
+
+
+#------------------------------------------------------------------------------#
+# make sure that translations do not cause stacktraces
+cd $WORKSPACE/locale
+for locale in *; do
+    if [ ! -d $locale ]; then
+        continue
+    fi
+    for cmd in `sed -n 's/.*("\(.*\)", *_.*/\1/p' $WORKSPACE/fdroid`; do
+        LANGUAGE=$locale $WORKSPACE/fdroid $cmd --help > /dev/null
+    done
+done
+
+
+#------------------------------------------------------------------------------#
+# test install using install direct from git repo
+cd $WORKSPACE
+rm -rf $WORKSPACE/env
+pyvenv $WORKSPACE/env
+. $WORKSPACE/env/bin/activate
+pip3 install --quiet -e $WORKSPACE
+python3 setup.py compile_catalog install
+
+# make sure translation files were installed
+test -e $WORKSPACE/env/share/locale/de/LC_MESSAGES/fdroidserver.mo
+
+# run tests in new pip+pyvenv install
+fdroid=$WORKSPACE/env/bin/fdroid $WORKSPACE/tests/run-tests $apksource
diff --git a/tests/config.py b/tests/config.py
new file mode 100644
index 00000000..ead06f91
--- /dev/null
+++ b/tests/config.py
@@ -0,0 +1,36 @@
+
+repo_url = "https://MyFirstFDroidRepo.org/fdroid/repo"
+repo_name = "My First F-Droid Repo Demo"
+repo_icon = "fdroid-icon.png"
+repo_description = """
+This is a repository of apps to be used with F-Droid. Applications in this
+repository are either official binaries built by the original application
+developers, or are binaries built from source by the admin of f-droid.org
+using the tools on https://gitlab.com/u/fdroid.
+"""
+
+archive_older = 3
+archive_url = "https://f-droid.org/archive"
+archive_name = "My First F-Droid Archive Demo"
+archive_icon = "fdroid-icon.png"
+archive_description = """
+The repository of older versions of applications from the main demo repository.
+"""
+
+make_current_version_link = False
+
+repo_keyalias = "sova"
+keystore = "keystore.jks"
+keystorepass = "r9aquRHYoI8+dYz6jKrLntQ5/NJNASFBacJh7Jv2BlI="
+keypass = "r9aquRHYoI8+dYz6jKrLntQ5/NJNASFBacJh7Jv2BlI="
+keydname = "CN=sova, OU=F-Droid"
+
+mirrors = (
+    'http://foobarfoobarfoobar.onion/fdroid',
+    'https://foo.bar/fdroid',
+)
+
+update_stats = True
+
+install_list = 'org.adaway'
+uninstall_list = ('com.android.vending', 'com.facebook.orca', )
diff --git a/tests/config.yml b/tests/config.yml
deleted file mode 100644
index 75b1eadf..00000000
--- a/tests/config.yml
+++ /dev/null
@@ -1,29 +0,0 @@
----
-
-repo_url: https://MyFirstFDroidRepo.org/fdroid/repo
-repo_name: My First F-Droid Repo Demo
-repo_description: This is a repository of apps to be used with F-Droid. Applications in this repository are either official binaries built by the original application developers, or are binaries built from source by the admin of f-droid.org using the tools on https://gitlab.com/fdroid.
-
-archive_older: 3
-archive_url: https://f-droid.org/archive
-archive_name: My First F-Droid Archive Demo
-archive_description: The repository of older versions of applications from the main demo repository.
-
-make_current_version_link: false
-
-repo_keyalias: sova
-keystore: keystore.jks
-keystorepass: "r9aquRHYoI8+dYz6jKrLntQ5/NJNASFBacJh7Jv2BlI="
-keypass: "r9aquRHYoI8+dYz6jKrLntQ5/NJNASFBacJh7Jv2BlI="
-keydname: "CN=sova, OU=F-Droid"
-
-mirrors:
-  - http://foobarfoobarfoobar.onion/fdroid
-  - https://foo.bar/fdroid
-
-install_list: org.adaway
-uninstall_list: ['com.android.vending', 'com.facebook.orca']
-
-repo_key_sha256: f49af3f11efddf20dffd70f5e3117b9976674167adca280e6b1932a0601b26f6
-
-gpgkey: F9A6B8DF7566FCAB173AAB3516D6C4D3CE71F7FB
diff --git a/tests/config/antiFeatures.yml b/tests/config/antiFeatures.yml
deleted file mode 100644
index cb4dc676..00000000
--- a/tests/config/antiFeatures.yml
+++ /dev/null
@@ -1,41 +0,0 @@
-Ads:
-  description: This app contains advertising
-  icon: ic_antifeature_ads.xml
-  name: Ads
-DisabledAlgorithm:
-  description: This app has a weak security signature
-  icon: ic_antifeature_disabledalgorithm.xml
-  name: Signed Using An Unsafe Algorithm
-KnownVuln:
-  description: This app contains a known security vulnerability
-  icon: ic_antifeature_knownvuln.xml
-  name: Known Vulnerability
-NSFW:
-  description: This app contains content that should not be publicized or visible
-    everywhere
-  icon: ic_antifeature_nsfw.xml
-  name: NSFW
-NoSourceSince:
-  description: The source code is no longer available, no updates possible.
-  icon: ic_antifeature_nosourcesince.xml
-  name: Newer Source Not Available
-NonFreeAdd:
-  description: This app promotes non-free add-ons
-  icon: ic_antifeature_nonfreeadd.xml
-  name: Non-Free Addons
-NonFreeAssets:
-  description: This app contains non-free assets
-  icon: ic_antifeature_nonfreeassets.xml
-  name: Non-Free Assets
-NonFreeDep:
-  description: This app depends on other non-free apps
-  icon: ic_antifeature_nonfreedep.xml
-  name: Non-Free Dependencies
-NonFreeNet:
-  description: This app promotes or depends entirely on a non-changeable or non-free network service
-  icon: ic_antifeature_nonfreenet.xml
-  name: Non-Free Network Services
-Tracking:
-  description: This app tracks and reports your activity
-  icon: ic_antifeature_tracking.xml
-  name: Tracking
diff --git a/tests/config/categories.yml b/tests/config/categories.yml
deleted file mode 100644
index e294ced6..00000000
--- a/tests/config/categories.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-Time:
-  name: Time
-Development:
-  name: Development
-GuardianProject:
-  name: Guardian Project
-Multimedia:
-  name: Multimedia
-Phone & SMS:
-  name: Phone & SMS
-Security:
-  name: Security
-System:
-  name: System
diff --git a/tests/config/de/antiFeatures.yml b/tests/config/de/antiFeatures.yml
deleted file mode 100644
index 65111db1..00000000
--- a/tests/config/de/antiFeatures.yml
+++ /dev/null
@@ -1,40 +0,0 @@
-Ads:
-  description: Diese App enthält Werbung
-  icon: ic_antifeature_ads.xml
-  name: Werbung
-DisabledAlgorithm:
-  description: Diese App hat eine schwache Sicherheitssignatur
-  icon: ic_antifeature_disabledalgorithm.xml
-  name: Mit einem unsicheren Algorithmus signiert
-KnownVuln:
-  description: Diese App enthält eine bekannte Sicherheitslücke
-  icon: ic_antifeature_knownvuln.xml
-  name: Bekannte Sicherheitslücke
-NSFW:
-  description: Diese App enthält Inhalte, die nicht überall veröffentlicht oder sichtbar
-    sein sollten
-  icon: ic_antifeature_nsfw.xml
-  name: NSFW
-NoSourceSince:
-  icon: ic_antifeature_nosourcesince.xml
-  name: Der Quellcode ist nicht mehr erhältlich, keine Aktualisierungen möglich.
-NonFreeAdd:
-  description: Diese App bewirbt nicht-quelloffene Erweiterungen
-  icon: ic_antifeature_nonfreeadd.xml
-  name: Nicht-quelloffene Erweiterungen
-NonFreeAssets:
-  description: Diese App enthält nicht-quelloffene Bestandteile
-  icon: ic_antifeature_nonfreeassets.xml
-  name: Nicht-quelloffene Bestandteile
-NonFreeDep:
-  description: Diese App ist abhängig von anderen nicht-quelloffenen Apps
-  icon: ic_antifeature_nonfreedep.xml
-  name: Nicht-quelloffene Abhängigkeiten
-NonFreeNet:
-  description: Diese App bewirbt nicht-quelloffene Netzwerkdienste
-  icon: ic_antifeature_nonfreenet.xml
-  name: Nicht-quelloffene Netzwerkdienste
-Tracking:
-  description: Diese App verfolgt und versendet Ihre Aktivitäten
-  icon: ic_antifeature_tracking.xml
-  name: Tracking
diff --git a/tests/config/fa/antiFeatures.yml b/tests/config/fa/antiFeatures.yml
deleted file mode 100644
index aa8290ef..00000000
--- a/tests/config/fa/antiFeatures.yml
+++ /dev/null
@@ -1,39 +0,0 @@
-Ads:
-  description: این کاره دارای تبلیغات است
-  icon: ic_antifeature_ads.xml
-  name: تبلیغات
-DisabledAlgorithm:
-  description: این کاره، امضای امنیتی ضعیفی دارد
-  icon: ic_antifeature_disabledalgorithm.xml
-  name: امضا شده با الگوریتمی ناامن
-KnownVuln:
-  description: این کاره، آسیب‌پذیری امنیتی شناخته‌شده‌ای دارد
-  icon: ic_antifeature_knownvuln.xml
-  name: آسیب‌پذیری شناخته
-NSFW:
-  description: این کاره محتوایی دارد که نباید عمومی شده یا همه‌حا نمایان باشد
-  icon: ic_antifeature_nsfw.xml
-  name: NSFW
-NoSourceSince:
-  icon: ic_antifeature_nosourcesince.xml
-  name: کد مبدأ دیگر در دسترس نیست. به‌روز رسانی ناممکن است.
-NonFreeAdd:
-  description: این کاره، افزونه‌های ناآزاد را تبلیغ می‌کند
-  icon: ic_antifeature_nonfreeadd.xml
-  name: افزونه‌های ناآزاد
-NonFreeAssets:
-  description: این کاره دارای بخش‌های ناآزاد است
-  icon: ic_antifeature_nonfreeassets.xml
-  name: بخش‌های ناآزاد
-NonFreeDep:
-  description: این کاره به دیگر کاره‌های ناآزاد وابسته است
-  icon: ic_antifeature_nonfreedep.xml
-  name: وابستگی‌های ناآزاد
-NonFreeNet:
-  description: این کاره، خدمات شبکه‌های ناآزاد را ترویج می‌کند
-  icon: ic_antifeature_nonfreenet.xml
-  name: خدمات شبکه‌ای ناآزاد
-Tracking:
-  description: این کاره، فعّالیتتان را ردیابی و گزارش می‌کند
-  icon: ic_antifeature_tracking.xml
-  name: ردیابی
diff --git a/tests/config/ic_antifeature_ads.xml b/tests/config/ic_antifeature_ads.xml
deleted file mode 100644
index 99eb6f5e..00000000
--- a/tests/config/ic_antifeature_ads.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<vector xmlns:tools="http://schemas.android.com/tools"
-    android:height="24dp"
-    android:viewportHeight="48"
-    android:tint="?attr/colorControlNormal"
-    android:viewportWidth="48"
-    android:width="24dp"
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    tools:ignore="VectorRaster">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M32.56,11.19a3,3 0,0 0,-3.07 0.44h0a44.91,44.91 0,0 1,-13.55 8.07,2.67 2.67,0 0,0 -2.51,-2.08H8.76a2.84,2.84 0,0 0,-2.64 3.06v6A3.08,3.08 0,0 0,7.66 29.5c0.28,7 2.5,11.65 4.05,12.8a2.65,2.65 0,0 0,1.61 0.47,7.75 7.75,0 0,0 3.17,-0.89c1.55,-0.79 2.33,-1.67 2.32,-2.64A6.52,6.52 0,0 0,18 36.92,25 25,0 0,1 16.5,33a14.59,14.59 0,0 1,-0.44 -4.38,1.28 1.28,0 0,0 0,-0.37c2.13,0.41 7,1.91 13.44,7.49a3.13,3.13 0,0 0,2 0.73,2.63 2.63,0 0,0 1.1,-0.24c0.62,-0.28 1.66,-1.08 1.66,-3.19V14.34A3.13,3.13 0,0 0,32.56 11.19ZM8.71,20.69a0.78,0.78 0,0 1,0.13 -0.47h4.5a0.78,0.78 0,0 1,0.13 0.47v6a0.78,0.78 0,0 1,-0.13 0.47H8.85a0.78,0.78 0,0 1,-0.13 -0.47ZM16.13,39.1a5.6,5.6 0,0 1,-2.92 1.09c-0.63,-0.58 -2.62,-4.2 -2.94,-10.41h3.18A17.66,17.66 0,0 0,14 33.62,27.5 27.5,0 0,0 15.65,38C15.82,38.36 16,38.8 16.13,39.1ZM31.63,33a1.67,1.67 0,0 1,-0.14 0.83,0.47 0.47,0 0,1 -0.31,-0.09C24,27.52 18.51,26 16.07,25.6V22.37c2.44,-0.64 8.75,-3.41 15.09,-8.75h0a0.42,0.42 0,0 1,0.3 -0.07s0.16,0.24 0.16,0.8Z" />
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M40.86,13.17 L44,6.11a1.3,1.3 0,0 0,-2.37 -1l-4.72,10.7h5.27l-3.62,7A1.3,1.3 0,1 0,40.83 24l5.56,-10.82Z" />
-</vector>
diff --git a/tests/config/ic_antifeature_disabledalgorithm.xml b/tests/config/ic_antifeature_disabledalgorithm.xml
deleted file mode 100644
index 0b231666..00000000
--- a/tests/config/ic_antifeature_disabledalgorithm.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<vector xmlns:tools="http://schemas.android.com/tools"
-    android:height="24dp"
-    android:viewportHeight="48"
-    android:tint="?attr/colorControlNormal"
-    android:viewportWidth="48"
-    android:width="24dp"
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    tools:ignore="VectorRaster">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M36.24,30.79l-2.18,-2.33A10,10 0,0 0,30.4 26a9.64,9.64 0,0 0,-1.28 -2.77A1.3,1.3 0,1 0,27 24.63a7.38,7.38 0,0 1,0.42 0.73,6.59 6.59,0 0,0 -4.63,1.71 6.51,6.51 0,0 0,-2 4.22,7.7 7.7,0 0,1 -1.48,-1.21l-2.18,-2.33A7.76,7.76 0,0 1,16 26.16,6.37 6.37,0 0,0 22.36,20a7.38,7.38 0,0 1,0.69 0.46,1.3 1.3,0 1,0 1.59,-2.05A9.65,9.65 0,0 0,22 16.92a10,10 0,0 0,-2.25 -3.83l-2.18,-2.33C14.26,7.24 9.18,6.62 6.23,9.37a6.74,6.74 0,0 0,-2 5.53,9.63 9.63,0 0,0 2.64,5.84L9,23.07a9.94,9.94 0,0 0,3.91 2.59,10.05 10.05,0 0,0 2.26,3.84l2.18,2.33A10,10 0,0 0,21 34.34a10,10 0,0 0,2.33 4.1l2.18,2.33a9.4,9.4 0,0 0,6.75 3.11,6.58 6.58,0 0,0 4.55,-1.72 6.74,6.74 0,0 0,2 -5.53A9.63,9.63 0,0 0,36.24 30.79ZM19.77,19.11a4.2,4.2 0,0 1,-1.22 3.46,4.18 4.18,0 0,1 -3.42,1s0,0 0,-0.06A4.2,4.2 0,0 1,16.35 20a4.2,4.2 0,0 1,3.41 -1S19.77,19.09 19.77,19.11ZM8.73,19a7,7 0,0 1,-2 -4.25A4.2,4.2 0,0 1,8 11.26a4,4 0,0 1,2.8 -1,6.84 6.84,0 0,1 4.85,2.3l2.18,2.33a7.7,7.7 0,0 1,1.11 1.57,6.4 6.4,0 0,0 -6.39,6.19 7.69,7.69 0,0 1,-1.63 -1.31ZM24.52,29a4.23,4.23 0,0 1,3.59 -1,3.94 3.94,0 0,1 -4.81,4.31A4.17,4.17 0,0 1,24.52 29ZM35.07,40.3C33.17,42 29.74,41.48 27.43,39l-2.18,-2.33a7.68,7.68 0,0 1,-1.2 -1.73h0.06A6.39,6.39 0,0 0,30.68 29a7.7,7.7 0,0 1,1.49 1.22l2.18,2.33a7,7 0,0 1,2 4.25A4.2,4.2 0,0 1,35.07 40.26Z" />
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M41.09,19.1a1.59,1.59 0,0 0,-1.87 -1.21l-4.57,1a1.54,1.54 0,0 0,-0.57 0.24h0a1.58,1.58 0,0 0,1.27 2.83l4.57,-1A1.55,1.55 0,0 0,41.09 19.1Z" />
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M33.93,16.3l0.06,-0.05 3.48,-3.1a1.58,1.58 0,0 0,-2 -2.41l-0.06,0.05 -3.48,3.1a1.58,1.58 0,0 0,2 2.41Z" />
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M27.14,14.49A1.54,1.54 0,0 0,29 13.34h0l1,-4.56a1.59,1.59 0,0 0,-1.15 -1.91,1.55 1.55,0 0,0 -1.49,0.4h0A1.54,1.54 0,0 0,27 8l-1,4.56A1.59,1.59 0,0 0,27.14 14.49Z" />
-</vector>
diff --git a/tests/config/ic_antifeature_knownvuln.xml b/tests/config/ic_antifeature_knownvuln.xml
deleted file mode 100644
index cfa81345..00000000
--- a/tests/config/ic_antifeature_knownvuln.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<vector xmlns:tools="http://schemas.android.com/tools"
-    android:height="24dp"
-    android:viewportHeight="48"
-    android:tint="?attr/colorControlNormal"
-    android:viewportWidth="48"
-    android:width="24dp"
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    tools:ignore="VectorRaster">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M37.55,32.13a1.27,1.27 0,0 0,-0.43 0v-1.5h7.94a1.3,1.3 0,0 0,0 -2.59L37.12,28.04L37.12,26.71a1.24,1.24 0,0 0,0.18 0l0.25,0c3.44,-0.67 7.38,-5 8.61,-9.4a1.3,1.3 0,1 0,-2.5 -0.7c-1,3.7 -4.35,7.06 -6.55,7.53L37.11,20.58a1.3,1.3 0,0 0,-1.3 -1.3L33.54,19.28c0,-1.14 0,-3.88 0,-5a9.24,9.24 0,0 0,-18.47 0,1.3 1.3,0 1,0 2.59,0 6.64,6.64 0,0 1,13.29 0c0,1.08 0,3.81 0,5L13.14,19.28a1.3,1.3 0,0 0,-1.3 1.3v3.57c-2.2,-0.49 -5.51,-3.84 -6.53,-7.53a1.3,1.3 0,1 0,-2.5 0.7C4,21.75 8,26.06 11.43,26.72l0.25,0a1.24,1.24 0,0 0,0.17 0L11.85,28L3.65,28a1.3,1.3 0,1 0,0 2.59h8.2v1.5a1.26,1.26 0,0 0,-0.42 0c-3.44,0.67 -7.38,5 -8.61,9.4a1.3,1.3 0,1 0,2.5 0.7c1,-3.69 4.33,-7 6.53,-7.53v2.84a1.3,1.3 0,0 0,1.3 1.3L35.82,38.8a1.3,1.3 0,0 0,1.3 -1.3L37.12,34.69c2.2,0.48 5.52,3.83 6.55,7.53a1.3,1.3 0,1 0,2.5 -0.7C44.93,37.1 41,32.79 37.55,32.13ZM34.55,36.24L14.44,36.24L14.44,21.88L34.52,21.88Z" />
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M24.5,28.82m-2.44,0a2.44,2.44 0,1 1,4.88 0a2.44,2.44 0,1 1,-4.88 0" />
-</vector>
diff --git a/tests/config/ic_antifeature_nonfreeadd.xml b/tests/config/ic_antifeature_nonfreeadd.xml
deleted file mode 100644
index adca82ca..00000000
--- a/tests/config/ic_antifeature_nonfreeadd.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<vector android:height="24dp"
-    android:viewportHeight="48"
-    android:tint="?attr/colorControlNormal"
-    android:viewportWidth="48"
-    android:width="24dp"
-    xmlns:android="http://schemas.android.com/apk/res/android">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M32.83,26.35H29.65a2.68,2.68 0,0 0,-3 -2.27h-0.18c-2.4,0 -3.35,1.82 -3.43,4.5s1.54,4.54 3.43,4.5a2.73,2.73 0,0 0,3 -2.44h3.56c-0.59,3.34 -3,5.29 -6.53,5.3 -3.94,0 -6.8,-3.29 -6.8,-7.36 0,-4.34 2.85,-7.36 6.8,-7.36H27c2.46,0 5.81,1.77 5.81,5.13Z" />
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M16.28,23.15h0A1.87,1.87 0,0 1,18.14 25h0a1.87,1.87 0,0 1,-1.86 1.87h0A1.87,1.87 0,0 1,14.42 25h0A1.87,1.87 0,0 1,16.28 23.15Z" />
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M16.28,29.7h0a1.87,1.87 0,0 1,1.86 1.87h0a1.87,1.87 0,0 1,-1.86 1.87h0a1.87,1.87 0,0 1,-1.86 -1.87h0A1.87,1.87 0,0 1,16.28 29.7Z" />
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M11,41.81a1.5,1.5 0,0 1,-1.5 -1.5L9.5,16.24a1.5,1.5 0,0 1,1.5 -1.5h8.71l0,-0.82A4.54,4.54 0,0 1,17.9 10.6,3.62 3.62,0 0,1 19,8a7,7 0,0 1,5.08 -1.81c5.65,0 6.35,3.1 6.38,4.42A4.61,4.61 0,0 1,28.76 14v0.79h8.19a1.5,1.5 0,0 1,1.5 1.49l0,7.6a1.3,1.3 0,0 1,-1.29 1.3h0a1.3,1.3 0,0 1,-1.3 -1.29l0,-6.51h-8.4a1.3,1.3 0,0 1,-1.3 -1.3v-2.7a1.3,1.3 0,0 1,0.55 -1.06c0.49,-0.35 1.17,-1.1 1.15,-1.59 0,-1.25 -1.32,-1.89 -3.8,-1.9a4.62,4.62 0,0 0,-3.22 1,1.08 1.08,0 0,0 -0.36,0.73c0,0.88 1.09,1.55 1.1,1.55a1.3,1.3 0,0 1,0.65 1.05L22.4,16a1.3,1.3 0,0 1,-1.29 1.37h-9L12.11,39.21l23.74,0c0,-0.33 0,-0.74 0,-1.21 0,-1.43 0,-3.4 0,-5.17a1.3,1.3 0,0 1,1.29 -1.3h0a1.3,1.3 0,0 1,1.3 1.29c0,1.79 0,3.77 0,5.21 0,0.72 0,1.3 0,1.67 0,0.07 0,0.32 0,0.55 -0.11,1.45 -1.09,1.56 -1.39,1.56l-26,0ZM11,39.22h0ZM37,39.22h0Z" />
-</vector>
diff --git a/tests/config/ic_antifeature_nonfreeassets.xml b/tests/config/ic_antifeature_nonfreeassets.xml
deleted file mode 100644
index 20619b4e..00000000
--- a/tests/config/ic_antifeature_nonfreeassets.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<vector android:height="24dp"
-    android:viewportHeight="48"
-    android:tint="?attr/colorControlNormal"
-    android:viewportWidth="48"
-    android:width="24dp"
-    xmlns:android="http://schemas.android.com/apk/res/android">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M17.08,18.06h0a1.87,1.87 0,0 1,1.86 1.87h0a1.87,1.87 0,0 1,-1.86 1.87h0a1.87,1.87 0,0 1,-1.86 -1.87h0A1.87,1.87 0,0 1,17.08 18.06Z" />
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M17.08,26.28h0a1.87,1.87 0,0 1,1.86 1.87h0A1.87,1.87 0,0 1,17.08 30h0a1.87,1.87 0,0 1,-1.86 -1.87h0A1.87,1.87 0,0 1,17.08 26.28Z" />
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M33.18,22H30a2.68,2.68 0,0 0,-3 -2.27h-0.18c-2.4,0 -3.35,1.82 -3.43,4.5s1.54,4.54 3.43,4.5a2.73,2.73 0,0 0,3 -2.44h3.56c-0.59,3.34 -3,5.29 -6.53,5.3 -3.94,0 -6.8,-3.29 -6.8,-7.36 0,-4.34 2.85,-7.36 6.8,-7.36h0.43c2.46,0 5.81,1.77 5.81,5.13Z" />
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M39.29,7.11h-30A3.85,3.85 0,0 0,6.44 8.37h0v0a3.59,3.59 0,0 0,-0.9 2.37L5.54,37.63a3.75,3.75 0,0 0,3.8 3.68h30a3.75,3.75 0,0 0,3.8 -3.68L43.14,10.79A3.75,3.75 0,0 0,39.29 7.11ZM39.48,9.71a1.86,1.86 0,1 1,-1.85 1.86A1.85,1.85 0,0 1,39.48 9.71ZM39.48,17.93a1.86,1.86 0,1 1,-1.85 1.86A1.85,1.85 0,0 1,39.48 17.94ZM9.06,38.34h0a1.87,1.87 0,0 1,0 -3.75h0a1.87,1.87 0,0 1,0 3.75ZM9.06,30.05h0a1.87,1.87 0,0 1,0 -3.75h0a1.87,1.87 0,0 1,0 3.75ZM9.06,21.76h0a1.87,1.87 0,0 1,0 -3.75h0a1.87,1.87 0,0 1,0 3.75ZM9.06,13.47h0a1.87,1.87 0,0 1,0 -3.75h0a1.87,1.87 0,0 1,0 3.75ZM36,38.71L12.23,38.71L12.23,9.7L36,9.7ZM39.51,38.33a1.87,1.87 0,1 1,1.86 -1.87A1.87,1.87 0,0 1,39.48 38.34ZM39.51,30.04a1.87,1.87 0,1 1,1.86 -1.87A1.87,1.87 0,0 1,39.48 30Z" />
-</vector>
diff --git a/tests/config/ic_antifeature_nonfreedep.xml b/tests/config/ic_antifeature_nonfreedep.xml
deleted file mode 100644
index 2b37b8d8..00000000
--- a/tests/config/ic_antifeature_nonfreedep.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<vector android:height="24dp"
-    android:viewportHeight="48"
-    android:tint="?attr/colorControlNormal"
-    android:viewportWidth="48"
-    android:width="24dp"
-    xmlns:android="http://schemas.android.com/apk/res/android">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M9.38,17.97a1.49,1.46 0,1 0,2.98 0a1.49,1.46 0,1 0,-2.98 0z" />
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M34.73,9.72a1.3,1.3 0,0 0,-1.3 1.3V33.07l-7.19,-5.52a12,12 0,1 0,-1.67 2l8.29,6.37a1.27,1.27 0,0 0,0.56 0.23v6.4a1.3,1.3 0,1 0,2.59 0V11A1.3,1.3 0,0 0,34.73 9.72ZM16.33,30.27a9.33,9.33 0,1 1,9.33 -9.33A9.34,9.34 0,0 1,16.33 30.27Z" />
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M41.67,9.72a1.3,1.3 0,0 0,-1.3 1.3V42.54a1.3,1.3 0,1 0,2.59 0V11A1.3,1.3 0,0 0,41.67 9.72Z" />
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M9.38,23.81a1.49,1.46 0,1 0,2.98 0a1.49,1.46 0,1 0,-2.98 0z" />
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M20.08,22.43A1.74,1.74 0,0 1,18.13 24h0a1.93,1.93 0,0 1,-1.38 -0.59,3.12 3.12,0 0,1 -0.78,-2.32c0.06,-1.94 0.8,-2.92 2.2,-2.92h0.18a1.68,1.68 0,0 1,1.83 1.44v0.07h2.28v-0.09c0,-2.34 -2.36,-3.48 -4,-3.5h-0.28c-2.72,0 -4.62,2.05 -4.62,5A5.23,5.23 0,0 0,15 24.77a4.41,4.41 0,0 0,3.14 1.29h0a4.19,4.19 0,0 0,4.43 -3.6l0,-0.1H20.09Z" />
-</vector>
diff --git a/tests/config/ic_antifeature_nonfreenet.xml b/tests/config/ic_antifeature_nonfreenet.xml
deleted file mode 100644
index 4d726f09..00000000
--- a/tests/config/ic_antifeature_nonfreenet.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<vector android:height="24dp"
-    android:viewportHeight="48"
-    android:tint="?attr/colorControlNormal"
-    android:viewportWidth="48"
-    android:width="24dp"
-    xmlns:android="http://schemas.android.com/apk/res/android">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M13.65,31.74L13,31.74a10.63,10.63 0,0 1,0 -21.25C15.18,7.25 19.22,4.1 23.66,3.9h0c6.23,-0.23 11.08,3.49 13.09,10a8.91,8.91 0,0 1,0 17.82L13.65,31.72ZM13.21,13.06A8,8 0,0 0,13 29.14L36.69,29.14a6.32,6.32 0,0 0,-0.23 -12.64l-0.54,0 -1.11,0.11 -0.27,-1.08c-0.72,-2.82 -3.19,-9.35 -10.76,-9.07h0c-3.23,0.14 -7,2.61 -9.06,6l-0.42,0.67 -0.78,-0.06Z" />
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M15.33,14.71h0a1.87,1.87 0,0 1,1.86 1.87h0a1.87,1.87 0,0 1,-1.86 1.87h0a1.87,1.87 0,0 1,-1.86 -1.87h0A1.87,1.87 0,0 1,15.33 14.71Z" />
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M15.33,20.77h0a1.87,1.87 0,0 1,1.86 1.87h0a1.87,1.87 0,0 1,-1.86 1.87h0a1.87,1.87 0,0 1,-1.86 -1.87h0A1.87,1.87 0,0 1,15.33 20.77Z" />
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M36.27,39.92a1.3,1.3 0,0 1,-1.1 -2l2.28,-3.68a1.3,1.3 0,1 1,2.2 1.37l-2.28,3.68A1.3,1.3 0,0 1,36.27 39.92Z" />
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M27.92,43.41a1.3,1.3 0,0 1,-1.1 -2l2.28,-3.68a1.3,1.3 0,1 1,2.2 1.37L29,42.79A1.3,1.3 0,0 1,27.92 43.41Z" />
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M22.17,39.92a1.3,1.3 0,0 1,-1.1 -2l2.28,-3.68a1.3,1.3 0,1 1,2.2 1.37l-2.28,3.68A1.3,1.3 0,0 1,22.17 39.92Z" />
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M13.83,43.41a1.3,1.3 0,0 1,-1.1 -2L15,37.75a1.3,1.3 0,1 1,2.2 1.37l-2.28,3.68A1.3,1.3 0,0 1,13.83 43.41Z" />
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M8.64,39.84a1.3,1.3 0,0 1,-1.1 -2l2.28,-3.68A1.3,1.3 0,0 1,12 35.55L9.74,39.23A1.3,1.3 0,0 1,8.64 39.84Z" />
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M30.28,17.37H27.56A2.3,2.3 0,0 0,25 15.43h-0.15c-2.06,0 -2.87,1.56 -2.94,3.85s1.32,3.89 2.94,3.85A2.34,2.34 0,0 0,27.48 21h3.05a5.28,5.28 0,0 1,-5.59 4.54c-3.38,0 -5.82,-2.82 -5.82,-6.3 0,-3.72 2.44,-6.3 5.82,-6.3h0.37C27.42,13 30.28,14.5 30.28,17.37Z" />
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M24.93,25.63a5.61,5.61 0,0 1,-4 -1.64,6.56 6.56,0 0,1 -1.86,-4.7 6.65,6.65 0,0 1,1.65 -4.57,5.67 5.67,0 0,1 4.21,-1.77h0.37c2,0 5,1.47 5,4.44v0H27.52v0a2.23,2.23 0,0 0,-2.42 -1.91h-0.23c-1.85,0 -2.82,1.28 -2.9,3.81a4.07,4.07 0,0 0,1 3,2.55 2.55,0 0,0 1.87,0.78A2.3,2.3 0,0 0,27.44 21v0h3.14v0.05a5.32,5.32 0,0 1,-5.64 4.57ZM25.14,13h-0.2c-3.4,0 -5.78,2.57 -5.78,6.26A6.48,6.48 0,0 0,21 23.93a5.53,5.53 0,0 0,3.93 1.62h0a5.24,5.24 0,0 0,5.54 -4.45h-3a2.39,2.39 0,0 1,-2.64 2.09h-0.05a2.63,2.63 0,0 1,-1.88 -0.8,4.15 4.15,0 0,1 -1.05,-3.1c0.08,-2.59 1.08,-3.9 3,-3.9h0.22a2.34,2.34 0,0 1,2.5 1.94h2.65c0,-2.88 -3,-4.27 -4.94,-4.31h-0.16Z" />
-</vector>
diff --git a/tests/config/ic_antifeature_nosourcesince.xml b/tests/config/ic_antifeature_nosourcesince.xml
deleted file mode 100644
index b524fc42..00000000
--- a/tests/config/ic_antifeature_nosourcesince.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<vector android:height="24dp"
-    android:viewportHeight="48"
-    android:tint="?attr/colorControlNormal"
-    android:viewportWidth="48"
-    android:width="24dp"
-    xmlns:android="http://schemas.android.com/apk/res/android">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M42,31.65L40.6,31.65L40.6,21.46a1.24,1.24 0,0 0,0 -0.26,16.08 16.08,0 0,0 -32.16,0.05 1.31,1.31 0,0 0,0 0.21v10.2L6.9,31.66a1.3,1.3 0,0 0,-1.3 1.3v7.36a1.3,1.3 0,0 0,1.3 1.3L42,41.62a1.3,1.3 0,0 0,1.3 -1.3L43.3,32.95A1.3,1.3 0,0 0,42 31.65ZM11,21.65a1.3,1.3 0,0 0,0 -0.18,13.49 13.49,0 0,1 27,0 1.24,1.24 0,0 0,0 0.24v10L11,31.71ZM40.74,39L8.2,39L8.2,34.25L40.74,34.25Z" />
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M28.27,16.23a1.3,1.3 0,0 0,-1.82 1.85l3.9,3.82 -3.9,3.82a1.3,1.3 0,0 0,1.82 1.85l4.84,-4.75a1.3,1.3 0,0 0,0 -1.85Z" />
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M22.52,16.25a1.3,1.3 0,0 0,-1.83 0L15.84,21a1.3,1.3 0,0 0,0 1.85l4.84,4.75a1.3,1.3 0,0 0,1.82 -1.85L18.6,21.9l3.9,-3.82A1.3,1.3 0,0 0,22.52 16.25Z" />
-</vector>
diff --git a/tests/config/ic_antifeature_nsfw.xml b/tests/config/ic_antifeature_nsfw.xml
deleted file mode 100644
index a1bf3b84..00000000
--- a/tests/config/ic_antifeature_nsfw.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<vector android:height="24dp" android:viewportHeight="48"
-    android:viewportWidth="48" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-  <path android:fillColor="#FF000000" android:pathData="M21.99,12.34C22,12.23 22,12.11 22,12c0,-5.52 -4.48,-10 -10,-10S2,6.48 2,12c0,5.17 3.93,9.43 8.96,9.95c-0.93,-0.73 -1.72,-1.64 -2.32,-2.68C5.9,18 4,15.22 4,12c0,-1.85 0.63,-3.55 1.69,-4.9l5.66,5.66c0.56,-0.4 1.17,-0.73 1.82,-1L7.1,5.69C8.45,4.63 10.15,4 12,4c4.24,0 7.7,3.29 7.98,7.45C20.69,11.67 21.37,11.97 21.99,12.34zM17,13c-3.18,0 -5.9,1.87 -7,4.5c1.1,2.63 3.82,4.5 7,4.5s5.9,-1.87 7,-4.5C22.9,14.87 20.18,13 17,13zM17,20c-1.38,0 -2.5,-1.12 -2.5,-2.5c0,-1.38 1.12,-2.5 2.5,-2.5s2.5,1.12 2.5,2.5C19.5,18.88 18.38,20 17,20zM18.5,17.5c0,0.83 -0.67,1.5 -1.5,1.5s-1.5,-0.67 -1.5,-1.5c0,-0.83 0.67,-1.5 1.5,-1.5S18.5,16.67 18.5,17.5z"/>
-</vector>
diff --git a/tests/config/ic_antifeature_tracking.xml b/tests/config/ic_antifeature_tracking.xml
deleted file mode 100644
index 984fe20c..00000000
--- a/tests/config/ic_antifeature_tracking.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<vector android:height="24dp"
-    android:viewportHeight="48"
-    android:tint="?attr/colorControlNormal"
-    android:viewportWidth="48"
-    android:width="24dp"
-    xmlns:android="http://schemas.android.com/apk/res/android">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M6.32,34.68a2.83,2.83 0,0 1,-2.54 -1.4,3.12 3.12,0 0,1 0.12,-3.16L9.68,20.3l0.25,-0.45c0.72,-1.31 1.25,-1.49 2.82,-1.5h0l20.2,-0.06h0c1.48,0 2,0.2 2.73,1.43l0.29,0.49L42.12,30a3.07,3.07 0,0 1,0.17 3.14,2.88 2.88,0 0,1 -2.58,1.44l-33.38,0.06ZM12.32,20.96 L12.24,21.11 11.95,21.62L6.13,31.44A0.62,0.62 0,0 0,6 32c0,0.08 0.24,0.09 0.29,0.09h0L39.71,32c0.08,0 0.26,0 0.31,-0.11a0.57,0.57 0,0 0,-0.1 -0.52l-6.11,-9.82c-0.14,-0.22 -0.25,-0.41 -0.34,-0.57l-0.07,-0.12L33,20.86l-20.2,0.06Z" />
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M22.94,18.19a8,8 0,0 0,-8.2 7.89A8,8 0,0 0,22.94 34a8,8 0,0 0,8.2 -7.89A8,8 0,0 0,22.94 18.19ZM22.94,31.12a5,5 0,1 1,5.26 -5A5.16,5.16 0,0 1,22.94 31.12Z" />
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M22.94,24h0a2.1,2.1 0,0 1,2.14 2.05h0a2.1,2.1 0,0 1,-2.14 2.05h0a2.1,2.1 0,0 1,-2.14 -2.05h0A2.1,2.1 0,0 1,22.94 24Z" />
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M42.91,29.16a6.72,6.72 0,0 1,-3.12 -1c-0.71,-0.39 -4.24,-2.45 -4.23,-4.5s3.48,-4 4.18,-4.42c2.92,-1.6 3.94,-0.94 4.28,-0.73 1.24,0.79 1.48,3.31 1.47,5.28 0,2.77 -0.51,4.49 -1.49,5.1A1.89,1.89 0,0 1,42.91 29.16ZM42.47,26.8ZM38.21,23.62a10.84,10.84 0,0 0,4.39 2.91,13.3 13.3,0 0,0 0,-5.75A10.64,10.64 0,0 0,38.21 23.62ZM38.13,23.77ZM38.13,23.47ZM42.87,20.75h0ZM42.47,20.52Z" />
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M42.82,42.72H3.15A1.3,1.3 0,0 1,2 40.79l3.49,-6.2a2.72,2.72 0,0 1,-1.74 -1.3,3.12 3.12,0 0,1 0.12,-3.16L9.68,20.3l0.25,-0.45c0.72,-1.31 1.25,-1.49 2.82,-1.5h1.91L21.51,6.17a1.3,1.3 0,0 1,1.12 -0.66,1.28 1.28,0 0,1 1.13,0.64L30.85,18.3h2.1c1.52,0 2.06,0.18 2.77,1.43 0.08,0.14 0.17,0.3 0.29,0.49L42.12,30a3.07,3.07 0,0 1,0.17 3.14,2.8 2.8,0 0,1 -2,1.38l3.62,6.2a1.3,1.3 0,0 1,-1.12 1.95ZM5.37,40.13H40.56L37,34A1.3,1.3 0,0 1,38.1 32h1.61c0.08,0 0.26,0 0.31,-0.11a0.57,0.57 0,0 0,-0.1 -0.52l-6.11,-9.82c-0.14,-0.23 -0.25,-0.41 -0.34,-0.57l-0.07,-0.12h-3.3A1.31,1.31 0,0 1,29 20.26L22.66,9.42 16.54,20.28a1.3,1.3 0,0 1,-1.13 0.66H12.29l-0.08,0.15 -0.29,0.51L6.13,31.44A0.62,0.62 0,0 0,6 32c0,0.08 0.24,0.09 0.29,0.09H7.68A1.3,1.3 0,0 1,8.81 34Z" />
-</vector>
diff --git a/tests/config/ic_antifeature_upstreamnonfree.xml b/tests/config/ic_antifeature_upstreamnonfree.xml
deleted file mode 100644
index f3598e67..00000000
--- a/tests/config/ic_antifeature_upstreamnonfree.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<vector android:height="24dp"
-    android:viewportHeight="48"
-    android:tint="?attr/colorControlNormal"
-    android:viewportWidth="48"
-    android:width="24dp"
-    xmlns:android="http://schemas.android.com/apk/res/android">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M15.72,22.64a1.86,1.87 0,1 0,3.72 0a1.86,1.87 0,1 0,-3.72 0z" />
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M15.72,29.24a1.86,1.87 0,1 0,3.72 0a1.86,1.87 0,1 0,-3.72 0z" />
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M20.28,26.12c0,4.06 2.85,7.37 6.8,7.36 3.49,0 5.94,-2 6.53,-5.3H30a2.73,2.73 0,0 1,-3 2.44c-1.89,0 -3.51,-1.7 -3.43,-4.5s1,-4.5 3.43,-4.5h0.18a2.68,2.68 0,0 1,3 2.27h3.18c0,-3.36 -3.35,-5.08 -5.81,-5.13h-0.43C23.13,18.76 20.28,21.78 20.28,26.12Z" />
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M24.375,8.9277A1.3,1.3 0,0 0,23.7793 9.0801L5.4492,18.8008A1.3,1.3 0,0 0,6.6699 21.0898L10.1992,19.2109L10.1992,36.6699A3.07,3.07 0,0 0,13.3594 39.6699L35.6406,39.6699A3.07,3.07 0,0 0,38.8008 36.6699L38.8008,19.4609L42.3301,21.3594A1.3,1.3 0,0 0,43.5605 19.0801L43.5605,19.0703L25,9.0801A1.3,1.3 0,0 0,24.375 8.9277zM24.3691,11.6992L36.2207,18.0703L36.2109,36.6699C36.2109,36.8399 35.9706,37.0293 35.6406,37.0293L13.3594,37.0293C13.0394,37.0293 12.7891,36.8399 12.7891,36.6699L12.7891,17.9492L12.7891,17.8496L24.3691,11.6992z" />
-</vector>
diff --git a/tests/config/ro/antiFeatures.yml b/tests/config/ro/antiFeatures.yml
deleted file mode 100644
index 9610b448..00000000
--- a/tests/config/ro/antiFeatures.yml
+++ /dev/null
@@ -1,40 +0,0 @@
-Ads:
-  description: Aplicația conține reclamă
-  icon: ic_antifeature_ads.xml
-  name: Reclame
-DisabledAlgorithm:
-  description: Aplicația are o semnătură slab securizată
-  icon: ic_antifeature_disabledalgorithm.xml
-  name: Algoritm nesigur semnătură
-KnownVuln:
-  description: Aplicația conține o vulnerabilitate de securitate cunoscută
-  icon: ic_antifeature_knownvuln.xml
-  name: Vulnerabilitate cunoscută
-NSFW:
-  description: Această aplicație conține conținut care nu ar trebui să fie făcut public
-    sau vizibil peste tot
-  icon: ic_antifeature_nsfw.xml
-  name: NSFW
-NoSourceSince:
-  icon: ic_antifeature_nosourcesince.xml
-  name: Codul sursă nu mai este disponibil, nu mai există posibilitatea de a actualiza.
-NonFreeAdd:
-  description: Aplicația promovează anexe ce nu sunt software liber
-  icon: ic_antifeature_nonfreeadd.xml
-  name: Anexe ne-libere
-NonFreeAssets:
-  description: Aceasta aplicație conține resurse ce nu sunt la disponibile la liber
-  icon: ic_antifeature_nonfreeassets.xml
-  name: Resurse ne-libere
-NonFreeDep:
-  description: Aplicația depinde de alte aplicații ce nu sunt software liber
-  icon: ic_antifeature_nonfreedep.xml
-  name: Dependențe ne-libere
-NonFreeNet:
-  description: Aplicația promovează servicii de rețea ce nu sunt accesibile la liber
-  icon: ic_antifeature_nonfreenet.xml
-  name: Servicii de rețea ne-libere
-Tracking:
-  description: Aplicația îți înregistrează și raportează activitatea undeva
-  icon: ic_antifeature_tracking.xml
-  name: Urmărire
diff --git a/tests/config/zh-rCN/antiFeatures.yml b/tests/config/zh-rCN/antiFeatures.yml
deleted file mode 100644
index 2c9f0819..00000000
--- a/tests/config/zh-rCN/antiFeatures.yml
+++ /dev/null
@@ -1,39 +0,0 @@
-Ads:
-  description: 此应用包含广告
-  icon: ic_antifeature_ads.xml
-  name: 广告
-DisabledAlgorithm:
-  description: 此应用的安全签名较弱
-  icon: ic_antifeature_disabledalgorithm.xml
-  name: 使用不安全算法签名
-KnownVuln:
-  description: 此应用包含已知的安全漏洞
-  icon: ic_antifeature_knownvuln.xml
-  name: 含有已知漏洞
-NSFW:
-  description: 此应用包含不应宣扬或随处可见的内容
-  icon: ic_antifeature_nsfw.xml
-  name: NSFW
-NoSourceSince:
-  icon: ic_antifeature_nosourcesince.xml
-  name: 源代码不再可用，无法更新。
-NonFreeAdd:
-  description: 此应用推广非自由的附加组件
-  icon: ic_antifeature_nonfreeadd.xml
-  name: 非自由附加组件
-NonFreeAssets:
-  description: 此应用包含非自由资源
-  icon: ic_antifeature_nonfreeassets.xml
-  name: 非自由资产
-NonFreeDep:
-  description: 此应用依赖于其它非自由应用
-  icon: ic_antifeature_nonfreedep.xml
-  name: 非自由依赖项
-NonFreeNet:
-  description: 此应用推广非自由的网络服务
-  icon: ic_antifeature_nonfreenet.xml
-  name: 非自由网络服务
-Tracking:
-  description: 此应用会记录并报告你的活动
-  icon: ic_antifeature_tracking.xml
-  name: 跟踪用户
diff --git a/tests/deploy.TestCase b/tests/deploy.TestCase
new file mode 100755
index 00000000..2ce5e500
--- /dev/null
+++ b/tests/deploy.TestCase
@@ -0,0 +1,175 @@
+#!/usr/bin/env python3
+
+import inspect
+import logging
+import optparse
+import os
+import sys
+import tempfile
+import unittest
+from unittest import mock
+
+localmodule = os.path.realpath(
+    os.path.join(os.path.dirname(inspect.getfile(inspect.currentframe())), '..'))
+if localmodule not in sys.path:
+    sys.path.insert(0, localmodule)
+
+import fdroidserver.common
+import fdroidserver.deploy
+from testcommon import TmpCwd
+
+
+class DeployTest(unittest.TestCase):
+    '''fdroidserver/deploy.py'''
+
+    def setUp(self):
+        logging.basicConfig(level=logging.DEBUG)
+        self.basedir = os.path.join(localmodule, 'tests')
+
+        fdroidserver.deploy.options = mock.Mock()
+        fdroidserver.deploy.config = {}
+
+    def test_update_serverwebroot_make_cur_version_link(self):
+
+        # setup parameters for this test run
+        fdroidserver.deploy.options.no_chcksum = True
+        fdroidserver.deploy.options.identity_file = None
+        fdroidserver.deploy.options.verbose = False
+        fdroidserver.deploy.options.quiet = True
+        fdroidserver.deploy.options.identity_file = None
+        fdroidserver.deploy.config['make_current_version_link'] = True
+        serverwebroot = "example.com:/var/www/fdroid"
+        repo_section = 'repo'
+
+        # setup function for asserting subprocess.call invocations
+        call_iteration = 0
+
+        def update_server_webroot_call(cmd):
+            nonlocal call_iteration
+            if call_iteration == 0:
+                self.assertListEqual(cmd, ['rsync',
+                                           '--archive',
+                                           '--delete-after',
+                                           '--safe-links',
+                                           '--quiet',
+                                           '--exclude', 'repo/index.xml',
+                                           '--exclude', 'repo/index.jar',
+                                           '--exclude', 'repo/index-v1.jar',
+                                           'repo',
+                                           'example.com:/var/www/fdroid'])
+            elif call_iteration == 1:
+                self.assertListEqual(cmd, ['rsync',
+                                           '--archive',
+                                           '--delete-after',
+                                           '--safe-links',
+                                           '--quiet',
+                                           'repo',
+                                           serverwebroot])
+            elif call_iteration == 2:
+                self.assertListEqual(cmd, ['rsync',
+                                           '--archive',
+                                           '--delete-after',
+                                           '--safe-links',
+                                           '--quiet',
+                                           'Sym.apk',
+                                           'Sym.apk.asc',
+                                           'Sym.apk.sig',
+                                           'example.com:/var/www/fdroid'])
+            else:
+                self.fail('unexpected subprocess.call invocation')
+            call_iteration += 1
+            return 0
+
+        with tempfile.TemporaryDirectory() as tmpdir, TmpCwd(tmpdir):
+            os.mkdir('repo')
+            os.symlink('repo/com.example.sym.apk', 'Sym.apk')
+            os.symlink('repo/com.example.sym.apk.asc', 'Sym.apk.asc')
+            os.symlink('repo/com.example.sym.apk.sig', 'Sym.apk.sig')
+            with mock.patch('subprocess.call', side_effect=update_server_webroot_call):
+                fdroidserver.deploy.update_serverwebroot(serverwebroot,
+                                                         repo_section)
+        self.assertEqual(call_iteration, 3, 'expected 3 invocations of subprocess.call')
+
+    def test_update_serverwebroot_with_id_file(self):
+
+        # setup parameters for this test run
+        fdroidserver.deploy.options.no_chcksum = False
+        fdroidserver.deploy.options.verbose = True
+        fdroidserver.deploy.options.quiet = False
+        fdroidserver.deploy.options.identity_file = None
+        fdroidserver.deploy.config['identity_file'] = './id_rsa'
+        fdroidserver.deploy.config['make_current_version_link'] = False
+        serverwebroot = "example.com:/var/www/fdroid"
+        repo_section = 'archive'
+
+        # setup function for asserting subprocess.call invocations
+        call_iteration = 0
+
+        def update_server_webroot_call(cmd):
+            nonlocal call_iteration
+            if call_iteration == 0:
+                self.assertListEqual(cmd, ['rsync',
+                                           '--archive',
+                                           '--delete-after',
+                                           '--safe-links',
+                                           '--verbose',
+                                           '-e',
+                                           'ssh -oBatchMode=yes -oIdentitiesOnly=yes -i '
+                                           + fdroidserver.deploy.config['identity_file'],
+                                           '--exclude', 'archive/index.xml',
+                                           '--exclude', 'archive/index.jar',
+                                           '--exclude', 'archive/index-v1.jar',
+                                           'archive',
+                                           serverwebroot])
+            elif call_iteration == 1:
+                self.assertListEqual(cmd, ['rsync',
+                                           '--archive',
+                                           '--delete-after',
+                                           '--safe-links',
+                                           '--verbose',
+                                           '-e',
+                                           'ssh -oBatchMode=yes -oIdentitiesOnly=yes -i '
+                                           + fdroidserver.deploy.config['identity_file'],
+                                           'archive',
+                                           serverwebroot])
+            else:
+                self.fail('unexpected subprocess.call invocation')
+            call_iteration += 1
+            return 0
+
+        with mock.patch('subprocess.call', side_effect=update_server_webroot_call):
+            fdroidserver.deploy.update_serverwebroot(serverwebroot,
+                                                     repo_section)
+        self.assertEqual(call_iteration, 2, 'expected 2 invocations of subprocess.call')
+
+    @unittest.skipIf(not os.getenv('VIRUSTOTAL_API_KEY'), 'VIRUSTOTAL_API_KEY is not set')
+    def test_upload_to_virustotal(self):
+        fdroidserver.deploy.options.verbose = True
+        virustotal_apikey = os.getenv('VIRUSTOTAL_API_KEY')
+        fdroidserver.deploy.upload_to_virustotal('repo', virustotal_apikey)
+
+    def test_remote_hostname_regex(self):
+        for remote_url, name in (
+                ('git@github.com:guardianproject/fdroid-repo', 'github'),
+                ('git@gitlab.com:guardianproject/fdroid-repo', 'gitlab'),
+                ('https://github.com:guardianproject/fdroid-repo', 'github'),
+                ('https://gitlab.com/guardianproject/fdroid-repo', 'gitlab'),
+                ('https://salsa.debian.org/foo/repo', 'salsa'),
+        ):
+            self.assertEqual(
+                name,
+                fdroidserver.deploy.REMOTE_HOSTNAME_REGEX.sub(r'\1', remote_url)
+            )
+
+
+if __name__ == "__main__":
+    os.chdir(os.path.dirname(__file__))
+
+    parser = optparse.OptionParser()
+    parser.add_option("-v", "--verbose", action="store_true", default=False,
+                      help="Spew out even more information than normal")
+    (fdroidserver.common.options, args) = parser.parse_args(['--verbose'])
+
+    newSuite = unittest.TestSuite()
+    newSuite.addTest(unittest.makeSuite(DeployTest))
+    unittest.main(failfast=False)
diff --git a/tests/dump_internal_metadata_format.py b/tests/dump_internal_metadata_format.py
index ffc72059..e4679449 100755
--- a/tests/dump_internal_metadata_format.py
+++ b/tests/dump_internal_metadata_format.py
@@ -9,27 +9,27 @@
 # The idea is to test changes using all of the files in
 # fdroiddata.git.  To run it, do:
 #
-#   cd fdroidserver
-#   git checkout <latest tag>
-#   cd ../fdroiddata
-#   ../fdroidserver/tests/dump_internal_metadata_format.py
+#   cd fdroidserver/tests
+#   cp dump_internal_metadata_format.py dump.py # since this isn't in old commits
+#   git checkout 0.7.0  # or any old commit of your choosing
+#   cd ../../fdroiddata
+#   ../fdroidserver/tests/dump.py
+#   mv metadata/dump metadata/dump_0.7.0
 #   cd ../fdroidserver
 #   git checkout master
 #   cd ../fdroiddata
-#   ../fdroidserver/tests/dump_internal_metadata_format.py
-#   diff -uw metadata/dump_*
-
-import inspect
-import os
-import sys
-from argparse import ArgumentParser
+#   ../fdroidserver/tests/dump.py
+#   meld metadata/dump_0.7.0 metadata/dump_0.7.0-179-ge85486a/
 
 import git
+import inspect
+import optparse
+import os
+import sys
 import yaml
 
 localmodule = os.path.realpath(
-    os.path.join(os.path.dirname(inspect.getfile(inspect.currentframe())), '..')
-)
+    os.path.join(os.path.dirname(inspect.getfile(inspect.currentframe())), '..'))
 if localmodule not in sys.path:
     sys.path.insert(0, localmodule)
 
@@ -38,41 +38,69 @@ import fdroidserver.metadata  # noqa
 
 
 def _build_yaml_representer(dumper, data):
-    """Create a YAML representation of a Build instance."""
-    # internal representation of keys were switched
-    # to lists instead of strings concatenated by &&
-    # https://gitlab.com/fdroid/fdroidserver/merge_requests/1185
-    output = {}
-    for k, v in data.items():
-        if k in ("build", "init", "prebuild", "sudo"):
-            output[k] = " && ".join(v)
+    '''Creates a YAML representation of a Build instance'''
+    if hasattr(data, 'append_flag'):
+        # for 0.7.0 and earlier, before https://gitlab.com/fdroid/fdroidserver/merge_requests/210
+        del(data._modified)
+        readdict = data.__dict__
+    else:
+        readdict = data
+
+    # these key names were all renamed in
+    # https://gitlab.com/fdroid/fdroidserver/merge_requests/210
+    output = dict()
+    for k, v in readdict.items():
+        if k == 'vercode':
+            output['versionCode'] = v
+        elif k == 'version':
+            output['versionName'] = v
+        elif k == 'update':
+            output['androidupdate'] = v
         else:
             output[k] = v
 
     return dumper.represent_dict(output)
 
 
-parser = ArgumentParser()
-fdroidserver.common.setup_global_opts(parser)
-fdroidserver.metadata.add_metadata_arguments(parser)
-options = fdroidserver.common.parse_args(parser)
-fdroidserver.metadata.warnings_action = options.W
-fdroidserver.common.read_config()
+parser = optparse.OptionParser()
+parser.add_option("-v", "--verbose", action="store_true", default=False,
+                  help="Spew out even more information than normal")
+(fdroidserver.common.options, args) = parser.parse_args(['--verbose'])
 
 if not os.path.isdir('metadata'):
     print("This script must be run in an F-Droid data folder with a 'metadata' subdir!")
     sys.exit(1)
 
+# these need to be set to prevent code running on None, only
+# 'accepted_formats' is actually used in metadata.py
+config = dict()
+config['sdk_path'] = os.getenv('ANDROID_HOME') or '/opt/android-sdk'
+config['ndk_paths'] = dict()
+config['accepted_formats'] = ['yml']
+fdroidserver.common.config = config
+
 repo = git.Repo(localmodule)
-savedir = os.path.join('metadata', 'dump_' + repo.git.rev_parse('HEAD'))
+savedir = os.path.join('metadata', 'dump_' + repo.git.describe())
 if not os.path.isdir(savedir):
     os.mkdir(savedir)
 
 apps = fdroidserver.metadata.read_metadata()
 for appid, app in apps.items():
     savepath = os.path.join(savedir, appid + '.yaml')
-    frommeta = dict(app)
+    if hasattr(app, 'attr_to_field'):
+        # for 0.7.0 and earlier, before https://gitlab.com/fdroid/fdroidserver/merge_requests/210
+        app.__dict__['lastUpdated'] = app.__dict__['lastupdated']
+        del(app.__dict__['lastupdated'])
+        del(app._modified)
+        frommeta = dict(app.__dict__)
+    else:
+        frommeta = dict(app)
 
-    with open(savepath, "w", encoding="utf-8") as f:
+    with open(savepath, 'w') as f:
         yaml.add_representer(fdroidserver.metadata.Build, _build_yaml_representer)
         yaml.dump(frommeta, f, default_flow_style=False)
+
+    # if appid == 'at.tomtasche.reader':
+    #     import pprint
+    #     pprint.pprint(app)
+    #     sys.exit(1)
diff --git a/tests/test_exception.py b/tests/exception.TestCase
similarity index 55%
rename from tests/test_exception.py
rename to tests/exception.TestCase
index 01a6cd46..2551b558 100755
--- a/tests/test_exception.py
+++ b/tests/exception.TestCase
@@ -1,8 +1,21 @@
 #!/usr/bin/env python3
 
+# http://www.drdobbs.com/testing/unit-testing-with-python/240165163
+
+import inspect
+import optparse
+import os
+import sys
 import unittest
 
-import fdroidserver
+localmodule = os.path.realpath(
+    os.path.join(os.path.dirname(inspect.getfile(inspect.currentframe())), '..'))
+print('localmodule: ' + localmodule)
+if localmodule not in sys.path:
+    sys.path.insert(0, localmodule)
+
+import fdroidserver.common
+import fdroidserver.exception
 
 
 class ExceptionTest(unittest.TestCase):
@@ -38,3 +51,17 @@ class ExceptionTest(unittest.TestCase):
             raise fdroidserver.exception.FDroidException(('one', 'two', 'three'))
         except fdroidserver.exception.FDroidException as e:
             str(e)
+
+
+if __name__ == "__main__":
+    os.chdir(os.path.dirname(__file__))
+
+    parser = optparse.OptionParser()
+    parser.add_option("-v", "--verbose", action="store_true", default=False,
+                      help="Spew out even more information than normal")
+    (fdroidserver.exception.options, args) = parser.parse_args(['--verbose'])
+    fdroidserver.common.options = fdroidserver.exception.options
+
+    newSuite = unittest.TestSuite()
+    newSuite.addTest(unittest.makeSuite(ExceptionTest))
+    unittest.main(failfast=False)
diff --git a/tests/extra/manual-vmtools-test.py b/tests/extra/manual-vmtools-test.py
index 2f01c9ff..6b6c6964 100755
--- a/tests/extra/manual-vmtools-test.py
+++ b/tests/extra/manual-vmtools-test.py
@@ -1,15 +1,11 @@
 #!/usr/bin/env python3
-#
-# This script is some of the only documentation of certain processes
-# that run in the buildserver setup.  It is not really maintained, but
-# is still here as a kind of reference.
 
-import inspect
-import logging
 import os
 import sys
-import tempfile
+import logging
 import textwrap
+import tempfile
+import inspect
 from argparse import ArgumentParser
 
 localmodule = os.path.realpath(
@@ -21,7 +17,6 @@ if localmodule not in sys.path:
 from fdroidserver.vmtools import get_build_vm
 
 
-# pylint: disable=no-member
 def main(args):
 
     if args.provider != None:
@@ -117,7 +112,7 @@ def main(args):
 
 if __name__ == '__main__':
     logging.basicConfig(format='%(message)s', level=logging.DEBUG)
-
+    
     parser = ArgumentParser(description="""\
 This is intended for manually testing vmtools.py
 
diff --git a/tests/funding-usernames.yaml b/tests/funding-usernames.yaml
index ccc8d8a2..04c08a13 100644
--- a/tests/funding-usernames.yaml
+++ b/tests/funding-usernames.yaml
@@ -17,6 +17,7 @@ custom:
   - https://email.faircode.eu/donate/
   - https://etchdroid.depau.eu/donate/
   - https://f-droid.org/about/
+  - https://flattr.com/github/bk138
   - https://gultsch.de/donate.html
   - https://jahir.dev/donate
   - https://kodi.tv/contribute/donate
diff --git a/tests/get-country-region-data.py b/tests/get-country-region-data.py
deleted file mode 100755
index 240d70b2..00000000
--- a/tests/get-country-region-data.py
+++ /dev/null
@@ -1,48 +0,0 @@
-#!/usr/bin/env python3
-#
-# This generates a list of ISO_3166-1 alpha 2 country codes for use in lint.
-
-import collections
-import os
-import re
-import sys
-import tempfile
-
-import requests
-import requests_cache
-
-
-def main():
-    # we want all the data
-    url = 'https://api.worldbank.org/v2/country?format=json&per_page=500'
-    r = requests.get(url, timeout=30)
-    data = r.json()
-    if data[0]['pages'] != 1:
-        print(
-            'ERROR: %d pages in data, this script only reads one page!'
-            % data[0]['pages']
-        )
-        sys.exit(1)
-
-    iso2Codes = set()
-    ISO3166_1_alpha_2_codes = set()
-    names = dict()
-    regions = collections.defaultdict(set)
-    for country in data[1]:
-        iso2Code = country['iso2Code']
-        iso2Codes.add(iso2Code)
-        if country['region']['value'] == 'Aggregates':
-            continue
-        if re.match(r'[A-Z][A-Z]', iso2Code):
-            ISO3166_1_alpha_2_codes.add(iso2Code)
-            names[iso2Code] = country['name']
-            regions[country['region']['value']].add(country['name'])
-    for code in sorted(ISO3166_1_alpha_2_codes):
-        print(f"    '{code}',  # " + names[code])
-
-
-if __name__ == "__main__":
-    requests_cache.install_cache(
-        os.path.join(tempfile.gettempdir(), os.path.basename(__file__) + '.cache')
-    )
-    main()
diff --git a/tests/get_android_tools_versions/android-ndk-r10e/RELEASE.TXT b/tests/get_android_tools_versions/android-ndk-r10e/RELEASE.TXT
deleted file mode 100644
index 39be8014..00000000
--- a/tests/get_android_tools_versions/android-ndk-r10e/RELEASE.TXT
+++ /dev/null
@@ -1 +0,0 @@
-r10e-rc4 (64-bit)
diff --git a/tests/get_android_tools_versions/android-sdk/ndk-bundle/package.xml b/tests/get_android_tools_versions/android-sdk/ndk-bundle/package.xml
deleted file mode 100644
index 41b8cac6..00000000
--- a/tests/get_android_tools_versions/android-sdk/ndk-bundle/package.xml
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?><ns2:repository xmlns:ns2="http://schemas.android.com/repository/android/common/01" xmlns:ns3="http://schemas.android.com/repository/android/generic/01" xmlns:ns4="http://schemas.android.com/sdk/android/repo/addon2/01" xmlns:ns5="http://schemas.android.com/sdk/android/repo/repository2/01" xmlns:ns6="http://schemas.android.com/sdk/android/repo/sys-img2/01"><license id="license-C3FD9DF8" type="text"/><localPackage path="ndk-bundle" obsolete="false"><type-details xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="ns3:genericDetailsType"/><revision><major>21</major><minor>4</minor><micro>7075529</micro></revision><display-name>Android NDK</display-name><uses-license ref="license-C3FD9DF8"/></localPackage></ns2:repository>
\ No newline at end of file
diff --git a/tests/get_android_tools_versions/android-sdk/ndk-bundle/source.properties b/tests/get_android_tools_versions/android-sdk/ndk-bundle/source.properties
deleted file mode 100644
index 14e4789f..00000000
--- a/tests/get_android_tools_versions/android-sdk/ndk-bundle/source.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-Pkg.Desc = Android NDK
-Pkg.Revision = 21.4.7075529
diff --git a/tests/get_android_tools_versions/android-sdk/ndk/11.2.2725575/source.properties b/tests/get_android_tools_versions/android-sdk/ndk/11.2.2725575/source.properties
deleted file mode 100644
index f3b7ffa1..00000000
--- a/tests/get_android_tools_versions/android-sdk/ndk/11.2.2725575/source.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-Pkg.Desc = Android NDK
-Pkg.Revision = 11.2.2725575
diff --git a/tests/get_android_tools_versions/android-sdk/ndk/17.2.4988734/source.properties b/tests/get_android_tools_versions/android-sdk/ndk/17.2.4988734/source.properties
deleted file mode 100644
index 8e1573f9..00000000
--- a/tests/get_android_tools_versions/android-sdk/ndk/17.2.4988734/source.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-Pkg.Desc = Android NDK
-Pkg.Revision = 17.2.4988734
diff --git a/tests/get_android_tools_versions/android-sdk/ndk/21.3.6528147/source.properties b/tests/get_android_tools_versions/android-sdk/ndk/21.3.6528147/source.properties
deleted file mode 100644
index 4f32bc9b..00000000
--- a/tests/get_android_tools_versions/android-sdk/ndk/21.3.6528147/source.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-Pkg.Desc = Android NDK
-Pkg.Revision = 21.3.6528147
diff --git a/tests/get_android_tools_versions/android-sdk/patcher/v4/source.properties b/tests/get_android_tools_versions/android-sdk/patcher/v4/source.properties
deleted file mode 100644
index 66cd669b..00000000
--- a/tests/get_android_tools_versions/android-sdk/patcher/v4/source.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-#
-# Copyright (C) 2016 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-Pkg.Revision=1
-Pkg.Path=patcher;v4
-Pkg.Desc=SDK Patch Applier v4
\ No newline at end of file
diff --git a/tests/get_android_tools_versions/android-sdk/platforms/android-30/source.properties b/tests/get_android_tools_versions/android-sdk/platforms/android-30/source.properties
deleted file mode 100644
index 239cbb3d..00000000
--- a/tests/get_android_tools_versions/android-sdk/platforms/android-30/source.properties
+++ /dev/null
@@ -1,9 +0,0 @@
-Pkg.Desc=Android SDK Platform 11
-Pkg.UserSrc=false
-Platform.Version=11
-Platform.CodeName=
-Pkg.Revision=3
-AndroidVersion.ApiLevel=30
-Layoutlib.Api=15
-Layoutlib.Revision=1
-Platform.MinToolsRev=22
diff --git a/tests/get_android_tools_versions/android-sdk/skiaparser/1/source.properties b/tests/get_android_tools_versions/android-sdk/skiaparser/1/source.properties
deleted file mode 100755
index a70c3bae..00000000
--- a/tests/get_android_tools_versions/android-sdk/skiaparser/1/source.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-Pkg.Revision=6
-Pkg.Path=skiaparser;1
-Pkg.Desc=Layout Inspector image server for API 29-30
diff --git a/tests/get_android_tools_versions/android-sdk/tools/source.properties b/tests/get_android_tools_versions/android-sdk/tools/source.properties
deleted file mode 100644
index 2c1388f1..00000000
--- a/tests/get_android_tools_versions/android-sdk/tools/source.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-Pkg.UserSrc=false
-Pkg.Revision=26.1.1
-Platform.MinPlatformToolsRev=20
-Pkg.Dependencies=emulator
-Pkg.Path=tools
-Pkg.Desc=Android SDK Tools
diff --git a/tests/getsig/getsig.java b/tests/getsig/getsig.java
new file mode 100644
index 00000000..78e7ac0c
--- /dev/null
+++ b/tests/getsig/getsig.java
@@ -0,0 +1,105 @@
+import java.io.IOException;
+import java.io.InputStream;
+import java.math.BigInteger;
+import java.security.Signature;
+import java.security.cert.*;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+import java.util.Enumeration;
+import java.util.jar.JarEntry;
+import java.util.jar.JarFile;
+
+public class getsig {
+
+    public static void main(String[] args) {
+
+        String apkPath = null;
+        boolean full = false;
+
+        if(args.length == 1) {
+            apkPath = args[0];
+        } else if (args.length == 2) {
+            if(!args[0].equals("-f")) {
+                System.out.println("Only -f is supported");
+                System.exit(1);
+            }
+            apkPath = args[1];
+            full = true;
+        } else {
+            System.out.println("Specify the APK file to get the signature from!");
+            System.exit(1);
+        }
+
+        try {
+
+            JarFile apk = new JarFile(apkPath);
+            java.security.cert.Certificate[] certs = null;
+
+            Enumeration entries = apk.entries();
+            while (entries.hasMoreElements()) {
+                JarEntry je = (JarEntry) entries.nextElement();
+                if (!je.isDirectory() && !je.getName().startsWith("META-INF/")) {
+                    // Just need to read the stream (discarding the data) to get
+                    // it to process the certificate...
+                    byte[] b = new byte[4096];
+                    InputStream is = apk.getInputStream(je);
+                    while (is.read(b, 0, b.length) != -1);
+                    is.close();
+                    certs = je.getCertificates();
+                    if(certs != null)
+                        break;
+                }
+            }
+            apk.close();
+
+            if (certs == null) {
+                System.out.println("Not signed");
+                System.exit(1);
+            }
+            if (certs.length != 1) {
+                System.out.println("One signature expected");
+                System.exit(1);
+            }
+
+            // Get the signature in the same form that is returned by
+            // android.content.pm.Signature.toCharsString() (but in the
+            // form of a byte array so we can pass it to the MD5 function)...
+            byte[] sig = certs[0].getEncoded();
+            byte[] csig = new byte[sig.length * 2];
+            for (int j=0; j<sig.length; j++) {
+                byte v = sig[j];
+                int d = (v>>4)&0xf;
+                csig[j*2] = (byte)(d >= 10 ? ('a' + d - 10) : ('0' + d));
+                d = v&0xf;
+                csig[j*2+1] = (byte)(d >= 10 ? ('a' + d - 10) : ('0' + d));
+            }
+
+            String result;
+            if(full) {
+                result = new String(csig);
+            } else {
+                // Get the MD5 sum...
+                MessageDigest md;
+                md = MessageDigest.getInstance("MD5");
+                byte[] md5sum = new byte[32];
+                md.update(csig);
+                md5sum = md.digest();
+                BigInteger bigInt = new BigInteger(1, md5sum);
+                String md5hash = bigInt.toString(16);
+                while (md5hash.length() < 32)
+                    md5hash = "0" + md5hash;
+                result = md5hash;
+            }
+
+            System.out.println("Result:" + result);
+            System.exit(0);
+
+        } catch (Exception e) {
+            System.out.println("Exception:" + e);
+            System.exit(1);
+        }
+    }
+
+}
+
+
diff --git a/tests/getsig/make.sh b/tests/getsig/make.sh
new file mode 100755
index 00000000..aa63c1a2
--- /dev/null
+++ b/tests/getsig/make.sh
@@ -0,0 +1,2 @@
+#!/bin/sh
+javac getsig.java
diff --git a/tests/getsig/run.sh b/tests/getsig/run.sh
new file mode 100755
index 00000000..726995bf
--- /dev/null
+++ b/tests/getsig/run.sh
@@ -0,0 +1,2 @@
+#!/bin/sh
+java getsig $1 $2 $3
diff --git a/tests/gradle-maven-blocks.yaml b/tests/gradle-maven-blocks.yaml
index 6db683f9..f6587f94 100644
--- a/tests/gradle-maven-blocks.yaml
+++ b/tests/gradle-maven-blocks.yaml
@@ -759,7 +759,6 @@
 - ' maven { url ''libs'' }'
 - ' maven { url = uri("https://jitpack.io") }'
 - ' maven { url = uri("https://maven.fabric.io/public") }'
-- ' maven { url = URI("https://jitpack.io") }'
 - ' maven { url MAVEN_REPO_CACHE }'
 - ' maven { url(''http://releases.marmeladburk.fidesmo.com/'') }'
 - ' maven {url "http://dl.bintray.com/tbruyelle/tbruyelle" }'
@@ -777,7 +776,3 @@
 - ' maven{ url ''https://maven.aliyun.com/repository/public''}'
 - ' maven{url "https://jitpack.io"}'
 - ' maven{url "https://plugins.gradle.org/m2/"}'
-- ' maven("https://maven.pkg.jetbrains.space/public/p/compose/dev")'
-- ' maven(url = "https://maven.pkg.jetbrains.space/public/p/kotlinx-html/maven")'
-- ' maven ( url = "https://jitpack.io")'
-- ' maven( url = "https://oss.sonatype.org/content/repositories/snapshots/" )'
diff --git a/tests/gradle-release-checksums.py b/tests/gradle-release-checksums.py
index 53ceb1a5..165c56da 100755
--- a/tests/gradle-release-checksums.py
+++ b/tests/gradle-release-checksums.py
@@ -2,66 +2,57 @@
 
 import os
 import re
-import subprocess
-import sys
-
 import requests
-from colorama import Fore, Style
-from packaging.version import Version
+import sys
+from bs4 import BeautifulSoup
+from distutils.version import LooseVersion
 
-checksums = None
-versions = dict()
-
-while not checksums:
-    r = requests.get(
-        'https://gitlab.com/fdroid/gradle-transparency-log/-/raw/master/checksums.json',
-        timeout=300,
-    )
+while True:
+    r = requests.get('https://gradle.org/release-checksums/')
     if r.status_code == 200:
-        checksums = r.json()
+        break
 
-gradle_bin_pat = re.compile(r'gradle-([0-9][0-9.]+[0-9])-bin.zip')
-for url, d in checksums.items():
-    m = gradle_bin_pat.search(url)
+soup = BeautifulSoup(r.text, 'html.parser')
+
+version_pat = re.compile(r'[0-9]+(\.[0-9]+)+')
+
+versions = dict()
+for a in soup.find_all('a'):
+    if a.parent.name != 'p':
+        continue
+    name = a.get('name')
+    if not name:
+        continue
+    m = version_pat.search(name)
     if m:
-        versions[m.group(1)] = d[0]['sha256']
+        ul = a.parent.find_next_sibling('ul')
+        versions[m.group()] = a.parent.find_next_sibling('ul').find('li').find('code').text.strip()
 
 errors = 0
 makebuildserver = os.path.join(os.path.dirname(__file__), os.pardir, 'makebuildserver')
 with open(makebuildserver) as fp:
-    makebuildserver_current = fp.read()
-to_compile = re.search(r'CACHE_FILES = [^\]]+\]', makebuildserver_current).group()
+    contents = fp.read()
+to_compile = re.search(r'CACHE_FILES = [^\]]+\]', contents, flags=re.DOTALL | re.MULTILINE).group()
 code = compile(to_compile, makebuildserver, 'exec')
 config = {}
 exec(code, None, config)  # nosec this is just a CI script
 makebuildserver_versions = []
-version_pat = re.compile(r'[0-9]+(\.[0-9]+)+')
 for url, checksum in config['CACHE_FILES']:
     if 'gradle.org' in url:
         m = version_pat.search(url.split('/')[-1])
         if m:
             makebuildserver_versions.append(m.group())
             if checksum != versions[m.group()]:
-                print(Fore.RED
-                      + 'ERROR: checksum mismatch:', checksum, versions[m.group()]
-                      + Style.RESET_ALL)
+                print('ERROR: checksum mismatch:', checksum, versions[m.group()])
                 errors += 1
 
 # error if makebuildserver is missing the latest version
 for version in sorted(versions.keys()):
     if version not in makebuildserver_versions \
-       and Version(version) > Version(sorted(makebuildserver_versions)[-1]):
-        add_before = """    ('https://dl.google.com/android/ndk/android-ndk-r10e-linux-x86_64.bin',"""
-        new = to_compile.replace(
-            add_before,
-            "    ('https://services.gradle.org/distributions/gradle-" + version + "-bin.zip',\n"
-            "     '" + versions[version] + "'),\n" + add_before
-        )
-        makebuildserver_current = makebuildserver_current.replace(to_compile, new)
+       and LooseVersion(version) > LooseVersion(sorted(makebuildserver_versions)[-1]):
+        errors += 1
+        print("    ('https://services.gradle.org/distributions/gradle-" + version + "-bin.zip',\n"
+              "     '" + versions[version] + "'),")
 
-with open('makebuildserver', 'w') as fp:
-    fp.write(makebuildserver_current)
-
-p = subprocess.run(['git', '--no-pager', 'diff'])
-errors += p.returncode
+print('makebuildserver has gradle v' + sorted(makebuildserver_versions)[-1])
 sys.exit(errors)
diff --git a/tests/import.TestCase b/tests/import.TestCase
new file mode 100755
index 00000000..70fe83df
--- /dev/null
+++ b/tests/import.TestCase
@@ -0,0 +1,101 @@
+#!/usr/bin/env python3
+
+# http://www.drdobbs.com/testing/unit-testing-with-python/240165163
+
+import inspect
+import logging
+import optparse
+import os
+import requests
+import shutil
+import sys
+import tempfile
+import unittest
+from unittest import mock
+
+localmodule = os.path.realpath(
+    os.path.join(os.path.dirname(inspect.getfile(inspect.currentframe())), '..'))
+print('localmodule: ' + localmodule)
+if localmodule not in sys.path:
+    sys.path.insert(0, localmodule)
+
+import fdroidserver.common
+import fdroidserver.metadata
+# work around the syntax error from: import fdroidserver.import
+import import_proxy
+
+
+class ImportTest(unittest.TestCase):
+    '''fdroid import'''
+
+    def setUp(self):
+        logging.basicConfig(level=logging.DEBUG)
+        self.basedir = os.path.join(localmodule, 'tests')
+        self.tmpdir = os.path.abspath(os.path.join(self.basedir, '..', '.testfiles'))
+        if not os.path.exists(self.tmpdir):
+            os.makedirs(self.tmpdir)
+        os.chdir(self.basedir)
+
+    def test_import_gitlab(self):
+        # FDroidPopen needs some config to work
+        config = dict()
+        fdroidserver.common.fill_config_defaults(config)
+        fdroidserver.common.config = config
+
+        url = 'https://gitlab.com/fdroid/ci-test-app'
+        r = requests.head(url)
+        if r.status_code != 200:
+            print("ERROR", url, 'unreachable (', r.status_code, ')')
+            print('Skipping ImportTest!')
+            return
+
+        app = fdroidserver.common.get_app_from_url(url)
+        import_proxy.clone_to_tmp_dir(app)
+        self.assertEqual(app.RepoType, 'git')
+        self.assertEqual(app.Repo, 'https://gitlab.com/fdroid/ci-test-app.git')
+
+    def test_get_app_from_url(self):
+        testdir = tempfile.mkdtemp(prefix=inspect.currentframe().f_code.co_name, dir=self.tmpdir)
+        os.chdir(testdir)
+        os.mkdir(os.path.join(testdir, 'tmp'))
+        tmp_importer = os.path.join(testdir, 'tmp', 'importer')
+        data = (
+            ('cn.wildfirechat.chat', 'https://github.com/wildfirechat/android-chat', '0.6.9', '23'),
+            ('com.anpmech.launcher', 'https://github.com/KeikaiLauncher/KeikaiLauncher', 'Unknown', None),
+            ('ut.ewh.audiometrytest', 'https://github.com/ReeceStevens/ut_ewh_audiometer_2014', '1.65', '14'),
+        )
+        for appid, url, vn, vc in data:
+            shutil.rmtree(tmp_importer, ignore_errors=True)
+            shutil.copytree(os.path.join(self.basedir, 'source-files', appid),
+                            tmp_importer)
+
+            app = fdroidserver.common.get_app_from_url(url)
+            with mock.patch('fdroidserver.common.getvcs',
+                            lambda a, b, c: fdroidserver.common.vcs(url, testdir)):
+                with mock.patch('fdroidserver.common.vcs.gotorevision',
+                                lambda s, rev: None):
+                    with mock.patch('shutil.rmtree', lambda a: None):
+                        build_dir = import_proxy.clone_to_tmp_dir(app)
+            self.assertEqual('git', app.RepoType)
+            self.assertEqual(url, app.Repo)
+            self.assertEqual(url, app.SourceCode)
+            logging.info(build_dir)
+            paths = fdroidserver.common.get_all_gradle_and_manifests(build_dir)
+            self.assertNotEqual(paths, [])
+            versionName, versionCode, package = fdroidserver.common.parse_androidmanifests(paths, app)
+            self.assertEqual(vn, versionName)
+            self.assertEqual(vc, versionCode)
+            self.assertEqual(appid, package)
+
+
+if __name__ == "__main__":
+    os.chdir(os.path.dirname(__file__))
+
+    parser = optparse.OptionParser()
+    parser.add_option("-v", "--verbose", action="store_true", default=False,
+                      help="Spew out even more information than normal")
+    (fdroidserver.common.options, args) = parser.parse_args(['--verbose'])
+
+    newSuite = unittest.TestSuite()
+    newSuite.addTest(unittest.makeSuite(ImportTest))
+    unittest.main(failfast=False)
diff --git a/tests/import_proxy.py b/tests/import_proxy.py
new file mode 100644
index 00000000..f230fdb1
--- /dev/null
+++ b/tests/import_proxy.py
@@ -0,0 +1,26 @@
+# workaround the syntax error from: import fdroidserver.import
+
+import inspect
+import os
+import sys
+
+localmodule = os.path.realpath(
+    os.path.join(os.path.dirname(inspect.getfile(inspect.currentframe())), '..'))
+print('localmodule: ' + localmodule)
+if localmodule not in sys.path:
+    sys.path.insert(0, localmodule)
+
+class Options:
+    def __init__(self):
+        self.rev = None
+        self.subdir = None
+
+module = __import__('fdroidserver.import')
+for name, obj in inspect.getmembers(module):
+    if name == 'import':
+        clone_to_tmp_dir = obj.clone_to_tmp_dir
+        obj.options = Options()
+        options = obj.options
+        break
+
+globals().update(vars(module))
diff --git a/tests/index.TestCase b/tests/index.TestCase
new file mode 100755
index 00000000..10a5b9a6
--- /dev/null
+++ b/tests/index.TestCase
@@ -0,0 +1,262 @@
+#!/usr/bin/env python3
+
+import datetime
+import inspect
+import logging
+import optparse
+import os
+import sys
+import unittest
+import zipfile
+from unittest.mock import patch
+import requests
+import tempfile
+import json
+import shutil
+
+localmodule = os.path.realpath(
+    os.path.join(os.path.dirname(inspect.getfile(inspect.currentframe())), '..'))
+print('localmodule: ' + localmodule)
+if localmodule not in sys.path:
+    sys.path.insert(0, localmodule)
+
+import fdroidserver.common
+import fdroidserver.index
+import fdroidserver.signindex
+import fdroidserver.publish
+from testcommon import TmpCwd
+
+
+GP_FINGERPRINT = 'B7C2EEFD8DAC7806AF67DFCD92EB18126BC08312A7F2D6F3862E46013C7A6135'
+
+
+class Options:
+    nosign = True
+    pretty = False
+    verbose = False
+
+
+class IndexTest(unittest.TestCase):
+
+    def setUp(self):
+        logging.basicConfig(level=logging.DEBUG)
+        self.basedir = os.path.join(localmodule, 'tests')
+        os.chmod(os.path.join(self.basedir, 'config.py'), 0o600)
+        self.tmpdir = os.path.abspath(os.path.join(self.basedir, '..', '.testfiles'))
+        if not os.path.exists(self.tmpdir):
+            os.makedirs(self.tmpdir)
+        os.chdir(self.basedir)
+
+        fdroidserver.common.config = None
+        fdroidserver.common.options = Options
+        config = fdroidserver.common.read_config(fdroidserver.common.options)
+        config['jarsigner'] = fdroidserver.common.find_sdk_tools_cmd('jarsigner')
+        fdroidserver.common.config = config
+        fdroidserver.signindex.config = config
+
+    def test_get_public_key_from_jar_succeeds(self):
+        source_dir = os.path.join(self.basedir, 'signindex')
+        for f in ('testy.jar', 'guardianproject.jar'):
+            testfile = os.path.join(source_dir, f)
+            jar = zipfile.ZipFile(testfile)
+            _, fingerprint = fdroidserver.index.get_public_key_from_jar(jar)
+            # comparing fingerprints should be sufficient
+            if f == 'testy.jar':
+                self.assertEqual(fingerprint,
+                                 '818E469465F96B704E27BE2FEE4C63AB'
+                                 + '9F83DDF30E7A34C7371A4728D83B0BC1')
+            if f == 'guardianproject.jar':
+                self.assertTrue(fingerprint == GP_FINGERPRINT)
+
+    def test_get_public_key_from_jar_fails(self):
+        source_dir = os.path.join(self.basedir, 'signindex')
+        testfile = os.path.join(source_dir, 'unsigned.jar')
+        jar = zipfile.ZipFile(testfile)
+        with self.assertRaises(fdroidserver.index.VerificationException):
+            fdroidserver.index.get_public_key_from_jar(jar)
+
+    def test_download_repo_index_no_fingerprint(self):
+        with self.assertRaises(fdroidserver.index.VerificationException):
+            fdroidserver.index.download_repo_index("http://example.org")
+
+    def test_download_repo_index_no_jar(self):
+        with self.assertRaises(requests.exceptions.RequestException):
+            fdroidserver.index.download_repo_index("http://example.org?fingerprint=nope")
+
+    @patch('requests.head')
+    def test_download_repo_index_same_etag(self, head):
+        url = 'http://example.org?fingerprint=test'
+        etag = '"4de5-54d840ce95cb9"'
+
+        head.return_value.headers = {'ETag': etag}
+        index, new_etag = fdroidserver.index.download_repo_index(url, etag=etag)
+
+        self.assertIsNone(index)
+        self.assertEqual(etag, new_etag)
+
+    @patch('requests.get')
+    @patch('requests.head')
+    def test_download_repo_index_new_etag(self, head, get):
+        url = 'http://example.org?fingerprint=' + GP_FINGERPRINT
+        etag = '"4de5-54d840ce95cb9"'
+
+        # fake HTTP answers
+        head.return_value.headers = {'ETag': 'new_etag'}
+        get.return_value.headers = {'ETag': 'new_etag'}
+        get.return_value.status_code = 200
+        testfile = os.path.join('signindex', 'guardianproject-v1.jar')
+        with open(testfile, 'rb') as file:
+            get.return_value.content = file.read()
+
+        index, new_etag = fdroidserver.index.download_repo_index(url, etag=etag)
+
+        # assert that the index was retrieved properly
+        self.assertEqual('Guardian Project Official Releases', index['repo']['name'])
+        self.assertEqual(GP_FINGERPRINT, index['repo']['fingerprint'])
+        self.assertTrue(len(index['repo']['pubkey']) > 500)
+        self.assertEqual(10, len(index['apps']))
+        self.assertEqual(10, len(index['packages']))
+        self.assertEqual('new_etag', new_etag)
+
+    def test_v1_sort_packages(self):
+
+        i = [{'packageName': 'org.smssecure.smssecure',
+              'apkName': 'org.smssecure.smssecure_134.apk',
+              'signer': 'b33a601a9da97c82e6eb121eb6b90adab561f396602ec4dc8b0019fb587e2af6',
+              'versionCode': 134},
+             {'packageName': 'org.smssecure.smssecure',
+              'apkName': 'org.smssecure.smssecure_134_b30bb97.apk',
+              'signer': 'b30bb971af0d134866e158ec748fcd553df97c150f58b0a963190bbafbeb0868',
+              'versionCode': 134},
+             {'packageName': 'b075b32b4ef1e8a869e00edb136bd48e34a0382b85ced8628f164d1199584e4e'},
+             {'packageName': '43af70d1aca437c2f9974c4634cc5abe45bdc4d5d71529ac4e553488d3bb3ff6'},
+             {'packageName': 'org.smssecure.smssecure',
+              'apkName': 'org.smssecure.smssecure_135_b30bb97.apk',
+              'signer': 'b30bb971af0d134866e158ec748fcd553df97c150f58b0a963190bbafbeb0868',
+              'versionCode': 135},
+             {'packageName': 'org.smssecure.smssecure',
+              'apkName': 'org.smssecure.smssecure_135.apk',
+              'signer': 'b33a601a9da97c82e6eb121eb6b90adab561f396602ec4dc8b0019fb587e2af6',
+              'versionCode': 135},
+             {'packageName': 'org.smssecure.smssecure',
+              'apkName': 'org.smssecure.smssecure_133.apk',
+              'signer': 'b33a601a9da97c82e6eb121eb6b90adab561f396602ec4dc8b0019fb587e2af6',
+              'versionCode': 133},
+             {'packageName': 'org.smssecure.smssecure',
+              'apkName': 'smssecure-weird-version.apk',
+              'signer': '99ff99ff99ff99ff99ff99ff99ff99ff99ff99ff99ff99ff99ff99ff99ff99ff',
+              'versionCode': 133},
+             {'packageName': 'org.smssecure.smssecure',
+              'apkName': 'smssecure-custom.apk',
+              'signer': '1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef',
+              'versionCode': 133},
+             {'packageName': 'org.smssecure.smssecure',
+              'apkName': 'smssecure-new-custom.apk',
+              'signer': '1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef',
+              'versionCode': 135}]
+
+        o = [{'packageName': '43af70d1aca437c2f9974c4634cc5abe45bdc4d5d71529ac4e553488d3bb3ff6'},
+             {'packageName': 'b075b32b4ef1e8a869e00edb136bd48e34a0382b85ced8628f164d1199584e4e'},
+             # app test data
+             # # packages with reproducible developer signature
+             {'packageName': 'org.smssecure.smssecure',
+              'apkName': 'org.smssecure.smssecure_135_b30bb97.apk',
+              'signer': 'b30bb971af0d134866e158ec748fcd553df97c150f58b0a963190bbafbeb0868',
+              'versionCode': 135},
+             {'packageName': 'org.smssecure.smssecure',
+              'apkName': 'org.smssecure.smssecure_134_b30bb97.apk',
+              'signer': 'b30bb971af0d134866e158ec748fcd553df97c150f58b0a963190bbafbeb0868',
+              'versionCode': 134},
+             # # packages build and signed by fdroid
+             {'packageName': 'org.smssecure.smssecure',
+              'apkName': 'org.smssecure.smssecure_135.apk',
+              'signer': 'b33a601a9da97c82e6eb121eb6b90adab561f396602ec4dc8b0019fb587e2af6',
+              'versionCode': 135},
+             {'packageName': 'org.smssecure.smssecure',
+              'apkName': 'org.smssecure.smssecure_134.apk',
+              'signer': 'b33a601a9da97c82e6eb121eb6b90adab561f396602ec4dc8b0019fb587e2af6',
+              'versionCode': 134},
+             {'packageName': 'org.smssecure.smssecure',
+              'apkName': 'org.smssecure.smssecure_133.apk',
+              'signer': 'b33a601a9da97c82e6eb121eb6b90adab561f396602ec4dc8b0019fb587e2af6',
+              'versionCode': 133},
+             # # packages signed with unkown keys
+             {'packageName': 'org.smssecure.smssecure',
+              'apkName': 'smssecure-new-custom.apk',
+              'signer': '1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef',
+              'versionCode': 135},
+             {'packageName': 'org.smssecure.smssecure',
+              'apkName': 'smssecure-custom.apk',
+              'signer': '1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef',
+              'versionCode': 133},
+             {'packageName': 'org.smssecure.smssecure',
+              'apkName': 'smssecure-weird-version.apk',
+              'signer': '99ff99ff99ff99ff99ff99ff99ff99ff99ff99ff99ff99ff99ff99ff99ff99ff',
+              'versionCode': 133}]
+
+        fdroidserver.common.config = {}
+        fdroidserver.common.fill_config_defaults(fdroidserver.common.config)
+        fdroidserver.publish.config = fdroidserver.common.config
+        fdroidserver.publish.config['keystorepass'] = '123456'
+        fdroidserver.publish.config['keypass'] = '123456'
+        fdroidserver.publish.config['keystore'] = os.path.join(os.getcwd(),
+                                                               'dummy-keystore.jks')
+        fdroidserver.publish.config['repo_keyalias'] = 'repokey'
+
+        testsmetadir = os.path.join(os.getcwd(), 'metadata')
+        with tempfile.TemporaryDirectory() as tmpdir, TmpCwd(tmpdir):
+            shutil.copytree(testsmetadir, 'metadata')
+            sigkeyfps = {
+                "org.smssecure.smssecure": {
+                    "signer": "b33a601a9da97c82e6eb121eb6b90adab561f396602ec4dc8b0019fb587e2af6"
+                }
+            }
+            os.makedirs('stats')
+            jarfile = 'stats/publishsigkeys.jar'
+            with zipfile.ZipFile(jarfile, 'w', zipfile.ZIP_DEFLATED) as jar:
+                jar.writestr('publishsigkeys.json', json.dumps(sigkeyfps))
+            fdroidserver.publish.sign_sig_key_fingerprint_list(jarfile)
+            with open('config.py', 'w'):
+                pass
+
+            fdroidserver.index.v1_sort_packages(
+                i, fdroidserver.common.load_stats_fdroid_signing_key_fingerprints())
+            self.maxDiff = None
+            self.assertEqual(json.dumps(i, indent=2), json.dumps(o, indent=2))
+
+    def test_make_v0(self):
+        tmptestsdir = tempfile.mkdtemp(prefix=inspect.currentframe().f_code.co_name,
+                                       dir=self.tmpdir)
+        os.chdir(tmptestsdir)
+        os.mkdir('repo')
+        repo_icons_dir = os.path.join('repo', 'icons')
+        self.assertFalse(os.path.isdir(repo_icons_dir))
+        repodict = {
+            'address': 'https://example.com/fdroid/repo',
+            'description': 'This is just a test',
+            'icon': 'blahblah',
+            'name': 'test',
+            'timestamp': datetime.datetime.now(),
+            'version': 12,
+        }
+        requestsdict = {'install': [], 'uninstall': []}
+        fdroidserver.common.config['repo_pubkey'] = 'ffffffffffffffffffffffffffffffffff'
+        fdroidserver.index.make_v0({}, [], 'repo', repodict, requestsdict, [])
+        self.assertTrue(os.path.isdir(repo_icons_dir))
+        self.assertTrue(os.path.exists(os.path.join(repo_icons_dir,
+                                                    fdroidserver.common.default_config['repo_icon'])))
+        self.assertTrue(os.path.exists(os.path.join('repo', 'index.xml')))
+
+
+if __name__ == "__main__":
+    os.chdir(os.path.dirname(__file__))
+
+    parser = optparse.OptionParser()
+    parser.add_option("-v", "--verbose", action="store_true", default=False,
+                      help="Spew out even more information than normal")
+    (options, args) = parser.parse_args()
+    Options.verbose = options.verbose
+
+    newSuite = unittest.TestSuite()
+    newSuite.addTest(unittest.makeSuite(IndexTest))
+    unittest.main(failfast=False)
diff --git a/tests/init.TestCase b/tests/init.TestCase
new file mode 100755
index 00000000..f080ff74
--- /dev/null
+++ b/tests/init.TestCase
@@ -0,0 +1,62 @@
+#!/usr/bin/env python3
+
+# http://www.drdobbs.com/testing/unit-testing-with-python/240165163
+
+import inspect
+import logging
+import os
+import optparse
+import sys
+import tempfile
+import unittest
+
+
+localmodule = os.path.realpath(
+    os.path.join(os.path.dirname(inspect.getfile(inspect.currentframe())), '..'))
+print('localmodule: ' + localmodule)
+if localmodule not in sys.path:
+    sys.path.insert(0, localmodule)
+
+import fdroidserver.init
+
+
+class InitTest(unittest.TestCase):
+    '''fdroidserver/init.py'''
+
+    def setUp(self):
+        logging.basicConfig(level=logging.DEBUG)
+        self.basedir = os.path.join(localmodule, 'tests')
+        self.tmpdir = os.path.abspath(os.path.join(self.basedir, '..', '.testfiles'))
+        if not os.path.exists(self.tmpdir):
+            os.makedirs(self.tmpdir)
+        os.chdir(self.basedir)
+        fdroidserver.init.config = None
+
+    def test_disable_in_config(self):
+        testdir = tempfile.mkdtemp(prefix=inspect.currentframe().f_code.co_name, dir=self.tmpdir)
+        os.chdir(testdir)
+        with open('config.yml', 'w') as fp:
+            fp.write('keystore: NONE\n')
+            fp.write('keypass: mysupersecrets\n')
+        config = fdroidserver.common.read_config(fdroidserver.common.options)
+        self.assertEqual('NONE', config['keystore'])
+        self.assertEqual('mysupersecrets', config['keypass'])
+        fdroidserver.init.disable_in_config('keypass', 'comment')
+        with open(fp.name) as fp:
+            self.assertTrue('#keypass:' in fp.read())
+        fdroidserver.common.config = None
+        config = fdroidserver.common.read_config(fdroidserver.common.options)
+        self.assertIsNone(config.get('keypass'))
+
+
+if __name__ == "__main__":
+    os.chdir(os.path.dirname(__file__))
+
+    parser = optparse.OptionParser()
+    parser.add_option("-v", "--verbose", action="store_true", default=False,
+                      help="Spew out even more information than normal")
+    (fdroidserver.init.options, args) = parser.parse_args(['--verbose'])
+
+    newSuite = unittest.TestSuite()
+    newSuite.addTest(unittest.makeSuite(InitTest))
+    unittest.main(failfast=False)
diff --git a/tests/install.TestCase b/tests/install.TestCase
new file mode 100755
index 00000000..e7bdb6e2
--- /dev/null
+++ b/tests/install.TestCase
@@ -0,0 +1,48 @@
+#!/usr/bin/env python3
+
+# http://www.drdobbs.com/testing/unit-testing-with-python/240165163
+
+import inspect
+import optparse
+import os
+import sys
+import unittest
+
+localmodule = os.path.realpath(
+    os.path.join(os.path.dirname(inspect.getfile(inspect.currentframe())), '..'))
+print('localmodule: ' + localmodule)
+if localmodule not in sys.path:
+    sys.path.insert(0, localmodule)
+
+import fdroidserver.common
+import fdroidserver.install
+
+
+class InstallTest(unittest.TestCase):
+    '''fdroidserver/install.py'''
+
+    def test_devices(self):
+        config = dict()
+        fdroidserver.common.fill_config_defaults(config)
+        fdroidserver.common.config = config
+        config['adb'] = fdroidserver.common.find_sdk_tools_cmd('adb')
+        self.assertTrue(os.path.exists(config['adb']))
+        self.assertTrue(os.path.isfile(config['adb']))
+        devices = fdroidserver.install.devices()
+        self.assertIsInstance(devices, list, 'install.devices() did not return a list!')
+        for device in devices:
+            self.assertIsInstance(device, str)
+
+
+if __name__ == "__main__":
+    os.chdir(os.path.dirname(__file__))
+
+    parser = optparse.OptionParser()
+    parser.add_option("-v", "--verbose", action="store_true", default=False,
+                      help="Spew out even more information than normal")
+    (fdroidserver.install.options, args) = parser.parse_args(['--verbose'])
+    fdroidserver.common.options = fdroidserver.install.options
+
+    newSuite = unittest.TestSuite()
+    newSuite.addTest(unittest.makeSuite(InstallTest))
+    unittest.main(failfast=False)
diff --git a/tests/issue-1128-min-sdk-30-poc.apk b/tests/issue-1128-min-sdk-30-poc.apk
deleted file mode 100644
index bef0297f..00000000
Binary files a/tests/issue-1128-min-sdk-30-poc.apk and /dev/null differ
diff --git a/tests/issue-1128-poc1.apk b/tests/issue-1128-poc1.apk
deleted file mode 100644
index ba643f3d..00000000
Binary files a/tests/issue-1128-poc1.apk and /dev/null differ
diff --git a/tests/issue-1128-poc2.apk b/tests/issue-1128-poc2.apk
deleted file mode 100644
index b9947df8..00000000
Binary files a/tests/issue-1128-poc2.apk and /dev/null differ
diff --git a/tests/issue-1128-poc3a.apk b/tests/issue-1128-poc3a.apk
deleted file mode 100644
index f6630d15..00000000
Binary files a/tests/issue-1128-poc3a.apk and /dev/null differ
diff --git a/tests/issue-1128-poc3b.apk b/tests/issue-1128-poc3b.apk
deleted file mode 100644
index 91f536e3..00000000
Binary files a/tests/issue-1128-poc3b.apk and /dev/null differ
diff --git a/tests/key-tricks.py b/tests/key-tricks.py
deleted file mode 100755
index a01bf0bf..00000000
--- a/tests/key-tricks.py
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/usr/bin/env python3
-
-import os
-import shutil
-import sys
-
-import fdroidserver
-from fdroidserver import common, nightly
-
-if os.getenv('CI') is None:
-    print('ERROR: This can overwrite SSH keys, so it should only be run in CI')
-    sys.exit(1)
-
-os.chdir(os.path.dirname(__file__))
-config = fdroidserver.common.read_config()
-nightly.PASSWORD = config['keystorepass']
-nightly.KEY_ALIAS = config['repo_keyalias']
-
-privkey = nightly._ssh_key_from_debug_keystore('keystore.jks')
-print('privkey', privkey)
-ssh_private_key_file = os.path.join(os.getenv('HOME'), '.ssh', 'id_rsa')
-if os.path.exists(ssh_private_key_file):
-    print('ERROR:', ssh_private_key_file, 'exists!')
-    sys.exit(1)
-shutil.move(privkey, ssh_private_key_file)
-shutil.move(privkey + '.pub', ssh_private_key_file + '.pub')
diff --git a/tests/lint.TestCase b/tests/lint.TestCase
new file mode 100755
index 00000000..09aca89f
--- /dev/null
+++ b/tests/lint.TestCase
@@ -0,0 +1,332 @@
+#!/usr/bin/env python3
+
+# http://www.drdobbs.com/testing/unit-testing-with-python/240165163
+
+import inspect
+import logging
+import optparse
+import os
+import shutil
+import sys
+import tempfile
+import unittest
+
+localmodule = os.path.realpath(
+    os.path.join(os.path.dirname(inspect.getfile(inspect.currentframe())), '..'))
+print('localmodule: ' + localmodule)
+if localmodule not in sys.path:
+    sys.path.insert(0, localmodule)
+
+import fdroidserver.common
+import fdroidserver.lint
+import fdroidserver.metadata
+
+
+class LintTest(unittest.TestCase):
+    '''fdroidserver/lint.py'''
+
+    def setUp(self):
+        logging.basicConfig(level=logging.INFO)
+        self.basedir = os.path.join(localmodule, 'tests')
+        self.tmpdir = os.path.abspath(os.path.join(self.basedir, '..', '.testfiles'))
+        if not os.path.exists(self.tmpdir):
+            os.makedirs(self.tmpdir)
+        os.chdir(self.basedir)
+
+    def test_check_for_unsupported_metadata_files(self):
+        self.assertTrue(fdroidserver.lint.check_for_unsupported_metadata_files())
+
+        tmptestsdir = tempfile.mkdtemp(prefix=inspect.currentframe().f_code.co_name,
+                                       dir=self.tmpdir)
+        self.assertFalse(fdroidserver.lint.check_for_unsupported_metadata_files(tmptestsdir + '/'))
+        shutil.copytree(os.path.join(localmodule, 'tests', 'metadata'),
+                        os.path.join(tmptestsdir, 'metadata'),
+                        ignore=shutil.ignore_patterns('apk', 'dump', '*.json'))
+        self.assertFalse(fdroidserver.lint.check_for_unsupported_metadata_files(tmptestsdir + '/'))
+        with open(os.path.join(tmptestsdir, 'metadata', 'org.adaway.json'), 'w') as fp:
+            fp.write('placeholder')
+        self.assertTrue(fdroidserver.lint.check_for_unsupported_metadata_files(tmptestsdir + '/'))
+
+    def test_forbidden_html_tags(self):
+        config = dict()
+        fdroidserver.common.fill_config_defaults(config)
+        fdroidserver.common.config = config
+        fdroidserver.lint.config = config
+
+        app = {
+            'Name': 'Bad App',
+            'Summary': 'We pwn you',
+            'Description': 'This way: <style><img src="</style><img src=x onerror=alert(1)//">',
+        }
+
+        anywarns = False
+        for warn in fdroidserver.lint.check_regexes(app):
+            anywarns = True
+            logging.debug(warn)
+        self.assertTrue(anywarns)
+
+    def test_source_urls(self):
+        config = dict()
+        fdroidserver.common.fill_config_defaults(config)
+        fdroidserver.common.config = config
+        fdroidserver.lint.config = config
+
+        app = {
+            'Name': 'My App',
+            'Summary': 'just a placeholder',
+            'Description': 'This app does all sorts of useful stuff',
+        }
+        good_urls = [
+            'https://github.com/Matteljay/mastermindy-android',
+            'https://gitlab.com/origin/master',
+            'https://gitlab.com/group/subgroup/masterthing',
+            'https://raw.githubusercontent.com/Seva-coder/Finder/HEAD/ChangeLog.txt',
+            'https://github.com/scoutant/blokish/blob/HEAD/README.md#changelog',
+            'https://git.ieval.ro/?p=fonbot.git;a=blob;f=Changes;hb=HEAD',
+            'https://htmlpreview.github.io/?https://github.com/YasuakiHonda/Maxima-on-Android-AS/blob/HEAD/app/src/main/assets/About_MoA/index.html',
+            '',
+        ]
+
+        anywarns = False
+        for url in good_urls:
+            app['SourceCode'] = url
+            for warn in fdroidserver.lint.check_regexes(app):
+                anywarns = True
+                logging.debug(warn)
+        self.assertFalse(anywarns)
+
+        bad_urls = [
+            'github.com/my/proj',
+            'http://github.com/not/secure',
+            'https://github.com/foo/bar.git',
+            'https://gitlab.com/group/subgroup/project.git',
+            'https://raw.githubusercontent.com/Seva-coder/Finder/master/ChangeLog.txt',
+            'https://github.com/scoutant/blokish/blob/master/README.md#changelog',
+            'http://htmlpreview.github.io/?https://github.com/my/project/blob/HEAD/index.html',
+            'http://fdroid.gitlab.io/fdroid-website',
+        ]
+        logging.debug('bad urls:')
+        for url in bad_urls:
+            anywarns = False
+            app['SourceCode'] = url
+            for warn in fdroidserver.lint.check_regexes(app):
+                anywarns = True
+                logging.debug(warn)
+            self.assertTrue(anywarns, url + " does not fail lint!")
+
+    def test_check_app_field_types(self):
+        config = dict()
+        fdroidserver.common.fill_config_defaults(config)
+        fdroidserver.common.config = config
+        fdroidserver.lint.config = config
+
+        app = fdroidserver.metadata.App()
+        app.id = 'fake.app'
+        app.Name = 'Bad App'
+        app.Summary = 'We pwn you'
+        app.Description = 'These are some back'
+
+        fields = {
+            'AntiFeatures': {
+                'good': [
+                    ['KnownVuln', ],
+                    ['NonFreeNet', 'KnownVuln'],
+                ],
+                'bad': [
+                    'KnownVuln',
+                    'NonFreeNet,KnownVuln',
+                ],
+            },
+            'Categories': {
+                'good': [
+                    ['Sports & Health', ],
+                    ['Multimedia', 'Graphics'],
+                ],
+                'bad': [
+                    'Science & Education',
+                    'Multimedia,Graphics',
+                ],
+            },
+            'WebSite': {
+                'good': [
+                    'https://homepage.com',
+                ],
+                'bad': [
+                    [],
+                    ['nope', ],
+                    29,
+                ],
+            },
+        }
+
+        for field, values in fields.items():
+
+            for bad in values['bad']:
+                anywarns = False
+                app[field] = bad
+                for warn in fdroidserver.lint.check_app_field_types(app):
+                    anywarns = True
+                    logging.debug(warn)
+                self.assertTrue(anywarns)
+
+            for good in values['good']:
+                anywarns = False
+                app[field] = good
+                for warn in fdroidserver.lint.check_app_field_types(app):
+                    anywarns = True
+                    logging.debug(warn)
+                self.assertFalse(anywarns)
+
+    def test_check_vercode_operation(self):
+        config = dict()
+        fdroidserver.common.fill_config_defaults(config)
+        fdroidserver.common.config = config
+        fdroidserver.lint.config = config
+
+        app = fdroidserver.metadata.App()
+        app.Name = 'Bad App'
+        app.Summary = 'We pwn you'
+        app.Description = 'These are some back'
+
+        good_fields = [
+            '6%c',
+            '%c - 1',
+            '%c + 10',
+            '%c*10',
+            '%c*10 + 3',
+            '%c*10 + 8',
+            '%c + 2 ',
+            '%c + 3',
+            '%c + 7',
+        ]
+        bad_fields = [
+            'open("/etc/passwd")',
+            '%C + 1',
+            '%%c * 123',
+            '123 + %%',
+            '%c % 7',
+        ]
+
+        anywarns = False
+        for good in good_fields:
+            app.VercodeOperation = good
+            for warn in fdroidserver.lint.check_vercode_operation(app):
+                anywarns = True
+                logging.debug(warn)
+            self.assertFalse(anywarns)
+
+        for bad in bad_fields:
+            anywarns = False
+            app.VercodeOperation = bad
+            for warn in fdroidserver.lint.check_vercode_operation(app):
+                anywarns = True
+                logging.debug(warn)
+            self.assertTrue(anywarns)
+
+    def test_check_license_tag_no_custom_pass(self):
+        config = dict()
+        fdroidserver.common.fill_config_defaults(config)
+        fdroidserver.common.config = config
+        fdroidserver.lint.config = config
+
+        app = fdroidserver.metadata.App()
+        app.License = "GPL-3.0-or-later"
+
+        anywarns = False
+        for warn in fdroidserver.lint.check_license_tag(app):
+            anywarns = True
+            logging.debug(warn)
+        self.assertFalse(anywarns)
+
+    def test_check_license_tag_no_custom_fail(self):
+        config = dict()
+        fdroidserver.common.fill_config_defaults(config)
+        fdroidserver.common.config = config
+        fdroidserver.lint.config = config
+
+        app = fdroidserver.metadata.App()
+        app.License = "Adobe-2006"
+
+        anywarns = False
+        for warn in fdroidserver.lint.check_license_tag(app):
+            anywarns = True
+            logging.debug(warn)
+        self.assertTrue(anywarns)
+
+    def test_check_license_tag_with_custom_pass(self):
+        config = dict()
+        fdroidserver.common.fill_config_defaults(config)
+        fdroidserver.common.config = config
+        fdroidserver.lint.config = config
+        config['lint_licenses'] = ['fancy-license', 'GPL-3.0-or-later']
+
+        app = fdroidserver.metadata.App()
+        app.License = "fancy-license"
+
+        anywarns = False
+        for warn in fdroidserver.lint.check_license_tag(app):
+            anywarns = True
+            logging.debug(warn)
+        self.assertFalse(anywarns)
+
+    def test_check_license_tag_with_custom_fail(self):
+        config = dict()
+        fdroidserver.common.fill_config_defaults(config)
+        fdroidserver.common.config = config
+        fdroidserver.lint.config = config
+        config['lint_licenses'] = ['fancy-license', 'GPL-3.0-or-later']
+
+        app = fdroidserver.metadata.App()
+        app.License = "Apache-2.0"
+
+        anywarns = False
+        for warn in fdroidserver.lint.check_license_tag(app):
+            anywarns = True
+            logging.debug(warn)
+        self.assertTrue(anywarns)
+
+    def test_check_license_tag_with_custom_empty(self):
+        config = dict()
+        fdroidserver.common.fill_config_defaults(config)
+        fdroidserver.common.config = config
+        fdroidserver.lint.config = config
+        config['lint_licenses'] = []
+
+        app = fdroidserver.metadata.App()
+        app.License = "Apache-2.0"
+
+        anywarns = False
+        for warn in fdroidserver.lint.check_license_tag(app):
+            anywarns = True
+            logging.debug(warn)
+        self.assertTrue(anywarns)
+
+    def test_check_license_tag_disabled(self):
+        config = dict()
+        fdroidserver.common.fill_config_defaults(config)
+        fdroidserver.common.config = config
+        fdroidserver.lint.config = config
+        config['lint_licenses'] = None
+
+        app = fdroidserver.metadata.App()
+        app.License = "Apache-2.0"
+
+        anywarns = False
+        for warn in fdroidserver.lint.check_license_tag(app):
+            anywarns = True
+            logging.debug(warn)
+        self.assertFalse(anywarns)
+
+
+if __name__ == "__main__":
+    os.chdir(os.path.dirname(__file__))
+
+    parser = optparse.OptionParser()
+    parser.add_option("-v", "--verbose", action="store_true", default=False,
+                      help="Spew out even more information than normal")
+    (fdroidserver.lint.options, args) = parser.parse_args(['--verbose'])
+    fdroidserver.common.options = fdroidserver.lint.options
+
+    newSuite = unittest.TestSuite()
+    newSuite.addTest(unittest.makeSuite(LintTest))
+    unittest.main(failfast=False)
diff --git a/tests/test_main.py b/tests/main.TestCase
similarity index 64%
rename from tests/test_main.py
rename to tests/main.TestCase
index 68984088..11e4410b 100755
--- a/tests/test_main.py
+++ b/tests/main.TestCase
@@ -1,46 +1,52 @@
 #!/usr/bin/env python3
 
+import inspect
+import optparse
 import os
+import sys
 import pkgutil
-import tempfile
 import textwrap
 import unittest
+import tempfile
 from unittest import mock
+from testcommon import TmpCwd, TmpPyPath
 
+localmodule = os.path.realpath(
+    os.path.join(os.path.dirname(inspect.getfile(inspect.currentframe())), '..'))
+print('localmodule: ' + localmodule)
+if localmodule not in sys.path:
+    sys.path.insert(0, localmodule)
+
+from fdroidserver import common
 import fdroidserver.__main__
 
-from .shared_test_code import TmpCwd, TmpPyPath
-
 
 class MainTest(unittest.TestCase):
     '''this tests fdroid.py'''
 
     def test_COMMANDS_check(self):
         """make sure the built in sub-command defs didn't change unintentionally"""
-        self.assertListEqual(
-            [x for x in fdroidserver.__main__.COMMANDS],
-            [
-                'build',
-                'init',
-                'publish',
-                'gpgsign',
-                'update',
-                'deploy',
-                'verify',
-                'checkupdates',
-                'import',
-                'install',
-                'readmeta',
-                'rewritemeta',
-                'lint',
-                'scanner',
-                'signindex',
-                'btlog',
-                'signatures',
-                'nightly',
-                'mirror',
-            ],
-        )
+        self.assertListEqual([x for x in fdroidserver.__main__.COMMANDS.keys()],
+                             ['build',
+                              'init',
+                              'publish',
+                              'gpgsign',
+                              'update',
+                              'deploy',
+                              'verify',
+                              'checkupdates',
+                              'import',
+                              'install',
+                              'readmeta',
+                              'rewritemeta',
+                              'lint',
+                              'scanner',
+                              'stats',
+                              'signindex',
+                              'btlog',
+                              'signatures',
+                              'nightly',
+                              'mirror'])
 
     def test_call_init(self):
         co = mock.Mock()
@@ -67,34 +73,26 @@ class MainTest(unittest.TestCase):
     def test_find_plugins(self):
         with tempfile.TemporaryDirectory() as tmpdir, TmpCwd(tmpdir):
             with open('fdroid_testy1.py', 'w') as f:
-                f.write(
-                    textwrap.dedent(
-                        """\
+                f.write(textwrap.dedent("""\
                         fdroid_summary = "ttt"
-                        main = lambda: 'all good'"""
-                    )
-                )
+                        main = lambda: 'all good'"""))
             with TmpPyPath(tmpdir):
                 plugins = fdroidserver.__main__.find_plugins()
                 self.assertIn('testy1', plugins.keys())
                 self.assertEqual(plugins['testy1']['summary'], 'ttt')
-                self.assertEqual(
-                    __import__(
-                        plugins['testy1']['name'], None, None, ['testy1']
-                    ).main(),
-                    'all good',
-                )
+                self.assertEqual(__import__(plugins['testy1']['name'],
+                                            None,
+                                            None,
+                                            ['testy1'])
+                                 .main(),
+                                 'all good')
 
     def test_main_plugin_lambda(self):
         with tempfile.TemporaryDirectory() as tmpdir, TmpCwd(tmpdir):
             with open('fdroid_testy2.py', 'w') as f:
-                f.write(
-                    textwrap.dedent(
-                        """\
+                f.write(textwrap.dedent("""\
                         fdroid_summary = "ttt"
-                        main = lambda: print('all good')"""
-                    )
-                )
+                        main = lambda: print('all good')"""))
             with TmpPyPath(tmpdir):
                 with mock.patch('sys.argv', ['', 'testy2']):
                     with mock.patch('sys.exit') as exit_mock:
@@ -104,14 +102,10 @@ class MainTest(unittest.TestCase):
     def test_main_plugin_def(self):
         with tempfile.TemporaryDirectory() as tmpdir, TmpCwd(tmpdir):
             with open('fdroid_testy3.py', 'w') as f:
-                f.write(
-                    textwrap.dedent(
-                        """\
+                f.write(textwrap.dedent("""\
                         fdroid_summary = "ttt"
                         def main():
-                            print('all good')"""
-                    )
-                )
+                            print('all good')"""))
             with TmpPyPath(tmpdir):
                 with mock.patch('sys.argv', ['', 'testy3']):
                     with mock.patch('sys.exit') as exit_mock:
@@ -122,14 +116,10 @@ class MainTest(unittest.TestCase):
         """making sure broken plugins get their exceptions through"""
         with tempfile.TemporaryDirectory() as tmpdir, TmpCwd(tmpdir):
             with open('fdroid_testy4.py', 'w') as f:
-                f.write(
-                    textwrap.dedent(
-                        """\
+                f.write(textwrap.dedent("""\
                         fdroid_summary = "ttt"
                         def main():
-                            raise Exception("this plugin is broken")"""
-                    )
-                )
+                            raise Exception("this plugin is broken")"""))
             with TmpPyPath(tmpdir):
                 with mock.patch('sys.argv', ['', 'testy4']):
                     with self.assertRaisesRegex(Exception, "this plugin is broken"):
@@ -141,15 +131,11 @@ class MainTest(unittest.TestCase):
         """
         with tempfile.TemporaryDirectory() as tmpdir, TmpCwd(tmpdir):
             with open('fdroid_testy5.py', 'w') as f:
-                f.write(
-                    textwrap.dedent(
-                        """\
+                f.write(textwrap.dedent("""\
                         fdroid_summary = "ttt"
                         raise Exception("this plugin is malicious")
                         def main():
-                            print("evil things")"""
-                    )
-                )
+                            print("evil things")"""))
             with TmpPyPath(tmpdir):
                 with mock.patch('sys.argv', ['', 'lint']):
                     with mock.patch('sys.exit') as exit_mock:
@@ -159,17 +145,14 @@ class MainTest(unittest.TestCase):
                         exit_mock.assert_called_once_with(0)
 
     def test_main_prevent_plugin_override(self):
-        """making sure build-in subcommands cannot be overridden by plugins"""
+        """making sure build-in subcommands cannot be overridden by plugins
+        """
         with tempfile.TemporaryDirectory() as tmpdir, TmpCwd(tmpdir):
             with open('fdroid_signatures.py', 'w') as f:
-                f.write(
-                    textwrap.dedent(
-                        """\
+                f.write(textwrap.dedent("""\
                         fdroid_summary = "ttt"
                         def main():
-                            raise("plugin overrides don't get prevent!")"""
-                    )
-                )
+                            raise("plugin overrides don't get prevent!")"""))
             with TmpPyPath(tmpdir):
                 with mock.patch('sys.argv', ['', 'signatures']):
                     with mock.patch('sys.exit') as exit_mock:
@@ -179,64 +162,49 @@ class MainTest(unittest.TestCase):
                         self.assertEqual(exit_mock.call_count, 2)
 
     def test_preparse_plugin_lookup_bad_name(self):
-        self.assertRaises(
-            ValueError,
-            fdroidserver.__main__.preparse_plugin,
-            "some.package",
-            "/non/existent/module/path",
-        )
+        self.assertRaises(ValueError,
+                          fdroidserver.__main__.preparse_plugin,
+                          "some.package", "/non/existent/module/path")
 
     def test_preparse_plugin_lookup_bad_path(self):
-        self.assertRaises(
-            ValueError,
-            fdroidserver.__main__.preparse_plugin,
-            "fake_module_name",
-            "/non/existent/module/path",
-        )
+        self.assertRaises(ValueError,
+                          fdroidserver.__main__.preparse_plugin,
+                          "fake_module_name", "/non/existent/module/path")
 
     def test_preparse_plugin_lookup_summary_missing(self):
         with tempfile.TemporaryDirectory() as tmpdir, TmpCwd(tmpdir):
             with open('fdroid_testy6.py', 'w') as f:
-                f.write("main = lambda: print('all good')")
+                f.write(textwrap.dedent("""\
+                        main = lambda: print('all good')"""))
             with TmpPyPath(tmpdir):
                 p = [x for x in pkgutil.iter_modules() if x[1].startswith('fdroid_')]
                 module_dir = p[0][0].path
                 module_name = p[0][1]
-                self.assertRaises(
-                    NameError,
-                    fdroidserver.__main__.preparse_plugin,
-                    module_name,
-                    module_dir,
-                )
+                self.assertRaises(NameError,
+                                  fdroidserver.__main__.preparse_plugin,
+                                  module_name, module_dir)
 
     def test_preparse_plugin_lookup_module_file(self):
         with tempfile.TemporaryDirectory() as tmpdir, TmpCwd(tmpdir):
             with open('fdroid_testy7.py', 'w') as f:
-                f.write(
-                    textwrap.dedent(
-                        """\
+                f.write(textwrap.dedent("""\
                         fdroid_summary = "ttt"
-                        main = lambda: pritn('all good')"""
-                    )
-                )
+                        main = lambda: pritn('all good')"""))
             with TmpPyPath(tmpdir):
                 p = [x for x in pkgutil.iter_modules() if x[1].startswith('fdroid_')]
                 module_path = p[0][0].path
                 module_name = p[0][1]
                 d = fdroidserver.__main__.preparse_plugin(module_name, module_path)
-            self.assertDictEqual(d, {'name': 'fdroid_testy7', 'summary': 'ttt'})
+            self.assertDictEqual(d, {'name': 'fdroid_testy7',
+                                     'summary': 'ttt'})
 
     def test_preparse_plugin_lookup_module_dir(self):
         with tempfile.TemporaryDirectory() as tmpdir, TmpCwd(tmpdir):
             os.mkdir(os.path.join(tmpdir, 'fdroid_testy8'))
             with open('fdroid_testy8/__main__.py', 'w') as f:
-                f.write(
-                    textwrap.dedent(
-                        """\
+                f.write(textwrap.dedent("""\
                         fdroid_summary = "ttt"
-                        main = lambda: print('all good')"""
-                    )
-                )
+                        main = lambda: print('all good')"""))
             with open('fdroid_testy8/__init__.py', 'w') as f:
                 pass
             with TmpPyPath(tmpdir):
@@ -244,4 +212,18 @@ class MainTest(unittest.TestCase):
                 module_path = p[0][0].path
                 module_name = p[0][1]
                 d = fdroidserver.__main__.preparse_plugin(module_name, module_path)
-            self.assertDictEqual(d, {'name': 'fdroid_testy8', 'summary': 'ttt'})
+            self.assertDictEqual(d, {'name': 'fdroid_testy8',
+                                     'summary': 'ttt'})
+
+
+if __name__ == "__main__":
+    os.chdir(os.path.dirname(__file__))
+
+    parser = optparse.OptionParser()
+    parser.add_option("-v", "--verbose", action="store_true", default=False,
+                      help="Spew out even more information than normal")
+    (common.options, args) = parser.parse_args(['--verbose'])
+
+    newSuite = unittest.TestSuite()
+    newSuite.addTest(unittest.makeSuite(MainTest))
+    unittest.main(failfast=False)
diff --git a/tests/metadata-rewrite-yml/app.with.special.build.params.yml b/tests/metadata-rewrite-yml/app.with.special.build.params.yml
index 95c1695c..e7755881 100644
--- a/tests/metadata-rewrite-yml/app.with.special.build.params.yml
+++ b/tests/metadata-rewrite-yml/app.with.special.build.params.yml
@@ -1,5 +1,5 @@
 AntiFeatures:
-  - Tracking
+  - UpstreamNonFree
 Categories:
   - System
 License: GPL-3.0-only
@@ -9,13 +9,13 @@ IssueTracker: https://github.com/loadrunner/Facebook-Contact-Sync/issues
 AutoName: UberSync for Facebook
 Summary: Sync your Facebook Contacts
 Description: |-
-  To configure, go to "Settings => Accounts & Sync => Add Account". Depending on
-  how many friends you have, the first import might take a while, so be patient.
+    To configure, go to "Settings => Accounts & Sync => Add Account". Depending on
+    how many friends you have, the first import might take a while, so be patient.
 
-  * Facebook does not allow to export phone numbers or emails: only names, pictures and statuses are synced.
-  * Facebook users have the option to block one or all apps: if they opt for that, they will be EXCLUDED from your friends list.
+    * Facebook does not allow to export phone numbers or emails: only names, pictures and statuses are synced.
+    * Facebook users have the option to block one or all apps: if they opt for that, they will be EXCLUDED from your friends list.
 
-  Appbrain SDK was removed before building.
+    Appbrain SDK was removed before building.
 
 RepoType: git
 Repo: https://github.com/loadrunner/Facebook-Contact-Sync.git
@@ -64,7 +64,7 @@ Builds:
     patch:
       - manifest-ads.patch
       - mobilecore.patch
-    maven: yes
+    maven: 'yes'
     srclibs:
       - FacebookSDK@sdk-version-3.0.2
 
@@ -77,9 +77,6 @@ Builds:
     maven: yes@..
     srclibs:
       - FacebookSDK@sdk-version-3.0.2
-    antifeatures:
-      Tracking:
-        en-US: Uses the Facebook SDK.
 
   - versionName: 2.1.1-c
     versionCode: 50
@@ -95,7 +92,7 @@ Builds:
     versionCode: 51
     disable: Labelled as pre-release, so skipped
 
-ArchivePolicy: 0
+ArchivePolicy: 0 versions
 AutoUpdateMode: None
 UpdateCheckMode: None
 CurrentVersion: 2.1.2
diff --git a/tests/metadata-rewrite-yml/fake.ota.update.yml b/tests/metadata-rewrite-yml/fake.ota.update.yml
index cde65618..dc8b6b9c 100644
--- a/tests/metadata-rewrite-yml/fake.ota.update.yml
+++ b/tests/metadata-rewrite-yml/fake.ota.update.yml
@@ -9,24 +9,24 @@ Donate: https://f-droid.org/about
 AutoName: Fake OTA Update
 Summary: Tests whether OTA ZIP files are being include
 Description: |-
-  F-Droid can make use of system privileges or permissions to
-  install, update and remove applications on its own. The only way to obtain those
-  privileges is to become a system app.
+    F-Droid can make use of system privileges or permissions to
+    install, update and remove applications on its own. The only way to obtain those
+    privileges is to become a system app.
 
-  This is where the Privileged Extension comes in - being a separate app and much
-  smaller, it can be installed as a system app and communicate with the main app
-  via AIDL IPC.
+    This is where the Privileged Extension comes in - being a separate app and much
+    smaller, it can be installed as a system app and communicate with the main app
+    via AIDL IPC.
 
-  This has several advantages:
+    This has several advantages:
 
-  * Reduced disk usage in the system partition
-  * System updates don't remove F-Droid
-  * The process of installing into system via root is safer
+    * Reduced disk usage in the system partition
+    * System updates don't remove F-Droid
+    * The process of installing into system via root is safer
 
-  This is packaged as an OTA (Over-The-Air) update ZIP file.  It must be installed
-  using TWRP or other Android recovery that can flash updates to the system from
-  the /data/data/org.fdroid.fdroid folder on the /data partition. The standalone
-  APK is called F-Droid Privileged Extension.
+    This is packaged as an OTA (Over-The-Air) update ZIP file.  It must be installed
+    using TWRP or other Android recovery that can flash updates to the system from
+    the /data/data/org.fdroid.fdroid folder on the /data partition. The standalone
+    APK is called F-Droid Privileged Extension.
 
 RepoType: git
 Repo: https://gitlab.com/fdroid/privileged-extension.git
diff --git a/tests/metadata-rewrite-yml/org.fdroid.fdroid.yml b/tests/metadata-rewrite-yml/org.fdroid.fdroid.yml
index fdda453f..9471f9a6 100644
--- a/tests/metadata-rewrite-yml/org.fdroid.fdroid.yml
+++ b/tests/metadata-rewrite-yml/org.fdroid.fdroid.yml
@@ -7,23 +7,24 @@ IssueTracker: https://gitlab.com/fdroid/fdroidclient/issues
 Translation: https://hosted.weblate.org/projects/f-droid/f-droid
 Changelog: https://gitlab.com/fdroid/fdroidclient/raw/HEAD/CHANGELOG.md
 Donate: https://f-droid.org/about
+FlattrID: '343053'
 Bitcoin: 15u8aAPK4jJ5N8wpWJ5gutAyyeHtKX5i18
 
 AutoName: F-Droid
 Summary: Application manager
 Description: |-
-  Connects to F-Droid compatible repositories. The default repo is hosted at
-  f-droid.org, which contains only bona fide FOSS.
+    Connects to F-Droid compatible repositories. The default repo is hosted at
+    f-droid.org, which contains only bona fide FOSS.
 
-  Android is open in the sense that you are free to install apks from anywhere you
-  wish, but there are many good reasons for using a client/repository setup:
+    Android is open in the sense that you are free to install apks from anywhere you
+    wish, but there are many good reasons for using a client/repository setup:
 
-  * Be notified when updates are available
-  * Keep track of older and beta versions
-  * Filter apps that aren't compatible with the device
-  * Find apps via categories and searchable descriptions
-  * Access associated urls for donations, source code etc.
-  * Stay safe by checking repo index signatures and apk hashes
+    * Be notified when updates are available
+    * Keep track of older and beta versions
+    * Filter apps that aren't compatible with the device
+    * Find apps via categories and searchable descriptions
+    * Access associated urls for donations, source code etc.
+    * Stay safe by checking repo index signatures and apk hashes
 
 RepoType: srclib
 Repo: fdroidclient
@@ -943,7 +944,7 @@ Builds:
     gradle:
       - yes
 
-ArchivePolicy: 12
+ArchivePolicy: 12 versions
 AutoUpdateMode: None
 UpdateCheckMode: Static
 CurrentVersion: 0.102.3
diff --git a/tests/metadata.TestCase b/tests/metadata.TestCase
new file mode 100755
index 00000000..f2c85331
--- /dev/null
+++ b/tests/metadata.TestCase
@@ -0,0 +1,842 @@
+#!/usr/bin/env python3
+
+# http://www.drdobbs.com/testing/unit-testing-with-python/240165163
+
+import io
+import glob
+import inspect
+import logging
+import optparse
+import os
+import random
+import shutil
+import sys
+import unittest
+import yaml
+import tempfile
+import textwrap
+from collections import OrderedDict
+from unittest import mock
+
+try:
+    from yaml import CSafeLoader as SafeLoader
+except ImportError:
+    from yaml import SafeLoader
+
+localmodule = os.path.realpath(
+    os.path.join(os.path.dirname(inspect.getfile(inspect.currentframe())), '..'))
+print('localmodule: ' + localmodule)
+if localmodule not in sys.path:
+    sys.path.insert(0, localmodule)
+
+from testcommon import TmpCwd
+
+import fdroidserver.common
+import fdroidserver.metadata
+from fdroidserver.exception import MetaDataException
+
+
+class MetadataTest(unittest.TestCase):
+    '''fdroidserver/metadata.py'''
+
+    def setUp(self):
+        logging.basicConfig(level=logging.DEBUG)
+        self.basedir = os.path.join(localmodule, 'tests')
+        self.tmpdir = os.path.abspath(os.path.join(self.basedir, '..', '.testfiles'))
+        if not os.path.exists(self.tmpdir):
+            os.makedirs(self.tmpdir)
+        os.chdir(self.basedir)
+
+    def test_FieldValidator_BitcoinAddress(self):
+        validator = None
+        for vali in fdroidserver.metadata.valuetypes:
+            if vali.name == 'Bitcoin address':
+                validator = vali
+                break
+        self.assertIsNotNone(validator, "could not find 'Bitcoin address' validator")
+
+        fdroidserver.metadata.warnings_action = 'error'
+
+        # some valid addresses (P2PKH, P2SH, Bech32)
+        self.assertIsNone(validator.check('1BrrrrErsrWetrTrnrrrrm4GFg7xJaNVN2', 'fake.app.id'))
+        self.assertIsNone(validator.check('3JrrrrWrEZr3rNrrvrecrnyirrnqRhWNLy', 'fake.app.id'))
+        self.assertIsNone(validator.check('bc1qar0srrr7xrkvr5lr43lrdnwrre5rgtrzrf5rrq', 'fake.app.id'))
+
+        # some invalid addresses
+        self.assertRaises(fdroidserver.exception.MetaDataException, validator.check,
+                          '21BvMrSYsrWrtrrlL5A10mlGFr7rrarrN2', 'fake.app.id')
+        self.assertRaises(fdroidserver.exception.MetaDataException, validator.check,
+                          '5Hrgr3ur5rGLrfKrrrrrrHSrqJrroGrrzrQrrrrrrLNrsrDrrrA', 'fake.app.id')
+        self.assertRaises(fdroidserver.exception.MetaDataException, validator.check,
+                          '92rr46rUrgTrrromrVrirW6r1rrrdrerrdbJrrrhrCsYrrrrrrc', 'fake.app.id')
+        self.assertRaises(fdroidserver.exception.MetaDataException, validator.check,
+                          'K1BvMrSYsrWrtrrrn5Au4m4GFr7rrarrN2', 'fake.app.id')
+        self.assertRaises(fdroidserver.exception.MetaDataException, validator.check,
+                          'L1BvMrSYsrWrtrrrn5Au4m4GFr7rrarrN2', 'fake.app.id')
+        self.assertRaises(fdroidserver.exception.MetaDataException, validator.check,
+                          'tb1qw5r8drrejxrrg4y5rrrrrraryrrrrwrkxrjrsx', 'fake.app.id')
+
+    def test_FieldValidator_LitecoinAddress(self):
+        validator = None
+        for vali in fdroidserver.metadata.valuetypes:
+            if vali.name == 'Litecoin address':
+                validator = vali
+                break
+        self.assertIsNotNone(validator, "could not find 'Litecoin address' validator")
+
+        fdroidserver.metadata.warnings_action = 'error'
+
+        # some valid addresses (L, M, 3)
+        self.assertIsNone(validator.check('LgeGrrrrJAxyXprrPrrBrrX5Qrrrrrrrrd', 'fake.app.id'))
+        self.assertIsNone(validator.check('MrrrrrrrJAxyXpanPtrrRAX5QHxvUJo8id', 'fake.app.id'))
+        self.assertIsNone(validator.check('3rereVr9rAryrranrrrrrAXrrHx', 'fake.app.id'))
+
+        # some invalid addresses (various special use/testnet addresses, invalid chars)
+        self.assertRaises(fdroidserver.exception.MetaDataException, validator.check,
+                          '21BvMrSYsrWrtrrrn5Au4l4GFr7rrarrN2', 'fake.app.id')
+        self.assertRaises(fdroidserver.exception.MetaDataException, validator.check,
+                          '5Hrgr3ur5rGLrfKrrrrrr1SrqJrroGrrzrQrrrrrrLNrsrDrrrA', 'fake.app.id')
+        self.assertRaises(fdroidserver.exception.MetaDataException, validator.check,
+                          '92rr46rUrgTrrromrVrirW6r1rrrdrerrdbJrrrhrCsYrrrrrrc', 'fake.app.id')
+        self.assertRaises(fdroidserver.exception.MetaDataException, validator.check,
+                          'K1BvMrSYsrWrtrrrn5Au4m4GFr7rrarrN2', 'fake.app.id')
+        self.assertRaises(fdroidserver.exception.MetaDataException, validator.check,
+                          'L0000rSYsrWrtrrrn5Au4m4GFr7rrarrN2', 'fake.app.id')
+        self.assertRaises(fdroidserver.exception.MetaDataException, validator.check,
+                          'tb1qw5r8drrejxrrg4y5rrrrrraryrrrrwrkxrjrsx', 'fake.app.id')
+
+    def test_valid_funding_yml_regex(self):
+        """Check the regex can find all the cases"""
+        with open(os.path.join(self.basedir, 'funding-usernames.yaml')) as fp:
+            data = yaml.load(fp, Loader=SafeLoader)
+
+        for k, entries in data.items():
+            for entry in entries:
+                m = fdroidserver.metadata.VALID_USERNAME_REGEX.match(entry)
+                if k == 'custom':
+                    pass
+                elif k == 'bad':
+                    self.assertIsNone(m, 'this is an invalid %s username: {%s}' % (k, entry))
+                else:
+                    self.assertIsNotNone(m, 'this is a valid %s username: {%s}' % (k, entry))
+
+    def test_read_metadata(self):
+
+        def _build_yaml_representer(dumper, data):
+            '''Creates a YAML representation of a Build instance'''
+            return dumper.represent_dict(data)
+
+        self.maxDiff = None
+
+        config = dict()
+        fdroidserver.common.fill_config_defaults(config)
+        fdroidserver.common.config = config
+        fdroidserver.metadata.warnings_action = None
+
+        apps = fdroidserver.metadata.read_metadata()
+        for appid in ('org.smssecure.smssecure', 'org.adaway',
+                      'org.videolan.vlc', 'com.politedroid'):
+            savepath = os.path.join('metadata', 'dump', appid + '.yaml')
+            frommeta = dict(apps[appid])
+            self.assertTrue(appid in apps)
+            with open(savepath, 'r') as f:
+                from_yaml = yaml.load(f, Loader=SafeLoader)
+            self.assertEqual(frommeta, from_yaml)
+            # comment above assert and uncomment below to update test
+            # files when new metadata fields are added
+            # with open(savepath, 'w') as f:
+            #     yaml.add_representer(fdroidserver.metadata.Build, _build_yaml_representer)
+            #     yaml.dump(frommeta, f, default_flow_style=False)
+
+    def test_rewrite_yaml_fakeotaupdate(self):
+        testdir = tempfile.mkdtemp(prefix=inspect.currentframe().f_code.co_name, dir=self.tmpdir)
+        fdroidserver.common.config = {'accepted_formats': ['yml']}
+        fdroidserver.metadata.warnings_action = None
+
+        # rewrite metadata
+        allapps = fdroidserver.metadata.read_metadata()
+        for appid, app in allapps.items():
+            if appid == 'fake.ota.update':
+                fdroidserver.metadata.write_metadata(os.path.join(testdir, appid + '.yml'), app)
+
+        # assert rewrite result
+        with open(os.path.join(testdir, 'fake.ota.update.yml'), 'r') as result:
+            with open('metadata-rewrite-yml/fake.ota.update.yml', 'r') as orig:
+                self.maxDiff = None
+                self.assertEqual(result.read(), orig.read())
+
+    def test_rewrite_yaml_fdroidclient(self):
+        testdir = tempfile.mkdtemp(prefix=inspect.currentframe().f_code.co_name, dir=self.tmpdir)
+        fdroidserver.common.config = {'accepted_formats': ['yml']}
+
+        # rewrite metadata
+        allapps = fdroidserver.metadata.read_metadata()
+        for appid, app in allapps.items():
+            if appid == 'org.fdroid.fdroid':
+                fdroidserver.metadata.write_metadata(os.path.join(testdir, appid + '.yml'), app)
+
+        # assert rewrite result
+        with open(os.path.join(testdir, 'org.fdroid.fdroid.yml'), 'r') as result:
+            with open('metadata-rewrite-yml/org.fdroid.fdroid.yml', 'r') as orig:
+                self.maxDiff = None
+                self.assertEqual(result.read(), orig.read())
+
+    def test_rewrite_yaml_special_build_params(self):
+        testdir = tempfile.mkdtemp(prefix=inspect.currentframe().f_code.co_name, dir=self.tmpdir)
+
+        # rewrite metadata
+        allapps = fdroidserver.metadata.read_metadata()
+        for appid, app in allapps.items():
+            if appid == 'app.with.special.build.params':
+                fdroidserver.metadata.write_metadata(os.path.join(testdir, appid + '.yml'), app)
+
+        # assert rewrite result
+        with open(os.path.join(testdir, 'app.with.special.build.params.yml'), 'r') as result:
+            with open('metadata-rewrite-yml/app.with.special.build.params.yml', 'r') as orig:
+                self.maxDiff = None
+                self.assertEqual(result.read(), orig.read())
+
+    def test_post_parse_yaml_metadata(self):
+        fdroidserver.metadata.warnings_action = 'error'
+        yamldata = OrderedDict()
+        builds = []
+        yamldata['Builds'] = builds
+        build = OrderedDict()
+        builds.append(build)
+
+        build['versionCode'] = 1.1
+        self.assertRaises(fdroidserver.exception.MetaDataException,
+                          fdroidserver.metadata.post_parse_yaml_metadata, yamldata)
+
+        build['versionCode'] = '1'
+        self.assertRaises(fdroidserver.exception.MetaDataException,
+                          fdroidserver.metadata.post_parse_yaml_metadata, yamldata)
+
+        build['versionCode'] = 1
+        build['versionName'] = 1
+        fdroidserver.metadata.post_parse_yaml_metadata(yamldata)
+        self.assertNotEqual(1, yamldata['Builds'][0]['versionName'])
+        self.assertEqual('1', yamldata['Builds'][0]['versionName'])
+        self.assertEqual(1, yamldata['Builds'][0]['versionCode'])
+
+        build['versionName'] = 1.0
+        fdroidserver.metadata.post_parse_yaml_metadata(yamldata)
+        self.assertNotEqual(1.0, yamldata['Builds'][0]['versionName'])
+        self.assertEqual('1.0', yamldata['Builds'][0]['versionName'])
+
+        build['commit'] = 1.0
+        fdroidserver.metadata.post_parse_yaml_metadata(yamldata)
+        self.assertNotEqual(1.0, yamldata['Builds'][0]['commit'])
+        self.assertEqual('1.0', yamldata['Builds'][0]['commit'])
+
+        teststr = '98234fab134b'
+        build['commit'] = teststr
+        fdroidserver.metadata.post_parse_yaml_metadata(yamldata)
+        self.assertEqual(teststr, yamldata['Builds'][0]['commit'])
+
+        testcommitid = 1234567890
+        build['commit'] = testcommitid
+        fdroidserver.metadata.post_parse_yaml_metadata(yamldata)
+        self.assertNotEqual(testcommitid, yamldata['Builds'][0]['commit'])
+        self.assertEqual('1234567890', yamldata['Builds'][0]['commit'])
+
+    def test_read_metadata_sort_by_time(self):
+        testdir = tempfile.mkdtemp(prefix=inspect.currentframe().f_code.co_name, dir=self.tmpdir)
+        metadatadir = os.path.join(testdir, 'metadata')
+        os.makedirs(metadatadir)
+
+        randomlist = []
+        randomapps = glob.glob(os.path.join(self.basedir, 'metadata', '*.yml'))
+        random.shuffle(randomapps)
+        i = 1
+        for f in randomapps:
+            shutil.copy(f, metadatadir)
+            new = os.path.join(metadatadir, os.path.basename(f))
+            stat = os.stat(new)
+            os.utime(new, (stat.st_ctime, stat.st_mtime + i))
+            # prepend new item so newest is always first
+            randomlist = [os.path.basename(f)[:-4]] + randomlist
+            i += 1
+        os.chdir(testdir)
+        allapps = fdroidserver.metadata.read_metadata(sort_by_time=True)
+        allappids = []
+        for appid, app in allapps.items():
+            allappids.append(appid)
+        self.assertEqual(randomlist, allappids)
+
+    def test_parse_yaml_metadata_unknown_app_field(self):
+        mf = io.StringIO(textwrap.dedent("""\
+            AutoName: F-Droid
+            RepoType: git
+            Builds: []
+            bad: value"""))
+        mf.name = 'mock_filename.yaml'
+        with mock.patch('fdroidserver.metadata.warnings_action', 'error'):
+            with self.assertRaises(MetaDataException):
+                fdroidserver.metadata.parse_yaml_metadata(mf, {})
+
+    def test_parse_yaml_metadata_unknown_build_flag(self):
+        mf = io.StringIO(textwrap.dedent("""\
+            AutoName: F-Droid
+            RepoType: git
+            Builds:
+              - bad: value"""))
+        mf.name = 'mock_filename.yaml'
+        with mock.patch('fdroidserver.metadata.warnings_action', 'error'):
+            with self.assertRaises(MetaDataException):
+                fdroidserver.metadata.parse_yaml_metadata(mf, {})
+
+    def test_parse_yaml_srclib_corrupt_file(self):
+        testdir = tempfile.mkdtemp(prefix=inspect.currentframe().f_code.co_name, dir=self.tmpdir)
+        srclibfile = os.path.join(testdir, 'srclib', 'mock.yml')
+        os.mkdir(os.path.dirname(srclibfile))
+        with open(srclibfile, 'w') as fp:
+            fp.write(textwrap.dedent("""
+            - RepoType: git
+            - Repo: https://github.com/realm/realm-js.git
+            """))
+        with mock.patch('fdroidserver.metadata.warnings_action', 'error'):
+            with self.assertRaises(MetaDataException):
+                fdroidserver.metadata.parse_yaml_srclib(srclibfile)
+
+    def test_write_yaml_with_placeholder_values(self):
+        mf = io.StringIO()
+
+        app = fdroidserver.metadata.App()
+        app.Categories = ['None']
+        app.SourceCode = "https://gitlab.com/fdroid/fdroidclient.git"
+        app.IssueTracker = "https://gitlab.com/fdroid/fdroidclient/issues"
+        app.RepoType = 'git'
+        app.Repo = 'https://gitlab.com/fdroid/fdroidclient.git'
+        app.AutoUpdateMode = 'None'
+        app.UpdateCheckMode = 'Tags'
+        build = fdroidserver.metadata.Build()
+        build.versionName = 'Unknown'  # taken from fdroidserver/import.py
+        build.versionCode = '0'  # taken from fdroidserver/import.py
+        build.disable = 'Generated by import.py ...'
+        build.commit = 'Unknown'
+        build.gradle = [True]
+        app.builds = [build]
+
+        fdroidserver.metadata.write_yaml(mf, app)
+
+        mf.seek(0)
+        self.assertEqual(mf.read(), textwrap.dedent("""\
+            Categories:
+              - None
+            License: Unknown
+            SourceCode: https://gitlab.com/fdroid/fdroidclient.git
+            IssueTracker: https://gitlab.com/fdroid/fdroidclient/issues
+
+            RepoType: git
+            Repo: https://gitlab.com/fdroid/fdroidclient.git
+
+            Builds:
+              - versionName: Unknown
+                versionCode: 0
+                disable: Generated by import.py ...
+                commit: Unknown
+                gradle:
+                  - true
+
+            AutoUpdateMode: None
+            UpdateCheckMode: Tags
+            """))
+
+    def test_parse_yaml_metadata_prebuild_list(self):
+        mf = io.StringIO(textwrap.dedent("""\
+            AutoName: F-Droid
+            RepoType: git
+            Builds:
+                - versionCode: 1
+                  versionName: v0.1.0
+                  sudo:
+                    - apt-get update
+                    - apt-get install -y whatever
+                    - sed -i -e 's/<that attr="bad"/<that attr="good"/' ~/.whatever/config.xml
+                  init:
+                    - bash generate_some_file.sh
+                    - sed -i -e 'g/what/ever/' /some/file
+                  prebuild:
+                    - npm something
+                    - echo 'important setting' >> /a/file
+                  build:
+                    - ./gradlew someSpecialTask
+                    - sed -i 'd/that wrong config/' gradle.properties
+                    - ./gradlew compile
+            """))
+        mf.name = 'mock_filename.yaml'
+        mf.seek(0)
+        result = {}
+        with mock.patch('fdroidserver.metadata.warnings_action', 'error'):
+            fdroidserver.metadata.parse_yaml_metadata(mf, result)
+        self.maxDiff = None
+        self.assertDictEqual(result, {'AutoName': 'F-Droid',
+                                      'RepoType': 'git',
+                                      'Builds': [{'versionCode': 1,
+                                                  'versionName': 'v0.1.0',
+                                                  'sudo': "apt-get update && "
+                                                          "apt-get install -y whatever && "
+                                                          "sed -i -e 's/<that attr=\"bad\"/<that attr=\"good\"/' ~/.whatever/config.xml",
+                                                  'init': "bash generate_some_file.sh && "
+                                                          "sed -i -e 'g/what/ever/' /some/file",
+                                                  'prebuild': "npm something && echo 'important setting' >> /a/file",
+                                                  'build': "./gradlew someSpecialTask && "
+                                                           "sed -i 'd/that wrong config/' gradle.properties && "
+                                                           "./gradlew compile"}]})
+
+    def test_parse_yaml_metadata_prebuild_strings(self):
+        mf = io.StringIO(textwrap.dedent("""\
+            AutoName: F-Droid
+            RepoType: git
+            Builds:
+                - versionCode: 1
+                  versionName: v0.1.0
+                  sudo: |-
+                    apt-get update && apt-get install -y whatever && sed -i -e 's/<that attr="bad"/<that attr="good"/' ~/.whatever/config.xml
+                  init: bash generate_some_file.sh && sed -i -e 'g/what/ever/' /some/file
+                  prebuild: npm something && echo 'important setting' >> /a/file
+                  build: |-
+                    ./gradlew someSpecialTask && sed -i 'd/that wrong config/' gradle.properties && ./gradlew compile
+            """))
+        mf.name = 'mock_filename.yaml'
+        mf.seek(0)
+        result = {}
+        with mock.patch('fdroidserver.metadata.warnings_action', 'error'):
+            fdroidserver.metadata.parse_yaml_metadata(mf, result)
+        self.maxDiff = None
+        self.assertDictEqual(result, {'AutoName': 'F-Droid',
+                                      'RepoType': 'git',
+                                      'Builds': [{'versionCode': 1,
+                                                  'versionName': 'v0.1.0',
+                                                  'sudo': "apt-get update && "
+                                                          "apt-get install -y whatever && "
+                                                          "sed -i -e 's/<that attr=\"bad\"/<that attr=\"good\"/' ~/.whatever/config.xml",
+                                                  'init': "bash generate_some_file.sh && "
+                                                          "sed -i -e 'g/what/ever/' /some/file",
+                                                  'prebuild': "npm something && echo 'important setting' >> /a/file",
+                                                  'build': "./gradlew someSpecialTask && "
+                                                           "sed -i 'd/that wrong config/' gradle.properties && "
+                                                           "./gradlew compile"}]})
+
+    def test_parse_yaml_metadata_prebuild_string(self):
+        mf = io.StringIO(textwrap.dedent("""\
+            AutoName: F-Droid
+            RepoType: git
+            Builds:
+                - versionCode: 1
+                  versionName: v0.1.0
+                  prebuild: |-
+                    a && b && sed -i 's,a,b,'
+            """))
+        mf.name = 'mock_filename.yaml'
+        mf.seek(0)
+        result = {}
+        with mock.patch('fdroidserver.metadata.warnings_action', 'error'):
+            fdroidserver.metadata.parse_yaml_metadata(mf, result)
+        self.assertDictEqual(result, {'AutoName': 'F-Droid',
+                                      'RepoType': 'git',
+                                      'Builds': [{'versionCode': 1,
+                                                  'versionName': 'v0.1.0',
+                                                  'prebuild': "a && b && "
+                                                              "sed -i 's,a,b,'"}]})
+
+    def test_parse_yaml_provides_should_be_ignored(self):
+        mf = io.StringIO(textwrap.dedent("""\
+            Provides: this.is.deprecated
+            AutoName: F-Droid
+            RepoType: git
+            Builds:
+                - versionCode: 1
+                  versionName: v0.1.0
+                  prebuild: |-
+                    a && b && sed -i 's,a,b,'
+            """))
+        mf.name = 'mock_filename.yaml'
+        mf.seek(0)
+        result = {}
+        with mock.patch('fdroidserver.metadata.warnings_action', 'error'):
+            fdroidserver.metadata.parse_yaml_metadata(mf, result)
+            self.assertNotIn('Provides', result)
+            self.assertNotIn('provides', result)
+
+    def test_write_yaml_1_line_scripts_as_string(self):
+        mf = io.StringIO()
+        app = fdroidserver.metadata.App()
+        app.Categories = ['None']
+        app.builds = []
+        build = fdroidserver.metadata.Build()
+        build.versionCode = 102030
+        build.versionName = 'v1.2.3'
+        build.sudo = "chmod +rwx /opt"
+        build.init = "sed -i -e 'g/what/ever/' /some/file"
+        build.prebuild = "sed -i 'd/that wrong config/' gradle.properties"
+        build.build = "./gradlew compile"
+        app.builds.append(build)
+        fdroidserver.metadata.write_yaml(mf, app)
+        mf.seek(0)
+        self.assertEqual(mf.read(), textwrap.dedent("""\
+            Categories:
+              - None
+            License: Unknown
+
+            Builds:
+              - versionName: v1.2.3
+                versionCode: 102030
+                sudo: chmod +rwx /opt
+                init: sed -i -e 'g/what/ever/' /some/file
+                prebuild: sed -i 'd/that wrong config/' gradle.properties
+                build: ./gradlew compile
+
+            AutoUpdateMode: None
+            UpdateCheckMode: None
+            """))
+
+    def test_write_yaml_1_line_scripts_as_list(self):
+        mf = io.StringIO()
+        app = fdroidserver.metadata.App()
+        app.Categories = ['None']
+        app.builds = []
+        build = fdroidserver.metadata.Build()
+        build.versionCode = 102030
+        build.versionName = 'v1.2.3'
+        build.sudo = ["chmod +rwx /opt"]
+        build.init = ["sed -i -e 'g/what/ever/' /some/file"]
+        build.prebuild = ["sed -i 'd/that wrong config/' gradle.properties"]
+        build.build = ["./gradlew compile"]
+        app.builds.append(build)
+        fdroidserver.metadata.write_yaml(mf, app)
+        mf.seek(0)
+        self.assertEqual(mf.read(), textwrap.dedent("""\
+            Categories:
+              - None
+            License: Unknown
+
+            Builds:
+              - versionName: v1.2.3
+                versionCode: 102030
+                sudo: chmod +rwx /opt
+                init: sed -i -e 'g/what/ever/' /some/file
+                prebuild: sed -i 'd/that wrong config/' gradle.properties
+                build: ./gradlew compile
+
+            AutoUpdateMode: None
+            UpdateCheckMode: None
+            """))
+
+    def test_write_yaml_multiline_scripts_from_list(self):
+        mf = io.StringIO()
+        app = fdroidserver.metadata.App()
+        app.Categories = ['None']
+        app.builds = []
+        build = fdroidserver.metadata.Build()
+        build.versionCode = 102030
+        build.versionName = 'v1.2.3'
+        build.sudo = ["apt-get update",
+                      "apt-get install -y whatever",
+                      "sed -i -e 's/<that attr=\"bad\"/<that attr=\"good\"/' ~/.whatever/config.xml"]
+        build.init = ["bash generate_some_file.sh",
+                      "sed -i -e 'g/what/ever/' /some/file"]
+        build.prebuild = ["npm something",
+                          "echo 'important setting' >> /a/file"]
+        build.build = ["./gradlew someSpecialTask",
+                       "sed -i 'd/that wrong config/' gradle.properties",
+                       "./gradlew compile"]
+        app.builds.append(build)
+        fdroidserver.metadata.write_yaml(mf, app)
+        mf.seek(0)
+        self.assertEqual(mf.read(), textwrap.dedent("""\
+            Categories:
+              - None
+            License: Unknown
+
+            Builds:
+              - versionName: v1.2.3
+                versionCode: 102030
+                sudo:
+                  - apt-get update
+                  - apt-get install -y whatever
+                  - sed -i -e 's/<that attr="bad"/<that attr="good"/' ~/.whatever/config.xml
+                init:
+                  - bash generate_some_file.sh
+                  - sed -i -e 'g/what/ever/' /some/file
+                prebuild:
+                  - npm something
+                  - echo 'important setting' >> /a/file
+                build:
+                  - ./gradlew someSpecialTask
+                  - sed -i 'd/that wrong config/' gradle.properties
+                  - ./gradlew compile
+
+            AutoUpdateMode: None
+            UpdateCheckMode: None
+            """))
+
+    def test_write_yaml_multiline_scripts_from_string(self):
+        mf = io.StringIO()
+        app = fdroidserver.metadata.App()
+        app.Categories = ['None']
+        app.builds = []
+        build = fdroidserver.metadata.Build()
+        build.versionCode = 102030
+        build.versionName = 'v1.2.3'
+        build.sudo = "apt-get update && apt-get install -y whatever && sed -i -e 's/<that attr=\"bad\"/<that attr=\"good\"/' ~/.whatever/config.xml"
+        build.init = "bash generate_some_file.sh && sed -i -e 'g/what/ever/' /some/file"
+        build.prebuild = "npm something && echo 'important setting' >> /a/file"
+        build.build = "./gradlew someSpecialTask && sed -i 'd/that wrong config/' gradle.properties && ./gradlew compile"
+        app.builds.append(build)
+        fdroidserver.metadata.write_yaml(mf, app)
+        mf.seek(0)
+        self.assertEqual(mf.read(), textwrap.dedent("""\
+            Categories:
+              - None
+            License: Unknown
+
+            Builds:
+              - versionName: v1.2.3
+                versionCode: 102030
+                sudo:
+                  - apt-get update
+                  - apt-get install -y whatever
+                  - sed -i -e 's/<that attr="bad"/<that attr="good"/' ~/.whatever/config.xml
+                init:
+                  - bash generate_some_file.sh
+                  - sed -i -e 'g/what/ever/' /some/file
+                prebuild:
+                  - npm something
+                  - echo 'important setting' >> /a/file
+                build:
+                  - ./gradlew someSpecialTask
+                  - sed -i 'd/that wrong config/' gradle.properties
+                  - ./gradlew compile
+
+            AutoUpdateMode: None
+            UpdateCheckMode: None
+            """))
+
+    def test_write_yaml_make_sure_provides_does_not_get_written(self):
+        mf = io.StringIO()
+        app = fdroidserver.metadata.App()
+        app.Categories = ['None']
+        app.Provides = 'this.is.deprecated'
+        app.builds = []
+        build = fdroidserver.metadata.Build()
+        build.versionCode = 102030
+        build.versionName = 'v1.2.3'
+        build.gradle = ['yes']
+        app.builds.append(build)
+        fdroidserver.metadata.write_yaml(mf, app)
+        mf.seek(0)
+        self.assertEqual(mf.read(), textwrap.dedent("""\
+            Categories:
+              - None
+            License: Unknown
+
+            Builds:
+              - versionName: v1.2.3
+                versionCode: 102030
+                gradle:
+                  - yes
+
+            AutoUpdateMode: None
+            UpdateCheckMode: None
+            """))
+
+    def test_parse_yaml_srclib_unknown_key(self):
+        fdroidserver.metadata.warnings_action = 'error'
+        with tempfile.TemporaryDirectory() as tmpdir, TmpCwd(tmpdir):
+            with open('test.yml', 'w', encoding='utf-8') as f:
+                f.write(textwrap.dedent('''\
+                    RepoType: git
+                    Repo: https://example.com/test.git
+                    Evil: I should not be here.
+                    '''))
+            with self.assertRaisesRegex(MetaDataException,
+                                        "Invalid srclib metadata: "
+                                        "unknown key 'Evil' in "
+                                        "'test.yml'"):
+                fdroidserver.metadata.parse_yaml_srclib('test.yml')
+
+    def test_parse_yaml_srclib_does_not_exists(self):
+        fdroidserver.metadata.warnings_action = 'error'
+        with self.assertRaisesRegex(MetaDataException,
+                                    "Invalid scrlib metadata: "
+                                    "'non/existent-test-srclib.yml' "
+                                    "does not exist"):
+            fdroidserver.metadata.parse_yaml_srclib('non/existent-test-srclib.yml')
+
+    def test_parse_yaml_srclib_simple(self):
+        fdroidserver.metadata.warnings_action = 'error'
+        with tempfile.TemporaryDirectory() as tmpdir, TmpCwd(tmpdir):
+            with open('simple.yml', 'w', encoding='utf-8') as f:
+                f.write(textwrap.dedent('''\
+                    # this should be simple
+                    RepoType: git
+                    Repo: https://git.host/repo.git
+                    '''))
+            srclib = fdroidserver.metadata.parse_yaml_srclib('simple.yml')
+            self.assertDictEqual({'Repo': 'https://git.host/repo.git',
+                                  'RepoType': 'git',
+                                  'Subdir': None,
+                                  'Prepare': None},
+                                 srclib)
+
+    def test_parse_yaml_srclib_simple_with_blanks(self):
+        fdroidserver.metadata.warnings_action = 'error'
+        with tempfile.TemporaryDirectory() as tmpdir, TmpCwd(tmpdir):
+            with open('simple.yml', 'w', encoding='utf-8') as f:
+                f.write(textwrap.dedent('''\
+                    # this should be simple
+
+                    RepoType: git
+
+                    Repo: https://git.host/repo.git
+
+                    Subdir:
+
+                    Prepare:
+                    '''))
+            srclib = fdroidserver.metadata.parse_yaml_srclib('simple.yml')
+            self.assertDictEqual({'Repo': 'https://git.host/repo.git',
+                                  'RepoType': 'git',
+                                  'Subdir': [''],
+                                  'Prepare': ''},
+                                 srclib)
+
+    def test_parse_yaml_srclib_Changelog_cketti(self):
+        fdroidserver.metadata.warnings_action = 'error'
+        with tempfile.TemporaryDirectory() as tmpdir, TmpCwd(tmpdir):
+            with open('Changelog-cketti.yml', 'w', encoding='utf-8') as f:
+                f.write(textwrap.dedent('''\
+                    RepoType: git
+                    Repo: https://github.com/cketti/ckChangeLog
+
+                    Subdir: library,ckChangeLog/src/main
+                    Prepare: "[ -f project.properties ] || echo 'source.dir=java' > ant.properties && echo -e 'android.library=true\\\\ntarget=android-19' > project.properties"
+                    '''))
+            srclib = fdroidserver.metadata.parse_yaml_srclib('Changelog-cketti.yml')
+            self.assertDictEqual(srclib,
+                                 {'Repo': 'https://github.com/cketti/ckChangeLog',
+                                  'RepoType': 'git',
+                                  'Subdir': ['library', 'ckChangeLog/src/main'],
+                                  'Prepare': "[ -f project.properties ] || echo 'source.dir=java' > "
+                                             "ant.properties && echo -e "
+                                             "'android.library=true\\ntarget=android-19' > project.properties"})
+
+    def test_read_srclibs_yml_subdir_list(self):
+        fdroidserver.metadata.warnings_action = 'error'
+        fdroidserver.metadata.srclibs = None
+        with tempfile.TemporaryDirectory() as tmpdir, TmpCwd(tmpdir):
+            os.mkdir('srclibs')
+            with open('srclibs/with-list.yml', 'w', encoding='utf-8') as f:
+                f.write(textwrap.dedent('''\
+                    # this should be simple
+                    RepoType: git
+                    Repo: https://git.host/repo.git
+
+                    Subdir:
+                     - This is your last chance.
+                     - After this, there is no turning back.
+                     - You take the blue pill—the story ends,
+                     - you wake up in your bed
+                     - and believe whatever you want to believe.
+                     - You take the red pill—you stay in Wonderland
+                     - and I show you how deep the rabbit-hole goes.
+                    Prepare:
+                        There is a difference between knowing the path
+                        and walking the path.
+                    '''))
+            fdroidserver.metadata.read_srclibs()
+        self.maxDiff = None
+        self.assertDictEqual(fdroidserver.metadata.srclibs,
+                             {'with-list': {'RepoType': 'git',
+                                            'Repo': 'https://git.host/repo.git',
+                                            'Subdir': ['This is your last chance.',
+                                                       'After this, there is no turning back.',
+                                                       'You take the blue pill—the story ends,',
+                                                       'you wake up in your bed',
+                                                       'and believe whatever you want to believe.',
+                                                       'You take the red pill—you stay in Wonderland',
+                                                       'and I show you how deep the rabbit-hole goes.'],
+                                            'Prepare': 'There is a difference between knowing the path '
+                                                       'and walking the path.'}})
+
+    def test_read_srclibs_yml_prepare_list(self):
+        fdroidserver.metadata.warnings_action = 'error'
+        fdroidserver.metadata.srclibs = None
+        with tempfile.TemporaryDirectory() as tmpdir, TmpCwd(tmpdir):
+            os.mkdir('srclibs')
+            with open('srclibs/with-list.yml', 'w', encoding='utf-8') as f:
+                f.write(textwrap.dedent('''\
+                    # this should be simple
+                    RepoType: git
+                    Repo: https://git.host/repo.git
+
+                    Subdir:
+                    Prepare:
+                     - The Matrix is a system, Neo.
+                     - That system is our enemy.
+                     - But when you're inside, you look around, what do you see?
+                     - Businessmen, teachers, lawyers, carpenters.
+                     - The very minds of the people we are trying to save.
+                     - But until we do, these people are still a part of that system and that makes them our enemy.
+                     - You have to understand, most of these people are not ready to be unplugged.
+                     - And many of them are so inert, so hopelessly dependent on the system that they will fight to protect it.
+                    '''))
+            fdroidserver.metadata.read_srclibs()
+        self.maxDiff = None
+        self.assertDictEqual(fdroidserver.metadata.srclibs,
+                             {'with-list': {'RepoType': 'git',
+                                            'Repo': 'https://git.host/repo.git',
+                                            'Subdir': [''],
+                                            'Prepare': 'The Matrix is a system, Neo. && '
+                                                       'That system is our enemy. && '
+                                                       'But when you\'re inside, you look around, what do you see? && '
+                                                       'Businessmen, teachers, lawyers, carpenters. && '
+                                                       'The very minds of the people we are trying to save. && '
+                                                       'But until we do, these people are still a part of that system and that makes them our enemy. && '
+                                                       'You have to understand, most of these people are not ready to be unplugged. && '
+                                                       'And many of them are so inert, so hopelessly dependent on the system that they will fight to protect it.'}})
+
+    def test_read_srclibs(self):
+        fdroidserver.metadata.warnings_action = 'error'
+        fdroidserver.metadata.srclibs = None
+        with tempfile.TemporaryDirectory() as tmpdir, TmpCwd(tmpdir):
+            os.mkdir('srclibs')
+            with open('srclibs/simple.yml', 'w', encoding='utf-8') as f:
+                f.write(textwrap.dedent('''\
+                    RepoType: git
+                    Repo: https://git.host/repo.git
+                    '''))
+            with open('srclibs/simple-wb.yml', 'w', encoding='utf-8') as f:
+                f.write(textwrap.dedent('''\
+                    # this should be simple
+                    RepoType: git
+                    Repo: https://git.host/repo.git
+
+                    Subdir:
+                    Prepare:
+                    '''))
+            fdroidserver.metadata.read_srclibs()
+        self.assertDictEqual(fdroidserver.metadata.srclibs,
+                             {'simple-wb': {'RepoType': 'git',
+                                            'Repo': 'https://git.host/repo.git',
+                                            'Subdir': [''],
+                                            'Prepare': ''},
+                              'simple': {'RepoType': 'git',
+                                         'Repo': 'https://git.host/repo.git',
+                                         'Subdir': None,
+                                         'Prepare': None}})
+
+
+if __name__ == "__main__":
+    os.chdir(os.path.dirname(__file__))
+
+    parser = optparse.OptionParser()
+    parser.add_option("-v", "--verbose", action="store_true", default=False,
+                      help="Spew out even more information than normal")
+    (fdroidserver.common.options, args) = parser.parse_args(['--verbose'])
+
+    newSuite = unittest.TestSuite()
+    newSuite.addTest(unittest.makeSuite(MetadataTest))
+    unittest.main(failfast=True)
diff --git a/tests/metadata/apk/info.guardianproject.urzip.yaml b/tests/metadata/apk/info.guardianproject.urzip.yaml
index ffe17471..4632c314 100644
--- a/tests/metadata/apk/info.guardianproject.urzip.yaml
+++ b/tests/metadata/apk/info.guardianproject.urzip.yaml
@@ -1,4 +1,4 @@
-antiFeatures: {}
+antiFeatures: !!set {}
 features: []
 hash: abfb3adb7496611749e7abfb014c5c789e3a02489e48a5c3665110d1b1acd931
 hashType: sha256
@@ -9,7 +9,6 @@ icons:
 icons_src:
   '-1': res/drawable/ic_launcher.png
   '160': res/drawable/ic_launcher.png
-ipfsCIDv1: bafybeigmtgrwyvj77jaflje2rf533haeqtpu2wtwsctryjusjnsawacsam
 minSdkVersion: 4
 name: urzip
 packageName: info.guardianproject.urzip
diff --git a/tests/metadata/apk/org.dyndns.fules.ck.yaml b/tests/metadata/apk/org.dyndns.fules.ck.yaml
index 876a9c6a..23a0325f 100644
--- a/tests/metadata/apk/org.dyndns.fules.ck.yaml
+++ b/tests/metadata/apk/org.dyndns.fules.ck.yaml
@@ -1,4 +1,4 @@
-antiFeatures: {}
+antiFeatures: !!set {}
 features: []
 hash: 897486e1f857c6c0ee32ccbad0e1b8cd82f6d0e65a44a23f13f852d2b63a18c8
 hashType: sha256
@@ -13,7 +13,6 @@ icons_src:
   '120': res/drawable-ldpi-v4/icon_launcher.png
   '160': res/drawable-mdpi-v4/icon_launcher.png
   '240': res/drawable-hdpi-v4/icon_launcher.png
-ipfsCIDv1: bafybeifijmr5ygvfvig4vzbmdc3ysj6m46ddohaol4vgp4qoyooqpc27zu
 minSdkVersion: 7
 name: Compass Keyboard
 nativecode:
diff --git a/tests/metadata/app.with.special.build.params.yml b/tests/metadata/app.with.special.build.params.yml
index c58cadf1..e7755881 100644
--- a/tests/metadata/app.with.special.build.params.yml
+++ b/tests/metadata/app.with.special.build.params.yml
@@ -1,5 +1,5 @@
 AntiFeatures:
-  - Tracking
+  - UpstreamNonFree
 Categories:
   - System
 License: GPL-3.0-only
@@ -9,13 +9,13 @@ IssueTracker: https://github.com/loadrunner/Facebook-Contact-Sync/issues
 AutoName: UberSync for Facebook
 Summary: Sync your Facebook Contacts
 Description: |-
-  To configure, go to "Settings => Accounts & Sync => Add Account". Depending on
-  how many friends you have, the first import might take a while, so be patient.
+    To configure, go to "Settings => Accounts & Sync => Add Account". Depending on
+    how many friends you have, the first import might take a while, so be patient.
 
-  * Facebook does not allow to export phone numbers or emails: only names, pictures and statuses are synced.
-  * Facebook users have the option to block one or all apps: if they opt for that, they will be EXCLUDED from your friends list.
+    * Facebook does not allow to export phone numbers or emails: only names, pictures and statuses are synced.
+    * Facebook users have the option to block one or all apps: if they opt for that, they will be EXCLUDED from your friends list.
 
-  Appbrain SDK was removed before building.
+    Appbrain SDK was removed before building.
 
 RepoType: git
 Repo: https://github.com/loadrunner/Facebook-Contact-Sync.git
@@ -64,7 +64,7 @@ Builds:
     patch:
       - manifest-ads.patch
       - mobilecore.patch
-    maven: yes
+    maven: 'yes'
     srclibs:
       - FacebookSDK@sdk-version-3.0.2
 
@@ -77,8 +77,6 @@ Builds:
     maven: yes@..
     srclibs:
       - FacebookSDK@sdk-version-3.0.2
-    antifeatures:
-      Tracking: Uses the Facebook SDK.
 
   - versionName: 2.1.1-c
     versionCode: 50
@@ -94,7 +92,7 @@ Builds:
     versionCode: 51
     disable: Labelled as pre-release, so skipped
 
-ArchivePolicy: 0
+ArchivePolicy: 0 versions
 AutoUpdateMode: None
 UpdateCheckMode: None
 CurrentVersion: 2.1.2
diff --git a/tests/metadata/app.with.special.build.params/en-US/antifeatures/50_Ads.txt b/tests/metadata/app.with.special.build.params/en-US/antifeatures/50_Ads.txt
deleted file mode 100644
index 982512f0..00000000
--- a/tests/metadata/app.with.special.build.params/en-US/antifeatures/50_Ads.txt
+++ /dev/null
@@ -1 +0,0 @@
-includes ad lib
diff --git a/tests/metadata/app.with.special.build.params/en-US/antifeatures/50_Tracking.txt b/tests/metadata/app.with.special.build.params/en-US/antifeatures/50_Tracking.txt
deleted file mode 100644
index bc711b96..00000000
--- a/tests/metadata/app.with.special.build.params/en-US/antifeatures/50_Tracking.txt
+++ /dev/null
@@ -1 +0,0 @@
-standard suspects
diff --git a/tests/metadata/app.with.special.build.params/en-US/antifeatures/Ads.txt b/tests/metadata/app.with.special.build.params/en-US/antifeatures/Ads.txt
deleted file mode 100644
index d7531e59..00000000
--- a/tests/metadata/app.with.special.build.params/en-US/antifeatures/Ads.txt
+++ /dev/null
@@ -1 +0,0 @@
-please no
\ No newline at end of file
diff --git a/tests/metadata/app.with.special.build.params/en-US/antifeatures/NoSourceSince.txt b/tests/metadata/app.with.special.build.params/en-US/antifeatures/NoSourceSince.txt
deleted file mode 100644
index 067eb2c4..00000000
--- a/tests/metadata/app.with.special.build.params/en-US/antifeatures/NoSourceSince.txt
+++ /dev/null
@@ -1 +0,0 @@
-no activity
diff --git a/tests/metadata/app.with.special.build.params/zh-CN/antifeatures/49_Tracking.txt b/tests/metadata/app.with.special.build.params/zh-CN/antifeatures/49_Tracking.txt
deleted file mode 100644
index fea9557e..00000000
--- a/tests/metadata/app.with.special.build.params/zh-CN/antifeatures/49_Tracking.txt
+++ /dev/null
@@ -1 +0,0 @@
-Text from zh-CN/49_Tracking.txt
\ No newline at end of file
diff --git a/tests/metadata/app.with.special.build.params/zh-CN/antifeatures/50_Ads.txt b/tests/metadata/app.with.special.build.params/zh-CN/antifeatures/50_Ads.txt
deleted file mode 100644
index f0bc2f11..00000000
--- a/tests/metadata/app.with.special.build.params/zh-CN/antifeatures/50_Ads.txt
+++ /dev/null
@@ -1 +0,0 @@
-包括广告图书馆
diff --git a/tests/metadata/com.politedroid.yml b/tests/metadata/com.politedroid.yml
index 87d13bcb..c138b6c8 100644
--- a/tests/metadata/com.politedroid.yml
+++ b/tests/metadata/com.politedroid.yml
@@ -1,8 +1,4 @@
-AntiFeatures:
-  - NonFreeNet
 Categories:
-  - Multimedia
-  - Security
   - Time
 License: GPL-3.0-only
 SourceCode: https://github.com/miguelvps/PoliteDroid
@@ -22,6 +18,7 @@ Builds:
     target: android-10
     antifeatures:
       - KnownVuln
+      - UpstreamNonFree
       - NonFreeAssets
 
   - versionName: '1.3'
@@ -40,9 +37,6 @@ Builds:
     sudo: echo 'this is just a test'
     gradle:
       - yes
-    antifeatures:
-      - KnownVuln
-      - NonFreeAssets
 
 ArchivePolicy: 4 versions
 AutoUpdateMode: Version v%v
diff --git a/tests/metadata/dump/app.with.special.build.params.yaml b/tests/metadata/dump/app.with.special.build.params.yaml
deleted file mode 100644
index fae6c9ae..00000000
--- a/tests/metadata/dump/app.with.special.build.params.yaml
+++ /dev/null
@@ -1,374 +0,0 @@
-%YAML 1.2
----
-AllowedAPKSigningKeys: []
-AntiFeatures:
-  Tracking: {}
-ArchivePolicy: 0
-AuthorEmail: null
-AuthorName: null
-AuthorWebSite: null
-AutoName: UberSync for Facebook
-AutoUpdateMode: None
-Binaries: null
-Bitcoin: null
-Builds:
-- androidupdate: []
-  antcommands: []
-  antifeatures: {}
-  binary: null
-  build: ''
-  buildjni: []
-  commit: b3879c973e7cac3a3319
-  disable: ''
-  encoding: null
-  extlibs: []
-  forcevercode: false
-  forceversion: false
-  gradle: []
-  gradleprops: []
-  init: ''
-  maven: null
-  ndk: null
-  novcheck: false
-  oldsdkloc: false
-  output: null
-  patch: []
-  postbuild: ''
-  preassemble: []
-  prebuild: ''
-  rm: []
-  scandelete: []
-  scanignore: []
-  srclibs: []
-  subdir: null
-  submodules: false
-  sudo: ''
-  target: null
-  timeout: null
-  versionCode: 32
-  versionName: 1.0.0
-- androidupdate: []
-  antcommands: []
-  antifeatures: {}
-  binary: null
-  build: ''
-  buildjni: []
-  commit: 252c8dd4c9
-  disable: ''
-  encoding: null
-  extlibs: []
-  forcevercode: false
-  forceversion: false
-  gradle: []
-  gradleprops: []
-  init: ''
-  maven: null
-  ndk: null
-  novcheck: false
-  oldsdkloc: false
-  output: null
-  patch: []
-  postbuild: ''
-  preassemble: []
-  prebuild: ''
-  rm: []
-  scandelete: []
-  scanignore: []
-  srclibs: []
-  subdir: null
-  submodules: false
-  sudo: ''
-  target: null
-  timeout: null
-  versionCode: 33
-  versionName: 1.0.1
-- androidupdate: []
-  antcommands: []
-  antifeatures: {}
-  binary: null
-  build: ''
-  buildjni: []
-  commit: v1.2.0
-  disable: ''
-  encoding: null
-  extlibs: []
-  forcevercode: false
-  forceversion: false
-  gradle: []
-  gradleprops: []
-  init: ''
-  maven: null
-  ndk: null
-  novcheck: false
-  oldsdkloc: false
-  output: null
-  patch:
-  - appbrain.patch
-  postbuild: ''
-  preassemble: []
-  prebuild:
-  - sed -i 's@\(reference.1=\).*@\1$$FacebookSDK$$@' project.properties
-  - sed -i 's/Class\[\]/Class\<?\>\[\]/g' $$FacebookSDK$$/src/com/facebook/model/GraphObject.java
-  rm:
-  - libs/appbrain-sdk-android.jar
-  scandelete: []
-  scanignore: []
-  srclibs:
-  - FacebookSDK@sdk-version-3.0.1
-  subdir: null
-  submodules: false
-  sudo: ''
-  target: null
-  timeout: null
-  versionCode: 39
-  versionName: 1.2.0
-- androidupdate: []
-  antcommands: []
-  antifeatures: {}
-  binary: null
-  build: ''
-  buildjni: []
-  commit: v1.2.2
-  disable: ''
-  encoding: null
-  extlibs:
-  - android/android-support-v4.jar
-  forcevercode: false
-  forceversion: false
-  gradle: []
-  gradleprops: []
-  init: ''
-  maven: null
-  ndk: null
-  novcheck: false
-  oldsdkloc: false
-  output: null
-  patch:
-  - appbrain.patch
-  postbuild: ''
-  preassemble: []
-  prebuild:
-  - mv libs/android-support-v4.jar $$FacebookSDK$$/libs/
-  - sed -i 's@\(reference.1=\).*@\1$$FacebookSDK$$@' project.properties
-  - sed -i 's/Class\[\]/Class\<?\>\[\]/g'          $$FacebookSDK$$/src/com/facebook/model/GraphObject.java
-  rm:
-  - libs/appbrain-sdk-android.jar
-  scandelete: []
-  scanignore: []
-  srclibs:
-  - FacebookSDK@sdk-version-3.0.2
-  subdir: null
-  submodules: false
-  sudo: ''
-  target: null
-  timeout: null
-  versionCode: 42
-  versionName: 1.2.2
-- androidupdate: []
-  antcommands: []
-  antifeatures: {}
-  binary: null
-  build: ''
-  buildjni: []
-  commit: 2.1.1
-  disable: ''
-  encoding: null
-  extlibs: []
-  forcevercode: false
-  forceversion: false
-  gradle: []
-  gradleprops: []
-  init: ''
-  maven: yes
-  ndk: null
-  novcheck: false
-  oldsdkloc: false
-  output: null
-  patch:
-  - manifest-ads.patch
-  - mobilecore.patch
-  postbuild: ''
-  preassemble: []
-  prebuild: ''
-  rm: []
-  scandelete: []
-  scanignore: []
-  srclibs:
-  - FacebookSDK@sdk-version-3.0.2
-  subdir: null
-  submodules: false
-  sudo: ''
-  target: null
-  timeout: null
-  versionCode: 48
-  versionName: 2.1.1
-- androidupdate: []
-  antcommands: []
-  antifeatures:
-    Tracking:
-      en-US: Uses the Facebook SDK.
-  binary: null
-  build: ''
-  buildjni: []
-  commit: 2.1.1
-  disable: ''
-  encoding: null
-  extlibs: []
-  forcevercode: false
-  forceversion: false
-  gradle: []
-  gradleprops: []
-  init: ''
-  maven: yes@..
-  ndk: null
-  novcheck: false
-  oldsdkloc: false
-  output: null
-  patch:
-  - manifest-ads.patch
-  - mobilecore.patch
-  postbuild: ''
-  preassemble: []
-  prebuild: ''
-  rm: []
-  scandelete: []
-  scanignore: []
-  srclibs:
-  - FacebookSDK@sdk-version-3.0.2
-  subdir: null
-  submodules: false
-  sudo: ''
-  target: null
-  timeout: null
-  versionCode: 49
-  versionName: 2.1.1-b
-- androidupdate: []
-  antcommands: []
-  antifeatures:
-    Ads:
-      en-US: 'includes ad lib
-
-        '
-      zh-CN: '包括广告图书馆
-
-        '
-    Tracking:
-      en-US: 'standard suspects
-
-        '
-  binary: null
-  build: ''
-  buildjni: []
-  commit: 2.1.1
-  disable: ''
-  encoding: null
-  extlibs: []
-  forcevercode: false
-  forceversion: false
-  gradle: []
-  gradleprops: []
-  init: ''
-  maven: '2'
-  ndk: null
-  novcheck: false
-  oldsdkloc: false
-  output: null
-  patch:
-  - manifest-ads.patch
-  - mobilecore.patch
-  postbuild: ''
-  preassemble: []
-  prebuild: ''
-  rm: []
-  scandelete: []
-  scanignore: []
-  srclibs:
-  - FacebookSDK@sdk-version-3.0.2
-  subdir: null
-  submodules: false
-  sudo: ''
-  target: null
-  timeout: null
-  versionCode: 50
-  versionName: 2.1.1-c
-- androidupdate: []
-  antcommands: []
-  antifeatures: {}
-  binary: null
-  build: ''
-  buildjni: []
-  commit: null
-  disable: Labelled as pre-release, so skipped
-  encoding: null
-  extlibs: []
-  forcevercode: false
-  forceversion: false
-  gradle: []
-  gradleprops: []
-  init: ''
-  maven: null
-  ndk: null
-  novcheck: false
-  oldsdkloc: false
-  output: null
-  patch: []
-  postbuild: ''
-  preassemble: []
-  prebuild: ''
-  rm: []
-  scandelete: []
-  scanignore: []
-  srclibs: []
-  subdir: null
-  submodules: false
-  sudo: ''
-  target: null
-  timeout: null
-  versionCode: 51
-  versionName: 2.1.2
-Categories:
-- System
-Changelog: ''
-CurrentVersion: 2.1.2
-CurrentVersionCode: 49
-Description: 'To configure, go to "Settings => Accounts & Sync => Add Account". Depending
-  on
-
-  how many friends you have, the first import might take a while, so be patient.
-
-
-  * Facebook does not allow to export phone numbers or emails: only names, pictures
-  and statuses are synced.
-
-  * Facebook users have the option to block one or all apps: if they opt for that,
-  they will be EXCLUDED from your friends list.
-
-
-  Appbrain SDK was removed before building.'
-Disabled: null
-Donate: null
-IssueTracker: https://github.com/loadrunner/Facebook-Contact-Sync/issues
-Liberapay: null
-License: GPL-3.0-only
-Litecoin: null
-MaintainerNotes: ''
-Name: null
-NoSourceSince: ''
-OpenCollective: null
-Provides: null
-Repo: https://github.com/loadrunner/Facebook-Contact-Sync.git
-RepoType: git
-RequiresRoot: false
-SourceCode: https://github.com/loadrunner/Facebook-Contact-Sync
-Summary: Sync your Facebook Contacts
-Translation: ''
-UpdateCheckData: null
-UpdateCheckIgnore: null
-UpdateCheckMode: None
-UpdateCheckName: null
-VercodeOperation: []
-WebSite: ''
-added: null
-id: app.with.special.build.params
-lastUpdated: null
-metadatapath: metadata/app.with.special.build.params.yml
diff --git a/tests/metadata/dump/com.politedroid.yaml b/tests/metadata/dump/com.politedroid.yaml
index 01d55b82..1fe59448 100644
--- a/tests/metadata/dump/com.politedroid.yaml
+++ b/tests/metadata/dump/com.politedroid.yaml
@@ -1,11 +1,5 @@
-%YAML 1.2
----
-AllowedAPKSigningKeys: []
-AntiFeatures:
-  NoSourceSince:
-    en-US: '1.5'
-  NonFreeNet: {}
-ArchivePolicy: 4
+AntiFeatures: []
+ArchivePolicy: 4 versions
 AuthorEmail: null
 AuthorName: null
 AuthorWebSite: null
@@ -13,165 +7,18 @@ AutoName: Polite Droid
 AutoUpdateMode: Version v%v
 Binaries: null
 Bitcoin: null
-Builds:
-- androidupdate: []
-  antcommands: []
-  antifeatures:
-    KnownVuln: {}
-    NonFreeAssets: {}
-  binary: null
-  build: ''
-  buildjni: []
-  commit: 6a548e4b19
-  disable: ''
-  encoding: null
-  extlibs: []
-  forcevercode: false
-  forceversion: false
-  gradle: []
-  gradleprops: []
-  init: ''
-  maven: null
-  ndk: null
-  novcheck: false
-  oldsdkloc: false
-  output: null
-  patch: []
-  postbuild: ''
-  preassemble: []
-  prebuild: ''
-  rm: []
-  scandelete: []
-  scanignore: []
-  srclibs: []
-  subdir: null
-  submodules: false
-  sudo: ''
-  target: android-10
-  timeout: null
-  versionCode: 3
-  versionName: '1.2'
-- androidupdate: []
-  antcommands: []
-  antifeatures: {}
-  binary: null
-  build: ''
-  buildjni: []
-  commit: ad865b57bf3ac59580f38485608a9b1dda4fa7dc
-  disable: ''
-  encoding: null
-  extlibs: []
-  forcevercode: false
-  forceversion: false
-  gradle: []
-  gradleprops: []
-  init: ''
-  maven: null
-  ndk: null
-  novcheck: false
-  oldsdkloc: false
-  output: null
-  patch: []
-  postbuild: ''
-  preassemble: []
-  prebuild: ''
-  rm: []
-  scandelete: []
-  scanignore: []
-  srclibs: []
-  subdir: null
-  submodules: false
-  sudo: ''
-  target: android-15
-  timeout: null
-  versionCode: 4
-  versionName: '1.3'
-- androidupdate: []
-  antcommands: []
-  antifeatures: {}
-  binary: null
-  build: ''
-  buildjni: []
-  commit: 456bd615f3fbe6dff06433928cf7ea20073601fb
-  disable: ''
-  encoding: null
-  extlibs: []
-  forcevercode: false
-  forceversion: false
-  gradle: []
-  gradleprops: []
-  init: ''
-  maven: null
-  ndk: null
-  novcheck: false
-  oldsdkloc: false
-  output: null
-  patch: []
-  postbuild: ''
-  preassemble: []
-  prebuild: ''
-  rm: []
-  scandelete: []
-  scanignore: []
-  srclibs: []
-  subdir: null
-  submodules: false
-  sudo: ''
-  target: android-10
-  timeout: null
-  versionCode: 5
-  versionName: '1.4'
-- androidupdate: []
-  antcommands: []
-  antifeatures:
-    KnownVuln: {}
-    NonFreeAssets: {}
-  binary: null
-  build: ''
-  buildjni: []
-  commit: v1.5
-  disable: ''
-  encoding: null
-  extlibs: []
-  forcevercode: false
-  forceversion: false
-  gradle:
-  - yes
-  gradleprops: []
-  init: ''
-  maven: null
-  ndk: null
-  novcheck: false
-  oldsdkloc: false
-  output: null
-  patch: []
-  postbuild: ''
-  preassemble: []
-  prebuild: ''
-  rm: []
-  scandelete: []
-  scanignore: []
-  srclibs: []
-  subdir: null
-  submodules: false
-  sudo:
-  - echo 'this is just a test'
-  target: null
-  timeout: null
-  versionCode: 6
-  versionName: '1.5'
 Categories:
-- Multimedia
-- Security
 - Time
 Changelog: ''
 CurrentVersion: '1.5'
-CurrentVersionCode: 6
+CurrentVersionCode: '6'
 Description: Activates silent mode during calendar events.
 Disabled: null
 Donate: null
+FlattrID: null
 IssueTracker: https://github.com/miguelvps/PoliteDroid/issues
 Liberapay: null
+LiberapayID: null
 License: GPL-3.0-only
 Litecoin: null
 MaintainerNotes: ''
@@ -189,9 +36,151 @@ UpdateCheckData: null
 UpdateCheckIgnore: null
 UpdateCheckMode: Tags
 UpdateCheckName: null
-VercodeOperation: []
+VercodeOperation: null
 WebSite: ''
 added: null
+builds:
+- androidupdate: []
+  antcommands: []
+  antifeatures:
+  - KnownVuln
+  - UpstreamNonFree
+  - NonFreeAssets
+  build: ''
+  buildjni: []
+  buildozer: false
+  commit: 6a548e4b19
+  disable: ''
+  encoding: null
+  extlibs: []
+  forcevercode: false
+  forceversion: false
+  gradle: []
+  gradleprops: []
+  init: ''
+  maven: false
+  ndk: null
+  novcheck: false
+  oldsdkloc: false
+  output: null
+  patch: []
+  preassemble: []
+  prebuild: ''
+  rm: []
+  scandelete: []
+  scanignore: []
+  srclibs: []
+  subdir: null
+  submodules: false
+  sudo: ''
+  target: android-10
+  timeout: null
+  versionCode: '3'
+  versionName: '1.2'
+- androidupdate: []
+  antcommands: []
+  antifeatures: []
+  build: ''
+  buildjni: []
+  buildozer: false
+  commit: ad865b57bf3ac59580f38485608a9b1dda4fa7dc
+  disable: ''
+  encoding: null
+  extlibs: []
+  forcevercode: false
+  forceversion: false
+  gradle: []
+  gradleprops: []
+  init: ''
+  maven: false
+  ndk: null
+  novcheck: false
+  oldsdkloc: false
+  output: null
+  patch: []
+  preassemble: []
+  prebuild: ''
+  rm: []
+  scandelete: []
+  scanignore: []
+  srclibs: []
+  subdir: null
+  submodules: false
+  sudo: ''
+  target: android-15
+  timeout: null
+  versionCode: '4'
+  versionName: '1.3'
+- androidupdate: []
+  antcommands: []
+  antifeatures: []
+  build: ''
+  buildjni: []
+  buildozer: false
+  commit: 456bd615f3fbe6dff06433928cf7ea20073601fb
+  disable: ''
+  encoding: null
+  extlibs: []
+  forcevercode: false
+  forceversion: false
+  gradle: []
+  gradleprops: []
+  init: ''
+  maven: false
+  ndk: null
+  novcheck: false
+  oldsdkloc: false
+  output: null
+  patch: []
+  preassemble: []
+  prebuild: ''
+  rm: []
+  scandelete: []
+  scanignore: []
+  srclibs: []
+  subdir: null
+  submodules: false
+  sudo: ''
+  target: android-10
+  timeout: null
+  versionCode: '5'
+  versionName: '1.4'
+- androidupdate: []
+  antcommands: []
+  antifeatures: []
+  build: ''
+  buildjni: []
+  buildozer: false
+  commit: v1.5
+  disable: ''
+  encoding: null
+  extlibs: []
+  forcevercode: false
+  forceversion: false
+  gradle:
+  - 'yes'
+  gradleprops: []
+  init: ''
+  maven: false
+  ndk: null
+  novcheck: false
+  oldsdkloc: false
+  output: null
+  patch: []
+  preassemble: []
+  prebuild: ''
+  rm: []
+  scandelete: []
+  scanignore: []
+  srclibs: []
+  subdir: null
+  submodules: false
+  sudo: echo 'this is just a test'
+  target: null
+  timeout: null
+  versionCode: '6'
+  versionName: '1.5'
+comments: {}
 id: com.politedroid
 lastUpdated: null
 metadatapath: metadata/com.politedroid.yml
diff --git a/tests/metadata/dump/org.adaway.yaml b/tests/metadata/dump/org.adaway.yaml
index 98a249d6..4732ad01 100644
--- a/tests/metadata/dump/org.adaway.yaml
+++ b/tests/metadata/dump/org.adaway.yaml
@@ -1,7 +1,4 @@
-%YAML 1.2
----
-AllowedAPKSigningKeys: []
-AntiFeatures: {}
+AntiFeatures: []
 ArchivePolicy: null
 AuthorEmail: null
 AuthorName: null
@@ -10,1086 +7,12 @@ AutoName: AdAway
 AutoUpdateMode: Version v%v
 Binaries: null
 Bitcoin: null
-Builds:
-- androidupdate: []
-  antcommands: []
-  antifeatures: {}
-  binary: null
-  build: ''
-  buildjni:
-  - yes
-  commit: ea5378a94ee0dc1d99d2cec95fae7e6d81afb2b9
-  disable: ''
-  encoding: null
-  extlibs: []
-  forcevercode: false
-  forceversion: false
-  gradle: []
-  gradleprops: []
-  init: ''
-  maven: null
-  ndk: null
-  novcheck: false
-  oldsdkloc: false
-  output: null
-  patch: []
-  postbuild: ''
-  preassemble: []
-  prebuild: ''
-  rm: []
-  scandelete: []
-  scanignore: []
-  srclibs: []
-  subdir: org_adaway/
-  submodules: false
-  sudo: ''
-  target: null
-  timeout: null
-  versionCode: 13
-  versionName: '1.12'
-- androidupdate: []
-  antcommands: []
-  antifeatures: {}
-  binary: null
-  build: ''
-  buildjni:
-  - yes
-  commit: 4128e59da2eac5c2904c7c7568d298ca51e79540
-  disable: ''
-  encoding: null
-  extlibs: []
-  forcevercode: false
-  forceversion: false
-  gradle: []
-  gradleprops: []
-  init: ''
-  maven: null
-  ndk: null
-  novcheck: false
-  oldsdkloc: false
-  output: null
-  patch:
-  - defprop.patch
-  postbuild: ''
-  preassemble: []
-  prebuild: ''
-  rm: []
-  scandelete: []
-  scanignore: []
-  srclibs: []
-  subdir: org_adaway/
-  submodules: false
-  sudo: ''
-  target: null
-  timeout: null
-  versionCode: 16
-  versionName: '1.15'
-- androidupdate: []
-  antcommands: []
-  antifeatures: {}
-  binary: null
-  build: ''
-  buildjni:
-  - yes
-  commit: 0b9985398b9eef7baf6aadd0dbb12002bc199d2e
-  disable: ''
-  encoding: null
-  extlibs: []
-  forcevercode: false
-  forceversion: false
-  gradle: []
-  gradleprops: []
-  init: ''
-  maven: null
-  ndk: null
-  novcheck: false
-  oldsdkloc: false
-  output: null
-  patch:
-  - defprop.patch
-  postbuild: ''
-  preassemble: []
-  prebuild: ''
-  rm: []
-  scandelete: []
-  scanignore: []
-  srclibs: []
-  subdir: org_adaway/
-  submodules: false
-  sudo: ''
-  target: null
-  timeout: null
-  versionCode: 19
-  versionName: '1.18'
-- androidupdate: []
-  antcommands: []
-  antifeatures: {}
-  binary: null
-  build: ''
-  buildjni:
-  - yes
-  commit: ab27f4dab5f3ea5e228cfb4a6b0e1fbf53695f22
-  disable: ''
-  encoding: null
-  extlibs: []
-  forcevercode: false
-  forceversion: false
-  gradle: []
-  gradleprops: []
-  init: ''
-  maven: null
-  ndk: null
-  novcheck: false
-  oldsdkloc: false
-  output: null
-  patch:
-  - defprop.patch
-  postbuild: ''
-  preassemble: []
-  prebuild: ''
-  rm: []
-  scandelete: []
-  scanignore: []
-  srclibs: []
-  subdir: org_adaway/
-  submodules: false
-  sudo: ''
-  target: null
-  timeout: null
-  versionCode: 20
-  versionName: '1.19'
-- androidupdate: []
-  antcommands: []
-  antifeatures: {}
-  binary: null
-  build: ''
-  buildjni:
-  - yes
-  commit: 695e3801e4081026c8f7213a2345fc451d5eb89c
-  disable: ''
-  encoding: null
-  extlibs: []
-  forcevercode: false
-  forceversion: false
-  gradle: []
-  gradleprops: []
-  init: ''
-  maven: null
-  ndk: null
-  novcheck: false
-  oldsdkloc: false
-  output: null
-  patch:
-  - defprop.patch
-  postbuild: ''
-  preassemble: []
-  prebuild: ''
-  rm: []
-  scandelete: []
-  scanignore: []
-  srclibs: []
-  subdir: org_adaway/
-  submodules: false
-  sudo: ''
-  target: null
-  timeout: null
-  versionCode: 21
-  versionName: '1.20'
-- androidupdate: []
-  antcommands: []
-  antifeatures: {}
-  binary: null
-  build: ''
-  buildjni:
-  - yes
-  commit: 65138c11cc8b6affd28b68e125fbc1dff0886a4e
-  disable: ''
-  encoding: null
-  extlibs: []
-  forcevercode: false
-  forceversion: false
-  gradle: []
-  gradleprops: []
-  init: ''
-  maven: null
-  ndk: null
-  novcheck: false
-  oldsdkloc: false
-  output: null
-  patch:
-  - defprop.patch
-  postbuild: ''
-  preassemble: []
-  prebuild: ''
-  rm: []
-  scandelete: []
-  scanignore: []
-  srclibs: []
-  subdir: org_adaway/
-  submodules: false
-  sudo: ''
-  target: null
-  timeout: null
-  versionCode: 22
-  versionName: '1.21'
-- androidupdate: []
-  antcommands: []
-  antifeatures: {}
-  binary: null
-  build: ''
-  buildjni: []
-  commit: unknown - see disabled
-  disable: no source in repo
-  encoding: null
-  extlibs: []
-  forcevercode: false
-  forceversion: false
-  gradle: []
-  gradleprops: []
-  init: ''
-  maven: null
-  ndk: null
-  novcheck: false
-  oldsdkloc: false
-  output: null
-  patch: []
-  postbuild: ''
-  preassemble: []
-  prebuild: ''
-  rm: []
-  scandelete: []
-  scanignore: []
-  srclibs: []
-  subdir: null
-  submodules: false
-  sudo: ''
-  target: null
-  timeout: null
-  versionCode: 24
-  versionName: '1.23'
-- androidupdate: []
-  antcommands: []
-  antifeatures: {}
-  binary: null
-  build: ''
-  buildjni:
-  - yes
-  commit: f811e53e1e1d2ee047b18715fd7d2072b90ae76b
-  disable: ''
-  encoding: null
-  extlibs: []
-  forcevercode: false
-  forceversion: false
-  gradle: []
-  gradleprops: []
-  init: ''
-  maven: null
-  ndk: null
-  novcheck: false
-  oldsdkloc: false
-  output: null
-  patch: []
-  postbuild: ''
-  preassemble: []
-  prebuild:
-  - android update project -p ../com_actionbarsherlock
-  rm: []
-  scandelete: []
-  scanignore: []
-  srclibs: []
-  subdir: org_adaway/
-  submodules: false
-  sudo: ''
-  target: null
-  timeout: null
-  versionCode: 25
-  versionName: '1.24'
-- androidupdate: []
-  antcommands: []
-  antifeatures: {}
-  binary: null
-  build: ''
-  buildjni:
-  - yes
-  commit: ff97932761cdee68638dc2550751a64b2cbe18e7
-  disable: ''
-  encoding: null
-  extlibs: []
-  forcevercode: false
-  forceversion: false
-  gradle: []
-  gradleprops: []
-  init: ''
-  maven: null
-  ndk: null
-  novcheck: false
-  oldsdkloc: false
-  output: null
-  patch: []
-  postbuild: ''
-  preassemble: []
-  prebuild:
-  - android update project -p ../com_actionbarsherlock
-  rm: []
-  scandelete: []
-  scanignore: []
-  srclibs: []
-  subdir: org_adaway/
-  submodules: false
-  sudo: ''
-  target: null
-  timeout: null
-  versionCode: 26
-  versionName: '1.25'
-- androidupdate: []
-  antcommands: []
-  antifeatures: {}
-  binary: null
-  build: ''
-  buildjni:
-  - yes
-  commit: 33d4d80998f30bafc88c04c80cbae00b03916f99
-  disable: ''
-  encoding: null
-  extlibs: []
-  forcevercode: false
-  forceversion: false
-  gradle: []
-  gradleprops: []
-  init: ''
-  maven: null
-  ndk: null
-  novcheck: false
-  oldsdkloc: false
-  output: null
-  patch: []
-  postbuild: ''
-  preassemble: []
-  prebuild:
-  - android update project -p ../com_actionbarsherlock
-  rm: []
-  scandelete: []
-  scanignore: []
-  srclibs: []
-  subdir: org_adaway/
-  submodules: false
-  sudo: ''
-  target: null
-  timeout: null
-  versionCode: 27
-  versionName: '1.26'
-- androidupdate: []
-  antcommands: []
-  antifeatures: {}
-  binary: null
-  build: ''
-  buildjni:
-  - yes
-  commit: 743d25a7e287505461f33f4b8e57e4cf988fffea
-  disable: ''
-  encoding: null
-  extlibs: []
-  forcevercode: false
-  forceversion: false
-  gradle: []
-  gradleprops: []
-  init: ''
-  maven: null
-  ndk: null
-  novcheck: false
-  oldsdkloc: false
-  output: null
-  patch: []
-  postbuild: ''
-  preassemble: []
-  prebuild:
-  - android update project -p ../com_actionbarsherlock
-  rm: []
-  scandelete: []
-  scanignore: []
-  srclibs: []
-  subdir: org_adaway/
-  submodules: false
-  sudo: ''
-  target: null
-  timeout: null
-  versionCode: 28
-  versionName: '1.27'
-- androidupdate: []
-  antcommands: []
-  antifeatures: {}
-  binary: null
-  build: ''
-  buildjni:
-  - yes
-  commit: eaa07f4
-  disable: ''
-  encoding: null
-  extlibs: []
-  forcevercode: false
-  forceversion: false
-  gradle: []
-  gradleprops: []
-  init: ''
-  maven: null
-  ndk: null
-  novcheck: false
-  oldsdkloc: false
-  output: null
-  patch: []
-  postbuild: ''
-  preassemble: []
-  prebuild:
-  - android update project -p ../com_actionbarsherlock
-  - rm -rf libs/armeabi/*
-  rm: []
-  scandelete: []
-  scanignore: []
-  srclibs: []
-  subdir: org_adaway/
-  submodules: false
-  sudo: ''
-  target: null
-  timeout: null
-  versionCode: 30
-  versionName: '1.29'
-- androidupdate: []
-  antcommands: []
-  antifeatures: {}
-  binary: null
-  build: ''
-  buildjni: []
-  commit: 71ced3f
-  disable: ''
-  encoding: null
-  extlibs: []
-  forcevercode: false
-  forceversion: false
-  gradle: []
-  gradleprops: []
-  init: ''
-  maven: null
-  ndk: null
-  novcheck: false
-  oldsdkloc: false
-  output: null
-  patch: []
-  postbuild: ''
-  preassemble: []
-  prebuild:
-  - android update project -p ../com_actionbarsherlock
-  - rm -rf libs/armeabi/*
-  - rm libs/android-support-v4.jar
-  rm: []
-  scandelete: []
-  scanignore: []
-  srclibs: []
-  subdir: org_adaway/
-  submodules: false
-  sudo: ''
-  target: null
-  timeout: null
-  versionCode: 33
-  versionName: '1.32'
-- androidupdate: []
-  antcommands: []
-  antifeatures: {}
-  binary: null
-  build: ''
-  buildjni: []
-  commit: 9d63c18
-  disable: ''
-  encoding: null
-  extlibs: []
-  forcevercode: false
-  forceversion: false
-  gradle: []
-  gradleprops: []
-  init: ''
-  maven: null
-  ndk: null
-  novcheck: false
-  oldsdkloc: false
-  output: null
-  patch: []
-  postbuild: ''
-  preassemble: []
-  prebuild:
-  - android update project -p ../com_actionbarsherlock
-  - rm -rf libs/armeabi/*
-  rm: []
-  scandelete: []
-  scanignore: []
-  srclibs: []
-  subdir: org_adaway/
-  submodules: false
-  sudo: ''
-  target: null
-  timeout: null
-  versionCode: 34
-  versionName: '1.33'
-- androidupdate: []
-  antcommands: []
-  antifeatures: {}
-  binary: null
-  build: ''
-  buildjni: []
-  commit: f2568b1
-  disable: ''
-  encoding: null
-  extlibs: []
-  forcevercode: false
-  forceversion: false
-  gradle: []
-  gradleprops: []
-  init: ''
-  maven: null
-  ndk: null
-  novcheck: false
-  oldsdkloc: false
-  output: null
-  patch: []
-  postbuild: ''
-  preassemble: []
-  prebuild:
-  - android update project -p ../com_actionbarsherlock
-  - rm -rf libs/armeabi/*
-  - android update project -p ../org_donations
-  rm: []
-  scandelete: []
-  scanignore: []
-  srclibs: []
-  subdir: org_adaway/
-  submodules: false
-  sudo: ''
-  target: null
-  timeout: null
-  versionCode: 35
-  versionName: '1.34'
-- androidupdate: []
-  antcommands: []
-  antifeatures: {}
-  binary: null
-  build: ''
-  buildjni: []
-  commit: 7442d5d
-  disable: ''
-  encoding: null
-  extlibs: []
-  forcevercode: false
-  forceversion: false
-  gradle: []
-  gradleprops: []
-  init: ''
-  maven: null
-  ndk: null
-  novcheck: false
-  oldsdkloc: false
-  output: null
-  patch: []
-  postbuild: ''
-  preassemble: []
-  prebuild:
-  - android update project -p ../com_actionbarsherlock
-  - rm -rf libs/armeabi/*
-  - android update project -p ../org_donations
-  rm: []
-  scandelete: []
-  scanignore: []
-  srclibs: []
-  subdir: org_adaway/
-  submodules: false
-  sudo: ''
-  target: null
-  timeout: null
-  versionCode: 36
-  versionName: '1.35'
-- androidupdate: []
-  antcommands: []
-  antifeatures: {}
-  binary: null
-  build: ''
-  buildjni: []
-  commit: 83fc713
-  disable: ''
-  encoding: null
-  extlibs: []
-  forcevercode: false
-  forceversion: false
-  gradle: []
-  gradleprops: []
-  init: ''
-  maven: null
-  ndk: null
-  novcheck: false
-  oldsdkloc: false
-  output: null
-  patch: []
-  postbuild: ''
-  preassemble: []
-  prebuild:
-  - android update project -p ../com_actionbarsherlock
-  - rm -rf libs/armeabi/*
-  - android update project -p ../org_donations
-  rm: []
-  scandelete: []
-  scanignore: []
-  srclibs: []
-  subdir: org_adaway/
-  submodules: false
-  sudo: ''
-  target: null
-  timeout: null
-  versionCode: 37
-  versionName: '1.36'
-- androidupdate: []
-  antcommands: []
-  antifeatures: {}
-  binary: null
-  build: ''
-  buildjni: []
-  commit: 70da32b567122b701cdcb1609b780eb85732028f
-  disable: ''
-  encoding: null
-  extlibs: []
-  forcevercode: false
-  forceversion: false
-  gradle: []
-  gradleprops: []
-  init: ''
-  maven: null
-  ndk: null
-  novcheck: false
-  oldsdkloc: false
-  output: null
-  patch: []
-  postbuild: ''
-  preassemble: []
-  prebuild:
-  - android update project -p ../com_actionbarsherlock
-  - rm -rf libs/armeabi/*
-  - android update project -p ../org_donations
-  rm: []
-  scandelete: []
-  scanignore: []
-  srclibs: []
-  subdir: org_adaway/
-  submodules: false
-  sudo: ''
-  target: null
-  timeout: null
-  versionCode: 38
-  versionName: '1.37'
-- androidupdate:
-  - .
-  - android-libs/Donations
-  - android-libs/ActionBarSherlock
-  - android-libs/HtmlSpanner/htmlspanner
-  antcommands: []
-  antifeatures: {}
-  binary: null
-  build: ''
-  buildjni:
-  - yes
-  commit: v2.1
-  disable: ''
-  encoding: null
-  extlibs:
-  - htmlcleaner/htmlcleaner-2.2.jar
-  forcevercode: false
-  forceversion: false
-  gradle: []
-  gradleprops: []
-  init:
-  - rm android-libs/Donations/custom_rules.xml
-  - git clone https://github.com/dschuermann/HtmlSpanner android-libs/HtmlSpanner
-  maven: null
-  ndk: null
-  novcheck: false
-  oldsdkloc: false
-  output: null
-  patch: []
-  postbuild: ''
-  preassemble: []
-  prebuild:
-  - rm -rf ../update_zip libs/root-commands-1.2.jar libs/htmlspanner-0.2-fork.jar
-  - cp -f libs/htmlcleaner-2.2.jar android-libs/HtmlSpanner/htmlspanner/libs/
-  - echo "android.library.reference.3=$$RootCommands$$" >> project.properties
-  - echo "android.library.reference.4=android-libs/HtmlSpanner/htmlspanner" >> project.properties
-  - find . -type f -print0 | xargs -0 sed -i 's/org.rootcommands/org.sufficientlysecure.rootcommands/g'
-  - cp android-libs/Donations/ant-templates/other/DonationsConfig.java android-libs/Donations/src/org/donations/
-  rm: []
-  scandelete: []
-  scanignore: []
-  srclibs:
-  - RootCommands@c940b0e503
-  subdir: AdAway
-  submodules: false
-  sudo: ''
-  target: null
-  timeout: null
-  versionCode: 40
-  versionName: '2.1'
-- androidupdate:
-  - .
-  - android-libs/Donations
-  - android-libs/ActionBarSherlock
-  - android-libs/HtmlSpanner/htmlspanner
-  antcommands: []
-  antifeatures: {}
-  binary: null
-  build: ''
-  buildjni:
-  - yes
-  commit: v2.3
-  disable: ''
-  encoding: null
-  extlibs:
-  - htmlcleaner/htmlcleaner-2.2.jar
-  forcevercode: false
-  forceversion: false
-  gradle: []
-  gradleprops: []
-  init:
-  - rm android-libs/Donations/custom_rules.xml
-  - git clone https://github.com/dschuermann/HtmlSpanner android-libs/HtmlSpanner
-  maven: null
-  ndk: null
-  novcheck: false
-  oldsdkloc: false
-  output: null
-  patch: []
-  postbuild: ''
-  preassemble: []
-  prebuild:
-  - rm -rf ../update_zip libs/root-commands-1.2.jar libs/htmlspanner-0.2-fork.jar
-  - cp -f libs/htmlcleaner-2.2.jar android-libs/HtmlSpanner/htmlspanner/libs/
-  - echo "android.library.reference.3=$$RootCommands$$" >> project.properties
-  - echo "android.library.reference.4=android-libs/HtmlSpanner/htmlspanner" >> project.properties
-  - find . -type f -print0 | xargs -0 sed -i 's/org.rootcommands/org.sufficientlysecure.rootcommands/g'
-  - cp android-libs/Donations/ant-templates/other/DonationsConfig.java android-libs/Donations/src/org/donations/
-  rm: []
-  scandelete: []
-  scanignore: []
-  srclibs:
-  - RootCommands@c940b0e503
-  subdir: AdAway
-  submodules: false
-  sudo: ''
-  target: null
-  timeout: null
-  versionCode: 42
-  versionName: '2.3'
-- androidupdate: []
-  antcommands: []
-  antifeatures: {}
-  binary: null
-  build: ''
-  buildjni:
-  - yes
-  commit: v2.6
-  disable: ''
-  encoding: null
-  extlibs: []
-  forcevercode: false
-  forceversion: false
-  gradle:
-  - yes
-  gradleprops: []
-  init: ''
-  maven: null
-  ndk: null
-  novcheck: false
-  oldsdkloc: false
-  output: null
-  patch: []
-  postbuild: ''
-  preassemble:
-  - renameExecutables
-  prebuild: ''
-  rm: []
-  scandelete: []
-  scanignore: []
-  srclibs: []
-  subdir: AdAway
-  submodules: false
-  sudo: ''
-  target: null
-  timeout: null
-  versionCode: 45
-  versionName: '2.6'
-- androidupdate: []
-  antcommands: []
-  antifeatures: {}
-  binary: null
-  build: ''
-  buildjni:
-  - yes
-  commit: v2.7
-  disable: ''
-  encoding: null
-  extlibs: []
-  forcevercode: false
-  forceversion: false
-  gradle:
-  - yes
-  gradleprops: []
-  init: ''
-  maven: null
-  ndk: null
-  novcheck: false
-  oldsdkloc: false
-  output: null
-  patch: []
-  postbuild: ''
-  preassemble:
-  - renameExecutables
-  prebuild: ''
-  rm: []
-  scandelete: []
-  scanignore: []
-  srclibs: []
-  subdir: AdAway
-  submodules: false
-  sudo: ''
-  target: null
-  timeout: null
-  versionCode: 46
-  versionName: '2.7'
-- androidupdate: []
-  antcommands: []
-  antifeatures: {}
-  binary: null
-  build: ''
-  buildjni:
-  - yes
-  commit: v2.8
-  disable: ''
-  encoding: null
-  extlibs: []
-  forcevercode: false
-  forceversion: false
-  gradle:
-  - yes
-  gradleprops: []
-  init: ''
-  maven: null
-  ndk: null
-  novcheck: false
-  oldsdkloc: false
-  output: null
-  patch: []
-  postbuild: ''
-  preassemble:
-  - renameExecutables
-  prebuild: ''
-  rm: []
-  scandelete: []
-  scanignore: []
-  srclibs: []
-  subdir: AdAway
-  submodules: false
-  sudo: ''
-  target: null
-  timeout: null
-  versionCode: 47
-  versionName: '2.8'
-- androidupdate: []
-  antcommands: []
-  antifeatures: {}
-  binary: null
-  build: ''
-  buildjni:
-  - yes
-  commit: v2.8.1
-  disable: ''
-  encoding: null
-  extlibs: []
-  forcevercode: false
-  forceversion: false
-  gradle:
-  - yes
-  gradleprops: []
-  init: ''
-  maven: null
-  ndk: null
-  novcheck: false
-  oldsdkloc: false
-  output: null
-  patch: []
-  postbuild: ''
-  preassemble:
-  - renameExecutables
-  prebuild: ''
-  rm: []
-  scandelete: []
-  scanignore: []
-  srclibs: []
-  subdir: AdAway
-  submodules: false
-  sudo: ''
-  target: null
-  timeout: null
-  versionCode: 48
-  versionName: 2.8.1
-- androidupdate: []
-  antcommands: []
-  antifeatures: {}
-  binary: null
-  build: ''
-  buildjni:
-  - yes
-  commit: v2.9
-  disable: ''
-  encoding: null
-  extlibs: []
-  forcevercode: false
-  forceversion: false
-  gradle:
-  - yes
-  gradleprops: []
-  init: ''
-  maven: null
-  ndk: null
-  novcheck: false
-  oldsdkloc: false
-  output: null
-  patch: []
-  postbuild: ''
-  preassemble:
-  - renameExecutables
-  prebuild: ''
-  rm: []
-  scandelete: []
-  scanignore: []
-  srclibs: []
-  subdir: AdAway
-  submodules: false
-  sudo: ''
-  target: null
-  timeout: null
-  versionCode: 49
-  versionName: '2.9'
-- androidupdate: []
-  antcommands: []
-  antifeatures: {}
-  binary: null
-  build: ''
-  buildjni:
-  - yes
-  commit: v2.9.1
-  disable: ''
-  encoding: null
-  extlibs: []
-  forcevercode: false
-  forceversion: false
-  gradle:
-  - yes
-  gradleprops: []
-  init: ''
-  maven: null
-  ndk: null
-  novcheck: false
-  oldsdkloc: false
-  output: null
-  patch: []
-  postbuild: ''
-  preassemble:
-  - renameExecutables
-  prebuild: ''
-  rm: []
-  scandelete: []
-  scanignore: []
-  srclibs: []
-  subdir: AdAway
-  submodules: false
-  sudo: ''
-  target: null
-  timeout: null
-  versionCode: 50
-  versionName: 2.9.1
-- androidupdate: []
-  antcommands: []
-  antifeatures: {}
-  binary: null
-  build: ''
-  buildjni:
-  - yes
-  commit: v2.9.2
-  disable: ''
-  encoding: null
-  extlibs: []
-  forcevercode: false
-  forceversion: false
-  gradle:
-  - yes
-  gradleprops: []
-  init: ''
-  maven: null
-  ndk: null
-  novcheck: false
-  oldsdkloc: false
-  output: null
-  patch: []
-  postbuild: ''
-  preassemble:
-  - renameExecutables
-  prebuild: ''
-  rm: []
-  scandelete: []
-  scanignore: []
-  srclibs: []
-  subdir: AdAway
-  submodules: false
-  sudo: ''
-  target: null
-  timeout: null
-  versionCode: 51
-  versionName: 2.9.2
-- androidupdate: []
-  antcommands: []
-  antifeatures: {}
-  binary: null
-  build: ''
-  buildjni:
-  - yes
-  commit: v3.0
-  disable: ''
-  encoding: null
-  extlibs: []
-  forcevercode: false
-  forceversion: false
-  gradle:
-  - yes
-  gradleprops: []
-  init: ''
-  maven: null
-  ndk: null
-  novcheck: false
-  oldsdkloc: false
-  output: null
-  patch: []
-  postbuild: ''
-  preassemble:
-  - renameExecutables
-  prebuild: ''
-  rm: []
-  scandelete: []
-  scanignore: []
-  srclibs: []
-  subdir: AdAway
-  submodules: false
-  sudo: ''
-  target: null
-  timeout: null
-  versionCode: 52
-  versionName: '3.0'
 Categories:
 - System
 - Security
 Changelog: ''
 CurrentVersion: '3.0'
-CurrentVersionCode: 52
+CurrentVersionCode: '52'
 Description: 'An ad blocker that uses the hosts file. The hosts file
 
   contains a list of mappings between hostnames and IP addresses. When
@@ -1115,8 +38,10 @@ Description: 'An ad blocker that uses the hosts file. The hosts file
   read-only.'
 Disabled: null
 Donate: http://sufficientlysecure.org/index.php/adaway
+FlattrID: '369138'
 IssueTracker: https://github.com/dschuermann/ad-away/issues
 Liberapay: null
+LiberapayID: '1234567890'
 License: GPL-3.0-only
 Litecoin: null
 MaintainerNotes: ''
@@ -1134,9 +59,1034 @@ UpdateCheckData: null
 UpdateCheckIgnore: null
 UpdateCheckMode: Tags
 UpdateCheckName: null
-VercodeOperation: []
+VercodeOperation: null
 WebSite: http://sufficientlysecure.org/index.php/adaway
 added: null
+builds:
+- androidupdate: []
+  antcommands: []
+  antifeatures: []
+  build: ''
+  buildjni:
+  - 'yes'
+  buildozer: false
+  commit: ea5378a94ee0dc1d99d2cec95fae7e6d81afb2b9
+  disable: ''
+  encoding: null
+  extlibs: []
+  forcevercode: false
+  forceversion: false
+  gradle: []
+  gradleprops: []
+  init: ''
+  maven: false
+  ndk: null
+  novcheck: false
+  oldsdkloc: false
+  output: null
+  patch: []
+  preassemble: []
+  prebuild: ''
+  rm: []
+  scandelete: []
+  scanignore: []
+  srclibs: []
+  subdir: org_adaway/
+  submodules: false
+  sudo: ''
+  target: null
+  timeout: null
+  versionCode: '13'
+  versionName: '1.12'
+- androidupdate: []
+  antcommands: []
+  antifeatures: []
+  build: ''
+  buildjni:
+  - 'yes'
+  buildozer: false
+  commit: 4128e59da2eac5c2904c7c7568d298ca51e79540
+  disable: ''
+  encoding: null
+  extlibs: []
+  forcevercode: false
+  forceversion: false
+  gradle: []
+  gradleprops: []
+  init: ''
+  maven: false
+  ndk: null
+  novcheck: false
+  oldsdkloc: false
+  output: null
+  patch:
+  - defprop.patch
+  preassemble: []
+  prebuild: ''
+  rm: []
+  scandelete: []
+  scanignore: []
+  srclibs: []
+  subdir: org_adaway/
+  submodules: false
+  sudo: ''
+  target: null
+  timeout: null
+  versionCode: '16'
+  versionName: '1.15'
+- androidupdate: []
+  antcommands: []
+  antifeatures: []
+  build: ''
+  buildjni:
+  - 'yes'
+  buildozer: false
+  commit: 0b9985398b9eef7baf6aadd0dbb12002bc199d2e
+  disable: ''
+  encoding: null
+  extlibs: []
+  forcevercode: false
+  forceversion: false
+  gradle: []
+  gradleprops: []
+  init: ''
+  maven: false
+  ndk: null
+  novcheck: false
+  oldsdkloc: false
+  output: null
+  patch:
+  - defprop.patch
+  preassemble: []
+  prebuild: ''
+  rm: []
+  scandelete: []
+  scanignore: []
+  srclibs: []
+  subdir: org_adaway/
+  submodules: false
+  sudo: ''
+  target: null
+  timeout: null
+  versionCode: '19'
+  versionName: '1.18'
+- androidupdate: []
+  antcommands: []
+  antifeatures: []
+  build: ''
+  buildjni:
+  - 'yes'
+  buildozer: false
+  commit: ab27f4dab5f3ea5e228cfb4a6b0e1fbf53695f22
+  disable: ''
+  encoding: null
+  extlibs: []
+  forcevercode: false
+  forceversion: false
+  gradle: []
+  gradleprops: []
+  init: ''
+  maven: false
+  ndk: null
+  novcheck: false
+  oldsdkloc: false
+  output: null
+  patch:
+  - defprop.patch
+  preassemble: []
+  prebuild: ''
+  rm: []
+  scandelete: []
+  scanignore: []
+  srclibs: []
+  subdir: org_adaway/
+  submodules: false
+  sudo: ''
+  target: null
+  timeout: null
+  versionCode: '20'
+  versionName: '1.19'
+- androidupdate: []
+  antcommands: []
+  antifeatures: []
+  build: ''
+  buildjni:
+  - 'yes'
+  buildozer: false
+  commit: 695e3801e4081026c8f7213a2345fc451d5eb89c
+  disable: ''
+  encoding: null
+  extlibs: []
+  forcevercode: false
+  forceversion: false
+  gradle: []
+  gradleprops: []
+  init: ''
+  maven: false
+  ndk: null
+  novcheck: false
+  oldsdkloc: false
+  output: null
+  patch:
+  - defprop.patch
+  preassemble: []
+  prebuild: ''
+  rm: []
+  scandelete: []
+  scanignore: []
+  srclibs: []
+  subdir: org_adaway/
+  submodules: false
+  sudo: ''
+  target: null
+  timeout: null
+  versionCode: '21'
+  versionName: '1.20'
+- androidupdate: []
+  antcommands: []
+  antifeatures: []
+  build: ''
+  buildjni:
+  - 'yes'
+  buildozer: false
+  commit: 65138c11cc8b6affd28b68e125fbc1dff0886a4e
+  disable: ''
+  encoding: null
+  extlibs: []
+  forcevercode: false
+  forceversion: false
+  gradle: []
+  gradleprops: []
+  init: ''
+  maven: false
+  ndk: null
+  novcheck: false
+  oldsdkloc: false
+  output: null
+  patch:
+  - defprop.patch
+  preassemble: []
+  prebuild: ''
+  rm: []
+  scandelete: []
+  scanignore: []
+  srclibs: []
+  subdir: org_adaway/
+  submodules: false
+  sudo: ''
+  target: null
+  timeout: null
+  versionCode: '22'
+  versionName: '1.21'
+- androidupdate: []
+  antcommands: []
+  antifeatures: []
+  build: ''
+  buildjni: []
+  buildozer: false
+  commit: unknown - see disabled
+  disable: no source in repo
+  encoding: null
+  extlibs: []
+  forcevercode: false
+  forceversion: false
+  gradle: []
+  gradleprops: []
+  init: ''
+  maven: false
+  ndk: null
+  novcheck: false
+  oldsdkloc: false
+  output: null
+  patch: []
+  preassemble: []
+  prebuild: ''
+  rm: []
+  scandelete: []
+  scanignore: []
+  srclibs: []
+  subdir: null
+  submodules: false
+  sudo: ''
+  target: null
+  timeout: null
+  versionCode: '24'
+  versionName: '1.23'
+- androidupdate: []
+  antcommands: []
+  antifeatures: []
+  build: ''
+  buildjni:
+  - 'yes'
+  buildozer: false
+  commit: f811e53e1e1d2ee047b18715fd7d2072b90ae76b
+  disable: ''
+  encoding: null
+  extlibs: []
+  forcevercode: false
+  forceversion: false
+  gradle: []
+  gradleprops: []
+  init: ''
+  maven: false
+  ndk: null
+  novcheck: false
+  oldsdkloc: false
+  output: null
+  patch: []
+  preassemble: []
+  prebuild: android update project -p ../com_actionbarsherlock
+  rm: []
+  scandelete: []
+  scanignore: []
+  srclibs: []
+  subdir: org_adaway/
+  submodules: false
+  sudo: ''
+  target: null
+  timeout: null
+  versionCode: '25'
+  versionName: '1.24'
+- androidupdate: []
+  antcommands: []
+  antifeatures: []
+  build: ''
+  buildjni:
+  - 'yes'
+  buildozer: false
+  commit: ff97932761cdee68638dc2550751a64b2cbe18e7
+  disable: ''
+  encoding: null
+  extlibs: []
+  forcevercode: false
+  forceversion: false
+  gradle: []
+  gradleprops: []
+  init: ''
+  maven: false
+  ndk: null
+  novcheck: false
+  oldsdkloc: false
+  output: null
+  patch: []
+  preassemble: []
+  prebuild: android update project -p ../com_actionbarsherlock
+  rm: []
+  scandelete: []
+  scanignore: []
+  srclibs: []
+  subdir: org_adaway/
+  submodules: false
+  sudo: ''
+  target: null
+  timeout: null
+  versionCode: '26'
+  versionName: '1.25'
+- androidupdate: []
+  antcommands: []
+  antifeatures: []
+  build: ''
+  buildjni:
+  - 'yes'
+  buildozer: false
+  commit: 33d4d80998f30bafc88c04c80cbae00b03916f99
+  disable: ''
+  encoding: null
+  extlibs: []
+  forcevercode: false
+  forceversion: false
+  gradle: []
+  gradleprops: []
+  init: ''
+  maven: false
+  ndk: null
+  novcheck: false
+  oldsdkloc: false
+  output: null
+  patch: []
+  preassemble: []
+  prebuild: android update project -p ../com_actionbarsherlock
+  rm: []
+  scandelete: []
+  scanignore: []
+  srclibs: []
+  subdir: org_adaway/
+  submodules: false
+  sudo: ''
+  target: null
+  timeout: null
+  versionCode: '27'
+  versionName: '1.26'
+- androidupdate: []
+  antcommands: []
+  antifeatures: []
+  build: ''
+  buildjni:
+  - 'yes'
+  buildozer: false
+  commit: 743d25a7e287505461f33f4b8e57e4cf988fffea
+  disable: ''
+  encoding: null
+  extlibs: []
+  forcevercode: false
+  forceversion: false
+  gradle: []
+  gradleprops: []
+  init: ''
+  maven: false
+  ndk: null
+  novcheck: false
+  oldsdkloc: false
+  output: null
+  patch: []
+  preassemble: []
+  prebuild: android update project -p ../com_actionbarsherlock
+  rm: []
+  scandelete: []
+  scanignore: []
+  srclibs: []
+  subdir: org_adaway/
+  submodules: false
+  sudo: ''
+  target: null
+  timeout: null
+  versionCode: '28'
+  versionName: '1.27'
+- androidupdate: []
+  antcommands: []
+  antifeatures: []
+  build: ''
+  buildjni:
+  - 'yes'
+  buildozer: false
+  commit: eaa07f4
+  disable: ''
+  encoding: null
+  extlibs: []
+  forcevercode: false
+  forceversion: false
+  gradle: []
+  gradleprops: []
+  init: ''
+  maven: false
+  ndk: null
+  novcheck: false
+  oldsdkloc: false
+  output: null
+  patch: []
+  preassemble: []
+  prebuild: android update project -p ../com_actionbarsherlock && rm -rf libs/armeabi/*
+  rm: []
+  scandelete: []
+  scanignore: []
+  srclibs: []
+  subdir: org_adaway/
+  submodules: false
+  sudo: ''
+  target: null
+  timeout: null
+  versionCode: '30'
+  versionName: '1.29'
+- androidupdate: []
+  antcommands: []
+  antifeatures: []
+  build: ''
+  buildjni: []
+  buildozer: false
+  commit: 71ced3f
+  disable: ''
+  encoding: null
+  extlibs: []
+  forcevercode: false
+  forceversion: false
+  gradle: []
+  gradleprops: []
+  init: ''
+  maven: false
+  ndk: null
+  novcheck: false
+  oldsdkloc: false
+  output: null
+  patch: []
+  preassemble: []
+  prebuild: android update project -p ../com_actionbarsherlock && rm -rf libs/armeabi/*
+    && rm libs/android-support-v4.jar
+  rm: []
+  scandelete: []
+  scanignore: []
+  srclibs: []
+  subdir: org_adaway/
+  submodules: false
+  sudo: ''
+  target: null
+  timeout: null
+  versionCode: '33'
+  versionName: '1.32'
+- androidupdate: []
+  antcommands: []
+  antifeatures: []
+  build: ''
+  buildjni: []
+  buildozer: false
+  commit: 9d63c18
+  disable: ''
+  encoding: null
+  extlibs: []
+  forcevercode: false
+  forceversion: false
+  gradle: []
+  gradleprops: []
+  init: ''
+  maven: false
+  ndk: null
+  novcheck: false
+  oldsdkloc: false
+  output: null
+  patch: []
+  preassemble: []
+  prebuild: android update project -p ../com_actionbarsherlock && rm -rf libs/armeabi/*
+  rm: []
+  scandelete: []
+  scanignore: []
+  srclibs: []
+  subdir: org_adaway/
+  submodules: false
+  sudo: ''
+  target: null
+  timeout: null
+  versionCode: '34'
+  versionName: '1.33'
+- androidupdate: []
+  antcommands: []
+  antifeatures: []
+  build: ''
+  buildjni: []
+  buildozer: false
+  commit: f2568b1
+  disable: ''
+  encoding: null
+  extlibs: []
+  forcevercode: false
+  forceversion: false
+  gradle: []
+  gradleprops: []
+  init: ''
+  maven: false
+  ndk: null
+  novcheck: false
+  oldsdkloc: false
+  output: null
+  patch: []
+  preassemble: []
+  prebuild: android update project -p ../com_actionbarsherlock && rm -rf libs/armeabi/*
+    && android update project -p ../org_donations
+  rm: []
+  scandelete: []
+  scanignore: []
+  srclibs: []
+  subdir: org_adaway/
+  submodules: false
+  sudo: ''
+  target: null
+  timeout: null
+  versionCode: '35'
+  versionName: '1.34'
+- androidupdate: []
+  antcommands: []
+  antifeatures: []
+  build: ''
+  buildjni: []
+  buildozer: false
+  commit: 7442d5d
+  disable: ''
+  encoding: null
+  extlibs: []
+  forcevercode: false
+  forceversion: false
+  gradle: []
+  gradleprops: []
+  init: ''
+  maven: false
+  ndk: null
+  novcheck: false
+  oldsdkloc: false
+  output: null
+  patch: []
+  preassemble: []
+  prebuild: android update project -p ../com_actionbarsherlock && rm -rf libs/armeabi/*
+    && android update project -p ../org_donations
+  rm: []
+  scandelete: []
+  scanignore: []
+  srclibs: []
+  subdir: org_adaway/
+  submodules: false
+  sudo: ''
+  target: null
+  timeout: null
+  versionCode: '36'
+  versionName: '1.35'
+- androidupdate: []
+  antcommands: []
+  antifeatures: []
+  build: ''
+  buildjni: []
+  buildozer: false
+  commit: 83fc713
+  disable: ''
+  encoding: null
+  extlibs: []
+  forcevercode: false
+  forceversion: false
+  gradle: []
+  gradleprops: []
+  init: ''
+  maven: false
+  ndk: null
+  novcheck: false
+  oldsdkloc: false
+  output: null
+  patch: []
+  preassemble: []
+  prebuild: android update project -p ../com_actionbarsherlock && rm -rf libs/armeabi/*
+    && android update project -p ../org_donations
+  rm: []
+  scandelete: []
+  scanignore: []
+  srclibs: []
+  subdir: org_adaway/
+  submodules: false
+  sudo: ''
+  target: null
+  timeout: null
+  versionCode: '37'
+  versionName: '1.36'
+- androidupdate: []
+  antcommands: []
+  antifeatures: []
+  build: ''
+  buildjni: []
+  buildozer: false
+  commit: 70da32b567122b701cdcb1609b780eb85732028f
+  disable: ''
+  encoding: null
+  extlibs: []
+  forcevercode: false
+  forceversion: false
+  gradle: []
+  gradleprops: []
+  init: ''
+  maven: false
+  ndk: null
+  novcheck: false
+  oldsdkloc: false
+  output: null
+  patch: []
+  preassemble: []
+  prebuild: android update project -p ../com_actionbarsherlock && rm -rf libs/armeabi/*
+    && android update project -p ../org_donations
+  rm: []
+  scandelete: []
+  scanignore: []
+  srclibs: []
+  subdir: org_adaway/
+  submodules: false
+  sudo: ''
+  target: null
+  timeout: null
+  versionCode: '38'
+  versionName: '1.37'
+- androidupdate:
+  - .
+  - android-libs/Donations
+  - android-libs/ActionBarSherlock
+  - android-libs/HtmlSpanner/htmlspanner
+  antcommands: []
+  antifeatures: []
+  build: ''
+  buildjni:
+  - 'yes'
+  buildozer: false
+  commit: v2.1
+  disable: ''
+  encoding: null
+  extlibs:
+  - htmlcleaner/htmlcleaner-2.2.jar
+  forcevercode: false
+  forceversion: false
+  gradle: []
+  gradleprops: []
+  init: rm android-libs/Donations/custom_rules.xml && git clone https://github.com/dschuermann/HtmlSpanner
+    android-libs/HtmlSpanner
+  maven: false
+  ndk: null
+  novcheck: false
+  oldsdkloc: false
+  output: null
+  patch: []
+  preassemble: []
+  prebuild: rm -rf ../update_zip libs/root-commands-1.2.jar libs/htmlspanner-0.2-fork.jar
+    && cp -f libs/htmlcleaner-2.2.jar android-libs/HtmlSpanner/htmlspanner/libs/ &&
+    echo "android.library.reference.3=$$RootCommands$$" >> project.properties && echo
+    "android.library.reference.4=android-libs/HtmlSpanner/htmlspanner" >> project.properties
+    && find . -type f -print0 | xargs -0 sed -i 's/org.rootcommands/org.sufficientlysecure.rootcommands/g'
+    && cp android-libs/Donations/ant-templates/other/DonationsConfig.java android-libs/Donations/src/org/donations/
+  rm: []
+  scandelete: []
+  scanignore: []
+  srclibs:
+  - RootCommands@c940b0e503
+  subdir: AdAway
+  submodules: false
+  sudo: ''
+  target: null
+  timeout: null
+  versionCode: '40'
+  versionName: '2.1'
+- androidupdate:
+  - .
+  - android-libs/Donations
+  - android-libs/ActionBarSherlock
+  - android-libs/HtmlSpanner/htmlspanner
+  antcommands: []
+  antifeatures: []
+  build: ''
+  buildjni:
+  - 'yes'
+  buildozer: false
+  commit: v2.3
+  disable: ''
+  encoding: null
+  extlibs:
+  - htmlcleaner/htmlcleaner-2.2.jar
+  forcevercode: false
+  forceversion: false
+  gradle: []
+  gradleprops: []
+  init: rm android-libs/Donations/custom_rules.xml && git clone https://github.com/dschuermann/HtmlSpanner
+    android-libs/HtmlSpanner
+  maven: false
+  ndk: null
+  novcheck: false
+  oldsdkloc: false
+  output: null
+  patch: []
+  preassemble: []
+  prebuild: rm -rf ../update_zip libs/root-commands-1.2.jar libs/htmlspanner-0.2-fork.jar
+    && cp -f libs/htmlcleaner-2.2.jar android-libs/HtmlSpanner/htmlspanner/libs/ &&
+    echo "android.library.reference.3=$$RootCommands$$" >> project.properties && echo
+    "android.library.reference.4=android-libs/HtmlSpanner/htmlspanner" >> project.properties
+    && find . -type f -print0 | xargs -0 sed -i 's/org.rootcommands/org.sufficientlysecure.rootcommands/g'
+    && cp android-libs/Donations/ant-templates/other/DonationsConfig.java android-libs/Donations/src/org/donations/
+  rm: []
+  scandelete: []
+  scanignore: []
+  srclibs:
+  - RootCommands@c940b0e503
+  subdir: AdAway
+  submodules: false
+  sudo: ''
+  target: null
+  timeout: null
+  versionCode: '42'
+  versionName: '2.3'
+- androidupdate: []
+  antcommands: []
+  antifeatures: []
+  build: ''
+  buildjni:
+  - 'yes'
+  buildozer: false
+  commit: v2.6
+  disable: ''
+  encoding: null
+  extlibs: []
+  forcevercode: false
+  forceversion: false
+  gradle:
+  - 'yes'
+  gradleprops: []
+  init: ''
+  maven: false
+  ndk: null
+  novcheck: false
+  oldsdkloc: false
+  output: null
+  patch: []
+  preassemble:
+  - renameExecutables
+  prebuild: ''
+  rm: []
+  scandelete: []
+  scanignore: []
+  srclibs: []
+  subdir: AdAway
+  submodules: false
+  sudo: ''
+  target: null
+  timeout: null
+  versionCode: '45'
+  versionName: '2.6'
+- androidupdate: []
+  antcommands: []
+  antifeatures: []
+  build: ''
+  buildjni:
+  - 'yes'
+  buildozer: false
+  commit: v2.7
+  disable: ''
+  encoding: null
+  extlibs: []
+  forcevercode: false
+  forceversion: false
+  gradle:
+  - 'yes'
+  gradleprops: []
+  init: ''
+  maven: false
+  ndk: null
+  novcheck: false
+  oldsdkloc: false
+  output: null
+  patch: []
+  preassemble:
+  - renameExecutables
+  prebuild: ''
+  rm: []
+  scandelete: []
+  scanignore: []
+  srclibs: []
+  subdir: AdAway
+  submodules: false
+  sudo: ''
+  target: null
+  timeout: null
+  versionCode: '46'
+  versionName: '2.7'
+- androidupdate: []
+  antcommands: []
+  antifeatures: []
+  build: ''
+  buildjni:
+  - 'yes'
+  buildozer: false
+  commit: v2.8
+  disable: ''
+  encoding: null
+  extlibs: []
+  forcevercode: false
+  forceversion: false
+  gradle:
+  - 'yes'
+  gradleprops: []
+  init: ''
+  maven: false
+  ndk: null
+  novcheck: false
+  oldsdkloc: false
+  output: null
+  patch: []
+  preassemble:
+  - renameExecutables
+  prebuild: ''
+  rm: []
+  scandelete: []
+  scanignore: []
+  srclibs: []
+  subdir: AdAway
+  submodules: false
+  sudo: ''
+  target: null
+  timeout: null
+  versionCode: '47'
+  versionName: '2.8'
+- androidupdate: []
+  antcommands: []
+  antifeatures: []
+  build: ''
+  buildjni:
+  - 'yes'
+  buildozer: false
+  commit: v2.8.1
+  disable: ''
+  encoding: null
+  extlibs: []
+  forcevercode: false
+  forceversion: false
+  gradle:
+  - 'yes'
+  gradleprops: []
+  init: ''
+  maven: false
+  ndk: null
+  novcheck: false
+  oldsdkloc: false
+  output: null
+  patch: []
+  preassemble:
+  - renameExecutables
+  prebuild: ''
+  rm: []
+  scandelete: []
+  scanignore: []
+  srclibs: []
+  subdir: AdAway
+  submodules: false
+  sudo: ''
+  target: null
+  timeout: null
+  versionCode: '48'
+  versionName: 2.8.1
+- androidupdate: []
+  antcommands: []
+  antifeatures: []
+  build: ''
+  buildjni:
+  - 'yes'
+  buildozer: false
+  commit: v2.9
+  disable: ''
+  encoding: null
+  extlibs: []
+  forcevercode: false
+  forceversion: false
+  gradle:
+  - 'yes'
+  gradleprops: []
+  init: ''
+  maven: false
+  ndk: null
+  novcheck: false
+  oldsdkloc: false
+  output: null
+  patch: []
+  preassemble:
+  - renameExecutables
+  prebuild: ''
+  rm: []
+  scandelete: []
+  scanignore: []
+  srclibs: []
+  subdir: AdAway
+  submodules: false
+  sudo: ''
+  target: null
+  timeout: null
+  versionCode: '49'
+  versionName: '2.9'
+- androidupdate: []
+  antcommands: []
+  antifeatures: []
+  build: ''
+  buildjni:
+  - 'yes'
+  buildozer: false
+  commit: v2.9.1
+  disable: ''
+  encoding: null
+  extlibs: []
+  forcevercode: false
+  forceversion: false
+  gradle:
+  - 'yes'
+  gradleprops: []
+  init: ''
+  maven: false
+  ndk: null
+  novcheck: false
+  oldsdkloc: false
+  output: null
+  patch: []
+  preassemble:
+  - renameExecutables
+  prebuild: ''
+  rm: []
+  scandelete: []
+  scanignore: []
+  srclibs: []
+  subdir: AdAway
+  submodules: false
+  sudo: ''
+  target: null
+  timeout: null
+  versionCode: '50'
+  versionName: 2.9.1
+- androidupdate: []
+  antcommands: []
+  antifeatures: []
+  build: ''
+  buildjni:
+  - 'yes'
+  buildozer: false
+  commit: v2.9.2
+  disable: ''
+  encoding: null
+  extlibs: []
+  forcevercode: false
+  forceversion: false
+  gradle:
+  - 'yes'
+  gradleprops: []
+  init: ''
+  maven: false
+  ndk: null
+  novcheck: false
+  oldsdkloc: false
+  output: null
+  patch: []
+  preassemble:
+  - renameExecutables
+  prebuild: ''
+  rm: []
+  scandelete: []
+  scanignore: []
+  srclibs: []
+  subdir: AdAway
+  submodules: false
+  sudo: ''
+  target: null
+  timeout: null
+  versionCode: '51'
+  versionName: 2.9.2
+- androidupdate: []
+  antcommands: []
+  antifeatures: []
+  build: ''
+  buildjni:
+  - 'yes'
+  buildozer: false
+  commit: v3.0
+  disable: ''
+  encoding: null
+  extlibs: []
+  forcevercode: false
+  forceversion: false
+  gradle:
+  - 'yes'
+  gradleprops: []
+  init: ''
+  maven: false
+  ndk: null
+  novcheck: false
+  oldsdkloc: false
+  output: null
+  patch: []
+  preassemble:
+  - renameExecutables
+  prebuild: ''
+  rm: []
+  scandelete: []
+  scanignore: []
+  srclibs: []
+  subdir: AdAway
+  submodules: false
+  sudo: ''
+  target: null
+  timeout: null
+  versionCode: '52'
+  versionName: '3.0'
+comments: {}
 id: org.adaway
 lastUpdated: null
 metadatapath: metadata/org.adaway.yml
diff --git a/tests/metadata/dump/org.smssecure.smssecure.yaml b/tests/metadata/dump/org.smssecure.smssecure.yaml
index 7410aa68..9587ce57 100644
--- a/tests/metadata/dump/org.smssecure.smssecure.yaml
+++ b/tests/metadata/dump/org.smssecure.smssecure.yaml
@@ -1,7 +1,4 @@
-%YAML 1.2
----
-AllowedAPKSigningKeys: []
-AntiFeatures: {}
+AntiFeatures: []
 ArchivePolicy: null
 AuthorEmail: null
 AuthorName: null
@@ -10,358 +7,11 @@ AutoName: SMSSecure
 AutoUpdateMode: Version v%v
 Binaries: null
 Bitcoin: null
-Builds:
-- androidupdate: []
-  antcommands: []
-  antifeatures: {}
-  binary: null
-  build: ''
-  buildjni: []
-  commit: 66367479a4f57f347b5cbe8f6f8f632adaae7727
-  disable: builds, merge changes into upstream
-  encoding: null
-  extlibs: []
-  forcevercode: true
-  forceversion: false
-  gradle:
-  - yes
-  gradleprops: []
-  init: ''
-  maven: null
-  ndk: null
-  novcheck: false
-  oldsdkloc: false
-  output: null
-  patch: []
-  postbuild: ''
-  preassemble: []
-  prebuild:
-  - touch signing.properties
-  - pushd $$GradleWitness$$
-  - gradle jar
-  - popd
-  - cp $$GradleWitness$$/build/libs/GradleWitness.jar libs/gradle-witness.jar
-  - sed -i -e '20,22d' build.gradle
-  - pushd $$PreferenceFragment$$
-  - gradle uploadArchives
-  - popd
-  - sed -i -e '/5470f5872514a6226fa1fc6f4e000991f38805691c534cf0bd2778911fc773ad/d'
-    build.gradle
-  - mkdir smil
-  - pushd smil
-  - wget -c http://www.w3.org/TR/smil-boston-dom/java-binding.zip
-  - unzip java-binding.zip
-  - popd
-  - cp -fR smil/java/org src/
-  - rm -fR smil
-  - sed -i -e '/org.w3c.smil/d' build.gradle
-  - cp -fR $$AospMms$$/src/org src/
-  rm:
-  - libs/*
-  scandelete: []
-  scanignore: []
-  srclibs:
-  - GradleWitness@10f1269c0aafdc1d478efc005ed48f3a47d44278
-  - PreferenceFragment@717a45433b927d2f0dfc5328f79e77c9682c37bc
-  - ShortcutBadger@3815ce2ec0c66acd7d7c0b4f2479df8fa70fed87
-  - AospMms@android-5.1.0_r3
-  subdir: null
-  submodules: false
-  sudo: ''
-  target: null
-  timeout: null
-  versionCode: 5
-  versionName: 0.3.3
-- androidupdate: []
-  antcommands: []
-  antifeatures: {}
-  binary: null
-  build: ''
-  buildjni: []
-  commit: 9675ce5eecb929dcaddb43b3d9486fdb88b9ae1a
-  disable: builds, wait for upstream
-  encoding: null
-  extlibs: []
-  forcevercode: false
-  forceversion: false
-  gradle:
-  - yes
-  gradleprops: []
-  init: ''
-  maven: null
-  ndk: null
-  novcheck: false
-  oldsdkloc: false
-  output: null
-  patch: []
-  postbuild: ''
-  preassemble: []
-  prebuild:
-  - touch signing.properties
-  - pushd $$GradleWitness$$
-  - gradle jar
-  - popd
-  - cp $$GradleWitness$$/build/libs/GradleWitness.jar libs/gradle-witness.jar
-  rm:
-  - libs/*.jar
-  scandelete: []
-  scanignore: []
-  srclibs:
-  - GradleWitness@10f1269c0aafdc1d478efc005ed48f3a47d44278
-  subdir: null
-  submodules: true
-  sudo: ''
-  target: null
-  timeout: null
-  versionCode: 6
-  versionName: 0.3.3
-- androidupdate: []
-  antcommands: []
-  antifeatures: {}
-  binary: null
-  build: ''
-  buildjni: []
-  commit: v0.4.2
-  disable: builds locally, but not on BS
-  encoding: null
-  extlibs: []
-  forcevercode: false
-  forceversion: false
-  gradle:
-  - yes
-  gradleprops: []
-  init: ''
-  maven: null
-  ndk: null
-  novcheck: false
-  oldsdkloc: false
-  output: null
-  patch: []
-  postbuild: ''
-  preassemble: []
-  prebuild:
-  - touch signing.properties
-  - ./build-witness.sh
-  - rm -rf libs/gradle-witness/build
-  - echo "org.gradle.jvmargs=-Xms512m -Xmx512m -XX:MaxPermSize=512m" >> gradle.properties
-  rm:
-  - libs/*.jar
-  scandelete: []
-  scanignore: []
-  srclibs: []
-  subdir: null
-  submodules: true
-  sudo: ''
-  target: null
-  timeout: null
-  versionCode: 9
-  versionName: 0.4.2
-- androidupdate: []
-  antcommands: []
-  antifeatures: {}
-  binary: null
-  build: ''
-  buildjni: []
-  commit: v0.5.1
-  disable: ''
-  encoding: null
-  extlibs: []
-  forcevercode: false
-  forceversion: false
-  gradle:
-  - yes
-  gradleprops: []
-  init: ''
-  maven: null
-  ndk: null
-  novcheck: false
-  oldsdkloc: false
-  output: null
-  patch: []
-  postbuild: ''
-  preassemble: []
-  prebuild:
-  - touch signing.properties
-  - ./build-witness.sh
-  - rm -rf libs/gradle-witness/build
-  - echo "org.gradle.jvmargs=-Xms512m -Xmx512m -XX:MaxPermSize=512m" >> gradle.properties
-  rm:
-  - libs/*.jar
-  scandelete: []
-  scanignore: []
-  srclibs: []
-  subdir: null
-  submodules: true
-  sudo: ''
-  target: null
-  timeout: null
-  versionCode: 11
-  versionName: 0.5.1
-- androidupdate: []
-  antcommands: []
-  antifeatures: {}
-  binary: null
-  build: ''
-  buildjni: []
-  commit: v0.5.2
-  disable: broken in upstream
-  encoding: null
-  extlibs: []
-  forcevercode: false
-  forceversion: false
-  gradle:
-  - yes
-  gradleprops: []
-  init: ''
-  maven: null
-  ndk: null
-  novcheck: false
-  oldsdkloc: false
-  output: null
-  patch: []
-  postbuild: ''
-  preassemble: []
-  prebuild:
-  - touch signing.properties
-  - ./scripts/build-witness.sh
-  - rm -rf libs/gradle-witness/build
-  rm:
-  - libs/*.jar
-  scandelete: []
-  scanignore: []
-  srclibs: []
-  subdir: null
-  submodules: true
-  sudo: ''
-  target: null
-  timeout: null
-  versionCode: 12
-  versionName: 0.5.2
-- androidupdate: []
-  antcommands: []
-  antifeatures: {}
-  binary: null
-  build: ''
-  buildjni: []
-  commit: v0.5.3
-  disable: ''
-  encoding: null
-  extlibs: []
-  forcevercode: false
-  forceversion: false
-  gradle:
-  - yes
-  gradleprops: []
-  init: ''
-  maven: null
-  ndk: null
-  novcheck: false
-  oldsdkloc: false
-  output: null
-  patch: []
-  postbuild: ''
-  preassemble: []
-  prebuild:
-  - touch signing.properties
-  - ./scripts/build-witness.sh
-  - rm -rf libs/gradle-witness/build
-  rm:
-  - libs/*.jar
-  scandelete: []
-  scanignore: []
-  srclibs: []
-  subdir: null
-  submodules: true
-  sudo: ''
-  target: null
-  timeout: null
-  versionCode: 100
-  versionName: 0.5.3
-- androidupdate: []
-  antcommands: []
-  antifeatures: {}
-  binary: null
-  build: ''
-  buildjni: []
-  commit: v0.5.4
-  disable: ''
-  encoding: null
-  extlibs: []
-  forcevercode: false
-  forceversion: false
-  gradle:
-  - yes
-  gradleprops: []
-  init: ''
-  maven: null
-  ndk: null
-  novcheck: false
-  oldsdkloc: false
-  output: null
-  patch: []
-  postbuild: ''
-  preassemble: []
-  prebuild:
-  - touch signing.properties
-  - ./scripts/build-witness.sh
-  - rm -rf libs/gradle-witness/build
-  rm:
-  - libs/*.jar
-  scandelete: []
-  scanignore: []
-  srclibs: []
-  subdir: null
-  submodules: true
-  sudo: ''
-  target: null
-  timeout: null
-  versionCode: 101
-  versionName: 0.5.4
-- androidupdate: []
-  antcommands: []
-  antifeatures: {}
-  binary: null
-  build: ''
-  buildjni: []
-  commit: v0.6.0
-  disable: ''
-  encoding: null
-  extlibs: []
-  forcevercode: false
-  forceversion: false
-  gradle:
-  - yes
-  gradleprops: []
-  init: ''
-  maven: null
-  ndk: null
-  novcheck: false
-  oldsdkloc: false
-  output: null
-  patch: []
-  postbuild: ''
-  preassemble: []
-  prebuild:
-  - touch signing.properties
-  - ./scripts/build-witness.sh
-  - rm -rf libs/gradle-witness/build
-  rm:
-  - libs/*.jar
-  scandelete: []
-  scanignore: []
-  srclibs: []
-  subdir: null
-  submodules: true
-  sudo: ''
-  target: null
-  timeout: null
-  versionCode: 102
-  versionName: 0.6.0
 Categories:
 - Phone & SMS
 Changelog: ''
 CurrentVersion: 0.6.0
-CurrentVersionCode: 102
+CurrentVersionCode: '102'
 Description: 'SMSSecure is an SMS/MMS application that allows you to protect your
   privacy while communicating with friends.
 
@@ -385,8 +35,10 @@ Description: 'SMSSecure is an SMS/MMS application that allows you to protect you
   security by auditing the code.'
 Disabled: null
 Donate: null
+FlattrID: null
 IssueTracker: https://github.com/SMSSecure/SMSSecure/issues
 Liberapay: null
+LiberapayID: null
 License: GPL-3.0-only
 Litecoin: null
 MaintainerNotes: ''
@@ -404,9 +56,313 @@ UpdateCheckData: null
 UpdateCheckIgnore: null
 UpdateCheckMode: Tags
 UpdateCheckName: null
-VercodeOperation: []
+VercodeOperation: null
 WebSite: http://www.smssecure.org
 added: null
+builds:
+- androidupdate: []
+  antcommands: []
+  antifeatures: []
+  build: ''
+  buildjni: []
+  buildozer: false
+  commit: 66367479a4f57f347b5cbe8f6f8f632adaae7727
+  disable: builds, merge changes into upstream
+  encoding: null
+  extlibs: []
+  forcevercode: true
+  forceversion: false
+  gradle:
+  - 'yes'
+  gradleprops: []
+  init: ''
+  maven: false
+  ndk: null
+  novcheck: false
+  oldsdkloc: false
+  output: null
+  patch: []
+  preassemble: []
+  prebuild: touch signing.properties && pushd $$GradleWitness$$ && gradle jar && popd
+    && cp $$GradleWitness$$/build/libs/GradleWitness.jar libs/gradle-witness.jar &&
+    sed -i -e '20,22d' build.gradle && pushd $$PreferenceFragment$$ && gradle uploadArchives
+    && popd && sed -i -e '/5470f5872514a6226fa1fc6f4e000991f38805691c534cf0bd2778911fc773ad/d'
+    build.gradle && mkdir smil && pushd smil && wget -c http://www.w3.org/TR/smil-boston-dom/java-binding.zip
+    && unzip java-binding.zip && popd && cp -fR smil/java/org src/ && rm -fR smil
+    && sed -i -e '/org.w3c.smil/d' build.gradle && cp -fR $$AospMms$$/src/org src/
+  rm:
+  - libs/*
+  scandelete: []
+  scanignore: []
+  srclibs:
+  - GradleWitness@10f1269c0aafdc1d478efc005ed48f3a47d44278
+  - PreferenceFragment@717a45433b927d2f0dfc5328f79e77c9682c37bc
+  - ShortcutBadger@3815ce2ec0c66acd7d7c0b4f2479df8fa70fed87
+  - AospMms@android-5.1.0_r3
+  subdir: null
+  submodules: false
+  sudo: ''
+  target: null
+  timeout: null
+  versionCode: '5'
+  versionName: 0.3.3
+- androidupdate: []
+  antcommands: []
+  antifeatures: []
+  build: ''
+  buildjni: []
+  buildozer: false
+  commit: 9675ce5eecb929dcaddb43b3d9486fdb88b9ae1a
+  disable: builds, wait for upstream
+  encoding: null
+  extlibs: []
+  forcevercode: false
+  forceversion: false
+  gradle:
+  - 'yes'
+  gradleprops: []
+  init: ''
+  maven: false
+  ndk: null
+  novcheck: false
+  oldsdkloc: false
+  output: null
+  patch: []
+  preassemble: []
+  prebuild: touch signing.properties && pushd $$GradleWitness$$ && gradle jar && popd
+    && cp $$GradleWitness$$/build/libs/GradleWitness.jar libs/gradle-witness.jar
+  rm:
+  - libs/*.jar
+  scandelete: []
+  scanignore: []
+  srclibs:
+  - GradleWitness@10f1269c0aafdc1d478efc005ed48f3a47d44278
+  subdir: null
+  submodules: true
+  sudo: ''
+  target: null
+  timeout: null
+  versionCode: '6'
+  versionName: 0.3.3
+- androidupdate: []
+  antcommands: []
+  antifeatures: []
+  build: ''
+  buildjni: []
+  buildozer: false
+  commit: v0.4.2
+  disable: builds locally, but not on BS
+  encoding: null
+  extlibs: []
+  forcevercode: false
+  forceversion: false
+  gradle:
+  - 'yes'
+  gradleprops: []
+  init: ''
+  maven: false
+  ndk: null
+  novcheck: false
+  oldsdkloc: false
+  output: null
+  patch: []
+  preassemble: []
+  prebuild: touch signing.properties && ./build-witness.sh && rm -rf libs/gradle-witness/build
+    && echo "org.gradle.jvmargs=-Xms512m -Xmx512m -XX:MaxPermSize=512m" >> gradle.properties
+  rm:
+  - libs/*.jar
+  scandelete: []
+  scanignore: []
+  srclibs: []
+  subdir: null
+  submodules: true
+  sudo: ''
+  target: null
+  timeout: null
+  versionCode: '9'
+  versionName: 0.4.2
+- androidupdate: []
+  antcommands: []
+  antifeatures: []
+  build: ''
+  buildjni: []
+  buildozer: false
+  commit: v0.5.1
+  disable: ''
+  encoding: null
+  extlibs: []
+  forcevercode: false
+  forceversion: false
+  gradle:
+  - 'yes'
+  gradleprops: []
+  init: ''
+  maven: false
+  ndk: null
+  novcheck: false
+  oldsdkloc: false
+  output: null
+  patch: []
+  preassemble: []
+  prebuild: touch signing.properties && ./build-witness.sh && rm -rf libs/gradle-witness/build
+    && echo "org.gradle.jvmargs=-Xms512m -Xmx512m -XX:MaxPermSize=512m" >> gradle.properties
+  rm:
+  - libs/*.jar
+  scandelete: []
+  scanignore: []
+  srclibs: []
+  subdir: null
+  submodules: true
+  sudo: ''
+  target: null
+  timeout: null
+  versionCode: '11'
+  versionName: 0.5.1
+- androidupdate: []
+  antcommands: []
+  antifeatures: []
+  build: ''
+  buildjni: []
+  buildozer: false
+  commit: v0.5.2
+  disable: broken in upstream
+  encoding: null
+  extlibs: []
+  forcevercode: false
+  forceversion: false
+  gradle:
+  - 'yes'
+  gradleprops: []
+  init: ''
+  maven: false
+  ndk: null
+  novcheck: false
+  oldsdkloc: false
+  output: null
+  patch: []
+  preassemble: []
+  prebuild: touch signing.properties && ./scripts/build-witness.sh && rm -rf libs/gradle-witness/build
+  rm:
+  - libs/*.jar
+  scandelete: []
+  scanignore: []
+  srclibs: []
+  subdir: null
+  submodules: true
+  sudo: ''
+  target: null
+  timeout: null
+  versionCode: '12'
+  versionName: 0.5.2
+- androidupdate: []
+  antcommands: []
+  antifeatures: []
+  build: ''
+  buildjni: []
+  buildozer: false
+  commit: v0.5.3
+  disable: ''
+  encoding: null
+  extlibs: []
+  forcevercode: false
+  forceversion: false
+  gradle:
+  - 'yes'
+  gradleprops: []
+  init: ''
+  maven: false
+  ndk: null
+  novcheck: false
+  oldsdkloc: false
+  output: null
+  patch: []
+  preassemble: []
+  prebuild: touch signing.properties && ./scripts/build-witness.sh && rm -rf libs/gradle-witness/build
+  rm:
+  - libs/*.jar
+  scandelete: []
+  scanignore: []
+  srclibs: []
+  subdir: null
+  submodules: true
+  sudo: ''
+  target: null
+  timeout: null
+  versionCode: '100'
+  versionName: 0.5.3
+- androidupdate: []
+  antcommands: []
+  antifeatures: []
+  build: ''
+  buildjni: []
+  buildozer: false
+  commit: v0.5.4
+  disable: ''
+  encoding: null
+  extlibs: []
+  forcevercode: false
+  forceversion: false
+  gradle:
+  - 'yes'
+  gradleprops: []
+  init: ''
+  maven: false
+  ndk: null
+  novcheck: false
+  oldsdkloc: false
+  output: null
+  patch: []
+  preassemble: []
+  prebuild: touch signing.properties && ./scripts/build-witness.sh && rm -rf libs/gradle-witness/build
+  rm:
+  - libs/*.jar
+  scandelete: []
+  scanignore: []
+  srclibs: []
+  subdir: null
+  submodules: true
+  sudo: ''
+  target: null
+  timeout: null
+  versionCode: '101'
+  versionName: 0.5.4
+- androidupdate: []
+  antcommands: []
+  antifeatures: []
+  build: ''
+  buildjni: []
+  buildozer: false
+  commit: v0.6.0
+  disable: ''
+  encoding: null
+  extlibs: []
+  forcevercode: false
+  forceversion: false
+  gradle:
+  - 'yes'
+  gradleprops: []
+  init: ''
+  maven: false
+  ndk: null
+  novcheck: false
+  oldsdkloc: false
+  output: null
+  patch: []
+  preassemble: []
+  prebuild: touch signing.properties && ./scripts/build-witness.sh && rm -rf libs/gradle-witness/build
+  rm:
+  - libs/*.jar
+  scandelete: []
+  scanignore: []
+  srclibs: []
+  subdir: null
+  submodules: true
+  sudo: ''
+  target: null
+  timeout: null
+  versionCode: '102'
+  versionName: 0.6.0
+comments: {}
 id: org.smssecure.smssecure
 lastUpdated: null
 metadatapath: metadata/org.smssecure.smssecure.yml
diff --git a/tests/metadata/dump/org.videolan.vlc.yaml b/tests/metadata/dump/org.videolan.vlc.yaml
index 5ecb108b..39d628d4 100644
--- a/tests/metadata/dump/org.videolan.vlc.yaml
+++ b/tests/metadata/dump/org.videolan.vlc.yaml
@@ -1,8 +1,5 @@
-%YAML 1.2
----
-AllowedAPKSigningKeys: []
-AntiFeatures: {}
-ArchivePolicy: 9
+AntiFeatures: []
+ArchivePolicy: 9 versions
 AuthorEmail: null
 AuthorName: null
 AuthorWebSite: null
@@ -10,2592 +7,11 @@ AutoName: VLC
 AutoUpdateMode: None
 Binaries: null
 Bitcoin: null
-Builds:
-- androidupdate:
-  - .
-  - ../java-libs/SlidingMenu
-  - ../java-libs/ActionBarSherlock
-  antcommands: []
-  antifeatures: {}
-  binary: null
-  build:
-  - cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release
-  buildjni: []
-  commit: 0.0.11
-  disable: ''
-  encoding: null
-  extlibs: []
-  forcevercode: true
-  forceversion: true
-  gradle: []
-  gradleprops: []
-  init: ''
-  maven: null
-  ndk: null
-  novcheck: false
-  oldsdkloc: false
-  output: null
-  patch: []
-  postbuild: ''
-  preassemble: []
-  prebuild:
-  - sed -i '48d' ../Makefile
-  rm: []
-  scandelete: []
-  scanignore: []
-  srclibs: []
-  subdir: vlc-android
-  submodules: false
-  sudo: ''
-  target: null
-  timeout: null
-  versionCode: 110
-  versionName: 0.0.11-ARMv7
-- androidupdate:
-  - .
-  - ../java-libs/SlidingMenu
-  - ../java-libs/ActionBarSherlock
-  antcommands: []
-  antifeatures: {}
-  binary: null
-  build:
-  - cd ../ && ANDROID_ABI=armeabi ./compile.sh release
-  buildjni: []
-  commit: 0.0.11
-  disable: ''
-  encoding: null
-  extlibs: []
-  forcevercode: true
-  forceversion: true
-  gradle: []
-  gradleprops: []
-  init: ''
-  maven: null
-  ndk: null
-  novcheck: false
-  oldsdkloc: false
-  output: null
-  patch: []
-  postbuild: ''
-  preassemble: []
-  prebuild:
-  - sed -i '48d' ../Makefile
-  rm: []
-  scandelete: []
-  scanignore: []
-  srclibs: []
-  subdir: vlc-android
-  submodules: false
-  sudo: ''
-  target: null
-  timeout: null
-  versionCode: 111
-  versionName: 0.0.11-ARM
-- androidupdate:
-  - .
-  - ../java-libs/SlidingMenu
-  - ../java-libs/ActionBarSherlock
-  antcommands: []
-  antifeatures: {}
-  binary: null
-  build:
-  - cd ../ && ANDROID_ABI=x86 ./compile.sh release
-  buildjni: []
-  commit: unknown - see disabled
-  disable: ffmpeg error 0.0.11
-  encoding: null
-  extlibs: []
-  forcevercode: true
-  forceversion: true
-  gradle: []
-  gradleprops: []
-  init: ''
-  maven: null
-  ndk: null
-  novcheck: false
-  oldsdkloc: false
-  output: null
-  patch: []
-  postbuild: ''
-  preassemble: []
-  prebuild:
-  - sed -i '48d' ../Makefile
-  rm: []
-  scandelete: []
-  scanignore: []
-  srclibs: []
-  subdir: vlc-android
-  submodules: false
-  sudo: ''
-  target: null
-  timeout: null
-  versionCode: 112
-  versionName: 0.0.11-x86
-- androidupdate:
-  - .
-  - ../java-libs/SlidingMenu
-  - ../java-libs/ActionBarSherlock
-  antcommands: []
-  antifeatures: {}
-  binary: null
-  build:
-  - cd ../ && ANDROID_ABI=mips ./compile.sh release
-  buildjni: []
-  commit: 0.0.11
-  disable: ''
-  encoding: null
-  extlibs: []
-  forcevercode: true
-  forceversion: true
-  gradle: []
-  gradleprops: []
-  init: ''
-  maven: null
-  ndk: null
-  novcheck: false
-  oldsdkloc: false
-  output: null
-  patch: []
-  postbuild: ''
-  preassemble: []
-  prebuild:
-  - sed -i '48d' ../Makefile
-  rm: []
-  scandelete: []
-  scanignore: []
-  srclibs: []
-  subdir: vlc-android
-  submodules: false
-  sudo: ''
-  target: null
-  timeout: null
-  versionCode: 113
-  versionName: 0.0.11-mips
-- androidupdate: []
-  antcommands: []
-  antifeatures: {}
-  binary: null
-  build:
-  - cd ../ && ANDROID_ABI=mips ./compile.sh release
-  buildjni: []
-  commit: 0.1.3
-  disable: build failing (at 0.1.3)
-  encoding: null
-  extlibs: []
-  forcevercode: true
-  forceversion: true
-  gradle: []
-  gradleprops: []
-  init: ''
-  maven: null
-  ndk: null
-  novcheck: false
-  oldsdkloc: false
-  output: null
-  patch:
-  - ndkr9.patch
-  postbuild: ''
-  preassemble: []
-  prebuild:
-  - sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC$$ ../vlc
-  rm: []
-  scandelete: []
-  scanignore: []
-  srclibs:
-  - VLC@7c52aacbe
-  subdir: vlc-android
-  submodules: false
-  sudo: ''
-  target: null
-  timeout: null
-  versionCode: 1301
-  versionName: 0.1.3-MIPS
-- androidupdate: []
-  antcommands: []
-  antifeatures: {}
-  binary: null
-  build:
-  - cd ../ && ANDROID_ABI=x86 ./compile.sh release
-  buildjni: []
-  commit: 0.1.3
-  disable: ''
-  encoding: null
-  extlibs: []
-  forcevercode: true
-  forceversion: true
-  gradle: []
-  gradleprops: []
-  init: ''
-  maven: null
-  ndk: null
-  novcheck: false
-  oldsdkloc: false
-  output: null
-  patch:
-  - ndkr9.patch
-  postbuild: ''
-  preassemble: []
-  prebuild:
-  - sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC$$ ../vlc
-  rm: []
-  scandelete: []
-  scanignore: []
-  srclibs:
-  - VLC@7c52aacbe
-  subdir: vlc-android
-  submodules: false
-  sudo: ''
-  target: null
-  timeout: null
-  versionCode: 1302
-  versionName: 0.1.3-x86
-- androidupdate: []
-  antcommands: []
-  antifeatures: {}
-  binary: null
-  build:
-  - cd ../ && ANDROID_ABI=armeabi ./compile.sh release
-  buildjni: []
-  commit: 0.1.3
-  disable: ''
-  encoding: null
-  extlibs: []
-  forcevercode: true
-  forceversion: true
-  gradle: []
-  gradleprops: []
-  init: ''
-  maven: null
-  ndk: null
-  novcheck: false
-  oldsdkloc: false
-  output: null
-  patch:
-  - ndkr9.patch
-  postbuild: ''
-  preassemble: []
-  prebuild:
-  - sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC$$ ../vlc
-  rm: []
-  scandelete: []
-  scanignore: []
-  srclibs:
-  - VLC@7c52aacbe
-  subdir: vlc-android
-  submodules: false
-  sudo: ''
-  target: null
-  timeout: null
-  versionCode: 1303
-  versionName: 0.1.3-ARM
-- androidupdate: []
-  antcommands: []
-  antifeatures: {}
-  binary: null
-  build:
-  - cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release
-  buildjni: []
-  commit: 0.1.3
-  disable: ''
-  encoding: null
-  extlibs: []
-  forcevercode: true
-  forceversion: true
-  gradle: []
-  gradleprops: []
-  init: ''
-  maven: null
-  ndk: null
-  novcheck: false
-  oldsdkloc: false
-  output: null
-  patch:
-  - ndkr9.patch
-  postbuild: ''
-  preassemble: []
-  prebuild:
-  - sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC$$ ../vlc
-  rm: []
-  scandelete: []
-  scanignore: []
-  srclibs:
-  - VLC@7c52aacbe
-  subdir: vlc-android
-  submodules: false
-  sudo: ''
-  target: null
-  timeout: null
-  versionCode: 1304
-  versionName: 0.1.3-ARMv7
-- androidupdate: []
-  antcommands: []
-  antifeatures: {}
-  binary: null
-  build:
-  - cd ../ && ANDROID_ABI=x86 ./compile.sh release
-  buildjni: []
-  commit: 0.9.0
-  disable: ''
-  encoding: null
-  extlibs: []
-  forcevercode: true
-  forceversion: false
-  gradle: []
-  gradleprops: []
-  init: ''
-  maven: null
-  ndk: null
-  novcheck: false
-  oldsdkloc: false
-  output: null
-  patch: []
-  postbuild: ''
-  preassemble: []
-  prebuild:
-  - sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC$$ ../vlc
-  rm: []
-  scandelete: []
-  scanignore: []
-  srclibs:
-  - VLC@31ffb20309264994
-  subdir: vlc-android
-  submodules: false
-  sudo: ''
-  target: null
-  timeout: null
-  versionCode: 9002
-  versionName: 0.9.0
-- androidupdate: []
-  antcommands: []
-  antifeatures: {}
-  binary: null
-  build:
-  - cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release
-  buildjni: []
-  commit: 0.9.0
-  disable: ''
-  encoding: null
-  extlibs: []
-  forcevercode: true
-  forceversion: false
-  gradle: []
-  gradleprops: []
-  init: ''
-  maven: null
-  ndk: null
-  novcheck: false
-  oldsdkloc: false
-  output: null
-  patch: []
-  postbuild: ''
-  preassemble: []
-  prebuild:
-  - sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC$$ ../vlc
-  rm: []
-  scandelete: []
-  scanignore: []
-  srclibs:
-  - VLC@31ffb20309264994
-  subdir: vlc-android
-  submodules: false
-  sudo: ''
-  target: null
-  timeout: null
-  versionCode: 9004
-  versionName: 0.9.0
-- androidupdate: []
-  antcommands: []
-  antifeatures: {}
-  binary: null
-  build:
-  - cd ../ && ANDROID_ABI=x86 ./compile.sh release
-  buildjni: []
-  commit: 0.9.1
-  disable: ''
-  encoding: null
-  extlibs: []
-  forcevercode: true
-  forceversion: false
-  gradle: []
-  gradleprops: []
-  init: ''
-  maven: null
-  ndk: null
-  novcheck: false
-  oldsdkloc: false
-  output: null
-  patch: []
-  postbuild: ''
-  preassemble: []
-  prebuild:
-  - sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC$$ ../vlc
-  rm: []
-  scandelete: []
-  scanignore: []
-  srclibs:
-  - VLC@37e886d113b8b567c15208579fb2f
-  subdir: vlc-android
-  submodules: false
-  sudo: ''
-  target: null
-  timeout: null
-  versionCode: 9102
-  versionName: 0.9.1
-- androidupdate: []
-  antcommands: []
-  antifeatures: {}
-  binary: null
-  build:
-  - cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release
-  buildjni: []
-  commit: 0.9.1
-  disable: ''
-  encoding: null
-  extlibs: []
-  forcevercode: true
-  forceversion: false
-  gradle: []
-  gradleprops: []
-  init: ''
-  maven: null
-  ndk: null
-  novcheck: false
-  oldsdkloc: false
-  output: null
-  patch: []
-  postbuild: ''
-  preassemble: []
-  prebuild:
-  - sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC$$ ../vlc
-  rm: []
-  scandelete: []
-  scanignore: []
-  srclibs:
-  - VLC@37e886d113b8b567c15208579fb2f
-  subdir: vlc-android
-  submodules: false
-  sudo: ''
-  target: null
-  timeout: null
-  versionCode: 9104
-  versionName: 0.9.1
-- androidupdate: []
-  antcommands: []
-  antifeatures: {}
-  binary: null
-  build:
-  - cd ../ && ANDROID_ABI=x86 ./compile.sh release
-  buildjni: []
-  commit: 0.9.5
-  disable: can't download gmp
-  encoding: null
-  extlibs: []
-  forcevercode: true
-  forceversion: false
-  gradle: []
-  gradleprops: []
-  init: ''
-  maven: null
-  ndk: null
-  novcheck: false
-  oldsdkloc: false
-  output: null
-  patch: []
-  postbuild: ''
-  preassemble: []
-  prebuild:
-  - sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC$$ ../vlc
-  rm: []
-  scandelete: []
-  scanignore: []
-  srclibs:
-  - VLC@052600173f376ff58ff04d53746961a2
-  subdir: vlc-android
-  submodules: false
-  sudo: ''
-  target: null
-  timeout: null
-  versionCode: 9502
-  versionName: 0.9.5
-- androidupdate: []
-  antcommands: []
-  antifeatures: {}
-  binary: null
-  build:
-  - cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release
-  buildjni: []
-  commit: 0.9.5
-  disable: can't download gmp
-  encoding: null
-  extlibs: []
-  forcevercode: true
-  forceversion: false
-  gradle: []
-  gradleprops: []
-  init: ''
-  maven: null
-  ndk: null
-  novcheck: false
-  oldsdkloc: false
-  output: null
-  patch: []
-  postbuild: ''
-  preassemble: []
-  prebuild:
-  - sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC$$ ../vlc
-  rm: []
-  scandelete: []
-  scanignore: []
-  srclibs:
-  - VLC@052600173f376ff58ff04d53746961a2
-  subdir: vlc-android
-  submodules: false
-  sudo: ''
-  target: null
-  timeout: null
-  versionCode: 9504
-  versionName: 0.9.5
-- androidupdate: []
-  antcommands: []
-  antifeatures: {}
-  binary: null
-  build:
-  - cd ../ && ANDROID_ABI=x86 ./compile.sh release
-  buildjni: []
-  commit: 0.9.6
-  disable: ''
-  encoding: null
-  extlibs: []
-  forcevercode: true
-  forceversion: false
-  gradle: []
-  gradleprops: []
-  init: ''
-  maven: null
-  ndk: null
-  novcheck: false
-  oldsdkloc: false
-  output: null
-  patch: []
-  postbuild: ''
-  preassemble: []
-  prebuild:
-  - sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC-2.2$$ ../vlc
-  rm: []
-  scandelete: []
-  scanignore: []
-  srclibs:
-  - VLC-2.2@27f4799
-  subdir: vlc-android
-  submodules: false
-  sudo: ''
-  target: null
-  timeout: null
-  versionCode: 9602
-  versionName: 0.9.6
-- androidupdate: []
-  antcommands: []
-  antifeatures: {}
-  binary: null
-  build:
-  - cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release
-  buildjni: []
-  commit: 0.9.6
-  disable: ''
-  encoding: null
-  extlibs: []
-  forcevercode: true
-  forceversion: false
-  gradle: []
-  gradleprops: []
-  init: ''
-  maven: null
-  ndk: null
-  novcheck: false
-  oldsdkloc: false
-  output: null
-  patch: []
-  postbuild: ''
-  preassemble: []
-  prebuild:
-  - sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC-2.2$$ ../vlc
-  rm: []
-  scandelete: []
-  scanignore: []
-  srclibs:
-  - VLC-2.2@27f4799
-  subdir: vlc-android
-  submodules: false
-  sudo: ''
-  target: null
-  timeout: null
-  versionCode: 9604
-  versionName: 0.9.6
-- androidupdate: []
-  antcommands: []
-  antifeatures: {}
-  binary: null
-  build:
-  - cd ../ && ANDROID_ABI=x86 ./compile.sh release
-  buildjni: []
-  commit: 0.9.7
-  disable: ''
-  encoding: null
-  extlibs: []
-  forcevercode: true
-  forceversion: false
-  gradle: []
-  gradleprops: []
-  init: ''
-  maven: null
-  ndk: null
-  novcheck: false
-  oldsdkloc: false
-  output: null
-  patch: []
-  postbuild: ''
-  preassemble: []
-  prebuild:
-  - sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC-2.2$$ ../vlc
-  rm: []
-  scandelete: []
-  scanignore: []
-  srclibs:
-  - VLC-2.2@9e1c6ff
-  subdir: vlc-android
-  submodules: false
-  sudo: ''
-  target: null
-  timeout: null
-  versionCode: 9702
-  versionName: 0.9.7
-- androidupdate: []
-  antcommands: []
-  antifeatures: {}
-  binary: null
-  build:
-  - cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release
-  buildjni: []
-  commit: 0.9.7
-  disable: ''
-  encoding: null
-  extlibs: []
-  forcevercode: true
-  forceversion: false
-  gradle: []
-  gradleprops: []
-  init: ''
-  maven: null
-  ndk: null
-  novcheck: false
-  oldsdkloc: false
-  output: null
-  patch: []
-  postbuild: ''
-  preassemble: []
-  prebuild:
-  - sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC-2.2$$ ../vlc
-  rm: []
-  scandelete: []
-  scanignore: []
-  srclibs:
-  - VLC-2.2@9e1c6ff
-  subdir: vlc-android
-  submodules: false
-  sudo: ''
-  target: null
-  timeout: null
-  versionCode: 9704
-  versionName: 0.9.7
-- androidupdate: []
-  antcommands: []
-  antifeatures: {}
-  binary: null
-  build:
-  - cd ../ && ANDROID_ABI=mips ./compile.sh release
-  buildjni: []
-  commit: 0.9.7.1
-  disable: build fails
-  encoding: null
-  extlibs: []
-  forcevercode: true
-  forceversion: false
-  gradle: []
-  gradleprops: []
-  init: ''
-  maven: null
-  ndk: null
-  novcheck: false
-  oldsdkloc: false
-  output: null
-  patch: []
-  postbuild: ''
-  preassemble: []
-  prebuild:
-  - sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC-2.2$$ ../vlc
-  rm: []
-  scandelete: []
-  scanignore: []
-  srclibs:
-  - VLC-2.2@57cd36b
-  subdir: vlc-android
-  submodules: false
-  sudo: ''
-  target: null
-  timeout: null
-  versionCode: 9711
-  versionName: 0.9.7.1
-- androidupdate: []
-  antcommands: []
-  antifeatures: {}
-  binary: null
-  build:
-  - cd ../ && ANDROID_ABI=x86 ./compile.sh release
-  buildjni: []
-  commit: 0.9.7.1
-  disable: ''
-  encoding: null
-  extlibs: []
-  forcevercode: true
-  forceversion: false
-  gradle: []
-  gradleprops: []
-  init: ''
-  maven: null
-  ndk: null
-  novcheck: false
-  oldsdkloc: false
-  output: null
-  patch: []
-  postbuild: ''
-  preassemble: []
-  prebuild:
-  - sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC-2.2$$ ../vlc
-  rm: []
-  scandelete: []
-  scanignore: []
-  srclibs:
-  - VLC-2.2@57cd36b
-  subdir: vlc-android
-  submodules: false
-  sudo: ''
-  target: null
-  timeout: null
-  versionCode: 9712
-  versionName: 0.9.7.1
-- androidupdate: []
-  antcommands: []
-  antifeatures: {}
-  binary: null
-  build:
-  - cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release
-  buildjni: []
-  commit: 0.9.7.1
-  disable: ''
-  encoding: null
-  extlibs: []
-  forcevercode: true
-  forceversion: false
-  gradle: []
-  gradleprops: []
-  init: ''
-  maven: null
-  ndk: null
-  novcheck: false
-  oldsdkloc: false
-  output: null
-  patch: []
-  postbuild: ''
-  preassemble: []
-  prebuild:
-  - sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC-2.2$$ ../vlc
-  rm: []
-  scandelete: []
-  scanignore: []
-  srclibs:
-  - VLC-2.2@57cd36b
-  subdir: vlc-android
-  submodules: false
-  sudo: ''
-  target: null
-  timeout: null
-  versionCode: 9714
-  versionName: 0.9.7.1
-- androidupdate: []
-  antcommands: []
-  antifeatures: {}
-  binary: null
-  build:
-  - cd ../ && ANDROID_ABI=x86 ./compile.sh release
-  buildjni: []
-  commit: 0.9.8
-  disable: ''
-  encoding: null
-  extlibs: []
-  forcevercode: true
-  forceversion: false
-  gradle: []
-  gradleprops: []
-  init: ''
-  maven: null
-  ndk: null
-  novcheck: false
-  oldsdkloc: false
-  output: null
-  patch: []
-  postbuild: ''
-  preassemble: []
-  prebuild:
-  - sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC-2.2$$ ../vlc
-  rm: []
-  scandelete: []
-  scanignore: []
-  srclibs:
-  - VLC-2.2@f2db364
-  subdir: vlc-android
-  submodules: false
-  sudo: ''
-  target: null
-  timeout: null
-  versionCode: 9802
-  versionName: 0.9.8
-- androidupdate: []
-  antcommands: []
-  antifeatures: {}
-  binary: null
-  build:
-  - cd ../ && ANDROID_ABI=armeabi ./compile.sh release
-  buildjni: []
-  commit: 0.9.8
-  disable: ''
-  encoding: null
-  extlibs: []
-  forcevercode: true
-  forceversion: false
-  gradle: []
-  gradleprops: []
-  init: ''
-  maven: null
-  ndk: null
-  novcheck: false
-  oldsdkloc: false
-  output: null
-  patch: []
-  postbuild: ''
-  preassemble: []
-  prebuild:
-  - sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC-2.2$$ ../vlc
-  rm: []
-  scandelete: []
-  scanignore: []
-  srclibs:
-  - VLC-2.2@f2db364
-  subdir: vlc-android
-  submodules: false
-  sudo: ''
-  target: null
-  timeout: null
-  versionCode: 9803
-  versionName: 0.9.8
-- androidupdate: []
-  antcommands: []
-  antifeatures: {}
-  binary: null
-  build:
-  - cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release
-  buildjni: []
-  commit: 0.9.8
-  disable: ''
-  encoding: null
-  extlibs: []
-  forcevercode: true
-  forceversion: false
-  gradle: []
-  gradleprops: []
-  init: ''
-  maven: null
-  ndk: null
-  novcheck: false
-  oldsdkloc: false
-  output: null
-  patch: []
-  postbuild: ''
-  preassemble: []
-  prebuild:
-  - sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC-2.2$$ ../vlc
-  rm: []
-  scandelete: []
-  scanignore: []
-  srclibs:
-  - VLC-2.2@f2db364
-  subdir: vlc-android
-  submodules: false
-  sudo: ''
-  target: null
-  timeout: null
-  versionCode: 9804
-  versionName: 0.9.8
-- androidupdate: []
-  antcommands: []
-  antifeatures: {}
-  binary: null
-  build:
-  - cd ../ && ANDROID_ABI=x86 ./compile.sh release
-  buildjni: []
-  commit: 0.9.9
-  disable: ''
-  encoding: null
-  extlibs: []
-  forcevercode: true
-  forceversion: false
-  gradle: []
-  gradleprops: []
-  init: ''
-  maven: null
-  ndk: null
-  novcheck: false
-  oldsdkloc: false
-  output: null
-  patch: []
-  postbuild: ''
-  preassemble: []
-  prebuild:
-  - sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC-2.2$$ ../vlc
-  rm: []
-  scandelete: []
-  scanignore: []
-  srclibs:
-  - VLC-2.2@e731dc23a4f8ef6782c7cc2236bbbf41c034dad1
-  subdir: vlc-android
-  submodules: false
-  sudo: ''
-  target: null
-  timeout: null
-  versionCode: 9902
-  versionName: 0.9.9
-- androidupdate: []
-  antcommands: []
-  antifeatures: {}
-  binary: null
-  build:
-  - cd ../ && ANDROID_ABI=armeabi ./compile.sh release
-  buildjni: []
-  commit: 0.9.9
-  disable: ''
-  encoding: null
-  extlibs: []
-  forcevercode: true
-  forceversion: false
-  gradle: []
-  gradleprops: []
-  init: ''
-  maven: null
-  ndk: null
-  novcheck: false
-  oldsdkloc: false
-  output: null
-  patch: []
-  postbuild: ''
-  preassemble: []
-  prebuild:
-  - sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC-2.2$$ ../vlc
-  rm: []
-  scandelete: []
-  scanignore: []
-  srclibs:
-  - VLC-2.2@e731dc23a4f8ef6782c7cc2236bbbf41c034dad1
-  subdir: vlc-android
-  submodules: false
-  sudo: ''
-  target: null
-  timeout: null
-  versionCode: 9903
-  versionName: 0.9.9
-- androidupdate: []
-  antcommands: []
-  antifeatures: {}
-  binary: null
-  build:
-  - cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release
-  buildjni: []
-  commit: 0.9.9
-  disable: ''
-  encoding: null
-  extlibs: []
-  forcevercode: true
-  forceversion: false
-  gradle: []
-  gradleprops: []
-  init: ''
-  maven: null
-  ndk: null
-  novcheck: false
-  oldsdkloc: false
-  output: null
-  patch: []
-  postbuild: ''
-  preassemble: []
-  prebuild:
-  - sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC-2.2$$ ../vlc
-  rm: []
-  scandelete: []
-  scanignore: []
-  srclibs:
-  - VLC-2.2@e731dc23a4f8ef6782c7cc2236bbbf41c034dad1
-  subdir: vlc-android
-  submodules: false
-  sudo: ''
-  target: null
-  timeout: null
-  versionCode: 9904
-  versionName: 0.9.9
-- androidupdate: []
-  antcommands: []
-  antifeatures: {}
-  binary: null
-  build:
-  - cd ../ && ANDROID_ABI=x86 ./compile.sh release
-  buildjni: []
-  commit: 0.9.10
-  disable: ''
-  encoding: null
-  extlibs: []
-  forcevercode: true
-  forceversion: false
-  gradle: []
-  gradleprops: []
-  init: ''
-  maven: null
-  ndk: null
-  novcheck: false
-  oldsdkloc: false
-  output: null
-  patch: []
-  postbuild: ''
-  preassemble: []
-  prebuild:
-  - sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC-2.2$$ ../vlc
-  rm: []
-  scandelete: []
-  scanignore: []
-  srclibs:
-  - VLC-2.2@e33e5de
-  subdir: vlc-android
-  submodules: false
-  sudo: ''
-  target: null
-  timeout: null
-  versionCode: 10002
-  versionName: 0.9.10
-- androidupdate: []
-  antcommands: []
-  antifeatures: {}
-  binary: null
-  build:
-  - cd ../ && ANDROID_ABI=armeabi ./compile.sh release
-  buildjni: []
-  commit: 0.9.10
-  disable: ''
-  encoding: null
-  extlibs: []
-  forcevercode: true
-  forceversion: false
-  gradle: []
-  gradleprops: []
-  init: ''
-  maven: null
-  ndk: null
-  novcheck: false
-  oldsdkloc: false
-  output: null
-  patch: []
-  postbuild: ''
-  preassemble: []
-  prebuild:
-  - sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC-2.2$$ ../vlc
-  rm: []
-  scandelete: []
-  scanignore: []
-  srclibs:
-  - VLC-2.2@e33e5de
-  subdir: vlc-android
-  submodules: false
-  sudo: ''
-  target: null
-  timeout: null
-  versionCode: 10003
-  versionName: 0.9.10
-- androidupdate: []
-  antcommands: []
-  antifeatures: {}
-  binary: null
-  build:
-  - cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release
-  buildjni: []
-  commit: 0.9.10
-  disable: ''
-  encoding: null
-  extlibs: []
-  forcevercode: true
-  forceversion: false
-  gradle: []
-  gradleprops: []
-  init: ''
-  maven: null
-  ndk: null
-  novcheck: false
-  oldsdkloc: false
-  output: null
-  patch: []
-  postbuild: ''
-  preassemble: []
-  prebuild:
-  - sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC-2.2$$ ../vlc
-  rm: []
-  scandelete: []
-  scanignore: []
-  srclibs:
-  - VLC-2.2@e33e5de
-  subdir: vlc-android
-  submodules: false
-  sudo: ''
-  target: null
-  timeout: null
-  versionCode: 10004
-  versionName: 0.9.10
-- androidupdate: []
-  antcommands: []
-  antifeatures: {}
-  binary: null
-  build:
-  - cd ../ && ANDROID_ABI=x86 ./compile.sh release
-  buildjni: []
-  commit: 1.0.0
-  disable: doesn't build
-  encoding: null
-  extlibs: []
-  forcevercode: true
-  forceversion: false
-  gradle: []
-  gradleprops: []
-  init: ''
-  maven: null
-  ndk: null
-  novcheck: false
-  oldsdkloc: false
-  output: null
-  patch: []
-  postbuild: ''
-  preassemble: []
-  prebuild:
-  - sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC-2.2$$ ../vlc
-  rm: []
-  scandelete: []
-  scanignore: []
-  srclibs:
-  - VLC-2.2@036010e
-  subdir: vlc-android
-  submodules: false
-  sudo: ''
-  target: null
-  timeout: null
-  versionCode: 10006
-  versionName: 1.0.0
-- androidupdate: []
-  antcommands: []
-  antifeatures: {}
-  binary: null
-  build:
-  - cd ../ && ANDROID_ABI=armeabi ./compile.sh release
-  buildjni: []
-  commit: 1.0.0
-  disable: doesn't build
-  encoding: null
-  extlibs: []
-  forcevercode: true
-  forceversion: false
-  gradle: []
-  gradleprops: []
-  init: ''
-  maven: null
-  ndk: null
-  novcheck: false
-  oldsdkloc: false
-  output: null
-  patch: []
-  postbuild: ''
-  preassemble: []
-  prebuild:
-  - sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC-2.2$$ ../vlc
-  rm: []
-  scandelete: []
-  scanignore: []
-  srclibs:
-  - VLC-2.2@036010e
-  subdir: vlc-android
-  submodules: false
-  sudo: ''
-  target: null
-  timeout: null
-  versionCode: 10007
-  versionName: 1.0.0
-- androidupdate: []
-  antcommands: []
-  antifeatures: {}
-  binary: null
-  build:
-  - cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release
-  buildjni: []
-  commit: 1.0.0
-  disable: doesn't build
-  encoding: null
-  extlibs: []
-  forcevercode: true
-  forceversion: false
-  gradle: []
-  gradleprops: []
-  init: ''
-  maven: null
-  ndk: null
-  novcheck: false
-  oldsdkloc: false
-  output: null
-  patch: []
-  postbuild: ''
-  preassemble: []
-  prebuild:
-  - sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC-2.2$$ ../vlc
-  rm: []
-  scandelete: []
-  scanignore: []
-  srclibs:
-  - VLC-2.2@036010e
-  subdir: vlc-android
-  submodules: false
-  sudo: ''
-  target: null
-  timeout: null
-  versionCode: 10008
-  versionName: 1.0.0
-- androidupdate: []
-  antcommands: []
-  antifeatures: {}
-  binary: null
-  build:
-  - cd ../ && ANDROID_ABI=x86 ./compile.sh release
-  buildjni: []
-  commit: 1.0.1
-  disable: ''
-  encoding: null
-  extlibs: []
-  forcevercode: true
-  forceversion: false
-  gradle: []
-  gradleprops: []
-  init: ''
-  maven: null
-  ndk: null
-  novcheck: false
-  oldsdkloc: false
-  output: null
-  patch: []
-  postbuild: ''
-  preassemble: []
-  prebuild:
-  - sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC-2.2$$ ../vlc
-  rm: []
-  scandelete: []
-  scanignore: []
-  srclibs:
-  - VLC-2.2@59409d5
-  subdir: vlc-android
-  submodules: false
-  sudo: ''
-  target: null
-  timeout: null
-  versionCode: 10102
-  versionName: 1.0.1
-- androidupdate: []
-  antcommands: []
-  antifeatures: {}
-  binary: null
-  build:
-  - cd ../ && ANDROID_ABI=armeabi ./compile.sh release
-  buildjni: []
-  commit: 1.0.1
-  disable: ''
-  encoding: null
-  extlibs: []
-  forcevercode: true
-  forceversion: false
-  gradle: []
-  gradleprops: []
-  init: ''
-  maven: null
-  ndk: null
-  novcheck: false
-  oldsdkloc: false
-  output: null
-  patch: []
-  postbuild: ''
-  preassemble: []
-  prebuild:
-  - sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC-2.2$$ ../vlc
-  rm: []
-  scandelete: []
-  scanignore: []
-  srclibs:
-  - VLC-2.2@59409d5
-  subdir: vlc-android
-  submodules: false
-  sudo: ''
-  target: null
-  timeout: null
-  versionCode: 10103
-  versionName: 1.0.1
-- androidupdate: []
-  antcommands: []
-  antifeatures: {}
-  binary: null
-  build:
-  - cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release
-  buildjni: []
-  commit: 1.0.1
-  disable: ''
-  encoding: null
-  extlibs: []
-  forcevercode: true
-  forceversion: false
-  gradle: []
-  gradleprops: []
-  init: ''
-  maven: null
-  ndk: null
-  novcheck: false
-  oldsdkloc: false
-  output: null
-  patch: []
-  postbuild: ''
-  preassemble: []
-  prebuild:
-  - sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC-2.2$$ ../vlc
-  rm: []
-  scandelete: []
-  scanignore: []
-  srclibs:
-  - VLC-2.2@59409d5
-  subdir: vlc-android
-  submodules: false
-  sudo: ''
-  target: null
-  timeout: null
-  versionCode: 10104
-  versionName: 1.0.1
-- androidupdate: []
-  antcommands: []
-  antifeatures: {}
-  binary: null
-  build:
-  - cd ../ && ./compile.sh -a "armeabi" --release
-  buildjni: []
-  commit: 1.1.3
-  disable: ''
-  encoding: null
-  extlibs: []
-  forcevercode: false
-  forceversion: false
-  gradle:
-  - VanillaARMv6fpu
-  gradleprops: []
-  init: ''
-  maven: null
-  ndk: r10d
-  novcheck: false
-  oldsdkloc: false
-  output: null
-  patch: []
-  postbuild: ''
-  preassemble: []
-  prebuild:
-  - sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh
-    && ln -s vlc-android/$$VLC$$ ../vlc
-  rm: []
-  scandelete: []
-  scanignore: []
-  srclibs:
-  - VLC@a9b19e4
-  subdir: vlc-android
-  submodules: false
-  sudo: ''
-  target: null
-  timeout: null
-  versionCode: 1010303
-  versionName: 1.1.3
-- androidupdate: []
-  antcommands: []
-  antifeatures: {}
-  binary: null
-  build:
-  - cd ../ && ./compile.sh -a "armeabi-v7a" --release
-  buildjni: []
-  commit: 1.1.3
-  disable: ''
-  encoding: null
-  extlibs: []
-  forcevercode: false
-  forceversion: false
-  gradle:
-  - VanillaARMv7
-  gradleprops: []
-  init: ''
-  maven: null
-  ndk: r10d
-  novcheck: false
-  oldsdkloc: false
-  output: null
-  patch: []
-  postbuild: ''
-  preassemble: []
-  prebuild:
-  - sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh
-    && ln -s vlc-android/$$VLC$$ ../vlc
-  rm: []
-  scandelete: []
-  scanignore: []
-  srclibs:
-  - VLC@a9b19e4
-  subdir: vlc-android
-  submodules: false
-  sudo: ''
-  target: null
-  timeout: null
-  versionCode: 1010304
-  versionName: 1.1.3
-- androidupdate: []
-  antcommands: []
-  antifeatures: {}
-  binary: null
-  build:
-  - cd ../ && ./compile.sh -a "x86" --release
-  buildjni: []
-  commit: 1.1.3
-  disable: ''
-  encoding: null
-  extlibs: []
-  forcevercode: false
-  forceversion: false
-  gradle:
-  - VanillaX86
-  gradleprops: []
-  init: ''
-  maven: null
-  ndk: r10d
-  novcheck: false
-  oldsdkloc: false
-  output: null
-  patch: []
-  postbuild: ''
-  preassemble: []
-  prebuild:
-  - sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh
-    && ln -s vlc-android/$$VLC$$ ../vlc
-  rm: []
-  scandelete: []
-  scanignore: []
-  srclibs:
-  - VLC@a9b19e4
-  subdir: vlc-android
-  submodules: false
-  sudo: ''
-  target: null
-  timeout: null
-  versionCode: 1010305
-  versionName: 1.1.3
-- androidupdate: []
-  antcommands: []
-  antifeatures: {}
-  binary: null
-  build:
-  - cd ../ && ./compile.sh -a "armeabi" --release
-  buildjni: []
-  commit: 1.1.5
-  disable: ''
-  encoding: null
-  extlibs: []
-  forcevercode: false
-  forceversion: false
-  gradle:
-  - VanillaARMv6fpu
-  gradleprops: []
-  init: ''
-  maven: null
-  ndk: r10d
-  novcheck: false
-  oldsdkloc: false
-  output: null
-  patch: []
-  postbuild: ''
-  preassemble: []
-  prebuild:
-  - sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh
-    && ln -s vlc-android/$$VLC$$ ../vlc
-  rm: []
-  scandelete: []
-  scanignore: []
-  srclibs:
-  - VLC@e6b4585
-  subdir: vlc-android
-  submodules: false
-  sudo: ''
-  target: null
-  timeout: null
-  versionCode: 1010503
-  versionName: 1.1.5
-- androidupdate: []
-  antcommands: []
-  antifeatures: {}
-  binary: null
-  build:
-  - cd ../ && ./compile.sh -a "armeabi-v7a" --release
-  buildjni: []
-  commit: 1.1.5
-  disable: ''
-  encoding: null
-  extlibs: []
-  forcevercode: false
-  forceversion: false
-  gradle:
-  - VanillaARMv7
-  gradleprops: []
-  init: ''
-  maven: null
-  ndk: r10d
-  novcheck: false
-  oldsdkloc: false
-  output: null
-  patch: []
-  postbuild: ''
-  preassemble: []
-  prebuild:
-  - sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh
-    && ln -s vlc-android/$$VLC$$ ../vlc
-  rm: []
-  scandelete: []
-  scanignore: []
-  srclibs:
-  - VLC@e6b4585
-  subdir: vlc-android
-  submodules: false
-  sudo: ''
-  target: null
-  timeout: null
-  versionCode: 1010504
-  versionName: 1.1.5
-- androidupdate: []
-  antcommands: []
-  antifeatures: {}
-  binary: null
-  build:
-  - cd ../ && ./compile.sh -a "x86" --release
-  buildjni: []
-  commit: 1.1.5
-  disable: ''
-  encoding: null
-  extlibs: []
-  forcevercode: false
-  forceversion: false
-  gradle:
-  - VanillaX86
-  gradleprops: []
-  init: ''
-  maven: null
-  ndk: r10d
-  novcheck: false
-  oldsdkloc: false
-  output: null
-  patch: []
-  postbuild: ''
-  preassemble: []
-  prebuild:
-  - sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh
-    && ln -s vlc-android/$$VLC$$ ../vlc
-  rm: []
-  scandelete: []
-  scanignore: []
-  srclibs:
-  - VLC@e6b4585
-  subdir: vlc-android
-  submodules: false
-  sudo: ''
-  target: null
-  timeout: null
-  versionCode: 1010505
-  versionName: 1.1.5
-- androidupdate: []
-  antcommands: []
-  antifeatures: {}
-  binary: null
-  build:
-  - cd ../ && ./compile.sh -a "armeabi" --release
-  buildjni: []
-  commit: 1.1.6
-  disable: ''
-  encoding: null
-  extlibs: []
-  forcevercode: false
-  forceversion: false
-  gradle:
-  - VanillaARMv6fpu
-  gradleprops: []
-  init: ''
-  maven: null
-  ndk: r10d
-  novcheck: false
-  oldsdkloc: false
-  output: null
-  patch: []
-  postbuild: ''
-  preassemble: []
-  prebuild:
-  - sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh
-    && ln -s vlc-android/$$VLC$$ ../vlc
-  rm: []
-  scandelete: []
-  scanignore: []
-  srclibs:
-  - VLC@551b670
-  subdir: vlc-android
-  submodules: false
-  sudo: ''
-  target: null
-  timeout: null
-  versionCode: 1010603
-  versionName: 1.1.6
-- androidupdate: []
-  antcommands: []
-  antifeatures: {}
-  binary: null
-  build:
-  - cd ../ && ./compile.sh -a "armeabi-v7a" --release
-  buildjni: []
-  commit: 1.1.6
-  disable: ''
-  encoding: null
-  extlibs: []
-  forcevercode: false
-  forceversion: false
-  gradle:
-  - VanillaARMv7
-  gradleprops: []
-  init: ''
-  maven: null
-  ndk: r10d
-  novcheck: false
-  oldsdkloc: false
-  output: null
-  patch: []
-  postbuild: ''
-  preassemble: []
-  prebuild:
-  - sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh
-    && ln -s vlc-android/$$VLC$$ ../vlc
-  rm: []
-  scandelete: []
-  scanignore: []
-  srclibs:
-  - VLC@551b670
-  subdir: vlc-android
-  submodules: false
-  sudo: ''
-  target: null
-  timeout: null
-  versionCode: 1010604
-  versionName: 1.1.6
-- androidupdate: []
-  antcommands: []
-  antifeatures: {}
-  binary: null
-  build:
-  - cd ../ && ./compile.sh -a "x86" --release
-  buildjni: []
-  commit: 1.1.6
-  disable: ''
-  encoding: null
-  extlibs: []
-  forcevercode: false
-  forceversion: false
-  gradle:
-  - VanillaX86
-  gradleprops: []
-  init: ''
-  maven: null
-  ndk: r10d
-  novcheck: false
-  oldsdkloc: false
-  output: null
-  patch: []
-  postbuild: ''
-  preassemble: []
-  prebuild:
-  - sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh
-    && ln -s vlc-android/$$VLC$$ ../vlc
-  rm: []
-  scandelete: []
-  scanignore: []
-  srclibs:
-  - VLC@551b670
-  subdir: vlc-android
-  submodules: false
-  sudo: ''
-  target: null
-  timeout: null
-  versionCode: 1010605
-  versionName: 1.1.6
-- androidupdate: []
-  antcommands: []
-  antifeatures: {}
-  binary: null
-  build:
-  - cd ../ && ./compile.sh -a "armeabi" --release
-  buildjni: []
-  commit: 1.2.0
-  disable: ''
-  encoding: null
-  extlibs: []
-  forcevercode: false
-  forceversion: false
-  gradle:
-  - VanillaARMv6fpu
-  gradleprops: []
-  init: ''
-  maven: null
-  ndk: r10d
-  novcheck: false
-  oldsdkloc: false
-  output: null
-  patch: []
-  postbuild: ''
-  preassemble: []
-  prebuild:
-  - sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh
-    && ln -s vlc-android/$$VLC$$ ../vlc
-  rm: []
-  scandelete: []
-  scanignore: []
-  srclibs:
-  - VLC@23c8d86
-  subdir: vlc-android
-  submodules: false
-  sudo: ''
-  target: null
-  timeout: null
-  versionCode: 1020003
-  versionName: 1.2.0
-- androidupdate: []
-  antcommands: []
-  antifeatures: {}
-  binary: null
-  build:
-  - cd ../ && ./compile.sh -a "armeabi-v7a" --release
-  buildjni: []
-  commit: 1.2.0
-  disable: ''
-  encoding: null
-  extlibs: []
-  forcevercode: false
-  forceversion: false
-  gradle:
-  - VanillaARMv7
-  gradleprops: []
-  init: ''
-  maven: null
-  ndk: r10d
-  novcheck: false
-  oldsdkloc: false
-  output: null
-  patch: []
-  postbuild: ''
-  preassemble: []
-  prebuild:
-  - sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh
-    && ln -s vlc-android/$$VLC$$ ../vlc
-  rm: []
-  scandelete: []
-  scanignore: []
-  srclibs:
-  - VLC@23c8d86
-  subdir: vlc-android
-  submodules: false
-  sudo: ''
-  target: null
-  timeout: null
-  versionCode: 1020004
-  versionName: 1.2.0
-- androidupdate: []
-  antcommands: []
-  antifeatures: {}
-  binary: null
-  build:
-  - cd ../ && ./compile.sh -a "x86" --release
-  buildjni: []
-  commit: 1.2.0
-  disable: ''
-  encoding: null
-  extlibs: []
-  forcevercode: false
-  forceversion: false
-  gradle:
-  - VanillaX86
-  gradleprops: []
-  init: ''
-  maven: null
-  ndk: r10d
-  novcheck: false
-  oldsdkloc: false
-  output: null
-  patch: []
-  postbuild: ''
-  preassemble: []
-  prebuild:
-  - sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh
-    && ln -s vlc-android/$$VLC$$ ../vlc
-  rm: []
-  scandelete: []
-  scanignore: []
-  srclibs:
-  - VLC@23c8d86
-  subdir: vlc-android
-  submodules: false
-  sudo: ''
-  target: null
-  timeout: null
-  versionCode: 1020005
-  versionName: 1.2.0
-- androidupdate: []
-  antcommands: []
-  antifeatures: {}
-  binary: null
-  build:
-  - cd ../ && ./compile.sh -a "armeabi" --release
-  buildjni: []
-  commit: 1.2.1
-  disable: ''
-  encoding: null
-  extlibs: []
-  forcevercode: false
-  forceversion: false
-  gradle:
-  - VanillaARMv6fpu
-  gradleprops: []
-  init: ''
-  maven: null
-  ndk: r10d
-  novcheck: false
-  oldsdkloc: false
-  output: null
-  patch: []
-  postbuild: ''
-  preassemble: []
-  prebuild:
-  - sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh
-    && ln -s vlc-android/$$VLC$$ ../vlc
-  rm: []
-  scandelete: []
-  scanignore: []
-  srclibs:
-  - VLC@23c8d86
-  subdir: vlc-android
-  submodules: false
-  sudo: ''
-  target: null
-  timeout: null
-  versionCode: 1020103
-  versionName: 1.2.1
-- androidupdate: []
-  antcommands: []
-  antifeatures: {}
-  binary: null
-  build:
-  - cd ../ && ./compile.sh -a "armeabi-v7a" --release
-  buildjni: []
-  commit: 1.2.1
-  disable: ''
-  encoding: null
-  extlibs: []
-  forcevercode: false
-  forceversion: false
-  gradle:
-  - VanillaARMv7
-  gradleprops: []
-  init: ''
-  maven: null
-  ndk: r10d
-  novcheck: false
-  oldsdkloc: false
-  output: null
-  patch: []
-  postbuild: ''
-  preassemble: []
-  prebuild:
-  - sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh
-    && ln -s vlc-android/$$VLC$$ ../vlc
-  rm: []
-  scandelete: []
-  scanignore: []
-  srclibs:
-  - VLC@23c8d86
-  subdir: vlc-android
-  submodules: false
-  sudo: ''
-  target: null
-  timeout: null
-  versionCode: 1020104
-  versionName: 1.2.1
-- androidupdate: []
-  antcommands: []
-  antifeatures: {}
-  binary: null
-  build:
-  - cd ../ && ./compile.sh -a "x86" --release
-  buildjni: []
-  commit: 1.2.1
-  disable: ''
-  encoding: null
-  extlibs: []
-  forcevercode: false
-  forceversion: false
-  gradle:
-  - VanillaX86
-  gradleprops: []
-  init: ''
-  maven: null
-  ndk: r10d
-  novcheck: false
-  oldsdkloc: false
-  output: null
-  patch: []
-  postbuild: ''
-  preassemble: []
-  prebuild:
-  - sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh
-    && ln -s vlc-android/$$VLC$$ ../vlc
-  rm: []
-  scandelete: []
-  scanignore: []
-  srclibs:
-  - VLC@23c8d86
-  subdir: vlc-android
-  submodules: false
-  sudo: ''
-  target: null
-  timeout: null
-  versionCode: 1020105
-  versionName: 1.2.1
-- androidupdate: []
-  antcommands: []
-  antifeatures: {}
-  binary: null
-  build:
-  - cd ../ && ./compile.sh -a "armeabi" --release
-  buildjni: []
-  commit: 1.2.2
-  disable: ''
-  encoding: null
-  extlibs: []
-  forcevercode: false
-  forceversion: false
-  gradle:
-  - VanillaARMv6fpu
-  gradleprops: []
-  init: ''
-  maven: null
-  ndk: r10d
-  novcheck: false
-  oldsdkloc: false
-  output: null
-  patch: []
-  postbuild: ''
-  preassemble: []
-  prebuild:
-  - sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh
-    && ln -s vlc-android/$$VLC$$ ../vlc
-  rm: []
-  scandelete: []
-  scanignore: []
-  srclibs:
-  - VLC@7491a5f
-  subdir: vlc-android
-  submodules: false
-  sudo: ''
-  target: null
-  timeout: null
-  versionCode: 1020203
-  versionName: 1.2.2
-- androidupdate: []
-  antcommands: []
-  antifeatures: {}
-  binary: null
-  build:
-  - cd ../ && ./compile.sh -a "armeabi-v7a" --release
-  buildjni: []
-  commit: 1.2.2
-  disable: ''
-  encoding: null
-  extlibs: []
-  forcevercode: false
-  forceversion: false
-  gradle:
-  - VanillaARMv7
-  gradleprops: []
-  init: ''
-  maven: null
-  ndk: r10d
-  novcheck: false
-  oldsdkloc: false
-  output: null
-  patch: []
-  postbuild: ''
-  preassemble: []
-  prebuild:
-  - sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh
-    && ln -s vlc-android/$$VLC$$ ../vlc
-  rm: []
-  scandelete: []
-  scanignore: []
-  srclibs:
-  - VLC@7491a5f
-  subdir: vlc-android
-  submodules: false
-  sudo: ''
-  target: null
-  timeout: null
-  versionCode: 1020204
-  versionName: 1.2.2
-- androidupdate: []
-  antcommands: []
-  antifeatures: {}
-  binary: null
-  build:
-  - cd ../ && ./compile.sh -a "x86" --release
-  buildjni: []
-  commit: 1.2.2
-  disable: ''
-  encoding: null
-  extlibs: []
-  forcevercode: false
-  forceversion: false
-  gradle:
-  - VanillaX86
-  gradleprops: []
-  init: ''
-  maven: null
-  ndk: r10d
-  novcheck: false
-  oldsdkloc: false
-  output: null
-  patch: []
-  postbuild: ''
-  preassemble: []
-  prebuild:
-  - sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh
-    && ln -s vlc-android/$$VLC$$ ../vlc
-  rm: []
-  scandelete: []
-  scanignore: []
-  srclibs:
-  - VLC@7491a5f
-  subdir: vlc-android
-  submodules: false
-  sudo: ''
-  target: null
-  timeout: null
-  versionCode: 1020205
-  versionName: 1.2.2
-- androidupdate: []
-  antcommands: []
-  antifeatures: {}
-  binary: null
-  build:
-  - cd ../ && ./compile.sh -a "armeabi" --release
-  buildjni: []
-  commit: 1.2.3
-  disable: ''
-  encoding: null
-  extlibs: []
-  forcevercode: false
-  forceversion: false
-  gradle:
-  - VanillaARMv6fpu
-  gradleprops: []
-  init: ''
-  maven: null
-  ndk: r10d
-  novcheck: false
-  oldsdkloc: false
-  output: null
-  patch: []
-  postbuild: ''
-  preassemble: []
-  prebuild:
-  - sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh
-    && ln -s vlc-android/$$VLC$$ ../vlc
-  rm: []
-  scandelete: []
-  scanignore: []
-  srclibs:
-  - VLC@7491a5f
-  subdir: vlc-android
-  submodules: false
-  sudo: ''
-  target: null
-  timeout: null
-  versionCode: 1020303
-  versionName: 1.2.3
-- androidupdate: []
-  antcommands: []
-  antifeatures: {}
-  binary: null
-  build:
-  - cd ../ && ./compile.sh -a "armeabi-v7a" --release
-  buildjni: []
-  commit: 1.2.3
-  disable: ''
-  encoding: null
-  extlibs: []
-  forcevercode: false
-  forceversion: false
-  gradle:
-  - VanillaARMv7
-  gradleprops: []
-  init: ''
-  maven: null
-  ndk: r10d
-  novcheck: false
-  oldsdkloc: false
-  output: null
-  patch: []
-  postbuild: ''
-  preassemble: []
-  prebuild:
-  - sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh
-    && ln -s vlc-android/$$VLC$$ ../vlc
-  rm: []
-  scandelete: []
-  scanignore: []
-  srclibs:
-  - VLC@7491a5f
-  subdir: vlc-android
-  submodules: false
-  sudo: ''
-  target: null
-  timeout: null
-  versionCode: 1020304
-  versionName: 1.2.3
-- androidupdate: []
-  antcommands: []
-  antifeatures: {}
-  binary: null
-  build:
-  - cd ../ && ./compile.sh -a "x86" --release
-  buildjni: []
-  commit: 1.2.3
-  disable: ''
-  encoding: null
-  extlibs: []
-  forcevercode: false
-  forceversion: false
-  gradle:
-  - VanillaX86
-  gradleprops: []
-  init: ''
-  maven: null
-  ndk: r10d
-  novcheck: false
-  oldsdkloc: false
-  output: null
-  patch: []
-  postbuild: ''
-  preassemble: []
-  prebuild:
-  - sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh
-    && ln -s vlc-android/$$VLC$$ ../vlc
-  rm: []
-  scandelete: []
-  scanignore: []
-  srclibs:
-  - VLC@7491a5f
-  subdir: vlc-android
-  submodules: false
-  sudo: ''
-  target: null
-  timeout: null
-  versionCode: 1020305
-  versionName: 1.2.3
-- androidupdate: []
-  antcommands: []
-  antifeatures: {}
-  binary: null
-  build:
-  - cd ../ && ./compile.sh -a "armeabi" --release
-  buildjni: []
-  commit: 1.2.4
-  disable: ''
-  encoding: null
-  extlibs: []
-  forcevercode: false
-  forceversion: false
-  gradle:
-  - VanillaARMv6fpu
-  gradleprops: []
-  init: ''
-  maven: null
-  ndk: r10d
-  novcheck: false
-  oldsdkloc: false
-  output: null
-  patch: []
-  postbuild: ''
-  preassemble: []
-  prebuild:
-  - sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh
-    && ln -s vlc-android/$$VLC$$ ../vlc
-  rm: []
-  scandelete: []
-  scanignore: []
-  srclibs:
-  - VLC@7491a5f
-  subdir: vlc-android
-  submodules: false
-  sudo: ''
-  target: null
-  timeout: null
-  versionCode: 1020403
-  versionName: 1.2.4
-- androidupdate: []
-  antcommands: []
-  antifeatures: {}
-  binary: null
-  build:
-  - cd ../ && ./compile.sh -a "armeabi-v7a" --release
-  buildjni: []
-  commit: 1.2.4
-  disable: ''
-  encoding: null
-  extlibs: []
-  forcevercode: false
-  forceversion: false
-  gradle:
-  - VanillaARMv7
-  gradleprops: []
-  init: ''
-  maven: null
-  ndk: r10d
-  novcheck: false
-  oldsdkloc: false
-  output: null
-  patch: []
-  postbuild: ''
-  preassemble: []
-  prebuild:
-  - sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh
-    && ln -s vlc-android/$$VLC$$ ../vlc
-  rm: []
-  scandelete: []
-  scanignore: []
-  srclibs:
-  - VLC@7491a5f
-  subdir: vlc-android
-  submodules: false
-  sudo: ''
-  target: null
-  timeout: null
-  versionCode: 1020404
-  versionName: 1.2.4
-- androidupdate: []
-  antcommands: []
-  antifeatures: {}
-  binary: null
-  build:
-  - cd ../ && ./compile.sh -a "x86" --release
-  buildjni: []
-  commit: 1.2.4
-  disable: ''
-  encoding: null
-  extlibs: []
-  forcevercode: false
-  forceversion: false
-  gradle:
-  - VanillaX86
-  gradleprops: []
-  init: ''
-  maven: null
-  ndk: r10d
-  novcheck: false
-  oldsdkloc: false
-  output: null
-  patch: []
-  postbuild: ''
-  preassemble: []
-  prebuild:
-  - sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh
-    && ln -s vlc-android/$$VLC$$ ../vlc
-  rm: []
-  scandelete: []
-  scanignore: []
-  srclibs:
-  - VLC@7491a5f
-  subdir: vlc-android
-  submodules: false
-  sudo: ''
-  target: null
-  timeout: null
-  versionCode: 1020405
-  versionName: 1.2.4
-- androidupdate: []
-  antcommands: []
-  antifeatures: {}
-  binary: null
-  build:
-  - cd ../ && ./compile.sh -a "armeabi" --release
-  buildjni: []
-  commit: 1.2.5
-  disable: ''
-  encoding: null
-  extlibs: []
-  forcevercode: false
-  forceversion: false
-  gradle:
-  - VanillaARMv6fpu
-  gradleprops: []
-  init: ''
-  maven: null
-  ndk: r10d
-  novcheck: false
-  oldsdkloc: false
-  output: null
-  patch: []
-  postbuild: ''
-  preassemble: []
-  prebuild:
-  - sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh
-    && ln -s vlc-android/$$VLC$$ ../vlc
-  rm: []
-  scandelete: []
-  scanignore: []
-  srclibs:
-  - VLC@50accb8
-  subdir: vlc-android
-  submodules: false
-  sudo: ''
-  target: null
-  timeout: null
-  versionCode: 1020503
-  versionName: 1.2.5
-- androidupdate: []
-  antcommands: []
-  antifeatures: {}
-  binary: null
-  build:
-  - cd ../ && ./compile.sh -a "armeabi-v7a" --release
-  buildjni: []
-  commit: 1.2.5
-  disable: ''
-  encoding: null
-  extlibs: []
-  forcevercode: false
-  forceversion: false
-  gradle:
-  - VanillaARMv7
-  gradleprops: []
-  init: ''
-  maven: null
-  ndk: r10d
-  novcheck: false
-  oldsdkloc: false
-  output: null
-  patch: []
-  postbuild: ''
-  preassemble: []
-  prebuild:
-  - sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh
-    && ln -s vlc-android/$$VLC$$ ../vlc
-  rm: []
-  scandelete: []
-  scanignore: []
-  srclibs:
-  - VLC@50accb8
-  subdir: vlc-android
-  submodules: false
-  sudo: ''
-  target: null
-  timeout: null
-  versionCode: 1020504
-  versionName: 1.2.5
-- androidupdate: []
-  antcommands: []
-  antifeatures: {}
-  binary: null
-  build:
-  - cd ../ && ./compile.sh -a "x86" --release
-  buildjni: []
-  commit: 1.2.5
-  disable: ''
-  encoding: null
-  extlibs: []
-  forcevercode: false
-  forceversion: false
-  gradle:
-  - VanillaX86
-  gradleprops: []
-  init: ''
-  maven: null
-  ndk: r10d
-  novcheck: false
-  oldsdkloc: false
-  output: null
-  patch: []
-  postbuild: ''
-  preassemble: []
-  prebuild:
-  - sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh
-    && ln -s vlc-android/$$VLC$$ ../vlc
-  rm: []
-  scandelete: []
-  scanignore: []
-  srclibs:
-  - VLC@50accb8
-  subdir: vlc-android
-  submodules: false
-  sudo: ''
-  target: null
-  timeout: null
-  versionCode: 1020505
-  versionName: 1.2.5
-- androidupdate: []
-  antcommands: []
-  antifeatures: {}
-  binary: null
-  build:
-  - cd ../ && ./compile.sh -a "armeabi" --release
-  buildjni: []
-  commit: 1.2.6
-  disable: ''
-  encoding: null
-  extlibs: []
-  forcevercode: false
-  forceversion: false
-  gradle:
-  - VanillaARMv6fpu
-  gradleprops: []
-  init: ''
-  maven: null
-  ndk: r10d
-  novcheck: false
-  oldsdkloc: false
-  output: null
-  patch: []
-  postbuild: ''
-  preassemble: []
-  prebuild:
-  - sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh
-    && ln -s vlc-android/$$VLC$$ ../vlc
-  rm: []
-  scandelete: []
-  scanignore: []
-  srclibs:
-  - VLC@d59b81a
-  subdir: vlc-android
-  submodules: false
-  sudo: ''
-  target: null
-  timeout: null
-  versionCode: 1030003
-  versionName: 1.2.6
-- androidupdate: []
-  antcommands: []
-  antifeatures: {}
-  binary: null
-  build:
-  - cd ../ && ./compile.sh -a "armeabi-v7a" --release
-  buildjni: []
-  commit: 1.2.6
-  disable: ''
-  encoding: null
-  extlibs: []
-  forcevercode: false
-  forceversion: false
-  gradle:
-  - VanillaARMv7
-  gradleprops: []
-  init: ''
-  maven: null
-  ndk: r10d
-  novcheck: false
-  oldsdkloc: false
-  output: null
-  patch: []
-  postbuild: ''
-  preassemble: []
-  prebuild:
-  - sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh
-    && ln -s vlc-android/$$VLC$$ ../vlc
-  rm: []
-  scandelete: []
-  scanignore: []
-  srclibs:
-  - VLC@d59b81a
-  subdir: vlc-android
-  submodules: false
-  sudo: ''
-  target: null
-  timeout: null
-  versionCode: 1030004
-  versionName: 1.2.6
-- androidupdate: []
-  antcommands: []
-  antifeatures: {}
-  binary: null
-  build:
-  - cd ../ && ./compile.sh -a "x86" --release
-  buildjni: []
-  commit: 1.2.6
-  disable: ''
-  encoding: null
-  extlibs: []
-  forcevercode: false
-  forceversion: false
-  gradle:
-  - VanillaX86
-  gradleprops: []
-  init: ''
-  maven: null
-  ndk: r10d
-  novcheck: false
-  oldsdkloc: false
-  output: null
-  patch: []
-  postbuild: ''
-  preassemble: []
-  prebuild:
-  - sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh
-    && ln -s vlc-android/$$VLC$$ ../vlc
-  rm: []
-  scandelete: []
-  scanignore: []
-  srclibs:
-  - VLC@d59b81a
-  subdir: vlc-android
-  submodules: false
-  sudo: ''
-  target: null
-  timeout: null
-  versionCode: 1030005
-  versionName: 1.2.6
 Categories:
 - Multimedia
 Changelog: ''
 CurrentVersion: 1.2.6
-CurrentVersionCode: 1030005
+CurrentVersionCode: '1030005'
 Description: 'Video and audio player that supports a wide range of formats,
 
   for both local and remote playback.
@@ -2606,8 +22,10 @@ Description: 'Video and audio player that supports a wide range of formats,
   '
 Disabled: null
 Donate: http://www.videolan.org/contribute.html#money
+FlattrID: null
 IssueTracker: http://www.videolan.org/support/index.html#bugs
 Liberapay: null
+LiberapayID: null
 License: GPL-3.0-only
 Litecoin: null
 MaintainerNotes: 'Instructions and dependencies here: http://wiki.videolan.org/AndroidCompile
@@ -2640,10 +58,2393 @@ UpdateCheckData: null
 UpdateCheckIgnore: null
 UpdateCheckMode: Tags
 UpdateCheckName: null
-VercodeOperation:
-- '%c + 5'
+VercodeOperation: '%c + 5'
 WebSite: http://www.videolan.org/vlc/download-android.html
 added: null
+builds:
+- androidupdate:
+  - .
+  - ../java-libs/SlidingMenu
+  - ../java-libs/ActionBarSherlock
+  antcommands: []
+  antifeatures: []
+  build: cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release
+  buildjni: []
+  buildozer: false
+  commit: 0.0.11
+  disable: ''
+  encoding: null
+  extlibs: []
+  forcevercode: true
+  forceversion: true
+  gradle: []
+  gradleprops: []
+  init: ''
+  maven: false
+  ndk: null
+  novcheck: false
+  oldsdkloc: false
+  output: null
+  patch: []
+  preassemble: []
+  prebuild: sed -i '48d' ../Makefile
+  rm: []
+  scandelete: []
+  scanignore: []
+  srclibs: []
+  subdir: vlc-android
+  submodules: false
+  sudo: ''
+  target: null
+  timeout: null
+  versionCode: '110'
+  versionName: 0.0.11-ARMv7
+- androidupdate:
+  - .
+  - ../java-libs/SlidingMenu
+  - ../java-libs/ActionBarSherlock
+  antcommands: []
+  antifeatures: []
+  build: cd ../ && ANDROID_ABI=armeabi ./compile.sh release
+  buildjni: []
+  buildozer: false
+  commit: 0.0.11
+  disable: ''
+  encoding: null
+  extlibs: []
+  forcevercode: true
+  forceversion: true
+  gradle: []
+  gradleprops: []
+  init: ''
+  maven: false
+  ndk: null
+  novcheck: false
+  oldsdkloc: false
+  output: null
+  patch: []
+  preassemble: []
+  prebuild: sed -i '48d' ../Makefile
+  rm: []
+  scandelete: []
+  scanignore: []
+  srclibs: []
+  subdir: vlc-android
+  submodules: false
+  sudo: ''
+  target: null
+  timeout: null
+  versionCode: '111'
+  versionName: 0.0.11-ARM
+- androidupdate:
+  - .
+  - ../java-libs/SlidingMenu
+  - ../java-libs/ActionBarSherlock
+  antcommands: []
+  antifeatures: []
+  build: cd ../ && ANDROID_ABI=x86 ./compile.sh release
+  buildjni: []
+  buildozer: false
+  commit: unknown - see disabled
+  disable: ffmpeg error 0.0.11
+  encoding: null
+  extlibs: []
+  forcevercode: true
+  forceversion: true
+  gradle: []
+  gradleprops: []
+  init: ''
+  maven: false
+  ndk: null
+  novcheck: false
+  oldsdkloc: false
+  output: null
+  patch: []
+  preassemble: []
+  prebuild: sed -i '48d' ../Makefile
+  rm: []
+  scandelete: []
+  scanignore: []
+  srclibs: []
+  subdir: vlc-android
+  submodules: false
+  sudo: ''
+  target: null
+  timeout: null
+  versionCode: '112'
+  versionName: 0.0.11-x86
+- androidupdate:
+  - .
+  - ../java-libs/SlidingMenu
+  - ../java-libs/ActionBarSherlock
+  antcommands: []
+  antifeatures: []
+  build: cd ../ && ANDROID_ABI=mips ./compile.sh release
+  buildjni: []
+  buildozer: false
+  commit: 0.0.11
+  disable: ''
+  encoding: null
+  extlibs: []
+  forcevercode: true
+  forceversion: true
+  gradle: []
+  gradleprops: []
+  init: ''
+  maven: false
+  ndk: null
+  novcheck: false
+  oldsdkloc: false
+  output: null
+  patch: []
+  preassemble: []
+  prebuild: sed -i '48d' ../Makefile
+  rm: []
+  scandelete: []
+  scanignore: []
+  srclibs: []
+  subdir: vlc-android
+  submodules: false
+  sudo: ''
+  target: null
+  timeout: null
+  versionCode: '113'
+  versionName: 0.0.11-mips
+- androidupdate: []
+  antcommands: []
+  antifeatures: []
+  build: cd ../ && ANDROID_ABI=mips ./compile.sh release
+  buildjni: []
+  buildozer: false
+  commit: 0.1.3
+  disable: build failing (at 0.1.3)
+  encoding: null
+  extlibs: []
+  forcevercode: true
+  forceversion: true
+  gradle: []
+  gradleprops: []
+  init: ''
+  maven: false
+  ndk: null
+  novcheck: false
+  oldsdkloc: false
+  output: null
+  patch:
+  - ndkr9.patch
+  preassemble: []
+  prebuild: sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC$$ ../vlc
+  rm: []
+  scandelete: []
+  scanignore: []
+  srclibs:
+  - VLC@7c52aacbe
+  subdir: vlc-android
+  submodules: false
+  sudo: ''
+  target: null
+  timeout: null
+  versionCode: '1301'
+  versionName: 0.1.3-MIPS
+- androidupdate: []
+  antcommands: []
+  antifeatures: []
+  build: cd ../ && ANDROID_ABI=x86 ./compile.sh release
+  buildjni: []
+  buildozer: false
+  commit: 0.1.3
+  disable: ''
+  encoding: null
+  extlibs: []
+  forcevercode: true
+  forceversion: true
+  gradle: []
+  gradleprops: []
+  init: ''
+  maven: false
+  ndk: null
+  novcheck: false
+  oldsdkloc: false
+  output: null
+  patch:
+  - ndkr9.patch
+  preassemble: []
+  prebuild: sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC$$ ../vlc
+  rm: []
+  scandelete: []
+  scanignore: []
+  srclibs:
+  - VLC@7c52aacbe
+  subdir: vlc-android
+  submodules: false
+  sudo: ''
+  target: null
+  timeout: null
+  versionCode: '1302'
+  versionName: 0.1.3-x86
+- androidupdate: []
+  antcommands: []
+  antifeatures: []
+  build: cd ../ && ANDROID_ABI=armeabi ./compile.sh release
+  buildjni: []
+  buildozer: false
+  commit: 0.1.3
+  disable: ''
+  encoding: null
+  extlibs: []
+  forcevercode: true
+  forceversion: true
+  gradle: []
+  gradleprops: []
+  init: ''
+  maven: false
+  ndk: null
+  novcheck: false
+  oldsdkloc: false
+  output: null
+  patch:
+  - ndkr9.patch
+  preassemble: []
+  prebuild: sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC$$ ../vlc
+  rm: []
+  scandelete: []
+  scanignore: []
+  srclibs:
+  - VLC@7c52aacbe
+  subdir: vlc-android
+  submodules: false
+  sudo: ''
+  target: null
+  timeout: null
+  versionCode: '1303'
+  versionName: 0.1.3-ARM
+- androidupdate: []
+  antcommands: []
+  antifeatures: []
+  build: cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release
+  buildjni: []
+  buildozer: false
+  commit: 0.1.3
+  disable: ''
+  encoding: null
+  extlibs: []
+  forcevercode: true
+  forceversion: true
+  gradle: []
+  gradleprops: []
+  init: ''
+  maven: false
+  ndk: null
+  novcheck: false
+  oldsdkloc: false
+  output: null
+  patch:
+  - ndkr9.patch
+  preassemble: []
+  prebuild: sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC$$ ../vlc
+  rm: []
+  scandelete: []
+  scanignore: []
+  srclibs:
+  - VLC@7c52aacbe
+  subdir: vlc-android
+  submodules: false
+  sudo: ''
+  target: null
+  timeout: null
+  versionCode: '1304'
+  versionName: 0.1.3-ARMv7
+- androidupdate: []
+  antcommands: []
+  antifeatures: []
+  build: cd ../ && ANDROID_ABI=x86 ./compile.sh release
+  buildjni: []
+  buildozer: false
+  commit: 0.9.0
+  disable: ''
+  encoding: null
+  extlibs: []
+  forcevercode: true
+  forceversion: false
+  gradle: []
+  gradleprops: []
+  init: ''
+  maven: false
+  ndk: null
+  novcheck: false
+  oldsdkloc: false
+  output: null
+  patch: []
+  preassemble: []
+  prebuild: sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC$$ ../vlc
+  rm: []
+  scandelete: []
+  scanignore: []
+  srclibs:
+  - VLC@31ffb20309264994
+  subdir: vlc-android
+  submodules: false
+  sudo: ''
+  target: null
+  timeout: null
+  versionCode: '9002'
+  versionName: 0.9.0
+- androidupdate: []
+  antcommands: []
+  antifeatures: []
+  build: cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release
+  buildjni: []
+  buildozer: false
+  commit: 0.9.0
+  disable: ''
+  encoding: null
+  extlibs: []
+  forcevercode: true
+  forceversion: false
+  gradle: []
+  gradleprops: []
+  init: ''
+  maven: false
+  ndk: null
+  novcheck: false
+  oldsdkloc: false
+  output: null
+  patch: []
+  preassemble: []
+  prebuild: sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC$$ ../vlc
+  rm: []
+  scandelete: []
+  scanignore: []
+  srclibs:
+  - VLC@31ffb20309264994
+  subdir: vlc-android
+  submodules: false
+  sudo: ''
+  target: null
+  timeout: null
+  versionCode: '9004'
+  versionName: 0.9.0
+- androidupdate: []
+  antcommands: []
+  antifeatures: []
+  build: cd ../ && ANDROID_ABI=x86 ./compile.sh release
+  buildjni: []
+  buildozer: false
+  commit: 0.9.1
+  disable: ''
+  encoding: null
+  extlibs: []
+  forcevercode: true
+  forceversion: false
+  gradle: []
+  gradleprops: []
+  init: ''
+  maven: false
+  ndk: null
+  novcheck: false
+  oldsdkloc: false
+  output: null
+  patch: []
+  preassemble: []
+  prebuild: sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC$$ ../vlc
+  rm: []
+  scandelete: []
+  scanignore: []
+  srclibs:
+  - VLC@37e886d113b8b567c15208579fb2f
+  subdir: vlc-android
+  submodules: false
+  sudo: ''
+  target: null
+  timeout: null
+  versionCode: '9102'
+  versionName: 0.9.1
+- androidupdate: []
+  antcommands: []
+  antifeatures: []
+  build: cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release
+  buildjni: []
+  buildozer: false
+  commit: 0.9.1
+  disable: ''
+  encoding: null
+  extlibs: []
+  forcevercode: true
+  forceversion: false
+  gradle: []
+  gradleprops: []
+  init: ''
+  maven: false
+  ndk: null
+  novcheck: false
+  oldsdkloc: false
+  output: null
+  patch: []
+  preassemble: []
+  prebuild: sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC$$ ../vlc
+  rm: []
+  scandelete: []
+  scanignore: []
+  srclibs:
+  - VLC@37e886d113b8b567c15208579fb2f
+  subdir: vlc-android
+  submodules: false
+  sudo: ''
+  target: null
+  timeout: null
+  versionCode: '9104'
+  versionName: 0.9.1
+- androidupdate: []
+  antcommands: []
+  antifeatures: []
+  build: cd ../ && ANDROID_ABI=x86 ./compile.sh release
+  buildjni: []
+  buildozer: false
+  commit: 0.9.5
+  disable: can't download gmp
+  encoding: null
+  extlibs: []
+  forcevercode: true
+  forceversion: false
+  gradle: []
+  gradleprops: []
+  init: ''
+  maven: false
+  ndk: null
+  novcheck: false
+  oldsdkloc: false
+  output: null
+  patch: []
+  preassemble: []
+  prebuild: sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC$$ ../vlc
+  rm: []
+  scandelete: []
+  scanignore: []
+  srclibs:
+  - VLC@052600173f376ff58ff04d53746961a2
+  subdir: vlc-android
+  submodules: false
+  sudo: ''
+  target: null
+  timeout: null
+  versionCode: '9502'
+  versionName: 0.9.5
+- androidupdate: []
+  antcommands: []
+  antifeatures: []
+  build: cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release
+  buildjni: []
+  buildozer: false
+  commit: 0.9.5
+  disable: can't download gmp
+  encoding: null
+  extlibs: []
+  forcevercode: true
+  forceversion: false
+  gradle: []
+  gradleprops: []
+  init: ''
+  maven: false
+  ndk: null
+  novcheck: false
+  oldsdkloc: false
+  output: null
+  patch: []
+  preassemble: []
+  prebuild: sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC$$ ../vlc
+  rm: []
+  scandelete: []
+  scanignore: []
+  srclibs:
+  - VLC@052600173f376ff58ff04d53746961a2
+  subdir: vlc-android
+  submodules: false
+  sudo: ''
+  target: null
+  timeout: null
+  versionCode: '9504'
+  versionName: 0.9.5
+- androidupdate: []
+  antcommands: []
+  antifeatures: []
+  build: cd ../ && ANDROID_ABI=x86 ./compile.sh release
+  buildjni: []
+  buildozer: false
+  commit: 0.9.6
+  disable: ''
+  encoding: null
+  extlibs: []
+  forcevercode: true
+  forceversion: false
+  gradle: []
+  gradleprops: []
+  init: ''
+  maven: false
+  ndk: null
+  novcheck: false
+  oldsdkloc: false
+  output: null
+  patch: []
+  preassemble: []
+  prebuild: sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC-2.2$$ ../vlc
+  rm: []
+  scandelete: []
+  scanignore: []
+  srclibs:
+  - VLC-2.2@27f4799
+  subdir: vlc-android
+  submodules: false
+  sudo: ''
+  target: null
+  timeout: null
+  versionCode: '9602'
+  versionName: 0.9.6
+- androidupdate: []
+  antcommands: []
+  antifeatures: []
+  build: cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release
+  buildjni: []
+  buildozer: false
+  commit: 0.9.6
+  disable: ''
+  encoding: null
+  extlibs: []
+  forcevercode: true
+  forceversion: false
+  gradle: []
+  gradleprops: []
+  init: ''
+  maven: false
+  ndk: null
+  novcheck: false
+  oldsdkloc: false
+  output: null
+  patch: []
+  preassemble: []
+  prebuild: sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC-2.2$$ ../vlc
+  rm: []
+  scandelete: []
+  scanignore: []
+  srclibs:
+  - VLC-2.2@27f4799
+  subdir: vlc-android
+  submodules: false
+  sudo: ''
+  target: null
+  timeout: null
+  versionCode: '9604'
+  versionName: 0.9.6
+- androidupdate: []
+  antcommands: []
+  antifeatures: []
+  build: cd ../ && ANDROID_ABI=x86 ./compile.sh release
+  buildjni: []
+  buildozer: false
+  commit: 0.9.7
+  disable: ''
+  encoding: null
+  extlibs: []
+  forcevercode: true
+  forceversion: false
+  gradle: []
+  gradleprops: []
+  init: ''
+  maven: false
+  ndk: null
+  novcheck: false
+  oldsdkloc: false
+  output: null
+  patch: []
+  preassemble: []
+  prebuild: sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC-2.2$$ ../vlc
+  rm: []
+  scandelete: []
+  scanignore: []
+  srclibs:
+  - VLC-2.2@9e1c6ff
+  subdir: vlc-android
+  submodules: false
+  sudo: ''
+  target: null
+  timeout: null
+  versionCode: '9702'
+  versionName: 0.9.7
+- androidupdate: []
+  antcommands: []
+  antifeatures: []
+  build: cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release
+  buildjni: []
+  buildozer: false
+  commit: 0.9.7
+  disable: ''
+  encoding: null
+  extlibs: []
+  forcevercode: true
+  forceversion: false
+  gradle: []
+  gradleprops: []
+  init: ''
+  maven: false
+  ndk: null
+  novcheck: false
+  oldsdkloc: false
+  output: null
+  patch: []
+  preassemble: []
+  prebuild: sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC-2.2$$ ../vlc
+  rm: []
+  scandelete: []
+  scanignore: []
+  srclibs:
+  - VLC-2.2@9e1c6ff
+  subdir: vlc-android
+  submodules: false
+  sudo: ''
+  target: null
+  timeout: null
+  versionCode: '9704'
+  versionName: 0.9.7
+- androidupdate: []
+  antcommands: []
+  antifeatures: []
+  build: cd ../ && ANDROID_ABI=mips ./compile.sh release
+  buildjni: []
+  buildozer: false
+  commit: 0.9.7.1
+  disable: build fails
+  encoding: null
+  extlibs: []
+  forcevercode: true
+  forceversion: false
+  gradle: []
+  gradleprops: []
+  init: ''
+  maven: false
+  ndk: null
+  novcheck: false
+  oldsdkloc: false
+  output: null
+  patch: []
+  preassemble: []
+  prebuild: sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC-2.2$$ ../vlc
+  rm: []
+  scandelete: []
+  scanignore: []
+  srclibs:
+  - VLC-2.2@57cd36b
+  subdir: vlc-android
+  submodules: false
+  sudo: ''
+  target: null
+  timeout: null
+  versionCode: '9711'
+  versionName: 0.9.7.1
+- androidupdate: []
+  antcommands: []
+  antifeatures: []
+  build: cd ../ && ANDROID_ABI=x86 ./compile.sh release
+  buildjni: []
+  buildozer: false
+  commit: 0.9.7.1
+  disable: ''
+  encoding: null
+  extlibs: []
+  forcevercode: true
+  forceversion: false
+  gradle: []
+  gradleprops: []
+  init: ''
+  maven: false
+  ndk: null
+  novcheck: false
+  oldsdkloc: false
+  output: null
+  patch: []
+  preassemble: []
+  prebuild: sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC-2.2$$ ../vlc
+  rm: []
+  scandelete: []
+  scanignore: []
+  srclibs:
+  - VLC-2.2@57cd36b
+  subdir: vlc-android
+  submodules: false
+  sudo: ''
+  target: null
+  timeout: null
+  versionCode: '9712'
+  versionName: 0.9.7.1
+- androidupdate: []
+  antcommands: []
+  antifeatures: []
+  build: cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release
+  buildjni: []
+  buildozer: false
+  commit: 0.9.7.1
+  disable: ''
+  encoding: null
+  extlibs: []
+  forcevercode: true
+  forceversion: false
+  gradle: []
+  gradleprops: []
+  init: ''
+  maven: false
+  ndk: null
+  novcheck: false
+  oldsdkloc: false
+  output: null
+  patch: []
+  preassemble: []
+  prebuild: sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC-2.2$$ ../vlc
+  rm: []
+  scandelete: []
+  scanignore: []
+  srclibs:
+  - VLC-2.2@57cd36b
+  subdir: vlc-android
+  submodules: false
+  sudo: ''
+  target: null
+  timeout: null
+  versionCode: '9714'
+  versionName: 0.9.7.1
+- androidupdate: []
+  antcommands: []
+  antifeatures: []
+  build: cd ../ && ANDROID_ABI=x86 ./compile.sh release
+  buildjni: []
+  buildozer: false
+  commit: 0.9.8
+  disable: ''
+  encoding: null
+  extlibs: []
+  forcevercode: true
+  forceversion: false
+  gradle: []
+  gradleprops: []
+  init: ''
+  maven: false
+  ndk: null
+  novcheck: false
+  oldsdkloc: false
+  output: null
+  patch: []
+  preassemble: []
+  prebuild: sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC-2.2$$ ../vlc
+  rm: []
+  scandelete: []
+  scanignore: []
+  srclibs:
+  - VLC-2.2@f2db364
+  subdir: vlc-android
+  submodules: false
+  sudo: ''
+  target: null
+  timeout: null
+  versionCode: '9802'
+  versionName: 0.9.8
+- androidupdate: []
+  antcommands: []
+  antifeatures: []
+  build: cd ../ && ANDROID_ABI=armeabi ./compile.sh release
+  buildjni: []
+  buildozer: false
+  commit: 0.9.8
+  disable: ''
+  encoding: null
+  extlibs: []
+  forcevercode: true
+  forceversion: false
+  gradle: []
+  gradleprops: []
+  init: ''
+  maven: false
+  ndk: null
+  novcheck: false
+  oldsdkloc: false
+  output: null
+  patch: []
+  preassemble: []
+  prebuild: sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC-2.2$$ ../vlc
+  rm: []
+  scandelete: []
+  scanignore: []
+  srclibs:
+  - VLC-2.2@f2db364
+  subdir: vlc-android
+  submodules: false
+  sudo: ''
+  target: null
+  timeout: null
+  versionCode: '9803'
+  versionName: 0.9.8
+- androidupdate: []
+  antcommands: []
+  antifeatures: []
+  build: cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release
+  buildjni: []
+  buildozer: false
+  commit: 0.9.8
+  disable: ''
+  encoding: null
+  extlibs: []
+  forcevercode: true
+  forceversion: false
+  gradle: []
+  gradleprops: []
+  init: ''
+  maven: false
+  ndk: null
+  novcheck: false
+  oldsdkloc: false
+  output: null
+  patch: []
+  preassemble: []
+  prebuild: sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC-2.2$$ ../vlc
+  rm: []
+  scandelete: []
+  scanignore: []
+  srclibs:
+  - VLC-2.2@f2db364
+  subdir: vlc-android
+  submodules: false
+  sudo: ''
+  target: null
+  timeout: null
+  versionCode: '9804'
+  versionName: 0.9.8
+- androidupdate: []
+  antcommands: []
+  antifeatures: []
+  build: cd ../ && ANDROID_ABI=x86 ./compile.sh release
+  buildjni: []
+  buildozer: false
+  commit: 0.9.9
+  disable: ''
+  encoding: null
+  extlibs: []
+  forcevercode: true
+  forceversion: false
+  gradle: []
+  gradleprops: []
+  init: ''
+  maven: false
+  ndk: null
+  novcheck: false
+  oldsdkloc: false
+  output: null
+  patch: []
+  preassemble: []
+  prebuild: sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC-2.2$$ ../vlc
+  rm: []
+  scandelete: []
+  scanignore: []
+  srclibs:
+  - VLC-2.2@e731dc23a4f8ef6782c7cc2236bbbf41c034dad1
+  subdir: vlc-android
+  submodules: false
+  sudo: ''
+  target: null
+  timeout: null
+  versionCode: '9902'
+  versionName: 0.9.9
+- androidupdate: []
+  antcommands: []
+  antifeatures: []
+  build: cd ../ && ANDROID_ABI=armeabi ./compile.sh release
+  buildjni: []
+  buildozer: false
+  commit: 0.9.9
+  disable: ''
+  encoding: null
+  extlibs: []
+  forcevercode: true
+  forceversion: false
+  gradle: []
+  gradleprops: []
+  init: ''
+  maven: false
+  ndk: null
+  novcheck: false
+  oldsdkloc: false
+  output: null
+  patch: []
+  preassemble: []
+  prebuild: sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC-2.2$$ ../vlc
+  rm: []
+  scandelete: []
+  scanignore: []
+  srclibs:
+  - VLC-2.2@e731dc23a4f8ef6782c7cc2236bbbf41c034dad1
+  subdir: vlc-android
+  submodules: false
+  sudo: ''
+  target: null
+  timeout: null
+  versionCode: '9903'
+  versionName: 0.9.9
+- androidupdate: []
+  antcommands: []
+  antifeatures: []
+  build: cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release
+  buildjni: []
+  buildozer: false
+  commit: 0.9.9
+  disable: ''
+  encoding: null
+  extlibs: []
+  forcevercode: true
+  forceversion: false
+  gradle: []
+  gradleprops: []
+  init: ''
+  maven: false
+  ndk: null
+  novcheck: false
+  oldsdkloc: false
+  output: null
+  patch: []
+  preassemble: []
+  prebuild: sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC-2.2$$ ../vlc
+  rm: []
+  scandelete: []
+  scanignore: []
+  srclibs:
+  - VLC-2.2@e731dc23a4f8ef6782c7cc2236bbbf41c034dad1
+  subdir: vlc-android
+  submodules: false
+  sudo: ''
+  target: null
+  timeout: null
+  versionCode: '9904'
+  versionName: 0.9.9
+- androidupdate: []
+  antcommands: []
+  antifeatures: []
+  build: cd ../ && ANDROID_ABI=x86 ./compile.sh release
+  buildjni: []
+  buildozer: false
+  commit: 0.9.10
+  disable: ''
+  encoding: null
+  extlibs: []
+  forcevercode: true
+  forceversion: false
+  gradle: []
+  gradleprops: []
+  init: ''
+  maven: false
+  ndk: null
+  novcheck: false
+  oldsdkloc: false
+  output: null
+  patch: []
+  preassemble: []
+  prebuild: sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC-2.2$$ ../vlc
+  rm: []
+  scandelete: []
+  scanignore: []
+  srclibs:
+  - VLC-2.2@e33e5de
+  subdir: vlc-android
+  submodules: false
+  sudo: ''
+  target: null
+  timeout: null
+  versionCode: '10002'
+  versionName: 0.9.10
+- androidupdate: []
+  antcommands: []
+  antifeatures: []
+  build: cd ../ && ANDROID_ABI=armeabi ./compile.sh release
+  buildjni: []
+  buildozer: false
+  commit: 0.9.10
+  disable: ''
+  encoding: null
+  extlibs: []
+  forcevercode: true
+  forceversion: false
+  gradle: []
+  gradleprops: []
+  init: ''
+  maven: false
+  ndk: null
+  novcheck: false
+  oldsdkloc: false
+  output: null
+  patch: []
+  preassemble: []
+  prebuild: sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC-2.2$$ ../vlc
+  rm: []
+  scandelete: []
+  scanignore: []
+  srclibs:
+  - VLC-2.2@e33e5de
+  subdir: vlc-android
+  submodules: false
+  sudo: ''
+  target: null
+  timeout: null
+  versionCode: '10003'
+  versionName: 0.9.10
+- androidupdate: []
+  antcommands: []
+  antifeatures: []
+  build: cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release
+  buildjni: []
+  buildozer: false
+  commit: 0.9.10
+  disable: ''
+  encoding: null
+  extlibs: []
+  forcevercode: true
+  forceversion: false
+  gradle: []
+  gradleprops: []
+  init: ''
+  maven: false
+  ndk: null
+  novcheck: false
+  oldsdkloc: false
+  output: null
+  patch: []
+  preassemble: []
+  prebuild: sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC-2.2$$ ../vlc
+  rm: []
+  scandelete: []
+  scanignore: []
+  srclibs:
+  - VLC-2.2@e33e5de
+  subdir: vlc-android
+  submodules: false
+  sudo: ''
+  target: null
+  timeout: null
+  versionCode: '10004'
+  versionName: 0.9.10
+- androidupdate: []
+  antcommands: []
+  antifeatures: []
+  build: cd ../ && ANDROID_ABI=x86 ./compile.sh release
+  buildjni: []
+  buildozer: false
+  commit: 1.0.0
+  disable: doesn't build
+  encoding: null
+  extlibs: []
+  forcevercode: true
+  forceversion: false
+  gradle: []
+  gradleprops: []
+  init: ''
+  maven: false
+  ndk: null
+  novcheck: false
+  oldsdkloc: false
+  output: null
+  patch: []
+  preassemble: []
+  prebuild: sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC-2.2$$ ../vlc
+  rm: []
+  scandelete: []
+  scanignore: []
+  srclibs:
+  - VLC-2.2@036010e
+  subdir: vlc-android
+  submodules: false
+  sudo: ''
+  target: null
+  timeout: null
+  versionCode: '10006'
+  versionName: 1.0.0
+- androidupdate: []
+  antcommands: []
+  antifeatures: []
+  build: cd ../ && ANDROID_ABI=armeabi ./compile.sh release
+  buildjni: []
+  buildozer: false
+  commit: 1.0.0
+  disable: doesn't build
+  encoding: null
+  extlibs: []
+  forcevercode: true
+  forceversion: false
+  gradle: []
+  gradleprops: []
+  init: ''
+  maven: false
+  ndk: null
+  novcheck: false
+  oldsdkloc: false
+  output: null
+  patch: []
+  preassemble: []
+  prebuild: sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC-2.2$$ ../vlc
+  rm: []
+  scandelete: []
+  scanignore: []
+  srclibs:
+  - VLC-2.2@036010e
+  subdir: vlc-android
+  submodules: false
+  sudo: ''
+  target: null
+  timeout: null
+  versionCode: '10007'
+  versionName: 1.0.0
+- androidupdate: []
+  antcommands: []
+  antifeatures: []
+  build: cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release
+  buildjni: []
+  buildozer: false
+  commit: 1.0.0
+  disable: doesn't build
+  encoding: null
+  extlibs: []
+  forcevercode: true
+  forceversion: false
+  gradle: []
+  gradleprops: []
+  init: ''
+  maven: false
+  ndk: null
+  novcheck: false
+  oldsdkloc: false
+  output: null
+  patch: []
+  preassemble: []
+  prebuild: sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC-2.2$$ ../vlc
+  rm: []
+  scandelete: []
+  scanignore: []
+  srclibs:
+  - VLC-2.2@036010e
+  subdir: vlc-android
+  submodules: false
+  sudo: ''
+  target: null
+  timeout: null
+  versionCode: '10008'
+  versionName: 1.0.0
+- androidupdate: []
+  antcommands: []
+  antifeatures: []
+  build: cd ../ && ANDROID_ABI=x86 ./compile.sh release
+  buildjni: []
+  buildozer: false
+  commit: 1.0.1
+  disable: ''
+  encoding: null
+  extlibs: []
+  forcevercode: true
+  forceversion: false
+  gradle: []
+  gradleprops: []
+  init: ''
+  maven: false
+  ndk: null
+  novcheck: false
+  oldsdkloc: false
+  output: null
+  patch: []
+  preassemble: []
+  prebuild: sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC-2.2$$ ../vlc
+  rm: []
+  scandelete: []
+  scanignore: []
+  srclibs:
+  - VLC-2.2@59409d5
+  subdir: vlc-android
+  submodules: false
+  sudo: ''
+  target: null
+  timeout: null
+  versionCode: '10102'
+  versionName: 1.0.1
+- androidupdate: []
+  antcommands: []
+  antifeatures: []
+  build: cd ../ && ANDROID_ABI=armeabi ./compile.sh release
+  buildjni: []
+  buildozer: false
+  commit: 1.0.1
+  disable: ''
+  encoding: null
+  extlibs: []
+  forcevercode: true
+  forceversion: false
+  gradle: []
+  gradleprops: []
+  init: ''
+  maven: false
+  ndk: null
+  novcheck: false
+  oldsdkloc: false
+  output: null
+  patch: []
+  preassemble: []
+  prebuild: sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC-2.2$$ ../vlc
+  rm: []
+  scandelete: []
+  scanignore: []
+  srclibs:
+  - VLC-2.2@59409d5
+  subdir: vlc-android
+  submodules: false
+  sudo: ''
+  target: null
+  timeout: null
+  versionCode: '10103'
+  versionName: 1.0.1
+- androidupdate: []
+  antcommands: []
+  antifeatures: []
+  build: cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release
+  buildjni: []
+  buildozer: false
+  commit: 1.0.1
+  disable: ''
+  encoding: null
+  extlibs: []
+  forcevercode: true
+  forceversion: false
+  gradle: []
+  gradleprops: []
+  init: ''
+  maven: false
+  ndk: null
+  novcheck: false
+  oldsdkloc: false
+  output: null
+  patch: []
+  preassemble: []
+  prebuild: sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC-2.2$$ ../vlc
+  rm: []
+  scandelete: []
+  scanignore: []
+  srclibs:
+  - VLC-2.2@59409d5
+  subdir: vlc-android
+  submodules: false
+  sudo: ''
+  target: null
+  timeout: null
+  versionCode: '10104'
+  versionName: 1.0.1
+- androidupdate: []
+  antcommands: []
+  antifeatures: []
+  build: cd ../ && ./compile.sh -a "armeabi" --release
+  buildjni: []
+  buildozer: false
+  commit: 1.1.3
+  disable: ''
+  encoding: null
+  extlibs: []
+  forcevercode: false
+  forceversion: false
+  gradle:
+  - VanillaARMv6fpu
+  gradleprops: []
+  init: ''
+  maven: false
+  ndk: r10d
+  novcheck: false
+  oldsdkloc: false
+  output: null
+  patch: []
+  preassemble: []
+  prebuild: sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh
+    && ln -s vlc-android/$$VLC$$ ../vlc
+  rm: []
+  scandelete: []
+  scanignore: []
+  srclibs:
+  - VLC@a9b19e4
+  subdir: vlc-android
+  submodules: false
+  sudo: ''
+  target: null
+  timeout: null
+  versionCode: '1010303'
+  versionName: 1.1.3
+- androidupdate: []
+  antcommands: []
+  antifeatures: []
+  build: cd ../ && ./compile.sh -a "armeabi-v7a" --release
+  buildjni: []
+  buildozer: false
+  commit: 1.1.3
+  disable: ''
+  encoding: null
+  extlibs: []
+  forcevercode: false
+  forceversion: false
+  gradle:
+  - VanillaARMv7
+  gradleprops: []
+  init: ''
+  maven: false
+  ndk: r10d
+  novcheck: false
+  oldsdkloc: false
+  output: null
+  patch: []
+  preassemble: []
+  prebuild: sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh
+    && ln -s vlc-android/$$VLC$$ ../vlc
+  rm: []
+  scandelete: []
+  scanignore: []
+  srclibs:
+  - VLC@a9b19e4
+  subdir: vlc-android
+  submodules: false
+  sudo: ''
+  target: null
+  timeout: null
+  versionCode: '1010304'
+  versionName: 1.1.3
+- androidupdate: []
+  antcommands: []
+  antifeatures: []
+  build: cd ../ && ./compile.sh -a "x86" --release
+  buildjni: []
+  buildozer: false
+  commit: 1.1.3
+  disable: ''
+  encoding: null
+  extlibs: []
+  forcevercode: false
+  forceversion: false
+  gradle:
+  - VanillaX86
+  gradleprops: []
+  init: ''
+  maven: false
+  ndk: r10d
+  novcheck: false
+  oldsdkloc: false
+  output: null
+  patch: []
+  preassemble: []
+  prebuild: sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh
+    && ln -s vlc-android/$$VLC$$ ../vlc
+  rm: []
+  scandelete: []
+  scanignore: []
+  srclibs:
+  - VLC@a9b19e4
+  subdir: vlc-android
+  submodules: false
+  sudo: ''
+  target: null
+  timeout: null
+  versionCode: '1010305'
+  versionName: 1.1.3
+- androidupdate: []
+  antcommands: []
+  antifeatures: []
+  build: cd ../ && ./compile.sh -a "armeabi" --release
+  buildjni: []
+  buildozer: false
+  commit: 1.1.5
+  disable: ''
+  encoding: null
+  extlibs: []
+  forcevercode: false
+  forceversion: false
+  gradle:
+  - VanillaARMv6fpu
+  gradleprops: []
+  init: ''
+  maven: false
+  ndk: r10d
+  novcheck: false
+  oldsdkloc: false
+  output: null
+  patch: []
+  preassemble: []
+  prebuild: sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh
+    && ln -s vlc-android/$$VLC$$ ../vlc
+  rm: []
+  scandelete: []
+  scanignore: []
+  srclibs:
+  - VLC@e6b4585
+  subdir: vlc-android
+  submodules: false
+  sudo: ''
+  target: null
+  timeout: null
+  versionCode: '1010503'
+  versionName: 1.1.5
+- androidupdate: []
+  antcommands: []
+  antifeatures: []
+  build: cd ../ && ./compile.sh -a "armeabi-v7a" --release
+  buildjni: []
+  buildozer: false
+  commit: 1.1.5
+  disable: ''
+  encoding: null
+  extlibs: []
+  forcevercode: false
+  forceversion: false
+  gradle:
+  - VanillaARMv7
+  gradleprops: []
+  init: ''
+  maven: false
+  ndk: r10d
+  novcheck: false
+  oldsdkloc: false
+  output: null
+  patch: []
+  preassemble: []
+  prebuild: sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh
+    && ln -s vlc-android/$$VLC$$ ../vlc
+  rm: []
+  scandelete: []
+  scanignore: []
+  srclibs:
+  - VLC@e6b4585
+  subdir: vlc-android
+  submodules: false
+  sudo: ''
+  target: null
+  timeout: null
+  versionCode: '1010504'
+  versionName: 1.1.5
+- androidupdate: []
+  antcommands: []
+  antifeatures: []
+  build: cd ../ && ./compile.sh -a "x86" --release
+  buildjni: []
+  buildozer: false
+  commit: 1.1.5
+  disable: ''
+  encoding: null
+  extlibs: []
+  forcevercode: false
+  forceversion: false
+  gradle:
+  - VanillaX86
+  gradleprops: []
+  init: ''
+  maven: false
+  ndk: r10d
+  novcheck: false
+  oldsdkloc: false
+  output: null
+  patch: []
+  preassemble: []
+  prebuild: sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh
+    && ln -s vlc-android/$$VLC$$ ../vlc
+  rm: []
+  scandelete: []
+  scanignore: []
+  srclibs:
+  - VLC@e6b4585
+  subdir: vlc-android
+  submodules: false
+  sudo: ''
+  target: null
+  timeout: null
+  versionCode: '1010505'
+  versionName: 1.1.5
+- androidupdate: []
+  antcommands: []
+  antifeatures: []
+  build: cd ../ && ./compile.sh -a "armeabi" --release
+  buildjni: []
+  buildozer: false
+  commit: 1.1.6
+  disable: ''
+  encoding: null
+  extlibs: []
+  forcevercode: false
+  forceversion: false
+  gradle:
+  - VanillaARMv6fpu
+  gradleprops: []
+  init: ''
+  maven: false
+  ndk: r10d
+  novcheck: false
+  oldsdkloc: false
+  output: null
+  patch: []
+  preassemble: []
+  prebuild: sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh
+    && ln -s vlc-android/$$VLC$$ ../vlc
+  rm: []
+  scandelete: []
+  scanignore: []
+  srclibs:
+  - VLC@551b670
+  subdir: vlc-android
+  submodules: false
+  sudo: ''
+  target: null
+  timeout: null
+  versionCode: '1010603'
+  versionName: 1.1.6
+- androidupdate: []
+  antcommands: []
+  antifeatures: []
+  build: cd ../ && ./compile.sh -a "armeabi-v7a" --release
+  buildjni: []
+  buildozer: false
+  commit: 1.1.6
+  disable: ''
+  encoding: null
+  extlibs: []
+  forcevercode: false
+  forceversion: false
+  gradle:
+  - VanillaARMv7
+  gradleprops: []
+  init: ''
+  maven: false
+  ndk: r10d
+  novcheck: false
+  oldsdkloc: false
+  output: null
+  patch: []
+  preassemble: []
+  prebuild: sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh
+    && ln -s vlc-android/$$VLC$$ ../vlc
+  rm: []
+  scandelete: []
+  scanignore: []
+  srclibs:
+  - VLC@551b670
+  subdir: vlc-android
+  submodules: false
+  sudo: ''
+  target: null
+  timeout: null
+  versionCode: '1010604'
+  versionName: 1.1.6
+- androidupdate: []
+  antcommands: []
+  antifeatures: []
+  build: cd ../ && ./compile.sh -a "x86" --release
+  buildjni: []
+  buildozer: false
+  commit: 1.1.6
+  disable: ''
+  encoding: null
+  extlibs: []
+  forcevercode: false
+  forceversion: false
+  gradle:
+  - VanillaX86
+  gradleprops: []
+  init: ''
+  maven: false
+  ndk: r10d
+  novcheck: false
+  oldsdkloc: false
+  output: null
+  patch: []
+  preassemble: []
+  prebuild: sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh
+    && ln -s vlc-android/$$VLC$$ ../vlc
+  rm: []
+  scandelete: []
+  scanignore: []
+  srclibs:
+  - VLC@551b670
+  subdir: vlc-android
+  submodules: false
+  sudo: ''
+  target: null
+  timeout: null
+  versionCode: '1010605'
+  versionName: 1.1.6
+- androidupdate: []
+  antcommands: []
+  antifeatures: []
+  build: cd ../ && ./compile.sh -a "armeabi" --release
+  buildjni: []
+  buildozer: false
+  commit: 1.2.0
+  disable: ''
+  encoding: null
+  extlibs: []
+  forcevercode: false
+  forceversion: false
+  gradle:
+  - VanillaARMv6fpu
+  gradleprops: []
+  init: ''
+  maven: false
+  ndk: r10d
+  novcheck: false
+  oldsdkloc: false
+  output: null
+  patch: []
+  preassemble: []
+  prebuild: sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh
+    && ln -s vlc-android/$$VLC$$ ../vlc
+  rm: []
+  scandelete: []
+  scanignore: []
+  srclibs:
+  - VLC@23c8d86
+  subdir: vlc-android
+  submodules: false
+  sudo: ''
+  target: null
+  timeout: null
+  versionCode: '1020003'
+  versionName: 1.2.0
+- androidupdate: []
+  antcommands: []
+  antifeatures: []
+  build: cd ../ && ./compile.sh -a "armeabi-v7a" --release
+  buildjni: []
+  buildozer: false
+  commit: 1.2.0
+  disable: ''
+  encoding: null
+  extlibs: []
+  forcevercode: false
+  forceversion: false
+  gradle:
+  - VanillaARMv7
+  gradleprops: []
+  init: ''
+  maven: false
+  ndk: r10d
+  novcheck: false
+  oldsdkloc: false
+  output: null
+  patch: []
+  preassemble: []
+  prebuild: sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh
+    && ln -s vlc-android/$$VLC$$ ../vlc
+  rm: []
+  scandelete: []
+  scanignore: []
+  srclibs:
+  - VLC@23c8d86
+  subdir: vlc-android
+  submodules: false
+  sudo: ''
+  target: null
+  timeout: null
+  versionCode: '1020004'
+  versionName: 1.2.0
+- androidupdate: []
+  antcommands: []
+  antifeatures: []
+  build: cd ../ && ./compile.sh -a "x86" --release
+  buildjni: []
+  buildozer: false
+  commit: 1.2.0
+  disable: ''
+  encoding: null
+  extlibs: []
+  forcevercode: false
+  forceversion: false
+  gradle:
+  - VanillaX86
+  gradleprops: []
+  init: ''
+  maven: false
+  ndk: r10d
+  novcheck: false
+  oldsdkloc: false
+  output: null
+  patch: []
+  preassemble: []
+  prebuild: sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh
+    && ln -s vlc-android/$$VLC$$ ../vlc
+  rm: []
+  scandelete: []
+  scanignore: []
+  srclibs:
+  - VLC@23c8d86
+  subdir: vlc-android
+  submodules: false
+  sudo: ''
+  target: null
+  timeout: null
+  versionCode: '1020005'
+  versionName: 1.2.0
+- androidupdate: []
+  antcommands: []
+  antifeatures: []
+  build: cd ../ && ./compile.sh -a "armeabi" --release
+  buildjni: []
+  buildozer: false
+  commit: 1.2.1
+  disable: ''
+  encoding: null
+  extlibs: []
+  forcevercode: false
+  forceversion: false
+  gradle:
+  - VanillaARMv6fpu
+  gradleprops: []
+  init: ''
+  maven: false
+  ndk: r10d
+  novcheck: false
+  oldsdkloc: false
+  output: null
+  patch: []
+  preassemble: []
+  prebuild: sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh
+    && ln -s vlc-android/$$VLC$$ ../vlc
+  rm: []
+  scandelete: []
+  scanignore: []
+  srclibs:
+  - VLC@23c8d86
+  subdir: vlc-android
+  submodules: false
+  sudo: ''
+  target: null
+  timeout: null
+  versionCode: '1020103'
+  versionName: 1.2.1
+- androidupdate: []
+  antcommands: []
+  antifeatures: []
+  build: cd ../ && ./compile.sh -a "armeabi-v7a" --release
+  buildjni: []
+  buildozer: false
+  commit: 1.2.1
+  disable: ''
+  encoding: null
+  extlibs: []
+  forcevercode: false
+  forceversion: false
+  gradle:
+  - VanillaARMv7
+  gradleprops: []
+  init: ''
+  maven: false
+  ndk: r10d
+  novcheck: false
+  oldsdkloc: false
+  output: null
+  patch: []
+  preassemble: []
+  prebuild: sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh
+    && ln -s vlc-android/$$VLC$$ ../vlc
+  rm: []
+  scandelete: []
+  scanignore: []
+  srclibs:
+  - VLC@23c8d86
+  subdir: vlc-android
+  submodules: false
+  sudo: ''
+  target: null
+  timeout: null
+  versionCode: '1020104'
+  versionName: 1.2.1
+- androidupdate: []
+  antcommands: []
+  antifeatures: []
+  build: cd ../ && ./compile.sh -a "x86" --release
+  buildjni: []
+  buildozer: false
+  commit: 1.2.1
+  disable: ''
+  encoding: null
+  extlibs: []
+  forcevercode: false
+  forceversion: false
+  gradle:
+  - VanillaX86
+  gradleprops: []
+  init: ''
+  maven: false
+  ndk: r10d
+  novcheck: false
+  oldsdkloc: false
+  output: null
+  patch: []
+  preassemble: []
+  prebuild: sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh
+    && ln -s vlc-android/$$VLC$$ ../vlc
+  rm: []
+  scandelete: []
+  scanignore: []
+  srclibs:
+  - VLC@23c8d86
+  subdir: vlc-android
+  submodules: false
+  sudo: ''
+  target: null
+  timeout: null
+  versionCode: '1020105'
+  versionName: 1.2.1
+- androidupdate: []
+  antcommands: []
+  antifeatures: []
+  build: cd ../ && ./compile.sh -a "armeabi" --release
+  buildjni: []
+  buildozer: false
+  commit: 1.2.2
+  disable: ''
+  encoding: null
+  extlibs: []
+  forcevercode: false
+  forceversion: false
+  gradle:
+  - VanillaARMv6fpu
+  gradleprops: []
+  init: ''
+  maven: false
+  ndk: r10d
+  novcheck: false
+  oldsdkloc: false
+  output: null
+  patch: []
+  preassemble: []
+  prebuild: sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh
+    && ln -s vlc-android/$$VLC$$ ../vlc
+  rm: []
+  scandelete: []
+  scanignore: []
+  srclibs:
+  - VLC@7491a5f
+  subdir: vlc-android
+  submodules: false
+  sudo: ''
+  target: null
+  timeout: null
+  versionCode: '1020203'
+  versionName: 1.2.2
+- androidupdate: []
+  antcommands: []
+  antifeatures: []
+  build: cd ../ && ./compile.sh -a "armeabi-v7a" --release
+  buildjni: []
+  buildozer: false
+  commit: 1.2.2
+  disable: ''
+  encoding: null
+  extlibs: []
+  forcevercode: false
+  forceversion: false
+  gradle:
+  - VanillaARMv7
+  gradleprops: []
+  init: ''
+  maven: false
+  ndk: r10d
+  novcheck: false
+  oldsdkloc: false
+  output: null
+  patch: []
+  preassemble: []
+  prebuild: sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh
+    && ln -s vlc-android/$$VLC$$ ../vlc
+  rm: []
+  scandelete: []
+  scanignore: []
+  srclibs:
+  - VLC@7491a5f
+  subdir: vlc-android
+  submodules: false
+  sudo: ''
+  target: null
+  timeout: null
+  versionCode: '1020204'
+  versionName: 1.2.2
+- androidupdate: []
+  antcommands: []
+  antifeatures: []
+  build: cd ../ && ./compile.sh -a "x86" --release
+  buildjni: []
+  buildozer: false
+  commit: 1.2.2
+  disable: ''
+  encoding: null
+  extlibs: []
+  forcevercode: false
+  forceversion: false
+  gradle:
+  - VanillaX86
+  gradleprops: []
+  init: ''
+  maven: false
+  ndk: r10d
+  novcheck: false
+  oldsdkloc: false
+  output: null
+  patch: []
+  preassemble: []
+  prebuild: sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh
+    && ln -s vlc-android/$$VLC$$ ../vlc
+  rm: []
+  scandelete: []
+  scanignore: []
+  srclibs:
+  - VLC@7491a5f
+  subdir: vlc-android
+  submodules: false
+  sudo: ''
+  target: null
+  timeout: null
+  versionCode: '1020205'
+  versionName: 1.2.2
+- androidupdate: []
+  antcommands: []
+  antifeatures: []
+  build: cd ../ && ./compile.sh -a "armeabi" --release
+  buildjni: []
+  buildozer: false
+  commit: 1.2.3
+  disable: ''
+  encoding: null
+  extlibs: []
+  forcevercode: false
+  forceversion: false
+  gradle:
+  - VanillaARMv6fpu
+  gradleprops: []
+  init: ''
+  maven: false
+  ndk: r10d
+  novcheck: false
+  oldsdkloc: false
+  output: null
+  patch: []
+  preassemble: []
+  prebuild: sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh
+    && ln -s vlc-android/$$VLC$$ ../vlc
+  rm: []
+  scandelete: []
+  scanignore: []
+  srclibs:
+  - VLC@7491a5f
+  subdir: vlc-android
+  submodules: false
+  sudo: ''
+  target: null
+  timeout: null
+  versionCode: '1020303'
+  versionName: 1.2.3
+- androidupdate: []
+  antcommands: []
+  antifeatures: []
+  build: cd ../ && ./compile.sh -a "armeabi-v7a" --release
+  buildjni: []
+  buildozer: false
+  commit: 1.2.3
+  disable: ''
+  encoding: null
+  extlibs: []
+  forcevercode: false
+  forceversion: false
+  gradle:
+  - VanillaARMv7
+  gradleprops: []
+  init: ''
+  maven: false
+  ndk: r10d
+  novcheck: false
+  oldsdkloc: false
+  output: null
+  patch: []
+  preassemble: []
+  prebuild: sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh
+    && ln -s vlc-android/$$VLC$$ ../vlc
+  rm: []
+  scandelete: []
+  scanignore: []
+  srclibs:
+  - VLC@7491a5f
+  subdir: vlc-android
+  submodules: false
+  sudo: ''
+  target: null
+  timeout: null
+  versionCode: '1020304'
+  versionName: 1.2.3
+- androidupdate: []
+  antcommands: []
+  antifeatures: []
+  build: cd ../ && ./compile.sh -a "x86" --release
+  buildjni: []
+  buildozer: false
+  commit: 1.2.3
+  disable: ''
+  encoding: null
+  extlibs: []
+  forcevercode: false
+  forceversion: false
+  gradle:
+  - VanillaX86
+  gradleprops: []
+  init: ''
+  maven: false
+  ndk: r10d
+  novcheck: false
+  oldsdkloc: false
+  output: null
+  patch: []
+  preassemble: []
+  prebuild: sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh
+    && ln -s vlc-android/$$VLC$$ ../vlc
+  rm: []
+  scandelete: []
+  scanignore: []
+  srclibs:
+  - VLC@7491a5f
+  subdir: vlc-android
+  submodules: false
+  sudo: ''
+  target: null
+  timeout: null
+  versionCode: '1020305'
+  versionName: 1.2.3
+- androidupdate: []
+  antcommands: []
+  antifeatures: []
+  build: cd ../ && ./compile.sh -a "armeabi" --release
+  buildjni: []
+  buildozer: false
+  commit: 1.2.4
+  disable: ''
+  encoding: null
+  extlibs: []
+  forcevercode: false
+  forceversion: false
+  gradle:
+  - VanillaARMv6fpu
+  gradleprops: []
+  init: ''
+  maven: false
+  ndk: r10d
+  novcheck: false
+  oldsdkloc: false
+  output: null
+  patch: []
+  preassemble: []
+  prebuild: sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh
+    && ln -s vlc-android/$$VLC$$ ../vlc
+  rm: []
+  scandelete: []
+  scanignore: []
+  srclibs:
+  - VLC@7491a5f
+  subdir: vlc-android
+  submodules: false
+  sudo: ''
+  target: null
+  timeout: null
+  versionCode: '1020403'
+  versionName: 1.2.4
+- androidupdate: []
+  antcommands: []
+  antifeatures: []
+  build: cd ../ && ./compile.sh -a "armeabi-v7a" --release
+  buildjni: []
+  buildozer: false
+  commit: 1.2.4
+  disable: ''
+  encoding: null
+  extlibs: []
+  forcevercode: false
+  forceversion: false
+  gradle:
+  - VanillaARMv7
+  gradleprops: []
+  init: ''
+  maven: false
+  ndk: r10d
+  novcheck: false
+  oldsdkloc: false
+  output: null
+  patch: []
+  preassemble: []
+  prebuild: sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh
+    && ln -s vlc-android/$$VLC$$ ../vlc
+  rm: []
+  scandelete: []
+  scanignore: []
+  srclibs:
+  - VLC@7491a5f
+  subdir: vlc-android
+  submodules: false
+  sudo: ''
+  target: null
+  timeout: null
+  versionCode: '1020404'
+  versionName: 1.2.4
+- androidupdate: []
+  antcommands: []
+  antifeatures: []
+  build: cd ../ && ./compile.sh -a "x86" --release
+  buildjni: []
+  buildozer: false
+  commit: 1.2.4
+  disable: ''
+  encoding: null
+  extlibs: []
+  forcevercode: false
+  forceversion: false
+  gradle:
+  - VanillaX86
+  gradleprops: []
+  init: ''
+  maven: false
+  ndk: r10d
+  novcheck: false
+  oldsdkloc: false
+  output: null
+  patch: []
+  preassemble: []
+  prebuild: sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh
+    && ln -s vlc-android/$$VLC$$ ../vlc
+  rm: []
+  scandelete: []
+  scanignore: []
+  srclibs:
+  - VLC@7491a5f
+  subdir: vlc-android
+  submodules: false
+  sudo: ''
+  target: null
+  timeout: null
+  versionCode: '1020405'
+  versionName: 1.2.4
+- androidupdate: []
+  antcommands: []
+  antifeatures: []
+  build: cd ../ && ./compile.sh -a "armeabi" --release
+  buildjni: []
+  buildozer: false
+  commit: 1.2.5
+  disable: ''
+  encoding: null
+  extlibs: []
+  forcevercode: false
+  forceversion: false
+  gradle:
+  - VanillaARMv6fpu
+  gradleprops: []
+  init: ''
+  maven: false
+  ndk: r10d
+  novcheck: false
+  oldsdkloc: false
+  output: null
+  patch: []
+  preassemble: []
+  prebuild: sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh
+    && ln -s vlc-android/$$VLC$$ ../vlc
+  rm: []
+  scandelete: []
+  scanignore: []
+  srclibs:
+  - VLC@50accb8
+  subdir: vlc-android
+  submodules: false
+  sudo: ''
+  target: null
+  timeout: null
+  versionCode: '1020503'
+  versionName: 1.2.5
+- androidupdate: []
+  antcommands: []
+  antifeatures: []
+  build: cd ../ && ./compile.sh -a "armeabi-v7a" --release
+  buildjni: []
+  buildozer: false
+  commit: 1.2.5
+  disable: ''
+  encoding: null
+  extlibs: []
+  forcevercode: false
+  forceversion: false
+  gradle:
+  - VanillaARMv7
+  gradleprops: []
+  init: ''
+  maven: false
+  ndk: r10d
+  novcheck: false
+  oldsdkloc: false
+  output: null
+  patch: []
+  preassemble: []
+  prebuild: sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh
+    && ln -s vlc-android/$$VLC$$ ../vlc
+  rm: []
+  scandelete: []
+  scanignore: []
+  srclibs:
+  - VLC@50accb8
+  subdir: vlc-android
+  submodules: false
+  sudo: ''
+  target: null
+  timeout: null
+  versionCode: '1020504'
+  versionName: 1.2.5
+- androidupdate: []
+  antcommands: []
+  antifeatures: []
+  build: cd ../ && ./compile.sh -a "x86" --release
+  buildjni: []
+  buildozer: false
+  commit: 1.2.5
+  disable: ''
+  encoding: null
+  extlibs: []
+  forcevercode: false
+  forceversion: false
+  gradle:
+  - VanillaX86
+  gradleprops: []
+  init: ''
+  maven: false
+  ndk: r10d
+  novcheck: false
+  oldsdkloc: false
+  output: null
+  patch: []
+  preassemble: []
+  prebuild: sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh
+    && ln -s vlc-android/$$VLC$$ ../vlc
+  rm: []
+  scandelete: []
+  scanignore: []
+  srclibs:
+  - VLC@50accb8
+  subdir: vlc-android
+  submodules: false
+  sudo: ''
+  target: null
+  timeout: null
+  versionCode: '1020505'
+  versionName: 1.2.5
+- androidupdate: []
+  antcommands: []
+  antifeatures: []
+  build: cd ../ && ./compile.sh -a "armeabi" --release
+  buildjni: []
+  buildozer: false
+  commit: 1.2.6
+  disable: ''
+  encoding: null
+  extlibs: []
+  forcevercode: false
+  forceversion: false
+  gradle:
+  - VanillaARMv6fpu
+  gradleprops: []
+  init: ''
+  maven: false
+  ndk: r10d
+  novcheck: false
+  oldsdkloc: false
+  output: null
+  patch: []
+  preassemble: []
+  prebuild: sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh
+    && ln -s vlc-android/$$VLC$$ ../vlc
+  rm: []
+  scandelete: []
+  scanignore: []
+  srclibs:
+  - VLC@d59b81a
+  subdir: vlc-android
+  submodules: false
+  sudo: ''
+  target: null
+  timeout: null
+  versionCode: '1030003'
+  versionName: 1.2.6
+- androidupdate: []
+  antcommands: []
+  antifeatures: []
+  build: cd ../ && ./compile.sh -a "armeabi-v7a" --release
+  buildjni: []
+  buildozer: false
+  commit: 1.2.6
+  disable: ''
+  encoding: null
+  extlibs: []
+  forcevercode: false
+  forceversion: false
+  gradle:
+  - VanillaARMv7
+  gradleprops: []
+  init: ''
+  maven: false
+  ndk: r10d
+  novcheck: false
+  oldsdkloc: false
+  output: null
+  patch: []
+  preassemble: []
+  prebuild: sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh
+    && ln -s vlc-android/$$VLC$$ ../vlc
+  rm: []
+  scandelete: []
+  scanignore: []
+  srclibs:
+  - VLC@d59b81a
+  subdir: vlc-android
+  submodules: false
+  sudo: ''
+  target: null
+  timeout: null
+  versionCode: '1030004'
+  versionName: 1.2.6
+- androidupdate: []
+  antcommands: []
+  antifeatures: []
+  build: cd ../ && ./compile.sh -a "x86" --release
+  buildjni: []
+  buildozer: false
+  commit: 1.2.6
+  disable: ''
+  encoding: null
+  extlibs: []
+  forcevercode: false
+  forceversion: false
+  gradle:
+  - VanillaX86
+  gradleprops: []
+  init: ''
+  maven: false
+  ndk: r10d
+  novcheck: false
+  oldsdkloc: false
+  output: null
+  patch: []
+  preassemble: []
+  prebuild: sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh
+    && ln -s vlc-android/$$VLC$$ ../vlc
+  rm: []
+  scandelete: []
+  scanignore: []
+  srclibs:
+  - VLC@d59b81a
+  subdir: vlc-android
+  submodules: false
+  sudo: ''
+  target: null
+  timeout: null
+  versionCode: '1030005'
+  versionName: 1.2.6
+comments: {}
 id: org.videolan.vlc
 lastUpdated: null
 metadatapath: metadata/org.videolan.vlc.yml
diff --git a/tests/metadata/duplicate.permisssions.yml b/tests/metadata/duplicate.permisssions.yml
index 1b721fdb..3401c235 100644
--- a/tests/metadata/duplicate.permisssions.yml
+++ b/tests/metadata/duplicate.permisssions.yml
@@ -1,4 +1,4 @@
 Categories:
-  - tests
+- tests
 Name: Duplicate Permisssions
 Summary: 'Test app for all possible <uses-permissions>'
diff --git a/tests/metadata/info.guardianproject.checkey.yml b/tests/metadata/info.guardianproject.checkey.yml
index 7d933abd..78b75320 100644
--- a/tests/metadata/info.guardianproject.checkey.yml
+++ b/tests/metadata/info.guardianproject.checkey.yml
@@ -9,7 +9,6 @@ Translation: https://www.transifex.com/otf/checkey
 Bitcoin: 1Fi5xUHiAPRKxHvyUGVFGt9extBe8Srdbk
 Liberapay: GuardianProject
 
-Name: Checkey the app!
 AutoName: Checkey
 
 AutoUpdateMode: None
diff --git a/tests/metadata/info.guardianproject.checkey/en-US/name.txt b/tests/metadata/info.guardianproject.checkey/en-US/name.txt
deleted file mode 100644
index 09d725c6..00000000
--- a/tests/metadata/info.guardianproject.checkey/en-US/name.txt
+++ /dev/null
@@ -1 +0,0 @@
-Checkey: info on local apps
diff --git a/tests/metadata/info.guardianproject.checkey/ja-JP/name.txt b/tests/metadata/info.guardianproject.checkey/ja-JP/name.txt
deleted file mode 100644
index c96d43b5..00000000
--- a/tests/metadata/info.guardianproject.checkey/ja-JP/name.txt
+++ /dev/null
@@ -1 +0,0 @@
-Checkey: ローカルアプリの情報
diff --git a/tests/metadata/info.guardianproject.urzip.yml b/tests/metadata/info.guardianproject.urzip.yml
index cf783f89..bab1d763 100644
--- a/tests/metadata/info.guardianproject.urzip.yml
+++ b/tests/metadata/info.guardianproject.urzip.yml
@@ -1,12 +1,13 @@
 AutoName: Urzip：本地应用的信息
 AutoUpdateMode: None
 Bitcoin: 1Fi5xUHiAPRKxHvyUGVFGt9extBe8Srdbk
+LiberapayID: '9999999'
 OpenCollective: f-droid-just-testing
 Categories:
-  - Development
-  - GuardianProject
-  - 1
-  - 2.0
+- Development
+- GuardianProject
+- 1
+- 2.0
 CurrentVersionCode: 2147483647
 AuthorWebSite: https://guardianproject.info
 Description: |
diff --git a/tests/metadata/info.guardianproject.urzip/en-US/changelogs/default.txt b/tests/metadata/info.guardianproject.urzip/en-US/changelogs/default.txt
deleted file mode 100644
index 331d858c..00000000
--- a/tests/metadata/info.guardianproject.urzip/en-US/changelogs/default.txt
+++ /dev/null
@@ -1 +0,0 @@
-default
\ No newline at end of file
diff --git a/tests/metadata/info.zwanenburg.caffeinetile.yml b/tests/metadata/info.zwanenburg.caffeinetile.yml
index 50321a81..a1c0b284 100644
--- a/tests/metadata/info.zwanenburg.caffeinetile.yml
+++ b/tests/metadata/info.zwanenburg.caffeinetile.yml
@@ -1,4 +1,4 @@
 Categories:
-  - Development
+- Development
 Name: Caffeine Tile
 Summary: Test app for extracting icons when an XML one is default
diff --git a/tests/metadata/org.adaway.yml b/tests/metadata/org.adaway.yml
index 55afc876..edfb2cd5 100644
--- a/tests/metadata/org.adaway.yml
+++ b/tests/metadata/org.adaway.yml
@@ -7,6 +7,8 @@ SourceCode: https://github.com/dschuermann/ad-away
 IssueTracker: https://github.com/dschuermann/ad-away/issues
 Translation: https://www.transifex.com/dominikschuermann/adaway
 Donate: http://sufficientlysecure.org/index.php/adaway
+FlattrID: '369138'
+LiberapayID: '1234567890'
 
 AutoName: AdAway
 Summary: Block advertisements
diff --git a/tests/metadata/org.fdroid.fdroid.yml b/tests/metadata/org.fdroid.fdroid.yml
index 949c4b0f..9471f9a6 100644
--- a/tests/metadata/org.fdroid.fdroid.yml
+++ b/tests/metadata/org.fdroid.fdroid.yml
@@ -7,6 +7,7 @@ IssueTracker: https://gitlab.com/fdroid/fdroidclient/issues
 Translation: https://hosted.weblate.org/projects/f-droid/f-droid
 Changelog: https://gitlab.com/fdroid/fdroidclient/raw/HEAD/CHANGELOG.md
 Donate: https://f-droid.org/about
+FlattrID: '343053'
 Bitcoin: 15u8aAPK4jJ5N8wpWJ5gutAyyeHtKX5i18
 
 AutoName: F-Droid
diff --git a/tests/metadata/org.maxsdkversion.yml b/tests/metadata/org.maxsdkversion.yml
deleted file mode 100644
index 08eab4db..00000000
--- a/tests/metadata/org.maxsdkversion.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-Name: maxSdkVersion
-Summary: Test setting maxSdkVersion in an APK
diff --git a/tests/metadata/org.videolan.vlc.yml b/tests/metadata/org.videolan.vlc.yml
index 3d40e9e9..62afe259 100644
--- a/tests/metadata/org.videolan.vlc.yml
+++ b/tests/metadata/org.videolan.vlc.yml
@@ -22,54 +22,58 @@ Builds:
     versionCode: 110
     commit: 0.0.11
     subdir: vlc-android
-    forceversion: true
-    forcevercode: true
+    forceversion: yes
+    forcevercode: yes
     prebuild: sed -i '48d' ../Makefile
     androidupdate:
       - .
       - ../java-libs/SlidingMenu
       - ../java-libs/ActionBarSherlock
     build: cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release
+    buildjni: no
 
   - versionName: 0.0.11-ARM
     versionCode: 111
     commit: 0.0.11
     subdir: vlc-android
-    forceversion: true
-    forcevercode: true
+    forceversion: yes
+    forcevercode: yes
     prebuild: sed -i '48d' ../Makefile
     androidupdate:
       - .
       - ../java-libs/SlidingMenu
       - ../java-libs/ActionBarSherlock
     build: cd ../ && ANDROID_ABI=armeabi ./compile.sh release
+    buildjni: no
 
   - versionName: 0.0.11-x86
     versionCode: 112
     disable: ffmpeg error 0.0.11
     commit: unknown - see disabled
     subdir: vlc-android
-    forceversion: true
-    forcevercode: true
+    forceversion: yes
+    forcevercode: yes
     prebuild: sed -i '48d' ../Makefile
     androidupdate:
       - .
       - ../java-libs/SlidingMenu
       - ../java-libs/ActionBarSherlock
     build: cd ../ && ANDROID_ABI=x86 ./compile.sh release
+    buildjni: no
 
   - versionName: 0.0.11-mips
     versionCode: 113
     commit: 0.0.11
     subdir: vlc-android
-    forceversion: true
-    forcevercode: true
+    forceversion: yes
+    forcevercode: yes
     prebuild: sed -i '48d' ../Makefile
     androidupdate:
       - .
       - ../java-libs/SlidingMenu
       - ../java-libs/ActionBarSherlock
     build: cd ../ && ANDROID_ABI=mips ./compile.sh release
+    buildjni: no
 
   - versionName: 0.1.3-MIPS
     versionCode: 1301
@@ -78,10 +82,11 @@ Builds:
     subdir: vlc-android
     patch: ndkr9.patch
     srclibs: VLC@7c52aacbe
-    forceversion: true
-    forcevercode: true
+    forceversion: yes
+    forcevercode: yes
     prebuild: sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC$$ ../vlc
     build: cd ../ && ANDROID_ABI=mips ./compile.sh release
+    buildjni: no
 
   - versionName: 0.1.3-x86
     versionCode: 1302
@@ -89,10 +94,11 @@ Builds:
     subdir: vlc-android
     patch: ndkr9.patch
     srclibs: VLC@7c52aacbe
-    forceversion: true
-    forcevercode: true
+    forceversion: yes
+    forcevercode: yes
     prebuild: sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC$$ ../vlc
     build: cd ../ && ANDROID_ABI=x86 ./compile.sh release
+    buildjni: no
 
   - versionName: 0.1.3-ARM
     versionCode: 1303
@@ -100,10 +106,11 @@ Builds:
     subdir: vlc-android
     patch: ndkr9.patch
     srclibs: VLC@7c52aacbe
-    forceversion: true
-    forcevercode: true
+    forceversion: yes
+    forcevercode: yes
     prebuild: sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC$$ ../vlc
     build: cd ../ && ANDROID_ABI=armeabi ./compile.sh release
+    buildjni: no
 
   - versionName: 0.1.3-ARMv7
     versionCode: 1304
@@ -111,46 +118,51 @@ Builds:
     subdir: vlc-android
     patch: ndkr9.patch
     srclibs: VLC@7c52aacbe
-    forceversion: true
-    forcevercode: true
+    forceversion: yes
+    forcevercode: yes
     prebuild: sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC$$ ../vlc
     build: cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release
+    buildjni: no
 
   - versionName: 0.9.0
     versionCode: 9002
     commit: 0.9.0
     subdir: vlc-android
     srclibs: VLC@31ffb20309264994
-    forcevercode: true
+    forcevercode: yes
     prebuild: sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC$$ ../vlc
     build: cd ../ && ANDROID_ABI=x86 ./compile.sh release
+    buildjni: no
 
   - versionName: 0.9.0
     versionCode: 9004
     commit: 0.9.0
     subdir: vlc-android
     srclibs: VLC@31ffb20309264994
-    forcevercode: true
+    forcevercode: yes
     prebuild: sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC$$ ../vlc
     build: cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release
+    buildjni: no
 
   - versionName: 0.9.1
     versionCode: 9102
     commit: 0.9.1
     subdir: vlc-android
     srclibs: VLC@37e886d113b8b567c15208579fb2f
-    forcevercode: true
+    forcevercode: yes
     prebuild: sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC$$ ../vlc
     build: cd ../ && ANDROID_ABI=x86 ./compile.sh release
+    buildjni: no
 
   - versionName: 0.9.1
     versionCode: 9104
     commit: 0.9.1
     subdir: vlc-android
     srclibs: VLC@37e886d113b8b567c15208579fb2f
-    forcevercode: true
+    forcevercode: yes
     prebuild: sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC$$ ../vlc
     build: cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release
+    buildjni: no
 
   - versionName: 0.9.5
     versionCode: 9502
@@ -158,9 +170,10 @@ Builds:
     commit: 0.9.5
     subdir: vlc-android
     srclibs: VLC@052600173f376ff58ff04d53746961a2
-    forcevercode: true
+    forcevercode: yes
     prebuild: sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC$$ ../vlc
     build: cd ../ && ANDROID_ABI=x86 ./compile.sh release
+    buildjni: no
 
   - versionName: 0.9.5
     versionCode: 9504
@@ -168,45 +181,50 @@ Builds:
     commit: 0.9.5
     subdir: vlc-android
     srclibs: VLC@052600173f376ff58ff04d53746961a2
-    forcevercode: true
+    forcevercode: yes
     prebuild: sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC$$ ../vlc
     build: cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release
+    buildjni: no
 
   - versionName: 0.9.6
     versionCode: 9602
     commit: 0.9.6
     subdir: vlc-android
     srclibs: VLC-2.2@27f4799
-    forcevercode: true
+    forcevercode: yes
     prebuild: sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC-2.2$$ ../vlc
     build: cd ../ && ANDROID_ABI=x86 ./compile.sh release
+    buildjni: no
 
   - versionName: 0.9.6
     versionCode: 9604
     commit: 0.9.6
     subdir: vlc-android
     srclibs: VLC-2.2@27f4799
-    forcevercode: true
+    forcevercode: yes
     prebuild: sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC-2.2$$ ../vlc
     build: cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release
+    buildjni: no
 
   - versionName: 0.9.7
     versionCode: 9702
     commit: 0.9.7
     subdir: vlc-android
     srclibs: VLC-2.2@9e1c6ff
-    forcevercode: true
+    forcevercode: yes
     prebuild: sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC-2.2$$ ../vlc
     build: cd ../ && ANDROID_ABI=x86 ./compile.sh release
+    buildjni: no
 
   - versionName: 0.9.7
     versionCode: 9704
     commit: 0.9.7
     subdir: vlc-android
     srclibs: VLC-2.2@9e1c6ff
-    forcevercode: true
+    forcevercode: yes
     prebuild: sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC-2.2$$ ../vlc
     build: cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release
+    buildjni: no
 
   - versionName: 0.9.7.1
     versionCode: 9711
@@ -214,168 +232,186 @@ Builds:
     commit: 0.9.7.1
     subdir: vlc-android
     srclibs: VLC-2.2@57cd36b
-    forcevercode: true
+    forcevercode: yes
     prebuild: sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC-2.2$$ ../vlc
     build: cd ../ && ANDROID_ABI=mips ./compile.sh release
+    buildjni: no
 
   - versionName: 0.9.7.1
     versionCode: 9712
     commit: 0.9.7.1
     subdir: vlc-android
     srclibs: VLC-2.2@57cd36b
-    forcevercode: true
+    forcevercode: yes
     prebuild: sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC-2.2$$ ../vlc
     build: cd ../ && ANDROID_ABI=x86 ./compile.sh release
+    buildjni: no
 
   - versionName: 0.9.7.1
     versionCode: 9714
     commit: 0.9.7.1
     subdir: vlc-android
     srclibs: VLC-2.2@57cd36b
-    forcevercode: true
+    forcevercode: yes
     prebuild: sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC-2.2$$ ../vlc
     build: cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release
+    buildjni: no
 
   - versionName: 0.9.8
     versionCode: 9802
     commit: 0.9.8
     subdir: vlc-android
     srclibs: VLC-2.2@f2db364
-    forcevercode: true
+    forcevercode: yes
     prebuild: sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC-2.2$$ ../vlc
     build: cd ../ && ANDROID_ABI=x86 ./compile.sh release
+    buildjni: no
 
   - versionName: 0.9.8
     versionCode: 9803
     commit: 0.9.8
     subdir: vlc-android
     srclibs: VLC-2.2@f2db364
-    forcevercode: true
+    forcevercode: yes
     prebuild: sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC-2.2$$ ../vlc
     build: cd ../ && ANDROID_ABI=armeabi ./compile.sh release
+    buildjni: no
 
   - versionName: 0.9.8
     versionCode: 9804
     commit: 0.9.8
     subdir: vlc-android
     srclibs: VLC-2.2@f2db364
-    forcevercode: true
+    forcevercode: yes
     prebuild: sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC-2.2$$ ../vlc
     build: cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release
+    buildjni: no
 
   - versionName: 0.9.9
     versionCode: 9902
     commit: 0.9.9
     subdir: vlc-android
     srclibs: VLC-2.2@e731dc23a4f8ef6782c7cc2236bbbf41c034dad1
-    forcevercode: true
+    forcevercode: yes
     prebuild: sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC-2.2$$ ../vlc
     build: cd ../ && ANDROID_ABI=x86 ./compile.sh release
+    buildjni: no
 
   - versionName: 0.9.9
     versionCode: 9903
     commit: 0.9.9
     subdir: vlc-android
     srclibs: VLC-2.2@e731dc23a4f8ef6782c7cc2236bbbf41c034dad1
-    forcevercode: true
+    forcevercode: yes
     prebuild: sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC-2.2$$ ../vlc
     build: cd ../ && ANDROID_ABI=armeabi ./compile.sh release
+    buildjni: no
 
   - versionName: 0.9.9
     versionCode: 9904
     commit: 0.9.9
     subdir: vlc-android
     srclibs: VLC-2.2@e731dc23a4f8ef6782c7cc2236bbbf41c034dad1
-    forcevercode: true
+    forcevercode: yes
     prebuild: sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC-2.2$$ ../vlc
     build: cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release
+    buildjni: no
 
   - versionName: 0.9.10
     versionCode: 10002
     commit: 0.9.10
     subdir: vlc-android
     srclibs: VLC-2.2@e33e5de
-    forcevercode: true
+    forcevercode: yes
     prebuild: sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC-2.2$$ ../vlc
     build: cd ../ && ANDROID_ABI=x86 ./compile.sh release
+    buildjni: no
 
   - versionName: 0.9.10
     versionCode: 10003
     commit: 0.9.10
     subdir: vlc-android
     srclibs: VLC-2.2@e33e5de
-    forcevercode: true
+    forcevercode: yes
     prebuild: sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC-2.2$$ ../vlc
     build: cd ../ && ANDROID_ABI=armeabi ./compile.sh release
+    buildjni: no
 
   - versionName: 0.9.10
     versionCode: 10004
     commit: 0.9.10
     subdir: vlc-android
     srclibs: VLC-2.2@e33e5de
-    forcevercode: true
+    forcevercode: yes
     prebuild: sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC-2.2$$ ../vlc
     build: cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release
+    buildjni: no
 
-  # 0.9.10 vercodes were off
+#0.9.10 vercodes were off
   - versionName: 1.0.0
     versionCode: 10006
     disable: doesn't build
     commit: 1.0.0
     subdir: vlc-android
     srclibs: VLC-2.2@036010e
-    forcevercode: true
+    forcevercode: yes
     prebuild: sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC-2.2$$ ../vlc
     build: cd ../ && ANDROID_ABI=x86 ./compile.sh release
+    buildjni: no
 
-  # 0.9.10 vercodes were off
+#0.9.10 vercodes were off
   - versionName: 1.0.0
     versionCode: 10007
     disable: doesn't build
     commit: 1.0.0
     subdir: vlc-android
     srclibs: VLC-2.2@036010e
-    forcevercode: true
+    forcevercode: yes
     prebuild: sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC-2.2$$ ../vlc
     build: cd ../ && ANDROID_ABI=armeabi ./compile.sh release
+    buildjni: no
 
-  # 0.9.10 vercodes were off
+#0.9.10 vercodes were off
   - versionName: 1.0.0
     versionCode: 10008
     disable: doesn't build
     commit: 1.0.0
     subdir: vlc-android
     srclibs: VLC-2.2@036010e
-    forcevercode: true
+    forcevercode: yes
     prebuild: sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC-2.2$$ ../vlc
     build: cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release
+    buildjni: no
 
   - versionName: 1.0.1
     versionCode: 10102
     commit: 1.0.1
     subdir: vlc-android
     srclibs: VLC-2.2@59409d5
-    forcevercode: true
+    forcevercode: yes
     prebuild: sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC-2.2$$ ../vlc
     build: cd ../ && ANDROID_ABI=x86 ./compile.sh release
+    buildjni: no
 
   - versionName: 1.0.1
     versionCode: 10103
     commit: 1.0.1
     subdir: vlc-android
     srclibs: VLC-2.2@59409d5
-    forcevercode: true
+    forcevercode: yes
     prebuild: sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC-2.2$$ ../vlc
     build: cd ../ && ANDROID_ABI=armeabi ./compile.sh release
+    buildjni: no
 
   - versionName: 1.0.1
     versionCode: 10104
     commit: 1.0.1
     subdir: vlc-android
     srclibs: VLC-2.2@59409d5
-    forcevercode: true
+    forcevercode: yes
     prebuild: sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC-2.2$$ ../vlc
     build: cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release
+    buildjni: no
 
   - versionName: 1.1.3
     versionCode: 1010303
@@ -386,6 +422,7 @@ Builds:
     prebuild: sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh &&
         ln -s vlc-android/$$VLC$$ ../vlc
     build: cd ../ && ./compile.sh -a "armeabi" --release
+    buildjni: no
     ndk: r10d
 
   - versionName: 1.1.3
@@ -397,6 +434,7 @@ Builds:
     prebuild: sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh &&
         ln -s vlc-android/$$VLC$$ ../vlc
     build: cd ../ && ./compile.sh -a "armeabi-v7a" --release
+    buildjni: no
     ndk: r10d
 
   - versionName: 1.1.3
@@ -408,6 +446,7 @@ Builds:
     prebuild: sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh &&
         ln -s vlc-android/$$VLC$$ ../vlc
     build: cd ../ && ./compile.sh -a "x86" --release
+    buildjni: no
     ndk: r10d
 
   - versionName: 1.1.5
@@ -419,6 +458,7 @@ Builds:
     prebuild: sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh &&
         ln -s vlc-android/$$VLC$$ ../vlc
     build: cd ../ && ./compile.sh -a "armeabi" --release
+    buildjni: no
     ndk: r10d
 
   - versionName: 1.1.5
@@ -430,6 +470,7 @@ Builds:
     prebuild: sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh &&
         ln -s vlc-android/$$VLC$$ ../vlc
     build: cd ../ && ./compile.sh -a "armeabi-v7a" --release
+    buildjni: no
     ndk: r10d
 
   - versionName: 1.1.5
@@ -441,6 +482,7 @@ Builds:
     prebuild: sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh &&
         ln -s vlc-android/$$VLC$$ ../vlc
     build: cd ../ && ./compile.sh -a "x86" --release
+    buildjni: no
     ndk: r10d
 
   - versionName: 1.1.6
@@ -452,6 +494,7 @@ Builds:
     prebuild: sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh &&
         ln -s vlc-android/$$VLC$$ ../vlc
     build: cd ../ && ./compile.sh -a "armeabi" --release
+    buildjni: no
     ndk: r10d
 
   - versionName: 1.1.6
@@ -463,6 +506,7 @@ Builds:
     prebuild: sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh &&
         ln -s vlc-android/$$VLC$$ ../vlc
     build: cd ../ && ./compile.sh -a "armeabi-v7a" --release
+    buildjni: no
     ndk: r10d
 
   - versionName: 1.1.6
@@ -474,6 +518,7 @@ Builds:
     prebuild: sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh &&
         ln -s vlc-android/$$VLC$$ ../vlc
     build: cd ../ && ./compile.sh -a "x86" --release
+    buildjni: no
     ndk: r10d
 
   - versionName: 1.2.0
@@ -485,6 +530,7 @@ Builds:
     prebuild: sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh &&
         ln -s vlc-android/$$VLC$$ ../vlc
     build: cd ../ && ./compile.sh -a "armeabi" --release
+    buildjni: no
     ndk: r10d
 
   - versionName: 1.2.0
@@ -496,6 +542,7 @@ Builds:
     prebuild: sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh &&
         ln -s vlc-android/$$VLC$$ ../vlc
     build: cd ../ && ./compile.sh -a "armeabi-v7a" --release
+    buildjni: no
     ndk: r10d
 
   - versionName: 1.2.0
@@ -507,6 +554,7 @@ Builds:
     prebuild: sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh &&
         ln -s vlc-android/$$VLC$$ ../vlc
     build: cd ../ && ./compile.sh -a "x86" --release
+    buildjni: no
     ndk: r10d
 
   - versionName: 1.2.1
@@ -518,6 +566,7 @@ Builds:
     prebuild: sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh &&
         ln -s vlc-android/$$VLC$$ ../vlc
     build: cd ../ && ./compile.sh -a "armeabi" --release
+    buildjni: no
     ndk: r10d
 
   - versionName: 1.2.1
@@ -529,6 +578,7 @@ Builds:
     prebuild: sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh &&
         ln -s vlc-android/$$VLC$$ ../vlc
     build: cd ../ && ./compile.sh -a "armeabi-v7a" --release
+    buildjni: no
     ndk: r10d
 
   - versionName: 1.2.1
@@ -540,6 +590,7 @@ Builds:
     prebuild: sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh &&
         ln -s vlc-android/$$VLC$$ ../vlc
     build: cd ../ && ./compile.sh -a "x86" --release
+    buildjni: no
     ndk: r10d
 
   - versionName: 1.2.2
@@ -551,6 +602,7 @@ Builds:
     prebuild: sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh &&
         ln -s vlc-android/$$VLC$$ ../vlc
     build: cd ../ && ./compile.sh -a "armeabi" --release
+    buildjni: no
     ndk: r10d
 
   - versionName: 1.2.2
@@ -562,6 +614,7 @@ Builds:
     prebuild: sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh &&
         ln -s vlc-android/$$VLC$$ ../vlc
     build: cd ../ && ./compile.sh -a "armeabi-v7a" --release
+    buildjni: no
     ndk: r10d
 
   - versionName: 1.2.2
@@ -573,6 +626,7 @@ Builds:
     prebuild: sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh &&
         ln -s vlc-android/$$VLC$$ ../vlc
     build: cd ../ && ./compile.sh -a "x86" --release
+    buildjni: no
     ndk: r10d
 
   - versionName: 1.2.3
@@ -584,6 +638,7 @@ Builds:
     prebuild: sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh &&
         ln -s vlc-android/$$VLC$$ ../vlc
     build: cd ../ && ./compile.sh -a "armeabi" --release
+    buildjni: no
     ndk: r10d
 
   - versionName: 1.2.3
@@ -595,6 +650,7 @@ Builds:
     prebuild: sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh &&
         ln -s vlc-android/$$VLC$$ ../vlc
     build: cd ../ && ./compile.sh -a "armeabi-v7a" --release
+    buildjni: no
     ndk: r10d
 
   - versionName: 1.2.3
@@ -606,6 +662,7 @@ Builds:
     prebuild: sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh &&
         ln -s vlc-android/$$VLC$$ ../vlc
     build: cd ../ && ./compile.sh -a "x86" --release
+    buildjni: no
     ndk: r10d
 
   - versionName: 1.2.4
@@ -617,6 +674,7 @@ Builds:
     prebuild: sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh &&
         ln -s vlc-android/$$VLC$$ ../vlc
     build: cd ../ && ./compile.sh -a "armeabi" --release
+    buildjni: no
     ndk: r10d
 
   - versionName: 1.2.4
@@ -628,6 +686,7 @@ Builds:
     prebuild: sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh &&
         ln -s vlc-android/$$VLC$$ ../vlc
     build: cd ../ && ./compile.sh -a "armeabi-v7a" --release
+    buildjni: no
     ndk: r10d
 
   - versionName: 1.2.4
@@ -639,6 +698,7 @@ Builds:
     prebuild: sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh &&
         ln -s vlc-android/$$VLC$$ ../vlc
     build: cd ../ && ./compile.sh -a "x86" --release
+    buildjni: no
     ndk: r10d
 
   - versionName: 1.2.5
@@ -650,6 +710,7 @@ Builds:
     prebuild: sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh &&
         ln -s vlc-android/$$VLC$$ ../vlc
     build: cd ../ && ./compile.sh -a "armeabi" --release
+    buildjni: no
     ndk: r10d
 
   - versionName: 1.2.5
@@ -661,6 +722,7 @@ Builds:
     prebuild: sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh &&
         ln -s vlc-android/$$VLC$$ ../vlc
     build: cd ../ && ./compile.sh -a "armeabi-v7a" --release
+    buildjni: no
     ndk: r10d
 
   - versionName: 1.2.5
@@ -672,6 +734,7 @@ Builds:
     prebuild: sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh &&
         ln -s vlc-android/$$VLC$$ ../vlc
     build: cd ../ && ./compile.sh -a "x86" --release
+    buildjni: no
     ndk: r10d
 
   - versionName: 1.2.6
@@ -683,6 +746,7 @@ Builds:
     prebuild: sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh &&
         ln -s vlc-android/$$VLC$$ ../vlc
     build: cd ../ && ./compile.sh -a "armeabi" --release
+    buildjni: no
     ndk: r10d
 
   - versionName: 1.2.6
@@ -694,6 +758,7 @@ Builds:
     prebuild: sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh &&
         ln -s vlc-android/$$VLC$$ ../vlc
     build: cd ../ && ./compile.sh -a "armeabi-v7a" --release
+    buildjni: no
     ndk: r10d
 
   - versionName: 1.2.6
@@ -705,13 +770,14 @@ Builds:
     prebuild: sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh &&
         ln -s vlc-android/$$VLC$$ ../vlc
     build: cd ../ && ./compile.sh -a "x86" --release
+    buildjni: no
     ndk: r10d
 
 MaintainerNotes: |
   Instructions and dependencies here: http://wiki.videolan.org/AndroidCompile
   see http://buildbot.videolan.org/builders/ for version code scheme
   The VLC srclib commit can be found out from TESTED_HASH value in compile.sh
-
+  
   On new releases remove the updatecheck and force the CV to the last working
   build. This will make sure users don't get notified about the update until
   the final build from the BS has been reviewed and tested. Once done, undo
@@ -738,7 +804,6 @@ ArchivePolicy: 9 versions
 AutoUpdateMode: None
 UpdateCheckMode: Tags
 # Only use higher vercode ops, if we do build those arches
-VercodeOperation:
-  - "%c + 5"
+VercodeOperation: "%c + 5"
 CurrentVersion: 1.2.6
 CurrentVersionCode: 1030005
diff --git a/tests/metadata/souch.smsbypass.yml b/tests/metadata/souch.smsbypass.yml
index ddc8edb7..5733673a 100644
--- a/tests/metadata/souch.smsbypass.yml
+++ b/tests/metadata/souch.smsbypass.yml
@@ -5,6 +5,7 @@ WebSite: https://gitlab.com/souch/SMSbypass
 SourceCode: https://gitlab.com/souch/SMSbypass/tree/HEAD
 IssueTracker: https://gitlab.com/souch/SMSbypass/issues
 Donate: http://rodolphe.souchaud.free.fr/donate
+FlattrID: cad90e036b975ed129a3ce80a0750466
 
 AutoName: Battery level
 Summary: Filter SMS and show them in a fake app
diff --git a/tests/openssl-version-check-test.py b/tests/openssl-version-check-test.py
index 69a1ff59..69d4d1ce 100755
--- a/tests/openssl-version-check-test.py
+++ b/tests/openssl-version-check-test.py
@@ -6,7 +6,6 @@
 # This is used in update.has_known_vulnerability()
 
 import re
-
 import requests
 
 # this list was generated using:
@@ -14,7 +13,7 @@ import requests
 versions = [
 ]
 
-r = requests.get('https://www.openssl.org/news/changelog.html', timeout=300)
+r = requests.get('https://www.openssl.org/news/changelog.html')
 
 safe = set()
 bad = set()
diff --git a/tests/org.fdroid.fdroid_1019051.apk.json b/tests/org.fdroid.fdroid_1019051.apk.json
deleted file mode 100644
index e71c1704..00000000
--- a/tests/org.fdroid.fdroid_1019051.apk.json
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-  "1708238023.6572325": {
-    "diffoscope": {
-      "Available-in-Debian-packages": [
-        "coreboot-utils",
-        "ghc",
-        "libxmlb-dev",
-        "radare2"
-      ],
-      "External-Tools-Required": [
-        "cbfstool",
-        "ghc",
-        "lipo",
-        "otool",
-        "radare2",
-        "xb-tool"
-      ],
-      "Missing-Python-Modules": [
-        "pypdf",
-        "r2pipe"
-      ],
-      "VERSION": "240"
-    },
-    "local": {
-      "file": "unsigned/org.fdroid.fdroid_1019051.apk",
-      "packageName": "org.fdroid.fdroid",
-      "sha256": "0eec78236ec5ebb8f416c611717bd659b75d2b6600ef71a50c922efc99dbdca2",
-      "timestamp": 1708238023.6572325,
-      "versionCode": 1019051,
-      "versionName": "1.19.1"
-    },
-    "remote": {
-      "file": "tmp/org.fdroid.fdroid_1019051.apk",
-      "packageName": "org.fdroid.fdroid",
-      "sha256": "162cb14b93bd9b665fff4256b4fc91cfe75fb72335a02b1d0febe606220b50f4",
-      "timestamp": 1715356428.522411,
-      "versionCode": 1019051,
-      "versionName": "1.19.1"
-    },
-    "url": "https://f-droid.org/repo/org.fdroid.fdroid_1019051.apk",
-    "verified": true
-  }
-}
diff --git a/tests/org.sajeg.fallingblocks_3.apk b/tests/org.sajeg.fallingblocks_3.apk
deleted file mode 100644
index 98bfe770..00000000
Binary files a/tests/org.sajeg.fallingblocks_3.apk and /dev/null differ
diff --git a/tests/publish.TestCase b/tests/publish.TestCase
new file mode 100755
index 00000000..d0d08376
--- /dev/null
+++ b/tests/publish.TestCase
@@ -0,0 +1,235 @@
+#!/usr/bin/env python3
+
+#
+#  command which created the keystore used in this test case:
+#
+#  $ for ALIAS in repokey a163ec9b d2d51ff2 dc3b169e 78688a0f; \
+#        do keytool -genkey -keystore dummy-keystore.jks \
+#        -alias $ALIAS -keyalg 'RSA' -keysize '2048' \
+#        -validity '10000' -storepass 123456 -storetype jks \
+#        -keypass 123456 -dname 'CN=test, OU=F-Droid'; done
+#
+
+import inspect
+import logging
+import optparse
+import os
+import shutil
+import sys
+import unittest
+import tempfile
+import textwrap
+from unittest import mock
+
+localmodule = os.path.realpath(
+    os.path.join(os.path.dirname(inspect.getfile(inspect.currentframe())), '..'))
+print('localmodule: ' + localmodule)
+if localmodule not in sys.path:
+    sys.path.insert(0, localmodule)
+
+from fdroidserver import publish
+from fdroidserver import common
+from fdroidserver.exception import FDroidException
+
+
+class PublishTest(unittest.TestCase):
+    '''fdroidserver/publish.py'''
+
+    def setUp(self):
+        logging.basicConfig(level=logging.DEBUG)
+        self.basedir = os.path.join(localmodule, 'tests')
+        self.tmpdir = os.path.abspath(os.path.join(self.basedir, '..', '.testfiles'))
+        if not os.path.exists(self.tmpdir):
+            os.makedirs(self.tmpdir)
+        os.chdir(self.basedir)
+
+    def test_key_alias(self):
+        publish.config = {}
+        self.assertEqual('a163ec9b', publish.key_alias('com.example.app'))
+        self.assertEqual('d2d51ff2', publish.key_alias('com.example.anotherapp'))
+        self.assertEqual('dc3b169e', publish.key_alias('org.test.testy'))
+        self.assertEqual('78688a0f', publish.key_alias('org.org.org'))
+
+        self.assertEqual('ee8807d2', publish.key_alias("org.schabi.newpipe"))
+        self.assertEqual('b53c7e11', publish.key_alias("de.grobox.liberario"))
+
+        publish.config = {'keyaliases': {'yep.app': '@org.org.org',
+                                         'com.example.app': '1a2b3c4d'}}
+        self.assertEqual('78688a0f', publish.key_alias('yep.app'))
+        self.assertEqual('1a2b3c4d', publish.key_alias('com.example.app'))
+
+    def test_read_fingerprints_from_keystore(self):
+        common.config = {}
+        common.fill_config_defaults(common.config)
+        publish.config = common.config
+        publish.config['keystorepass'] = '123456'
+        publish.config['keypass'] = '123456'
+        publish.config['keystore'] = 'dummy-keystore.jks'
+
+        expected = {'78688a0f': '277655a6235bc6b0ef2d824396c51ba947f5ebc738c293d887e7083ff338af82',
+                    'd2d51ff2': 'fa3f6a017541ee7fe797be084b1bcfbf92418a7589ef1f7fdeb46741b6d2e9c3',
+                    'dc3b169e': '6ae5355157a47ddcc3834a71f57f6fb5a8c2621c8e0dc739e9ddf59f865e497c',
+                    'a163ec9b': 'd34f678afbaa8f2fa6cc0edd6f0c2d1d2e2e9eb08bea521b24c740806016bff4',
+                    'repokey': 'c58460800c7b250a619c30c13b07b7359a43e5af71a4352d86c58ae18c9f6d41'}
+        result = publish.read_fingerprints_from_keystore()
+        self.maxDiff = None
+        self.assertEqual(expected, result)
+
+    def test_store_and_load_fdroid_signing_key_fingerprints(self):
+        common.config = {}
+        common.fill_config_defaults(common.config)
+        publish.config = common.config
+        publish.config['keystorepass'] = '123456'
+        publish.config['keypass'] = '123456'
+        publish.config['keystore'] = os.path.join(os.getcwd(),
+                                                  'dummy-keystore.jks')
+        publish.config['repo_keyalias'] = 'repokey'
+
+        appids = ['com.example.app',
+                  'net.unavailable',
+                  'org.test.testy',
+                  'com.example.anotherapp',
+                  'org.org.org']
+
+        testdir = tempfile.mkdtemp(prefix=inspect.currentframe().f_code.co_name, dir=self.tmpdir)
+        os.chdir(testdir)
+        with open('config.py', 'w') as f:
+            pass
+
+        publish.store_stats_fdroid_signing_key_fingerprints(appids, indent=2)
+
+        self.maxDiff = None
+        expected = {
+            "com.example.anotherapp": {
+                "signer": "fa3f6a017541ee7fe797be084b1bcfbf92418a7589ef1f7fdeb46741b6d2e9c3"
+            },
+            "com.example.app": {
+                "signer": "d34f678afbaa8f2fa6cc0edd6f0c2d1d2e2e9eb08bea521b24c740806016bff4"
+            },
+            "org.org.org": {
+                "signer": "277655a6235bc6b0ef2d824396c51ba947f5ebc738c293d887e7083ff338af82"
+            },
+            "org.test.testy": {
+                "signer": "6ae5355157a47ddcc3834a71f57f6fb5a8c2621c8e0dc739e9ddf59f865e497c"
+            }
+        }
+        self.assertEqual(expected, common.load_stats_fdroid_signing_key_fingerprints())
+
+        with open('config.py', 'r') as f:
+            self.assertEqual(textwrap.dedent('''\
+
+                repo_key_sha256 = "c58460800c7b250a619c30c13b07b7359a43e5af71a4352d86c58ae18c9f6d41"
+                '''), f.read())
+
+    def test_store_and_load_fdroid_signing_key_fingerprints_with_missmatch(self):
+        common.config = {}
+        common.fill_config_defaults(common.config)
+        publish.config = common.config
+        publish.config['keystorepass'] = '123456'
+        publish.config['keypass'] = '123456'
+        publish.config['keystore'] = os.path.join(os.getcwd(),
+                                                  'dummy-keystore.jks')
+        publish.config['repo_keyalias'] = 'repokey'
+        publish.config['repo_key_sha256'] = 'bad bad bad bad bad bad bad bad bad bad bad bad'
+
+        testdir = tempfile.mkdtemp(prefix=inspect.currentframe().f_code.co_name, dir=self.tmpdir)
+        os.chdir(testdir)
+        publish.store_stats_fdroid_signing_key_fingerprints({}, indent=2)
+        with self.assertRaises(FDroidException):
+            common.load_stats_fdroid_signing_key_fingerprints()
+
+    def test_reproducible_binaries_process(self):
+        common.config = {}
+        common.fill_config_defaults(common.config)
+        publish.config = common.config
+        publish.config['keystore'] = 'keystore.jks'
+        publish.config['repo_keyalias'] = 'sova'
+        publish.config['keystorepass'] = 'r9aquRHYoI8+dYz6jKrLntQ5/NJNASFBacJh7Jv2BlI='
+        publish.config['keypass'] = 'r9aquRHYoI8+dYz6jKrLntQ5/NJNASFBacJh7Jv2BlI='
+        testdir = tempfile.mkdtemp(prefix=inspect.currentframe().f_code.co_name, dir=self.tmpdir)
+
+        shutil.copy('keystore.jks', testdir)
+        os.mkdir(os.path.join(testdir, 'repo'))
+        metadata_dir = os.path.join(testdir, 'metadata')
+        os.mkdir(metadata_dir)
+        shutil.copy(os.path.join('metadata', 'com.politedroid.yml'), metadata_dir)
+        with open(os.path.join(metadata_dir, 'com.politedroid.yml'), 'a') as fp:
+            fp.write('\nBinaries: https://placeholder/foo%v.apk\n')
+        os.mkdir(os.path.join(testdir, 'unsigned'))
+        shutil.copy('repo/com.politedroid_6.apk', os.path.join(testdir, 'unsigned'))
+        os.mkdir(os.path.join(testdir, 'unsigned', 'binaries'))
+        shutil.copy('repo/com.politedroid_6.apk',
+                    os.path.join(testdir, 'unsigned', 'binaries', 'com.politedroid_6.binary.apk'))
+
+        os.chdir(testdir)
+        with mock.patch.object(sys, 'argv', ['fdroid fakesubcommand']):
+            publish.main()
+
+    def test_check_for_key_collisions(self):
+        from fdroidserver.metadata import App
+        common.config = {}
+        common.fill_config_defaults(common.config)
+        publish.config = common.config
+
+        randomappids = [
+            "org.fdroid.fdroid",
+            "a.b.c",
+            "u.v.w.x.y.z",
+            "lpzpkgqwyevnmzvrlaazhgardbyiyoybyicpmifkyrxkobljoz",
+            "vuslsm.jlrevavz.qnbsenmizhur.lprwbjiujtu.ekiho",
+            "w.g.g.w.p.v.f.v.gvhyz",
+            "nlozuqer.ufiinmrbjqboogsjgmpfks.dywtpcpnyssjmqz",
+        ]
+        allapps = {}
+        for appid in randomappids:
+            allapps[appid] = App()
+        allaliases = publish.check_for_key_collisions(allapps)
+        self.assertEqual(len(randomappids), len(allaliases))
+
+        allapps = {'tof.cv.mpp': App(), 'j6mX276h': App()}
+        self.assertEqual(publish.key_alias('tof.cv.mpp'), publish.key_alias('j6mX276h'))
+        self.assertRaises(SystemExit, publish.check_for_key_collisions, allapps)
+
+    def test_create_key_if_not_existing(self):
+        try:
+            import jks
+            import jks.util
+        except ImportError:
+            self.skipTest("pyjks not installed")
+        common.config = {}
+        common.fill_config_defaults(common.config)
+        publish.config = common.config
+        publish.config['keystorepass'] = '123456'
+        publish.config['keypass'] = '654321'
+        publish.config['keystore'] = "keystore.jks"
+        publish.config['keydname'] = 'CN=Birdman, OU=Cell, O=Alcatraz, L=Alcatraz, S=California, C=US'
+        testdir = tempfile.mkdtemp(prefix=inspect.currentframe().f_code.co_name, dir=self.tmpdir)
+        os.chdir(testdir)
+        keystore = jks.KeyStore.new("jks", [])
+        keystore.save(publish.config['keystore'], publish.config['keystorepass'])
+
+        self.assertTrue(publish.create_key_if_not_existing("newalias"))
+        # The second time we try that, a new key should not be created
+        self.assertFalse(publish.create_key_if_not_existing("newalias"))
+        self.assertTrue(publish.create_key_if_not_existing("anotheralias"))
+
+        keystore = jks.KeyStore.load(publish.config['keystore'], publish.config['keystorepass'])
+        self.assertCountEqual(keystore.private_keys, ["newalias", "anotheralias"])
+        for alias, pk in keystore.private_keys.items():
+            self.assertFalse(pk.is_decrypted())
+            pk.decrypt(publish.config['keypass'])
+            self.assertTrue(pk.is_decrypted())
+            self.assertEqual(jks.util.RSA_ENCRYPTION_OID, pk.algorithm_oid)
+
+
+if __name__ == "__main__":
+    os.chdir(os.path.dirname(__file__))
+
+    parser = optparse.OptionParser()
+    parser.add_option("-v", "--verbose", action="store_true", default=False,
+                      help="Spew out even more information than normal")
+    (common.options, args) = parser.parse_args(['--verbose'])
+
+    newSuite = unittest.TestSuite()
+    newSuite.addTest(unittest.makeSuite(PublishTest))
+    unittest.main(failfast=False)
diff --git a/tests/refresh-SUSS_DEFAULT.py b/tests/refresh-SUSS_DEFAULT.py
deleted file mode 100755
index 11f1cf84..00000000
--- a/tests/refresh-SUSS_DEFAULT.py
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/usr/bin/env python3
-#
-# This will update the caches suss.json from the network, then
-# overwrite fdroidserver/scanner.py to add the contents of suss.json
-# to the SUSS_DEFAULT variable.
-
-import inspect
-import os
-import re
-import sys
-from pathlib import Path
-
-localmodule = os.path.realpath(
-    os.path.join(os.path.dirname(inspect.getfile(inspect.currentframe())), '..')
-)
-print('localmodule: ' + localmodule)
-if localmodule not in sys.path:
-    sys.path.insert(0, localmodule)
-from fdroidserver import scanner
-
-scanner._get_tool().refresh()
-scanner_py = Path(localmodule) / 'fdroidserver/scanner.py'
-contents = scanner_py.read_text()
-scanner_py.write_text(
-    re.sub(
-        r"""SUSS_DEFAULT *= *r?'''.*""",
-        """SUSS_DEFAULT = r'''""",
-        contents,
-        flags=re.DOTALL,
-    )
-)
-os.system(  # nosec bandit B605 start_process_with_a_shell, don't judge me ;-)
-    """cat %s >> %s"""
-    % (str(scanner._scanner_cachedir() / 'suss.json'), str(scanner_py))
-)
-with scanner_py.open('a') as fp:
-    fp.write("'''\n")
diff --git a/tests/repo/categories.txt b/tests/repo/categories.txt
new file mode 100644
index 00000000..9af231f5
--- /dev/null
+++ b/tests/repo/categories.txt
@@ -0,0 +1,10 @@
+1
+2.0
+Development
+GuardianProject
+Multimedia
+Phone & SMS
+Security
+System
+Time
+tests
diff --git a/tests/repo/entry.json b/tests/repo/entry.json
deleted file mode 100644
index 85b6b14f..00000000
--- a/tests/repo/entry.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "timestamp": 1676634233000,
-  "version": 20002,
-  "index": {
-    "name": "/index-v2.json",
-    "sha256": "94dca5f4398d2a0167bbe69c790cdd66f1bc305ca5e362ee5e3f793e9f88e3cf",
-    "size": 53355,
-    "numPackages": 11
-  },
-  "diffs": {}
-}
\ No newline at end of file
diff --git a/tests/repo/index-v1.json b/tests/repo/index-v1.json
index 03f8f060..e781d974 100644
--- a/tests/repo/index-v1.json
+++ b/tests/repo/index-v1.json
@@ -1,11 +1,11 @@
 {
   "repo": {
-    "timestamp": 1676634233000,
-    "version": 20002,
+    "timestamp": 1502845383782,
+    "version": 21,
     "name": "My First F-Droid Repo Demo",
-    "icon": "icon.png",
+    "icon": "fdroid-icon.png",
     "address": "https://MyFirstFDroidRepo.org/fdroid/repo",
-    "description": "This is a repository of apps to be used with F-Droid. Applications in this repository are either official binaries built by the original application developers, or are binaries built from source by the admin of f-droid.org using the tools on https://gitlab.com/fdroid.",
+    "description": "This is a repository of apps to be used with F-Droid. Applications in this repository are either official binaries built by the original application developers, or are binaries built from source by the admin of f-droid.org using the tools on https://gitlab.com/u/fdroid.",
     "mirrors": [
       "http://foobarfoobarfoobar.onion/fdroid/repo",
       "https://foo.bar/fdroid/repo"
@@ -29,20 +29,17 @@
       "suggestedVersionCode": "9",
       "description": "In order to keep away curious eyes, SMS-bypass filters incoming SMS messages\nbefore they reach your inbox. Based on bughunter2.smsfilter.\n\nFeatures:\n\n* Discrete fake app \"Battery level\": Long tap on Battery percentage will show SMS.\n* Filter incoming SMS specified address: redirect the SMS to SMS-bypass messages list; remove SMS arrival sound or vibration; show a discreet notification icon (battery level); vibrate if checked in settings\n* Add contact from contact list\n* Export messages to a text file",
       "donate": "http://rodolphe.souchaud.free.fr/donate",
+      "flattrID": "cad90e036b975ed129a3ce80a0750466",
       "issueTracker": "https://gitlab.com/souch/SMSbypass/issues",
       "license": "GPL-3.0-only",
+      "name": "Battery level",
       "sourceCode": "https://gitlab.com/souch/SMSbypass/tree/HEAD",
       "summary": "Filter SMS and show them in a fake app",
       "webSite": "https://gitlab.com/souch/SMSbypass",
       "added": 1524700800000,
       "icon": "souch.smsbypass.9.png",
       "packageName": "souch.smsbypass",
-      "lastUpdated": 1524700800000,
-      "localized": {
-        "en-US": {
-          "name": "Battery level"
-        }
-      }
+      "lastUpdated": 1524700800000
     },
     {
       "categories": [
@@ -53,6 +50,7 @@
       "name": "Caffeine Tile",
       "summary": "Test app for extracting icons when an XML one is default",
       "added": 1539129600000,
+      "icon": "info.zwanenburg.caffeinetile.4.xml",
       "packageName": "info.zwanenburg.caffeinetile",
       "lastUpdated": 1539129600000
     },
@@ -79,27 +77,13 @@
       "donate": "https://f-droid.org/about",
       "issueTracker": "https://gitlab.com/fdroid/privileged-extension/issues",
       "license": "Apache-2.0",
+      "name": "fake.ota.update_1234",
       "sourceCode": "https://gitlab.com/fdroid/privileged-extension",
       "summary": "Tests whether OTA ZIP files are being include",
       "webSite": "https://f-droid.org",
       "added": 1457568000000,
       "packageName": "fake.ota.update",
-      "lastUpdated": 1457568000000,
-      "localized": {
-        "en-US": {
-          "name": "fake.ota.update_1234"
-        }
-      }
-    },
-    {
-      "suggestedVersionCode": "4",
-      "license": "Unknown",
-      "name": "maxSdkVersion",
-      "summary": "Test setting maxSdkVersion in an APK",
-      "added": 1739805810000,
-      "icon": "org.maxsdkversion.4.png",
-      "packageName": "org.maxsdkversion",
-      "lastUpdated": 1739805810000
+      "lastUpdated": 1457568000000
     },
     {
       "categories": [
@@ -122,16 +106,12 @@
       "suggestedVersionCode": "99999999",
       "liberapay": "12334",
       "license": "GPL-3.0-only",
+      "name": "OBB Main Old Version",
       "sourceCode": "https://github.com/eighthave/urzip",
       "added": 1388448000000,
       "icon": "obb.main.oldversion.1444412523.png",
       "packageName": "obb.main.oldversion",
-      "lastUpdated": 1388448000000,
-      "localized": {
-        "en-US": {
-          "name": "OBB Main Old Version"
-        }
-      }
+      "lastUpdated": 1388448000000
     },
     {
       "bitcoin": "1Fi5xUHiAPRKxHvyUGVFGt9extBe8Srdbk",
@@ -140,16 +120,12 @@
       ],
       "suggestedVersionCode": "99999999",
       "license": "GPL-3.0-only",
+      "name": "OBB Main Two Versions",
       "sourceCode": "https://github.com/eighthave/urzip",
       "added": 1444608000000,
       "icon": "obb.main.twoversions.1101617.png",
       "packageName": "obb.main.twoversions",
-      "lastUpdated": 1466380800000,
-      "localized": {
-        "en-US": {
-          "name": "OBB Main Two Versions"
-        }
-      }
+      "lastUpdated": 1466380800000
     },
     {
       "bitcoin": "1Fi5xUHiAPRKxHvyUGVFGt9extBe8Srdbk",
@@ -158,6 +134,7 @@
       ],
       "suggestedVersionCode": "99999999",
       "license": "GPL-3.0-only",
+      "name": "OBB Main/Patch Current",
       "sourceCode": "https://github.com/eighthave/urzip",
       "added": 1461369600000,
       "icon": "obb.mainpatch.current.1619.png",
@@ -167,7 +144,6 @@
         "en-US": {
           "featureGraphic": "featureGraphic_ffhLaojxbGAfu9ROe1MJgK5ux8d0OVc6b65nmvOBaTk=.png",
           "icon": "icon_WI0pkO3LsklrsTAnRr-OQSxkkoMY41lYe2-fAvXLiLg=.png",
-          "name": "OBB Main/Patch Current",
           "phoneScreenshots": [
             "screenshot-main.png"
           ],
@@ -179,12 +155,9 @@
     },
     {
       "antiFeatures": [
-        "NoSourceSince",
-        "NonFreeNet"
+        "NoSourceSince"
       ],
       "categories": [
-        "Multimedia",
-        "Security",
         "Time"
       ],
       "suggestedVersionName": "1.5",
@@ -192,17 +165,13 @@
       "description": "Activates silent mode during calendar events.",
       "issueTracker": "https://github.com/miguelvps/PoliteDroid/issues",
       "license": "GPL-3.0-only",
+      "name": "Polite Droid",
       "sourceCode": "https://github.com/miguelvps/PoliteDroid",
       "summary": "Calendar tool",
       "added": 1498176000000,
       "icon": "com.politedroid.6.png",
       "packageName": "com.politedroid",
-      "lastUpdated": 1498176000000,
-      "localized": {
-        "en-US": {
-          "name": "Polite Droid"
-        }
-      }
+      "lastUpdated": 1498176000000
     },
     {
       "authorWebSite": "https://guardianproject.info",
@@ -216,7 +185,9 @@
       "suggestedVersionCode": "2147483647",
       "description": "It\u2019s Urzip \u662f\u4e00\u4e2a\u83b7\u5f97\u5df2\u5b89\u88c5 APK \u76f8\u5173\u4fe1\u606f\u7684\u5b9e\u7528\u5de5\u5177\u3002\u5b83\u4ece\u60a8\u7684\u8bbe\u5907\u4e0a\u5df2\u5b89\u88c5\u7684\u6240\u6709\u5e94\u7528\u5f00\u59cb\uff0c\u4e00\u952e\u89e6\u6478\u5373\u53ef\u663e\u793a APK \u7684\u6307\u7eb9\uff0c\u5e76\u4e14\u63d0\u4f9b\u5230\u8fbe virustotal.com \u548c androidobservatory.org \u7684\u5feb\u6377\u94fe\u63a5\uff0c\u8ba9\u60a8\u65b9\u4fbf\u5730\u4e86\u89e3\u7279\u5b9a APK \u7684\u6863\u6848\u3002\u5b83\u8fd8\u53ef\u4ee5\u8ba9\u60a8\u5bfc\u51fa\u7b7e\u540d\u8bc1\u4e66\u548c\u751f\u6210 ApkSignaturePin Pin \u6587\u4ef6\u4f9b TrustedIntents \u5e93\u4f7f\u7528\u3002\n\n\u2605 Urzip \u652f\u6301\u4e0b\u5217\u8bed\u8a00\uff1a Deutsch, English, espa\u00f1ol, suomi, \u65e5\u672c\u8a9e, \ud55c\uad6d\uc5b4, Norsk, portugu\u00eas (Portugal), \u0420\u0443\u0441\u0441\u043a\u0438\u0439, Sloven\u0161\u010dina, T\u00fcrk\u00e7e\n\u6ca1\u770b\u5230\u60a8\u7684\u8bed\u8a00\uff1f\u5e2e\u5fd9\u7ffb\u8bd1\u672c\u5e94\u7528\u5427\uff1a\nhttps://www.transifex.com/projects/p/urzip\n\n\u2605 \u81f4\u7528\u6237\uff1a\u6211\u4eec\u8fd8\u7f3a\u5c11\u4f60\u559c\u6b22\u7684\u529f\u80fd\uff1f\u53d1\u73b0\u4e86\u4e00\u4e2a bug\uff1f\u8bf7\u544a\u8bc9\u6211\u4eec\uff01\u6211\u4eec\u4e50\u4e8e\u542c\u53d6\u60a8\u7684\u610f\u89c1\u3002\u8bf7\u53d1\u9001\u7535\u5b50\u90ae\u4ef6\u81f3: support@guardianproject.info \u6216\u8005\u52a0\u5165\u6211\u4eec\u7684\u804a\u5929\u5ba4 https://guardianproject.info/contact\n",
       "issueTracker": "https://dev.guardianproject.info/projects/urzip/issues",
+      "liberapayID": "9999999",
       "license": "GPL-3.0-only",
+      "name": "urzip-\u03c0\u00c7\u00c7\u03c0\u00c7\u00c7\u73b0\u4ee3\u6c49\u8bed\u901a\u7528\u5b57-\u0431\u044a\u043b\u0433\u0430\u0440\u0441\u043a\u0438-\u0639\u0631\u0628\u064a1234",
       "openCollective": "f-droid-just-testing",
       "sourceCode": "https://github.com/guardianproject/urzip",
       "summary": "\u4e00\u4e2a\u5b9e\u7528\u5de5\u5177\uff0c\u83b7\u53d6\u5df2\u5b89\u88c5\u5728\u60a8\u7684\u8bbe\u5907\u4e0a\u7684\u5e94\u7528\u7684\u6709\u5173\u4fe1\u606f",
@@ -232,8 +203,7 @@
           "icon": "icon_NJXNzMcyf-v9i5a1ElJi0j9X1LvllibCa48xXYPlOqQ=.png",
           "name": "title",
           "summary": "short description",
-          "video": "video",
-          "whatsNew": "default"
+          "video": "video"
         }
       }
     }
@@ -243,8 +213,7 @@
       {
         "added": 1498176000000,
         "antiFeatures": [
-          "KnownVuln",
-          "NonFreeAssets"
+          "NoSourceSince"
         ],
         "apkName": "com.politedroid_6.apk",
         "hash": "70c2f776a2bac38a58a7d521f96ee0414c6f0fb1de973c3ca8b10862a009247d",
@@ -270,6 +239,9 @@
       },
       {
         "added": 1498176000000,
+        "antiFeatures": [
+          "NoSourceSince"
+        ],
         "apkName": "com.politedroid_5.apk",
         "hash": "5bdbfa071cca4b8d05ced41d6b28763595d6e8096cca5bbf0f9253c9a2622e5d",
         "hashType": "sha256",
@@ -294,6 +266,9 @@
       },
       {
         "added": 1498176000000,
+        "antiFeatures": [
+          "NoSourceSince"
+        ],
         "apkName": "com.politedroid_4.apk",
         "hash": "c809bdff83715fbf919f3840ee09869b038e209378b906e135ee40d3f0e1f075",
         "hashType": "sha256",
@@ -331,7 +306,9 @@
         "added": 1498176000000,
         "antiFeatures": [
           "KnownVuln",
-          "NonFreeAssets"
+          "NoSourceSince",
+          "NonFreeAssets",
+          "UpstreamNonFree"
         ],
         "apkName": "com.politedroid_3.apk",
         "hash": "665d03d61ebc642289fda697f71a59305b0202b16cafc5ffdae91cbe91f0b25d",
@@ -660,32 +637,6 @@
         "versionName": "0.1"
       }
     ],
-    "org.maxsdkversion": [
-      {
-        "added": 1739805810000,
-        "apkName": "org.maxsdkversion_4.apk",
-        "features": [
-          "android.hardware.camera.front"
-        ],
-        "hash": "877d582369d2840fc0d6892e44feaaad21419b0e35af42f22b3e127bcd08274d",
-        "hashType": "sha256",
-        "maxSdkVersion": 25,
-        "minSdkVersion": 14,
-        "packageName": "org.maxsdkversion",
-        "sig": "1a5e67bcef6b2d6242f2d36982b54589",
-        "signer": "401a3a5843a3d5cebc22e6de5cb76d08eaa6797122d7fe1283df1d192e132f5e",
-        "size": 12768,
-        "targetSdkVersion": 19,
-        "uses-permission": [
-          [
-            "android.permission.CAMERA",
-            null
-          ]
-        ],
-        "versionCode": 4,
-        "versionName": "1.0.3"
-      }
-    ],
     "souch.smsbypass": [
       {
         "added": 1524700800000,
@@ -729,4 +680,4 @@
       }
     ]
   }
-}
\ No newline at end of file
+}
diff --git a/tests/repo/index-v2.json b/tests/repo/index-v2.json
deleted file mode 100644
index 263dffd2..00000000
--- a/tests/repo/index-v2.json
+++ /dev/null
@@ -1,1472 +0,0 @@
-{
-  "repo": {
-    "name": {
-      "en-US": "My First F-Droid Repo Demo"
-    },
-    "description": {
-      "en-US": "This is a repository of apps to be used with F-Droid. Applications in this repository are either official binaries built by the original application developers, or are binaries built from source by the admin of f-droid.org using the tools on https://gitlab.com/fdroid."
-    },
-    "icon": {
-      "en-US": {
-        "name": "/icons/icon.png",
-        "sha256": "b1f27fa87f8cabca50cdcd462a0f500d79d883b965a498d0e49eea560b39be1f",
-        "size": 715
-      }
-    },
-    "address": "https://MyFirstFDroidRepo.org/fdroid/repo",
-    "mirrors": [
-      {
-        "isPrimary": true,
-        "url": "https://MyFirstFDroidRepo.org/fdroid/repo"
-      },
-      {
-        "url": "http://foobarfoobarfoobar.onion/fdroid/repo"
-      },
-      {
-        "url": "https://foo.bar/fdroid/repo"
-      }
-    ],
-    "timestamp": 1676634233000,
-    "antiFeatures": {
-      "Ads": {
-        "description": {
-          "de": "Diese App enthält Werbung",
-          "en-US": "This app contains advertising",
-          "fa": "این کاره دارای تبلیغات است",
-          "ro": "Aplicația conține reclamă",
-          "zh-rCN": "此应用包含广告"
-        },
-        "icon": {
-          "de": {
-            "name": "/icons/ic_antifeature_ads.xml",
-            "sha256": "b333528573134c5de73484862a1b567a0bdfd6878d183f8500287abadc0ba60e",
-            "size": 1564
-          },
-          "en-US": {
-            "name": "/icons/ic_antifeature_ads.xml",
-            "sha256": "b333528573134c5de73484862a1b567a0bdfd6878d183f8500287abadc0ba60e",
-            "size": 1564
-          },
-          "fa": {
-            "name": "/icons/ic_antifeature_ads.xml",
-            "sha256": "b333528573134c5de73484862a1b567a0bdfd6878d183f8500287abadc0ba60e",
-            "size": 1564
-          },
-          "ro": {
-            "name": "/icons/ic_antifeature_ads.xml",
-            "sha256": "b333528573134c5de73484862a1b567a0bdfd6878d183f8500287abadc0ba60e",
-            "size": 1564
-          },
-          "zh-rCN": {
-            "name": "/icons/ic_antifeature_ads.xml",
-            "sha256": "b333528573134c5de73484862a1b567a0bdfd6878d183f8500287abadc0ba60e",
-            "size": 1564
-          }
-        },
-        "name": {
-          "de": "Werbung",
-          "en-US": "Ads",
-          "fa": "تبلیغات",
-          "ro": "Reclame",
-          "zh-rCN": "广告"
-        }
-      },
-      "DisabledAlgorithm": {
-        "description": {
-          "de": "Diese App hat eine schwache Sicherheitssignatur",
-          "en-US": "This app has a weak security signature",
-          "fa": "این کاره، امضای امنیتی ضعیفی دارد",
-          "ro": "Aplicația are o semnătură slab securizată",
-          "zh-rCN": "此应用的安全签名较弱"
-        },
-        "icon": {
-          "de": {
-            "name": "/icons/ic_antifeature_disabledalgorithm.xml",
-            "sha256": "94dea590c7c0aa37d351ab62a69fc7eefbc2cdbb84b79df3934c2e9332e1dcfb",
-            "size": 2313
-          },
-          "en-US": {
-            "name": "/icons/ic_antifeature_disabledalgorithm.xml",
-            "sha256": "94dea590c7c0aa37d351ab62a69fc7eefbc2cdbb84b79df3934c2e9332e1dcfb",
-            "size": 2313
-          },
-          "fa": {
-            "name": "/icons/ic_antifeature_disabledalgorithm.xml",
-            "sha256": "94dea590c7c0aa37d351ab62a69fc7eefbc2cdbb84b79df3934c2e9332e1dcfb",
-            "size": 2313
-          },
-          "ro": {
-            "name": "/icons/ic_antifeature_disabledalgorithm.xml",
-            "sha256": "94dea590c7c0aa37d351ab62a69fc7eefbc2cdbb84b79df3934c2e9332e1dcfb",
-            "size": 2313
-          },
-          "zh-rCN": {
-            "name": "/icons/ic_antifeature_disabledalgorithm.xml",
-            "sha256": "94dea590c7c0aa37d351ab62a69fc7eefbc2cdbb84b79df3934c2e9332e1dcfb",
-            "size": 2313
-          }
-        },
-        "name": {
-          "de": "Mit einem unsicheren Algorithmus signiert",
-          "en-US": "Signed Using An Unsafe Algorithm",
-          "fa": "امضا شده با الگوریتمی ناامن",
-          "ro": "Algoritm nesigur semnătură",
-          "zh-rCN": "使用不安全算法签名"
-        }
-      },
-      "KnownVuln": {
-        "description": {
-          "de": "Diese App enthält eine bekannte Sicherheitslücke",
-          "en-US": "This app contains a known security vulnerability",
-          "fa": "این کاره، آسیب‌پذیری امنیتی شناخته‌شده‌ای دارد",
-          "ro": "Aplicația conține o vulnerabilitate de securitate cunoscută",
-          "zh-rCN": "此应用包含已知的安全漏洞"
-        },
-        "icon": {
-          "de": {
-            "name": "/icons/ic_antifeature_knownvuln.xml",
-            "sha256": "743ddcad0120896b03bf62bca9b3b9902878ac9366959a0b77b2c50beeb37f9d",
-            "size": 1415
-          },
-          "en-US": {
-            "name": "/icons/ic_antifeature_knownvuln.xml",
-            "sha256": "743ddcad0120896b03bf62bca9b3b9902878ac9366959a0b77b2c50beeb37f9d",
-            "size": 1415
-          },
-          "fa": {
-            "name": "/icons/ic_antifeature_knownvuln.xml",
-            "sha256": "743ddcad0120896b03bf62bca9b3b9902878ac9366959a0b77b2c50beeb37f9d",
-            "size": 1415
-          },
-          "ro": {
-            "name": "/icons/ic_antifeature_knownvuln.xml",
-            "sha256": "743ddcad0120896b03bf62bca9b3b9902878ac9366959a0b77b2c50beeb37f9d",
-            "size": 1415
-          },
-          "zh-rCN": {
-            "name": "/icons/ic_antifeature_knownvuln.xml",
-            "sha256": "743ddcad0120896b03bf62bca9b3b9902878ac9366959a0b77b2c50beeb37f9d",
-            "size": 1415
-          }
-        },
-        "name": {
-          "de": "Bekannte Sicherheitslücke",
-          "en-US": "Known Vulnerability",
-          "fa": "آسیب‌پذیری شناخته",
-          "ro": "Vulnerabilitate cunoscută",
-          "zh-rCN": "含有已知漏洞"
-        }
-      },
-      "NSFW": {
-        "description": {
-          "de": "Diese App enthält Inhalte, die nicht überall veröffentlicht oder sichtbar sein sollten",
-          "en-US": "This app contains content that should not be publicized or visible everywhere",
-          "fa": "این کاره محتوایی دارد که نباید عمومی شده یا همه‌حا نمایان باشد",
-          "ro": "Această aplicație conține conținut care nu ar trebui să fie făcut public sau vizibil peste tot",
-          "zh-rCN": "此应用包含不应宣扬或随处可见的内容"
-        },
-        "icon": {
-          "de": {
-            "name": "/icons/ic_antifeature_nsfw.xml",
-            "sha256": "acab2a7a846700529cd7f2b7a7980f7d04a291f22db8434f3e966f7350ed1465",
-            "size": 871
-          },
-          "en-US": {
-            "name": "/icons/ic_antifeature_nsfw.xml",
-            "sha256": "acab2a7a846700529cd7f2b7a7980f7d04a291f22db8434f3e966f7350ed1465",
-            "size": 871
-          },
-          "fa": {
-            "name": "/icons/ic_antifeature_nsfw.xml",
-            "sha256": "acab2a7a846700529cd7f2b7a7980f7d04a291f22db8434f3e966f7350ed1465",
-            "size": 871
-          },
-          "ro": {
-            "name": "/icons/ic_antifeature_nsfw.xml",
-            "sha256": "acab2a7a846700529cd7f2b7a7980f7d04a291f22db8434f3e966f7350ed1465",
-            "size": 871
-          },
-          "zh-rCN": {
-            "name": "/icons/ic_antifeature_nsfw.xml",
-            "sha256": "acab2a7a846700529cd7f2b7a7980f7d04a291f22db8434f3e966f7350ed1465",
-            "size": 871
-          }
-        },
-        "name": {
-          "de": "NSFW",
-          "en-US": "NSFW",
-          "fa": "NSFW",
-          "ro": "NSFW",
-          "zh-rCN": "NSFW"
-        }
-      },
-      "NoSourceSince": {
-        "description": {
-          "en-US": "The source code is no longer available, no updates possible."
-        },
-        "icon": {
-          "de": {
-            "name": "/icons/ic_antifeature_nosourcesince.xml",
-            "sha256": "69c880b075967fe9598c777e18d600e1c1612bf061111911421fe8f6b9d88d4f",
-            "size": 1102
-          },
-          "en-US": {
-            "name": "/icons/ic_antifeature_nosourcesince.xml",
-            "sha256": "69c880b075967fe9598c777e18d600e1c1612bf061111911421fe8f6b9d88d4f",
-            "size": 1102
-          },
-          "fa": {
-            "name": "/icons/ic_antifeature_nosourcesince.xml",
-            "sha256": "69c880b075967fe9598c777e18d600e1c1612bf061111911421fe8f6b9d88d4f",
-            "size": 1102
-          },
-          "ro": {
-            "name": "/icons/ic_antifeature_nosourcesince.xml",
-            "sha256": "69c880b075967fe9598c777e18d600e1c1612bf061111911421fe8f6b9d88d4f",
-            "size": 1102
-          },
-          "zh-rCN": {
-            "name": "/icons/ic_antifeature_nosourcesince.xml",
-            "sha256": "69c880b075967fe9598c777e18d600e1c1612bf061111911421fe8f6b9d88d4f",
-            "size": 1102
-          }
-        },
-        "name": {
-          "de": "Der Quellcode ist nicht mehr erhältlich, keine Aktualisierungen möglich.",
-          "en-US": "Newer Source Not Available",
-          "fa": "کد مبدأ دیگر در دسترس نیست. به‌روز رسانی ناممکن است.",
-          "ro": "Codul sursă nu mai este disponibil, nu mai există posibilitatea de a actualiza.",
-          "zh-rCN": "源代码不再可用，无法更新。"
-        }
-      },
-      "NonFreeAdd": {
-        "description": {
-          "de": "Diese App bewirbt nicht-quelloffene Erweiterungen",
-          "en-US": "This app promotes non-free add-ons",
-          "fa": "این کاره، افزونه‌های ناآزاد را تبلیغ می‌کند",
-          "ro": "Aplicația promovează anexe ce nu sunt software liber",
-          "zh-rCN": "此应用推广非自由的附加组件"
-        },
-        "icon": {
-          "de": {
-            "name": "/icons/ic_antifeature_nonfreeadd.xml",
-            "sha256": "a1d1f2070bdaabf80ca5a55bccef98c82031ea2f31cc040be5ec009f44ddeef2",
-            "size": 1846
-          },
-          "en-US": {
-            "name": "/icons/ic_antifeature_nonfreeadd.xml",
-            "sha256": "a1d1f2070bdaabf80ca5a55bccef98c82031ea2f31cc040be5ec009f44ddeef2",
-            "size": 1846
-          },
-          "fa": {
-            "name": "/icons/ic_antifeature_nonfreeadd.xml",
-            "sha256": "a1d1f2070bdaabf80ca5a55bccef98c82031ea2f31cc040be5ec009f44ddeef2",
-            "size": 1846
-          },
-          "ro": {
-            "name": "/icons/ic_antifeature_nonfreeadd.xml",
-            "sha256": "a1d1f2070bdaabf80ca5a55bccef98c82031ea2f31cc040be5ec009f44ddeef2",
-            "size": 1846
-          },
-          "zh-rCN": {
-            "name": "/icons/ic_antifeature_nonfreeadd.xml",
-            "sha256": "a1d1f2070bdaabf80ca5a55bccef98c82031ea2f31cc040be5ec009f44ddeef2",
-            "size": 1846
-          }
-        },
-        "name": {
-          "de": "Nicht-quelloffene Erweiterungen",
-          "en-US": "Non-Free Addons",
-          "fa": "افزونه‌های ناآزاد",
-          "ro": "Anexe ne-libere",
-          "zh-rCN": "非自由附加组件"
-        }
-      },
-      "NonFreeAssets": {
-        "description": {
-          "de": "Diese App enthält nicht-quelloffene Bestandteile",
-          "en-US": "This app contains non-free assets",
-          "fa": "این کاره دارای بخش‌های ناآزاد است",
-          "ro": "Aceasta aplicație conține resurse ce nu sunt la disponibile la liber",
-          "zh-rCN": "此应用包含非自由资源"
-        },
-        "icon": {
-          "de": {
-            "name": "/icons/ic_antifeature_nonfreeassets.xml",
-            "sha256": "b39fe384386fc67fb30fa2f91402594110e2e42c961d76adc93141b8bd774008",
-            "size": 1784
-          },
-          "en-US": {
-            "name": "/icons/ic_antifeature_nonfreeassets.xml",
-            "sha256": "b39fe384386fc67fb30fa2f91402594110e2e42c961d76adc93141b8bd774008",
-            "size": 1784
-          },
-          "fa": {
-            "name": "/icons/ic_antifeature_nonfreeassets.xml",
-            "sha256": "b39fe384386fc67fb30fa2f91402594110e2e42c961d76adc93141b8bd774008",
-            "size": 1784
-          },
-          "ro": {
-            "name": "/icons/ic_antifeature_nonfreeassets.xml",
-            "sha256": "b39fe384386fc67fb30fa2f91402594110e2e42c961d76adc93141b8bd774008",
-            "size": 1784
-          },
-          "zh-rCN": {
-            "name": "/icons/ic_antifeature_nonfreeassets.xml",
-            "sha256": "b39fe384386fc67fb30fa2f91402594110e2e42c961d76adc93141b8bd774008",
-            "size": 1784
-          }
-        },
-        "name": {
-          "de": "Nicht-quelloffene Bestandteile",
-          "en-US": "Non-Free Assets",
-          "fa": "بخش‌های ناآزاد",
-          "ro": "Resurse ne-libere",
-          "zh-rCN": "非自由资产"
-        }
-      },
-      "NonFreeDep": {
-        "description": {
-          "de": "Diese App ist abhängig von anderen nicht-quelloffenen Apps",
-          "en-US": "This app depends on other non-free apps",
-          "fa": "این کاره به دیگر کاره‌های ناآزاد وابسته است",
-          "ro": "Aplicația depinde de alte aplicații ce nu sunt software liber",
-          "zh-rCN": "此应用依赖于其它非自由应用"
-        },
-        "icon": {
-          "de": {
-            "name": "/icons/ic_antifeature_nonfreedep.xml",
-            "sha256": "c1b4052a8f58125b2120d9ca07adb725d47bfa7cfcea80c4d6bbbc432b5cb83a",
-            "size": 1396
-          },
-          "en-US": {
-            "name": "/icons/ic_antifeature_nonfreedep.xml",
-            "sha256": "c1b4052a8f58125b2120d9ca07adb725d47bfa7cfcea80c4d6bbbc432b5cb83a",
-            "size": 1396
-          },
-          "fa": {
-            "name": "/icons/ic_antifeature_nonfreedep.xml",
-            "sha256": "c1b4052a8f58125b2120d9ca07adb725d47bfa7cfcea80c4d6bbbc432b5cb83a",
-            "size": 1396
-          },
-          "ro": {
-            "name": "/icons/ic_antifeature_nonfreedep.xml",
-            "sha256": "c1b4052a8f58125b2120d9ca07adb725d47bfa7cfcea80c4d6bbbc432b5cb83a",
-            "size": 1396
-          },
-          "zh-rCN": {
-            "name": "/icons/ic_antifeature_nonfreedep.xml",
-            "sha256": "c1b4052a8f58125b2120d9ca07adb725d47bfa7cfcea80c4d6bbbc432b5cb83a",
-            "size": 1396
-          }
-        },
-        "name": {
-          "de": "Nicht-quelloffene Abhängigkeiten",
-          "en-US": "Non-Free Dependencies",
-          "fa": "وابستگی‌های ناآزاد",
-          "ro": "Dependențe ne-libere",
-          "zh-rCN": "非自由依赖项"
-        }
-      },
-      "NonFreeNet": {
-        "description": {
-          "de": "Diese App bewirbt nicht-quelloffene Netzwerkdienste",
-          "en-US": "This app promotes or depends entirely on a non-changeable or non-free network service",
-          "fa": "این کاره، خدمات شبکه‌های ناآزاد را ترویج می‌کند",
-          "ro": "Aplicația promovează servicii de rețea ce nu sunt accesibile la liber",
-          "zh-rCN": "此应用推广非自由的网络服务"
-        },
-        "icon": {
-          "de": {
-            "name": "/icons/ic_antifeature_nonfreenet.xml",
-            "sha256": "7fff45c847ed2ecc94e85ba2341685c8f113fa5fdf7267a25637dc38ee0275f6",
-            "size": 3038
-          },
-          "en-US": {
-            "name": "/icons/ic_antifeature_nonfreenet.xml",
-            "sha256": "7fff45c847ed2ecc94e85ba2341685c8f113fa5fdf7267a25637dc38ee0275f6",
-            "size": 3038
-          },
-          "fa": {
-            "name": "/icons/ic_antifeature_nonfreenet.xml",
-            "sha256": "7fff45c847ed2ecc94e85ba2341685c8f113fa5fdf7267a25637dc38ee0275f6",
-            "size": 3038
-          },
-          "ro": {
-            "name": "/icons/ic_antifeature_nonfreenet.xml",
-            "sha256": "7fff45c847ed2ecc94e85ba2341685c8f113fa5fdf7267a25637dc38ee0275f6",
-            "size": 3038
-          },
-          "zh-rCN": {
-            "name": "/icons/ic_antifeature_nonfreenet.xml",
-            "sha256": "7fff45c847ed2ecc94e85ba2341685c8f113fa5fdf7267a25637dc38ee0275f6",
-            "size": 3038
-          }
-        },
-        "name": {
-          "de": "Nicht-quelloffene Netzwerkdienste",
-          "en-US": "Non-Free Network Services",
-          "fa": "خدمات شبکه‌ای ناآزاد",
-          "ro": "Servicii de rețea ne-libere",
-          "zh-rCN": "非自由网络服务"
-        }
-      },
-      "Tracking": {
-        "description": {
-          "de": "Diese App verfolgt und versendet Ihre Aktivitäten",
-          "en-US": "This app tracks and reports your activity",
-          "fa": "این کاره، فعّالیتتان را ردیابی و گزارش می‌کند",
-          "ro": "Aplicația îți înregistrează și raportează activitatea undeva",
-          "zh-rCN": "此应用会记录并报告你的活动"
-        },
-        "icon": {
-          "de": {
-            "name": "/icons/ic_antifeature_tracking.xml",
-            "sha256": "4779337b5b0a12c4b4a8a83d0d8a994a2477460db702784df4c8d3e3730be961",
-            "size": 2493
-          },
-          "en-US": {
-            "name": "/icons/ic_antifeature_tracking.xml",
-            "sha256": "4779337b5b0a12c4b4a8a83d0d8a994a2477460db702784df4c8d3e3730be961",
-            "size": 2493
-          },
-          "fa": {
-            "name": "/icons/ic_antifeature_tracking.xml",
-            "sha256": "4779337b5b0a12c4b4a8a83d0d8a994a2477460db702784df4c8d3e3730be961",
-            "size": 2493
-          },
-          "ro": {
-            "name": "/icons/ic_antifeature_tracking.xml",
-            "sha256": "4779337b5b0a12c4b4a8a83d0d8a994a2477460db702784df4c8d3e3730be961",
-            "size": 2493
-          },
-          "zh-rCN": {
-            "name": "/icons/ic_antifeature_tracking.xml",
-            "sha256": "4779337b5b0a12c4b4a8a83d0d8a994a2477460db702784df4c8d3e3730be961",
-            "size": 2493
-          }
-        },
-        "name": {
-          "de": "Tracking",
-          "en-US": "Tracking",
-          "fa": "ردیابی",
-          "ro": "Urmărire",
-          "zh-rCN": "跟踪用户"
-        }
-      }
-    },
-    "categories": {
-      "Time": {
-        "name": {
-          "en-US": "Time"
-        }
-      },
-      "Development": {
-        "name": {
-          "en-US": "Development"
-        }
-      },
-      "GuardianProject": {
-        "name": {
-          "en-US": "Guardian Project"
-        }
-      },
-      "Multimedia": {
-        "name": {
-          "en-US": "Multimedia"
-        }
-      },
-      "Phone & SMS": {
-        "name": {
-          "en-US": "Phone & SMS"
-        }
-      },
-      "Security": {
-        "name": {
-          "en-US": "Security"
-        }
-      },
-      "System": {
-        "name": {
-          "en-US": "System"
-        }
-      },
-      "1": {
-        "name": {
-          "en-US": "1"
-        }
-      },
-      "2.0": {
-        "name": {
-          "en-US": "2.0"
-        }
-      },
-      "tests": {
-        "name": {
-          "en-US": "tests"
-        }
-      }
-    },
-    "requests": {
-      "install": [
-        "org.adaway"
-      ],
-      "uninstall": [
-        "com.android.vending",
-        "com.facebook.orca"
-      ]
-    }
-  },
-  "packages": {
-    "com.politedroid": {
-      "metadata": {
-        "added": 1498176000000,
-        "categories": [
-          "Multimedia",
-          "Security",
-          "Time"
-        ],
-        "issueTracker": "https://github.com/miguelvps/PoliteDroid/issues",
-        "lastUpdated": 1498176000000,
-        "license": "GPL-3.0-only",
-        "sourceCode": "https://github.com/miguelvps/PoliteDroid",
-        "name": {
-          "en-US": "Polite Droid"
-        },
-        "summary": {
-          "en-US": "Calendar tool"
-        },
-        "description": {
-          "en-US": "Activates silent mode during calendar events."
-        },
-        "icon": {
-          "en-US": {
-            "name": "/icons/com.politedroid.6.png",
-            "sha256": "edf8d30b97a06821337e267168b131a6a16d81df9e7007e017778f9781f5c8f3",
-            "size": 559
-          }
-        },
-        "preferredSigner": "32a23624c201b949f085996ba5ed53d40f703aca4989476949cae891022e0ed6"
-      },
-      "versions": {
-        "70c2f776a2bac38a58a7d521f96ee0414c6f0fb1de973c3ca8b10862a009247d": {
-          "added": 1498176000000,
-          "file": {
-            "name": "/com.politedroid_6.apk",
-            "sha256": "70c2f776a2bac38a58a7d521f96ee0414c6f0fb1de973c3ca8b10862a009247d",
-            "size": 16578,
-            "ipfsCIDv1": "bafybeidvgxrq77qr7yqkcnykdfvszsxjqc5kzt6ya5k7r666wriadrylt4"
-          },
-          "manifest": {
-            "versionName": "1.5",
-            "versionCode": 6,
-            "usesSdk": {
-              "minSdkVersion": 14,
-              "targetSdkVersion": 21
-            },
-            "signer": {
-              "sha256": [
-                "32a23624c201b949f085996ba5ed53d40f703aca4989476949cae891022e0ed6"
-              ]
-            },
-            "usesPermission": [
-              {
-                "name": "android.permission.READ_CALENDAR"
-              },
-              {
-                "name": "android.permission.RECEIVE_BOOT_COMPLETED"
-              }
-            ]
-          },
-          "antiFeatures": {
-            "KnownVuln": {},
-            "NoSourceSince": {
-              "en-US": "1.5"
-            },
-            "NonFreeAssets": {},
-            "NonFreeNet": {}
-          }
-        },
-        "5bdbfa071cca4b8d05ced41d6b28763595d6e8096cca5bbf0f9253c9a2622e5d": {
-          "added": 1498176000000,
-          "file": {
-            "name": "/com.politedroid_5.apk",
-            "sha256": "5bdbfa071cca4b8d05ced41d6b28763595d6e8096cca5bbf0f9253c9a2622e5d",
-            "size": 18817,
-            "ipfsCIDv1": "bafybeifbrio5rumqvgfd5sihs7yihux2yktfvd5i7jimlgrwchzcvi6ldu"
-          },
-          "manifest": {
-            "versionName": "1.4",
-            "versionCode": 5,
-            "usesSdk": {
-              "minSdkVersion": 3,
-              "targetSdkVersion": 10
-            },
-            "signer": {
-              "sha256": [
-                "32a23624c201b949f085996ba5ed53d40f703aca4989476949cae891022e0ed6"
-              ]
-            },
-            "usesPermission": [
-              {
-                "name": "android.permission.READ_CALENDAR"
-              },
-              {
-                "name": "android.permission.RECEIVE_BOOT_COMPLETED"
-              }
-            ]
-          },
-          "antiFeatures": {
-            "NoSourceSince": {
-              "en-US": "1.5"
-            },
-            "NonFreeNet": {}
-          }
-        },
-        "c809bdff83715fbf919f3840ee09869b038e209378b906e135ee40d3f0e1f075": {
-          "added": 1498176000000,
-          "file": {
-            "name": "/com.politedroid_4.apk",
-            "sha256": "c809bdff83715fbf919f3840ee09869b038e209378b906e135ee40d3f0e1f075",
-            "size": 18489,
-            "ipfsCIDv1": "bafybeicridbev22c2rt3lwbfsrkafcf3yepak7kpvk6zgbayrxls2mmwim"
-          },
-          "manifest": {
-            "versionName": "1.3",
-            "versionCode": 4,
-            "usesSdk": {
-              "minSdkVersion": 3,
-              "targetSdkVersion": 3
-            },
-            "signer": {
-              "sha256": [
-                "32a23624c201b949f085996ba5ed53d40f703aca4989476949cae891022e0ed6"
-              ]
-            },
-            "usesPermission": [
-              {
-                "name": "android.permission.READ_CALENDAR"
-              },
-              {
-                "name": "android.permission.RECEIVE_BOOT_COMPLETED"
-              },
-              {
-                "name": "android.permission.WRITE_EXTERNAL_STORAGE"
-              },
-              {
-                "name": "android.permission.READ_PHONE_STATE"
-              },
-              {
-                "name": "android.permission.READ_EXTERNAL_STORAGE"
-              }
-            ]
-          },
-          "antiFeatures": {
-            "NoSourceSince": {
-              "en-US": "1.5"
-            },
-            "NonFreeNet": {}
-          }
-        },
-        "665d03d61ebc642289fda697f71a59305b0202b16cafc5ffdae91cbe91f0b25d": {
-          "added": 1498176000000,
-          "file": {
-            "name": "/com.politedroid_3.apk",
-            "sha256": "665d03d61ebc642289fda697f71a59305b0202b16cafc5ffdae91cbe91f0b25d",
-            "size": 17552,
-            "ipfsCIDv1": "bafybeib7arokhivttalcnq5ieu5fx5pzn7vo5qpmdiozqodzhb4ba53nd4"
-          },
-          "manifest": {
-            "versionName": "1.2",
-            "versionCode": 3,
-            "usesSdk": {
-              "minSdkVersion": 3,
-              "targetSdkVersion": 3
-            },
-            "signer": {
-              "sha256": [
-                "32a23624c201b949f085996ba5ed53d40f703aca4989476949cae891022e0ed6"
-              ]
-            },
-            "usesPermission": [
-              {
-                "name": "android.permission.READ_CALENDAR"
-              },
-              {
-                "name": "android.permission.RECEIVE_BOOT_COMPLETED"
-              },
-              {
-                "name": "android.permission.WRITE_EXTERNAL_STORAGE"
-              },
-              {
-                "name": "android.permission.READ_PHONE_STATE"
-              },
-              {
-                "name": "android.permission.READ_EXTERNAL_STORAGE"
-              }
-            ]
-          },
-          "antiFeatures": {
-            "KnownVuln": {},
-            "NoSourceSince": {
-              "en-US": "1.5"
-            },
-            "NonFreeAssets": {},
-            "NonFreeNet": {}
-          }
-        }
-      }
-    },
-    "duplicate.permisssions": {
-      "metadata": {
-        "added": 1513900800000,
-        "categories": [
-          "tests"
-        ],
-        "lastUpdated": 1513900800000,
-        "name": {
-          "en-US": "Duplicate Permisssions"
-        },
-        "summary": {
-          "en-US": "Test app for all possible <uses-permissions>"
-        },
-        "icon": {
-          "en-US": {
-            "name": "/icons/duplicate.permisssions.9999999.png",
-            "sha256": "fb0f3bb45312b53e349a762b67af4f48d010a38a245f75c3a0b152097d7b067f",
-            "size": 1301
-          }
-        },
-        "preferredSigner": "659e1fd284549f70d13fb02c620100e27eeea3420558cce62b0f5d4cf2b77d84"
-      },
-      "versions": {
-        "8367857fe75f85321ce2c344b34804d0bc193707f6ba03710d025d9030803434": {
-          "added": 1513900800000,
-          "file": {
-            "name": "/duplicate.permisssions_9999999.apk",
-            "sha256": "8367857fe75f85321ce2c344b34804d0bc193707f6ba03710d025d9030803434",
-            "size": 27446,
-            "ipfsCIDv1": "bafybeicucr4lk7fynyde4fpxubudpl6m6wqnuq2j6vjroutjyryw24en3u"
-          },
-          "manifest": {
-            "versionName": "",
-            "versionCode": 9999999,
-            "usesSdk": {
-              "minSdkVersion": 18,
-              "targetSdkVersion": 27
-            },
-            "signer": {
-              "sha256": [
-                "659e1fd284549f70d13fb02c620100e27eeea3420558cce62b0f5d4cf2b77d84"
-              ]
-            },
-            "usesPermission": [
-              {
-                "name": "android.permission.INTERNET"
-              },
-              {
-                "name": "android.permission.ACCESS_NETWORK_STATE"
-              },
-              {
-                "name": "android.permission.ACCESS_WIFI_STATE"
-              },
-              {
-                "name": "android.permission.CHANGE_WIFI_MULTICAST_STATE"
-              },
-              {
-                "name": "android.permission.INTERNET"
-              },
-              {
-                "name": "android.permission.WRITE_EXTERNAL_STORAGE",
-                "maxSdkVersion": 18
-              },
-              {
-                "name": "android.permission.READ_EXTERNAL_STORAGE",
-                "maxSdkVersion": 18
-              }
-            ],
-            "usesPermissionSdk23": [
-              {
-                "name": "android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS",
-                "maxSdkVersion": 27
-              },
-              {
-                "name": "android.permission.REQUEST_INSTALL_PACKAGES"
-              }
-            ]
-          }
-        }
-      }
-    },
-    "fake.ota.update": {
-      "metadata": {
-        "added": 1457568000000,
-        "categories": [
-          "System"
-        ],
-        "issueTracker": "https://gitlab.com/fdroid/privileged-extension/issues",
-        "lastUpdated": 1457568000000,
-        "license": "Apache-2.0",
-        "sourceCode": "https://gitlab.com/fdroid/privileged-extension",
-        "webSite": "https://f-droid.org",
-        "name": {
-          "en-US": "fake.ota.update_1234"
-        },
-        "summary": {
-          "en-US": "Tests whether OTA ZIP files are being include"
-        },
-        "description": {
-          "en-US": "F-Droid can make use of system privileges or permissions to\ninstall, update and remove applications on its own. The only way to obtain those\nprivileges is to become a system app.\n\nThis is where the Privileged Extension comes in - being a separate app and much\nsmaller, it can be installed as a system app and communicate with the main app\nvia AIDL IPC.\n\nThis has several advantages:\n\n* Reduced disk usage in the system partition\n* System updates don't remove F-Droid\n* The process of installing into system via root is safer\n\nThis is packaged as an OTA (Over-The-Air) update ZIP file.  It must be installed\nusing TWRP or other Android recovery that can flash updates to the system from\nthe /data/data/org.fdroid.fdroid folder on the /data partition. The standalone\nAPK is called F-Droid Privileged Extension."
-        },
-        "donate": [
-          "https://f-droid.org/about"
-        ]
-      },
-      "versions": {
-        "897a92a4ccff4f415f6ba275b2af16d4ecaee60a983b215bddcb9f8964e7a24c": {
-          "added": 1457568000000,
-          "file": {
-            "name": "/fake.ota.update_1234.zip",
-            "sha256": "897a92a4ccff4f415f6ba275b2af16d4ecaee60a983b215bddcb9f8964e7a24c",
-            "size": 233
-          },
-          "manifest": {
-            "versionName": "897a92a",
-            "versionCode": 1234
-          }
-        }
-      }
-    },
-    "info.guardianproject.urzip": {
-      "metadata": {
-        "added": 1466640000000,
-        "categories": [
-          "Development",
-          "GuardianProject",
-          "1",
-          "2.0"
-        ],
-        "issueTracker": "https://dev.guardianproject.info/projects/urzip/issues",
-        "lastUpdated": 1466640000000,
-        "license": "GPL-3.0-only",
-        "sourceCode": "https://github.com/guardianproject/urzip",
-        "webSite": "https://dev.guardianproject.info/projects/urzip",
-        "featureGraphic": {
-          "en-US": {
-            "name": "/info.guardianproject.urzip/en-US/featureGraphic_GFRT5BovZsENGpJq1HqPODGWBRPWQsx25B95Ol5w_wU=.png",
-            "sha256": "185453e41a2f66c10d1a926ad47a8f3831960513d642cc76e41f793a5e70ff05",
-            "size": 36027
-          }
-        },
-        "authorWebSite": "https://guardianproject.info",
-        "bitcoin": "1Fi5xUHiAPRKxHvyUGVFGt9extBe8Srdbk",
-        "openCollective": "f-droid-just-testing",
-        "name": {
-          "en-US": "title"
-        },
-        "summary": {
-          "en-US": "一个实用工具，获取已安装在您的设备上的应用的有关信息"
-        },
-        "description": {
-          "en-US": "It’s Urzip 是一个获得已安装 APK 相关信息的实用工具。它从您的设备上已安装的所有应用开始，一键触摸即可显示 APK 的指纹，并且提供到达 virustotal.com 和 androidobservatory.org 的快捷链接，让您方便地了解特定 APK 的档案。它还可以让您导出签名证书和生成 ApkSignaturePin Pin 文件供 TrustedIntents 库使用。\n\n★ Urzip 支持下列语言： Deutsch, English, español, suomi, 日本語, 한국어, Norsk, português (Portugal), Русский, Slovenščina, Türkçe\n没看到您的语言？帮忙翻译本应用吧：\nhttps://www.transifex.com/projects/p/urzip\n\n★ 致用户：我们还缺少你喜欢的功能？发现了一个 bug？请告诉我们！我们乐于听取您的意见。请发送电子邮件至: support@guardianproject.info 或者加入我们的聊天室 https://guardianproject.info/contact\n"
-        },
-        "video": {
-          "en-US": "video"
-        },
-        "icon": {
-          "en-US": {
-            "name": "/info.guardianproject.urzip/en-US/icon_NJXNzMcyf-v9i5a1ElJi0j9X1LvllibCa48xXYPlOqQ=.png",
-            "sha256": "3495cdccc7327febfd8b96b5125262d23f57d4bbe59626c26b8f315d83e53aa4",
-            "size": 1413
-          }
-        },
-        "preferredSigner": "32a23624c201b949f085996ba5ed53d40f703aca4989476949cae891022e0ed6"
-      },
-      "versions": {
-        "15c0ec72c74a3791f42cdb43c57df0fb11a4dbb656851bbb8cf05b26a8372789": {
-          "added": 1466640000000,
-          "file": {
-            "name": "/urzip-; Рахма́, [rɐxˈmanʲɪnəf] سيرجي_رخمانينوف 谢·.apk",
-            "sha256": "15c0ec72c74a3791f42cdb43c57df0fb11a4dbb656851bbb8cf05b26a8372789",
-            "size": 11471,
-            "ipfsCIDv1": "bafybeig77jwqx243si3gh55iqx4gkcxhltkt6pjimzgigfsk3kshsi6qem"
-          },
-          "manifest": {
-            "versionName": "0.1",
-            "versionCode": 100,
-            "usesSdk": {
-              "minSdkVersion": 4,
-              "targetSdkVersion": 18
-            },
-            "signer": {
-              "sha256": [
-                "32a23624c201b949f085996ba5ed53d40f703aca4989476949cae891022e0ed6"
-              ]
-            }
-          }
-        }
-      }
-    },
-    "info.zwanenburg.caffeinetile": {
-      "metadata": {
-        "added": 1539129600000,
-        "categories": [
-          "Development"
-        ],
-        "lastUpdated": 1539129600000,
-        "name": {
-          "en-US": "Caffeine Tile"
-        },
-        "summary": {
-          "en-US": "Test app for extracting icons when an XML one is default"
-        },
-        "preferredSigner": "51cfa5c8a743833ad89acf81cb755936876a5c8b8eca54d1ffdcec0cdca25d0e"
-      },
-      "versions": {
-        "dbbdd7deadb038862f426b71efe4a64df8c3edf25d669e935f349510e16f65db": {
-          "added": 1539129600000,
-          "file": {
-            "name": "/info.zwanenburg.caffeinetile_4.apk",
-            "sha256": "dbbdd7deadb038862f426b71efe4a64df8c3edf25d669e935f349510e16f65db",
-            "size": 11740,
-            "ipfsCIDv1": "bafybeigormhkorw3mk6pkkfk63kkmxpvwylthgj67geulvskc5acr65sym"
-          },
-          "manifest": {
-            "versionName": "1.3",
-            "versionCode": 4,
-            "usesSdk": {
-              "minSdkVersion": 24,
-              "targetSdkVersion": 25
-            },
-            "signer": {
-              "sha256": [
-                "51cfa5c8a743833ad89acf81cb755936876a5c8b8eca54d1ffdcec0cdca25d0e"
-              ]
-            },
-            "usesPermission": [
-              {
-                "name": "android.permission.WAKE_LOCK"
-              }
-            ]
-          }
-        }
-      }
-    },
-    "no.min.target.sdk": {
-      "metadata": {
-        "added": 1539129600000,
-        "categories": [
-          "Development"
-        ],
-        "lastUpdated": 1539129600000,
-        "name": {
-          "en-US": "No minSdkVersion or targetSdkVersion"
-        },
-        "summary": {
-          "en-US": "An APK without any <uses-sdk> block in AndroidManifest.xml"
-        },
-        "icon": {
-          "en-US": {
-            "name": "/icons/no.min.target.sdk.987.png",
-            "sha256": "fb0f3bb45312b53e349a762b67af4f48d010a38a245f75c3a0b152097d7b067f",
-            "size": 1301
-          }
-        },
-        "preferredSigner": "32a23624c201b949f085996ba5ed53d40f703aca4989476949cae891022e0ed6"
-      },
-      "versions": {
-        "e2e1dc1d550df2b5bc383860139207258645b5540abeccd305ed8b2cb6459d2c": {
-          "added": 1539129600000,
-          "file": {
-            "name": "/no.min.target.sdk_987.apk",
-            "sha256": "e2e1dc1d550df2b5bc383860139207258645b5540abeccd305ed8b2cb6459d2c",
-            "size": 14102,
-            "ipfsCIDv1": "bafybeidwxseoagnew3gtlasttqovl7ciuwxaud5a5p4a5pzpbrfcfj2gaa"
-          },
-          "manifest": {
-            "versionName": "1.2-fake",
-            "versionCode": 987,
-            "usesSdk": {
-              "minSdkVersion": 3,
-              "targetSdkVersion": 3
-            },
-            "signer": {
-              "sha256": [
-                "32a23624c201b949f085996ba5ed53d40f703aca4989476949cae891022e0ed6"
-              ]
-            },
-            "usesPermission": [
-              {
-                "name": "android.permission.WRITE_EXTERNAL_STORAGE"
-              },
-              {
-                "name": "android.permission.READ_PHONE_STATE"
-              },
-              {
-                "name": "android.permission.READ_EXTERNAL_STORAGE"
-              }
-            ]
-          }
-        }
-      }
-    },
-    "obb.main.oldversion": {
-      "metadata": {
-        "added": 1388448000000,
-        "categories": [
-          "Development"
-        ],
-        "lastUpdated": 1388448000000,
-        "license": "GPL-3.0-only",
-        "sourceCode": "https://github.com/eighthave/urzip",
-        "bitcoin": "1Fi5xUHiAPRKxHvyUGVFGt9extBe8Srdbk",
-        "liberapay": "12334",
-        "name": {
-          "en-US": "OBB Main Old Version"
-        },
-        "icon": {
-          "en-US": {
-            "name": "/icons/obb.main.oldversion.1444412523.png",
-            "sha256": "fb0f3bb45312b53e349a762b67af4f48d010a38a245f75c3a0b152097d7b067f",
-            "size": 1301
-          }
-        },
-        "preferredSigner": "818e469465f96b704e27be2fee4c63ab9f83ddf30e7a34c7371a4728d83b0bc1"
-      },
-      "versions": {
-        "c5f149e526f89c05c62923bdb7bb1e2be5673c46ec85143f41e514340631449c": {
-          "added": 1388448000000,
-          "file": {
-            "name": "/obb.main.oldversion_1444412523.apk",
-            "sha256": "c5f149e526f89c05c62923bdb7bb1e2be5673c46ec85143f41e514340631449c",
-            "size": 14323,
-            "ipfsCIDv1": "bafybeicnwnpiyfke3tbk3nve62meig65vved34i6kesjkksdciff6242ui"
-          },
-          "obbMainFile": {
-            "name": "/main.1434483388.obb.main.oldversion.obb",
-            "sha256": "d3eb539a556352f3f47881d71fb0e5777b2f3e9a4251d283c18c67ce996774b7",
-            "size": 6
-          },
-          "manifest": {
-            "versionName": "0.1",
-            "versionCode": 1444412523,
-            "usesSdk": {
-              "minSdkVersion": 4,
-              "targetSdkVersion": 18
-            },
-            "signer": {
-              "sha256": [
-                "818e469465f96b704e27be2fee4c63ab9f83ddf30e7a34c7371a4728d83b0bc1"
-              ]
-            },
-            "usesPermission": [
-              {
-                "name": "android.permission.INTERNET"
-              },
-              {
-                "name": "android.permission.ACCESS_NETWORK_STATE",
-                "maxSdkVersion": 22
-              },
-              {
-                "name": "android.permission.ACCESS_WIFI_STATE"
-              },
-              {
-                "name": "android.permission.CHANGE_WIFI_MULTICAST_STATE"
-              },
-              {
-                "name": "android.permission.CHANGE_NETWORK_STATE"
-              },
-              {
-                "name": "android.permission.CHANGE_WIFI_STATE"
-              },
-              {
-                "name": "android.permission.BLUETOOTH"
-              },
-              {
-                "name": "android.permission.BLUETOOTH_ADMIN",
-                "maxSdkVersion": 18
-              },
-              {
-                "name": "android.permission.RECEIVE_BOOT_COMPLETED"
-              },
-              {
-                "name": "android.permission.NFC"
-              }
-            ],
-            "usesPermissionSdk23": [
-              {
-                "name": "android.permission.WRITE_EXTERNAL_STORAGE"
-              },
-              {
-                "name": "android.permission.WRITE_SETTINGS",
-                "maxSdkVersion": 25
-              }
-            ]
-          },
-          "releaseChannels": [
-            "Beta"
-          ]
-        }
-      }
-    },
-    "obb.main.twoversions": {
-      "metadata": {
-        "added": 1444608000000,
-        "categories": [
-          "Development"
-        ],
-        "lastUpdated": 1466380800000,
-        "license": "GPL-3.0-only",
-        "sourceCode": "https://github.com/eighthave/urzip",
-        "bitcoin": "1Fi5xUHiAPRKxHvyUGVFGt9extBe8Srdbk",
-        "name": {
-          "en-US": "OBB Main Two Versions"
-        },
-        "icon": {
-          "en-US": {
-            "name": "/icons/obb.main.twoversions.1101617.png",
-            "sha256": "d27c9866adeda6dd466628e43c62ccac95a0e9480c4bb095ac7e0b1c2b58a77d",
-            "size": 1413
-          }
-        },
-        "preferredSigner": "32a23624c201b949f085996ba5ed53d40f703aca4989476949cae891022e0ed6"
-      },
-      "versions": {
-        "9bc74566f089ef030ac33e7fbd99d92f1a38f363fb499fed138d9e7b774e821c": {
-          "added": 1466380800000,
-          "file": {
-            "name": "/obb.main.twoversions_1101617.apk",
-            "sha256": "9bc74566f089ef030ac33e7fbd99d92f1a38f363fb499fed138d9e7b774e821c",
-            "size": 11481,
-            "ipfsCIDv1": "bafybeiblpfmwololxgsrum337rbbbsqg2gk6hytvt6szf4njubosju3bme"
-          },
-          "src": {
-            "name": "/obb.main.twoversions_1101617_src.tar.gz",
-            "sha256": "3115241ed53aa047191f64db2c14e609a7dc0a803211f56a9b17e2d027763f9d",
-            "size": 150
-          },
-          "obbMainFile": {
-            "name": "/main.1101615.obb.main.twoversions.obb",
-            "sha256": "d3eb539a556352f3f47881d71fb0e5777b2f3e9a4251d283c18c67ce996774b7",
-            "size": 6
-          },
-          "manifest": {
-            "versionName": "0.1",
-            "versionCode": 1101617,
-            "usesSdk": {
-              "minSdkVersion": 4,
-              "targetSdkVersion": 18
-            },
-            "signer": {
-              "sha256": [
-                "32a23624c201b949f085996ba5ed53d40f703aca4989476949cae891022e0ed6"
-              ]
-            }
-          }
-        },
-        "7b0b7b9ba248e15751a16e3a0e01e1e24cbb673686c38422030cb75d5c33f0bb": {
-          "added": 1451606400000,
-          "file": {
-            "name": "/obb.main.twoversions_1101615.apk",
-            "sha256": "7b0b7b9ba248e15751a16e3a0e01e1e24cbb673686c38422030cb75d5c33f0bb",
-            "size": 11480,
-            "ipfsCIDv1": "bafybeigglr3iefb3es4lp2sgfacppk3w2qqtuykjgf4actebpalyizef3q"
-          },
-          "obbMainFile": {
-            "name": "/main.1101615.obb.main.twoversions.obb",
-            "sha256": "d3eb539a556352f3f47881d71fb0e5777b2f3e9a4251d283c18c67ce996774b7",
-            "size": 6
-          },
-          "manifest": {
-            "versionName": "0.1",
-            "versionCode": 1101615,
-            "usesSdk": {
-              "minSdkVersion": 4,
-              "targetSdkVersion": 18
-            },
-            "signer": {
-              "sha256": [
-                "32a23624c201b949f085996ba5ed53d40f703aca4989476949cae891022e0ed6"
-              ]
-            }
-          }
-        },
-        "cce97a52ff18d843185be7f22ecb1a557c36b7a9f8ba07a8be94e328e00b35dc": {
-          "added": 1444608000000,
-          "file": {
-            "name": "/obb.main.twoversions_1101613.apk",
-            "sha256": "cce97a52ff18d843185be7f22ecb1a557c36b7a9f8ba07a8be94e328e00b35dc",
-            "size": 11477,
-            "ipfsCIDv1": "bafybeicocjo4khzp2rkui2ltvrhbksrm373lr3pb43ut7hqgbllfjpv6ti"
-          },
-          "obbMainFile": {
-            "name": "/main.1101613.obb.main.twoversions.obb",
-            "sha256": "d3eb539a556352f3f47881d71fb0e5777b2f3e9a4251d283c18c67ce996774b7",
-            "size": 6
-          },
-          "manifest": {
-            "versionName": "0.1",
-            "versionCode": 1101613,
-            "usesSdk": {
-              "minSdkVersion": 4,
-              "targetSdkVersion": 18
-            },
-            "signer": {
-              "sha256": [
-                "32a23624c201b949f085996ba5ed53d40f703aca4989476949cae891022e0ed6"
-              ]
-            }
-          }
-        }
-      }
-    },
-    "obb.mainpatch.current": {
-      "metadata": {
-        "added": 1461369600000,
-        "categories": [
-          "Development"
-        ],
-        "lastUpdated": 1496275200000,
-        "license": "GPL-3.0-only",
-        "sourceCode": "https://github.com/eighthave/urzip",
-        "featureGraphic": {
-          "en-US": {
-            "name": "/obb.mainpatch.current/en-US/featureGraphic_ffhLaojxbGAfu9ROe1MJgK5ux8d0OVc6b65nmvOBaTk=.png",
-            "sha256": "7df84b6a88f16c601fbbd44e7b530980ae6ec7c77439573a6fae679af3816939",
-            "size": 24336
-          }
-        },
-        "screenshots": {
-          "phone": {
-            "en-US": [
-              {
-                "name": "/obb.mainpatch.current/en-US/phoneScreenshots/screenshot-main.png",
-                "sha256": "719f95f0811e6e6e03e6dbd47553eafe9d8d96b14107e26f2dee3ccdabbdc6bf",
-                "size": 44990
-              }
-            ]
-          },
-          "sevenInch": {
-            "en-US": [
-              {
-                "name": "/obb.mainpatch.current/en-US/sevenInchScreenshots/screenshot-tablet-main.png",
-                "sha256": "460c6ce2e5e3987ae6688f398c9093a07802991e7cdee559a578f201189c6630",
-                "size": 56049
-              }
-            ]
-          }
-        },
-        "bitcoin": "1Fi5xUHiAPRKxHvyUGVFGt9extBe8Srdbk",
-        "name": {
-          "en-US": "OBB Main/Patch Current"
-        },
-        "icon": {
-          "en-US": {
-            "name": "/obb.mainpatch.current/en-US/icon_WI0pkO3LsklrsTAnRr-OQSxkkoMY41lYe2-fAvXLiLg=.png",
-            "sha256": "588d2990edcbb2496bb1302746bf8e412c64928318e359587b6f9f02f5cb88b8",
-            "size": 260113
-          }
-        },
-        "preferredSigner": "32a23624c201b949f085996ba5ed53d40f703aca4989476949cae891022e0ed6"
-      },
-      "versions": {
-        "eda5fc3ecfdac3252717e36bdbc9820865baeef162264af9ba5db7364f0e7a0c": {
-          "added": 1461369600000,
-          "file": {
-            "name": "/obb.mainpatch.current_1619.apk",
-            "sha256": "eda5fc3ecfdac3252717e36bdbc9820865baeef162264af9ba5db7364f0e7a0c",
-            "size": 11479,
-            "ipfsCIDv1": "bafybeievo4e234mllujityvtjgeltauyfbriszoqddzygmimcm4mo3zyqu"
-          },
-          "obbMainFile": {
-            "name": "/main.1619.obb.mainpatch.current.obb",
-            "sha256": "d3eb539a556352f3f47881d71fb0e5777b2f3e9a4251d283c18c67ce996774b7",
-            "size": 6
-          },
-          "obbPatchFile": {
-            "name": "/patch.1619.obb.mainpatch.current.obb",
-            "sha256": "d3eb539a556352f3f47881d71fb0e5777b2f3e9a4251d283c18c67ce996774b7",
-            "size": 6
-          },
-          "manifest": {
-            "versionName": "0.1",
-            "versionCode": 1619,
-            "usesSdk": {
-              "minSdkVersion": 4,
-              "targetSdkVersion": 18
-            },
-            "signer": {
-              "sha256": [
-                "32a23624c201b949f085996ba5ed53d40f703aca4989476949cae891022e0ed6"
-              ]
-            }
-          }
-        },
-        "42e7d6d2f8254aaf9fe95ba6ecc233ee8c3cd543a3e4f3f9ebe1b638221122fa": {
-          "added": 1496275200000,
-          "file": {
-            "name": "/obb.mainpatch.current_1619_another-release-key.apk",
-            "sha256": "42e7d6d2f8254aaf9fe95ba6ecc233ee8c3cd543a3e4f3f9ebe1b638221122fa",
-            "size": 10541,
-            "ipfsCIDv1": "bafybeiatdbzlxairqzvdowevwuy7nk24rknc55jpip2wb2sq4c3f7mtngm"
-          },
-          "obbMainFile": {
-            "name": "/main.1619.obb.mainpatch.current.obb",
-            "sha256": "d3eb539a556352f3f47881d71fb0e5777b2f3e9a4251d283c18c67ce996774b7",
-            "size": 6
-          },
-          "obbPatchFile": {
-            "name": "/patch.1619.obb.mainpatch.current.obb",
-            "sha256": "d3eb539a556352f3f47881d71fb0e5777b2f3e9a4251d283c18c67ce996774b7",
-            "size": 6
-          },
-          "manifest": {
-            "versionName": "0.1",
-            "versionCode": 1619,
-            "usesSdk": {
-              "minSdkVersion": 4,
-              "targetSdkVersion": 18
-            },
-            "signer": {
-              "sha256": [
-                "ce9e200667f02d96d49891a2e08a3c178870e91853d61bdd33ef5f0b54701aa5"
-              ]
-            }
-          }
-        }
-      }
-    },
-    "org.maxsdkversion": {
-      "metadata": {
-        "added": 1739805810000,
-        "lastUpdated": 1739805810000,
-        "name": {
-          "en-US": "maxSdkVersion"
-        },
-        "summary": {
-          "en-US": "Test setting maxSdkVersion in an APK"
-        },
-        "icon": {
-          "en-US": {
-            "name": "/icons/org.maxsdkversion.4.png",
-            "sha256": "428442a0b75be04af3191a066041341f8a0b289972f99868687f43e02055a348",
-            "size": 91
-          }
-        },
-        "preferredSigner": "401a3a5843a3d5cebc22e6de5cb76d08eaa6797122d7fe1283df1d192e132f5e"
-      },
-      "versions": {
-        "877d582369d2840fc0d6892e44feaaad21419b0e35af42f22b3e127bcd08274d": {
-          "added": 1739805810000,
-          "file": {
-            "name": "/org.maxsdkversion_4.apk",
-            "sha256": "877d582369d2840fc0d6892e44feaaad21419b0e35af42f22b3e127bcd08274d",
-            "size": 12768,
-            "ipfsCIDv1": "bafybeibdls2h4mpfw5gks3iirsne2qaez6uefwb5xmqkhahqbakvdszk6y"
-          },
-          "manifest": {
-            "versionName": "1.0.3",
-            "maxSdkVersion": 25,
-            "versionCode": 4,
-            "features": [
-              {
-                "name": "android.hardware.camera.front"
-              }
-            ],
-            "usesSdk": {
-              "minSdkVersion": 14,
-              "targetSdkVersion": 19
-            },
-            "signer": {
-              "sha256": [
-                "401a3a5843a3d5cebc22e6de5cb76d08eaa6797122d7fe1283df1d192e132f5e"
-              ]
-            },
-            "usesPermission": [
-              {
-                "name": "android.permission.CAMERA"
-              }
-            ]
-          }
-        }
-      }
-    },
-    "souch.smsbypass": {
-      "metadata": {
-        "added": 1524700800000,
-        "categories": [
-          "Phone & SMS"
-        ],
-        "issueTracker": "https://gitlab.com/souch/SMSbypass/issues",
-        "lastUpdated": 1524700800000,
-        "license": "GPL-3.0-only",
-        "sourceCode": "https://gitlab.com/souch/SMSbypass/tree/HEAD",
-        "webSite": "https://gitlab.com/souch/SMSbypass",
-        "name": {
-          "en-US": "Battery level"
-        },
-        "summary": {
-          "en-US": "Filter SMS and show them in a fake app"
-        },
-        "description": {
-          "en-US": "In order to keep away curious eyes, SMS-bypass filters incoming SMS messages\nbefore they reach your inbox. Based on bughunter2.smsfilter.\n\nFeatures:\n\n* Discrete fake app \"Battery level\": Long tap on Battery percentage will show SMS.\n* Filter incoming SMS specified address: redirect the SMS to SMS-bypass messages list; remove SMS arrival sound or vibration; show a discreet notification icon (battery level); vibrate if checked in settings\n* Add contact from contact list\n* Export messages to a text file"
-        },
-        "donate": [
-          "http://rodolphe.souchaud.free.fr/donate"
-        ],
-        "icon": {
-          "en-US": {
-            "name": "/icons/souch.smsbypass.9.png",
-            "sha256": "8fee034537477fcd40fd33887868786b70258fcf7b9acffaff7436bca8748c8a",
-            "size": 1558
-          }
-        },
-        "preferredSigner": "d3aec784b1fd71549fc22c999789122e3639895db6bd585da5835fbe3db6985c"
-      },
-      "versions": {
-        "80b0ae68a1189baa3ee6717092e3dbf1a4210165f7f7e5f2f9616bd63a2ec01d": {
-          "added": 1524700800000,
-          "file": {
-            "name": "/souch.smsbypass_9.apk",
-            "sha256": "80b0ae68a1189baa3ee6717092e3dbf1a4210165f7f7e5f2f9616bd63a2ec01d",
-            "size": 81295,
-            "ipfsCIDv1": "bafybeihaccfnt32q2iwfulh2m7jvdivuunlw6t72wa7jfi7igxvqxjqszy"
-          },
-          "manifest": {
-            "versionName": "0.9",
-            "versionCode": 9,
-            "usesSdk": {
-              "minSdkVersion": 8,
-              "targetSdkVersion": 18
-            },
-            "signer": {
-              "sha256": [
-                "d3aec784b1fd71549fc22c999789122e3639895db6bd585da5835fbe3db6985c"
-              ]
-            },
-            "usesPermission": [
-              {
-                "name": "android.permission.RECEIVE_SMS"
-              },
-              {
-                "name": "android.permission.SEND_SMS"
-              },
-              {
-                "name": "android.permission.READ_CONTACTS"
-              },
-              {
-                "name": "android.permission.WRITE_EXTERNAL_STORAGE"
-              },
-              {
-                "name": "android.permission.VIBRATE"
-              },
-              {
-                "name": "android.permission.READ_EXTERNAL_STORAGE"
-              }
-            ]
-          }
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/tests/repo/index.xml b/tests/repo/index.xml
index 04e8f87d..298fd022 100644
--- a/tests/repo/index.xml
+++ b/tests/repo/index.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <fdroid>
-	<repo icon="icon.png" name="My First F-Droid Repo Demo" pubkey="308204e1308202c9a003020102020434597643300d06092a864886f70d01010b050030213110300e060355040b1307462d44726f6964310d300b06035504031304736f7661301e170d3136303931333230313930395a170d3434303133303230313930395a30213110300e060355040b1307462d44726f6964310d300b06035504031304736f766130820222300d06092a864886f70d01010105000382020f003082020a028202010086ef94b5aacf2ba4f38c875f4194b44f5644392e3715575d7c92828577e692c352b567172823851c8c72347fbc9d99684cd7ca3e1db3e4cca126382c53f2a5869fb4c19bdec989b2930501af3e758ff40588915fe96b10076ce3346a193a0277d79e83e30fd8657c20e35260dd085aa32eac7c4b85786ffefbf1555cafe2bc928443430cdbba48cfbe701e12ae86e676477932730d4fc7c00af820aef85038a5b4df084cf6470d110dc4c49ea1b749b80b34709d199b3db516b223625c5de4501e861f7d261b3838f8f616aa78831d618d41d25872dc810c9b2087b5a9e146ca95be740316dcdbcb77314e23ab87d4487913b800b1113c0603ea2294188b71d3e49875df097b56f9151211fc6832f9790c5c83d17481f14ad37915fd164f4fd713f6732a15f4245714b84cd665bdbd085660ea33ad7d7095dcc414f09e3903604a40facc2314a115c0045bb50e9df38efb57e1b8e7cc105f340a26eeb46aba0fa6672953eee7f1f92dcb408e561909bbd4bdf4a4948c4d57c467d21aa238c34ba43be050398be963191fa2b49828bc1e4eeed224b40dbe9dc3e570890a71a974a2f4527edb1b07105071755105edcb2af2f269facfb89180903a572a99b46456e80d4a01685a80b233278805f2c876678e731f4ec4f52075aeef6b2b023efbb8a3637ef507c4c37c27e428152ec1817fcba640ad601cb09f72f0fbe2d274a2410203010001a321301f301d0603551d0e04160414c28bf33dd5a9a17338e5b1d1a6edd8c7d141ed0b300d06092a864886f70d01010b0500038202010084e20458b2aafd7fc27146b0986f9324f4260f244920417a77c9bf15e2e2d22d2725bdd8093ec261c3779c3ca03312516506f9410075b90595b41345956d8eb2786fb5994f195611382c2b99dba13381b0100a30bc9e6e47248bf4325e2f6eec9d789216dc7536e753bf1f4be603d9fa2e6f5e192b4eb988b8cdb0bb1e8668a9225426f7d4636479f73ed24ad1d2657c31e63c93d9679b9080171b3bd1bf10a3b92b80bd790fbf62d3644900cd08eae8b9bf9c2567be98dc8cdd2ae19a8d57a3e3e2de899f81f1279f578989e6af906f80c8c2b67651730ee7e568c1af5bcb845b6d685dc55332a9984aeceaea3b7e883447edf1c76b155d95253e39b9710eaa22efa6c81468829702b5dce7126538f3ca70c2f0ad9a5795435fdb1f715f20d60359ef9a9926c7050116e802df651727447848827815f70bd82af3cedd08783156102d2d8ce995c4c43b8e47e91a3e6927f3505a5d395e6bebb84542c570903eeab4382a1c2151f1471c7a06a34dc4d268d8fa72e93bdcd2dccc4302ecac47b9e7e3d8bc9b46d21cd097874a24d529548018dc190ff568c6aa428f0a5eedff1a347730931c74f19277538e49647a4ad7254f4c1ec7d4da12cce9e1fad9607534e66ab40a56b473d9d7e3d563fd03cad2052bad365c5a29f8ae54f09b60dbca3ea768d7767cbe1c133ca08ce725c1c1370f4aab8e5b6e286f52dc0be8d0982b5a" timestamp="1676634233" url="https://MyFirstFDroidRepo.org/fdroid/repo" version="20002">
-		<description>This is a repository of apps to be used with F-Droid. Applications in this repository are either official binaries built by the original application developers, or are binaries built from source by the admin of f-droid.org using the tools on https://gitlab.com/fdroid.</description>
+	<repo icon="fdroid-icon.png" name="My First F-Droid Repo Demo" pubkey="308204e1308202c9a003020102020434597643300d06092a864886f70d01010b050030213110300e060355040b1307462d44726f6964310d300b06035504031304736f7661301e170d3136303931333230313930395a170d3434303133303230313930395a30213110300e060355040b1307462d44726f6964310d300b06035504031304736f766130820222300d06092a864886f70d01010105000382020f003082020a028202010086ef94b5aacf2ba4f38c875f4194b44f5644392e3715575d7c92828577e692c352b567172823851c8c72347fbc9d99684cd7ca3e1db3e4cca126382c53f2a5869fb4c19bdec989b2930501af3e758ff40588915fe96b10076ce3346a193a0277d79e83e30fd8657c20e35260dd085aa32eac7c4b85786ffefbf1555cafe2bc928443430cdbba48cfbe701e12ae86e676477932730d4fc7c00af820aef85038a5b4df084cf6470d110dc4c49ea1b749b80b34709d199b3db516b223625c5de4501e861f7d261b3838f8f616aa78831d618d41d25872dc810c9b2087b5a9e146ca95be740316dcdbcb77314e23ab87d4487913b800b1113c0603ea2294188b71d3e49875df097b56f9151211fc6832f9790c5c83d17481f14ad37915fd164f4fd713f6732a15f4245714b84cd665bdbd085660ea33ad7d7095dcc414f09e3903604a40facc2314a115c0045bb50e9df38efb57e1b8e7cc105f340a26eeb46aba0fa6672953eee7f1f92dcb408e561909bbd4bdf4a4948c4d57c467d21aa238c34ba43be050398be963191fa2b49828bc1e4eeed224b40dbe9dc3e570890a71a974a2f4527edb1b07105071755105edcb2af2f269facfb89180903a572a99b46456e80d4a01685a80b233278805f2c876678e731f4ec4f52075aeef6b2b023efbb8a3637ef507c4c37c27e428152ec1817fcba640ad601cb09f72f0fbe2d274a2410203010001a321301f301d0603551d0e04160414c28bf33dd5a9a17338e5b1d1a6edd8c7d141ed0b300d06092a864886f70d01010b0500038202010084e20458b2aafd7fc27146b0986f9324f4260f244920417a77c9bf15e2e2d22d2725bdd8093ec261c3779c3ca03312516506f9410075b90595b41345956d8eb2786fb5994f195611382c2b99dba13381b0100a30bc9e6e47248bf4325e2f6eec9d789216dc7536e753bf1f4be603d9fa2e6f5e192b4eb988b8cdb0bb1e8668a9225426f7d4636479f73ed24ad1d2657c31e63c93d9679b9080171b3bd1bf10a3b92b80bd790fbf62d3644900cd08eae8b9bf9c2567be98dc8cdd2ae19a8d57a3e3e2de899f81f1279f578989e6af906f80c8c2b67651730ee7e568c1af5bcb845b6d685dc55332a9984aeceaea3b7e883447edf1c76b155d95253e39b9710eaa22efa6c81468829702b5dce7126538f3ca70c2f0ad9a5795435fdb1f715f20d60359ef9a9926c7050116e802df651727447848827815f70bd82af3cedd08783156102d2d8ce995c4c43b8e47e91a3e6927f3505a5d395e6bebb84542c570903eeab4382a1c2151f1471c7a06a34dc4d268d8fa72e93bdcd2dccc4302ecac47b9e7e3d8bc9b46d21cd097874a24d529548018dc190ff568c6aa428f0a5eedff1a347730931c74f19277538e49647a4ad7254f4c1ec7d4da12cce9e1fad9607534e66ab40a56b473d9d7e3d563fd03cad2052bad365c5a29f8ae54f09b60dbca3ea768d7767cbe1c133ca08ce725c1c1370f4aab8e5b6e286f52dc0be8d0982b5a" timestamp="1480431575" url="https://MyFirstFDroidRepo.org/fdroid/repo" version="21">
+		<description>This is a repository of apps to be used with F-Droid. Applications in this repository are either official binaries built by the original application developers, or are binaries built from source by the admin of f-droid.org using the tools on https://gitlab.com/u/fdroid.</description>
 		<mirror>http://foobarfoobarfoobar.onion/fdroid/repo</mirror>
 		<mirror>https://foo.bar/fdroid/repo</mirror>
 	</repo>
@@ -31,6 +31,7 @@ Features:
 		<source>https://gitlab.com/souch/SMSbypass/tree/HEAD</source>
 		<tracker>https://gitlab.com/souch/SMSbypass/issues</tracker>
 		<donate>http://rodolphe.souchaud.free.fr/donate</donate>
+		<flattr>cad90e036b975ed129a3ce80a0750466</flattr>
 		<marketversion>0.9</marketversion>
 		<marketvercode>9</marketvercode>
 		<package>
@@ -52,6 +53,7 @@ Features:
 		<lastupdated>2018-10-10</lastupdated>
 		<name>Caffeine Tile</name>
 		<summary>Test app for extracting icons when an XML one is default</summary>
+		<icon>info.zwanenburg.caffeinetile.4.xml</icon>
 		<desc>No description available</desc>
 		<license>Unknown</license>
 		<categories>Development</categories>
@@ -147,35 +149,6 @@ APK is called F-Droid Privileged Extension.</desc>
 			<added>2016-03-10</added>
 		</package>
 	</application>
-	<application id="org.maxsdkversion">
-		<id>org.maxsdkversion</id>
-		<added>2025-02-17</added>
-		<lastupdated>2025-02-17</lastupdated>
-		<name>maxSdkVersion</name>
-		<summary>Test setting maxSdkVersion in an APK</summary>
-		<icon>org.maxsdkversion.4.png</icon>
-		<desc>No description available</desc>
-		<license>Unknown</license>
-		<web></web>
-		<source></source>
-		<tracker></tracker>
-		<marketversion></marketversion>
-		<marketvercode>4</marketvercode>
-		<package>
-			<version>1.0.3</version>
-			<versioncode>4</versioncode>
-			<apkname>org.maxsdkversion_4.apk</apkname>
-			<hash type="sha256">877d582369d2840fc0d6892e44feaaad21419b0e35af42f22b3e127bcd08274d</hash>
-			<size>12768</size>
-			<sdkver>14</sdkver>
-			<targetSdkVersion>19</targetSdkVersion>
-			<maxsdkver>25</maxsdkver>
-			<added>2025-02-17</added>
-			<sig>1a5e67bcef6b2d6242f2d36982b54589</sig>
-			<permissions>CAMERA</permissions>
-			<features>android.hardware.camera.front</features>
-		</package>
-	</application>
 	<application id="no.min.target.sdk">
 		<id>no.min.target.sdk</id>
 		<added>2018-10-10</added>
@@ -339,14 +312,14 @@ APK is called F-Droid Privileged Extension.</desc>
 		<icon>com.politedroid.6.png</icon>
 		<desc>Activates silent mode during calendar events.</desc>
 		<license>GPL-3.0-only</license>
-		<categories>Multimedia,Security,Time</categories>
-		<category>Multimedia</category>
+		<categories>Time</categories>
+		<category>Time</category>
 		<web></web>
 		<source>https://github.com/miguelvps/PoliteDroid</source>
 		<tracker>https://github.com/miguelvps/PoliteDroid/issues</tracker>
 		<marketversion>1.5</marketversion>
 		<marketvercode>6</marketvercode>
-		<antifeatures>KnownVuln,NoSourceSince,NonFreeAssets,NonFreeNet</antifeatures>
+		<antifeatures>NoSourceSince</antifeatures>
 		<package>
 			<version>1.5</version>
 			<versioncode>6</versioncode>
@@ -398,7 +371,7 @@ APK is called F-Droid Privileged Extension.</desc>
 		<id>info.guardianproject.urzip</id>
 		<added>2016-06-23</added>
 		<lastupdated>2016-06-23</lastupdated>
-		<name>title</name>
+		<name>urzip-πÇÇπÇÇ现代汉语通用字-български-عربي1234</name>
 		<summary>一个实用工具，获取已安装在您的设备上的应用的有关信息</summary>
 		<icon>info.guardianproject.urzip.100.png</icon>
 		<desc>It’s Urzip 是一个获得已安装 APK 相关信息的实用工具。它从您的设备上已安装的所有应用开始，一键触摸即可显示 APK 的指纹，并且提供到达 virustotal.com 和 androidobservatory.org 的快捷链接，让您方便地了解特定 APK 的档案。它还可以让您导出签名证书和生成 ApkSignaturePin Pin 文件供 TrustedIntents 库使用。
@@ -416,6 +389,7 @@ https://www.transifex.com/projects/p/urzip
 		<source>https://github.com/guardianproject/urzip</source>
 		<tracker>https://dev.guardianproject.info/projects/urzip/issues</tracker>
 		<bitcoin>1Fi5xUHiAPRKxHvyUGVFGt9extBe8Srdbk</bitcoin>
+		<liberapay>9999999</liberapay>
 		<openCollective>f-droid-just-testing</openCollective>
 		<marketversion></marketversion>
 		<marketvercode>2147483647</marketvercode>
diff --git a/tests/repo/org.maxsdkversion_4.apk b/tests/repo/org.maxsdkversion_4.apk
deleted file mode 100644
index 39578861..00000000
Binary files a/tests/repo/org.maxsdkversion_4.apk and /dev/null differ
diff --git a/tests/rewritemeta.TestCase b/tests/rewritemeta.TestCase
new file mode 100755
index 00000000..c4b34867
--- /dev/null
+++ b/tests/rewritemeta.TestCase
@@ -0,0 +1,98 @@
+#!/usr/bin/env python3
+
+import inspect
+import logging
+import optparse
+import os
+import sys
+import unittest
+import tempfile
+import textwrap
+from unittest import mock
+from testcommon import TmpCwd
+
+localmodule = os.path.realpath(
+    os.path.join(os.path.dirname(inspect.getfile(inspect.currentframe())), '..'))
+print('localmodule: ' + localmodule)
+if localmodule not in sys.path:
+    sys.path.insert(0, localmodule)
+
+from fdroidserver import common
+from fdroidserver import rewritemeta
+from fdroidserver.exception import FDroidException
+
+
+class RewriteMetaTest(unittest.TestCase):
+    '''fdroidserver/publish.py'''
+
+    def setUp(self):
+        logging.basicConfig(level=logging.DEBUG)
+        self.basedir = os.path.join(localmodule, 'tests')
+        self.tmpdir = os.path.abspath(os.path.join(self.basedir, '..', '.testfiles'))
+        if not os.path.exists(self.tmpdir):
+            os.makedirs(self.tmpdir)
+        os.chdir(self.basedir)
+
+    def test_rewrite_scenario_trivial(self):
+
+        sys.argv = ['rewritemeta', 'a', 'b']
+
+        with tempfile.TemporaryDirectory() as tmpdir, TmpCwd(tmpdir):
+            os.mkdir('metadata')
+            with open('metadata/a.yml', 'w') as f:
+                f.write('AutoName: a')
+            with open('metadata/b.yml', 'w') as f:
+                f.write('AutoName: b')
+
+            rewritemeta.main()
+
+            with open('metadata/a.yml') as f:
+                self.assertEqual(f.read(), textwrap.dedent('''\
+                    License: Unknown
+
+                    AutoName: a
+
+                    AutoUpdateMode: None
+                    UpdateCheckMode: None
+                    '''))
+
+            with open('metadata/b.yml') as f:
+                self.assertEqual(f.read(), textwrap.dedent('''\
+                    License: Unknown
+
+                    AutoName: b
+
+                    AutoUpdateMode: None
+                    UpdateCheckMode: None
+                    '''))
+
+    def test_rewrite_scenario_yml_no_ruamel(self):
+        sys.argv = ['rewritemeta', 'a']
+        with tempfile.TemporaryDirectory() as tmpdir, TmpCwd(tmpdir):
+            os.mkdir('metadata')
+            with open('metadata/a.yml', 'w') as f:
+                f.write('AutoName: a')
+
+            def boom(*args):
+                raise FDroidException(' '.join((str(x) for x in args)))
+
+            with mock.patch('importlib.util.find_spec', boom):
+                with self.assertRaises(FDroidException):
+                    rewritemeta.main()
+
+            with open('metadata/a.yml') as f:
+                self.assertEqual(f.read(), textwrap.dedent('''\
+                    AutoName: a'''))
+
+
+if __name__ == "__main__":
+    os.chdir(os.path.dirname(__file__))
+
+    parser = optparse.OptionParser()
+    parser.add_option("-v", "--verbose", action="store_true", default=False,
+                      help="Spew out even more information than normal")
+    (common.options, args) = parser.parse_args(['--verbose'])
+
+    newSuite = unittest.TestSuite()
+    newSuite.addTest(unittest.makeSuite(RewriteMetaTest))
+    unittest.main(failfast=False)
diff --git a/tests/run-tests b/tests/run-tests
index a790d4c7..1a489fef 100755
--- a/tests/run-tests
+++ b/tests/run-tests
@@ -6,10 +6,129 @@ echo_header() {
     { echo -e "==============================================================================\n$1"; } 2>/dev/null
 }
 
-#------------------------------------------------------------------------------#
+get_fdroid_apk_filename() {
+    if [ -z $aapt ]; then
+        python3 -c "from androguard.core.bytecodes.apk import APK; a=APK('$1'); print(a.package+'_'+a.get_androidversion_code()+'.apk')"
+    else
+        $aapt dump badging "$1" | sed -n "s,^package: name='\(.*\)' versionCode='\([0-9][0-9]*\)' .*,\1_\2.apk,p"
+    fi
+}
 
-if [ ! -d tests ]; then
-    cd ..
+copy_apks_into_repo() {
+    set +x
+    find $APKDIR -type f -name '*.apk' -print0 | while IFS= read -r -d '' f; do
+        echo $f | grep -F -v -e unaligned -e unsigned -e badsig -e badcert -e bad-unicode -e janus.apk || continue
+        apk=`get_fdroid_apk_filename "$f"`
+        test "$f" -nt repo/$apk && rm -f repo/$apk  # delete existing if $f is newer
+        if [ ! -e repo/$apk ] && [ ! -e archive/$apk ]; then
+            echo "$f --> repo/$apk"
+            ln "$f" $1/repo/$apk || \
+                rsync -axv "$f" $1/repo/$apk # rsync if hard link is not possible
+	    touch $1/.found-apks
+        fi
+    done
+    if [ ! -e $1/.found-apks ]; then
+	echo "ERROR: The dir APKDIR must have APKs in it! $APKDIR does not."
+	exit 1
+    fi
+    set -x
+}
+
+# keep this as an old version to test the automatic parsing of build-tools
+# verion numbers in `fdroid init`
+create_fake_android_home() {
+    mkdir $1/tools
+    mkdir $1/platform-tools
+    mkdir $1/build-tools
+    mkdir $1/build-tools/19.0.2
+    touch $1/build-tools/19.0.2/aapt
+}
+
+create_test_dir() {
+    test -e $WORKSPACE/.testfiles || mkdir $WORKSPACE/.testfiles
+    mktemp -d $WORKSPACE/.testfiles/run-tests.XXXX
+}
+
+create_test_file() {
+    test -e $WORKSPACE/.testfiles || mkdir $WORKSPACE/.testfiles
+    TMPDIR=$WORKSPACE/.testfiles  mktemp
+}
+
+fdroid_init_with_prebuilt_keystore() {
+    if [ -z "$1" ]; then
+        keystore=$WORKSPACE/tests/keystore.jks
+    else
+        keystore="$1"
+    fi
+    $fdroid init --keystore $keystore --repo-keyalias=sova
+    echo 'keystorepass: r9aquRHYoI8+dYz6jKrLntQ5/NJNASFBacJh7Jv2BlI=' >> config.yml
+    echo 'keypass: r9aquRHYoI8+dYz6jKrLntQ5/NJNASFBacJh7Jv2BlI=' >> config.yml
+}
+
+# the < is reverse since 0 means success in exit codes
+have_git_2_3() {
+    python3 -c "import sys; from distutils.version import LooseVersion as V; sys.exit(V(sys.argv[3]) < V('2.3'))" `git --version`
+}
+
+is_MD5_disabled() {
+    javac $WORKSPACE/tests/IsMD5Disabled.java && java -cp $WORKSPACE/tests IsMD5Disabled
+    return $?
+}
+
+#------------------------------------------------------------------------------#
+# "main"
+
+if [ "$1" = "-h" ] || [ "$1" = "--help" ]; then
+    set +x
+    echo "Usage: $0 '/path/to/folder/with/apks'"
+    exit 1
+fi
+
+if [ -z "$ANDROID_HOME" ]; then
+    if python3 -c "import androguard"; then
+        echo "ANDROID_HOME is not set, using androguard"
+    else
+        echo "ERROR: ANDROID_HOME is not set, androguard is not available!"
+        exit 1
+    fi
+else
+    echo "Using ANDROID_HOME=$ANDROID_HOME"
+fi
+
+if [ -d tests ]; then
+    cd tests
+fi
+
+if [ -z "$1" ]; then
+    APKDIR=`pwd`
+else
+    APKDIR=$1
+fi
+if [ ! -d "$APKDIR" ]; then
+    echo "ERROR: '$APKDIR' does not exist!"
+    exit 1
+fi
+
+if [ -z $WORKSPACE ]; then
+    WORKSPACE=`dirname $(pwd)`
+    echo "Setting Workspace to $WORKSPACE"
+fi
+
+# allow the location of the script to be overridden
+if [ -z $fdroid ]; then
+    fdroid="$WORKSPACE/fdroid"
+fi
+
+# allow the location of aapt to be overridden
+if [ -z $aapt ]; then
+    aapt=`ls -1 $ANDROID_HOME/build-tools/*/aapt 2> /dev/null | sort | tail -1`
+fi
+
+# try to use GNU sed on OSX/BSD cuz BSD sed sucks
+if which gsed; then
+    sed=gsed
+else
+    sed=sed
 fi
 
 set -x # show each command as it is executed
@@ -17,11 +136,1161 @@ set -x # show each command as it is executed
 #------------------------------------------------------------------------------#
 echo_header "run commit hooks"
 
+cd $WORKSPACE
 test -x ./hooks/pre-commit && ./hooks/pre-commit
 
-#------------------------------------------------------------------------------#
-echo_header "run unit tests"
 
-python3 -m unittest -v
+#------------------------------------------------------------------------------#
+echo_header "test python getsig replacement"
+
+cd $WORKSPACE/tests/getsig
+./make.sh
+
+cd $WORKSPACE/tests
+for testcase in $WORKSPACE/tests/*.TestCase; do
+    if [ $testcase == $WORKSPACE/tests/install.TestCase ]; then
+        echo "skipping install.TestCase, its too troublesome in CI builds"
+        continue
+    fi
+    $testcase
+done
+
+
+#------------------------------------------------------------------------------#
+echo_header "print fdroid version"
+
+$fdroid --version
+
+
+#------------------------------------------------------------------------------#
+echo_header 'run process when building and signing are on separate machines'
+
+if which zipalign || ls -1 $ANDROID_HOME/build-tools/*/zipalign; then
+    REPOROOT=`create_test_dir`
+    cd $REPOROOT
+    cp $WORKSPACE/tests/keystore.jks $REPOROOT/
+    $fdroid init --keystore keystore.jks --repo-keyalias=sova
+    echo 'make_current_version_link: true' >> config.yml
+    echo 'keystorepass: r9aquRHYoI8+dYz6jKrLntQ5/NJNASFBacJh7Jv2BlI=' >> config.yml
+    echo 'keypass: r9aquRHYoI8+dYz6jKrLntQ5/NJNASFBacJh7Jv2BlI=' >> config.yml
+    echo 'keydname: "CN=Birdman, OU=Cell, O=Alcatraz, L=Alcatraz, S=California, C=US"' >> config.yml
+    test -d archive || mkdir archive
+    test -d metadata || mkdir metadata
+    cp $WORKSPACE/tests/metadata/info.guardianproject.urzip.yml metadata/
+    test -d repo || mkdir repo
+    test -d unsigned || mkdir unsigned
+    cp $WORKSPACE/tests/urzip-release-unsigned.apk unsigned/info.guardianproject.urzip_100.apk
+    $fdroid publish --verbose
+    $fdroid update --verbose --nosign
+    $fdroid signindex --verbose
+    test -e repo/index.xml
+    test -e repo/index.jar
+    test -e repo/index-v1.jar
+    test -e tmp/apkcache.json
+    ! test -z tmp/apkcache.json
+    test -L urzip.apk
+    grep -F '<application id=' repo/index.xml > /dev/null
+fi
+
+#------------------------------------------------------------------------------#
+echo_header "test UTF-8 metadata"
+
+REPOROOT=`create_test_dir`
+cd $REPOROOT
+
+fdroid_init_with_prebuilt_keystore
+$sed -i.tmp 's,^ *repo_description.*,repo_description: |\n  获取已安装在您的设备上的应用的,' config.yml
+echo "mirrors: ['https://foo.bar/fdroid', 'http://secret.onion/fdroid']" >> config.yml
+mkdir metadata
+cp $WORKSPACE/tests/urzip.apk $WORKSPACE/tests/bad-unicode*.apk repo/
+cp $WORKSPACE/tests/metadata/info.guardianproject.urzip.yml metadata/
+
+$fdroid readmeta
+$fdroid update
+
+
+#------------------------------------------------------------------------------#
+echo_header 'run "fdroid build" in fresh git checkout from import.TestCase'
+
+cd $WORKSPACE/tests/tmp/importer
+git remote update -p
+git clean -fdx
+# stick with known working commit, in case future commits break things for this code
+git reset --hard fea54e1161d5eb9eb1a54e26253ef84d3ab63705
+if [ -d $ANDROID_HOME/platforms/android-23 && -d $ANDROID_HOME/build-tools/23.0.3 ]; then
+    $fdroid build --verbose org.fdroid.ci.test.app:300
+else
+    echo 'WARNING: Skipping "fdroid build" test since android-23 is missing!'
+fi
+
+#------------------------------------------------------------------------------#
+echo_header 'copy git import and run "fdroid scanner" on it'
+
+REPOROOT=`create_test_dir`
+cd $REPOROOT
+cp $WORKSPACE/examples/fdroid-icon.png $REPOROOT/
+mkdir metadata
+echo "AutoName: Just A Test" > metadata/org.fdroid.ci.test.app.yml
+echo "WebSite: " >> metadata/org.fdroid.ci.test.app.yml
+echo "Builds:" >> metadata/org.fdroid.ci.test.app.yml
+echo " - versionName: 0.3" >> metadata/org.fdroid.ci.test.app.yml
+echo "   versionCode: 300" >> metadata/org.fdroid.ci.test.app.yml
+echo "   commit: 0.3" >> metadata/org.fdroid.ci.test.app.yml
+echo "   subdir: app" >> metadata/org.fdroid.ci.test.app.yml
+echo "   gradle:" >> metadata/org.fdroid.ci.test.app.yml
+echo "     - yes" >> metadata/org.fdroid.ci.test.app.yml
+echo "" >> metadata/org.fdroid.ci.test.app.yml
+echo "Repo: https://gitlab.com/fdroid/ci-test-app.git" >> metadata/org.fdroid.ci.test.app.yml
+echo "RepoType: git" >> metadata/org.fdroid.ci.test.app.yml
+mkdir build
+cp -a $WORKSPACE/tests/tmp/importer build/org.fdroid.ci.test.app
+ls -l build/org.fdroid.ci.test.app
+$fdroid scanner org.fdroid.ci.test.app --verbose
+
+
+#------------------------------------------------------------------------------#
+echo_header "copy tests/repo, generate java/gpg keys, update, and gpgsign"
+
+REPOROOT=`create_test_dir`
+GNUPGHOME=$REPOROOT/gnupghome
+cd $REPOROOT
+fdroid_init_with_prebuilt_keystore
+cp -a $WORKSPACE/tests/metadata $WORKSPACE/tests/repo $WORKSPACE/tests/stats $REPOROOT/
+cp -a $WORKSPACE/tests/gnupghome $GNUPGHOME
+chmod 0700 $GNUPGHOME
+echo "install_list: org.adaway" >> config.yml
+echo "uninstall_list: [com.android.vending, com.facebook.orca]" >> config.yml
+echo "gpghome: $GNUPGHOME" >> config.yml
+echo "gpgkey: CE71F7FB" >> config.yml
+echo "mirrors: ['http://foobarfoobarfoobar.onion/fdroid', 'https://foo.bar/fdroid']" >> config.yml
+$fdroid update --verbose --pretty
+test -e repo/index.xml
+test -e repo/index.jar
+test -e repo/index-v1.jar
+grep -F '<application id=' repo/index.xml > /dev/null
+grep -F '<install packageName=' repo/index.xml > /dev/null
+grep -F '<uninstall packageName=' repo/index.xml > /dev/null
+# OSX tests are run on Travis-CI, and gpg fails to launch gpg-agent there
+if [ "$TRAVIS_OS_NAME" != "osx" ] && which gpg; then
+    $fdroid gpgsign --verbose
+    $fdroid gpgsign --verbose
+    test -e repo/obb.mainpatch.current_1619.apk.asc
+    test -e repo/obb.main.twoversions_1101617_src.tar.gz.asc
+    ! test -e repo/obb.mainpatch.current_1619.apk.asc.asc
+    ! test -e repo/obb.main.twoversions_1101617_src.tar.gz.asc.asc
+    ! test -e repo/index.xml.asc
+fi
+
+v0timestamp=`$sed -n -e 's,.*timestamp="\([0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9]\)".*,\1,p' repo/index.xml`
+v1timestamp=`$sed -n -e 's,.*"timestamp": \([0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9]\).*,\1,p' repo/index-v1.json`
+test $v0timestamp -eq $v1timestamp
+
+# we can't easily reproduce the timestamps for things, so just hardcode them
+$sed -i.tmp -e 's,timestamp="[0-9]*",timestamp="1480431575",' repo/index.xml
+diff -uw $WORKSPACE/tests/repo/index.xml repo/index.xml
+sed -i --expression='s,"timestamp": [0-9]*,"timestamp": 1502845383782,' repo/index-v1.json
+diff -uw $WORKSPACE/tests/repo/index-v1.json repo/index-v1.json
+
+
+#------------------------------------------------------------------------------#
+echo_header 'test moving lots of APKs to the archive'
+
+REPOROOT=`create_test_dir`
+cd $REPOROOT
+fdroid_init_with_prebuilt_keystore
+$sed -i.tmp '/allow_disabled_algorithms/d' config.yml
+test -d metadata || mkdir metadata
+cp $WORKSPACE/tests/metadata/*.yml metadata/
+echo 'Summary: good test version of urzip' > metadata/info.guardianproject.urzip.yml
+echo 'Summary: good MD5 sig, which is disabled algorithm' > metadata/org.bitbucket.tickytacky.mirrormirror.yml
+$sed -i.tmp '/ArchivePolicy:/d' metadata/*.yml
+test -d repo || mkdir repo
+cp $WORKSPACE/tests/urzip.apk \
+   $WORKSPACE/tests/org.bitbucket.tickytacky.mirrormirror_[0-9].apk \
+   $WORKSPACE/tests/repo/com.politedroid_[0-9].apk \
+   $WORKSPACE/tests/repo/obb.main.twoversions_110161[357].apk \
+   repo/
+$sed -i.tmp 's,archive_older: [0-9],archive_older: 3,' config.yml
+
+$fdroid update --pretty --nosign
+if which apksigner; then
+    test `grep '<package>' archive/index.xml | wc -l` -eq 2
+    test `grep '<package>' repo/index.xml | wc -l` -eq 10
+else
+    echo "This will fail when jarsigner allows MD5 for APK signatures"
+    test `grep '<package>' archive/index.xml | wc -l` -eq 5
+    test `grep '<package>' repo/index.xml | wc -l` -eq 7
+fi
+
+#------------------------------------------------------------------------------#
+if ! which apksigner; then
+    echo_header 'test per-app "Archive Policy"'
+
+    REPOROOT=`create_test_dir`
+    cd $REPOROOT
+    fdroid_init_with_prebuilt_keystore
+    test -d metadata || mkdir metadata
+    cp $WORKSPACE/tests/metadata/com.politedroid.yml metadata/
+    test -d repo || mkdir repo
+    cp $WORKSPACE/tests/repo/com.politedroid_[0-9].apk repo/
+    $sed -i.tmp 's,archive_older: [0-9],archive_older: 3,' config.yml
+
+    $fdroid update --pretty --nosign
+    test `grep '<package>' archive/index.xml | wc -l` -eq 0
+    test `grep '<package>' repo/index.xml | wc -l` -eq 4
+    grep -F com.politedroid_3.apk repo/index.xml
+    grep -F com.politedroid_4.apk repo/index.xml
+    grep -F com.politedroid_5.apk repo/index.xml
+    grep -F com.politedroid_6.apk repo/index.xml
+    test -e repo/com.politedroid_3.apk
+    test -e repo/com.politedroid_4.apk
+    test -e repo/com.politedroid_5.apk
+    test -e repo/com.politedroid_6.apk
+
+    echo "enable one app in the repo"
+    $sed -i.tmp 's,^ArchivePolicy: 4,ArchivePolicy: 1,' metadata/com.politedroid.yml
+    $fdroid update --pretty --nosign
+    test `grep '<package>' archive/index.xml | wc -l` -eq 3
+    test `grep '<package>' repo/index.xml | wc -l` -eq 1
+    grep -F com.politedroid_3.apk archive/index.xml
+    grep -F com.politedroid_4.apk archive/index.xml
+    grep -F com.politedroid_5.apk archive/index.xml
+    grep -F com.politedroid_6.apk repo/index.xml
+    test -e archive/com.politedroid_3.apk
+    test -e archive/com.politedroid_4.apk
+    test -e archive/com.politedroid_5.apk
+    test -e repo/com.politedroid_6.apk
+
+    echo "remove all apps from the repo"
+    $sed -i.tmp 's,^ArchivePolicy: 1,ArchivePolicy: 0,' metadata/com.politedroid.yml
+    $fdroid update --pretty --nosign
+    test `grep '<package>' archive/index.xml | wc -l` -eq 4
+    test `grep '<package>' repo/index.xml | wc -l` -eq 0
+    grep -F com.politedroid_3.apk archive/index.xml
+    grep -F com.politedroid_4.apk archive/index.xml
+    grep -F com.politedroid_5.apk archive/index.xml
+    grep -F com.politedroid_6.apk archive/index.xml
+    test -e archive/com.politedroid_3.apk
+    test -e archive/com.politedroid_4.apk
+    test -e archive/com.politedroid_5.apk
+    test -e archive/com.politedroid_6.apk
+    ! test -e repo/com.politedroid_6.apk
+
+    echo "move back one from archive to the repo"
+    $sed -i.tmp 's,^ArchivePolicy: 0,ArchivePolicy: 1,' metadata/com.politedroid.yml
+    $fdroid update --pretty --nosign
+    test `grep '<package>' archive/index.xml | wc -l` -eq 3
+    test `grep '<package>' repo/index.xml | wc -l` -eq 1
+    grep -F com.politedroid_3.apk archive/index.xml
+    grep -F com.politedroid_4.apk archive/index.xml
+    grep -F com.politedroid_5.apk archive/index.xml
+    grep -F com.politedroid_6.apk repo/index.xml
+    test -e archive/com.politedroid_3.apk
+    test -e archive/com.politedroid_4.apk
+    test -e archive/com.politedroid_5.apk
+    ! test -e archive/com.politedroid_6.apk
+    test -e repo/com.politedroid_6.apk
+
+    echo "set an earlier version as CVC and test that it's the only one not archived"
+    $sed -i.tmp 's,^CurrentVersionCode: 6,CurrentVersionCode: 5,' metadata/com.politedroid.yml
+    $fdroid update --pretty --nosign
+    test `grep '<package>' archive/index.xml | wc -l` -eq 3
+    test `grep '<package>' repo/index.xml | wc -l` -eq 1
+    grep -F com.politedroid_3.apk archive/index.xml
+    grep -F com.politedroid_4.apk archive/index.xml
+    grep -F com.politedroid_5.apk repo/index.xml
+    grep -F com.politedroid_6.apk archive/index.xml
+    test -e archive/com.politedroid_3.apk
+    test -e archive/com.politedroid_4.apk
+    test -e repo/com.politedroid_5.apk
+    ! test -e repo/com.politedroid_6.apk
+    test -e archive/com.politedroid_6.apk
+fi
+
+
+#------------------------------------------------------------------------------#
+echo_header 'test moving old APKs to and from the archive'
+
+REPOROOT=`create_test_dir`
+cd $REPOROOT
+fdroid_init_with_prebuilt_keystore
+test -d metadata || mkdir metadata
+cp $WORKSPACE/tests/metadata/com.politedroid.yml metadata/
+$sed -i.tmp '/ArchivePolicy:/d' metadata/com.politedroid.yml
+test -d repo || mkdir repo
+cp $WORKSPACE/tests/repo/com.politedroid_[0-9].apk repo/
+$sed -i.tmp 's,archive_older: [0-9],archive_older: 3,' config.yml
+
+$fdroid update --pretty --nosign
+test `grep '<package>' archive/index.xml | wc -l` -eq 1
+test `grep '<package>' repo/index.xml | wc -l` -eq 3
+grep -F com.politedroid_3.apk archive/index.xml
+grep -F com.politedroid_4.apk repo/index.xml
+grep -F com.politedroid_5.apk repo/index.xml
+grep -F com.politedroid_6.apk repo/index.xml
+test -e archive/com.politedroid_3.apk
+test -e repo/com.politedroid_4.apk
+test -e repo/com.politedroid_5.apk
+test -e repo/com.politedroid_6.apk
+
+$sed -i.tmp 's,archive_older: 3,archive_older: 1,' config.yml
+$fdroid update --pretty --nosign
+test `grep '<package>' archive/index.xml | wc -l` -eq 3
+test `grep '<package>' repo/index.xml | wc -l` -eq 1
+grep -F com.politedroid_3.apk archive/index.xml
+grep -F com.politedroid_4.apk archive/index.xml
+grep -F com.politedroid_5.apk archive/index.xml
+grep -F com.politedroid_6.apk repo/index.xml
+test -e archive/com.politedroid_3.apk
+test -e archive/com.politedroid_4.apk
+test -e archive/com.politedroid_5.apk
+test -e repo/com.politedroid_6.apk
+
+# disabling deletes from the archive
+$sed -i.tmp 's/\(versionCode: 4\)/\1\n    disable: testing deletion/' metadata/com.politedroid.yml
+$fdroid update --pretty --nosign
+test `grep '<package>' archive/index.xml | wc -l` -eq 2
+test `grep '<package>' repo/index.xml | wc -l` -eq 1
+grep -F com.politedroid_3.apk archive/index.xml
+! grep -F com.politedroid_4.apk archive/index.xml
+grep -F com.politedroid_5.apk archive/index.xml
+grep -F com.politedroid_6.apk repo/index.xml
+test -e archive/com.politedroid_3.apk
+! test -e archive/com.politedroid_4.apk
+test -e archive/com.politedroid_5.apk
+test -e repo/com.politedroid_6.apk
+
+# disabling deletes from the repo, and promotes one from the archive
+$sed -i.tmp 's/\(versionCode: 6\)/\1\n    disable: testing deletion/' metadata/com.politedroid.yml
+$fdroid update --pretty --nosign
+test `grep '<package>' archive/index.xml | wc -l` -eq 1
+test `grep '<package>' repo/index.xml | wc -l` -eq 1
+grep -F com.politedroid_3.apk archive/index.xml
+grep -F com.politedroid_5.apk repo/index.xml
+! grep -F com.politedroid_6.apk repo/index.xml
+test -e archive/com.politedroid_3.apk
+test -e repo/com.politedroid_5.apk
+! test -e repo/com.politedroid_6.apk
+
+
+#------------------------------------------------------------------------------#
+echo_header 'test that verify can succeed and fail'
+
+REPOROOT=`create_test_dir`
+cd $REPOROOT
+test -d tmp || mkdir tmp
+test -d unsigned || mkdir unsigned
+cp $WORKSPACE/tests/repo/com.politedroid_6.apk tmp/
+cp $WORKSPACE/tests/repo/com.politedroid_6.apk unsigned/
+$fdroid verify --reuse-remote-apk --verbose com.politedroid
+# force a fail
+cp $WORKSPACE/tests/repo/com.politedroid_5.apk unsigned/com.politedroid_6.apk
+! $fdroid verify --reuse-remote-apk --verbose com.politedroid
+
+
+#------------------------------------------------------------------------------#
+echo_header 'test allowing disabled signatures in repo and archive'
+
+REPOROOT=`create_test_dir`
+cd $REPOROOT
+fdroid_init_with_prebuilt_keystore
+echo 'allow_disabled_algorithms: true' >> config.yml
+$sed -i.tmp 's,archive_older: [0-9],archive_older: 3,' config.yml
+test -d metadata || mkdir metadata
+cp $WORKSPACE/tests/metadata/com.politedroid.yml metadata/
+echo 'Summary: good test version of urzip' > metadata/info.guardianproject.urzip.yml
+echo 'Summary: good MD5 sig, disabled algorithm' > metadata/org.bitbucket.tickytacky.mirrormirror.yml
+$sed -i.tmp '/ArchivePolicy:/d' metadata/*.yml
+test -d repo || mkdir repo
+cp $WORKSPACE/tests/repo/com.politedroid_[0-9].apk \
+   $WORKSPACE/tests/org.bitbucket.tickytacky.mirrormirror_[0-9].apk \
+   $WORKSPACE/tests/urzip-badsig.apk \
+   repo/
+
+$fdroid update --pretty --nosign
+test `grep '<package>' archive/index.xml | wc -l` -eq 2
+test `grep '<package>' repo/index.xml | wc -l` -eq 6
+grep -F com.politedroid_3.apk archive/index.xml
+grep -F com.politedroid_4.apk repo/index.xml
+grep -F com.politedroid_5.apk repo/index.xml
+grep -F com.politedroid_6.apk repo/index.xml
+grep -F org.bitbucket.tickytacky.mirrormirror_1.apk archive/index.xml
+grep -F org.bitbucket.tickytacky.mirrormirror_2.apk repo/index.xml
+grep -F org.bitbucket.tickytacky.mirrormirror_3.apk repo/index.xml
+grep -F org.bitbucket.tickytacky.mirrormirror_4.apk repo/index.xml
+! grep -F urzip-badsig.apk repo/index.xml
+! grep -F urzip-badsig.apk archive/index.xml
+test -e archive/com.politedroid_3.apk
+test -e repo/com.politedroid_4.apk
+test -e repo/com.politedroid_5.apk
+test -e repo/com.politedroid_6.apk
+test -e archive/org.bitbucket.tickytacky.mirrormirror_1.apk
+test -e repo/org.bitbucket.tickytacky.mirrormirror_2.apk
+test -e repo/org.bitbucket.tickytacky.mirrormirror_3.apk
+test -e repo/org.bitbucket.tickytacky.mirrormirror_4.apk
+test -e archive/urzip-badsig.apk
+
+if ! which apksigner; then
+    $sed -i.tmp '/allow_disabled_algorithms/d' config.yml
+    $fdroid update --pretty --nosign
+    test `grep '<package>' archive/index.xml | wc -l` -eq 5
+    test `grep '<package>' repo/index.xml | wc -l` -eq 3
+    grep -F org.bitbucket.tickytacky.mirrormirror_1.apk archive/index.xml
+    grep -F org.bitbucket.tickytacky.mirrormirror_2.apk archive/index.xml
+    grep -F org.bitbucket.tickytacky.mirrormirror_3.apk archive/index.xml
+    grep -F org.bitbucket.tickytacky.mirrormirror_4.apk archive/index.xml
+    grep -F com.politedroid_3.apk archive/index.xml
+    grep -F com.politedroid_4.apk repo/index.xml
+    grep -F com.politedroid_5.apk repo/index.xml
+    grep -F com.politedroid_6.apk repo/index.xml
+    ! grep -F urzip-badsig.apk repo/index.xml
+    ! grep -F urzip-badsig.apk archive/index.xml
+    test -e archive/org.bitbucket.tickytacky.mirrormirror_1.apk
+    test -e archive/org.bitbucket.tickytacky.mirrormirror_2.apk
+    test -e archive/org.bitbucket.tickytacky.mirrormirror_3.apk
+    test -e archive/org.bitbucket.tickytacky.mirrormirror_4.apk
+    test -e archive/com.politedroid_3.apk
+    test -e archive/urzip-badsig.apk
+    test -e repo/com.politedroid_4.apk
+    test -e repo/com.politedroid_5.apk
+    test -e repo/com.politedroid_6.apk
+fi
+
+# test unarchiving when disabled_algorithms are allowed again
+echo 'allow_disabled_algorithms: true' >> config.yml
+$fdroid update --pretty --nosign
+test `grep '<package>' archive/index.xml | wc -l` -eq 2
+test `grep '<package>' repo/index.xml | wc -l` -eq 6
+grep -F com.politedroid_3.apk archive/index.xml
+grep -F com.politedroid_4.apk repo/index.xml
+grep -F com.politedroid_5.apk repo/index.xml
+grep -F com.politedroid_6.apk repo/index.xml
+grep -F org.bitbucket.tickytacky.mirrormirror_1.apk archive/index.xml
+grep -F org.bitbucket.tickytacky.mirrormirror_2.apk repo/index.xml
+grep -F org.bitbucket.tickytacky.mirrormirror_3.apk repo/index.xml
+grep -F org.bitbucket.tickytacky.mirrormirror_4.apk repo/index.xml
+! grep -F urzip-badsig.apk repo/index.xml
+! grep -F urzip-badsig.apk archive/index.xml
+test -e archive/com.politedroid_3.apk
+test -e repo/com.politedroid_4.apk
+test -e repo/com.politedroid_5.apk
+test -e repo/com.politedroid_6.apk
+test -e archive/org.bitbucket.tickytacky.mirrormirror_1.apk
+test -e repo/org.bitbucket.tickytacky.mirrormirror_2.apk
+test -e repo/org.bitbucket.tickytacky.mirrormirror_3.apk
+test -e repo/org.bitbucket.tickytacky.mirrormirror_4.apk
+test -e archive/urzip-badsig.apk
+
+#------------------------------------------------------------------------------#
+echo_header 'rename apks with `fdroid update --rename-apks`, --nosign for speed'
+
+REPOROOT=`create_test_dir`
+cd $REPOROOT
+fdroid_init_with_prebuilt_keystore
+echo 'keydname: "CN=Birdman, OU=Cell, O=Alcatraz, L=Alcatraz, S=California, C=US"' >> config.yml
+test -d metadata || mkdir metadata
+cp $WORKSPACE/tests/metadata/info.guardianproject.urzip.yml metadata/
+test -d repo || mkdir repo
+cp $WORKSPACE/tests/urzip.apk "repo/asdfiuhk urzip-πÇÇπÇÇ现代汉语通用字-български-عربي1234 ö.apk"
+$fdroid update --rename-apks --pretty --nosign
+test -e repo/info.guardianproject.urzip_100.apk
+grep -F 'info.guardianproject.urzip_100.apk' repo/index-v1.json repo/index.xml
+cp $WORKSPACE/tests/urzip-release.apk repo/
+$fdroid update --rename-apks --pretty --nosign
+test -e repo/info.guardianproject.urzip_100.apk
+test -e repo/info.guardianproject.urzip_100_b4964fd.apk
+grep -F 'info.guardianproject.urzip_100.apk' repo/index-v1.json repo/index.xml
+grep -F 'info.guardianproject.urzip_100_b4964fd.apk' repo/index-v1.json
+! grep -F 'info.guardianproject.urzip_100_b4964fd.apk' repo/index.xml
+cp $WORKSPACE/tests/urzip-release.apk repo/
+$fdroid update --rename-apks --pretty --nosign
+test -e repo/info.guardianproject.urzip_100.apk
+test -e repo/info.guardianproject.urzip_100_b4964fd.apk
+test -e duplicates/repo/info.guardianproject.urzip_100_b4964fd.apk
+grep -F 'info.guardianproject.urzip_100.apk' repo/index-v1.json repo/index.xml
+grep -F 'info.guardianproject.urzip_100_b4964fd.apk' repo/index-v1.json
+! grep -F 'info.guardianproject.urzip_100_b4964fd.apk' repo/index.xml
+
+#------------------------------------------------------------------------------#
+echo_header "test for added date being set correctly for repo and archive"
+REPOROOT=`create_test_dir`
+cd $REPOROOT
+fdroid_init_with_prebuilt_keystore
+mkdir -p {repo,archive,metadata,stats}
+cp $WORKSPACE/tests/repo/com.politedroid_5.apk archive
+cp $WORKSPACE/tests/repo/com.politedroid_6.apk repo
+cp $WORKSPACE/tests/metadata/com.politedroid.yml metadata
+#TODO: the timestamp of the oldest apk in the file should be used, even if that
+# doesn't exist anymore
+echo "com.politedroid_4.apk com.politedroid 2016-01-01" > stats/known_apks.txt
+echo "com.politedroid_5.apk com.politedroid 2017-01-01" >> stats/known_apks.txt
+echo "com.politedroid_6.apk com.politedroid 2018-01-01" >> stats/known_apks.txt
+sed -i -e 's/ArchivePolicy:.*/ArchivePolicy: 1 versions/' metadata/com.politedroid.yml
+timestamp=1483228800  # $(date -u --date=2017-01-01 +%s)000
+
+$fdroid update --pretty --nosign
+grep -F "\"added\": $timestamp" repo/index-v1.json
+# the archive will have the added timestamp for the app and for the apk, both need to be there
+if [ $(grep -F "\"added\": $timestamp" archive/index-v1.json | wc -l) == 2 ]; then true; else false;fi
+
+#------------------------------------------------------------------------------#
+echo_header "test whatsnew from fastlane without CVC set"
+REPOROOT=`create_test_dir`
+cd $REPOROOT
+fdroid_init_with_prebuilt_keystore
+mkdir -p metadata/com.politedroid/en-US/changelogs/
+cp $WORKSPACE/tests/repo/com.politedroid_6.apk repo
+cp $WORKSPACE/tests/metadata/com.politedroid.yml metadata
+echo "whatsnew test" > metadata/com.politedroid/en-US/changelogs/6.txt
+sed -i -e '/CurrentVersion/d' metadata/com.politedroid.yml
+$fdroid update --pretty --nosign
+grep -F 'whatsnew' repo/index-v1.json
+
+#------------------------------------------------------------------------------#
+echo_header "test metadata checks"
+
+REPOROOT=`create_test_dir`
+cd $REPOROOT
+
+mkdir repo
+cp $WORKSPACE/tests/urzip.apk $REPOROOT/repo/
+
+set +e
+$fdroid build
+if [ $? -eq 0 ]; then
+    echo "This should have failed because there is no metadata!"
+    exit 1
+else
+    echo "testing metadata checks passed"
+fi
+set -e
+
+mkdir $REPOROOT/metadata/
+cp $WORKSPACE/tests/metadata/org.smssecure.smssecure.yml $REPOROOT/metadata/
+$fdroid readmeta
+
+
+#------------------------------------------------------------------------------#
+echo_header "ensure commands that don't need the JDK work without a JDK configed"
+
+REPOROOT=`create_test_dir`
+cd $REPOROOT
+mkdir repo
+mkdir metadata
+echo "License: GPL-2.0-only" >> metadata/fake.yml
+echo "Summary: Yup still fake" >> metadata/fake.yml
+echo "Categories: [Internet]" >> metadata/fake.yml
+echo "Description: |" >> metadata/fake.yml
+echo " this is fake" >> metadata/fake.yml
+
+# fake that no JDKs are available
+echo 'java_paths: {}' > config.yml
+
+LOCAL_COPY_DIR=`create_test_dir`/fdroid
+mkdir -p $LOCAL_COPY_DIR/repo
+echo "local_copy_dir: $LOCAL_COPY_DIR" >> config.yml
+
+$fdroid checkupdates --allow-dirty
+which gpg && $fdroid gpgsign
+$fdroid lint
+$fdroid readmeta
+$fdroid rewritemeta fake
+$fdroid deploy
+$fdroid deploy
+$fdroid scanner
+
+# run these to get their output, but the are not setup, so don't fail
+$fdroid build || true
+$fdroid import || true
+$fdroid install || true
+
+
+#------------------------------------------------------------------------------#
+# only run this test if running from a git repo, not all files are in the tarball
+if [ -e .git/config ]; then
+    echo_header "create a source tarball"
+
+    cd $WORKSPACE
+    ./setup.py compile_catalog sdist
+
+    REPOROOT=`create_test_dir`
+    cd $REPOROOT
+    tar xzf `ls -1 $WORKSPACE/dist/fdroidserver-*.tar.gz | sort -n | tail -1`
+    cd $REPOROOT
+    ./fdroidserver-*/fdroid init
+    copy_apks_into_repo $REPOROOT
+    ./fdroidserver-*/fdroid update --create-metadata --verbose
+fi
+
+#------------------------------------------------------------------------------#
+echo_header "test config checks of local_copy_dir"
+
+REPOROOT=`create_test_dir`
+cd $REPOROOT
+$fdroid init
+$fdroid update --create-metadata --verbose
+$fdroid readmeta
+$fdroid deploy --local-copy-dir=/tmp/fdroid
+$fdroid deploy --local-copy-dir=/tmp/fdroid --verbose
+
+# now test the errors work
+set +e
+$fdroid deploy --local-copy-dir=thisisnotanabsolutepath
+if [ $? -eq 0 ]; then
+    echo "This should have failed because thisisnotanabsolutepath is not an absolute path!"
+    exit 1
+else
+    echo "testing absolute path checker passed"
+fi
+$fdroid deploy --local-copy-dir=/tmp/IReallyDoubtThisPathExistsasdfasdf
+if [ $? -eq 0 ]; then
+    echo "This should have failed because the path does not end with 'fdroid'!"
+    exit 1
+else
+    echo "testing dirname exists checker passed"
+fi
+$fdroid deploy --local-copy-dir=/tmp/IReallyDoubtThisPathExistsasdfasdf/fdroid
+if [ $? -eq 0 ]; then
+    echo "This should have failed because the dirname path does not exist!"
+    exit 1
+else
+    echo "testing dirname exists checker passed"
+fi
+set -e
+
+
+#------------------------------------------------------------------------------#
+echo_header "setup a new repo from scratch using ANDROID_HOME and do a local sync"
+
+REPOROOT=`create_test_dir`
+cd $REPOROOT
+fdroid_init_with_prebuilt_keystore
+copy_apks_into_repo $REPOROOT
+$fdroid update --create-metadata --verbose
+$fdroid readmeta
+grep -F '<application id=' repo/index.xml > /dev/null
+
+LOCALCOPYDIR=`create_test_dir`/fdroid
+$fdroid deploy --local-copy-dir=$LOCALCOPYDIR
+NEWREPOROOT=`create_test_dir`
+cd $NEWREPOROOT
+fdroid_init_with_prebuilt_keystore
+echo "sync_from_local_copy_dir: true" >> config.yml
+$fdroid deploy --local-copy-dir=$LOCALCOPYDIR
+
+
+#------------------------------------------------------------------------------#
+# check that --android-home fails when dir does not exist or is not a dir
+
+REPOROOT=`create_test_dir`
+KEYSTORE=$REPOROOT/keystore.p12
+cd $REPOROOT
+set +e
+$fdroid init --keystore $KEYSTORE --android-home /opt/fakeandroidhome
+if [ $? -eq 0 ]; then
+    echo "This should have failed because /opt/fakeandroidhome does not exist!"
+    exit 1
+else
+    echo "testing android-home path checker passed"
+fi
+TESTFILE=`create_test_file`
+$fdroid init --keystore $KEYSTORE --android-home $TESTFILE
+if [ $? -eq 0 ]; then
+    echo "This should have failed because $TESTFILE is a file not a dir!"
+    exit 1
+else
+    echo "testing android-home not-dir checker passed"
+fi
+set -e
+
+
+#------------------------------------------------------------------------------#
+echo_header "check that fake android home passes 'fdroid init'"
+
+REPOROOT=`create_test_dir`
+FAKE_ANDROID_HOME=`create_test_dir`
+create_fake_android_home $FAKE_ANDROID_HOME
+KEYSTORE=$REPOROOT/keystore.p12
+cd $REPOROOT
+$fdroid init --keystore $KEYSTORE --android-home $FAKE_ANDROID_HOME
+
+
+#------------------------------------------------------------------------------#
+echo_header "check that 'fdroid init' fails when build-tools cannot be found"
+
+if [ -e /usr/bin/aapt ] || python3 -c 'import androguard'; then
+    echo "/usr/bin/aapt or androguard installed, not running test"
+else
+    REPOROOT=`create_test_dir`
+    FAKE_ANDROID_HOME=`create_test_dir`
+    create_fake_android_home $FAKE_ANDROID_HOME
+    rm -f $FAKE_ANDROID_HOME/build-tools/*/aapt
+    KEYSTORE=$REPOROOT/keystore.p12
+    cd $REPOROOT
+    set +e
+    $fdroid init --keystore $KEYSTORE --android-home $FAKE_ANDROID_HOME
+    [ $? -eq 0 ] && exit 1
+    set -e
+fi
+
+
+#------------------------------------------------------------------------------#
+echo_header "check that --android-home overrides ANDROID_HOME"
+
+REPOROOT=`create_test_dir`
+FAKE_ANDROID_HOME=`create_test_dir`
+create_fake_android_home $FAKE_ANDROID_HOME
+KEYSTORE=$REPOROOT/keystore.p12
+cd $REPOROOT
+$fdroid init --keystore $KEYSTORE --android-home $FAKE_ANDROID_HOME
+set +e
+grep $FAKE_ANDROID_HOME $REPOROOT/config.yml
+if [ $? -ne 0 ]; then
+    echo "the value set in --android-home '$FAKE_ANDROID_HOME' should override ANDROID_HOME '$ANDROID_HOME'"
+    exit 1
+fi
+set -e
+
+
+#------------------------------------------------------------------------------#
+# In this case, ANDROID_HOME is set to a fake, non-working version that will
+# be detected by fdroid as an Android SDK install.  It should use the path set
+# by --android-home over the one in ANDROID_HOME, therefore if it uses the one
+# in ANDROID_HOME, it won't work because it is a fake one.  Only
+# --android-home provides a working one.
+if [ -z "$ANDROID_HOME" ]; then
+    echo_header "SKIP setup a new repo from scratch with keystore and android-home set on cmd line"
+else
+    echo_header "setup a new repo from scratch with keystore and android-home set on cmd line"
+
+    REPOROOT=`create_test_dir`
+    KEYSTORE=$REPOROOT/keystore.p12
+    FAKE_ANDROID_HOME=`create_test_dir`
+    create_fake_android_home $FAKE_ANDROID_HOME
+    STORED_ANDROID_HOME=$ANDROID_HOME
+    unset ANDROID_HOME
+    echo "ANDROID_HOME: $ANDROID_HOME"
+    cd $REPOROOT
+    $fdroid init --keystore $KEYSTORE --android-home $STORED_ANDROID_HOME --no-prompt
+    test -e $KEYSTORE
+    copy_apks_into_repo $REPOROOT
+    $fdroid update --create-metadata --verbose
+    $fdroid readmeta
+    grep -F '<application id=' repo/index.xml > /dev/null
+    test -e repo/index.xml
+    test -e repo/index.jar
+    test -e repo/index-v1.jar
+    test -e tmp/apkcache.json
+    ! test -z tmp/apkcache.json
+    export ANDROID_HOME=$STORED_ANDROID_HOME
+fi
+
+#------------------------------------------------------------------------------#
+echo_header "check duplicate files are properly handled by fdroid update"
+
+REPOROOT=`create_test_dir`
+cd $REPOROOT
+fdroid_init_with_prebuilt_keystore
+mkdir $REPOROOT/metadata
+cp -a $WORKSPACE/tests/metadata/obb.mainpatch.current.yml $REPOROOT/metadata
+cp $WORKSPACE/tests/repo/obb.mainpatch.current_1619.apk $REPOROOT/repo/
+cp $WORKSPACE/tests/repo/obb.mainpatch.current_1619_another-release-key.apk $REPOROOT/repo/
+$fdroid update --pretty
+grep -F 'obb.mainpatch.current_1619.apk' repo/index.xml repo/index-v1.json
+grep -F 'obb.mainpatch.current_1619_another-release-key.apk' repo/index-v1.json
+! grep -F 'obb.mainpatch.current_1619_another-release-key.apk' repo/index.xml
+# die if there are exact duplicates
+cp $WORKSPACE/tests/repo/obb.mainpatch.current_1619.apk $REPOROOT/repo/duplicate.apk
+! $fdroid update
+
+
+#------------------------------------------------------------------------------#
+echo_header "setup new repo from scratch using ANDROID_HOME, putting APKs in repo first"
+
+REPOROOT=`create_test_dir`
+cd $REPOROOT
+mkdir repo
+copy_apks_into_repo $REPOROOT
+fdroid_init_with_prebuilt_keystore
+$fdroid update --create-metadata --verbose
+$fdroid readmeta
+grep -F '<application id=' repo/index.xml > /dev/null
+
+
+#------------------------------------------------------------------------------#
+echo_header "setup a new repo from scratch and generate a keystore"
+
+REPOROOT=`create_test_dir`
+KEYSTORE=$REPOROOT/keystore.p12
+cd $REPOROOT
+$fdroid init --keystore $KEYSTORE
+test -e $KEYSTORE
+copy_apks_into_repo $REPOROOT
+$fdroid update --create-metadata --verbose
+$fdroid readmeta
+test -e repo/index.xml
+test -e repo/index.jar
+test -e repo/index-v1.jar
+test -e tmp/apkcache.json
+! test -z tmp/apkcache.json
+grep -F '<application id=' repo/index.xml > /dev/null
+
+
+#------------------------------------------------------------------------------#
+echo_header "setup a new repo manually and generate a keystore"
+
+REPOROOT=`create_test_dir`
+KEYSTORE=$REPOROOT/keystore.p12
+cd $REPOROOT
+cp $WORKSPACE/examples/fdroid-icon.png $REPOROOT/
+! test -e $KEYSTORE
+set +e
+$fdroid update
+if [ $? -eq 0 ]; then
+    echo "This should have failed because this repo has no keystore!"
+    exit 1
+else
+    echo '`fdroid update` prompted to add keystore'
+fi
+set -e
+$fdroid update --create-key
+test -e $KEYSTORE
+copy_apks_into_repo $REPOROOT
+$fdroid update --create-metadata --verbose
+$fdroid readmeta
+test -e repo/index.xml
+test -e repo/index.jar
+test -e repo/index-v1.jar
+test -e tmp/apkcache.json
+! test -z tmp/apkcache.json
+grep -F '<application id=' repo/index.xml > /dev/null
+
+
+#------------------------------------------------------------------------------#
+echo_header "setup a new repo from scratch, generate a keystore, then add APK and update"
+
+REPOROOT=`create_test_dir`
+KEYSTORE=$REPOROOT/keystore.p12
+cd $REPOROOT
+$fdroid init --keystore $KEYSTORE
+test -e $KEYSTORE
+copy_apks_into_repo $REPOROOT
+$fdroid update --create-metadata --verbose
+$fdroid readmeta
+test -e repo/index.xml
+test -e repo/index.jar
+test -e repo/index-v1.jar
+grep -F '<application id=' repo/index.xml > /dev/null
+test -e $REPOROOT/repo/info.guardianproject.urzip_100.apk || \
+    cp $WORKSPACE/tests/urzip.apk $REPOROOT/repo/
+$fdroid update --create-metadata --verbose
+$fdroid readmeta
+test -e repo/index.xml
+test -e repo/index.jar
+test -e repo/index-v1.jar
+test -e tmp/apkcache.json
+! test -z tmp/apkcache.json
+grep -F '<application id=' repo/index.xml > /dev/null
+
+
+#------------------------------------------------------------------------------#
+echo_header "setup a new repo from scratch with a HSM/smartcard"
+REPOROOT=`create_test_dir`
+cd $REPOROOT
+$fdroid init --keystore NONE
+test -e opensc-fdroid.cfg
+test ! -e NONE
+
+
+#------------------------------------------------------------------------------#
+echo_header "setup a new repo with no keystore, add APK, and update"
+
+REPOROOT=`create_test_dir`
+KEYSTORE=$REPOROOT/keystore.p12
+cd $REPOROOT
+touch fdroid-icon.png
+mkdir repo
+cp $WORKSPACE/tests/urzip.apk $REPOROOT/repo/
+set +e
+$fdroid update --create-metadata --verbose
+if [ $? -eq 0 ]; then
+    echo "This should have failed because this repo has no keystore!"
+    exit 1
+else
+    echo '`fdroid update` prompted to add keystore'
+fi
+set -e
+
+# now set up fake, non-working keystore setup
+touch $KEYSTORE
+echo "keystore: $KEYSTORE" >> config.yml
+echo 'repo_keyalias: foo' >> config.yml
+echo 'keystorepass: foo' >> config.yml
+echo 'keypass: foo' >> config.yml
+set +e
+$fdroid update --create-metadata --verbose
+if [ $? -eq 0 ]; then
+    echo "This should have failed because this repo has a bad/fake keystore!"
+    exit 1
+else
+    echo '`fdroid update` prompted to add keystore'
+fi
+set -e
+
+
+#------------------------------------------------------------------------------#
+echo_header "copy tests/repo, update with binary transparency log"
+
+REPOROOT=`create_test_dir`
+GIT_REMOTE=`create_test_dir`
+GNUPGHOME=$REPOROOT/gnupghome
+cd $REPOROOT
+fdroid_init_with_prebuilt_keystore
+cp -a $WORKSPACE/tests/metadata $WORKSPACE/tests/repo $WORKSPACE/tests/stats $REPOROOT/
+echo "binary_transparency_remote: $GIT_REMOTE" >> config.yml
+$fdroid update --verbose
+if have_git_2_3; then
+    $fdroid deploy --verbose
+    test -e repo/index.xml
+    test -e repo/index.jar
+    test -e repo/index-v1.jar
+    grep -F '<application id=' repo/index.xml > /dev/null
+    cd binary_transparency
+    [ `git rev-list --count HEAD` == "2" ]
+    cd $GIT_REMOTE
+    [ `git rev-list --count HEAD` == "2" ]
+else
+    echo "Skipping test, `git --version` older than 2.3"
+fi
+
+
+#------------------------------------------------------------------------------#
+echo_header "setup a new repo with keystore with APK, update, then without key"
+
+REPOROOT=`create_test_dir`
+KEYSTORE=$REPOROOT/keystore.jks
+cd $REPOROOT
+cp $WORKSPACE/tests/keystore.jks $KEYSTORE
+fdroid_init_with_prebuilt_keystore $KEYSTORE
+test -e $KEYSTORE
+cp $WORKSPACE/tests/urzip.apk $REPOROOT/repo/
+$fdroid update --create-metadata --verbose
+$fdroid readmeta
+test -e repo/index.xml
+test -e repo/index.jar
+test -e repo/index-v1.jar
+test -e tmp/apkcache.json
+! test -z tmp/apkcache.json
+grep -F '<application id=' repo/index.xml > /dev/null
+
+# now set fake repo_keyalias
+$sed -i.tmp 's,^ *repo_keyalias.*,repo_keyalias: fake,' $REPOROOT/config.yml
+set +e
+$fdroid update
+if [ $? -eq 0 ]; then
+    echo "This should have failed because this repo has a bad repo_keyalias!"
+    exit 1
+else
+    echo '`fdroid update` prompted to add keystore'
+fi
+set -e
+
+# try creating a new keystore, but fail because the old one is there
+test -e $KEYSTORE
+set +e
+$fdroid update --create-key
+if [ $? -eq 0 ]; then
+    echo "This should have failed because a keystore is already there!"
+    exit 1
+else
+    echo '`fdroid update` complained about existing keystore'
+fi
+set -e
+
+# now actually create the key with the existing settings
+rm -f $KEYSTORE
+! test -e $KEYSTORE
+$fdroid update --create-key
+test -e $KEYSTORE
+
+
+#------------------------------------------------------------------------------#
+echo_header "setup a new repo from scratch using ANDROID_HOME with git mirror"
+
+# fake git remote server for repo mirror
+SERVER_GIT_MIRROR=`create_test_dir`
+cd $SERVER_GIT_MIRROR
+git init
+git config receive.denyCurrentBranch updateInstead
+
+REPOROOT=`create_test_dir`
+GIT_MIRROR=$REPOROOT/git-mirror
+cd $REPOROOT
+fdroid_init_with_prebuilt_keystore
+echo "servergitmirrors: $SERVER_GIT_MIRROR" >> config.yml
+
+cp $WORKSPACE/tests/repo/com.politedroid_[345].apk repo/
+$fdroid update --create-metadata
+$fdroid deploy
+test -e $GIT_MIRROR/fdroid/repo/com.politedroid_3.apk
+test -e $GIT_MIRROR/fdroid/repo/com.politedroid_4.apk
+test -e $GIT_MIRROR/fdroid/repo/com.politedroid_5.apk
+test -e $SERVER_GIT_MIRROR/fdroid/repo/com.politedroid_3.apk
+test -e $SERVER_GIT_MIRROR/fdroid/repo/com.politedroid_4.apk
+test -e $SERVER_GIT_MIRROR/fdroid/repo/com.politedroid_5.apk
+date > $GIT_MIRROR/.git/test-stamp
+
+# add one more APK to trigger archiving
+cp $WORKSPACE/tests/repo/com.politedroid_6.apk repo/
+$fdroid update
+$fdroid deploy
+test -e $REPOROOT/archive/com.politedroid_3.apk
+! test -e $GIT_MIRROR/fdroid/archive/com.politedroid_3.apk
+! test -e $SERVER_GIT_MIRROR/fdroid/archive/com.politedroid_3.apk
+test -e $GIT_MIRROR/fdroid/repo/com.politedroid_4.apk
+test -e $GIT_MIRROR/fdroid/repo/com.politedroid_5.apk
+test -e $GIT_MIRROR/fdroid/repo/com.politedroid_6.apk
+test -e $SERVER_GIT_MIRROR/fdroid/repo/com.politedroid_4.apk
+test -e $SERVER_GIT_MIRROR/fdroid/repo/com.politedroid_5.apk
+test -e $SERVER_GIT_MIRROR/fdroid/repo/com.politedroid_6.apk
+before=`du -s --bytes $GIT_MIRROR/.git/ | awk '{print $1}'`
+
+echo "git_mirror_size_limit: 60kb" >> config.yml
+$fdroid update
+$fdroid deploy
+test -e $REPOROOT/archive/com.politedroid_3.apk
+! test -e $SERVER_GIT_MIRROR/fdroid/archive/com.politedroid_3.apk
+after=`du -s --bytes $GIT_MIRROR/.git/ | awk '{print $1}'`
+! test -e $GIT_MIRROR/.git/test-stamp
+git -C $GIT_MIRROR gc
+git -C $SERVER_GIT_MIRROR gc
+test $before -gt $after
+
+
+#------------------------------------------------------------------------------#
+echo_header "sign binary repo in offline box, then publishing from online box"
+
+if have_git_2_3; then
+    OFFLINE_ROOT=`create_test_dir`
+    KEYSTORE=$WORKSPACE/tests/keystore.p12
+    LOCAL_COPY_DIR=`create_test_dir`/fdroid
+    mkdir $LOCAL_COPY_DIR
+    ONLINE_ROOT=`create_test_dir`
+    SERVERWEBROOT=`create_test_dir`
+
+    # create offline binary transparency log
+    cd $OFFLINE_ROOT
+    mkdir binary_transparency
+    cd binary_transparency
+    git init
+
+    # fake git remote server for binary transparency log
+    BINARY_TRANSPARENCY_REMOTE=`create_test_dir`
+
+    # fake git remote server for repo mirror
+    SERVER_GIT_MIRROR=`create_test_dir`
+    cd $SERVER_GIT_MIRROR
+    git init
+    git config receive.denyCurrentBranch updateInstead
+
+    cd $OFFLINE_ROOT
+    fdroid_init_with_prebuilt_keystore
+    cp -a $WORKSPACE/tests/metadata $WORKSPACE/tests/repo $WORKSPACE/tests/stats $OFFLINE_ROOT/
+
+    echo "mirrors: ['http://foo.bar/fdroid', 'http://asdflkdsfjafdsdfhkjh.onion/fdroid']" >> config.yml
+    echo "servergitmirrors: $SERVER_GIT_MIRROR" >> config.yml
+    echo "local_copy_dir: $LOCAL_COPY_DIR" >> config.yml
+    $fdroid update --pretty
+    grep -F '<application id=' repo/index.xml > /dev/null
+    grep -F '/fdroid/repo</mirror>' repo/index.xml
+    grep -F '/fdroid/archive</mirror>' archive/index.xml
+    test `grep '<mirror>' repo/index.xml | wc -l` -eq 2
+    test `grep '<mirror>' archive/index.xml | wc -l` -eq 2
+    cd binary_transparency
+    [ `git rev-list --count HEAD` == "1" ]
+    cd ..
+    $fdroid deploy --verbose
+    grep -F '<application id=' $LOCAL_COPY_DIR/repo/index.xml > /dev/null
+    cd $ONLINE_ROOT
+    echo "local_copy_dir: $LOCAL_COPY_DIR" >> config.yml
+    echo "sync_from_local_copy_dir: True" >> config.yml
+    echo "serverwebroots: $SERVERWEBROOT" >> config.yml
+    echo "servergitmirrors: $SERVER_GIT_MIRROR" >> config.yml
+    echo "local_copy_dir: $LOCAL_COPY_DIR" >> config.yml
+    echo "binary_transparency_remote: $BINARY_TRANSPARENCY_REMOTE" >> config.yml
+    $fdroid deploy --verbose
+    cd $BINARY_TRANSPARENCY_REMOTE
+    [ `git rev-list --count HEAD` == "1" ]
+    cd $SERVER_GIT_MIRROR
+    [ `git rev-list --count HEAD` == "1" ]
+fi
+
+
+#------------------------------------------------------------------------------#
+echo_header 'test extracting and publishing with developer signature'
+
+REPOROOT=`create_test_dir`
+cd $REPOROOT
+fdroid_init_with_prebuilt_keystore
+echo 'keydname: "CN=Birdman, OU=Cell, O=Alcatraz, L=Alcatraz, S=California, C=US"' >> config.yml
+test -d metadata || mkdir metadata
+cp $WORKSPACE/tests/metadata/com.politedroid.yml metadata/
+test -d repo || mkdir repo
+test -d unsigned || mkdir unsigned
+cp $WORKSPACE/tests/repo/com.politedroid_6.apk unsigned/
+$fdroid signatures unsigned/com.politedroid_6.apk
+test -d metadata/com.politedroid/signatures/6
+test -f metadata/com.politedroid/signatures/6/MANIFEST.MF
+test -f metadata/com.politedroid/signatures/6/RELEASE.RSA
+test -f metadata/com.politedroid/signatures/6/RELEASE.SF
+! test -f repo/com.politedroid_6.apk
+$fdroid publish
+test -f repo/com.politedroid_6.apk
+if which jarsigner; then
+    jarsigner -verify repo/com.politedroid_6.apk
+fi
+if which apksigner; then
+    apksigner verify repo/com.politedroid_6.apk
+fi
+
+
+#------------------------------------------------------------------------------#
+echo_header 'test mirroring a repo'
+
+if which wget; then
+    REPOROOT=`create_test_dir`
+    cd $WORKSPACE/tests
+    test -d archive || mkdir archive
+    cp repo/index-v1.json $REPOROOT/
+    $fdroid signindex
+    mv $REPOROOT/index-v1.json repo/index-v1.json
+
+    port=3210${RANDOM:3}
+    test $(printf $port | wc --chars) -le 3 && port=52734 # when $RANDOM doesn't work
+    timeout 5m python3 -m http.server $port --bind 127.0.0.1 > $REPOROOT/http.server.log 2>&1 &
+    http_server_pid=$!
+
+    cd $REPOROOT
+    http_proxy= HTTP_PROXY= $fdroid mirror http://127.0.0.1:${port}/
+    test -e 127.0.0.1\:${port}/repo/souch.smsbypass_9.apk
+    test -e 127.0.0.1\:${port}/repo/icons-640/souch.smsbypass.9.png
+    # the index shouldn't be saved unless it was verified
+    ! test -e 127.0.0.1\:${port}/repo/index-v1.jar
+    ! http_proxy= HTTP_PROXY= $fdroid mirror "http://127.0.0.1:${port}/?fingerprint=asdfasdf"
+    ! test -e 127.0.0.1\:${port}/repo/index-v1.jar
+    http_proxy= HTTP_PROXY= $fdroid mirror "http://127.0.0.1:${port}/?fingerprint=F49AF3F11EFDDF20DFFD70F5E3117B9976674167ADCA280E6B1932A0601B26F6"
+    test -e 127.0.0.1\:${port}/repo/index-v1.jar
+
+    # clean up
+    kill -9 $http_server_pid
+    rm -f 127.0.0.1\:${port}/repo/*.apk 127.0.0.1\:${port}/repo/*/*/*/*.png
+else
+    echo "WARNING: wget not installed, skipping"
+fi
+
+#------------------------------------------------------------------------------#
+
+# remove this to prevent git conflicts and complaining
+rm -rf $WORKSPACE/fdroidserver.egg-info/
 
 echo SUCCESS
diff --git a/tests/scanner.TestCase b/tests/scanner.TestCase
new file mode 100755
index 00000000..3c18becc
--- /dev/null
+++ b/tests/scanner.TestCase
@@ -0,0 +1,305 @@
+#!/usr/bin/env python3
+
+import glob
+import inspect
+import logging
+import optparse
+import os
+import shutil
+import sys
+import tempfile
+import textwrap
+import unittest
+import uuid
+import yaml
+from unittest import mock
+
+localmodule = os.path.realpath(
+    os.path.join(os.path.dirname(inspect.getfile(inspect.currentframe())), '..'))
+print('localmodule: ' + localmodule)
+if localmodule not in sys.path:
+    sys.path.insert(0, localmodule)
+
+import fdroidserver.build
+import fdroidserver.common
+import fdroidserver.metadata
+import fdroidserver.scanner
+
+
+class ScannerTest(unittest.TestCase):
+
+    def setUp(self):
+        logging.basicConfig(level=logging.INFO)
+        self.basedir = os.path.join(localmodule, 'tests')
+        self.tmpdir = os.path.abspath(os.path.join(self.basedir, '..', '.testfiles'))
+        if not os.path.exists(self.tmpdir):
+            os.makedirs(self.tmpdir)
+        os.chdir(self.basedir)
+
+    def test_scan_source_files(self):
+        fdroidserver.scanner.options = mock.Mock()
+        fdroidserver.scanner.options.json = False
+        source_files = os.path.join(self.basedir, 'source-files')
+        projects = {
+            'cn.wildfirechat.chat': 4,
+            'com.integreight.onesheeld': 11,
+            'Zillode': 1,
+            'firebase-suspect': 1,
+            'org.mozilla.rocket': 3,
+            'realm': 1,
+            'se.manyver': 2,
+        }
+        for d in glob.glob(os.path.join(source_files, '*')):
+            build = fdroidserver.metadata.Build()
+            fatal_problems = fdroidserver.scanner.scan_source(d, build)
+            should = projects.get(os.path.basename(d), 0)
+            self.assertEqual(should, fatal_problems,
+                             "%s should have %d errors!" % (d, should))
+
+    def test_get_gradle_compile_commands(self):
+        test_files = [
+            ('source-files/fdroid/fdroidclient/build.gradle', 'yes', 17),
+            ('source-files/com.nextcloud.client/build.gradle', 'generic', 24),
+            ('source-files/com.kunzisoft.testcase/build.gradle', 'libre', 4),
+            ('source-files/cn.wildfirechat.chat/chat/build.gradle', 'yes', 33),
+            ('source-files/org.tasks/app/build.gradle.kts', 'generic', 39),
+            ('source-files/at.bitfire.davdroid/build.gradle', 'standard', 16),
+            ('source-files/se.manyver/android/app/build.gradle', 'indie', 29),
+            ('source-files/osmandapp/osmand/build.gradle', 'free', 5),
+            ('source-files/eu.siacs.conversations/build.gradle', 'free', 23),
+            ('source-files/org.mozilla.rocket/app/build.gradle', 'focus', 42),
+        ]
+
+        for f, flavor, count in test_files:
+            i = 0
+            build = fdroidserver.metadata.Build()
+            build.gradle = [flavor]
+            regexs = fdroidserver.scanner.get_gradle_compile_commands(build)
+            with open(f) as fp:
+                for line in fp.readlines():
+                    for regex in regexs:
+                        m = regex.match(line)
+                        if m:
+                            i += 1
+            self.assertEqual(count, i)
+
+    def test_scan_source_files_sneaky_maven(self):
+        """Check for sneaking in banned maven repos"""
+        testdir = tempfile.mkdtemp(prefix=inspect.currentframe().f_code.co_name, dir=self.tmpdir)
+        os.chdir(testdir)
+        fdroidserver.scanner.config = None
+        fdroidserver.scanner.options = mock.Mock()
+        fdroidserver.scanner.options.json = True
+        with open('build.gradle', 'w') as fp:
+            fp.write(textwrap.dedent("""
+                 maven {
+                    "https://jitpack.io"
+                    url 'https://maven.fabric.io/public'
+                 }
+                 maven {
+                    "https://maven.google.com"
+                    setUrl('https://evilcorp.com/maven')
+                 }
+            """))
+        count = fdroidserver.scanner.scan_source(testdir)
+        self.assertEqual(2, count, 'there should be this many errors')
+
+    def test_scan_source_file_types(self):
+        """Build product files are not allowed, test they are detected
+
+        This test runs as if `fdroid build` running to test the
+        difference between absolute and relative paths.
+
+        """
+        testdir = tempfile.mkdtemp(prefix=inspect.currentframe().f_code.co_name, dir=self.tmpdir)
+        build_dir = os.path.join('build', 'fake.app')
+        abs_build_dir = os.path.join(testdir, build_dir)
+        os.makedirs(abs_build_dir, exist_ok=True)
+        os.chdir(abs_build_dir)
+
+        fdroidserver.scanner.config = None
+        fdroidserver.scanner.options = mock.Mock()
+        fdroidserver.scanner.options.json = True
+
+        keep = [
+            'arg.jar',
+            'ascii.out',
+            'baz.so',
+            'classes.dex',
+            'sqlcipher.aar',
+            'static.a',
+            'src/test/resources/classes.dex',
+        ]
+        remove = [
+            'gradle-wrapper.jar',
+            'gradlew',
+            'gradlew.bat',
+        ]
+        os.makedirs('src/test/resources', exist_ok=True)
+        for f in keep + remove:
+            with open(f, 'w') as fp:
+                fp.write('placeholder')
+            self.assertTrue(os.path.exists(f))
+        binaries = [
+            'binary.out',
+            'fake.png',
+            'snippet.png',
+        ]
+        with open('binary.out', 'wb') as fp:
+            fp.write(b'\x00\x00')
+            fp.write(uuid.uuid4().bytes)
+        shutil.copyfile('binary.out', 'fake.png')
+        os.chmod('fake.png', 0o755)
+        os.system('ls -l binary.out')
+        with open('snippet.png', 'wb') as fp:
+            fp.write(b'\x89PNG\r\n\x1a\n\x00\x00\x00\rIHDR\x00\x00\x000\x00\x00'
+                     b'\x000\x08\x06\x00\x00\x00W\x02\xf9\x87\x00\x00\x00\x04sB'
+                     b'IT\x08\x08\x08\x08|\x08d\x88\x00\x00\x00\tpHYs\x00\x00\n'
+                     b'a\x00\x00\na\x01\xfc\xccJ%\x00\x00\x00\x19tEXtSoftware')
+        os.chmod('snippet.png', 0o755)
+        os.system('ls -l fake.png')
+
+        # run scanner as if from `fdroid build`
+        os.chdir(testdir)
+        count = fdroidserver.scanner.scan_source(build_dir)
+        self.assertEqual(6, count, 'there should be this many errors')
+        os.chdir(build_dir)
+
+        for f in keep + binaries:
+            self.assertTrue(os.path.exists(f), f + ' should still be there')
+        for f in remove:
+            self.assertFalse(os.path.exists(f), f + ' should have been removed')
+
+        files = dict()
+        for section in ('errors', 'infos', 'warnings'):
+            files[section] = []
+            for msg, f in fdroidserver.scanner.json_per_build[section]:
+                files[section].append(f)
+
+        self.assertFalse('ascii.out' in files['errors'],
+                         'an ASCII .out file is not an error')
+        self.assertFalse('snippet.png' in files['errors'],
+                         'an executable valid image is not an error')
+
+        self.assertTrue('arg.jar' in files['errors'], 'all JAR files are errors')
+        self.assertTrue('baz.so' in files['errors'], 'all .so files are errors')
+        self.assertTrue('binary.out' in files['errors'], 'a binary .out file is an error')
+        self.assertTrue('classes.dex' in files['errors'], 'all classes.dex files are errors')
+        self.assertTrue('sqlcipher.aar' in files['errors'], 'all AAR files are errors')
+        self.assertTrue('static.a' in files['errors'], 'all .a files are errors')
+
+        self.assertTrue('fake.png' in files['warnings'],
+                        'a random binary that is executable that is not an image is a warning')
+        self.assertTrue('src/test/resources/classes.dex' in files['warnings'],
+                        'suspicious file but in a test dir is a warning')
+
+        for f in remove:
+            self.assertTrue(f in files['infos'],
+                            f + ' should be removed with an info message')
+
+    def test_build_local_scanner(self):
+        """`fdroid build` calls scanner functions, test them here"""
+        testdir = tempfile.mkdtemp(prefix=inspect.currentframe().f_code.co_name, dir=self.tmpdir)
+        os.chdir(testdir)
+
+        config = dict()
+        fdroidserver.common.fill_config_defaults(config)
+        fdroidserver.common.config = config
+        fdroidserver.build.config = config
+        fdroidserver.build.options = mock.Mock()
+        fdroidserver.build.options.json = False
+        fdroidserver.build.options.scan_binary = False
+        fdroidserver.build.options.notarball = True
+        fdroidserver.build.options.skipscan = False
+        fdroidserver.scanner.options = fdroidserver.build.options
+
+        app = fdroidserver.metadata.App()
+        app.id = 'mocked.app.id'
+        build = fdroidserver.metadata.Build()
+        build.commit = '1.0'
+        build.output = app.id + '.apk'
+        build.scanignore = ['baz.so', 'foo.aar']
+        build.versionCode = '1'
+        build.versionName = '1.0'
+        vcs = mock.Mock()
+
+        for f in ('baz.so', 'foo.aar', 'gradle-wrapper.jar'):
+            with open(f, 'w') as fp:
+                fp.write('placeholder')
+            self.assertTrue(os.path.exists(f))
+
+        with open('build.xml', 'w') as fp:
+            fp.write(textwrap.dedent(
+                """<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+                <project basedir="." default="clean" name="mockapp">
+                <target name="release"/>
+                <target name="clean"/>
+                </project>"""))
+
+        def make_fake_apk(output, build):
+            with open(build.output, 'w') as fp:
+                fp.write('APK PLACEHOLDER')
+            return output
+
+        with mock.patch('fdroidserver.common.replace_build_vars', wraps=make_fake_apk):
+            with mock.patch('fdroidserver.common.get_native_code', return_value='x86'):
+                with mock.patch('fdroidserver.common.get_apk_id',
+                                return_value=(app.id, build.versionCode, build.versionName)):
+                    with mock.patch('fdroidserver.common.is_apk_and_debuggable', return_value=False):
+                        fdroidserver.build.build_local(
+                            app, build, vcs,
+                            build_dir=testdir, output_dir=testdir,
+                            log_dir=None, srclib_dir=None, extlib_dir=None, tmp_dir=None,
+                            force=False, onserver=False, refresh=False
+                        )
+        self.assertTrue(os.path.exists('baz.so'))
+        self.assertTrue(os.path.exists('foo.aar'))
+        self.assertFalse(os.path.exists('gradle-wrapper.jar'))
+
+    def test_gradle_maven_url_regex(self):
+        """Check the regex can find all the cases"""
+        with open(os.path.join(self.basedir, 'gradle-maven-blocks.yaml')) as fp:
+            data = yaml.safe_load(fp)
+
+        urls = []
+        for entry in data:
+            found = False
+            for m in fdroidserver.scanner.MAVEN_URL_REGEX.findall(entry):
+                urls.append(m)
+                found = True
+            self.assertTrue(found, 'this block should produce a URL:\n' + entry)
+        self.assertEqual(len(data), len(urls), 'each data example should produce a URL')
+
+    def test_scan_gradle_file_with_multiple_problems(self):
+        """Check that the scanner can handle scandelete with gradle files with multiple problems"""
+        testdir = tempfile.mkdtemp(prefix=inspect.currentframe().f_code.co_name, dir=self.tmpdir)
+        os.chdir(testdir)
+        fdroidserver.scanner.config = None
+        fdroidserver.scanner.options = mock.Mock()
+        build = fdroidserver.metadata.Build()
+        build.scandelete = ['build.gradle']
+        with open('build.gradle', 'w') as fp:
+            fp.write(textwrap.dedent("""
+                 maven {
+                    url 'https://maven.fabric.io/public'
+                 }
+                 maven {
+                    url 'https://evilcorp.com/maven'
+                 }
+            """))
+        count = fdroidserver.scanner.scan_source(testdir, build)
+        self.assertFalse(os.path.exists("build.gradle"))
+        self.assertEqual(0, count, 'there should be this many errors')
+
+
+if __name__ == "__main__":
+    os.chdir(os.path.dirname(__file__))
+
+    parser = optparse.OptionParser()
+    parser.add_option("-v", "--verbose", action="store_true", default=False,
+                      help="Spew out even more information than normal")
+    (fdroidserver.common.options, args) = parser.parse_args(['--verbose'])
+
+    newSuite = unittest.TestSuite()
+    newSuite.addTest(unittest.makeSuite(ScannerTest))
+    unittest.main(failfast=False)
diff --git a/tests/shared_test_code.py b/tests/shared_test_code.py
deleted file mode 100644
index 3e34900b..00000000
--- a/tests/shared_test_code.py
+++ /dev/null
@@ -1,88 +0,0 @@
-#!/usr/bin/env python3
-#
-# Copyright (C) 2017, Michael Poehn <michael.poehn@fsfe.org>
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-import os
-import sys
-import tempfile
-import unittest
-import unittest.mock
-from pathlib import Path
-
-GP_FINGERPRINT = 'B7C2EEFD8DAC7806AF67DFCD92EB18126BC08312A7F2D6F3862E46013C7A6135'
-
-
-class VerboseFalseOptions:
-    verbose = False
-
-
-class TmpCwd:
-    """Context-manager for temporarily changing the current working directory."""
-
-    def __init__(self, new_cwd):
-        self.new_cwd = new_cwd
-
-    def __enter__(self):
-        self.orig_cwd = os.getcwd()
-        os.chdir(self.new_cwd)
-
-    def __exit__(self, a, b, c):
-        os.chdir(self.orig_cwd)
-
-
-class TmpPyPath:
-    """Context-manager for temporarily adding a directory to Python path."""
-
-    def __init__(self, additional_path):
-        self.additional_path = additional_path
-
-    def __enter__(self):
-        sys.path.append(self.additional_path)
-
-    def __exit__(self, a, b, c):
-        sys.path.remove(self.additional_path)
-
-
-def mock_open_to_str(mock):
-    """For accessing all data written into a unittest.mock.mock_open() instance as a string."""
-
-    return "".join(
-        [x.args[0] for x in mock.mock_calls if str(x).startswith("call().write(")]
-    )
-
-
-def mkdtemp():
-    if sys.version_info < (3, 10):  # ignore_cleanup_errors was added in 3.10
-        return tempfile.TemporaryDirectory()
-    else:
-        return tempfile.TemporaryDirectory(ignore_cleanup_errors=True)
-
-
-def mkdir_testfiles(localmodule, test):
-    """Keep the test files in a labeled test dir for easy reference"""
-    testroot = Path(localmodule) / '.testfiles'
-    testroot.mkdir(exist_ok=True)
-    testdir = testroot / unittest.TestCase.id(test)
-    testdir.mkdir(exist_ok=True)
-    return Path(tempfile.mkdtemp(dir=testdir))
-
-
-def mock_urlopen(status=200, body=None):
-    resp = unittest.mock.MagicMock()
-    resp.getcode.return_value = status
-    resp.read.return_value = body
-    resp.__enter__.return_value = resp
-    return unittest.mock.Mock(return_value=resp)
diff --git a/tests/signatures.TestCase b/tests/signatures.TestCase
new file mode 100755
index 00000000..b6af0eb5
--- /dev/null
+++ b/tests/signatures.TestCase
@@ -0,0 +1,69 @@
+#!/usr/bin/env python3
+
+import inspect
+import optparse
+import os
+import sys
+import unittest
+import hashlib
+import logging
+from tempfile import TemporaryDirectory
+
+localmodule = os.path.realpath(
+    os.path.join(os.path.dirname(inspect.getfile(inspect.currentframe())), '..'))
+print('localmodule: ' + localmodule)
+if localmodule not in sys.path:
+    sys.path.insert(0, localmodule)
+
+from testcommon import TmpCwd
+from fdroidserver import common, signatures
+
+
+class SignaturesTest(unittest.TestCase):
+
+    def setUp(self):
+        logging.basicConfig(level=logging.DEBUG)
+        common.config = None
+        config = common.read_config(common.options)
+        config['jarsigner'] = common.find_sdk_tools_cmd('jarsigner')
+        config['verbose'] = True
+        common.config = config
+
+    def test_main(self):
+
+        # option fixture class:
+        class OptionsFixture:
+            APK = [os.path.abspath(os.path.join('repo', 'com.politedroid_3.apk'))]
+
+        with TemporaryDirectory() as tmpdir, TmpCwd(tmpdir):
+            signatures.extract(OptionsFixture())
+
+            # check if extracted signatures are where they are supposed to be
+            # also verify weather if extracted file contian what they should
+            filesAndHashes = (
+                (os.path.join('metadata', 'com.politedroid', 'signatures', '3', 'MANIFEST.MF'),
+                 '7dcd83f0c41a75457fd2311bf3c4578f80d684362d74ba8dc52838d353f31cf2'),
+                (os.path.join('metadata', 'com.politedroid', 'signatures', '3', 'RELEASE.RSA'),
+                 '883ef3d5a6e0bf69d2a58d9e255a7930f08a49abc38e216ed054943c99c8fdb4'),
+                (os.path.join('metadata', 'com.politedroid', 'signatures', '3', 'RELEASE.SF'),
+                 '99fbb3211ef5d7c1253f3a7ad4836eadc9905103ce6a75916c40de2831958284'),
+            )
+            for path, checksum in filesAndHashes:
+                self.assertTrue(os.path.isfile(path),
+                                msg="check whether '{path}' was extracted "
+                                    "correctly.".format(path=path))
+                with open(path, 'rb') as f:
+                    self.assertEqual(hashlib.sha256(f.read()).hexdigest(), checksum)
+
+
+if __name__ == "__main__":
+    os.chdir(os.path.dirname(__file__))
+
+    parser = optparse.OptionParser()
+    parser.add_option("-v", "--verbose", action="store_true", default=False,
+                      help="Spew out even more information than normal")
+    (common.options, args) = parser.parse_args(['--verbose'])
+
+    newSuite = unittest.TestSuite()
+    newSuite.addTest(unittest.makeSuite(SignaturesTest))
+    unittest.main(failfast=False)
diff --git a/tests/source-files/OtakuWorld/build.gradle b/tests/source-files/OtakuWorld/build.gradle
deleted file mode 100644
index cfbc1450..00000000
--- a/tests/source-files/OtakuWorld/build.gradle
+++ /dev/null
@@ -1,166 +0,0 @@
-// Top-level build file where you can add configuration options common to all sub-projects/modules.
-buildscript {
-    ext.kotlin_version = "1.6.21"
-    ext.latestAboutLibsRelease = "10.3.0"
-
-    ext.coroutinesVersion = "1.6.2"
-
-    ext.coroutinesCore = "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutinesVersion"
-    ext.coroutinesAndroid = "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutinesVersion"
-    ext.coroutinesRX =  "org.jetbrains.kotlinx:kotlinx-coroutines-rx2:$coroutinesVersion"
-
-    ext.gson = 'com.google.code.gson:gson:2.9.0'
-
-    ext.glideVersion = "4.13.1"
-    ext.glide = "com.github.bumptech.glide:glide:$glideVersion"
-    ext.glideCompiler = "com.github.bumptech.glide:compiler:$glideVersion"
-
-    ext.paging_version = "3.1.1"
-
-    ext.rxkotlin = "io.reactivex.rxjava2:rxkotlin:2.4.0"
-    ext.rxandroid = "io.reactivex.rxjava2:rxandroid:2.1.1"
-    ext.rxbinding = 'com.jakewharton.rxbinding2:rxbinding:2.2.0'
-    ext.rxbindingKotlin = 'com.jakewharton.rxbinding2:rxbinding-kotlin:2.2.0'
-
-    ext.androidCore = 'androidx.core:core-ktx:1.8.0'
-    ext.appCompat = 'androidx.appcompat:appcompat:1.4.2'
-    ext.material = 'com.google.android.material:material:1.6.0-beta01'
-
-    ext.preference = "androidx.preference:preference-ktx:1.2.0"
-
-    ext.recyclerview = 'androidx.recyclerview:recyclerview:1.2.1'
-    ext.constraintlayout = 'androidx.constraintlayout:constraintlayout:2.1.4'
-    ext.swiperefresh = 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
-
-    ext.jsoup = 'org.jsoup:jsoup:1.15.1'
-
-    ext.crashlytics = 'com.google.firebase:firebase-crashlytics:18.2.8'
-    ext.analytics = 'com.google.firebase:firebase-analytics:20.1.0'
-    ext.play_services = 'com.google.android.gms:play-services-auth:20.1.0'
-
-    ext.exoplayer_version = "2.16.1"
-    ext.room_version = "2.4.2"
-
-    ext.nav_version = "2.4.2"
-
-    def koin_version = "3.0.2"
-
-    // Koin main features for Android (Scope,ViewModel ...)
-    ext.koinAndroid = "io.insert-koin:koin-android:$koin_version"
-    // Koin Android - experimental builder extensions
-    ext.koinAndroidExt = "io.insert-koin:koin-android-ext:$koin_version"
-
-    ext.lottieVersion = "4.2.2"
-
-    ext.coil = "2.1.0"
-
-    ext.jetpack = "1.2.0-rc01"
-
-    ext.accompanist = "0.24.11-rc"
-
-    ext.composeUi = "androidx.compose.ui:ui:$jetpack"
-    // Tooling support (Previews, etc.)
-    ext.composeUiTooling = "androidx.compose.ui:ui-tooling:$jetpack"
-    // Foundation (Border, Background, Box, Image, Scroll, shapes, animations, etc.)
-    ext.composeFoundation = "androidx.compose.foundation:foundation:$jetpack"
-    // Material Design
-    ext.composeMaterial = "androidx.compose.material:material:$jetpack"
-    ext.materialYou = "androidx.compose.material3:material3:1.0.0-alpha13"
-    // Material design icons
-    ext.composeMaterialIconsCore = "androidx.compose.material:material-icons-core:$jetpack"
-    ext.composeMaterialIconsExtended = "androidx.compose.material:material-icons-extended:$jetpack"
-    // Integration with activities
-    ext.composeActivity = 'androidx.activity:activity-compose:1.4.0'
-    // Integration with ViewModels
-    ext.composeLifecycle = 'androidx.lifecycle:lifecycle-viewmodel-compose:2.4.1'
-    // Integration with observables
-    ext.composeRuntimeLivedata = "androidx.compose.runtime:runtime-livedata:$jetpack"
-    ext.composeRuntimeRxjava2 = "androidx.compose.runtime:runtime-rxjava2:$jetpack"
-    ext.composeMaterialThemeAdapter = "com.google.android.material:compose-theme-adapter:1.1.11"
-    ext.composeMaterial3ThemeAdapter = "com.google.android.material:compose-theme-adapter-3:1.0.11"
-    ext.landscapistGlide = "com.github.skydoves:landscapist-glide:1.5.2"
-    ext.composeConstraintLayout = "androidx.constraintlayout:constraintlayout-compose:1.0.1"
-    ext.composeAnimation = "androidx.compose.animation:animation:$jetpack"
-    ext.materialPlaceholder = "com.google.accompanist:accompanist-placeholder-material:$accompanist"
-    ext.drawablePainter = "com.google.accompanist:accompanist-drawablepainter:$accompanist"
-    ext.permissions = "com.google.accompanist:accompanist-permissions:$accompanist"
-    ext.uiUtil = "androidx.compose.ui:ui-util:$jetpack"
-    ext.coilCompose = "io.coil-kt:coil-compose:$coil"
-    ext.navCompose = "androidx.navigation:navigation-compose:$nav_version"
-    ext.navMaterial = "com.google.accompanist:accompanist-navigation-material:$accompanist"
-    ext.navAnimation = "com.google.accompanist:accompanist-navigation-animation:$accompanist"
-
-    ext.swipeRefresh = "com.google.accompanist:accompanist-swiperefresh:$accompanist"
-    ext.systemUiController = "com.google.accompanist:accompanist-systemuicontroller:$accompanist"
-
-    ext.inset =  "com.google.accompanist:accompanist-insets:$accompanist"
-    // If using insets-ui
-    ext.insetUi = "com.google.accompanist:accompanist-insets-ui:$accompanist"
-
-    ext.datastore = "androidx.datastore:datastore:1.0.0"
-    ext.datastorePref = "androidx.datastore:datastore-preferences:1.0.0"
-
-    ext {
-        jakepurple13Tools = [
-                helpfultools: [
-                        Deps.gsonutils,
-                        Deps.helpfulutils,
-                        Deps.loggingutils,
-                        Deps.dragswipe,
-                        Deps.funutils,
-                        Deps.rxutils
-                ]
-        ]
-        room = [
-                room: [
-                        "androidx.room:room-runtime:$room_version",
-                        "androidx.room:room-ktx:$room_version",
-                        "androidx.room:room-rxjava2:$room_version"
-                ]
-        ]
-
-        koin = [koin: [koinAndroid, koinAndroidExt]]
-
-        compose = [
-                compose: [
-                        composeUi, composeUiTooling, composeFoundation, composeMaterial,
-                        composeMaterialIconsCore, composeMaterialIconsExtended,
-                        composeActivity, composeLifecycle,
-                        composeRuntimeLivedata, composeRuntimeRxjava2,
-                        composeMaterialThemeAdapter, composeMaterial3ThemeAdapter,
-                        landscapistGlide, coilCompose,
-                        composeConstraintLayout, permissions,
-                        materialPlaceholder, drawablePainter, uiUtil,
-                        materialYou,
-                        inset, insetUi,
-                        navCompose, navMaterial, navAnimation,
-                        swipeRefresh, systemUiController
-                ]
-        ]
-
-        firebaseCrash = [ crash: [crashlytics, analytics] ]
-
-        datastore = [ datastore: [datastore, datastorePref] ]
-    }
-
-    repositories {
-        google()
-        gradlePluginPortal()
-        mavenCentral()
-    }
-    dependencies {
-        classpath 'com.android.tools.build:gradle:7.1.2'
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-        classpath 'com.google.gms:google-services:4.3.10'
-        classpath 'com.google.firebase:firebase-crashlytics-gradle:2.8.1'
-        classpath "com.mikepenz.aboutlibraries.plugin:aboutlibraries-plugin:10.3.0"
-        classpath "org.jetbrains.kotlin:kotlin-serialization:$kotlin_version"
-        // NOTE: Do not place your application dependencies here; they belong
-        // in the individual module build.gradle files
-        classpath "androidx.navigation:navigation-safe-args-gradle-plugin:$nav_version"
-    }
-}
-
-task clean(type: Delete) {
-    delete rootProject.buildDir
-}
diff --git a/tests/source-files/catalog.test/app/build.gradle b/tests/source-files/catalog.test/app/build.gradle
deleted file mode 100644
index 72c9d184..00000000
--- a/tests/source-files/catalog.test/app/build.gradle
+++ /dev/null
@@ -1,2 +0,0 @@
-implementation libs.bundles.firebase
-implementation libs.play.service.ads
diff --git a/tests/source-files/catalog.test/build.gradle.kts b/tests/source-files/catalog.test/build.gradle.kts
deleted file mode 100644
index 5572706f..00000000
--- a/tests/source-files/catalog.test/build.gradle.kts
+++ /dev/null
@@ -1,5 +0,0 @@
-plugins {
-    alias(libs.plugins.google.services)
-    alias(libs.plugins.firebase.crashlytics)
-    alias(projectLibs.plugins.firebase.crashlytics)
-}
diff --git a/tests/source-files/catalog.test/buildSrc/build.gradle.kts b/tests/source-files/catalog.test/buildSrc/build.gradle.kts
deleted file mode 100644
index 40eeaa54..00000000
--- a/tests/source-files/catalog.test/buildSrc/build.gradle.kts
+++ /dev/null
@@ -1,9 +0,0 @@
-plugins {
-    alias(libs.plugins.google.services)
-    alias(libs.plugins.firebase.crashlytics)
-    alias(projectLibs.plugins.firebase.crashlytics)
-}
-
-dependencies {
-    implementation(libs.plugins.androidApplication.asLibraryDependency)
-}
diff --git a/tests/source-files/catalog.test/buildSrc/settings.gradle.kts b/tests/source-files/catalog.test/buildSrc/settings.gradle.kts
deleted file mode 100644
index 98644daf..00000000
--- a/tests/source-files/catalog.test/buildSrc/settings.gradle.kts
+++ /dev/null
@@ -1,22 +0,0 @@
-pluginManagement {
-    repositories {
-        gradlePluginPortal()
-    }
-}
-
-dependencyResolutionManagement {
-    repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
-    repositories {
-        google()
-        mavenCentral()
-    }
-
-    versionCatalogs {
-        create("libs") {
-            from(files("../gradle/libs.versions.toml"))
-        }
-    }
-}
-
-rootProject.name = "buildSrc"
-rootProject.buildFileName = "buildSrc.gradle.kts"
diff --git a/tests/source-files/catalog.test/buildSrc2/build.gradle.kts b/tests/source-files/catalog.test/buildSrc2/build.gradle.kts
deleted file mode 100644
index 5572706f..00000000
--- a/tests/source-files/catalog.test/buildSrc2/build.gradle.kts
+++ /dev/null
@@ -1,5 +0,0 @@
-plugins {
-    alias(libs.plugins.google.services)
-    alias(libs.plugins.firebase.crashlytics)
-    alias(projectLibs.plugins.firebase.crashlytics)
-}
diff --git a/tests/source-files/catalog.test/buildSrc2/settings.gradle.kts b/tests/source-files/catalog.test/buildSrc2/settings.gradle.kts
deleted file mode 100644
index 98644daf..00000000
--- a/tests/source-files/catalog.test/buildSrc2/settings.gradle.kts
+++ /dev/null
@@ -1,22 +0,0 @@
-pluginManagement {
-    repositories {
-        gradlePluginPortal()
-    }
-}
-
-dependencyResolutionManagement {
-    repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
-    repositories {
-        google()
-        mavenCentral()
-    }
-
-    versionCatalogs {
-        create("libs") {
-            from(files("../gradle/libs.versions.toml"))
-        }
-    }
-}
-
-rootProject.name = "buildSrc"
-rootProject.buildFileName = "buildSrc.gradle.kts"
diff --git a/tests/source-files/catalog.test/core/build.gradle b/tests/source-files/catalog.test/core/build.gradle
deleted file mode 100644
index 72c9d184..00000000
--- a/tests/source-files/catalog.test/core/build.gradle
+++ /dev/null
@@ -1,2 +0,0 @@
-implementation libs.bundles.firebase
-implementation libs.play.service.ads
diff --git a/tests/source-files/catalog.test/gradle/libs.versions.toml b/tests/source-files/catalog.test/gradle/libs.versions.toml
deleted file mode 100644
index 9fb3707f..00000000
--- a/tests/source-files/catalog.test/gradle/libs.versions.toml
+++ /dev/null
@@ -1,18 +0,0 @@
-[versions]
-firebase = "1.1.1"
-gms = "1.2.1"
-androidGradlePlugin = "8.12.0"
-
-[libraries]
-firebase-crash = { module = "com.google.firebase:firebase-crash", version.ref = "firebase" }
-firebase_core = { module = "com.google.firebase:firebase-core", version = "2.2.2" }
-"play.service.ads" = { module = "com.google.android.gms:play-services-ads", version.ref = "gms" }
-jacoco = "org.jacoco:org.jacoco.core:0.8.7"
-
-[plugins]
-google-services = { id = "com.google.gms.google-services", version.ref = "gms" }
-firebase-crashlytics = { id = "com.google.firebase.crashlytics", version.ref = "firebase" }
-androidApplication = { id = "com.android.application", version.ref = "androidGradlePlugin" }
-
-[bundles]
-firebase = ["firebase-crash", "firebase_core"]
diff --git a/tests/source-files/catalog.test/libs.versions.toml b/tests/source-files/catalog.test/libs.versions.toml
deleted file mode 100644
index 666a0f7f..00000000
--- a/tests/source-files/catalog.test/libs.versions.toml
+++ /dev/null
@@ -1,15 +0,0 @@
-[versions]
-firebase = "1.1.1"
-gms = "1.2.1"
-
-[libraries]
-firebase-crash = { module = "com.google.firebase:firebase-crash", version.ref = "firebase" }
-firebase_core = { module = "com.google.firebase:firebase-core", version = "2.2.2" }
-"play.service.ads" = { module = "com.google.android.gms:play-services-ads", version.ref = "gms"}
-
-[plugins]
-google-services = { id = "com.google.gms.google-services", version.ref = "gms" }
-firebase-crashlytics = { id = "com.google.firebase.crashlytics", version.ref = "firebase" }
-
-[bundles]
-firebase = ["firebase-crash", "firebase_core"]
diff --git a/tests/source-files/catalog.test/settings.gradle.kts b/tests/source-files/catalog.test/settings.gradle.kts
deleted file mode 100644
index fd9ba80c..00000000
--- a/tests/source-files/catalog.test/settings.gradle.kts
+++ /dev/null
@@ -1,14 +0,0 @@
-dependencyResolutionManagement {
-    repositories {
-        mavenCentral()
-    }
-    defaultLibrariesExtensionName = "projectLibs"
-    versionCatalogs {
-        create("libs") {
-            from(files("./libs.versions.toml"))
-        }
-        create("anotherLibs") {
-            from(files("$rootDir/libs.versions.toml"))
-        }
-    }
-}
diff --git a/tests/source-files/com.github.jameshnsears.quoteunquote/build.gradle b/tests/source-files/com.github.jameshnsears.quoteunquote/build.gradle
deleted file mode 100644
index bb55589e..00000000
--- a/tests/source-files/com.github.jameshnsears.quoteunquote/build.gradle
+++ /dev/null
@@ -1,232 +0,0 @@
-apply plugin: 'com.android.application'
-apply plugin: 'com.google.gms.google-services'
-apply plugin: 'kotlin-android'
-
-apply from: '../jacoco.gradle'
-apply from: '../ktlint.gradle'
-apply from: '../detekt.gradle'
-apply from: '../checkstyle.gradle'
-apply from: '../sonarcube.gradle'
-
-def localPropertiesFile = rootProject.file("local.properties")
-def localProperties = new Properties()
-
-if (!localPropertiesFile.exists()) {
-    localProperties.setProperty("RELEASE_STORE_PASSWORD", "")
-    localProperties.setProperty("RELEASE_KEY_PASSWORD", "")
-    localProperties.setProperty("RELEASE_KEY_ALIAS", "")
-    localProperties.setProperty("RELEASE_STORE_FILE", "keystore.jks")
-    Writer writer = new FileWriter(localPropertiesFile, false)
-    localProperties.store(writer, "empty, as creating the file is done manually via gpg")
-    writer.close()
-
-    file(project(':app').projectDir.path + "/keystore.jks").text = ""
-}
-
-localProperties.load(new FileInputStream(localPropertiesFile))
-
-android {
-    compileSdkVersion 30
-    // compileSdkVersion "android-S"
-
-    signingConfigs {
-        googleplay {
-            keyAlias localProperties['RELEASE_KEY_ALIAS']
-            keyPassword localProperties['RELEASE_KEY_PASSWORD']
-            storeFile file(localProperties['RELEASE_STORE_FILE'])
-            storePassword localProperties['RELEASE_STORE_PASSWORD']
-        }
-    }
-
-    defaultConfig {
-        minSdkVersion 24
-        targetSdkVersion 30
-        // minSdkVersion "S"
-        // targetSdkVersion "S"
-
-        applicationId "com.github.jameshnsears.quoteunquote"
-
-        versionCode 73
-        versionName "2.5.2"
-
-        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-        testInstrumentationRunnerArguments clearPackageData: 'true'
-
-        javaCompileOptions {
-            annotationProcessorOptions {
-                arguments += ["room.schemaLocation":
-                                      "$projectDir/schemas".toString()]
-            }
-        }
-    }
-
-    packagingOptions {
-        exclude "**/module-info.class"
-        exclude 'LICENSE'
-        exclude 'README.md'
-    }
-
-    lintOptions {
-        abortOnError true
-        warningsAsErrors false
-        checkAllWarnings = true
-        xmlReport false
-        htmlReport true
-    }
-
-    buildTypes {
-        def gitHash = { ->
-            def stdout = new ByteArrayOutputStream()
-            exec {
-                commandLine 'git', 'rev-parse', '--short=8', 'HEAD'
-                standardOutput = stdout
-            }
-            return stdout.toString().trim()
-        }
-
-        release {
-            minifyEnabled true
-            shrinkResources true
-            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
-
-            buildConfigField("String", "GIT_HASH", "\"$gitHash\"")
-            buildConfigField("String", "DATABASE_QUOTATIONS", "\"quotations.db.prod\"")
-        }
-        debug {
-            testCoverageEnabled true
-            buildConfigField("String", "GIT_HASH", "\"$gitHash\"")
-            buildConfigField("String", "DATABASE_QUOTATIONS", "\"quotations.db.dev\"")
-        }
-    }
-
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
-    }
-
-    kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_1_8.toString()
-    }
-
-    flavorDimensions 'Version'
-    productFlavors {
-        'googleplay' {
-            dimension 'Version'
-            versionNameSuffix "-googleplay"
-            signingConfig signingConfigs.googleplay
-        }
-        'googleplayS' {
-            dimension 'Version'
-            versionNameSuffix "-googleplay-S"
-            signingConfig signingConfigs.googleplay
-        }
-        'fdroid' {
-            dimension 'Version'
-            versionNameSuffix "-fdroid"
-            isDefault true
-        }
-        'fdroidS' {
-            dimension 'Version'
-            versionNameSuffix "-fdroid-S"
-        }
-    }
-
-    sourceSets {
-        androidTest {
-            assets.srcDirs += files("$projectDir/schemas".toString())
-        }
-        fdroid {
-            assets.srcDirs = ['src/main/assets']
-            java.srcDirs = ['src/main/java', 'src/fdroid/java']
-        }
-        fdroidS {
-            assets.srcDirs = ['src/main/assets']
-            java.srcDirs = ['src/main/java', 'src/fdroid/java']
-        }
-        googleplay {
-            assets.srcDirs = ['src/main/assets']
-            java.srcDirs = ['src/main/java']
-        }
-        googleplayS {
-            assets.srcDirs = ['src/main/assets']
-            java.srcDirs = ['src/main/java']
-        }
-    }
-
-    testOptions {
-        // will make tests run very slowly on the emulator/device + affects coverage #
-        // execution 'ANDROIDX_TEST_ORCHESTRATOR'
-
-        animationsDisabled true
-        unitTests {
-            includeAndroidResources = true
-            returnDefaultValues = true
-            all {
-                maxHeapSize = "1024m"
-                jacoco {
-                    includeNoLocationClasses = true
-                    excludes = ['jdk.internal.*']
-                }
-            }
-        }
-    }
-
-    buildFeatures {
-        viewBinding = true
-    }
-}
-
-dependencies {
-    androidTestImplementation "androidx.arch.core:core-testing:2.1.0"
-    androidTestImplementation 'androidx.room:room-testing:2.3.0'
-    androidTestImplementation 'androidx.test:core:1.4.0-beta01'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.2'
-    androidTestImplementation 'androidx.test:rules:1.3.0'
-    androidTestImplementation 'androidx.test:runner:1.3.0'
-    androidTestImplementation 'io.mockk:mockk-android:1.11.0'
-
-    annotationProcessor 'androidx.room:room-compiler:2.3.0'
-
-    debugImplementation 'androidx.fragment:fragment-testing:1.3.4'
-    debugImplementation 'androidx.test:core:1.4.0-beta01'
-    debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.7'
-
-    implementation 'androidx.activity:activity:1.2.3'
-    implementation 'androidx.fragment:fragment:1.3.4'
-    implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
-    implementation 'androidx.core:core-ktx:1.5.0'
-    fdroidSImplementation 'androidx.core:core-ktx:1.6.0-beta02'
-    googleplaySImplementation 'androidx.core:core-ktx:1.6.0-beta02'
-    implementation 'androidx.legacy:legacy-support-v4:1.0.0'
-    implementation 'androidx.lifecycle:lifecycle-common-java8:2.3.1'
-    implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
-    implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.3.1'
-    implementation 'androidx.multidex:multidex:2.0.1'
-    implementation 'androidx.room:room-guava:2.3.0'
-    implementation 'androidx.room:room-runtime:2.3.0'
-    implementation 'androidx.room:room-rxjava2:2.3.0'
-    implementation 'com.google.android.material:material:1.3.0'
-    implementation 'com.jakewharton.rxbinding2:rxbinding:2.2.0'
-    implementation 'com.jakewharton.timber:timber:4.7.1'
-    implementation fileTree(include: ['*.jar'], dir: 'libs')
-    implementation 'io.reactivex.rxjava2:rxandroid:2.1.1'
-    implementation 'io.reactivex.rxjava2:rxjava:2.2.21'
-    implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.5.10'
-
-    implementation project(path: ':cloudLib')
-    implementation project(path: ':utilsLib')
-
-    testImplementation 'androidx.arch.core:core-testing:2.1.0'
-    testImplementation 'androidx.room:room-testing:2.3.0'
-    testImplementation 'androidx.test:core-ktx:1.3.0'
-    testImplementation 'androidx.test.ext:junit:1.1.2'
-    testImplementation 'androidx.test:rules:1.3.0'
-    testImplementation 'com.google.guava:guava:30.1.1-jre'
-    testImplementation 'io.mockk:mockk:1.11.0'
-    testImplementation 'junit:junit:4.13.2'
-    testImplementation 'org.robolectric:robolectric:4.5.1'
-}
-
-repositories {
-    mavenCentral()
-}
diff --git a/tests/source-files/com.github.shadowsocks/core/build.gradle.kts b/tests/source-files/com.github.shadowsocks/core/build.gradle.kts
deleted file mode 100644
index b9708b02..00000000
--- a/tests/source-files/com.github.shadowsocks/core/build.gradle.kts
+++ /dev/null
@@ -1,94 +0,0 @@
-import com.android.build.gradle.internal.tasks.factory.dependsOn
-
-plugins {
-    id("com.android.library")
-    id("org.mozilla.rust-android-gradle.rust-android")
-    kotlin("android")
-    kotlin("kapt")
-    id("kotlin-parcelize")
-}
-
-setupCore()
-
-android {
-    defaultConfig {
-        consumerProguardFiles("proguard-rules.pro")
-
-        externalNativeBuild.ndkBuild {
-            abiFilters("armeabi-v7a", "arm64-v8a", "x86", "x86_64")
-            arguments("-j${Runtime.getRuntime().availableProcessors()}")
-        }
-
-        kapt.arguments {
-            arg("room.incremental", true)
-            arg("room.schemaLocation", "$projectDir/schemas")
-        }
-    }
-
-    externalNativeBuild.ndkBuild.path("src/main/jni/Android.mk")
-
-    sourceSets.getByName("androidTest") {
-        assets.setSrcDirs(assets.srcDirs + files("$projectDir/schemas"))
-    }
-}
-
-cargo {
-    module = "src/main/rust/shadowsocks-rust"
-    libname = "sslocal"
-    targets = listOf("arm", "arm64", "x86", "x86_64")
-    profile = findProperty("CARGO_PROFILE")?.toString() ?: currentFlavor
-    extraCargoBuildArguments = listOf("--bin", libname!!)
-    featureSpec.noDefaultBut(arrayOf(
-            "stream-cipher",
-            "aead-cipher-extra",
-            "logging",
-            "local-flow-stat",
-            "local-dns"))
-    exec = { spec, toolchain ->
-        spec.environment("RUST_ANDROID_GRADLE_LINKER_WRAPPER_PY", "$projectDir/$module/../linker-wrapper.py")
-        spec.environment("RUST_ANDROID_GRADLE_TARGET", "target/${toolchain.target}/$profile/lib$libname.so")
-    }
-}
-
-tasks.whenTaskAdded {
-    when (name) {
-        "mergeDebugJniLibFolders", "mergeReleaseJniLibFolders" -> dependsOn("cargoBuild")
-    }
-}
-
-tasks.register<Exec>("cargoClean") {
-    executable("cargo")     // cargo.cargoCommand
-    args("clean")
-    workingDir("$projectDir/${cargo.module}")
-}
-tasks.clean.dependsOn("cargoClean")
-
-dependencies {
-    val coroutinesVersion = "1.5.2"
-    val roomVersion = "2.3.0"
-    val workVersion = "2.7.0-beta01"
-
-    api(project(":plugin"))
-    api("androidx.core:core-ktx:1.6.0")
-    // https://android-developers.googleblog.com/2019/07/android-q-beta-5-update.html
-    api("androidx.drawerlayout:drawerlayout:1.1.1")
-    api("androidx.fragment:fragment-ktx:1.3.6")
-    api("com.google.android.material:material:1.4.0")
-
-    api("androidx.lifecycle:lifecycle-livedata-core-ktx:$lifecycleVersion")
-    api("androidx.preference:preference:1.1.1")
-    api("androidx.room:room-runtime:$roomVersion")
-    api("androidx.work:work-multiprocess:$workVersion")
-    api("androidx.work:work-runtime-ktx:$workVersion")
-    api("com.google.android.gms:play-services-oss-licenses:17.0.0")
-    api("com.google.code.gson:gson:2.8.8")
-    api("com.google.firebase:firebase-analytics-ktx:19.0.1")
-    api("com.google.firebase:firebase-crashlytics:18.2.1")
-    api("com.jakewharton.timber:timber:5.0.1")
-    api("dnsjava:dnsjava:3.4.1")
-    api("org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutinesVersion")
-    api("org.jetbrains.kotlinx:kotlinx-coroutines-play-services:$coroutinesVersion")
-    kapt("androidx.room:room-compiler:$roomVersion")
-    androidTestImplementation("androidx.room:room-testing:$roomVersion")
-    androidTestImplementation("androidx.test.ext:junit-ktx:1.1.3")
-}
diff --git a/tests/source-files/com.github.shadowsocks/mobile/build.gradle.kts b/tests/source-files/com.github.shadowsocks/mobile/build.gradle.kts
deleted file mode 100644
index 874ea857..00000000
--- a/tests/source-files/com.github.shadowsocks/mobile/build.gradle.kts
+++ /dev/null
@@ -1,28 +0,0 @@
-plugins {
-    id("com.android.application")
-    id("com.google.android.gms.oss-licenses-plugin")
-    id("com.google.gms.google-services")
-    id("com.google.firebase.crashlytics")
-    kotlin("android")
-    id("kotlin-parcelize")
-}
-
-setupApp()
-
-android.defaultConfig.applicationId = "com.github.shadowsocks"
-
-dependencies {
-    val cameraxVersion = "1.0.1"
-
-    implementation("androidx.browser:browser:1.3.0")
-    implementation("androidx.camera:camera-camera2:$cameraxVersion")
-    implementation("androidx.camera:camera-lifecycle:$cameraxVersion")
-    implementation("androidx.camera:camera-view:1.0.0-alpha28")
-    implementation("androidx.constraintlayout:constraintlayout:2.1.0")
-    implementation("androidx.lifecycle:lifecycle-runtime-ktx:$lifecycleVersion")
-    implementation("com.google.mlkit:barcode-scanning:17.0.0")
-    implementation("com.google.zxing:core:3.4.1")
-    implementation("com.takisoft.preferencex:preferencex-simplemenu:1.1.0")
-    implementation("com.twofortyfouram:android-plugin-api-for-locale:1.0.4")
-    implementation("me.zhanghai.android.fastscroll:library:1.1.7")
-}
diff --git a/tests/source-files/com.infomaniak.mail/Core/gradle/core.versions.toml b/tests/source-files/com.infomaniak.mail/Core/gradle/core.versions.toml
deleted file mode 100644
index e69de29b..00000000
diff --git a/tests/source-files/com.infomaniak.mail/gradle/libs.versions.toml b/tests/source-files/com.infomaniak.mail/gradle/libs.versions.toml
deleted file mode 100644
index e69de29b..00000000
diff --git a/tests/source-files/com.infomaniak.mail/settings.gradle b/tests/source-files/com.infomaniak.mail/settings.gradle
deleted file mode 100644
index bb9b1161..00000000
--- a/tests/source-files/com.infomaniak.mail/settings.gradle
+++ /dev/null
@@ -1,44 +0,0 @@
-pluginManagement {
-    repositories {
-        gradlePluginPortal()
-        google()
-        mavenCentral()
-    }
-}
-
-dependencyResolutionManagement {
-    repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
-    repositories {
-        google()
-        mavenCentral()
-        maven { url 'https://jitpack.io' }
-    }
-    versionCatalogs {
-        create("core") { from(files("Core/gradle/core.versions.toml")) }
-    }
-}
-
-rootProject.name = 'Infomaniak Mail'
-include ':app',
-        ':Core:AppIntegrity',
-        ':Core:Auth',
-        ':Core:Avatar',
-        ':Core:Coil',
-        ':Core:Compose:Basics',
-        ':Core:Compose:Margin',
-        ':Core:Compose:MaterialThemeFromXml',
-        ':Core:CrossAppLogin',
-        ':Core:CrossAppLoginUI',
-        ':Core:FragmentNavigation',
-        ':Core:Legacy',
-        ':Core:Legacy:AppLock',
-        ':Core:Legacy:BugTracker',
-        ':Core:Legacy:Confetti',
-        ':Core:Legacy:Stores',
-        ':Core:Matomo',
-        ':Core:MyKSuite',
-        ':Core:Network',
-        ':Core:Network:Models',
-        ':Core:Sentry',
-        ':EmojiComponents',
-        ':HtmlCleaner'
diff --git a/tests/source-files/com.jens.automation2/app/build.gradle b/tests/source-files/com.jens.automation2/app/build.gradle
deleted file mode 100644
index c2ffeda9..00000000
--- a/tests/source-files/com.jens.automation2/app/build.gradle
+++ /dev/null
@@ -1,78 +0,0 @@
-plugins {
-    id 'com.android.application'
-}
-
-android {
-    compileSdkVersion 29
-
-    defaultConfig {
-        applicationId "com.jens.automation2"
-        minSdkVersion 16
-        compileSdkVersion 29
-        buildToolsVersion '29.0.2'
-        useLibrary  'org.apache.http.legacy'
-        versionCode 96
-        versionName "1.6.21"
-
-        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-    }
-
-    buildTypes {
-        release {
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
-        }
-    }
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
-    }
-
-    lintOptions {
-        checkReleaseBuilds false
-        abortOnError false
-    }
-
-    flavorDimensions "version"
-
-    productFlavors
-            {
-                googlePlayFlavor
-                        {
-                            dimension "version"
-//                            applicationIdSuffix ".googlePlay"
-                            versionNameSuffix "-googlePlay"
-                            targetSdkVersion 29
-                        }
-
-                fdroidFlavor
-                        {
-                            dimension "version"
-//                            applicationIdSuffix ".fdroid"
-                            versionNameSuffix "-fdroid"
-                            targetSdkVersion 28
-                        }
-
-                apkFlavor
-                        {
-                            dimension "version"
-//                            applicationIdSuffix ".apk"
-                            versionNameSuffix "-apk"
-                            targetSdkVersion 28
-                        }
-            }
-}
-
-dependencies {
-    googlePlayFlavorImplementation 'com.google.firebase:firebase-appindexing:19.2.0'
-    googlePlayFlavorImplementation 'com.google.android.gms:play-services-location:17.1.0'
-
-    apkFlavorImplementation 'com.google.firebase:firebase-appindexing:19.2.0'
-    apkFlavorImplementation 'com.google.android.gms:play-services-location:17.1.0'
-
-    implementation 'androidx.appcompat:appcompat:1.2.0'
-    implementation 'com.google.android.material:material:1.3.0'
-    testImplementation 'junit:junit:4.+'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.2'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
-}
\ No newline at end of file
diff --git a/tests/source-files/com.jens.automation2/build.gradle b/tests/source-files/com.jens.automation2/build.gradle
deleted file mode 100644
index 1ed6b0cf..00000000
--- a/tests/source-files/com.jens.automation2/build.gradle
+++ /dev/null
@@ -1,77 +0,0 @@
-plugins {
-    id 'com.android.application'
-}
-
-android {
-    compileSdkVersion 29
-
-    defaultConfig {
-        applicationId "com.jens.automation2"
-        minSdkVersion 16
-        compileSdkVersion 29
-        buildToolsVersion '29.0.2'
-        useLibrary  'org.apache.http.legacy'
-        versionCode 105
-        versionName "1.6.34"
-
-        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-    }
-
-    buildTypes {
-        release {
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
-        }
-    }
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
-    }
-
-    lintOptions {
-        checkReleaseBuilds false
-        abortOnError false
-    }
-
-    flavorDimensions "version"
-
-    productFlavors
-            {
-                googlePlayFlavor
-                        {
-                            dimension "version"
-//                            applicationIdSuffix ".googlePlay"
-                            versionNameSuffix "-googlePlay"
-                            targetSdkVersion 29
-                        }
-
-                fdroidFlavor
-                        {
-                            dimension "version"
-//                            applicationIdSuffix ".fdroid"
-                            versionNameSuffix "-fdroid"
-                            targetSdkVersion 28
-                        }
-
-                apkFlavor
-                        {
-                            dimension "version"
-//                            applicationIdSuffix ".apk"
-                            versionNameSuffix "-apk"
-                            targetSdkVersion 28
-                        }
-            }
-}
-
-dependencies {
-
-
-
-    implementation 'com.linkedin.dexmaker:dexmaker:2.25.0'
-
-    implementation 'androidx.appcompat:appcompat:1.2.0'
-    implementation 'com.google.android.material:material:1.3.0'
-    testImplementation 'junit:junit:4.+'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.2'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
-}
diff --git a/tests/source-files/com.kunzisoft.testcase/build.gradle b/tests/source-files/com.kunzisoft.testcase/build.gradle
index 13cc4bc2..2753d058 100644
--- a/tests/source-files/com.kunzisoft.testcase/build.gradle
+++ b/tests/source-files/com.kunzisoft.testcase/build.gradle
@@ -59,15 +59,6 @@ android {
             // Version code : 2018_04_30
             // Version name : 20180430-underscore
         }
-        underscore_first {
-            applicationIdSuffix = ".underscore_first"
-            versionCode _04_30
-            buildConfigField "boolean", "FULL_VERSION", "true"
-            buildConfigField "boolean", "CLOSED_STORE", "true"
-            // ApplicationId : com.kunzisoft.fdroidtest.applicationidsuffix.underscore_first
-            // Version code : 1
-            // Version name : 1.0
-        }
     }
 }
 
diff --git a/tests/source-files/com.lolo.io.onelist/app/build.gradle.kts b/tests/source-files/com.lolo.io.onelist/app/build.gradle.kts
deleted file mode 100644
index 261cfe2f..00000000
--- a/tests/source-files/com.lolo.io.onelist/app/build.gradle.kts
+++ /dev/null
@@ -1,118 +0,0 @@
-import java.io.FileInputStream
-import java.util.Properties
-
-plugins {
-    alias(libs.plugins.android.application)
-    alias(libs.plugins.kotlin.android)
-    alias(libs.plugins.google.services)
-    alias(libs.plugins.firebase.crashlytics)
-    alias(libs.plugins.ksp)
-}
-android {
-    namespace = "com.lolo.io.onelist"
-
-    val versionPropsFile = file("../version.properties")
-    var versionCodeCI: Int? = null
-    if (versionPropsFile.canRead()) {
-        val versionProps = Properties()
-        versionProps.load(FileInputStream(versionPropsFile))
-        val v = versionProps["VERSION_CODE"]
-        versionCodeCI = (versionProps["VERSION_CODE"] as String).toInt()
-    }
-
-
-    defaultConfig {
-        multiDexEnabled = true
-        applicationId = "com.lolo.io.onelist"
-        compileSdk = 34
-        minSdk = 23
-        targetSdk = 34
-        versionCode = versionCodeCI ?: 19
-        versionName = "1.4.2"
-        vectorDrawables.useSupportLibrary = true
-    }
-
-    androidResources {
-        generateLocaleConfig = true
-    }
-
-    buildFeatures {
-        viewBinding = true
-        buildConfig = true
-    }
-
-
-    ksp {
-        arg("room.schemaLocation", "$projectDir/schemas")
-    }
-
-    buildTypes {
-        getByName("debug") {
-            applicationIdSuffix = ".debug"
-            versionNameSuffix = "-DEBUG"
-            resValue("string", "app_name", "1ListDev")
-        }
-        getByName("release") {
-            isMinifyEnabled = true
-            isShrinkResources = true
-
-            proguardFiles(
-                getDefaultProguardFile("proguard-android-optimize.txt"),
-                "proguard-rules.pro"
-            )
-            resValue("string", "app_name", "1List")
-        }
-    }
-
-    compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_17
-        targetCompatibility = JavaVersion.VERSION_17
-    }
-
-}
-repositories {
-    google()
-    mavenCentral()
-    maven { url = uri("https://jitpack.io") }
-}
-
-dependencies {
-
-    // android
-    implementation(libs.androidx.core.splashscreen)
-    implementation(libs.androidx.preference.ktx)
-    implementation(libs.androidx.lifecycle.extensions)
-    implementation(libs.androidx.legacy.support.v4)
-    implementation(libs.androidx.appcompat)
-
-    // android - design
-    implementation(libs.constraint.layout)
-    implementation(libs.androidx.recyclerview)
-    implementation(libs.flexbox)
-    implementation(libs.material)
-    implementation(libs.androidx.swiperefreshlayout)
-
-    // kotlin
-    implementation(libs.kotlinx.coroutines.core)
-    implementation(libs.kotlin.stdlib.jdk7)
-
-    // firebase
-    implementation(libs.firebase.crashlytics)
-
-    // koin di
-    implementation(libs.koin.android)
-    implementation(libs.koin.androidx.navigation)
-
-    // room
-    implementation(libs.androidx.room.runtime)
-    implementation(libs.androidx.room.ktx)
-    ksp(libs.androidx.room.compiler)
-
-    // json
-    implementation(libs.gson)
-
-    // other libs
-    implementation(libs.whatsnew)
-    implementation(libs.storage)
-    implementation(libs.advrecyclerview)
-}
diff --git a/tests/source-files/com.lolo.io.onelist/build.gradle.kts b/tests/source-files/com.lolo.io.onelist/build.gradle.kts
deleted file mode 100644
index baad9726..00000000
--- a/tests/source-files/com.lolo.io.onelist/build.gradle.kts
+++ /dev/null
@@ -1,11 +0,0 @@
-plugins {
-    alias(libs.plugins.android.application) apply false
-    alias(libs.plugins.kotlin.android) apply false
-    alias(libs.plugins.google.services) apply false
-    alias(libs.plugins.firebase.crashlytics) apply false
-    alias(libs.plugins.ksp) apply false
-}
-
-tasks.register("clean", Delete::class) {
-    delete(rootProject.layout.buildDirectory)
-}
\ No newline at end of file
diff --git a/tests/source-files/com.lolo.io.onelist/gradle/libs.versions.toml b/tests/source-files/com.lolo.io.onelist/gradle/libs.versions.toml
deleted file mode 100644
index d6cf9869..00000000
--- a/tests/source-files/com.lolo.io.onelist/gradle/libs.versions.toml
+++ /dev/null
@@ -1,58 +0,0 @@
-[versions]
-advrecyclerview = "1.0.0"
-appcompat = "1.6.1"
-constraint-layout = "2.0.4"
-crashlytics = "18.6.2"
-firebase-crashlytics-gradle-plugin = "2.9.9"
-flexbox = "3.0.0"
-gson = "2.5.6"
-kotlin = "1.9.20"
-kotlin-coroutines = "1.6.4"
-legacy-support-v4 = "1.0.0"
-lifecycle-extensions = "2.2.0"
-material = "1.11.0"
-preference-ktx = "1.2.1"
-recyclerview = "1.3.2"
-splashscreen ="1.0.1"
-koin ="3.5.0"
-room="2.6.1"
-storage = "1.5.5"
-swiperefreshlayout = "1.1.0"
-whatsnew = "0.1.7"
-ksp-plugin="1.9.20-1.0.14"
-
-# plugins versions
-android-application-plugin="8.3.0"
-kotlin-android-plugin="1.9.22"
-google-services-plugin = "4.4.1"
-
-[libraries]
-advrecyclerview = { module = "com.h6ah4i.android.widget.advrecyclerview:advrecyclerview", version.ref = "advrecyclerview" }
-androidx-appcompat = { module = "androidx.appcompat:appcompat", version.ref = "appcompat" }
-androidx-core-splashscreen = { module = "androidx.core:core-splashscreen", version.ref = "splashscreen" }
-androidx-legacy-support-v4 = { module = "androidx.legacy:legacy-support-v4", version.ref = "legacy-support-v4" }
-androidx-lifecycle-extensions = { module = "androidx.lifecycle:lifecycle-extensions", version.ref = "lifecycle-extensions" }
-androidx-preference-ktx = { module = "androidx.preference:preference-ktx", version.ref = "preference-ktx" }
-androidx-recyclerview = { module = "androidx.recyclerview:recyclerview", version.ref = "recyclerview" }
-androidx-room-runtime = { group = "androidx.room", name = "room-runtime", version.ref = "room" }
-androidx-room-ktx = { group = "androidx.room", name = "room-ktx", version.ref = "room" }
-androidx-room-compiler = { group = "androidx.room", name = "room-compiler", version.ref = "room" }
-androidx-swiperefreshlayout = { module = "androidx.swiperefreshlayout:swiperefreshlayout", version.ref = "swiperefreshlayout" }
-constraint-layout = { module = "com.android.support.constraint:constraint-layout", version.ref = "constraint-layout" }
-firebase-crashlytics = { module = "com.google.firebase:firebase-crashlytics", version.ref = "crashlytics" }
-flexbox = { module = "com.google.android.flexbox:flexbox", version.ref = "flexbox" }
-gson = { module = "org.immutables:gson", version.ref = "gson" }
-koin-android = { module = "io.insert-koin:koin-android", version.ref = "koin" }
-koin-androidx-navigation = { module = "io.insert-koin:koin-androidx-navigation", version.ref = "koin" }
-kotlin-stdlib-jdk7 = { module = "org.jetbrains.kotlin:kotlin-stdlib-jdk7", version.ref = "kotlin" }
-kotlinx-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "kotlin-coroutines" }
-material = { module = "com.google.android.material:material", version.ref = "material" }
-storage = { module = "com.anggrayudi:storage", version.ref = "storage" }
-whatsnew = { module = "io.github.tonnyl:whatsnew", version.ref = "whatsnew" }
-
-[plugins]
-ksp = { id = "com.google.devtools.ksp", version.ref = "ksp-plugin" }
-android-application = { id = "com.android.application", version.ref = "android-application-plugin" }
-kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin-android-plugin" }
-google-services = { id = "com.google.gms.google-services", version.ref = "google-services-plugin" }
-firebase-crashlytics = { id = "com.google.firebase.crashlytics", version.ref = "firebase-crashlytics-gradle-plugin" }
\ No newline at end of file
diff --git a/tests/source-files/com.lolo.io.onelist/gradle/wrapper/gradle-wrapper.properties b/tests/source-files/com.lolo.io.onelist/gradle/wrapper/gradle-wrapper.properties
deleted file mode 100644
index e411586a..00000000
--- a/tests/source-files/com.lolo.io.onelist/gradle/wrapper/gradle-wrapper.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-distributionBase=GRADLE_USER_HOME
-distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
-zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
diff --git a/tests/source-files/com.lolo.io.onelist/settings.gradle b/tests/source-files/com.lolo.io.onelist/settings.gradle
deleted file mode 100644
index 533aeeeb..00000000
--- a/tests/source-files/com.lolo.io.onelist/settings.gradle
+++ /dev/null
@@ -1,9 +0,0 @@
-pluginManagement {
-    repositories {
-        google()
-        mavenCentral()
-        gradlePluginPortal()
-    }
-}
-
-include 'app'
diff --git a/tests/source-files/com.ubergeek42.WeechatAndroid/app/build.gradle.kts b/tests/source-files/com.ubergeek42.WeechatAndroid/app/build.gradle.kts
deleted file mode 100644
index 88c03a08..00000000
--- a/tests/source-files/com.ubergeek42.WeechatAndroid/app/build.gradle.kts
+++ /dev/null
@@ -1,306 +0,0 @@
-import com.android.build.api.transform.*
-import com.android.build.api.variant.VariantInfo
-import com.android.utils.FileUtils
-import org.gradle.internal.os.OperatingSystem
-import org.aspectj.bridge.IMessage
-import org.aspectj.bridge.MessageHandler
-import org.aspectj.tools.ajc.Main
-
-plugins {
-    id("com.android.application")
-    kotlin("android")
-    kotlin("kapt")
-}
-
-dependencies {
-    implementation(project(":cats"))
-    implementation(project(":relay"))
-
-    implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.7.0")
-
-    // these two are required for logging within the relay module. todo remove?
-    implementation("org.slf4j:slf4j-api:1.7.36")
-    implementation("com.noveogroup.android:android-logger:1.3.6")
-
-    implementation("androidx.core:core-ktx:1.8.0")
-    implementation("androidx.legacy:legacy-support-v4:1.0.0")
-    implementation("androidx.annotation:annotation:1.3.0") // For @Nullable/@NonNull
-    implementation("androidx.appcompat:appcompat:1.4.2")
-    implementation("androidx.emoji2:emoji2:1.1.0")
-    implementation("androidx.preference:preference-ktx:1.2.0")  // preference fragment & al
-    implementation("androidx.legacy:legacy-preference-v14:1.0.0") // styling for the fragment
-    implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.4.1")
-    implementation("androidx.lifecycle:lifecycle-common-java8:2.4.1")
-    implementation("androidx.sharetarget:sharetarget:1.2.0-rc01")
-
-    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.2")
-
-    implementation("com.github.bumptech.glide:glide:4.13.2")
-    kapt("com.github.bumptech.glide:compiler:4.13.2")
-    implementation("com.squareup.okhttp3:okhttp:4.10.0")
-
-    val roomVersion = "2.4.2"
-    implementation("androidx.room:room-runtime:$roomVersion")
-    annotationProcessor("androidx.room:room-compiler:$roomVersion")
-    kapt("androidx.room:room-compiler:$roomVersion")
-
-    implementation("org.yaml:snakeyaml:1.30")
-
-    implementation("org.bouncycastle:bcpkix-jdk15on:1.70")
-
-    // needed for thread-safe date formatting as SimpleDateFormat isn"t thread-safe
-    // the alternatives, including apache commons and threetenabp, seem to be much slower
-    // todo perhaps replace with core library desugaring, if it"s fast
-    implementation("net.danlew:android.joda:2.10.14")
-
-    implementation("org.greenrobot:eventbus:3.3.1")
-
-    debugImplementation("org.aspectj:aspectjrt:1.9.9.1")
-    debugImplementation("com.squareup.leakcanary:leakcanary-android:2.9.1")
-
-    testImplementation("org.junit.jupiter:junit-jupiter:5.8.2")
-    testImplementation("org.junit.jupiter:junit-jupiter-params:5.8.2")
-}
-
-tasks.withType<JavaCompile> {
-    options.encoding = "UTF-8"
-}
-
-android {
-    compileSdk = 31
-
-    defaultConfig {
-        versionCode = 1_08_01
-        versionName = "1.8.1"
-
-        minSdk = 21
-        targetSdk = 31
-        buildConfigField("String", "VERSION_BANNER", "\"" + versionBanner() + "\"")
-
-        vectorDrawables.useSupportLibrary = true
-
-        javaCompileOptions {
-            annotationProcessorOptions {
-                arguments["room.schemaLocation"] = "$projectDir/schemas"
-                arguments["room.incremental"] = "true"
-            }
-        }
-
-        kotlinOptions {
-            freeCompilerArgs = listOf(
-                    "-language-version", "1.7",
-                    "-api-version", "1.7")
-            jvmTarget = "11"
-        }
-    }
-
-    signingConfigs {
-        create("dev") {
-            try {
-                storeFile = file(project.properties["devStorefile"] as String)
-                storePassword = project.properties["devStorePassword"] as String
-                keyAlias = project.properties["devKeyAlias"] as String
-                keyPassword = project.properties["devKeyPassword"] as String
-            } catch (e: Exception) {
-                project.logger.warn("WARNING: Set the values devStorefile, devStorePassword, " +
-                        "devKeyAlias, and devKeyPassword " +
-                        "in ~/.gradle/gradle.properties to sign the release.")
-            }
-        }
-    }
-
-    buildTypes {
-        getByName("debug") {
-            applicationIdSuffix = ".debug"
-            versionNameSuffix = "-debug"
-        }
-
-        getByName("release") {
-            isMinifyEnabled = true
-            proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"),
-                          "proguard-rules.pro",
-                          "../cats/proguard-rules.pro")
-            // kotlinx-coroutines-core debug-only artifact
-            // see https://github.com/Kotlin/kotlinx.coroutines#avoiding-including-the-debug-infrastructure-in-the-resulting-apk
-            packagingOptions {
-                resources.excludes += "DebugProbesKt.bin"
-            }
-        }
-
-        create("dev") {
-            initWith(getByName("release"))
-            matchingFallbacks += listOf("release")
-            applicationIdSuffix = ".dev"
-            versionNameSuffix = "-dev"
-            signingConfig = signingConfigs.getByName("dev")
-        }
-
-        compileOptions {
-            sourceCompatibility = JavaVersion.VERSION_11
-            targetCompatibility = JavaVersion.VERSION_11
-        }
-    }
-
-    buildFeatures {
-        viewBinding = true
-    }
-}
-
-fun versionBanner(): String {
-    val os = org.apache.commons.io.output.ByteArrayOutputStream()
-    project.exec {
-        commandLine = "git describe --long".split(" ")
-        standardOutput = os
-    }
-    return String(os.toByteArray()).trim()
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-/////////////////////////////////////////////////////////////////////////////////////////////// cats
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-// ajc gets hold of some files such as R.jar, and on Windows it leads to errors such as:
-//   The process cannot access the file because it is being used by another process
-// to avoid these, weave in a process, which `javaexec` will helpfully launch for us.
-
-fun weave(classPath: Iterable<File>, aspectPath: Iterable<File>, input: Iterable<File>, output: File) {
-    val runInAProcess = OperatingSystem.current().isWindows
-    val bootClassPath = android.bootClasspath
-
-    println(if (runInAProcess) ":: weaving in a process..." else ":: weaving...")
-    println(":: boot class path:  $bootClassPath")
-    println(":: class path:       $classPath")
-    println(":: aspect path:      $aspectPath")
-    println(":: input:            $input")
-    println(":: output:           $output")
-
-    val arguments = listOf("-showWeaveInfo",
-                           "-1.8",
-                           "-preserveAllLocals",
-                           "-bootclasspath", bootClassPath.asArgument,
-                           "-classpath", classPath.asArgument,
-                           "-aspectpath", aspectPath.asArgument,
-                           "-inpath", input.asArgument,
-                           "-d", output.absolutePath)
-
-    if (runInAProcess) {
-        javaexec {
-            classpath = weaving
-            main = "org.aspectj.tools.ajc.Main"
-            args = arguments
-        }
-    } else {
-        val handler = MessageHandler(true)
-        Main().run(arguments.toTypedArray(), handler)
-
-        val log = project.logger
-        for (message in handler.getMessages(null, true)) {
-            when (message.kind) {
-                IMessage.DEBUG -> log.debug("DEBUG " + message.message, message.thrown)
-                IMessage.INFO -> log.info("INFO: " + message.message, message.thrown)
-                IMessage.WARNING -> log.warn("WARN: " + message.message, message.thrown)
-                IMessage.FAIL,
-                IMessage.ERROR,
-                IMessage.ABORT -> log.error("ERROR: " + message.message, message.thrown)
-            }
-        }
-    }
-}
-
-// the only purpose of the following is to get a hold of aspectjtools jar
-// this jar is already on build script classpath, but that classpath is impossible to get
-// see https://discuss.gradle.org/t/how-do-i-determine-buildscript-classpath/37973/3
-
-val weaving: Configuration by configurations.creating
-
-dependencies {
-    weaving("org.aspectj:aspectjtools:1.9.9.1")
-}
-
-// historical note: the problem with weaving Kotlin and Java in-place is that:
-//   * Java is compiled by task compileDebugJavaWithJavac
-//   * gradle can run either one of these tasks, or both of them
-//   * compileDebugJavaWithJavac depends on compileDebugKotlin
-//   * weaving Kotlin requires Java classes
-//
-// a transformation is a poorly advertised feature that works on merged code, and also has its own
-// inputs and outputs, so this fixes all of our problems...
-
-    class TransformCats : Transform() {
-    override fun getName(): String = TransformCats::class.simpleName!!
-
-    override fun getInputTypes() = setOf(QualifiedContent.DefaultContentType.CLASSES)
-
-    // only look for annotations in app classes
-    // transformation will consume these and put woven classes in the output dir
-    override fun getScopes() = mutableSetOf(QualifiedContent.Scope.PROJECT)
-
-    // but also have the rest on our class path
-    // these will not be touched by the transformation
-    override fun getReferencedScopes() = mutableSetOf(QualifiedContent.Scope.SUB_PROJECTS,
-                                                      QualifiedContent.Scope.EXTERNAL_LIBRARIES)
-
-    override fun isIncremental() = false
-
-    // only run on debug builds
-    override fun applyToVariant(variant: VariantInfo) = variant.isDebuggable
-
-    override fun transform(invocation: TransformInvocation) {
-        if (!invocation.isIncremental) {
-            invocation.outputProvider.deleteAll()
-        }
-
-        val output = invocation.outputProvider.getContentLocation(name, outputTypes,
-                                                                  scopes, Format.DIRECTORY)
-        if (output.isDirectory) FileUtils.deleteDirectoryContents(output)
-        FileUtils.mkdirs(output)
-
-        val input = mutableListOf<File>()
-        val classPath = mutableListOf<File>()
-        val aspectPath = mutableListOf<File>()
-
-        invocation.inputs.forEach { source ->
-            source.directoryInputs.forEach { dir ->
-                input.add(dir.file)
-                classPath.add(dir.file)
-            }
-
-            source.jarInputs.forEach { jar ->
-                input.add(jar.file)
-                classPath.add(jar.file)
-            }
-        }
-
-        invocation.referencedInputs.forEach { source ->
-            source.directoryInputs.forEach { dir ->
-                classPath.add(dir.file)
-            }
-
-            source.jarInputs.forEach { jar ->
-                classPath.add(jar.file)
-                // this used to read `if (jar.name == ":cats") ...`,
-                // but with android gradle plugin 4.2.0 jar names contain garbage
-                // this is a very simple but a bit fragile workaround. todo improve
-                if (jar.file.directoriesInsideRootProject().contains("cats")) {
-                    aspectPath.add(jar.file)
-                }
-            }
-
-        }
-
-        weave(classPath, aspectPath, input, output)
-    }
-}
-
-android.registerTransform(TransformCats())
-
-val Iterable<File>.asArgument get() = joinToString(File.pathSeparator)
-
-fun File.directoriesInsideRootProject() = sequence {
-    var file = this@directoriesInsideRootProject
-    while (true) {
-        yield(file.name)
-        file = file.parentFile ?: break
-        if (file == rootProject.projectDir) break
-    }
-}
diff --git a/tests/source-files/com.ubergeek42.WeechatAndroid/app/src/main/res/values/strings.xml b/tests/source-files/com.ubergeek42.WeechatAndroid/app/src/main/res/values/strings.xml
deleted file mode 100644
index 0e1ff29b..00000000
--- a/tests/source-files/com.ubergeek42.WeechatAndroid/app/src/main/res/values/strings.xml
+++ /dev/null
@@ -1,1023 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE resources [
-    <!ENTITY nbsp "&#160;"> <!-- &#xA0;, non-breaking space -->
-]>
-<resources xmlns:tools="http://schemas.android.com/tools">
-
-    <!-- ####################################################################################### -->
-    <!-- ######################################### etc ######################################### -->
-    <!-- ####################################################################################### -->
-
-    <!-- ################################ internally used names ################################ -->
-
-    <string name="etc__application_name" translatable="false">Weechat-Android</string>
-    <string name="etc__package_name" translatable="false">com.ubergeek42.WeechatAndroid</string>
-
-    <!-- ################################### runtime errors #################################### -->
-
-    <string name="error__pref_validation__relay_host_not_set">Relay host is not set</string>
-    <string name="error__pref_validation__relay_password_not_set">Relay password is not set</string>
-    <string name="error__pref_validation__ssh_host_not_set">SSH host is not set</string>
-    <string name="error__pref_validation__ssh_password_not_set">SSH password is not set</string>
-    <string name="error__pref_validation__ssh_key_not_set">SSH private key is not set</string>
-
-    <!-- more connection errors in preferences section -->
-    <string name="error__connection__server_unexpectedly_closed_connection">
-        Server unexpectedly closed connection while connecting.
-        Wrong password or connection type?</string>
-    <string name="error__connection__could_not_resolve_address">
-        Could not resolve address %s</string>
-
-    <string name="error__etc__prefix">Error: %s</string>
-    <string name="error__etc__hot_line_lost">Buffer lost some hot messages because of new lines</string>
-    <string name="error__etc__no_hot_buffers">There are no hot buffers for now</string>
-    <string name="error__etc__not_connected">Not connected</string>
-    <string name="error__etc__cannot_share_to_empty_buffer_list">Buffer list empty</string>
-    <string name="error__etc__activity_not_found_for_url">Activity not found for intent %s</string>
-
-    <!-- ############################## main activity ui elements ############################## -->
-
-    <string name="ui__button_paperclip">Upload file</string>
-    <string name="ui__button_tab">Tab</string>
-    <string name="ui__button_upload_now">Upload</string>
-    <string name="ui__button_send">Send</string>
-
-    <string name="ui__button_search_cancel">Cancel search</string>
-    <string name="ui__button_search_up">Search up</string>
-    <string name="ui__button_search_down">Search down</string>
-    <string name="ui__button_search_overflow">More</string>
-
-    <string name="ui__fab_go_to_bottom">Go to bottom</string>
-
-    <string name="ui__button_fetch_more_lines">Fetch more lines</string>
-    <string name="ui__button_fetching_lines">Fetching lines…</string>
-
-    <string name="ui__input_search_hint"><i>search</i></string>
-
-    <string name="ui__buffer_list_filter_placeholder"><i>filter</i></string>
-
-    <string name="ui__ActionBarDrawerToggle__open_drawer">Open drawer</string>
-    <string name="ui__ActionBarDrawerToggle__close_drawer">Close drawer</string>
-
-    <!-- ####################################################################################### -->
-    <!-- ######################################### menu ######################################## -->
-    <!-- ####################################################################################### -->
-
-    <string name="menu__search">Search</string>
-
-    <string name="menu__nicklist">Users</string>
-
-    <string name="menu__hotlist">Hotlist</string>
-    <string name="menu__hotlist_hint">Show hot message</string>
-
-    <string name="menu__close">Close</string>
-
-    <string name="menu__connection_state__connect">Connect</string>
-    <string name="menu__connection_state__disconnect">Disconnect</string>
-    <string name="menu__connection_state__stop_connecting">Stop connecting</string>
-
-    <string name="menu__preferences">Settings</string>
-
-    <string name="menu__filter_lines">Filter lines</string>
-
-    <string name="menu__dark_theme">Dark theme</string>
-
-    <string name="menu__upload_actions__content_images">Attach image</string>
-    <string name="menu__upload_actions__content_media">Attach media</string>
-    <string name="menu__upload_actions__content_anything">Attach file</string>
-    <string name="menu__upload_actions__mediastore_images">Attach image</string>
-    <string name="menu__upload_actions__mediastore_media">Attach media</string>
-    <string name="menu__upload_actions__camera">Take photo</string>
-
-    <string name="menu__debug">Debug</string>
-    <string name="menu__debug__sync_hotlist">Sync hotlist</string>
-    <string name="menu__debug__die">Die</string>
-
-    <!-- ####################################################################################### -->
-
-    <string name="menu__search__source__prefix">Prefix</string>
-    <string name="menu__search__source__message">Message</string>
-    <string name="menu__search__source__prefix_and_message">Both</string>
-
-    <string name="menu__search__regex">Regex</string>
-    <string name="menu__search__case_sensitive">Case sensitive</string>
-
-    <!-- ####################################################################################### -->
-
-    <string name="menu__copy__with_timestamps">With timestamps</string>
-    <string name="menu__copy__without_timestamps">Without timestamps</string>
-    <string name="menu__copy__messages_only">Messages only</string>
-
-    <!-- ####################################################################################### -->
-    <!-- #################################### notifications #################################### -->
-    <!-- ####################################################################################### -->
-
-    <string name="notifications__channel__connection_status">Connection Status</string>
-    <string name="notifications__channel__hotlist">Hotlist</string>
-
-    <string name="notifications__main__waiting_for_network">Waiting for network</string>
-    <string name="notifications__main__will_connect_in_n_seconds">Will connect in %d seconds…</string>
-    <string name="notifications__main__connecting_now">Connecting now…</string>
-    <string name="notifications__main__connected_to">Connected to %s</string>
-
-    <!-- the is the title for the summary notification, it is visible to users -->
-    <plurals name="notifications__hot_summary__messages">
-        <item quantity="one">%d message</item>
-        <item quantity="other">%d messages</item>
-    </plurals>
-    <plurals name="notifications__hot_summary__in_buffers">
-        <item quantity="one">&nbsp;in %d buffer</item>
-        <item quantity="other">&nbsp;in %d buffers</item>
-    </plurals>
-
-    <!-- this is the title for individual buffer hot message notifications. it is not normally
-    visible to users in any way as they instead see messages from MessagingStyle -->
-    <plurals name="notifications__hot__text">
-        <item quantity="one">New message in %2$s</item>
-        <item quantity="other">%1$d new messages in %2$s</item>
-    </plurals>
-
-    <plurals name="notifications__MessagingStyle__missing_users">
-        <item quantity="one">(user unknown)</item>
-        <item quantity="other">(users unknown)</item>
-    </plurals>
-    <string name="notifications__MessagingStyle__missing_messages_1">(message not fetched)</string>
-    <plurals name="notifications__MessagingStyle__missing_messages">
-        <item quantity="one">(message not fetched)</item>
-        <item quantity="other">(%d messages not fetched)</item>
-    </plurals>
-
-    <!-- this is displayed when you reply to messages from notification itself -->
-    <string name="notifications__MessagingStyle__me">Me</string>
-
-    <string name="notifications__RemoteInput__label">Reply</string>
-
-    <!-- ####################################################################################### -->
-    <!-- ####################################################################################### -->
-    <!-- ####################################### dialogs ####################################### -->
-    <!-- ####################################################################################### -->
-    <!-- ####################################################################################### -->
-
-    <string name="dialog__nicklist__title" translatable="false">%1$s (%2$s)</string>
-    <plurals name="dialog__nicklist__n_users">
-        <item quantity="one">%1$d user</item>
-        <item quantity="other">%1$d users</item>
-    </plurals>
-    <string name="dialog__nicklist__user_away">%s (away)</string>
-
-
-    <string name="dialog__copy__title">Copy</string>
-    <string name="dialog__copy__button_select_text">Select text</string>
-
-    <string name="dialog__paste__title">Paste</string>
-
-    <string name="dialog__write_permission_for_camera__title">
-        Permission required</string>
-    <string name="dialog__write_permission_for_camera__text">
-        To take photos, app needs write access to public storage</string>
-    <string name="dialog__write_permission_for_camera__button_ok">OK</string>
-
-    <!-- ####################################################################################### -->
-    <!-- ################################# certificate dialogs ################################# -->
-    <!-- ####################################################################################### -->
-
-    <string name="dialog__certificate__certificate_description"><![CDATA[
-        <b>Issued to:</b><br>
-        %1$s<br>
-        <br>
-        <b>Issued by:</b><br>
-        %2$s<br>
-        <br>
-        <b>Validity period:</b><br>
-        Issued on: %3$s<br>
-        Expires on: %4$s<br>
-        <br>
-        <b>SHA-256 fingerprint:</b><br>
-        %5$s
-    ]]></string>
-    <string name="dialog__certificate__unknown_fingerprint">Unknown</string>
-
-    <string name="dialog__certificate__button_reject">Reject</string>
-    <string name="dialog__certificate__button_back_to_safety">Back to safety</string>
-
-    <!-- ############################### invalid hostname dialog ############################### -->
-
-    <string name="dialog__certificate__invalid_hostname__title">
-        Invalid hostname</string>
-
-    <string name="dialog__certificate__invalid_hostname__text"><![CDATA[
-        You are trying to connect to <strong>%1$s</strong>
-        but the certificate is only valid for the following hosts: %2$s
-    ]]></string>
-    <string name="dialog__certificate__invalid_hostname__text__android_p_warning"><![CDATA[
-        <br>Note that Android P and beyond does not fall back to Common Name (CN) validation.
-        Subject Alternative Name (SAN) must be used instead.
-        <a href="https://github.com/ubergeek42/weechat-android/wiki/Using-SSL-with-WeeChat">Learn more</a>
-    ]]></string>
-    <string name="dialog__certificate__invalid_hostname__text__host_line" translatable="false"><![CDATA[
-        <br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<strong>%s</strong>
-    ]]></string>
-    <string name="dialog__certificate__invalid_hostname__text__host_line_empty"><![CDATA[
-        <br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<strong>(none)</strong>
-    ]]></string>
-
-    <!-- ############################## certificate expired dialog ############################# -->
-
-    <string name="dialog__certificate__expired__title">
-        Certificate expired</string>
-    <string name="dialog__certificate__expired__text">
-        This certificate is no longer valid.
-        Please make sure that the device date is correct.</string>
-
-    <!-- ########################### certificate not yet valid dialog ########################## -->
-
-    <string name="dialog__certificate__not_yet_valid__title">
-        Certificate not yet valid</string>
-    <string name="dialog__certificate__not_yet_valid__text">
-        This certificate will be valid in the future.
-        Please make sure that the device date is correct.</string>
-
-    <!-- ############################# untrusted certificate dialog ############################ -->
-
-    <string name="dialog__certificate__untrusted__title">
-        Untrusted certificate</string>
-    <string name="dialog__certificate__untrusted__text">
-        This certificate isn’t trusted by Android, but you can still connect.
-        The app will remember the selected certificate
-        and trust it and any certificates signed by it.</string>
-
-    <string name="dialog__certificate__untrusted__button_accept">
-        Accept selected</string>
-
-    <!-- ############################ certificate not pinned dialog ############################ -->
-
-    <string name="dialog__certificate__not_pinned__title">
-        Certificate not pinned</string>
-    <string name="dialog__certificate__not_pinned__text">
-        This server is trusted by Android,
-        but a setting requires you to confirm that you trust it as well.
-        The app will remember the selected certificate
-        and trust it and any certificates signed by it.</string>
-
-    <string name="dialog__certificate__not_pinned__pin_selected">
-        Pin selected</string>
-
-    <!-- ####################################################################################### -->
-    <!-- ##################################### ssh dialogs ##################################### -->
-    <!-- ####################################################################################### -->
-
-    <!-- as used by dialog__ssh__server_unknown__text and dialog__ssh__server_changed_key__text -->
-    <string name="dialog__ssh__etc_unknown_key_type">Unknown</string>
-
-    <!-- #################################### unknown server ################################### -->
-
-    <string name="dialog__ssh__server_unknown__title">
-        Unknown server</string>
-    <string name="dialog__ssh__server_unknown__text"><![CDATA[
-        Server at <b>%1$s</b> has never been encountered.
-        <br>
-        <br>%2$s key SHA256 fingerprint:
-        <br><b>%3$s</b>
-    ]]></string>
-
-    <string name="dialog__ssh__server_unknown__button_accept_key">Accept server key</string>
-    <string name="dialog__ssh__server_unknown__button_reject_key">Reject</string>
-
-    <!-- ################################## server changed key ################################# -->
-
-    <string name="dialog__ssh__server_changed_key__title">
-        Server changed key</string>
-    <string name="dialog__ssh__server_changed_key__text"><![CDATA[
-        <b>⚠ Warning:</b> it’s possible that someone is trying to hijack this connection!
-        <br>
-        <br>Server at <b>%1$s</b> is known, but its key doesn’t match the key you previously accepted.
-        <br>
-        <br>%2$s key SHA256 fingerprint:
-        <br><b>%3$s</b>
-        <br>
-        <br>If you want to continue, please clear known hosts in preferences.
-    ]]></string>
-
-    <!-- ####################################################################################### -->
-    <!-- ####################################################################################### -->
-    <!-- ##################################### preferences ##################################### -->
-    <!-- ####################################################################################### -->
-    <!-- ####################################################################################### -->
-
-    <!-- ############################# generic preferences strings ############################# -->
-
-    <string name="pref__FilePreference__button_clear">Clear</string>
-    <string name="pref__FilePreference__button_paste">Paste</string>
-    <string name="pref__FilePreference__button_choose_file">Choose file</string>
-    <string name="pref__FilePreference__summary_adapter" translatable="false">%1$s (%2$s)</string>
-    <string name="pref__FilePreference__summary_status_set">set</string>
-    <string name="pref__FilePreference__summary_status_not_set">not set</string>
-    <string name="error__pref__clipboard_empty">Clipboard is empty</string>
-
-    <string name="pref__PasswordedFilePickerPreference__input_hint">password</string>
-
-    <string name="pref__FullScreenEditTextPreference__menu_save">Save</string>
-    <string name="pref__FullScreenEditTextPreference__menu_reset_to_default">Default</string>
-    <string name="pref__FullScreenEditTextPreference__discard_changes_prompt">Discard changes?</string>
-    <string name="pref__FullScreenEditTextPreference__discard_changes_cancel">Cancel</string>
-    <string name="pref__FullScreenEditTextPreference__discard_changes_discard">Discard</string>
-
-    <string name="pref__RingtonePreferenceFix__summary_none">None</string>
-    <string name="pref__RingtonePreferenceFix__summary_unknown">Unknown</string>
-
-    <string name="error__pref__invalid_number">Invalid number</string>
-    <string name="error__pref__no_spaces_allowed_in_hostnames">No spaces allowed in hostnames</string>
-
-    <!-- ####################################################################################### -->
-    <!-- ###################################### connection ##################################### -->
-    <!-- ####################################################################################### -->
-
-    <string name="pref__connection_group">Connection</string>
-
-    <string name="pref__connection_type">Connection type</string>
-    <string-array name="pref__connection_type_names">
-        <item>Plain connection</item>
-        <item>WeeChat SSL</item>
-        <item>SSH tunnel</item>
-        <item>WebSocket</item>
-        <item>WebSocket (SSL)</item>
-    </string-array>
-
-    <!-- ########################### connection: web socket settings ########################### -->
-
-    <string name="pref__connection__websocket_path">WebSocket path</string>
-
-    <!-- ############################### connection: ssl settings ############################## -->
-
-    <!-- note that we prefer “ssl” over “tsl” as it's used throughout the app
-    and also by weechat itself, as in `/relay add ssl.weechat` -->
-
-    <string name="pref__connection__ssl_group">SSL settings</string>
-
-    <string name="pref__connection__ssl__require_certificate_pin">
-        Require certificate pins</string>
-    <string name="pref__connection__ssl__require_certificate_pin_summary">
-        Prompt to confirm that you trust the server, even if the system trusts it</string>
-
-    <string name="pref__connection__ssl__clear_certificates">Clear certificates</string>
-    <string name="pref__ClearCertPreference__0_entries">No trusted certificates</string>
-    <string name="pref__ClearCertPreference__1_entries">One trusted certificate</string>
-    <plurals name="pref__ClearCertPreference__n_entries">
-        <item quantity="one">One trusted certificate</item>
-        <item quantity="other">%s trusted certificates</item>
-    </plurals>
-    <string name="pref__ClearCertPreference__prompt">Clear certificates?</string>
-    <string name="pref__ClearCertPreference__button_clear">Clear</string>
-    <string name="pref__ClearCertPreference__button_cancel">Cancel</string>
-    <string name="pref__ClearCertPreference__success_cleared">Certificates cleared</string>
-    <string name="pref__ClearCertPreference__error_could_not_clear">Could not clear certificates</string>
-
-    <string name="pref__connection__ssl__client_certificate">
-        Client certificate</string>
-    <string name="pref__connection__ssl__client_certificate_summary">
-        PKCS #12 file containing private key and client certificate</string>
-    <string name="pref__CertPickerPreference__success_stored_inside_security_hardware_yes">
-        Certificate was stored inside security hardware</string>
-    <string name="pref__CertPickerPreference__success_stored_inside_security_hardware_no">
-        Certificate was stored inside software key store</string>
-    <string name="pref__CertPickerPreference__success_stored_inside_security_hardware_yes_cant_tell">
-        Certificate was stored inside key store</string>
-    <string name="pref__CertPickerPreference__success_certificate_forgotten">
-        Certificate forgotten</string>
-
-    <string name="error__connection__ssl__client_certificate__not_set">
-        Server is asking for a client certificate but none is set.
-        Wanted: %1$s certificate issued by: %2$s</string>
-    <string name="error__connection__ssl__client_certificate__certificate_mismatch">
-        Server is asking for a client certificate but the one we have doesn’t fit.
-        Wanted: %1$s certificate issued by: %2$s</string>
-
-    <!-- ########################### connection: ssh tunnel settings ########################### -->
-
-    <string name="pref__connection__ssh_group">SSH tunnel settings</string>
-
-    <string name="pref__connection__ssh__host">SSH host</string>
-
-    <string name="pref__connection__ssh__port">SSH port</string>
-
-    <string name="pref__connection__ssh__user">SSH username</string>
-
-    <string name="pref__connection__ssh__authentication_method">Authentication method</string>
-    <string-array name="pref__connection__ssh__authentication_method_names">
-        <item>Password</item>
-        <item>Key</item>
-    </string-array>
-
-    <string name="pref__connection__ssh__password">Password</string>
-
-    <string name="pref__connection__ssh__key">Private key</string>
-    <string name="pref__connection__ssh__key_summary">Ed25519, ECDSA, RSA or DSA key</string>
-    <string name="pref__PrivateKeyPickerPreference__success_stored_inside_security_hardware_yes">
-        %s key was stored inside security hardware</string>
-    <string name="pref__PrivateKeyPickerPreference__success_stored_inside_security_hardware_no">
-        %s key was stored inside software key store</string>
-    <string name="pref__PrivateKeyPickerPreference__success_stored_inside_security_hardware_cant_tell">
-        %s key was stored inside key store</string>
-    <string name="pref__PrivateKeyPickerPreference__success_stored_outside_key_store">
-        %1$s key was stored inside the app.
-        \n
-        \nThe key couldn’t be stored in the key store: %2$s</string>
-    <string name="pref__PrivateKeyPickerPreference__success_key_forgotten">
-        Key forgotten</string>
-
-    <string name="pref__connection__ssh__clear_known_hosts">Clear known hosts</string>
-    <string name="pref__ClearKnownHostsPreference__0_entries">No entries</string>
-    <plurals name="pref__ClearKnownHostsPreference__n_entries">
-        <item quantity="one">%s entry</item>
-        <item quantity="other">%s entries</item>
-    </plurals>
-    <string name="pref__ClearKnownHostsPreference__prompt">Clear known hosts?</string>
-    <string name="pref__ClearKnownHostsPreference__button_cancel">Cancel</string>
-    <string name="pref__ClearKnownHostsPreference__button_clear">Clear</string>
-    <string name="pref__ClearKnownHostsPreference__success_cleared">Known hosts cleared</string>
-
-    <string name="error__connection__ssh__failed_to_authenticate_with_password">
-        Failed to authenticate with password</string>
-    <string name="error__connection__ssh__failed_to_authenticate_with_key">
-        Failed to authenticate with key</string>
-
-    <!-- ################################## connection: relay ################################## -->
-
-    <string name="pref__connection__relay_group">Relay</string>
-
-    <string name="pref__connection__relay_host">Relay host</string>
-
-    <string name="pref__connection__relay_port">Relay port</string>
-
-    <string name="pref__connection__relay_password">Relay password</string>
-
-    <!-- ############################ connection: relay: handshake ############################# -->
-
-    <string name="pref__connection__handshake_group">Handshake settings</string>
-
-    <string name="pref__connection__handshake">Handshake</string>
-    <string-array name="pref__connection__handshake_method_names">
-        <item>Compatibility</item>
-        <item>Modern &amp; fast</item>
-        <item>Modern</item>
-    </string-array>
-
-    <string name="pref__connection__handshake_help"><![CDATA[
-        This option determines the way the password is hashed during authentication.
-
-        <p>In <b>compatibility</b> mode, the password isn’t hashed. This is the fastest method.
-        This method is required if using WeeChat < 2.9, but works on the later versions as well.
-
-        <p><b>Modern & fast</b> handshake limits algorithms to the SHA-2 family.
-
-        <p><b>Modern</b> handshake also includes PBKDF2.
-        These algorithms can be very slow, depending on the number of iterations.
-
-        <p>Password hashing offers little to no benefit if the connection is encrypted.
-        <a href="https://github.com/ubergeek42/weechat-android/wiki/FAQ#what-does-the-handshake-option-do">Learn more</a>
-    ]]></string>
-
-    <!-- ######################### connection: relay: synchronization ########################## -->
-
-    <string name="pref__connection__synchronization_group">Synchronization settings</string>
-
-    <string name="pref__connection__synchronization__only_sync_open_buffers">
-        Only sync open buffers</string>
-    <string name="pref__connection__synchronization__only_sync_open_buffers_summary">
-        Can significantly reduce traffic and battery usage,
-        but hotlist updates will only happen once 5 minutes</string>
-
-    <string name="pref__connection__synchronization__sync_read_status">
-        Sync buffer read status</string>
-    <string name="pref__connection__synchronization__sync_read_status_summary">
-        Mark buffers as read in WeeChat when you read them in this app</string>
-
-    <string name="pref__connection__synchronization__line_increment">
-        Number of lines to fetch</string>
-    <string name="pref__connection__synchronization__line_increment_summary">
-        The number of lines requested when opening a buffer
-        or when you press the “Load more lines” button (%s)</string>
-
-    <string name="pref__connection__synchronization__line_number_to_request_when_starting_search">
-        Number of lines to fetch for search</string>
-    <string name="pref__connection__synchronization__line_number_to_request_when_starting_search_summary">
-        When starting a new search, unless already fetched,
-        the app will request up to this many lines from WeeChat (%s)</string>
-
-    <string name="pref__connection__synchronization_help">
-        These settings take effect after reconnection.
-        Note that due to filtering the number of lines actually shown
-        might be less than the number of loaded lines.
-        Also note that due to WeeChat’s limitations
-        the app has to re-fetch all lines every times it requests more lines.</string>
-
-    <!-- ############################## connection: miscellaneous ############################## -->
-
-    <string name="pref__connection__misc_group">Miscellaneous</string>
-
-    <string name="pref__connection__reconnect_on_connection_loss">Reconnect on connection loss</string>
-
-    <string name="pref__connection__connect_on_boot">Connect on system boot</string>
-
-    <!-- ############################## connection: ping settings ############################## -->
-
-    <string name="pref__connection__ping_group">Ping settings</string>
-
-    <string name="pref__connection__ping_enabled">
-        Enable ping</string>
-    <string name="pref__connection__ping_enabled_summary">
-        Periodically check that the relay connection is still alive when idle</string>
-
-    <string name="pref__connection__ping_idle">
-        Idle time</string>
-    <string name="pref__connection__ping_idle_summary">
-        Number of seconds to wait before sending a ping when the connection is idle (%s)</string>
-
-    <string name="pref__connection__ping_timeout">
-        Ping timeout</string>
-    <string name="pref__connection__ping_timeout_summary">
-        Number of seconds to wait before closing an unresponsive connection (%s)</string>
-
-    <!-- ####################################################################################### -->
-    <!-- ##################################### buffer list ##################################### -->
-    <!-- ####################################################################################### -->
-
-    <string name="pref__buffer_list_group">Buffer list</string>
-
-    <string name="pref__buffer_list__sort_by_hot">
-        Sort buffer list</string>
-    <string name="pref__buffer_list__sort_by_hot_summary">
-        Sort by number of highlights/private messages/unread messages</string>
-
-    <string name="pref__buffer_list__hide_server_buffers">
-        Hide non-conversation buffers</string>
-    <string name="pref__buffer_list__hide_server_buffers_summary">
-        E.g. server buffers and plugin buffers</string>
-
-    <string name="pref__buffer_list__hide_hidden_buffers">
-        Hide hidden buffers</string>
-    <string name="pref__buffer_list__hide_hidden_buffers_summary">
-        Hide buffers hidden with /buffer hide</string>
-
-    <string name="pref__buffer_list__show_buffer_filter">
-        Show buffer filter</string>
-    <string name="pref__buffer_list__show_buffer_filter_summary">
-        Filter matches full buffer names and reveals matching hidden buffers</string>
-
-    <string name="pref__buffer_list__use_gesture_exclusion_zone">
-        System gesture exclusion zone</string>
-    <string name="pref__buffer_list__use_gesture_exclusion_zone_summary">
-        On Android Q, the left side of the screen is reserved for the back gesture.
-        Enable this to have a small area in the bottom of the screen
-        where you can open the buffer list normally.</string>
-
-    <!-- ####################################################################################### -->
-    <!-- #################################### look and feel #################################### -->
-    <!-- ####################################################################################### -->
-
-    <string name="pref__look_n_feel_group">Look &amp; feel</string>
-
-    <string name="pref__look_n_feel__text_size">Text size</string>
-
-    <string name="pref__look_n_feel__hide_toolbar">
-        Hide action bar</string>
-    <string name="pref__look_n_feel__hide_toolbar_summary">
-        Hide action bar when the keyboard is open or when scrolling up</string>
-
-    <string name="pref__look_n_feel__filter_messages">
-        Filter messages</string>
-    <string name="pref__look_n_feel__filter_messages_summary">
-        Hide messages filtered by WeeChat (e.g. irc_smart_filter)</string>
-
-    <string name="pref__look_n_feel__alignment">
-        Prefix alignment</string>
-    <string-array name="pref__look_n_feel__alignment_names">
-        <item>Left aligned</item>
-        <item>Right aligned</item>
-        <item>Timestamp aligned</item>
-        <item>No alignment</item>
-    </string-array>
-
-    <string name="pref__look_n_feel__maximum_prefix_width">
-        Maximum width of prefix</string>
-    <string name="pref__look_n_feel__maximum_prefix_width_summary">
-        In terms of letters; longer nicknames will be cut (%s)</string>
-
-    <string name="pref__look_n_feel__enclose_nicks">
-        Enclose nicknames</string>
-    <string name="pref__look_n_feel__enclose_nicks_summary">
-        Enclose the nicknames in &lt;&nbsp;and&nbsp;&gt;</string>
-
-    <string name="pref__look_n_feel__timestamp_format">Timestamp format</string>
-    <string name="pref__look_n_feel__timestamp_format_summary">%s (default: HH:mm:ss)</string>
-    <string name="error__pref__invalid_timestamp_format">Invalid timestamp format</string>
-
-    <string name="pref__look_n_feel__font">
-        Buffer font</string>
-    <string name="pref__FontPreference__default">Default</string>
-    <string name="pref__FontPreference__import_button">Import</string>
-    <string name="pref__FontPreference__imported">Imported: %s</string>
-
-    <string name="pref__FontPreferenceHelp__summary">
-        Non-monospace fonts will not work well with alignment.
-        Import fonts from the dialog,
-        or put them into one of the following locations:%1$s</string>
-
-    <!-- ####################################################################################### -->
-    <!-- ######################################## theme ######################################## -->
-    <!-- ####################################################################################### -->
-
-    <string name="pref__theme">Theme</string>
-    <string-array name="pref__theme__theme_names">
-        <item translatable="false">@string/pref__theme__theme__system</item>
-        <item>Dark</item>
-        <item>Light</item>
-    </string-array>
-    <!-- overridden in -v29 -->
-    <string name="pref__theme__theme__system">Set by battery saver</string>
-
-    <string name="pref__theme__menu_switch">Theme switch</string>
-    <string name="pref__theme__menu_switch_summary">Show theme switch in the menu</string>
-
-    <string name="pref__theme__color_scheme_light">Light color scheme</string>
-    <string name="pref__theme__color_scheme_dark">Dark color scheme</string>
-    <string name="pref__ThemeManager__error_loading_color_scheme">Error loading color scheme %s</string> <!-- todo -->
-    <string name="pref__ThemePreference__not_set">Not set</string>
-    <string name="pref__ThemePreference__error">Error</string>
-    <string name="pref__ThemePreference__import_button">Import</string>
-    <string name="pref__ThemePreference__imported">Imported: %s</string>
-
-    <string name="pref__ThemePreferenceHelp__summary"><![CDATA[
-        You can create custom color schemes for this application.
-        Use arbitrary colors for UI elements,
-        customize highlight and read marker color,
-        change the WeeChat color palette!
-        <a href="https://github.com/ubergeek42/weechat-android/wiki/Custom-Color-Schemes">Learn more</a>
-        <br>
-        <br>Import color schemes from the dialogs
-        or put them into the following location:%1$s
-    ]]></string>
-
-    <string name="pref__theme__dim_down_non_human_lines">
-        Dim down non-human lines</string>
-    <string name="pref__theme__dim_down_non_human_lines_summary">
-        Display joins/quits in a faint color, as set in the color scheme</string>
-
-    <!-- ####################################################################################### -->
-    <!-- ####################################### buttons ####################################### -->
-    <!-- ####################################################################################### -->
-
-    <string name="pref__buttons_group">Buttons</string>
-
-    <string name="pref__buttons__show_tab">Show tab button</string>
-
-    <string name="pref__buttons__show_send">Show send button</string>
-
-    <string name="pref__buttons__show_paperclip">Show paperclip button</string>
-
-    <string name="pref__buttons__paperclip__action_1">Paperclip button short tap</string>
-    <string-array name="pref__buttons__paperclip__action_1_names" translatable="false">
-        <item>@string/pref__buttons__paperclip__actions__content_images</item>
-        <item>@string/pref__buttons__paperclip__actions__content_media</item>
-        <item>@string/pref__buttons__paperclip__actions__content_anything</item>
-        <item>@string/pref__buttons__paperclip__actions__mediastore_images</item>
-        <item>@string/pref__buttons__paperclip__actions__mediastore_media</item>
-        <item>@string/pref__buttons__paperclip__actions__camera</item>
-    </string-array>
-
-    <string name="pref__buttons__paperclip__action_2">Paperclip button long tap</string>
-    <string-array name="pref__buttons__paperclip__action_2_names" translatable="false">
-        <item>@string/pref__buttons__paperclip__actions__none</item>
-        <item>@string/pref__buttons__paperclip__actions__content_images</item>
-        <item>@string/pref__buttons__paperclip__actions__content_media</item>
-        <item>@string/pref__buttons__paperclip__actions__content_anything</item>
-        <item>@string/pref__buttons__paperclip__actions__mediastore_images</item>
-        <item>@string/pref__buttons__paperclip__actions__mediastore_media</item>
-        <item>@string/pref__buttons__paperclip__actions__camera</item>
-    </string-array>
-    <string name="pref__buttons__paperclip__actions__none">
-        Disabled</string>
-    <string name="pref__buttons__paperclip__actions__content_images">
-        System: attach images</string>
-    <string name="pref__buttons__paperclip__actions__content_media">
-        System: attach images and videos</string>
-    <string name="pref__buttons__paperclip__actions__content_anything">
-        System: attach any files</string>
-    <string name="pref__buttons__paperclip__actions__mediastore_images">
-        Gallery: attach images</string>
-    <string name="pref__buttons__paperclip__actions__mediastore_media">
-        Gallery: attach images and videos</string>
-    <string name="pref__buttons__paperclip__actions__camera">
-        Take photo</string>
-
-    <string name="pref__paperclip__help">
-        When the paperclip button gets hidden to provide more space for the input field,
-        you can still attach files via overflow menu.</string>
-
-    <string name="pref__buttons__volume_buttons_change_text_size">
-        Volume buttons change text size</string>
-    <string name="pref__buttons__volume_buttons_change_text_size_summary">
-        If set, volume buttons will change text size instead of volume</string>
-
-    <!-- ####################################################################################### -->
-    <!-- #################################### notifications #################################### -->
-    <!-- ####################################################################################### -->
-
-    <string name="pref__notifications_group">Notifications</string>
-
-    <string name="pref__notifications__enable">
-        Enable notifications</string>
-    <string name="pref__notifications__enable_summary">
-        Notify about hot messages such as private messages or highlights</string>
-
-    <string name="pref__notifications__sound">Notification sound</string>
-
-    <string name="pref__notifications__vibration">Vibration</string>
-
-    <string name="pref__notifications__light">Notification light</string>
-
-    <!-- ####################################################################################### -->
-    <!-- #################################### media preview #################################### -->
-    <!-- ####################################################################################### -->
-
-    <string name="pref__media_preview_group">Media preview</string>
-
-    <string name="pref__media_preview__enabled_for_network">Enabled</string>
-    <string-array name="pref__media_preview__enabled_for_network_names">
-        <item>Never</item>
-        <item>On Wi-Fi only</item>
-        <item>On unmetered networks only</item>
-        <item>Always</item>
-    </string-array>
-
-    <string name="pref__media_preview__enabled_for_context">Context</string>
-    <string name="pref__media_preview__enabled_for_context_summary_empty">Disabled everywhere</string>
-    <string name="pref__media_preview__enabled_for_context_summary">Enabled for %s</string>
-    <string-array name="pref__media_preview__enabled_for_context_names">
-        <item>Chat</item>
-        <item>Paste dialog</item>
-        <item>Notifications</item>
-    </string-array>
-
-    <!-- originally secure requests: optional, rewrite, require, hence the naming -->
-    <string name="pref__media_preview__secure_requests">Insecure requests</string>
-    <string-array name="pref__media_preview__secure_requests_names">
-        <item>Allow</item>
-        <item>Rewrite as HTTPS</item>
-        <item>Disallow</item>
-    </string-array>
-
-    <string name="pref__media_preview__help"><![CDATA[
-        Enabling media preview for notifications
-        can result in duplicate lines being shown on some earlier platforms.
-        Also note that you may need to clear the caches
-        for the settings to apply to already existing data.
-        <br />
-        <br /><b>⚠ Warning:</b> the app is accessing the web directly.
-        A malicious person could craft a website to learn your IP address and other data.
-        To prevent the app from accessing websites you don’t know,
-        remove the strategy for the wildcard host “*” or set it to “none”.
-        <a href="https://github.com/ubergeek42/weechat-android/wiki/Media-preview">Learn more</a>
-    ]]></string>
-
-    <string name="pref__media_preview__strategies">
-        Strategies</string>
-    <string name="pref__StrategyPreference__summary">
-        Defines the ways images are fetched from individual websites, and some filters.
-        \n
-        \n%1$s; %2$s;
-        \n
-        \n%3$s</string>
-    <string name="pref__StrategyPreference__summary_error">Error</string>
-    <string name="pref__StrategyPreference__message_filter_set">Message filter set</string>
-    <string name="pref__StrategyPreference__message_filter_not_set">Message filter not set</string>
-    <string name="pref__StrategyPreference__0_line_filters_set">line filters not set</string>
-    <plurals name="pref__StrategyPreference__n_line_filters_set">
-        <item quantity="one">%d line filter set</item>
-        <item quantity="other">%d line filters set</item>
-    </plurals>
-    <string name="pref__StrategyPreference__strategies_not_loaded">No strategies loaded</string>
-    <string name="pref__StrategyPreference__strategies_list">Strategies: %s</string>
-    <string name="pref__media_preview__strategies_default" translatable="false">
-"# don’t look for links in the part
-# of the message that matches the
-# following regex. this prevents
-# the app from showing broken links
-# in matrix clients’ quotes, e.g.
-# &lt;nick "http://broken.co"> message
-#message filter:
-#  ^&lt;[^ ]{1,16} \".{1,33}\">\\s
-
-line filters:
-# don’t display thumbnails for any
-# lines that match the following regex
-- regex: '^(?:Title: |[↑^] )'
-
-# don’t display thumbnails
-# for any lines from bot
-#- nicks: [bot]
-
-# don’t display thumbnails
-# for any lines from bot
-# that also math the given regex
-#- nicks: [bot]
-#  regex: ^&lt;\\S+>\\s
-
-strategies:
-- name: skip pastebins
-  type: none
-  hosts:
-  - pastebin.com
-  - bpa.st
-  - dpaste.com
-  - termbin.com
-
-- name: skip site banners
-  type: none
-  hosts:
-  - github.com
-  - gist.github.com
-  - stackoverflow.com
-  - '*.stackexchange.com'
-  - twitch.tv
-  - '*.twitch.tv'
-
-#- name: skip the rest, including redirects
-#  type: none
-#  hosts: ['*']
-
-- name: try the rest
-  type: any
-  hosts: ['*']
-
-- name: youtube
-  type: image
-  hosts: [www.youtube.com, m.youtube.com, youtube.com, youtu.be]
-  regex: (?i)^https?://(?:(?:www\\.|m\\.)?youtube\\.com/watch\\?v=|youtu\\.be/)([A-Za-z0-9_-]+)
-  small: https://img.youtube.com/vi/$1/mqdefault.jpg
-  big: https://img.youtube.com/vi/$1/hqdefault.jpg
-
-- name: i.imgur
-  type: image
-  hosts: [i.imgur.com]
-  regex: (?i)^https?://i\\.imgur\\.com/([A-Za-z0-9]+)
-  small: https://i.imgur.com/$1m.jpg
-  big: https://i.imgur.com/$1h.jpg
-
-- name: imgur/gallery
-  type: any
-  hosts: [imgur.com, www.imgur.com]
-  regex: (?i)^https?://(?:www\\.)?imgur\\.com/gallery/(.*)
-  sub: https://imgur.com/a/$1
-
-- name: 9gag
-  type: image
-  hosts: [9gag.com, img-9gag-fun.9cache.com]
-  regex: (?i)^https?://(?:9gag\\.com/gag|img-9gag-fun\\.9cache\\.com/photo)/([^_]+)
-  small: https://images-cdn.9gag.com/photo/$1_700b.jpg
-  big: https://images-cdn.9gag.com/photo/$1_700b.jpg
-
-- name: mobile.twitter
-  type: any
-  hosts: [mobile.twitter.com]
-  regex: (?i)^https?://mobile\\.twitter\\.com/(.*)
-  sub: https://twitter.com/$1
-
-- name: common
-  type: any
-  regex: (?i)^https?://(.+)
-  sub: https://$1
-  hosts:
-  - '*.wikipedia.org'
-  - gfycat.com
-  - imgur.com
-
-- name: reddit
-  type: any
-  hosts: [v.redd.it, reddit.com, www.reddit.com, old.reddit.com]
-  body size: 196608
-"</string>
-
-    <string name="pref__media_preview__advanced_group">Advanced</string>
-
-    <string name="pref__media_preview__maximum_body_size">Download size limit</string>
-    <string name="pref__media_preview__maximum_body_size_summary">%s MB</string>
-
-    <string name="pref__media_preview__image_disk_cache_size">
-        Disk cache</string>
-    <string name="pref__media_preview__image_disk_cache_size_summary">
-        %s MB; takes effect on restart</string>
-
-    <string name="pref__media_preview__success_cooldown">
-        Success cooldown</string>
-    <string name="pref__media_preview__success_cooldown_summary">
-        %s hours. The app will consider successfully fetched image available,
-        either from cache or the web,
-        for the specified amount of time.</string>
-
-    <string name="pref__media_preview__thumbnail_width">Thumbnail width</string>
-
-    <string name="pref__media_preview__thumbnail_min_height">Minimum thumbnail height</string>
-
-    <string name="pref__media_preview__thumbnail_max_height">Maximum thumbnail height</string>
-
-    <!-- ####################################################################################### -->
-    <!-- ####################################### sharing ####################################### -->
-    <!-- ####################################################################################### -->
-
-    <string name="pref__upload_group">File sharing</string>
-
-    <string name="pref__upload__accept_shared">Accept from other apps</string>
-    <string-array name="pref__upload__accept_shared_names">
-        <item>Text only</item>
-        <item>Text, images and videos</item>
-        <item>Everything</item>
-    </string-array>
-
-    <string name="pref__upload__no_of_direct_share_targets">Direct share</string>
-    <string-array name="pref__upload__no_of_direct_share_targets_names">
-        <item>Disabled</item>
-        <item>Up to one buffer</item>
-        <item>Up to two buffers</item>
-        <item>Up to three buffers</item>
-        <item>Up to four buffers</item>
-    </string-array>
-
-    <string name="pref__upload__upload_uri">Upload URL</string>
-
-    <string name="pref__upload__file_field">File field</string>
-
-    <string name="pref__upload__regex">Regex</string>
-
-    <string name="pref__upload__help" tools:ignore="TypographyDashes,Typos"><![CDATA[
-        These settings roughly correspond to the following command:
-        <br>
-        <br><tt><small> curl -s --user user:pass \\
-        <br>&nbsp;&nbsp;--header \'Additional: Header\' \\
-        <br>&nbsp;&nbsp;--form additional=field \\
-        <br>&nbsp;&nbsp;--form file=@file.ext \\
-        <br>&nbsp;&nbsp;https://example.com | perl -nle \\
-        <br>&nbsp;&nbsp;\'m#^https://\\S+#; print $1//$&\'</small></tt>
-        <br>
-        <br>If the regular expression is set, it is used to find the URL in the response body;
-        either the first capture group is used, or the whole match.
-        <a href="https://github.com/ubergeek42/weechat-android/wiki/File-sharing">Learn more</a>
-    ]]></string>
-
-    <string name="pref__upload__advanced_group">Advanced</string>
-
-    <string name="pref__upload__additional_headers">Additional headers</string>
-
-    <string name="pref__upload__additional_fields">Additional fields</string>
-
-    <string name="pref__upload__authentication">Authentication</string>
-    <string-array name="pref__upload__authentication_names">
-        <item>None</item>
-        <item>Basic</item>
-    </string-array>
-
-    <string name="pref__upload__authentication_basic_user">User</string>
-
-    <string name="pref__upload__authentication_basic_password">Password</string>
-
-    <string name="pref__upload__remember_uploads_for">Remember uploads for</string>
-    <string name="pref__upload__remember_uploads_for_summary">%s hours</string>
-
-    <!-- ####################################################################################### -->
-    <!-- ######################################## about ######################################## -->
-    <!-- ####################################################################################### -->
-
-    <string name="pref__about_group">About</string>
-
-    <string name="pref__about__weechat_android_v" translatable="false">Weechat-Android %s</string>
-
-    <string name="pref__about__created_by">created by ubergeek42</string>
-
-    <string name="pref__about__build_id">build ID %s</string>
-    <string name="pref__about__unknown_version_id">Unknown version ID</string>
-
-    <string name="pref__about__used_libraries">
-        \nThis project uses the following libraries:
-        \n
-        \n&nbsp;&nbsp;&nbsp;&nbsp;•&nbsp;<a href="https://github.com/noveogroup/android-logger">Android Logger by Noveo Group</a>
-        \n&nbsp;&nbsp;&nbsp;&nbsp;•&nbsp;<a href="https://www.eclipse.org/aspectj/">AspectJ by Eclipse Foundation</a>
-        \n&nbsp;&nbsp;&nbsp;&nbsp;•&nbsp;<a href="https://www.bouncycastle.org/">Bouncy Castle</a>
-        \n&nbsp;&nbsp;&nbsp;&nbsp;•&nbsp;<a href="https://github.com/greenrobot/EventBus">EventBus by greenrobot</a>
-        \n&nbsp;&nbsp;&nbsp;&nbsp;•&nbsp;<a href="https://bumptech.github.io/glide/">Glide by Bump Technologies</a>
-        \n&nbsp;&nbsp;&nbsp;&nbsp;•&nbsp;<a href="https://github.com/JakeWharton/hugo">Hugo by Jake Wharton</a>
-        \n&nbsp;&nbsp;&nbsp;&nbsp;•&nbsp;<a href="https://github.com/TooTallNate/Java-WebSocket">Java-WebSocket by Nathan Rajlich</a>
-        \n&nbsp;&nbsp;&nbsp;&nbsp;•&nbsp;<a href="https://github.com/dlew/joda-time-android">joda-time-android by Daniel Lew</a>
-        \n&nbsp;&nbsp;&nbsp;&nbsp;•&nbsp;<a href="http://www.jcraft.com/jsch/">JSch by JCraft</a>
-        \n&nbsp;&nbsp;&nbsp;&nbsp;•&nbsp;<a href="https://square.github.io/leakcanary/">LeakCanary by Square, Inc</a>
-        \n&nbsp;&nbsp;&nbsp;&nbsp;•&nbsp;<a href="http://site.mockito.org/">Mockito by Szczepan Faber and friends</a>
-        \n&nbsp;&nbsp;&nbsp;&nbsp;•&nbsp;<a href="https://github.com/TakahikoKawasaki/nv-websocket-client">nv-websocket-client by Takahiko Kawasaki</a>
-        \n&nbsp;&nbsp;&nbsp;&nbsp;•&nbsp;<a href="https://square.github.io/okhttp/">OkHttp by Square, Inc</a>
-        \n&nbsp;&nbsp;&nbsp;&nbsp;•&nbsp;<a href="https://www.slf4j.org/">SLF4J by QOS.ch</a>
-        \n&nbsp;&nbsp;&nbsp;&nbsp;•&nbsp;<a href="https://bitbucket.org/asomov/snakeyaml">SnakeYAML by Andrey Somov</a>
-        \n&nbsp;&nbsp;&nbsp;&nbsp;•&nbsp;<a href="https://github.com/connectbot/sshlib">sshlib by ConnectBot</a>
-        \n
-        \nPlease create an issue on&nbsp;<a href="https://github.com/ubergeek42/weechat-android/">GitHub</a>
-        if you find a bug or have a feature request.
-        \n
-        \n</string>
-</resources>
diff --git a/tests/source-files/de.varengold.activeTAN/build.gradle b/tests/source-files/de.varengold.activeTAN/build.gradle
deleted file mode 100644
index e950be92..00000000
--- a/tests/source-files/de.varengold.activeTAN/build.gradle
+++ /dev/null
@@ -1,115 +0,0 @@
-apply plugin: 'com.android.application'
-
-android {
-    compileSdkVersion versions.compileSdk
-    defaultConfig {
-        versionCode 34
-        versionName "2021-06-30"
-
-        // Requires API level 23 (Android 6.0) to use Android keystore system for cryptography.
-        minSdkVersion 23
-        targetSdkVersion versions.targetSdk
-
-        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-
-        vectorDrawables.useSupportLibrary = true
-
-        javaCompileOptions {
-            annotationProcessorOptions {
-                // Export database schema history as JSON files.
-                arguments = ["room.schemaLocation": "$projectDir/schemas".toString()]
-            }
-        }
-        sourceSets {
-            // Include database schema history for migration testing.
-            androidTest.assets.srcDirs += files("$projectDir/schemas".toString())
-        }
-    }
-
-    buildFeatures {
-        viewBinding = true
-    }
-
-    buildTypes {
-        debug {
-            // Don't mess with the release versions during debugging, so use a different appId.
-            applicationIdSuffix ".debug"
-            debuggable true
-        }
-        release {
-            minifyEnabled true
-            shrinkResources true
-            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
-        }
-    }
-
-    flavorDimensions "client", "environment"
-    productFlavors {
-        prod {
-            dimension "environment"
-        }
-
-        qs {
-            dimension "environment"
-            // To be able to install a second app variant, we must change the applicationId.
-            // Otherwise it would not be possible to use the same device for testing and production.
-            applicationIdSuffix ".QS"
-        }
-
-        EFD {
-            // Demo portal efdis-online.de (extern) / dailybuild.efdis-online.de (intern)
-            dimension "client"
-            applicationId "de.efdis.activeTAN"
-        }
-
-        VAR {
-            dimension "client"
-            applicationId "de.varengold.activeTAN"
-        }
-
-    }
-    compileOptions {
-        // ZXing uses Java 8 language features from the core library
-        coreLibraryDesugaringEnabled true
-
-        targetCompatibility JavaVersion.VERSION_1_8
-        sourceCompatibility JavaVersion.VERSION_1_8
-    }
-
-}
-
-tasks.withType(JavaCompile) {
-    options.deprecation = true
-}
-
-dependencies {
-    implementation fileTree(dir: 'libs', include: ['*.jar'])
-
-    implementation project(':material-design-icons')
-    implementation project(":barcodescanner")
-
-    implementation 'com.google.android.material:material:1.3.0'
-
-    implementation 'androidx.appcompat:appcompat:1.3.0'
-    implementation 'androidx.biometric:biometric:1.1.0'
-
-    implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
-    implementation 'androidx.recyclerview:recyclerview:1.2.1'
-
-    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5'
-    implementation 'com.google.zxing:core:' + versions.zxing
-
-    def room_version = '2.3.0'
-    implementation "androidx.room:room-runtime:$room_version"
-    annotationProcessor "androidx.room:room-compiler:$room_version"
-    androidTestImplementation "androidx.room:room-testing:$room_version"
-
-    testImplementation 'junit:junit:4.13.1'
-
-    androidTestImplementation 'androidx.test.ext:junit:1.1.2'
-    androidTestImplementation 'androidx.test:runner:1.3.0'
-    androidTestImplementation 'androidx.test:rules:1.3.0'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
-    androidTestImplementation 'androidx.test.espresso:espresso-contrib:3.3.0'
-    androidTestImplementation 'androidx.test.espresso:espresso-intents:3.3.0'
-}
diff --git a/tests/source-files/dev.patrickgold.florisboard/app/build.gradle.kts b/tests/source-files/dev.patrickgold.florisboard/app/build.gradle.kts
deleted file mode 100644
index 14767fa8..00000000
--- a/tests/source-files/dev.patrickgold.florisboard/app/build.gradle.kts
+++ /dev/null
@@ -1,97 +0,0 @@
-plugins {
-    id("com.android.application") version "4.1.2"
-    kotlin("android") version "1.4.30"
-}
-
-android {
-    compileSdkVersion(30)
-    buildToolsVersion("30.0.3")
-
-    compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
-    }
-
-    kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_1_8.toString()
-        freeCompilerArgs = listOf("-Xallow-result-return-type") // enables use of kotlin.Result
-    }
-
-    defaultConfig {
-        applicationId = "dev.patrickgold.florisboard"
-        minSdkVersion(23)
-        targetSdkVersion(30)
-        versionCode(29)
-        versionName("0.3.10")
-
-        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
-    }
-
-    buildFeatures {
-        viewBinding = true
-    }
-
-    buildTypes {
-        named("debug").configure {
-            applicationIdSuffix = ".debug"
-            versionNameSuffix = "-debug"
-
-            resValue("mipmap", "floris_app_icon", "@mipmap/ic_app_icon_debug")
-            resValue("mipmap", "floris_app_icon_round", "@mipmap/ic_app_icon_debug_round")
-            resValue("string", "floris_app_name", "FlorisBoard Debug")
-        }
-
-        create("beta") // Needed because by default the "beta" BuildType does not exist
-        named("beta").configure {
-            applicationIdSuffix = ".beta"
-            versionNameSuffix = "-beta01"
-            proguardFiles.add(getDefaultProguardFile("proguard-android-optimize.txt"))
-
-            resValue("mipmap", "floris_app_icon", "@mipmap/ic_app_icon_beta")
-            resValue("mipmap", "floris_app_icon_round", "@mipmap/ic_app_icon_beta_round")
-            resValue("string", "floris_app_name", "FlorisBoard Beta")
-        }
-
-        named("release").configure {
-            proguardFiles.add(getDefaultProguardFile("proguard-android-optimize.txt"))
-
-            resValue("mipmap", "floris_app_icon", "@mipmap/ic_app_icon_release")
-            resValue("mipmap", "floris_app_icon_round", "@mipmap/ic_app_icon_release_round")
-            resValue("string", "floris_app_name", "@string/app_name")
-        }
-    }
-
-    testOptions {
-        unitTests {
-            isIncludeAndroidResources = true
-        }
-    }
-
-    lintOptions {
-        isAbortOnError = false
-    }
-}
-
-dependencies {
-    implementation("androidx.activity", "activity-ktx", "1.2.1")
-    implementation("androidx.appcompat", "appcompat", "1.2.0")
-    implementation("androidx.core", "core-ktx", "1.3.2")
-    implementation("androidx.fragment", "fragment-ktx", "1.3.0")
-    implementation("androidx.preference", "preference-ktx", "1.1.1")
-    implementation("androidx.constraintlayout", "constraintlayout", "2.0.4")
-    implementation("androidx.lifecycle", "lifecycle-service", "2.2.0")
-    implementation("com.google.android", "flexbox", "2.0.1") // requires jcenter as of version 2.0.1
-    implementation("com.squareup.moshi", "moshi-kotlin", "1.11.0")
-    implementation("com.squareup.moshi", "moshi-adapters", "1.11.0")
-    implementation("com.google.android.material", "material", "1.3.0")
-    implementation("org.jetbrains.kotlinx", "kotlinx-coroutines-android", "1.4.2")
-    implementation("com.jaredrummler", "colorpicker", "1.1.0")
-    implementation("com.jakewharton.timber", "timber", "4.7.1")
-    implementation("com.nambimobile.widgets", "expandable-fab", "1.0.2")
-
-    testImplementation("junit", "junit", "4.13.1")
-    testImplementation("org.mockito", "mockito-inline", "3.7.7")
-    testImplementation("org.robolectric", "robolectric", "4.5.1")
-    androidTestImplementation("androidx.test.ext", "junit", "1.1.2")
-    androidTestImplementation("androidx.test.espresso", "espresso-core", "3.3.0")
-}
diff --git a/tests/source-files/firebase-allowlisted/app/build.gradle b/tests/source-files/firebase-whitelisted/app/build.gradle
similarity index 100%
rename from tests/source-files/firebase-allowlisted/app/build.gradle
rename to tests/source-files/firebase-whitelisted/app/build.gradle
diff --git a/tests/source-files/firebase-allowlisted/build.gradle b/tests/source-files/firebase-whitelisted/build.gradle
similarity index 100%
rename from tests/source-files/firebase-allowlisted/build.gradle
rename to tests/source-files/firebase-whitelisted/build.gradle
diff --git a/tests/source-files/flavor.test/build.gradle b/tests/source-files/flavor.test/build.gradle
deleted file mode 100644
index 2c958bdc..00000000
--- a/tests/source-files/flavor.test/build.gradle
+++ /dev/null
@@ -1,15 +0,0 @@
-dependenies {
-    /// dependencies for app building
-    fossImplementation 'com.android.support:multidex:1.0.2'
-    implementation 'com.github.nextcloud:android-library:1.0.33'
-    devImplementation 'com.github.nextcloud:android-library:master-SNAPSHOT' // use always latest master
-    implementation "com.android.support:support-v4:${supportLibraryVersion}"
-    prodImplementation "com.android.support:design:${supportLibraryVersion}"
-    gplayImplementation 'com.jakewharton:disklrucache:2.0.2'
-    implementation "com.android.support:appcompat-v7:${supportLibraryVersion}"
-    gplayProdImplementation "com.android.support:cardview-v7:${supportLibraryVersion}"
-    implementation "com.android.support:exifinterface:${supportLibraryVersion}"
-    fossDevImplementation 'com.github.tobiasKaminsky:android-floating-action-button:1.10.2'
-    gplayDevImplementation 'com.github.albfernandez:juniversalchardet:v2.0.0'
-    fossProdImplementation 'com.google.code.findbugs:annotations:2.0.1'
-}
diff --git a/tests/source-files/lockfile.test/flutter/.dart_tool/flutter_gen/pubspec.yaml b/tests/source-files/lockfile.test/flutter/.dart_tool/flutter_gen/pubspec.yaml
deleted file mode 100644
index e69de29b..00000000
diff --git a/tests/source-files/lockfile.test/flutter/pubspec.lock b/tests/source-files/lockfile.test/flutter/pubspec.lock
deleted file mode 100644
index e69de29b..00000000
diff --git a/tests/source-files/lockfile.test/flutter/pubspec.yaml b/tests/source-files/lockfile.test/flutter/pubspec.yaml
deleted file mode 100644
index e69de29b..00000000
diff --git a/tests/source-files/lockfile.test/javascript/package.json b/tests/source-files/lockfile.test/javascript/package.json
deleted file mode 100644
index e69de29b..00000000
diff --git a/tests/source-files/lockfile.test/javascript/yarn.lock b/tests/source-files/lockfile.test/javascript/yarn.lock
deleted file mode 100644
index e69de29b..00000000
diff --git a/tests/source-files/lockfile.test/rust/subdir/Cargo.lock b/tests/source-files/lockfile.test/rust/subdir/Cargo.lock
deleted file mode 100644
index e69de29b..00000000
diff --git a/tests/source-files/lockfile.test/rust/subdir/Cargo.toml b/tests/source-files/lockfile.test/rust/subdir/Cargo.toml
deleted file mode 100644
index e69de29b..00000000
diff --git a/tests/source-files/lockfile.test/rust/subdir/subdir/subdir/Cargo.toml b/tests/source-files/lockfile.test/rust/subdir/subdir/subdir/Cargo.toml
deleted file mode 100644
index e69de29b..00000000
diff --git a/tests/source-files/lockfile.test/rust/subdir2/Cargo.toml b/tests/source-files/lockfile.test/rust/subdir2/Cargo.toml
deleted file mode 100644
index e69de29b..00000000
diff --git a/tests/source-files/org.noise_planet.noisecapture/app/build.gradle b/tests/source-files/org.noise_planet.noisecapture/app/build.gradle
deleted file mode 100644
index 158712bd..00000000
--- a/tests/source-files/org.noise_planet.noisecapture/app/build.gradle
+++ /dev/null
@@ -1,116 +0,0 @@
-apply plugin: 'com.android.application'
-
-def getCheckedOutGitCommitHash() {
-    'git rev-parse --verify --short HEAD'.execute().text.trim()
-}
-
-def getAvailableLocales() {
-    new File("app/src/main/res").list(new FilenameFilter() {
-        @Override
-        boolean accept(File dir, String name) {
-            return name.startsWith("values-") && new File(new File(dir,name), "strings.xml").exists();
-        }
-    }).collect() { fold -> fold.substring("values-".length())}.join(",")
-}
-
-android {
-    compileSdkVersion 30
-    buildToolsVersion '30.0.0'
-    def signingFilePath = System.getProperty("user.home") + "/.idea/signing.gradle"
-    if (new File(signingFilePath).exists()) {
-        apply from: signingFilePath
-    }
-    defaultConfig {
-        applicationId "org.noise_planet.noisecapture"
-        minSdkVersion 15
-        targetSdkVersion 30
-        versionCode 55
-        versionName "1.2.19"
-        // Store build date in apk
-        buildConfigField "long", "TIMESTAMP", System.currentTimeMillis() + "L"
-        buildConfigField "String", "GITHASH", "\"${getCheckedOutGitCommitHash().toString()}\""
-        buildConfigField "String", "SUPPORTEDLOCALES",  "\"${getAvailableLocales()}\""
-        // Enabling multidex support.
-        multiDexEnabled false
-
-        vectorDrawables.useSupportLibrary = true
-
-        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-    }
-
-    dexOptions {
-        javaMaxHeapSize "4g"
-    }
-    lintOptions {
-        abortOnError false
-        disable 'MissingTranslation'
-    }
-    buildTypes {
-        release {
-            minifyEnabled true
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
-            if (new File(signingFilePath).exists()) {
-                signingConfig signingConfigs.release
-            }
-        }
-        debug {
-            debuggable true
-            if (new File(signingFilePath).exists()) {
-                signingConfig signingConfigs.debug
-            }
-        }
-    }
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_7
-        targetCompatibility JavaVersion.VERSION_1_7
-    }
-    testOptions {
-        unitTests {
-            includeAndroidResources = true
-        }
-    }
-}
-
-// For using the MPAndroidChart package
-// https://github.com/PhilJay/MPAndroidChart
-// Apache License, Version 2.0
-task listrepos {
-    doLast {
-        println "Repositories:"
-        project.repositories.each { println "Name: " + it.name + "; url: " + it.url }
-    }
-}
-
-repositories {
-    mavenLocal()
-}
-
-dependencies {
-    implementation 'com.github.PhilJay:MPAndroidChart:v2.2.5'
-    implementation 'org.slf4j:slf4j-simple:1.7.12'
-    implementation name: 'org/noise-planet/jwarble/0.2.3/jwarble-0.2.3'
-    implementation group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.9.10'
-    implementation group: 'com.fasterxml.jackson.core', name: 'jackson-core', version: '2.9.10'
-
-    // multithreaded FFT for realtime visualisation of spectrum only
-    implementation 'com.github.wendykierp:JTransforms:3.1'
-    implementation 'org.apache.commons:commons-math3:3.5'
-    implementation 'androidx.appcompat:appcompat:1.0.0'
-    implementation 'com.google.android.material:material:1.0.0'
-    implementation 'androidx.vectordrawable:vectordrawable:1.0.0'
-    implementation 'com.nhaarman.supertooltips:library:3.0.0'
-    //compile 'com.android.support:multidex:1.0.0'
-    // Testing-only dependencies
-    // Force usage of support annotations in the test app, since it is internally used by the runner module.
-    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
-    androidTestImplementation 'androidx.annotation:annotation:1.0.0'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.1'
-    androidTestImplementation 'androidx.test:rules:1.1.1'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0'
-    // unit test
-    testImplementation group: 'org.robolectric', name: 'robolectric', version: '4.3.1'
-    testImplementation 'junit:junit:4.12'
-    testImplementation group: 'com.googlecode.soundlibs', name: 'jorbis', version: '0.0.17.4'
-    implementation project(':sosfilter')
-}
-
diff --git a/tests/source-files/org.noise_planet.noisecapture/settings.gradle b/tests/source-files/org.noise_planet.noisecapture/settings.gradle
deleted file mode 100644
index 3af2006a..00000000
--- a/tests/source-files/org.noise_planet.noisecapture/settings.gradle
+++ /dev/null
@@ -1 +0,0 @@
-include 'sosfilter', 'app'
diff --git a/tests/source-files/org.noise_planet.noisecapture/sosfilter/build.gradle b/tests/source-files/org.noise_planet.noisecapture/sosfilter/build.gradle
deleted file mode 100644
index ab7b0caa..00000000
--- a/tests/source-files/org.noise_planet.noisecapture/sosfilter/build.gradle
+++ /dev/null
@@ -1,31 +0,0 @@
-apply plugin: 'java'
-apply plugin: 'idea'
-apply plugin: 'java'
-
-group = 'org.orbisgis'
-version = '1.0-SNAPSHOT'
-
-
-description = """Signal processing, A-weighting and third-octave bands filtering"""
-
-compileJava {
-    sourceCompatibility = 1.7
-    targetCompatibility = 1.7
-}
-repositories {
-    mavenCentral()
-}
-
-dependencies {
-    compile group: 'org.slf4j', name: 'slf4j-api', version:'1.7.12'
-    compile group: 'com.github.wendykierp', name: 'JTransforms', version:'3.1'
-    testCompile group: 'org.slf4j', name: 'slf4j-simple', version:'1.7.12'
-    testCompile group: 'junit', name: 'junit', version:'4.12'
-}
-
-// Copy resource for unit tests
-task copyTestResources(type: Copy) {
-    from "${projectDir}/src/test/resources"
-    into "${buildDir}/classes/test"
-}
-processTestResources.dependsOn copyTestResources
diff --git a/tests/source-files/org.piepmeyer.gauguin/build.gradle.kts b/tests/source-files/org.piepmeyer.gauguin/build.gradle.kts
deleted file mode 100644
index cb7d1d02..00000000
--- a/tests/source-files/org.piepmeyer.gauguin/build.gradle.kts
+++ /dev/null
@@ -1,47 +0,0 @@
-import java.net.URI
-
-buildscript {
-    dependencies {
-        classpath("com.android.tools.build:gradle:8.6.0")
-    }
-}
-
-plugins {
-    alias(libs.plugins.android.application) apply false
-    alias(libs.plugins.android.library) apply false
-    alias(libs.plugins.kotlin.android) apply false
-    alias(libs.plugins.kotlin.jvm) apply false
-    alias(libs.plugins.sonarqube)
-    alias(libs.plugins.ktlint)
-    alias(libs.plugins.ksp)
-    alias(libs.plugins.roborazzi) apply false
-    alias(libs.plugins.gms) apply false
-}
-
-sonarqube {
-    properties {
-        property("sonar.projectKey", "org.piepmeyer.gauguin")
-        property("sonar.organization", "meikpiep")
-        property("sonar.verbose", "true")
-        property("sonar.host.url", "https://sonarcloud.io")
-    }
-}
-
-tasks.sonar {
-    onlyIf("There is no property 'buildserver'") {
-        project.hasProperty("buildserver")
-    }
-    dependsOn(":gauguin-app:lint")
-}
-
-allprojects {
-    repositories {
-        mavenCentral()
-        google()
-        maven { url = URI("https://jitpack.io") }
-    }
-}
-
-subprojects {
-    apply(plugin = "org.jlleitschuh.gradle.ktlint")
-}
diff --git a/tests/source-files/org.piepmeyer.gauguin/libs.versions.toml b/tests/source-files/org.piepmeyer.gauguin/libs.versions.toml
deleted file mode 100644
index 7159985c..00000000
--- a/tests/source-files/org.piepmeyer.gauguin/libs.versions.toml
+++ /dev/null
@@ -1,91 +0,0 @@
-[versions]
-
-kotlin = "1.9.23"
-koin = "3.5.6"
-koin-annotations="1.3.1"
-kotest = "5.9.1"
-kotest-extensions = "1.3.0"
-kotlin-coroutines = "1.8.1"
-android-gradle-plugin = "8.6.0"
-androidUiTestingUtils = "2.3.3"
-roborazzi = "1.26.0"
-
-[libraries]
-
-kotlin-coroutines-core = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-core", version.ref = "kotlin-coroutines" }
-kotlin-coroutines-debug = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-debug", version.ref = "kotlin-coroutines" }
-kotlin-serialization = { group = "org.jetbrains.kotlinx", name = "kotlinx-serialization-json", version = "1.6.3" }
-
-logging-kotlin = { group = "io.github.oshai", name = "kotlin-logging-jvm", version = "6.0.9" }
-logging-slf = { group = "org.slf4j", name = "slf4j-api", version = "2.0.13" }
-logging-logback-android = { group = "com.github.tony19", name = "logback-android", version = "3.0.0" }
-logging-logback-kotlin = { group = "ch.qos.logback", name = "logback-classic", version = "1.5.6" }
-
-android-material = { group = "com.google.android.material", name = "material", version = "1.12.0" }
-
-androidx-annotation = { group = "androidx.annotation", name = "annotation", version = "1.8.2" }
-androidx-ktx = { group = "androidx.core", name = "core-ktx", version = "1.13.1" }
-androidx-constraintlayout = { group = "androidx.constraintlayout", name = "constraintlayout", version = "2.1.4" }
-androidx-drawerlayout = { group = "androidx.drawerlayout", name = "drawerlayout", version = "1.2.0" }
-androidx-fragment = { group = "androidx.fragment", name = "fragment-ktx", version = "1.8.3" }
-androidx-gridlayout = { group = "androidx.gridlayout", name = "gridlayout", version = "1.0.0" }
-androidx-lifecycle-runtime = { group = "androidx.lifecycle", name = "lifecycle-runtime-ktx", version = "2.8.5" }
-androidx-lifecycle-viewmodel = { group = "androidx.lifecycle", name = "lifecycle-viewmodel-ktx", version = "2.8.5" }
-androidx-preference = { group = "androidx.preference", name = "preference-ktx", version = "1.2.1" }
-androidx-recyclerview = { group = "androidx.recyclerview", name = "recyclerview", version = "1.3.2" }
-androidx-transition = { group = "androidx.transition", name = "transition", version = "1.5.1" }
-androidx-window = { group = "androidx.window", name = "window", version = "1.3.0" }
-androidx-window-core = { group = "androidx.window", name = "window-core", version = "1.3.0" }
-
-androidx-test-junit-ktx = { group = "androidx.test.ext", name = "junit-ktx", version = "1.2.1" }
-androidx-test-rules = { group = "androidx.test", name = "rules", version = "1.6.1" }
-androidx-test-runner = { group = "androidx.test", name = "runner", version = "1.6.2" }
-
-koin-core = { group = "io.insert-koin", name = "koin-core", version.ref = "koin" }
-koin-annotations = { group = "io.insert-koin", name = "koin-annotations", version.ref = "koin-annotations" }
-koin-ksp-compiler = { group = "io.insert-koin", name = "koin-ksp-compiler", version.ref = "koin-annotations" }
-koin-test = { group = "io.insert-koin", name = "koin-test", version.ref = "koin" }
-koin-android = { group = "io.insert-koin", name = "koin-android", version.ref = "koin" }
-
-kotest-runner = { group = "io.kotest", name = "kotest-runner-junit5", version.ref = "kotest" }
-kotest-assertions = { group = "io.kotest", name = "kotest-assertions-core", version.ref = "kotest" }
-kotest-parametrizedtests = { group = "io.kotest", name = "kotest-framework-datatest", version.ref = "kotest" }
-kotest-koin = { group = "io.kotest.extensions", name = "kotest-extensions-koin", version.ref = "kotest-extensions" }
-
-test-mockk = { group = "io.mockk", name = "mockk", version = "1.13.11" }
-
-androiduitestingutils-utils = { group = "com.github.sergio-sastre.AndroidUiTestingUtils", name = "utils", version.ref = "androidUiTestingUtils" }
-androiduitestingutils-robolectric = { group = "com.github.sergio-sastre.AndroidUiTestingUtils", name = "robolectric", version.ref = "androidUiTestingUtils" }
-roboelectric = { group = "org.robolectric", name = "robolectric", version = "4.13" }
-roborazzi = { group = "io.github.takahirom.roborazzi", name = "roborazzi", version.ref = "roborazzi" }
-roborazzi-junit = { group = "io.github.takahirom.roborazzi", name = "roborazzi-junit-rule", version.ref = "roborazzi" }
-junit-vintage-engine = { group = "org.junit.vintage", name = "junit-vintage-engine", version = "5.10.3" }
-
-thirdparty-konfetti = { group = "nl.dionsegijn", name = "konfetti-xml", version = "2.0.4" }
-#thirdparty-ferriswheel = { group = "ru.github.igla", name = "ferriswheel", version = "1.2" }
-thirdparty-navigationdrawer = { group = "com.mikepenz", name = "materialdrawer", version = "9.0.2" }
-thirdparty-balloon = { group = "com.github.skydoves", name = "balloon", version = "1.6.7" }
-thirdparty-vico = { group = "com.patrykandpatrick.vico", name = "views", version = "2.0.0-alpha.25" }
-thirdparty-androidplot = { group = "com.androidplot", name = "androidplot-core", version = "1.5.11" }
-thirdparty-leakcanary = { group = "com.squareup.leakcanary", name = "leakcanary-android", version = "2.14" }
-
-[plugins]
-
-android-application = { id = "com.android.application", version.ref = "android-gradle-plugin" }
-android-library = { id = "com.android.library", version.ref = "android-gradle-plugin" }
-kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
-kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
-sonarqube = { id = "org.sonarqube", version = "5.0.0.4638" }
-ktlint = { id = "org.jlleitschuh.gradle.ktlint", version = "12.1.1" }
-ksp = { id = "com.google.devtools.ksp", version = "1.9.23-1.0.20" }
-roborazzi = { id = "io.github.takahirom.roborazzi", version.ref = "roborazzi" }
-gms = { id = "com.google.gms.google-services", version = "1" }
-
-[bundles]
-
-logging = ["logging-kotlin", "logging-slf"]
-kotest = ["kotest-runner", "kotest-assertions", "kotest-parametrizedtests", "kotest-koin"]
-koin = ["koin-core", "koin-annotations", "koin-ksp-compiler"]
-androidx-test = ["androidx-test-junit-ktx", "androidx-test-rules", "androidx-test-runner"]
-screenshotTests = ["androiduitestingutils-utils", "androiduitestingutils-robolectric", "roboelectric", "roborazzi", "roborazzi-junit", "junit-vintage-engine"]
-
diff --git a/tests/source-files/org.piepmeyer.gauguin/settings.gradle.kts b/tests/source-files/org.piepmeyer.gauguin/settings.gradle.kts
deleted file mode 100644
index 46f4acda..00000000
--- a/tests/source-files/org.piepmeyer.gauguin/settings.gradle.kts
+++ /dev/null
@@ -1,24 +0,0 @@
-pluginManagement {
-    repositories {
-        google()
-        mavenCentral()
-        gradlePluginPortal()
-    }
-}
-
-dependencyResolutionManagement {
-    versionCatalogs {
-        create("libs") {
-            from(files("libs.versions.toml"))
-        }
-    }
-}
-
-plugins {
-    id("org.gradle.toolchains.foojay-resolver-convention") version ("0.8.0")
-}
-
-rootProject.name = "gauguin"
-
-include(":gauguin-app")
-include(":gauguin-core")
diff --git a/tests/stats/known_apks.txt b/tests/stats/known_apks.txt
new file mode 100644
index 00000000..d25073a0
--- /dev/null
+++ b/tests/stats/known_apks.txt
@@ -0,0 +1,16 @@
+com.politedroid_3.apk com.politedroid 2017-06-23
+com.politedroid_4.apk com.politedroid 2017-06-23
+com.politedroid_5.apk com.politedroid 2017-06-23
+com.politedroid_6.apk com.politedroid 2017-06-23
+duplicate.permisssions_9999999.apk duplicate.permisssions 2017-12-22
+fake.ota.update_1234.zip fake.ota.update 2016-03-10
+info.zwanenburg.caffeinetile_4.apk info.zwanenburg.caffeinetile 2018-10-10
+no.min.target.sdk_987.apk no.min.target.sdk 2018-10-10
+obb.main.oldversion_1444412523.apk obb.main.oldversion 2013-12-31
+obb.main.twoversions_1101613.apk obb.main.twoversions 2015-10-12
+obb.main.twoversions_1101615.apk obb.main.twoversions 2016-01-01
+obb.main.twoversions_1101617.apk obb.main.twoversions 2016-06-20
+obb.mainpatch.current_1619.apk obb.mainpatch.current 2016-04-23
+obb.mainpatch.current_1619_another-release-key.apk obb.mainpatch.current 2017-06-01
+souch.smsbypass_9.apk souch.smsbypass 2018-04-26
+urzip-; Рахма́, [rɐxˈmanʲɪnəf] سيرجي_رخمانينوف 谢·.apk info.guardianproject.urzip 2016-06-23
diff --git a/tests/test-gradlew-fdroid b/tests/test-gradlew-fdroid
new file mode 100755
index 00000000..63f74e5e
--- /dev/null
+++ b/tests/test-gradlew-fdroid
@@ -0,0 +1,42 @@
+#!/bin/bash
+
+run_test() {
+    red='\033[0;31m'
+    green='\033[0;32m'
+    nocolor='\033[0m'
+    cd $source_files/$1
+    printf "\n${1}:\n"
+    if ($basedir/gradlew-fdroid 2>/dev/null || true) | grep -Fo "$2"; then
+	printf "${green}passed: $1\n"
+    else
+	printf "${red}ERROR: $2 not found in $1\n"
+	((exit_value++))
+    fi
+    printf $nocolor
+}
+
+exit_value=0
+basedir=$(cd $(dirname $0)/..; pwd)
+source_files=$basedir/tests/source-files
+export https_proxy=127.7.7.7:7 # fake proxy to block downloading
+
+run_test osmandapp/osmand 2.2.1
+run_test com.integreight.onesheeld 3.3
+run_test se.manyver/android 5.5
+run_test yuriykulikov/AlarmClock 5.1.1
+
+printf "\n\nforce test files to have Windows linefeeds:\n"
+tmpdir=`mktemp -d`
+cp -a $source_files/osmandapp $source_files/yuriykulikov $tmpdir/
+awk 'sub("$", "\r")' \
+    $source_files/yuriykulikov/AlarmClock/gradle/wrapper/gradle-wrapper.properties \
+    > $tmpdir/yuriykulikov/AlarmClock/gradle/wrapper/gradle-wrapper.properties
+awk 'sub("$", "\r")' \
+    $source_files/osmandapp/osmand/build.gradle \
+    > $tmpdir/osmandapp/osmand/build.gradle
+source_files=$tmpdir
+
+run_test yuriykulikov/AlarmClock 5.1.1
+run_test osmandapp/osmand 2.2.1
+
+exit $exit_value
diff --git a/tests/test_api.py b/tests/test_api.py
deleted file mode 100755
index ba18caa6..00000000
--- a/tests/test_api.py
+++ /dev/null
@@ -1,103 +0,0 @@
-#!/usr/bin/env python3
-
-import os
-import shutil
-import unittest
-from pathlib import Path
-from unittest import mock
-
-import fdroidserver
-from fdroidserver import common, signindex
-
-from .shared_test_code import GP_FINGERPRINT, mkdtemp
-
-basedir = Path(__file__).parent
-
-
-class ApiTest(unittest.TestCase):
-    """Test the public API in the base "fdroidserver" module
-
-    This is mostly a smokecheck to make sure the public API as
-    declared in fdroidserver/__init__.py is working.  The functions
-    are all implemented in other modules, with their own tests.
-
-    """
-
-    def setUp(self):
-        os.chdir(basedir)
-
-        self._td = mkdtemp()
-        self.testdir = self._td.name
-
-        common.config = None
-        config = common.read_config()
-        config['jarsigner'] = common.find_sdk_tools_cmd('jarsigner')
-        common.config = config
-        signindex.config = config
-
-    def tearDown(self):
-        self._td.cleanup()
-
-    def test_download_repo_index_no_fingerprint(self):
-        with self.assertRaises(fdroidserver.VerificationException):
-            fdroidserver.download_repo_index("http://example.org")
-
-    @mock.patch('fdroidserver.net.http_get')
-    def test_download_repo_index_url_parsing(self, mock_http_get):
-        """Test whether it is trying to download the right file
-
-        This passes the URL back via the etag return value just as a
-        hack to check which URL was actually attempted.
-
-        """
-        mock_http_get.side_effect = lambda url, etag, timeout: (None, url)
-        repo_url = 'https://example.org/fdroid/repo'
-        index_url = 'https://example.org/fdroid/repo/index-v1.jar'
-        for url in (repo_url, index_url):
-            _ignored, etag_set_to_url = fdroidserver.download_repo_index(
-                url, verify_fingerprint=False
-            )
-            self.assertEqual(index_url, etag_set_to_url)
-
-    @mock.patch('fdroidserver.net.http_get')
-    def test_download_repo_index_v1_url_parsing(self, mock_http_get):
-        """Test whether it is trying to download the right file
-
-        This passes the URL back via the etag return value just as a
-        hack to check which URL was actually attempted.
-
-        """
-        mock_http_get.side_effect = lambda url, etag, timeout: (None, url)
-        repo_url = 'https://example.org/fdroid/repo'
-        index_url = 'https://example.org/fdroid/repo/index-v1.jar'
-        for url in (repo_url, index_url):
-            _ignored, etag_set_to_url = fdroidserver.download_repo_index_v1(
-                url, verify_fingerprint=False
-            )
-            self.assertEqual(index_url, etag_set_to_url)
-
-    @mock.patch('fdroidserver.net.download_using_mirrors')
-    def test_download_repo_index_v2(self, mock_download_using_mirrors):
-        """Basically a copy of IndexTest.test_download_repo_index_v2"""
-        mock_download_using_mirrors.side_effect = lambda mirrors: os.path.join(
-            self.testdir, 'repo', os.path.basename(mirrors[0]['url'])
-        )
-        os.chdir(self.testdir)
-        signindex.config['keystore'] = os.path.join(basedir, 'keystore.jks')
-        os.mkdir('repo')
-        shutil.copy(basedir / 'repo' / 'entry.json', 'repo')
-        shutil.copy(basedir / 'repo' / 'index-v2.json', 'repo')
-        signindex.sign_index('repo', 'entry.json')
-        repo_url = 'https://fake.url/fdroid/repo'
-        entry_url = 'https://fake.url/fdroid/repo/entry.jar'
-        index_url = 'https://fake.url/fdroid/repo/index-v2.json'
-        fingerprint_url = 'https://fake.url/fdroid/repo?fingerprint=' + GP_FINGERPRINT
-        slash_url = 'https://fake.url/fdroid/repo//?fingerprint=' + GP_FINGERPRINT
-        for url in (repo_url, entry_url, index_url, fingerprint_url, slash_url):
-            data, _ignored = fdroidserver.download_repo_index_v2(
-                url, verify_fingerprint=False
-            )
-            self.assertEqual(['repo', 'packages'], list(data))
-            self.assertEqual(
-                'My First F-Droid Repo Demo', data['repo']['name']['en-US']
-            )
diff --git a/tests/test_build.py b/tests/test_build.py
deleted file mode 100755
index 578837ed..00000000
--- a/tests/test_build.py
+++ /dev/null
@@ -1,1092 +0,0 @@
-#!/usr/bin/env python3
-
-import os
-import shutil
-import sys
-import tempfile
-import textwrap
-import unittest
-from pathlib import Path
-from unittest import mock
-
-import yaml
-
-import fdroidserver.build
-import fdroidserver.common
-
-from .shared_test_code import TmpCwd, mkdtemp
-
-
-class FakeProcess:
-    output = 'fake output'
-    returncode = 0
-
-    def __init__(self, args, **kwargs):
-        print('FakeFDroidPopen', args, kwargs)
-
-
-class Options:
-    keep_when_not_allowed = False
-
-
-class BuildTest(unittest.TestCase):
-    '''fdroidserver/build.py'''
-
-    def setUp(self):
-        self.basedir = str(Path(__file__).parent)
-        os.chdir(self.basedir)
-        fdroidserver.common.config = None
-        fdroidserver.build.config = None
-        fdroidserver.build.options = None
-        self._td = mkdtemp()
-        self.testdir = self._td.name
-
-    def tearDown(self):
-        os.chdir(self.basedir)
-        self._td.cleanup()
-
-    def create_fake_android_home(self, d):
-        os.makedirs(os.path.join(d, 'build-tools'), exist_ok=True)
-        os.makedirs(os.path.join(d, 'platform-tools'), exist_ok=True)
-        os.makedirs(os.path.join(d, 'tools'), exist_ok=True)
-
-    @unittest.skipIf(sys.byteorder == 'big', "androguard is not ported to big-endian")
-    def test_get_apk_metadata(self):
-        config = dict()
-        fdroidserver.common.fill_config_defaults(config)
-        fdroidserver.common.config = config
-        fdroidserver.build.config = config
-        try:
-            config['aapt'] = fdroidserver.common.find_sdk_tools_cmd('aapt')
-        except fdroidserver.exception.FDroidException:
-            pass  # aapt is not required if androguard is present
-
-        testcases = [
-            (
-                'repo/obb.main.twoversions_1101613.apk',
-                'obb.main.twoversions',
-                1101613,
-                '0.1',
-                None,
-            ),
-            (
-                'org.bitbucket.tickytacky.mirrormirror_1.apk',
-                'org.bitbucket.tickytacky.mirrormirror',
-                1,
-                '1.0',
-                None,
-            ),
-            (
-                'org.bitbucket.tickytacky.mirrormirror_2.apk',
-                'org.bitbucket.tickytacky.mirrormirror',
-                2,
-                '1.0.1',
-                None,
-            ),
-            (
-                'org.bitbucket.tickytacky.mirrormirror_3.apk',
-                'org.bitbucket.tickytacky.mirrormirror',
-                3,
-                '1.0.2',
-                None,
-            ),
-            (
-                'org.bitbucket.tickytacky.mirrormirror_4.apk',
-                'org.bitbucket.tickytacky.mirrormirror',
-                4,
-                '1.0.3',
-                None,
-            ),
-            (
-                'org.dyndns.fules.ck_20.apk',
-                'org.dyndns.fules.ck',
-                20,
-                'v1.6pre2',
-                [
-                    'arm64-v8a',
-                    'armeabi',
-                    'armeabi-v7a',
-                    'mips',
-                    'mips64',
-                    'x86',
-                    'x86_64',
-                ],
-            ),
-            ('urzip.apk', 'info.guardianproject.urzip', 100, '0.1', None),
-            ('urzip-badcert.apk', 'info.guardianproject.urzip', 100, '0.1', None),
-            ('urzip-badsig.apk', 'info.guardianproject.urzip', 100, '0.1', None),
-            ('urzip-release.apk', 'info.guardianproject.urzip', 100, '0.1', None),
-            (
-                'urzip-release-unsigned.apk',
-                'info.guardianproject.urzip',
-                100,
-                '0.1',
-                None,
-            ),
-            ('repo/com.politedroid_3.apk', 'com.politedroid', 3, '1.2', None),
-            ('repo/com.politedroid_4.apk', 'com.politedroid', 4, '1.3', None),
-            ('repo/com.politedroid_5.apk', 'com.politedroid', 5, '1.4', None),
-            ('repo/com.politedroid_6.apk', 'com.politedroid', 6, '1.5', None),
-            (
-                'repo/duplicate.permisssions_9999999.apk',
-                'duplicate.permisssions',
-                9999999,
-                '',
-                None,
-            ),
-            (
-                'repo/info.zwanenburg.caffeinetile_4.apk',
-                'info.zwanenburg.caffeinetile',
-                4,
-                '1.3',
-                None,
-            ),
-            (
-                'repo/obb.main.oldversion_1444412523.apk',
-                'obb.main.oldversion',
-                1444412523,
-                '0.1',
-                None,
-            ),
-            (
-                'repo/obb.mainpatch.current_1619_another-release-key.apk',
-                'obb.mainpatch.current',
-                1619,
-                '0.1',
-                None,
-            ),
-            (
-                'repo/obb.mainpatch.current_1619.apk',
-                'obb.mainpatch.current',
-                1619,
-                '0.1',
-                None,
-            ),
-            (
-                'repo/obb.main.twoversions_1101613.apk',
-                'obb.main.twoversions',
-                1101613,
-                '0.1',
-                None,
-            ),
-            (
-                'repo/obb.main.twoversions_1101615.apk',
-                'obb.main.twoversions',
-                1101615,
-                '0.1',
-                None,
-            ),
-            (
-                'repo/obb.main.twoversions_1101617.apk',
-                'obb.main.twoversions',
-                1101617,
-                '0.1',
-                None,
-            ),
-            (
-                'repo/urzip-; Рахма́, [rɐxˈmanʲɪnəf] سيرجي_رخمانينوف 谢·.apk',
-                'info.guardianproject.urzip',
-                100,
-                '0.1',
-                None,
-            ),
-        ]
-        for apkfilename, appid, versionCode, versionName, nativecode in testcases:
-            app = fdroidserver.metadata.App()
-            app.id = appid
-            build = fdroidserver.metadata.Build()
-            build.buildjni = ['yes'] if nativecode else build.buildjni
-            build.versionCode = versionCode
-            build.versionName = versionName
-            vc, vn = fdroidserver.build.get_metadata_from_apk(app, build, apkfilename)
-            self.assertEqual(versionCode, vc)
-            self.assertEqual(versionName, vn)
-
-    @mock.patch('fdroidserver.common.get_apk_id')
-    @mock.patch('fdroidserver.build.FDroidPopen')
-    @mock.patch('fdroidserver.common.is_debuggable_or_testOnly', lambda f: False)
-    @mock.patch('fdroidserver.common.get_native_code', lambda f: 'x86')
-    @mock.patch('fdroidserver.common.get_source_date_epoch', lambda f: '1234567890')
-    def test_build_local_maven(self, fake_FDroidPopen, fake_get_apk_id):
-        """Test build_local() with a maven project"""
-
-        # pylint: disable=unused-argument
-        def _side_effect(cmd, cwd=None):
-            p = mock.MagicMock()
-            p.output = '[INFO] fake apkbuilder target/no.apk'
-            with open(os.path.join(self.testdir, 'target', 'no.apk'), 'w') as fp:
-                fp.write('placeholder')
-            p.returncode = 0
-            return p
-
-        fake_FDroidPopen.side_effect = _side_effect
-        os.chdir(self.testdir)
-        os.mkdir('target')
-        config = dict()
-        fdroidserver.common.fill_config_defaults(config)
-        fdroidserver.common.config = config
-        fdroidserver.build.config = config
-        fdroidserver.build.options = mock.Mock()
-        fdroidserver.build.options.scan_binary = False
-        fdroidserver.build.options.notarball = True
-        fdroidserver.build.options.skipscan = False
-
-        app = fdroidserver.metadata.App()
-        app.id = 'mocked.app.id'
-        build = fdroidserver.metadata.Build()
-        build.commit = '1.0'
-        build.versionCode = 1
-        build.versionName = '1.0'
-        fake_get_apk_id.side_effect = lambda f: (
-            app.id,
-            build.versionCode,
-            build.versionName,
-        )
-        vcs = mock.Mock()
-
-        build.maven = 'yes@..'
-        fdroidserver.build.build_local(
-            app,
-            build,
-            vcs,
-            build_dir=self.testdir,
-            output_dir=self.testdir,
-            log_dir=os.getcwd(),
-            srclib_dir=None,
-            extlib_dir=None,
-            tmp_dir=None,
-            force=False,
-            onserver=True,
-            refresh=False,
-        )
-
-        build.maven = 'yes'
-        fdroidserver.build.build_local(
-            app,
-            build,
-            vcs,
-            build_dir=self.testdir,
-            output_dir=self.testdir,
-            log_dir=os.getcwd(),
-            srclib_dir=None,
-            extlib_dir=None,
-            tmp_dir=None,
-            force=False,
-            onserver=True,
-            refresh=False,
-        )
-
-    @mock.patch('sdkmanager.build_package_list', lambda use_net: None)
-    def test_build_local_ndk(self):
-        """Test if `fdroid build` detects installed NDKs and auto-installs when missing"""
-        with tempfile.TemporaryDirectory() as testdir, TmpCwd(
-            testdir
-        ), tempfile.TemporaryDirectory() as sdk_path:
-            config = {'ndk_paths': {}, 'sdk_path': sdk_path}
-            fdroidserver.common.config = config
-            fdroidserver.build.config = config
-            fdroidserver.build.options = mock.Mock()
-            fdroidserver.build.options.scan_binary = False
-            fdroidserver.build.options.notarball = True
-            fdroidserver.build.options.skipscan = True
-
-            app = fdroidserver.metadata.App()
-            app.id = 'mocked.app.id'
-            build = fdroidserver.metadata.Build()
-            build.commit = '1.0'
-            build.output = app.id + '.apk'
-            build.versionCode = 1
-            build.versionName = '1.0'
-            build.ndk = 'r21e'  # aka 21.4.7075529
-            ndk_version = '21.4.7075529'
-            ndk_dir = Path(config['sdk_path']) / 'ndk' / ndk_version
-            vcs = mock.Mock()
-
-            def make_fake_apk(output, build):
-                with open(build.output, 'w') as fp:
-                    fp.write('APK PLACEHOLDER')
-                return output
-
-            # pylint: disable=unused-argument
-            def fake_sdkmanager_install(to_install, android_home=None):
-                ndk_dir.mkdir(parents=True)
-                self.assertNotEqual(ndk_version, to_install)  # converts r21e to version
-                with (ndk_dir / 'source.properties').open('w') as fp:
-                    fp.write('Pkg.Revision = %s\n' % ndk_version)
-
-            # use "as _ignored" just to make a pretty layout
-            with mock.patch(
-                'fdroidserver.common.replace_build_vars', wraps=make_fake_apk
-            ) as _ignored, mock.patch(
-                'fdroidserver.common.get_native_code', return_value='x86'
-            ) as _ignored, mock.patch(
-                'fdroidserver.common.get_apk_id',
-                return_value=(app.id, build.versionCode, build.versionName),
-            ) as _ignored, mock.patch(
-                'fdroidserver.common.sha256sum',
-                return_value='ad7ce5467e18d40050dc51b8e7affc3e635c85bd8c59be62de32352328ed467e',
-            ) as _ignored, mock.patch(
-                'fdroidserver.common.is_debuggable_or_testOnly',
-                return_value=False,
-            ) as _ignored, mock.patch(
-                'fdroidserver.build.FDroidPopen', FakeProcess
-            ) as _ignored, mock.patch(
-                'sdkmanager.install', wraps=fake_sdkmanager_install
-            ) as _ignored, mock.patch(
-                'fdroidserver.common.get_source_date_epoch', lambda f: '1234567890'
-            ) as _ignored:
-                _ignored  # silence the linters
-                with self.assertRaises(
-                    fdroidserver.exception.FDroidException,
-                    msg="No NDK setup, `fdroid build` should fail with error",
-                ):
-                    fdroidserver.build.build_local(
-                        app,
-                        build,
-                        vcs,
-                        build_dir=testdir,
-                        output_dir=testdir,
-                        log_dir=None,
-                        srclib_dir=None,
-                        extlib_dir=None,
-                        tmp_dir=None,
-                        force=False,
-                        onserver=False,
-                        refresh=False,
-                    )
-                # now run `fdroid build --onserver`
-                print('now run `fdroid build --onserver`')
-                self.assertFalse(ndk_dir.exists())
-                self.assertFalse('r21e' in config['ndk_paths'])
-                self.assertFalse(ndk_version in config['ndk_paths'])
-                fdroidserver.build.build_local(
-                    app,
-                    build,
-                    vcs,
-                    build_dir=testdir,
-                    output_dir=testdir,
-                    log_dir=os.getcwd(),
-                    srclib_dir=None,
-                    extlib_dir=None,
-                    tmp_dir=None,
-                    force=False,
-                    onserver=True,
-                    refresh=False,
-                )
-                self.assertTrue(ndk_dir.exists())
-                self.assertTrue(os.path.exists(config['ndk_paths'][ndk_version]))
-                # All paths in the config must be strings, never pathlib.Path instances
-                self.assertIsInstance(config['ndk_paths'][ndk_version], str)
-
-    @mock.patch('sdkmanager.build_package_list', lambda use_net: None)
-    @mock.patch('fdroidserver.build.FDroidPopen', FakeProcess)
-    @mock.patch('fdroidserver.common.get_native_code', lambda _ignored: 'x86')
-    @mock.patch('fdroidserver.common.is_debuggable_or_testOnly', lambda _ignored: False)
-    @mock.patch('fdroidserver.common.get_source_date_epoch', lambda f: '1234567890')
-    @mock.patch(
-        'fdroidserver.common.sha256sum',
-        lambda f: 'ad7ce5467e18d40050dc51b8e7affc3e635c85bd8c59be62de32352328ed467e',
-    )
-    def test_build_local_ndk_some_installed(self):
-        """Test if `fdroid build` detects installed NDKs and auto-installs when missing"""
-        with tempfile.TemporaryDirectory() as testdir, TmpCwd(
-            testdir
-        ), tempfile.TemporaryDirectory() as sdk_path:
-            ndk_r24 = os.path.join(sdk_path, 'ndk', '24.0.8215888')
-            os.makedirs(ndk_r24)
-            with open(os.path.join(ndk_r24, 'source.properties'), 'w') as fp:
-                fp.write('Pkg.Revision = 24.0.8215888\n')
-            config = {'ndk_paths': {'r24': ndk_r24}, 'sdk_path': sdk_path}
-            fdroidserver.common.config = config
-            fdroidserver.build.config = config
-            fdroidserver.build.options = mock.Mock()
-            fdroidserver.build.options.scan_binary = False
-            fdroidserver.build.options.notarball = True
-            fdroidserver.build.options.skipscan = True
-
-            app = fdroidserver.metadata.App()
-            app.id = 'mocked.app.id'
-            build = fdroidserver.metadata.Build()
-            build.commit = '1.0'
-            build.output = app.id + '.apk'
-            build.versionCode = 1
-            build.versionName = '1.0'
-            build.ndk = 'r21e'  # aka 21.4.7075529
-            ndk_version = '21.4.7075529'
-            ndk_dir = Path(config['sdk_path']) / 'ndk' / ndk_version
-            vcs = mock.Mock()
-
-            def make_fake_apk(output, build):
-                with open(build.output, 'w') as fp:
-                    fp.write('APK PLACEHOLDER')
-                return output
-
-            # pylint: disable=unused-argument
-            def fake_sdkmanager_install(to_install, android_home=None):
-                ndk_dir.mkdir(parents=True)
-                self.assertNotEqual(ndk_version, to_install)  # converts r21e to version
-                with (ndk_dir / 'source.properties').open('w') as fp:
-                    fp.write('Pkg.Revision = %s\n' % ndk_version)
-
-            # use "as _ignored" just to make a pretty layout
-            with mock.patch(
-                'fdroidserver.common.replace_build_vars', wraps=make_fake_apk
-            ) as _ignored, mock.patch(
-                'fdroidserver.common.get_apk_id',
-                return_value=(app.id, build.versionCode, build.versionName),
-            ) as _ignored, mock.patch(
-                'sdkmanager.install', wraps=fake_sdkmanager_install
-            ) as _ignored:
-                _ignored  # silence the linters
-                self.assertFalse(ndk_dir.exists())
-                self.assertFalse('r21e' in config['ndk_paths'])
-                self.assertFalse(ndk_version in config['ndk_paths'])
-                fdroidserver.build.build_local(
-                    app,
-                    build,
-                    vcs,
-                    build_dir=testdir,
-                    output_dir=testdir,
-                    log_dir=os.getcwd(),
-                    srclib_dir=None,
-                    extlib_dir=None,
-                    tmp_dir=None,
-                    force=False,
-                    onserver=True,
-                    refresh=False,
-                )
-                self.assertTrue(ndk_dir.exists())
-                self.assertTrue(os.path.exists(config['ndk_paths'][ndk_version]))
-
-    @mock.patch('fdroidserver.common.get_source_date_epoch', lambda f: '1234567890')
-    def test_build_local_clean(self):
-        """Test if `fdroid build` cleans ant and gradle build products"""
-        os.chdir(self.testdir)
-        config = dict()
-        fdroidserver.common.fill_config_defaults(config)
-        fdroidserver.common.config = config
-        fdroidserver.build.config = config
-        fdroidserver.build.options = mock.Mock()
-        fdroidserver.build.options.scan_binary = False
-        fdroidserver.build.options.notarball = True
-        fdroidserver.build.options.skipscan = False
-
-        app = fdroidserver.metadata.App()
-        app.id = 'mocked.app.id'
-        build = fdroidserver.metadata.Build()
-        build.commit = '1.0'
-        build.output = app.id + '.apk'
-        build.scandelete = ['baz.so']
-        build.scanignore = ['foo.aar']
-        build.versionCode = 1
-        build.versionName = '1.0'
-        vcs = mock.Mock()
-
-        os.mkdir('reports')
-        os.mkdir('target')
-
-        for f in ('baz.so', 'foo.aar', 'gradle-wrapper.jar'):
-            with open(f, 'w') as fp:
-                fp.write('placeholder')
-            self.assertTrue(os.path.exists(f))
-
-        os.mkdir('build')
-        os.mkdir('build/reports')
-        with open('build.gradle', 'w', encoding='utf-8') as fp:
-            fp.write('// placeholder')
-
-        os.mkdir('bin')
-        os.mkdir('gen')
-        with open('build.xml', 'w', encoding='utf-8') as fp:
-            fp.write(
-                textwrap.dedent(
-                    """<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-                <project basedir="." default="clean" name="mockapp">
-                <target name="release"/>
-                <target name="clean"/>
-                </project>"""
-                )
-            )
-
-        def make_fake_apk(output, build):
-            with open(build.output, 'w') as fp:
-                fp.write('APK PLACEHOLDER')
-            return output
-
-        with mock.patch('fdroidserver.common.replace_build_vars', wraps=make_fake_apk):
-            with mock.patch('fdroidserver.common.get_native_code', return_value='x86'):
-                with mock.patch(
-                    'fdroidserver.common.get_apk_id',
-                    return_value=(app.id, build.versionCode, build.versionName),
-                ):
-                    with mock.patch(
-                        'fdroidserver.common.is_debuggable_or_testOnly',
-                        return_value=False,
-                    ):
-                        fdroidserver.build.build_local(
-                            app,
-                            build,
-                            vcs,
-                            build_dir=self.testdir,
-                            output_dir=self.testdir,
-                            log_dir=None,
-                            srclib_dir=None,
-                            extlib_dir=None,
-                            tmp_dir=None,
-                            force=False,
-                            onserver=False,
-                            refresh=False,
-                        )
-
-        self.assertTrue(os.path.exists('foo.aar'))
-        self.assertTrue(os.path.isdir('build'))
-        self.assertTrue(os.path.isdir('reports'))
-        self.assertTrue(os.path.isdir('target'))
-        self.assertFalse(os.path.exists('baz.so'))
-        self.assertFalse(os.path.exists('bin'))
-        self.assertFalse(os.path.exists('build/reports'))
-        self.assertFalse(os.path.exists('gen'))
-        self.assertFalse(os.path.exists('gradle-wrapper.jar'))
-
-    def test_scan_with_extlib(self):
-        os.chdir(self.testdir)
-        os.mkdir("build")
-
-        config = fdroidserver.common.read_config()
-        config['sdk_path'] = os.getenv('ANDROID_HOME')
-        config['ndk_paths'] = {'r10d': os.getenv('ANDROID_NDK_HOME')}
-        fdroidserver.common.config = config
-        app = fdroidserver.metadata.App()
-        app.id = 'com.gpl.rpg.AndorsTrail'
-        build = fdroidserver.metadata.Build()
-        build.commit = 'master'
-        build.androidupdate = ['no']
-        os.makedirs("extlib/android")
-        # write a fake binary jar file the scanner should definitely error on
-        with open('extlib/android/android-support-v4r11.jar', 'wb') as file:
-            file.write(
-                b'PK\x03\x04\x14\x00\x08\x00\x08\x00-\x0eiA\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\t\x00\x04\x00META-INF/\xfe\xca\x00\x00\x03\x00PK\x07\x08\x00\x00\x00\x00\x02\x00\x00\x00\x00\x00\x00\x00'
-            )
-
-        class FakeVcs:
-            # no need to change to the correct commit here
-            def gotorevision(self, rev, refresh=True):
-                pass
-
-            def getsrclib(self):
-                return None
-
-            def deinitsubmodules(self):
-                pass
-
-        # Test we trigger a scanner error without extlibs
-        build.extlibs = []
-        os.makedirs('build/libs')
-        shutil.copy('extlib/android/android-support-v4r11.jar', 'build/libs')
-        fdroidserver.common.prepare_source(
-            FakeVcs(), app, build, "build", "ignore", "extlib"
-        )
-        count = fdroidserver.scanner.scan_source("build", build)
-        self.assertEqual(1, count, "Should produce a scanner error without extlib")
-
-        # Now try again as an extlib
-        build.extlibs = ['android/android-support-v4r11.jar']
-        fdroidserver.common.prepare_source(
-            FakeVcs(), app, build, "build", "ignore", "extlib"
-        )
-        count = fdroidserver.scanner.scan_source("build", build)
-        self.assertEqual(0, count, "Shouldn't error on jar from extlib")
-
-    def test_failed_verifies_are_not_in_unsigned(self):
-        os.chdir(self.testdir)
-        sdk_path = os.path.join(self.testdir, 'android-sdk')
-        self.create_fake_android_home(sdk_path)
-        with open(fdroidserver.common.CONFIG_FILE, 'w') as fp:
-            yaml.dump({'sdk_path': sdk_path, 'keep_when_not_allowed': True}, fp)
-        os.chmod(fdroidserver.common.CONFIG_FILE, 0o600)
-        fdroidserver.build.config = fdroidserver.common.read_config()
-
-        os.mkdir('metadata')
-        appid = 'info.guardianproject.checkey'
-        metadata_file = os.path.join('metadata', appid + '.yml')
-        shutil.copy(os.path.join(self.basedir, metadata_file), 'metadata')
-        with open(metadata_file) as fp:
-            app = fdroidserver.metadata.App(yaml.safe_load(fp))
-        app['RepoType'] = 'git'
-        app[
-            'Binaries'
-        ] = 'https://example.com/fdroid/repo/info.guardianproject.checkey_%v.apk'
-        build = fdroidserver.metadata.Build(
-            {
-                'versionCode': 123,
-                'versionName': '1.2.3',
-                'commit': '1.2.3',
-                'disable': False,
-            }
-        )
-        app['Builds'] = [build]
-        fdroidserver.metadata.write_metadata(metadata_file, app)
-
-        os.makedirs(os.path.join('unsigned', 'binaries'))
-        production_result = os.path.join(
-            'unsigned', '%s_%d.apk' % (appid, build['versionCode'])
-        )
-        production_compare_file = os.path.join(
-            'unsigned', 'binaries', '%s_%d.binary.apk' % (appid, build['versionCode'])
-        )
-        os.makedirs(os.path.join('tmp', 'binaries'))
-        test_result = os.path.join('tmp', '%s_%d.apk' % (appid, build['versionCode']))
-        test_compare_file = os.path.join(
-            'tmp', 'binaries', '%s_%d.binary.apk' % (appid, build['versionCode'])
-        )
-        with mock.patch(
-            'fdroidserver.common.force_exit', lambda *args: None
-        ) as a, mock.patch(
-            'fdroidserver.common.get_android_tools_version_log', lambda: 'fake'
-        ) as b, mock.patch(
-            'fdroidserver.common.FDroidPopen', FakeProcess
-        ) as c, mock.patch(
-            'fdroidserver.build.FDroidPopen', FakeProcess
-        ) as d, mock.patch(
-            'fdroidserver.build.trybuild', lambda *args: True
-        ) as e, mock.patch(
-            'fdroidserver.net.download_file', lambda *args, **kwargs: None
-        ) as f:
-            a, b, c, d, e, f  # silence linters' "unused" warnings
-
-            with mock.patch('sys.argv', ['fdroid build', appid]):
-                # successful comparison
-                open(production_result, 'w').close()
-                open(production_compare_file, 'w').close()
-                with mock.patch('fdroidserver.common.verify_apks', lambda *args: None):
-                    fdroidserver.build.main()
-                self.assertTrue(os.path.exists(production_result))
-                self.assertTrue(os.path.exists(production_compare_file))
-                # failed comparison
-                open(production_result, 'w').close()
-                open(production_compare_file, 'w').close()
-                with mock.patch(
-                    'fdroidserver.common.verify_apks', lambda *args: 'failed'
-                ):
-                    fdroidserver.build.main()
-                self.assertFalse(os.path.exists(production_result))
-                self.assertFalse(os.path.exists(production_compare_file))
-
-            with mock.patch('sys.argv', ['fdroid build', '--test', appid]):
-                # successful comparison
-                open(test_result, 'w').close()
-                open(test_compare_file, 'w').close()
-                with mock.patch('fdroidserver.common.verify_apks', lambda *args: None):
-                    fdroidserver.build.main()
-                self.assertTrue(os.path.exists(test_result))
-                self.assertTrue(os.path.exists(test_compare_file))
-                self.assertFalse(os.path.exists(production_result))
-                self.assertFalse(os.path.exists(production_compare_file))
-                # failed comparison
-                open(test_result, 'w').close()
-                open(test_compare_file, 'w').close()
-                with mock.patch(
-                    'fdroidserver.common.verify_apks', lambda *args: 'failed'
-                ):
-                    fdroidserver.build.main()
-                self.assertTrue(os.path.exists(test_result))
-                self.assertFalse(os.path.exists(test_compare_file))
-                self.assertFalse(os.path.exists(production_result))
-                self.assertFalse(os.path.exists(production_compare_file))
-
-    def test_failed_allowedapksigningkeys_are_not_in_unsigned(self):
-        os.chdir(self.testdir)
-        os.mkdir('metadata')
-        appid = 'info.guardianproject.checkey'
-        metadata_file = os.path.join('metadata', appid + '.yml')
-        shutil.copy(os.path.join(self.basedir, metadata_file), 'metadata')
-        with open(metadata_file) as fp:
-            app = fdroidserver.metadata.App(yaml.safe_load(fp))
-        app['RepoType'] = 'git'
-        app[
-            'Binaries'
-        ] = 'https://example.com/fdroid/repo/info.guardianproject.checkey_%v.apk'
-        build = fdroidserver.metadata.Build(
-            {
-                'versionCode': 123,
-                'versionName': '1.2.3',
-                'commit': '1.2.3',
-                'disable': False,
-            }
-        )
-        app['Builds'] = [build]
-        expected_key = 'a' * 64
-        bogus_key = 'b' * 64
-        app['AllowedAPKSigningKeys'] = [expected_key]
-        fdroidserver.metadata.write_metadata(metadata_file, app)
-
-        os.makedirs(os.path.join('unsigned', 'binaries'))
-        production_result = os.path.join(
-            'unsigned', '%s_%d.apk' % (appid, build['versionCode'])
-        )
-        production_compare_file = os.path.join(
-            'unsigned', 'binaries', '%s_%d.binary.apk' % (appid, build['versionCode'])
-        )
-        os.makedirs(os.path.join('tmp', 'binaries'))
-        test_result = os.path.join('tmp', '%s_%d.apk' % (appid, build['versionCode']))
-        test_compare_file = os.path.join(
-            'tmp', 'binaries', '%s_%d.binary.apk' % (appid, build['versionCode'])
-        )
-        with mock.patch(
-            'fdroidserver.common.force_exit', lambda *args: None
-        ) as a, mock.patch(
-            'fdroidserver.common.get_android_tools_version_log', lambda: 'fake'
-        ) as b, mock.patch(
-            'fdroidserver.common.FDroidPopen', FakeProcess
-        ) as c, mock.patch(
-            'fdroidserver.build.FDroidPopen', FakeProcess
-        ) as d, mock.patch(
-            'fdroidserver.build.trybuild', lambda *args: True
-        ) as e, mock.patch(
-            'fdroidserver.net.download_file', lambda *args, **kwargs: None
-        ) as f:
-            a, b, c, d, e, f  # silence linters' "unused" warnings
-
-            with mock.patch('sys.argv', ['fdroid build', appid]):
-                # successful comparison, successful signer
-                open(production_result, 'w').close()
-                open(production_compare_file, 'w').close()
-                with mock.patch(
-                    'fdroidserver.common.verify_apks', lambda *args: None
-                ) as g, mock.patch(
-                    'fdroidserver.common.apk_signer_fingerprint',
-                    lambda *args: expected_key,
-                ) as h:
-                    g, h
-                    fdroidserver.build.main()
-                self.assertTrue(os.path.exists(production_result))
-                self.assertTrue(os.path.exists(production_compare_file))
-                # successful comparison, failed signer
-                open(production_result, 'w').close()
-                open(production_compare_file, 'w').close()
-                with mock.patch(
-                    'fdroidserver.common.verify_apks', lambda *args: None
-                ) as g, mock.patch(
-                    'fdroidserver.common.apk_signer_fingerprint',
-                    lambda *args: bogus_key,
-                ) as h:
-                    g, h
-                    fdroidserver.build.main()
-                self.assertFalse(os.path.exists(production_result))
-                self.assertFalse(os.path.exists(production_compare_file))
-                # failed comparison
-                open(production_result, 'w').close()
-                open(production_compare_file, 'w').close()
-                with mock.patch(
-                    'fdroidserver.common.verify_apks', lambda *args: 'failed'
-                ):
-                    fdroidserver.build.main()
-                self.assertFalse(os.path.exists(production_result))
-                self.assertFalse(os.path.exists(production_compare_file))
-
-            with mock.patch('sys.argv', ['fdroid build', '--test', appid]):
-                # successful comparison, successful signer
-                open(test_result, 'w').close()
-                open(test_compare_file, 'w').close()
-                with mock.patch(
-                    'fdroidserver.common.verify_apks', lambda *args: None
-                ) as g, mock.patch(
-                    'fdroidserver.common.apk_signer_fingerprint',
-                    lambda *args: expected_key,
-                ) as h:
-                    g, h
-                    fdroidserver.build.main()
-                self.assertTrue(os.path.exists(test_result))
-                self.assertTrue(os.path.exists(test_compare_file))
-                self.assertFalse(os.path.exists(production_result))
-                self.assertFalse(os.path.exists(production_compare_file))
-                # successful comparison, failed signer
-                open(test_result, 'w').close()
-                open(test_compare_file, 'w').close()
-                with mock.patch(
-                    'fdroidserver.common.verify_apks', lambda *args: None
-                ) as g, mock.patch(
-                    'fdroidserver.common.apk_signer_fingerprint',
-                    lambda *args: bogus_key,
-                ) as h:
-                    g, h
-                    fdroidserver.build.main()
-                self.assertTrue(os.path.exists(test_result))
-                self.assertFalse(os.path.exists(test_compare_file))
-                self.assertFalse(os.path.exists(production_result))
-                self.assertFalse(os.path.exists(production_compare_file))
-                # failed comparison
-                open(test_result, 'w').close()
-                open(test_compare_file, 'w').close()
-                with mock.patch(
-                    'fdroidserver.common.verify_apks', lambda *args: 'failed'
-                ):
-                    fdroidserver.build.main()
-                self.assertTrue(os.path.exists(test_result))
-                self.assertFalse(os.path.exists(test_compare_file))
-                self.assertFalse(os.path.exists(production_result))
-                self.assertFalse(os.path.exists(production_compare_file))
-
-    @mock.patch('fdroidserver.vmtools.get_build_vm')
-    @mock.patch('fdroidserver.vmtools.get_clean_builder')
-    @mock.patch('paramiko.SSHClient')
-    @mock.patch('subprocess.check_output')
-    def test_build_server_cmdline(
-        self,
-        subprocess_check_output,
-        paramiko_SSHClient,
-        fdroidserver_vmtools_get_clean_builder,
-        fdroidserver_vmtools_get_build_vm,
-    ):
-        """Test command line flags passed to the buildserver"""
-        global cmdline_args
-        test_flag = ['', False]
-
-        def _exec_command(args):
-            flag = test_flag[0]
-            if test_flag[1]:
-                self.assertTrue(flag in args, flag + ' should be present')
-            else:
-                self.assertFalse(flag in args, flag + ' should not be present')
-
-        os.chdir(self.testdir)
-        os.mkdir('tmp')
-
-        chan = mock.MagicMock()
-        chan.exec_command = _exec_command
-        chan.recv_exit_status = lambda: 0
-        transport = mock.MagicMock()
-        transport.open_session = mock.Mock(return_value=chan)
-        sshs = mock.MagicMock()
-        sshs.get_transport = mock.Mock(return_value=transport)
-        paramiko_SSHClient.return_value = sshs
-        subprocess_check_output.return_value = (
-            b'0123456789abcdef0123456789abcdefcafebabe'
-        )
-        fdroidserver_vmtools_get_clean_builder.side_effect = lambda s: {
-            'hostname': 'example.com',
-            'idfile': '/path/to/id/file',
-            'port': 123,
-            'user': 'fake',
-        }
-        fdroidserver.common.config = {'sdk_path': '/fake/android/sdk/path'}
-        fdroidserver.build.options = mock.MagicMock()
-        vcs = mock.Mock()
-        vcs.getsrclib = mock.Mock(return_value=None)
-        app = fdroidserver.metadata.App()
-        app['metadatapath'] = 'metadata/fake.id.yml'
-        app['id'] = 'fake.id'
-        app['RepoType'] = 'git'
-        build = fdroidserver.metadata.Build(
-            {
-                'versionCode': 123,
-                'versionName': '1.2.3',
-                'commit': '1.2.3',
-                'disable': False,
-            }
-        )
-        app['Builds'] = [build]
-
-        test_flag = ('--on-server', True)
-        fdroidserver.build.build_server(app, build, vcs, '', '', '', False)
-        self.assertTrue(fdroidserver_vmtools_get_build_vm.called)
-
-        for force in (True, False):
-            test_flag = ('--force', force)
-            fdroidserver.build.build_server(app, build, vcs, '', '', '', force)
-
-        fdroidserver.build.options.notarball = True
-        test_flag = ('--no-tarball', True)
-        fdroidserver.build.build_server(app, build, vcs, '', '', '', False)
-        fdroidserver.build.options.notarball = False
-        test_flag = ('--no-tarball', False)
-        fdroidserver.build.build_server(app, build, vcs, '', '', '', False)
-
-        fdroidserver.build.options.skipscan = False
-        test_flag = ('--scan-binary', True)
-        fdroidserver.build.build_server(app, build, vcs, '', '', '', False)
-        fdroidserver.build.options.skipscan = True
-        test_flag = ('--scan-binary', False)
-        fdroidserver.build.build_server(app, build, vcs, '', '', '', False)
-        test_flag = ('--skip-scan', True)
-        fdroidserver.build.build_server(app, build, vcs, '', '', '', False)
-
-    @mock.patch('fdroidserver.vmtools.get_build_vm')
-    @mock.patch('fdroidserver.vmtools.get_clean_builder')
-    @mock.patch('paramiko.SSHClient')
-    @mock.patch('subprocess.check_output')
-    @mock.patch('fdroidserver.common.getsrclib')
-    @mock.patch('fdroidserver.common.prepare_source')
-    @mock.patch('fdroidserver.build.build_local')
-    @mock.patch('fdroidserver.common.get_android_tools_version_log', lambda: 'versions')
-    @mock.patch('fdroidserver.common.deploy_build_log_with_rsync', lambda a, b, c: None)
-    def test_build_server_no_local_prepare(
-        self,
-        build_build_local,
-        common_prepare_source,
-        common_getsrclib,
-        subprocess_check_output,
-        paramiko_SSHClient,
-        fdroidserver_vmtools_get_clean_builder,
-        fdroidserver_vmtools_get_build_vm,  # pylint: disable=unused-argument
-    ):
-        """srclibs Prepare: should only be executed in the buildserver"""
-
-        def _exec_command(args):
-            print('chan.exec_command', args)
-
-        def _getsrclib(
-            spec,
-            srclib_dir,
-            basepath=False,
-            raw=False,
-            prepare=True,
-            preponly=False,
-            refresh=True,
-            build=None,
-        ):
-            # pylint: disable=unused-argument
-            name, ref = spec.split('@')
-            libdir = os.path.join(srclib_dir, name)
-            os.mkdir(libdir)
-            self.assertFalse(prepare, 'Prepare: scripts should never run on host')
-            return name, None, libdir  # TODO
-
-        os.chdir(self.testdir)
-
-        chan = mock.MagicMock()
-        chan.exec_command = _exec_command
-        chan.recv_exit_status = lambda: 0
-        transport = mock.MagicMock()
-        transport.open_session = mock.Mock(return_value=chan)
-        sshs = mock.MagicMock()
-        sshs.get_transport = mock.Mock(return_value=transport)
-        paramiko_SSHClient.return_value = sshs
-        subprocess_check_output.return_value = (
-            b'0123456789abcdef0123456789abcdefcafebabe'
-        )
-        fdroidserver_vmtools_get_clean_builder.side_effect = lambda s: {
-            'hostname': 'example.com',
-            'idfile': '/path/to/id/file',
-            'port': 123,
-            'user': 'fake',
-        }
-
-        fdroidserver.metadata.srclibs = {
-            'flutter': {
-                'RepoType': 'git',
-                'Repo': 'https://github.com/flutter/flutter',
-            }
-        }
-        os.mkdir('srclibs')
-        with open('srclibs/flutter.yml', 'w') as fp:
-            yaml.dump(fdroidserver.metadata.srclibs, fp)
-        common_getsrclib.side_effect = _getsrclib
-
-        options = mock.MagicMock()
-        options.force = False
-        options.notarball = True
-        options.onserver = False
-        options.refresh = False
-        options.scan_binary = False
-        options.server = True
-        options.skipscan = True
-        options.test = False
-        options.verbose = True
-        fdroidserver.build.options = options
-        fdroidserver.build.config = {'sdk_path': '/fake/android/sdk/path'}
-
-        vcs = mock.Mock()
-        vcs.getsrclib = mock.Mock(return_value=None)
-        app = fdroidserver.metadata.App()
-        app['metadatapath'] = 'metadata/fake.id.yml'
-        app['id'] = 'fake.id'
-        app['RepoType'] = 'git'
-        spec = 'flutter@v1.7.8'
-        build = fdroidserver.metadata.Build(
-            {
-                'versionCode': 123,
-                'versionName': '1.2.3',
-                'commit': '1.2.3',
-                'disable': False,
-                'srclibs': [spec],
-            }
-        )
-        app['Builds'] = [build]
-
-        build_dir = 'build'
-        srclib_dir = os.path.join(build_dir, 'srclib')
-        extlib_dir = os.path.join(build_dir, 'extlib')
-        os.mkdir('tmp')
-        os.mkdir(build_dir)
-        os.mkdir(srclib_dir)
-
-        fdroidserver.build.trybuild(
-            app,
-            build,
-            build_dir,
-            'unsigned',
-            'logs',
-            None,
-            srclib_dir,
-            extlib_dir,
-            'tmp',
-            'repo',
-            vcs,
-            options.test,
-            options.server,
-            options.force,
-            options.onserver,
-            options.refresh,
-        )
-
-        common_getsrclib.assert_called_once_with(
-            spec, srclib_dir, basepath=True, prepare=False
-        )
-        common_prepare_source.assert_not_called()
-        build_build_local.assert_not_called()
-
-    def test_keep_when_not_allowed_default(self):
-        self.assertFalse(fdroidserver.build.keep_when_not_allowed())
-
-    def test_keep_when_not_allowed_config_true(self):
-        fdroidserver.build.config = {'keep_when_not_allowed': True}
-        self.assertTrue(fdroidserver.build.keep_when_not_allowed())
-
-    def test_keep_when_not_allowed_config_false(self):
-        fdroidserver.build.config = {'keep_when_not_allowed': False}
-        self.assertFalse(fdroidserver.build.keep_when_not_allowed())
-
-    def test_keep_when_not_allowed_options_true(self):
-        fdroidserver.build.options = Options
-        fdroidserver.build.options.keep_when_not_allowed = True
-        self.assertTrue(fdroidserver.build.keep_when_not_allowed())
-
-    def test_keep_when_not_allowed_options_false(self):
-        fdroidserver.build.options = Options
-        fdroidserver.build.options.keep_when_not_allowed = False
-        self.assertFalse(fdroidserver.build.keep_when_not_allowed())
-
-    def test_keep_when_not_allowed_options_true_override_config(self):
-        fdroidserver.build.options = Options
-        fdroidserver.build.options.keep_when_not_allowed = True
-        fdroidserver.build.config = {'keep_when_not_allowed': False}
-        self.assertTrue(fdroidserver.build.keep_when_not_allowed())
-
-    def test_keep_when_not_allowed_options_default_does_not_override(self):
-        fdroidserver.build.options = Options
-        fdroidserver.build.options.keep_when_not_allowed = False
-        fdroidserver.build.config = {'keep_when_not_allowed': True}
-        self.assertTrue(fdroidserver.build.keep_when_not_allowed())
-
-    def test_keep_when_not_allowed_all_true(self):
-        fdroidserver.build.options = Options
-        fdroidserver.build.options.keep_when_not_allowed = True
-        fdroidserver.build.config = {'keep_when_not_allowed': True}
-        self.assertTrue(fdroidserver.build.keep_when_not_allowed())
-
-    def test_keep_when_not_allowed_all_false(self):
-        fdroidserver.build.options = Options
-        fdroidserver.build.options.keep_when_not_allowed = False
-        fdroidserver.build.config = {'keep_when_not_allowed': False}
-        self.assertFalse(fdroidserver.build.keep_when_not_allowed())
diff --git a/tests/test_checkupdates.py b/tests/test_checkupdates.py
deleted file mode 100755
index 107caf29..00000000
--- a/tests/test_checkupdates.py
+++ /dev/null
@@ -1,707 +0,0 @@
-#!/usr/bin/env python3
-
-import os
-import platform
-import shutil
-import tempfile
-import time
-import unittest
-from pathlib import Path
-from unittest import mock
-
-import git
-
-import fdroidserver
-import fdroidserver.checkupdates
-
-basedir = Path(__file__).parent
-
-
-class CheckupdatesTest(unittest.TestCase):
-    '''fdroidserver/checkupdates.py'''
-
-    def setUp(self):
-        os.chdir(basedir)
-        self.testdir = tempfile.TemporaryDirectory(
-            str(time.time()), self._testMethodName + '_'
-        )
-
-    def tearDown(self):
-        self.testdir.cleanup()
-
-    def test_autoupdatemode_no_suffix(self):
-        fdroidserver.checkupdates.config = {}
-
-        app = fdroidserver.metadata.App()
-        app.id = 'loop.starts.shooting'
-        app.metadatapath = 'metadata/' + app.id + '.yml'
-        app.CurrentVersion = '1.1.8-fdroid'
-        app.CurrentVersionCode = 10108
-        app.UpdateCheckMode = 'HTTP'
-        app.AutoUpdateMode = 'Version %v'
-
-        build = fdroidserver.metadata.Build()
-        build.versionCode = app.CurrentVersionCode
-        build.versionName = app.CurrentVersion
-        app['Builds'].append(build)
-
-        with mock.patch(
-            'fdroidserver.checkupdates.check_http', lambda app: ('1.1.9', 10109)
-        ):
-            with mock.patch('fdroidserver.metadata.write_metadata', mock.Mock()):
-                with mock.patch('subprocess.call', lambda cmd: 0):
-                    fdroidserver.checkupdates.checkupdates_app(app, auto=True)
-
-        build = app['Builds'][-1]
-        self.assertEqual(build.versionName, '1.1.9')
-        self.assertEqual(build.commit, '1.1.9')
-
-        with mock.patch(
-            'fdroidserver.checkupdates.check_http', lambda app: ('1.7.9', 10107)
-        ):
-            with mock.patch('fdroidserver.metadata.write_metadata', mock.Mock()):
-                with mock.patch('subprocess.call', lambda cmd: 0):
-                    with self.assertRaises(fdroidserver.exception.FDroidException):
-                        fdroidserver.checkupdates.checkupdates_app(app, auto=True)
-
-        build = app['Builds'][-1]
-        self.assertEqual(build.versionName, '1.1.9')
-        self.assertEqual(build.commit, '1.1.9')
-
-    def test_autoupdatemode_suffix(self):
-        fdroidserver.checkupdates.config = {}
-
-        app = fdroidserver.metadata.App()
-        app.id = 'loop.starts.shooting'
-        app.metadatapath = 'metadata/' + app.id + '.yml'
-        app.CurrentVersion = '1.1.8-fdroid'
-        app.CurrentVersionCode = 10108
-        app.UpdateCheckMode = 'HTTP'
-        app.AutoUpdateMode = r'Version +.%c-fdroid v%v_%c'
-
-        build = fdroidserver.metadata.Build()
-        build.versionCode = app.CurrentVersionCode
-        build.versionName = app.CurrentVersion
-        app['Builds'].append(build)
-
-        with mock.patch(
-            'fdroidserver.checkupdates.check_http', lambda app: ('1.1.9', 10109)
-        ):
-            with mock.patch('fdroidserver.metadata.write_metadata', mock.Mock()):
-                with mock.patch('subprocess.call', lambda cmd: 0):
-                    fdroidserver.checkupdates.checkupdates_app(app, auto=True)
-
-        build = app['Builds'][-1]
-        self.assertEqual(build.versionName, '1.1.9.10109-fdroid')
-        self.assertEqual(build.commit, 'v1.1.9_10109')
-
-    def test_autoupdate_multi_variants(self):
-        fdroidserver.checkupdates.config = {}
-
-        app = fdroidserver.metadata.App()
-        app.id = 'loop.starts.shooting'
-        app.metadatapath = 'metadata/' + app.id + '.yml'
-        app.CurrentVersion = '1.1.8'
-        app.CurrentVersionCode = 101083
-        app.UpdateCheckMode = 'Tags'
-        app.AutoUpdateMode = r'Version'
-        app.VercodeOperation = [
-            "10*%c+1",
-            "10*%c+3",
-        ]
-
-        build = fdroidserver.metadata.Build()
-        build.versionCode = app.CurrentVersionCode - 2
-        build.versionName = app.CurrentVersion
-        build.gradle = ["arm"]
-        app['Builds'].append(build)
-
-        build = fdroidserver.metadata.Build()
-        build.versionCode = app.CurrentVersionCode
-        build.versionName = app.CurrentVersion
-        build.gradle = ["x86"]
-        app['Builds'].append(build)
-
-        with mock.patch(
-            'fdroidserver.checkupdates.check_tags',
-            lambda app, pattern: ('1.1.9', 10109, 'v1.1.9'),
-        ):
-            with mock.patch('fdroidserver.metadata.write_metadata', mock.Mock()):
-                with mock.patch('subprocess.call', lambda cmd: 0):
-                    fdroidserver.checkupdates.checkupdates_app(app, auto=True)
-
-        build = app['Builds'][-2]
-        self.assertEqual(build.versionName, '1.1.9')
-        self.assertEqual(build.versionCode, 101091)
-        self.assertEqual(build.gradle, ["arm"])
-
-        build = app['Builds'][-1]
-        self.assertEqual(build.versionName, '1.1.9')
-        self.assertEqual(build.versionCode, 101093)
-        self.assertEqual(build.gradle, ["x86"])
-
-        self.assertEqual(app.CurrentVersion, '1.1.9')
-        self.assertEqual(app.CurrentVersionCode, 101093)
-
-    def test_checkupdates_app_http(self):
-        fdroidserver.checkupdates.config = {}
-
-        app = fdroidserver.metadata.App()
-        app.id = 'loop.starts.shooting'
-        app.metadatapath = 'metadata/' + app.id + '.yml'
-        app.CurrentVersionCode = 10108
-        app.UpdateCheckMode = 'HTTP'
-        app.UpdateCheckData = 'mock'
-
-        with mock.patch(
-            'fdroidserver.checkupdates.check_http', lambda app: (None, 'bla')
-        ):
-            with self.assertRaises(fdroidserver.exception.FDroidException):
-                fdroidserver.checkupdates.checkupdates_app(app, auto=True)
-
-        with mock.patch(
-            'fdroidserver.checkupdates.check_http', lambda app: ('1.1.9', 10109)
-        ):
-            with mock.patch(
-                'fdroidserver.metadata.write_metadata', mock.Mock()
-            ) as wrmock:
-                with mock.patch('subprocess.call', lambda cmd: 0):
-                    fdroidserver.checkupdates.checkupdates_app(app, auto=True)
-                wrmock.assert_called_with(app.metadatapath, app)
-
-    def test_checkupdates_app_tags(self):
-        fdroidserver.checkupdates.config = {}
-
-        app = fdroidserver.metadata.App()
-        app.id = 'loop.starts.shooting'
-        app.metadatapath = 'metadata/' + app.id + '.yml'
-        app.CurrentVersion = '1.1.8'
-        app.CurrentVersionCode = 10108
-        app.UpdateCheckMode = 'Tags'
-        app.AutoUpdateMode = 'Version'
-
-        build = fdroidserver.metadata.Build()
-        build.versionCode = app.CurrentVersionCode
-        build.versionName = app.CurrentVersion
-        app['Builds'].append(build)
-
-        with mock.patch(
-            'fdroidserver.checkupdates.check_tags',
-            lambda app, pattern: (None, 'bla', None),
-        ):
-            with self.assertRaises(fdroidserver.exception.FDroidException):
-                fdroidserver.checkupdates.checkupdates_app(app, auto=True)
-
-        with mock.patch(
-            'fdroidserver.checkupdates.check_tags',
-            lambda app, pattern: ('1.1.9', 10109, 'v1.1.9'),
-        ):
-            with mock.patch('fdroidserver.metadata.write_metadata', mock.Mock()):
-                with mock.patch('subprocess.call', lambda cmd: 0):
-                    fdroidserver.checkupdates.checkupdates_app(app, auto=True)
-
-        build = app['Builds'][-1]
-        self.assertEqual(build.versionName, '1.1.9')
-        self.assertEqual(build.commit, 'v1.1.9')
-
-    def test_check_http(self):
-        app = fdroidserver.metadata.App()
-        app.id = 'loop.starts.shooting'
-        app.metadatapath = 'metadata/' + app.id + '.yml'
-        app.CurrentVersionCode = 10108
-        app.UpdateCheckMode = 'HTTP'
-        app.UpdateCheckData = r'https://a.net/b.txt|c(.*)|https://d.net/e.txt|v(.*)'
-        app.UpdateCheckIgnore = 'beta'
-
-        respmock = mock.Mock()
-        respmock.read = lambda: 'v1.1.9\nc10109'.encode('utf-8')
-        with mock.patch('urllib.request.urlopen', lambda a, b, c: respmock):
-            vername, vercode = fdroidserver.checkupdates.check_http(app)
-        self.assertEqual(vername, '1.1.9')
-        self.assertEqual(vercode, 10109)
-
-    def test_check_http_blocks_unknown_schemes(self):
-        app = fdroidserver.metadata.App()
-        for scheme in ('file', 'ssh', 'http', ';pwn'):
-            app.id = scheme
-            faked = scheme + '://fake.url/for/testing/scheme'
-            app.UpdateCheckData = faked + '|ignored|' + faked + '|ignored'
-            app.metadatapath = 'metadata/' + app.id + '.yml'
-            with self.assertRaises(fdroidserver.exception.FDroidException):
-                fdroidserver.checkupdates.check_http(app)
-
-    def test_check_http_ignore(self):
-        app = fdroidserver.metadata.App()
-        app.id = 'loop.starts.shooting'
-        app.metadatapath = 'metadata/' + app.id + '.yml'
-        app.CurrentVersionCode = 10108
-        app.UpdateCheckMode = 'HTTP'
-        app.UpdateCheckData = r'https://a.net/b.txt|c(.*)|https://d.net/e.txt|v(.*)'
-        app.UpdateCheckIgnore = 'beta'
-
-        respmock = mock.Mock()
-        respmock.read = lambda: 'v1.1.9-beta\nc10109'.encode('utf-8')
-        with mock.patch('urllib.request.urlopen', lambda a, b, c: respmock):
-            vername, vercode = fdroidserver.checkupdates.check_http(app)
-        self.assertEqual(vername, None)
-
-    def test_check_tags_data(self):
-        app = fdroidserver.metadata.App()
-        app.id = 'loop.starts.shooting'
-        app.metadatapath = 'metadata/' + app.id + '.yml'
-        app.RepoType = 'git'
-        app.CurrentVersionCode = 10108
-        app.UpdateCheckMode = 'Tags'
-        app.UpdateCheckData = r'b.txt|c(.*)|e.txt|v(.*)'
-
-        vcs = mock.Mock()
-        vcs.latesttags.return_value = ['1.1.9', '1.1.8']
-        with mock.patch(
-            'pathlib.Path.read_text', lambda a: 'v1.1.9\nc10109'
-        ) as _ignored, mock.patch.object(Path, 'is_file') as mock_path, mock.patch(
-            'fdroidserver.common.getvcs', return_value=vcs
-        ):
-            _ignored  # silence the linters
-            mock_path.is_file.return_falue = True
-            vername, vercode, _tag = fdroidserver.checkupdates.check_tags(app, None)
-        self.assertEqual(vername, '1.1.9')
-        self.assertEqual(vercode, 10109)
-
-        app.UpdateCheckData = r'b.txt|c(.*)|.|v(.*)'
-        with mock.patch(
-            'pathlib.Path.read_text', lambda a: 'v1.1.0\nc10109'
-        ) as _ignored, mock.patch.object(Path, 'is_file') as mock_path, mock.patch(
-            'fdroidserver.common.getvcs', return_value=vcs
-        ):
-            _ignored  # silence the linters
-            mock_path.is_file.return_falue = True
-            vername, vercode, _tag = fdroidserver.checkupdates.check_tags(app, None)
-        self.assertEqual(vername, '1.1.0')
-        self.assertEqual(vercode, 10109)
-
-        app.UpdateCheckData = r'b.txt|c(.*)||'
-        with mock.patch(
-            'pathlib.Path.read_text', lambda a: 'v1.1.9\nc10109'
-        ) as _ignored, mock.patch.object(Path, 'is_file') as mock_path, mock.patch(
-            'fdroidserver.common.getvcs', return_value=vcs
-        ):
-            _ignored  # silence the linters
-            mock_path.is_file.return_falue = True
-            vername, vercode, _tag = fdroidserver.checkupdates.check_tags(app, None)
-        self.assertEqual(vername, '1.1.9')
-        self.assertEqual(vercode, 10109)
-
-        vcs.latesttags.return_value = ['Android-1.1.0', '1.1.8']
-        app.UpdateCheckData = r'b.txt|c(.*)||Android-([\d.]+)'
-        with mock.patch(
-            'pathlib.Path.read_text', lambda a: 'v1.1.9\nc10109'
-        ) as _ignored, mock.patch.object(Path, 'is_file') as mock_path, mock.patch(
-            'fdroidserver.common.getvcs', return_value=vcs
-        ):
-            _ignored  # silence the linters
-            mock_path.is_file.return_falue = True
-            vername, vercode, _tag = fdroidserver.checkupdates.check_tags(app, None)
-        self.assertEqual(vername, '1.1.0')
-        self.assertEqual(vercode, 10109)
-
-        app.UpdateCheckData = r'|\+(\d+)||Android-([\d.]+)'
-        vcs.latesttags.return_value = ['Android-1.1.0+1']
-        with mock.patch('fdroidserver.common.getvcs', return_value=vcs):
-            vername, vercode, _tag = fdroidserver.checkupdates.check_tags(app, None)
-        self.assertEqual(vername, '1.1.0')
-        self.assertEqual(vercode, 1)
-
-        app.UpdateCheckData = '|||'
-        vcs.latesttags.return_value = ['2']
-        with mock.patch('fdroidserver.common.getvcs', return_value=vcs):
-            vername, vercode, _tag = fdroidserver.checkupdates.check_tags(app, None)
-        self.assertEqual(vername, '2')
-        self.assertEqual(vercode, 2)
-
-    def _get_test_git_repos(self):
-        testdir = self.testdir.name
-        os.chdir(testdir)
-        os.mkdir('metadata')
-        for f in (basedir / 'metadata').glob('*.yml'):
-            shutil.copy(f, 'metadata')
-        git_repo = git.Repo.init(testdir)
-        with git_repo.config_writer() as cw:
-            cw.set_value('user', 'name', 'Foo Bar')
-            cw.set_value('user', 'email', 'foo@bar.com')
-        git_repo.git.add(all=True)
-        git_repo.index.commit("all metadata files")
-
-        git_remote_upstream = os.path.join(testdir, 'git_remote_upstream')
-        upstream_repo = git.Repo.init(git_remote_upstream, bare=True)
-        with upstream_repo.config_writer() as cw:
-            cw.set_value('receive', 'advertisePushOptions', True)
-        git_repo.create_remote('upstream', 'file://' + git_remote_upstream)
-
-        git_remote_origin = os.path.join(testdir, 'git_remote_origin')
-        origin_repo = git.Repo.init(git_remote_origin, bare=True)
-        with origin_repo.config_writer() as cw:
-            cw.set_value('receive', 'advertisePushOptions', True)
-        git_repo.create_remote('origin', 'file://' + git_remote_origin)
-
-        return git_repo, origin_repo, upstream_repo
-
-    def test_get_changes_versus_ref(self):
-        def _make_commit_new_app(git_repo, metadata_file):
-            app = fdroidserver.metadata.App()
-            fdroidserver.metadata.write_metadata(metadata_file, app)
-            git_repo.git.add(metadata_file)
-            git_repo.git.commit(metadata_file, message=f'changed {metadata_file}')
-
-        git_repo, origin_repo, upstream_repo = self._get_test_git_repos()
-        for remote in git_repo.remotes:
-            remote.push(git_repo.active_branch)
-        appid = 'com.testvalue'
-        metadata_file = f'metadata/{appid}.yml'
-
-        # set up remote branch with change to app
-        git_repo.git.checkout('-b', appid)
-        _make_commit_new_app(git_repo, metadata_file)
-        git_repo.remotes.origin.push(appid)
-
-        # reset local branch and there should be differences
-        upstream_main = fdroidserver.checkupdates.get_upstream_main_branch(git_repo)
-        git_repo.git.reset(upstream_main)
-        self.assertTrue(
-            fdroidserver.checkupdates.get_changes_versus_ref(
-                git_repo, f'origin/{appid}', metadata_file
-            )
-        )
-        # make new commit that matches the previous, different commit, no diff
-        _make_commit_new_app(git_repo, metadata_file)
-        self.assertFalse(
-            fdroidserver.checkupdates.get_changes_versus_ref(
-                git_repo, f'origin/{appid}', metadata_file
-            )
-        )
-
-    def test_push_commits(self):
-        git_repo, origin_repo, upstream_repo = self._get_test_git_repos()
-        for remote in git_repo.remotes:
-            remote.push(git_repo.active_branch)
-        self.assertEqual(git_repo.head, upstream_repo.head)
-        self.assertEqual(origin_repo.head, upstream_repo.head)
-        # pretend that checkupdates ran but didn't create any new commits
-        fdroidserver.checkupdates.push_commits()
-
-        appid = 'org.adaway'
-        self.assertNotIn(appid, git_repo.branches)
-        self.assertNotIn(appid, origin_repo.branches)
-        self.assertNotIn(appid, upstream_repo.branches)
-        self.assertNotIn('checkupdates', git_repo.branches)
-
-        # now make commit
-        app = fdroidserver.metadata.read_metadata({appid: -1})[appid]
-        build = fdroidserver.metadata.Build()
-        build.versionName = 'fake'
-        build.versionCode = 999999999
-        app.Builds.append(build)
-        metadata_file = 'metadata/%s.yml' % appid
-        fdroidserver.metadata.write_metadata(metadata_file, app)
-        git_repo.index.add(metadata_file)
-        git_repo.index.commit('changed ' + appid)
-
-        # and push the new commit to the dynamic branch
-        fdroidserver.checkupdates.push_commits()
-        self.assertIn(appid, git_repo.branches)
-        self.assertIn(appid, git_repo.remotes.origin.refs)
-        self.assertNotIn('checkupdates', git_repo.branches)
-        self.assertNotIn(appid, git_repo.remotes.upstream.refs)
-
-    def test_push_commits_verbose(self):
-        class Options:
-            verbose = True
-
-        fdroidserver.checkupdates.options = Options
-        repos = self._get_test_git_repos()
-        git_repo = repos[0]
-        git_repo.remotes.origin.push(git_repo.active_branch)
-        git_repo.remotes.upstream.push(git_repo.active_branch)
-
-        # make commit
-        appid = 'org.adaway'
-        app = fdroidserver.metadata.read_metadata({appid: -1})[appid]
-        build = fdroidserver.metadata.Build()
-        build.versionName = 'fake'
-        build.versionCode = 999999999
-        app.Builds.append(build)
-        metadata_file = 'metadata/%s.yml' % appid
-        fdroidserver.metadata.write_metadata(metadata_file, app)
-        git_repo.index.add(metadata_file)
-        git_repo.index.commit('changed ' + appid)
-
-        # and push the new commit to the dynamic branch
-        fdroidserver.checkupdates.push_commits()
-        self.assertIn(appid, git_repo.branches)
-        self.assertIn(appid, git_repo.remotes.origin.refs)
-
-    def test_prune_empty_appid_branches(self):
-        git_repo, origin_repo, upstream_repo = self._get_test_git_repos()
-        for remote in git_repo.remotes:
-            remote.push(git_repo.active_branch)
-        self.assertEqual(git_repo.head, upstream_repo.head)
-        self.assertEqual(origin_repo.head, upstream_repo.head)
-
-        appid = 'org.adaway'
-        git_repo.create_head(appid, force=True)
-        git_repo.remotes.origin.push(appid, force=True)
-        self.assertIn(appid, git_repo.branches)
-        self.assertIn(appid, origin_repo.branches)
-        self.assertIn(appid, git_repo.remotes.origin.refs)
-        self.assertNotIn(appid, git_repo.remotes.upstream.refs)
-        fdroidserver.checkupdates.prune_empty_appid_branches()
-        self.assertNotIn(appid, origin_repo.branches)
-        self.assertNotIn(appid, git_repo.remotes.origin.refs)
-        self.assertNotIn(appid, git_repo.remotes.upstream.refs)
-
-    @mock.patch('sys.exit')
-    @mock.patch('fdroidserver.metadata.read_metadata')
-    def test_merge_requests_flag(self, read_metadata, sys_exit):
-        def _sys_exit(return_code=0):
-            self.assertNotEqual(return_code, 0)
-            raise fdroidserver.exception.FDroidException('sys.exit() ran')
-
-        def _read_metadata(a=None, b=None):
-            raise StopIteration('read_metadata() ran, test is successful')
-
-        appid = 'com.example'
-        # read_metadata.return_value = dict()  # {appid: dict()}
-        read_metadata.side_effect = _read_metadata
-        sys_exit.side_effect = _sys_exit
-
-        # set up clean git repo
-        os.chdir(self.testdir.name)
-        git_repo = git.Repo.init()
-        open('foo', 'w').close()
-        git_repo.git.add(all=True)
-        git_repo.index.commit("all files")
-
-        with mock.patch('sys.argv', ['fdroid checkupdates', '--merge-request']):
-            with self.assertRaises(fdroidserver.exception.FDroidException):
-                fdroidserver.checkupdates.main()
-        sys_exit.assert_called()
-
-        sys_exit.reset_mock()
-        with mock.patch('sys.argv', ['fdroid checkupdates', '--merge-request', appid]):
-            with self.assertRaises(StopIteration):
-                fdroidserver.checkupdates.main()
-        sys_exit.assert_not_called()
-
-    @unittest.skipIf(
-        platform.system() == 'Darwin',
-        'It is difficult to configure the base system for this test.',
-    )
-    def test_get_upstream_main_branch(self):
-        os.chdir(self.testdir.name)
-        testvalue = 'foo'
-        git_repo = git.Repo.init('.', initial_branch=testvalue)
-
-        open('foo', 'w').close()
-        git_repo.git.add(all=True)
-        git_repo.index.commit("all files")
-        git_repo.create_remote('upstream', os.getcwd()).fetch()
-
-        branch = fdroidserver.checkupdates.get_upstream_main_branch(git_repo)
-        self.assertEqual(
-            f'upstream/{testvalue}',
-            branch,
-            f'The default branch should be called {testvalue}!',
-        )
-
-    def test_get_upstream_main_branch_git_config(self):
-        os.chdir(self.testdir.name)
-        testvalue = 'foo'
-        git_repo = git.Repo.init('.', initial_branch=testvalue)
-        with git_repo.config_writer() as cw:
-            cw.set_value('init', 'defaultBranch', testvalue)
-
-        open('foo', 'w').close()
-        git_repo.git.add(all=True)
-        git_repo.index.commit("all files")
-        git_repo.git.branch('somethingelse')  # make another remote branch
-        git_repo.create_remote('upstream', os.getcwd()).fetch()
-
-        branch = fdroidserver.checkupdates.get_upstream_main_branch(git_repo)
-        self.assertEqual(
-            f'upstream/{testvalue}',
-            branch,
-            f'The default branch should be called {testvalue}!',
-        )
-
-    def test_checkout_appid_branch_does_not_exist(self):
-        appid = 'com.example'
-        os.chdir(self.testdir.name)
-        git_repo = git.Repo.init('.')
-        open('foo', 'w').close()
-        git_repo.git.add(all=True)
-        git_repo.index.commit("all files")
-        # --merge-request assumes remotes called 'origin' and 'upstream'
-        git_repo.create_remote('origin', os.getcwd()).fetch()
-        git_repo.create_remote('upstream', os.getcwd()).fetch()
-        self.assertNotIn(appid, git_repo.heads)
-        fdroidserver.checkupdates.checkout_appid_branch(appid)
-        self.assertIn(appid, git_repo.heads)
-
-    def test_checkout_appid_branch_exists(self):
-        appid = 'com.example'
-
-        upstream_dir = os.path.join(self.testdir.name, 'upstream_git')
-        os.mkdir(upstream_dir)
-        upstream_repo = git.Repo.init(upstream_dir)
-        (Path(upstream_dir) / 'README').write_text('README')
-        upstream_repo.git.add(all=True)
-        upstream_repo.index.commit("README")
-        upstream_repo.create_head(appid)
-
-        local_dir = os.path.join(self.testdir.name, 'local_git')
-        git.Repo.clone_from(upstream_dir, local_dir)
-        os.chdir(local_dir)
-        git_repo = git.Repo.init('.')
-        # --merge-request assumes remotes called 'origin' and 'upstream'
-        git_repo.create_remote('upstream', upstream_dir).fetch()
-
-        self.assertNotIn(appid, git_repo.heads)
-        fdroidserver.checkupdates.checkout_appid_branch(appid)
-        self.assertIn(appid, git_repo.heads)
-
-    def test_checkout_appid_branch_skip_bot_commit(self):
-        appid = 'com.example'
-
-        upstream_dir = os.path.join(self.testdir.name, 'upstream_git')
-        os.mkdir(upstream_dir)
-        upstream_repo = git.Repo.init(upstream_dir)
-        (Path(upstream_dir) / 'README').write_text('README')
-        upstream_repo.git.add(all=True)
-        upstream_repo.index.commit("README")
-        upstream_repo.create_head(appid)
-
-        local_dir = os.path.join(self.testdir.name, 'local_git')
-        git.Repo.clone_from(upstream_dir, local_dir)
-        os.chdir(local_dir)
-        git_repo = git.Repo.init('.')
-        # --merge-request assumes remotes called 'origin' and 'upstream'
-        git_repo.create_remote('upstream', upstream_dir).fetch()
-
-        os.mkdir('metadata')
-        git_repo.create_head(appid, f'origin/{appid}', force=True)
-        git_repo.git.checkout(appid)
-
-        # fake checkupdates-bot commit
-        Path(f'metadata/{appid}.yml').write_text('AutoName: Example\n')
-        with git_repo.config_writer() as cw:
-            cw.set_value('user', 'email', fdroidserver.checkupdates.BOT_EMAIL)
-        git_repo.git.add(all=True)
-        git_repo.index.commit("Example")
-
-        # set up starting from remote branch
-        git_repo.remotes.origin.push(appid)
-        upstream_main = fdroidserver.checkupdates.get_upstream_main_branch(git_repo)
-        git_repo.git.checkout(upstream_main.split('/')[1])
-        git_repo.delete_head(appid, force=True)
-
-        self.assertTrue(
-            fdroidserver.checkupdates.checkout_appid_branch(appid),
-            'This should have been true since there are only bot commits.',
-        )
-
-    def test_checkout_appid_branch_skip_human_edits(self):
-        appid = 'com.example'
-
-        upstream_dir = os.path.join(self.testdir.name, 'upstream_git')
-        os.mkdir(upstream_dir)
-        upstream_repo = git.Repo.init(upstream_dir)
-        (Path(upstream_dir) / 'README').write_text('README')
-        upstream_repo.git.add(all=True)
-        upstream_repo.index.commit("README")
-        upstream_repo.create_head(appid)
-
-        local_dir = os.path.join(self.testdir.name, 'local_git')
-        git.Repo.clone_from(upstream_dir, local_dir)
-        os.chdir(local_dir)
-        git_repo = git.Repo.init('.')
-        # --merge-request assumes remotes called 'origin' and 'upstream'
-        git_repo.create_remote('upstream', upstream_dir).fetch()
-
-        os.mkdir('metadata')
-        git_repo.create_head(appid, f'origin/{appid}', force=True)
-        git_repo.git.checkout(appid)
-
-        with git_repo.config_writer() as cw:
-            cw.set_value('user', 'email', fdroidserver.checkupdates.BOT_EMAIL)
-
-        # fake checkupdates-bot commit
-        Path(f'metadata/{appid}.yml').write_text('AutoName: Example\n')
-        git_repo.git.add(all=True)
-        git_repo.index.commit("Example")
-
-        # fake commit added on top by a human
-        Path(f'metadata/{appid}.yml').write_text('AutoName: Example\nName: Foo\n')
-        with git_repo.config_writer() as cw:
-            cw.set_value('user', 'email', 'human@bar.com')
-        git_repo.git.add(all=True)
-        git_repo.index.commit("Example")
-
-        # set up starting from remote branch
-        git_repo.remotes.origin.push(appid)
-        upstream_main = fdroidserver.checkupdates.get_upstream_main_branch(git_repo)
-        git_repo.git.reset(upstream_main.split('/')[1])
-
-        self.assertFalse(
-            fdroidserver.checkupdates.checkout_appid_branch(appid),
-            'This should have been false since there are human edits.',
-        )
-
-    @mock.patch('git.remote.Remote.push')
-    @mock.patch('sys.exit')
-    @mock.patch('fdroidserver.common.read_app_args')
-    @mock.patch('fdroidserver.checkupdates.checkupdates_app')
-    def test_merge_requests_branch(
-        self, checkupdates_app, read_app_args, sys_exit, push
-    ):
-        def _sys_exit(return_code=0):
-            self.assertEqual(return_code, 0)
-
-        def _checkupdates_app(app, auto, commit):  # pylint: disable=unused-argument
-            os.mkdir('metadata')
-            Path(f'metadata/{app["packageName"]}.yml').write_text('AutoName: Example')
-            git_repo.git.add(all=True)
-            git_repo.index.commit("Example")
-
-        def _read_app_args(apps=[]):
-            appid = apps[0]
-            return {appid: {'packageName': appid}}
-
-        appid = 'com.example'
-        read_app_args.side_effect = _read_app_args
-        checkupdates_app.side_effect = _checkupdates_app
-        sys_exit.side_effect = _sys_exit
-
-        # set up clean git repo
-        os.chdir(self.testdir.name)
-        git_repo = git.Repo.init()
-        open('foo', 'w').close()
-        git_repo.git.add(all=True)
-        git_repo.index.commit("all files")
-        # --merge-request assumes remotes called 'origin' and 'upstream'
-        git_repo.create_remote('origin', os.getcwd()).fetch()
-        git_repo.create_remote('upstream', os.getcwd()).fetch()
-
-        self.assertNotIn(appid, git_repo.heads)
-        with mock.patch('sys.argv', ['fdroid checkupdates', '--merge-request', appid]):
-            fdroidserver.checkupdates.main()
-        push.assert_called_once()
-        sys_exit.assert_called_once()
-        self.assertIn(appid, git_repo.heads)
-
-    def test_push_commits_invalid_branch_name(self):
-        git_repo, origin_repo, upstream_repo = self._get_test_git_repos()
-        for remote in git_repo.remotes:
-            remote.push(git_repo.active_branch)
-        self.assertEqual(git_repo.head, upstream_repo.head)
-        self.assertEqual(origin_repo.head, upstream_repo.head)
-        # pretend that checkupdates ran but didn't create any new commits
-        fdroidserver.checkupdates.push_commits('')
diff --git a/tests/test_common.py b/tests/test_common.py
deleted file mode 100755
index 3110b446..00000000
--- a/tests/test_common.py
+++ /dev/null
@@ -1,3653 +0,0 @@
-#!/usr/bin/env python3
-
-import difflib
-import glob
-import gzip
-import importlib
-import json
-import logging
-import os
-import re
-import shutil
-import subprocess
-import sys
-import tempfile
-import textwrap
-import time
-import unittest
-from argparse import ArgumentParser
-from datetime import datetime, timezone
-from pathlib import Path
-from unittest import mock
-from zipfile import BadZipFile, ZipFile
-
-import git
-import ruamel.yaml
-
-import fdroidserver
-import fdroidserver.common
-import fdroidserver.metadata
-import fdroidserver.signindex
-from fdroidserver._yaml import config_dump, yaml, yaml_dumper
-from fdroidserver.common import ANTIFEATURES_CONFIG_NAME, CATEGORIES_CONFIG_NAME
-from fdroidserver.exception import (
-    FDroidException,
-    MetaDataException,
-    VCSException,
-    VerificationException,
-)
-from fdroidserver.looseversion import LooseVersion
-
-from .shared_test_code import TmpCwd, mkdir_testfiles, mkdtemp
-
-basedir = Path(__file__).parent
-
-
-def _mock_common_module_options_instance():
-    """Helper method to deal with difficult visibility of the module-level options."""
-    fdroidserver.common.options = mock.Mock()
-    fdroidserver.common.options.verbose = False
-
-
-class SetUpTearDownMixin:
-    """A mixin with no tests in it for shared setUp and tearDown."""
-
-    def setUp(self):
-        logging.basicConfig(level=logging.DEBUG)
-        logger = logging.getLogger('androguard.axml')
-        logger.setLevel(logging.INFO)  # tame the axml debug messages
-        os.chdir(basedir)
-
-        self.verbose = '-v' in sys.argv or '--verbose' in sys.argv
-        fdroidserver.common.set_console_logging(self.verbose)
-
-        # these are declared as None at the top of the module file
-        fdroidserver.common.config = None
-        fdroidserver.common.options = None
-        fdroidserver.metadata.srclibs = None
-
-        self.testdir = mkdir_testfiles(basedir, self)
-
-    def tearDown(self):
-        fdroidserver.common.config = None
-        fdroidserver.common.options = None
-        os.chdir(basedir)
-        if os.path.exists(self.testdir):
-            shutil.rmtree(self.testdir)
-
-
-class CommonTest(SetUpTearDownMixin, unittest.TestCase):
-    '''fdroidserver/common.py'''
-
-    def test_yaml_1_2(self):
-        """Return a ruamel.yaml instance that supports YAML 1.2
-
-        There should be no "Norway Problem", and other things like this:
-        https://yaml.org/spec/1.2.2/ext/changes/
-
-        YAML 1.2 says "underlines _ cannot be used within numerical
-        values", but ruamel.yaml seems to ignore that. 1_0 should be a
-        string, but it is read as a 10.
-
-        """
-        os.chdir(self.testdir)
-        yaml12file = Path('YAML 1.2.yml')
-        yaml12file.write_text('[true, no, 0b010, 010, 0o10, "\\/"]', encoding='utf-8')
-        with yaml12file.open() as fp:
-            self.assertEqual(
-                [True, 'no', 2, 10, 8, '/'],
-                yaml.load(fp),
-            )
-
-    def test_parse_human_readable_size(self):
-        for k, v in (
-            (9827, 9827),
-            (123.456, 123),
-            ('123b', 123),
-            ('1.2', 1),
-            ('10.43 KiB', 10680),
-            ('11GB', 11000000000),
-            ('59kb', 59000),
-            ('343.1 mb', 343100000),
-            ('99.9GiB', 107266808217),
-            ('1MB', 1000000),
-        ):
-            self.assertEqual(fdroidserver.common.parse_human_readable_size(k), v)
-        for v in ((12, 123), '0xfff', [], None, '12,123', '123GG', '982374bb', self):
-            with self.assertRaises(ValueError):
-                fdroidserver.common.parse_human_readable_size(v)
-
-    def test_assert_config_keystore(self):
-        with tempfile.TemporaryDirectory() as tmpdir, TmpCwd(tmpdir):
-            with self.assertRaises(FDroidException):
-                fdroidserver.common.assert_config_keystore({})
-
-        with tempfile.TemporaryDirectory() as tmpdir, TmpCwd(tmpdir):
-            c = {
-                'repo_keyalias': 'localhost',
-                'keystore': 'keystore.jks',
-                'keystorepass': '12345',
-                'keypass': '12345',
-            }
-            with open('keystore.jks', 'w'):
-                pass
-            fdroidserver.common.assert_config_keystore(c)
-
-    def _set_build_tools(self):
-        build_tools = os.path.join(
-            fdroidserver.common.config['sdk_path'], 'build-tools'
-        )
-        if os.path.exists(build_tools):
-            for f in sorted(os.listdir(build_tools), reverse=True):
-                versioned = os.path.join(build_tools, f)
-                if os.path.isdir(versioned) and os.path.isfile(
-                    os.path.join(versioned, 'apksigner')
-                ):
-                    break
-            return True
-        else:
-            print('no build-tools found: ' + build_tools)
-            return False
-
-    def _find_all(self):
-        tools = ['aapt', 'adb', 'jarsigner']
-        if os.path.exists(os.path.join(os.getenv('ANDROID_HOME'), 'tools', 'android')):
-            tools.append('android')
-        for cmd in tools:
-            try:
-                path = fdroidserver.common.find_sdk_tools_cmd(cmd)
-                self.assertTrue(os.path.exists(path))
-                self.assertTrue(os.path.isfile(path))
-            except fdroidserver.exception.FDroidException:
-                pass
-
-    @unittest.skipUnless(os.getenv('ANDROID_HOME'), "Needs ANDROID_HOME env var")
-    def test_find_sdk_tools_cmd(self):
-        fdroidserver.common.config = dict()
-        # TODO add this once everything works without sdk_path set in config
-        # self._find_all()
-        sdk_path = os.getenv('ANDROID_HOME')
-        if os.path.exists(sdk_path):
-            fdroidserver.common.config['sdk_path'] = sdk_path
-            build_tools = os.path.join(sdk_path, 'build-tools')
-            if self._set_build_tools() or os.path.exists('/usr/bin/aapt'):
-                self._find_all()
-            else:
-                print('no build-tools found: ' + build_tools)
-
-    def test_find_java_root_path(self):
-        os.chdir(self.testdir)
-
-        all_pathlists = [
-            (
-                [  # Debian
-                    '/usr/lib/jvm/java-1.5.0-gcj-5-amd64',
-                    '/usr/lib/jvm/java-8-openjdk-amd64',
-                    '/usr/lib/jvm/java-1.8.0-openjdk-amd64',
-                ],
-                '/usr/lib/jvm/java-8-openjdk-amd64',
-            ),
-            (
-                [  # OSX
-                    '/Library/Java/JavaVirtualMachines/jdk1.8.0_202.jdk',
-                    '/Library/Java/JavaVirtualMachines/jdk1.8.0_45.jdk',
-                    '/System/Library/Java/JavaVirtualMachines/jdk1.7.0_80.jdk',
-                ],
-                '/Library/Java/JavaVirtualMachines/jdk1.8.0_202.jdk',
-            ),
-        ]
-
-        for pathlist, choice in all_pathlists:
-            # strip leading / to make relative paths to test without root
-            pathlist = [p[1:] for p in pathlist]
-
-            # create test file used in common._add_java_paths_to_config()
-            for p in pathlist:
-                if p.startswith('/System') or p.startswith('/Library'):
-                    _dir = os.path.join(p, 'Contents', 'Home', 'bin')
-                else:
-                    _dir = os.path.join(p, 'bin')
-                os.makedirs(_dir)
-                open(os.path.join(_dir, 'javac'), 'w').close()
-
-            config = dict()
-            config['java_paths'] = dict()
-            fdroidserver.common._add_java_paths_to_config(pathlist, config)
-            self.assertEqual(config['java_paths']['8'], choice[1:])
-
-    @unittest.skipIf(sys.byteorder == 'big', 'androguard is not ported to big-endian')
-    def test_is_debuggable_or_testOnly(self):
-        config = dict()
-        fdroidserver.common.fill_config_defaults(config)
-        fdroidserver.common.config = config
-
-        # these are set debuggable
-        for apkfile in ('urzip.apk', 'urzip-badsig.apk', 'urzip-badcert.apk'):
-            self.assertTrue(
-                fdroidserver.common.is_debuggable_or_testOnly(str(basedir / apkfile)),
-                "debuggable APK state was not properly parsed!",
-            )
-
-        # these are set NOT debuggable
-        testfiles = 'urzip-release.apk', 'urzip-release-unsigned.apk', 'v2.only.sig_2.apk'
-        for apkfile in testfiles:
-            self.assertFalse(
-                fdroidserver.common.is_debuggable_or_testOnly(apkfile),
-                "debuggable APK state was not properly parsed!",
-            )
-
-    VALID_STRICT_PACKAGE_NAMES = [
-        "An.stop",
-        "SpeedoMeterApp.main",
-        "a2dp.Vol",
-        "au.com.darkside.XServer",
-        "click.dummer.UartSmartwatch",
-        "com.Bisha.TI89EmuDonation",
-        "com.MarcosDiez.shareviahttp",
-        "com.Pau.ImapNotes2",
-        "com.app.Zensuren",
-        "com.darshancomputing.BatteryIndicator",
-        "com.geecko.QuickLyric",
-        "com.genonbeta.TrebleShot",
-        "com.gpl.rpg.AndorsTrail",
-        "com.hobbyone.HashDroid",
-        "com.moez.QKSMS",
-        "com.platypus.SAnd",
-        "com.prhlt.aemus.Read4SpeechExperiments",
-        "de.syss.MifareClassicTool",
-        "org.fdroid.fdroid",
-        "org.f_droid.fdr0ID",
-    ]
-
-    def test_is_valid_package_name(self):
-        for name in self.VALID_STRICT_PACKAGE_NAMES + [
-            "_SpeedoMeterApp.main",
-            "05041684efd9b16c2888b1eddbadd0359f655f311b89bdd1737f560a10d20fb8",
-        ]:
-            self.assertTrue(
-                fdroidserver.common.is_valid_package_name(name),
-                "{0} should be a valid package name".format(name),
-            )
-        for name in [
-            "0rg.fdroid.fdroid",
-            ".f_droid.fdr0ID",
-            "trailingdot.",
-            "org.fdroid/fdroid",
-            "/org.fdroid.fdroid",
-        ]:
-            self.assertFalse(
-                fdroidserver.common.is_valid_package_name(name),
-                "{0} should not be a valid package name".format(name),
-            )
-
-    def test_is_strict_application_id(self):
-        """see also tests/valid-package-names/"""
-        for name in self.VALID_STRICT_PACKAGE_NAMES:
-            self.assertTrue(
-                fdroidserver.common.is_strict_application_id(name),
-                "{0} should be a strict application id".format(name),
-            )
-        for name in [
-            "0rg.fdroid.fdroid",
-            ".f_droid.fdr0ID",
-            "oneword",
-            "trailingdot.",
-            "cafebabe",
-            "org.fdroid/fdroid",
-            "/org.fdroid.fdroid",
-            "_SpeedoMeterApp.main",
-            "05041684efd9b16c2888b1eddbadd0359f655f311b89bdd1737f560a10d20fb8",
-        ]:
-            self.assertFalse(
-                fdroidserver.common.is_strict_application_id(name),
-                "{0} should not be a strict application id".format(name),
-            )
-
-    def test_prepare_sources(self):
-        testint = 99999999
-        teststr = 'FAKE_STR_FOR_TESTING'
-
-        shutil.copytree(
-            os.path.join(basedir, 'source-files'),
-            os.path.join(self.testdir, 'source-files'),
-        )
-
-        fdroidclient_testdir = os.path.join(
-            self.testdir, 'source-files', 'fdroid', 'fdroidclient'
-        )
-
-        config = dict()
-        config['sdk_path'] = os.getenv('ANDROID_HOME')
-        config['ndk_paths'] = {'r10d': os.getenv('ANDROID_NDK_HOME')}
-        fdroidserver.common.config = config
-        app = fdroidserver.metadata.App()
-        app.id = 'org.fdroid.froid'
-        build = fdroidserver.metadata.Build()
-        build.commit = 'master'
-        build.forceversion = True
-        build.forcevercode = True
-        build.gradle = ['yes']
-        build.target = 'android-' + str(testint)
-        build.versionName = teststr
-        build.versionCode = testint
-
-        class FakeVcs:
-            # no need to change to the correct commit here
-            def gotorevision(self, rev, refresh=True):
-                pass
-
-            # no srclib info needed, but it could be added...
-            def getsrclib(self):
-                return None
-
-            def deinitsubmodules(self):
-                pass
-
-        fdroidserver.common.prepare_source(FakeVcs(), app, build,
-                                           fdroidclient_testdir, fdroidclient_testdir, fdroidclient_testdir)
-
-        fdroidclient_testdir = Path(fdroidclient_testdir)
-        build_gradle = fdroidclient_testdir / 'build.gradle'
-        filedata = build_gradle.read_text(encoding='utf-8')
-        self.assertIsNotNone(
-            re.search(r"\s+compileSdkVersion %s\s+" % testint, filedata)
-        )
-
-        androidmanifest_xml = fdroidclient_testdir / 'AndroidManifest.xml'
-        filedata = androidmanifest_xml.read_text(encoding='utf-8')
-        self.assertIsNone(re.search('android:debuggable', filedata))
-        self.assertIsNotNone(
-            re.search('android:versionName="%s"' % build.versionName, filedata)
-        )
-        self.assertIsNotNone(
-            re.search('android:versionCode="%s"' % build.versionCode, filedata)
-        )
-
-    @unittest.skipIf(os.name == 'nt', "`fdroid build` assumes POSIX scripting")
-    def test_prepare_sources_with_prebuild_subdir(self):
-        app_build_dir = os.path.join(self.testdir, 'build', 'com.example')
-        shutil.copytree(
-            basedir / 'source-files' / 'fdroid' / 'fdroidclient',
-            app_build_dir,
-        )
-
-        subdir = 'baz/bar'
-        subdir_path = Path(app_build_dir) / subdir
-        subdir_path.mkdir(parents=True, exist_ok=True)
-        build_gradle = subdir_path / 'build.gradle'
-        build_gradle.write_text('// just a test placeholder', encoding='utf-8')
-
-        config = dict()
-        fdroidserver.common.fill_config_defaults(config)
-        fdroidserver.common.config = config
-        _mock_common_module_options_instance()
-
-        srclibname = 'FakeSrcLib'
-        srclib_testdir = os.path.join(self.testdir, 'build', 'srclib')
-        os.makedirs(os.path.join(srclib_testdir, srclibname, 'testdirshouldexist'))
-        fdroidserver.metadata.srclibs = {
-            srclibname: {
-                'RepoType': 'git',
-                'Repo': 'https://example.com/foo/fakesrclib',
-                'Subdir': None,
-                'Prepare': None,
-            }
-        }
-
-        app = fdroidserver.metadata.App()
-        app.id = 'app.has.srclibs'
-        build = fdroidserver.metadata.Build()
-        build.commit = 'master'
-        build.gradle = ['yes']
-        build.prebuild = ['test -d $$FakeSrcLib$$/testdirshouldexist']  # actual test condition
-        build.srclibs = [srclibname + '@1.2.3']
-        build.subdir = subdir
-        build.versionCode = 0xCAFE
-        build.versionName = 'vCAFE'
-
-        class FakeVcs:
-            # no need to change to the correct commit here
-            def gotorevision(self, rev, refresh=True):
-                pass
-
-            # no srclib info needed, but it could be added...
-            def getsrclib(self):
-                return None
-
-            def deinitsubmodules(self):
-                pass
-
-        fdroidserver.common.prepare_source(FakeVcs(), app, build,
-                                           app_build_dir, srclib_testdir, app_build_dir,
-                                           onserver=True, refresh=False)  # do not clone in this test
-
-    def test_prepare_sources_refresh(self):
-        _mock_common_module_options_instance()
-        packageName = 'org.fdroid.ci.test.app'
-        os.chdir(self.testdir)
-        os.mkdir('build')
-        os.mkdir('metadata')
-
-        # use a local copy if available to avoid hitting the network
-        tmprepo = os.path.join(basedir, 'tmp', 'importer')
-        if os.path.exists(tmprepo):
-            git_url = tmprepo
-        else:
-            git_url = 'https://gitlab.com/fdroid/ci-test-app.git'
-
-        metadata = dict()
-        metadata['Description'] = 'This is just a test app'
-        metadata['RepoType'] = 'git'
-        metadata['Repo'] = git_url
-        with open(os.path.join('metadata', packageName + '.yml'), 'w') as fp:
-            yaml_dumper.dump(metadata, fp)
-
-        gitrepo = os.path.join(self.testdir, 'build', packageName)
-        vcs0 = fdroidserver.common.getvcs('git', git_url, gitrepo)
-        vcs0.gotorevision('0.3', refresh=True)
-        vcs1 = fdroidserver.common.getvcs('git', git_url, gitrepo)
-        vcs1.gotorevision('0.3', refresh=False)
-
-    def test_setup_vcs_srclib(self):
-        app = fdroidserver.metadata.App(
-            {
-                'RepoType': 'srclib',
-                'Repo': 'TransportsRennes',
-            }
-        )
-        srclib = {
-            'RepoType': 'git',
-            'Repo': 'https://github.com/ybonnel/TransportsRennes',
-        }
-        fdroidserver.metadata.srclibs = {'TransportsRennes': srclib}
-        vcs, build_dir = fdroidserver.common.setup_vcs(app)
-        self.assertIsNotNone(vcs)
-        self.assertEqual(build_dir, Path('build/srclib/TransportsRennes'))
-
-    def test_getvcs_srclib(self):
-        vcstype = 'srclib'
-        remote = 'TransportsRennes'
-        local = 'build/srclib/' + remote
-        fdroidserver.metadata.srclibs = {
-            remote: {
-                'RepoType': 'git',
-                'Repo': 'https://github.com/ybonnel/TransportsRennes',
-            }
-        }
-        self.assertIsNotNone(fdroidserver.common.getvcs(vcstype, remote, local))
-        self.assertIsNotNone(fdroidserver.common.getvcs(vcstype, Path(remote), local))
-        self.assertIsNotNone(fdroidserver.common.getvcs(vcstype, remote, Path(local)))
-        self.assertIsNotNone(fdroidserver.common.getvcs(
-            vcstype, Path(remote), Path(local)
-        ))
-        with self.assertRaises(VCSException):
-            fdroidserver.common.getvcs(vcstype, remote, 'bad')
-        with self.assertRaises(VCSException):
-            fdroidserver.common.getvcs(vcstype, remote, Path('bad'))
-        with self.assertRaises(VCSException):
-            fdroidserver.common.getvcs(vcstype, Path(remote), 'bad')
-        with self.assertRaises(VCSException):
-            fdroidserver.common.getvcs(vcstype, Path(remote), Path('bad'))
-
-    def test_fdroid_popen_stderr_redirect(self):
-        config = dict()
-        fdroidserver.common.fill_config_defaults(config)
-        fdroidserver.common.config = config
-        _mock_common_module_options_instance()
-
-        commands = ['sh', '-c', 'echo stdout message && echo stderr message 1>&2']
-
-        p = fdroidserver.common.FDroidPopen(commands)
-        self.assertEqual(p.output, 'stdout message\nstderr message\n')
-
-        p = fdroidserver.common.FDroidPopen(commands, stderr_to_stdout=False)
-        self.assertEqual(p.output, 'stdout message\n')
-
-    def test_signjar(self):
-        _mock_common_module_options_instance()
-        config = fdroidserver.common.read_config()
-        config['jarsigner'] = fdroidserver.common.find_sdk_tools_cmd('jarsigner')
-        fdroidserver.common.config = config
-        fdroidserver.signindex.config = config
-
-        sourcedir = os.path.join(basedir, 'signindex')
-        for f in ('testy.jar', 'guardianproject.jar'):
-            sourcefile = os.path.join(sourcedir, f)
-            testfile = os.path.join(self.testdir, f)
-            shutil.copy(sourcefile, self.testdir)
-            fdroidserver.signindex.sign_jar(testfile, use_old_algs=True)
-            # these should be resigned, and therefore different
-            self.assertNotEqual(
-                open(sourcefile, 'rb').read(), open(testfile, 'rb').read()
-            )
-
-    def test_verify_apk_signature(self):
-        _mock_common_module_options_instance()
-        config = fdroidserver.common.read_config()
-        fdroidserver.common.config = config
-
-        self.assertTrue(fdroidserver.common.verify_apk_signature('bad-unicode-πÇÇ现代通用字-български-عربي1.apk'))
-        if 'apksigner' in fdroidserver.common.config:  # apksigner considers MD5 signatures valid
-            self.assertTrue(fdroidserver.common.verify_apk_signature('org.bitbucket.tickytacky.mirrormirror_1.apk'))
-            self.assertTrue(fdroidserver.common.verify_apk_signature('org.bitbucket.tickytacky.mirrormirror_2.apk'))
-            self.assertTrue(fdroidserver.common.verify_apk_signature('org.bitbucket.tickytacky.mirrormirror_3.apk'))
-            self.assertTrue(fdroidserver.common.verify_apk_signature('org.bitbucket.tickytacky.mirrormirror_4.apk'))
-        else:
-            self.assertFalse(fdroidserver.common.verify_apk_signature('org.bitbucket.tickytacky.mirrormirror_1.apk'))
-            self.assertFalse(fdroidserver.common.verify_apk_signature('org.bitbucket.tickytacky.mirrormirror_2.apk'))
-            self.assertFalse(fdroidserver.common.verify_apk_signature('org.bitbucket.tickytacky.mirrormirror_3.apk'))
-            self.assertFalse(fdroidserver.common.verify_apk_signature('org.bitbucket.tickytacky.mirrormirror_4.apk'))
-        self.assertTrue(fdroidserver.common.verify_apk_signature('org.dyndns.fules.ck_20.apk'))
-        self.assertTrue(fdroidserver.common.verify_apk_signature('urzip.apk'))
-        self.assertFalse(fdroidserver.common.verify_apk_signature('urzip-badcert.apk'))
-        self.assertFalse(fdroidserver.common.verify_apk_signature('urzip-badsig.apk'))
-        self.assertTrue(fdroidserver.common.verify_apk_signature('urzip-release.apk'))
-        self.assertFalse(fdroidserver.common.verify_apk_signature('urzip-release-unsigned.apk'))
-
-    def test_verify_old_apk_signature(self):
-        _mock_common_module_options_instance()
-        config = fdroidserver.common.read_config()
-        config['jarsigner'] = fdroidserver.common.find_sdk_tools_cmd('jarsigner')
-        fdroidserver.common.config = config
-
-        try:
-            fdroidserver.common.verify_deprecated_jar_signature('bad-unicode-πÇÇ现代通用字-български-عربي1.apk')
-            fdroidserver.common.verify_deprecated_jar_signature('org.bitbucket.tickytacky.mirrormirror_1.apk')
-            fdroidserver.common.verify_deprecated_jar_signature('org.bitbucket.tickytacky.mirrormirror_2.apk')
-            fdroidserver.common.verify_deprecated_jar_signature('org.bitbucket.tickytacky.mirrormirror_3.apk')
-            fdroidserver.common.verify_deprecated_jar_signature('org.bitbucket.tickytacky.mirrormirror_4.apk')
-            fdroidserver.common.verify_deprecated_jar_signature('org.dyndns.fules.ck_20.apk')
-            fdroidserver.common.verify_deprecated_jar_signature('urzip.apk')
-            fdroidserver.common.verify_deprecated_jar_signature('urzip-release.apk')
-        except VerificationException:
-            self.fail("failed to jarsigner failed to verify an old apk")
-        self.assertRaises(VerificationException, fdroidserver.common.verify_deprecated_jar_signature, 'urzip-badcert.apk')
-        self.assertRaises(VerificationException, fdroidserver.common.verify_deprecated_jar_signature, 'urzip-badsig.apk')
-        self.assertRaises(VerificationException, fdroidserver.common.verify_deprecated_jar_signature, 'urzip-release-unsigned.apk')
-
-    def test_verify_jar_signature(self):
-        """Sign entry.jar and make sure it validates"""
-        config = fdroidserver.common.read_config()
-        config['jarsigner'] = fdroidserver.common.find_sdk_tools_cmd('jarsigner')
-        config['keystore'] = os.path.join(basedir, 'keystore.jks')
-        config['repo_keyalias'] = 'sova'
-        config['keystorepass'] = 'r9aquRHYoI8+dYz6jKrLntQ5/NJNASFBacJh7Jv2BlI='
-        config['keypass'] = 'r9aquRHYoI8+dYz6jKrLntQ5/NJNASFBacJh7Jv2BlI='
-        fdroidserver.common.config = config
-        fdroidserver.signindex.config = config
-        repo_dir = Path(self.testdir) / 'repo'
-        repo_dir.mkdir()
-        shutil.copy('repo/entry.json', repo_dir)
-        shutil.copy('repo/index-v2.json', repo_dir)
-        os.chdir(self.testdir)
-        fdroidserver.signindex.sign_index('repo', 'entry.json')
-        fdroidserver.common.verify_jar_signature('repo/entry.jar')
-
-    def test_verify_jar_signature_fails(self):
-        """Test verify_jar_signature fails on unsigned and deprecated algorithms"""
-        config = fdroidserver.common.read_config()
-        config['jarsigner'] = fdroidserver.common.find_sdk_tools_cmd('jarsigner')
-        fdroidserver.common.config = config
-        source_dir = os.path.join(basedir, 'signindex')
-        for f in ('unsigned.jar', 'testy.jar', 'guardianproject.jar', 'guardianproject-v1.jar'):
-            testfile = os.path.join(source_dir, f)
-            with self.assertRaises(fdroidserver.index.VerificationException):
-                fdroidserver.common.verify_jar_signature(testfile)
-
-    def test_verify_deprecated_jar_signature(self):
-        config = fdroidserver.common.read_config()
-        config['jarsigner'] = fdroidserver.common.find_sdk_tools_cmd('jarsigner')
-        fdroidserver.common.config = config
-        source_dir = os.path.join(basedir, 'signindex')
-        for f in ('testy.jar', 'guardianproject.jar'):
-            testfile = os.path.join(source_dir, f)
-            fdroidserver.common.verify_deprecated_jar_signature(testfile)
-
-        testfile = os.path.join(source_dir, 'unsigned.jar')
-        with self.assertRaises(fdroidserver.index.VerificationException):
-            fdroidserver.common.verify_deprecated_jar_signature(testfile)
-
-    def test_verify_apks(self):
-        config = fdroidserver.common.read_config()
-        fdroidserver.common.config = config
-        _mock_common_module_options_instance()
-
-        sourceapk = os.path.join(basedir, 'urzip.apk')
-
-        copyapk = os.path.join(self.testdir, 'urzip-copy.apk')
-        shutil.copy(sourceapk, copyapk)
-        self.assertTrue(fdroidserver.common.verify_apk_signature(copyapk))
-        self.assertIsNone(
-            fdroidserver.common.verify_apks(sourceapk, copyapk, self.testdir)
-        )
-
-        unsignedapk = os.path.join(self.testdir, 'urzip-unsigned.apk')
-        with ZipFile(sourceapk, 'r') as apk:
-            with ZipFile(unsignedapk, 'w') as testapk:
-                for info in apk.infolist():
-                    if not info.filename.startswith('META-INF/'):
-                        testapk.writestr(info, apk.read(info.filename))
-        self.assertIsNone(
-            fdroidserver.common.verify_apks(sourceapk, unsignedapk, self.testdir)
-        )
-
-        twosigapk = os.path.join(self.testdir, 'urzip-twosig.apk')
-        otherapk = ZipFile(os.path.join(basedir, 'urzip-release.apk'), 'r')
-        with ZipFile(sourceapk, 'r') as apk:
-            with ZipFile(twosigapk, 'w') as testapk:
-                for info in apk.infolist():
-                    testapk.writestr(info, apk.read(info.filename))
-                    if info.filename.startswith('META-INF/'):
-                        testapk.writestr(info.filename, otherapk.read(info.filename))
-        otherapk.close()
-        self.assertFalse(fdroidserver.common.verify_apk_signature(twosigapk))
-        self.assertIsNone(fdroidserver.common.verify_apks(sourceapk, twosigapk, self.testdir))
-
-    def test_get_certificate_with_chain_sandisk(self):
-        """Test that APK signatures with a cert chain are parsed like apksigner.
-
-        SanDisk signs their APKs with a X.509 certificate chain of
-        trust, so there are actually three certificates
-        included. apksigner only cares about the certificate in the
-        chain that actually signs the manifest.
-
-        The correct value comes from:
-        apksigner verify --print-certs 883cbdae7aeb2e4b122e8ee8d89966c7062d0d49107a130235fa220a5b994a79.apk
-
-        """
-        cert = fdroidserver.common.get_certificate(
-            signature_block_file=Path('SANAPPSI.RSA').read_bytes(),
-            signature_file=Path('SANAPPSI.SF').read_bytes(),
-        )
-        self.assertEqual(
-            'ea0abbf2a142e4b167405d516b2cc408c4af4b29cd50ba281aa4470d4aab3e53',
-            fdroidserver.common.signer_fingerprint(cert),
-        )
-
-    def test_write_to_config(self):
-        """Test that config items can be added without messing up config.yml.
-
-        The '_orig' key are where the original string values of paths
-        are stored.  Paths have tilde expansion and env vars replaced
-        in fill_config_defaults().
-
-        """
-        os.chdir(self.testdir)
-        fdroidserver.common.write_config_file(
-            textwrap.dedent(
-                """\
-                # abc
-                # test: 'example value'
-                a_path: ~/android-sdk
-
-                # comment
-                do_not_touch: good value
-                a_path: "!!!"
-
-                key: "123"    # inline"""
-            )
-        )
-
-        config = {'key': 111, 'a_path_orig': '~/android-sdk'}
-        fdroidserver.common.write_to_config(config, 'key')
-        fdroidserver.common.write_to_config(config, 'a_path')
-        fdroidserver.common.write_to_config(config, 'test', value='test value')
-        fdroidserver.common.write_to_config(config, 'new_key', value='new')
-
-        with open(fdroidserver.common.CONFIG_FILE) as fp:
-            self.assertEqual(
-                fp.read(),
-                textwrap.dedent(
-                    """\
-                    # abc
-                    test: test value
-                    a_path: ~/android-sdk
-
-                    # comment
-                    do_not_touch: good value
-
-                    key: 111
-                    new_key: new
-                    """
-                ),
-            )
-
-    def test_write_to_config_when_empty(self):
-        os.chdir(self.testdir)
-        config_yml = Path(fdroidserver.common.CONFIG_FILE)
-        config_yml.write_text('', encoding='utf-8')
-        fdroidserver.common.write_to_config({}, 'key', 'val')
-        self.assertEqual(config_yml.read_text(), 'key: val\n')
-
-    def test_apk_name_regex(self):
-        good = [
-            'urzipπÇÇπÇÇ现代汉语通用字българскиعربي1234ö_-123456.apk',
-            'urzipπÇÇπÇÇ现代汉语通用字българскиعربي1234ö_123456_abcdef0.apk',
-            'urzip_-123456.apk',
-            'a0_0.apk',
-            'Z0_0.apk',
-            'a0_0_abcdef0.apk',
-            'a_a_a_a_0_abcdef0.apk',
-            'a_____0.apk',
-            'a_____123456_abcdef0.apk',
-            'org.fdroid.fdroid_123456.apk',
-            # valid, but "_99999" is part of packageName rather than versionCode
-            'org.fdroid.fdroid_99999_123456.apk',
-            # should be valid, but I can't figure out the regex since \w includes digits
-            # 'πÇÇπÇÇ现代汉语通用字българскиعربي1234ö_0_123bafd.apk',
-        ]
-        for name in good:
-            m = fdroidserver.common.APK_NAME_REGEX.match(name)
-            self.assertIsNotNone(m)
-            self.assertIn(m.group(2), ('-123456', '0', '123456'))
-            self.assertIn(m.group(3), ('abcdef0', None))
-
-        bad = [
-            'urzipπÇÇπÇÇ现代汉语通用字българскиعربي1234ö_123456_abcdefg.apk',
-            'urzip-_-198274.apk',
-            'urzip-_0_123bafd.apk',
-            'no spaces allowed_123.apk',
-            '0_0.apk',
-            '0_0_abcdef0.apk',
-        ]
-        for name in bad:
-            self.assertIsNone(fdroidserver.common.APK_NAME_REGEX.match(name))
-
-    def test_standard_file_name_regex(self):
-        good = [
-            'urzipπÇÇπÇÇ现代汉语通用字българскиعربي1234ö_-123456.mp3',
-            'urzipπÇÇπÇÇ现代汉语通用字българскиعربي1234ö_123456.mov',
-            'Document_-123456.pdf',
-            'WTF_0.MOV',
-            'Z0_0.ebk',
-            'a_a_a_a_0.txt',
-            'org.fdroid.fdroid.privileged.ota_123456.zip',
-            'πÇÇπÇÇ现代汉语通用字българскиعربي1234ö_0.jpeg',
-            'a_____0.PNG',
-            # valid, but "_99999" is part of packageName rather than versionCode
-            'a_____99999_123456.zip',
-            'org.fdroid.fdroid_99999_123456.zip',
-        ]
-        for name in good:
-            m = fdroidserver.common.STANDARD_FILE_NAME_REGEX.match(name)
-            self.assertIsNotNone(m)
-            self.assertIn(m.group(2), ('-123456', '0', '123456'))
-
-        bad = [
-            'urzipπÇÇπÇÇ现代汉语通用字българскиعربي1234ö_abcdefg.JPEG',
-            'urzip-_-198274.zip',
-            'urzip-_123bafd.pdf',
-            'no spaces allowed_123.foobar',
-            'a_____0.',
-        ]
-        for name in bad:
-            self.assertIsNone(fdroidserver.common.STANDARD_FILE_NAME_REGEX.match(name))
-
-    @unittest.skipIf(sys.byteorder == 'big', 'androguard is not ported to big-endian')
-    def test_apk_signer_fingerprint(self):
-
-        # fingerprints fetched with: keytool -printcert -file ____.RSA
-        testapks = (('repo/obb.main.oldversion_1444412523.apk',
-                     '818e469465f96b704e27be2fee4c63ab9f83ddf30e7a34c7371a4728d83b0bc1'),
-                    ('repo/obb.main.twoversions_1101613.apk',
-                     '32a23624c201b949f085996ba5ed53d40f703aca4989476949cae891022e0ed6'),
-                    ('repo/obb.main.twoversions_1101617.apk',
-                     '32a23624c201b949f085996ba5ed53d40f703aca4989476949cae891022e0ed6'))
-
-        for apkfile, keytoolcertfingerprint in testapks:
-            self.assertEqual(keytoolcertfingerprint,
-                             fdroidserver.common.apk_signer_fingerprint(apkfile))
-
-    def test_find_apksigner_system_package_default_path(self):
-        """apksigner should be automatically used from the PATH"""
-        usr_bin_apksigner = '/usr/bin/apksigner'
-        if not os.path.isfile(usr_bin_apksigner):
-            self.skipTest('SKIPPING since %s is not installed!' % usr_bin_apksigner)
-        with mock.patch.dict(os.environ, clear=True):
-            os.environ['PATH'] = '/usr/local/bin:/usr/bin:/bin'
-            config = {}
-            fdroidserver.common.find_apksigner(config)
-            self.assertEqual(usr_bin_apksigner, config.get('apksigner'))
-
-    def test_find_apksigner_config_overrides(self):
-        """apksigner should come from config before any auto-detection"""
-        os.chdir(self.testdir)
-        android_home = os.path.join(self.testdir, 'ANDROID_HOME')
-        do_not_use = os.path.join(android_home, 'build-tools', '30.0.3', 'apksigner')
-        os.makedirs(os.path.dirname(do_not_use))
-        with open(do_not_use, 'w') as fp:
-            fp.write('#!/bin/sh\ndate\n')
-        os.chmod(do_not_use, 0o0755)  # nosec B103
-        apksigner = os.path.join(self.testdir, 'apksigner')
-        config = {'apksigner': apksigner}
-        with mock.patch.dict(os.environ, clear=True):
-            os.environ['ANDROID_HOME'] = android_home
-            os.environ['PATH'] = '%s:/usr/local/bin:/usr/bin:/bin' % android_home
-            fdroidserver.common.find_apksigner(config)
-            self.assertEqual(apksigner, config.get('apksigner'))
-
-    def test_find_apksigner_prefer_path(self):
-        """apksigner should come from PATH before ANDROID_HOME"""
-        os.chdir(self.testdir)
-        apksigner = os.path.join(self.testdir, 'apksigner')
-        with open(apksigner, 'w') as fp:
-            fp.write('#!/bin/sh\ndate\n')
-        os.chmod(apksigner, 0o0755)  # nosec B103
-
-        android_home = os.path.join(self.testdir, 'ANDROID_HOME')
-        do_not_use = os.path.join(android_home, 'build-tools', '30.0.3', 'apksigner')
-        os.makedirs(os.path.dirname(do_not_use))
-        with open(do_not_use, 'w') as fp:
-            fp.write('#!/bin/sh\ndate\n')
-        os.chmod(do_not_use, 0o0755)  # nosec B103
-
-        config = {'sdk_path': android_home}
-        with mock.patch.dict(os.environ, clear=True):
-            os.environ['ANDROID_HOME'] = android_home
-            os.environ['PATH'] = '%s:/usr/local/bin:/usr/bin:/bin' % os.path.dirname(apksigner)
-            fdroidserver.common.find_apksigner(config)
-            self.assertEqual(apksigner, config.get('apksigner'))
-
-    def test_find_apksigner_prefer_newest(self):
-        """apksigner should be the newest available in ANDROID_HOME"""
-        os.chdir(self.testdir)
-        android_home = os.path.join(self.testdir, 'ANDROID_HOME')
-
-        apksigner = os.path.join(android_home, 'build-tools', '30.0.3', 'apksigner')
-        os.makedirs(os.path.dirname(apksigner))
-        with open(apksigner, 'w') as fp:
-            fp.write('#!/bin/sh\necho 30.0.3\n')
-        os.chmod(apksigner, 0o0755)  # nosec B103
-
-        do_not_use = os.path.join(android_home, 'build-tools', '29.0.3', 'apksigner')
-        os.makedirs(os.path.dirname(do_not_use))
-        with open(do_not_use, 'w') as fp:
-            fp.write('#!/bin/sh\necho 29.0.3\n')
-        os.chmod(do_not_use, 0o0755)  # nosec B103
-
-        config = {'sdk_path': android_home}
-        with mock.patch.dict(os.environ, clear=True):
-            os.environ['PATH'] = '/fake/path/to/avoid/conflicts'
-            fdroidserver.common.find_apksigner(config)
-            self.assertEqual(apksigner, config.get('apksigner'))
-
-    def test_find_apksigner_system_package_android_home(self):
-        """Test that apksigner v30 or newer is found"""
-        os.chdir(self.testdir)
-        android_home = os.getenv('ANDROID_HOME')
-        if not android_home or not os.path.isdir(android_home):
-            self.skipTest('SKIPPING since ANDROID_HOME (%s) is not a dir!' % android_home)
-        build_tools = glob.glob(os.path.join(android_home, 'build-tools', '*', 'apksigner'))
-        if not build_tools:
-            self.skipTest('SKIPPING since ANDROID_HOME (%s) build-tools has no apksigner!' % android_home)
-        min_version = fdroidserver.common.MINIMUM_APKSIGNER_BUILD_TOOLS_VERSION
-        version = '0'
-        for bt in sorted(build_tools):
-            v = bt.split('/')[-2]
-            if v == 'debian':
-                continue
-            if LooseVersion(version) < LooseVersion(v):
-                version = v
-        if LooseVersion(version) < LooseVersion(min_version):
-            self.skipTest('SKIPPING since build-tools %s or higher is required!' % min_version)
-        fdroidserver.common.config = {'sdk_path': android_home}
-        with mock.patch.dict(os.environ, clear=True):
-            os.environ['PATH'] = '/fake/path/to/avoid/conflicts'
-            config = fdroidserver.common.read_config()
-            fdroidserver.common.find_apksigner(config)
-            self.assertEqual(
-                os.path.join(android_home, 'build-tools'),
-                os.path.dirname(os.path.dirname(config.get('apksigner'))),
-            )
-
-    @unittest.skipIf(sys.byteorder == 'big', 'androguard is not ported to big-endian')
-    def test_sign_apk(self):
-        _mock_common_module_options_instance()
-        config = fdroidserver.common.read_config()
-        if 'apksigner' not in config:
-            self.skipTest('SKIPPING test_sign_apk, apksigner not installed!')
-
-        config['keyalias'] = 'sova'
-        config['keystorepass'] = 'r9aquRHYoI8+dYz6jKrLntQ5/NJNASFBacJh7Jv2BlI='
-        config['keypass'] = 'r9aquRHYoI8+dYz6jKrLntQ5/NJNASFBacJh7Jv2BlI='
-        config['keystore'] = os.path.join(basedir, 'keystore.jks')
-        fdroidserver.common.config = config
-        fdroidserver.signindex.config = config
-
-        unsigned = os.path.join(self.testdir, 'urzip-release-unsigned.apk')
-        signed = os.path.join(self.testdir, 'urzip-release.apk')
-        shutil.copy(os.path.join(basedir, 'urzip-release-unsigned.apk'), self.testdir)
-
-        self.assertFalse(fdroidserver.common.verify_apk_signature(unsigned))
-
-        fdroidserver.common.sign_apk(unsigned, signed, config['keyalias'])
-        self.assertTrue(os.path.isfile(signed))
-        self.assertFalse(os.path.isfile(unsigned))
-        self.assertTrue(fdroidserver.common.verify_apk_signature(signed))
-
-        # now sign an APK with minSdkVersion >= 18
-        unsigned = os.path.join(self.testdir, 'duplicate.permisssions_9999999-unsigned.apk')
-        signed = os.path.join(self.testdir, 'duplicate.permisssions_9999999.apk')
-        shutil.copy(
-            os.path.join(basedir, 'repo', 'duplicate.permisssions_9999999.apk'),
-            os.path.join(unsigned),
-        )
-        fdroidserver.common.apk_strip_v1_signatures(unsigned, strip_manifest=True)
-        fdroidserver.common.sign_apk(unsigned, signed, config['keyalias'])
-        self.assertTrue(os.path.isfile(signed))
-        self.assertFalse(os.path.isfile(unsigned))
-        self.assertTrue(fdroidserver.common.verify_apk_signature(signed))
-        self.assertEqual('18', fdroidserver.common.get_androguard_APK(signed).get_min_sdk_version())
-
-        shutil.copy(os.path.join(basedir, 'minimal_targetsdk_30_unsigned.apk'), self.testdir)
-        unsigned = os.path.join(self.testdir, 'minimal_targetsdk_30_unsigned.apk')
-        signed = os.path.join(self.testdir, 'minimal_targetsdk_30.apk')
-
-        self.assertFalse(fdroidserver.common.verify_apk_signature(unsigned))
-        fdroidserver.common.sign_apk(unsigned, signed, config['keyalias'])
-
-        self.assertTrue(os.path.isfile(signed))
-        self.assertFalse(os.path.isfile(unsigned))
-        self.assertTrue(fdroidserver.common.verify_apk_signature(signed))
-        # verify it has a v2 signature
-        self.assertTrue(fdroidserver.common.get_androguard_APK(signed).is_signed_v2())
-
-        shutil.copy(os.path.join(basedir, 'no_targetsdk_minsdk30_unsigned.apk'), self.testdir)
-        unsigned = os.path.join(self.testdir, 'no_targetsdk_minsdk30_unsigned.apk')
-        signed = os.path.join(self.testdir, 'no_targetsdk_minsdk30_signed.apk')
-
-        fdroidserver.common.sign_apk(unsigned, signed, config['keyalias'])
-        self.assertTrue(fdroidserver.common.verify_apk_signature(signed))
-        self.assertTrue(fdroidserver.common.get_androguard_APK(signed).is_signed_v2())
-
-        shutil.copy(os.path.join(basedir, 'no_targetsdk_minsdk1_unsigned.apk'), self.testdir)
-        unsigned = os.path.join(self.testdir, 'no_targetsdk_minsdk1_unsigned.apk')
-        signed = os.path.join(self.testdir, 'no_targetsdk_minsdk1_signed.apk')
-
-        self.assertFalse(fdroidserver.common.verify_apk_signature(unsigned))
-        fdroidserver.common.sign_apk(unsigned, signed, config['keyalias'])
-
-        self.assertTrue(os.path.isfile(signed))
-        self.assertFalse(os.path.isfile(unsigned))
-        self.assertTrue(fdroidserver.common.verify_apk_signature(signed))
-
-    @unittest.skipIf(os.getuid() == 0, 'This is meaningless when run as root')
-    def test_sign_apk_fail(self):
-        _mock_common_module_options_instance()
-        config = fdroidserver.common.read_config()
-        if 'apksigner' not in config:
-            self.skipTest('SKIPPING test_sign_apk_fail, apksigner not installed!')
-
-        config['keyalias'] = 'sova'
-        config['keystorepass'] = 'r9aquRHYoI8+dYz6jKrLntQ5/NJNASFBacJh7Jv2BlI='
-        config['keypass'] = 'r9aquRHYoI8+dYz6jKrLntQ5/NJNASFBacJh7Jv2BlI='
-        config['keystore'] = os.path.join(basedir, 'keystore.jks')
-        fdroidserver.common.config = config
-        fdroidserver.signindex.config = config
-
-        unsigned = os.path.join(self.testdir, 'urzip-release-unsigned.apk')
-        signed = os.path.join(self.testdir, 'urzip-release.apk')
-        shutil.copy(os.path.join(basedir, 'urzip-release-unsigned.apk'), self.testdir)
-
-        os.chmod(unsigned, 0o000)
-        with self.assertRaises(fdroidserver.exception.BuildException):
-            fdroidserver.common.sign_apk(unsigned, signed, config['keyalias'])
-        os.chmod(unsigned, 0o777)  # nosec B103
-        self.assertTrue(os.path.isfile(unsigned))
-        self.assertFalse(os.path.isfile(signed))
-
-    def test_sign_apk_corrupt(self):
-        _mock_common_module_options_instance()
-        config = fdroidserver.common.read_config()
-        if 'apksigner' not in config:
-            self.skipTest('SKIPPING test_sign_apk_corrupt, apksigner not installed!')
-
-        config['keyalias'] = 'sova'
-        config['keystorepass'] = 'r9aquRHYoI8+dYz6jKrLntQ5/NJNASFBacJh7Jv2BlI='
-        config['keypass'] = 'r9aquRHYoI8+dYz6jKrLntQ5/NJNASFBacJh7Jv2BlI='
-        config['keystore'] = os.path.join(basedir, 'keystore.jks')
-        fdroidserver.common.config = config
-        fdroidserver.signindex.config = config
-
-        unsigned = os.path.join(self.testdir, 'urzip-release-unsigned.apk')
-        signed = os.path.join(self.testdir, 'urzip-release.apk')
-        with open(unsigned, 'w') as fp:
-            fp.write('this is a corrupt APK')
-
-        with self.assertRaises(fdroidserver.exception.BuildException):
-            fdroidserver.common.sign_apk(unsigned, signed, config['keyalias'])
-        self.assertTrue(os.path.isfile(unsigned))
-        self.assertFalse(os.path.isfile(signed))
-
-    @unittest.skipUnless(
-        os.path.exists('tests/SystemWebView-repack.apk'), "file too big for sdist"
-    )
-    def test_resign_apk(self):
-        """When using apksigner, it should resign signed APKs"""
-        _mock_common_module_options_instance()
-        config = fdroidserver.common.read_config()
-        if 'apksigner' not in config:
-            self.skipTest('SKIPPING test_resign_apk, apksigner not installed!')
-        if sys.byteorder == 'big':
-            self.skipTest('SKIPPING androguard is not ported to big-endian')
-
-        config['keyalias'] = 'sova'
-        config['keystorepass'] = 'r9aquRHYoI8+dYz6jKrLntQ5/NJNASFBacJh7Jv2BlI='
-        config['keypass'] = 'r9aquRHYoI8+dYz6jKrLntQ5/NJNASFBacJh7Jv2BlI='
-        config['keystore'] = os.path.join(basedir, 'keystore.jks')
-        fdroidserver.common.config = config
-        fdroidserver.signindex.config = config
-
-        os.chdir(self.testdir)
-        os.mkdir('unsigned')
-        os.mkdir('repo')
-
-        for apk in (
-            'org.bitbucket.tickytacky.mirrormirror_4.apk',
-            'v2.only.sig_2.apk',
-            'SystemWebView-repack.apk',
-        ):
-            original = os.path.join(basedir, apk)
-            unsigned = os.path.join('unsigned', apk)
-            resign = os.path.join('repo', apk)
-            shutil.copy(original, unsigned)
-            fdroidserver.common.sign_apk(unsigned, resign, config['keyalias'])
-            self.assertTrue(
-                fdroidserver.common.verify_apk_signature(resign), apk + " verifies"
-            )
-            self.assertTrue(os.path.isfile(resign))
-            self.assertFalse(os.path.isfile(unsigned))
-            self.assertNotEqual(
-                fdroidserver.common.get_first_signer_certificate(original),
-                fdroidserver.common.get_first_signer_certificate(resign)
-            )
-
-    @unittest.skipIf(sys.byteorder == 'big', 'androguard is not ported to big-endian')
-    def test_get_apk_id(self):
-        config = dict()
-        fdroidserver.common.fill_config_defaults(config)
-        fdroidserver.common.config = config
-        self._set_build_tools()
-        try:
-            config['aapt'] = fdroidserver.common.find_sdk_tools_cmd('aapt')
-        except fdroidserver.exception.FDroidException:
-            pass  # aapt is not required if androguard is present
-
-        testcases = [
-            ('repo/obb.main.twoversions_1101613.apk', 'obb.main.twoversions', 1101613, '0.1'),
-            ('org.bitbucket.tickytacky.mirrormirror_1.apk', 'org.bitbucket.tickytacky.mirrormirror', 1, '1.0'),
-            ('org.bitbucket.tickytacky.mirrormirror_2.apk', 'org.bitbucket.tickytacky.mirrormirror', 2, '1.0.1'),
-            ('org.bitbucket.tickytacky.mirrormirror_3.apk', 'org.bitbucket.tickytacky.mirrormirror', 3, '1.0.2'),
-            ('org.bitbucket.tickytacky.mirrormirror_4.apk', 'org.bitbucket.tickytacky.mirrormirror', 4, '1.0.3'),
-            ('org.dyndns.fules.ck_20.apk', 'org.dyndns.fules.ck', 20, 'v1.6pre2'),
-            ('issue-1128-min-sdk-30-poc.apk', 'org.fdroid.ci', 1, '1.0'),
-            ('issue-1128-poc1.apk', 'android.appsecurity.cts.tinyapp', 10, '1.0'),
-            ('issue-1128-poc2.apk', 'android.appsecurity.cts.tinyapp', 10, '1.0'),
-            ('issue-1128-poc3a.apk', 'android.appsecurity.cts.tinyapp', 10, '1.0'),
-            ('issue-1128-poc3b.apk', 'android.appsecurity.cts.tinyapp', 10, '1.0'),
-            ('urzip.apk', 'info.guardianproject.urzip', 100, '0.1'),
-            ('urzip-badcert.apk', 'info.guardianproject.urzip', 100, '0.1'),
-            ('urzip-badsig.apk', 'info.guardianproject.urzip', 100, '0.1'),
-            ('urzip-release.apk', 'info.guardianproject.urzip', 100, '0.1'),
-            ('urzip-release-unsigned.apk', 'info.guardianproject.urzip', 100, '0.1'),
-            ('repo/com.politedroid_3.apk', 'com.politedroid', 3, '1.2'),
-            ('repo/com.politedroid_4.apk', 'com.politedroid', 4, '1.3'),
-            ('repo/com.politedroid_5.apk', 'com.politedroid', 5, '1.4'),
-            ('repo/com.politedroid_6.apk', 'com.politedroid', 6, '1.5'),
-            ('repo/duplicate.permisssions_9999999.apk', 'duplicate.permisssions', 9999999, ''),
-            ('repo/info.zwanenburg.caffeinetile_4.apk', 'info.zwanenburg.caffeinetile', 4, '1.3'),
-            ('repo/obb.main.oldversion_1444412523.apk', 'obb.main.oldversion', 1444412523, '0.1'),
-            ('repo/obb.mainpatch.current_1619_another-release-key.apk', 'obb.mainpatch.current', 1619, '0.1'),
-            ('repo/obb.mainpatch.current_1619.apk', 'obb.mainpatch.current', 1619, '0.1'),
-            ('repo/obb.main.twoversions_1101613.apk', 'obb.main.twoversions', 1101613, '0.1'),
-            ('repo/obb.main.twoversions_1101615.apk', 'obb.main.twoversions', 1101615, '0.1'),
-            ('repo/obb.main.twoversions_1101617.apk', 'obb.main.twoversions', 1101617, '0.1'),
-            ('repo/urzip-; Рахма́, [rɐxˈmanʲɪnəf] سيرجي_رخمانينوف 谢·.apk', 'info.guardianproject.urzip', 100, '0.1'),
-        ]
-        for apkfilename, appid, versionCode, versionName in testcases:
-            a, vc, vn = fdroidserver.common.get_apk_id(apkfilename)
-            self.assertEqual(appid, a, 'androguard appid parsing failed for ' + apkfilename)
-            self.assertEqual(versionName, vn, 'androguard versionName parsing failed for ' + apkfilename)
-            self.assertEqual(versionCode, vc, 'androguard versionCode parsing failed for ' + apkfilename)
-            if 'aapt' in config:
-                a, vc, vn = fdroidserver.common.get_apk_id_aapt(apkfilename)
-                self.assertEqual(appid, a, 'aapt appid parsing failed for ' + apkfilename)
-                self.assertEqual(versionCode, vc, 'aapt versionCode parsing failed for ' + apkfilename)
-                self.assertEqual(versionName, vn, 'aapt versionName parsing failed for ' + apkfilename)
-
-    @unittest.skipIf(sys.byteorder == 'big', 'androguard is not ported to big-endian')
-    def test_get_apk_id_bad_apk(self):
-        """get_apk_id should never return None on error, only raise exceptions"""
-        with self.assertRaises(KeyError):
-            fdroidserver.common.get_apk_id('Norway_bouvet_europe_2.obf.zip')
-        shutil.copy('Norway_bouvet_europe_2.obf.zip', self.testdir)
-        os.chdir(self.testdir)
-        with ZipFile('Norway_bouvet_europe_2.obf.zip', 'a') as zipfp:
-            zipfp.writestr('AndroidManifest.xml', 'not a manifest')
-        with self.assertRaises(KeyError):
-            fdroidserver.common.get_apk_id('Norway_bouvet_europe_2.obf.zip')
-
-    @unittest.skipIf(sys.byteorder == 'big', 'androguard is not ported to big-endian')
-    def test_get_apk_id_bad_path(self):
-        with self.assertRaises(FDroidException):
-            fdroidserver.common.get_apk_id('nope')
-
-    @unittest.skipIf(sys.byteorder == 'big', 'androguard is not ported to big-endian')
-    def test_get_apk_id_api_call(self):
-        self.assertEqual(
-            ('info.guardianproject.urzip', 100, '0.1'),
-            fdroidserver.common.get_apk_id('urzip.apk'),
-        )
-
-    @unittest.skipIf(sys.byteorder == 'big', 'androguard is not ported to big-endian')
-    def test_get_apk_id_bad_zip(self):
-        os.chdir(self.testdir)
-        badzip = 'badzip.apk'
-        with open(badzip, 'w') as fp:
-            fp.write('not a ZIP')
-        with self.assertRaises(BadZipFile):
-            fdroidserver.common.get_apk_id(badzip)
-
-    def test_get_apk_id_aapt_regex(self):
-        files = glob.glob(os.path.join(basedir, 'build-tools', '[1-9]*.*', '*.txt'))
-        self.assertNotEqual(0, len(files))
-        for f in files:
-            appid, versionCode = os.path.splitext(os.path.basename(f))[0][12:].split('_')
-            with open(f, encoding='utf-8') as fp:
-                m = fdroidserver.common.APK_ID_TRIPLET_REGEX.match(fp.read())
-                if m:
-                    self.assertEqual(appid, m.group(1))
-                    self.assertEqual(versionCode, m.group(2))
-                else:
-                    self.fail('could not parse aapt output: {}'.format(f))
-
-    def test_get_native_code(self):
-        testcases = [
-            ('repo/obb.main.twoversions_1101613.apk', []),
-            ('org.bitbucket.tickytacky.mirrormirror_1.apk', []),
-            ('org.bitbucket.tickytacky.mirrormirror_2.apk', []),
-            ('org.bitbucket.tickytacky.mirrormirror_3.apk', []),
-            ('org.bitbucket.tickytacky.mirrormirror_4.apk', []),
-            ('org.dyndns.fules.ck_20.apk', ['arm64-v8a', 'armeabi', 'armeabi-v7a', 'mips', 'mips64', 'x86', 'x86_64']),
-            ('urzip.apk', []),
-            ('urzip-badcert.apk', []),
-            ('urzip-badsig.apk', []),
-            ('urzip-release.apk', []),
-            ('urzip-release-unsigned.apk', []),
-            ('repo/com.politedroid_3.apk', []),
-            ('repo/com.politedroid_4.apk', []),
-            ('repo/com.politedroid_5.apk', []),
-            ('repo/com.politedroid_6.apk', []),
-            ('repo/duplicate.permisssions_9999999.apk', []),
-            ('repo/info.zwanenburg.caffeinetile_4.apk', []),
-            ('repo/obb.main.oldversion_1444412523.apk', []),
-            ('repo/obb.mainpatch.current_1619_another-release-key.apk', []),
-            ('repo/obb.mainpatch.current_1619.apk', []),
-            ('repo/obb.main.twoversions_1101613.apk', []),
-            ('repo/obb.main.twoversions_1101615.apk', []),
-            ('repo/obb.main.twoversions_1101617.apk', []),
-            ('repo/urzip-; Рахма́, [rɐxˈmanʲɪnəf] سيرجي_رخمانينوف 谢·.apk', []),
-        ]
-        for apkfilename, native_code in testcases:
-            nc = fdroidserver.common.get_native_code(apkfilename)
-            self.assertEqual(native_code, nc)
-
-    @unittest.skipIf(sys.byteorder == 'big', 'androguard is not ported to big-endian')
-    def test_get_sdkversions_androguard(self):
-        """This is a sanity test that androguard isn't broken"""
-
-        def get_minSdkVersion(apkfile):
-            apk = fdroidserver.common.get_androguard_APK(apkfile)
-            return fdroidserver.common.get_min_sdk_version(apk)
-
-        def get_targetSdkVersion(apkfile):
-            apk = fdroidserver.common.get_androguard_APK(apkfile)
-            return apk.get_effective_target_sdk_version()
-
-        self.assertEqual(4, get_minSdkVersion('bad-unicode-πÇÇ现代通用字-български-عربي1.apk'))
-        self.assertEqual(30, get_minSdkVersion('issue-1128-min-sdk-30-poc.apk'))
-        self.assertEqual(29, get_minSdkVersion('issue-1128-poc1.apk'))
-        self.assertEqual(29, get_minSdkVersion('issue-1128-poc2.apk'))
-        self.assertEqual(23, get_minSdkVersion('issue-1128-poc3a.apk'))
-        self.assertEqual(23, get_minSdkVersion('issue-1128-poc3b.apk'))
-        self.assertEqual(14, get_minSdkVersion('org.bitbucket.tickytacky.mirrormirror_1.apk'))
-        self.assertEqual(14, get_minSdkVersion('org.bitbucket.tickytacky.mirrormirror_2.apk'))
-        self.assertEqual(14, get_minSdkVersion('org.bitbucket.tickytacky.mirrormirror_3.apk'))
-        self.assertEqual(14, get_minSdkVersion('org.bitbucket.tickytacky.mirrormirror_4.apk'))
-        self.assertEqual(7, get_minSdkVersion('org.dyndns.fules.ck_20.apk'))
-        self.assertEqual(4, get_minSdkVersion('urzip.apk'))
-        self.assertEqual(4, get_minSdkVersion('urzip-badcert.apk'))
-        self.assertEqual(4, get_minSdkVersion('urzip-badsig.apk'))
-        self.assertEqual(4, get_minSdkVersion('urzip-release.apk'))
-        self.assertEqual(4, get_minSdkVersion('urzip-release-unsigned.apk'))
-        self.assertEqual(27, get_minSdkVersion('v2.only.sig_2.apk'))
-        self.assertEqual(3, get_minSdkVersion('repo/com.politedroid_3.apk'))
-        self.assertEqual(3, get_minSdkVersion('repo/com.politedroid_4.apk'))
-        self.assertEqual(3, get_minSdkVersion('repo/com.politedroid_5.apk'))
-        self.assertEqual(14, get_minSdkVersion('repo/com.politedroid_6.apk'))
-        self.assertEqual(4, get_minSdkVersion('repo/obb.main.oldversion_1444412523.apk'))
-        self.assertEqual(4, get_minSdkVersion('repo/obb.mainpatch.current_1619_another-release-key.apk'))
-        self.assertEqual(4, get_minSdkVersion('repo/obb.mainpatch.current_1619.apk'))
-        self.assertEqual(4, get_minSdkVersion('repo/obb.main.twoversions_1101613.apk'))
-        self.assertEqual(4, get_minSdkVersion('repo/obb.main.twoversions_1101615.apk'))
-        self.assertEqual(4, get_minSdkVersion('repo/obb.main.twoversions_1101617.apk'))
-        self.assertEqual(4, get_minSdkVersion('repo/urzip-; Рахма́, [rɐxˈmanʲɪnəf] سيرجي_رخمانينوف 谢·.apk'))
-
-        self.assertEqual(30, get_targetSdkVersion('minimal_targetsdk_30_unsigned.apk'))
-        self.assertEqual(1, get_targetSdkVersion('no_targetsdk_minsdk1_unsigned.apk'))
-        self.assertEqual(30, get_targetSdkVersion('no_targetsdk_minsdk30_unsigned.apk'))
-
-    def test_apk_release_name(self):
-        appid, vercode, sigfp = fdroidserver.common.apk_parse_release_filename('com.serwylo.lexica_905.apk')
-        self.assertEqual(appid, 'com.serwylo.lexica')
-        self.assertEqual(vercode, 905)
-        self.assertEqual(sigfp, None)
-
-        appid, vercode, sigfp = fdroidserver.common.apk_parse_release_filename('com.serwylo.lexica_905_c82e0f6.apk')
-        self.assertEqual(appid, 'com.serwylo.lexica')
-        self.assertEqual(vercode, 905)
-        self.assertEqual(sigfp, 'c82e0f6')
-
-        appid, vercode, sigfp = fdroidserver.common.apk_parse_release_filename('beverly_hills-90210.apk')
-        self.assertEqual(appid, None)
-        self.assertEqual(vercode, None)
-        self.assertEqual(sigfp, None)
-
-    def test_metadata_find_developer_signature(self):
-        sig = fdroidserver.common.metadata_find_developer_signature('org.smssecure.smssecure')
-        self.assertEqual('b30bb971af0d134866e158ec748fcd553df97c150f58b0a963190bbafbeb0868', sig)
-
-    def test_parse_xml(self):
-        manifest = Path('source-files/fdroid/fdroidclient/AndroidManifest.xml')
-        parsed = fdroidserver.common.parse_xml(manifest)
-        self.assertIsNotNone(parsed)
-        self.assertEqual(str(type(parsed)), "<class 'xml.etree.ElementTree.Element'>")
-
-    def test_parse_androidmanifests(self):
-        app = fdroidserver.metadata.App()
-        app.id = 'org.fdroid.fdroid'
-        paths = [
-            Path('source-files/fdroid/fdroidclient/AndroidManifest.xml'),
-            Path('source-files/fdroid/fdroidclient/build.gradle'),
-        ]
-        for path in paths:
-            self.assertTrue(os.path.isfile(path))
-        self.assertEqual(('0.94-test', 940, 'org.fdroid.fdroid'),
-                         fdroidserver.common.parse_androidmanifests(paths, app))
-
-        app = fdroidserver.metadata.App()
-        app.AutoName = 'android-chat'
-        app.RepoType = 'git'
-        url = 'https://github.com/wildfirechat/android-chat.git'
-        app.SourceCode = url.rstrip('.git')
-        app.Repo = url
-        paths = [
-            Path('source-files/cn.wildfirechat.chat/avenginekit/build.gradle'),
-            Path('source-files/cn.wildfirechat.chat/build.gradle'),
-            Path('source-files/cn.wildfirechat.chat/client/build.gradle'),
-            Path('source-files/cn.wildfirechat.chat/client/src/main/AndroidManifest.xml'),
-            Path('source-files/cn.wildfirechat.chat/emojilibrary/build.gradle'),
-            Path('source-files/cn.wildfirechat.chat/gradle/build_libraries.gradle'),
-            Path('source-files/cn.wildfirechat.chat/imagepicker/build.gradle'),
-            Path('source-files/cn.wildfirechat.chat/mars-core-release/build.gradle'),
-            Path('source-files/cn.wildfirechat.chat/push/build.gradle'),
-            Path('source-files/cn.wildfirechat.chat/settings.gradle'),
-            Path('source-files/cn.wildfirechat.chat/chat/build.gradle'),
-        ]
-        for path in paths:
-            self.assertTrue(os.path.isfile(path))
-        self.assertEqual(('0.6.9', 23, 'cn.wildfirechat.chat'),
-                         fdroidserver.common.parse_androidmanifests(paths, app))
-
-        app = fdroidserver.metadata.App()
-        app.Repo = 'https://github.com/Integreight/1Sheeld-Android-App'
-        paths = [
-            Path('source-files/com.integreight.onesheeld/pagerIndicator/src/main/AndroidManifest.xml'),
-            Path('source-files/com.integreight.onesheeld/pagerIndicator/build.gradle'),
-            Path('source-files/com.integreight.onesheeld/oneSheeld/src/main/AndroidManifest.xml'),
-            Path('source-files/com.integreight.onesheeld/oneSheeld/build.gradle'),
-            Path('source-files/com.integreight.onesheeld/localeapi/src/main/AndroidManifest.xml'),
-            Path('source-files/com.integreight.onesheeld/localeapi/build.gradle'),
-            Path('source-files/com.integreight.onesheeld/build.gradle'),
-            Path('source-files/com.integreight.onesheeld/settings.gradle'),
-            Path('source-files/com.integreight.onesheeld/quickReturnHeader/src/main/AndroidManifest.xml'),
-            Path('source-files/com.integreight.onesheeld/quickReturnHeader/build.gradle'),
-            Path('source-files/com.integreight.onesheeld/pullToRefreshlibrary/src/main/AndroidManifest.xml'),
-            Path('source-files/com.integreight.onesheeld/pullToRefreshlibrary/build.gradle'),
-        ]
-        for path in paths:
-            self.assertTrue(os.path.isfile(path))
-        self.assertEqual(('1.9.0', 170521, 'com.integreight.onesheeld'),
-                         fdroidserver.common.parse_androidmanifests(paths, app))
-
-        app = fdroidserver.metadata.App()
-        app.id = 'dev.patrickgold.florisboard'
-        paths = [
-            Path('source-files/dev.patrickgold.florisboard/app/build.gradle.kts'),
-        ]
-        for path in paths:
-            self.assertTrue(os.path.isfile(path))
-        self.assertEqual(('0.3.10', 29, 'dev.patrickgold.florisboard'),
-                         fdroidserver.common.parse_androidmanifests(paths, app))
-
-        app = fdroidserver.metadata.App()
-        app.id = 'com.ubergeek42.WeechatAndroid'
-        paths = [
-            Path('source-files/com.ubergeek42.WeechatAndroid/app/build.gradle.kts'),
-            Path('source-files/com.ubergeek42.WeechatAndroid/app/src/main/res/values/strings.xml'),
-        ]
-        for path in paths:
-            self.assertTrue(os.path.isfile(path))
-        self.assertEqual(('1.8.1', 10801, None),
-                         fdroidserver.common.parse_androidmanifests(paths, app))
-
-    def test_parse_androidmanifests_ignore(self):
-        app = fdroidserver.metadata.App()
-        app.id = 'org.fdroid.fdroid'
-        app.UpdateCheckIgnore = '-test'
-        paths = [
-            Path('source-files/fdroid/fdroidclient/AndroidManifest.xml'),
-            Path('source-files/fdroid/fdroidclient/build.gradle'),
-        ]
-        for path in paths:
-            self.assertTrue(os.path.isfile(path))
-        self.assertEqual(('Ignore', None, 'org.fdroid.fdroid'),
-                         fdroidserver.common.parse_androidmanifests(paths, app))
-
-    def test_parse_androidmanifests_with_flavor(self):
-        app = fdroidserver.metadata.App()
-        build = fdroidserver.metadata.Build()
-        build.gradle = ['devVersion']
-        app['Builds'] = [build]
-        app.id = 'org.fdroid.fdroid.dev'
-        paths = [
-            Path('source-files/fdroid/fdroidclient/AndroidManifest.xml'),
-            Path('source-files/fdroid/fdroidclient/build.gradle'),
-        ]
-        for path in paths:
-            self.assertTrue(os.path.isfile(path))
-        self.assertEqual(('0.95-dev', 949, 'org.fdroid.fdroid.dev'),
-                         fdroidserver.common.parse_androidmanifests(paths, app))
-
-        app = fdroidserver.metadata.App()
-        build = fdroidserver.metadata.Build()
-        build.gradle = ['free']
-        app['Builds'] = [build]
-        app.id = 'eu.siacs.conversations'
-        paths = [
-            Path('source-files/eu.siacs.conversations/build.gradle'),
-        ]
-        for path in paths:
-            self.assertTrue(os.path.isfile(path))
-        self.assertEqual(('1.23.1', 245, 'eu.siacs.conversations'),
-                         fdroidserver.common.parse_androidmanifests(paths, app))
-
-        app = fdroidserver.metadata.App()
-        build = fdroidserver.metadata.Build()
-        build.gradle = ['generic']
-        app['Builds'] = [build]
-        app.id = 'com.nextcloud.client'
-        paths = [
-            Path('source-files/com.nextcloud.client/build.gradle'),
-        ]
-        for path in paths:
-            self.assertTrue(os.path.isfile(path))
-        self.assertEqual(('2.0.0', 20000099, 'com.nextcloud.client'),
-                         fdroidserver.common.parse_androidmanifests(paths, app))
-
-        app = fdroidserver.metadata.App()
-        build = fdroidserver.metadata.Build()
-        build.gradle = ['versionDev']
-        app['Builds'] = [build]
-        app.id = 'com.nextcloud.android.beta'
-        paths = [
-            Path('source-files/com.nextcloud.client/build.gradle'),
-        ]
-        for path in paths:
-            self.assertTrue(os.path.isfile(path))
-        self.assertEqual(('20171223', 20171223, 'com.nextcloud.android.beta'),
-                         fdroidserver.common.parse_androidmanifests(paths, app))
-
-        app = fdroidserver.metadata.App()
-        build = fdroidserver.metadata.Build()
-        build.gradle = ['standard']
-        app['Builds'] = [build]
-        app.id = 'at.bitfire.davdroid'
-        paths = [
-            Path('source-files/at.bitfire.davdroid/build.gradle'),
-        ]
-        for path in paths:
-            self.assertTrue(os.path.isfile(path))
-        self.assertEqual(('1.9.8.1-ose', 197, 'at.bitfire.davdroid'),
-                         fdroidserver.common.parse_androidmanifests(paths, app))
-
-        app = fdroidserver.metadata.App()
-        build = fdroidserver.metadata.Build()
-        build.gradle = ['libre']
-        app['Builds'] = [build]
-        app.id = 'com.kunzisoft.fdroidtest.applicationidsuffix.libre'
-        paths = [
-            Path('source-files/com.kunzisoft.testcase/build.gradle'),
-        ]
-        for path in paths:
-            self.assertTrue(os.path.isfile(path))
-        self.assertEqual(('1.0-libre', 1, 'com.kunzisoft.fdroidtest.applicationidsuffix.libre'),
-                         fdroidserver.common.parse_androidmanifests(paths, app))
-
-        app = fdroidserver.metadata.App()
-        build = fdroidserver.metadata.Build()
-        build.gradle = ['pro']
-        app['Builds'] = [build]
-        app.id = 'com.kunzisoft.fdroidtest.applicationidsuffix.pro'
-        paths = [
-            Path('source-files/com.kunzisoft.testcase/build.gradle'),
-        ]
-        for path in paths:
-            self.assertTrue(os.path.isfile(path))
-        self.assertEqual(('20180430-pro', 20180430, 'com.kunzisoft.fdroidtest.applicationidsuffix.pro'),
-                         fdroidserver.common.parse_androidmanifests(paths, app))
-
-        app = fdroidserver.metadata.App()
-        build = fdroidserver.metadata.Build()
-        build.gradle = ['free']
-        app['Builds'] = [build]
-        app.id = 'com.kunzisoft.fdroidtest.applicationidsuffix'
-        paths = [
-            Path('source-files/com.kunzisoft.testcase/build.gradle'),
-        ]
-        for path in paths:
-            self.assertTrue(os.path.isfile(path))
-        self.assertEqual(('1.0-free', 1, 'com.kunzisoft.fdroidtest.applicationidsuffix'),
-                         fdroidserver.common.parse_androidmanifests(paths, app))
-
-        app = fdroidserver.metadata.App()
-        build = fdroidserver.metadata.Build()
-        build.gradle = ['underscore']
-        app['Builds'] = [build]
-        app.id = 'com.kunzisoft.fdroidtest.applicationidsuffix.underscore'
-        paths = [
-            Path('source-files/com.kunzisoft.testcase/build.gradle'),
-        ]
-        for path in paths:
-            self.assertTrue(os.path.isfile(path))
-        self.assertEqual(('20180430-underscore', 20180430, 'com.kunzisoft.fdroidtest.applicationidsuffix.underscore'),
-                         fdroidserver.common.parse_androidmanifests(paths, app))
-
-        app = fdroidserver.metadata.App()
-        build = fdroidserver.metadata.Build()
-        build.gradle = ['underscore_first']
-        app['Builds'] = [build]
-        app.id = 'com.kunzisoft.fdroidtest.applicationidsuffix.underscore_first'
-        paths = [
-            Path('source-files/com.kunzisoft.testcase/build.gradle'),
-        ]
-        for path in paths:
-            self.assertTrue(os.path.isfile(path))
-        self.assertEqual(('1.0', 1, 'com.kunzisoft.fdroidtest.applicationidsuffix.underscore_first'),
-                         fdroidserver.common.parse_androidmanifests(paths, app))
-
-        app = fdroidserver.metadata.App()
-        build = fdroidserver.metadata.Build()
-        build.gradle = ['fdroid']
-        app['Builds'] = [build]
-        app.id = 'com.github.jameshnsears.quoteunquote'
-        paths = [
-            Path('source-files/com.github.jameshnsears.quoteunquote/build.gradle'),
-        ]
-        for path in paths:
-            self.assertTrue(os.path.isfile(path))
-        self.assertEqual(('2.5.2-fdroid', 73, 'com.github.jameshnsears.quoteunquote'),
-                         fdroidserver.common.parse_androidmanifests(paths, app))
-
-        app = fdroidserver.metadata.App()
-        build = fdroidserver.metadata.Build()
-        build.gradle = ['fdroidFlavor']
-        app['Builds'] = [build]
-        app.id = 'com.jens.automation2'
-        paths = [
-            Path('source-files/com.jens.automation2/build.gradle'),
-        ]
-        for path in paths:
-            self.assertTrue(os.path.isfile(path))
-        self.assertEqual(('1.6.34-fdroid', 105, 'com.jens.automation2'),
-                         fdroidserver.common.parse_androidmanifests(paths, app))
-
-        app = fdroidserver.metadata.App()
-        build = fdroidserver.metadata.Build()
-        build.gradle = ['VAR', 'prod']
-        app['Builds'] = [build]
-        app.id = 'de.varengold.activeTAN'
-        paths = [
-            Path('source-files/de.varengold.activeTAN/build.gradle'),
-        ]
-        for path in paths:
-            self.assertTrue(os.path.isfile(path))
-        self.assertEqual(('2021-06-30', 34, 'de.varengold.activeTAN'),
-                         fdroidserver.common.parse_androidmanifests(paths, app))
-
-    def test_parse_srclib_spec_good(self):
-        self.assertEqual(fdroidserver.common.parse_srclib_spec('osmand-external-skia@android/oreo'),
-                         ('osmand-external-skia', 'android/oreo', None, None))
-        self.assertEqual(fdroidserver.common.parse_srclib_spec('1:appcompat@v7'),
-                         ('appcompat', 'v7', '1', None))
-        self.assertEqual(fdroidserver.common.parse_srclib_spec('1:Support/v7/appcompat@android-4.4_r1.1'),
-                         ('Support', 'android-4.4_r1.1', '1', 'v7/appcompat'))
-
-    def test_parse_srclib_spec_many_ats(self):
-        self.assertEqual(
-            fdroidserver.common.parse_srclib_spec('foo@@v2'), ('foo', '@v2', None, None)
-        )
-        self.assertEqual(
-            fdroidserver.common.parse_srclib_spec('bar@2@f'), ('bar', '2@f', None, None)
-        )
-
-    def test_parse_srclib_spec_none(self):
-        with self.assertRaises(MetaDataException):
-            fdroidserver.common.parse_srclib_spec(None)
-
-    def test_parse_srclib_spec_no_ref(self):
-        with self.assertRaises(MetaDataException):
-            fdroidserver.common.parse_srclib_spec('no-ref')
-        with self.assertRaises(MetaDataException):
-            fdroidserver.common.parse_srclib_spec('noref@')
-
-    def test_parse_srclib_spec_no_name(self):
-        with self.assertRaises(MetaDataException):
-            fdroidserver.common.parse_srclib_spec('@ref')
-
-    def test_remove_signing_keys(self):
-        shutil.copytree(
-            os.path.join(basedir, 'source-files'),
-            os.path.join(self.testdir, 'source-files'),
-        )
-        os.chdir(self.testdir)
-        with_signingConfigs = [
-            'source-files/com.seafile.seadroid2/app/build.gradle',
-            'source-files/eu.siacs.conversations/build.gradle',
-            'source-files/info.guardianproject.ripple/build.gradle',
-            'source-files/open-keychain/open-keychain/build.gradle',
-            'source-files/open-keychain/open-keychain/OpenKeychain/build.gradle',
-            'source-files/org.tasks/app/build.gradle.kts',
-            'source-files/osmandapp/osmand/build.gradle',
-            'source-files/ut.ewh.audiometrytest/app/build.gradle',
-        ]
-        for f in with_signingConfigs:
-            build_dir = os.path.join(*f.split(os.sep)[:2])
-            if not os.path.isdir(build_dir):
-                continue
-            fdroidserver.common.remove_signing_keys(build_dir)
-            fromfile = os.path.join(basedir, f)
-            with open(f) as fp:
-                content = fp.read()
-            if 'signingConfig' in content:
-                with open(f) as fp:
-                    b = fp.readlines()
-                with open(fromfile) as fp:
-                    a = fp.readlines()
-                diff = difflib.unified_diff(a, b, fromfile, f)
-                sys.stdout.writelines(diff)
-                self.assertFalse(True)
-        do_not_modify = [
-            'source-files/Zillode/syncthing-silk/build.gradle',
-            'source-files/at.bitfire.davdroid/build.gradle',
-            'source-files/com.kunzisoft.testcase/build.gradle',
-            'source-files/com.nextcloud.client/build.gradle',
-            'source-files/fdroid/fdroidclient/build.gradle',
-            'source-files/firebase-suspect/app/build.gradle',
-            'source-files/firebase-suspect/build.gradle',
-            'source-files/firebase-allowlisted/app/build.gradle',
-            'source-files/firebase-allowlisted/build.gradle',
-            'source-files/org.mozilla.rocket/app/build.gradle',
-            'source-files/realm/react-native/android/build.gradle',
-            'triple-t-2/build/org.piwigo.android/app/build.gradle',
-        ]
-        for f in do_not_modify:
-            build_dir = os.path.join(*f.split(os.sep)[:2])
-            if not os.path.isdir(build_dir):
-                continue
-            fdroidserver.common.remove_signing_keys(build_dir)
-            fromfile = os.path.join(basedir, f)
-            with open(fromfile) as fp:
-                a = fp.readlines()
-            with open(f) as fp:
-                b = fp.readlines()
-            diff = list(difflib.unified_diff(a, b, fromfile, f))
-            self.assertEqual(0, len(diff), 'This file should not have been modified:\n' + ''.join(diff))
-
-    def test_calculate_math_string(self):
-        self.assertEqual(1234,
-                         fdroidserver.common.calculate_math_string('1234'))
-        self.assertEqual((1 + 1) * 2,
-                         fdroidserver.common.calculate_math_string('(1 + 1) * 2'))
-        self.assertEqual((1 - 1) * 2 + 3 * 1 - 1,
-                         fdroidserver.common.calculate_math_string('(1 - 1) * 2 + 3 * 1 - 1'))
-        self.assertEqual(0 - 12345,
-                         fdroidserver.common.calculate_math_string('0 - 12345'))
-        self.assertEqual(0xffff,
-                         fdroidserver.common.calculate_math_string('0xffff'))
-        self.assertEqual(0xcafe * 123,
-                         fdroidserver.common.calculate_math_string('0xcafe * 123'))
-        self.assertEqual(-1,
-                         fdroidserver.common.calculate_math_string('-1'))
-        with self.assertRaises(SyntaxError):
-            fdroidserver.common.calculate_math_string('__import__("urllib")')
-        with self.assertRaises(SyntaxError):
-            fdroidserver.common.calculate_math_string('self')
-        with self.assertRaises(SyntaxError):
-            fdroidserver.common.calculate_math_string('Ox9()')
-        with self.assertRaises(SyntaxError):
-            fdroidserver.common.calculate_math_string('1+1; print(1)')
-        with self.assertRaises(SyntaxError):
-            fdroidserver.common.calculate_math_string('1-1 # no comment')
-
-    def test_calculate_IPFS_cid_with_no_tool(self):
-        fdroidserver.common.config = {'ipfs_cid': None}
-        self.assertIsNone(fdroidserver.common.calculate_IPFS_cid('urzip.apk'))
-        self.assertIsNone(fdroidserver.common.calculate_IPFS_cid('FileDoesNotExist'))
-
-    @unittest.skipUnless(shutil.which('ipfs_cid'), 'calculate_IPFS_cid needs ipfs_cid')
-    def test_calculate_IPFS_cid(self):
-        config = dict()
-        fdroidserver.common.fill_config_defaults(config)
-        fdroidserver.common.config = config
-        self.assertIsNone(fdroidserver.common.calculate_IPFS_cid('FileDoesNotExist'))
-        self.assertEqual(
-            fdroidserver.common.calculate_IPFS_cid('urzip.apk'),
-            "bafybeigmtgrwyvj77jaflje2rf533haeqtpu2wtwsctryjusjnsawacsam",
-        )
-
-    def test_deploy_build_log_with_rsync_with_id_file(self):
-
-        mocklogcontent = bytes(
-            textwrap.dedent(
-                """\
-            build started
-            building...
-            build completed
-            profit!"""
-            ),
-            'utf-8',
-        )
-
-        fdroidserver.common.options = mock.Mock()
-        fdroidserver.common.options.verbose = False
-        fdroidserver.common.options.quiet = False
-        fdroidserver.common.config = {}
-        fdroidserver.common.config['serverwebroot'] = [
-            {'url': 'example.com:/var/www/fdroid/'},
-            {'url': 'example.com:/var/www/fbot/'},
-        ]
-        fdroidserver.common.config['deploy_process_logs'] = True
-        fdroidserver.common.config['identity_file'] = 'ssh/id_rsa'
-
-        assert_subprocess_call_iteration = 0
-
-        def assert_subprocess_call(cmd):
-            nonlocal assert_subprocess_call_iteration
-            logging.debug(cmd)
-            if assert_subprocess_call_iteration == 0:
-                self.assertListEqual(['rsync',
-                                      '--archive',
-                                      '--delete-after',
-                                      '--safe-links',
-                                      '-e',
-                                      'ssh -oBatchMode=yes -oIdentitiesOnly=yes -i ssh/id_rsa',
-                                      cmd[6],
-                                      'example.com:/var/www/fdroid/repo/'],
-                                     cmd)
-                self.assertTrue(cmd[6].endswith('/com.example.app_4711.log.gz'))
-                with gzip.open(cmd[6], 'r') as f:
-                    self.assertTrue(f.read(), mocklogcontent)
-            elif assert_subprocess_call_iteration == 1:
-                self.assertListEqual(['rsync',
-                                      '--archive',
-                                      '--delete-after',
-                                      '--safe-links',
-                                      '-e',
-                                      'ssh -oBatchMode=yes -oIdentitiesOnly=yes -i ssh/id_rsa',
-                                      cmd[6],
-                                      'example.com:/var/www/fbot/repo/'],
-                                     cmd)
-                self.assertTrue(cmd[6].endswith('/com.example.app_4711.log.gz'))
-                with gzip.open(cmd[6], 'r') as f:
-                    self.assertTrue(f.read(), mocklogcontent)
-            else:
-                self.fail('unexpected subprocess.call invocation ({})'
-                          .format(assert_subprocess_call_iteration))
-            assert_subprocess_call_iteration += 1
-            return 0
-
-        with mock.patch('subprocess.call',
-                        side_effect=assert_subprocess_call):
-            with tempfile.TemporaryDirectory() as tmpdir, TmpCwd(tmpdir):
-                fdroidserver.common.deploy_build_log_with_rsync(
-                    'com.example.app', 4711, mocklogcontent)
-
-                expected_log_path = os.path.join(tmpdir, 'repo', 'com.example.app_4711.log.gz')
-                self.assertTrue(os.path.isfile(expected_log_path))
-                with gzip.open(expected_log_path, 'r') as f:
-                    self.assertEqual(f.read(), mocklogcontent)
-
-    def test_deploy_status_json(self):
-        os.chdir(self.testdir)
-        fakesubcommand = 'fakesubcommand'
-        fake_timestamp = 1234567890
-        fakeserver = 'example.com:/var/www/fbot/'
-        expected_dir = os.path.join(self.testdir, fakeserver.replace(':', ''), 'repo', 'status')
-
-        fdroidserver.common.options = mock.Mock()
-        fdroidserver.common.config = {}
-        fdroidserver.common.config['serverwebroot'] = [{'url': fakeserver}]
-        fdroidserver.common.config['identity_file'] = 'ssh/id_rsa'
-
-        def assert_subprocess_call(cmd):
-            dest_path = os.path.join(self.testdir, cmd[-1].replace(':', ''))
-            if not os.path.exists(dest_path):
-                os.makedirs(dest_path)
-            return subprocess.run(cmd[:-1] + [dest_path]).returncode
-
-        with mock.patch('subprocess.call', side_effect=assert_subprocess_call):
-            with mock.patch.object(sys, 'argv', ['fdroid ' + fakesubcommand]):
-                output = fdroidserver.common.setup_status_output(time.localtime(fake_timestamp))
-                self.assertFalse(os.path.exists(os.path.join(expected_dir, 'running.json')))
-                with mock.patch.object(sys, 'argv', ['fdroid ' + fakesubcommand]):
-                    fdroidserver.common.write_status_json(output)
-                self.assertFalse(os.path.exists(os.path.join(expected_dir, fakesubcommand + '.json')))
-
-                fdroidserver.common.config['deploy_process_logs'] = True
-
-                output = fdroidserver.common.setup_status_output(time.localtime(fake_timestamp))
-                expected_path = os.path.join(expected_dir, 'running.json')
-                self.assertTrue(os.path.isfile(expected_path))
-                with open(expected_path) as fp:
-                    data = json.load(fp)
-                self.assertEqual(fake_timestamp * 1000, data['startTimestamp'])
-                self.assertFalse('endTimestamp' in data)
-
-                testvalue = 'asdfasd'
-                output['testvalue'] = testvalue
-
-                fdroidserver.common.write_status_json(output)
-                expected_path = os.path.join(expected_dir, fakesubcommand + '.json')
-                self.assertTrue(os.path.isfile(expected_path))
-                with open(expected_path) as fp:
-                    data = json.load(fp)
-                self.assertEqual(fake_timestamp * 1000, data['startTimestamp'])
-                self.assertTrue('endTimestamp' in data)
-                self.assertEqual(testvalue, output.get('testvalue'))
-
-    def test_string_is_integer(self):
-        self.assertTrue(fdroidserver.common.string_is_integer('0x10'))
-        self.assertTrue(fdroidserver.common.string_is_integer('010'))
-        self.assertTrue(fdroidserver.common.string_is_integer('123'))
-        self.assertFalse(fdroidserver.common.string_is_integer('0xgg'))
-        self.assertFalse(fdroidserver.common.string_is_integer('01g'))
-        self.assertFalse(fdroidserver.common.string_is_integer('o123'))
-
-    def test_version_code_string_to_int(self):
-        self.assertEqual(16, fdroidserver.common.version_code_string_to_int('0x10'))
-        self.assertEqual(198712389, fdroidserver.common.version_code_string_to_int('198712389'))
-        self.assertEqual(8, fdroidserver.common.version_code_string_to_int('0o10'))
-        self.assertEqual(10, fdroidserver.common.version_code_string_to_int('010'))
-        self.assertEqual(123, fdroidserver.common.version_code_string_to_int('0000123'))
-        self.assertEqual(-42, fdroidserver.common.version_code_string_to_int('-42'))
-
-    def test_getsrclibvcs(self):
-        fdroidserver.metadata.srclibs = {'somelib': {'RepoType': 'git'},
-                                         'yeslib': {'RepoType': 'hg'},
-                                         'nolib': {'RepoType': 'git-svn'}}
-        self.assertEqual(fdroidserver.common.getsrclibvcs('somelib'), 'git')
-        self.assertEqual(fdroidserver.common.getsrclibvcs('yeslib'), 'hg')
-        self.assertEqual(fdroidserver.common.getsrclibvcs('nolib'), 'git-svn')
-        with self.assertRaises(VCSException):
-            fdroidserver.common.getsrclibvcs('nonexistentlib')
-
-    def test_getsrclib_not_found(self):
-        fdroidserver.common.config = {'sdk_path': '',
-                                      'java_paths': {}}
-        fdroidserver.metadata.srclibs = {}
-
-        with self.assertRaisesRegex(VCSException, 'srclib SDL not found.'):
-            fdroidserver.common.getsrclib('SDL@release-2.0.3', 'srclib')
-
-    def test_getsrclib_gotorevision_raw(self):
-        fdroidserver.common.config = {'sdk_path': '',
-                                      'java_paths': {}}
-        fdroidserver.metadata.srclibs = {'SDL': {'RepoType': 'git',
-                                                 'Repo': ''}}
-
-        vcs = mock.Mock()
-
-        with tempfile.TemporaryDirectory() as tmpdir, TmpCwd(tmpdir):
-            os.makedirs(os.path.join('srclib', 'SDL'))
-            with mock.patch('fdroidserver.common.getvcs', return_value=vcs):
-                ret = fdroidserver.common.getsrclib('SDL', 'srclib', raw=True)
-                self.assertEqual(vcs.srclib, ('SDL', None, 'srclib/SDL'))
-                self.assertEqual(ret, vcs)
-
-    def test_getsrclib_gotorevision_ref(self):
-        fdroidserver.common.config = {'sdk_path': '',
-                                      'java_paths': {}}
-        fdroidserver.metadata.srclibs = {'ACRA': {'RepoType': 'git',
-                                                  'Repo': 'https://github.com/ACRA/acra.git',
-                                                  'Subdir': None,
-                                                  'Prepare': None}}
-
-        vcs = mock.Mock()
-        skm = mock.Mock()
-        dfm = mock.Mock()
-
-        with tempfile.TemporaryDirectory() as tmpdir, TmpCwd(tmpdir):
-            os.makedirs(os.path.join('srclib', 'ACRA'))
-            with mock.patch('fdroidserver.common.getvcs', return_value=vcs):
-                with mock.patch('fdroidserver.common.remove_signing_keys', skm):
-                    with mock.patch('fdroidserver.common.remove_debuggable_flags', dfm):
-                        ret = fdroidserver.common.getsrclib('ACRA@acra-4.6.2', 'srclib')
-                        self.assertEqual(vcs.srclib, ('ACRA', None, 'srclib/ACRA'))
-                        vcs.gotorevision.assert_called_once_with('acra-4.6.2', True)
-                        skm.assert_called_once_with('srclib/ACRA')
-                        dfm.assert_called_once_with('srclib/ACRA')
-                        self.assertEqual(ret, ('ACRA', None, 'srclib/ACRA'))
-
-    def test_run_yamllint_wellformed(self):
-        try:
-            import yamllint.config
-
-            yamllint.config  # make pyflakes ignore this
-        except ImportError:
-            self.skipTest('yamllint not installed')
-        with tempfile.TemporaryDirectory() as tmpdir, TmpCwd(tmpdir):
-            with open('wellformed.yml', 'w') as f:
-                f.write(
-                    textwrap.dedent(
-                        '''\
-                    yaml:
-                        file:
-                            - for
-                            - test
-                        purposeses: true
-                    '''
-                    )
-                )
-            result = fdroidserver.common.run_yamllint('wellformed.yml')
-            self.assertEqual(result, '')
-
-    def test_run_yamllint_malformed(self):
-        try:
-            import yamllint.config
-
-            yamllint.config  # make pyflakes ignore this
-        except ImportError:
-            self.skipTest('yamllint not installed')
-        with tempfile.TemporaryDirectory() as tmpdir, TmpCwd(tmpdir):
-            with open('malformed.yml', 'w') as f:
-                f.write(
-                    textwrap.dedent(
-                        '''\
-                    yaml:
-                          - that
-                     fails
-                          - test
-                    '''
-                    )
-                )
-            result = fdroidserver.common.run_yamllint('malformed.yml')
-            self.assertIsNotNone(result)
-            self.assertNotEqual(result, '')
-
-    def test_with_no_config(self):
-        """It should set defaults if no config file is found"""
-        os.chdir(self.testdir)
-        self.assertFalse(os.path.exists(fdroidserver.common.CONFIG_FILE))
-        config = fdroidserver.common.read_config()
-        self.assertIsNotNone(config.get('char_limits'))
-
-    def test_with_zero_size_config(self):
-        """It should set defaults if config file has nothing in it"""
-        os.chdir(self.testdir)
-        fdroidserver.common.write_config_file('')
-        self.assertTrue(os.path.exists(fdroidserver.common.CONFIG_FILE))
-        config = fdroidserver.common.read_config()
-        self.assertIsNotNone(config.get('char_limits'))
-
-    def test_with_config_yml(self):
-        """Make sure it is possible to use config.yml alone."""
-        os.chdir(self.testdir)
-        fdroidserver.common.write_config_file('apksigner: yml')
-        self.assertTrue(os.path.exists(fdroidserver.common.CONFIG_FILE))
-        config = fdroidserver.common.read_config()
-        self.assertEqual('yml', config.get('apksigner'))
-
-    def test_with_config_yml_utf8(self):
-        """Make sure it is possible to use config.yml in UTF-8 encoding."""
-        os.chdir(self.testdir)
-        teststr = '/πÇÇ现代通用字-български-عربي1/ö/yml'
-        fdroidserver.common.write_config_file('apksigner: ' + teststr)
-        self.assertTrue(os.path.exists(fdroidserver.common.CONFIG_FILE))
-        config = fdroidserver.common.read_config()
-        self.assertEqual(teststr, config.get('apksigner'))
-
-    def test_with_config_yml_utf8_as_ascii(self):
-        """Make sure it is possible to use config.yml Unicode encoded as ASCII."""
-        os.chdir(self.testdir)
-        teststr = '/πÇÇ现代通用字-български-عربي1/ö/yml'
-        with open(fdroidserver.common.CONFIG_FILE, 'w', encoding='utf-8') as fp:
-            config_dump({'apksigner': teststr}, fp)
-        self.assertTrue(os.path.exists(fdroidserver.common.CONFIG_FILE))
-        config = fdroidserver.common.read_config()
-        self.assertEqual(teststr, config.get('apksigner'))
-
-    def test_with_config_yml_with_env_var(self):
-        """Make sure it is possible to use config.yml alone."""
-        os.chdir(self.testdir)
-        with mock.patch.dict(os.environ):
-            os.environ['SECRET'] = 'mysecretpassword'  # nosec B105
-            fdroidserver.common.write_config_file("""keypass: {'env': 'SECRET'}\n""")
-            self.assertTrue(os.path.exists(fdroidserver.common.CONFIG_FILE))
-            config = fdroidserver.common.read_config()
-            self.assertEqual(os.getenv('SECRET', 'fail'), config.get('keypass'))
-
-    def test_with_config_yml_is_dict(self):
-        os.chdir(self.testdir)
-        Path(fdroidserver.common.CONFIG_FILE).write_text('apksigner = /bin/apksigner')
-        with self.assertRaises(TypeError):
-            fdroidserver.common.read_config()
-
-    def test_with_config_yml_is_not_mixed_type(self):
-        os.chdir(self.testdir)
-        Path(fdroidserver.common.CONFIG_FILE).write_text('k: v\napksigner = /bin/apk')
-        with self.assertRaises(ruamel.yaml.scanner.ScannerError):
-            fdroidserver.common.read_config()
-
-    def test_config_repo_url(self):
-        """repo_url ends in /repo, archive_url ends in /archive."""
-        os.chdir(self.testdir)
-        fdroidserver.common.write_config_file(
-            textwrap.dedent(
-                """\
-                repo_url: https://MyFirstFDroidRepo.org/fdroid/repo
-                archive_url: https://MyFirstFDroidRepo.org/fdroid/archive
-                """
-            )
-        )
-        config = fdroidserver.common.read_config()
-        self.assertEqual(
-            'https://MyFirstFDroidRepo.org/fdroid/repo', config.get('repo_url')
-        )
-        self.assertEqual(
-            'https://MyFirstFDroidRepo.org/fdroid/archive', config.get('archive_url')
-        )
-
-    def test_config_repo_url_extra_slash(self):
-        """repo_url ends in /repo, archive_url ends in /archive."""
-        os.chdir(self.testdir)
-        fdroidserver.common.write_config_file('repo_url: https://MyFirstFDroidRepo.org/fdroid/repo/')
-        with self.assertRaises(FDroidException):
-            fdroidserver.common.read_config()
-
-    def test_config_repo_url_not_repo(self):
-        """repo_url ends in /repo, archive_url ends in /archive."""
-        os.chdir(self.testdir)
-        fdroidserver.common.write_config_file('repo_url: https://MyFirstFDroidRepo.org/fdroid/foo')
-        with self.assertRaises(FDroidException):
-            fdroidserver.common.read_config()
-
-    def test_config_archive_url_extra_slash(self):
-        """repo_url ends in /repo, archive_url ends in /archive."""
-        os.chdir(self.testdir)
-        fdroidserver.common.write_config_file('archive_url: https://MyFirstFDroidRepo.org/fdroid/archive/')
-        with self.assertRaises(FDroidException):
-            fdroidserver.common.read_config()
-
-    def test_config_archive_url_not_repo(self):
-        """repo_url ends in /repo, archive_url ends in /archive."""
-        os.chdir(self.testdir)
-        fdroidserver.common.write_config_file('archive_url: https://MyFirstFDroidRepo.org/fdroid/foo')
-        with self.assertRaises(FDroidException):
-            fdroidserver.common.read_config()
-
-    def test_write_to_config_yml(self):
-        os.chdir(self.testdir)
-        fdroidserver.common.write_config_file('apksigner: yml')
-        os.chmod(fdroidserver.common.CONFIG_FILE, 0o0600)
-        self.assertTrue(os.path.exists(fdroidserver.common.CONFIG_FILE))
-        config = fdroidserver.common.read_config()
-        self.assertFalse('keypass' in config)
-        self.assertEqual('yml', config.get('apksigner'))
-        fdroidserver.common.write_to_config(config, 'keypass', 'mysecretpassword')
-        fdroidserver.common.config = None
-        config = fdroidserver.common.read_config()
-        self.assertEqual('mysecretpassword', config['keypass'])
-
-    def test_config_dict_with_int_keys(self):
-        os.chdir(self.testdir)
-        fdroidserver.common.write_config_file(
-            textwrap.dedent(
-                """
-                java_paths:
-                  8: /usr/lib/jvm/java-8-openjdk
-                """
-            )
-        )
-        self.assertTrue(os.path.exists(fdroidserver.common.CONFIG_FILE))
-        config = fdroidserver.common.read_config()
-        self.assertEqual('/usr/lib/jvm/java-8-openjdk', config['java_paths']['8'])
-
-    @mock.patch.dict(os.environ, {'PATH': os.getenv('PATH')}, clear=True)
-    def test_config_lazy_load_env_vars(self):
-        """Test the environment variables in config.yml is lazy loaded.
-
-        It shouldn't throw errors when read the config if the environment variables are
-        not set. It should throw errors when the variables are get from the config.
-        """
-        os.chdir(self.testdir)
-        fdroidserver.common.write_config_file(
-            textwrap.dedent(
-                """
-                serverwebroot: {env: serverwebroot}
-                servergitmirrors:
-                  - url: {env: mirror1}
-                  - url: {env: mirror2}
-                keypass: {env: keypass}
-                keystorepass: {env: keystorepass}
-                """
-            )
-        )
-        with self.assertNoLogs(level=logging.ERROR):
-            config = fdroidserver.common.read_config()
-
-        # KeyError should be raised if a key is not in the config.yml
-        with self.assertRaises(KeyError):
-            config['gpghome']
-
-        self.assertEqual(config.get('gpghome', 'gpg'), 'gpg')
-        os.environ.update({key: f"{key}supersecret" for key in ["serverwebroot", "mirror1", "mirror2", "keystorepass"]})
-        self.assertEqual(config['keystorepass'], 'keystorepasssupersecret')
-        self.assertEqual(config['serverwebroot'], [{'url': 'serverwebrootsupersecret/'}])
-        self.assertEqual(config['servergitmirrors'], [{'url': 'mirror1supersecret'}, {'url': 'mirror2supersecret'}])
-
-    @mock.patch.dict(os.environ, {'PATH': os.getenv('PATH')}, clear=True)
-    def test_config_lazy_load_env_vars_not_set(self):
-        os.chdir(self.testdir)
-        fdroidserver.common.write_config_file('keypass: {env: keypass}')
-        fdroidserver.common.read_config()
-        with self.assertLogs(level=logging.ERROR) as lw:
-            fdroidserver.common.config['keypass']
-            self.assertTrue('is not set' in lw.output[0])
-            self.assertEqual(1, len(lw.output))
-
-    @mock.patch.dict(os.environ, {'PATH': os.getenv('PATH')}, clear=True)
-    def test_test_sdk_exists_fails_on_bad_sdk_path(self):
-        config = {'sdk_path': 'nothinghere'}
-        self.assertFalse(fdroidserver.common.test_sdk_exists(config))
-
-    @mock.patch.dict(os.environ, {'PATH': os.getenv('PATH')}, clear=True)
-    def test_test_sdk_exists_fails_on_empty(self):
-        self.assertFalse(fdroidserver.common.test_sdk_exists(dict()))
-
-    @mock.patch.dict(os.environ, {'PATH': os.getenv('PATH')}, clear=True)
-    def test_test_sdk_exists_fails_on_non_existent(self):
-        config = {'sdk_path': os.path.join(self.testdir, 'non_existent')}
-        self.assertFalse(fdroidserver.common.test_sdk_exists(config))
-
-    @mock.patch.dict(os.environ, {'PATH': os.getenv('PATH')}, clear=True)
-    def test_test_sdk_exists_fails_on_file(self):
-        f = os.path.join(self.testdir, 'testfile')
-        open(f, 'w').close()
-        config = {'sdk_path': f}
-        self.assertFalse(fdroidserver.common.test_sdk_exists(config))
-
-    @mock.patch.dict(os.environ, {'PATH': '/nonexistent'}, clear=True)
-    def test_test_sdk_exists_valid_apksigner_in_config(self):
-        apksigner = os.path.join(
-            self.testdir,
-            'build-tools',
-            fdroidserver.common.MINIMUM_APKSIGNER_BUILD_TOOLS_VERSION,
-            'apksigner',
-        )
-        os.makedirs(os.path.dirname(apksigner))
-        with open(apksigner, 'w') as fp:
-            fp.write('#!/bin/sh\ndate\n')
-        os.chmod(apksigner, 0o0755)  # nosec B103
-        config = {'apksigner': apksigner}
-        self.assertTrue(fdroidserver.common.test_sdk_exists(config))
-
-    @mock.patch.dict(os.environ, {'PATH': '/nonexistent'}, clear=True)
-    def test_test_sdk_exists_old_apksigner_in_config(self):
-        apksigner = os.path.join(self.testdir, 'build-tools', '28.0.0', 'apksigner')
-        os.makedirs(os.path.dirname(apksigner))
-        with open(apksigner, 'w') as fp:
-            fp.write('#!/bin/sh\ndate\n')
-        os.chmod(apksigner, 0o0755)  # nosec B103
-        config = {'apksigner': apksigner}
-        self.assertFalse(fdroidserver.common.test_sdk_exists(config))
-
-    @mock.patch.dict(os.environ, {'PATH': '/nonexistent'}, clear=True)
-    def test_test_sdk_exists_with_valid_apksigner(self):
-        apksigner = (
-            Path(self.testdir)
-            / 'build-tools'
-            / fdroidserver.common.MINIMUM_APKSIGNER_BUILD_TOOLS_VERSION
-            / 'apksigner'
-        )
-        apksigner.parent.mkdir(parents=True)
-        apksigner.write_text('#!/bin/sh\ndate\n')
-        apksigner.chmod(0o0755)
-        config = {'sdk_path': self.testdir}
-        self.assertTrue(fdroidserver.common.test_sdk_exists(config))
-
-    @mock.patch.dict(os.environ, {'PATH': '/nonexistent'}, clear=True)
-    def test_test_sdk_exists_with_old_apksigner(self):
-        apksigner = Path(self.testdir) / 'build-tools' / '17.0.0' / 'apksigner'
-        apksigner.parent.mkdir(parents=True)
-        apksigner.write_text('#!/bin/sh\ndate\n')
-        apksigner.chmod(0o0755)
-        config = {'sdk_path': self.testdir}
-        self.assertFalse(fdroidserver.common.test_sdk_exists(config))
-
-    def test_loading_config_buildserver_yml(self):
-        """Smoke check to make sure this file is properly parsed"""
-        os.chdir(self.testdir)
-        shutil.copy(
-            os.path.join(basedir, '..', 'buildserver', 'config.buildserver.yml'),
-            fdroidserver.common.CONFIG_FILE,
-        )
-        fdroidserver.common.read_config()
-
-    @mock.patch.dict(os.environ, {'PATH': os.getenv('PATH')}, clear=True)
-    def test_config_with_env_string(self):
-        """Test whether env works in keys with string values."""
-        os.chdir(self.testdir)
-        testvalue = 'this is just a test'
-        Path('config.yml').write_text('keypass: {env: foo}')
-        os.environ['foo'] = testvalue
-        self.assertEqual(testvalue, fdroidserver.common.get_config()['keypass'])
-
-    @mock.patch.dict(os.environ, {'PATH': os.getenv('PATH')}, clear=True)
-    def test_config_with_env_path(self):
-        """Test whether env works in keys with path values."""
-        os.chdir(self.testdir)
-        path = 'user@server:/path/to/bar/'
-        os.environ['foo'] = path
-        Path('config.yml').write_text('serverwebroot: {env: foo}')
-        self.assertEqual(
-            [{'url': path}],
-            fdroidserver.common.get_config()['serverwebroot'],
-        )
-
-    def test_setup_status_output(self):
-        os.chdir(self.testdir)
-        start_timestamp = time.gmtime()
-        subcommand = 'test'
-
-        fakecmd = ['fdroid ' + subcommand, '--option']
-        sys.argv = fakecmd
-        fdroidserver.common.config = dict()
-        fdroidserver.common.setup_status_output(start_timestamp)
-        with open(os.path.join('repo', 'status', 'running.json')) as fp:
-            data = json.load(fp)
-        self.assertFalse(os.path.exists('.git'))
-        self.assertFalse('fdroiddata' in data)
-        self.assertEqual(fakecmd, data['commandLine'])
-        self.assertEqual(subcommand, data['subcommand'])
-
-    def test_setup_status_output_in_git_repo(self):
-        os.chdir(self.testdir)
-        logging.getLogger('git.cmd').setLevel(logging.INFO)
-        git_repo = git.Repo.init(self.testdir)
-        file_in_git = 'README.md'
-        with open(file_in_git, 'w') as fp:
-            fp.write('this is just a test')
-        git_repo.git.add(all=True)
-        git_repo.index.commit("update README")
-
-        start_timestamp = time.gmtime()
-        fakecmd = ['fdroid test2', '--option']
-        sys.argv = fakecmd
-        fdroidserver.common.config = dict()
-        fdroidserver.common.setup_status_output(start_timestamp)
-        with open(os.path.join('repo', 'status', 'running.json')) as fp:
-            data = json.load(fp)
-        self.assertTrue(os.path.exists('.git'))
-        self.assertIsNotNone(re.match(r'[0-9a-f]{40}', data['fdroiddata']['commitId']),
-                             'Must be a valid git SHA1 commit ID!')
-        self.assertFalse(data['fdroiddata']['isDirty'])
-        self.assertEqual(fakecmd, data['commandLine'])
-
-        self.assertEqual([],
-                         data['fdroiddata']['untrackedFiles'])
-        dirtyfile = 'dirtyfile'
-        with open(dirtyfile, 'w', encoding='utf-8') as fp:
-            fp.write('this is just a test')
-        with open(file_in_git, 'a', encoding='utf-8') as fp:
-            fp.write('\nappend some stuff')
-        self.assertEqual([],
-                         data['fdroiddata']['modifiedFiles'])
-        fdroidserver.common.setup_status_output(start_timestamp)
-        with open(os.path.join('repo', 'status', 'running.json')) as fp:
-            data = json.load(fp)
-        self.assertTrue(data['fdroiddata']['isDirty'])
-        self.assertEqual([file_in_git],
-                         data['fdroiddata']['modifiedFiles'])
-        self.assertEqual([dirtyfile, 'repo/status/running.json'],
-                         data['fdroiddata']['untrackedFiles'])
-
-    def test_get_app_display_name(self):
-        testvalue = 'WIN!'
-        for app in [
-                {'Name': testvalue},
-                {'AutoName': testvalue},
-                {'id': testvalue},
-                {'id': 'a', 'localized': {'de-AT': {'name': testvalue}}},
-                {'id': 'a', 'localized': {
-                    'de-AT': {'name': 'nope'},
-                    'en-US': {'name': testvalue},
-                }},
-                {'AutoName': 'ignore me', 'Name': testvalue, 'id': 'nope'},
-                {'AutoName': testvalue, 'id': 'nope'}]:
-            self.assertEqual(testvalue, fdroidserver.common.get_app_display_name(app))
-
-    @mock.patch.dict(os.environ, {'PATH': os.getenv('PATH')}, clear=True)
-    def test_get_android_tools_versions(self):
-        sdk_path = os.path.join(basedir, 'get_android_tools_versions/android-sdk')
-        config = {
-            'ndk_paths': {'r10e': os.path.join(sdk_path, '..', 'android-ndk-r10e')},
-            'sdk_path': sdk_path,
-        }
-        fdroidserver.common.config = config
-        fdroidserver.common.fill_config_defaults(config)
-        components = fdroidserver.common.get_android_tools_versions()
-        expected = (
-            ('../android-ndk-r10e', 'r10e'),
-            ('ndk-bundle', '21.4.7075529'),
-            ('ndk/11.2.2725575', '11.2.2725575'),
-            ('ndk/17.2.4988734', '17.2.4988734'),
-            ('ndk/21.3.6528147', '21.3.6528147'),
-            ('patcher/v4', '1'),
-            ('platforms/android-30', '3'),
-            ('skiaparser/1', '6'),
-            ('tools', '26.1.1'),
-        )
-        self.assertSequenceEqual(expected, sorted(components))
-
-    @mock.patch.dict(os.environ, {'PATH': os.getenv('PATH')}, clear=True)
-    def test_get_android_tools_versions_no_ndk(self):
-        with tempfile.TemporaryDirectory() as tmpdir:
-            sdk_path = Path(tmpdir) / 'get_android_tools_versions'
-            shutil.copytree(
-                os.path.join(basedir, 'get_android_tools_versions'), sdk_path
-            )
-            shutil.rmtree(sdk_path / 'android-ndk-r10e')
-            shutil.rmtree(sdk_path / 'android-sdk/ndk')
-            shutil.rmtree(sdk_path / 'android-sdk/ndk-bundle')
-            fdroidserver.common.config = {'sdk_path': str(sdk_path)}
-            components = fdroidserver.common.get_android_tools_versions()
-            expected = (
-                ('android-sdk/patcher/v4', '1'),
-                ('android-sdk/platforms/android-30', '3'),
-                ('android-sdk/skiaparser/1', '6'),
-                ('android-sdk/tools', '26.1.1'),
-            )
-        self.assertSequenceEqual(expected, sorted(components))
-
-    def test_read_pkg_args(self):
-        allow_vercodes = False
-        self.assertEqual(
-            {'org.fdroid.fdroid': []},
-            fdroidserver.common.read_pkg_args(['org.fdroid.fdroid'], allow_vercodes),
-        )
-        self.assertNotEqual(
-            {'com.example': [123456]},
-            fdroidserver.common.read_pkg_args(['com.example:123456'], allow_vercodes),
-        )
-
-        allow_vercodes = True
-        self.assertEqual(
-            {'org.fdroid.fdroid': []},
-            fdroidserver.common.read_pkg_args(['org.fdroid.fdroid'], allow_vercodes),
-        )
-        self.assertEqual(
-            {'com.example': [123456]},
-            fdroidserver.common.read_pkg_args(['com.example:123456'], allow_vercodes),
-        )
-        self.assertEqual(
-            {'org.debian_kit': [6]},
-            fdroidserver.common.read_pkg_args(['org.debian_kit_6.apk'], allow_vercodes),
-        )
-        appid_versionCode_pairs = (
-            'org.fdroid.fdroid:1',
-            'com.example:12345',
-            'com.example:67890',
-        )
-        self.assertEqual(
-            {'com.example': [12345, 67890], 'org.fdroid.fdroid': [1]},
-            fdroidserver.common.read_pkg_args(appid_versionCode_pairs, allow_vercodes),
-        )
-        appid_versionCode_pairs = (
-            'com.example:67890',
-            'org.c_base.c_beam_29.apk',
-        )
-        self.assertEqual(
-            {'com.example': [67890], 'org.c_base.c_beam': [29]},
-            fdroidserver.common.read_pkg_args(appid_versionCode_pairs, allow_vercodes),
-        )
-
-    def test_read_pkg_args_errors(self):
-        allow_vercodes = True
-        with self.assertRaises(FDroidException):
-            fdroidserver.common.read_pkg_args(['org.fdroid.fdroid:'], allow_vercodes),
-        with self.assertRaises(FDroidException):
-            fdroidserver.common.read_pkg_args(['org.fdroid.fdroid:foo'], allow_vercodes),
-
-    def test_apk_strip_v1_signatures(self):
-        before = os.path.join(basedir, 'no_targetsdk_minsdk1_unsigned.apk')
-        after = os.path.join(self.testdir, 'after.apk')
-        shutil.copy(before, after)
-        fdroidserver.common.apk_strip_v1_signatures(after, strip_manifest=False)
-
-    def test_metadata_find_developer_signing_files(self):
-        appid = 'org.smssecure.smssecure'
-
-        self.assertIsNone(
-            fdroidserver.common.metadata_find_developer_signing_files(appid, 133)
-        )
-
-        vc = '135'
-        self.assertEqual(
-            (
-                os.path.join('metadata', appid, 'signatures', vc, '28969C09.RSA'),
-                os.path.join('metadata', appid, 'signatures', vc, '28969C09.SF'),
-                os.path.join('metadata', appid, 'signatures', vc, 'MANIFEST.MF'),
-                None,
-            ),
-            fdroidserver.common.metadata_find_developer_signing_files(appid, vc),
-        )
-
-        vc = '134'
-        self.assertEqual(
-            (
-                os.path.join('metadata', appid, 'signatures', vc, '28969C09.RSA'),
-                os.path.join('metadata', appid, 'signatures', vc, '28969C09.SF'),
-                os.path.join('metadata', appid, 'signatures', vc, 'MANIFEST.MF'),
-                None,
-            ),
-            fdroidserver.common.metadata_find_developer_signing_files(appid, vc),
-        )
-
-    @mock.patch('sdkmanager.build_package_list', lambda use_net: None)
-    def test_auto_install_ndk(self):
-        """Test all possible field data types for build.ndk"""
-        fdroidserver.common.config = {'sdk_path': self.testdir}
-        sdk_path = self.testdir
-        build = fdroidserver.metadata.Build()
-
-        none_entry = mock.Mock()
-        with mock.patch('sdkmanager.install', none_entry):
-            fdroidserver.common.auto_install_ndk(build)
-            none_entry.assert_not_called()
-
-        empty_list = mock.Mock()
-        build.ndk = []
-        with mock.patch('sdkmanager.install', empty_list):
-            fdroidserver.common.auto_install_ndk(build)
-            empty_list.assert_not_called()
-
-        release_entry = mock.Mock()
-        build.ndk = 'r21e'
-        with mock.patch('sdkmanager.install', release_entry):
-            fdroidserver.common.auto_install_ndk(build)
-            release_entry.assert_called_once_with('ndk;r21e', sdk_path)
-
-        revision_entry = mock.Mock()
-        build.ndk = '21.4.7075529'
-        with mock.patch('sdkmanager.install', revision_entry):
-            fdroidserver.common.auto_install_ndk(build)
-            revision_entry.assert_called_once_with('ndk;21.4.7075529', sdk_path)
-
-        list_entry = mock.Mock()
-        calls = []
-        build.ndk = ['r10e', '11.0.2655954', 'r12b', 'r21e']
-        for n in build.ndk:
-            calls.append(mock.call(f'ndk;{n}', sdk_path))
-        with mock.patch('sdkmanager.install', list_entry):
-            fdroidserver.common.auto_install_ndk(build)
-            list_entry.assert_has_calls(calls)
-
-    @unittest.skipIf(importlib.util.find_spec('sdkmanager') is None, 'needs sdkmanager')
-    @mock.patch('sdkmanager.build_package_list', lambda use_net: None)
-    @mock.patch('sdkmanager._install_zipball_from_cache', lambda a, b: None)
-    @mock.patch('sdkmanager._generate_package_xml', lambda a, b, c: None)
-    def test_auto_install_ndk_mock_dl(self):
-        """Test NDK installs by actually calling sdkmanager"""
-        import importlib.metadata
-
-        import sdkmanager
-
-        sdkmanager_version = LooseVersion(importlib.metadata.version('sdkmanager'))
-        if sdkmanager_version < LooseVersion('0.6.4'):
-            raise unittest.SkipTest('needs fdroid sdkmanager >= 0.6.4')
-
-        fdroidserver.common.config = {'sdk_path': 'placeholder'}
-        build = fdroidserver.metadata.Build()
-        url = 'https://dl.google.com/android/repository/android-ndk-r24-linux.zip'
-        path = sdkmanager.get_cachedir() / os.path.basename(url)
-        sdkmanager.packages = {
-            ('ndk', '24.0.8215888'): url,
-            ('ndk', 'r24'): url,
-        }
-        build.ndk = 'r24'
-        firstrun = mock.Mock()
-        with mock.patch('sdkmanager.download_file', firstrun):
-            fdroidserver.common.auto_install_ndk(build)
-            firstrun.assert_called_once_with(url, path)
-        build.ndk = '24.0.8215888'
-        secondrun = mock.Mock()
-        with mock.patch('sdkmanager.download_file', secondrun):
-            fdroidserver.common.auto_install_ndk(build)
-            secondrun.assert_called_once_with(url, path)
-
-    @unittest.skip("This test downloads and unzips a 1GB file.")
-    def test_install_ndk(self):
-        """NDK r10e is a special case since its missing source.properties"""
-        config = {'sdk_path': self.testdir}
-        fdroidserver.common.config = config
-        fdroidserver.common._install_ndk('r10e')
-        r10e = os.path.join(self.testdir, 'ndk', 'r10e')
-        self.assertEqual('r10e', fdroidserver.common.get_ndk_version(r10e))
-        fdroidserver.common.fill_config_defaults(config)
-        self.assertEqual({'r10e': r10e}, config['ndk_paths'])
-
-    def test_fill_config_defaults(self):
-        """Test the auto-detection of NDKs installed in standard paths"""
-        ndk_bundle = os.path.join(self.testdir, 'ndk-bundle')
-        os.makedirs(ndk_bundle)
-        with open(os.path.join(ndk_bundle, 'source.properties'), 'w') as fp:
-            fp.write('Pkg.Desc = Android NDK\nPkg.Revision = 17.2.4988734\n')
-        config = {'sdk_path': self.testdir}
-        fdroidserver.common.fill_config_defaults(config)
-        self.assertEqual({'17.2.4988734': ndk_bundle}, config['ndk_paths'])
-
-        r21e = os.path.join(self.testdir, 'ndk', '21.4.7075529')
-        os.makedirs(r21e)
-        with open(os.path.join(r21e, 'source.properties'), 'w') as fp:
-            fp.write('Pkg.Desc = Android NDK\nPkg.Revision = 21.4.7075529\n')
-        config = {'sdk_path': self.testdir}
-        fdroidserver.common.fill_config_defaults(config)
-        self.assertEqual(
-            {'17.2.4988734': ndk_bundle, '21.4.7075529': r21e},
-            config['ndk_paths'],
-        )
-
-        r10e = os.path.join(self.testdir, 'ndk', 'r10e')
-        os.makedirs(r10e)
-        with open(os.path.join(r10e, 'RELEASE.TXT'), 'w') as fp:
-            fp.write('r10e-rc4 (64-bit)\n')
-        config = {'sdk_path': self.testdir}
-        fdroidserver.common.fill_config_defaults(config)
-        self.assertEqual(
-            {'r10e': r10e, '17.2.4988734': ndk_bundle, '21.4.7075529': r21e},
-            config['ndk_paths'],
-        )
-
-    @unittest.skipIf(not os.path.isdir('/usr/lib/jvm/default-java'), 'uses Debian path')
-    def test_fill_config_defaults_java(self):
-        """Test the auto-detection of Java installed in standard paths"""
-        config = {'sdk_path': self.testdir}
-        fdroidserver.common.fill_config_defaults(config)
-        java_paths = []
-        # use presence of javac to make sure its JDK not just JRE
-        for f in glob.glob('/usr/lib/jvm/java-*-openjdk-*/bin/javac'):
-            jdk = os.path.dirname(os.path.dirname(f))
-            if not os.path.islink(jdk):
-                java_paths.append(jdk)
-        self.assertEqual(
-            len(java_paths),
-            len(config['java_paths'])
-        )
-        for f in config['java_paths'].values():
-            self.assertTrue(f in java_paths)
-            self.assertTrue(isinstance(f, str))  # paths in config must be str
-
-    @mock.patch.dict(os.environ, clear=True)
-    def test_sdk_path_in_config_must_be_strings(self):
-        """All paths in config must be strings, and never pathlib.Path instances"""
-        os.environ['PATH'] = '/usr/bin:/usr/sbin'
-        config = {'sdk_path': Path('/opt/android-sdk')}
-        fdroidserver.common.fill_config_defaults(config)
-        build = fdroidserver.metadata.Build()
-        with self.assertRaises(TypeError):
-            fdroidserver.common.set_FDroidPopen_env(build=build)
-
-    @mock.patch.dict(os.environ, clear=True)
-    def test_ndk_paths_in_config_must_be_strings(self):
-        """All paths in config must be strings, and never pathlib.Path instances"""
-        fdroidserver.common.config = {
-            'ndk_paths': {'r21d': Path('/opt/android-sdk/ndk/r21d')}
-        }
-        build = fdroidserver.metadata.Build()
-        build.ndk = 'r21d'
-        os.environ['PATH'] = '/usr/bin:/usr/sbin'
-        with self.assertRaises(TypeError):
-            fdroidserver.common.set_FDroidPopen_env(build=build)
-
-    @mock.patch.dict(os.environ, clear=True)
-    def test_FDroidPopen_envs_paths_can_be_pathlib(self):
-        _mock_common_module_options_instance()
-        os.environ['PATH'] = '/usr/bin:/usr/sbin'
-        envs = {'PATHLIB': Path('/pathlib/path'), 'STRING': '/string/path'}
-        p = fdroidserver.common.FDroidPopen(['/bin/sh', '-c', 'export'], envs=envs)
-        self.assertIn('/string/path', p.output)
-        self.assertIn('/pathlib/path', p.output)
-
-    def test_vcs_git_latesttags(self):
-        tags = [
-            "1.1.1",
-            "2.2.2",
-            "v3.0",
-            "0.0.4",
-            "0.5.0-beta",
-            "666(6)",
-            "seven",
-        ]
-        with tempfile.TemporaryDirectory() as tmpdir, TmpCwd(tmpdir):
-            repo = git.Repo.init(Path.cwd())
-            f = Path("test")
-            date = 10 ** 9
-            for tag in tags:
-                date += 1
-                f.write_text(tag)
-                repo.index.add([str(f)])
-                repo.index.commit(tag, commit_date=str(date) + " +0000")
-                repo.create_tag(tag)
-
-            vcs = fdroidserver.common.vcs_git(None, Path.cwd())
-            self.assertEqual(vcs.latesttags(), tags[::-1])
-
-    def test_vcs_git_getref(self):
-
-        with tempfile.TemporaryDirectory() as tmpdir, TmpCwd(tmpdir):
-            repo = git.Repo.init(Path.cwd())
-            tag = "1.1.1"
-            f = Path("test")
-            f.write_text(tag)
-            repo.index.add([str(f)])
-            repo.index.commit("foo")
-            repo.create_tag(tag)
-
-            vcs = fdroidserver.common.vcs_git(None, Path.cwd())
-
-            self.assertIsNotNone(vcs.getref("1.1.1"))
-            self.assertIsNone(vcs.getref("invalid"))
-
-    def test_get_release_filename(self):
-        app = fdroidserver.metadata.App()
-        app.id = 'test.app'
-        build = fdroidserver.metadata.Build()
-        build.versionCode = 123
-
-        build.output = 'build/apk/*'
-        self.assertEqual(
-            fdroidserver.common.get_release_filename(app, build),
-            "%s_%s.apk" % (app.id, build.versionCode),
-        )
-
-        build.output = 'build/apk/*.zip'
-        self.assertEqual(
-            fdroidserver.common.get_release_filename(app, build),
-            "%s_%s.zip" % (app.id, build.versionCode),
-        )
-
-        build.output = 'build/apk/*.apk'
-        self.assertEqual(
-            fdroidserver.common.get_release_filename(app, build),
-            "%s_%s.apk" % (app.id, build.versionCode),
-        )
-
-        build.output = 'build/apk/*.apk'
-        self.assertEqual(
-            fdroidserver.common.get_release_filename(app, build, 'exe'),
-            "%s_%s.exe" % (app.id, build.versionCode),
-        )
-
-    def test_no_zero_length_ndk_path_prefixes(self):
-        fdroidserver.common.config = {'ndk_paths': {}}
-        build = fdroidserver.metadata.Build()
-
-        with mock.patch.dict(os.environ, clear=True):
-            os.environ['PATH'] = '/usr/bin:/usr/sbin'
-            fdroidserver.common.set_FDroidPopen_env(build=build)
-            self.assertNotIn('', os.getenv('PATH').split(os.pathsep))
-
-    def test_is_repo_file(self):
-        is_repo_file = fdroidserver.common.is_repo_file
-        self.assertFalse(is_repo_file('does-not-exist'))
-
-        with tempfile.TemporaryDirectory() as tmpdir, TmpCwd(tmpdir):
-            Path('repo').mkdir()
-            repo_files = [
-                'repo/com.example.test.helloworld_1.apk',
-                'repo/com.politedroid_6.apk',
-                'repo/duplicate.permisssions_9999999.apk',
-                'repo/fake.ota.update_1234.zip',
-                'repo/info.guardianproject.index-v1.jar_123.apk',
-                'repo/info.zwanenburg.caffeinetile_4.apk',
-                'repo/main.1101613.obb.main.twoversions.obb',
-            ]
-            index_files = [
-                'repo/entry.jar',
-                'repo/entry.json',
-                'repo/index-v1.jar',
-                'repo/index-v1.json',
-                'repo/index-v2.json',
-                'repo/index.css',
-                'repo/index.html',
-                'repo/index.jar',
-                'repo/index.png',
-                'repo/index.xml',
-            ]
-            for f in repo_files + index_files:
-                open(f, 'w').close()
-
-            repo_dirs = [
-                'repo/com.politedroid',
-                'repo/info.guardianproject.index-v1.jar',
-                'repo/status',
-            ]
-            for d in repo_dirs:
-                os.mkdir(d)
-
-            for f in repo_files:
-                self.assertTrue(os.path.exists(f), f + ' was created')
-                self.assertTrue(is_repo_file(f), f + ' is repo file')
-
-            for f in index_files:
-                self.assertTrue(os.path.exists(f), f + ' was created')
-                self.assertFalse(is_repo_file(f), f + ' is repo file')
-                gpg_signed = [
-                    'repo/entry.json',
-                    'repo/index-v1.json',
-                    'repo/index-v2.json',
-                ]
-                self.assertEqual(
-                    (f in gpg_signed or is_repo_file(f, for_gpg_signing=False)),
-                    is_repo_file(f, for_gpg_signing=True),
-                    f + ' gpg signable?',
-                )
-
-            for d in repo_dirs:
-                self.assertTrue(os.path.exists(d), d + ' was created')
-                self.assertFalse(is_repo_file(d), d + ' not repo file')
-
-    def test_get_apksigner_smartcardoptions(self):
-        os.chdir(self.testdir)
-        with open(fdroidserver.common.CONFIG_FILE, 'w', encoding='utf-8') as fp:
-            d = {
-                'smartcardoptions': '-storetype PKCS11'
-                ' -providerName SunPKCS11-OpenSC'
-                ' -providerClass sun.security.pkcs11.SunPKCS11'
-                ' -providerArg opensc-fdroid.cfg'
-            }
-            config_dump(d, fp)
-        config = fdroidserver.common.read_config()
-        fdroidserver.common.config = config
-        self.assertTrue(isinstance(d['smartcardoptions'], str))
-        self.assertTrue(isinstance(config['smartcardoptions'], list))
-        self.assertEqual(
-            [
-                '--ks-type',
-                'PKCS11',
-                '--provider-class',
-                'sun.security.pkcs11.SunPKCS11',
-                '--provider-arg',
-                'opensc-fdroid.cfg',
-            ],
-            fdroidserver.common.get_apksigner_smartcardoptions(
-                config['smartcardoptions']
-            ),
-        )
-
-    def test_get_smartcardoptions_list(self):
-        os.chdir(self.testdir)
-        fdroidserver.common.write_config_file(
-            textwrap.dedent(
-                """
-                    smartcardoptions:
-                      - -storetype
-                      -  PKCS11
-                      - -providerName
-                      -  SunPKCS11-OpenSC
-                      - -providerClass
-                      -  sun.security.pkcs11.SunPKCS11
-                      - -providerArg
-                      -  opensc-fdroid.cfg
-                """
-            )
-        )
-        config = fdroidserver.common.read_config()
-        fdroidserver.common.config = config
-        self.assertTrue(isinstance(config['smartcardoptions'], list))
-        self.assertEqual(
-            [
-                '-storetype',
-                'PKCS11',
-                '-providerName',
-                'SunPKCS11-OpenSC',
-                '-providerClass',
-                'sun.security.pkcs11.SunPKCS11',
-                '-providerArg',
-                'opensc-fdroid.cfg',
-            ],
-            config['smartcardoptions'],
-        )
-
-    def test_get_smartcardoptions_spaces(self):
-        os.chdir(self.testdir)
-        fdroidserver.common.write_config_file(
-            textwrap.dedent(
-                """
-                smartcardoptions: |
-                  -storetype      PKCS11
-                  -providerClass  sun.security.pkcs11.SunPKCS11
-                  -providerArg    /etc/pkcs11_java.cfg
-                """
-            )
-        )
-        config = fdroidserver.common.read_config()
-        fdroidserver.common.config = config
-        self.assertTrue(isinstance(config['smartcardoptions'], list))
-        self.assertEqual(
-            [
-                '-storetype',
-                'PKCS11',
-                '-providerClass',
-                'sun.security.pkcs11.SunPKCS11',
-                '-providerArg',
-                '/etc/pkcs11_java.cfg',
-            ],
-            config['smartcardoptions'],
-        )
-
-    def test_load_localized_config(self):
-        """It should load"""
-        antiFeatures = fdroidserver.common.load_localized_config(
-            ANTIFEATURES_CONFIG_NAME, 'repo'
-        )
-        self.assertEqual(
-            [
-                'Ads',
-                'DisabledAlgorithm',
-                'KnownVuln',
-                'NSFW',
-                'NoSourceSince',
-                'NonFreeAdd',
-                'NonFreeAssets',
-                'NonFreeDep',
-                'NonFreeNet',
-                'Tracking',
-            ],
-            list(antiFeatures.keys()),
-        )
-        self.assertEqual(
-            ['de', 'en-US', 'fa', 'ro', 'zh-rCN'],
-            list(antiFeatures['Ads']['description'].keys()),
-        )
-        self.assertEqual(
-            ['en-US'],
-            list(antiFeatures['NoSourceSince']['description'].keys()),
-        )
-        # it should have copied the icon files into place
-        for v in antiFeatures.values():
-            p = Path(os.path.dirname(__file__) + '/repo' + v['icon']['en-US']['name'])
-            self.assertTrue(p.exists())
-
-    def test_load_localized_config_categories(self):
-        """It should load"""
-        categories = fdroidserver.common.load_localized_config(
-            CATEGORIES_CONFIG_NAME, 'repo'
-        )
-        self.assertEqual(
-            [
-                'Time',
-                'Development',
-                'GuardianProject',
-                'Multimedia',
-                'Phone & SMS',
-                'Security',
-                'System',
-            ],
-            list(categories.keys()),
-        )
-        self.assertEqual(['en-US'], list(categories['GuardianProject']['name'].keys()))
-
-    def test_load_localized_config_copy_icon(self):
-        os.chdir(self.testdir)
-        os.mkdir('config')
-        Path('config/categories.yml').write_text('System:\n  icon: system.png')
-        source_file = 'config/system.png'
-        Path(source_file).write_text('placeholder')
-        time.sleep(0.01)  # ensure reliable failure if mtime isn't preserved
-        fdroidserver.common.load_localized_config(CATEGORIES_CONFIG_NAME, 'repo')
-        dest_file = f'repo/icons/{os.path.basename(source_file)}'
-        self.assertEqual(os.path.getsize(source_file), os.path.getsize(dest_file))
-        self.assertEqual(os.path.getmtime(source_file), os.path.getmtime(dest_file))
-
-    def test_load_localized_config_copy_unchanged(self):
-        """The destination file should only change if the source file did."""
-        os.chdir(self.testdir)
-        os.mkdir('config')
-        Path('config/categories.yml').write_text('System:\n  icon: system.png')
-        source_file = 'config/system.png'
-        Path(source_file).write_text('placeholder')
-        fdroidserver.common.load_localized_config(CATEGORIES_CONFIG_NAME, 'repo')
-        delta = 0.01
-        time.sleep(delta)  # ensure reliable failure if file isn't preserved
-        fdroidserver.common.load_localized_config(CATEGORIES_CONFIG_NAME, 'repo')
-        dest_file = f'repo/icons/{os.path.basename(source_file)}'
-        self.assertAlmostEqual(
-            os.path.getctime(source_file), os.path.getctime(dest_file), delta=delta
-        )
-
-    def test_load_localized_config_copy_over_dest(self):
-        os.chdir(self.testdir)
-        os.mkdir('config')
-        Path('config/categories.yml').write_text('System:\n  icon: system.png')
-        source_file = Path('config/system.png')
-        dest_file = Path(f'repo/icons/{os.path.basename(source_file)}')
-        source_file.write_text('placeholder')
-        dest_file.parent.mkdir(parents=True)
-        dest_file.write_text('different contents')
-        fdroidserver.common.load_localized_config(CATEGORIES_CONFIG_NAME, 'repo')
-        self.assertEqual(os.path.getsize(source_file), os.path.getsize(dest_file))
-
-    def test_load_localized_config_0_file(self):
-        os.chdir(self.testdir)
-        os.mkdir('config')
-        Path('config/categories.yml').write_text('')
-        with self.assertRaises(TypeError):
-            fdroidserver.common.load_localized_config(CATEGORIES_CONFIG_NAME, 'repo')
-
-    def test_load_localized_config_string(self):
-        os.chdir(self.testdir)
-        os.mkdir('config')
-        Path('config/categories.yml').write_text('this is a string')
-        with self.assertRaises(TypeError):
-            fdroidserver.common.load_localized_config(CATEGORIES_CONFIG_NAME, 'repo')
-
-    def test_load_localized_config_list(self):
-        os.chdir(self.testdir)
-        os.mkdir('config')
-        Path('config/categories.yml').write_text('- System')
-        with self.assertRaises(TypeError):
-            fdroidserver.common.load_localized_config(CATEGORIES_CONFIG_NAME, 'repo')
-
-    def test_config_type_check_config_yml_dict(self):
-        fdroidserver.common.config_type_check('config.yml', dict())
-
-    def test_config_type_check_config_yml_list(self):
-        with self.assertRaises(TypeError):
-            fdroidserver.common.config_type_check('config.yml', list())
-
-    def test_config_type_check_config_yml_set(self):
-        with self.assertRaises(TypeError):
-            fdroidserver.common.config_type_check('config.yml', set())
-
-    def test_config_type_check_config_yml_str(self):
-        with self.assertRaises(TypeError):
-            fdroidserver.common.config_type_check('config.yml', str())
-
-    def test_config_type_check_mirrors_list(self):
-        fdroidserver.common.config_type_check('config/mirrors.yml', list())
-
-    def test_config_type_check_mirrors_dict(self):
-        with self.assertRaises(TypeError):
-            fdroidserver.common.config_type_check('config/mirrors.yml', dict())
-
-    def test_config_type_check_mirrors_set(self):
-        with self.assertRaises(TypeError):
-            fdroidserver.common.config_type_check('config/mirrors.yml', set())
-
-    def test_config_type_check_mirrors_str(self):
-        with self.assertRaises(TypeError):
-            fdroidserver.common.config_type_check('config/mirrors.yml', str())
-
-    def test_config_serverwebroot_str(self):
-        os.chdir(self.testdir)
-        fdroidserver.common.write_config_file(
-            """serverwebroot: 'foo@example.com:/var/www'"""
-        )
-        self.assertEqual(
-            [{'url': 'foo@example.com:/var/www/'}],
-            fdroidserver.common.read_config()['serverwebroot'],
-        )
-
-    def test_config_serverwebroot_list(self):
-        os.chdir(self.testdir)
-        fdroidserver.common.write_config_file(
-            """serverwebroot:\n  - foo@example.com:/var/www"""
-        )
-        self.assertEqual(
-            [{'url': 'foo@example.com:/var/www/'}],
-            fdroidserver.common.read_config()['serverwebroot'],
-        )
-
-    def test_config_serverwebroot_dict(self):
-        os.chdir(self.testdir)
-        fdroidserver.common.write_config_file(
-            """serverwebroot:\n  - url: 'foo@example.com:/var/www'"""
-        )
-        self.assertEqual(
-            [{'url': 'foo@example.com:/var/www/'}],
-            fdroidserver.common.read_config()['serverwebroot'],
-        )
-
-    @mock.patch.dict(os.environ, {'PATH': os.getenv('PATH')}, clear=True)
-    def test_config_serverwebroot_list_of_dicts_env(self):
-        os.chdir(self.testdir)
-        url = 'foo@example.com:/var/www/'
-        os.environ['serverwebroot'] = url
-        fdroidserver.common.write_config_file(
-            textwrap.dedent(
-                """\
-                serverwebroot:
-                  - url: {env: serverwebroot}
-                    index_only: true
-                """
-            )
-        )
-        self.assertEqual(
-            [{'url': url, 'index_only': True}],
-            fdroidserver.common.read_config()['serverwebroot'],
-        )
-
-    def test_expand_env_dict_fake_str(self):
-        testvalue = '"{env: foo}"'
-        self.assertEqual(testvalue, fdroidserver.common.expand_env_dict(testvalue))
-
-    @mock.patch.dict(os.environ, {'PATH': os.getenv('PATH')}, clear=True)
-    def test_expand_env_dict_good(self):
-        name = 'foo'
-        value = 'bar'
-        os.environ[name] = value
-        self.assertEqual(value, fdroidserver.common.expand_env_dict({'env': name}))
-
-    @mock.patch.dict(os.environ, {'PATH': os.getenv('PATH')}, clear=True)
-    def test_expand_env_dict_bad_dict(self):
-        with self.assertRaises(TypeError):
-            fdroidserver.common.expand_env_dict({'env': 'foo', 'foo': 'bar'})
-
-    def test_parse_list_of_dicts_str(self):
-        s = 'foo@example.com:/var/www'
-        mirrors = yaml.load("""'%s'""" % s)
-        self.assertEqual(
-            [{'url': s}], fdroidserver.common.parse_list_of_dicts(mirrors)
-        )
-
-    def test_parse_list_of_dicts_list(self):
-        s = 'foo@example.com:/var/www'
-        mirrors = yaml.load("""- '%s'""" % s)
-        self.assertEqual(
-            [{'url': s}], fdroidserver.common.parse_list_of_dicts(mirrors)
-        )
-
-    def test_parse_list_of_dicts_dict(self):
-        s = 'foo@example.com:/var/www'
-        mirrors = yaml.load("""- url: '%s'""" % s)
-        self.assertEqual(
-            [{'url': s}], fdroidserver.common.parse_list_of_dicts(mirrors)
-        )
-
-    @mock.patch.dict(os.environ, {'PATH': os.getenv('PATH'), 'foo': 'bar'}, clear=True)
-    def test_parse_list_of_dicts_env_str(self):
-        mirrors = yaml.load('{env: foo}')
-        self.assertEqual(
-            [{'url': 'bar'}], fdroidserver.common.parse_list_of_dicts(mirrors)
-        )
-
-    def test_parse_list_of_dicts_env_list(self):
-        s = 'foo@example.com:/var/www'
-        mirrors = yaml.load("""- '%s'""" % s)
-        self.assertEqual(
-            [{'url': s}], fdroidserver.common.parse_list_of_dicts(mirrors)
-        )
-
-    def test_parse_list_of_dicts_env_dict(self):
-        s = 'foo@example.com:/var/www'
-        mirrors = yaml.load("""- url: '%s'""" % s)
-        self.assertEqual(
-            [{'url': s}], fdroidserver.common.parse_list_of_dicts(mirrors)
-        )
-
-    def test_KnownApks_recordapk(self):
-        """Test that added dates are being fetched from the index.
-
-        There are more related tests in tests/run-tests.
-
-        """
-        now = datetime.now(timezone.utc)
-        knownapks = fdroidserver.common.KnownApks()
-        for apkName in knownapks.apks:
-            knownapks.recordapk(apkName, default_date=now)
-        for added in knownapks.apks.values():
-            self.assertNotEqual(added, now)
-
-    def test_KnownApks_recordapk_new(self):
-        """Test that new added dates work, and are not replaced later.
-
-        There are more related tests in tests/run-tests.
-
-        """
-        now = datetime.now(timezone.utc)
-        knownapks = fdroidserver.common.KnownApks()
-        fake_apk = 'fake.apk'
-        knownapks.recordapk(fake_apk, default_date=now)
-        for apk, added in knownapks.apks.items():
-            if apk == fake_apk:
-                self.assertEqual(added, now)
-            else:
-                self.assertNotEqual(added, now)
-        knownapks.recordapk(fake_apk, default_date=datetime.now(timezone.utc))
-        self.assertEqual(knownapks.apks[fake_apk], now)
-
-    def test_get_mirrors_fdroidorg(self):
-        mirrors = fdroidserver.common.get_mirrors(
-            'https://f-droid.org/repo', 'entry.jar'
-        )
-        self.assertEqual(
-            'https://f-droid.org/repo/entry.jar',
-            mirrors[0]['url'],
-        )
-
-    def test_get_mirrors_other(self):
-        self.assertEqual(
-            [{'url': 'https://example.com/fdroid/repo/index-v2.json'}],
-            fdroidserver.common.get_mirrors(
-                'https://example.com/fdroid/repo', 'index-v2.json'
-            ),
-        )
-
-    def test_append_filename_to_mirrors(self):
-        filename = 'test.apk'
-        url = 'https://example.com/fdroid/repo'
-        mirrors = [{'url': url}]
-        self.assertEqual(
-            [{'url': url + '/' + filename}],
-            fdroidserver.common.append_filename_to_mirrors(filename, mirrors),
-        )
-
-    def test_append_filename_to_mirrors_full(self):
-        filename = 'test.apk'
-        mirrors = fdroidserver.common.FDROIDORG_MIRRORS
-        for mirror in fdroidserver.common.append_filename_to_mirrors(filename, mirrors):
-            self.assertTrue(mirror['url'].endswith('/' + filename))
-
-    def test_get_source_date_epoch(self):
-        git_repo = git.Repo.init(self.testdir)
-        Path('README').write_text('file to commit')
-        git_repo.git.add(all=True)
-        git_repo.index.commit("README")
-        self.assertEqual(
-            git_repo.git.log(n=1, pretty='%ct'),
-            fdroidserver.common.get_source_date_epoch(self.testdir),
-        )
-
-    def test_get_source_date_epoch_no_scm(self):
-        self.assertIsNone(fdroidserver.common.get_source_date_epoch(self.testdir))
-
-    def test_get_source_date_epoch_not_git(self):
-        """Test when build_dir is not a git repo, e.g. hg, svn, etc."""
-        appid = 'com.example'
-        build_dir = Path(self.testdir) / 'build' / appid
-        fdroiddata = build_dir.parent.parent
-        (fdroiddata / 'metadata').mkdir()
-        build_dir.mkdir(parents=True)
-        os.chdir(build_dir)
-        git_repo = git.Repo.init(fdroiddata)  # fdroiddata is always a git repo
-        with (fdroiddata / f'metadata/{appid}.yml').open('w') as fp:
-            fp.write('AutoName: Example App\n')
-        git_repo.git.add(all=True)
-        git_repo.index.commit("update README")
-        self.assertEqual(
-            git.repo.Repo(fdroiddata).git.log(n=1, pretty='%ct'),
-            fdroidserver.common.get_source_date_epoch(build_dir),
-        )
-
-    @mock.patch.dict(os.environ, {'PATH': os.getenv('PATH')}, clear=True)
-    def test_set_FDroidPopen_env_with_app(self):
-        """Test SOURCE_DATE_EPOCH in FDroidPopen when build_dir is a git repo."""
-        os.chdir(self.testdir)
-        app = fdroidserver.metadata.App()
-        app.id = 'com.example'
-        build_dir = Path(self.testdir) / 'build' / app.id
-        git_repo = git.Repo.init(build_dir)
-        Path('README').write_text('file to commit')
-        git_repo.git.add(all=True)
-        now = datetime.now(timezone.utc)
-        git_repo.index.commit("README", commit_date=now)
-        fdroidserver.common.set_FDroidPopen_env(app)
-        p = fdroidserver.common.FDroidPopen(['printenv', 'SOURCE_DATE_EPOCH'])
-        self.assertEqual(int(p.output), int(now.timestamp()))
-
-    def test_calculate_gradle_flavor_combination(self):
-        flavors = ['aa', 'BB', 'δδ']
-        combinations = ['aaBBΔδ', 'aaBB', 'aaΔδ', 'aa', 'BBΔδ', 'BB', 'δδ', '']
-        self.assertEqual(fdroidserver.common.calculate_gradle_flavor_combination(flavors), combinations)
-
-
-APKS_WITH_JAR_SIGNATURES = (
-    (
-        'SpeedoMeterApp.main_1.apk',
-        '2e6b3126fb7e0db6a9d4c2a06df690620655454d6e152cf244cc9efe9787a77d',
-    ),
-    (
-        'apk.embedded_1.apk',
-        '764f0eaac0cdcde35023658eea865c4383ab580f9827c62fdd3daf9e654199ee',
-    ),
-    (
-        'bad-unicode-πÇÇ现代通用字-български-عربي1.apk',
-        '32a23624c201b949f085996ba5ed53d40f703aca4989476949cae891022e0ed6',
-    ),
-    (
-        'issue-1128-poc3a.apk',
-        '1dbb8be012293e988a0820f7d455b07abd267d2c0b500fc793fcfd80141cb5ce',
-    ),
-    (
-        'issue-1128-poc3b.apk',
-        '1dbb8be012293e988a0820f7d455b07abd267d2c0b500fc793fcfd80141cb5ce',
-    ),
-    (
-        'janus.apk',
-        'ebb0fedf1942a099b287c3db00ff732162152481abb2b6c7cbcdb2ba5894a768',
-    ),
-    (
-        'org.bitbucket.tickytacky.mirrormirror_1.apk',
-        'feaa63df35b4635cf091513dfcd6d11209632555efdfc47e33b70d4e4eb5ba28',
-    ),
-    (
-        'org.bitbucket.tickytacky.mirrormirror_2.apk',
-        'feaa63df35b4635cf091513dfcd6d11209632555efdfc47e33b70d4e4eb5ba28',
-    ),
-    (
-        'org.bitbucket.tickytacky.mirrormirror_3.apk',
-        'feaa63df35b4635cf091513dfcd6d11209632555efdfc47e33b70d4e4eb5ba28',
-    ),
-    (
-        'org.bitbucket.tickytacky.mirrormirror_4.apk',
-        'feaa63df35b4635cf091513dfcd6d11209632555efdfc47e33b70d4e4eb5ba28',
-    ),
-    (
-        'org.dyndns.fules.ck_20.apk',
-        '9326a2cc1a2f148202bc7837a0af3b81200bd37fd359c9e13a2296a71d342056',
-    ),
-    (
-        'org.sajeg.fallingblocks_3.apk',
-        '033389681f4288fdb3e72a28058c8506233ca50de75452ab6c9c76ea1ca2d70f',
-    ),
-    (
-        'repo/com.example.test.helloworld_1.apk',
-        'c3a5ca5465a7585a1bda30218ae4017083605e3576867aa897d724208d99696c',
-    ),
-    (
-        'repo/com.politedroid_3.apk',
-        '32a23624c201b949f085996ba5ed53d40f703aca4989476949cae891022e0ed6',
-    ),
-    (
-        'repo/com.politedroid_4.apk',
-        '32a23624c201b949f085996ba5ed53d40f703aca4989476949cae891022e0ed6',
-    ),
-    (
-        'repo/com.politedroid_5.apk',
-        '32a23624c201b949f085996ba5ed53d40f703aca4989476949cae891022e0ed6',
-    ),
-    (
-        'repo/com.politedroid_6.apk',
-        '32a23624c201b949f085996ba5ed53d40f703aca4989476949cae891022e0ed6',
-    ),
-    (
-        'repo/duplicate.permisssions_9999999.apk',
-        '659e1fd284549f70d13fb02c620100e27eeea3420558cce62b0f5d4cf2b77d84',
-    ),
-    (
-        'repo/info.zwanenburg.caffeinetile_4.apk',
-        '51cfa5c8a743833ad89acf81cb755936876a5c8b8eca54d1ffdcec0cdca25d0e',
-    ),
-    (
-        'repo/no.min.target.sdk_987.apk',
-        '32a23624c201b949f085996ba5ed53d40f703aca4989476949cae891022e0ed6',
-    ),
-    (
-        'repo/obb.main.oldversion_1444412523.apk',
-        '818e469465f96b704e27be2fee4c63ab9f83ddf30e7a34c7371a4728d83b0bc1',
-    ),
-    (
-        'repo/obb.main.twoversions_1101613.apk',
-        '32a23624c201b949f085996ba5ed53d40f703aca4989476949cae891022e0ed6',
-    ),
-    (
-        'repo/obb.main.twoversions_1101615.apk',
-        '32a23624c201b949f085996ba5ed53d40f703aca4989476949cae891022e0ed6',
-    ),
-    (
-        'repo/obb.main.twoversions_1101617.apk',
-        '32a23624c201b949f085996ba5ed53d40f703aca4989476949cae891022e0ed6',
-    ),
-    (
-        'repo/obb.mainpatch.current_1619.apk',
-        '32a23624c201b949f085996ba5ed53d40f703aca4989476949cae891022e0ed6',
-    ),
-    (
-        'repo/obb.mainpatch.current_1619_another-release-key.apk',
-        'ce9e200667f02d96d49891a2e08a3c178870e91853d61bdd33ef5f0b54701aa5',
-    ),
-    (
-        'repo/souch.smsbypass_9.apk',
-        'd3aec784b1fd71549fc22c999789122e3639895db6bd585da5835fbe3db6985c',
-    ),
-    (
-        'repo/urzip-; Рахма́, [rɐxˈmanʲɪnəf] سيرجي_رخمانينوف 谢·.apk',
-        '32a23624c201b949f085996ba5ed53d40f703aca4989476949cae891022e0ed6',
-    ),
-    (
-        'repo/v1.v2.sig_1020.apk',
-        '32a23624c201b949f085996ba5ed53d40f703aca4989476949cae891022e0ed6',
-    ),
-    (
-        'urzip-release.apk',
-        '32a23624c201b949f085996ba5ed53d40f703aca4989476949cae891022e0ed6',
-    ),
-    (
-        'urzip.apk',
-        '7eabd8c15de883d1e82b5df2fd4f7f769e498078e9ad6dc901f0e96db77ceac3',
-    ),
-)
-APKS_WITHOUT_JAR_SIGNATURES = (
-    (
-        'issue-1128-poc1.apk',  # APK v3 Signature only
-        '1dbb8be012293e988a0820f7d455b07abd267d2c0b500fc793fcfd80141cb5ce',
-    ),
-    (
-        'issue-1128-poc2.apk',  # APK v3 Signature only
-        '1dbb8be012293e988a0820f7d455b07abd267d2c0b500fc793fcfd80141cb5ce',
-    ),
-    (
-        'issue-1128-min-sdk-30-poc.apk',  # APK v3 Signature only
-        '09350d5f3460a8a0ea5cf6b68ccd296a58754f7e683ba6aa08c19be8353504f3',
-    ),
-    (
-        'v2.only.sig_2.apk',
-        '32a23624c201b949f085996ba5ed53d40f703aca4989476949cae891022e0ed6',
-    ),
-)
-
-
-class SignerExtractionTest(unittest.TestCase):
-    """Test extraction of the signer certificate from JARs and APKs
-
-    These fingerprints can be confirmed with:
-    apksigner verify --print-certs foo.apk | grep SHA-256
-    keytool -printcert -file ____.RSA
-    """
-
-    def setUp(self):
-        os.chdir(basedir)
-        self._td = mkdtemp()
-        self.testdir = self._td.name
-
-        self.apksigner = shutil.which('apksigner')
-        self.keytool = shutil.which('keytool')
-
-    def tearDown(self):
-        self._td.cleanup()
-
-    @unittest.skipIf(sys.byteorder == 'big', 'androguard is not ported to big-endian')
-    def test_get_first_signer_certificate_with_jars(self):
-        for jar in (
-            'signindex/guardianproject-v1.jar',
-            'signindex/guardianproject.jar',
-            'signindex/testy.jar',
-        ):
-            outdir = os.path.join(self.testdir, jar[:-4].replace('/', '_'))
-            os.mkdir(outdir)
-            fdroidserver.common.apk_extract_signatures(jar, outdir)
-            certs = glob.glob(os.path.join(outdir, '*.RSA'))
-            with open(certs[0], 'rb') as fp:
-                self.assertEqual(
-                    fdroidserver.common.get_certificate(fp.read()),
-                    fdroidserver.common.get_first_signer_certificate(jar),
-                )
-
-    @unittest.skip("slow and only needed when adding to APKS_WITH_JAR_SIGNATURES")
-    def test_vs_keytool(self):
-        if not self.keytool:
-            self.skipTest('requires keytool to run')
-        pat = re.compile(r'[0-9A-F:]{95}')
-        cmd = [self.keytool, '-printcert', '-jarfile']
-        for apk, fingerprint in APKS_WITH_JAR_SIGNATURES:
-            o = subprocess.check_output(cmd + [apk], text=True)
-            try:
-                self.assertEqual(
-                    fingerprint,
-                    pat.search(o).group().replace(':', '').lower(),
-                )
-            except AttributeError as e:
-                print(e, o)
-
-    @unittest.skip("slow and only needed when adding to APKS_WITH_JAR_SIGNATURES")
-    def test_vs_apksigner(self):
-        if not self.apksigner:
-            self.skipTest('requires apksigner to run')
-        pat = re.compile(r'\s[0-9a-f]{64}\s')
-        cmd = [self.apksigner, 'verify', '--print-certs']
-        for apk, fingerprint in APKS_WITH_JAR_SIGNATURES + APKS_WITHOUT_JAR_SIGNATURES:
-            output = subprocess.check_output(cmd + [apk], text=True)
-            self.assertEqual(
-                fingerprint,
-                pat.search(output).group().strip(),
-                apk + " should have matching signer fingerprints",
-            )
-
-    @unittest.skipIf(sys.byteorder == 'big', 'androguard is not ported to big-endian')
-    def test_apk_signer_fingerprint_with_v1_apks(self):
-        for apk, fingerprint in APKS_WITH_JAR_SIGNATURES:
-            self.assertEqual(
-                fingerprint,
-                fdroidserver.common.apk_signer_fingerprint(apk),
-                f'apk_signer_fingerprint should match stored fingerprint for {apk}',
-            )
-
-    @unittest.skipIf(sys.byteorder == 'big', 'androguard is not ported to big-endian')
-    def test_apk_signer_fingerprint_without_v1_apks(self):
-        for apk, fingerprint in APKS_WITHOUT_JAR_SIGNATURES:
-            self.assertEqual(
-                fingerprint,
-                fdroidserver.common.apk_signer_fingerprint(apk),
-                f'apk_signer_fingerprint should match stored fingerprint for {apk}',
-            )
-
-    @unittest.skipIf(sys.byteorder == 'big', 'androguard is not ported to big-endian')
-    def test_get_first_signer_certificate_with_unsigned_jar(self):
-        self.assertIsNone(
-            fdroidserver.common.get_first_signer_certificate('signindex/unsigned.jar')
-        )
-
-    def test_apk_extract_fingerprint(self):
-        """Test extraction of JAR signatures (does not cover APK v2+ extraction)."""
-        for apk, fingerprint in APKS_WITH_JAR_SIGNATURES:
-            outdir = os.path.join(self.testdir, apk[:-4].replace('/', '_'))
-            os.mkdir(outdir)
-            try:
-                fdroidserver.common.apk_extract_signatures(apk, outdir)
-            except fdroidserver.apksigcopier.APKSigCopierError:
-                # nothing to test here when this error is thrown
-                continue
-            v1_certs = [str(cert) for cert in Path(outdir).glob('*.[DR]SA')]
-            cert = fdroidserver.common.get_certificate(
-                signature_block_file=Path(v1_certs[0]).read_bytes(),
-                signature_file=Path(v1_certs[0][:-4] + '.SF').read_bytes(),
-            )
-            self.assertEqual(
-                fingerprint,
-                fdroidserver.common.signer_fingerprint(cert),
-            )
-            apkobject = fdroidserver.common.get_androguard_APK(apk, skip_analysis=True)
-            v2_certs = apkobject.get_certificates_der_v2()
-            if v2_certs:
-                if v1_certs:
-                    self.assertEqual(len(v1_certs), len(v2_certs))
-                self.assertEqual(
-                    fingerprint,
-                    fdroidserver.common.signer_fingerprint(v2_certs[0]),
-                )
-            v3_certs = apkobject.get_certificates_der_v3()
-            if v3_certs:
-                if v2_certs:
-                    self.assertEqual(len(v2_certs), len(v3_certs))
-                self.assertEqual(
-                    fingerprint,
-                    fdroidserver.common.signer_fingerprint(v3_certs[0]),
-                )
-
-    def test_signature_block_file_regex(self):
-        for apkpath, fingerprint in APKS_WITH_JAR_SIGNATURES:
-            with ZipFile(apkpath, 'r') as apk:
-                cert_files = [
-                    n
-                    for n in apk.namelist()
-                    if fdroidserver.common.SIGNATURE_BLOCK_FILE_REGEX.match(n)
-                ]
-                self.assertEqual(1, len(cert_files))
-
-    def test_signature_block_file_regex_malicious(self):
-        apkpath = os.path.join(self.testdir, 'malicious.apk')
-        with ZipFile(apkpath, 'w') as apk:
-            apk.writestr('META-INF/MANIFEST.MF', 'this is fake sig data')
-            apk.writestr('META-INF/CERT.SF\n', 'this is fake sig data')
-            apk.writestr('META-INF/AFTER.SF', 'this is fake sig data')
-            apk.writestr('META-INF/CERT.RSA\n', 'this is fake sig data')
-            apk.writestr('META-INF/AFTER.RSA', 'this is fake sig data')
-        with ZipFile(apkpath, 'r') as apk:
-            self.assertEqual(
-                ['META-INF/AFTER.RSA'],
-                [
-                    n
-                    for n in apk.namelist()
-                    if fdroidserver.common.SIGNATURE_BLOCK_FILE_REGEX.match(n)
-                ],
-            )
-
-
-class IgnoreApksignerV33Test(SetUpTearDownMixin, unittest.TestCase):
-    """apksigner v33 should be entirely ignored
-
-    https://gitlab.com/fdroid/fdroidserver/-/issues/1253
-    """
-
-    BAD_VERSIONS = [
-        '33.0.0-rc1',
-        '33.0.0-rc2',
-        '33.0.0-rc3',
-        '33.0.0-rc4',
-        '33.0.0',
-        '33.0.1',
-        '33.0.2',
-        '33.0.3',
-    ]
-
-    def setUp(self):
-        super().setUp()
-        self.config = {'sdk_path': self.testdir}
-
-    def _create_fake_build_tools(self, version):
-        for v in self.BAD_VERSIONS + [version]:
-            apksigner = os.path.join(self.testdir, 'build-tools', v, 'apksigner')
-            os.makedirs(os.path.dirname(apksigner))
-            with open(apksigner, 'w') as fp:
-                fp.write(f'#!/bin/sh\necho {v}[\n')
-            os.chmod(apksigner, 0o0755)  # nosec B103
-
-    def test_find_apksigner_choose_version_32_over_any_33(self):
-        good = '32.0.0'
-        self._create_fake_build_tools(good)
-        with mock.patch.dict(os.environ, clear=True):
-            os.environ['PATH'] = '/fake/path/to/avoid/conflicts'
-            fdroidserver.common.find_apksigner(self.config)
-            self.assertEqual(
-                os.path.join(self.testdir, 'build-tools', good, 'apksigner'),
-                self.config.get('apksigner'),
-            )
-
-    def test_find_apksigner_choose_no_version_over_any_33(self):
-        """apksigner v33 should be entirely ignored"""
-        self._create_fake_build_tools('29.0.0')  # too old a version
-        with mock.patch.dict(os.environ, clear=True):
-            os.environ['PATH'] = '/fake/path/to/avoid/conflicts'
-            fdroidserver.common.find_apksigner(self.config)
-            self.assertIsNone(self.config.get('apksigner'))
-
-
-class ConfigOptionsScopeTest(unittest.TestCase):
-    """Test assumptions about variable scope for "config" and "options".
-
-    The ancient architecture of config and options in fdroidserver has
-    weird issues around unexpected scope, like there are cases where
-    the global config is not the same as the module-level config, and
-    more.
-
-    This is about describing what is happening, it is not about
-    documenting behaviors that are good design. The config and options
-    handling should really be refactored into a well-known, workable
-    Pythonic pattern.
-
-    """
-
-    def setUp(self):
-        # these are declared as None at the top of the module file
-        fdroidserver.common.config = None
-        fdroidserver.common.options = None
-
-    def tearDown(self):
-        fdroidserver.common.config = None
-        fdroidserver.common.options = None
-        if 'config' in globals():
-            global config
-            del config
-        if 'options' in globals():
-            global options
-            del options
-
-    def test_parse_args(self):
-        """Test that options is properly set up at the module-level and not global."""
-        self.assertFalse('options' in globals())
-        self.assertIsNone(fdroidserver.common.options)
-        parser = ArgumentParser()
-        fdroidserver.common.setup_global_opts(parser)
-        with mock.patch('sys.argv', ['$0']):
-            o = fdroidserver.common.parse_args(parser)
-        self.assertEqual(o, fdroidserver.common.options)
-
-        # No function should set options as a global, and the global
-        # keyword does not create the variable.
-        global options
-        with self.assertRaises(NameError):
-            options
-        self.assertFalse('options' in globals())
-
-    def test_parse_args_without_args(self):
-        """Test that the parsing function works fine when there are no args."""
-        parser = ArgumentParser()
-        fdroidserver.common.setup_global_opts(parser)
-        with mock.patch('sys.argv', ['$0']):
-            o = fdroidserver.common.parse_args(parser)
-        self.assertFalse(o.verbose)
-
-    def test_parse_args_with_args(self):
-        parser = ArgumentParser()
-        fdroidserver.common.setup_global_opts(parser)
-        with mock.patch('sys.argv', ['$0', '-v']):
-            o = fdroidserver.common.parse_args(parser)
-        self.assertTrue(o.verbose)
-
-    def test_get_config(self):
-        """Show how the module-level variables are initialized."""
-        self.assertTrue('config' not in vars() and 'config' not in globals())
-        self.assertIsNone(fdroidserver.common.config)
-        config = fdroidserver.common.read_config()
-        self.assertIsNotNone(fdroidserver.common.config)
-        self.assertTrue(isinstance(config, dict))
-        self.assertEqual(config, fdroidserver.common.config)
-
-    def test_get_config_global(self):
-        """Test assumptions about variable scope using global keyword."""
-        global config
-        self.assertTrue('config' not in vars() and 'config' not in globals())
-        self.assertIsNone(fdroidserver.common.config)
-        c = fdroidserver.common.read_config()
-        self.assertIsNotNone(fdroidserver.common.config)
-        self.assertTrue(isinstance(c, dict))
-        self.assertEqual(c, fdroidserver.common.config)
-        self.assertTrue(
-            'config' not in vars() and 'config' not in globals(),
-            "The config should not be set in the global context, only module-level.",
-        )
-
-
-class UnsafePermissionsTest(SetUpTearDownMixin, unittest.TestCase):
-    def setUp(self):
-        config = dict()
-        fdroidserver.common.find_apksigner(config)
-        if not config.get('apksigner'):
-            self.skipTest('SKIPPING, apksigner not installed!')
-
-        super().setUp()
-        os.chdir(self.testdir)
-        fdroidserver.common.write_config_file('keypass: {env: keypass}')
-        os.chmod(fdroidserver.common.CONFIG_FILE, 0o666)  # nosec B103
-
-    def test_config_perm_no_warning(self):
-        fdroidserver.common.write_config_file('keystore: foo.jks')
-        with self.assertNoLogs(level=logging.WARNING):
-            fdroidserver.common.read_config()
-
-    def test_config_perm_keypass_warning(self):
-        fdroidserver.common.write_config_file('keypass: supersecret')
-        with self.assertLogs(level=logging.WARNING) as lw:
-            fdroidserver.common.read_config()
-            self.assertTrue('unsafe' in lw.output[0])
-
-    @mock.patch.dict(os.environ, {'PATH': os.getenv('PATH')}, clear=True)
-    def test_config_perm_env_warning(self):
-        os.environ['keypass'] = 'supersecret'
-        fdroidserver.common.write_config_file('keypass: {env: keypass}')
-        with self.assertLogs(level=logging.WARNING) as lw:
-            fdroidserver.common.read_config()
-            self.assertTrue('unsafe' in lw.output[0])
-            self.assertEqual(1, len(lw.output))
-
-
-class GetHeadCommitIdTest(unittest.TestCase):
-    """Test and compare two methods of getting the commit ID."""
-
-    def setUp(self):
-        self._td = mkdtemp()
-        self.testdir = self._td.name
-        os.chdir(self.testdir)
-        logging.getLogger('git.cmd').setLevel(logging.INFO)
-
-    def tearDown(self):
-        os.chdir(basedir)
-        self._td.cleanup()
-
-    @unittest.skipUnless((basedir.parent / '.git').exists(), 'Needs a working git repo')
-    def test_get_head_commit_id_compare(self):
-        """Run on this git repo to get some real world noise in there."""
-        git_dir = basedir.parent
-        self.assertIsNotNone(fdroidserver.common.get_head_commit_id(git_dir))
-
-    def test_get_head_commit_id_error_bare_repo(self):
-        """Error because it is an empty, bare git repo."""
-        git_repo = git.Repo.init(self.testdir)
-        self.assertIsNone(fdroidserver.common.get_head_commit_id(git_repo))
-
-    def test_get_head_commit_id_error_no_repo(self):
-        """Error because there is no .git/ dir."""
-        with self.assertLogs('root', level=logging.DEBUG):
-            self.assertIsNone(fdroidserver.common.get_head_commit_id(self.testdir))
-
-    def test_get_head_commit_id_detached_and_branch(self):
-        """Fetching commit ID must work from detached HEADs and branches."""
-        git_repo = git.Repo.init(self.testdir)
-        Path('README').write_text('this is just a test')
-        git_repo.git.add(all=True)
-        git_repo.index.commit("add README")
-        Path('LICENSE').write_text('free!')
-        git_repo.git.add(all=True)
-        git_repo.index.commit("add LICENSE")
-        self.assertIsNotNone(fdroidserver.common.get_head_commit_id(git_repo))
-        # detached HEAD
-        git_repo.git.checkout('HEAD^')
-        self.assertIsNotNone(fdroidserver.common.get_head_commit_id(git_repo))
-        # on a branch with a new commits
-        git_repo.git.checkout('test', b=True)
-        Path('foo.py').write_text('print("code!")')
-        git_repo.git.add(all=True)
-        git_repo.index.commit("add code")
-        self.assertIsNotNone(fdroidserver.common.get_head_commit_id(git_repo))
diff --git a/tests/test_deploy.py b/tests/test_deploy.py
deleted file mode 100755
index d7de7545..00000000
--- a/tests/test_deploy.py
+++ /dev/null
@@ -1,1226 +0,0 @@
-#!/usr/bin/env python3
-
-import configparser
-import os
-import shutil
-import tempfile
-import unittest
-from pathlib import Path
-from unittest import mock
-
-import git
-
-import fdroidserver
-
-from .shared_test_code import TmpCwd, VerboseFalseOptions, mkdtemp
-
-basedir = Path(__file__).parent
-FILES = basedir
-
-
-def _mock_rclone_config_file(cmd, text):  # pylint: disable=unused-argument
-    """Mock output from rclone 1.60.1 but with nonexistent conf file."""
-    return "Configuration file doesn't exist, but rclone will use this path:\n/nonexistent/rclone.conf\n"
-
-
-class DeployTest(unittest.TestCase):
-    '''fdroidserver/deploy.py'''
-
-    def setUp(self):
-        os.chdir(basedir)
-        self._td = mkdtemp()
-        self.testdir = self._td.name
-
-        fdroidserver.common.options = mock.Mock()
-        fdroidserver.deploy.config = {}
-
-    def tearDown(self):
-        self._td.cleanup()
-
-    def test_update_serverwebroots_bad_None(self):
-        with self.assertRaises(TypeError):
-            fdroidserver.deploy.update_serverwebroots(None, 'repo')
-
-    def test_update_serverwebroots_bad_int(self):
-        with self.assertRaises(TypeError):
-            fdroidserver.deploy.update_serverwebroots(9, 'repo')
-
-    def test_update_serverwebroots_bad_float(self):
-        with self.assertRaises(TypeError):
-            fdroidserver.deploy.update_serverwebroots(1.0, 'repo')
-
-    def test_update_serverwebroots(self):
-        """rsync works with file paths, so this test uses paths for the URLs"""
-        os.chdir(self.testdir)
-        repo = Path('repo')
-        repo.mkdir()
-        fake_apk = repo / 'fake.apk'
-        with fake_apk.open('w') as fp:
-            fp.write('not an APK, but has the right filename')
-        url0 = Path('url0/fdroid')
-        url0.mkdir(parents=True)
-        url1 = Path('url1/fdroid')
-        url1.mkdir(parents=True)
-
-        # setup parameters for this test run
-        fdroidserver.common.options.identity_file = None
-        fdroidserver.deploy.config['make_current_version_link'] = False
-
-        dest_apk0 = url0 / fake_apk
-        dest_apk1 = url1 / fake_apk
-        self.assertFalse(dest_apk0.is_file())
-        self.assertFalse(dest_apk1.is_file())
-        fdroidserver.deploy.update_serverwebroots(
-            [
-                {'url': str(url0)},
-                {'url': str(url1)},
-            ],
-            str(repo),
-        )
-        self.assertTrue(dest_apk0.is_file())
-        self.assertTrue(dest_apk1.is_file())
-
-    def test_update_serverwebroots_url_does_not_end_with_fdroid(self):
-        with self.assertRaises(SystemExit):
-            fdroidserver.deploy.update_serverwebroots([{'url': 'url'}], 'repo')
-
-    def test_update_serverwebroots_bad_ssh_url(self):
-        with self.assertRaises(SystemExit):
-            fdroidserver.deploy.update_serverwebroots(
-                [{'url': 'f@b.ar::/path/to/fdroid'}], 'repo'
-            )
-
-    def test_update_serverwebroots_unsupported_ssh_url(self):
-        with self.assertRaises(SystemExit):
-            fdroidserver.deploy.update_serverwebroots([{'url': 'ssh://nope'}], 'repo')
-
-    @unittest.skipUnless(shutil.which('rclone'), 'requires rclone')
-    def test_update_remote_storage_with_rclone(self):
-        os.chdir(self.testdir)
-        repo = Path('repo')
-        repo.mkdir(parents=True, exist_ok=True)
-
-        fake_apk = repo / 'another_fake.apk'
-        with fake_apk.open('w') as fp:
-            fp.write('not an APK, but has the right filename')
-        fake_index = repo / fdroidserver.common.INDEX_FILES[0]
-        with fake_index.open('w') as fp:
-            fp.write('not an index, but has the right filename')
-
-        # write out rclone config for test use
-        rclone_config = configparser.ConfigParser()
-        rclone_config.add_section("test-local-config")
-        rclone_config.set("test-local-config", "type", "local")
-
-        rclone_config_path = Path('rclone_config_path')
-        rclone_config_path.mkdir(parents=True, exist_ok=True)
-        rclone_file = rclone_config_path / 'rclone.conf'
-        with open(rclone_file, 'w') as configfile:
-            rclone_config.write(configfile)
-
-        # setup parameters for this test run
-        awsbucket = 'test_bucket_folder'
-        fdroidserver.deploy.config['awsbucket'] = awsbucket
-        fdroidserver.deploy.config['rclone_config'] = 'test-local-config'
-        fdroidserver.deploy.config['path_to_custom_rclone_config'] = str(rclone_file)
-        fdroidserver.common.options = VerboseFalseOptions
-
-        # write out destination path
-        destination = Path(f'{awsbucket}/fdroid')
-        destination.mkdir(parents=True, exist_ok=True)
-        dest_apk = Path(destination) / fake_apk
-        dest_index = Path(destination) / fake_index
-        self.assertFalse(dest_apk.is_file())
-        self.assertFalse(dest_index.is_file())
-        repo_section = str(repo)
-        fdroidserver.deploy.update_remote_storage_with_rclone(repo_section, awsbucket)
-        self.assertTrue(dest_apk.is_file())
-        self.assertTrue(dest_index.is_file())
-
-    @unittest.skipUnless(shutil.which('rclone'), 'requires rclone')
-    def test_update_remote_storage_with_rclone_in_index_only_mode(self):
-        os.chdir(self.testdir)
-        repo = Path('repo')
-        repo.mkdir(parents=True, exist_ok=True)
-
-        fake_apk = repo / 'another_fake.apk'
-        with fake_apk.open('w') as fp:
-            fp.write('not an APK, but has the right filename')
-        fake_index = repo / fdroidserver.common.INDEX_FILES[0]
-        with fake_index.open('w') as fp:
-            fp.write('not an index, but has the right filename')
-
-        # write out rclone config for test use
-        rclone_config = configparser.ConfigParser()
-        rclone_config.add_section("test-local-config")
-        rclone_config.set("test-local-config", "type", "local")
-
-        rclone_config_path = Path('rclone_config_path')
-        rclone_config_path.mkdir(parents=True, exist_ok=True)
-        rclone_file = rclone_config_path / 'rclone.conf'
-        with open(rclone_file, 'w') as configfile:
-            rclone_config.write(configfile)
-
-        # setup parameters for this test run
-        awsbucket = 'test_bucket_folder'
-        fdroidserver.deploy.config['awsbucket'] = awsbucket
-        fdroidserver.deploy.config['rclone_config'] = 'test-local-config'
-        fdroidserver.deploy.config['path_to_custom_rclone_config'] = str(rclone_file)
-        fdroidserver.common.options = VerboseFalseOptions
-
-        # write out destination path
-        destination = Path(f'{awsbucket}/fdroid')
-        destination.mkdir(parents=True, exist_ok=True)
-        dest_apk = Path(destination) / fake_apk
-        dest_index = Path(destination) / fake_index
-        self.assertFalse(dest_apk.is_file())
-        self.assertFalse(dest_index.is_file())
-        repo_section = str(repo)
-        fdroidserver.deploy.update_remote_storage_with_rclone(
-            repo_section, awsbucket, is_index_only=True
-        )
-        self.assertFalse(dest_apk.is_file())
-        self.assertTrue(dest_index.is_file())
-
-    @mock.patch.dict(os.environ, {'PATH': os.getenv('PATH')}, clear=True)
-    @mock.patch('subprocess.check_output', _mock_rclone_config_file)
-    def test_update_remote_storage_with_rclone_awsbucket_no_env_vars(self):
-        with self.assertRaises(fdroidserver.exception.FDroidException):
-            fdroidserver.deploy.update_remote_storage_with_rclone('repo', 'foobucket')
-
-    @mock.patch.dict(os.environ, {'PATH': os.getenv('PATH')}, clear=True)
-    @mock.patch('subprocess.check_output', _mock_rclone_config_file)
-    def test_update_remote_storage_with_rclone_awsbucket_no_AWS_SECRET_ACCESS_KEY(self):
-        os.environ['AWS_ACCESS_KEY_ID'] = 'accesskey'
-        with self.assertRaises(fdroidserver.exception.FDroidException):
-            fdroidserver.deploy.update_remote_storage_with_rclone('repo', 'foobucket')
-
-    @mock.patch.dict(os.environ, {'PATH': os.getenv('PATH')}, clear=True)
-    @mock.patch('subprocess.check_output', _mock_rclone_config_file)
-    def test_update_remote_storage_with_rclone_awsbucket_no_AWS_ACCESS_KEY_ID(self):
-        os.environ['AWS_SECRET_ACCESS_KEY'] = 'secrets'  # nosec B105
-        with self.assertRaises(fdroidserver.exception.FDroidException):
-            fdroidserver.deploy.update_remote_storage_with_rclone('repo', 'foobucket')
-
-    @mock.patch.dict(os.environ, {'PATH': os.getenv('PATH')}, clear=True)
-    @mock.patch('subprocess.check_output', _mock_rclone_config_file)
-    @mock.patch('subprocess.call')
-    def test_update_remote_storage_with_rclone_awsbucket_env_vars(self, mock_call):
-        awsbucket = 'test_bucket_folder'
-        os.environ['AWS_ACCESS_KEY_ID'] = 'accesskey'
-        os.environ['AWS_SECRET_ACCESS_KEY'] = 'secrets'  # nosec B105
-
-        def _mock_subprocess_call(cmd):
-            self.assertEqual(
-                cmd[:5],
-                [
-                    'rclone',
-                    'sync',
-                    '--delete-after',
-                    '--config',
-                    '.fdroid-deploy-rclone.conf',
-                ],
-            )
-            return 0
-
-        mock_call.side_effect = _mock_subprocess_call
-        fdroidserver.deploy.config = {'awsbucket': awsbucket}
-        fdroidserver.deploy.update_remote_storage_with_rclone('repo', awsbucket)
-        mock_call.assert_called()
-
-    @mock.patch.dict(os.environ, {'PATH': os.getenv('PATH')}, clear=True)
-    @mock.patch('subprocess.check_output', _mock_rclone_config_file)
-    @mock.patch('subprocess.call')
-    def test_update_remote_storage_with_rclone_mock_awsbucket(self, mock_call):
-        awsbucket = 'test_bucket_folder'
-        os.environ['AWS_ACCESS_KEY_ID'] = 'accesskey'
-        os.environ['AWS_SECRET_ACCESS_KEY'] = 'secrets'  # nosec B105
-        self.last_cmd = None
-
-        def _mock_subprocess_call(cmd):
-            self.last_cmd = cmd
-            return 0
-
-        mock_call.side_effect = _mock_subprocess_call
-
-        fdroidserver.deploy.config = {'awsbucket': awsbucket}
-        fdroidserver.deploy.update_remote_storage_with_rclone('repo', awsbucket)
-        self.maxDiff = None
-        self.assertEqual(
-            self.last_cmd,
-            [
-                'rclone',
-                'sync',
-                '--delete-after',
-                '--config',
-                '.fdroid-deploy-rclone.conf',
-                'repo',
-                f'AWS-S3-US-East-1:{awsbucket}/fdroid/repo',
-            ],
-        )
-
-    @mock.patch('subprocess.check_output', _mock_rclone_config_file)
-    @mock.patch('subprocess.call')
-    def test_update_remote_storage_with_rclone_mock_rclone_config(self, mock_call):
-        awsbucket = 'test_bucket_folder'
-        self.last_cmd = None
-
-        def _mock_subprocess_call(cmd):
-            self.last_cmd = cmd
-            return 0
-
-        mock_call.side_effect = _mock_subprocess_call
-
-        fdroidserver.deploy.config = {
-            'awsbucket': awsbucket,
-            'rclone_config': 'test_local_config',
-        }
-        fdroidserver.deploy.update_remote_storage_with_rclone('repo', awsbucket)
-        self.maxDiff = None
-        self.assertEqual(
-            self.last_cmd,
-            [
-                'rclone',
-                'sync',
-                '--delete-after',
-                'repo',
-                'test_local_config:test_bucket_folder/fdroid/repo',
-            ],
-        )
-
-    @mock.patch('subprocess.check_output', _mock_rclone_config_file)
-    @mock.patch('subprocess.call')
-    def test_update_remote_storage_with_rclone_mock_default_user_path(self, mock_call):
-        self.last_cmd = None
-
-        def _mock_subprocess_call(cmd):
-            self.last_cmd = cmd
-            return 0
-
-        mock_call.side_effect = _mock_subprocess_call
-
-        os.chdir(self.testdir)
-        config_name = 'test_local_config'
-        Path('rclone.conf').write_text('placeholder, contents ignored')
-
-        awsbucket = 'test_bucket_folder'
-        fdroidserver.deploy.config['awsbucket'] = awsbucket
-        fdroidserver.deploy.config['rclone_config'] = config_name
-        fdroidserver.deploy.update_remote_storage_with_rclone('repo', awsbucket)
-        self.maxDiff = None
-        self.assertEqual(
-            self.last_cmd,
-            [
-                'rclone',
-                'sync',
-                '--delete-after',
-                '--config',
-                fdroidserver.deploy.EMBEDDED_RCLONE_CONF,
-                'repo',
-                f'{config_name}:{awsbucket}/fdroid/repo',
-            ],
-        )
-
-    def test_update_serverwebroot(self):
-        """rsync works with file paths, so this test uses paths for the URLs"""
-        os.chdir(self.testdir)
-        repo = Path('repo')
-        repo.mkdir(parents=True)
-        fake_apk = repo / 'fake.apk'
-        with fake_apk.open('w') as fp:
-            fp.write('not an APK, but has the right filename')
-        fake_index = repo / fdroidserver.common.INDEX_FILES[0]
-        with fake_index.open('w') as fp:
-            fp.write('not an index, but has the right filename')
-        url = Path('url')
-        url.mkdir()
-
-        # setup parameters for this test run
-        fdroidserver.common.options = mock.Mock()
-        fdroidserver.common.options.identity_file = None
-        fdroidserver.common.options.identity_file = None
-        fdroidserver.deploy.config['make_current_version_link'] = False
-
-        dest_apk = Path(url) / fake_apk
-        dest_index = Path(url) / fake_index
-        self.assertFalse(dest_apk.is_file())
-        self.assertFalse(dest_index.is_file())
-
-        fdroidserver.deploy.update_serverwebroot({'url': str(url)}, 'repo')
-        self.assertTrue(dest_apk.is_file())
-        self.assertTrue(dest_index.is_file())
-
-    def test_update_serverwebroot_in_index_only_mode(self):
-        os.chdir(self.testdir)
-        repo = Path('repo')
-        repo.mkdir()
-        fake_apk = repo / 'fake.apk'
-        with fake_apk.open('w') as fp:
-            fp.write('not an APK, but has the right filename')
-        fake_index = repo / fdroidserver.common.INDEX_FILES[0]
-        with fake_index.open('w') as fp:
-            fp.write('not an index, but has the right filename')
-        url = Path('url')
-        url.mkdir()
-
-        # setup parameters for this test run
-        fdroidserver.common.options = mock.Mock()
-        fdroidserver.common.options.identity_file = None
-        fdroidserver.deploy.config['make_current_version_link'] = False
-
-        dest_apk = Path(url) / fake_apk
-        dest_index = Path(url) / fake_index
-        self.assertFalse(dest_apk.is_file())
-        self.assertFalse(dest_index.is_file())
-
-        fdroidserver.deploy.update_serverwebroot(
-            {'url': str(url), 'index_only': True}, 'repo'
-        )
-        self.assertFalse(dest_apk.is_file())
-        self.assertTrue(dest_index.is_file())
-
-    @mock.patch.dict(os.environ, clear=True)
-    def test_update_serverwebroot_no_rsync_error(self):
-        os.environ['PATH'] = self.testdir
-        os.chdir(self.testdir)
-        with self.assertRaises(fdroidserver.exception.FDroidException):
-            fdroidserver.deploy.update_serverwebroot('serverwebroot', 'repo')
-
-    def test_update_serverwebroot_make_cur_version_link(self):
-        self.maxDiff = None
-
-        # setup parameters for this test run
-        fdroidserver.common.options = mock.Mock()
-        fdroidserver.common.options.no_checksum = True
-        fdroidserver.common.options.identity_file = None
-        fdroidserver.common.options.verbose = False
-        fdroidserver.common.options.quiet = True
-        fdroidserver.common.options.index_only = False
-        fdroidserver.deploy.config = {'make_current_version_link': True}
-        url = "example.com:/var/www/fdroid"
-        repo_section = 'repo'
-
-        # setup function for asserting subprocess.call invocations
-        call_iteration = 0
-
-        def update_server_webroot_call(cmd):
-            nonlocal call_iteration
-            if call_iteration == 0:
-                self.assertListEqual(
-                    cmd,
-                    [
-                        'rsync',
-                        '--archive',
-                        '--delete-after',
-                        '--safe-links',
-                        '--quiet',
-                        '--exclude',
-                        'repo/altstore-index.json',
-                        '--exclude',
-                        'repo/altstore-index.json.asc',
-                        '--exclude',
-                        'repo/entry.jar',
-                        '--exclude',
-                        'repo/entry.json',
-                        '--exclude',
-                        'repo/entry.json.asc',
-                        '--exclude',
-                        'repo/index-v1.jar',
-                        '--exclude',
-                        'repo/index-v1.json',
-                        '--exclude',
-                        'repo/index-v1.json.asc',
-                        '--exclude',
-                        'repo/index-v2.json',
-                        '--exclude',
-                        'repo/index-v2.json.asc',
-                        '--exclude',
-                        'repo/index.css',
-                        '--exclude',
-                        'repo/index.html',
-                        '--exclude',
-                        'repo/index.jar',
-                        '--exclude',
-                        'repo/index.png',
-                        '--exclude',
-                        'repo/index.xml',
-                        '--exclude',
-                        'repo/signer-index.jar',
-                        '--exclude',
-                        'repo/signer-index.json',
-                        '--exclude',
-                        'repo/signer-index.json.asc',
-                        'repo',
-                        'example.com:/var/www/fdroid',
-                    ],
-                )
-            elif call_iteration == 1:
-                self.assertListEqual(
-                    cmd,
-                    [
-                        'rsync',
-                        '--archive',
-                        '--delete-after',
-                        '--safe-links',
-                        '--quiet',
-                        'repo',
-                        url,
-                    ],
-                )
-            elif call_iteration == 2:
-                self.assertListEqual(
-                    cmd,
-                    [
-                        'rsync',
-                        '--archive',
-                        '--delete-after',
-                        '--safe-links',
-                        '--quiet',
-                        'Sym.apk',
-                        'Sym.apk.asc',
-                        'Sym.apk.sig',
-                        'example.com:/var/www/fdroid',
-                    ],
-                )
-            else:
-                self.fail('unexpected subprocess.call invocation')
-            call_iteration += 1
-            return 0
-
-        with tempfile.TemporaryDirectory() as tmpdir, TmpCwd(tmpdir):
-            os.mkdir('repo')
-            os.symlink('repo/com.example.sym.apk', 'Sym.apk')
-            os.symlink('repo/com.example.sym.apk.asc', 'Sym.apk.asc')
-            os.symlink('repo/com.example.sym.apk.sig', 'Sym.apk.sig')
-            with mock.patch('subprocess.call', side_effect=update_server_webroot_call):
-                fdroidserver.deploy.update_serverwebroot({'url': url}, repo_section)
-        self.assertEqual(call_iteration, 3, 'expected 3 invocations of subprocess.call')
-
-    def test_update_serverwebroot_make_cur_version_link_in_index_only_mode(self):
-        # setup parameters for this test run
-        fdroidserver.common.options = mock.Mock()
-        fdroidserver.common.options.no_checksum = True
-        fdroidserver.common.options.identity_file = None
-        fdroidserver.common.options.verbose = False
-        fdroidserver.common.options.quiet = True
-        fdroidserver.common.options.identity_file = None
-        fdroidserver.deploy.config['make_current_version_link'] = True
-        url = "example.com:/var/www/fdroid"
-        repo_section = 'repo'
-
-        # setup function for asserting subprocess.call invocations
-        call_iteration = 0
-
-        def update_server_webroot_call(cmd):
-            nonlocal call_iteration
-            if call_iteration == 0:
-                self.assertListEqual(
-                    cmd,
-                    [
-                        'rsync',
-                        '--archive',
-                        '--delete-after',
-                        '--safe-links',
-                        '--quiet',
-                        'repo/altstore-index.json',
-                        'repo/altstore-index.json.asc',
-                        'repo/entry.jar',
-                        'repo/entry.json',
-                        'repo/entry.json.asc',
-                        'repo/index-v1.jar',
-                        'repo/index-v1.json',
-                        'repo/index-v1.json.asc',
-                        'repo/index-v2.json',
-                        'repo/index-v2.json.asc',
-                        'repo/index.css',
-                        'repo/index.html',
-                        'repo/index.jar',
-                        'repo/index.png',
-                        'repo/index.xml',
-                        'repo/signer-index.jar',
-                        'repo/signer-index.json',
-                        'repo/signer-index.json.asc',
-                        'example.com:/var/www/fdroid/repo/',
-                    ],
-                )
-            elif call_iteration == 1:
-                self.assertListEqual(
-                    cmd,
-                    [
-                        'rsync',
-                        '--archive',
-                        '--delete-after',
-                        '--safe-links',
-                        '--quiet',
-                        'repo',
-                        url,
-                    ],
-                )
-            elif call_iteration == 2:
-                self.assertListEqual(
-                    cmd,
-                    [
-                        'rsync',
-                        '--archive',
-                        '--delete-after',
-                        '--safe-links',
-                        '--quiet',
-                        'Sym.apk',
-                        'Sym.apk.asc',
-                        'Sym.apk.sig',
-                        'example.com:/var/www/fdroid',
-                    ],
-                )
-            else:
-                self.fail('unexpected subprocess.call invocation')
-            call_iteration += 1
-            return 0
-
-        with tempfile.TemporaryDirectory() as tmpdir, TmpCwd(tmpdir):
-            os.mkdir(repo_section)
-            os.symlink('repo/com.example.sym.apk', 'Sym.apk')
-            os.symlink('repo/com.example.sym.apk.asc', 'Sym.apk.asc')
-            os.symlink('repo/com.example.sym.apk.sig', 'Sym.apk.sig')
-
-            fake_files = fdroidserver.common.INDEX_FILES
-            for filename in fake_files:
-                fake_file = Path(repo_section) / filename
-                with fake_file.open('w') as fp:
-                    fp.write('not a real one, but has the right filename')
-
-            with mock.patch('subprocess.call', side_effect=update_server_webroot_call):
-                fdroidserver.deploy.update_serverwebroot(
-                    {'url': url, 'index_only': True}, repo_section
-                )
-        self.assertEqual(call_iteration, 1, 'expected 1 invocations of subprocess.call')
-
-    def test_update_serverwebroot_with_id_file(self):
-        # setup parameters for this test run
-        fdroidserver.common.options = mock.Mock()
-        fdroidserver.common.options.identity_file = None
-        fdroidserver.common.options.no_checksum = True
-        fdroidserver.common.options.verbose = True
-        fdroidserver.common.options.quiet = False
-        fdroidserver.common.options.identity_file = None
-        fdroidserver.common.options.index_only = False
-        fdroidserver.deploy.config = {'identity_file': './id_rsa'}
-        url = "example.com:/var/www/fdroid"
-        repo_section = 'archive'
-
-        # setup function for asserting subprocess.call invocations
-        call_iteration = 0
-
-        def update_server_webroot_call(cmd):
-            nonlocal call_iteration
-            if call_iteration == 0:
-                self.assertListEqual(
-                    cmd,
-                    [
-                        'rsync',
-                        '--archive',
-                        '--delete-after',
-                        '--safe-links',
-                        '--verbose',
-                        '-e',
-                        'ssh -oBatchMode=yes -oIdentitiesOnly=yes -i '
-                        + fdroidserver.deploy.config['identity_file'],
-                        '--exclude',
-                        'archive/altstore-index.json',
-                        '--exclude',
-                        'archive/altstore-index.json.asc',
-                        '--exclude',
-                        'archive/entry.jar',
-                        '--exclude',
-                        'archive/entry.json',
-                        '--exclude',
-                        'archive/entry.json.asc',
-                        '--exclude',
-                        'archive/index-v1.jar',
-                        '--exclude',
-                        'archive/index-v1.json',
-                        '--exclude',
-                        'archive/index-v1.json.asc',
-                        '--exclude',
-                        'archive/index-v2.json',
-                        '--exclude',
-                        'archive/index-v2.json.asc',
-                        '--exclude',
-                        'archive/index.css',
-                        '--exclude',
-                        'archive/index.html',
-                        '--exclude',
-                        'archive/index.jar',
-                        '--exclude',
-                        'archive/index.png',
-                        '--exclude',
-                        'archive/index.xml',
-                        'archive',
-                        url,
-                    ],
-                )
-            elif call_iteration == 1:
-                self.assertListEqual(
-                    cmd,
-                    [
-                        'rsync',
-                        '--archive',
-                        '--delete-after',
-                        '--safe-links',
-                        '--verbose',
-                        '-e',
-                        'ssh -oBatchMode=yes -oIdentitiesOnly=yes -i '
-                        + fdroidserver.deploy.config['identity_file'],
-                        'archive',
-                        url,
-                    ],
-                )
-            else:
-                self.fail('unexpected subprocess.call invocation')
-            call_iteration += 1
-            return 0
-
-        with mock.patch('subprocess.call', side_effect=update_server_webroot_call):
-            fdroidserver.deploy.update_serverwebroot({'url': url}, repo_section)
-        self.assertEqual(call_iteration, 2, 'expected 2 invocations of subprocess.call')
-
-    def test_update_serverwebroot_with_id_file_in_index_only_mode(self):
-        # setup parameters for this test run
-        fdroidserver.common.options = mock.Mock()
-        fdroidserver.common.options.no_chcksum = False
-        fdroidserver.common.options.verbose = True
-        fdroidserver.common.options.quiet = False
-        fdroidserver.common.options.identity_file = None
-        fdroidserver.deploy.config['identity_file'] = './id_rsa'
-        fdroidserver.deploy.config['make_current_version_link'] = False
-        url = "example.com:/var/www/fdroid"
-        repo_section = 'archive'
-
-        # setup function for asserting subprocess.call invocations
-        call_iteration = 0
-
-        def update_server_webroot_call(cmd):
-            nonlocal call_iteration
-            if call_iteration == 0:
-                self.assertListEqual(
-                    cmd,
-                    [
-                        'rsync',
-                        '--archive',
-                        '--delete-after',
-                        '--safe-links',
-                        '--verbose',
-                        '-e',
-                        'ssh -oBatchMode=yes -oIdentitiesOnly=yes -i '
-                        + fdroidserver.deploy.config['identity_file'],
-                        'archive/altstore-index.json',
-                        'archive/altstore-index.json.asc',
-                        'archive/entry.jar',
-                        'archive/entry.json',
-                        'archive/entry.json.asc',
-                        'archive/index-v1.jar',
-                        'archive/index-v1.json',
-                        'archive/index-v1.json.asc',
-                        'archive/index-v2.json',
-                        'archive/index-v2.json.asc',
-                        'archive/index.css',
-                        'archive/index.html',
-                        'archive/index.jar',
-                        'archive/index.png',
-                        'archive/index.xml',
-                        "example.com:/var/www/fdroid/archive/",
-                    ],
-                )
-            elif call_iteration == 1:
-                self.assertListEqual(
-                    cmd,
-                    [
-                        'rsync',
-                        '--archive',
-                        '--delete-after',
-                        '--safe-links',
-                        '--verbose',
-                        '-e',
-                        'ssh -oBatchMode=yes -oIdentitiesOnly=yes -i '
-                        + fdroidserver.deploy.config['identity_file'],
-                        "example.com:/var/www/fdroid/archive/",
-                    ],
-                )
-            else:
-                self.fail('unexpected subprocess.call invocation')
-            call_iteration += 1
-            return 0
-
-        with tempfile.TemporaryDirectory() as tmpdir, TmpCwd(tmpdir):
-            with mock.patch('subprocess.call', side_effect=update_server_webroot_call):
-                os.mkdir(repo_section)
-                fake_files = fdroidserver.common.INDEX_FILES
-                for filename in fake_files:
-                    fake_file = Path(repo_section) / filename
-                    with fake_file.open('w') as fp:
-                        fp.write('not a real one, but has the right filename')
-
-                fdroidserver.deploy.update_serverwebroot(
-                    {'url': url, 'index_only': True}, repo_section
-                )
-        self.assertEqual(call_iteration, 1, 'expected 1 invocations of subprocess.call')
-
-    @unittest.skipIf(
-        not os.getenv('VIRUSTOTAL_API_KEY'), 'VIRUSTOTAL_API_KEY is not set'
-    )
-    def test_upload_to_virustotal(self):
-        fdroidserver.common.options = mock.Mock()
-        fdroidserver.common.options.verbose = True
-        virustotal_apikey = os.getenv('VIRUSTOTAL_API_KEY')
-        fdroidserver.deploy.upload_to_virustotal('repo', virustotal_apikey)
-
-    def test_remote_hostname_regex(self):
-        for remote_url, name in (
-            ('git@github.com:guardianproject/fdroid-repo', 'github'),
-            ('git@gitlab.com:guardianproject/fdroid-repo', 'gitlab'),
-            ('https://github.com:guardianproject/fdroid-repo', 'github'),
-            ('https://gitlab.com/guardianproject/fdroid-repo', 'gitlab'),
-            ('https://salsa.debian.org/foo/repo', 'salsa'),
-        ):
-            self.assertEqual(
-                name, fdroidserver.deploy.REMOTE_HOSTNAME_REGEX.sub(r'\1', remote_url)
-            )
-
-    def test_update_servergitmirrors(self):
-        # setup parameters for this test run
-        fdroidserver.common.options = mock.Mock()
-        fdroidserver.common.options.identity_file = None
-        fdroidserver.common.options.no_keep_git_mirror_archive = False
-        fdroidserver.common.options.verbose = False
-        fdroidserver.common.options.quiet = True
-
-        config = {}
-        fdroidserver.common.fill_config_defaults(config)
-        fdroidserver.deploy.config = config
-
-        os.chdir(self.testdir)
-
-        repo_section = 'repo'
-        initial_branch = fdroidserver.deploy.GIT_BRANCH
-
-        remote_repo = Path(self.testdir) / 'remote'
-        remote_repo.mkdir(parents=True)
-        remote_git_repo = git.Repo.init(
-            remote_repo, initial_branch=initial_branch, bare=True
-        )
-        fdroidserver.deploy.config["servergitmirrors"] = [{"url": str(remote_repo)}]
-
-        os.chdir(self.testdir)
-        repo = Path('repo')
-        repo.mkdir(parents=True)
-        fake_apk = 'Sym.apk'
-        fake_files = fdroidserver.common.INDEX_FILES + [fake_apk]
-        for filename in fake_files:
-            fake_file = repo / filename
-            with fake_file.open('w') as fp:
-                fp.write('not a real one, but has the right filename')
-
-        fdroidserver.deploy.update_servergitmirrors(
-            fdroidserver.deploy.config["servergitmirrors"], repo_section
-        )
-
-        verify_repo = remote_git_repo.clone(
-            Path(self.testdir) / 'verify',
-        )
-
-        for filename in fake_files:
-            remote_file = f"fdroid/{repo_section}/{filename}"
-
-            self.assertIsNotNone(verify_repo.working_tree_dir)
-            if verify_repo.working_tree_dir is not None:
-                self.assertTrue(
-                    (Path(verify_repo.working_tree_dir) / remote_file).exists()
-                )
-
-    def test_update_servergitmirrors_in_index_only_mode(self):
-        # setup parameters for this test run
-        fdroidserver.common.options = mock.Mock()
-        fdroidserver.common.options.identity_file = None
-        fdroidserver.common.options.no_keep_git_mirror_archive = False
-        fdroidserver.common.options.verbose = False
-        fdroidserver.common.options.quiet = True
-
-        config = {}
-        fdroidserver.common.fill_config_defaults(config)
-        fdroidserver.deploy.config = config
-
-        os.chdir(self.testdir)
-
-        repo_section = 'repo'
-        initial_branch = fdroidserver.deploy.GIT_BRANCH
-
-        remote_repo = Path(self.testdir) / 'remote'
-        remote_repo.mkdir(parents=True)
-        remote_git_repo = git.Repo.init(
-            remote_repo, initial_branch=initial_branch, bare=True
-        )
-        fdroidserver.deploy.config["servergitmirrors"] = [
-            {"url": str(remote_repo), "index_only": True}
-        ]
-
-        os.chdir(self.testdir)
-        repo = Path('repo')
-        repo.mkdir(parents=True)
-        fake_apk = 'Sym.apk'
-        fake_files = fdroidserver.common.INDEX_FILES + [fake_apk]
-        for filename in fake_files:
-            fake_file = repo / filename
-            with fake_file.open('w') as fp:
-                fp.write('not a real one, but has the right filename')
-
-        fdroidserver.deploy.update_servergitmirrors(
-            fdroidserver.deploy.config["servergitmirrors"], repo_section
-        )
-
-        verify_repo = remote_git_repo.clone(
-            Path(self.testdir) / 'verify',
-        )
-
-        for filename in fdroidserver.common.INDEX_FILES:
-            remote_file = f"fdroid/{repo_section}/{filename}"
-
-            self.assertIsNotNone(verify_repo.working_tree_dir)
-            if verify_repo.working_tree_dir is not None:
-                self.assertTrue(
-                    (Path(verify_repo.working_tree_dir) / remote_file).exists()
-                )
-
-        # Should not have the APK file
-        remote_file = f"fdroid/{repo_section}/{fake_apk}"
-        if verify_repo.working_tree_dir is not None:
-            self.assertFalse(
-                (Path(verify_repo.working_tree_dir) / remote_file).exists()
-            )
-
-    def test_upload_to_servergitmirror_in_index_only_mode(self):
-        # setup parameters for this test run
-        fdroidserver.common.options = mock.Mock()
-        fdroidserver.common.options.identity_file = None
-        fdroidserver.common.options.no_keep_git_mirror_archive = False
-        fdroidserver.common.options.verbose = False
-        fdroidserver.common.options.quiet = True
-        fdroidserver.common.options.identity_file = None
-
-        config = {}
-        fdroidserver.common.fill_config_defaults(config)
-        fdroidserver.deploy.config = config
-
-        repo_section = 'repo'
-        initial_branch = fdroidserver.deploy.GIT_BRANCH
-
-        os.chdir(self.testdir)
-
-        local_git_repo_path = Path(self.testdir) / 'local'
-        local_git_repo = git.Repo.init(
-            local_git_repo_path, initial_branch=initial_branch
-        )
-
-        fdroid_dir = local_git_repo_path / 'fdroid'
-        repo_dir = fdroid_dir / repo_section
-        repo_dir.mkdir(parents=True)
-        fake_apk = 'Sym.apk'
-        fake_files = fdroidserver.common.INDEX_FILES + [fake_apk]
-        for filename in fake_files:
-            fake_file = repo_dir / filename
-            with fake_file.open('w') as fp:
-                fp.write('not a real one, but has the right filename')
-
-        # The remote repo must be a bare repo to allow being pushed to
-        remote_git_repo_dir = Path(self.testdir) / 'remote'
-        remote_git_repo = git.Repo.init(
-            remote_git_repo_dir, initial_branch=initial_branch, bare=True
-        )
-
-        mirror_config = {"url": str(remote_git_repo_dir), "index_only": True}
-        enabled_remotes = []
-        ssh_cmd = 'ssh -oBatchMode=yes'
-        fdroidserver.deploy.upload_to_servergitmirror(
-            mirror_config=mirror_config,
-            local_repo=local_git_repo,
-            enabled_remotes=enabled_remotes,
-            repo_section=repo_section,
-            is_index_only=mirror_config['index_only'],
-            fdroid_dir=str(fdroid_dir),
-            git_mirror_path=str(local_git_repo_path),
-            ssh_cmd=ssh_cmd,
-            progress=git.RemoteProgress(),
-        )
-
-        verify_repo = remote_git_repo.clone(
-            Path(self.testdir) / 'verify',
-        )
-
-        for filename in fdroidserver.common.INDEX_FILES:
-            remote_file = f"fdroid/{repo_section}/{filename}"
-
-            self.assertIsNotNone(verify_repo.working_tree_dir)
-            if verify_repo.working_tree_dir is not None:
-                self.assertTrue(
-                    (Path(verify_repo.working_tree_dir) / remote_file).exists()
-                )
-
-        # Should not have the APK file
-        remote_file = f"fdroid/{repo_section}/{fake_apk}"
-        if verify_repo.working_tree_dir is not None:
-            self.assertFalse(
-                (Path(verify_repo.working_tree_dir) / remote_file).exists()
-            )
-
-
-class GitHubReleasesTest(unittest.TestCase):
-    def test_find_release_infos(self):
-        self.maxDiff = None
-
-        index_mock = b"""
-            {
-                "packages": {
-                    "com.example.app": {
-                        "versions": {
-                            "2e6f263c1927506015bfc98bce0818247836f2e7fe29a04e1af2b33c97848750": {
-                                "file": {
-                                    "name": "/com.example.app_123.apk"
-                                },
-                                "whatsNew": {
-                                    "en-US": "fake what's new"
-                                },
-                                "manifest": {
-                                    "versionName": "1.2.3",
-                                    "versionCode": "123"
-                                }
-                            },
-                            "8a6f263c8327506015bfc98bce0815247836f2e7fe29a04e1af2bffa6409998d": {
-                                "file": {
-                                    "name": "/com.example.app_100.apk"
-                                },
-                                "manifest": {
-                                    "versionName": "1.0-alpha",
-                                    "versionCode": "123"
-                                },
-                                "releaseChannels": ["alpha"]
-                            }
-                        }
-                    },
-                    "another.app": {
-                        "versions": {
-                            "30602ffc19a7c0601bbfa93bce00082c78a6f2ddfe29a04e1af253fc9f84eda0": {
-                                "file": {
-                                    "name": "/another.app_1.apk"
-                                },
-                                "manifest": {
-                                    "versionName": "1",
-                                    "versionCode": "1"
-                                }
-                            }
-                        }
-                    },
-                    "fildered.app": {
-                        "versions": {
-                            "93ae02fc19a7c0601adfa93bce0443fc78a6f2ddfe3df04e1af093fca9a1ff09": {
-                                "file": {
-                                    "name": "/another.app_1.apk"
-                                },
-                                "manifest": {
-                                    "versionName": "1",
-                                    "versionCode": "1"
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        """
-        with unittest.mock.patch(
-            "fdroidserver.deploy.open", unittest.mock.mock_open(read_data=index_mock)
-        ):
-            release_infos = fdroidserver.deploy.find_release_infos(
-                "fake_path",
-                Path('fake_repo'),
-                ["com.example.app", "another.app"],
-            )
-
-        self.assertDictEqual(
-            release_infos,
-            {
-                "another.app": {
-                    "1": {
-                        "files": [Path('fake_repo') / "another.app_1.apk"],
-                        "hasReleaseChannels": False,
-                        "whatsNew": None,
-                    },
-                },
-                "com.example.app": {
-                    "1.0-alpha": {
-                        "files": [
-                            Path("fake_repo") / "com.example.app_100.apk",
-                        ],
-                        "hasReleaseChannels": True,
-                        "whatsNew": None,
-                    },
-                    "1.2.3": {
-                        "files": [
-                            Path("fake_repo") / "com.example.app_123.apk",
-                        ],
-                        "hasReleaseChannels": False,
-                        "whatsNew": "fake what's new",
-                    },
-                },
-            },
-        )
-
-    def test_upload_to_github_releases(self):
-        gh_config = [
-            {
-                "projectUrl": "https://github.com/example/app",
-                "packageNames": ["com.example.app", "another.app"],
-            },
-            {
-                "projectUrl": "https://github.com/custom/app",
-                "packageNames": ["more.custom.app"],
-                "token": "custom_token",
-            },
-        ]
-
-        fri_mock = unittest.mock.Mock(return_value="fri_result")
-        urr_mock = unittest.mock.Mock()
-        with unittest.mock.patch(
-            "fdroidserver.deploy.find_release_infos", fri_mock
-        ), unittest.mock.patch(
-            "fdroidserver.deploy.upload_to_github_releases_repo", urr_mock
-        ), tempfile.TemporaryDirectory() as tmpdir:
-            with open(Path(tmpdir) / "index-v2.json", "w") as f:
-                f.write("")
-
-            fdroidserver.deploy.upload_to_github_releases(
-                tmpdir, gh_config, "fake_global_token"
-            )
-
-            fri_mock.assert_called_once_with(
-                Path(tmpdir) / "index-v2.json",
-                Path(tmpdir),
-                ["com.example.app", "another.app", "more.custom.app"],
-            )
-
-        self.maxDiff = None
-        self.assertListEqual(
-            urr_mock.call_args_list,
-            [
-                unittest.mock.call(
-                    {
-                        "projectUrl": "https://github.com/example/app",
-                        "packageNames": ["com.example.app", "another.app"],
-                    },
-                    "fri_result",
-                    "fake_global_token",
-                ),
-                unittest.mock.call(
-                    {
-                        "projectUrl": "https://github.com/custom/app",
-                        "packageNames": ["more.custom.app"],
-                        "token": "custom_token",
-                    },
-                    "fri_result",
-                    "fake_global_token",
-                ),
-            ],
-        )
-
-
-class Test_UploadToGithubReleasesRepo(unittest.TestCase):
-    def setUp(self):
-        self.repo_conf = {
-            "projectUrl": "https://github.com/example/app",
-            "packageNames": ["com.example.app", "com.example.altapp", "another.app"],
-        }
-        self.release_infos = {
-            "com.example.app": {
-                "1.0.0": {
-                    "files": [
-                        Path("fake_repo") / "com.example.app_100100.apk",
-                    ],
-                    "hasReleaseChannels": False,
-                    "whatsNew": "what's new com.example.app 1.0.0",
-                },
-                "1.0.0-beta1": {
-                    "files": [
-                        Path("fake_repo") / "com.example.app_100007.apk",
-                    ],
-                    "hasReleaseChannels": True,
-                    "whatsNew": None,
-                },
-            },
-            "com.example.altapp": {
-                "1.0.0": {
-                    "files": [
-                        Path("fake_repo") / "com.example.altapp_100100.apk",
-                        Path("fake_repo") / "com.example.altapp_100100.apk.asc",
-                        Path("fake_repo") / "com.example.altapp_100100.apk.idsig",
-                    ],
-                    "whatsNew": "what's new com.example.altapp 1.0.0",
-                },
-            },
-        }
-
-        self.api = unittest.mock.Mock()
-        self.api.list_unreleased_tags = lambda: ["1.0.0", "1.0.0-beta1"]
-        self.api_constructor = unittest.mock.Mock(return_value=self.api)
-
-    def test_global_token(self):
-        with unittest.mock.patch("fdroidserver.github.GithubApi", self.api_constructor):
-            fdroidserver.deploy.upload_to_github_releases_repo(
-                self.repo_conf,
-                self.release_infos,
-                "global_token",
-            )
-
-        self.api_constructor.assert_called_once_with(
-            "global_token", "https://github.com/example/app"
-        )
-
-        self.assertListEqual(
-            self.api.create_release.call_args_list,
-            [
-                unittest.mock.call(
-                    "1.0.0",
-                    [
-                        Path("fake_repo/com.example.app_100100.apk"),
-                        Path("fake_repo/com.example.altapp_100100.apk"),
-                        Path("fake_repo/com.example.altapp_100100.apk.asc"),
-                        Path("fake_repo/com.example.altapp_100100.apk.idsig"),
-                    ],
-                    "what's new com.example.app 1.0.0",
-                ),
-            ],
-        )
-
-    def test_local_token(self):
-        self.repo_conf["token"] = "local_token"  # nosec B105
-        with unittest.mock.patch("fdroidserver.github.GithubApi", self.api_constructor):
-            fdroidserver.deploy.upload_to_github_releases_repo(
-                self.repo_conf,
-                self.release_infos,
-                "global_token",
-            )
-
-        self.api_constructor.assert_called_once_with(
-            "local_token", "https://github.com/example/app"
-        )
-
-        self.assertListEqual(
-            self.api.create_release.call_args_list,
-            [
-                unittest.mock.call(
-                    "1.0.0",
-                    [
-                        Path("fake_repo/com.example.app_100100.apk"),
-                        Path("fake_repo/com.example.altapp_100100.apk"),
-                        Path("fake_repo/com.example.altapp_100100.apk.asc"),
-                        Path("fake_repo/com.example.altapp_100100.apk.idsig"),
-                    ],
-                    "what's new com.example.app 1.0.0",
-                ),
-            ],
-        )
diff --git a/tests/test_github.py b/tests/test_github.py
deleted file mode 100755
index f30ce0bb..00000000
--- a/tests/test_github.py
+++ /dev/null
@@ -1,136 +0,0 @@
-#!/usr/bin/env python3
-
-import unittest
-import unittest.mock
-
-import fdroidserver
-
-from .shared_test_code import mock_urlopen
-
-
-class GithubApiTest(unittest.TestCase):
-    def test__init(self):
-        api = fdroidserver.github.GithubApi('faketoken', 'fakerepopath')
-        self.assertEqual(api._api_token, 'faketoken')
-        self.assertEqual(api._repo_path, 'fakerepopath')
-
-    def test__req(self):
-        api = fdroidserver.github.GithubApi('faketoken', 'fakerepopath')
-        r = api._req('https://fakeurl', data='fakedata')
-        self.assertEqual(r.full_url, 'https://fakeurl')
-        self.assertEqual(r.data, "fakedata")
-        self.assertDictEqual(
-            r.headers,
-            {
-                'Accept': 'application/vnd.github+json',
-                'Authorization': 'Bearer faketoken',
-                'X-github-api-version': '2022-11-28',
-            },
-        )
-
-    def test_list_released_tags(self):
-        api = fdroidserver.github.GithubApi('faketoken', 'fakerepopath')
-        uomock = mock_urlopen(
-            body='[{"tag_name": "fake"}, {"tag_name": "double_fake"}]'
-        )
-        with unittest.mock.patch("urllib.request.urlopen", uomock):
-            result = api.list_released_tags()
-        self.assertListEqual(result, ['fake', 'double_fake'])
-
-    def test_list_unreleased_tags(self):
-        api = fdroidserver.github.GithubApi('faketoken', 'fakerepopath')
-
-        api.list_all_tags = unittest.mock.Mock(return_value=[1, 2, 3, 4])
-        api.list_released_tags = unittest.mock.Mock(return_value=[1, 2])
-
-        result = api.list_unreleased_tags()
-
-        self.assertListEqual(result, [3, 4])
-
-    def test_tag_exists(self):
-        api = fdroidserver.github.GithubApi('faketoken', 'fakerepopath')
-        uomock = mock_urlopen(body='[{"ref": "refs/tags/fake_tag"}]')
-        with unittest.mock.patch("urllib.request.urlopen", uomock):
-            result = api.tag_exists('fake_tag')
-        self.assertTrue(result)
-
-    def test_tag_exists_failure(self):
-        api = fdroidserver.github.GithubApi('faketoken', 'fakerepopath')
-
-        uomock = mock_urlopen(body='[{"error": "failure"}]')
-
-        with unittest.mock.patch("urllib.request.urlopen", uomock):
-            success = api.tag_exists('fake_tag')
-
-        self.assertFalse(success)
-
-    def test_list_all_tags(self):
-        api = fdroidserver.github.GithubApi('faketoken', 'fakerepopath')
-
-        uomock = mock_urlopen(
-            body='[{"ref": "refs/tags/fake"}, {"ref": "refs/tags/double_fake"}]'
-        )
-
-        with unittest.mock.patch("urllib.request.urlopen", uomock):
-            result = api.list_all_tags()
-
-        self.assertListEqual(result, ['fake', 'double_fake'])
-
-    def test_create_release(self):
-        api = fdroidserver.github.GithubApi('faketoken', 'fakerepopath')
-
-        uomock = mock_urlopen(body='{"id": "fakeid"}')
-        api.tag_exists = lambda x: True
-        api._create_release_asset = unittest.mock.Mock()
-
-        with unittest.mock.patch("urllib.request.urlopen", uomock):
-            success = api.create_release('faketag', ['file_a', 'file_b'], body="bdy")
-        self.assertTrue(success)
-
-        req = uomock.call_args_list[0][0][0]
-        self.assertEqual(1, len(uomock.call_args_list))
-        self.assertEqual(2, len(uomock.call_args_list[0]))
-        self.assertEqual(1, len(uomock.call_args_list[0][0]))
-        self.assertEqual(
-            req.full_url,
-            'https://api.github.com/repos/fakerepopath/releases',
-        )
-        self.assertEqual(req.data, b'{"tag_name": "faketag", "body": "bdy"}')
-        self.assertListEqual(
-            api._create_release_asset.call_args_list,
-            [
-                unittest.mock.call('fakeid', 'file_a'),
-                unittest.mock.call('fakeid', 'file_b'),
-            ],
-        )
-
-    def test__create_release_asset(self):
-        api = fdroidserver.github.GithubApi('faketoken', 'fakerepopath')
-        uomock = mock_urlopen()
-
-        with unittest.mock.patch(
-            'fdroidserver.github.open',
-            unittest.mock.mock_open(read_data=b"fake_content"),
-        ), unittest.mock.patch("urllib.request.urlopen", uomock):
-            success = api._create_release_asset('fake_id', 'fake_file')
-
-        self.assertTrue(success)
-
-        req = uomock.call_args_list[0][0][0]
-        self.assertEqual(1, len(uomock.call_args_list))
-        self.assertEqual(2, len(uomock.call_args_list[0]))
-        self.assertEqual(1, len(uomock.call_args_list[0][0]))
-        self.assertEqual(
-            req.full_url,
-            'https://uploads.github.com/repos/fakerepopath/releases/fake_id/assets?name=fake_file',
-        )
-        self.assertDictEqual(
-            req.headers,
-            {
-                "Accept": "application/vnd.github+json",
-                'Authorization': 'Bearer faketoken',
-                'Content-type': 'application/octet-stream',
-                'X-github-api-version': '2022-11-28',
-            },
-        )
-        self.assertEqual(req.data, b'fake_content')
diff --git a/tests/test_gpgsign.py b/tests/test_gpgsign.py
deleted file mode 100755
index 84634874..00000000
--- a/tests/test_gpgsign.py
+++ /dev/null
@@ -1,60 +0,0 @@
-#!/usr/bin/env python3
-
-import json
-import os
-import shutil
-import tempfile
-import unittest
-from pathlib import Path
-from unittest.mock import MagicMock, patch
-
-from fdroidserver import common, gpgsign
-
-basedir = Path(__file__).parent
-
-
-class GpgsignTest(unittest.TestCase):
-    def setUp(self):
-        self.tempdir = tempfile.TemporaryDirectory()
-        os.chdir(self.tempdir.name)
-        self.repodir = Path('repo')
-        self.repodir.mkdir()
-
-        gpgsign.config = None
-        config = common.read_config()
-        config['verbose'] = True
-        config['gpghome'] = str((basedir / 'gnupghome').resolve())
-        config['gpgkey'] = '1DBA2E89'
-        gpgsign.config = config
-
-    def tearDown(self):
-        self.tempdir.cleanup()
-
-    @patch('sys.argv', ['fdroid gpgsign', '--verbose'])
-    @patch('fdroidserver.gpgsign.FDroidPopen')
-    def test_sign_index(self, FDroidPopen):
-        """This skips running gpg because its hard to setup in a test env"""
-        index_v1_json = 'repo/index-v1.json'
-        shutil.copy(basedir / index_v1_json, 'repo')
-        shutil.copy(basedir / 'SpeedoMeterApp.main_1.apk', 'repo')
-
-        def _side_effect(gpg):
-            f = gpg[-1]
-            sig = gpg[3]
-            self.assertTrue(sig.startswith(f))
-            open(sig, 'w').close()
-            p = MagicMock()
-            p.returncode = 0
-            return p
-
-        FDroidPopen.side_effect = _side_effect
-        gpgsign.main()
-        self.assertTrue(FDroidPopen.called)
-        self.assertTrue((self.repodir / 'index-v1.json').exists())
-        self.assertTrue((self.repodir / 'index-v1.json.asc').exists())
-        self.assertTrue((self.repodir / 'SpeedoMeterApp.main_1.apk.asc').exists())
-        self.assertFalse((self.repodir / 'index.jar.asc').exists())
-        # smoke check status JSON
-        with (self.repodir / 'status/gpgsign.json').open() as fp:
-            data = json.load(fp)
-        self.assertIn('index-v1.json', data['signed'])
diff --git a/tests/test_import_subcommand.py b/tests/test_import_subcommand.py
deleted file mode 100755
index 530e10fb..00000000
--- a/tests/test_import_subcommand.py
+++ /dev/null
@@ -1,199 +0,0 @@
-#!/usr/bin/env python3
-
-import logging
-import os
-import shutil
-import sys
-import tempfile
-import unittest
-from pathlib import Path
-from unittest import mock
-
-import git
-import requests
-import yaml
-
-import fdroidserver
-import fdroidserver.import_subcommand
-
-from .shared_test_code import TmpCwd, VerboseFalseOptions, mkdtemp
-
-basedir = Path(__file__).parent
-logging.basicConfig(level=logging.DEBUG)
-
-
-class ImportTest(unittest.TestCase):
-    '''fdroid import'''
-
-    def setUp(self):
-        os.chdir(basedir)
-        self._td = mkdtemp()
-        self.testdir = self._td.name
-
-    def tearDown(self):
-        os.chdir(basedir)
-        self._td.cleanup()
-
-    def test_get_all_gradle_and_manifests(self):
-        """Test whether the function works with relative and absolute paths"""
-        a = fdroidserver.import_subcommand.get_all_gradle_and_manifests(
-            Path('source-files/cn.wildfirechat.chat')
-        )
-        paths = [
-            'avenginekit/build.gradle',
-            'build.gradle',
-            'chat/build.gradle',
-            'client/build.gradle',
-            'client/src/main/AndroidManifest.xml',
-            'emojilibrary/build.gradle',
-            'gradle/build_libraries.gradle',
-            'imagepicker/build.gradle',
-            'mars-core-release/build.gradle',
-            'push/build.gradle',
-            'settings.gradle',
-        ]
-        paths = [Path('source-files/cn.wildfirechat.chat') / path for path in paths]
-        self.assertEqual(sorted(paths), sorted(a))
-
-        abspath = basedir / 'source-files/realm'
-        p = fdroidserver.import_subcommand.get_all_gradle_and_manifests(abspath)
-        self.assertEqual(1, len(p))
-        self.assertTrue(p[0].is_relative_to(abspath))
-
-    def test_get_gradle_subdir(self):
-        subdirs = {
-            'cn.wildfirechat.chat': 'chat',
-            'com.anpmech.launcher': 'app',
-            'org.tasks': 'app',
-            'ut.ewh.audiometrytest': 'app',
-            'org.noise_planet.noisecapture': 'app',
-        }
-        for k, v in subdirs.items():
-            build_dir = Path('source-files') / k
-            paths = fdroidserver.import_subcommand.get_all_gradle_and_manifests(
-                build_dir
-            )
-            logging.info(paths)
-            subdir = fdroidserver.import_subcommand.get_gradle_subdir(build_dir, paths)
-            self.assertEqual(v, str(subdir))
-
-    def test_import_gitlab(self):
-        with tempfile.TemporaryDirectory() as testdir, TmpCwd(testdir):
-            # FDroidPopen needs some config to work
-            config = dict()
-            fdroidserver.common.fill_config_defaults(config)
-            fdroidserver.common.config = config
-
-            url = 'https://gitlab.com/fdroid/ci-test-app'
-            r = requests.head(url, timeout=300)
-            if r.status_code != 200:
-                print("ERROR", url, 'unreachable (', r.status_code, ')')
-                print('Skipping ImportTest!')
-                return
-
-            fdroidserver.common.options = VerboseFalseOptions
-            app = fdroidserver.import_subcommand.get_app_from_url(url)
-            fdroidserver.import_subcommand.clone_to_tmp_dir(app)
-            self.assertEqual(app.RepoType, 'git')
-            self.assertEqual(app.Repo, 'https://gitlab.com/fdroid/ci-test-app.git')
-
-    def test_get_app_from_url(self):
-        with tempfile.TemporaryDirectory() as testdir, TmpCwd(testdir):
-            testdir = Path(testdir)
-            (testdir / 'tmp').mkdir()
-            tmp_importer = testdir / 'tmp/importer'
-            data = (
-                (
-                    'cn.wildfirechat.chat',
-                    'https://github.com/wildfirechat/android-chat',
-                    '0.6.9',
-                    23,
-                ),
-                (
-                    'com.anpmech.launcher',
-                    'https://github.com/KeikaiLauncher/KeikaiLauncher',
-                    'Unknown',
-                    None,
-                ),
-                (
-                    'ut.ewh.audiometrytest',
-                    'https://github.com/ReeceStevens/ut_ewh_audiometer_2014',
-                    '1.65',
-                    14,
-                ),
-            )
-            for appid, url, vn, vc in data:
-                shutil.rmtree(
-                    tmp_importer,
-                    onerror=fdroidserver.import_subcommand.handle_retree_error_on_windows,
-                )
-                shutil.copytree(basedir / 'source-files' / appid, tmp_importer)
-
-                app = fdroidserver.import_subcommand.get_app_from_url(url)
-                with mock.patch(
-                    'fdroidserver.common.getvcs',
-                    lambda a, b, c: fdroidserver.common.vcs(url, testdir),
-                ), mock.patch(
-                    'fdroidserver.common.vcs.gotorevision', lambda s, rev: None
-                ), mock.patch(
-                    'shutil.rmtree', lambda a, onerror=None: None
-                ):
-                    build_dir = fdroidserver.import_subcommand.clone_to_tmp_dir(app)
-                self.assertEqual('git', app.RepoType)
-                self.assertEqual(url, app.Repo)
-                self.assertEqual(url, app.SourceCode)
-                logging.info(build_dir)
-                paths = fdroidserver.import_subcommand.get_all_gradle_and_manifests(
-                    build_dir
-                )
-                self.assertNotEqual(paths, [])
-                (
-                    versionName,
-                    versionCode,
-                    package,
-                ) = fdroidserver.common.parse_androidmanifests(paths, app)
-                self.assertEqual(vn, versionName)
-                self.assertEqual(vc, versionCode)
-                self.assertEqual(appid, package)
-
-    def test_bad_urls(self):
-        for url in (
-            'asdf',
-            'file://thing.git',
-            'https:///github.com/my/project',
-            'git:///so/many/slashes',
-            'ssh:/notabug.org/missing/a/slash',
-            'git:notabug.org/missing/some/slashes',
-            'https//github.com/bar/baz',
-        ):
-            with self.assertRaises(ValueError):
-                fdroidserver.import_subcommand.get_app_from_url(url)
-
-    @mock.patch('sys.argv', ['fdroid import', '-u', 'https://example.com/mystery/url'])
-    @mock.patch('fdroidserver.import_subcommand.clone_to_tmp_dir', lambda a: None)
-    def test_unrecognized_url(self):
-        """Test whether error is thrown when the RepoType was not found.
-
-        clone_to_tmp_dir is mocked out to prevent this test from using
-        the network, if it gets past the code that throws the error.
-
-        """
-        with self.assertRaises(fdroidserver.exception.FDroidException):
-            fdroidserver.import_subcommand.main()
-
-    @mock.patch('sys.argv', ['fdroid import', '-u', 'https://fake/git/url.git'])
-    @mock.patch(
-        'fdroidserver.import_subcommand.clone_to_tmp_dir', lambda a, r: Path('td')
-    )
-    def test_main_local_git(self):
-        os.chdir(self.testdir)
-        git.Repo.init('td')
-        Path('td/build.gradle').write_text(
-            'android { defaultConfig { applicationId "com.example" } }'
-        )
-        fdroidserver.import_subcommand.main()
-        with open('metadata/com.example.yml') as fp:
-            data = yaml.safe_load(fp)
-        self.assertEqual(data['Repo'], sys.argv[2])
-        self.assertEqual(data['RepoType'], 'git')
-        self.assertEqual(1, len(data['Builds']))
diff --git a/tests/test_index.py b/tests/test_index.py
deleted file mode 100755
index c8ff5cbe..00000000
--- a/tests/test_index.py
+++ /dev/null
@@ -1,918 +0,0 @@
-#!/usr/bin/env python3
-
-import copy
-import datetime
-import glob
-import json
-import os
-import shutil
-import tempfile
-import unittest
-import zipfile
-from pathlib import Path
-from unittest.mock import patch
-
-import requests
-import yaml
-
-import fdroidserver
-from fdroidserver import common, index, publish, signindex, update
-
-from .shared_test_code import GP_FINGERPRINT, TmpCwd, mkdtemp
-
-basedir = Path(__file__).parent
-
-
-class Options:
-    nosign = True
-    pretty = False
-    verbose = False
-
-
-class IndexTest(unittest.TestCase):
-    @classmethod
-    def setUpClass(cls):
-        # TODO something should remove cls.index_v1_jar, but it was
-        # causing the tests to be flaky.  There seems to be something
-        # that is running the background somehow, maybe sign_index()
-        # exits before jarsigner actually finishes?
-        cls.index_v1_jar = basedir / 'repo' / 'index-v1.jar'
-
-    def setUp(self):
-        (basedir / common.CONFIG_FILE).chmod(0o600)
-        os.chdir(basedir)  # so read_config() can find config.yml
-
-        common.config = None
-        common.options = Options
-        config = common.read_config()
-        config['jarsigner'] = common.find_sdk_tools_cmd('jarsigner')
-        common.config = config
-        signindex.config = config
-        update.config = config
-
-        self._td = mkdtemp()
-        self.testdir = self._td.name
-
-    def tearDown(self):
-        self._td.cleanup()
-
-    def _sign_test_index_v1_jar(self):
-        if not self.index_v1_jar.exists():
-            signindex.sign_index(self.index_v1_jar.parent, 'index-v1.json')
-
-    def test_get_public_key_from_jar_succeeds(self):
-        source_dir = basedir / 'signindex'
-        for f in ('testy.jar', 'guardianproject.jar'):
-            testfile = os.path.join(source_dir, f)
-            jar = zipfile.ZipFile(testfile)
-            _, fingerprint = index.get_public_key_from_jar(jar)
-            # comparing fingerprints should be sufficient
-            if f == 'testy.jar':
-                self.assertEqual(
-                    fingerprint,
-                    '818E469465F96B704E27BE2FEE4C63AB'
-                    + '9F83DDF30E7A34C7371A4728D83B0BC1',
-                )
-            if f == 'guardianproject.jar':
-                self.assertTrue(fingerprint == GP_FINGERPRINT)
-
-    def test_get_public_key_from_jar_fails(self):
-        source_dir = basedir / 'signindex'
-        testfile = os.path.join(source_dir, 'unsigned.jar')
-        jar = zipfile.ZipFile(testfile)
-        with self.assertRaises(index.VerificationException):
-            index.get_public_key_from_jar(jar)
-
-    def test_download_repo_index_no_fingerprint(self):
-        with self.assertRaises(index.VerificationException):
-            index.download_repo_index("http://example.org")
-
-    def test_download_repo_index_no_jar(self):
-        with self.assertRaises(requests.exceptions.RequestException):
-            index.download_repo_index("http://example.org?fingerprint=nope")
-
-    def test_get_repo_key_fingerprint(self):
-        self._sign_test_index_v1_jar()
-        pubkey, fingerprint = index.extract_pubkey()
-        (
-            data,
-            public_key,
-            public_key_fingerprint,
-        ) = index.get_index_from_jar(
-            'repo/index-v1.jar', fingerprint, allow_deprecated=True
-        )
-        self.assertIsNotNone(data)
-        self.assertIsNotNone(public_key)
-        self.assertIsNotNone(public_key_fingerprint)
-
-    def test_get_index_from_jar_with_bad_fingerprint(self):
-        pubkey, fingerprint = index.extract_pubkey()
-        fingerprint = fingerprint[:-1] + 'G'
-        with self.assertRaises(fdroidserver.exception.VerificationException):
-            index.get_index_from_jar(
-                'repo/index-v1.jar', fingerprint, allow_deprecated=True
-            )
-
-    def test_get_index_from_jar_with_chars_to_be_stripped(self):
-        self._sign_test_index_v1_jar()
-        fingerprint = 'NOOOO F4 9A F3 F1 1E FD DF 20 DF FD 70 F5 E3 11 7B 99 76 67 41 67 AD CA 28 0E 6B 19 32 A0 60 1B 26 F6'
-        index.get_index_from_jar(
-            'repo/index-v1.jar', fingerprint, allow_deprecated=True
-        )
-
-    @patch('requests.head')
-    def test_download_repo_index_same_etag(self, head):
-        url = 'http://example.org?fingerprint=test'
-        etag = '"4de5-54d840ce95cb9"'
-
-        head.return_value.headers = {'ETag': etag}
-        data, new_etag = index.download_repo_index(url, etag=etag)
-
-        self.assertIsNone(data)
-        self.assertEqual(etag, new_etag)
-
-    @patch('requests.get')
-    @patch('requests.head')
-    def test_download_repo_index_new_etag(self, head, get):
-        url = 'http://example.org?fingerprint=' + GP_FINGERPRINT
-        etag = '"4de5-54d840ce95cb9"'
-
-        # fake HTTP answers
-        head.return_value.headers = {'ETag': 'new_etag'}
-        get.return_value.headers = {'ETag': 'new_etag'}
-        get.return_value.status_code = 200
-        testfile = os.path.join('signindex', 'guardianproject-v1.jar')
-        with open(testfile, 'rb') as file:
-            get.return_value.content = file.read()
-
-        data, new_etag = index.download_repo_index(url, etag=etag)
-
-        # assert that the index was retrieved properly
-        self.assertEqual('Guardian Project Official Releases', data['repo']['name'])
-        self.assertEqual(GP_FINGERPRINT, data['repo']['fingerprint'])
-        self.assertTrue(len(data['repo']['pubkey']) > 500)
-        self.assertEqual(10, len(data['apps']))
-        self.assertEqual(10, len(data['packages']))
-        self.assertEqual('new_etag', new_etag)
-
-    @patch('fdroidserver.net.http_get')
-    def test_download_repo_index_url_parsing(self, mock_http_get):
-        """Test whether it is trying to download the right file
-
-        This passes the URL back via the etag return value just as a
-        hack to check which URL was actually attempted.
-
-        """
-        mock_http_get.side_effect = lambda url, etag, timeout: (None, url)
-        repo_url = 'https://fake.url/fdroid/repo'
-        index_url = 'https://fake.url/fdroid/repo/index-v1.jar'
-        fingerprint_url = 'https://fake.url/fdroid/repo?fingerprint=' + GP_FINGERPRINT
-        slash_url = 'https://fake.url/fdroid/repo//?fingerprint=' + GP_FINGERPRINT
-        for url in (repo_url, index_url, fingerprint_url, slash_url):
-            ilist = index.download_repo_index(url, verify_fingerprint=False)
-            self.assertEqual(index_url, ilist[1])  # etag item used to return URL
-
-    @patch('fdroidserver.net.download_using_mirrors')
-    def test_download_repo_index_v2(self, mock_download_using_mirrors):
-        mock_download_using_mirrors.side_effect = lambda mirrors: os.path.join(
-            self.testdir, 'repo', os.path.basename(mirrors[0]['url'])
-        )
-        os.chdir(self.testdir)
-        signindex.config['keystore'] = os.path.join(basedir, 'keystore.jks')
-        os.mkdir('repo')
-        shutil.copy(basedir / 'repo' / 'entry.json', 'repo')
-        shutil.copy(basedir / 'repo' / 'index-v2.json', 'repo')
-        signindex.sign_index('repo', 'entry.json')
-        repo_url = 'https://fake.url/fdroid/repo'
-        entry_url = 'https://fake.url/fdroid/repo/entry.jar'
-        index_url = 'https://fake.url/fdroid/repo/index-v2.json'
-        fingerprint_url = 'https://fake.url/fdroid/repo?fingerprint=' + GP_FINGERPRINT
-        slash_url = 'https://fake.url/fdroid/repo//?fingerprint=' + GP_FINGERPRINT
-        for url in (repo_url, entry_url, index_url, fingerprint_url, slash_url):
-            data, _ignored = index.download_repo_index_v2(url, verify_fingerprint=False)
-            self.assertEqual(['repo', 'packages'], list(data.keys()))
-            self.assertEqual(
-                'My First F-Droid Repo Demo', data['repo']['name']['en-US']
-            )
-
-    @patch('fdroidserver.net.download_using_mirrors')
-    def test_download_repo_index_v2_bad_fingerprint(self, mock_download_using_mirrors):
-        mock_download_using_mirrors.side_effect = lambda mirrors: os.path.join(
-            self.testdir, 'repo', os.path.basename(mirrors[0]['url'])
-        )
-        os.chdir(self.testdir)
-        signindex.config['keystore'] = os.path.join(basedir, 'keystore.jks')
-        os.mkdir('repo')
-        shutil.copy(basedir / 'repo' / 'entry.json', 'repo')
-        shutil.copy(basedir / 'repo' / 'index-v2.json', 'repo')
-        signindex.sign_index('repo', 'entry.json')
-        bad_fp = '0123456789001234567890012345678900123456789001234567890012345678'
-        bad_fp_url = 'https://fake.url/fdroid/repo?fingerprint=' + bad_fp
-        with self.assertRaises(fdroidserver.exception.VerificationException):
-            data, _ignored = index.download_repo_index_v2(bad_fp_url)
-
-    @patch('fdroidserver.net.download_using_mirrors')
-    def test_download_repo_index_v2_entry_verify(self, mock_download_using_mirrors):
-        def download_using_mirrors_def(mirrors):
-            f = os.path.join(tempfile.mkdtemp(), os.path.basename(mirrors[0]['url']))
-            Path(f).write_text('not the entry.jar file contents')
-            return f
-
-        mock_download_using_mirrors.side_effect = download_using_mirrors_def
-        url = 'https://fake.url/fdroid/repo?fingerprint=' + GP_FINGERPRINT
-        with self.assertRaises(fdroidserver.exception.VerificationException):
-            data, _ignored = index.download_repo_index_v2(url)
-
-    @patch('fdroidserver.net.download_using_mirrors')
-    def test_download_repo_index_v2_index_verify(self, mock_download_using_mirrors):
-        def download_using_mirrors_def(mirrors):
-            f = os.path.join(tempfile.mkdtemp(), os.path.basename(mirrors[0]['url']))
-            Path(f).write_text('not the index-v2.json file contents')
-            return f
-
-        mock_download_using_mirrors.side_effect = download_using_mirrors_def
-        os.chdir(self.testdir)
-        signindex.config['keystore'] = os.path.join(basedir, 'keystore.jks')
-        os.mkdir('repo')
-        shutil.copy(basedir / 'repo' / 'entry.json', 'repo')
-        shutil.copy(basedir / 'repo' / 'index-v2.json', 'repo')
-        signindex.sign_index('repo', 'entry.json')
-        url = 'https://fake.url/fdroid/repo?fingerprint=' + GP_FINGERPRINT
-        with self.assertRaises(fdroidserver.exception.VerificationException):
-            data, _ignored = index.download_repo_index_v2(url)
-
-    def test_sort_package_versions(self):
-        i = [
-            {
-                'packageName': 'org.smssecure.smssecure',
-                'apkName': 'org.smssecure.smssecure_134.apk',
-                'signer': 'b33a601a9da97c82e6eb121eb6b90adab561f396602ec4dc8b0019fb587e2af6',
-                'versionCode': 134,
-            },
-            {
-                'packageName': 'org.smssecure.smssecure',
-                'apkName': 'org.smssecure.smssecure_134_b30bb97.apk',
-                'signer': 'b30bb971af0d134866e158ec748fcd553df97c150f58b0a963190bbafbeb0868',
-                'versionCode': 134,
-            },
-            {
-                'packageName': 'b075b32b4ef1e8a869e00edb136bd48e34a0382b85ced8628f164d1199584e4e'
-            },
-            {
-                'packageName': '43af70d1aca437c2f9974c4634cc5abe45bdc4d5d71529ac4e553488d3bb3ff6'
-            },
-            {
-                'packageName': 'org.smssecure.smssecure',
-                'apkName': 'org.smssecure.smssecure_135_b30bb97.apk',
-                'signer': 'b30bb971af0d134866e158ec748fcd553df97c150f58b0a963190bbafbeb0868',
-                'versionCode': 135,
-            },
-            {
-                'packageName': 'org.smssecure.smssecure',
-                'apkName': 'org.smssecure.smssecure_135.apk',
-                'signer': 'b33a601a9da97c82e6eb121eb6b90adab561f396602ec4dc8b0019fb587e2af6',
-                'versionCode': 135,
-            },
-            {
-                'packageName': 'org.smssecure.smssecure',
-                'apkName': 'org.smssecure.smssecure_133.apk',
-                'signer': 'b33a601a9da97c82e6eb121eb6b90adab561f396602ec4dc8b0019fb587e2af6',
-                'versionCode': 133,
-            },
-            {
-                'packageName': 'org.smssecure.smssecure',
-                'apkName': 'smssecure-weird-version.apk',
-                'signer': '99ff99ff99ff99ff99ff99ff99ff99ff99ff99ff99ff99ff99ff99ff99ff99ff',
-                'versionCode': 133,
-            },
-            {
-                'packageName': 'org.smssecure.smssecure',
-                'apkName': 'smssecure-custom.apk',
-                'signer': '1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef',
-                'versionCode': 133,
-            },
-            {
-                'packageName': 'org.smssecure.smssecure',
-                'apkName': 'smssecure-new-custom.apk',
-                'signer': '1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef',
-                'versionCode': 135,
-            },
-        ]
-
-        o = [
-            {
-                'packageName': '43af70d1aca437c2f9974c4634cc5abe45bdc4d5d71529ac4e553488d3bb3ff6'
-            },
-            {
-                'packageName': 'b075b32b4ef1e8a869e00edb136bd48e34a0382b85ced8628f164d1199584e4e'
-            },
-            # app test data
-            # # packages with reproducible developer signature
-            {
-                'packageName': 'org.smssecure.smssecure',
-                'apkName': 'org.smssecure.smssecure_135_b30bb97.apk',
-                'signer': 'b30bb971af0d134866e158ec748fcd553df97c150f58b0a963190bbafbeb0868',
-                'versionCode': 135,
-            },
-            {
-                'packageName': 'org.smssecure.smssecure',
-                'apkName': 'org.smssecure.smssecure_134_b30bb97.apk',
-                'signer': 'b30bb971af0d134866e158ec748fcd553df97c150f58b0a963190bbafbeb0868',
-                'versionCode': 134,
-            },
-            # # packages build and signed by fdroid
-            {
-                'packageName': 'org.smssecure.smssecure',
-                'apkName': 'org.smssecure.smssecure_135.apk',
-                'signer': 'b33a601a9da97c82e6eb121eb6b90adab561f396602ec4dc8b0019fb587e2af6',
-                'versionCode': 135,
-            },
-            {
-                'packageName': 'org.smssecure.smssecure',
-                'apkName': 'org.smssecure.smssecure_134.apk',
-                'signer': 'b33a601a9da97c82e6eb121eb6b90adab561f396602ec4dc8b0019fb587e2af6',
-                'versionCode': 134,
-            },
-            {
-                'packageName': 'org.smssecure.smssecure',
-                'apkName': 'org.smssecure.smssecure_133.apk',
-                'signer': 'b33a601a9da97c82e6eb121eb6b90adab561f396602ec4dc8b0019fb587e2af6',
-                'versionCode': 133,
-            },
-            # # packages signed with unkown keys
-            {
-                'packageName': 'org.smssecure.smssecure',
-                'apkName': 'smssecure-new-custom.apk',
-                'signer': '1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef',
-                'versionCode': 135,
-            },
-            {
-                'packageName': 'org.smssecure.smssecure',
-                'apkName': 'smssecure-custom.apk',
-                'signer': '1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef',
-                'versionCode': 133,
-            },
-            {
-                'packageName': 'org.smssecure.smssecure',
-                'apkName': 'smssecure-weird-version.apk',
-                'signer': '99ff99ff99ff99ff99ff99ff99ff99ff99ff99ff99ff99ff99ff99ff99ff99ff',
-                'versionCode': 133,
-            },
-        ]
-
-        common.config = {}
-        common.fill_config_defaults(common.config)
-        publish.config = common.config
-        publish.config['keystorepass'] = '123456'
-        publish.config['keypass'] = '123456'
-        publish.config['keystore'] = os.path.join(os.getcwd(), 'dummy-keystore.jks')
-        publish.config['repo_keyalias'] = 'repokey'
-
-        testsmetadir = os.path.join(os.getcwd(), 'metadata')
-        with tempfile.TemporaryDirectory() as tmpdir, TmpCwd(tmpdir):
-            shutil.copytree(testsmetadir, 'metadata')
-            sigkeyfps = {
-                "org.smssecure.smssecure": {
-                    "signer": "b33a601a9da97c82e6eb121eb6b90adab561f396602ec4dc8b0019fb587e2af6"
-                }
-            }
-            os.mkdir('repo')
-            jarfile = 'repo/signer-index.jar'
-            with zipfile.ZipFile(jarfile, 'w', zipfile.ZIP_DEFLATED) as jar:
-                jar.writestr('signer-index.json', json.dumps(sigkeyfps))
-            publish.sign_sig_key_fingerprint_list(jarfile)
-            common.write_config_file('')
-
-            index.sort_package_versions(i, common.load_publish_signer_fingerprints())
-            self.maxDiff = None
-            self.assertEqual(json.dumps(i, indent=2), json.dumps(o, indent=2))
-
-            # and test it still works with get_first_signer_certificate
-            outdir = os.path.join(self.testdir, 'index-signer-fingerprints')
-            os.mkdir(outdir)
-            common.apk_extract_signatures(jarfile, outdir)
-            certs = glob.glob(os.path.join(outdir, '*.RSA'))
-            with open(certs[0], 'rb') as fp:
-                self.assertEqual(
-                    common.get_certificate(fp.read()),
-                    common.get_first_signer_certificate(jarfile),
-                )
-
-    def test_make_v0_repo_only(self):
-        os.chdir(self.testdir)
-        os.mkdir('repo')
-        repo_icons_dir = os.path.join('repo', 'icons')
-        self.assertFalse(os.path.isdir(repo_icons_dir))
-        repodict = {
-            'address': 'https://example.com/fdroid/repo',
-            'description': 'This is just a test',
-            'icon': 'blahblah',
-            'name': 'test',
-            'timestamp': datetime.datetime.now(),
-            'version': 12,
-        }
-        requestsdict = {'install': [], 'uninstall': []}
-        common.config['repo_pubkey'] = 'ffffffffffffffffffffffffffffffffff'
-        index.make_v0({}, [], 'repo', repodict, requestsdict, {})
-        self.assertTrue(os.path.isdir(repo_icons_dir))
-        self.assertTrue(
-            os.path.exists(
-                os.path.join(repo_icons_dir, common.default_config['repo_icon'])
-            )
-        )
-        self.assertTrue(os.path.exists(os.path.join('repo', 'index.xml')))
-
-    def test_make_v0(self):
-        os.chdir(self.testdir)
-        os.mkdir('metadata')
-        os.mkdir('repo')
-        metadatafile = 'metadata/info.zwanenburg.caffeinetile.yml'
-        shutil.copy(os.path.join(basedir, metadatafile), metadatafile)
-        repo_icons_dir = os.path.join('repo', 'icons')
-        self.assertFalse(os.path.isdir(repo_icons_dir))
-        repodict = {
-            'address': 'https://example.com/fdroid/repo',
-            'description': 'This is just a test',
-            'icon': 'blahblah',
-            'mirrors': [
-                {'isPrimary': True, 'url': 'https://example.com/fdroid/repo'},
-                {'extra': 'data', 'url': 'http://one/fdroid/repo'},
-                {'url': 'http://two/fdroid/repo'},
-            ],
-            'name': 'test',
-            'timestamp': datetime.datetime.now(),
-            'version': 12,
-        }
-        app = fdroidserver.metadata.parse_metadata(metadatafile)
-        app['icon'] = 'info.zwanenburg.caffeinetile.4.xml'
-        app['CurrentVersionCode'] = 4
-        apps = {app.id: app}
-        orig_apps = copy.deepcopy(apps)
-        apk = {
-            'hash': 'dbbdd7deadb038862f426b71efe4a64df8c3edf25d669e935f349510e16f65db',
-            'hashType': 'sha256',
-            'uses-permission': [['android.permission.WAKE_LOCK', None]],
-            'uses-permission-sdk-23': [],
-            'features': [],
-            'icons_src': {
-                '160': 'res/drawable/ic_coffee_on.xml',
-                '-1': 'res/drawable/ic_coffee_on.xml',
-            },
-            'icons': {'160': 'info.zwanenburg.caffeinetile.4.xml'},
-            'antiFeatures': ['KnownVuln'],
-            'packageName': 'info.zwanenburg.caffeinetile',
-            'versionCode': 4,
-            'name': 'Caffeine Tile',
-            'versionName': '1.3',
-            'minSdkVersion': 24,
-            'targetSdkVersion': 25,
-            'sig': '03f9b2f848d22fd1d8d1331e8b1b486d',
-            'signer': '51cfa5c8a743833ad89acf81cb755936876a5c8b8eca54d1ffdcec0cdca25d0e',
-            'size': 11740,
-            'apkName': 'info.zwanenburg.caffeinetile_4.apk',
-            'icon': 'info.zwanenburg.caffeinetile.4.xml',
-            'added': datetime.datetime.fromtimestamp(1539122400),
-        }
-        requestsdict = {'install': [], 'uninstall': []}
-        common.config['repo_pubkey'] = 'ffffffffffffffffffffffffffffffffff'
-        common.config['make_current_version_link'] = True
-        index.make_v0(apps, [apk], 'repo', repodict, requestsdict, {})
-        self.assertTrue(os.path.isdir(repo_icons_dir))
-        self.assertTrue(
-            os.path.exists(
-                os.path.join(repo_icons_dir, common.default_config['repo_icon'])
-            )
-        )
-        self.assertTrue(os.path.exists(os.path.join('repo', 'index.xml')))
-        self.assertEqual(orig_apps, apps, "apps was modified when building the index")
-
-    def test_v0_invalid_config_exception(self):
-        """Index v0 needs additional config values when using --nosign
-
-        index.xml aka Index v0 includes the full repo public key in
-        the XML itself.  So when running `fdroid update --nosign`,
-        there needs to be either repo_pubkey or a full keystore config
-        present.
-
-        """
-        os.chdir(self.testdir)
-        os.mkdir('repo')
-        repo_icons_dir = os.path.join('repo', 'icons')
-        self.assertFalse(os.path.isdir(repo_icons_dir))
-        repodict = {
-            'address': 'https://example.com/fdroid/repo',
-            'description': 'This is just a test',
-            'icon': 'blahblah',
-            'name': 'test',
-            'timestamp': datetime.datetime.now(),
-            'version': 12,
-        }
-        requestsdict = {'install': [], 'uninstall': []}
-
-        common.options.nosign = False
-        with self.assertRaises(fdroidserver.exception.FDroidException):
-            index.make_v0({}, [], 'repo', repodict, requestsdict, {})
-
-        common.options.nosign = True
-        with self.assertRaises(fdroidserver.exception.FDroidException):
-            index.make_v0({}, [], 'repo', repodict, requestsdict, {})
-
-        common.config['repo_pubkey'] = 'ffffffffffffffffffffffffffffffffff'
-        self.assertFalse(os.path.exists(os.path.join('repo', 'index.xml')))
-        self.assertFalse(os.path.exists(os.path.join('repo', 'index_unsigned.jar')))
-        self.assertFalse(os.path.exists(os.path.join('repo', 'index.jar')))
-        index.make_v0({}, [], 'repo', repodict, requestsdict, {})
-        self.assertTrue(os.path.exists(os.path.join('repo', 'index.xml')))
-        self.assertTrue(os.path.exists(os.path.join('repo', 'index_unsigned.jar')))
-        self.assertFalse(os.path.exists(os.path.join('repo', 'index.jar')))
-
-    def test_make_v1_with_mirrors(self):
-        os.chdir(self.testdir)
-        os.mkdir('repo')
-        repodict = {
-            'address': 'https://example.com/fdroid/repo',
-            'mirrors': [
-                {'isPrimary': True, 'url': 'https://example.com/fdroid/repo'},
-                {'extra': 'data', 'url': 'http://one/fdroid/repo'},
-                {'url': 'http://two/fdroid/repo'},
-            ],
-        }
-        index.make_v1({}, [], 'repo', repodict, {}, {})
-        index_v1 = Path('repo/index-v1.json')
-        self.assertTrue(index_v1.exists())
-        with index_v1.open() as fp:
-            self.assertEqual(
-                json.load(fp)['repo']['mirrors'],
-                ['http://one/fdroid/repo', 'http://two/fdroid/repo'],
-            )
-
-    def test_github_get_mirror_service_urls(self):
-        for url in [
-            'git@github.com:foo/bar',
-            'git@github.com:foo/bar.git',
-            'https://github.com/foo/bar',
-            'https://github.com/foo/bar.git',
-        ]:
-            self.assertEqual(
-                ['https://raw.githubusercontent.com/foo/bar/master/fdroid'],
-                index.get_mirror_service_urls({"url": url}),
-            )
-
-    @patch.dict(os.environ, clear=True)
-    def test_gitlab_get_mirror_service_urls(self):
-        with tempfile.TemporaryDirectory() as tmpdir, TmpCwd(tmpdir):
-            git_mirror_path = Path('git-mirror/fdroid')
-            git_mirror_path.mkdir(parents=True)
-            ci_job_id = '12345678'
-            artifacts_url = (
-                'https://group.gitlab.io/-/project/-/jobs/%s/artifacts/public/fdroid'
-                % ci_job_id
-            )
-            with (git_mirror_path / 'placeholder').open('w') as fp:
-                fp.write('                                        ')
-            for url in [
-                'git@gitlab.com:group/project',
-                'git@gitlab.com:group/project.git',
-                'https://gitlab.com/group/project',
-                'https://gitlab.com/group/project.git',
-            ]:
-                with patch('fdroidserver.common.GITLAB_COM_PAGES_MAX_SIZE', 1000):
-                    expected = [
-                        'https://group.gitlab.io/project/fdroid',
-                        'https://gitlab.com/group/project/-/raw/master/fdroid',
-                    ]
-                    self.assertEqual(
-                        expected,
-                        index.get_mirror_service_urls({"url": url}),
-                    )
-                    with patch.dict(os.environ, clear=True):
-                        os.environ['CI_JOB_ID'] = ci_job_id
-                        self.assertEqual(
-                            expected + [artifacts_url],
-                            index.get_mirror_service_urls({"url": url}),
-                        )
-                with patch('fdroidserver.common.GITLAB_COM_PAGES_MAX_SIZE', 10):
-                    expected = [
-                        'https://gitlab.com/group/project/-/raw/master/fdroid',
-                    ]
-                    self.assertEqual(
-                        expected,
-                        index.get_mirror_service_urls({"url": url}),
-                    )
-                    with patch.dict(os.environ, clear=True):
-                        os.environ['CI_JOB_ID'] = ci_job_id
-                        self.assertEqual(
-                            expected + [artifacts_url],
-                            index.get_mirror_service_urls({"url": url}),
-                        )
-
-    def test_make_website(self):
-        os.chdir(self.testdir)
-        os.mkdir('metadata')
-        os.mkdir('repo')
-
-        repodict = {
-            'address': 'https://example.com/fdroid/repo',
-            'description': 'This is just a test',
-            'icon': 'blahblah',
-            'name': 'test',
-            'timestamp': datetime.datetime.now(),
-            'version': 12,
-        }
-
-        common.config['repo_pubkey'] = 'ffffffffffffffffffffffffffffffffff'
-
-        index.make_website([], "repo", repodict)
-        self.assertTrue(os.path.exists(os.path.join('repo', 'index.html')))
-        self.assertTrue(os.path.exists(os.path.join('repo', 'index.css')))
-        self.assertTrue(os.path.exists(os.path.join('repo', 'index.png')))
-
-        try:
-            from html5print import CSSBeautifier, HTMLBeautifier
-        except ImportError:
-            print('WARNING: skipping rest of test since html5print is missing!')
-            return
-
-        with open(os.path.join("repo", "index.html")) as f:
-            html = f.read()
-            pretty_html = HTMLBeautifier.beautify(html)
-            self.maxDiff = None
-            self.assertEqual(html, pretty_html)
-
-        with open(os.path.join("repo", "index.css")) as f:
-            css = f.read()
-            pretty_css = CSSBeautifier.beautify(css)
-            self.maxDiff = None
-            self.assertEqual(css, pretty_css)
-
-    def test_sort_package_versions_with_invalid(self):
-        i = [
-            {
-                'packageName': 'org.smssecure.smssecure',
-                'apkName': 'smssecure-custom.fake',
-                'signer': None,
-                'versionCode': 11111,
-            }
-        ]
-
-        index.sort_package_versions(i, common.load_publish_signer_fingerprints())
-
-    def test_package_metadata(self):
-        """A smoke check and format check of index.package_metadata()"""
-
-        def _kn(key):
-            return key[0].lower() + key[1:]
-
-        apps = fdroidserver.metadata.read_metadata()
-        update.insert_localized_app_metadata(apps)
-
-        # smoke check all metadata files
-        for appid, app in apps.items():
-            metadata = index.package_metadata(app, 'repo')
-            for k in ('Description', 'Name', 'Summary', 'video'):
-                if app.get(k):
-                    self.assertTrue(isinstance(metadata[_kn(k)], dict))
-            for k in ('AuthorWebSite', 'IssueTracker', 'Translation', 'WebSite'):
-                if app.get(k):
-                    self.assertTrue(isinstance(metadata[_kn(k)], str))
-
-        # make sure these known values were properly parsed and included
-        appid = 'info.guardianproject.urzip'
-        app = apps[appid]
-        metadata = index.package_metadata(app, 'repo')
-        # files
-        self.assertEqual(
-            os.path.getsize(f'repo/{appid}/en-US/featureGraphic.png'),
-            metadata['featureGraphic']['en-US']['size'],
-        )
-        self.assertEqual(
-            os.path.getsize(f'repo/{appid}/en-US/icon.png'),
-            metadata['icon']['en-US']['size'],
-        )
-        # localized strings
-        self.assertEqual({'en-US': 'title'}, metadata['name'])
-        self.assertEqual({'en-US': 'video'}, metadata['video'])
-        # strings
-        self.assertEqual(
-            'https://dev.guardianproject.info/projects/urzip',
-            metadata['webSite'],
-        )
-
-    def test_add_mirrors_to_repodict(self):
-        """Test based on the contents of tests/config.yml"""
-        repodict = {'address': common.config['repo_url']}
-        index.add_mirrors_to_repodict('repo', repodict)
-        self.assertEqual(
-            repodict['mirrors'],
-            [
-                {'isPrimary': True, 'url': 'https://MyFirstFDroidRepo.org/fdroid/repo'},
-                {'url': 'http://foobarfoobarfoobar.onion/fdroid/repo'},
-                {'url': 'https://foo.bar/fdroid/repo'},
-            ],
-        )
-
-    def test_custom_config_yml_with_mirrors(self):
-        """Test based on custom contents of config.yml"""
-        os.chdir(self.testdir)
-        repo_url = 'https://example.com/fdroid/repo'
-        c = {'repo_url': repo_url, 'mirrors': ['http://one/fdroid']}
-        with open(common.CONFIG_FILE, 'w', encoding='utf-8') as fp:
-            yaml.dump(c, fp)
-        common.config = None
-        common.read_config()
-        repodict = {'address': common.config['repo_url']}
-        index.add_mirrors_to_repodict('repo', repodict)
-        self.assertEqual(
-            repodict['mirrors'],
-            [
-                {'url': 'https://example.com/fdroid/repo', 'isPrimary': True},
-                {'url': 'http://one/fdroid/repo'},
-            ],
-        )
-
-    def test_no_mirrors_config(self):
-        common.config = dict()
-        repodict = {'address': 'https://example.com/fdroid/repo'}
-        index.add_mirrors_to_repodict('repo', repodict)
-        self.assertFalse('mirrors' in repodict)
-
-    def test_add_metadata_to_canonical_in_mirrors_config(self):
-        """It is possible to add extra metadata to the canonical URL"""
-        common.config = {
-            'repo_url': 'http://one/fdroid/repo',
-            'mirrors': [
-                {'url': 'http://one/fdroid', 'extra': 'data'},
-                {'url': 'http://two/fdroid'},
-            ],
-        }
-        repodict = {'address': common.config['repo_url']}
-        index.add_mirrors_to_repodict('repo', repodict)
-        self.assertEqual(
-            repodict['mirrors'],
-            [
-                {'extra': 'data', 'isPrimary': True, 'url': 'http://one/fdroid/repo'},
-                {'url': 'http://two/fdroid/repo'},
-            ],
-        )
-
-    def test_duplicate_primary_in_mirrors_config(self):
-        """There can be only one primary mirror aka canonical URL"""
-        common.config = {
-            'repo_url': 'http://one/fdroid',
-            'mirrors': [
-                {'url': 'http://one/fdroid', 'countryCode': 'SA'},
-                {'url': 'http://two/fdroid'},
-                {'url': 'http://one/fdroid'},
-            ],
-        }
-        repodict = {'address': common.config['repo_url']}
-        with self.assertRaises(fdroidserver.exception.FDroidException):
-            index.add_mirrors_to_repodict('repo', repodict)
-
-    def test_bad_type_in_mirrors_config(self):
-        for i in (1, 2.3, b'asdf'):
-            common.config = {'mirrors': i}
-            repodict = dict()
-            with self.assertRaises(fdroidserver.exception.FDroidException):
-                index.add_mirrors_to_repodict('repo', repodict)
-
-    def test_load_mirrors_config_from_file(self):
-        # empty the dict for *.config, see setUp()
-        for k in sorted(common.config.keys()):
-            del common.config[k]
-
-        os.chdir(self.testdir)
-        os.mkdir('config')
-        primary = 'https://primary.com/fdroid/repo'
-        mirror = 'https://mirror.com/fdroid'
-        with open('config/mirrors.yml', 'w') as fp:
-            yaml.dump([{'url': mirror}], fp)
-        repodict = {'address': primary}
-        index.add_mirrors_to_repodict('repo', repodict)
-        self.assertEqual(
-            repodict['mirrors'],
-            [
-                {'isPrimary': True, 'url': primary},
-                {'url': mirror + '/repo'},
-            ],
-        )
-
-    def test_error_when_load_mirrors_from_config_and_file(self):
-        # empty the dict for *.config, see setUp()
-        for k in sorted(common.config.keys()):
-            del common.config[k]
-
-        os.chdir(self.testdir)
-        os.mkdir('config')
-        with open('config/mirrors.yml', 'w') as fp:
-            yaml.dump([{'url': 'https://foo.com'}], fp)
-        repodict = {
-            'address': 'https://foo.com',
-            'mirrors': {'url': 'http://two/fdroid/repo'},
-        }
-        with self.assertRaises(fdroidserver.exception.FDroidException):
-            index.add_mirrors_to_repodict('repo', repodict)
-
-    def test_erroneous_isPrimary_in_mirrors_config(self):
-        """There can be only one primary mirror aka canonical URL"""
-        common.config = {
-            'repo_url': 'http://one/fdroid',
-            'mirrors': [
-                {'url': 'http://one/fdroid', 'countryCode': 'SA'},
-                {'url': 'http://two/fdroid', 'isPrimary': True},
-            ],
-        }
-        repodict = {'address': common.config['repo_url']}
-        with self.assertRaises(fdroidserver.exception.FDroidException):
-            index.add_mirrors_to_repodict('repo', repodict)
-
-
-class AltstoreIndexTest(unittest.TestCase):
-    def test_make_altstore(self):
-        self.maxDiff = None
-
-        apps = {
-            "app.fake": {
-                "AutoName": "Fake App",
-                "AuthorName": "Fake Author",
-                "iconv2": {"en_US": "fake_icon.png"},
-            }
-        }
-        apks = [
-            {
-                "packageName": "app.fake",
-                "apkName": "app.fake_123.ipa",
-                "versionName": "v123",
-                "added": datetime.datetime(2000, 2, 2, 2, 2, 2),
-                "size": 123,
-                "ipa_MinimumOSVersion": "10.0",
-                "ipa_DTPlatformVersion": "12.0",
-                "ipa_permissions": [
-                    "NSCameraUsageDescription",
-                    "NSDocumentsFolderUsageDescription",
-                ],
-                "ipa_entitlements": [
-                    "com.apple.developer.team-identifier",
-                    "com.apple.developer.web-browser",
-                    "keychain-access-groups",
-                ],
-            },
-        ]
-        config = {
-            "repo_icon": "fake_repo_icon.png",
-            "repo_name": "fake_repo",
-            "repo_url": "gopher://fake-repo.com/fdroid/repo",
-        }
-
-        with tempfile.TemporaryDirectory() as tmpdir, TmpCwd(tmpdir):
-            repodir = Path(tmpdir) / 'repo'
-            repodir.mkdir()
-            (repodir / "fake.ipa").touch()
-
-            fdroidserver.index.make_altstore(
-                apps,
-                apks,
-                config,
-                repodir,
-                True,
-            )
-
-            with open(repodir / "altstore-index.json", 'r') as f:
-                self.assertDictEqual(
-                    {
-                        "apps": [
-                            {
-                                "appPermissions": {
-                                    "entitlements": [
-                                        'com.apple.developer.team-identifier',
-                                        'com.apple.developer.web-browser',
-                                        'keychain-access-groups',
-                                    ],
-                                    'privacy': [
-                                        'NSCameraUsageDescription',
-                                        'NSDocumentsFolderUsageDescription',
-                                    ],
-                                },
-                                'bundleIdentifier': 'app.fake',
-                                'developerName': 'Fake Author',
-                                'iconURL': 'gopher://fake-repo.com/fdroid/repo',
-                                'localizedDescription': '',
-                                'name': 'Fake App',
-                                'screenshots': [],
-                                'versions': [
-                                    {
-                                        'date': '2000-02-02T02:02:02',
-                                        'downloadURL': 'gopher://fake-repo.com/fdroid/repo/app.fake_123.ipa',
-                                        'maxOSVersion': '12.0',
-                                        'minOSVersion': '10.0',
-                                        'size': 123,
-                                        'version': 'v123',
-                                    }
-                                ],
-                            },
-                        ],
-                        'name': 'fake_repo',
-                        'news': [],
-                    },
-                    json.load(f),
-                )
diff --git a/tests/test_init.py b/tests/test_init.py
deleted file mode 100755
index a038493b..00000000
--- a/tests/test_init.py
+++ /dev/null
@@ -1,60 +0,0 @@
-#!/usr/bin/env python3
-
-import os
-import pathlib
-import shutil
-import sys
-import unittest
-
-import fdroidserver.common
-import fdroidserver.init
-
-from .shared_test_code import mkdtemp
-
-basedir = pathlib.Path(__file__).parent
-
-
-class InitTest(unittest.TestCase):
-    '''fdroidserver/init.py'''
-
-    def setUp(self):
-        fdroidserver.common.config = None
-        fdroidserver.init.config = None
-        self._td = mkdtemp()
-        self.testdir = self._td.name
-        os.chdir(self.testdir)
-
-    def tearDown(self):
-        os.chdir(basedir)
-        self._td.cleanup()
-
-    def test_disable_in_config(self):
-        test = 'mysupersecrets'
-        configfile = pathlib.Path(fdroidserver.common.CONFIG_FILE)
-        configfile.write_text(f'keystore: NONE\nkeypass: {test}\n', encoding='utf-8')
-        configfile.chmod(0o600)
-        config = fdroidserver.common.read_config()
-        self.assertEqual('NONE', config['keystore'])
-        self.assertEqual(test, config['keypass'])
-        fdroidserver.init.disable_in_config('keypass', 'comment')
-        self.assertIn('#keypass:', configfile.read_text())
-        fdroidserver.common.config = None
-        config = fdroidserver.common.read_config()
-        self.assertIsNone(config.get('keypass'))
-
-    @unittest.skipIf(os.name == 'nt', "calling main() like this hangs on Windows")
-    def test_main_in_empty_dir(self):
-        """Test that `fdroid init` will find apksigner and add it to the config"""
-
-        shutil.copy(basedir / 'keystore.jks', self.testdir)
-
-        bindir = os.path.join(os.getcwd(), 'bin')
-        os.mkdir(bindir)
-        apksigner = os.path.join(bindir, 'apksigner')
-        open(apksigner, 'w').close()
-        os.chmod(apksigner, 0o755)  # nosec B103
-
-        sys.argv = ['fdroid init', '--keystore', 'keystore.jks', '--repo-keyalias=sova']
-        with unittest.mock.patch.dict(os.environ, {'PATH': bindir}):
-            fdroidserver.init.main()
-        self.assertEqual(apksigner, fdroidserver.init.config.get('apksigner'))
diff --git a/tests/test_install.py b/tests/test_install.py
deleted file mode 100755
index aa239d4d..00000000
--- a/tests/test_install.py
+++ /dev/null
@@ -1,256 +0,0 @@
-#!/usr/bin/env python3
-
-import os
-import textwrap
-import unittest
-from pathlib import Path
-from unittest.mock import Mock, patch
-
-import fdroidserver
-from fdroidserver import common, install
-from fdroidserver.exception import BuildException, FDroidException
-
-
-@unittest.skipIf(os.uname().machine == 's390x', 'adb is not ported to s390x')
-class InstallTest(unittest.TestCase):
-    '''fdroidserver/install.py'''
-
-    def tearDown(self):
-        common.config = None
-
-    def test_devices(self):
-        config = dict()
-        fdroidserver.common.fill_config_defaults(config)
-        fdroidserver.common.config = config
-        try:
-            config['adb'] = fdroidserver.common.find_sdk_tools_cmd('adb')
-        except FDroidException as e:
-            self.skipTest(f'Skipping test because: {e}')
-        self.assertTrue(os.path.exists(config['adb']))
-        self.assertTrue(os.path.isfile(config['adb']))
-        devices = fdroidserver.install.devices()
-        self.assertIsInstance(devices, list, 'install.devices() did not return a list!')
-        for device in devices:
-            self.assertIsInstance(device, str)
-
-    def test_devices_fail(self):
-        common.config = dict()
-        common.fill_config_defaults(common.config)
-        common.config['adb'] = '/bin/false'
-        with self.assertRaises(FDroidException):
-            fdroidserver.install.devices()
-
-    def test_devices_fail_nonexistent(self):
-        """This is mostly just to document this strange difference in behavior"""
-        common.config = dict()
-        common.fill_config_defaults(common.config)
-        common.config['adb'] = '/nonexistent'
-        with self.assertRaises(BuildException):
-            fdroidserver.install.devices()
-
-    @patch('fdroidserver.common.SdkToolsPopen')
-    def test_devices_with_mock_none(self, mock_SdkToolsPopen):
-        p = Mock()
-        mock_SdkToolsPopen.return_value = p
-        p.output = 'List of devices attached\n\n'
-        p.returncode = 0
-        common.config = dict()
-        common.fill_config_defaults(common.config)
-        self.assertEqual([], fdroidserver.install.devices())
-
-    @patch('fdroidserver.common.SdkToolsPopen')
-    def test_devices_with_mock_one(self, mock_SdkToolsPopen):
-        p = Mock()
-        mock_SdkToolsPopen.return_value = p
-        p.output = 'List of devices attached\n05995813\tdevice\n\n'
-        p.returncode = 0
-        common.config = dict()
-        common.fill_config_defaults(common.config)
-        self.assertEqual(['05995813'], fdroidserver.install.devices())
-
-    @patch('fdroidserver.common.SdkToolsPopen')
-    def test_devices_with_mock_many(self, mock_SdkToolsPopen):
-        p = Mock()
-        mock_SdkToolsPopen.return_value = p
-        p.output = textwrap.dedent(
-            """* daemon not running; starting now at tcp:5037
-            * daemon started successfully
-            List of devices attached
-            RZCT809FTQM	device
-            05995813	device
-            emulator-5556	device
-            emulator-5554	unauthorized
-            0a388e93	no permissions (missing udev rules? user is in the plugdev group); see [http://developer.android.com/tools/device.html]
-            986AY133QL	device
-            09301JEC215064	device
-            015d165c3010200e	device
-            4DCESKVGUC85VOTO	device
-
-            """
-        )
-        p.returncode = 0
-        common.config = dict()
-        common.fill_config_defaults(common.config)
-        self.assertEqual(
-            [
-                'RZCT809FTQM',
-                '05995813',
-                'emulator-5556',
-                '986AY133QL',
-                '09301JEC215064',
-                '015d165c3010200e',
-                '4DCESKVGUC85VOTO',
-            ],
-            fdroidserver.install.devices(),
-        )
-
-    @patch('fdroidserver.common.SdkToolsPopen')
-    def test_devices_with_mock_error(self, mock_SdkToolsPopen):
-        p = Mock()
-        mock_SdkToolsPopen.return_value = p
-        p.output = textwrap.dedent(
-            """* daemon not running. starting it now on port 5037 *
-            * daemon started successfully *
-            ** daemon still not running
-            error: cannot connect to daemon
-            """
-        )
-        p.returncode = 0
-        common.config = dict()
-        common.fill_config_defaults(common.config)
-        self.assertEqual([], fdroidserver.install.devices())
-
-    @patch('fdroidserver.common.SdkToolsPopen')
-    def test_devices_with_mock_no_permissions(self, mock_SdkToolsPopen):
-        p = Mock()
-        mock_SdkToolsPopen.return_value = p
-        p.output = textwrap.dedent(
-            """List of devices attached
-            ????????????????	no permissions
-            """
-        )
-        p.returncode = 0
-        common.config = dict()
-        common.fill_config_defaults(common.config)
-        self.assertEqual([], fdroidserver.install.devices())
-
-    @patch('fdroidserver.common.SdkToolsPopen')
-    def test_devices_with_mock_unauthorized(self, mock_SdkToolsPopen):
-        p = Mock()
-        mock_SdkToolsPopen.return_value = p
-        p.output = textwrap.dedent(
-            """List of devices attached
-            aeef5e4e	unauthorized
-            """
-        )
-        p.returncode = 0
-        common.config = dict()
-        common.fill_config_defaults(common.config)
-        self.assertEqual([], fdroidserver.install.devices())
-
-    @patch('fdroidserver.common.SdkToolsPopen')
-    def test_devices_with_mock_no_permissions_with_serial(self, mock_SdkToolsPopen):
-        p = Mock()
-        mock_SdkToolsPopen.return_value = p
-        p.output = textwrap.dedent(
-            """List of devices attached
-             4DCESKVGUC85VOTO	no permissions (missing udev rules? user is in the plugdev group); see [http://developer.android.com/tools/device.html]
-
-            """
-        )
-        p.returncode = 0
-        common.config = dict()
-        common.fill_config_defaults(common.config)
-        self.assertEqual([], fdroidserver.install.devices())
-
-    @staticmethod
-    def _download_raise(privacy_mode):
-        raise Exception('fake failed download')
-
-    @patch('fdroidserver.install.download_apk')
-    @patch('fdroidserver.install.download_fdroid_apk')
-    @patch('fdroidserver.install.download_fdroid_apk_from_github')
-    @patch('fdroidserver.install.download_fdroid_apk_from_ipns')
-    @patch('fdroidserver.install.download_fdroid_apk_from_maven')
-    def test_install_fdroid_apk_privacy_mode_true(
-        self, maven, ipns, github, download_fdroid_apk, download_apk
-    ):
-        download_apk.side_effect = self._download_raise
-        download_fdroid_apk.side_effect = self._download_raise
-        github.side_effect = self._download_raise
-        ipns.side_effect = self._download_raise
-        maven.side_effect = self._download_raise
-        fdroidserver.common.config = {'jarsigner': 'fakepath'}
-        install.install_fdroid_apk(privacy_mode=True)
-        download_apk.assert_not_called()
-        download_fdroid_apk.assert_not_called()
-        github.assert_called_once()
-        ipns.assert_called_once()
-        maven.assert_called_once()
-
-    @patch('fdroidserver.install.download_apk')
-    @patch('fdroidserver.install.download_fdroid_apk')
-    @patch('fdroidserver.install.download_fdroid_apk_from_github')
-    @patch('fdroidserver.install.download_fdroid_apk_from_ipns')
-    @patch('fdroidserver.install.download_fdroid_apk_from_maven')
-    def test_install_fdroid_apk_privacy_mode_false(
-        self, maven, ipns, github, download_fdroid_apk, download_apk
-    ):
-        download_apk.side_effect = self._download_raise
-        download_fdroid_apk.side_effect = self._download_raise
-        github.side_effect = self._download_raise
-        ipns.side_effect = self._download_raise
-        maven.side_effect = self._download_raise
-        fdroidserver.common.config = {'jarsigner': 'fakepath'}
-        install.install_fdroid_apk(privacy_mode=False)
-        download_apk.assert_called_once()
-        download_fdroid_apk.assert_called_once()
-        github.assert_called_once()
-        ipns.assert_called_once()
-        maven.assert_called_once()
-
-    @patch('fdroidserver.install.download_apk')
-    @patch('fdroidserver.install.download_fdroid_apk')
-    @patch('fdroidserver.install.download_fdroid_apk_from_github')
-    @patch('fdroidserver.install.download_fdroid_apk_from_ipns')
-    @patch('fdroidserver.install.download_fdroid_apk_from_maven')
-    @patch('locale.getlocale', lambda: ('zh_CN', 'UTF-8'))
-    def test_install_fdroid_apk_privacy_mode_locale_auto(
-        self, maven, ipns, github, download_fdroid_apk, download_apk
-    ):
-        download_apk.side_effect = self._download_raise
-        download_fdroid_apk.side_effect = self._download_raise
-        github.side_effect = self._download_raise
-        ipns.side_effect = self._download_raise
-        maven.side_effect = self._download_raise
-        fdroidserver.common.config = {'jarsigner': 'fakepath'}
-        install.install_fdroid_apk(privacy_mode=None)
-        download_apk.assert_not_called()
-        download_fdroid_apk.assert_not_called()
-        github.assert_called_once()
-        ipns.assert_called_once()
-        maven.assert_called_once()
-
-    @patch('fdroidserver.net.download_using_mirrors', lambda m: 'testvalue')
-    def test_download_fdroid_apk_smokecheck(self):
-        self.assertEqual('testvalue', install.download_fdroid_apk())
-
-    @unittest.skipUnless(os.getenv('test_download_fdroid_apk'), 'requires net access')
-    def test_download_fdroid_apk(self):
-        f = install.download_fdroid_apk()
-        self.assertTrue(Path(f).exists())
-
-    @unittest.skipUnless(os.getenv('test_download_fdroid_apk'), 'requires net access')
-    def test_download_fdroid_apk_from_maven(self):
-        f = install.download_fdroid_apk_from_maven()
-        self.assertTrue(Path(f).exists())
-
-    @unittest.skipUnless(os.getenv('test_download_fdroid_apk'), 'requires net access')
-    def test_download_fdroid_apk_from_ipns(self):
-        f = install.download_fdroid_apk_from_ipns()
-        self.assertTrue(Path(f).exists())
-
-    @unittest.skipUnless(os.getenv('test_download_fdroid_apk'), 'requires net access')
-    def test_download_fdroid_apk_from_github(self):
-        f = install.download_fdroid_apk_from_github()
-        self.assertTrue(Path(f).exists())
diff --git a/tests/test_integration.py b/tests/test_integration.py
deleted file mode 100755
index 2cdf19d9..00000000
--- a/tests/test_integration.py
+++ /dev/null
@@ -1,1691 +0,0 @@
-import configparser
-import itertools
-import os
-import platform
-import re
-import shlex
-import shutil
-import subprocess
-import sys
-import threading
-import unittest
-from datetime import datetime, timezone
-from http.server import SimpleHTTPRequestHandler, ThreadingHTTPServer
-from pathlib import Path
-
-try:
-    from androguard.core.bytecodes.apk import get_apkid  # androguard <4
-except ModuleNotFoundError:
-    from androguard.core.apk import get_apkid
-
-from fdroidserver._yaml import yaml, yaml_dumper
-
-from .shared_test_code import mkdir_testfiles, VerboseFalseOptions
-
-# TODO: port generic tests that use index.xml to index-v2 (test that
-#       explicitly test index-v0 should still use index.xml)
-
-
-basedir = Path(__file__).parent
-FILES = basedir
-
-try:
-    WORKSPACE = Path(os.environ["WORKSPACE"])
-except KeyError:
-    WORKSPACE = basedir.parent
-
-from fdroidserver import common
-from fdroidserver import deploy
-
-conf = {"sdk_path": os.getenv("ANDROID_HOME", "")}
-common.find_apksigner(conf)
-USE_APKSIGNER = "apksigner" in conf
-
-
-def docker_exists():
-    try:
-        subprocess.check_output(["docker", "info"])
-    except Exception:
-        return False
-    else:
-        return True
-
-
-@unittest.skipIf(sys.byteorder == 'big', 'androguard is not ported to big-endian')
-class IntegrationTest(unittest.TestCase):
-    @classmethod
-    def setUpClass(cls):
-        try:
-            cls.fdroid_cmd = shlex.split(os.environ["fdroid"])
-        except KeyError:
-            cls.fdroid_cmd = [WORKSPACE / "fdroid"]
-
-        os.environ.update(
-            {
-                "GIT_AUTHOR_NAME": "Test",
-                "GIT_AUTHOR_EMAIL": "no@mail",
-                "GIT_COMMITTER_NAME": "Test",
-                "GIT_COMMITTER_EMAIL": "no@mail",
-                "GIT_ALLOW_PROTOCOL": "file:https",
-            }
-        )
-
-    def setUp(self):
-        self.prev_cwd = Path()
-        self.testdir = mkdir_testfiles(WORKSPACE, self)
-        self.tmp_repo_root = self.testdir / "fdroid"
-        self.tmp_repo_root.mkdir(parents=True)
-        deploy.config = {}
-        os.chdir(self.tmp_repo_root)
-
-    def tearDown(self):
-        os.chdir(self.prev_cwd)
-        shutil.rmtree(self.testdir)
-
-    def assert_run(self, *args, **kwargs):
-        proc = subprocess.run(*args, **kwargs)
-        self.assertEqual(proc.returncode, 0)
-        return proc
-
-    def assert_run_fail(self, *args, **kwargs):
-        proc = subprocess.run(*args, **kwargs)
-        self.assertNotEqual(proc.returncode, 0)
-        return proc
-
-    @staticmethod
-    def update_yaml(path, items, replace=False):
-        """Update a .yml file, e.g. config.yml, with the given items."""
-        doc = {}
-        if not replace:
-            try:
-                with open(path) as f:
-                    doc = yaml.load(f)
-            except FileNotFoundError:
-                pass
-        doc.update(items)
-        with open(path, "w") as f:
-            yaml_dumper.dump(doc, f)
-
-    @staticmethod
-    def remove_lines(path, unwanted_strings):
-        """Remove the lines in the path that contain the unwanted strings."""
-
-        def contains_unwanted(line, unwanted_strings):
-            for str in unwanted_strings:
-                if str in line:
-                    return True
-            return False
-
-        with open(path) as f:
-            filtered = [
-                line for line in f if not contains_unwanted(line, unwanted_strings)
-            ]
-
-        with open(path, "w") as f:
-            for line in filtered:
-                f.write(line)
-
-    @staticmethod
-    def copy_apks_into_repo():
-        def to_skip(name):
-            for str in [
-                "unaligned",
-                "unsigned",
-                "badsig",
-                "badcert",
-                "bad-unicode",
-                "janus.apk",
-            ]:
-                if str in name:
-                    return True
-            return False
-
-        for f in FILES.glob("*.apk"):
-            if not to_skip(f.name):
-                appid, versionCode, _ignored = get_apkid(f)
-                shutil.copy(
-                    f,
-                    Path("repo") / common.get_release_apk_filename(appid, versionCode),
-                )
-
-    @staticmethod
-    def create_fake_android_home(path):
-        (path / "tools").mkdir()
-        (path / "platform-tools").mkdir()
-        (path / "build-tools/34.0.0").mkdir(parents=True)
-        (path / "build-tools/34.0.0/aapt").touch()
-
-    def fdroid_init_with_prebuilt_keystore(self, keystore_path=FILES / "keystore.jks"):
-        self.assert_run(
-            self.fdroid_cmd
-            + ["init", "--keystore", keystore_path, "--repo-keyalias", "sova"]
-        )
-        self.update_yaml(
-            common.CONFIG_FILE,
-            {
-                "keystorepass": "r9aquRHYoI8+dYz6jKrLntQ5/NJNASFBacJh7Jv2BlI=",
-                "keypass": "r9aquRHYoI8+dYz6jKrLntQ5/NJNASFBacJh7Jv2BlI=",
-            },
-        )
-
-    @unittest.skipUnless(USE_APKSIGNER, "requires apksigner")
-    def test_run_process_when_building_and_signing_are_on_separate_machines(self):
-        shutil.copy(FILES / "keystore.jks", "keystore.jks")
-        self.fdroid_init_with_prebuilt_keystore("keystore.jks")
-        self.update_yaml(
-            common.CONFIG_FILE,
-            {
-                "make_current_version_link": True,
-                "keydname": "CN=Birdman, OU=Cell, O=Alcatraz, L=Alcatraz, S=California, C=US",
-            },
-        )
-
-        Path("metadata").mkdir()
-        shutil.copy(FILES / "metadata/info.guardianproject.urzip.yml", "metadata")
-        Path("unsigned").mkdir()
-        shutil.copy(
-            FILES / "urzip-release-unsigned.apk",
-            "unsigned/info.guardianproject.urzip_100.apk",
-        )
-
-        self.assert_run(self.fdroid_cmd + ["publish", "--verbose"])
-        self.assert_run(self.fdroid_cmd + ["update", "--verbose", "--nosign"])
-        self.assert_run(self.fdroid_cmd + ["signindex", "--verbose"])
-
-        self.assertIn(
-            '<application id="info.guardianproject.urzip">',
-            Path("repo/index.xml").read_text(),
-        )
-        self.assertTrue(Path("repo/index.jar").is_file())
-        self.assertTrue(Path("repo/index-v1.jar").is_file())
-        apkcache = Path("tmp/apkcache.json")
-        self.assertTrue(apkcache.is_file())
-        self.assertTrue(apkcache.stat().st_size > 0)
-        self.assertTrue(Path("urzip.apk").is_symlink())
-
-    def test_utf8_metadata(self):
-        self.fdroid_init_with_prebuilt_keystore()
-        self.update_yaml(
-            common.CONFIG_FILE,
-            {
-                "repo_description": "获取已安装在您的设备上的应用的",
-                "mirrors": ["https://foo.bar/fdroid", "http://secret.onion/fdroid"],
-            },
-        )
-        shutil.copy(FILES / "urzip.apk", "repo")
-        shutil.copy(FILES / "bad-unicode-πÇÇ现代通用字-български-عربي1.apk", "repo")
-        Path("metadata").mkdir()
-        shutil.copy(FILES / "metadata/info.guardianproject.urzip.yml", "metadata")
-
-        self.assert_run(self.fdroid_cmd + ["readmeta"])
-        self.assert_run(self.fdroid_cmd + ["update"])
-
-    def test_copy_git_import_and_run_fdroid_scanner_on_it(self):
-        url = "https://gitlab.com/fdroid/ci-test-app.git"
-        Path("metadata").mkdir()
-        self.update_yaml(
-            "metadata/org.fdroid.ci.test.app.yml",
-            {
-                "AutoName": "Just A Test",
-                "WebSite": None,
-                "Builds": [
-                    {
-                        "versionName": "0.3",
-                        "versionCode": 300,
-                        "commit": "0.3",
-                        "subdir": "app",
-                        "gradle": ["yes"],
-                    }
-                ],
-                "Repo": url,
-                "RepoType": "git",
-            },
-        )
-
-        self.assert_run(["git", "clone", url, "build/org.fdroid.ci.test.app"])
-        self.assert_run(
-            self.fdroid_cmd + ["scanner", "org.fdroid.ci.test.app", "--verbose"]
-        )
-
-    @unittest.skipUnless(shutil.which("gpg"), "requires command line gpg")
-    def test_copy_repo_generate_java_gpg_keys_update_and_gpgsign(self):
-        """Needs tricks to make gpg-agent run in a test harness."""
-        self.fdroid_init_with_prebuilt_keystore()
-        shutil.copytree(FILES / "repo", "repo", dirs_exist_ok=True)
-        for dir in ["config", "metadata"]:
-            shutil.copytree(FILES / dir, dir)
-        # gpg requires a short path to the socket to talk to gpg-agent
-        gnupghome = (WORKSPACE / '.testfiles/gnupghome').resolve()
-        shutil.rmtree(gnupghome, ignore_errors=True)
-        shutil.copytree(FILES / "gnupghome", gnupghome)
-        os.chmod(gnupghome, 0o700)
-        self.update_yaml(
-            common.CONFIG_FILE,
-            {
-                "install_list": "org.adaway",
-                "uninstall_list": ["com.android.vending", "com.facebook.orca"],
-                "gpghome": str(gnupghome),
-                "gpgkey": "CE71F7FB",
-                "mirrors": [
-                    "http://foobarfoobarfoobar.onion/fdroid",
-                    "https://foo.bar/fdroid",
-                ],
-            },
-        )
-        self.assert_run(
-            self.fdroid_cmd + ["update", "--verbose", "--pretty"],
-            env=os.environ | {"LC_MESSAGES": "C.UTF-8"},
-        )
-        index_xml = Path("repo/index.xml").read_text()
-        self.assertIn("<application id=", index_xml)
-        self.assertIn("<install packageName=", index_xml)
-        self.assertIn("<uninstall packageName=", index_xml)
-        self.assertTrue(Path("repo/index.jar").is_file())
-        self.assertTrue(Path("repo/index-v1.jar").is_file())
-
-        self.assert_run(self.fdroid_cmd + ["gpgsign", "--verbose"])
-        env = os.environ.copy()
-        env["GNUPGHOME"] = gnupghome
-        self.assert_run(['gpgconf', '--kill', 'gpg-agent'], env=env)
-
-        self.assertTrue(Path("repo/obb.mainpatch.current_1619.apk.asc").is_file())
-        self.assertTrue(
-            Path("repo/obb.main.twoversions_1101617_src.tar.gz.asc").is_file()
-        )
-        self.assertFalse(Path("repo/obb.mainpatch.current_1619.apk.asc.asc").exists())
-        self.assertFalse(
-            Path("repo/obb.main.twoversions_1101617_src.tar.gz.asc.asc").exists()
-        )
-        self.assertFalse(Path("repo/index.xml.asc").exists())
-
-        index_v1_json = Path("repo/index-v1.json").read_text()
-        v0_timestamp = re.search(r'timestamp="(\d+)"', index_xml).group(1)
-        v1_timestamp = re.search(r'"timestamp": (\d+)', index_v1_json).group(1)[:-3]
-        self.assertEqual(v0_timestamp, v1_timestamp)
-
-        # we can't easily reproduce the timestamps for things, so just hardcode them
-        index_xml = re.sub(r'timestamp="\d+"', 'timestamp="1676634233"', index_xml)
-        self.assertEqual((FILES / "repo/index.xml").read_text(), index_xml)
-        index_v1_json = re.sub(
-            r'"timestamp": (\d+)', '"timestamp": 1676634233000', index_v1_json
-        )
-        self.assertEqual((FILES / "repo/index-v1.json").read_text(), index_v1_json)
-
-        expected_index_v2_json = (FILES / "repo/index-v2.json").read_text()
-        expected_index_v2_json = re.sub(
-            r',\s*"ipfsCIDv1":\s*"[\w]+"', "", expected_index_v2_json
-        )
-
-        index_v2_json = Path("repo/index-v2.json").read_text()
-        index_v2_json = re.sub(
-            r'"timestamp": (\d+)', '"timestamp": 1676634233000', index_v2_json
-        )
-        index_v2_json = re.sub(r',\s*"ipfsCIDv1":\s*"[\w]+"', "", index_v2_json)
-        self.assertEqual(index_v2_json, expected_index_v2_json)
-
-    def test_moving_lots_of_apks_to_the_archive(self):
-        self.fdroid_init_with_prebuilt_keystore()
-        Path("metadata").mkdir()
-        for path in (FILES / "metadata").glob("*.yml"):
-            shutil.copy(path, "metadata")
-        self.update_yaml(
-            "metadata/info.guardianproject.urzip.yml",
-            {"Summary": "good test version of urzip"},
-            replace=True,
-        )
-        self.update_yaml(
-            "metadata/org.bitbucket.tickytacky.mirrormirror.yml",
-            {"Summary": "good MD5 sig, which is disabled algorithm"},
-            replace=True,
-        )
-        for f in Path("metadata").glob("*.yml"):
-            self.remove_lines(f, ["ArchivePolicy:"])
-        for f in itertools.chain(
-            FILES.glob("urzip.apk"),
-            FILES.glob("org.bitbucket.tickytacky.mirrormirror_[0-9].apk"),
-            FILES.glob("repo/com.politedroid_[0-9].apk"),
-            FILES.glob("repo/obb.main.twoversions_110161[357].apk"),
-        ):
-            shutil.copy(f, "repo")
-        self.update_yaml(common.CONFIG_FILE, {"archive_older": 3})
-
-        self.assert_run(self.fdroid_cmd + ["update", "--pretty", "--nosign"])
-        with open("archive/index.xml") as f:
-            archive_cnt = sum(1 for line in f if "<package>" in line)
-        with open("repo/index.xml") as f:
-            repo_cnt = sum(1 for line in f if "<package>" in line)
-        if USE_APKSIGNER:
-            self.assertEqual(archive_cnt, 2)
-            self.assertEqual(repo_cnt, 10)
-        else:
-            # This will fail when jarsigner allows MD5 for APK signatures
-            self.assertEqual(archive_cnt, 5)
-            self.assertEqual(repo_cnt, 7)
-
-    @unittest.skipIf(USE_APKSIGNER, "runs only without apksigner")
-    def test_per_app_archive_policy(self):
-        self.fdroid_init_with_prebuilt_keystore()
-        Path("metadata").mkdir()
-        shutil.copy(FILES / "metadata/com.politedroid.yml", "metadata")
-        for f in FILES.glob("repo/com.politedroid_[0-9].apk"):
-            shutil.copy(f, "repo")
-        self.update_yaml(common.CONFIG_FILE, {"archive_older": 3})
-
-        self.assert_run(self.fdroid_cmd + ["update", "--pretty", "--nosign"])
-        repo = Path("repo/index.xml").read_text()
-        repo_cnt = sum(1 for line in repo.splitlines() if "<package>" in line)
-        archive = Path("archive/index.xml").read_text()
-        archive_cnt = sum(1 for line in archive.splitlines() if "<package>" in line)
-        self.assertEqual(repo_cnt, 4)
-        self.assertEqual(archive_cnt, 0)
-        self.assertIn("com.politedroid_3.apk", repo)
-        self.assertIn("com.politedroid_4.apk", repo)
-        self.assertIn("com.politedroid_5.apk", repo)
-        self.assertIn("com.politedroid_6.apk", repo)
-        self.assertTrue(Path("repo/com.politedroid_3.apk").is_file())
-        self.assertTrue(Path("repo/com.politedroid_4.apk").is_file())
-        self.assertTrue(Path("repo/com.politedroid_5.apk").is_file())
-        self.assertTrue(Path("repo/com.politedroid_6.apk").is_file())
-
-        # enable one app in the repo
-        self.update_yaml("metadata/com.politedroid.yml", {"ArchivePolicy": 1})
-        self.assert_run(self.fdroid_cmd + ["update", "--pretty", "--nosign"])
-        repo = Path("repo/index.xml").read_text()
-        repo_cnt = sum(1 for line in repo.splitlines() if "<package>" in line)
-        archive = Path("archive/index.xml").read_text()
-        archive_cnt = sum(1 for line in archive.splitlines() if "<package>" in line)
-        self.assertEqual(repo_cnt, 1)
-        self.assertEqual(archive_cnt, 3)
-        self.assertIn("com.politedroid_6.apk", repo)
-        self.assertIn("com.politedroid_3.apk", archive)
-        self.assertIn("com.politedroid_4.apk", archive)
-        self.assertIn("com.politedroid_5.apk", archive)
-        self.assertTrue(Path("repo/com.politedroid_6.apk").is_file())
-        self.assertTrue(Path("archive/com.politedroid_3.apk").is_file())
-        self.assertTrue(Path("archive/com.politedroid_4.apk").is_file())
-        self.assertTrue(Path("archive/com.politedroid_5.apk").is_file())
-
-        # remove all apps from the repo
-        self.update_yaml("metadata/com.politedroid.yml", {"ArchivePolicy": 0})
-        self.assert_run(self.fdroid_cmd + ["update", "--pretty", "--nosign"])
-        repo = Path("repo/index.xml").read_text()
-        repo_cnt = sum(1 for line in repo.splitlines() if "<package>" in line)
-        archive = Path("archive/index.xml").read_text()
-        archive_cnt = sum(1 for line in archive.splitlines() if "<package>" in line)
-        self.assertEqual(repo_cnt, 0)
-        self.assertEqual(archive_cnt, 4)
-        self.assertIn("com.politedroid_3.apk", archive)
-        self.assertIn("com.politedroid_4.apk", archive)
-        self.assertIn("com.politedroid_5.apk", archive)
-        self.assertIn("com.politedroid_6.apk", archive)
-        self.assertTrue(Path("archive/com.politedroid_3.apk").is_file())
-        self.assertTrue(Path("archive/com.politedroid_4.apk").is_file())
-        self.assertTrue(Path("archive/com.politedroid_5.apk").is_file())
-        self.assertTrue(Path("archive/com.politedroid_6.apk").is_file())
-        self.assertFalse(Path("repo/com.politedroid_6.apk").exists())
-
-        # move back one from archive to the repo
-        self.update_yaml("metadata/com.politedroid.yml", {"ArchivePolicy": 1})
-        self.assert_run(self.fdroid_cmd + ["update", "--pretty", "--nosign"])
-        repo = Path("repo/index.xml").read_text()
-        repo_cnt = sum(1 for line in repo.splitlines() if "<package>" in line)
-        archive = Path("archive/index.xml").read_text()
-        archive_cnt = sum(1 for line in archive.splitlines() if "<package>" in line)
-        self.assertEqual(repo_cnt, 1)
-        self.assertEqual(archive_cnt, 3)
-        self.assertIn("com.politedroid_6.apk", repo)
-        self.assertIn("com.politedroid_3.apk", archive)
-        self.assertIn("com.politedroid_4.apk", archive)
-        self.assertIn("com.politedroid_5.apk", archive)
-        self.assertTrue(Path("repo/com.politedroid_6.apk").is_file())
-        self.assertTrue(Path("archive/com.politedroid_3.apk").is_file())
-        self.assertTrue(Path("archive/com.politedroid_4.apk").is_file())
-        self.assertTrue(Path("archive/com.politedroid_5.apk").is_file())
-        self.assertFalse(Path("archive/com.politedroid_6.apk").exists())
-
-        # set an earlier version as CVC and test that it's the only one not archived
-        self.update_yaml("metadata/com.politedroid.yml", {"CurrentVersionCode": 5})
-        self.assert_run(self.fdroid_cmd + ["update", "--pretty", "--nosign"])
-        repo = Path("repo/index.xml").read_text()
-        repo_cnt = sum(1 for line in repo.splitlines() if "<package>" in line)
-        archive = Path("archive/index.xml").read_text()
-        archive_cnt = sum(1 for line in archive.splitlines() if "<package>" in line)
-        self.assertEqual(repo_cnt, 1)
-        self.assertEqual(archive_cnt, 3)
-        self.assertIn("com.politedroid_5.apk", repo)
-        self.assertIn("com.politedroid_3.apk", archive)
-        self.assertIn("com.politedroid_4.apk", archive)
-        self.assertIn("com.politedroid_6.apk", archive)
-        self.assertTrue(Path("repo/com.politedroid_5.apk").is_file())
-        self.assertFalse(Path("repo/com.politedroid_6.apk").exists())
-        self.assertTrue(Path("archive/com.politedroid_3.apk").is_file())
-        self.assertTrue(Path("archive/com.politedroid_4.apk").is_file())
-        self.assertTrue(Path("archive/com.politedroid_6.apk").is_file())
-
-    def test_moving_old_apks_to_and_from_the_archive(self):
-        self.fdroid_init_with_prebuilt_keystore()
-        Path("metadata").mkdir()
-        shutil.copy(FILES / "metadata/com.politedroid.yml", "metadata")
-        self.remove_lines("metadata/com.politedroid.yml", ["ArchivePolicy:"])
-        for f in FILES.glob("repo/com.politedroid_[0-9].apk"):
-            shutil.copy(f, "repo")
-        self.update_yaml(common.CONFIG_FILE, {"archive_older": 3})
-
-        self.assert_run(self.fdroid_cmd + ["update", "--pretty", "--nosign"])
-        repo = Path("repo/index.xml").read_text()
-        repo_cnt = sum(1 for line in repo.splitlines() if "<package>" in line)
-        self.assertEqual(repo_cnt, 3)
-        self.assertIn("com.politedroid_4.apk", repo)
-        self.assertIn("com.politedroid_5.apk", repo)
-        self.assertIn("com.politedroid_6.apk", repo)
-        self.assertTrue(Path("repo/com.politedroid_4.apk").is_file())
-        self.assertTrue(Path("repo/com.politedroid_5.apk").is_file())
-        self.assertTrue(Path("repo/com.politedroid_6.apk").is_file())
-        archive = Path("archive/index.xml").read_text()
-        archive_cnt = sum(1 for line in archive.splitlines() if "<package>" in line)
-        self.assertEqual(archive_cnt, 1)
-        self.assertIn("com.politedroid_3.apk", archive)
-        self.assertTrue(Path("archive/com.politedroid_3.apk").is_file())
-
-        self.update_yaml(common.CONFIG_FILE, {"archive_older": 1})
-        self.assert_run(self.fdroid_cmd + ["update", "--pretty", "--nosign"])
-        repo = Path("repo/index.xml").read_text()
-        repo_cnt = sum(1 for line in repo.splitlines() if "<package>" in line)
-        self.assertEqual(repo_cnt, 1)
-        self.assertIn("com.politedroid_6.apk", repo)
-        self.assertTrue(Path("repo/com.politedroid_6.apk").is_file())
-        archive = Path("archive/index.xml").read_text()
-        archive_cnt = sum(1 for line in archive.splitlines() if "<package>" in line)
-        self.assertEqual(archive_cnt, 3)
-        self.assertIn("com.politedroid_3.apk", archive)
-        self.assertIn("com.politedroid_4.apk", archive)
-        self.assertIn("com.politedroid_5.apk", archive)
-        self.assertTrue(Path("archive/com.politedroid_3.apk").is_file())
-        self.assertTrue(Path("archive/com.politedroid_4.apk").is_file())
-        self.assertTrue(Path("archive/com.politedroid_5.apk").is_file())
-
-        # disabling deletes from the archive
-        metadata_path = Path("metadata/com.politedroid.yml")
-        metadata = metadata_path.read_text()
-        metadata = re.sub(
-            "versionCode: 4", "versionCode: 4\n    disable: testing deletion", metadata
-        )
-        metadata_path.write_text(metadata)
-        self.assert_run(self.fdroid_cmd + ["update", "--pretty", "--nosign"])
-        repo = Path("repo/index.xml").read_text()
-        repo_cnt = sum(1 for line in repo.splitlines() if "<package>" in line)
-        self.assertEqual(repo_cnt, 1)
-        self.assertIn("com.politedroid_6.apk", repo)
-        self.assertTrue(Path("repo/com.politedroid_6.apk").is_file())
-        archive = Path("archive/index.xml").read_text()
-        archive_cnt = sum(1 for line in archive.splitlines() if "<package>" in line)
-        self.assertEqual(archive_cnt, 2)
-        self.assertIn("com.politedroid_3.apk", archive)
-        self.assertNotIn("com.politedroid_4.apk", archive)
-        self.assertIn("com.politedroid_5.apk", archive)
-        self.assertTrue(Path("archive/com.politedroid_3.apk").is_file())
-        self.assertFalse(Path("archive/com.politedroid_4.apk").exists())
-        self.assertTrue(Path("archive/com.politedroid_5.apk").is_file())
-
-        # disabling deletes from the repo, and promotes one from the archive
-        metadata = re.sub(
-            "versionCode: 6", "versionCode: 6\n    disable: testing deletion", metadata
-        )
-        metadata_path.write_text(metadata)
-        self.assert_run(self.fdroid_cmd + ["update", "--pretty", "--nosign"])
-        repo = Path("repo/index.xml").read_text()
-        repo_cnt = sum(1 for line in repo.splitlines() if "<package>" in line)
-        self.assertEqual(repo_cnt, 1)
-        self.assertIn("com.politedroid_5.apk", repo)
-        self.assertNotIn("com.politedroid_6.apk", repo)
-        self.assertTrue(Path("repo/com.politedroid_5.apk").is_file())
-        self.assertFalse(Path("repo/com.politedroid_6.apk").exists())
-        archive = Path("archive/index.xml").read_text()
-        archive_cnt = sum(1 for line in archive.splitlines() if "<package>" in line)
-        self.assertEqual(archive_cnt, 1)
-        self.assertIn("com.politedroid_3.apk", archive)
-        self.assertTrue(Path("archive/com.politedroid_3.apk").is_file())
-        self.assertFalse(Path("archive/com.politedroid_6.apk").exists())
-
-    def test_that_verify_can_succeed_and_fail(self):
-        Path("tmp").mkdir()
-        Path("unsigned").mkdir()
-        shutil.copy(FILES / "repo/com.politedroid_6.apk", "tmp")
-        shutil.copy(FILES / "repo/com.politedroid_6.apk", "unsigned")
-        self.assert_run(
-            self.fdroid_cmd
-            + ["verify", "--reuse-remote-apk", "--verbose", "com.politedroid"]
-        )
-        # force a fail
-        shutil.copy(
-            FILES / "repo/com.politedroid_5.apk", "unsigned/com.politedroid_6.apk"
-        )
-        self.assert_run_fail(
-            self.fdroid_cmd
-            + ["verify", "--reuse-remote-apk", "--verbose", "com.politedroid"]
-        )
-
-    def test_allowing_disabled_signatures_in_repo_and_archive(self):
-        self.fdroid_init_with_prebuilt_keystore()
-        self.update_yaml(
-            common.CONFIG_FILE, {"allow_disabled_algorithms": True, "archive_older": 3}
-        )
-        Path("metadata").mkdir()
-        shutil.copy(FILES / "metadata/com.politedroid.yml", "metadata")
-        self.update_yaml(
-            "metadata/info.guardianproject.urzip.yml",
-            {"Summary": "good test version of urzip"},
-            replace=True,
-        )
-        self.update_yaml(
-            "metadata/org.bitbucket.tickytacky.mirrormirror.yml",
-            {"Summary": "good MD5 sig, disabled algorithm"},
-            replace=True,
-        )
-        for f in Path("metadata").glob("*.yml"):
-            self.remove_lines(f, ["ArchivePolicy:"])
-        for f in itertools.chain(
-            FILES.glob("urzip-badsig.apk"),
-            FILES.glob("org.bitbucket.tickytacky.mirrormirror_[0-9].apk"),
-            FILES.glob("repo/com.politedroid_[0-9].apk"),
-        ):
-            shutil.copy(f, "repo")
-
-        self.assert_run(self.fdroid_cmd + ["update", "--pretty", "--nosign"])
-        repo = Path("repo/index.xml").read_text()
-        repo_cnt = sum(1 for line in repo.splitlines() if "<package>" in line)
-        archive = Path("archive/index.xml").read_text()
-        archive_cnt = sum(1 for line in archive.splitlines() if "<package>" in line)
-        self.assertEqual(repo_cnt, 6)
-        self.assertEqual(archive_cnt, 2)
-        self.assertIn("com.politedroid_4.apk", repo)
-        self.assertIn("com.politedroid_5.apk", repo)
-        self.assertIn("com.politedroid_6.apk", repo)
-        self.assertIn("com.politedroid_3.apk", archive)
-        self.assertIn("org.bitbucket.tickytacky.mirrormirror_2.apk", repo)
-        self.assertIn("org.bitbucket.tickytacky.mirrormirror_3.apk", repo)
-        self.assertIn("org.bitbucket.tickytacky.mirrormirror_4.apk", repo)
-        self.assertIn("org.bitbucket.tickytacky.mirrormirror_1.apk", archive)
-        self.assertNotIn("urzip-badsig.apk", repo)
-        self.assertNotIn("urzip-badsig.apk", archive)
-        self.assertTrue(Path("archive/com.politedroid_3.apk").is_file())
-        self.assertTrue(Path("repo/com.politedroid_4.apk").is_file())
-        self.assertTrue(Path("repo/com.politedroid_5.apk").is_file())
-        self.assertTrue(Path("repo/com.politedroid_6.apk").is_file())
-        self.assertTrue(
-            Path("archive/org.bitbucket.tickytacky.mirrormirror_1.apk").is_file()
-        )
-        self.assertTrue(
-            Path("repo/org.bitbucket.tickytacky.mirrormirror_2.apk").is_file()
-        )
-        self.assertTrue(
-            Path("repo/org.bitbucket.tickytacky.mirrormirror_3.apk").is_file()
-        )
-        self.assertTrue(
-            Path("repo/org.bitbucket.tickytacky.mirrormirror_4.apk").is_file()
-        )
-        self.assertTrue(Path("archive/urzip-badsig.apk").is_file())
-
-        if not USE_APKSIGNER:
-            self.assert_run(self.fdroid_cmd + ["update", "--pretty", "--nosign"])
-            repo = Path("repo/index.xml").read_text()
-            repo_cnt = sum(1 for line in repo.splitlines() if "<package>" in line)
-            archive = Path("archive/index.xml").read_text()
-            archive_cnt = sum(1 for line in archive.splitlines() if "<package>" in line)
-            self.assertEqual(repo_cnt, 3)
-            self.assertEqual(archive_cnt, 5)
-            self.assertIn("com.politedroid_4.apk", repo)
-            self.assertIn("com.politedroid_5.apk", repo)
-            self.assertIn("com.politedroid_6.apk", repo)
-            self.assertNotIn("urzip-badsig.apk", repo)
-            self.assertIn("org.bitbucket.tickytacky.mirrormirror_1.apk", archive)
-            self.assertIn("org.bitbucket.tickytacky.mirrormirror_2.apk", archive)
-            self.assertIn("org.bitbucket.tickytacky.mirrormirror_3.apk", archive)
-            self.assertIn("org.bitbucket.tickytacky.mirrormirror_4.apk", archive)
-            self.assertIn("com.politedroid_3.apk", archive)
-            self.assertNotIn("urzip-badsig.apk", archive)
-            self.assertTrue(Path("repo/com.politedroid_4.apk").is_file())
-            self.assertTrue(Path("repo/com.politedroid_5.apk").is_file())
-            self.assertTrue(Path("repo/com.politedroid_6.apk").is_file())
-            self.assertTrue(
-                Path("archive/org.bitbucket.tickytacky.mirrormirror_1.apk").is_file()
-            )
-            self.assertTrue(
-                Path("archive/org.bitbucket.tickytacky.mirrormirror_2.apk").is_file()
-            )
-            self.assertTrue(
-                Path("archive/org.bitbucket.tickytacky.mirrormirror_3.apk").is_file()
-            )
-            self.assertTrue(
-                Path("archive/org.bitbucket.tickytacky.mirrormirror_4.apk").is_file()
-            )
-            self.assertTrue(Path("archive/com.politedroid_3.apk").is_file())
-            self.assertTrue(Path("archive/urzip-badsig.apk").is_file())
-
-        # test unarchiving when disabled_algorithms are allowed again
-        self.update_yaml(common.CONFIG_FILE, {"allow_disabled_algorithms": True})
-        self.assert_run(self.fdroid_cmd + ["update", "--pretty", "--nosign"])
-        with open("archive/index.xml") as f:
-            archive_cnt = sum(1 for line in f if "<package>" in line)
-        with open("repo/index.xml") as f:
-            repo_cnt = sum(1 for line in f if "<package>" in line)
-        self.assertEqual(repo_cnt, 6)
-        self.assertEqual(archive_cnt, 2)
-        self.assertIn("com.politedroid_4.apk", repo)
-        self.assertIn("com.politedroid_5.apk", repo)
-        self.assertIn("com.politedroid_6.apk", repo)
-        self.assertIn("org.bitbucket.tickytacky.mirrormirror_2.apk", repo)
-        self.assertIn("org.bitbucket.tickytacky.mirrormirror_3.apk", repo)
-        self.assertIn("org.bitbucket.tickytacky.mirrormirror_4.apk", repo)
-        self.assertNotIn("urzip-badsig.apk", repo)
-        self.assertIn("com.politedroid_3.apk", archive)
-        self.assertIn("org.bitbucket.tickytacky.mirrormirror_1.apk", archive)
-        self.assertNotIn("urzip-badsig.apk", archive)
-        self.assertTrue(Path("repo/com.politedroid_4.apk").is_file())
-        self.assertTrue(Path("repo/com.politedroid_5.apk").is_file())
-        self.assertTrue(Path("repo/com.politedroid_6.apk").is_file())
-        self.assertTrue(
-            Path("repo/org.bitbucket.tickytacky.mirrormirror_2.apk").is_file()
-        )
-        self.assertTrue(
-            Path("repo/org.bitbucket.tickytacky.mirrormirror_3.apk").is_file()
-        )
-        self.assertTrue(
-            Path("repo/org.bitbucket.tickytacky.mirrormirror_4.apk").is_file()
-        )
-        self.assertTrue(Path("archive/com.politedroid_3.apk").is_file())
-        self.assertTrue(
-            Path("archive/org.bitbucket.tickytacky.mirrormirror_1.apk").is_file()
-        )
-        self.assertTrue(Path("archive/urzip-badsig.apk").is_file())
-
-    def test_rename_apks_with_fdroid_update_rename_apks_opt_nosign_opt_for_speed(self):
-        self.fdroid_init_with_prebuilt_keystore()
-        self.update_yaml(
-            common.CONFIG_FILE,
-            {
-                "keydname": "CN=Birdman, OU=Cell, O=Alcatraz, L=Alcatraz, S=California, C=US"
-            },
-        )
-        Path("metadata").mkdir()
-        shutil.copy(FILES / "metadata/info.guardianproject.urzip.yml", "metadata")
-        shutil.copy(
-            FILES / "urzip.apk",
-            "repo/asdfiuhk urzip-πÇÇπÇÇ现代汉语通用字-български-عربي1234 ö.apk",
-        )
-        self.assert_run(
-            self.fdroid_cmd + ["update", "--rename-apks", "--pretty", "--nosign"]
-        )
-        self.assertTrue(Path("repo/info.guardianproject.urzip_100.apk").is_file())
-        index_xml = Path("repo/index.xml").read_text()
-        index_v1_json = Path("repo/index-v1.json").read_text()
-        self.assertIn("info.guardianproject.urzip_100.apk", index_v1_json)
-        self.assertIn("info.guardianproject.urzip_100.apk", index_xml)
-
-        shutil.copy(FILES / "urzip-release.apk", "repo")
-        self.assert_run(
-            self.fdroid_cmd + ["update", "--rename-apks", "--pretty", "--nosign"]
-        )
-        self.assertTrue(Path("repo/info.guardianproject.urzip_100.apk").is_file())
-        self.assertTrue(
-            Path("repo/info.guardianproject.urzip_100_b4964fd.apk").is_file()
-        )
-        index_xml = Path("repo/index.xml").read_text()
-        index_v1_json = Path("repo/index-v1.json").read_text()
-        self.assertIn("info.guardianproject.urzip_100.apk", index_v1_json)
-        self.assertIn("info.guardianproject.urzip_100.apk", index_xml)
-        self.assertIn("info.guardianproject.urzip_100_b4964fd.apk", index_v1_json)
-        self.assertNotIn("info.guardianproject.urzip_100_b4964fd.apk", index_xml)
-
-        shutil.copy(FILES / "urzip-release.apk", "repo")
-        self.assert_run(
-            self.fdroid_cmd + ["update", "--rename-apks", "--pretty", "--nosign"]
-        )
-        self.assertTrue(Path("repo/info.guardianproject.urzip_100.apk").is_file())
-        self.assertTrue(
-            Path("repo/info.guardianproject.urzip_100_b4964fd.apk").is_file()
-        )
-        self.assertTrue(
-            Path("duplicates/repo/info.guardianproject.urzip_100_b4964fd.apk").is_file()
-        )
-        index_xml = Path("repo/index.xml").read_text()
-        index_v1_json = Path("repo/index-v1.json").read_text()
-        self.assertIn("info.guardianproject.urzip_100.apk", index_v1_json)
-        self.assertIn("info.guardianproject.urzip_100.apk", index_xml)
-        self.assertIn("info.guardianproject.urzip_100_b4964fd.apk", index_v1_json)
-        self.assertNotIn("info.guardianproject.urzip_100_b4964fd.apk", index_xml)
-
-    def test_for_added_date_being_set_correctly_for_repo_and_archive(self):
-        self.fdroid_init_with_prebuilt_keystore()
-        self.update_yaml(common.CONFIG_FILE, {"archive_older": 3})
-        Path("metadata").mkdir()
-        Path("archive").mkdir()
-        shutil.copy(FILES / "repo/com.politedroid_6.apk", "repo")
-        shutil.copy(FILES / "repo/index-v2.json", "repo")
-        shutil.copy(FILES / "repo/com.politedroid_5.apk", "archive")
-        shutil.copy(FILES / "metadata/com.politedroid.yml", "metadata")
-
-        # TODO: the timestamp of the oldest apk in the file should be used, even
-        #       if that doesn't exist anymore
-        self.update_yaml("metadata/com.politedroid.yml", {"ArchivePolicy": 1})
-
-        self.assert_run(self.fdroid_cmd + ["update", "--pretty", "--nosign"])
-        timestamp = int(datetime(2017, 6, 23, tzinfo=timezone.utc).timestamp()) * 1000
-        index_v1_json = Path("repo/index-v1.json").read_text()
-        self.assertIn(f'"added": {timestamp}', index_v1_json)
-        # the archive will have the added timestamp for the app and for the apk,
-        # both need to be there
-        with open("archive/index-v1.json") as f:
-            count = sum(1 for line in f if f'"added": {timestamp}' in line)
-        self.assertEqual(count, 2)
-
-    def test_whatsnew_from_fastlane_without_cvc_set(self):
-        self.fdroid_init_with_prebuilt_keystore()
-        Path("metadata/com.politedroid/en-US/changelogs").mkdir(parents=True)
-        shutil.copy(FILES / "repo/com.politedroid_6.apk", "repo")
-        shutil.copy(FILES / "metadata/com.politedroid.yml", "metadata")
-        self.remove_lines("metadata/com.politedroid.yml", ["CurrentVersion:"])
-        Path("metadata/com.politedroid/en-US/changelogs/6.txt").write_text(
-            "whatsnew test"
-        )
-        self.assert_run(self.fdroid_cmd + ["update", "--pretty", "--nosign"])
-        index_v1_json = Path("repo/index-v1.json").read_text()
-        self.assertIn("whatsnew test", index_v1_json)
-
-    def test_metadata_checks(self):
-        Path("repo").mkdir()
-        shutil.copy(FILES / "urzip.apk", "repo")
-        # this should fail because there is no metadata
-        self.assert_run_fail(self.fdroid_cmd + ["build"])
-        Path("metadata").mkdir()
-        shutil.copy(FILES / "metadata/org.smssecure.smssecure.yml", "metadata")
-        self.assert_run(self.fdroid_cmd + ["readmeta"])
-
-    def test_ensure_commands_that_dont_need_the_jdk_work_without_a_jdk_configured(self):
-        Path("repo").mkdir()
-        Path("metadata").mkdir()
-        self.update_yaml(
-            "metadata/fake.yml",
-            {
-                "License": "GPL-2.0-only",
-                "Summary": "Yup still fake",
-                "Categories": ["Internet"],
-                "Description": "this is fake",
-            },
-        )
-        # fake that no JDKs are available
-        self.update_yaml(
-            common.CONFIG_FILE,
-            {"categories": ["Internet"], "java_paths": {}},
-            replace=True,
-        )
-        local_copy_dir = self.testdir / "local_copy_dir/fdroid"
-        (local_copy_dir / "repo").mkdir(parents=True)
-        self.update_yaml(
-            common.CONFIG_FILE, {"local_copy_dir": str(local_copy_dir.resolve())}
-        )
-
-        subprocess.run(self.fdroid_cmd + ["checkupdates", "--allow-dirty"])
-        if shutil.which("gpg"):
-            self.assert_run(self.fdroid_cmd + ["gpgsign"])
-        self.assert_run(self.fdroid_cmd + ["lint"])
-        self.assert_run(self.fdroid_cmd + ["readmeta"])
-        self.assert_run(self.fdroid_cmd + ["rewritemeta", "fake"])
-        self.assert_run(self.fdroid_cmd + ["deploy"])
-        self.assert_run(self.fdroid_cmd + ["scanner"])
-
-        # run these to get their output, but the are not setup, so don't fail
-        subprocess.run(self.fdroid_cmd + ["build"])
-        subprocess.run(self.fdroid_cmd + ["import"])
-        subprocess.run(self.fdroid_cmd + ["install", "-n"])
-
-    def test_config_checks_of_local_copy_dir(self):
-        self.assert_run(self.fdroid_cmd + ["init"])
-        self.assert_run(self.fdroid_cmd + ["update", "--create-metadata", "--verbose"])
-        self.assert_run(self.fdroid_cmd + ["readmeta"])
-        local_copy_dir = (self.testdir / "local_copy_dir/fdroid").resolve()
-        local_copy_dir.mkdir(parents=True)
-        self.assert_run(
-            self.fdroid_cmd + ["deploy", "--local-copy-dir", local_copy_dir]
-        )
-        self.assert_run(
-            self.fdroid_cmd
-            + ["deploy", "--local-copy-dir", local_copy_dir, "--verbose"]
-        )
-
-        # this should fail because thisisnotanabsolutepath is not an absolute path
-        self.assert_run_fail(
-            self.fdroid_cmd + ["deploy", "--local-copy-dir", "thisisnotanabsolutepath"]
-        )
-        # this should fail because the path doesn't end with "fdroid"
-        self.assert_run_fail(
-            self.fdroid_cmd
-            + [
-                "deploy",
-                "--local-copy-dir",
-                "/tmp/IReallyDoubtThisPathExistsasdfasdf",  # nosec B108
-            ]
-        )
-        # this should fail because the dirname path does not exist
-        self.assert_run_fail(
-            self.fdroid_cmd
-            + [
-                "deploy",
-                "--local-copy-dir",
-                "/tmp/IReallyDoubtThisPathExistsasdfasdf/fdroid",  # nosec B108
-            ]
-        )
-
-    def test_setup_a_new_repo_from_scratch_using_android_home_and_do_a_local_sync(self):
-        self.fdroid_init_with_prebuilt_keystore()
-        self.copy_apks_into_repo()
-        self.assert_run(self.fdroid_cmd + ["update", "--create-metadata", "--verbose"])
-        self.assert_run(self.fdroid_cmd + ["readmeta"])
-        self.assertIn("<application id=", Path("repo/index.xml").read_text())
-
-        local_copy_dir = self.testdir / "local_copy_dir/fdroid"
-        local_copy_dir.parent.mkdir()
-        self.assert_run(
-            self.fdroid_cmd + ["deploy", "--local-copy-dir", local_copy_dir]
-        )
-
-        new_tmp_repo = self.testdir / "new_repo"
-        new_tmp_repo.mkdir()
-        os.chdir(new_tmp_repo)
-        self.fdroid_init_with_prebuilt_keystore()
-        self.update_yaml(common.CONFIG_FILE, {"sync_from_local_copy_dir": True})
-        self.assert_run(
-            self.fdroid_cmd + ["deploy", "--local-copy-dir", local_copy_dir]
-        )
-
-    def test_check_that_android_home_opt_fails_when_dir_does_not_exist_or_is_not_a_dir(
-        self,
-    ):
-        # this should fail because /opt/fakeandroidhome does not exist
-        self.assert_run_fail(
-            self.fdroid_cmd
-            + [
-                "init",
-                "--keystore",
-                "keystore.p12",
-                "--android-home",
-                "/opt/fakeandroidhome",
-            ]
-        )
-        Path("test_file").touch()
-        # this should fail because test_file is not a directory
-        self.assert_run_fail(
-            self.fdroid_cmd
-            + ["init", "--keystore", "keystore.p12", "--android-home", "test_file"]
-        )
-
-    def test_check_that_fake_android_home_passes_fdroid_init(self):
-        android_home = self.testdir / "android-sdk"
-        android_home.mkdir()
-        self.create_fake_android_home(android_home)
-        self.assert_run(
-            self.fdroid_cmd
-            + ["init", "--keystore", "keystore.p12", "--android-home", android_home]
-        )
-
-    @unittest.skip
-    def test_check_that_fdroid_init_fails_when_build_tools_cannot_be_found(self):
-        fake_android_home = self.testdir / "android-sdk"
-        fake_android_home.mkdir()
-        self.create_fake_android_home(fake_android_home)
-        (fake_android_home / "build-tools/34.0.0/aapt").unlink()
-        self.assert_run_fail(
-            self.fdroid_cmd
-            + [
-                "init",
-                "--keystore",
-                "keystore.p12",
-                "--android-home",
-                fake_android_home,
-            ]
-        )
-
-    def check_that_android_home_opt_overrides_android_home_env_var(self):
-        fake_android_home = self.testdir / "android-sdk"
-        fake_android_home.mkdir()
-        self.create_fake_android_home(fake_android_home)
-        self.assert_run(
-            self.fdroid_cmd
-            + [
-                "init",
-                "--keystore",
-                "keystore.p12",
-                "--android-home",
-                fake_android_home,
-            ]
-        )
-        # the value set in --android-home should override $ANDROID_HOME
-        self.assertIn(str(fake_android_home), Path(common.CONFIG_FILE).read_text())
-
-    @unittest.skipUnless(
-        "ANDROID_HOME" in os.environ, "runs only with ANDROID_HOME set"
-    )
-    def setup_a_new_repo_from_scratch_with_keystore_and_android_home_opt_set_on_cmd_line(
-        self,
-    ):
-        """Test with broken setup in ANDROID_HOME.
-
-        In this case, ANDROID_HOME is set to a fake, non-working
-        version that will be detected by fdroid as an Android SDK
-        install. It should use the path set by --android-home over the
-        one in ANDROID_HOME, therefore if it uses the one in
-        ANDROID_HOME, it won't work because it is a fake one.  Only
-        --android-home provides a working one.
-
-        """
-        real_android_home = os.environ["ANDROID_HOME"]
-        fake_android_home = self.testdir / "android-sdk"
-        fake_android_home.mkdir()
-        env = os.environ.copy()
-        env["ANDROID_HOME"] = str(fake_android_home)
-        self.assert_run(
-            self.fdroid_cmd
-            + [
-                "init",
-                "--keystore",
-                "keystore.p12",
-                "--android-home",
-                real_android_home,
-                "--no-prompt",
-            ],
-            env=env,
-        )
-        self.assertTrue(Path("keystore.p12").is_file())
-        self.copy_apks_into_repo()
-        self.assert_run(
-            self.fdroid_cmd + ["update", "--create-metadata", "--verbose"], env=env
-        )
-        self.assert_run(self.fdroid_cmd + ["readmeta"], env=env)
-        self.assertIn("<application id=", Path("repo/index.xml").read_text())
-        self.assertTrue(Path("repo/index.jar").is_file())
-        self.assertTrue(Path("repo/index-v1.jar").is_file())
-        apkcache = Path("tmp/apkcache.json")
-        self.assertTrue(apkcache.is_file())
-        self.assertTrue(apkcache.stat().st_size > 0)
-
-    def test_check_duplicate_files_are_properly_handled_by_fdroid_update(self):
-        self.fdroid_init_with_prebuilt_keystore()
-        Path("metadata").mkdir()
-        shutil.copy(FILES / "metadata/obb.mainpatch.current.yml", "metadata")
-        shutil.copy(FILES / "repo/obb.mainpatch.current_1619.apk", "repo")
-        shutil.copy(
-            FILES / "repo/obb.mainpatch.current_1619_another-release-key.apk", "repo"
-        )
-        self.assert_run(self.fdroid_cmd + ["update", "--pretty"])
-        index_xml = Path("repo/index.xml").read_text()
-        index_v1_json = Path("repo/index-v1.json").read_text()
-        self.assertNotIn(
-            "obb.mainpatch.current_1619_another-release-key.apk", index_xml
-        )
-        self.assertIn("obb.mainpatch.current_1619.apk", index_xml)
-        self.assertIn("obb.mainpatch.current_1619.apk", index_v1_json)
-        self.assertIn(
-            "obb.mainpatch.current_1619_another-release-key.apk", index_v1_json
-        )
-        # die if there are exact duplicates
-        shutil.copy(FILES / "repo/obb.mainpatch.current_1619.apk", "repo/duplicate.apk")
-        self.assert_run_fail(self.fdroid_cmd + ["update"])
-
-    def test_setup_new_repo_from_scratch_using_android_home_env_var_putting_apks_in_repo_first(
-        self,
-    ):
-        Path("repo").mkdir()
-        self.copy_apks_into_repo()
-        self.fdroid_init_with_prebuilt_keystore()
-        self.assert_run(self.fdroid_cmd + ["update", "--create-metadata", "--verbose"])
-        self.assert_run(self.fdroid_cmd + ["readmeta"])
-        self.assertIn("<application id=", Path("repo/index.xml").read_text())
-
-    def test_setup_a_new_repo_from_scratch_and_generate_a_keystore(self):
-        self.assert_run(self.fdroid_cmd + ["init", "--keystore", "keystore.p12"])
-        self.assertTrue(Path("keystore.p12").is_file())
-        self.copy_apks_into_repo()
-        self.assert_run(self.fdroid_cmd + ["update", "--create-metadata", "--verbose"])
-        self.assert_run(self.fdroid_cmd + ["readmeta"])
-        self.assertIn("<application id=", Path("repo/index.xml").read_text())
-        self.assertTrue(Path("repo/index.jar").is_file())
-        self.assertTrue(Path("repo/index-v1.jar").is_file())
-        apkcache = Path("tmp/apkcache.json")
-        self.assertTrue(apkcache.is_file())
-        self.assertTrue(apkcache.stat().st_size > 0)
-
-    def test_setup_a_new_repo_manually_and_generate_a_keystore(self):
-        self.assertFalse(Path("keystore.p12").exists())
-        # this should fail because this repo has no keystore
-        self.assert_run_fail(self.fdroid_cmd + ["update"])
-        self.assert_run(self.fdroid_cmd + ["update", "--create-key"])
-        self.assertTrue(Path("keystore.p12").is_file())
-        self.copy_apks_into_repo()
-        self.assert_run(self.fdroid_cmd + ["update", "--create-metadata", "--verbose"])
-        self.assert_run(self.fdroid_cmd + ["readmeta"])
-        self.assertIn("<application id=", Path("repo/index.xml").read_text())
-        self.assertTrue(Path("repo/index.jar").is_file())
-        self.assertTrue(Path("repo/index-v1.jar").is_file())
-        apkcache = Path("tmp/apkcache.json")
-        self.assertTrue(apkcache.is_file())
-        self.assertTrue(apkcache.stat().st_size > 0)
-
-    def test_setup_a_new_repo_from_scratch_generate_a_keystore_then_add_apk_and_update(
-        self,
-    ):
-        self.assert_run(self.fdroid_cmd + ["init", "--keystore", "keystore.p12"])
-        self.assertTrue(Path("keystore.p12").is_file())
-        self.copy_apks_into_repo()
-        self.assert_run(self.fdroid_cmd + ["update", "--create-metadata", "--verbose"])
-        self.assert_run(self.fdroid_cmd + ["readmeta"])
-        self.assertIn("<application id=", Path("repo/index.xml").read_text())
-        self.assertTrue(Path("repo/index.jar").is_file())
-        self.assertTrue(Path("repo/index-v1.jar").is_file())
-
-        if not Path("repo/info.guardianproject.urzip_100.apk").exists():
-            shutil.copy(FILES / "urzip.apk", "repo")
-        self.assert_run(self.fdroid_cmd + ["update", "--create-metadata", "--verbose"])
-        self.assert_run(self.fdroid_cmd + ["readmeta"])
-        self.assertIn("<application id=", Path("repo/index.xml").read_text())
-        self.assertTrue(Path("repo/index.jar").is_file())
-        self.assertTrue(Path("repo/index-v1.jar").is_file())
-        apkcache = Path("tmp/apkcache.json")
-        self.assertTrue(apkcache.is_file())
-        self.assertTrue(apkcache.stat().st_size > 0)
-        self.assertIn("<application id=", Path("repo/index.xml").read_text())
-
-    def test_setup_a_new_repo_from_scratch_with_a_hsm_or_smartcard(self):
-        self.assert_run(self.fdroid_cmd + ["init", "--keystore", "NONE"])
-        self.assertTrue(Path("opensc-fdroid.cfg").is_file())
-        self.assertFalse(Path("NONE").exists())
-
-    def test_setup_a_new_repo_with_no_keystore_add_apk_and_update(self):
-        Path("fdroid-icon.png").touch()
-        Path("repo").mkdir()
-        shutil.copy(FILES / "urzip.apk", "repo")
-        # this should fail because this repo has no keystore
-        self.assert_run_fail(
-            self.fdroid_cmd + ["update", "--create-metadata", "--verbose"]
-        )
-
-        # now set up fake, non-working keystore setup
-        Path("keystore.p12").touch()
-        self.update_yaml(
-            common.CONFIG_FILE,
-            {
-                "keystore": "keystore.p12",
-                "repo_keyalias": "foo",
-                "keystorepass": "foo",
-                "keypass": "foo",
-            },
-        )
-        # this should fail because this repo has a bad/fake keystore
-        self.assert_run_fail(
-            self.fdroid_cmd + ["update", "--create-metadata", "--verbose"]
-        )
-
-    def test_copy_tests_repo_update_with_binary_transparency_log(self):
-        self.fdroid_init_with_prebuilt_keystore()
-        shutil.copytree(FILES / "repo", "repo", dirs_exist_ok=True)
-        shutil.copytree(FILES / "metadata", "metadata")
-        git_remote = self.testdir / "git_remote"
-        self.update_yaml(
-            common.CONFIG_FILE, {"binary_transparency_remote": str(git_remote)}
-        )
-        self.assert_run(self.fdroid_cmd + ["update", "--verbose"])
-        self.assert_run(self.fdroid_cmd + ["deploy", "--verbose"])
-        self.assertIn("<application id=", Path("repo/index.xml").read_text())
-        self.assertTrue(Path("repo/index.jar").is_file())
-        self.assertTrue(Path("repo/index-v1.jar").is_file())
-        os.chdir("binary_transparency")
-        proc = self.assert_run(
-            ["git", "rev-list", "--count", "HEAD"], capture_output=True
-        )
-        self.assertEqual(int(proc.stdout), 2)
-        os.chdir(git_remote)
-        proc = self.assert_run(
-            ["git", "rev-list", "--count", "HEAD"], capture_output=True
-        )
-        self.assertEqual(int(proc.stdout), 2)
-
-    def test_setup_a_new_repo_with_keystore_with_apk_update_then_without_key(self):
-        shutil.copy(FILES / "keystore.jks", "keystore.jks")
-        self.fdroid_init_with_prebuilt_keystore("keystore.jks")
-        shutil.copy(FILES / "urzip.apk", "repo")
-        self.assert_run(self.fdroid_cmd + ["update", "--create-metadata", "--verbose"])
-        self.assert_run(self.fdroid_cmd + ["readmeta"])
-        self.assertIn("<application id=", Path("repo/index.xml").read_text())
-        self.assertTrue(Path("repo/index.jar").is_file())
-        self.assertTrue(Path("repo/index-v1.jar").is_file())
-        apkcache = Path("tmp/apkcache.json")
-        self.assertTrue(apkcache.is_file())
-        self.assertTrue(apkcache.stat().st_size > 0)
-
-        # now set fake repo_keyalias
-        self.update_yaml(common.CONFIG_FILE, {"repo_keyalias": "fake"})
-        # this should fail because this repo has a bad repo_keyalias
-        self.assert_run_fail(self.fdroid_cmd + ["update"])
-
-        # this should fail because a keystore is already there
-        self.assert_run_fail(self.fdroid_cmd + ["update", "--create-key"])
-
-        # now actually create the key with the existing settings
-        Path("keystore.jks").unlink()
-        self.assert_run(self.fdroid_cmd + ["update", "--create-key"])
-        self.assertTrue(Path("keystore.jks").is_file())
-
-    def test_setup_a_new_repo_from_scratch_using_android_home_env_var_with_git_mirror(
-        self,
-    ):
-        server_git_mirror = self.testdir / "server_git_mirror"
-        server_git_mirror.mkdir()
-        self.assert_run(
-            ["git", "-C", server_git_mirror, "init", "--initial-branch", "master"]
-        )
-        self.assert_run(
-            [
-                "git",
-                "-C",
-                server_git_mirror,
-                "config",
-                "receive.denyCurrentBranch",
-                "updateInstead",
-            ]
-        )
-
-        self.fdroid_init_with_prebuilt_keystore()
-        self.update_yaml(
-            common.CONFIG_FILE,
-            {"archive_older": 3, "servergitmirrors": str(server_git_mirror)},
-        )
-        for f in FILES.glob("repo/com.politedroid_[345].apk"):
-            shutil.copy(f, "repo")
-        self.assert_run(self.fdroid_cmd + ["update", "--create-metadata"])
-        self.assert_run(self.fdroid_cmd + ["deploy"])
-        git_mirror = Path("git-mirror")
-        self.assertTrue((git_mirror / "fdroid/repo/com.politedroid_3.apk").is_file())
-        self.assertTrue((git_mirror / "fdroid/repo/com.politedroid_4.apk").is_file())
-        self.assertTrue((git_mirror / "fdroid/repo/com.politedroid_5.apk").is_file())
-        self.assertTrue(
-            (server_git_mirror / "fdroid/repo/com.politedroid_3.apk").is_file()
-        )
-        self.assertTrue(
-            (server_git_mirror / "fdroid/repo/com.politedroid_4.apk").is_file()
-        )
-        self.assertTrue(
-            (server_git_mirror / "fdroid/repo/com.politedroid_5.apk").is_file()
-        )
-        (git_mirror / ".git/test-stamp").write_text(str(datetime.now()))
-
-        # add one more APK to trigger archiving
-        shutil.copy(FILES / "repo/com.politedroid_6.apk", "repo")
-        self.assert_run(self.fdroid_cmd + ["update"])
-        self.assert_run(self.fdroid_cmd + ["deploy"])
-        self.assertTrue(Path("archive/com.politedroid_3.apk").is_file())
-        self.assertFalse((git_mirror / "fdroid/archive/com.politedroid_3.apk").exists())
-        self.assertFalse(
-            (server_git_mirror / "fdroid/archive/com.politedroid_3.apk").exists()
-        )
-        self.assertTrue((git_mirror / "fdroid/repo/com.politedroid_4.apk").is_file())
-        self.assertTrue((git_mirror / "fdroid/repo/com.politedroid_5.apk").is_file())
-        self.assertTrue((git_mirror / "fdroid/repo/com.politedroid_6.apk").is_file())
-        self.assertTrue(
-            (server_git_mirror / "fdroid/repo/com.politedroid_4.apk").is_file()
-        )
-        self.assertTrue(
-            (server_git_mirror / "fdroid/repo/com.politedroid_5.apk").is_file()
-        )
-        self.assertTrue(
-            (server_git_mirror / "fdroid/repo/com.politedroid_6.apk").is_file()
-        )
-        before = sum(
-            f.stat().st_size for f in (git_mirror / ".git").glob("**/*") if f.is_file()
-        )
-
-        self.update_yaml(common.CONFIG_FILE, {"git_mirror_size_limit": "60kb"})
-        self.assert_run(self.fdroid_cmd + ["update"])
-        self.assert_run(self.fdroid_cmd + ["deploy"])
-        self.assertTrue(Path("archive/com.politedroid_3.apk").is_file())
-        self.assertFalse(
-            (server_git_mirror / "fdroid/archive/com.politedroid_3.apk").exists()
-        )
-        after = sum(
-            f.stat().st_size for f in (git_mirror / ".git").glob("**/*") if f.is_file()
-        )
-        self.assertFalse((git_mirror / ".git/test-stamp").exists())
-        self.assert_run(["git", "-C", git_mirror, "gc"])
-        self.assert_run(["git", "-C", server_git_mirror, "gc"])
-        self.assertGreater(before, after)
-
-    def test_sign_binary_repo_in_offline_box_then_publishing_from_online_box(self):
-        offline_root = self.testdir / "offline_root"
-        offline_root.mkdir()
-        local_copy_dir = self.testdir / "local_copy_dir/fdroid"
-        local_copy_dir.mkdir(parents=True)
-        online_root = self.testdir / "online_root"
-        online_root.mkdir()
-        server_web_root = self.testdir / "server_web_root/fdroid"
-        server_web_root.mkdir(parents=True)
-
-        # create offline binary transparency log
-        (offline_root / "binary_transparency").mkdir()
-        os.chdir(offline_root / "binary_transparency")
-        self.assert_run(["git", "init", "--initial-branch", "master"])
-
-        # fake git remote server for binary transparency log
-        binary_transparency_remote = self.testdir / "binary_transparency_remote"
-        binary_transparency_remote.mkdir()
-
-        # fake git remote server for repo mirror
-        server_git_mirror = self.testdir / "server_git_mirror"
-        server_git_mirror.mkdir()
-        os.chdir(server_git_mirror)
-        self.assert_run(["git", "init", "--initial-branch", "master"])
-        self.assert_run(["git", "config", "receive.denyCurrentBranch", "updateInstead"])
-
-        os.chdir(offline_root)
-        self.fdroid_init_with_prebuilt_keystore()
-        shutil.copytree(FILES / "repo", "repo", dirs_exist_ok=True)
-        shutil.copytree(FILES / "metadata", "metadata")
-        Path("unsigned").mkdir()
-        shutil.copy(FILES / "urzip-release-unsigned.apk", "unsigned")
-        self.update_yaml(
-            common.CONFIG_FILE,
-            {
-                "archive_older": 3,
-                "mirrors": [
-                    "http://foo.bar/fdroid",
-                    "http://asdflkdsfjafdsdfhkjh.onion/fdroid",
-                ],
-                "servergitmirrors": str(server_git_mirror),
-                "local_copy_dir": str(local_copy_dir),
-            },
-        )
-        self.assert_run(self.fdroid_cmd + ["update", "--pretty"])
-        index_xml = Path("repo/index.xml").read_text()
-        self.assertIn("<application id=", index_xml)
-        self.assertIn("/fdroid/repo</mirror>", index_xml)
-        mirror_cnt = sum(1 for line in index_xml.splitlines() if "<mirror>" in line)
-        self.assertEqual(mirror_cnt, 2)
-
-        archive_xml = Path("archive/index.xml").read_text()
-        self.assertIn("/fdroid/archive</mirror>", archive_xml)
-        mirror_cnt = sum(1 for line in archive_xml.splitlines() if "<mirror>" in line)
-        self.assertEqual(mirror_cnt, 2)
-
-        os.chdir("binary_transparency")
-        proc = self.assert_run(
-            ["git", "rev-list", "--count", "HEAD"], capture_output=True
-        )
-        self.assertEqual(int(proc.stdout), 1)
-        os.chdir(offline_root)
-        self.assert_run(self.fdroid_cmd + ["deploy", "--verbose"])
-        self.assertTrue(
-            Path(local_copy_dir / "unsigned/urzip-release-unsigned.apk").is_file()
-        )
-        self.assertIn(
-            "<application id=", (local_copy_dir / "repo/index.xml").read_text()
-        )
-        os.chdir(online_root)
-        self.update_yaml(
-            common.CONFIG_FILE,
-            {
-                "local_copy_dir": str(local_copy_dir),
-                "sync_from_local_copy_dir": True,
-                "serverwebroot": str(server_web_root),
-                "servergitmirrors": str(server_git_mirror),
-                "binary_transparency_remote": str(binary_transparency_remote),
-            },
-        )
-        self.assert_run(self.fdroid_cmd + ["deploy", "--verbose"])
-        self.assertTrue((online_root / "unsigned/urzip-release-unsigned.apk").is_file())
-        self.assertTrue(
-            (server_web_root / "unsigned/urzip-release-unsigned.apk").is_file()
-        )
-        os.chdir(binary_transparency_remote)
-        proc = self.assert_run(
-            ["git", "rev-list", "--count", "HEAD"], capture_output=True
-        )
-        self.assertEqual(int(proc.stdout), 1)
-
-        if platform.system() == 'Darwin':
-            self.skipTest('FIXME the last step of this test fails only on macOS')
-        os.chdir(server_git_mirror)
-        proc = self.assert_run(
-            ["git", "rev-list", "--count", "HEAD"], capture_output=True
-        )
-        self.assertEqual(int(proc.stdout), 1)
-
-    @unittest.skipUnless(USE_APKSIGNER, "requires apksigner")
-    def test_extracting_and_publishing_with_developer_signature(self):
-        self.fdroid_init_with_prebuilt_keystore()
-        self.update_yaml(
-            common.CONFIG_FILE,
-            {
-                "keydname": "CN=Birdman, OU=Cell, O=Alcatraz, L=Alcatraz, S=California, C=US"
-            },
-        )
-        Path("metadata").mkdir()
-        shutil.copy(FILES / "metadata/com.politedroid.yml", "metadata")
-        Path("unsigned").mkdir()
-        shutil.copy(FILES / "repo/com.politedroid_6.apk", "unsigned")
-        self.assert_run(
-            self.fdroid_cmd + ["signatures", "unsigned/com.politedroid_6.apk"]
-        )
-        self.assertTrue(
-            Path("metadata/com.politedroid/signatures/6/MANIFEST.MF").is_file()
-        )
-        self.assertTrue(
-            Path("metadata/com.politedroid/signatures/6/RELEASE.RSA").is_file()
-        )
-        self.assertTrue(
-            Path("metadata/com.politedroid/signatures/6/RELEASE.SF").is_file()
-        )
-        self.assertFalse(Path("repo/com.politedroid_6.apk").exists())
-        self.assert_run(self.fdroid_cmd + ["publish"])
-        self.assertTrue(Path("repo/com.politedroid_6.apk").is_file())
-        if shutil.which("apksigner"):
-            self.assert_run(["apksigner", "verify", "repo/com.politedroid_6.apk"])
-        if shutil.which("jarsigner"):
-            self.assert_run(["jarsigner", "-verify", "repo/com.politedroid_6.apk"])
-
-    @unittest.skipUnless(shutil.which("wget"), "requires wget")
-    def test_mirroring_a_repo(self):
-        """Start a local webserver to mirror a fake repo from.
-
-        Proxy settings via environment variables can interfere with
-        this test. The requests library will automatically pick up
-        proxy settings from environment variables. Proxy settings can
-        force the local connection over the proxy, which might not
-        support that, then this fails with an error like 405 or
-        others.
-
-        """
-        tmp_test = self.testdir / "tests"
-        tmp_test.mkdir()
-        shutil.copytree(FILES, tmp_test, dirs_exist_ok=True)
-        os.chdir(tmp_test)
-        Path("archive").mkdir(exist_ok=True)
-        shutil.copy("repo/index-v1.json", self.tmp_repo_root)
-        self.assert_run(self.fdroid_cmd + ["update"])
-        self.assert_run(self.fdroid_cmd + ["signindex"])
-        shutil.move(self.tmp_repo_root / "index-v1.json", "repo/index-v1.json")
-
-        class RequestHandler(SimpleHTTPRequestHandler):
-            def __init__(self, *args, **kwargs):
-                super().__init__(*args, directory=tmp_test, **kwargs)
-
-        httpd = ThreadingHTTPServer(("127.0.0.1", 0), RequestHandler)
-        threading.Thread(target=httpd.serve_forever).start()
-
-        os.chdir(self.tmp_repo_root)
-        host, port = httpd.socket.getsockname()
-        url, output_dir = f"http://{host}:{port}/", Path(f"{host}:{port}")
-        self.assert_run(self.fdroid_cmd + ["mirror", url])
-        self.assertTrue((output_dir / "repo/souch.smsbypass_9.apk").is_file())
-        self.assertTrue((output_dir / "repo/icons-640/souch.smsbypass.9.png").is_file())
-        # the index shouldn't be saved unless it was verified
-        self.assertFalse((output_dir / "repo/index-v1.jar").exists())
-        self.assert_run_fail(
-            self.fdroid_cmd + ["mirror", f"{url}?fingerprint=asdfasdf"]
-        )
-        self.assertFalse((output_dir / "repo/index-v1.jar").exists())
-        self.assert_run(
-            self.fdroid_cmd
-            + [
-                "mirror",
-                f"{url}?fingerprint=F49AF3F11EFDDF20DFFD70F5E3117B9976674167ADCA280E6B1932A0601B26F6",
-            ],
-        )
-        self.assertTrue((output_dir / "repo/index-v1.jar").is_file())
-
-        httpd.shutdown()
-
-    def test_recovering_from_broken_git_submodules(self):
-        Path("foo").mkdir()
-        Path("bar").mkdir()
-        os.chdir("foo")
-        self.assert_run(["git", "init"])
-        Path("a").write_text("a")
-        self.assert_run(["git", "add", "a"])
-        self.assert_run(["git", "commit", "-m", "a"])
-
-        os.chdir("../bar")
-        self.assert_run(["git", "init"])
-        self.assert_run(
-            ["git", "submodule", "add", f"file://{Path().resolve()}/../foo", "baz"]
-        )
-        Path(".gitmodules").unlink()
-        self.assert_run(["git", "commit", "-am", "a"])
-        shutil.rmtree("baz")
-        self.assert_run(["git", "checkout", "baz"])
-        self.assert_run(["git", "tag", "2"])
-
-        os.chdir("..")
-        Path("repo").mkdir()
-        Path("metadata").mkdir()
-        self.update_yaml(
-            "metadata/fake.yml",
-            {
-                "RepoType": "git",
-                "Repo": f"file://{Path().resolve()}/bar",
-                "AutoUpdateMode": "Version",
-                "UpdateCheckMode": "Tags",
-                "UpdateCheckData": "|||",
-                "CurrentVersion": 1,
-                "CurrentVersionCode": 1,
-            },
-        )
-        self.assert_run(self.fdroid_cmd + ["checkupdates", "--allow-dirty"])
-        self.assertIn("CurrentVersionCode: 2", Path("metadata/fake.yml").read_text())
-
-    def test_checkupdates_ignore_broken_submodule(self):
-        Path("foo").mkdir()
-        Path("bar").mkdir()
-        os.chdir("foo")
-        self.assert_run(["git", "init"])
-        Path("a").write_text("a")
-        self.assert_run(["git", "add", "a"])
-        self.assert_run(["git", "commit", "-m", "a"])
-
-        os.chdir("../bar")
-        self.assert_run(["git", "init"])
-        self.assert_run(
-            ["git", "submodule", "add", f"file://{Path().resolve()}/../foo", "baz"]
-        )
-        self.assert_run(["git", "commit", "-am", "a"])
-        self.assert_run(["git", "tag", "2"])
-
-        os.chdir("../foo")
-        # delete the commit referenced in bar
-        self.assert_run(["git", "commit", "--amend", "-m", "aa"])
-        self.assert_run(["git", "reflog", "expire", "--expire", "now", "--all"])
-        self.assert_run(["git", "gc", "--aggressive", "--prune=now"])
-
-        os.chdir("..")
-
-        Path("repo").mkdir()
-        Path("metadata").mkdir()
-        self.update_yaml(
-            "metadata/fake.yml",
-            {
-                "RepoType": "git",
-                "Repo": f"file://{Path().resolve()}/bar",
-                "Builds": [{"versionName": 1, "versionCode": 1, "submodules": True}],
-                "AutoUpdateMode": "Version",
-                "UpdateCheckMode": "Tags",
-                "UpdateCheckData": "|||",
-                "CurrentVersion": 1,
-                "CurrentVersionCode": 1,
-            },
-        )
-        self.assert_run(self.fdroid_cmd + ["checkupdates", "--allow-dirty"])
-        self.assertIn("CurrentVersionCode: 2", Path("metadata/fake.yml").read_text())
-
-    def test_checkupdates_check_version_in_submodule(self):
-        Path("app").mkdir()
-        Path("sub").mkdir()
-        os.chdir("sub")
-        self.assert_run(["git", "init"])
-        Path("ver").write_text("1")
-        self.assert_run(["git", "add", "ver"])
-        self.assert_run(["git", "commit", "-m", "1"])
-
-        os.chdir("../app")
-        self.assert_run(["git", "init"])
-        self.assert_run(
-            ["git", "submodule", "add", f"file://{Path().resolve()}/../sub"]
-        )
-        self.assert_run(["git", "commit", "-am", "1"])
-        self.assert_run(["git", "tag", "1"])
-
-        os.chdir("../sub")
-        Path("ver").write_text("2")
-        self.assert_run(["git", "commit", "-am", "2"])
-
-        os.chdir("../app")
-        self.assert_run(["git", "init"])
-        self.assert_run(["git", "submodule", "update", "--remote"])
-        self.assert_run(["git", "commit", "-am", "2"])
-
-        os.chdir("..")
-        Path("repo").mkdir()
-        Path("metadata").mkdir()
-        self.update_yaml(
-            "metadata/fake.yml",
-            {
-                "RepoType": "git",
-                "Repo": f"file://{Path().resolve()}/app",
-                "Builds": [{"versionName": 0, "versionCode": 0, "submodules": True}],
-                "AutoUpdateMode": "Version",
-                "UpdateCheckMode": "Tags",
-                "UpdateCheckData": r"sub/ver|(\d)||",
-                "CurrentVersion": 0,
-                "CurrentVersionCode": 0,
-            },
-        )
-        self.assert_run(
-            self.fdroid_cmd + ["checkupdates", "--allow-dirty", "--auto", "-v"]
-        )
-        self.assertIn("CurrentVersionCode: 1", Path("metadata/fake.yml").read_text())
-
-    @unittest.skipUnless(docker_exists(), "Docker is not available")
-    def test_update_remote_storage_with_rclone_and_minio(self):
-        # This test shows how an entire repo can be deployed using rclone.
-        # To avoid multiple files being copied in the repo since the repo
-        # directory can change, only two files are used.
-        try:
-            from testcontainers.minio import MinioContainer
-        except ImportError:
-            self.skipTest('Requires testcontainers.minio to run')
-        with MinioContainer(image="quay.io/minio/minio:latest") as minio:
-            # Set up minio bukcet
-            client = minio.get_client()
-            client.make_bucket('test-bucket')
-            host_ip = minio.get_config()['endpoint']
-
-            # Set up Repo dir
-            os.chdir(self.testdir)
-            repo_section = 'repo'
-            repo = Path(repo_section)
-            repo.mkdir(parents=True, exist_ok=True)
-            shutil.copy(basedir / 'SpeedoMeterApp.main_1.apk', repo)
-            shutil.copy(basedir / 'repo/index-v2.json', repo)
-
-            # write out config for test use
-            rclone_config = configparser.ConfigParser()
-            rclone_config.add_section("test-minio-config")
-            rclone_config.set("test-minio-config", "type", "s3")
-            rclone_config.set("test-minio-config", "provider", "Minio")
-            rclone_config.set("test-minio-config", "endpoint", "http://" + host_ip)
-            rclone_config.set("test-minio-config", "acl", "public-read")
-            rclone_config.set("test-minio-config", "env_auth", "true")
-            rclone_config.set("test-minio-config", "region", "us-east-1")
-            rclone_config.set("test-minio-config", "access_key_id", "minioadmin")
-            rclone_config.set("test-minio-config", "secret_access_key", "minioadmin")
-
-            rclone_config_path = Path('rclone_config_path')
-            rclone_config_path.mkdir(parents=True, exist_ok=True)
-            rclone_file = rclone_config_path / 'rclone-minio.conf'
-            with open(rclone_file, "w", encoding="utf-8") as configfile:
-                rclone_config.write(configfile)
-
-            # set up config for run
-            awsbucket = "test-bucket"
-            deploy.config['awsbucket'] = awsbucket
-            deploy.config['rclone_config'] = "test-minio-config"
-            deploy.config['path_to_custom_rclone_config'] = str(rclone_file)
-            common.options = VerboseFalseOptions
-
-            # call function
-            deploy.update_remote_storage_with_rclone(repo_section, awsbucket)
-
-            # check if apk and index file are available
-            bucket_content = client.list_objects('test-bucket', recursive=True)
-            files_in_bucket = {obj.object_name for obj in bucket_content}
-        self.assertEqual(
-            files_in_bucket,
-            {'fdroid/repo/SpeedoMeterApp.main_1.apk', 'fdroid/repo/index-v2.json'},
-        )
-
-    @unittest.skipUnless(docker_exists(), "Docker is not available")
-    def test_update_remote_storage_with_rclone_and_minio_in_index_only_mode(self):
-        try:
-            from testcontainers.minio import MinioContainer
-        except ImportError:
-            self.skipTest('Requires testcontainers.minio to run')
-        with MinioContainer(image="quay.io/minio/minio:latest") as minio:
-            # Set up minio bukcet
-            client = minio.get_client()
-            client.make_bucket('test-bucket')
-            host_ip = minio.get_config()['endpoint']
-
-            # Set up Repo dir
-            os.chdir(self.testdir)
-            repo_section = 'repo'
-            repo = Path(repo_section)
-            repo.mkdir(parents=True, exist_ok=True)
-            shutil.copytree(basedir / repo, repo, dirs_exist_ok=True)
-
-            # write out config for test use
-            rclone_config = configparser.ConfigParser()
-            rclone_config.add_section("test-minio-config")
-            rclone_config.set("test-minio-config", "type", "s3")
-            rclone_config.set("test-minio-config", "provider", "Minio")
-            rclone_config.set("test-minio-config", "endpoint", "http://" + host_ip)
-            rclone_config.set("test-minio-config", "acl", "public-read")
-            rclone_config.set("test-minio-config", "env_auth", "true")
-            rclone_config.set("test-minio-config", "region", "us-east-1")
-            rclone_config.set("test-minio-config", "access_key_id", "minioadmin")
-            rclone_config.set("test-minio-config", "secret_access_key", "minioadmin")
-
-            rclone_config_path = Path('rclone_config_path')
-            rclone_config_path.mkdir(parents=True, exist_ok=True)
-            rclone_file = rclone_config_path / 'rclone-minio.conf'
-            with open(rclone_file, "w", encoding="utf-8") as configfile:
-                rclone_config.write(configfile)
-
-            # set up config for run
-            awsbucket = "test-bucket"
-            deploy.config['awsbucket'] = awsbucket
-            deploy.config['rclone_config'] = "test-minio-config"
-            deploy.config['path_to_custom_rclone_config'] = str(rclone_file)
-            common.options = VerboseFalseOptions
-
-            # call function
-            deploy.update_remote_storage_with_rclone(
-                repo_section, awsbucket, is_index_only=True
-            )
-
-            # check if apk and index file are available
-            bucket_content = client.list_objects('test-bucket', recursive=True)
-            files_in_bucket = {obj.object_name for obj in bucket_content}
-        self.assertEqual(
-            files_in_bucket,
-            {
-                'fdroid/repo/index-v2.json',
-                'fdroid/repo/index.xml',
-                'fdroid/repo/entry.json',
-                'fdroid/repo/index-v1.json',
-            },
-        )
diff --git a/tests/test_lint.py b/tests/test_lint.py
deleted file mode 100755
index 37b7ce95..00000000
--- a/tests/test_lint.py
+++ /dev/null
@@ -1,663 +0,0 @@
-#!/usr/bin/env python3
-
-import logging
-import os
-import shutil
-import tempfile
-import textwrap
-import unittest
-from pathlib import Path
-from unittest import mock
-
-import fdroidserver.common
-import fdroidserver.lint
-import fdroidserver.metadata
-from fdroidserver._yaml import config_dump
-
-from .shared_test_code import mkdtemp
-
-basedir = Path(__file__).parent
-
-
-class SetUpTearDownMixin:
-    """A base class with no test in it for shared setUp and tearDown."""
-
-    def setUp(self):
-        os.chdir(basedir)
-        fdroidserver.common.config = None
-        fdroidserver.lint.config = None
-        fdroidserver.lint.CATEGORIES_KEYS = None
-        self._td = mkdtemp()
-        self.testdir = self._td.name
-
-    def tearDown(self):
-        self._td.cleanup()
-
-
-class LintTest(SetUpTearDownMixin, unittest.TestCase):
-    '''fdroidserver/lint.py'''
-
-    def test_check_for_unsupported_metadata_files(self):
-        self.assertTrue(fdroidserver.lint.check_for_unsupported_metadata_files())
-
-        with tempfile.TemporaryDirectory() as testdir:
-            testdir = Path(testdir)
-            self.assertFalse(
-                fdroidserver.lint.check_for_unsupported_metadata_files(testdir)
-            )
-            shutil.copytree(
-                basedir / 'metadata',
-                testdir / 'metadata',
-                ignore=shutil.ignore_patterns('apk', 'dump', '*.json'),
-            )
-            self.assertFalse(
-                fdroidserver.lint.check_for_unsupported_metadata_files(testdir)
-            )
-            (testdir / 'metadata/org.adaway.json').write_text('placeholder')
-            self.assertTrue(
-                fdroidserver.lint.check_for_unsupported_metadata_files(testdir)
-            )
-
-    def test_forbidden_html_tags(self):
-        config = dict()
-        fdroidserver.common.fill_config_defaults(config)
-        fdroidserver.common.config = config
-        fdroidserver.lint.config = config
-
-        app = {
-            'Name': 'Bad App',
-            'Summary': 'We pwn you',
-            'Description': 'This way: <style><img src="</style><img src=x onerror=alert(1)//">',
-        }
-
-        anywarns = False
-        for warn in fdroidserver.lint.check_regexes(app):
-            anywarns = True
-            logging.debug(warn)
-        self.assertTrue(anywarns)
-
-    def test_source_urls(self):
-        config = dict()
-        fdroidserver.common.fill_config_defaults(config)
-        fdroidserver.common.config = config
-        fdroidserver.lint.config = config
-
-        app = {
-            'Name': 'My App',
-            'Summary': 'just a placeholder',
-            'Description': 'This app does all sorts of useful stuff',
-        }
-        good_urls = [
-            'https://github.com/Matteljay/mastermindy-android',
-            'https://gitlab.com/origin/master',
-            'https://gitlab.com/group/subgroup/masterthing',
-            'https://raw.githubusercontent.com/Seva-coder/Finder/HEAD/ChangeLog.txt',
-            'https://github.com/scoutant/blokish/blob/HEAD/README.md#changelog',
-            'https://git.ieval.ro/?p=fonbot.git;a=blob;f=Changes;hb=HEAD',
-            'https://htmlpreview.github.io/?https://github.com/YasuakiHonda/Maxima-on-Android-AS/blob/HEAD/app/src/main/assets/About_MoA/index.html',
-            '',
-        ]
-
-        anywarns = False
-        for url in good_urls:
-            app['SourceCode'] = url
-            for warn in fdroidserver.lint.check_regexes(app):
-                anywarns = True
-                logging.debug(warn)
-        self.assertFalse(anywarns)
-
-        bad_urls = [
-            'github.com/my/proj',
-            'http://github.com/not/secure',
-            'https://github.com/foo/bar.git',
-            'https://gitlab.com/group/subgroup/project.git',
-            'https://raw.githubusercontent.com/Seva-coder/Finder/master/ChangeLog.txt',
-            'https://github.com/scoutant/blokish/blob/master/README.md#changelog',
-            'http://htmlpreview.github.io/?https://github.com/my/project/blob/HEAD/index.html',
-            'http://fdroid.gitlab.io/fdroid-website',
-        ]
-        logging.debug('bad urls:')
-        for url in bad_urls:
-            anywarns = False
-            app['SourceCode'] = url
-            for warn in fdroidserver.lint.check_regexes(app):
-                anywarns = True
-                logging.debug(warn)
-            self.assertTrue(anywarns, url + " does not fail lint!")
-
-    def test_check_app_field_types(self):
-        config = dict()
-        fdroidserver.common.fill_config_defaults(config)
-        fdroidserver.common.config = config
-        fdroidserver.lint.config = config
-
-        app = fdroidserver.metadata.App()
-        app.id = 'fake.app'
-        app.Name = 'Bad App'
-        app.Summary = 'We pwn you'
-        app.Description = 'These are some back'
-
-        fields = {
-            'Categories': {
-                'good': [
-                    ['Sports & Health'],
-                    ['Multimedia', 'Graphics'],
-                ],
-                'bad': [
-                    'Science & Education',
-                    'Multimedia,Graphics',
-                ],
-            },
-            'WebSite': {
-                'good': [
-                    'https://homepage.com',
-                ],
-                'bad': [
-                    [],
-                    [
-                        'nope',
-                    ],
-                    29,
-                ],
-            },
-        }
-
-        for field, values in fields.items():
-            for bad in values['bad']:
-                anywarns = False
-                app[field] = bad
-                for warn in fdroidserver.lint.check_app_field_types(app):
-                    anywarns = True
-                    logging.debug(warn)
-                self.assertTrue(anywarns)
-
-            for good in values['good']:
-                anywarns = False
-                app[field] = good
-                for warn in fdroidserver.lint.check_app_field_types(app):
-                    anywarns = True
-                    logging.debug(warn)
-                self.assertFalse(anywarns)
-
-    def test_check_vercode_operation(self):
-        config = dict()
-        fdroidserver.common.fill_config_defaults(config)
-        fdroidserver.common.config = config
-        fdroidserver.lint.config = config
-
-        app = fdroidserver.metadata.App()
-        app.Name = 'Bad App'
-        app.Summary = 'We pwn you'
-        app.Description = 'These are some back'
-
-        good_fields = [
-            '6%c',
-            '%c - 1',
-            '%c + 10',
-            '%c*10',
-            '%c*10 + 3',
-            '%c*10 + 8',
-            '%c + 2 ',
-            '%c + 3',
-            '%c + 7',
-        ]
-        bad_fields = [
-            'open("/etc/passwd")',
-            '%C + 1',
-            '%%c * 123',
-            '123 + %%',
-            '%c % 7',
-        ]
-
-        anywarns = False
-        for good in good_fields:
-            app.VercodeOperation = [good]
-            for warn in fdroidserver.lint.check_vercode_operation(app):
-                anywarns = True
-                logging.debug(warn)
-            self.assertFalse(anywarns)
-
-        for bad in bad_fields:
-            anywarns = False
-            app.VercodeOperation = [bad]
-            for warn in fdroidserver.lint.check_vercode_operation(app):
-                anywarns = True
-                logging.debug(warn)
-            self.assertTrue(anywarns)
-
-    def test_check_license_tag_no_custom_pass(self):
-        config = dict()
-        fdroidserver.common.fill_config_defaults(config)
-        fdroidserver.common.config = config
-        fdroidserver.lint.config = config
-
-        app = fdroidserver.metadata.App()
-        app.License = "GPL-3.0-or-later"
-
-        anywarns = False
-        for warn in fdroidserver.lint.check_license_tag(app):
-            anywarns = True
-            logging.debug(warn)
-        self.assertFalse(anywarns)
-
-    def test_check_license_tag_no_custom_fail(self):
-        config = dict()
-        fdroidserver.common.fill_config_defaults(config)
-        fdroidserver.common.config = config
-        fdroidserver.lint.config = config
-
-        app = fdroidserver.metadata.App()
-        app.License = "Adobe-2006"
-
-        anywarns = False
-        for warn in fdroidserver.lint.check_license_tag(app):
-            anywarns = True
-            logging.debug(warn)
-        self.assertTrue(anywarns)
-
-    def test_check_license_tag_with_custom_pass(self):
-        config = dict()
-        fdroidserver.common.fill_config_defaults(config)
-        fdroidserver.common.config = config
-        fdroidserver.lint.config = config
-        config['lint_licenses'] = ['fancy-license', 'GPL-3.0-or-later']
-
-        app = fdroidserver.metadata.App()
-        app.License = "fancy-license"
-
-        anywarns = False
-        for warn in fdroidserver.lint.check_license_tag(app):
-            anywarns = True
-            logging.debug(warn)
-        self.assertFalse(anywarns)
-
-    def test_check_license_tag_with_custom_fail(self):
-        config = dict()
-        fdroidserver.common.fill_config_defaults(config)
-        fdroidserver.common.config = config
-        fdroidserver.lint.config = config
-        config['lint_licenses'] = ['fancy-license', 'GPL-3.0-or-later']
-
-        app = fdroidserver.metadata.App()
-        app.License = "Apache-2.0"
-
-        anywarns = False
-        for warn in fdroidserver.lint.check_license_tag(app):
-            anywarns = True
-            logging.debug(warn)
-        self.assertTrue(anywarns)
-
-    def test_check_license_tag_with_custom_empty(self):
-        config = dict()
-        fdroidserver.common.fill_config_defaults(config)
-        fdroidserver.common.config = config
-        fdroidserver.lint.config = config
-        config['lint_licenses'] = []
-
-        app = fdroidserver.metadata.App()
-        app.License = "Apache-2.0"
-
-        anywarns = False
-        for warn in fdroidserver.lint.check_license_tag(app):
-            anywarns = True
-            logging.debug(warn)
-        self.assertTrue(anywarns)
-
-    def test_check_license_tag_disabled(self):
-        config = dict()
-        fdroidserver.common.fill_config_defaults(config)
-        fdroidserver.common.config = config
-        fdroidserver.lint.config = config
-        config['lint_licenses'] = None
-
-        app = fdroidserver.metadata.App()
-        app.License = "Apache-2.0"
-
-        anywarns = False
-        for warn in fdroidserver.lint.check_license_tag(app):
-            anywarns = True
-            logging.debug(warn)
-        self.assertFalse(anywarns)
-
-    def test_check_categories_in_config(self):
-        fdroidserver.lint.config = {
-            fdroidserver.common.CATEGORIES_CONFIG_NAME: ['InConfig']
-        }
-        fdroidserver.lint.load_categories_config()
-        app = fdroidserver.metadata.App({'Categories': ['InConfig']})
-        self.assertEqual(0, len(list(fdroidserver.lint.check_categories(app))))
-
-    def test_check_categories_not_in_config(self):
-        fdroidserver.lint.config = dict()
-        fdroidserver.lint.load_categories_config()
-        app = fdroidserver.metadata.App({'Categories': ['NotInConfig']})
-        self.assertEqual(1, len(list(fdroidserver.lint.check_categories(app))))
-
-    def test_check_categories_empty_is_error(self):
-        fdroidserver.lint.config = {fdroidserver.common.CATEGORIES_CONFIG_NAME: []}
-        fdroidserver.lint.load_categories_config()
-        app = fdroidserver.metadata.App({'Categories': ['something']})
-        self.assertEqual(1, len(list(fdroidserver.lint.check_categories(app))))
-
-    def test_check_categories_old_hardcoded_not_defined(self):
-        fdroidserver.lint.config = {
-            fdroidserver.common.CATEGORIES_CONFIG_NAME: ['foo', 'bar']
-        }
-        fdroidserver.lint.load_categories_config()
-        app = fdroidserver.metadata.App({'Categories': ['Writing']})
-        self.assertEqual(1, len(list(fdroidserver.lint.check_categories(app))))
-
-    def test_check_categories_from_config_yml(self):
-        """In config.yml, categories is a list."""
-        os.chdir(self.testdir)
-        fdroidserver.common.write_config_file('categories: [foo, bar]\n')
-        fdroidserver.lint.config = fdroidserver.common.read_config()
-        fdroidserver.lint.load_categories_config()
-        self.assertEqual(fdroidserver.lint.CATEGORIES_KEYS, ['foo', 'bar'])
-        app = fdroidserver.metadata.App({'Categories': ['bar']})
-        self.assertEqual(0, len(list(fdroidserver.lint.check_categories(app))))
-
-    def test_check_categories_from_config_categories_yml(self):
-        """In config/categories.yml, categories is a localized STRINGMAP dict."""
-        os.chdir(self.testdir)
-        os.mkdir('config')
-        Path('config/categories.yml').write_text('{foo: {name: foo}, bar: {name: bar}}')
-        fdroidserver.lint.config = fdroidserver.common.read_config()
-        fdroidserver.lint.load_categories_config()
-        self.assertEqual(fdroidserver.lint.CATEGORIES_KEYS, ['foo', 'bar'])
-        app = fdroidserver.metadata.App({'Categories': ['bar']})
-        self.assertEqual(0, len(list(fdroidserver.lint.check_categories(app))))
-
-    def test_lint_config_basic_mirrors_yml(self):
-        os.chdir(self.testdir)
-        with Path('mirrors.yml').open('w') as fp:
-            config_dump([{'url': 'https://example.com/fdroid/repo'}], fp)
-        self.assertTrue(fdroidserver.lint.lint_config('mirrors.yml'))
-
-    def test_lint_config_mirrors_yml_kenya_countryCode(self):
-        os.chdir(self.testdir)
-        with Path('mirrors.yml').open('w') as fp:
-            config_dump(
-                [{'url': 'https://foo.com/fdroid/repo', 'countryCode': 'KE'}], fp
-            )
-        self.assertTrue(fdroidserver.lint.lint_config('mirrors.yml'))
-
-    def test_lint_config_mirrors_yml_invalid_countryCode(self):
-        """WV is "indeterminately reserved" so it should never be used."""
-        os.chdir(self.testdir)
-        with Path('mirrors.yml').open('w') as fp:
-            config_dump(
-                [{'url': 'https://foo.com/fdroid/repo', 'countryCode': 'WV'}], fp
-            )
-        self.assertFalse(fdroidserver.lint.lint_config('mirrors.yml'))
-
-    def test_lint_config_mirrors_yml_alpha3_countryCode(self):
-        """Only ISO 3166-1 alpha 2 are supported"""
-        os.chdir(self.testdir)
-        with Path('mirrors.yml').open('w') as fp:
-            config_dump(
-                [{'url': 'https://de.com/fdroid/repo', 'countryCode': 'DEU'}], fp
-            )
-        self.assertFalse(fdroidserver.lint.lint_config('mirrors.yml'))
-
-    def test_lint_config_mirrors_yml_one_invalid_countryCode(self):
-        """WV is "indeterminately reserved" so it should never be used."""
-        os.chdir(self.testdir)
-        with Path('mirrors.yml').open('w') as fp:
-            config_dump(
-                [
-                    {'url': 'https://bar.com/fdroid/repo', 'countryCode': 'BA'},
-                    {'url': 'https://foo.com/fdroid/repo', 'countryCode': 'FO'},
-                    {'url': 'https://wv.com/fdroid/repo', 'countryCode': 'WV'},
-                ],
-                fp,
-            )
-        self.assertFalse(fdroidserver.lint.lint_config('mirrors.yml'))
-
-    def test_lint_config_bad_mirrors_yml_dict(self):
-        os.chdir(self.testdir)
-        Path('mirrors.yml').write_text('baz: [foo, bar]\n')
-        with self.assertRaises(TypeError):
-            fdroidserver.lint.lint_config('mirrors.yml')
-
-    def test_lint_config_bad_mirrors_yml_float(self):
-        os.chdir(self.testdir)
-        Path('mirrors.yml').write_text('1.0\n')
-        with self.assertRaises(TypeError):
-            fdroidserver.lint.lint_config('mirrors.yml')
-
-    def test_lint_config_bad_mirrors_yml_int(self):
-        os.chdir(self.testdir)
-        Path('mirrors.yml').write_text('1\n')
-        with self.assertRaises(TypeError):
-            fdroidserver.lint.lint_config('mirrors.yml')
-
-    def test_lint_config_bad_mirrors_yml_str(self):
-        os.chdir(self.testdir)
-        Path('mirrors.yml').write_text('foo\n')
-        with self.assertRaises(TypeError):
-            fdroidserver.lint.lint_config('mirrors.yml')
-
-    def test_lint_invalid_config_keys(self):
-        os.chdir(self.testdir)
-        os.mkdir('config')
-        config_yml = fdroidserver.common.CONFIG_FILE
-        with open(f'config/{config_yml}', 'w', encoding='utf-8') as fp:
-            fp.write('repo:\n  invalid_key: test\n')
-        self.assertFalse(fdroidserver.lint.lint_config(f'config/{config_yml}'))
-
-    def test_lint_invalid_localized_config_keys(self):
-        os.chdir(self.testdir)
-        Path('config/en').mkdir(parents=True)
-        Path('config/en/antiFeatures.yml').write_text('NonFreeNet:\n  icon: test.png\n')
-        self.assertFalse(fdroidserver.lint.lint_config('config/en/antiFeatures.yml'))
-
-    def test_check_certificate_pinned_binaries_empty(self):
-        fdroidserver.common.config = {}
-        app = fdroidserver.metadata.App()
-        app.AllowedAPKSigningKeys = [
-            'a40da80a59d170caa950cf15c18c454d47a39b26989d8b640ecd745ba71bf5dc'
-        ]
-        self.assertEqual(
-            [],
-            list(fdroidserver.lint.check_certificate_pinned_binaries(app)),
-            "when the config is empty, any signing key should be allowed",
-        )
-
-    def test_lint_known_debug_keys_no_match(self):
-        fdroidserver.common.config = {
-            "apk_signing_key_block_list": "a40da80a59d170caa950cf15c18c454d47a39b26989d8b640ecd745ba71bf5dc"
-        }
-        app = fdroidserver.metadata.App()
-        app.AllowedAPKSigningKeys = [
-            '2fd4fd5f54babba4bcb21237809bb653361d0d2583c80964ec89b28a26e9539e'
-        ]
-        self.assertEqual(
-            [],
-            list(fdroidserver.lint.check_certificate_pinned_binaries(app)),
-            "A signing key that does not match one in the config should be allowed",
-        )
-
-    def test_lint_known_debug_keys(self):
-        fdroidserver.common.config = {
-            'apk_signing_key_block_list': 'a40da80a59d170caa950cf15c18c454d47a39b26989d8b640ecd745ba71bf5dc'
-        }
-        app = fdroidserver.metadata.App()
-        app.AllowedAPKSigningKeys = [
-            'a40da80a59d170caa950cf15c18c454d47a39b26989d8b640ecd745ba71bf5dc'
-        ]
-        for warn in fdroidserver.lint.check_certificate_pinned_binaries(app):
-            anywarns = True
-            logging.debug(warn)
-        self.assertTrue(anywarns)
-
-
-class LintAntiFeaturesTest(unittest.TestCase):
-    def setUp(self):
-        os.chdir(basedir)
-        fdroidserver.common.config = dict()
-        fdroidserver.lint.ANTIFEATURES_KEYS = None
-        fdroidserver.lint.load_antiFeatures_config()
-
-    def test_check_antiFeatures_empty(self):
-        app = fdroidserver.metadata.App()
-        self.assertEqual([], list(fdroidserver.lint.check_antiFeatures(app)))
-
-    def test_check_antiFeatures_empty_AntiFeatures(self):
-        app = fdroidserver.metadata.App()
-        app['AntiFeatures'] = []
-        self.assertEqual([], list(fdroidserver.lint.check_antiFeatures(app)))
-
-    def test_check_antiFeatures(self):
-        app = fdroidserver.metadata.App()
-        app['AntiFeatures'] = ['Ads', 'Tracking']
-        self.assertEqual([], list(fdroidserver.lint.check_antiFeatures(app)))
-
-    def test_check_antiFeatures_fails_one(self):
-        app = fdroidserver.metadata.App()
-        app['AntiFeatures'] = ['Ad']
-        self.assertEqual(1, len(list(fdroidserver.lint.check_antiFeatures(app))))
-
-    def test_check_antiFeatures_fails_many(self):
-        app = fdroidserver.metadata.App()
-        app['AntiFeatures'] = ['Adss', 'Tracker', 'NoSourceSince', 'FAKE', 'NonFree']
-        self.assertEqual(4, len(list(fdroidserver.lint.check_antiFeatures(app))))
-
-    def test_check_antiFeatures_build_empty(self):
-        app = fdroidserver.metadata.App()
-        app['Builds'] = [{'antifeatures': []}]
-        self.assertEqual([], list(fdroidserver.lint.check_antiFeatures(app)))
-
-    def test_check_antiFeatures_build(self):
-        app = fdroidserver.metadata.App()
-        app['Builds'] = [{'antifeatures': ['Tracking']}]
-        self.assertEqual(0, len(list(fdroidserver.lint.check_antiFeatures(app))))
-
-    def test_check_antiFeatures_build_fail(self):
-        app = fdroidserver.metadata.App()
-        app['Builds'] = [{'antifeatures': ['Ads', 'Tracker']}]
-        self.assertEqual(1, len(list(fdroidserver.lint.check_antiFeatures(app))))
-
-
-class ConfigYmlTest(LintTest):
-    """Test data formats used in config.yml.
-
-    lint.py uses print() and not logging so hacks are used to control
-    the output when running in the test runner.
-
-    """
-
-    def setUp(self):
-        super().setUp()
-        self.config_yml = Path(self.testdir) / fdroidserver.common.CONFIG_FILE
-
-    def test_config_yml_int(self):
-        self.config_yml.write_text('repo_maxage: 1\n')
-        self.assertTrue(fdroidserver.lint.lint_config(self.config_yml))
-
-    @mock.patch('builtins.print', mock.Mock())  # hide error message
-    def test_config_yml_int_bad(self):
-        self.config_yml.write_text('repo_maxage: "1"\n')
-        self.assertFalse(fdroidserver.lint.lint_config(self.config_yml))
-
-    def test_config_yml_str(self):
-        self.config_yml.write_text('sdk_path: /opt/android-sdk\n')
-        self.assertTrue(fdroidserver.lint.lint_config(self.config_yml))
-
-    def test_config_yml_str_list(self):
-        self.config_yml.write_text('serverwebroot: [server1, server2]\n')
-        self.assertTrue(fdroidserver.lint.lint_config(self.config_yml))
-
-    def test_config_yml_str_list_of_dicts(self):
-        self.config_yml.write_text(
-            textwrap.dedent(
-                """\
-                serverwebroot:
-                  - url: 'me@b.az:/srv/fdroid'
-                    index_only: true
-                """
-            )
-        )
-        self.assertTrue(fdroidserver.lint.lint_config(self.config_yml))
-
-    def test_config_yml_str_list_of_dicts_env(self):
-        """serverwebroot can be str, list of str, or list of dicts."""
-        self.config_yml.write_text('serverwebroot: {env: ANDROID_HOME}\n')
-        self.assertTrue(fdroidserver.lint.lint_config(self.config_yml))
-
-    def test_config_yml_str_env(self):
-        self.config_yml.write_text('sdk_path: {env: ANDROID_HOME}\n')
-        self.assertTrue(fdroidserver.lint.lint_config(self.config_yml))
-
-    @mock.patch('builtins.print', mock.Mock())  # hide error message
-    def test_config_yml_str_bad(self):
-        self.config_yml.write_text('sdk_path: 1.0\n')
-        self.assertFalse(fdroidserver.lint.lint_config(self.config_yml))
-
-    def test_config_yml_bool(self):
-        self.config_yml.write_text("deploy_process_logs: true\n")
-        self.assertTrue(fdroidserver.lint.lint_config(self.config_yml))
-
-    @mock.patch('builtins.print', mock.Mock())  # hide error message
-    def test_config_yml_bool_bad(self):
-        self.config_yml.write_text('deploy_process_logs: 2342fe23\n')
-        self.assertFalse(fdroidserver.lint.lint_config(self.config_yml))
-
-    def test_config_yml_dict(self):
-        self.config_yml.write_text("keyaliases: {com.example: '@com.foo'}\n")
-        self.assertTrue(fdroidserver.lint.lint_config(self.config_yml))
-
-    @mock.patch('builtins.print', mock.Mock())  # hide error message
-    def test_config_yml_dict_bad(self):
-        self.config_yml.write_text('keyaliases: 2342fe23\n')
-        self.assertFalse(fdroidserver.lint.lint_config(self.config_yml))
-
-    @mock.patch('builtins.print', mock.Mock())  # hide error message
-    def test_config_yml_bad_key_name(self):
-        self.config_yml.write_text('keyalias: 2342fe23\n')
-        self.assertFalse(fdroidserver.lint.lint_config(self.config_yml))
-
-    @mock.patch('builtins.print', mock.Mock())  # hide error message
-    def test_config_yml_bad_value_for_all_keys(self):
-        """Check all config keys with a bad value."""
-        for key in fdroidserver.lint.check_config_keys:
-            if key in fdroidserver.lint.bool_keys:
-                value = 'foobar'
-            else:
-                value = 'false'
-            self.config_yml.write_text(f'{key}: {value}\n')
-            self.assertFalse(
-                fdroidserver.lint.lint_config(self.config_yml),
-                f'{key} should fail on value of "{value}"',
-            )
-
-    def test_config_yml_keyaliases(self):
-        self.config_yml.write_text(
-            textwrap.dedent(
-                """\
-                keyaliases:
-                  com.example: myalias
-                  com.foo: '@com.example'
-                """
-            )
-        )
-        self.assertTrue(fdroidserver.lint.lint_config(self.config_yml))
-
-    @mock.patch('builtins.print', mock.Mock())  # hide error message
-    def test_config_yml_keyaliases_bad_str(self):
-        """The keyaliases: value is a dict not a str."""
-        self.config_yml.write_text("keyaliases: '@com.example'\n")
-        self.assertFalse(fdroidserver.lint.lint_config(self.config_yml))
-
-    @mock.patch('builtins.print', mock.Mock())  # hide error message
-    def test_config_yml_keyaliases_bad_list(self):
-        """The keyaliases: value is a dict not a list."""
-        self.config_yml.write_text(
-            textwrap.dedent(
-                """\
-                keyaliases:
-                  - com.example: myalias
-                """
-            )
-        )
-        self.assertFalse(fdroidserver.lint.lint_config(self.config_yml))
diff --git a/tests/test_metadata.py b/tests/test_metadata.py
deleted file mode 100755
index 84040024..00000000
--- a/tests/test_metadata.py
+++ /dev/null
@@ -1,2427 +0,0 @@
-#!/usr/bin/env python3
-
-import copy
-import io
-import os
-import random
-import shutil
-import tempfile
-import textwrap
-import unittest
-from collections import OrderedDict
-from pathlib import Path
-from unittest import mock
-
-import ruamel.yaml
-
-import fdroidserver
-from fdroidserver import metadata
-from fdroidserver._yaml import yaml
-from fdroidserver.common import DEFAULT_LOCALE
-from fdroidserver.exception import MetaDataException
-
-from .shared_test_code import TmpCwd, mkdtemp
-
-basedir = Path(__file__).parent
-
-
-def _get_mock_mf(s):
-    mf = io.StringIO(s)
-    mf.name = 'mock_filename.yaml'
-    return mf
-
-
-class MetadataTest(unittest.TestCase):
-    '''fdroidserver/metadata.py'''
-
-    def setUp(self):
-        os.chdir(basedir)
-        self._td = mkdtemp()
-        self.testdir = self._td.name
-        fdroidserver.metadata.warnings_action = 'error'
-
-    def tearDown(self):
-        # auto-generated dirs by functions, not tests, so they are not always cleaned up
-        self._td.cleanup()
-        try:
-            os.rmdir("srclibs")
-        except OSError:
-            pass
-        try:
-            os.rmdir("tmp")
-        except OSError:
-            pass
-
-    def test_fieldtypes_key_exist(self):
-        for k in fdroidserver.metadata.fieldtypes:
-            self.assertIn(k, fdroidserver.metadata.yaml_app_fields)
-
-    def test_build_flagtypes_key_exist(self):
-        for k in fdroidserver.metadata.flagtypes:
-            self.assertIn(k, fdroidserver.metadata.build_flags)
-
-    def test_FieldValidator_BitcoinAddress(self):
-        validator = None
-        for vali in fdroidserver.metadata.valuetypes:
-            if vali.name == 'Bitcoin address':
-                validator = vali
-                break
-        self.assertIsNotNone(validator, "could not find 'Bitcoin address' validator")
-
-        # some valid addresses (P2PKH, P2SH, Bech32)
-        self.assertIsNone(
-            validator.check('1BrrrrErsrWetrTrnrrrrm4GFg7xJaNVN2', 'fake.app.id')
-        )
-        self.assertIsNone(
-            validator.check('3JrrrrWrEZr3rNrrvrecrnyirrnqRhWNLy', 'fake.app.id')
-        )
-        self.assertIsNone(
-            validator.check('bc1qar0srrr7xrkvr5lr43lrdnwrre5rgtrzrf5rrq', 'fake.app.id')
-        )
-
-        # some invalid addresses
-        self.assertRaises(
-            fdroidserver.exception.MetaDataException,
-            validator.check,
-            '21BvMrSYsrWrtrrlL5A10mlGFr7rrarrN2',
-            'fake.app.id',
-        )
-        self.assertRaises(
-            fdroidserver.exception.MetaDataException,
-            validator.check,
-            '5Hrgr3ur5rGLrfKrrrrrrHSrqJrroGrrzrQrrrrrrLNrsrDrrrA',
-            'fake.app.id',
-        )
-        self.assertRaises(
-            fdroidserver.exception.MetaDataException,
-            validator.check,
-            '92rr46rUrgTrrromrVrirW6r1rrrdrerrdbJrrrhrCsYrrrrrrc',
-            'fake.app.id',
-        )
-        self.assertRaises(
-            fdroidserver.exception.MetaDataException,
-            validator.check,
-            'K1BvMrSYsrWrtrrrn5Au4m4GFr7rrarrN2',
-            'fake.app.id',
-        )
-        self.assertRaises(
-            fdroidserver.exception.MetaDataException,
-            validator.check,
-            'L1BvMrSYsrWrtrrrn5Au4m4GFr7rrarrN2',
-            'fake.app.id',
-        )
-        self.assertRaises(
-            fdroidserver.exception.MetaDataException,
-            validator.check,
-            'tb1qw5r8drrejxrrg4y5rrrrrraryrrrrwrkxrjrsx',
-            'fake.app.id',
-        )
-
-    def test_FieldValidator_LitecoinAddress(self):
-        validator = None
-        for vali in fdroidserver.metadata.valuetypes:
-            if vali.name == 'Litecoin address':
-                validator = vali
-                break
-        self.assertIsNotNone(validator, "could not find 'Litecoin address' validator")
-
-        # some valid addresses (L, M, 3, segwit)
-        self.assertIsNone(
-            validator.check('LgeGrrrrJAxyXprrPrrBrrX5Qrrrrrrrrd', 'fake.app.id')
-        )
-        self.assertIsNone(
-            validator.check('MrrrrrrrJAxyXpanPtrrRAX5QHxvUJo8id', 'fake.app.id')
-        )
-        self.assertIsNone(validator.check('3rereVr9rAryrranrrrrrAXrrHx', 'fake.app.id'))
-        self.assertIsNone(
-            validator.check(
-                'ltc1q7euacwhn6ef99vcfa57mute92q572aqsc4c2j5', 'fake.app.id'
-            )
-        )
-
-        # some invalid addresses (various special use/testnet addresses, invalid chars)
-        self.assertRaises(
-            fdroidserver.exception.MetaDataException,
-            validator.check,
-            '21BvMrSYsrWrtrrrn5Au4l4GFr7rrarrN2',
-            'fake.app.id',
-        )
-        self.assertRaises(
-            fdroidserver.exception.MetaDataException,
-            validator.check,
-            '5Hrgr3ur5rGLrfKrrrrrr1SrqJrroGrrzrQrrrrrrLNrsrDrrrA',
-            'fake.app.id',
-        )
-        self.assertRaises(
-            fdroidserver.exception.MetaDataException,
-            validator.check,
-            '92rr46rUrgTrrromrVrirW6r1rrrdrerrdbJrrrhrCsYrrrrrrc',
-            'fake.app.id',
-        )
-        self.assertRaises(
-            fdroidserver.exception.MetaDataException,
-            validator.check,
-            'K1BvMrSYsrWrtrrrn5Au4m4GFr7rrarrN2',
-            'fake.app.id',
-        )
-        self.assertRaises(
-            fdroidserver.exception.MetaDataException,
-            validator.check,
-            'L0000rSYsrWrtrrrn5Au4m4GFr7rrarrN2',
-            'fake.app.id',
-        )
-        self.assertRaises(
-            fdroidserver.exception.MetaDataException,
-            validator.check,
-            'tb1qw5r8drrejxrrg4y5rrrrrraryrrrrwrkxrjrsx',
-            'fake.app.id',
-        )
-
-    def test_valid_funding_yml_regex(self):
-        """Check the regex can find all the cases"""
-        with (basedir / 'funding-usernames.yaml').open() as fp:
-            data = yaml.load(fp)
-
-        for k, entries in data.items():
-            for entry in entries:
-                m = fdroidserver.metadata.VALID_USERNAME_REGEX.match(entry)
-                if k == 'custom':
-                    pass
-                elif k == 'bad':
-                    self.assertIsNone(
-                        m, 'this is an invalid %s username: {%s}' % (k, entry)
-                    )
-                else:
-                    self.assertIsNotNone(
-                        m, 'this is a valid %s username: {%s}' % (k, entry)
-                    )
-
-    @mock.patch('git.Repo', mock.Mock())
-    @mock.patch('logging.error')
-    def test_read_metadata(self, logging_error):
-        """Read specified metadata files included in tests/, compare to stored output"""
-
-        self.maxDiff = None
-
-        config = dict()
-        fdroidserver.common.fill_config_defaults(config)
-        fdroidserver.common.config = config
-        fdroidserver.metadata.warnings_action = None
-
-        apps = fdroidserver.metadata.read_metadata()
-        for appid in (
-            'app.with.special.build.params',
-            'org.smssecure.smssecure',
-            'org.adaway',
-            'org.videolan.vlc',
-            'com.politedroid',
-        ):
-            savepath = Path('metadata/dump') / (appid + '.yaml')
-            frommeta = dict(apps[appid])
-            self.assertTrue(appid in apps)
-            with savepath.open('r') as f:
-                from_yaml = yaml.load(f)
-            self.assertEqual(frommeta, from_yaml)
-            # comment above assert and uncomment below to update test
-            # files when new metadata fields are added
-            # with savepath.open('w') as fp:
-            #     yaml.default_flow_style = False
-            #     yaml.register_class(metadata.Build)
-            #     yaml.dump(frommeta, fp)
-
-        # errors are printed when .yml overrides localized
-        logging_error.assert_called()
-        self.assertEqual(3, len(logging_error.call_args_list))
-
-    @mock.patch('git.Repo', mock.Mock())
-    def test_metadata_overrides_dot_fdroid_yml(self):
-        """Fields in metadata files should override anything in .fdroid.yml."""
-        app = metadata.parse_metadata('metadata/info.guardianproject.urzip.yml')
-        self.assertEqual(app['Summary'], '一个实用工具，获取已安装在您的设备上的应用的有关信息')
-
-    def test_dot_fdroid_yml_works_without_git(self):
-        """Parsing should work if .fdroid.yml is present and it is not a git repo."""
-        os.chdir(self.testdir)
-        yml = Path('metadata/test.yml')
-        yml.parent.mkdir()
-        with yml.open('w') as fp:
-            fp.write('Repo: https://example.com/not/git/or/anything')
-        fdroid_yml = Path('build/test/.fdroid.yml')
-        fdroid_yml.parent.mkdir(parents=True)
-        with fdroid_yml.open('w') as fp:
-            fp.write('OpenCollective: test')
-        metadata.parse_metadata(yml)  # should not throw an exception
-
-    @mock.patch('git.Repo', mock.Mock())
-    @mock.patch('logging.error')
-    def test_rewrite_yaml_fakeotaupdate(self, logging_error):
-        with tempfile.TemporaryDirectory() as testdir:
-            testdir = Path(testdir)
-            fdroidserver.common.config = {'accepted_formats': ['yml']}
-            fdroidserver.metadata.warnings_action = None
-
-            # rewrite metadata
-            allapps = fdroidserver.metadata.read_metadata()
-            for appid, app in allapps.items():
-                if appid == 'fake.ota.update':
-                    fdroidserver.metadata.write_metadata(
-                        testdir / (appid + '.yml'), app
-                    )
-
-            # assert rewrite result
-            self.maxDiff = None
-            file_name = 'fake.ota.update.yml'
-            self.assertEqual(
-                (testdir / file_name).read_text(encoding='utf-8'),
-                (Path('metadata-rewrite-yml') / file_name).read_text(encoding='utf-8'),
-            )
-
-        # errors are printed when .yml overrides localized
-        logging_error.assert_called()
-        self.assertEqual(3, len(logging_error.call_args_list))
-
-    @mock.patch('git.Repo', mock.Mock())
-    def test_rewrite_yaml_fdroidclient(self):
-        with tempfile.TemporaryDirectory() as testdir:
-            testdir = Path(testdir)
-            fdroidserver.common.config = {'accepted_formats': ['yml']}
-
-            # rewrite metadata
-            allapps = fdroidserver.metadata.read_metadata()
-            for appid, app in allapps.items():
-                if appid == 'org.fdroid.fdroid':
-                    fdroidserver.metadata.write_metadata(
-                        testdir / (appid + '.yml'), app
-                    )
-
-            # assert rewrite result
-            self.maxDiff = None
-            file_name = 'org.fdroid.fdroid.yml'
-            self.assertEqual(
-                (testdir / file_name).read_text(encoding='utf-8'),
-                (Path('metadata-rewrite-yml') / file_name).read_text(encoding='utf-8'),
-            )
-
-    @mock.patch('git.Repo', mock.Mock())
-    def test_rewrite_yaml_special_build_params(self):
-        """Test rewriting a plain YAML metadata file without localized files."""
-        os.chdir(self.testdir)
-        os.mkdir('metadata')
-        appid = 'app.with.special.build.params'
-        file_name = Path('metadata/%s.yml' % appid)
-        shutil.copy(basedir / file_name, file_name)
-
-        # rewrite metadata
-        allapps = fdroidserver.metadata.read_metadata({appid: -1})
-        for appid, app in allapps.items():
-            metadata.write_metadata(file_name, app)
-
-        # assert rewrite result
-        self.maxDiff = None
-        self.assertEqual(
-            file_name.read_text(),
-            (basedir / 'metadata-rewrite-yml' / file_name.name).read_text(),
-        )
-
-    def test_normalize_type_string(self):
-        """TYPE_STRING currently has some quirky behavior."""
-        self.assertEqual('123456', metadata._normalize_type_string(123456))
-        self.assertEqual('1.0', metadata._normalize_type_string(1.0))
-        self.assertEqual('0', metadata._normalize_type_string(0))
-        self.assertEqual('0.0', metadata._normalize_type_string(0.0))
-        self.assertEqual('0.1', metadata._normalize_type_string(0.1))
-        self.assertEqual('[]', metadata._normalize_type_string(list()))
-        self.assertEqual('{}', metadata._normalize_type_string(dict()))
-        self.assertEqual('false', metadata._normalize_type_string(False))
-        self.assertEqual('true', metadata._normalize_type_string(True))
-
-    def test_normalize_type_string_sha256(self):
-        """SHA-256 values are TYPE_STRING, which YAML can parse as decimal ints."""
-        for v in range(1, 1000):
-            s = '%064d' % (v * (10**51))
-            self.assertEqual(s, metadata._normalize_type_string(yaml.load(s)))
-
-    def test_normalize_type_stringmap_none(self):
-        self.assertEqual(dict(), metadata._normalize_type_stringmap('key', None))
-
-    def test_normalize_type_stringmap_empty_list(self):
-        self.assertEqual(dict(), metadata._normalize_type_stringmap('AntiFeatures', []))
-
-    def test_normalize_type_stringmap_simple_list_format(self):
-        self.assertEqual(
-            {'Ads': {}, 'Tracking': {}},
-            metadata._normalize_type_stringmap('AntiFeatures', ['Ads', 'Tracking']),
-        )
-
-    def test_normalize_type_int(self):
-        """TYPE_INT should be an int whenever possible."""
-        self.assertEqual(0, metadata._normalize_type_int('key', 0))
-        self.assertEqual(1, metadata._normalize_type_int('key', 1))
-        self.assertEqual(-5, metadata._normalize_type_int('key', -5))
-        self.assertEqual(0, metadata._normalize_type_int('key', '0'))
-        self.assertEqual(1, metadata._normalize_type_int('key', '1'))
-        self.assertEqual(-5, metadata._normalize_type_int('key', '-5'))
-        self.assertEqual(
-            12345678901234567890,
-            metadata._normalize_type_int('key', 12345678901234567890),
-        )
-
-    def test_normalize_type_int_fails(self):
-        with self.assertRaises(MetaDataException):
-            metadata._normalize_type_int('key', '1a')
-        with self.assertRaises(MetaDataException):
-            metadata._normalize_type_int('key', 1.1)
-        with self.assertRaises(MetaDataException):
-            metadata._normalize_type_int('key', True)
-
-    def test_normalize_type_list(self):
-        """TYPE_LIST is always a list of strings, no matter what YAML thinks."""
-        k = 'placeholder'
-        self.assertEqual(['1.0'], metadata._normalize_type_list(k, 1.0))
-        self.assertEqual(['1234567890'], metadata._normalize_type_list(k, 1234567890))
-        self.assertEqual(['false'], metadata._normalize_type_list(k, False))
-        self.assertEqual(['true'], metadata._normalize_type_list(k, True))
-        self.assertEqual(['foo'], metadata._normalize_type_list(k, 'foo'))
-        self.assertEqual([], metadata._normalize_type_list(k, list()))
-        self.assertEqual([], metadata._normalize_type_list(k, tuple()))
-        self.assertEqual([], metadata._normalize_type_list(k, set()))
-        self.assertEqual(['0', '1', '2'], metadata._normalize_type_list(k, {0, 1, 2}))
-        self.assertEqual(
-            ['a', 'b', 'c', '0', '0.0'],
-            metadata._normalize_type_list(k, yaml.load('[a, b, c, 0, 0.0]')),
-        )
-        self.assertEqual(
-            ['1', '1.0', 's', 'true', '{}'],
-            metadata._normalize_type_list(k, yaml.load('[1, 1.0, s, true, {}]')),
-        )
-        self.assertEqual(
-            ['1', '1.0', 's', 'true', '{}'],
-            metadata._normalize_type_list(k, (1, 1.0, 's', True, dict())),
-        )
-
-    def test_normalize_type_list_fails(self):
-        with self.assertRaises(MetaDataException):
-            metadata._normalize_type_list('placeholder', dict())
-
-    def test_post_parse_yaml_metadata(self):
-        yamldata = dict()
-        metadata.post_parse_yaml_metadata(yamldata)
-
-        yamldata[
-            'AllowedAPKSigningKeys'
-        ] = 'c03dac71394d6c26766f1b04d3e31cfcac5d03b55d8aa40cc9b9fa6b74354c66'
-        metadata.post_parse_yaml_metadata(yamldata)
-
-    def test_post_parse_yaml_metadata_ArchivePolicy_int(self):
-        for i in range(20):
-            yamldata = {'ArchivePolicy': i}
-            metadata.post_parse_yaml_metadata(yamldata)
-            self.assertEqual(i, yamldata['ArchivePolicy'])
-
-    def test_post_parse_yaml_metadata_ArchivePolicy_string(self):
-        for i in range(20):
-            yamldata = {'ArchivePolicy': '%d' % i}
-            metadata.post_parse_yaml_metadata(yamldata)
-            self.assertEqual(i, yamldata['ArchivePolicy'])
-
-    def test_post_parse_yaml_metadata_ArchivePolicy_versions(self):
-        """Test that the old format still works."""
-        for i in range(20):
-            yamldata = {'ArchivePolicy': '%d versions' % i}
-            metadata.post_parse_yaml_metadata(yamldata)
-            self.assertEqual(i, yamldata['ArchivePolicy'])
-
-    def test_post_parse_yaml_metadata_fails(self):
-        yamldata = {'AllowedAPKSigningKeys': {'bad': 'dict-placement'}}
-        with self.assertRaises(MetaDataException):
-            metadata.post_parse_yaml_metadata(yamldata)
-
-    def test_post_parse_yaml_metadata_0padding_sha256(self):
-        """SHA-256 values are strings, but YAML 1.2 will read some as decimal ints."""
-        v = '0027293472934293872934729834729834729834729834792837487293847926'
-        yamldata = yaml.load('AllowedAPKSigningKeys: ' + v)
-        metadata.post_parse_yaml_metadata(yamldata)
-        self.assertEqual(yamldata['AllowedAPKSigningKeys'], [v])
-
-    def test_post_parse_yaml_metadata_builds(self):
-        yamldata = OrderedDict()
-        builds = []
-        yamldata['Builds'] = builds
-        build = OrderedDict()
-        builds.append(build)
-
-        build['versionCode'] = 1.1
-        self.assertRaises(
-            fdroidserver.exception.MetaDataException,
-            fdroidserver.metadata.post_parse_yaml_metadata,
-            yamldata,
-        )
-
-        build['versionCode'] = '1a'
-        self.assertRaises(
-            fdroidserver.exception.MetaDataException,
-            fdroidserver.metadata.post_parse_yaml_metadata,
-            yamldata,
-        )
-
-        build['versionCode'] = 1
-        build['versionName'] = 1
-        fdroidserver.metadata.post_parse_yaml_metadata(yamldata)
-        self.assertNotEqual(1, yamldata['Builds'][0]['versionName'])
-        self.assertEqual('1', yamldata['Builds'][0]['versionName'])
-        self.assertEqual(1, yamldata['Builds'][0]['versionCode'])
-
-        build['versionName'] = 1.0
-        fdroidserver.metadata.post_parse_yaml_metadata(yamldata)
-        self.assertNotEqual(1.0, yamldata['Builds'][0]['versionName'])
-        self.assertEqual('1.0', yamldata['Builds'][0]['versionName'])
-
-        build['commit'] = 1.0
-        fdroidserver.metadata.post_parse_yaml_metadata(yamldata)
-        self.assertNotEqual(1.0, yamldata['Builds'][0]['commit'])
-        self.assertEqual('1.0', yamldata['Builds'][0]['commit'])
-
-        teststr = '98234fab134b'
-        build['commit'] = teststr
-        fdroidserver.metadata.post_parse_yaml_metadata(yamldata)
-        self.assertEqual(teststr, yamldata['Builds'][0]['commit'])
-
-        testcommitid = 1234567890
-        build['commit'] = testcommitid
-        fdroidserver.metadata.post_parse_yaml_metadata(yamldata)
-        self.assertNotEqual(testcommitid, yamldata['Builds'][0]['commit'])
-        self.assertEqual('1234567890', yamldata['Builds'][0]['commit'])
-
-    def test_read_metadata_sort_by_time(self):
-        with tempfile.TemporaryDirectory() as testdir, TmpCwd(testdir):
-            testdir = Path(testdir)
-            metadatadir = testdir / 'metadata'
-            metadatadir.mkdir()
-
-            randomlist = []
-            randomapps = list((basedir / 'metadata').glob('*.yml'))
-            random.shuffle(randomapps)
-            i = 1
-            for f in randomapps:
-                shutil.copy(f, metadatadir)
-                new = metadatadir / f.name
-                stat = new.stat()
-                os.utime(new, (stat.st_ctime, stat.st_mtime + i))
-                # prepend new item so newest is always first
-                randomlist = [f.stem] + randomlist
-                i += 1
-            allapps = fdroidserver.metadata.read_metadata(sort_by_time=True)
-            allappids = []
-            for appid, app in allapps.items():
-                allappids.append(appid)
-            self.assertEqual(randomlist, allappids)
-
-    def test_parse_yaml_metadata_0size_file(self):
-        self.assertEqual(dict(), metadata.parse_yaml_metadata(_get_mock_mf('')))
-
-    def test_parse_yaml_metadata_empty_dict_file(self):
-        self.assertEqual(dict(), metadata.parse_yaml_metadata(_get_mock_mf('{}')))
-
-    def test_parse_yaml_metadata_empty_string_file(self):
-        self.assertEqual(dict(), metadata.parse_yaml_metadata(_get_mock_mf('""')))
-
-    def test_parse_yaml_metadata_fail_on_root_list(self):
-        with self.assertRaises(MetaDataException):
-            metadata.parse_yaml_metadata(_get_mock_mf('-'))
-        with self.assertRaises(MetaDataException):
-            metadata.parse_yaml_metadata(_get_mock_mf('[]'))
-        with self.assertRaises(MetaDataException):
-            metadata.parse_yaml_metadata(_get_mock_mf('- AutoName: fake'))
-
-    def test_parse_yaml_metadata_type_list_str(self):
-        v = 'e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855'
-        mf = _get_mock_mf('AllowedAPKSigningKeys: "%s"' % v)
-        self.assertEqual(
-            v,
-            metadata.parse_yaml_metadata(mf)['AllowedAPKSigningKeys'][0],
-        )
-
-    def test_parse_yaml_metadata_type_list_build_str(self):
-        mf = _get_mock_mf('Builds: [{versionCode: 1, rm: s}]')
-        self.assertEqual(
-            metadata.parse_yaml_metadata(mf),
-            {'Builds': [{'rm': ['s'], 'versionCode': 1}]},
-        )
-
-    def test_parse_yaml_metadata_app_type_list_fails(self):
-        mf = _get_mock_mf('AllowedAPKSigningKeys: {t: f}')
-        with self.assertRaises(MetaDataException):
-            metadata.parse_yaml_metadata(mf)
-
-    def test_parse_yaml_metadata_build_type_list_fails(self):
-        mf = _get_mock_mf('Builds: [{versionCode: 1, rm: {bad: dict-placement}}]')
-        with self.assertRaises(MetaDataException):
-            metadata.parse_yaml_metadata(mf)
-
-    def test_parse_yaml_metadata_unknown_app_field(self):
-        mf = io.StringIO(
-            textwrap.dedent(
-                """\
-                AutoName: F-Droid
-                RepoType: git
-                Builds: []
-                bad: value"""
-            )
-        )
-        mf.name = 'mock_filename.yaml'
-        with self.assertRaises(MetaDataException):
-            fdroidserver.metadata.parse_yaml_metadata(mf)
-
-    def test_parse_yaml_metadata_unknown_build_flag(self):
-        mf = io.StringIO(
-            textwrap.dedent(
-                """\
-                AutoName: F-Droid
-                RepoType: git
-                Builds:
-                - bad: value"""
-            )
-        )
-        mf.name = 'mock_filename.yaml'
-        with self.assertRaises(MetaDataException):
-            fdroidserver.metadata.parse_yaml_metadata(mf)
-
-    @mock.patch('logging.warning')
-    @mock.patch('logging.error')
-    def test_parse_yaml_metadata_continue_on_warning(self, _error, _warning):
-        """When errors are disabled, parsing should provide something that can work.
-
-        When errors are disabled, then it should try to give data that
-        lets something happen.  A zero-length file is valid for
-        operation, it just declares a Application ID as "known" and
-        nothing else.  This example gives a list as the base in the
-        .yml file, which is unparsable, so it gives a warning message
-        and carries on with a blank dict.
-
-        """
-        fdroidserver.metadata.warnings_action = None
-        mf = _get_mock_mf('[AntiFeatures: Tracking]')
-        self.assertEqual(fdroidserver.metadata.parse_yaml_metadata(mf), dict())
-        _warning.assert_called_once()
-        _error.assert_called_once()
-
-    def test_parse_localized_antifeatures(self):
-        """Unit test based on reading files included in the test repo."""
-        app = dict()
-        app['id'] = 'app.with.special.build.params'
-        metadata.parse_localized_antifeatures(app)
-        self.maxDiff = None
-        self.assertEqual(
-            app,
-            {
-                'AntiFeatures': {
-                    'Ads': {'en-US': 'please no'},
-                    'NoSourceSince': {'en-US': 'no activity\n'},
-                },
-                'Builds': [
-                    {
-                        'versionCode': 50,
-                        'antifeatures': {
-                            'Ads': {
-                                'en-US': 'includes ad lib\n',
-                                'zh-CN': '包括广告图书馆\n',
-                            },
-                            'Tracking': {'en-US': 'standard suspects\n'},
-                        },
-                    },
-                    {
-                        'versionCode': 49,
-                        'antifeatures': {
-                            'Tracking': {'zh-CN': 'Text from zh-CN/49_Tracking.txt'},
-                        },
-                    },
-                ],
-                'id': app['id'],
-            },
-        )
-
-    def test_parse_localized_antifeatures_passthrough(self):
-        """Test app values are cleanly passed through if no localized files."""
-        before = {
-            'id': 'placeholder',
-            'AntiFeatures': {'NonFreeDep': {}},
-            'Builds': [{'versionCode': 999, 'antifeatures': {'zero': {}, 'one': {}}}],
-        }
-        after = copy.deepcopy(before)
-        with tempfile.TemporaryDirectory() as testdir:
-            os.chdir(testdir)
-            os.mkdir('metadata')
-            os.mkdir(os.path.join('metadata', after['id']))
-            metadata.parse_localized_antifeatures(after)
-        self.assertEqual(before, after)
-
-    def test_parse_metadata_antifeatures_NoSourceSince(self):
-        """Test that NoSourceSince gets added as an Anti-Feature."""
-        os.chdir(self.testdir)
-        yml = Path('metadata/test.yml')
-        yml.parent.mkdir()
-        with yml.open('w') as fp:
-            fp.write('AntiFeatures: Ads\nNoSourceSince: gone\n')
-        app = metadata.parse_metadata(yml)
-        self.assertEqual(
-            app['AntiFeatures'], {'Ads': {}, 'NoSourceSince': {DEFAULT_LOCALE: 'gone'}}
-        )
-
-    @mock.patch('logging.error')
-    def test_yml_overrides_localized_antifeatures(self, logging_error):
-        """Definitions in .yml files should override the localized versions."""
-        app = metadata.parse_metadata('metadata/app.with.special.build.params.yml')
-
-        self.assertEqual(app['AntiFeatures'], {'Tracking': {}})
-
-        self.assertEqual(49, app['Builds'][-3]['versionCode'])
-        self.assertEqual(
-            app['Builds'][-3]['antifeatures'],
-            {'Tracking': {DEFAULT_LOCALE: 'Uses the Facebook SDK.'}},
-        )
-
-        self.assertEqual(50, app['Builds'][-2]['versionCode'])
-        self.assertEqual(
-            app['Builds'][-2]['antifeatures'],
-            {
-                'Ads': {
-                    'en-US': 'includes ad lib\n',
-                    'zh-CN': '包括广告图书馆\n',
-                },
-                'Tracking': {'en-US': 'standard suspects\n'},
-            },
-        )
-        # errors are printed when .yml overrides localized
-        logging_error.assert_called()
-        self.assertEqual(3, len(logging_error.call_args_list))
-
-    def test_parse_yaml_srclib_corrupt_file(self):
-        with tempfile.TemporaryDirectory() as testdir:
-            testdir = Path(testdir)
-            srclibfile = testdir / 'srclib/mock.yml'
-            srclibfile.parent.mkdir()
-            with srclibfile.open('w') as fp:
-                fp.write(
-                    textwrap.dedent(
-                        """
-                        - RepoType: git
-                        - Repo: https://github.com/realm/realm-js.git
-                        """
-                    )
-                )
-            with self.assertRaises(MetaDataException):
-                fdroidserver.metadata.parse_yaml_srclib(srclibfile)
-
-    def test_write_yaml_with_placeholder_values(self):
-        mf = io.StringIO()
-
-        app = fdroidserver.metadata.App()
-        app.Categories = ['None']
-        app.SourceCode = "https://gitlab.com/fdroid/fdroidclient.git"
-        app.IssueTracker = "https://gitlab.com/fdroid/fdroidclient/issues"
-        app.RepoType = 'git'
-        app.Repo = 'https://gitlab.com/fdroid/fdroidclient.git'
-        app.AutoUpdateMode = 'None'
-        app.UpdateCheckMode = 'Tags'
-        build = fdroidserver.metadata.Build()
-        build.versionName = 'Unknown'  # taken from fdroidserver/import.py
-        build.versionCode = 0  # taken from fdroidserver/import.py
-        build.disable = 'Generated by import.py ...'
-        build.commit = 'Unknown'
-        build.gradle = ['yes']
-        app['Builds'] = [build]
-
-        fdroidserver.metadata.write_yaml(mf, app)
-
-        mf.seek(0)
-        self.assertEqual(
-            mf.read(),
-            textwrap.dedent(
-                """\
-                Categories:
-                  - None
-                License: Unknown
-                SourceCode: https://gitlab.com/fdroid/fdroidclient.git
-                IssueTracker: https://gitlab.com/fdroid/fdroidclient/issues
-
-                RepoType: git
-                Repo: https://gitlab.com/fdroid/fdroidclient.git
-
-                Builds:
-                  - versionName: Unknown
-                    versionCode: 0
-                    disable: Generated by import.py ...
-                    commit: Unknown
-                    gradle:
-                      - yes
-
-                AutoUpdateMode: None
-                UpdateCheckMode: Tags
-                """
-            ),
-        )
-
-    def test_parse_yaml_metadata_prebuild_list(self):
-        mf = io.StringIO(
-            textwrap.dedent(
-                """\
-                AutoName: F-Droid
-                RepoType: git
-                Builds:
-                  - versionCode: 1
-                    versionName: v0.1.0
-                    sudo:
-                      - apt-get update
-                      - apt-get install -y whatever
-                      - sed -i -e 's/<that attr="bad"/<that attr="good"/' ~/.whatever/config.xml
-                    init:
-                      - bash generate_some_file.sh
-                      - sed -i -e 'g/what/ever/' /some/file
-                    prebuild:
-                      - npm something
-                      - echo 'important setting' >> /a/file
-                    build:
-                      - ./gradlew someSpecialTask
-                      - sed -i 'd/that wrong config/' gradle.properties
-                      - ./gradlew compile
-                """
-            )
-        )
-        mf.name = 'mock_filename.yaml'
-        mf.seek(0)
-        result = fdroidserver.metadata.parse_yaml_metadata(mf)
-        self.maxDiff = None
-        self.assertDictEqual(
-            result,
-            {
-                'AutoName': 'F-Droid',
-                'RepoType': 'git',
-                'Builds': [
-                    {
-                        'versionCode': 1,
-                        'versionName': 'v0.1.0',
-                        'sudo': [
-                            "apt-get update",
-                            "apt-get install -y whatever",
-                            "sed -i -e 's/<that attr=\"bad\"/<that attr=\"good\"/' ~/.whatever/config.xml",
-                        ],
-                        'init': [
-                            "bash generate_some_file.sh",
-                            "sed -i -e 'g/what/ever/' /some/file",
-                        ],
-                        'prebuild': [
-                            "npm something",
-                            "echo 'important setting' >> /a/file",
-                        ],
-                        'build': [
-                            "./gradlew someSpecialTask",
-                            "sed -i 'd/that wrong config/' gradle.properties",
-                            "./gradlew compile",
-                        ],
-                    }
-                ],
-            },
-        )
-
-    def test_parse_yaml_metadata_prebuild_strings(self):
-        mf = io.StringIO(
-            textwrap.dedent(
-                """\
-                AutoName: F-Droid
-                RepoType: git
-                Builds:
-                  - versionCode: 1
-                    versionName: v0.1.0
-                    sudo: |-
-                      apt-get update && apt-get install -y whatever && sed -i -e 's/<that attr="bad"/<that attr="good"/' ~/.whatever/config.xml
-                    init: bash generate_some_file.sh && sed -i -e 'g/what/ever/' /some/file
-                    prebuild: npm something && echo 'important setting' >> /a/file
-                    build: |-
-                      ./gradlew someSpecialTask && sed -i 'd/that wrong config/' gradle.properties && ./gradlew compile
-                """
-            )
-        )
-        mf.name = 'mock_filename.yaml'
-        mf.seek(0)
-        result = fdroidserver.metadata.parse_yaml_metadata(mf)
-        self.maxDiff = None
-        self.assertDictEqual(
-            result,
-            {
-                'AutoName': 'F-Droid',
-                'RepoType': 'git',
-                'Builds': [
-                    {
-                        'versionCode': 1,
-                        'versionName': 'v0.1.0',
-                        'sudo': [
-                            "apt-get update && "
-                            "apt-get install -y whatever && "
-                            "sed -i -e 's/<that attr=\"bad\"/<that attr=\"good\"/' ~/.whatever/config.xml"
-                        ],
-                        'init': [
-                            "bash generate_some_file.sh && "
-                            "sed -i -e 'g/what/ever/' /some/file"
-                        ],
-                        'prebuild': [
-                            "npm something && echo 'important setting' >> /a/file"
-                        ],
-                        'build': [
-                            "./gradlew someSpecialTask && "
-                            "sed -i 'd/that wrong config/' gradle.properties && "
-                            "./gradlew compile"
-                        ],
-                    }
-                ],
-            },
-        )
-
-    def test_parse_yaml_metadata_prebuild_string(self):
-        mf = io.StringIO(
-            textwrap.dedent(
-                """\
-                AutoName: F-Droid
-                RepoType: git
-                Builds:
-                  - versionCode: 1
-                    versionName: v0.1.0
-                    prebuild: |-
-                      a && b && sed -i 's,a,b,'
-                """
-            )
-        )
-        mf.name = 'mock_filename.yaml'
-        mf.seek(0)
-        result = fdroidserver.metadata.parse_yaml_metadata(mf)
-        self.assertDictEqual(
-            result,
-            {
-                'AutoName': 'F-Droid',
-                'RepoType': 'git',
-                'Builds': [
-                    {
-                        'versionCode': 1,
-                        'versionName': 'v0.1.0',
-                        'prebuild': ["a && b && sed -i 's,a,b,'"],
-                    }
-                ],
-            },
-        )
-
-    def test_parse_yaml_provides_should_be_ignored(self):
-        mf = io.StringIO(
-            textwrap.dedent(
-                """\
-                Provides: this.is.deprecated
-                AutoName: F-Droid
-                RepoType: git
-                Builds:
-                  - versionCode: 1
-                    versionName: v0.1.0
-                    prebuild: |-
-                      a && b && sed -i 's,a,b,'
-                """
-            )
-        )
-        mf.name = 'mock_filename.yaml'
-        mf.seek(0)
-        result = fdroidserver.metadata.parse_yaml_metadata(mf)
-        self.assertNotIn('Provides', result)
-        self.assertNotIn('provides', result)
-
-    def test_parse_yaml_app_antifeatures_dict(self):
-        nonfreenet = 'free it!'
-        tracking = 'so many'
-        mf = io.StringIO(
-            textwrap.dedent(
-                f"""
-                AntiFeatures:
-                  Tracking: {tracking}
-                  NonFreeNet: {nonfreenet}
-                """
-            )
-        )
-        self.assertEqual(
-            metadata.parse_yaml_metadata(mf),
-            {
-                'AntiFeatures': {
-                    'NonFreeNet': {DEFAULT_LOCALE: nonfreenet},
-                    'Tracking': {DEFAULT_LOCALE: tracking},
-                }
-            },
-        )
-
-    def test_parse_yaml_metadata_build_antifeatures_old_style(self):
-        mf = _get_mock_mf(
-            textwrap.dedent(
-                """
-                AntiFeatures:
-                  - Ads
-                Builds:
-                  - versionCode: 123
-                    antifeatures:
-                      - KnownVuln
-                      - NonFreeAssets
-                """
-            )
-        )
-        self.assertEqual(
-            metadata.parse_yaml_metadata(mf),
-            {
-                'AntiFeatures': {'Ads': {}},
-                'Builds': [
-                    {
-                        'antifeatures': {'KnownVuln': {}, 'NonFreeAssets': {}},
-                        'versionCode': 123,
-                    }
-                ],
-            },
-        )
-
-    def test_parse_yaml_metadata_antifeatures_sort(self):
-        """All data should end up sorted, to minimize diffs in the index files."""
-        self.assertEqual(
-            metadata.parse_yaml_metadata(
-                _get_mock_mf(
-                    textwrap.dedent(
-                        """
-                Builds:
-                  - versionCode: 123
-                    antifeatures:
-                      KnownVuln:
-                        es: 2nd
-                        az: zero
-                        en-US: first
-                      Tracking:
-                      NonFreeAssets:
-                AntiFeatures:
-                  NonFreeDep:
-                  Ads:
-                    sw: 2nd
-                    zh-CN: 3rd
-                    de: 1st
-                """
-                    )
-                )
-            ),
-            {
-                'AntiFeatures': {
-                    'Ads': {'de': '1st', 'sw': '2nd', 'zh-CN': '3rd'},
-                    'NonFreeDep': {},
-                },
-                'Builds': [
-                    {
-                        'antifeatures': {
-                            'KnownVuln': {'az': 'zero', 'en-US': 'first', 'es': '2nd'},
-                            'NonFreeAssets': {},
-                            'Tracking': {},
-                        },
-                        'versionCode': 123,
-                    }
-                ],
-            },
-        )
-
-    def test_parse_yaml_app_antifeatures_str(self):
-        self.assertEqual(
-            metadata.parse_yaml_metadata(io.StringIO('AntiFeatures: Tracking')),
-            {'AntiFeatures': {'Tracking': {}}},
-        )
-
-    def test_parse_yaml_app_antifeatures_bool(self):
-        self.assertEqual(
-            metadata.parse_yaml_metadata(io.StringIO('AntiFeatures: true')),
-            {'AntiFeatures': {'true': {}}},
-        )
-
-    def test_parse_yaml_app_antifeatures_float_nan(self):
-        self.assertEqual(
-            metadata.parse_yaml_metadata(io.StringIO('AntiFeatures: .nan')),
-            {'AntiFeatures': {'.nan': {}}},
-        )
-
-    def test_parse_yaml_app_antifeatures_float_inf(self):
-        self.assertEqual(
-            metadata.parse_yaml_metadata(io.StringIO('AntiFeatures: .inf')),
-            {'AntiFeatures': {'.inf': {}}},
-        )
-
-    def test_parse_yaml_app_antifeatures_float_negative_inf(self):
-        self.assertEqual(
-            metadata.parse_yaml_metadata(io.StringIO('AntiFeatures: -.inf')),
-            {'AntiFeatures': {'-.inf': {}}},
-        )
-
-    def test_parse_yaml_app_antifeatures_int(self):
-        self.assertEqual(
-            metadata.parse_yaml_metadata(io.StringIO('AntiFeatures: 1')),
-            {'AntiFeatures': {'1': {}}},
-        )
-
-    def test_parse_yaml_app_antifeatures_float(self):
-        self.assertEqual(
-            metadata.parse_yaml_metadata(io.StringIO('AntiFeatures: 1.0')),
-            {'AntiFeatures': {'1.0': {}}},
-        )
-
-    def test_parse_yaml_app_antifeatures_list_float(self):
-        self.assertEqual(
-            metadata.parse_yaml_metadata(io.StringIO('AntiFeatures:\n  - 1.0\n')),
-            {'AntiFeatures': {'1.0': {}}},
-        )
-
-    def test_parse_yaml_app_antifeatures_dict_float(self):
-        mf = io.StringIO('AntiFeatures:\n  0.0: too early\n')
-        self.assertEqual(
-            metadata.parse_yaml_metadata(mf),
-            {'AntiFeatures': {'0.0': {'en-US': 'too early'}}},
-        )
-
-    def test_parse_yaml_app_antifeatures_dict_float_fail_value(self):
-        mf = io.StringIO('AntiFeatures:\n  NoSourceSince: 1.0\n')
-        self.assertEqual(
-            metadata.parse_yaml_metadata(mf),
-            {'AntiFeatures': {'NoSourceSince': {'en-US': '1.0'}}},
-        )
-
-    def test_parse_yaml_metadata_type_stringmap_old_list(self):
-        mf = _get_mock_mf(
-            textwrap.dedent(
-                """
-                    AntiFeatures:
-                      - Ads
-                      - Tracking
-                """
-            )
-        )
-        self.assertEqual(
-            {'AntiFeatures': {'Ads': {}, 'Tracking': {}}},
-            metadata.parse_yaml_metadata(mf),
-        )
-
-    def test_parse_yaml_app_antifeatures_dict_no_value(self):
-        mf = io.StringIO(
-            textwrap.dedent(
-                """\
-                AntiFeatures:
-                  Tracking:
-                  NonFreeNet:
-                """
-            )
-        )
-        self.assertEqual(
-            metadata.parse_yaml_metadata(mf),
-            {'AntiFeatures': {'NonFreeNet': {}, 'Tracking': {}}},
-        )
-
-    def test_parse_yaml_metadata_type_stringmap_transitional(self):
-        """Support a transitional format, where users just append a text"""
-        ads = 'Has ad lib in it.'
-        tracking = 'opt-out reports with ACRA'
-        mf = _get_mock_mf(
-            textwrap.dedent(
-                f"""
-                    AntiFeatures:
-                      - Ads: {ads}
-                      - Tracking: {tracking}
-                """
-            )
-        )
-        self.assertEqual(
-            metadata.parse_yaml_metadata(mf),
-            {
-                'AntiFeatures': {
-                    'Ads': {DEFAULT_LOCALE: ads},
-                    'Tracking': {DEFAULT_LOCALE: tracking},
-                }
-            },
-        )
-
-    def test_parse_yaml_app_antifeatures_dict_mixed_values(self):
-        ads = 'true'
-        tracking = 'many'
-        nonfreenet = '1'
-        mf = io.StringIO(
-            textwrap.dedent(
-                f"""
-                AntiFeatures:
-                  Ads: {ads}
-                  Tracking: {tracking}
-                  NonFreeNet: {nonfreenet}
-                """
-            )
-        )
-        self.assertEqual(
-            metadata.parse_yaml_metadata(mf),
-            {
-                'AntiFeatures': {
-                    'Ads': {DEFAULT_LOCALE: ads},
-                    'NonFreeNet': {DEFAULT_LOCALE: nonfreenet},
-                    'Tracking': {DEFAULT_LOCALE: tracking},
-                }
-            },
-        )
-
-    def test_parse_yaml_app_antifeatures_stringmap_full(self):
-        ads = 'watching'
-        tracking = 'many'
-        nonfreenet = 'pipes'
-        nonfreenet_zh = '非免费网络'
-        self.maxDiff = None
-        mf = io.StringIO(
-            textwrap.dedent(
-                f"""
-                AntiFeatures:
-                  Ads:
-                    {DEFAULT_LOCALE}: {ads}
-                  Tracking:
-                    {DEFAULT_LOCALE}: {tracking}
-                  NonFreeNet:
-                    {DEFAULT_LOCALE}: {nonfreenet}
-                    zh-CN: {nonfreenet_zh}
-                """
-            )
-        )
-        self.assertEqual(
-            metadata.parse_yaml_metadata(mf),
-            {
-                'AntiFeatures': {
-                    'Ads': {DEFAULT_LOCALE: ads},
-                    'NonFreeNet': {DEFAULT_LOCALE: nonfreenet, 'zh-CN': nonfreenet_zh},
-                    'Tracking': {DEFAULT_LOCALE: tracking},
-                }
-            },
-        )
-
-    def test_parse_yaml_build_type_int_fail(self):
-        mf = io.StringIO('Builds: [{versionCode: 1a}]')
-        with self.assertRaises(MetaDataException):
-            fdroidserver.metadata.parse_yaml_metadata(mf)
-
-    def test_parse_yaml_int_strict_typing_fails(self):
-        """Things that cannot be preserved when parsing as YAML."""
-        mf = io.StringIO('Builds: [{versionCode: 1, rm: 0xf}]')
-        self.assertEqual(
-            {'Builds': [{'rm': ['15'], 'versionCode': 1}]},  # 15 != 0xf
-            fdroidserver.metadata.parse_yaml_metadata(mf),
-        )
-        mf = io.StringIO('Builds: [{versionCode: 1, rm: 0x010}]')
-        self.assertEqual(
-            {'Builds': [{'rm': ['16'], 'versionCode': 1}]},  # 16 != 0x010
-            fdroidserver.metadata.parse_yaml_metadata(mf),
-        )
-        mf = io.StringIO('Builds: [{versionCode: 1, rm: 0o015}]')
-        self.assertEqual(
-            {'Builds': [{'rm': ['13'], 'versionCode': 1}]},  # 13 != 0o015
-            fdroidserver.metadata.parse_yaml_metadata(mf),
-        )
-        mf = io.StringIO('Builds: [{versionCode: 1, rm: 10_000}]')
-        self.assertEqual(
-            {'Builds': [{'rm': ['10000'], 'versionCode': 1}]},  # 10000 != 10_000
-            fdroidserver.metadata.parse_yaml_metadata(mf),
-        )
-
-    def test_write_yaml_1_line_scripts_as_string(self):
-        mf = io.StringIO()
-        app = fdroidserver.metadata.App()
-        app.Categories = ['None']
-        app['Builds'] = []
-        build = fdroidserver.metadata.Build()
-        build.versionCode = 102030
-        build.versionName = 'v1.2.3'
-        build.sudo = ["chmod +rwx /opt"]
-        build.init = ["sed -i -e 'g/what/ever/' /some/file"]
-        build.prebuild = ["sed -i 'd/that wrong config/' gradle.properties"]
-        build.build = ["./gradlew compile"]
-        app['Builds'].append(build)
-        fdroidserver.metadata.write_yaml(mf, app)
-        mf.seek(0)
-        self.assertEqual(
-            mf.read(),
-            textwrap.dedent(
-                """\
-                Categories:
-                  - None
-                License: Unknown
-
-                Builds:
-                  - versionName: v1.2.3
-                    versionCode: 102030
-                    sudo: chmod +rwx /opt
-                    init: sed -i -e 'g/what/ever/' /some/file
-                    prebuild: sed -i 'd/that wrong config/' gradle.properties
-                    build: ./gradlew compile
-
-                AutoUpdateMode: None
-                UpdateCheckMode: None
-                """
-            ),
-        )
-
-    def test_write_yaml_1_line_scripts_as_list(self):
-        mf = io.StringIO()
-        app = fdroidserver.metadata.App()
-        app.Categories = ['None']
-        app['Builds'] = []
-        build = fdroidserver.metadata.Build()
-        build.versionCode = 102030
-        build.versionName = 'v1.2.3'
-        build.sudo = ["chmod +rwx /opt"]
-        build.init = ["sed -i -e 'g/what/ever/' /some/file"]
-        build.prebuild = ["sed -i 'd/that wrong config/' gradle.properties"]
-        build.build = ["./gradlew compile"]
-        app['Builds'].append(build)
-        fdroidserver.metadata.write_yaml(mf, app)
-        mf.seek(0)
-        self.assertEqual(
-            mf.read(),
-            textwrap.dedent(
-                """\
-                Categories:
-                  - None
-                License: Unknown
-
-                Builds:
-                  - versionName: v1.2.3
-                    versionCode: 102030
-                    sudo: chmod +rwx /opt
-                    init: sed -i -e 'g/what/ever/' /some/file
-                    prebuild: sed -i 'd/that wrong config/' gradle.properties
-                    build: ./gradlew compile
-
-                AutoUpdateMode: None
-                UpdateCheckMode: None
-                """
-            ),
-        )
-
-    def test_write_yaml_multiline_scripts_from_list(self):
-        mf = io.StringIO()
-        app = fdroidserver.metadata.App()
-        app.Categories = ['None']
-        app['Builds'] = []
-        build = fdroidserver.metadata.Build()
-        build.versionCode = 102030
-        build.versionName = 'v1.2.3'
-        build.sudo = [
-            "apt-get update",
-            "apt-get install -y whatever",
-            "sed -i -e 's/<that attr=\"bad\"/<that attr=\"good\"/' ~/.whatever/config.xml",
-        ]
-        build.init = [
-            "bash generate_some_file.sh",
-            "sed -i -e 'g/what/ever/' /some/file",
-        ]
-        build.prebuild = ["npm something", "echo 'important setting' >> /a/file"]
-        build.build = [
-            "./gradlew someSpecialTask",
-            "sed -i 'd/that wrong config/' gradle.properties",
-            "./gradlew compile",
-        ]
-        app['Builds'].append(build)
-        fdroidserver.metadata.write_yaml(mf, app)
-        mf.seek(0)
-        self.assertEqual(
-            mf.read(),
-            textwrap.dedent(
-                """\
-            Categories:
-              - None
-            License: Unknown
-
-            Builds:
-              - versionName: v1.2.3
-                versionCode: 102030
-                sudo:
-                  - apt-get update
-                  - apt-get install -y whatever
-                  - sed -i -e 's/<that attr="bad"/<that attr="good"/' ~/.whatever/config.xml
-                init:
-                  - bash generate_some_file.sh
-                  - sed -i -e 'g/what/ever/' /some/file
-                prebuild:
-                  - npm something
-                  - echo 'important setting' >> /a/file
-                build:
-                  - ./gradlew someSpecialTask
-                  - sed -i 'd/that wrong config/' gradle.properties
-                  - ./gradlew compile
-
-            AutoUpdateMode: None
-            UpdateCheckMode: None
-            """
-            ),
-        )
-
-    def test_write_yaml_multiline_scripts_from_string(self):
-        mf = io.StringIO()
-        app = fdroidserver.metadata.App()
-        app.Categories = ['None']
-        app['Builds'] = []
-        build = fdroidserver.metadata.Build()
-        build.versionCode = 102030
-        build.versionName = 'v1.2.3'
-        build.sudo = [
-            "apt-get update",
-            "apt-get install -y whatever",
-            "sed -i -e 's/<that attr=\"bad\"/<that attr=\"good\"/' ~/.whatever/config.xml",
-        ]
-        build.init = [
-            "bash generate_some_file.sh",
-            "sed -i -e 'g/what/ever/' /some/file",
-        ]
-        build.prebuild = ["npm something", "echo 'important setting' >> /a/file"]
-        build.build = [
-            "./gradlew someSpecialTask",
-            "sed -i 'd/that wrong config/' gradle.properties",
-            "./gradlew compile",
-        ]
-        app['Builds'].append(build)
-        fdroidserver.metadata.write_yaml(mf, app)
-        mf.seek(0)
-        self.assertEqual(
-            mf.read(),
-            textwrap.dedent(
-                """\
-            Categories:
-              - None
-            License: Unknown
-
-            Builds:
-              - versionName: v1.2.3
-                versionCode: 102030
-                sudo:
-                  - apt-get update
-                  - apt-get install -y whatever
-                  - sed -i -e 's/<that attr="bad"/<that attr="good"/' ~/.whatever/config.xml
-                init:
-                  - bash generate_some_file.sh
-                  - sed -i -e 'g/what/ever/' /some/file
-                prebuild:
-                  - npm something
-                  - echo 'important setting' >> /a/file
-                build:
-                  - ./gradlew someSpecialTask
-                  - sed -i 'd/that wrong config/' gradle.properties
-                  - ./gradlew compile
-
-            AutoUpdateMode: None
-            UpdateCheckMode: None
-            """
-            ),
-        )
-
-    def test_write_yaml_build_antifeatures(self):
-        mf = io.StringIO()
-        app = metadata.App(
-            {
-                'License': 'Apache-2.0',
-                'Builds': [
-                    metadata.Build(
-                        {
-                            'versionCode': 102030,
-                            'versionName': 'v1.2.3',
-                            'gradle': ['yes'],
-                            'antifeatures': {
-                                'a': {},
-                                'b': {'de': 'Probe', 'en-US': 'test'},
-                            },
-                        }
-                    ),
-                ],
-                'id': 'placeholder',
-            }
-        )
-        metadata.write_yaml(mf, app)
-        mf.seek(0)
-        self.assertEqual(
-            mf.read(),
-            textwrap.dedent(
-                """\
-                License: Apache-2.0
-
-                Builds:
-                  - versionName: v1.2.3
-                    versionCode: 102030
-                    gradle:
-                      - yes
-                    antifeatures:
-                      a: {}
-                      b:
-                        de: Probe
-                        en-US: test
-                """
-            ),
-        )
-
-    def test_write_yaml_build_antifeatures_old_style(self):
-        mf = io.StringIO()
-        app = metadata.App(
-            {
-                'License': 'Apache-2.0',
-                'Builds': [
-                    metadata.Build(
-                        {
-                            'versionCode': 102030,
-                            'versionName': 'v1.2.3',
-                            'gradle': ['yes'],
-                            'antifeatures': {'b': {}, 'a': {}},
-                        }
-                    ),
-                ],
-                'id': 'placeholder',
-            }
-        )
-        metadata.write_yaml(mf, app)
-        mf.seek(0)
-        self.assertEqual(
-            mf.read(),
-            textwrap.dedent(
-                """\
-                License: Apache-2.0
-
-                Builds:
-                  - versionName: v1.2.3
-                    versionCode: 102030
-                    gradle:
-                      - yes
-                    antifeatures:
-                      - a
-                      - b
-                """
-            ),
-        )
-
-    def test_write_yaml_make_sure_provides_does_not_get_written(self):
-        mf = io.StringIO()
-        app = fdroidserver.metadata.App()
-        app.Categories = ['None']
-        app.Provides = 'this.is.deprecated'
-        app['Builds'] = []
-        build = fdroidserver.metadata.Build()
-        build.versionCode = 102030
-        build.versionName = 'v1.2.3'
-        build.gradle = ['yes']
-        app['Builds'].append(build)
-        fdroidserver.metadata.write_yaml(mf, app)
-        mf.seek(0)
-        self.assertEqual(
-            mf.read(),
-            textwrap.dedent(
-                """\
-                Categories:
-                  - None
-                License: Unknown
-
-                Builds:
-                  - versionName: v1.2.3
-                    versionCode: 102030
-                    gradle:
-                      - yes
-
-                AutoUpdateMode: None
-                UpdateCheckMode: None
-                """
-            ),
-        )
-
-    def test_parse_yaml_srclib_unknown_key(self):
-        with tempfile.TemporaryDirectory() as tmpdir, TmpCwd(tmpdir):
-            with Path('test.yml').open('w', encoding='utf-8') as f:
-                f.write(
-                    textwrap.dedent(
-                        '''\
-                        RepoType: git
-                        Repo: https://example.com/test.git
-                        Evil: I should not be here.
-                        '''
-                    )
-                )
-            with self.assertRaisesRegex(
-                MetaDataException,
-                "Invalid srclib metadata: unknown key 'Evil' in 'test.yml'",
-            ):
-                fdroidserver.metadata.parse_yaml_srclib(Path('test.yml'))
-
-    def test_parse_yaml_srclib_does_not_exists(self):
-        with self.assertRaisesRegex(
-            MetaDataException,
-            "Invalid scrlib metadata: "
-            r"'non(/|\\)existent-test-srclib.yml' "
-            "does not exist",
-        ):
-            fdroidserver.metadata.parse_yaml_srclib(
-                Path('non/existent-test-srclib.yml')
-            )
-
-    def test_parse_yaml_srclib_simple(self):
-        with tempfile.TemporaryDirectory() as tmpdir, TmpCwd(tmpdir):
-            with Path('simple.yml').open('w', encoding='utf-8') as f:
-                f.write(
-                    textwrap.dedent(
-                        '''\
-                    # this should be simple
-                    RepoType: git
-                    Repo: https://git.host/repo.git
-                    '''
-                    )
-                )
-            srclib = fdroidserver.metadata.parse_yaml_srclib(Path('simple.yml'))
-            self.assertDictEqual(
-                {
-                    'Repo': 'https://git.host/repo.git',
-                    'RepoType': 'git',
-                    'Subdir': None,
-                    'Prepare': None,
-                },
-                srclib,
-            )
-
-    def test_parse_yaml_srclib_simple_with_blanks(self):
-        with tempfile.TemporaryDirectory() as tmpdir, TmpCwd(tmpdir):
-            with Path('simple.yml').open('w', encoding='utf-8') as f:
-                f.write(
-                    textwrap.dedent(
-                        '''\
-                    # this should be simple
-
-                    RepoType: git
-
-                    Repo: https://git.host/repo.git
-
-                    Subdir:
-
-                    Prepare:
-                    '''
-                    )
-                )
-            srclib = fdroidserver.metadata.parse_yaml_srclib(Path('simple.yml'))
-            self.assertDictEqual(
-                {
-                    'Repo': 'https://git.host/repo.git',
-                    'RepoType': 'git',
-                    'Subdir': [''],
-                    'Prepare': [],
-                },
-                srclib,
-            )
-
-    def test_parse_yaml_srclib_Changelog_cketti(self):
-        with tempfile.TemporaryDirectory() as tmpdir, TmpCwd(tmpdir):
-            with Path('Changelog-cketti.yml').open('w', encoding='utf-8') as f:
-                f.write(
-                    textwrap.dedent(
-                        '''\
-                    RepoType: git
-                    Repo: https://github.com/cketti/ckChangeLog
-
-                    Subdir: library,ckChangeLog/src/main
-                    Prepare: "[ -f project.properties ] || echo 'source.dir=java' > ant.properties && echo -e 'android.library=true\\\\ntarget=android-19' > project.properties"
-                    '''
-                    )
-                )
-            srclib = fdroidserver.metadata.parse_yaml_srclib(
-                Path('Changelog-cketti.yml')
-            )
-            self.assertDictEqual(
-                srclib,
-                {
-                    'Repo': 'https://github.com/cketti/ckChangeLog',
-                    'RepoType': 'git',
-                    'Subdir': ['library', 'ckChangeLog/src/main'],
-                    'Prepare': [
-                        "[ -f project.properties ] || echo 'source.dir=java' > "
-                        "ant.properties && echo -e "
-                        "'android.library=true\\ntarget=android-19' > project.properties"
-                    ],
-                },
-            )
-
-    def test_read_srclibs_yml_subdir_list(self):
-        fdroidserver.metadata.srclibs = None
-        with tempfile.TemporaryDirectory() as tmpdir, TmpCwd(tmpdir):
-            Path('srclibs').mkdir()
-            with Path('srclibs/with-list.yml').open('w', encoding='utf-8') as f:
-                f.write(
-                    textwrap.dedent(
-                        '''\
-                    # this should be simple
-                    RepoType: git
-                    Repo: https://git.host/repo.git
-
-                    Subdir:
-                     - This is your last chance.
-                     - After this, there is no turning back.
-                     - You take the blue pill—the story ends,
-                     - you wake up in your bed
-                     - and believe whatever you want to believe.
-                     - You take the red pill—you stay in Wonderland
-                     - and I show you how deep the rabbit-hole goes.
-                    Prepare:
-                        There is a difference between knowing the path
-                        and walking the path.
-                    '''
-                    )
-                )
-            fdroidserver.metadata.read_srclibs()
-        self.maxDiff = None
-        self.assertDictEqual(
-            fdroidserver.metadata.srclibs,
-            {
-                'with-list': {
-                    'RepoType': 'git',
-                    'Repo': 'https://git.host/repo.git',
-                    'Subdir': [
-                        'This is your last chance.',
-                        'After this, there is no turning back.',
-                        'You take the blue pill—the story ends,',
-                        'you wake up in your bed',
-                        'and believe whatever you want to believe.',
-                        'You take the red pill—you stay in Wonderland',
-                        'and I show you how deep the rabbit-hole goes.',
-                    ],
-                    'Prepare': [
-                        'There is a difference between knowing the path '
-                        'and walking the path.'
-                    ],
-                }
-            },
-        )
-
-    def test_read_srclibs_yml_prepare_list(self):
-        fdroidserver.metadata.srclibs = None
-        with tempfile.TemporaryDirectory() as tmpdir, TmpCwd(tmpdir):
-            Path('srclibs').mkdir()
-            with Path('srclibs/with-list.yml').open('w', encoding='utf-8') as f:
-                f.write(
-                    textwrap.dedent(
-                        '''\
-                    # this should be simple
-                    RepoType: git
-                    Repo: https://git.host/repo.git
-
-                    Subdir:
-                    Prepare:
-                     - Many
-                     - invalid
-                     - commands
-                     - here.
-                    '''
-                    )
-                )
-            fdroidserver.metadata.read_srclibs()
-        self.maxDiff = None
-        self.assertDictEqual(
-            fdroidserver.metadata.srclibs,
-            {
-                'with-list': {
-                    'RepoType': 'git',
-                    'Repo': 'https://git.host/repo.git',
-                    'Subdir': [''],
-                    'Prepare': [
-                        'Many',
-                        'invalid',
-                        'commands',
-                        'here.',
-                    ],
-                }
-            },
-        )
-
-    def test_read_srclibs(self):
-        fdroidserver.metadata.srclibs = None
-        with tempfile.TemporaryDirectory() as tmpdir, TmpCwd(tmpdir):
-            Path('srclibs').mkdir()
-            with Path('srclibs/simple.yml').open('w', encoding='utf-8') as f:
-                f.write(
-                    textwrap.dedent(
-                        '''\
-                    RepoType: git
-                    Repo: https://git.host/repo.git
-                    '''
-                    )
-                )
-            with Path('srclibs/simple-wb.yml').open('w', encoding='utf-8') as f:
-                f.write(
-                    textwrap.dedent(
-                        '''\
-                    # this should be simple
-                    RepoType: git
-                    Repo: https://git.host/repo.git
-
-                    Subdir:
-                    Prepare:
-                    '''
-                    )
-                )
-            fdroidserver.metadata.read_srclibs()
-        self.assertDictEqual(
-            fdroidserver.metadata.srclibs,
-            {
-                'simple-wb': {
-                    'RepoType': 'git',
-                    'Repo': 'https://git.host/repo.git',
-                    'Subdir': [''],
-                    'Prepare': [],
-                },
-                'simple': {
-                    'RepoType': 'git',
-                    'Repo': 'https://git.host/repo.git',
-                    'Subdir': None,
-                    'Prepare': None,
-                },
-            },
-        )
-
-    def test_build_ndk_path(self):
-        with tempfile.TemporaryDirectory(prefix='android-sdk-') as sdk_path:
-            config = {'ndk_paths': {}, 'sdk_path': sdk_path}
-            fdroidserver.common.config = config
-
-            build = fdroidserver.metadata.Build()
-            build.ndk = 'r10e'
-            self.assertEqual('', build.ndk_path())
-
-            correct = '/fake/path/ndk/r21b'
-            config['ndk_paths'] = {'r21b': correct}
-            self.assertEqual('', build.ndk_path())
-            config['ndk_paths'] = {'r10e': correct}
-            self.assertEqual(correct, build.ndk_path())
-
-            r10e = '/fake/path/ndk/r10e'
-            r22b = '/fake/path/ndk/r22e'
-            config['ndk_paths'] = {'r10e': r10e, 'r22b': r22b}
-            self.assertEqual(r10e, build.ndk_path())
-
-            build.ndk = ['r10e', 'r22b']
-            self.assertEqual(r10e, build.ndk_path())
-
-            build.ndk = ['r22b', 'r10e']
-            self.assertEqual(r22b, build.ndk_path())
-
-    def test_build_ndk_path_only_accepts_str(self):
-        """Paths in the config must be strings, never pathlib.Path instances"""
-        config = {'ndk_paths': {'r24': Path('r24')}}
-        fdroidserver.common.config = config
-        build = fdroidserver.metadata.Build()
-        build.ndk = 'r24'
-        with self.assertRaises(TypeError):
-            build.ndk_path()
-
-    def test_del_duplicated_NoSourceSince(self):
-        app = {
-            'AntiFeatures': {'Ads': {}, 'NoSourceSince': {DEFAULT_LOCALE: '1.0'}},
-            'NoSourceSince': '1.0',
-        }
-        metadata._del_duplicated_NoSourceSince(app)
-        self.assertEqual(app, {'AntiFeatures': {'Ads': {}}, 'NoSourceSince': '1.0'})
-
-    def test_check_manually_extended_NoSourceSince(self):
-        app = {
-            'AntiFeatures': {'NoSourceSince': {DEFAULT_LOCALE: '1.0', 'de': '1,0'}},
-            'NoSourceSince': '1.0',
-        }
-        metadata._del_duplicated_NoSourceSince(app)
-        self.assertEqual(
-            app,
-            {
-                'AntiFeatures': {'NoSourceSince': {DEFAULT_LOCALE: '1.0', 'de': '1,0'}},
-                'NoSourceSince': '1.0',
-            },
-        )
-
-    def test_make_sure_nosourcesince_does_not_get_written(self):
-        appid = 'com.politedroid'
-        app = metadata.read_metadata({appid: -1})[appid]
-        builds = app['Builds']
-        app['Builds'] = [copy.deepcopy(builds[0])]
-        mf = io.StringIO()
-        metadata.write_yaml(mf, app)
-        mf.seek(0)
-        self.maxDiff = None
-        self.assertEqual(
-            mf.read(),
-            textwrap.dedent(
-                """\
-                AntiFeatures:
-                  - NonFreeNet
-                Categories:
-                  - Multimedia
-                  - Security
-                  - Time
-                License: GPL-3.0-only
-                SourceCode: https://github.com/miguelvps/PoliteDroid
-                IssueTracker: https://github.com/miguelvps/PoliteDroid/issues
-
-                AutoName: Polite Droid
-                Summary: Calendar tool
-                Description: Activates silent mode during calendar events.
-
-                RepoType: git
-                Repo: https://github.com/miguelvps/PoliteDroid.git
-
-                Builds:
-                  - versionName: '1.2'
-                    versionCode: 3
-                    commit: 6a548e4b19
-                    target: android-10
-                    antifeatures:
-                      - KnownVuln
-                      - NonFreeAssets
-
-                ArchivePolicy: 4
-                AutoUpdateMode: Version v%v
-                UpdateCheckMode: Tags
-                CurrentVersion: '1.5'
-                CurrentVersionCode: 6
-
-                NoSourceSince: '1.5'
-                """
-            ),
-        )
-
-    def test_app_to_yaml_smokecheck(self):
-        self.assertTrue(
-            isinstance(metadata._app_to_yaml(dict()), ruamel.yaml.comments.CommentedMap)
-        )
-
-    def test_app_to_yaml_build_list_empty(self):
-        app = metadata.App({'Builds': [metadata.Build({'rm': []})]})
-        self.assertEqual(dict(), metadata._app_to_yaml(app)['Builds'][0])
-
-    def test_app_to_yaml_build_list_one(self):
-        app = metadata.App({'Builds': [metadata.Build({'rm': ['one']})]})
-        self.assertEqual({'rm': ['one']}, metadata._app_to_yaml(app)['Builds'][0])
-
-    def test_app_to_yaml_build_list_two(self):
-        app = metadata.App({'Builds': [metadata.Build({'rm': ['1', '2']})]})
-        self.assertEqual({'rm': ['1', '2']}, metadata._app_to_yaml(app)['Builds'][0])
-
-    def test_app_to_yaml_build_list(self):
-        app = metadata.App({'Builds': [metadata.Build({'rm': ['b2', 'NO1']})]})
-        self.assertEqual({'rm': ['b2', 'NO1']}, metadata._app_to_yaml(app)['Builds'][0])
-
-    def test_app_to_yaml_AllowedAPKSigningKeys_two(self):
-        cm = metadata._app_to_yaml(metadata.App({'AllowedAPKSigningKeys': ['b', 'A']}))
-        self.assertEqual(['b', 'a'], cm['AllowedAPKSigningKeys'])
-
-    def test_app_to_yaml_AllowedAPKSigningKeys_one(self):
-        cm = metadata._app_to_yaml(metadata.App({'AllowedAPKSigningKeys': ['One']}))
-        self.assertEqual('one', cm['AllowedAPKSigningKeys'])
-
-    def test_app_to_yaml_int_hex(self):
-        cm = metadata._app_to_yaml(metadata.App({'CurrentVersionCode': 0xFF}))
-        self.assertEqual(255, cm['CurrentVersionCode'])
-
-    def test_app_to_yaml_int_underscore(self):
-        cm = metadata._app_to_yaml(metadata.App({'CurrentVersionCode': 1_2_3}))
-        self.assertEqual(123, cm['CurrentVersionCode'])
-
-    def test_app_to_yaml_int_0(self):
-        """Document that 0 values fail to make it through."""
-        # TODO it should be possible to use `CurrentVersionCode: 0`
-        cm = metadata._app_to_yaml(metadata.App({'CurrentVersionCode': 0}))
-        self.assertFalse('CurrentVersionCode' in cm)
-
-    def test_format_multiline(self):
-        self.assertEqual(metadata._format_multiline('description'), 'description')
-
-    def test_format_multiline_empty(self):
-        self.assertEqual(metadata._format_multiline(''), '')
-
-    def test_format_multiline_newline_char(self):
-        self.assertEqual(metadata._format_multiline('one\\ntwo'), 'one\\ntwo')
-
-    def test_format_multiline_newlines(self):
-        self.assertEqual(
-            metadata._format_multiline(
-                textwrap.dedent(
-                    """
-                    one
-                    two
-                    three
-                    """
-                )
-            ),
-            '\none\ntwo\nthree\n',
-        )
-
-    def test_format_list_empty(self):
-        self.assertEqual(metadata._format_list(['', None]), list())
-
-    def test_format_list_one_empty(self):
-        self.assertEqual(metadata._format_list(['foo', None]), ['foo'])
-
-    def test_format_list_two(self):
-        self.assertEqual(metadata._format_list(['2', '1']), ['2', '1'])
-
-    def test_format_list_newline(self):
-        self.assertEqual(metadata._format_list(['one\ntwo']), ['one\ntwo'])
-
-    def test_format_list_newline_char(self):
-        self.assertEqual(metadata._format_list(['one\\ntwo']), ['one\\ntwo'])
-
-    def test_format_script_empty(self):
-        self.assertEqual(metadata._format_script(['', None]), list())
-
-    def test_format_script_newline(self):
-        self.assertEqual(metadata._format_script(['one\ntwo']), 'one\ntwo')
-
-    def test_format_script_newline_char(self):
-        self.assertEqual(metadata._format_script(['one\\ntwo']), 'one\\ntwo')
-
-    def test_format_stringmap_empty(self):
-        self.assertEqual(
-            metadata._format_stringmap('🔥', 'test', dict()),
-            list(),
-        )
-
-    def test_format_stringmap_one_list(self):
-        self.assertEqual(
-            metadata._format_stringmap('🔥', 'test', {'Tracking': {}, 'Ads': {}}),
-            ['Ads', 'Tracking'],
-        )
-
-    def test_format_stringmap_one_list_empty_desc(self):
-        self.assertEqual(
-            metadata._format_stringmap('🔥', 'test', {'NonFree': {}, 'Ads': {'en': ''}}),
-            ['Ads', 'NonFree'],
-        )
-
-    def test_format_stringmap_three_list(self):
-        self.assertEqual(
-            metadata._format_stringmap('🔥', 'test', {'B': {}, 'A': {}, 'C': {}}),
-            ['A', 'B', 'C'],
-        )
-
-    def test_format_stringmap_two_dict(self):
-        self.assertEqual(
-            metadata._format_stringmap('🔥', 'test', {'1': {'uz': 'a'}, '2': {}}),
-            {'1': {'uz': 'a'}, '2': {}},
-        )
-
-    def test_format_stringmap_three_locales(self):
-        self.assertEqual(
-            metadata._format_stringmap(
-                '🔥', 'test', {'AF': {'uz': 'a', 'ko': 'b', 'zh': 'c'}}
-            ),
-            {'AF': {'ko': 'b', 'uz': 'a', 'zh': 'c'}},
-        )
-
-    def test_format_stringmap_move_build_antifeatures_to_filesystem(self):
-        os.chdir(self.testdir)
-        appid = 'a'
-        yml = Path('metadata/a.yml')
-        yml.parent.mkdir()
-        self.assertEqual(
-            metadata._format_stringmap(
-                appid, 'antifeatures', {'AF': {'uz': 'a', 'ko': 'b', 'zh': 'c'}}
-            ),
-            {'AF': {'ko': 'b', 'uz': 'a', 'zh': 'c'}},
-        )
-
-    def test_format_stringmap_app_antifeatures_conflict(self):
-        """Raise an error if a YAML Anti-Feature conflicts with a localized file."""
-        os.chdir(self.testdir)
-        appid = 'a'
-        field = 'AntiFeatures'
-        locale = 'ko'
-        yml = Path('metadata/a.yml')
-        antifeatures_ko = yml.parent / appid / locale / field.lower()
-        antifeatures_ko.mkdir(parents=True)
-        afname = 'Anti-🔥'
-        (antifeatures_ko / (afname + '.txt')).write_text('SOMETHING ELSE')
-        with self.assertRaises(MetaDataException):
-            metadata._format_stringmap(
-                appid, field, {afname: {'uz': 'a', locale: 'b', 'zh': 'c'}}
-            )
-
-    def test_format_stringmap_app_antifeatures_conflict_same_contents(self):
-        """Raise an error if a YAML Anti-Feature conflicts with a localized file."""
-        os.chdir(self.testdir)
-        appid = 'a'
-        field = 'AntiFeatures'
-        locale = 'ko'
-        yml = Path('metadata/a.yml')
-        antifeatures_ko = yml.parent / appid / locale / field.lower()
-        antifeatures_ko.mkdir(parents=True)
-        afname = 'Anti-🔥'
-        (antifeatures_ko / (afname + '.txt')).write_text('b')
-        metadata._format_stringmap(
-            appid, field, {afname: {'uz': 'a', locale: 'b', 'zh': 'c'}}
-        )
-
-    def test_format_stringmap_build_antifeatures_conflict(self):
-        """Raise an error if a YAML Anti-Feature conflicts with a localized file."""
-        os.chdir(self.testdir)
-        appid = 'a'
-        field = 'antifeatures'
-        locale = 'ko'
-        versionCode = 123
-        yml = Path('metadata/a.yml')
-        antifeatures_ko = yml.parent / appid / locale / field.lower()
-        antifeatures_ko.mkdir(parents=True)
-        afname = 'Anti-🔥'
-        with (antifeatures_ko / ('%d_%s.txt' % (versionCode, afname))).open('w') as fp:
-            fp.write('SOMETHING ELSE')
-        with self.assertRaises(MetaDataException):
-            metadata._format_stringmap(
-                appid, field, {afname: {'uz': 'a', locale: 'b', 'zh': 'c'}}, versionCode
-            )
-
-    def test_app_to_yaml_one_category(self):
-        """Categories does not get simplified to string when outputting YAML."""
-        self.assertEqual(
-            metadata._app_to_yaml({'Categories': ['one']}),
-            {'Categories': ['one']},
-        )
-
-    def test_app_to_yaml_categories(self):
-        """Sort case-insensitive before outputting YAML."""
-        self.assertEqual(
-            metadata._app_to_yaml({'Categories': ['c', 'a', 'B']}),
-            {'Categories': ['a', 'B', 'c']},
-        )
-
-    def test_builds_to_yaml_gradle_yes(self):
-        app = {'Builds': [{'versionCode': 0, 'gradle': ['yes']}]}
-        self.assertEqual(
-            metadata._builds_to_yaml(app), [{'versionCode': 0, 'gradle': ['yes']}]
-        )
-
-    def test_builds_to_yaml_gradle_off(self):
-        app = {'Builds': [{'versionCode': 0, 'gradle': ['off']}]}
-        self.assertEqual(
-            metadata._builds_to_yaml(app), [{'versionCode': 0, 'gradle': ['off']}]
-        )
-
-    def test_builds_to_yaml_gradle_true(self):
-        app = {'Builds': [{'versionCode': 0, 'gradle': ['true']}]}
-        self.assertEqual(
-            metadata._builds_to_yaml(app), [{'versionCode': 0, 'gradle': ['true']}]
-        )
-
-    def test_builds_to_yaml_gradle_false(self):
-        app = {'Builds': [{'versionCode': 0, 'gradle': ['false']}]}
-        self.assertEqual(
-            metadata._builds_to_yaml(app), [{'versionCode': 0, 'gradle': ['false']}]
-        )
-
-    def test_builds_to_yaml_stripped(self):
-        self.assertEqual(
-            metadata._builds_to_yaml(
-                {
-                    'Builds': [
-                        metadata.Build({'versionCode': 0, 'rm': [None], 'init': ['']})
-                    ]
-                }
-            ),
-            [{'versionCode': 0}],
-        )
-
-    def test_builds_to_yaml(self):
-        """Include one of each flag type with a valid value."""
-        app = {
-            'Builds': [
-                metadata.Build(
-                    {
-                        'versionCode': 0,
-                        'gradle': ['free'],
-                        'rm': ['0', '2'],
-                        'submodules': True,
-                        'timeout': 0,
-                        'init': ['false', 'two'],
-                    }
-                )
-            ]
-        }
-        # check that metadata.Build() inited flag values
-        self.assertEqual(app['Builds'][0]['scanignore'], list())
-        # then unchanged values should be removed by _builds_to_yaml
-        self.assertEqual(
-            metadata._builds_to_yaml(app),
-            [
-                {
-                    'versionCode': 0,
-                    'gradle': ['free'],
-                    'rm': ['0', '2'],
-                    'submodules': True,
-                    'timeout': 0,
-                    'init': ['false', 'two'],
-                }
-            ],
-        )
-
-
-class PostMetadataParseTest(unittest.TestCase):
-    """Test the functions that post process the YAML input.
-
-    The following series of "post_metadata_parse" tests map out the
-    current state of automatic type conversion in the YAML post
-    processing.  They are not necessary a statement of how things
-    should be, but more to surface the details of it functions.
-
-    """
-
-    def setUp(self):
-        fdroidserver.metadata.warnings_action = 'error'
-
-    def _post_metadata_parse_app_int(self, from_yaml, expected):
-        app = {'ArchivePolicy': from_yaml}
-        metadata.post_parse_yaml_metadata(app)
-        return {'ArchivePolicy': expected}, app
-
-    def _post_metadata_parse_app_list(self, from_yaml, expected):
-        app = {'AllowedAPKSigningKeys': from_yaml}
-        metadata.post_parse_yaml_metadata(app)
-        return {'AllowedAPKSigningKeys': expected}, app
-
-    def _post_metadata_parse_app_string(self, from_yaml, expected):
-        app = {'Repo': from_yaml}
-        metadata.post_parse_yaml_metadata(app)
-        return {'Repo': expected}, app
-
-    def _post_metadata_parse_build_bool(self, from_yaml, expected):
-        tested_key = 'submodules'
-        app = {'Builds': [{'versionCode': 1, tested_key: from_yaml}]}
-        post = copy.deepcopy(app)
-        metadata.post_parse_yaml_metadata(post)
-        del app['Builds'][0]['versionCode']
-        del post['Builds'][0]['versionCode']
-        for build in post['Builds']:
-            for k in list(build):
-                if k != tested_key:
-                    del build[k]
-        app['Builds'][0][tested_key] = expected
-        return app, post
-
-    def _post_metadata_parse_build_int(self, from_yaml, expected):
-        tested_key = 'versionCode'
-        app = {'Builds': [{'versionCode': from_yaml}]}
-        post = copy.deepcopy(app)
-        metadata.post_parse_yaml_metadata(post)
-        for build in post['Builds']:
-            for k in list(build):
-                if k != tested_key:
-                    del build[k]
-        app['Builds'][0][tested_key] = expected
-        return app, post
-
-    def _post_metadata_parse_build_list(self, from_yaml, expected):
-        tested_key = 'rm'
-        app = {'Builds': [{'versionCode': 1, tested_key: from_yaml}]}
-        post = copy.deepcopy(app)
-        metadata.post_parse_yaml_metadata(post)
-        del app['Builds'][0]['versionCode']
-        del post['Builds'][0]['versionCode']
-        for build in post['Builds']:
-            for k in list(build):
-                if k != tested_key:
-                    del build[k]
-        app['Builds'][0][tested_key] = expected
-        return app, post
-
-    def _post_metadata_parse_build_script(self, from_yaml, expected):
-        tested_key = 'build'
-        app = {'Builds': [{'versionCode': 1, tested_key: from_yaml}]}
-        post = copy.deepcopy(app)
-        metadata.post_parse_yaml_metadata(post)
-        del app['Builds'][0]['versionCode']
-        del post['Builds'][0]['versionCode']
-        for build in post['Builds']:
-            for k in list(build):
-                if k != tested_key:
-                    del build[k]
-        app['Builds'][0][tested_key] = expected
-        return app, post
-
-    def _post_metadata_parse_build_string(self, from_yaml, expected):
-        tested_key = 'commit'
-        app = {'Builds': [{'versionCode': 1, tested_key: from_yaml}]}
-        post = copy.deepcopy(app)
-        metadata.post_parse_yaml_metadata(post)
-        del app['Builds'][0]['versionCode']
-        del post['Builds'][0]['versionCode']
-        for build in post['Builds']:
-            for k in list(build):
-                if k != tested_key:
-                    del build[k]
-        app['Builds'][0][tested_key] = expected
-        return app, post
-
-    def test_post_metadata_parse_none(self):
-        """Run None aka YAML null or blank through the various field and flag types."""
-        self.assertEqual(*self._post_metadata_parse_app_int(None, None))
-        self.assertEqual(*self._post_metadata_parse_app_list(None, None))
-        self.assertEqual(*self._post_metadata_parse_app_string(None, None))
-        self.assertEqual(*self._post_metadata_parse_build_bool(None, None))
-        self.assertEqual(*self._post_metadata_parse_build_int(None, None))
-        self.assertEqual(*self._post_metadata_parse_build_list(None, None))
-        self.assertEqual(*self._post_metadata_parse_build_script(None, None))
-        self.assertEqual(*self._post_metadata_parse_build_string(None, None))
-
-    def test_post_metadata_parse_int(self):
-        """Run the int 123456 through the various field and flag types."""
-        self.assertEqual(*self._post_metadata_parse_app_int(123456, 123456))
-        self.assertEqual(*self._post_metadata_parse_app_list(123456, ['123456']))
-        self.assertEqual(*self._post_metadata_parse_app_string(123456, '123456'))
-        self.assertEqual(*self._post_metadata_parse_build_bool(123456, True))
-        self.assertEqual(*self._post_metadata_parse_build_int(123456, 123456))
-        self.assertEqual(*self._post_metadata_parse_build_list(123456, ['123456']))
-        self.assertEqual(*self._post_metadata_parse_build_script(123456, ['123456']))
-        self.assertEqual(*self._post_metadata_parse_build_string(123456, '123456'))
-
-    def test_post_metadata_parse_sha256(self):
-        """Run a SHA-256 that YAML calls an int through the various types.
-
-        The current f-droid.org signer set has SHA-256 values with a
-        maximum of two leading zeros, but this will handle more.
-
-        """
-        str_sha256 = '0000000000000498456908409534729834729834729834792837487293847926'
-        sha256 = yaml.load('a: ' + str_sha256)['a']
-        self.assertEqual(*self._post_metadata_parse_app_int(sha256, int(str_sha256)))
-        self.assertEqual(*self._post_metadata_parse_app_list(sha256, [str_sha256]))
-        self.assertEqual(*self._post_metadata_parse_app_string(sha256, str_sha256))
-        self.assertEqual(*self._post_metadata_parse_build_bool(sha256, True))
-        self.assertEqual(*self._post_metadata_parse_build_int(sha256, sha256))
-        self.assertEqual(*self._post_metadata_parse_build_list(sha256, [str_sha256]))
-        self.assertEqual(*self._post_metadata_parse_build_script(sha256, [str_sha256]))
-        self.assertEqual(*self._post_metadata_parse_build_string(sha256, str_sha256))
-
-    def test_post_metadata_parse_int_0(self):
-        """Run the int 0 through the various field and flag types."""
-        self.assertEqual(*self._post_metadata_parse_app_int(0, 0))
-        self.assertEqual(*self._post_metadata_parse_app_list(0, ['0']))
-        self.assertEqual(*self._post_metadata_parse_app_string(0, '0'))
-        self.assertEqual(*self._post_metadata_parse_build_bool(0, False))
-        self.assertEqual(*self._post_metadata_parse_build_int(0, 0))
-        self.assertEqual(*self._post_metadata_parse_build_list(0, ['0']))
-        self.assertEqual(*self._post_metadata_parse_build_script(0, ['0']))
-        self.assertEqual(*self._post_metadata_parse_build_string(0, '0'))
-
-    def test_post_metadata_parse_float_0_0(self):
-        """Run the float 0.0 through the various field and flag types."""
-        with self.assertRaises(MetaDataException):
-            self._post_metadata_parse_app_int(0.0, MetaDataException)
-        self.assertEqual(*self._post_metadata_parse_app_list(0.0, ['0.0']))
-        self.assertEqual(*self._post_metadata_parse_app_string(0.0, '0.0'))
-        self.assertEqual(*self._post_metadata_parse_build_bool(0.0, False))
-        with self.assertRaises(MetaDataException):
-            self._post_metadata_parse_build_int(0.0, MetaDataException)
-        self.assertEqual(*self._post_metadata_parse_build_list(0.0, ['0.0']))
-        self.assertEqual(*self._post_metadata_parse_build_script(0.0, ['0.0']))
-        self.assertEqual(*self._post_metadata_parse_build_string(0.0, '0.0'))
-
-    def test_post_metadata_parse_float_0_1(self):
-        """Run the float 0.1 through the various field and flag types."""
-        with self.assertRaises(MetaDataException):
-            self._post_metadata_parse_app_int(0.1, MetaDataException)
-        self.assertEqual(*self._post_metadata_parse_app_list(0.1, ['0.1']))
-        self.assertEqual(*self._post_metadata_parse_app_string(0.1, '0.1'))
-        self.assertEqual(*self._post_metadata_parse_build_bool(0.1, True))
-        with self.assertRaises(MetaDataException):
-            self._post_metadata_parse_build_int(0.1, MetaDataException)
-        self.assertEqual(*self._post_metadata_parse_build_list(0.1, ['0.1']))
-        self.assertEqual(*self._post_metadata_parse_build_script(0.1, ['0.1']))
-        self.assertEqual(*self._post_metadata_parse_build_string(0.1, '0.1'))
-
-    def test_post_metadata_parse_float_1_0(self):
-        """Run the float 1.0 through the various field and flag types."""
-        with self.assertRaises(MetaDataException):
-            self._post_metadata_parse_app_int(1.0, MetaDataException)
-        self.assertEqual(*self._post_metadata_parse_app_list(1.0, ['1.0']))
-        self.assertEqual(*self._post_metadata_parse_app_string(1.0, '1.0'))
-        self.assertEqual(*self._post_metadata_parse_build_bool(1.0, True))
-        with self.assertRaises(MetaDataException):
-            self._post_metadata_parse_build_int(1.0, MetaDataException)
-        self.assertEqual(*self._post_metadata_parse_build_list(1.0, ['1.0']))
-        self.assertEqual(*self._post_metadata_parse_build_script(1.0, ['1.0']))
-        self.assertEqual(*self._post_metadata_parse_build_string(1.0, '1.0'))
-
-    def test_post_metadata_parse_empty_list(self):
-        with self.assertRaises(MetaDataException):
-            self._post_metadata_parse_app_int(list(), MetaDataException)
-        self.assertEqual(*self._post_metadata_parse_app_list(list(), list()))
-        self.assertEqual(*self._post_metadata_parse_app_string(list(), list()))
-        self.assertEqual(*self._post_metadata_parse_build_bool(list(), False))
-        with self.assertRaises(MetaDataException):
-            self._post_metadata_parse_build_int(list(), MetaDataException)
-        self.assertEqual(*self._post_metadata_parse_build_list(list(), list()))
-        self.assertEqual(*self._post_metadata_parse_build_script(list(), list()))
-        self.assertEqual(*self._post_metadata_parse_build_string(list(), list()))
-
-    def test_post_metadata_parse_set_of_1(self):
-        with self.assertRaises(MetaDataException):
-            self._post_metadata_parse_app_int({1}, MetaDataException)
-        self.assertEqual(*self._post_metadata_parse_app_list({1}, ['1']))
-        self.assertEqual(*self._post_metadata_parse_app_string({1}, '{1}'))
-        self.assertEqual(*self._post_metadata_parse_build_bool({1}, True))
-        with self.assertRaises(MetaDataException):
-            self._post_metadata_parse_build_int({1}, MetaDataException)
-        self.assertEqual(*self._post_metadata_parse_build_list({1}, ['1']))
-        self.assertEqual(*self._post_metadata_parse_build_script({1}, ['1']))
-        self.assertEqual(*self._post_metadata_parse_build_string({1}, '{1}'))
-
-    def test_post_metadata_parse_empty_dict(self):
-        with self.assertRaises(MetaDataException):
-            self._post_metadata_parse_app_int(dict(), MetaDataException)
-        self.assertEqual(*self._post_metadata_parse_app_list(dict(), dict()))
-        self.assertEqual(*self._post_metadata_parse_app_string(dict(), dict()))
-        self.assertEqual(*self._post_metadata_parse_build_bool(dict(), False))
-        with self.assertRaises(MetaDataException):
-            self._post_metadata_parse_build_int(dict(), MetaDataException)
-        self.assertEqual(*self._post_metadata_parse_build_list(dict(), dict()))
-        self.assertEqual(*self._post_metadata_parse_build_script(dict(), dict()))
-        self.assertEqual(*self._post_metadata_parse_build_string(dict(), dict()))
-
-    def test_post_metadata_parse_list_int_string(self):
-        with self.assertRaises(MetaDataException):
-            self._post_metadata_parse_app_int([1, 'a'], MetaDataException)
-        self.assertEqual(*self._post_metadata_parse_app_list([1, 'a'], ['1', 'a']))
-        self.assertEqual(*self._post_metadata_parse_app_string([1, 'a'], "[1, 'a']"))
-        self.assertEqual(*self._post_metadata_parse_build_bool([1, 'a'], True))
-        with self.assertRaises(MetaDataException):
-            self._post_metadata_parse_build_int([1, 'a'], MetaDataException)
-        self.assertEqual(*self._post_metadata_parse_build_list([1, 'a'], ['1', 'a']))
-        self.assertEqual(*self._post_metadata_parse_build_script([1, 'a'], ['1', 'a']))
-        self.assertEqual(*self._post_metadata_parse_build_string([1, 'a'], "[1, 'a']"))
-
-    def test_post_metadata_parse_dict_int_string(self):
-        with self.assertRaises(MetaDataException):
-            self._post_metadata_parse_app_int({'k': 1}, MetaDataException)
-        with self.assertRaises(MetaDataException):
-            self._post_metadata_parse_app_list({'k': 1}, MetaDataException)
-        self.assertEqual(*self._post_metadata_parse_app_string({'k': 1}, "{'k': 1}"))
-        self.assertEqual(*self._post_metadata_parse_build_bool({'k': 1}, True))
-        with self.assertRaises(MetaDataException):
-            self._post_metadata_parse_build_int({'k': 1}, MetaDataException)
-        with self.assertRaises(MetaDataException):
-            self._post_metadata_parse_build_list({'k': 1}, MetaDataException)
-        with self.assertRaises(MetaDataException):
-            self._post_metadata_parse_build_script({'k': 1}, MetaDataException)
-        self.assertEqual(*self._post_metadata_parse_build_string({'k': 1}, "{'k': 1}"))
-
-    def test_post_metadata_parse_false(self):
-        with self.assertRaises(MetaDataException):
-            self._post_metadata_parse_app_int(False, MetaDataException)
-        self.assertEqual(*self._post_metadata_parse_app_list(False, ['false']))
-        self.assertEqual(*self._post_metadata_parse_app_string(False, 'false'))
-        self.assertEqual(*self._post_metadata_parse_build_bool(False, False))
-        with self.assertRaises(MetaDataException):
-            self._post_metadata_parse_build_int(False, MetaDataException)
-        self.assertEqual(*self._post_metadata_parse_build_list(False, ['false']))
-        self.assertEqual(*self._post_metadata_parse_build_script(False, ['false']))
-        self.assertEqual(*self._post_metadata_parse_build_string(False, 'false'))
-
-    def test_post_metadata_parse_true(self):
-        with self.assertRaises(MetaDataException):
-            self._post_metadata_parse_app_int(True, MetaDataException)
-        self.assertEqual(*self._post_metadata_parse_app_list(True, ['true']))
-        self.assertEqual(*self._post_metadata_parse_app_string(True, 'true'))
-        self.assertEqual(*self._post_metadata_parse_build_bool(True, True))
-        with self.assertRaises(MetaDataException):
-            self._post_metadata_parse_build_int(True, MetaDataException)
-        self.assertEqual(*self._post_metadata_parse_build_list(True, ['true']))
-        self.assertEqual(*self._post_metadata_parse_build_script(True, ['true']))
-        self.assertEqual(*self._post_metadata_parse_build_string(True, 'true'))
diff --git a/tests/test_net.py b/tests/test_net.py
deleted file mode 100755
index beacd9af..00000000
--- a/tests/test_net.py
+++ /dev/null
@@ -1,146 +0,0 @@
-#!/usr/bin/env python3
-
-import os
-import random
-import socket
-import tempfile
-import threading
-import time
-import unittest
-from pathlib import Path
-from unittest.mock import MagicMock, patch
-
-import requests
-
-from fdroidserver import net
-
-
-class RetryServer:
-    """A stupid simple HTTP server that can fail to connect.
-
-    Proxy settings via environment variables can interfere with this
-    test. The requests library will automatically pick up proxy
-    settings from environment variables. Proxy settings can force the
-    local connection over the proxy, which might not support that,
-    then this fails with an error like 405 or others.
-
-    """
-
-    def __init__(self, port=None, failures=3):
-        self.port = port
-        if self.port is None:
-            self.port = random.randint(1024, 65535)  # nosec B311
-        self.failures = failures
-        self.stop_event = threading.Event()
-        threading.Thread(target=self.run_fake_server).start()
-
-    def stop(self):
-        self.stop_event.set()
-
-    def run_fake_server(self):
-        addr = ('localhost', self.port)
-        # localhost might not be a valid name for all families, use the first available
-        family = socket.getaddrinfo(addr[0], addr[1], type=socket.SOCK_STREAM)[0][0]
-        server_sock = socket.create_server(addr, family=family)
-        server_sock.listen(5)
-        server_sock.settimeout(5)
-        time.sleep(0.001)  # wait for it to start
-
-        while not self.stop_event.is_set():
-            self.failures -= 1
-            conn = None
-            try:
-                conn, address = server_sock.accept()
-                conn.settimeout(5)
-            except TimeoutError:
-                break
-            if self.failures > 0:
-                conn.close()
-                continue
-            conn.recv(8192)  # request ignored
-            self.reply = b"""HTTP/1.1 200 OK
-                Date: Mon, 26 Feb 2024 09:00:14 GMT
-                Connection: close
-                Content-Type: text/html
-
-                <HTML><BODY>Hello World!</HEAD></HTML>
-                """
-            self.reply = self.reply.replace(b'                ', b'')  # dedent
-            conn.sendall(self.reply)
-            conn.shutdown(socket.SHUT_RDWR)
-            conn.close()
-
-            self.stop_event.wait(timeout=1)
-        server_sock.shutdown(socket.SHUT_RDWR)
-        server_sock.close()
-
-
-class NetTest(unittest.TestCase):
-    def setUp(self):
-        self.tempdir = tempfile.TemporaryDirectory()
-        os.chdir(self.tempdir.name)
-        Path('tmp').mkdir()
-
-    def tearDown(self):
-        self.tempdir.cleanup()
-
-    @patch('requests.get')
-    def test_download_file_url_parsing(self, requests_get):
-        # pylint: disable=unused-argument
-        def _get(url, stream, allow_redirects, headers, timeout):
-            return MagicMock()
-
-        requests_get.side_effect = _get
-        f = net.download_file('https://f-droid.org/repo/entry.jar', retries=0)
-        requests_get.assert_called()
-        self.assertTrue(os.path.exists(f))
-        self.assertEqual('tmp/entry.jar', f)
-
-        f = net.download_file(
-            'https://d-05.example.com/custom/com.downloader.aegis-3175421.apk?_fn=QVBLUHVyZV92My4xNy41NF9hcGtwdXJlLmNvbS5hcGs&_p=Y29tLmFwa3B1cmUuYWVnb24&am=6avvTpfJ1dMl9-K6JYKzQw&arg=downloader%3A%2F%2Fcampaign%2F%3Futm_medium%3Ddownloader%26utm_source%3Daegis&at=1652080635&k=1f6e58465df3a441665e585719ab0b13627a117f&r=https%3A%2F%2Fdownloader.com%2Fdownloader-app.html%3Ficn%3Daegis%26ici%3Dimage_qr&uu=http%3A%2F%2F172.16.82.1%2Fcustom%2Fcom.downloader.aegis-3175421.apk%3Fk%3D3fb9c4ae0be578206f6a1c330736fac1627a117f',
-            retries=0,
-        )
-        self.assertTrue(requests_get.called)
-        self.assertTrue(os.path.exists(f))
-        self.assertEqual('tmp/com.downloader.aegis-3175421.apk', f)
-
-    @patch.dict(os.environ, clear=True)
-    def test_download_file_retries(self):
-        server = RetryServer()
-        f = net.download_file('http://localhost:%d/f.txt' % server.port)
-        # strip the HTTP headers and compare the reply
-        self.assertEqual(server.reply.split(b'\n\n')[1], Path(f).read_bytes())
-        server.stop()
-
-    @patch.dict(os.environ, clear=True)
-    def test_download_file_retries_not_forever(self):
-        """The retry logic should eventually exit with an error."""
-        server = RetryServer(failures=5)
-        with self.assertRaises(requests.exceptions.ConnectionError):
-            net.download_file('http://localhost:%d/f.txt' % server.port)
-        server.stop()
-
-    @unittest.skipIf(os.getenv('CI'), 'FIXME this fails mysteriously only in GitLab CI')
-    @patch.dict(os.environ, clear=True)
-    def test_download_using_mirrors_retries(self):
-        server = RetryServer()
-        f = net.download_using_mirrors(
-            [
-                'https://fake.com/f.txt',  # 404 or 301 Redirect
-                'https://httpbin.org/status/403',
-                'https://httpbin.org/status/500',
-                'http://localhost:1/f.txt',  # ConnectionError
-                'http://localhost:%d/should-succeed' % server.port,
-            ],
-        )
-        # strip the HTTP headers and compare the reply
-        self.assertEqual(server.reply.split(b'\n\n')[1], Path(f).read_bytes())
-        server.stop()
-
-    @patch.dict(os.environ, clear=True)
-    def test_download_using_mirrors_retries_not_forever(self):
-        """The retry logic should eventually exit with an error."""
-        server = RetryServer(failures=5)
-        with self.assertRaises(requests.exceptions.ConnectionError):
-            net.download_using_mirrors(['http://localhost:%d/' % server.port])
-        server.stop()
diff --git a/tests/test_nightly.py b/tests/test_nightly.py
deleted file mode 100755
index fb1614b7..00000000
--- a/tests/test_nightly.py
+++ /dev/null
@@ -1,372 +0,0 @@
-#!/usr/bin/env python3
-
-import os
-import platform
-import shutil
-import subprocess
-import tempfile
-import time
-import unittest
-from pathlib import Path
-from unittest.mock import patch
-
-import requests
-import yaml
-
-from fdroidserver import common, exception, index, nightly
-
-DEBUG_KEYSTORE = '/u3+7QAAAAIAAAABAAAAAQAPYW5kcm9pZGRlYnVna2V5AAABNYhAuskAAAK8MIICuDAOBgorBgEEASoCEQEBBQAEggKkqRnFlhidQmVff83bsAeewXPIsF0jiymzJnvrnUAQtCK0MV9uZonu37Mrj/qKLn56mf6QcvEoKvpCstZxzftgYYpAHWMVLM+hy2Z707QZEHlY7Ukppt8DItj+dXkeqGt7f8KzOb2AQwDbt9lm1fJb+MefLowTaubtvrLMcKIne43CbCu2D8HyN7RPWpEkVetA2Qgr5W4sa3tIUT80afqo9jzwJjKCspuxY9A1M8EIM3/kvyLo2B9r0cuWwRjYZXJ6gmTYI2ARNz0KQnCZUok14NDg+mZTb1B7AzRfb0lfjbA6grbzuAL+WaEpO8/LgGfuOh7QBZBT498TElOaFfQ9toQWA79wAmrQCm4OoFukpPIy2m/l6VjJSmlK5Q+CMOl/Au7OG1sUUCTvPaIr0XKnsiwDJ7a71n9garnPWHkvuWapSRCzCNgaUoGQjB+fTMJFFrwT8P1aLfM6onc3KNrDStoQZuYe5ngCLlNS56bENkVGvJBfdkboxtHZjqDXXON9jWGSOI527J3o2D5sjSVyx3T9XPrsL4TA/nBtdU+c/+M6aoASZR2VymzAKdMrGfj9kE5GXp8vv2vkJj9+OJ4Jm5yeczocc/Idtojjb1yg+sq1yY8kAQxgezpY1rpgi2jF3tSN01c23DNvAaSJLJX2ZuH8sD40ACc80Y1Qp1nUTdpwBZUeaeNruBwx4PHU8GnC71FwtiUpwNs0OoSl0pgDUJ3ODC5bs8B5QmW1wu1eg7I4mMSmCsNGW6VN3sFcu+WEqnmTxPoZombdFZKxsr2oq359Nn4bJ6Uc9PBz/sXsns7Zx1vND/oK/Jv5Y269UVAMeKX/eGpfnxzagW3tqGbOu12C2p9Azo5VxiU2fG/tmk2PjaG5hV/ywReco7I6C1p8OWM2fwAAAAEABVguNTA5AAAB6TCCAeUwggFOoAMCAQICBE89gTUwDQYJKoZIhvcNAQEFBQAwNzELMAkGA1UEBhMCVVMxEDAOBgNVBAoTB0FuZHJvaWQxFjAUBgNVBAMTDUFuZHJvaWQgRGVidWcwHhcNMTIwMjE2MjIyMDM3WhcNNDIwMjA4MjIyMDM3WjA3MQswCQYDVQQGEwJVUzEQMA4GA1UEChMHQW5kcm9pZDEWMBQGA1UEAxMNQW5kcm9pZCBEZWJ1ZzCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA3AKU7S7JXhUjEwxWP1/LPHXieh61SaA/+xbpqsPA+yjGz1sAcGAyuG6bjNAVm56pq7nkjJzicX7Wi83nUBo58DEC/quxOLdy0C4PEOSAeTnTT1RJIwMDvOgiL1GFCErvQ7gCH6zuAID/JRFbN6nIkhDjs2DYnSBl7aJJf8wCLc0CAwEAATANBgkqhkiG9w0BAQUFAAOBgQAoq/TJffA0l+ZGf89xndmHdxrO6qi+TzSlByvLZ4eFfCovTh1iO+Edrd5V1yXGLxyyvdsadMAFZT8SaxMrP5xxhJ0nra0APWYLpA96M//auMhQBWPgqPntwgvEZuEH7f0kdItjBJ39yijbG8xfgwid6XqNUo0TDDkp/wNWKpJ9tJe+2PrGw1NAvrgSydoH2j8DI1Eq'
-DEBUG_KEYSTORE_KEY_FILE_NAME = (
-    'debug_keystore_QW+xRCJDGHXyyFtgCW8QRajj+6uYmsLwGWpCfYqYQ5M_id_rsa'
-)
-
-AOSP_TESTKEY_DEBUG_KEYSTORE = '/u3+7QAAAAIAAAABAAAAAQAPYW5kcm9pZGRlYnVna2V5AAABejjuIU0AAAUBMIIE/TAOBgorBgEEASoCEQEBBQAEggTpvqhdBtq9D3jRUZGnhKLbFH1LMtCKqwGg25ETAEhvK1GVRNuWAHAUUedCnarjgeUy/zx9OsHuZq18KjUI115kWq/jxkf00fIg7wrOmXoyJf5Dbc7NGKjU64rRmppQEkJ417Lq4Uola9EBJ/WweEu6UTjTn5HcNl4mVloWKMBKNPkVfhZhAkXUyjiZ9rCVHMjLOVKG5vyTWZLwXpYR00Xz6VyzSunTyDza5oUOT/Fh7Gw74V7iNHANydkBHmH+UJ100p0vNPRFvt/3ABfMjkNbRXKNERnyN7NeBmCAOceuXjme/n0XLUidP9/NYk1yAmRJgUnauKD6UPSZYaUPuNSSdf4dD5fCQ7OVDq95e7vmqRDfrKUoWmtpndN7hbVl+OHVZXk2ngvXbvoS+F7ShsEfbq7+c37dnOcVrIlrY+wlOWX2jN42T+AkGt3AfA8zdIPdNgLGk64Op+aP4vGyLQqbuUEzOTNG9uExjGlamogPKFf93GAF83xv7AChYLR/9H+B1E955FL58bRuYOXVWJfLRsO/jyjXsilhBggo3VD1omRuOp98AkKP+P9JXCTswK7IZgvbMK3GB6QIzD20vlT0eK6JGLeWE7cXVn6oT26zvnqAjJ94PjS+YckMOExhqwCivPp1VaX6JzpQ1wr52OsGDUvconcjYrBEHBiY+UnMUk0Wj4mhZlJd1lpybZcWZ3vhTIlM0uMt4udl7t+zsgZ6BW97/pkGaa+QoxeTvgNlHGYyDYp8hveM3bCLXTHULw8mXUHxOJawq/J3E6vZ5/h2nzfmQmWtZtBOGWCkq+gKusTFUsHghjvHsPcQ2+EVfMcePBb/FKvtzSgH59C3iNOHE29l3ceSqccgxlxfStzbf+QkP7gxGVGZ8rLnCn3s8WzkGHZE4LtS0Zm3Y+hV5igrClk940YZP1hmilt2y7adPE4gCyQjb44JXgc3/NxlkZJcmeZTfAGxMXT8HG6Use/Kti114phsF7GDrqk1kPbB51Hr3xF1NAJUWP3csg3jgTS3E6jgD5XjPPG9BEDE2MwnBlUUMe3TC8TIWkK+AlwjlsDr5B9nqy2Fevv62+k5Adplw+fsQ8VzZREZF+MllWO3vtkD6srdx9h4vPD3dp5urFCFXNRaoD3SMDk27z3EVCQZ4bPL5PsVpB/ZBotLGkUZ0yi+5oC+u7ByP1ihMXMsRgvXbQpyOonEqDy84EZiIPWbyzGd0tEAXLz3mMh1x/IqZ1wxyDT/vkxhNCFqlBNlRW6GbMN2cng4A9Cigj9eNu9ptL1tdgFTxwndjoNRQMJ0NAc6WnsQ1UeIu8nMsa8/kLDtnVFLVmPQv2ZBUM4mxLrwC1mxOiQrWBW2XJ1OIheimSkLHfQOef1mIH3Z0cBuLBKGkRYGaXiZ6RX7po+ch0WFGjBef3e3uczl1mT5WGKdIG4x1+aRAtJHL+9K7Z6wzG0ygoamdiX2Fd0xBrWjTU72DzYbceqc+uHrbcLKDa5w0ENhyYK0+XEzG5fXHjFgmawY1D7xZQOJZO3jxStcv+xzoiTnNSrIxbxog/0Fez/WhMM9H6gV4eeDjMWEg79cJLugCBNwqmp3Yoe5EDU2TxQlLT53tye3Aji3FbocuDWjLI3Jc5VDxd7lrbzeIbFzSNpoFG8DSgjSiq41WJVeuzXxmdl7HM4zQpGRAAAAAQAFWC41MDkAAASsMIIEqDCCA5CgAwIBAgIJAJNurL4H8gHfMA0GCSqGSIb3DQEBBQUAMIGUMQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNTW91bnRhaW4gVmlldzEQMA4GA1UEChMHQW5kcm9pZDEQMA4GA1UECxMHQW5kcm9pZDEQMA4GA1UEAxMHQW5kcm9pZDEiMCAGCSqGSIb3DQEJARYTYW5kcm9pZEBhbmRyb2lkLmNvbTAeFw0wODAyMjkwMTMzNDZaFw0zNTA3MTcwMTMzNDZaMIGUMQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNTW91bnRhaW4gVmlldzEQMA4GA1UEChMHQW5kcm9pZDEQMA4GA1UECxMHQW5kcm9pZDEQMA4GA1UEAxMHQW5kcm9pZDEiMCAGCSqGSIb3DQEJARYTYW5kcm9pZEBhbmRyb2lkLmNvbTCCASAwDQYJKoZIhvcNAQEBBQADggENADCCAQgCggEBANaTGQTexgskse3HYuDZ2CU+Ps1s6x3i/waMqOi8qM1r03hupwqnbOYOuw+ZNVn/2T53qUPn6D1LZLjk/qLT5lbx4meoG7+yMLV4wgRDvkxyGLhG9SEVhvA4oU6Jwr44f46+z4/Kw9oe4zDJ6pPQp8PcSvNQIg1QCAcy4ICXF+5qBTNZ5qaU7Cyz8oSgpGbIepTYOzEJOmc3Li9kEsBubULxWBjf/gOBzAzURNps3cO4JFgZSAGzJWQTT7/emMkod0jb9WdqVA2BVMi7yge54kdVMxHEa5r3b97szI5p58ii0I54JiCUP5lyfTwE/nKZHZnfm644oLIXf6MdW2r+6R8CAQOjgfwwgfkwHQYDVR0OBBYEFEhZAFY9JyxGrhGGBaR0GawJyowRMIHJBgNVHSMEgcEwgb6AFEhZAFY9JyxGrhGGBaR0GawJyowRoYGapIGXMIGUMQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNTW91bnRhaW4gVmlldzEQMA4GA1UEChMHQW5kcm9pZDEQMA4GA1UECxMHQW5kcm9pZDEQMA4GA1UEAxMHQW5kcm9pZDEiMCAGCSqGSIb3DQEJARYTYW5kcm9pZEBhbmRyb2lkLmNvbYIJAJNurL4H8gHfMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAHqvlozrUMRBBVEY0NqrrwFbinZaJ6cVosK0TyIUFf/azgMJWr+kLfcHCHJsIGnlw27drgQAvilFLAhLwn62oX6snb4YLCBOsVMR9FXYJLZW2+TcIkCRLXWG/oiVHQGo/rWuWkJgU134NDEFJCJGjDbiLCpe+ZTWHdcwauTJ9pUbo8EvHRkU3cYfGmLaLfgn9gP+pWA7LFQNvXwBnDa6sppCccEX31I828XzgXpJ4O+mDL1/dBd+ek8ZPUP0IgdyZm5MTYPhvVqGCHzzTy3sIeJFymwrsBbmg2OAUNLEMO6nwmocSdN2ClirfxqCzJOLSDE4QyS9BAH6EhY6UFcOaE21IJawTAEXnf52TqT7diFUlWRSnQ=='
-AOSP_TESTKEY_DEBUG_KEYSTORE_KEY_FILE_NAME = (
-    'debug_keystore_k47SVrA85+oMZAexHc62PkgvIgO8TJBYN00U82xSlxc_id_rsa'
-)
-
-basedir = Path(__file__).parent
-testroot = basedir.with_name('.testfiles')
-
-
-class Options:
-    allow_disabled_algorithms = False
-    clean = False
-    delete_unknown = False
-    nosign = False
-    pretty = True
-    rename_apks = False
-    verbose = False
-
-
-@unittest.skipUnless(
-    platform.system() == 'Linux',
-    'skipping test_nightly, it currently only works GNU/Linux',
-)
-class NightlyTest(unittest.TestCase):
-    path = os.environ['PATH']
-
-    def setUp(self):
-        common.config = None
-        nightly.config = None
-        testroot.mkdir(exist_ok=True)
-        os.chdir(basedir)
-        self.tempdir = tempfile.TemporaryDirectory(
-            str(time.time()), self._testMethodName + '_', testroot
-        )
-        self.testdir = Path(self.tempdir.name)
-        self.home = self.testdir / 'home'
-        self.home.mkdir()
-        self.dot_android = self.home / '.android'
-        nightly.KEYSTORE_FILE = str(self.dot_android / 'debug.keystore')
-
-    def tearDown(self):
-        self.tempdir.cleanup()
-        try:
-            os.rmdir(testroot)
-        except OSError:  # other test modules might have left stuff around
-            pass
-
-    def _copy_test_debug_keystore(self):
-        self.dot_android.mkdir()
-        shutil.copy(
-            basedir / 'aosp_testkey_debug.keystore',
-            self.dot_android / 'debug.keystore',
-        )
-
-    def _copy_debug_apk(self):
-        outputdir = Path('app/build/output/apk/debug')
-        outputdir.mkdir(parents=True)
-        shutil.copy(basedir / 'urzip.apk', outputdir / 'urzip-debug.apk')
-
-    def test_get_repo_base_url(self):
-        for clone_url, repo_git_base, result in [
-            (
-                'https://github.com/onionshare/onionshare-android-nightly',
-                'onionshare/onionshare-android-nightly',
-                'https://raw.githubusercontent.com/onionshare/onionshare-android-nightly/master/fdroid',
-            ),
-            (
-                'https://gitlab.com/fdroid/fdroidclient-nightly',
-                'fdroid/fdroidclient-nightly',
-                'https://gitlab.com/fdroid/fdroidclient-nightly/-/raw/master/fdroid',
-            ),
-        ]:
-            url = nightly.get_repo_base_url(clone_url, repo_git_base)
-            self.assertEqual(result, url)
-            r = requests.head(os.path.join(url, 'repo/index-v1.jar'), timeout=300)
-            # gitlab.com often returns 403 Forbidden from their cloudflare restrictions
-            self.assertTrue(r.status_code in (200, 403), 'should not be a redirect')
-
-    def test_get_keystore_secret_var(self):
-        self.assertEqual(
-            AOSP_TESTKEY_DEBUG_KEYSTORE,
-            nightly._get_keystore_secret_var(basedir / 'aosp_testkey_debug.keystore'),
-        )
-
-    @patch.dict(os.environ, clear=True)
-    def test_ssh_key_from_debug_keystore(self):
-        os.environ['HOME'] = str(self.home)
-        os.environ['PATH'] = self.path
-        ssh_private_key_file = nightly._ssh_key_from_debug_keystore(
-            basedir / 'aosp_testkey_debug.keystore'
-        )
-        with open(ssh_private_key_file) as fp:
-            self.assertIn('-----BEGIN RSA PRIVATE KEY-----', fp.read())
-        with open(ssh_private_key_file + '.pub') as fp:
-            self.assertEqual(fp.read(8), 'ssh-rsa ')
-        shutil.rmtree(os.path.dirname(ssh_private_key_file))
-
-    @patch.dict(os.environ, clear=True)
-    @patch('sys.argv', ['fdroid nightly', '--verbose'])
-    def test_main_empty_dot_android(self):
-        """Test that it exits with an error when ~/.android is empty"""
-        os.environ['HOME'] = str(self.home)
-        os.environ['PATH'] = self.path
-        with self.assertRaises(SystemExit) as cm:
-            nightly.main()
-        self.assertEqual(cm.exception.code, 1)
-
-    @patch.dict(os.environ, clear=True)
-    @patch('sys.argv', ['fdroid nightly', '--verbose'])
-    def test_main_empty_dot_ssh(self):
-        """Test that it does not create ~/.ssh if it does not exist
-
-        Careful!  If the test env is wrong, it can mess up the local
-        SSH setup.
-
-        """
-        dot_ssh = self.home / '.ssh'
-        self._copy_test_debug_keystore()
-        os.environ['HOME'] = str(self.home)
-        os.environ['PATH'] = self.path
-        self.assertFalse(dot_ssh.exists())
-        nightly.main()
-        self.assertFalse(dot_ssh.exists())
-
-    @patch.dict(os.environ, clear=True)
-    @patch('sys.argv', ['fdroid nightly', '--verbose'])
-    def test_main_on_user_machine(self):
-        """Test that `fdroid nightly` runs on the user's machine
-
-        Careful!  If the test env is wrong, it can mess up the local
-        SSH setup.
-
-        """
-        dot_ssh = self.home / '.ssh'
-        dot_ssh.mkdir()
-        self._copy_test_debug_keystore()
-        os.environ['HOME'] = str(self.home)
-        os.environ['PATH'] = self.path
-        nightly.main()
-        self.assertTrue((dot_ssh / AOSP_TESTKEY_DEBUG_KEYSTORE_KEY_FILE_NAME).exists())
-        self.assertTrue(
-            (dot_ssh / (AOSP_TESTKEY_DEBUG_KEYSTORE_KEY_FILE_NAME + '.pub')).exists()
-        )
-
-    @patch('fdroidserver.common.vcs_git.git', lambda args, e: common.PopenResult(1))
-    @patch('sys.argv', ['fdroid nightly', '--verbose'])
-    def test_private_or_non_existent_git_mirror(self):
-        """Test that this exits with an error when the git mirror repo won't work
-
-        Careful!  If the test environment is setup wrong, it can mess
-        up local files in ~/.ssh or ~/.android.
-
-        """
-        os.chdir(self.testdir)
-        with patch.dict(
-            os.environ,
-            {
-                'CI': 'true',
-                'CI_PROJECT_PATH': 'thisshouldneverexist/orthistoo',
-                'CI_PROJECT_URL': 'https://gitlab.com/thisshouldneverexist/orthistoo',
-                'DEBUG_KEYSTORE': DEBUG_KEYSTORE,
-                'GITLAB_USER_NAME': 'username',
-                'GITLAB_USER_EMAIL': 'username@example.com',
-                'HOME': str(self.testdir),
-                'PATH': os.getenv('PATH'),
-            },
-            clear=True,
-        ):
-            with self.assertRaises(exception.VCSException):
-                nightly.main()
-
-    def test_clone_git_repo(self):
-        os.chdir(self.testdir)
-        common.options = Options
-        d = 'fakeappid'
-        nightly.clone_git_repo('https://gitlab.com/fdroid/ci-test-tiny-repo.git', d)
-        self.assertTrue(os.path.isdir(Path(d) / '.git'))
-
-    def test_clone_git_repo_fails_on_gitlab_password_prompt(self):
-        os.chdir(self.testdir)
-        common.options = Options
-        d = 'shouldnotbecreated'
-        with self.assertRaises(exception.VCSException):
-            nightly.clone_git_repo(f'https://gitlab.com/{d}/{d}.git', d)
-        self.assertFalse(os.path.isdir(Path(d)))
-
-    def test_clone_git_repo_fails_on_github_password_prompt(self):
-        os.chdir(self.testdir)
-        common.options = Options
-        d = 'shouldnotbecreated'
-        with self.assertRaises(exception.VCSException):
-            nightly.clone_git_repo(f'https://github.com/{d}/{d}.git', d)
-        self.assertFalse(os.path.isdir(Path(d)))
-
-    def _put_fdroid_in_args(self, args):
-        """Find fdroid command that belongs to this source code tree"""
-        fdroid = os.path.join(basedir.parent, 'fdroid')
-        if not os.path.exists(fdroid):
-            fdroid = os.getenv('fdroid')
-        return [fdroid] + args[1:]
-
-    @patch('sys.argv', ['fdroid nightly', '--verbose'])
-    @patch('platform.node', lambda: 'example.com')
-    def test_github_actions(self):
-        """Careful! If the test env is bad, it'll mess up the local SSH setup
-
-        https://docs.github.com/en/actions/learn-github-actions/environment-variables
-
-        """
-
-        called = []
-        orig_check_call = subprocess.check_call
-        os.chdir(self.testdir)
-        os.makedirs('fdroid/git-mirror/fdroid/repo')  # fake this to avoid cloning
-        self._copy_test_debug_keystore()
-        self._copy_debug_apk()
-
-        def _subprocess_check_call(args, cwd=None, env=None):
-            if os.path.basename(args[0]) in ('keytool', 'openssl'):
-                orig_check_call(args, cwd=cwd, env=env)
-            elif args[:2] == ['fdroid', 'update']:
-                orig_check_call(self._put_fdroid_in_args(args), cwd=cwd, env=env)
-            else:
-                called.append(args[:2])
-                return
-
-        with patch.dict(
-            os.environ,
-            {
-                'CI': 'true',
-                'DEBUG_KEYSTORE': DEBUG_KEYSTORE,
-                'GITHUB_ACTIONS': 'true',
-                'GITHUB_ACTOR': 'username',
-                'GITHUB_REPOSITORY': 'f-droid/test',
-                'GITHUB_SERVER_URL': 'https://github.com',
-                'HOME': str(self.testdir),
-                'PATH': os.getenv('PATH'),
-                'fdroid': os.getenv('fdroid', ''),
-            },
-            clear=True,
-        ):
-            self.assertTrue(testroot == Path.home().parent)
-            with patch('subprocess.check_call', _subprocess_check_call):
-                try:
-                    nightly.main()
-                except exception.BuildException as e:
-                    if "apksigner not found" in e.value:
-                        self.skipTest("skipping, apksigner not found due to fake $HOME")
-                    else:
-                        raise
-
-        self.assertEqual(called, [['ssh', '-Tvi'], ['fdroid', 'deploy']])
-        git_url = 'git@github.com:f-droid/test-nightly'
-        mirror_url = index.get_mirror_service_urls({"url": git_url})[0]
-        expected = {
-            'archive_description': 'Old nightly builds that have been archived.',
-            'archive_name': 'f-droid/test-nightly archive',
-            'archive_older': 20,
-            'archive_url': mirror_url + '/archive',
-            'keydname': 'CN=Android Debug,O=Android,C=US',
-            'keypass': 'android',
-            'keystore': nightly.KEYSTORE_FILE,
-            'keystorepass': 'android',
-            'make_current_version_link': False,
-            'repo_description': 'Nightly builds from username@example.com',
-            'repo_keyalias': 'androiddebugkey',
-            'repo_name': 'f-droid/test-nightly',
-            'repo_url': mirror_url + '/repo',
-            'servergitmirrors': [{"url": git_url}],
-        }
-        with open(common.CONFIG_FILE) as fp:
-            config = yaml.safe_load(fp)
-            # .ssh is random tmpdir set in nightly.py, so test basename only
-            self.assertEqual(
-                os.path.basename(config['identity_file']),
-                DEBUG_KEYSTORE_KEY_FILE_NAME,
-            )
-            del config['identity_file']
-            self.assertEqual(expected, config)
-
-    @patch('sys.argv', ['fdroid nightly', '--verbose'])
-    def test_gitlab_ci(self):
-        """Careful!  If the test env is bad, it can mess up the local SSH setup"""
-        called = []
-        orig_check_call = subprocess.check_call
-        os.chdir(self.testdir)
-        os.makedirs('fdroid/git-mirror/fdroid/repo')  # fake this to avoid cloning
-        self._copy_test_debug_keystore()
-        self._copy_debug_apk()
-
-        def _subprocess_check_call(args, cwd=None, env=None):
-            if os.path.basename(args[0]) in ('keytool', 'openssl'):
-                orig_check_call(args, cwd=cwd, env=env)
-            elif args[:2] == ['fdroid', 'update']:
-                orig_check_call(self._put_fdroid_in_args(args), cwd=cwd, env=env)
-            else:
-                called.append(args[:2])
-                return
-
-        with patch.dict(
-            os.environ,
-            {
-                'CI': 'true',
-                'CI_PROJECT_PATH': 'fdroid/test',
-                'CI_PROJECT_URL': 'https://gitlab.com/fdroid/test',
-                'DEBUG_KEYSTORE': DEBUG_KEYSTORE,
-                'GITLAB_USER_NAME': 'username',
-                'GITLAB_USER_EMAIL': 'username@example.com',
-                'HOME': str(self.testdir),
-                'PATH': os.getenv('PATH'),
-                'fdroid': os.getenv('fdroid', ''),
-            },
-            clear=True,
-        ):
-            self.assertTrue(testroot == Path.home().parent)
-            with patch('subprocess.check_call', _subprocess_check_call):
-                try:
-                    nightly.main()
-                except exception.BuildException as e:
-                    if "apksigner not found" in e.value:
-                        self.skipTest("skipping, apksigner not found due to fake $HOME")
-                    else:
-                        raise
-
-        self.assertEqual(called, [['ssh', '-Tvi'], ['fdroid', 'deploy']])
-        expected = {
-            'archive_description': 'Old nightly builds that have been archived.',
-            'archive_name': 'fdroid/test-nightly archive',
-            'archive_older': 20,
-            'archive_url': 'https://gitlab.com/fdroid/test-nightly/-/raw/master/fdroid/archive',
-            'keydname': 'CN=Android Debug,O=Android,C=US',
-            'keypass': 'android',
-            'keystore': nightly.KEYSTORE_FILE,
-            'keystorepass': 'android',
-            'make_current_version_link': False,
-            'repo_description': 'Nightly builds from username@example.com',
-            'repo_keyalias': 'androiddebugkey',
-            'repo_name': 'fdroid/test-nightly',
-            'repo_url': 'https://gitlab.com/fdroid/test-nightly/-/raw/master/fdroid/repo',
-            'servergitmirrors': [{"url": 'git@gitlab.com:fdroid/test-nightly'}],
-        }
-        with open(common.CONFIG_FILE) as fp:
-            config = yaml.safe_load(fp)
-            # .ssh is random tmpdir set in nightly.py, so test basename only
-            self.assertEqual(
-                os.path.basename(config['identity_file']),
-                DEBUG_KEYSTORE_KEY_FILE_NAME,
-            )
-            del config['identity_file']
-            self.assertEqual(expected, config)
diff --git a/tests/test_publish.py b/tests/test_publish.py
deleted file mode 100755
index 82c670d7..00000000
--- a/tests/test_publish.py
+++ /dev/null
@@ -1,413 +0,0 @@
-#!/usr/bin/env python3
-
-#
-#  command which created the keystore used in this test case:
-#
-#  $ for ALIAS in repokey a163ec9b d2d51ff2 dc3b169e 78688a0f; \
-#        do keytool -genkey -keystore dummy-keystore.jks \
-#        -alias $ALIAS -keyalg 'RSA' -keysize '2048' \
-#        -validity '10000' -storepass 123456 -storetype jks \
-#        -keypass 123456 -dname 'CN=test, OU=F-Droid'; done
-#
-
-import json
-import os
-import pathlib
-import shutil
-import sys
-import tempfile
-import unittest
-from unittest import mock
-
-from fdroidserver import common, metadata, publish, signatures
-from fdroidserver._yaml import yaml
-from fdroidserver.exception import FDroidException
-
-from .shared_test_code import VerboseFalseOptions, mkdtemp
-
-basedir = pathlib.Path(__file__).parent
-
-
-class PublishTest(unittest.TestCase):
-    '''fdroidserver/publish.py'''
-
-    def setUp(self):
-        os.chdir(basedir)
-        self._td = mkdtemp()
-        self.testdir = self._td.name
-
-    def tearDown(self):
-        self._td.cleanup()
-        os.chdir(basedir)
-
-    def test_key_alias(self):
-        publish.config = {}
-        self.assertEqual('a163ec9b', publish.key_alias('com.example.app'))
-        self.assertEqual('d2d51ff2', publish.key_alias('com.example.anotherapp'))
-        self.assertEqual('dc3b169e', publish.key_alias('org.test.testy'))
-        self.assertEqual('78688a0f', publish.key_alias('org.org.org'))
-
-        self.assertEqual('ee8807d2', publish.key_alias("org.schabi.newpipe"))
-        self.assertEqual('b53c7e11', publish.key_alias("de.grobox.liberario"))
-
-        publish.config = {
-            'keyaliases': {'yep.app': '@org.org.org', 'com.example.app': '1a2b3c4d'}
-        }
-        self.assertEqual('78688a0f', publish.key_alias('yep.app'))
-        self.assertEqual('1a2b3c4d', publish.key_alias('com.example.app'))
-
-    def test_read_fingerprints_from_keystore(self):
-        common.config = {}
-        common.fill_config_defaults(common.config)
-        publish.config = common.config
-        publish.config['keystorepass'] = '123456'
-        publish.config['keypass'] = '123456'
-        publish.config['keystore'] = 'dummy-keystore.jks'
-
-        expected = {
-            '78688a0f': '277655a6235bc6b0ef2d824396c51ba947f5ebc738c293d887e7083ff338af82',
-            'd2d51ff2': 'fa3f6a017541ee7fe797be084b1bcfbf92418a7589ef1f7fdeb46741b6d2e9c3',
-            'dc3b169e': '6ae5355157a47ddcc3834a71f57f6fb5a8c2621c8e0dc739e9ddf59f865e497c',
-            'a163ec9b': 'd34f678afbaa8f2fa6cc0edd6f0c2d1d2e2e9eb08bea521b24c740806016bff4',
-            'repokey': 'c58460800c7b250a619c30c13b07b7359a43e5af71a4352d86c58ae18c9f6d41',
-        }
-        result = publish.read_fingerprints_from_keystore()
-        self.maxDiff = None
-        self.assertEqual(expected, result)
-
-    def test_store_and_load_signer_fingerprints(self):
-        common.config = {}
-        common.fill_config_defaults(common.config)
-        publish.config = common.config
-        publish.config['keystorepass'] = '123456'
-        publish.config['keypass'] = '123456'
-        publish.config['keystore'] = os.path.join(basedir, 'dummy-keystore.jks')
-        publish.config['repo_keyalias'] = 'repokey'
-
-        appids = [
-            'com.example.app',
-            'net.unavailable',
-            'org.test.testy',
-            'com.example.anotherapp',
-            'org.org.org',
-        ]
-
-        os.chdir(self.testdir)
-        common.write_config_file('')
-
-        publish.store_publish_signer_fingerprints(appids, indent=2)
-
-        self.maxDiff = None
-        expected = {
-            "com.example.anotherapp": {
-                "signer": "fa3f6a017541ee7fe797be084b1bcfbf92418a7589ef1f7fdeb46741b6d2e9c3"
-            },
-            "com.example.app": {
-                "signer": "d34f678afbaa8f2fa6cc0edd6f0c2d1d2e2e9eb08bea521b24c740806016bff4"
-            },
-            "org.org.org": {
-                "signer": "277655a6235bc6b0ef2d824396c51ba947f5ebc738c293d887e7083ff338af82"
-            },
-            "org.test.testy": {
-                "signer": "6ae5355157a47ddcc3834a71f57f6fb5a8c2621c8e0dc739e9ddf59f865e497c"
-            },
-        }
-        self.assertEqual(expected, common.load_publish_signer_fingerprints())
-
-        with open(common.CONFIG_FILE) as fp:
-            config = yaml.load(fp)
-        self.assertEqual(
-            'c58460800c7b250a619c30c13b07b7359a43e5af71a4352d86c58ae18c9f6d41',
-            config['repo_key_sha256'],
-        )
-
-    def test_store_and_load_signer_fingerprints_with_missmatch(self):
-        common.config = {}
-        common.fill_config_defaults(common.config)
-        publish.config = common.config
-        publish.config['keystorepass'] = '123456'
-        publish.config['keypass'] = '123456'
-        publish.config['keystore'] = os.path.join(basedir, 'dummy-keystore.jks')
-        publish.config['repo_keyalias'] = 'repokey'
-        publish.config['repo_key_sha256'] = 'bad bad bad bad bad bad bad bad bad bad'
-
-        os.chdir(self.testdir)
-        publish.store_publish_signer_fingerprints({}, indent=2)
-        with self.assertRaises(FDroidException):
-            common.load_publish_signer_fingerprints()
-
-    def test_reproducible_binaries_process(self):
-        common.config = {}
-        common.fill_config_defaults(common.config)
-        publish.config = common.config
-        publish.config['keystore'] = 'keystore.jks'
-        publish.config['repo_keyalias'] = 'sova'
-        publish.config['keystorepass'] = 'r9aquRHYoI8+dYz6jKrLntQ5/NJNASFBacJh7Jv2BlI='
-        publish.config['keypass'] = 'r9aquRHYoI8+dYz6jKrLntQ5/NJNASFBacJh7Jv2BlI='
-        shutil.copy('keystore.jks', self.testdir)
-        os.mkdir(os.path.join(self.testdir, 'repo'))
-        metadata_dir = os.path.join(self.testdir, 'metadata')
-        os.mkdir(metadata_dir)
-        shutil.copy(os.path.join('metadata', 'com.politedroid.yml'), metadata_dir)
-        with open(os.path.join(metadata_dir, 'com.politedroid.yml'), 'a') as fp:
-            fp.write('\nBinaries: https://placeholder/foo%v.apk\n')
-        os.mkdir(os.path.join(self.testdir, 'unsigned'))
-        shutil.copy(
-            'repo/com.politedroid_6.apk', os.path.join(self.testdir, 'unsigned')
-        )
-        os.mkdir(os.path.join(self.testdir, 'unsigned', 'binaries'))
-        shutil.copy(
-            'repo/com.politedroid_6.apk',
-            os.path.join(
-                self.testdir, 'unsigned', 'binaries', 'com.politedroid_6.binary.apk'
-            ),
-        )
-
-        os.chdir(self.testdir)
-        with mock.patch.object(sys, 'argv', ['fdroid fakesubcommand']):
-            publish.main()
-
-    def test_check_for_key_collisions(self):
-        from fdroidserver.metadata import App
-
-        common.config = {}
-        common.fill_config_defaults(common.config)
-        publish.config = common.config
-
-        randomappids = [
-            "org.fdroid.fdroid",
-            "a.b.c",
-            "u.v.w.x.y.z",
-            "lpzpkgqwyevnmzvrlaazhgardbyiyoybyicpmifkyrxkobljoz",
-            "vuslsm.jlrevavz.qnbsenmizhur.lprwbjiujtu.ekiho",
-            "w.g.g.w.p.v.f.v.gvhyz",
-            "nlozuqer.ufiinmrbjqboogsjgmpfks.dywtpcpnyssjmqz",
-        ]
-        allapps = {}
-        for appid in randomappids:
-            allapps[appid] = App()
-        allaliases = publish.check_for_key_collisions(allapps)
-        self.assertEqual(len(randomappids), len(allaliases))
-
-        allapps = {'tof.cv.mpp': App(), 'j6mX276h': App()}
-        self.assertEqual(publish.key_alias('tof.cv.mpp'), publish.key_alias('j6mX276h'))
-        self.assertRaises(SystemExit, publish.check_for_key_collisions, allapps)
-
-    def test_create_key_if_not_existing(self):
-        try:
-            import jks
-            import jks.util
-        except ImportError:
-            self.skipTest("pyjks not installed")
-        common.config = {}
-        common.fill_config_defaults(common.config)
-        publish.config = common.config
-        publish.config['keystorepass'] = '123456'
-        publish.config['keypass'] = '654321'
-        publish.config['keystore'] = "keystore.jks"
-        publish.config[
-            'keydname'
-        ] = 'CN=Birdman, OU=Cell, O=Alcatraz, L=Alcatraz, S=CA, C=US'
-        os.chdir(self.testdir)
-        keystore = jks.KeyStore.new("jks", [])
-        keystore.save(publish.config['keystore'], publish.config['keystorepass'])
-
-        self.assertTrue(publish.create_key_if_not_existing("newalias"))
-        # The second time we try that, a new key should not be created
-        self.assertFalse(publish.create_key_if_not_existing("newalias"))
-        self.assertTrue(publish.create_key_if_not_existing("anotheralias"))
-
-        keystore = jks.KeyStore.load(
-            publish.config['keystore'], publish.config['keystorepass']
-        )
-        self.assertCountEqual(keystore.private_keys, ["newalias", "anotheralias"])
-        for alias, pk in keystore.private_keys.items():
-            self.assertFalse(pk.is_decrypted())
-            pk.decrypt(publish.config['keypass'])
-            self.assertTrue(pk.is_decrypted())
-            self.assertEqual(jks.util.RSA_ENCRYPTION_OID, pk.algorithm_oid)
-
-    def test_status_update_json(self):
-        common.config = {}
-        publish.config = {}
-        with tempfile.TemporaryDirectory() as tmpdir:
-            os.chdir(tmpdir)
-            with mock.patch('sys.argv', ['fdroid publish', '']):
-                publish.status_update_json([], [])
-                with open('repo/status/publish.json') as fp:
-                    data = json.load(fp)
-                self.assertTrue('apksigner' in data)
-
-                publish.config = {
-                    'apksigner': 'apksigner',
-                }
-                publish.status_update_json([], [])
-                with open('repo/status/publish.json') as fp:
-                    data = json.load(fp)
-                self.assertEqual(
-                    shutil.which(publish.config['apksigner']), data['apksigner']
-                )
-
-                publish.config = {}
-                common.fill_config_defaults(publish.config)
-                publish.status_update_json([], [])
-                with open('repo/status/publish.json') as fp:
-                    data = json.load(fp)
-                self.assertEqual(publish.config.get('apksigner'), data['apksigner'])
-                self.assertEqual(publish.config['jarsigner'], data['jarsigner'])
-                self.assertEqual(publish.config['keytool'], data['keytool'])
-
-    @unittest.skipIf(sys.byteorder == 'big', 'androguard is not ported to big-endian')
-    def test_sign_then_implant_signature(self):
-        os.chdir(self.testdir)
-
-        common.options = VerboseFalseOptions
-        config = common.read_config()
-        if 'apksigner' not in config:
-            self.skipTest(
-                'SKIPPING test_sign_then_implant_signature, apksigner not installed!'
-            )
-        config['repo_keyalias'] = 'sova'
-        config['keystorepass'] = 'r9aquRHYoI8+dYz6jKrLntQ5/NJNASFBacJh7Jv2BlI='
-        config['keypass'] = 'r9aquRHYoI8+dYz6jKrLntQ5/NJNASFBacJh7Jv2BlI='
-        shutil.copy(basedir / 'keystore.jks', self.testdir)
-        config['keystore'] = 'keystore.jks'
-        config['keydname'] = 'CN=Birdman, OU=Cell, O=Alcatraz, L=Alcatraz, S=CA, C=US'
-        publish.config = config
-        common.config = config
-
-        app = metadata.App()
-        app.id = 'org.fdroid.ci'
-        versionCode = 1
-        build = metadata.Build(
-            {
-                'versionCode': versionCode,
-                'versionName': '1.0',
-            }
-        )
-        app.Builds = [build]
-        os.mkdir('metadata')
-        metadata.write_metadata(os.path.join('metadata', '%s.yml' % app.id), app)
-
-        os.mkdir('unsigned')
-        testapk = basedir / 'no_targetsdk_minsdk1_unsigned.apk'
-        unsigned = os.path.join('unsigned', common.get_release_filename(app, build))
-        signed = os.path.join('repo', common.get_release_filename(app, build))
-        shutil.copy(testapk, unsigned)
-
-        # sign the unsigned APK
-        self.assertTrue(os.path.exists(unsigned))
-        self.assertFalse(os.path.exists(signed))
-        with mock.patch(
-            'sys.argv', ['fdroid publish', '%s:%d' % (app.id, versionCode)]
-        ):
-            publish.main()
-        self.assertFalse(os.path.exists(unsigned))
-        self.assertTrue(os.path.exists(signed))
-
-        with mock.patch('sys.argv', ['fdroid signatures', signed]):
-            signatures.main()
-        self.assertTrue(
-            os.path.exists(
-                os.path.join(
-                    'metadata', 'org.fdroid.ci', 'signatures', '1', 'MANIFEST.MF'
-                )
-            )
-        )
-        os.remove(signed)
-
-        # implant the signature into the unsigned APK
-        shutil.copy(testapk, unsigned)
-        self.assertTrue(os.path.exists(unsigned))
-        self.assertFalse(os.path.exists(signed))
-        with mock.patch(
-            'sys.argv', ['fdroid publish', '%s:%d' % (app.id, versionCode)]
-        ):
-            publish.main()
-        self.assertFalse(os.path.exists(unsigned))
-        self.assertTrue(os.path.exists(signed))
-
-    @unittest.skipIf(sys.byteorder == 'big', 'androguard is not ported to big-endian')
-    def test_exit_on_error(self):
-        """Exits properly on errors, with and without --error-on-failed.
-
-        `fdroid publish` runs on the signing server and does large
-        batches.  In that case, it shouldn't exit after a single
-        failure since it should try to complete the whole batch.  For
-        CI and other use cases, there is --error-on-failed to force it
-        to exit after a failure.
-
-        """
-
-        class Options:
-            error_on_failed = True
-            verbose = False
-
-        os.chdir(self.testdir)
-
-        common.options = Options
-        config = common.read_config()
-        if 'apksigner' not in config:
-            self.skipTest('SKIPPING test_error_on_failed, apksigner not installed!')
-        config['repo_keyalias'] = 'sova'
-        config['keystorepass'] = 'r9aquRHYoI8+dYz6jKrLntQ5/NJNASFBacJh7Jv2BlI='
-        config['keypass'] = 'r9aquRHYoI8+dYz6jKrLntQ5/NJNASFBacJh7Jv2BlI='
-        shutil.copy(basedir / 'keystore.jks', self.testdir)
-        config['keystore'] = 'keystore.jks'
-        config['keydname'] = 'CN=Birdman, OU=Cell, O=Alcatraz, L=Alcatraz, S=CA, C=US'
-        publish.config = config
-        common.config = config
-
-        app = metadata.App()
-        app.id = 'org.fdroid.ci'
-        versionCode = 1
-        build = metadata.Build(
-            {
-                'versionCode': versionCode,
-                'versionName': '1.0',
-            }
-        )
-        app.Builds = [build]
-        os.mkdir('metadata')
-        metadata.write_metadata(os.path.join('metadata', '%s.yml' % app.id), app)
-
-        os.mkdir('unsigned')
-        testapk = basedir / 'no_targetsdk_minsdk1_unsigned.apk'
-        unsigned = os.path.join('unsigned', common.get_release_filename(app, build))
-        signed = os.path.join('repo', common.get_release_filename(app, build))
-        shutil.copy(testapk, unsigned)
-
-        # sign the unsigned APK
-        self.assertTrue(os.path.exists(unsigned))
-        self.assertFalse(os.path.exists(signed))
-        with mock.patch(
-            'sys.argv', ['fdroid publish', '%s:%d' % (app.id, versionCode)]
-        ):
-            publish.main()
-        self.assertFalse(os.path.exists(unsigned))
-        self.assertTrue(os.path.exists(signed))
-
-        with mock.patch('sys.argv', ['fdroid signatures', signed]):
-            signatures.main()
-        mf = os.path.join('metadata', 'org.fdroid.ci', 'signatures', '1', 'MANIFEST.MF')
-        self.assertTrue(os.path.exists(mf))
-        os.remove(signed)
-
-        with open(mf, 'a') as fp:
-            fp.write('appended to break signature')
-
-        # implant the signature into the unsigned APK
-        shutil.copy(testapk, unsigned)
-        self.assertTrue(os.path.exists(unsigned))
-        self.assertFalse(os.path.exists(signed))
-        apk_id = '%s:%d' % (app.id, versionCode)
-
-        # by default, it should complete without exiting
-        with mock.patch('sys.argv', ['fdroid publish', apk_id]):
-            publish.main()
-
-        # --error-on-failed should make it exit
-        with mock.patch('sys.argv', ['fdroid publish', '--error-on-failed', apk_id]):
-            with self.assertRaises(SystemExit) as e:
-                publish.main()
-            self.assertEqual(e.exception.code, 1)
diff --git a/tests/test_rewritemeta.py b/tests/test_rewritemeta.py
deleted file mode 100755
index 4dcdd03f..00000000
--- a/tests/test_rewritemeta.py
+++ /dev/null
@@ -1,257 +0,0 @@
-#!/usr/bin/env python3
-
-import os
-import tempfile
-import textwrap
-import unittest
-from pathlib import Path
-from unittest import mock
-
-from fdroidserver import metadata, rewritemeta
-
-from .shared_test_code import TmpCwd, mkdtemp
-
-basedir = Path(__file__).parent
-
-
-class RewriteMetaTest(unittest.TestCase):
-    '''fdroidserver/publish.py'''
-
-    def setUp(self):
-        os.chdir(basedir)
-        metadata.warnings_action = 'error'
-        self._td = mkdtemp()
-        self.testdir = self._td.name
-
-    def tearDown(self):
-        self._td.cleanup()
-
-    def test_remove_blank_flags_from_builds_com_politedroid_3(self):
-        """Unset fields in Builds: entries should be removed."""
-        appid = 'com.politedroid'
-        app = metadata.read_metadata({appid: -1})[appid]
-        builds = rewritemeta.remove_blank_flags_from_builds(app.get('Builds'))
-        self.assertEqual(
-            builds[0],
-            {
-                'versionName': '1.2',
-                'versionCode': 3,
-                'commit': '6a548e4b19',
-                'target': 'android-10',
-                'antifeatures': {
-                    'KnownVuln': {},
-                    'NonFreeAssets': {},
-                },
-            },
-        )
-
-    def test_remove_blank_flags_from_builds_com_politedroid_4(self):
-        """Unset fields in Builds: entries should be removed."""
-        appid = 'com.politedroid'
-        app = metadata.read_metadata({appid: -1})[appid]
-        builds = rewritemeta.remove_blank_flags_from_builds(app.get('Builds'))
-        self.assertEqual(
-            builds[1],
-            {
-                'versionName': '1.3',
-                'versionCode': 4,
-                'commit': 'ad865b57bf3ac59580f38485608a9b1dda4fa7dc',
-                'target': 'android-15',
-            },
-        )
-
-    def test_remove_blank_flags_from_builds_org_adaway_52(self):
-        """Unset fields in Builds: entries should be removed."""
-        appid = 'org.adaway'
-        app = metadata.read_metadata({appid: -1})[appid]
-        builds = rewritemeta.remove_blank_flags_from_builds(app.get('Builds'))
-        self.assertEqual(
-            builds[-1],
-            {
-                'buildjni': ['yes'],
-                'commit': 'v3.0',
-                'gradle': ['yes'],
-                'preassemble': ['renameExecutables'],
-                'subdir': 'AdAway',
-                'versionCode': 52,
-                'versionName': '3.0',
-            },
-        )
-
-    def test_remove_blank_flags_from_builds_no_builds(self):
-        """Unset fields in Builds: entries should be removed."""
-        self.assertEqual(
-            rewritemeta.remove_blank_flags_from_builds(None),
-            list(),
-        )
-        self.assertEqual(
-            rewritemeta.remove_blank_flags_from_builds(dict()),
-            list(),
-        )
-        self.assertEqual(
-            rewritemeta.remove_blank_flags_from_builds(list()),
-            list(),
-        )
-        self.assertEqual(
-            rewritemeta.remove_blank_flags_from_builds(set()),
-            list(),
-        )
-        self.assertEqual(
-            rewritemeta.remove_blank_flags_from_builds(tuple()),
-            list(),
-        )
-
-    def test_remove_blank_flags_from_builds_0_is_a_value(self):
-        self.assertEqual(
-            rewritemeta.remove_blank_flags_from_builds([{'versionCode': 0}]),
-            [{'versionCode': 0}],
-        )
-
-    def test_remove_blank_flags_from_builds_values_to_purge(self):
-        self.assertEqual(
-            rewritemeta.remove_blank_flags_from_builds(
-                [
-                    {
-                        'antifeatures': dict(),
-                        'forceversion': False,
-                        'init': None,
-                        'rm': '',
-                        'scandelete': list(),
-                        'versionCode': 0,
-                    },
-                    {'antifeatures': list(), 'versionCode': 1},
-                    {'antifeatures': '', 'versionCode': 2},
-                ]
-            ),
-            [{'versionCode': 0}, {'versionCode': 1}, {'versionCode': 2}],
-        )
-
-    @mock.patch('sys.argv', ['fdroid rewritemeta', 'a'])
-    def test_rewrite_no_builds(self):
-        os.chdir(self.testdir)
-        Path('metadata').mkdir()
-        with Path('metadata/a.yml').open('w') as f:
-            f.write('AutoName: a')
-        rewritemeta.main()
-        self.assertEqual(
-            Path('metadata/a.yml').read_text(encoding='utf-8'),
-            textwrap.dedent(
-                '''\
-                License: Unknown
-
-                AutoName: a
-
-                AutoUpdateMode: None
-                UpdateCheckMode: None
-                '''
-            ),
-        )
-
-    @mock.patch('sys.argv', ['fdroid rewritemeta', 'a'])
-    def test_rewrite_empty_build_field(self):
-        os.chdir(self.testdir)
-        Path('metadata').mkdir()
-        with Path('metadata/a.yml').open('w') as fp:
-            fp.write(
-                textwrap.dedent(
-                    """
-                License: Apache-2.0
-                Builds:
-                  - versionCode: 4
-                    versionName: a
-                    rm:
-                """
-                )
-            )
-        rewritemeta.main()
-        self.assertEqual(
-            Path('metadata/a.yml').read_text(encoding='utf-8'),
-            textwrap.dedent(
-                '''\
-                License: Apache-2.0
-
-                Builds:
-                  - versionName: a
-                    versionCode: 4
-
-                AutoUpdateMode: None
-                UpdateCheckMode: None
-                '''
-            ),
-        )
-
-    def test_remove_blank_flags_from_builds_app_with_special_build_params(self):
-        appid = 'app.with.special.build.params'
-        app = metadata.read_metadata({appid: -1})[appid]
-        builds = rewritemeta.remove_blank_flags_from_builds(app.get('Builds'))
-        self.assertEqual(
-            builds[-1],
-            {
-                'versionName': '2.1.2',
-                'versionCode': 51,
-                'disable': 'Labelled as pre-release, so skipped',
-            },
-        )
-
-    def test_remove_blank_flags_from_builds_app_with_special_build_params_af(self):
-        """Unset fields in Builds: entries should be removed."""
-        appid = 'app.with.special.build.params'
-        app = metadata.read_metadata({appid: -1})[appid]
-        builds = rewritemeta.remove_blank_flags_from_builds(app.get('Builds'))
-        self.assertEqual(
-            builds[-2],
-            {
-                'antifeatures': {
-                    'Ads': {'en-US': 'includes ad lib\n', 'zh-CN': '包括广告图书馆\n'},
-                    'Tracking': {'en-US': 'standard suspects\n'},
-                },
-                'commit': '2.1.1',
-                'maven': '2',
-                'patch': [
-                    'manifest-ads.patch',
-                    'mobilecore.patch',
-                ],
-                'srclibs': ['FacebookSDK@sdk-version-3.0.2'],
-                'versionCode': 50,
-                'versionName': '2.1.1-c',
-            },
-        )
-
-    @mock.patch('sys.argv', ['fdroid rewritemeta', 'a', 'b'])
-    def test_rewrite_scenario_trivial(self):
-        with tempfile.TemporaryDirectory() as tmpdir, TmpCwd(tmpdir):
-            Path('metadata').mkdir()
-            with Path('metadata/a.yml').open('w') as f:
-                f.write('AutoName: a')
-            with Path('metadata/b.yml').open('w') as f:
-                f.write('AutoName: b')
-
-            rewritemeta.main()
-
-            self.assertEqual(
-                Path('metadata/a.yml').read_text(encoding='utf-8'),
-                textwrap.dedent(
-                    '''\
-                    License: Unknown
-
-                    AutoName: a
-
-                    AutoUpdateMode: None
-                    UpdateCheckMode: None
-                    '''
-                ),
-            )
-
-            self.assertEqual(
-                Path('metadata/b.yml').read_text(encoding='utf-8'),
-                textwrap.dedent(
-                    '''\
-                    License: Unknown
-
-                    AutoName: b
-
-                    AutoUpdateMode: None
-                    UpdateCheckMode: None
-                    '''
-                ),
-            )
diff --git a/tests/test_scanner.py b/tests/test_scanner.py
deleted file mode 100755
index 8da5d5cb..00000000
--- a/tests/test_scanner.py
+++ /dev/null
@@ -1,928 +0,0 @@
-#!/usr/bin/env python3
-
-import logging
-import os
-import pathlib
-import re
-import shutil
-import sys
-import tempfile
-import textwrap
-import unittest
-import uuid
-import zipfile
-from dataclasses import asdict
-from datetime import datetime, timedelta, timezone
-from unittest import mock
-
-if sys.version_info >= (3, 11):
-    import tomllib
-else:
-    import tomli as tomllib
-import yaml
-
-import fdroidserver.build
-import fdroidserver.common
-import fdroidserver.exception
-import fdroidserver.metadata
-import fdroidserver.scanner
-
-from .shared_test_code import TmpCwd, mkdtemp, mock_open_to_str
-
-basedir = pathlib.Path(__file__).parent
-
-
-def _dexdump_found():
-    """Find if dexdump is available in the PATH or in an Android SDK install.
-
-    This must be run after common.config is setup.
-
-    """
-    try:
-        dexdump = fdroidserver.common.find_sdk_tools_cmd("dexdump")
-        logging.debug('Found dexdump: %s', dexdump)
-        return dexdump is not None
-    except fdroidserver.exception.FDroidException:
-        pass
-    return False
-
-
-# Always use built-in default rules so changes in downloaded rules don't break tests.
-@mock.patch(
-    'fdroidserver.scanner.SUSSDataController.load',
-    fdroidserver.scanner.SUSSDataController.load_from_defaults,
-)
-class ScannerTest(unittest.TestCase):
-    def setUp(self):
-        os.chdir(basedir)
-        self._td = mkdtemp()
-        self.testdir = self._td.name
-        fdroidserver.scanner.ScannerTool.refresh_allowed = False
-
-    def tearDown(self):
-        os.chdir(basedir)
-        self._td.cleanup()
-
-    def test_scan_source_files(self):
-        fdroidserver.common.options = mock.Mock()
-        fdroidserver.common.options.json = False
-        projects = {
-            'OtakuWorld': 2,
-            'Zillode': 1,
-            'cn.wildfirechat.chat': 4,
-            'com.github.shadowsocks': 9,
-            'com.integreight.onesheeld': 17,
-            'com.jens.automation2': 3,
-            'firebase-suspect': 1,
-            'org.mozilla.rocket': 2,
-            'org.piepmeyer.gauguin': 1,
-            'org.tasks': 3,
-            'realm': 1,
-            'se.manyver': 3,
-            'lockfile.test': 1,
-            'com.lolo.io.onelist': 6,
-            'catalog.test': 22,
-        }
-        for d in (basedir / 'source-files').iterdir():
-            build = fdroidserver.metadata.Build()
-            should = projects.get(d.name, 0)
-            if should > 0:
-                with self.assertLogs(level=logging.ERROR):
-                    fatal_problems = fdroidserver.scanner.scan_source(d, build)
-            else:
-                with self.assertNoLogs():
-                    fatal_problems = fdroidserver.scanner.scan_source(d, build)
-            self.assertEqual(
-                should, fatal_problems, f'{d} should have {should} errors!'
-            )
-
-    def test_get_gradle_compile_commands_without_catalog(self):
-        test_files = [
-            ('source-files/fdroid/fdroidclient/build.gradle', 'yes', 15),
-            ('source-files/com.nextcloud.client/build.gradle', 'generic', 24),
-            ('source-files/com.kunzisoft.testcase/build.gradle', 'libre', 3),
-            ('source-files/cn.wildfirechat.chat/chat/build.gradle', 'yes', 30),
-            ('source-files/org.tasks/app/build.gradle.kts', 'generic', 41),
-            ('source-files/at.bitfire.davdroid/build.gradle', 'standard', 15),
-            ('source-files/se.manyver/android/app/build.gradle', 'indie', 26),
-            ('source-files/osmandapp/osmand/build.gradle', 'free', 2),
-            ('source-files/eu.siacs.conversations/build.gradle', 'free', 21),
-            ('source-files/org.mozilla.rocket/app/build.gradle', 'focus', 40),
-            ('source-files/com.jens.automation2/app/build.gradle', 'fdroidFlavor', 5),
-            ('source-files/flavor.test/build.gradle', ['foss', 'prod'], 7),
-        ]
-
-        for f, flavor, count in test_files:
-            i = 0
-            build = fdroidserver.metadata.Build()
-            if isinstance(flavor, list):
-                build.gradle = flavor
-            else:
-                build.gradle = [flavor]
-            regexs = fdroidserver.scanner.get_gradle_compile_commands_without_catalog(
-                build
-            )
-            with open(f, encoding='utf-8') as fp:
-                for line in fp.readlines():
-                    for regex in regexs:
-                        m = regex.match(line)
-                        if m:
-                            i += 1
-            self.assertEqual(count, i)
-
-    def test_get_gradle_compile_commands_with_catalog(self):
-        test_files = [
-            ('source-files/com.lolo.io.onelist/build.gradle.kts', 'yes', 5),
-            ('source-files/com.lolo.io.onelist/app/build.gradle.kts', 'yes', 26),
-            ('source-files/catalog.test/build.gradle.kts', 'yes', 3),
-            ('source-files/catalog.test/app/build.gradle', 'yes', 2),
-        ]
-
-        for f, flavor, count in test_files:
-            i = 0
-            build = fdroidserver.metadata.Build()
-            build.gradle = [flavor]
-            regexs = fdroidserver.scanner.get_gradle_compile_commands_with_catalog(
-                build, "libs"
-            )
-            with open(f, encoding='utf-8') as fp:
-                for line in fp.readlines():
-                    for regex in regexs:
-                        m = regex.match(line)
-                        if m:
-                            i += 1
-            self.assertEqual(count, i)
-
-    def test_catalog(self):
-        accessor_coordinate_pairs = {
-            'firebase.crash': ['com.google.firebase:firebase-crash:1.1.1'],
-            'firebase.core': ['com.google.firebase:firebase-core:2.2.2'],
-            'play.service.ads': ['com.google.android.gms:play-services-ads:1.2.1'],
-            'jacoco': ['org.jacoco:org.jacoco.core:0.8.7'],
-            'plugins.google.services': ['com.google.gms.google-services:1.2.1'],
-            'plugins.firebase.crashlytics': ['com.google.firebase.crashlytics:1.1.1'],
-            'bundles.firebase': [
-                'com.google.firebase:firebase-crash:1.1.1',
-                'com.google.firebase:firebase-core:2.2.2',
-            ],
-            'plugins.androidApplication.asLibraryDependency': [
-                'com.android.application:8.12.0'
-            ],
-        }
-        with open('source-files/catalog.test/gradle/libs.versions.toml', 'rb') as f:
-            catalog = fdroidserver.scanner.GradleVersionCatalog(tomllib.load(f))
-        for accessor, coordinate in accessor_coordinate_pairs.items():
-            self.assertEqual(catalog.get_coordinate(accessor), coordinate)
-
-    def test_get_catalogs(self):
-        test_files = [
-            ('source-files/com.lolo.io.onelist/', 1),
-            ('source-files/catalog.test/', 3),
-            ('source-files/org.piepmeyer.gauguin/', 1),
-            ('source-files/com.infomaniak.mail/', 2),
-        ]
-
-        for root, count in test_files:
-            self.assertEqual(count, len(fdroidserver.scanner.get_catalogs(root)))
-
-    def test_scan_source_files_sneaky_maven(self):
-        """Check for sneaking in banned maven repos"""
-        os.chdir(self.testdir)
-        fdroidserver.scanner.config = None
-        fdroidserver.common.options = mock.Mock()
-        fdroidserver.common.options.json = True
-        with open('build.gradle', 'w', encoding='utf-8') as fp:
-            fp.write(
-                textwrap.dedent(
-                    """
-                 maven {
-                    "https://jitpack.io"
-                    url 'https://maven.fabric.io/public'
-                 }
-                 maven {
-                    "https://maven.google.com"
-                    setUrl('https://evilcorp.com/maven')
-                 }
-            """
-                )
-            )
-        with self.assertLogs(level=logging.ERROR):
-            count = fdroidserver.scanner.scan_source(self.testdir)
-        self.assertEqual(2, count, 'there should be this many errors')
-
-    def test_scan_source_file_types(self):
-        """Build product files are not allowed, test they are detected
-
-        This test runs as if `fdroid build` running to test the
-        difference between absolute and relative paths.
-
-        """
-        build_dir = os.path.join('build', 'fake.app')
-        abs_build_dir = os.path.join(self.testdir, build_dir)
-        os.makedirs(abs_build_dir, exist_ok=True)
-        os.chdir(abs_build_dir)
-
-        fdroidserver.scanner.config = None
-        fdroidserver.common.options = mock.Mock()
-        fdroidserver.common.options.json = True
-
-        keep = [
-            'arg.jar',
-            'ascii.out',
-            'baz.so',
-            'classes.dex',
-            'sqlcipher.aar',
-            'static.a',
-            'src/test/resources/classes.dex',
-        ]
-        remove = ['gradle-wrapper.jar', 'gradlew', 'gradlew.bat']
-        os.makedirs('src/test/resources', exist_ok=True)
-        for f in keep + remove:
-            with open(f, 'w') as fp:
-                fp.write('placeholder')
-            self.assertTrue(os.path.exists(f))
-        binaries = ['binary.out', 'fake.png', 'snippet.png']
-        with open('binary.out', 'wb') as fp:
-            fp.write(b'\x00\x00')
-            fp.write(uuid.uuid4().bytes)
-        shutil.copyfile('binary.out', 'fake.png')
-        os.chmod('fake.png', 0o755)  # nosec B103
-        with open('snippet.png', 'wb') as fp:
-            fp.write(
-                b'\x89PNG\r\n\x1a\n\x00\x00\x00\rIHDR\x00\x00\x000\x00\x00'
-                b'\x000\x08\x06\x00\x00\x00W\x02\xf9\x87\x00\x00\x00\x04sB'
-                b'IT\x08\x08\x08\x08|\x08d\x88\x00\x00\x00\tpHYs\x00\x00\n'
-                b'a\x00\x00\na\x01\xfc\xccJ%\x00\x00\x00\x19tEXtSoftware'
-            )
-        os.chmod('snippet.png', 0o755)  # nosec B103
-
-        # run scanner as if from `fdroid build`
-        os.chdir(self.testdir)
-        json_per_build = fdroidserver.scanner.MessageStore()
-        with self.assertLogs(level=logging.ERROR):
-            count = fdroidserver.scanner.scan_source(
-                build_dir, json_per_build=json_per_build
-            )
-        self.assertEqual(6, count, 'there should be this many errors')
-        os.chdir(build_dir)
-
-        for f in keep + binaries:
-            self.assertTrue(os.path.exists(f), f + ' should still be there')
-        for f in remove:
-            self.assertFalse(os.path.exists(f), f + ' should have been removed')
-
-        json_per_build_asdict = asdict(json_per_build)
-        files = dict()
-        for section in ('errors', 'infos', 'warnings'):
-            files[section] = []
-            for msg, f in json_per_build_asdict[section]:
-                files[section].append(f)
-
-        self.assertFalse(
-            'ascii.out' in files['errors'], 'ASCII .out file is not an error'
-        )
-        self.assertFalse(
-            'snippet.png' in files['errors'], 'executable valid image is not an error'
-        )
-
-        self.assertTrue('arg.jar' in files['errors'], 'all JAR files are errors')
-        self.assertTrue('baz.so' in files['errors'], 'all .so files are errors')
-        self.assertTrue(
-            'binary.out' in files['errors'], 'a binary .out file is an error'
-        )
-        self.assertTrue(
-            'classes.dex' in files['errors'], 'all classes.dex files are errors'
-        )
-        self.assertTrue('sqlcipher.aar' in files['errors'], 'all AAR files are errors')
-        self.assertTrue('static.a' in files['errors'], 'all .a files are errors')
-
-        self.assertTrue(
-            'fake.png' in files['warnings'],
-            'a random binary that is executable that is not an image is a warning',
-        )
-        self.assertTrue(
-            'src/test/resources/classes.dex' in files['warnings'],
-            'suspicious file but in a test dir is a warning',
-        )
-
-        for f in remove:
-            self.assertTrue(
-                f in files['infos'], '%s should be removed with an info message' % f
-            )
-
-    def test_build_local_scanner(self):
-        """`fdroid build` calls scanner functions, test them here"""
-        os.chdir(self.testdir)
-        config = dict()
-        fdroidserver.common.fill_config_defaults(config)
-        fdroidserver.common.config = config
-        fdroidserver.build.config = config
-        fdroidserver.build.options = mock.Mock()
-        fdroidserver.build.options.json = False
-        fdroidserver.build.options.scan_binary = False
-        fdroidserver.build.options.notarball = True
-        fdroidserver.build.options.skipscan = False
-        fdroidserver.common.options = fdroidserver.build.options
-
-        app = fdroidserver.metadata.App()
-        app.id = 'mocked.app.id'
-        build = fdroidserver.metadata.Build()
-        build.commit = '1.0'
-        build.output = app.id + '.apk'
-        build.scanignore = ['baz.so', 'foo.aar']
-        build.versionCode = 1
-        build.versionName = '1.0'
-        vcs = mock.Mock()
-
-        for f in ('baz.so', 'foo.aar', 'gradle-wrapper.jar'):
-            with open(f, 'w') as fp:
-                fp.write('placeholder')
-            self.assertTrue(os.path.exists(f))
-
-        with open('build.xml', 'w', encoding='utf-8') as fp:
-            fp.write(
-                textwrap.dedent(
-                    """<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-                <project basedir="." default="clean" name="mockapp">
-                <target name="release"/>
-                <target name="clean"/>
-                </project>"""
-                )
-            )
-
-        def make_fake_apk(output, build):
-            with open(build.output, 'w') as fp:
-                fp.write('APK PLACEHOLDER')
-            return output
-
-        with mock.patch('fdroidserver.common.replace_build_vars', wraps=make_fake_apk):
-            with mock.patch('fdroidserver.common.get_native_code', return_value='x86'):
-                with (
-                    mock.patch(
-                        'fdroidserver.common.get_apk_id',
-                        return_value=(app.id, build.versionCode, build.versionName),
-                    ),
-                    mock.patch(
-                        'fdroidserver.common.get_source_date_epoch',
-                        lambda f: '1234567890',
-                    ),
-                ):
-                    with mock.patch(
-                        'fdroidserver.common.is_debuggable_or_testOnly',
-                        return_value=False,
-                    ):
-                        fdroidserver.build.build_local(
-                            app,
-                            build,
-                            vcs,
-                            build_dir=self.testdir,
-                            output_dir=self.testdir,
-                            log_dir=None,
-                            srclib_dir=None,
-                            extlib_dir=None,
-                            tmp_dir=None,
-                            force=False,
-                            onserver=False,
-                            refresh=False,
-                        )
-        self.assertTrue(os.path.exists('baz.so'))
-        self.assertTrue(os.path.exists('foo.aar'))
-        self.assertFalse(os.path.exists('gradle-wrapper.jar'))
-
-    def test_gradle_maven_url_regex(self):
-        """Check the regex can find all the cases"""
-        with open(basedir / 'gradle-maven-blocks.yaml') as fp:
-            data = yaml.safe_load(fp)
-
-        urls = []
-        for entry in data:
-            found = False
-            for m in fdroidserver.scanner.MAVEN_URL_REGEX.findall(entry):
-                urls.append(m)
-                found = True
-            self.assertTrue(found, 'this block should produce a URL:\n' + entry)
-        self.assertEqual(len(data), len(urls), 'each data example should produce a URL')
-
-    def test_scan_gradle_file_with_multiple_problems(self):
-        """Check that the scanner can handle scandelete with gradle files with multiple problems"""
-        os.chdir(self.testdir)
-        fdroidserver.scanner.config = None
-        fdroidserver.common.options = mock.Mock()
-        build = fdroidserver.metadata.Build()
-        build.scandelete = ['build.gradle']
-        with open('build.gradle', 'w', encoding='utf-8') as fp:
-            fp.write(
-                textwrap.dedent(
-                    """
-                 maven {
-                    url 'https://maven.fabric.io/public'
-                 }
-                 maven {
-                    url 'https://evilcorp.com/maven'
-                 }
-            """
-                )
-            )
-        count = fdroidserver.scanner.scan_source(self.testdir, build)
-        self.assertFalse(os.path.exists("build.gradle"))
-        self.assertEqual(0, count, 'there should be this many errors')
-
-    def test_get_embedded_classes(self):
-        config = dict()
-        fdroidserver.common.config = config
-        fdroidserver.common.fill_config_defaults(config)
-        if not _dexdump_found():
-            self.skipTest('Some Debian arches lack dexdump')
-        for f in (
-            'apk.embedded_1.apk',
-            'bad-unicode-πÇÇ现代通用字-български-عربي1.apk',
-            'janus.apk',
-            'minimal_targetsdk_30_unsigned.apk',
-            'no_targetsdk_minsdk1_unsigned.apk',
-            'org.bitbucket.tickytacky.mirrormirror_1.apk',
-            'org.bitbucket.tickytacky.mirrormirror_2.apk',
-            'org.bitbucket.tickytacky.mirrormirror_3.apk',
-            'org.bitbucket.tickytacky.mirrormirror_4.apk',
-            'org.dyndns.fules.ck_20.apk',
-            'SpeedoMeterApp.main_1.apk',
-            'urzip.apk',
-            'urzip-badcert.apk',
-            'urzip-badsig.apk',
-            'urzip-release.apk',
-            'urzip-release-unsigned.apk',
-            'repo/com.example.test.helloworld_1.apk',
-            'repo/com.politedroid_3.apk',
-            'repo/com.politedroid_4.apk',
-            'repo/com.politedroid_5.apk',
-            'repo/com.politedroid_6.apk',
-            'repo/duplicate.permisssions_9999999.apk',
-            'repo/info.zwanenburg.caffeinetile_4.apk',
-            'repo/no.min.target.sdk_987.apk',
-            'repo/obb.main.oldversion_1444412523.apk',
-            'repo/obb.mainpatch.current_1619_another-release-key.apk',
-            'repo/obb.mainpatch.current_1619.apk',
-            'repo/obb.main.twoversions_1101613.apk',
-            'repo/obb.main.twoversions_1101615.apk',
-            'repo/obb.main.twoversions_1101617.apk',
-            'repo/souch.smsbypass_9.apk',
-            'repo/urzip-; Рахма́, [rɐxˈmanʲɪnəf] سيرجي_رخمانينوف 谢·.apk',
-            'repo/v1.v2.sig_1020.apk',
-        ):
-            self.assertNotEqual(
-                set(),
-                fdroidserver.scanner.get_embedded_classes(f),
-                'should return results for ' + f,
-            )
-
-    def test_get_embedded_classes_empty_archives(self):
-        config = dict()
-        fdroidserver.common.config = config
-        fdroidserver.common.fill_config_defaults(config)
-        for f in (
-            'Norway_bouvet_europe_2.obf.zip',
-            'repo/fake.ota.update_1234.zip',
-        ):
-            self.assertEqual(
-                set(),
-                fdroidserver.scanner.get_embedded_classes(f),
-                'should return not results for ' + f,
-            )
-
-    def test_get_embedded_classes_secret_apk(self):
-        """Try to hide an APK+DEX in an APK and see if we can find it"""
-        config = dict()
-        fdroidserver.common.config = config
-        fdroidserver.common.fill_config_defaults(config)
-        if not _dexdump_found():
-            self.skipTest('Some Debian arches lack dexdump')
-        apk = 'urzip.apk'
-        mapzip = 'Norway_bouvet_europe_2.obf.zip'
-        secretfile = os.path.join(
-            basedir, 'org.bitbucket.tickytacky.mirrormirror_1.apk'
-        )
-        with tempfile.TemporaryDirectory() as tmpdir:
-            shutil.copy(apk, tmpdir)
-            shutil.copy(mapzip, tmpdir)
-            os.chdir(tmpdir)
-            with zipfile.ZipFile(mapzip, 'a') as zipfp:
-                zipfp.write(secretfile, 'secretapk')
-                with zipfile.ZipFile(apk) as readfp:
-                    with readfp.open('classes.dex') as cfp:
-                        zipfp.writestr('secretdex', cfp.read())
-            with zipfile.ZipFile(apk, 'a') as zipfp:
-                zipfp.write(mapzip)
-
-            cls = fdroidserver.scanner.get_embedded_classes(apk)
-            self.assertTrue(
-                'org/bitbucket/tickytacky/mirrormirror/MainActivity' in cls,
-                'this should find the classes in the hidden, embedded APK',
-            )
-            self.assertTrue(
-                'DEX file with fake name: secretdex' in cls,
-                'badly named embedded DEX fils should throw an error',
-            )
-            self.assertTrue(
-                'ZIP file without proper file extension: secretapk' in cls,
-                'badly named embedded ZIPs should throw an error',
-            )
-
-
-class Test_scan_binary(unittest.TestCase):
-    def setUp(self):
-        config = dict()
-        fdroidserver.common.fill_config_defaults(config)
-        fdroidserver.common.config = config
-        fdroidserver.common.options = mock.Mock()
-
-        if not _dexdump_found():
-            self.skipTest('Some Debian arches lack dexdump')
-
-        fdroidserver.scanner._SCANNER_TOOL = mock.Mock()
-        fdroidserver.scanner._SCANNER_TOOL.regexs = {}
-        fdroidserver.scanner._SCANNER_TOOL.regexs['err_code_signatures'] = {
-            "java/lang/Object": re.compile(
-                r'.*java/lang/Object', re.IGNORECASE | re.UNICODE
-            )
-        }
-        fdroidserver.scanner._SCANNER_TOOL.regexs['warn_code_signatures'] = {}
-
-    def test_code_signature_match(self):
-        apkfile = os.path.join(basedir, 'no_targetsdk_minsdk1_unsigned.apk')
-        with self.assertLogs(level=logging.CRITICAL):
-            problems = fdroidserver.scanner.scan_binary(apkfile)
-        self.assertEqual(
-            1,
-            problems,
-            "Did not find expected code signature '{}' in binary '{}'".format(
-                fdroidserver.scanner._SCANNER_TOOL.regexs[
-                    'err_code_signatures'
-                ].values(),
-                apkfile,
-            ),
-        )
-
-    def test_bottom_level_embedded_apk_code_signature(self):
-        apkfile = os.path.join(basedir, 'apk.embedded_1.apk')
-        fdroidserver.scanner._SCANNER_TOOL.regexs['err_code_signatures'] = {
-            "org/bitbucket/tickytacky/mirrormirror/MainActivity": re.compile(
-                r'.*org/bitbucket/tickytacky/mirrormirror/MainActivity',
-                re.IGNORECASE | re.UNICODE,
-            )
-        }
-
-        with self.assertLogs(level=logging.CRITICAL):
-            problems = fdroidserver.scanner.scan_binary(apkfile)
-        self.assertEqual(
-            1,
-            problems,
-            "Did not find expected code signature '{}' in binary '{}'".format(
-                fdroidserver.scanner._SCANNER_TOOL.regexs[
-                    'err_code_signatures'
-                ].values(),
-                apkfile,
-            ),
-        )
-
-    def test_top_level_signature_embedded_apk_present(self):
-        apkfile = os.path.join(basedir, 'apk.embedded_1.apk')
-        fdroidserver.scanner._SCANNER_TOOL.regexs['err_code_signatures'] = {
-            "org/fdroid/ci/BuildConfig": re.compile(
-                r'.*org/fdroid/ci/BuildConfig', re.IGNORECASE | re.UNICODE
-            )
-        }
-        with self.assertLogs(level=logging.CRITICAL):
-            problems = fdroidserver.scanner.scan_binary(apkfile)
-        self.assertEqual(
-            1,
-            problems,
-            "Did not find expected code signature '{}' in binary '{}'".format(
-                fdroidserver.scanner._SCANNER_TOOL.regexs[
-                    'err_code_signatures'
-                ].values(),
-                apkfile,
-            ),
-        )
-
-
-class Test_SignatureDataController(unittest.TestCase):
-    def test_init(self):
-        sdc = fdroidserver.scanner.SignatureDataController(
-            'nnn', 'fff.yml', 'https://example.com/test.json'
-        )
-        self.assertEqual(sdc.name, 'nnn')
-        self.assertEqual(sdc.filename, 'fff.yml')
-        self.assertEqual(sdc.cache_duration, timedelta(999999))
-        self.assertDictEqual(sdc.data, {})
-
-    # check_last_updated
-    def test_check_last_updated_ok(self):
-        sdc = fdroidserver.scanner.SignatureDataController(
-            'nnn', 'fff.yml', 'https://example.com/test.json'
-        )
-        sdc.data['last_updated'] = datetime.now(timezone.utc).timestamp()
-        sdc.check_last_updated()
-
-    def test_check_last_updated_exception_cache_outdated(self):
-        sdc = fdroidserver.scanner.SignatureDataController(
-            'nnn', 'fff.yml', 'https://example.com/test.json'
-        )
-        sdc.cache_duration = timedelta(days=7)
-        sdc.data['last_updated'] = (
-            datetime.now(timezone.utc) - timedelta(days=30)
-        ).timestamp()
-        with self.assertRaises(fdroidserver.scanner.SignatureDataOutdatedException):
-            sdc.check_last_updated()
-
-    def test_check_last_updated_exception_not_string(self):
-        sdc = fdroidserver.scanner.SignatureDataController(
-            'nnn', 'fff.yml', 'https://example.com/test.json'
-        )
-        sdc.data['last_updated'] = 'sepp'
-        with self.assertRaises(fdroidserver.scanner.SignatureDataMalformedException):
-            sdc.check_last_updated()
-
-    def test_check_last_updated_exception_not_iso_formatted_string(self):
-        sdc = fdroidserver.scanner.SignatureDataController(
-            'nnn', 'fff.yml', 'https://example.com/test.json'
-        )
-        sdc.data['last_updated'] = '01/09/2002 10:11'
-        with self.assertRaises(fdroidserver.scanner.SignatureDataMalformedException):
-            sdc.check_last_updated()
-
-    def test_check_last_updated_no_exception_missing_when_last_updated_not_set(self):
-        sdc = fdroidserver.scanner.SignatureDataController(
-            'nnn', 'fff.yml', 'https://example.com/test.json'
-        )
-        sdc.check_last_updated()
-
-    # check_data_version
-    def test_check_data_version_ok(self):
-        sdc = fdroidserver.scanner.SignatureDataController(
-            'nnn', 'fff.yml', 'https://example.com/test.json'
-        )
-        sdc.data['version'] = fdroidserver.scanner.SCANNER_CACHE_VERSION
-        sdc.check_data_version()
-
-    def test_check_data_version_exception(self):
-        sdc = fdroidserver.scanner.SignatureDataController(
-            'nnn', 'fff.yml', 'https://example.com/test.json'
-        )
-        with self.assertRaises(
-            fdroidserver.scanner.SignatureDataVersionMismatchException
-        ):
-            sdc.check_data_version()
-
-    def test_load_ok(self):
-        sdc = fdroidserver.scanner.SignatureDataController(
-            'nnn', 'fff.yml', 'https://example.com/test.json'
-        )
-        func_lfc = mock.Mock()
-        func_vd = mock.Mock()
-        func_clu = mock.Mock()
-        with (
-            mock.patch(
-                'fdroidserver.scanner.SignatureDataController.load_from_cache',
-                func_lfc,
-            ),
-            mock.patch(
-                'fdroidserver.scanner.SignatureDataController.verify_data',
-                func_vd,
-            ),
-            mock.patch(
-                'fdroidserver.scanner.SignatureDataController.check_last_updated',
-                func_clu,
-            ),
-        ):
-            sdc.load()
-        func_lfc.assert_called_once_with()
-        func_vd.assert_called_once_with()
-        func_clu.assert_called_once_with()
-
-    def test_load_initial_cache_miss(self):
-        sdc = fdroidserver.scanner.SignatureDataController(
-            'nnn', 'fff.yml', 'https://example.com/test.json'
-        )
-        func_lfc = mock.Mock(
-            side_effect=fdroidserver.scanner.SignatureDataCacheMissException
-        )
-        func_lfd = mock.Mock()
-        with (
-            mock.patch(
-                'fdroidserver.scanner.SignatureDataController.load_from_cache',
-                func_lfc,
-            ),
-            mock.patch(
-                'fdroidserver.scanner.SignatureDataController.load_from_defaults',
-                func_lfd,
-            ),
-        ):
-            sdc.load()
-        func_lfc.assert_called_once_with()
-        func_lfd.assert_called_once_with()
-
-    def test_load_cache_auto_refresh(self):
-        sdc = fdroidserver.scanner.SignatureDataController(
-            'nnn', 'fff.yml', 'https://example.com/test.json'
-        )
-        func_lfc = mock.Mock()
-        func_vd = mock.Mock()
-        func_clu = mock.Mock(
-            side_effect=fdroidserver.scanner.SignatureDataOutdatedException()
-        )
-        func_fsfw = mock.Mock()
-        func_wtc = mock.Mock()
-        with (
-            mock.patch(
-                'fdroidserver.scanner.SignatureDataController.load_from_cache',
-                func_lfc,
-            ),
-            mock.patch(
-                'fdroidserver.scanner.SignatureDataController.verify_data',
-                func_vd,
-            ),
-            mock.patch(
-                'fdroidserver.scanner.SignatureDataController.check_last_updated',
-                func_clu,
-            ),
-            mock.patch(
-                'fdroidserver.scanner.SignatureDataController.fetch_signatures_from_web',
-                func_fsfw,
-            ),
-            mock.patch(
-                'fdroidserver.scanner.SignatureDataController.write_to_cache',
-                func_wtc,
-            ),
-        ):
-            sdc.load()
-        func_lfc.assert_called_once_with()
-        func_vd.assert_called_once_with()
-        func_clu.assert_called_once_with()
-        func_fsfw.assert_called_once_with()
-        func_wtc.assert_called_once_with()
-
-    def test_load_try_web_when_no_defaults(self):
-        sdc = fdroidserver.scanner.SignatureDataController(
-            'nnn', 'fff.yml', 'https://example.com/test.json'
-        )
-        func_lfc = mock.Mock(
-            side_effect=fdroidserver.scanner.SignatureDataCacheMissException()
-        )
-        func_lfd = mock.Mock(
-            side_effect=fdroidserver.scanner.SignatureDataNoDefaultsException()
-        )
-        func_fsfw = mock.Mock()
-        func_wtc = mock.Mock()
-        with (
-            mock.patch(
-                'fdroidserver.scanner.SignatureDataController.load_from_cache',
-                func_lfc,
-            ),
-            mock.patch(
-                'fdroidserver.scanner.SignatureDataController.load_from_defaults',
-                func_lfd,
-            ),
-            mock.patch(
-                'fdroidserver.scanner.SignatureDataController.fetch_signatures_from_web',
-                func_fsfw,
-            ),
-            mock.patch(
-                'fdroidserver.scanner.SignatureDataController.write_to_cache',
-                func_wtc,
-            ),
-        ):
-            sdc.load()
-        func_lfc.assert_called_once_with()
-        func_lfd.assert_called_once_with()
-        func_fsfw.assert_called_once_with()
-        func_wtc.assert_called_once_with()
-
-    @unittest.skipIf(
-        sys.version_info < (3, 9, 0),
-        "mock_open doesn't allow easy access to written data in older python versions",
-    )
-    def test_write_to_cache(self):
-        open_func = mock.mock_open()
-        sdc = fdroidserver.scanner.SignatureDataController(
-            'nnn', 'fff.yml', 'https://example.com/test.json'
-        )
-        sdc.data = {"mocked": "data"}
-
-        with (
-            mock.patch("builtins.open", open_func),
-            mock.patch(
-                "fdroidserver.scanner._scanner_cachedir",
-                return_value=pathlib.Path('.'),
-            ),
-        ):
-            sdc.write_to_cache()
-
-        open_func.assert_called_with(pathlib.Path('fff.yml'), 'w', encoding="utf-8")
-        self.assertEqual(mock_open_to_str(open_func), """{\n  "mocked": "data"\n}""")
-
-
-class Test_ScannerTool(unittest.TestCase):
-    def setUp(self):
-        fdroidserver.common.options = None
-        fdroidserver.common.config = None
-        os.chdir(basedir)
-        self._td = mkdtemp()
-        self.testdir = self._td.name
-        fdroidserver.scanner.ScannerTool.refresh_allowed = True
-
-    def tearDown(self):
-        fdroidserver.common.options = None
-        fdroidserver.common.config = None
-        os.chdir(basedir)
-        self._td.cleanup()
-
-    def test_load(self):
-        st = mock.Mock()
-        st.sdcs = [mock.Mock(), mock.Mock()]
-        fdroidserver.scanner.ScannerTool.load(st)
-        st.sdcs[0].load.assert_called_once_with()
-        st.sdcs[1].load.assert_called_once_with()
-
-    def test_refresh_no_options_or_config(self):
-        """This simulates what happens when running something like scan_source()"""
-        with mock.patch('fdroidserver.scanner.ScannerTool.refresh') as refresh:
-            fdroidserver.scanner.ScannerTool()
-            refresh.assert_not_called()
-
-    def test_refresh_true(self):
-        fdroidserver.common.options = mock.Mock()
-        fdroidserver.common.options.refresh_scanner = True
-        with mock.patch('fdroidserver.scanner.ScannerTool.refresh') as refresh:
-            fdroidserver.scanner.ScannerTool()
-            refresh.assert_called_once()
-
-    def test_refresh_false(self):
-        fdroidserver.common.options = mock.Mock()
-        fdroidserver.common.options.refresh_scanner = False
-        with mock.patch('fdroidserver.scanner.ScannerTool.refresh') as refresh:
-            fdroidserver.scanner.ScannerTool()
-            refresh.assert_not_called()
-
-    def test_refresh_from_config(self):
-        os.chdir(self.testdir)
-        fdroidserver.common.write_config_file('refresh_scanner: true\n')
-        with mock.patch('fdroidserver.scanner.ScannerTool.refresh') as refresh:
-            fdroidserver.scanner.ScannerTool()
-            refresh.assert_called_once()
-
-    def test_refresh_options_overrides_config(self):
-        fdroidserver.common.options = mock.Mock()
-        fdroidserver.common.options.refresh_scanner = True
-        os.chdir(self.testdir)
-        fdroidserver.common.write_config_file('refresh_scanner: false\n')
-        with mock.patch('fdroidserver.scanner.ScannerTool.refresh') as refresh:
-            fdroidserver.scanner.ScannerTool()
-            refresh.assert_called_once()
-
-
-class Test_main(unittest.TestCase):
-    def setUp(self):
-        self.args = ["com.example.app", "local/additional.apk", "another.apk"]
-        self.exit_func = mock.Mock()
-        self.read_app_args_func = mock.Mock(return_value={})
-        self.scan_binary_func = mock.Mock(return_value=0)
-
-    def test_parsing_appid(self):
-        """This test verifies that app id get parsed correctly
-        (doesn't test how they get processed)
-        """
-        self.args = ["com.example.app"]
-        with (
-            tempfile.TemporaryDirectory() as tmpdir,
-            TmpCwd(tmpdir),
-            mock.patch("sys.exit", self.exit_func),
-            mock.patch("sys.argv", ["fdroid scanner", *self.args]),
-            mock.patch("fdroidserver.common.read_app_args", self.read_app_args_func),
-            mock.patch("fdroidserver.scanner.scan_binary", self.scan_binary_func),
-        ):
-            fdroidserver.scanner.main()
-
-            self.exit_func.assert_not_called()
-            self.read_app_args_func.assert_called_once_with(
-                ['com.example.app'], allow_version_codes=True
-            )
-            self.scan_binary_func.assert_not_called()
-
-    def test_parsing_apkpath(self):
-        """This test verifies that apk paths get parsed correctly
-        (doesn't test how they get processed)
-        """
-        self.args = ["local.application.apk"]
-        with (
-            tempfile.TemporaryDirectory() as tmpdir,
-            TmpCwd(tmpdir),
-            mock.patch("sys.exit", self.exit_func),
-            mock.patch("sys.argv", ["fdroid scanner", *self.args]),
-            mock.patch("fdroidserver.common.read_app_args", self.read_app_args_func),
-            mock.patch("fdroidserver.scanner.scan_binary", self.scan_binary_func),
-        ):
-            pathlib.Path(self.args[0]).touch()
-            fdroidserver.scanner.main()
-
-            self.exit_func.assert_not_called()
-            self.read_app_args_func.assert_not_called()
-            self.scan_binary_func.assert_called_once_with('local.application.apk')
diff --git a/tests/test_signatures.py b/tests/test_signatures.py
deleted file mode 100755
index 4f7bd105..00000000
--- a/tests/test_signatures.py
+++ /dev/null
@@ -1,59 +0,0 @@
-#!/usr/bin/env python3
-
-import hashlib
-import os
-import sys
-import unittest
-from tempfile import TemporaryDirectory
-
-from fdroidserver import common, signatures
-
-from .shared_test_code import TmpCwd
-
-basedir = os.path.dirname(__file__)
-
-
-class SignaturesTest(unittest.TestCase):
-    def setUp(self):
-        common.config = None
-        config = common.read_config()
-        config['jarsigner'] = common.find_sdk_tools_cmd('jarsigner')
-        common.config = config
-
-    @unittest.skipIf(sys.byteorder == 'big', "androguard is not ported to big-endian")
-    def test_main(self):
-        class OptionsFixture:
-            APK = [os.path.join(basedir, 'repo', 'com.politedroid_3.apk')]
-
-        with TemporaryDirectory() as tmpdir, TmpCwd(tmpdir):
-            signatures.extract(OptionsFixture)
-
-            # check if extracted signatures are where they are supposed to be
-            # also verify weather if extracted file contain what they should
-            filesAndHashes = (
-                (
-                    os.path.join(
-                        'metadata', 'com.politedroid', 'signatures', '3', 'MANIFEST.MF'
-                    ),
-                    '7dcd83f0c41a75457fd2311bf3c4578f80d684362d74ba8dc52838d353f31cf2',
-                ),
-                (
-                    os.path.join(
-                        'metadata', 'com.politedroid', 'signatures', '3', 'RELEASE.RSA'
-                    ),
-                    '883ef3d5a6e0bf69d2a58d9e255a7930f08a49abc38e216ed054943c99c8fdb4',
-                ),
-                (
-                    os.path.join(
-                        'metadata', 'com.politedroid', 'signatures', '3', 'RELEASE.SF'
-                    ),
-                    '99fbb3211ef5d7c1253f3a7ad4836eadc9905103ce6a75916c40de2831958284',
-                ),
-            )
-            for path, checksum in filesAndHashes:
-                self.assertTrue(
-                    os.path.isfile(path),
-                    f'check whether {path!r} was extracted correctly.',
-                )
-                with open(path, 'rb') as f:
-                    self.assertEqual(hashlib.sha256(f.read()).hexdigest(), checksum)
diff --git a/tests/test_signindex.py b/tests/test_signindex.py
deleted file mode 100755
index 21d54585..00000000
--- a/tests/test_signindex.py
+++ /dev/null
@@ -1,178 +0,0 @@
-#!/usr/bin/env python3
-
-import json
-import os
-import shutil
-import subprocess
-import tempfile
-import unittest
-from pathlib import Path
-from unittest.mock import patch
-
-from fdroidserver import apksigcopier, common, exception, signindex, update
-
-
-class Options:
-    allow_disabled_algorithms = False
-    clean = False
-    delete_unknown = False
-    nosign = False
-    pretty = True
-    rename_apks = False
-    verbose = False
-
-
-class SignindexTest(unittest.TestCase):
-    basedir = Path(__file__).resolve().parent
-
-    def setUp(self):
-        signindex.config = None
-        config = common.read_config()
-        config['jarsigner'] = common.find_sdk_tools_cmd('jarsigner')
-        config['verbose'] = True
-        config['keystore'] = str(self.basedir / 'keystore.jks')
-        config['repo_keyalias'] = 'sova'
-        config['keystorepass'] = 'r9aquRHYoI8+dYz6jKrLntQ5/NJNASFBacJh7Jv2BlI='
-        config['keypass'] = 'r9aquRHYoI8+dYz6jKrLntQ5/NJNASFBacJh7Jv2BlI='
-        signindex.config = config
-
-        self.tempdir = tempfile.TemporaryDirectory()
-        os.chdir(self.tempdir.name)
-        self.repodir = Path('repo')
-        self.repodir.mkdir()
-
-    def tearDown(self):
-        self.tempdir.cleanup()
-
-    def test_sign_index(self):
-        shutil.copy(str(self.basedir / 'repo/index-v1.json'), 'repo')
-        signindex.sign_index(str(self.repodir), 'index-v1.json')
-        self.assertTrue((self.repodir / 'index-v1.jar').exists())
-        self.assertTrue((self.repodir / 'index-v1.json').exists())
-
-    def test_sign_index_corrupt(self):
-        with open('repo/index-v1.json', 'w') as fp:
-            fp.write('corrupt JSON!')
-        with self.assertRaises(json.decoder.JSONDecodeError, msg='error on bad JSON'):
-            signindex.sign_index(str(self.repodir), 'index-v1.json')
-
-    def test_sign_entry(self):
-        entry = 'repo/entry.json'
-        v2 = 'repo/index-v2.json'
-        shutil.copy(self.basedir / entry, entry)
-        shutil.copy(self.basedir / v2, v2)
-        signindex.sign_index(self.repodir, 'entry.json')
-        self.assertTrue((self.repodir / 'entry.jar').exists())
-
-    def test_sign_entry_corrupt(self):
-        """sign_index should exit with error if entry.json is bad JSON"""
-        entry = 'repo/entry.json'
-        with open(entry, 'w') as fp:
-            fp.write('{')
-        with self.assertRaises(json.decoder.JSONDecodeError, msg='error on bad JSON'):
-            signindex.sign_index(self.repodir, 'entry.json')
-        self.assertFalse((self.repodir / 'entry.jar').exists())
-
-    def test_sign_entry_corrupt_leave_entry_jar(self):
-        """sign_index should not touch existing entry.jar if entry.json is corrupt"""
-        existing = 'repo/entry.jar'
-        testvalue = "Don't touch!"
-        with open(existing, 'w') as fp:
-            fp.write(testvalue)
-        with open('repo/entry.json', 'w') as fp:
-            fp.write('{')
-        with self.assertRaises(json.decoder.JSONDecodeError, msg='error on bad JSON'):
-            signindex.sign_index(self.repodir, 'entry.json')
-        with open(existing) as fp:
-            self.assertEqual(testvalue, fp.read())
-
-    def test_sign_corrupt_index_v2_json(self):
-        """sign_index should exit with error if index-v2.json JSON is corrupt"""
-        with open('repo/index-v2.json', 'w') as fp:
-            fp.write('{"key": "not really an index"')
-        good_entry = {
-            "timestamp": 1676583021000,
-            "version": 20002,
-            "index": {
-                "name": "/index-v2.json",
-                "sha256": common.sha256sum('repo/index-v2.json'),
-                "size": os.path.getsize('repo/index-v2.json'),
-                "numPackages": 0,
-            },
-        }
-        with open('repo/entry.json', 'w') as fp:
-            json.dump(good_entry, fp)
-        with self.assertRaises(json.decoder.JSONDecodeError, msg='error on bad JSON'):
-            signindex.sign_index(self.repodir, 'entry.json')
-        self.assertFalse((self.repodir / 'entry.jar').exists())
-
-    def test_sign_index_v2_corrupt_sha256(self):
-        """sign_index should exit with error if SHA-256 of file in entry is wrong"""
-        entry = 'repo/entry.json'
-        v2 = 'repo/index-v2.json'
-        shutil.copy(self.basedir / entry, entry)
-        shutil.copy(self.basedir / v2, v2)
-        with open(v2, 'a') as fp:
-            fp.write(' ')
-        with self.assertRaises(exception.FDroidException, msg='error on bad SHA-256'):
-            signindex.sign_index(self.repodir, 'entry.json')
-        self.assertFalse((self.repodir / 'entry.jar').exists())
-
-    def test_signindex(self):
-        if common.find_apksigner({}) is None:  # TODO remove me for buildserver-bullseye
-            self.skipTest('SKIPPING test_signindex, apksigner not installed!')
-        os.mkdir('archive')
-        metadata = Path('metadata')
-        metadata.mkdir()
-        with (metadata / 'info.guardianproject.urzip.yml').open('w') as fp:
-            fp.write('# placeholder')
-        shutil.copy(str(self.basedir / 'urzip.apk'), 'repo')
-        index_files = []
-        for f in (
-            'entry.jar',
-            'entry.json',
-            'index-v1.jar',
-            'index-v1.json',
-            'index-v2.json',
-            'index.jar',
-            'index.xml',
-        ):
-            for section in (Path('repo'), Path('archive')):
-                path = section / f
-                self.assertFalse(path.exists(), '%s should not exist yet!' % path)
-                index_files.append(path)
-        common.options = Options
-        with patch('sys.argv', ['fdroid update']):
-            update.main()
-        with patch('sys.argv', ['fdroid signindex', '--verbose']):
-            signindex.main()
-        for f in index_files:
-            self.assertTrue(f.exists(), '%s should exist!' % f)
-        self.assertFalse(os.path.exists('index-v2.jar'))  # no JAR version of this file
-
-        # index.jar aka v0 must by signed by SHA1withRSA
-        f = 'repo/index.jar'
-        common.verify_deprecated_jar_signature(f)
-        self.assertIsNone(apksigcopier.extract_v2_sig(f, expected=False))
-        cp = subprocess.run(
-            ['jarsigner', '-verify', '-verbose', f], stdout=subprocess.PIPE
-        )
-        self.assertTrue(b'SHA1withRSA' in cp.stdout)
-
-        # index-v1.jar must by signed by SHA1withRSA
-        f = 'repo/index-v1.jar'
-        common.verify_deprecated_jar_signature(f)
-        self.assertIsNone(apksigcopier.extract_v2_sig(f, expected=False))
-        cp = subprocess.run(
-            ['jarsigner', '-verify', '-verbose', f], stdout=subprocess.PIPE
-        )
-        self.assertTrue(b'SHA1withRSA' in cp.stdout)
-
-        # entry.jar aka index v2 must by signed by a modern algorithm
-        f = 'repo/entry.jar'
-        common.verify_deprecated_jar_signature(f)
-        self.assertIsNone(apksigcopier.extract_v2_sig(f, expected=False))
-        cp = subprocess.run(
-            ['jarsigner', '-verify', '-verbose', f], stdout=subprocess.PIPE
-        )
-        self.assertFalse(b'SHA1withRSA' in cp.stdout)
diff --git a/tests/test_update.py b/tests/test_update.py
deleted file mode 100755
index 623f48cc..00000000
--- a/tests/test_update.py
+++ /dev/null
@@ -1,2467 +0,0 @@
-#!/usr/bin/env python3
-
-import copy
-import glob
-import hashlib
-import json
-import logging
-import os
-import random
-import shutil
-import string
-import subprocess
-import sys
-import textwrap
-import time
-import unittest
-import zipfile
-from binascii import hexlify
-from datetime import datetime
-from pathlib import Path
-from unittest import mock
-
-import git
-import yaml
-
-try:
-    # these were moved in androguard 4.0
-    from androguard.core.apk import APK
-except ImportError:
-    from androguard.core.bytecodes.apk import APK
-
-try:
-    from yaml import CSafeLoader as SafeLoader
-except ImportError:
-    from yaml import SafeLoader
-
-try:
-    from yaml import CFullLoader as FullLoader
-except ImportError:
-    try:
-        # FullLoader is available from PyYaml 5.1+, as we don't load user
-        # controlled data here, it's okay to fall back the unsafe older
-        # Loader
-        from yaml import FullLoader
-    except ImportError:
-        from yaml import Loader as FullLoader
-
-from PIL import PngImagePlugin
-
-import fdroidserver.common
-import fdroidserver.exception
-import fdroidserver.metadata
-import fdroidserver.update
-from fdroidserver.common import CATEGORIES_CONFIG_NAME
-from fdroidserver.looseversion import LooseVersion
-
-from .shared_test_code import TmpCwd, mkdtemp
-
-DONATION_FIELDS = ('Donate', 'Liberapay', 'OpenCollective')
-
-logging.getLogger(PngImagePlugin.__name__).setLevel(logging.INFO)
-basedir = Path(__file__).parent
-
-
-class Options:
-    allow_disabled_algorithms = False
-    clean = False
-    delete_unknown = False
-    nosign = False
-    pretty = True
-    rename_apks = False
-    verbose = False
-
-
-@unittest.skipIf(sys.byteorder == 'big', 'androguard is not ported to big-endian')
-class UpdateTest(unittest.TestCase):
-    '''fdroid update'''
-
-    def setUp(self):
-        os.chdir(basedir)
-        self._td = mkdtemp()
-        self.testdir = self._td.name
-
-        fdroidserver.common.config = None
-        fdroidserver.common.options = None
-
-    def tearDown(self):
-        os.chdir(basedir)
-        self._td.cleanup()
-
-    def test_insert_store_metadata(self):
-        os.chdir(self.testdir)
-
-        config = dict()
-        fdroidserver.common.fill_config_defaults(config)
-        fdroidserver.update.config = config
-
-        repo_dir = basedir / 'repo'
-        os.mkdir('metadata')
-        for packageName in (
-            'obb.mainpatch.current',
-            'org.videolan.vlc',
-        ):
-            shutil.copytree(
-                repo_dir / packageName, os.path.join('repo', packageName)
-            )
-        for packageName in (
-            'info.guardianproject.checkey',
-            'info.guardianproject.urzip',
-            'org.smssecure.smssecure',
-        ):
-            shutil.copytree(
-                basedir / 'metadata' / packageName,
-                os.path.join('metadata', packageName),
-            )
-        for packageName in (
-            'com.nextcloud.client',
-            'com.nextcloud.client.dev',
-            'eu.siacs.conversations',
-        ):
-            shutil.copytree(
-                basedir / 'source-files' / packageName,
-                os.path.join(self.testdir, 'build', packageName),
-            )
-
-        testfilename = 'icon_yAfSvPRJukZzMMfUzvbYqwaD1XmHXNtiPBtuPVHW-6s=.png'
-        testfile = repo_dir / 'org.videolan.vlc/en-US/icon.png'
-        cpdir = os.path.join('metadata', 'org.videolan.vlc', 'en-US')
-        cpfile = os.path.join(cpdir, testfilename)
-        os.makedirs(cpdir, exist_ok=True)
-        shutil.copy(testfile, cpfile)
-        shutil.copystat(testfile, cpfile)
-
-        apps = dict()
-        for packageName in (
-            'info.guardianproject.urzip',
-            'org.videolan.vlc',
-            'obb.mainpatch.current',
-            'com.nextcloud.client',
-            'com.nextcloud.client.dev',
-            'eu.siacs.conversations',
-        ):
-            apps[packageName] = fdroidserver.metadata.App()
-            apps[packageName]['id'] = packageName
-            apps[packageName]['CurrentVersionCode'] = 0xCAFEBEEF
-
-        apps['info.guardianproject.urzip']['CurrentVersionCode'] = 100
-
-        buildnextcloudclient = fdroidserver.metadata.Build()
-        buildnextcloudclient.gradle = ['generic']
-        apps['com.nextcloud.client']['Builds'] = [buildnextcloudclient]
-
-        buildnextclouddevclient = fdroidserver.metadata.Build()
-        buildnextclouddevclient.gradle = ['versionDev']
-        apps['com.nextcloud.client.dev']['Builds'] = [buildnextclouddevclient]
-
-        build_conversations = fdroidserver.metadata.Build()
-        build_conversations.gradle = ['free']
-        apps['eu.siacs.conversations']['Builds'] = [build_conversations]
-
-        fdroidserver.update.insert_localized_app_metadata(apps)
-        fdroidserver.update.ingest_screenshots_from_repo_dir(apps)
-
-        appdir = Path('repo/info.guardianproject.urzip/en-US')
-        self.assertTrue(
-            os.path.isfile(
-                os.path.join(
-                    appdir, 'icon_NJXNzMcyf-v9i5a1ElJi0j9X1LvllibCa48xXYPlOqQ=.png'
-                )
-            )
-        )
-        self.assertTrue(
-            os.path.isfile(
-                os.path.join(
-                    appdir,
-                    'featureGraphic_GFRT5BovZsENGpJq1HqPODGWBRPWQsx25B95Ol5w_wU=.png',
-                )
-            )
-        )
-
-        self.assertEqual(6, len(apps))
-        for packageName, app in apps.items():
-            self.assertIn('localized', app, packageName)
-            self.assertIn('en-US', app['localized'])
-            self.assertEqual(1, len(app['localized']))
-            if packageName == 'info.guardianproject.urzip':
-                self.assertEqual(7, len(app['localized']['en-US']))
-                self.assertEqual('full description\n', app['localized']['en-US']['description'])
-                self.assertEqual('title', app['localized']['en-US']['name'])
-                self.assertEqual('short description', app['localized']['en-US']['summary'])
-                self.assertEqual('video', app['localized']['en-US']['video'])
-                self.assertEqual('icon_NJXNzMcyf-v9i5a1ElJi0j9X1LvllibCa48xXYPlOqQ=.png',
-                                 app['localized']['en-US']['icon'])
-                self.assertEqual('featureGraphic_GFRT5BovZsENGpJq1HqPODGWBRPWQsx25B95Ol5w_wU=.png',
-                                 app['localized']['en-US']['featureGraphic'])
-                self.assertEqual('100\n', app['localized']['en-US']['whatsNew'])
-            elif packageName == 'org.videolan.vlc':
-                self.assertEqual(testfilename, app['localized']['en-US']['icon'])
-                self.assertEqual(9, len(app['localized']['en-US']['phoneScreenshots']))
-                self.assertEqual(15, len(app['localized']['en-US']['sevenInchScreenshots']))
-            elif packageName == 'obb.mainpatch.current':
-                self.assertEqual('icon_WI0pkO3LsklrsTAnRr-OQSxkkoMY41lYe2-fAvXLiLg=.png',
-                                 app['localized']['en-US']['icon'])
-                self.assertEqual('featureGraphic_ffhLaojxbGAfu9ROe1MJgK5ux8d0OVc6b65nmvOBaTk=.png',
-                                 app['localized']['en-US']['featureGraphic'])
-                self.assertEqual(1, len(app['localized']['en-US']['phoneScreenshots']))
-                self.assertEqual(1, len(app['localized']['en-US']['sevenInchScreenshots']))
-            elif packageName == 'com.nextcloud.client':
-                self.assertEqual('Nextcloud', app['localized']['en-US']['name'])
-                self.assertEqual(1073, len(app['localized']['en-US']['description']))
-                self.assertEqual(78, len(app['localized']['en-US']['summary']))
-            elif packageName == 'com.nextcloud.client.dev':
-                self.assertEqual('Nextcloud Dev', app['localized']['en-US']['name'])
-                self.assertEqual(586, len(app['localized']['en-US']['description']))
-                self.assertEqual(78, len(app['localized']['en-US']['summary']))
-            elif packageName == 'eu.siacs.conversations':
-                self.assertEqual('Conversations', app['localized']['en-US']['name'])
-
-    def test_insert_fastlane_default_txt_changelog(self):
-        """Test that Fastlane's default.txt is handled properly
-
-        https://docs.fastlane.tools/actions/supply/#changelogs-whats-new
-        """
-        os.chdir(self.testdir)
-
-        config = dict()
-        fdroidserver.common.fill_config_defaults(config)
-        fdroidserver.update.config = config
-
-        app = fdroidserver.metadata.App()
-        app.id = 'com.example.app'
-        changelogs_dir = 'build/%s/metadata/en-US/changelogs' % app.id
-        os.makedirs(changelogs_dir)
-        with open(os.path.join(changelogs_dir, 'default.txt'), 'w') as fp:
-            fp.write('default')
-        with open(os.path.join(changelogs_dir, '42.txt'), 'w') as fp:
-            fp.write('42')
-        apps = {app.id: app}
-        build = fdroidserver.metadata.Build()
-        build.versionCode = 42
-        app['Builds'] = [build]
-
-        fdroidserver.update.insert_localized_app_metadata(apps)
-        self.assertEqual('default', apps[app.id]['localized']['en-US']['whatsNew'])
-
-        app.CurrentVersionCode = 1
-        fdroidserver.update.insert_localized_app_metadata(apps)
-        self.assertEqual('default', apps[app.id]['localized']['en-US']['whatsNew'])
-
-        app.CurrentVersionCode = 10000
-        fdroidserver.update.insert_localized_app_metadata(apps)
-        self.assertEqual('default', apps[app.id]['localized']['en-US']['whatsNew'])
-
-        app.CurrentVersionCode = 42
-        fdroidserver.update.insert_localized_app_metadata(apps)
-        self.assertEqual('42', apps[app.id]['localized']['en-US']['whatsNew'])
-
-    def test_fastlane_with_subdir(self):
-        """Test if fastlane in simple one-level subdir is found."""
-        os.chdir(self.testdir)
-        config = dict()
-        fdroidserver.common.fill_config_defaults(config)
-        fdroidserver.update.config = config
-
-        app = fdroidserver.metadata.App()
-        app.id = 'com.example.app'
-        build_dir = f'build/{app.id}'
-        flavor = 'flavor'
-        subdir = 'subproject'
-        apps = {app.id: app}
-        build = fdroidserver.metadata.Build()
-        build.versionCode = 42
-        build.gradle = [flavor]
-        build.subdir = subdir
-        app['Builds'] = [build]
-
-        first_value = 'first'
-        first_dir = Path(f'{build_dir}/src/{flavor}/fastlane/metadata/android/en-US')
-        first_dir.mkdir(parents=True)
-        (first_dir / 'title.txt').write_text(first_value)
-        fdroidserver.update.insert_localized_app_metadata(apps)
-        self.assertEqual(first_value, apps[app.id]['localized']['en-US']['name'])
-
-        second_value = 'second'
-        second_dir = Path(f'{build_dir}/{subdir}/fastlane/metadata/android/en-US')
-        second_dir.mkdir(parents=True)
-        (second_dir / 'title.txt').write_text(second_value)
-        fdroidserver.update.insert_localized_app_metadata(apps)
-        self.assertEqual(second_value, apps[app.id]['localized']['en-US']['name'])
-
-    def test_fastlane_with_schildichat(self):
-        """Test if fastlane is found in this tangle of dirs and symlinks.
-
-        https://github.com/SchildiChat/schildichat-android-next/tree/sc_v0.10.3-ex_25_6_2
-        """
-        os.chdir(self.testdir)
-        config = dict()
-        fdroidserver.common.fill_config_defaults(config)
-        fdroidserver.update.config = config
-
-        app = fdroidserver.metadata.App()
-        app.id = 'chat.schildi.android'
-        build_dir = f'build/{app.id}'
-        flavors = ['fdroid', 'sc', 'default']
-        subdir = 'app'
-        apps = {app.id: app}
-        build = fdroidserver.metadata.Build()
-        build.versionCode = 42
-        build.gradle = flavors
-        build.subdir = subdir
-        app['Builds'] = [build]
-
-        wrong_value = 'wrong'
-        wrong_dir = Path(f'{build_dir}/upstream_infra/fastlane/metadata/android/en-US')
-        wrong_dir.mkdir(parents=True)
-        (wrong_dir / 'title.txt').write_text(wrong_value)
-
-        right_value = 'right'
-        right_dir = Path(f'{build_dir}/metadata/en-US')
-        right_dir.mkdir(parents=True)
-        (right_dir / 'title.txt').write_text(right_value)
-        _fastlane = Path('.fastlane/metadata')
-        _fastlane.mkdir(parents=True)
-        os.symlink('../../metadata', _fastlane / 'android')
-        os.symlink('.fastlane', 'fastlane')
-        fdroidserver.update.insert_localized_app_metadata(apps)
-        self.assertEqual(right_value, apps[app.id]['localized']['en-US']['name'])
-
-    def test_fastlane_with_multi_level_subdir(self):
-        """Test if fastlane in multi-level subdir is found."""
-        os.chdir(self.testdir)
-        config = dict()
-        fdroidserver.common.fill_config_defaults(config)
-        fdroidserver.update.config = config
-
-        app = fdroidserver.metadata.App()
-        app.id = 'org.videolan.vlc'
-        build_dir = f'build/{app.id}'
-        subdir = 'application/app'
-        apps = {app.id: app}
-        build = fdroidserver.metadata.Build()
-        build.versionCode = 42
-        build.gradle = ['yes']
-        build.subdir = subdir
-        app['Builds'] = [build]
-
-        first_value = 'first'
-        first_dir = Path(f'{build_dir}/{subdir}/fastlane/metadata/android/en-US')
-        first_dir.mkdir(parents=True)
-        (first_dir / 'title.txt').write_text(first_value)
-        fdroidserver.update.insert_localized_app_metadata(apps)
-        self.assertEqual(first_value, apps[app.id]['localized']['en-US']['name'])
-
-        # I'm not sure that it is correct behavior for this path to
-        # override the above path, but it is how it is working now. It
-        # seems to me it should be the other way around, but that is
-        # really hard to implement using the current algorithm.
-        second_value = 'second'
-        second_dir = Path(f'{build_dir}/fastlane/metadata/android/en-US')
-        second_dir.mkdir(parents=True)
-        (second_dir / 'title.txt').write_text(second_value)
-        fdroidserver.update.insert_localized_app_metadata(apps)
-        self.assertEqual(second_value, apps[app.id]['localized']['en-US']['name'])
-
-    def test_name_title_scraping(self):
-        """metadata file --> fdroiddata localized files --> fastlane/triple-t in app source --> APK"""
-        shutil.copytree(basedir, self.testdir, dirs_exist_ok=True)
-        config = dict()
-        fdroidserver.common.fill_config_defaults(config)
-        fdroidserver.common.config = config
-        fdroidserver.update.config = config
-        os.chdir(self.testdir)
-        fdroidserver.common.options = Options
-        fdroidserver.update.options = fdroidserver.common.options
-        fdroidserver.update.options.clean = True
-        fdroidserver.update.options.delete_unknown = True
-
-        apps = fdroidserver.metadata.read_metadata()
-        apps['info.guardianproject.urzip']['CurrentVersionCode'] = 100
-        knownapks = fdroidserver.common.KnownApks()
-        apks, cachechanged = fdroidserver.update.process_apks({}, 'repo', knownapks, False)
-        fdroidserver.update.insert_localized_app_metadata(apps)
-        fdroidserver.update.ingest_screenshots_from_repo_dir(apps)
-        fdroidserver.update.apply_info_from_latest_apk(apps, apks)
-        app = apps['info.guardianproject.urzip']
-        self.assertIsNone(app.Name)
-        self.assertTrue('localized' in app)
-        self.assertEqual('title', app['localized']['en-US']['name'])
-        self.assertEqual('100\n', app['localized']['en-US']['whatsNew'])
-        app = apps['org.videolan.vlc']
-        self.assertIsNone(app.Name)
-        self.assertTrue('localized' in app)
-        self.assertFalse('name' in app['localized']['en-US'])
-        app = apps['info.guardianproject.checkey']
-        self.assertEqual('Checkey the app!', app.Name)
-        self.assertTrue('localized' in app)
-        self.assertEqual('Checkey: info on local apps', app['localized']['en-US']['name'])
-        self.assertEqual('Checkey: ローカルアプリの情報', app['localized']['ja-JP']['name'])
-        app = apps['org.adaway']
-        self.assertIsNone(app.Name)
-        self.assertFalse('localized' in app)
-        app = apps['obb.main.twoversions']
-        self.assertIsNone(app.Name)
-        self.assertFalse('localized' in app)
-
-    def test_insert_missing_app_names_from_apks(self):
-        """en-US serves as the final, default, fallback value with index-v1"""
-        testvalue = 'TESTVALUE!'
-        apps = {
-            'none': {},
-            'name': {'Name': testvalue},
-            'onlyapk': {'Name': None},
-            'autoname': {'AutoName': 'autoname', 'Name': None},
-            'onlylocalized': {'localized': {'en-US': {'name': testvalue}}},
-            'non_en_us_localized': {'localized': {'de-AT': {'name': 'leiwand'}}},
-            'apks': {},
-        }
-        apks = [
-            {'packageName': 'none', 'name': '', 'versionCode': 1},
-            {'packageName': 'name', 'name': 'fromapk', 'versionCode': 1},
-            {'packageName': 'onlyapk', 'name': testvalue, 'versionCode': 1},
-            {'packageName': 'autoname', 'name': testvalue, 'versionCode': 1},
-            {'packageName': 'onlylocalized', 'name': 'fromapk', 'versionCode': 1},
-            {'packageName': 'non_en_us_localized', 'name': testvalue, 'versionCode': 0xcafe},
-            {'packageName': 'apks', 'name': 'fromapk1', 'versionCode': 1},
-            {'packageName': 'apks', 'name': 'fromapk2', 'versionCode': 2},
-            {'packageName': 'apks', 'name': testvalue, 'versionCode': 3},
-        ]
-        fdroidserver.common.options = Options
-        fdroidserver.update.insert_missing_app_names_from_apks(apps, apks)
-        for appid, app in apps.items():
-            if appid == 'none':
-                self.assertIsNone(app.get('Name'))
-                self.assertIsNone(app.get('localized'))
-            elif appid == 'onlyapk':
-                self.assertIsNone(app.get('Name'))
-                self.assertEqual(testvalue, app['localized']['en-US']['name'])
-            elif appid == 'autoname':
-                self.assertIsNone(app.get('Name'))
-                self.assertEqual(testvalue, app['localized']['en-US']['name'])
-            elif appid == 'onlylocalized':
-                self.assertIsNone(app.get('Name'))
-                self.assertEqual(testvalue, app['localized']['en-US']['name'])
-            elif appid == 'non_en_us_localized':
-                self.assertIsNone(app.get('Name'))
-                self.assertEqual(testvalue, app['localized']['en-US']['name'])
-            elif appid == 'name':
-                self.assertEqual(testvalue, app['Name'])
-                self.assertIsNone(app.get('localized'))
-            elif appid == 'apks':
-                self.assertIsNone(app.get('Name'))
-                self.assertEqual(testvalue, app['localized']['en-US']['name'])
-
-    def test_insert_missing_app_names_from_apks_from_repo(self):
-        os.chdir(self.testdir)
-        shutil.copytree(basedir, self.testdir, dirs_exist_ok=True)
-        config = dict()
-        fdroidserver.common.fill_config_defaults(config)
-        fdroidserver.common.config = config
-        fdroidserver.update.config = config
-        fdroidserver.common.options = Options
-        fdroidserver.update.options = fdroidserver.common.options
-        fdroidserver.update.options.clean = True
-        fdroidserver.update.options.delete_unknown = True
-
-        apps = fdroidserver.metadata.read_metadata()
-        knownapks = fdroidserver.common.KnownApks()
-        apks, cachechanged = fdroidserver.update.process_apks({}, 'repo', knownapks, False)
-
-        appid = 'info.guardianproject.checkey'
-        testapps = {appid: copy.copy(apps[appid])}
-        self.assertEqual('Checkey the app!', testapps[appid]['Name'])
-        del testapps[appid]['Name']
-        fdroidserver.update.insert_missing_app_names_from_apks(testapps, apks)
-        self.assertIsNone(testapps[appid].get('Name'))
-
-        repoapps = fdroidserver.update.prepare_apps(apps, apks, 'repo')
-        fdroidserver.update.insert_missing_app_names_from_apks(repoapps, apks)
-        self.assertIsNone(repoapps['com.politedroid']['Name'])
-        self.assertEqual('Polite Droid',
-                         repoapps['com.politedroid']['localized']['en-US']['name'])
-        self.assertEqual('Duplicate Permisssions', repoapps['duplicate.permisssions']['Name'])
-        self.assertEqual('Caffeine Tile', repoapps['info.zwanenburg.caffeinetile']['Name'])
-        self.assertEqual('No minSdkVersion or targetSdkVersion', repoapps['no.min.target.sdk']['Name'])
-        self.assertIsNone(repoapps['obb.main.oldversion'].get('Name'))
-        self.assertEqual('OBB Main Old Version',
-                         repoapps['obb.main.oldversion']['localized']['en-US']['name'])
-        self.assertIsNone(repoapps['obb.main.twoversions'].get('Name'))
-        self.assertEqual('OBB Main Two Versions',
-                         repoapps['obb.main.twoversions']['localized']['en-US']['name'])
-        self.assertIsNone(repoapps['souch.smsbypass'].get('Name'))
-        self.assertEqual('Battery level',
-                         repoapps['souch.smsbypass']['localized']['en-US']['name'])
-        self.assertIsNone(repoapps['info.guardianproject.urzip'].get('Name'))
-        self.assertEqual('title',
-                         repoapps['info.guardianproject.urzip']['localized']['en-US']['name'])
-        self.assertIsNone(repoapps['obb.mainpatch.current'].get('Name'))
-
-        del repoapps['info.guardianproject.urzip']['localized']
-        fdroidserver.update.insert_missing_app_names_from_apks(repoapps, apks)
-        self.assertEqual('urzip-πÇÇπÇÇ现代汉语通用字-български-عربي1234',
-                         repoapps['info.guardianproject.urzip']['localized']['en-US']['name'])
-
-    def test_insert_triple_t_metadata(self):
-        importer = basedir / 'tmp/importer'
-        packageName = 'org.fdroid.ci.test.app'
-        if not os.path.isdir(importer):
-            logging.warning('skipping test_insert_triple_t_metadata, test_import.py must run first!')
-            return
-        packageDir = os.path.join(self.testdir, 'build', packageName)
-        shutil.copytree(importer, packageDir)
-
-        # always use the same commit so these tests work when ci-test-app.git is updated
-        repo = git.Repo(packageDir)
-        for remote in repo.remotes:
-            remote.fetch()
-        repo.git.reset('--hard', 'b9e5d1a0d8d6fc31d4674b2f0514fef10762ed4f')
-        repo.git.clean('-fdx')
-
-        os.mkdir(os.path.join(self.testdir, 'metadata'))
-        metadata = dict()
-        metadata['Description'] = 'This is just a test app'
-        with open(os.path.join(self.testdir, 'metadata', packageName + '.yml'), 'w') as fp:
-            yaml.dump(metadata, fp)
-
-        config = dict()
-        fdroidserver.common.fill_config_defaults(config)
-        fdroidserver.common.config = config
-        fdroidserver.update.config = config
-        os.chdir(self.testdir)
-
-        apps = fdroidserver.metadata.read_metadata()
-        fdroidserver.update.copy_triple_t_store_metadata(apps)
-
-        # TODO ideally, this would compare the whole dict like in test_metadata.test_read_metadata()
-        correctlocales = [
-            'ar', 'ast_ES', 'az', 'ca', 'ca_ES', 'cs-CZ', 'cs_CZ', 'da',
-            'da-DK', 'de', 'de-DE', 'el', 'en-US', 'es', 'es-ES', 'es_ES', 'et',
-            'fi', 'fr', 'fr-FR', 'he_IL', 'hi-IN', 'hi_IN', 'hu', 'id', 'it',
-            'it-IT', 'it_IT', 'iw-IL', 'ja', 'ja-JP', 'kn_IN', 'ko', 'ko-KR',
-            'ko_KR', 'lt', 'nb', 'nb_NO', 'nl', 'nl-NL', 'no', 'pl', 'pl-PL',
-            'pl_PL', 'pt', 'pt-BR', 'pt-PT', 'pt_BR', 'ro', 'ro_RO', 'ru-RU',
-            'ru_RU', 'sv-SE', 'sv_SE', 'te', 'tr', 'tr-TR', 'uk', 'uk_UA', 'vi',
-            'vi_VN', 'zh-CN', 'zh_CN', 'zh_TW',
-        ]
-        locales = sorted(apps['org.fdroid.ci.test.app']['localized'])
-        self.assertEqual(correctlocales, locales)
-
-    def test_insert_triple_t_1_graphics(self):
-        packageName = 'de.wivewa.dialer'
-        shutil.copytree(basedir / 'triple-t-1-graphics', self.testdir, dirs_exist_ok=True)
-        os.chdir(self.testdir)
-
-        config = dict()
-        fdroidserver.common.fill_config_defaults(config)
-        fdroidserver.common.config = config
-        fdroidserver.update.config = config
-
-        apps = fdroidserver.metadata.read_metadata()
-        fdroidserver.update.copy_triple_t_store_metadata(apps)
-
-        os.chdir(os.path.join('repo', packageName))
-        self.assertTrue(os.path.exists(os.path.join('en-US', 'icon.png')))
-        self.assertTrue(os.path.exists(os.path.join('en-US', 'featureGraphic.png')))
-        self.assertTrue(os.path.exists(os.path.join('en-US', 'phoneScreenshots', '1.png')))
-
-    def test_insert_triple_t_2_metadata(self):
-        packageName = 'org.piwigo.android'
-        shutil.copytree(basedir / 'triple-t-2', self.testdir, dirs_exist_ok=True)
-        os.chdir(self.testdir)
-
-        config = dict()
-        fdroidserver.common.fill_config_defaults(config)
-        fdroidserver.common.config = config
-        fdroidserver.update.config = config
-
-        apps = fdroidserver.metadata.read_metadata()
-        self.assertTrue(packageName in apps)
-        fdroidserver.update.copy_triple_t_store_metadata(apps)
-        correctlocales = ['de-DE', 'en-US', 'fr-FR', 'kn-IN']
-        app = apps[packageName]
-        self.assertEqual('android@piwigo.org', app['authorEmail'])
-        self.assertEqual('https://www.piwigo.org', app['authorWebSite'])
-        locales = sorted(list(app['localized'].keys()))
-        self.assertEqual(correctlocales, locales)
-        kn_IN = app['localized']['kn-IN']
-        self.assertTrue('description' in kn_IN)
-        self.assertTrue('name' in kn_IN)
-        self.assertTrue('summary' in kn_IN)
-        en_US = app['localized']['en-US']
-        self.assertTrue('whatsNew' in en_US)
-
-        os.chdir(os.path.join('repo', packageName))
-        self.assertTrue(os.path.exists(os.path.join('en-US', 'icon.png')))
-        self.assertTrue(os.path.exists(os.path.join('en-US', 'featureGraphic.png')))
-        self.assertTrue(os.path.exists(os.path.join('en-US', 'phoneScreenshots', '01_Login.jpg')))
-        self.assertTrue(os.path.exists(os.path.join('en-US', 'sevenInchScreenshots', '01_Login.png')))
-        self.assertFalse(os.path.exists(os.path.join('de-DE', 'icon.png')))
-        self.assertFalse(os.path.exists(os.path.join('de-DE', 'featureGraphic.png')))
-        self.assertFalse(os.path.exists(os.path.join('de-DE', 'phoneScreenshots', '01_Login.jpg')))
-        self.assertFalse(os.path.exists(os.path.join('de-DE', 'sevenInchScreenshots', '01_Login.png')))
-
-    def test_insert_triple_t_anysoftkeyboard(self):
-        packages = ('com.anysoftkeyboard.languagepack.dutch', 'com.menny.android.anysoftkeyboard')
-        names = ('Dutch for AnySoftKeyboard', 'AnySoftKeyboard')
-
-        shutil.copytree(basedir / 'triple-t-anysoftkeyboard', self.testdir, dirs_exist_ok=True)
-        os.chdir(self.testdir)
-
-        for packageName, name in zip(packages, names):
-            config = dict()
-            fdroidserver.common.fill_config_defaults(config)
-            fdroidserver.common.config = config
-            fdroidserver.update.config = config
-            fdroidserver.update.options = fdroidserver.common.options
-
-            apps = fdroidserver.metadata.read_metadata()
-            self.assertTrue(packageName in apps)
-            fdroidserver.update.copy_triple_t_store_metadata(apps)
-            app = apps[packageName]
-            self.assertEqual(app['localized']['en-US']['name'], name)
-
-    def test_insert_triple_t_multiple_metadata(self):
-        namespace = 'ch.admin.bag.covidcertificate.'
-        packages = ('verifier', 'wallet')
-        names = dict(verifier='COVID Certificate Check', wallet='COVID Certificate')
-
-        shutil.copytree(basedir / 'triple-t-multiple', self.testdir, dirs_exist_ok=True)
-        os.chdir(self.testdir)
-
-        for p in packages:
-            packageName = namespace + p
-            config = dict()
-            fdroidserver.common.fill_config_defaults(config)
-            fdroidserver.common.config = config
-            fdroidserver.update.config = config
-            fdroidserver.update.options = fdroidserver.common.options
-
-            apps = fdroidserver.metadata.read_metadata()
-            self.assertTrue(packageName in apps)
-            fdroidserver.update.copy_triple_t_store_metadata(apps)
-            app = apps[packageName]
-            self.assertEqual(app['localized']['en-US']['name'], names[p])
-
-    def test_insert_triple_t_flutter(self):
-        packageName = 'fr.emersion.goguma'
-
-        shutil.copytree(basedir / 'triple-t-flutter', self.testdir, dirs_exist_ok=True)
-        os.chdir(self.testdir)
-
-        config = dict()
-        fdroidserver.common.fill_config_defaults(config)
-        fdroidserver.common.config = config
-        fdroidserver.update.config = config
-        fdroidserver.update.options = fdroidserver.common.options
-
-        apps = fdroidserver.metadata.read_metadata()
-        self.assertTrue(packageName in apps)
-        fdroidserver.update.copy_triple_t_store_metadata(apps)
-        app = apps[packageName]
-        self.assertEqual(app['authorWebSite'], 'https://emersion.fr')
-        self.assertEqual(app['localized']['en-US']['name'], 'Goguma')
-        self.assertEqual(app['localized']['en-US']['summary'], 'An IRC client for mobile devices')
-
-    def testBadGetsig(self):
-        """getsig() should still be able to fetch the fingerprint of bad signatures"""
-        # config needed to use jarsigner and keytool
-        config = dict()
-        fdroidserver.common.fill_config_defaults(config)
-        fdroidserver.update.config = config
-
-        apkfile = 'urzip-badsig.apk'
-        sig = fdroidserver.update.getsig(apkfile)
-        self.assertEqual(sig, 'e0ecb5fc2d63088e4a07ae410a127722',
-                         "python sig should be: " + str(sig))
-
-        apkfile = 'urzip-badcert.apk'
-        sig = fdroidserver.update.getsig(apkfile)
-        self.assertEqual(sig, 'e0ecb5fc2d63088e4a07ae410a127722',
-                         "python sig should be: " + str(sig))
-
-    def test_getsig(self):
-        # config needed to use jarsigner and keytool
-        config = dict()
-        fdroidserver.common.fill_config_defaults(config)
-        fdroidserver.update.config = config
-
-        sig = fdroidserver.update.getsig('urzip-release-unsigned.apk')
-        self.assertIsNone(sig)
-
-        good_fingerprint = 'b4964fd759edaa54e65bb476d0276880'
-
-        apkpath = 'urzip-release.apk'  # v1 only
-        sig = fdroidserver.update.getsig(apkpath)
-        self.assertEqual(good_fingerprint, sig,
-                         'python sig was: ' + str(sig))
-
-        apkpath = 'repo/v1.v2.sig_1020.apk'
-        sig = fdroidserver.update.getsig(apkpath)
-        self.assertEqual(good_fingerprint, sig,
-                         'python sig was: ' + str(sig))
-        # check that v1 and v2 have the same certificate
-        apkobject = APK(apkpath)
-        cert_encoded = apkobject.get_certificates_der_v2()[0]
-        self.assertEqual(good_fingerprint, sig,
-                         hashlib.md5(hexlify(cert_encoded)).hexdigest())  # nosec just used as ID for signing key
-
-        filename = 'v2.only.sig_2.apk'
-        with zipfile.ZipFile(filename) as z:
-            self.assertTrue('META-INF/MANIFEST.MF' in z.namelist(), 'META-INF/MANIFEST.MF required')
-            for f in z.namelist():
-                # ensure there are no v1 signature files
-                self.assertIsNone(fdroidserver.common.SIGNATURE_BLOCK_FILE_REGEX.match(f))
-        sig = fdroidserver.update.getsig(filename)
-        self.assertEqual(good_fingerprint, sig,
-                         "python sig was: " + str(sig))
-
-    def testScanApksAndObbs(self):
-        os.chdir(self.testdir)
-        shutil.copytree(basedir / 'repo', 'repo')
-        shutil.copytree(basedir / 'metadata', 'metadata')
-        config = dict()
-        fdroidserver.common.fill_config_defaults(config)
-        config['ndk_paths'] = dict()
-        fdroidserver.common.config = config
-        fdroidserver.update.config = config
-
-        fdroidserver.common.options = Options
-        fdroidserver.update.options = fdroidserver.common.options
-        fdroidserver.update.options.clean = True
-        fdroidserver.update.options.delete_unknown = True
-
-        apps = fdroidserver.metadata.read_metadata()
-        knownapks = fdroidserver.common.KnownApks()
-        apks, cachechanged = fdroidserver.update.process_apks({}, 'repo', knownapks, False)
-        self.assertEqual(len(apks), 18)
-        apk = apks[1]
-        self.assertEqual(apk['packageName'], 'com.politedroid')
-        self.assertEqual(apk['versionCode'], 3)
-        self.assertEqual(apk['minSdkVersion'], 3)
-        self.assertIsNone(apk.get('targetSdkVersion'))
-        self.assertFalse('maxSdkVersion' in apk)
-        apk = apks[8]
-        self.assertEqual(apk['packageName'], 'obb.main.oldversion')
-        self.assertEqual(apk['versionCode'], 1444412523)
-        self.assertEqual(apk['minSdkVersion'], 4)
-        self.assertEqual(apk['targetSdkVersion'], 18)
-        self.assertFalse('maxSdkVersion' in apk)
-
-        fdroidserver.update.insert_obbs('repo', apps, apks)
-        for apk in apks:
-            if apk['packageName'] == 'obb.mainpatch.current':
-                self.assertEqual(apk.get('obbMainFile'), 'main.1619.obb.mainpatch.current.obb')
-                self.assertEqual(apk.get('obbPatchFile'), 'patch.1619.obb.mainpatch.current.obb')
-            elif apk['packageName'] == 'obb.main.oldversion':
-                self.assertEqual(apk.get('obbMainFile'), 'main.1434483388.obb.main.oldversion.obb')
-                self.assertIsNone(apk.get('obbPatchFile'))
-            elif apk['packageName'] == 'obb.main.twoversions':
-                self.assertIsNone(apk.get('obbPatchFile'))
-                if apk['versionCode'] == 1101613:
-                    self.assertEqual(apk.get('obbMainFile'), 'main.1101613.obb.main.twoversions.obb')
-                elif apk['versionCode'] == 1101615:
-                    self.assertEqual(apk.get('obbMainFile'), 'main.1101615.obb.main.twoversions.obb')
-                elif apk['versionCode'] == 1101617:
-                    self.assertEqual(apk.get('obbMainFile'), 'main.1101615.obb.main.twoversions.obb')
-                else:
-                    self.assertTrue(False)
-            elif apk['packageName'] == 'info.guardianproject.urzip':
-                self.assertIsNone(apk.get('obbMainFile'))
-                self.assertIsNone(apk.get('obbPatchFile'))
-
-    def test_apkcache_json(self):
-        """test the migration from pickle to json"""
-        os.chdir(self.testdir)
-        shutil.copytree(basedir / 'repo', 'repo')
-        config = dict()
-        fdroidserver.common.fill_config_defaults(config)
-        config['ndk_paths'] = dict()
-        fdroidserver.common.config = config
-        fdroidserver.update.config = config
-
-        fdroidserver.common.options = Options
-        fdroidserver.update.options = fdroidserver.common.options
-        fdroidserver.update.options.clean = True
-        fdroidserver.update.options.delete_unknown = True
-
-        fdroidserver.metadata.read_metadata()
-        knownapks = fdroidserver.common.KnownApks()
-        apkcache = fdroidserver.update.get_cache()
-        self.assertEqual(2, len(apkcache))
-        self.assertEqual(fdroidserver.update.METADATA_VERSION, apkcache["METADATA_VERSION"])
-        self.assertEqual(fdroidserver.update.options.allow_disabled_algorithms,
-                         apkcache['allow_disabled_algorithms'])
-        apks, cachechanged = fdroidserver.update.process_apks(apkcache, 'repo', knownapks, False)
-        fdroidserver.update.write_cache(apkcache)
-
-        fdroidserver.update.options.clean = False
-        read_from_json = fdroidserver.update.get_cache()
-        self.assertEqual(20, len(read_from_json))
-        for f in glob.glob('repo/*.apk'):
-            self.assertTrue(os.path.basename(f) in read_from_json)
-
-        fdroidserver.update.options.clean = True
-        reset = fdroidserver.update.get_cache()
-        self.assertEqual(2, len(reset))
-
-    def test_scan_repo_files(self):
-        config = dict()
-        fdroidserver.common.fill_config_defaults(config)
-        fdroidserver.common.config = config
-        fdroidserver.update.config = config
-
-        os.chdir(self.testdir)
-        os.mkdir('repo')
-        filename = 'Norway_bouvet_europe_2.obf.zip'
-        shutil.copy(basedir / filename, 'repo')
-        knownapks = fdroidserver.common.KnownApks()
-        files, fcachechanged = fdroidserver.update.scan_repo_files(dict(), 'repo', knownapks, False)
-        self.assertTrue(fcachechanged)
-
-        info = files[0]
-        self.assertEqual(filename, info['apkName'])
-        self.assertEqual(datetime, type(info['added']))
-        self.assertEqual(os.path.getsize(os.path.join('repo', filename)), info['size'])
-        self.assertEqual(
-            '531190bdbc07e77d5577249949106f32dac7f62d38d66d66c3ae058be53a729d',
-            info['hash'],
-        )
-
-    def test_read_added_date_from_all_apks(self):
-        os.chdir(self.testdir)
-        shutil.copytree(basedir / 'repo', 'repo')
-        config = dict()
-        fdroidserver.common.fill_config_defaults(config)
-        fdroidserver.common.config = config
-        fdroidserver.update.config = config
-        fdroidserver.common.options = Options
-        apps = fdroidserver.metadata.read_metadata()
-        knownapks = fdroidserver.common.KnownApks()
-        apks, cachechanged = fdroidserver.update.process_apks({}, 'repo', knownapks)
-        fdroidserver.update.read_added_date_from_all_apks(apps, apks)
-
-    def test_apply_info_from_latest_apk(self):
-        os.chdir(self.testdir)
-        shutil.copytree(basedir / 'repo', 'repo')
-        config = dict()
-        fdroidserver.common.fill_config_defaults(config)
-        fdroidserver.common.config = config
-        fdroidserver.update.config = config
-        fdroidserver.common.options = Options
-        fdroidserver.update.options = fdroidserver.common.options
-        apps = fdroidserver.metadata.read_metadata()
-        knownapks = fdroidserver.common.KnownApks()
-        apks, cachechanged = fdroidserver.update.process_apks({}, 'repo', knownapks)
-        fdroidserver.update.apply_info_from_latest_apk(apps, apks)
-
-    def test_scan_apk(self):
-        config = dict()
-        fdroidserver.common.fill_config_defaults(config)
-        fdroidserver.common.config = config
-        fdroidserver.update.config = config
-        os.chdir(basedir)
-
-        if 'apksigner' in config:
-            apk_info = fdroidserver.update.scan_apk('v2.only.sig_2.apk')
-            self.assertIsNone(apk_info.get('maxSdkVersion'))
-            self.assertEqual(apk_info.get('versionName'), 'v2-only')
-            self.assertEqual(apk_info.get('versionCode'), 2)
-        else:
-            print('WARNING: skipping v2-only test since apksigner cannot be found')
-        apk_info = fdroidserver.update.scan_apk('repo/v1.v2.sig_1020.apk')
-        self.assertIsNone(apk_info.get('maxSdkVersion'))
-        self.assertEqual(apk_info.get('versionName'), 'v1+2')
-        self.assertEqual(apk_info.get('versionCode'), 1020)
-
-        apk_info = fdroidserver.update.scan_apk('repo/souch.smsbypass_9.apk')
-        self.assertIsNone(apk_info.get('maxSdkVersion'))
-        self.assertEqual(apk_info.get('versionName'), '0.9')
-
-        apk_info = fdroidserver.update.scan_apk('repo/duplicate.permisssions_9999999.apk')
-        self.assertEqual(apk_info.get('versionName'), '')
-        self.assertEqual(apk_info['icons_src'], {'160': 'res/drawable/ic_launcher.png',
-                                                 '-1': 'res/drawable/ic_launcher.png'})
-
-        apk_info = fdroidserver.update.scan_apk('org.dyndns.fules.ck_20.apk')
-        self.assertEqual(apk_info['icons_src'], {'240': 'res/drawable-hdpi-v4/icon_launcher.png',
-                                                 '120': 'res/drawable-ldpi-v4/icon_launcher.png',
-                                                 '160': 'res/drawable-mdpi-v4/icon_launcher.png',
-                                                 '-1': 'res/drawable-mdpi-v4/icon_launcher.png'})
-        self.assertEqual(apk_info['icons'], {})
-        self.assertEqual(apk_info['features'], [])
-        self.assertEqual(apk_info['antiFeatures'], dict())
-        self.assertEqual(apk_info['versionName'], 'v1.6pre2')
-        self.assertEqual(apk_info['hash'],
-                         '897486e1f857c6c0ee32ccbad0e1b8cd82f6d0e65a44a23f13f852d2b63a18c8')
-        self.assertEqual(apk_info['packageName'], 'org.dyndns.fules.ck')
-        self.assertEqual(apk_info['versionCode'], 20)
-        self.assertEqual(apk_info['size'], 132453)
-        self.assertEqual(apk_info['nativecode'],
-                         ['arm64-v8a', 'armeabi', 'armeabi-v7a', 'mips', 'mips64', 'x86', 'x86_64'])
-        self.assertEqual(apk_info['minSdkVersion'], 7)
-        self.assertEqual(apk_info['sig'], '9bf7a6a67f95688daec75eab4b1436ac')
-        self.assertEqual(apk_info['hashType'], 'sha256')
-        self.assertEqual(apk_info['targetSdkVersion'], 8)
-
-        apk_info = fdroidserver.update.scan_apk('org.bitbucket.tickytacky.mirrormirror_4.apk')
-        self.assertEqual(apk_info.get('versionName'), '1.0.3')
-        self.assertEqual(apk_info['icons_src'], {'160': 'res/drawable-mdpi/mirror.png',
-                                                 '-1': 'res/drawable-mdpi/mirror.png'})
-
-        apk_info = fdroidserver.update.scan_apk('repo/info.zwanenburg.caffeinetile_4.apk')
-        self.assertEqual(apk_info.get('versionName'), '1.3')
-        self.assertEqual(apk_info['icons_src'], {})
-
-        apk_info = fdroidserver.update.scan_apk('repo/com.politedroid_6.apk')
-        self.assertEqual(apk_info.get('versionName'), '1.5')
-        self.assertEqual(apk_info['icons_src'], {'120': 'res/drawable-ldpi-v4/icon.png',
-                                                 '160': 'res/drawable-mdpi-v4/icon.png',
-                                                 '240': 'res/drawable-hdpi-v4/icon.png',
-                                                 '320': 'res/drawable-xhdpi-v4/icon.png',
-                                                 '-1': 'res/drawable-mdpi-v4/icon.png'})
-
-        apk_info = fdroidserver.update.scan_apk('SpeedoMeterApp.main_1.apk')
-        self.assertEqual(apk_info.get('versionName'), '1.0')
-        self.assertEqual(apk_info['icons_src'], {})
-
-    def test_scan_apk_no_min_target(self):
-        config = dict()
-        fdroidserver.common.fill_config_defaults(config)
-        fdroidserver.common.config = config
-        fdroidserver.update.config = config
-        apk_info = fdroidserver.update.scan_apk('repo/no.min.target.sdk_987.apk')
-        self.maxDiff = None
-        expected = {
-            'icons': {},
-            'icons_src': {'-1': 'res/drawable/ic_launcher.png',
-                          '160': 'res/drawable/ic_launcher.png'},
-            'name': 'No minSdkVersion or targetSdkVersion',
-            'signer': '32a23624c201b949f085996ba5ed53d40f703aca4989476949cae891022e0ed6',
-            'hashType': 'sha256',
-            'packageName': 'no.min.target.sdk',
-            'features': [],
-            'antiFeatures': dict(),
-            'size': 14102,
-            'sig': 'b4964fd759edaa54e65bb476d0276880',
-            'versionName': '1.2-fake',
-            'uses-permission-sdk-23': [],
-            'hash': 'e2e1dc1d550df2b5bc383860139207258645b5540abeccd305ed8b2cb6459d2c',
-            'versionCode': 987,
-            'minSdkVersion': 3,
-            'uses-permission': [
-                fdroidserver.update.UsesPermission(name='android.permission.WRITE_EXTERNAL_STORAGE',
-                                                   maxSdkVersion=None),
-                fdroidserver.update.UsesPermission(name='android.permission.READ_PHONE_STATE',
-                                                   maxSdkVersion=None),
-                fdroidserver.update.UsesPermission(name='android.permission.READ_EXTERNAL_STORAGE',
-                                                   maxSdkVersion=None),
-            ],
-        }
-        if config.get('ipfs_cid'):
-            expected['ipfsCIDv1'] = 'bafybeidwxseoagnew3gtlasttqovl7ciuwxaud5a5p4a5pzpbrfcfj2gaa'
-
-        self.assertDictEqual(apk_info, expected)
-
-    def test_scan_apk_no_sig(self):
-        config = dict()
-        fdroidserver.common.fill_config_defaults(config)
-        fdroidserver.common.config = config
-        fdroidserver.update.config = config
-        os.chdir(basedir)
-        if os.path.basename(os.getcwd()) != 'tests':
-            raise Exception('This test must be run in the "tests/" subdir')
-
-        with self.assertRaises(fdroidserver.exception.BuildException):
-            fdroidserver.update.scan_apk('urzip-release-unsigned.apk')
-
-    def test_scan_apk_bad_zip(self):
-        config = dict()
-        fdroidserver.common.fill_config_defaults(config)
-        fdroidserver.common.config = config
-        fdroidserver.update.config = config
-        os.chdir(self.testdir)
-        os.mkdir('repo')
-        apkfile = 'repo/badzip_1.apk'
-        with open(apkfile, 'w') as fp:
-            fp.write('this is not a zip file')
-        with self.assertRaises(fdroidserver.exception.BuildException):
-            fdroidserver.update.scan_apk(apkfile)
-
-    @unittest.skipUnless(
-        os.path.exists('tests/SystemWebView-repack.apk'), "file too big for sdist"
-    )
-    def test_scan_apk_bad_icon_id(self):
-        """Some APKs can produce an exception when extracting the icon
-
-        This kind of parsing exception should be reported then ignored
-        so that working APKs can be included in the index.  There are
-        so many weird things that make it into APKs, that does not
-        automatically disqualify them from inclusion. For example:
-
-        ValueError: invalid literal for int() with base 16: '<0x801FF, type 0x07>'
-
-        The test APK was made from:
-        https://gitlab.com/fdroid/fdroidserver/-/merge_requests/1018#note_690565333
-        It was then stripped down by doing:
-
-        * mkdir SystemWebView
-        * cd SystemWebView/
-        * unzip ../SystemWebView.apk
-        * rm -rf META-INF/ lib assets/icudtl.dat assets/stored-locales/
-        * jar cf ../SystemWebView-repack.apk *
-        """
-        # reset the state, perhaps this should be in setUp()
-        config = dict()
-        fdroidserver.common.fill_config_defaults(config)
-        fdroidserver.common.config = config
-        fdroidserver.update.config = config
-        with mkdtemp() as tmpdir, TmpCwd(tmpdir):
-            os.mkdir('repo')
-            apkfile = 'repo/SystemWebView-repack.apk'
-            shutil.copy(basedir / os.path.basename(apkfile), apkfile)
-            fdroidserver.update.scan_apk(apkfile)
-
-    def test_scan_apk_bad_namespace_in_manifest(self):
-        """Some APKs can produce an exception when parsing the AndroidManifest.xml
-
-        This kind of parsing exception should be reported then ignored
-        so that working APKs can be included in the index.  There are
-        so many weird things that make it into APKs, that does not
-        automatically disqualify them from inclusion.
-
-        This APK has <uses-permission> elements with messed up namespaces:
-        <uses-permission xmlns:n1="android" n1:name="android.permission.VIBRATE"/>
-
-        """
-        # reset the state, perhaps this should be in setUp()
-        config = dict()
-        fdroidserver.common.fill_config_defaults(config)
-        fdroidserver.common.config = config
-        fdroidserver.update.config = config
-        with mkdtemp() as tmpdir, TmpCwd(tmpdir):
-            os.mkdir('repo')
-            apkfile = 'repo/org.sajeg.fallingblocks_3.apk'
-            shutil.copy(basedir / os.path.basename(apkfile), apkfile)
-            fdroidserver.update.scan_apk(apkfile)
-
-    def test_process_apk(self):
-        def _build_yaml_representer(dumper, data):
-            '''Creates a YAML representation of a Build instance'''
-            return dumper.represent_dict(data)
-
-        os.chdir(self.testdir)
-        shutil.copytree(basedir, 'tests')
-        config = dict()
-        fdroidserver.common.fill_config_defaults(config)
-        fdroidserver.common.config = config
-        fdroidserver.update.config = config
-        os.chdir("tests")
-
-        config['ndk_paths'] = dict()
-        fdroidserver.common.config = config
-        fdroidserver.update.config = config
-
-        fdroidserver.common.options = Options
-        fdroidserver.update.options = fdroidserver.common.options
-        fdroidserver.update.options.clean = True
-        fdroidserver.update.options.delete_unknown = True
-
-        for icon_dir in fdroidserver.update.get_all_icon_dirs('repo'):
-            if not os.path.exists(icon_dir):
-                os.makedirs(icon_dir)
-
-        knownapks = fdroidserver.common.KnownApks()
-        apkList = ['../urzip.apk', '../org.dyndns.fules.ck_20.apk']
-
-        for apkName in apkList:
-            _, apk, cachechanged = fdroidserver.update.process_apk({}, apkName, 'repo', knownapks,
-                                                                   False)
-            # Don't care about the date added to the repo and relative apkName
-            self.assertEqual(datetime, type(apk['added']))
-            del apk['added']
-            del apk['apkName']
-
-            # ensure that icons have been extracted properly
-            if apkName == '../urzip.apk':
-                self.assertEqual(apk['icon'], 'info.guardianproject.urzip.100.png')
-            if apkName == '../org.dyndns.fules.ck_20.apk':
-                self.assertEqual(apk['icon'], 'org.dyndns.fules.ck.20.png')
-            for density in fdroidserver.update.screen_densities:
-                icon_path = os.path.join(
-                    fdroidserver.update.get_icon_dir('repo', density), apk['icon']
-                )
-                self.assertTrue(os.path.isfile(icon_path))
-                self.assertTrue(os.path.getsize(icon_path) > 1)
-
-            savepath = os.path.join('metadata', 'apk', apk['packageName'] + '.yaml')
-            # Uncomment to save APK metadata
-            # with open(savepath, 'w') as f:
-            #     yaml.add_representer(fdroidserver.metadata.Build, _build_yaml_representer)
-            #     yaml.dump(apk, f, default_flow_style=False)
-
-            # CFullLoader doesn't always work
-            # https://github.com/yaml/pyyaml/issues/266#issuecomment-559116876
-            TestLoader = FullLoader
-            try:
-                testyaml = '- !!python/object/new:fdroidserver.update.UsesPermission\n  - test\n  - null'
-                from_yaml = yaml.load(testyaml, Loader=TestLoader)  # nosec B506
-            except yaml.constructor.ConstructorError:
-                from yaml import UnsafeLoader as TestLoader
-
-            with open(savepath, 'r') as f:
-                from_yaml = yaml.load(f, Loader=TestLoader)  # nosec B506
-            self.maxDiff = None
-            if not config.get('ipfs_cid'):
-                del from_yaml['ipfsCIDv1']  # handle when ipfs_cid is not installed
-            self.assertEqual(apk, from_yaml)
-
-    def test_process_apk_signed_by_disabled_algorithms(self):
-        config = dict()
-        fdroidserver.common.fill_config_defaults(config)
-        fdroidserver.update.config = config
-
-        config['ndk_paths'] = dict()
-        fdroidserver.common.config = config
-        fdroidserver.update.config = config
-
-        fdroidserver.common.options = Options
-        fdroidserver.update.options = fdroidserver.common.options
-        fdroidserver.update.options.clean = True
-        fdroidserver.update.options.verbose = True
-        fdroidserver.update.options.delete_unknown = True
-
-        knownapks = fdroidserver.common.KnownApks()
-
-        with mkdtemp() as tmptestsdir, TmpCwd(tmptestsdir):
-            os.mkdir('repo')
-            os.mkdir('archive')
-            # setup the repo, create icons dirs, etc.
-            fdroidserver.update.process_apks({}, 'repo', knownapks)
-            fdroidserver.update.process_apks({}, 'archive', knownapks)
-
-            disabledsigs = ['org.bitbucket.tickytacky.mirrormirror_2.apk']
-            for apkName in disabledsigs:
-                shutil.copy(basedir / apkName,
-                            os.path.join(tmptestsdir, 'repo'))
-
-                skip, apk, cachechanged = fdroidserver.update.process_apk({}, apkName, 'repo',
-                                                                          knownapks,
-                                                                          allow_disabled_algorithms=True,
-                                                                          archive_bad_sig=False)
-                self.assertFalse(skip)
-                self.assertIsNotNone(apk)
-                self.assertTrue(cachechanged)
-                self.assertFalse(os.path.exists(os.path.join('archive', apkName)))
-                self.assertTrue(os.path.exists(os.path.join('repo', apkName)))
-
-                if os.path.exists('/usr/bin/apksigner') or 'apksigner' in config:
-                    print('SKIPPING: apksigner installed and it allows MD5 signatures')
-                    return
-
-                javac = config['jarsigner'].replace('jarsigner', 'javac')
-                v = subprocess.check_output([javac, '-version'], stderr=subprocess.STDOUT)[6:-1].decode('utf-8')
-                if LooseVersion(v) < LooseVersion('1.8.0_132'):
-                    print('SKIPPING: running tests with old Java (' + v + ')')
-                    return
-
-                # this test only works on systems with fully updated Java/jarsigner
-                # that has MD5 listed in jdk.jar.disabledAlgorithms in java.security
-                # https://blogs.oracle.com/java-platform-group/oracle-jre-will-no-longer-trust-md5-signed-code-by-default
-                skip, apk, cachechanged = fdroidserver.update.process_apk({}, apkName, 'repo',
-                                                                          knownapks,
-                                                                          allow_disabled_algorithms=False,
-                                                                          archive_bad_sig=True)
-                self.assertTrue(skip)
-                self.assertIsNone(apk)
-                self.assertFalse(cachechanged)
-                self.assertTrue(os.path.exists(os.path.join('archive', apkName)))
-                self.assertFalse(os.path.exists(os.path.join('repo', apkName)))
-
-                skip, apk, cachechanged = fdroidserver.update.process_apk({}, apkName, 'archive',
-                                                                          knownapks,
-                                                                          allow_disabled_algorithms=False,
-                                                                          archive_bad_sig=False)
-                self.assertFalse(skip)
-                self.assertIsNotNone(apk)
-                self.assertTrue(cachechanged)
-                self.assertTrue(os.path.exists(os.path.join('archive', apkName)))
-                self.assertFalse(os.path.exists(os.path.join('repo', apkName)))
-
-                # ensure that icons have been moved to the archive as well
-                for density in fdroidserver.update.screen_densities:
-                    icon_path = os.path.join(fdroidserver.update.get_icon_dir('archive', density),
-                                             apk['icon'])
-                    self.assertTrue(os.path.isfile(icon_path))
-                    self.assertTrue(os.path.getsize(icon_path) > 1)
-
-            badsigs = ['urzip-badcert.apk', 'urzip-badsig.apk', 'urzip-release-unsigned.apk', ]
-            for apkName in badsigs:
-                shutil.copy(basedir / apkName,
-                            os.path.join(self.testdir, 'repo'))
-
-                skip, apk, cachechanged = fdroidserver.update.process_apk({}, apkName, 'repo',
-                                                                          knownapks,
-                                                                          allow_disabled_algorithms=False,
-                                                                          archive_bad_sig=False)
-                self.assertTrue(skip)
-                self.assertIsNone(apk)
-                self.assertFalse(cachechanged)
-
-    def test_process_invalid_apk(self):
-        os.chdir(basedir)
-        if os.path.basename(os.getcwd()) != 'tests':
-            raise Exception('This test must be run in the "tests/" subdir')
-
-        config = dict()
-        fdroidserver.common.fill_config_defaults(config)
-        fdroidserver.common.config = config
-        fdroidserver.update.config = config
-        fdroidserver.common.options = Options
-        fdroidserver.update.options = fdroidserver.common.options
-        fdroidserver.update.options.delete_unknown = False
-
-        knownapks = fdroidserver.common.KnownApks()
-        apk = 'fake.ota.update_1234.zip'  # this is not an APK, scanning should fail
-        (skip, apk, cachechanged) = fdroidserver.update.process_apk({}, apk, 'repo', knownapks,
-                                                                    False)
-
-        self.assertTrue(skip)
-        self.assertIsNone(apk)
-        self.assertFalse(cachechanged)
-
-    def test_get_apks_without_allowed_signatures(self):
-        """Test when no AllowedAPKSigningKeys is specified"""
-        os.chdir(self.testdir)
-        shutil.copytree(basedir / 'repo', 'repo')
-        config = dict()
-        fdroidserver.common.fill_config_defaults(config)
-        fdroidserver.common.config = config
-        fdroidserver.common.options = Options
-        fdroidserver.update.options = fdroidserver.common.options
-
-        app = fdroidserver.metadata.App()
-        knownapks = fdroidserver.common.KnownApks()
-        apks, cachechanged = fdroidserver.update.process_apks({}, 'repo', knownapks)
-        apkfile = 'v1.v2.sig_1020.apk'
-        self.assertIn(
-            apkfile,
-            os.listdir('repo'),
-            f'{apkfile} was archived or otherwise removed from "repo"',
-        )
-        (skip, apk, cachechanged) = fdroidserver.update.process_apk(
-            {}, apkfile, 'repo', knownapks, False
-        )
-
-        r = fdroidserver.update.get_apks_without_allowed_signatures(app, apk)
-        self.assertIsNone(r)
-
-    def test_get_apks_without_allowed_signatures_allowed(self):
-        """Test when the APK matches the specified AllowedAPKSigningKeys"""
-        os.chdir(self.testdir)
-        shutil.copytree(basedir / 'repo', 'repo')
-        config = dict()
-        fdroidserver.common.fill_config_defaults(config)
-        fdroidserver.common.config = config
-        fdroidserver.common.options = Options
-        fdroidserver.update.options = fdroidserver.common.options
-
-        app = fdroidserver.metadata.App(
-            {
-                'AllowedAPKSigningKeys': '32a23624c201b949f085996ba5ed53d40f703aca4989476949cae891022e0ed6'
-            }
-        )
-        knownapks = fdroidserver.common.KnownApks()
-        apks, cachechanged = fdroidserver.update.process_apks({}, 'repo', knownapks)
-        apkfile = 'v1.v2.sig_1020.apk'
-        (skip, apk, cachechanged) = fdroidserver.update.process_apk(
-            {}, apkfile, 'repo', knownapks, False
-        )
-
-        r = fdroidserver.update.get_apks_without_allowed_signatures(app, apk)
-        self.assertIsNone(r)
-
-    def test_get_apks_without_allowed_signatures_blocked(self):
-        """Test when the APK does not match any specified AllowedAPKSigningKeys"""
-        os.chdir(self.testdir)
-        shutil.copytree(basedir / 'repo', 'repo')
-        config = dict()
-        fdroidserver.common.fill_config_defaults(config)
-        fdroidserver.common.config = config
-        fdroidserver.common.options = Options
-        fdroidserver.update.options = fdroidserver.common.options
-
-        app = fdroidserver.metadata.App(
-            {
-                'AllowedAPKSigningKeys': 'fa4edeadfa4edeadfa4edeadfa4edeadfa4edeadfa4edeadfa4edeadfa4edead'
-            }
-        )
-        knownapks = fdroidserver.common.KnownApks()
-        apks, cachechanged = fdroidserver.update.process_apks({}, 'repo', knownapks)
-        apkfile = 'v1.v2.sig_1020.apk'
-        (skip, apk, cachechanged) = fdroidserver.update.process_apk(
-            {}, apkfile, 'repo', knownapks, False
-        )
-
-        r = fdroidserver.update.get_apks_without_allowed_signatures(app, apk)
-        self.assertEqual(apkfile, r)
-
-    def test_update_with_AllowedAPKSigningKeys(self):
-        """Test that APKs without allowed signatures get deleted."""
-        os.chdir(self.testdir)
-        os.mkdir('repo')
-        testapk = os.path.join('repo', 'com.politedroid_6.apk')
-        shutil.copy(basedir / testapk, testapk)
-        os.mkdir('metadata')
-        metadatafile = os.path.join('metadata', 'com.politedroid.yml')
-
-        # Copy and manipulate metadata file
-        shutil.copy(basedir / metadatafile, metadatafile)
-        with open(metadatafile, 'a') as fp:
-            fp.write(
-                '\n\nAllowedAPKSigningKeys: 32a23624c201b949f085996ba5ed53d40f703aca4989476949cae891022e0ed6\n'
-            )
-
-        # Set up options
-        fdroidserver.common.options = Options
-        config = fdroidserver.common.read_config()
-        if 'apksigner' not in config:  # TODO remove me for buildserver-bullseye
-            self.skipTest('SKIPPING test_update_with_AllowedAPKSigningKeys, apksigner not installed!')
-        config['repo_keyalias'] = 'sova'
-        config['keystorepass'] = 'r9aquRHYoI8+dYz6jKrLntQ5/NJNASFBacJh7Jv2BlI='
-        config['keypass'] = 'r9aquRHYoI8+dYz6jKrLntQ5/NJNASFBacJh7Jv2BlI='
-        config['keystore'] = os.path.join(basedir, 'keystore.jks')
-
-        self.assertTrue(os.path.exists(testapk))
-
-        # Test for non-deletion
-        with mock.patch('sys.argv', ['fdroid update', '--delete-unknown']):
-            fdroidserver.update.main()
-        self.assertTrue(os.path.exists(testapk))
-
-        # Copy and manipulate metadata file again
-        shutil.copy(basedir / metadatafile, metadatafile)
-        with open(metadatafile, 'a') as fp:
-            fp.write(
-                '\n\nAllowedAPKSigningKeys: fa4edeadfa4edeadfa4edeadfa4edeadfa4edeadfa4edeadfa4edeadfa4edead\n'
-            )
-
-        # Test for deletion
-        with mock.patch('sys.argv', ['fdroid update', '--delete-unknown']):
-            fdroidserver.update.main()
-        self.assertFalse(os.path.exists(testapk))
-
-    def test_translate_per_build_anti_features(self):
-        os.chdir(self.testdir)
-        shutil.copytree(basedir / 'repo', 'repo')
-        shutil.copytree(basedir / 'metadata', 'metadata')
-        config = dict()
-        fdroidserver.common.fill_config_defaults(config)
-        config['ndk_paths'] = dict()
-        fdroidserver.common.config = config
-        fdroidserver.update.config = config
-
-        fdroidserver.common.options = Options
-        fdroidserver.update.options = fdroidserver.common.options
-        fdroidserver.update.options.clean = True
-        fdroidserver.update.options.delete_unknown = True
-
-        apps = fdroidserver.metadata.read_metadata()
-        knownapks = fdroidserver.common.KnownApks()
-        apks, cachechanged = fdroidserver.update.process_apks({}, 'repo', knownapks, False)
-        fdroidserver.update.translate_per_build_anti_features(apps, apks)
-        self.assertEqual(len(apks), 18)
-        foundtest = False
-        for apk in apks:
-            if apk['packageName'] == 'com.politedroid' and apk['versionCode'] == 3:
-                antiFeatures = apk.get('antiFeatures')
-                self.assertTrue('KnownVuln' in antiFeatures)
-                self.assertEqual(2, len(antiFeatures))
-                foundtest = True
-        self.assertTrue(foundtest)
-
-    def test_create_metadata_from_template(self):
-        os.chdir(self.testdir)
-        os.mkdir('repo')
-        os.mkdir('metadata')
-        shutil.copy(basedir / 'urzip.apk', 'repo')
-
-        config = dict()
-        fdroidserver.common.fill_config_defaults(config)
-        config['ndk_paths'] = dict()
-        fdroidserver.common.config = config
-        fdroidserver.update.config = config
-
-        fdroidserver.common.options = Options
-        fdroidserver.update.options = fdroidserver.common.options
-        fdroidserver.update.options.clean = True
-
-        knownapks = fdroidserver.common.KnownApks()
-        apks, cachechanged = fdroidserver.update.process_apks({}, 'repo', knownapks, False)
-        self.assertEqual(1, len(apks))
-        apk = apks[0]
-
-        testfile = 'metadata/info.guardianproject.urzip.yml'
-        # create empty 0 byte .yml file, run read_metadata, it should work
-        open(testfile, 'a').close()
-        apps = fdroidserver.metadata.read_metadata()
-        self.assertEqual(1, len(apps))
-        os.remove(testfile)
-
-        # test using internal template
-        apps = fdroidserver.metadata.read_metadata()
-        self.assertEqual(0, len(apps))
-        fdroidserver.update.create_metadata_from_template(apk)
-        self.assertTrue(os.path.exists(testfile))
-        apps = fdroidserver.metadata.read_metadata()
-        self.assertEqual(1, len(apps))
-        for app in apps.values():
-            self.assertEqual('urzip', app['Name'])
-            self.assertEqual(1, len(app['Categories']))
-            break
-
-        # test using external template.yml
-        os.remove(testfile)
-        self.assertFalse(os.path.exists(testfile))
-        shutil.copy(basedir.with_name('examples') / 'template.yml', self.testdir)
-        fdroidserver.update.create_metadata_from_template(apk)
-        self.assertTrue(os.path.exists(testfile))
-        apps = fdroidserver.metadata.read_metadata()
-        self.assertEqual(1, len(apps))
-        for app in apps.values():
-            self.assertEqual('urzip', app['Name'])
-            self.assertEqual(1, len(app['Categories']))
-            self.assertEqual('Internet', app['Categories'][0])
-            break
-        with open(testfile) as fp:
-            data = yaml.load(fp, Loader=SafeLoader)
-        self.assertEqual('urzip', data['Name'])
-        self.assertEqual('urzip', data['Summary'])
-
-    def test_has_known_vulnerability(self):
-        good = [
-            'org.bitbucket.tickytacky.mirrormirror_1.apk',
-            'org.bitbucket.tickytacky.mirrormirror_2.apk',
-            'org.bitbucket.tickytacky.mirrormirror_3.apk',
-            'org.bitbucket.tickytacky.mirrormirror_4.apk',
-            'org.dyndns.fules.ck_20.apk',
-            'urzip.apk',
-            'urzip-badcert.apk',
-            'urzip-badsig.apk',
-            'urzip-release.apk',
-            'urzip-release-unsigned.apk',
-            'repo/com.politedroid_3.apk',
-            'repo/com.politedroid_4.apk',
-            'repo/com.politedroid_5.apk',
-            'repo/com.politedroid_6.apk',
-            'repo/obb.main.oldversion_1444412523.apk',
-            'repo/obb.mainpatch.current_1619_another-release-key.apk',
-            'repo/obb.mainpatch.current_1619.apk',
-            'repo/obb.main.twoversions_1101613.apk',
-            'repo/obb.main.twoversions_1101615.apk',
-            'repo/obb.main.twoversions_1101617.apk',
-            'repo/urzip-; Рахма́, [rɐxˈmanʲɪnəf] سيرجي_رخمانينوف 谢·.apk',
-        ]
-        for f in good:
-            self.assertFalse(fdroidserver.update.has_known_vulnerability(f))
-        with self.assertRaises(fdroidserver.exception.FDroidException):
-            fdroidserver.update.has_known_vulnerability('janus.apk')
-
-    def test_get_apk_icon_when_src_is_none(self):
-        config = dict()
-        fdroidserver.common.fill_config_defaults(config)
-        fdroidserver.common.config = config
-        fdroidserver.update.config = config
-
-        # pylint: disable=protected-access
-        icons_src = fdroidserver.update._get_apk_icons_src('urzip-release.apk', None)
-        self.assertFalse(icons_src)
-
-    def test_strip_and_copy_image(self):
-        in_file = basedir / 'metadata/info.guardianproject.urzip/en-US/images/icon.png'
-        out_file = os.path.join(self.testdir, 'icon.png')
-        with self.assertLogs(level=logging.DEBUG):
-            fdroidserver.update._strip_and_copy_image(in_file, out_file)
-        self.assertTrue(os.path.exists(out_file))
-
-    def test_strip_and_copy_image_bad_filename(self):
-        in_file = basedir / 'corrupt-featureGraphic.png'
-        out_file = os.path.join(self.testdir, 'corrupt-featureGraphic.png')
-        with self.assertLogs(level=logging.DEBUG):
-            fdroidserver.update._strip_and_copy_image(in_file, out_file)
-        self.assertFalse(os.path.exists(out_file))
-
-    def test_strip_and_copy_image_unchanged(self):
-        in_file = basedir / 'metadata/info.guardianproject.urzip/en-US/images/icon.png'
-        out_file = os.path.join(self.testdir, 'icon.png')
-        shutil.copy2(in_file, out_file)
-        ctime = os.path.getctime(out_file)
-        delta = 0.01
-        time.sleep(delta)  # ensure reliable failure if file isn't preserved
-        with self.assertLogs(level=logging.DEBUG):  # suppress log output
-            fdroidserver.update._strip_and_copy_image(in_file, out_file)
-        self.assertAlmostEqual(ctime, os.path.getctime(out_file), delta=delta)
-
-    def test_strip_and_copy_image_in_file_ctime_changed(self):
-        out_file = os.path.join(self.testdir, 'icon.png')
-        with open(out_file, 'w') as fp:
-            fp.write('to be replaced')
-        size = os.path.getsize(out_file)
-        delta = 0.01
-        time.sleep(delta)  # ensure reliable failure when testing ctime
-        src_file = basedir / 'metadata/info.guardianproject.urzip/en-US/images/icon.png'
-        in_file = os.path.join(self.testdir, 'in-icon.png')
-        shutil.copy(src_file, in_file)
-        time.sleep(delta)  # ensure reliable failure when testing ctime
-        with self.assertLogs(level=logging.DEBUG):  # suppress log output
-            fdroidserver.update._strip_and_copy_image(in_file, out_file)
-        self.assertNotEqual(size, os.path.getsize(out_file))
-        self.assertTrue(os.path.getctime(in_file) <= os.path.getctime(out_file))
-        # _strip_and_copy_image syncs mtime from in_file to out_file
-        self.assertAlmostEqual(
-            os.path.getmtime(in_file), os.path.getmtime(out_file), delta=delta
-        )
-
-    def test_strip_and_copy_image_in_file_mtime_changed(self):
-        in_file = basedir / 'metadata/info.guardianproject.urzip/en-US/images/icon.png'
-        out_file = os.path.join(self.testdir, 'icon.png')
-        shutil.copy(in_file, out_file)
-        os.utime(out_file, (12345, 12345))  # set atime/mtime to something old
-        with self.assertLogs(level=logging.DEBUG):  # suppress log output
-            fdroidserver.update._strip_and_copy_image(in_file, out_file)
-        delta = 0.01
-        self.assertNotAlmostEqual(
-            os.path.getctime(in_file), os.path.getctime(out_file), delta=delta
-        )
-        # _strip_and_copy_image syncs mtime from in_file to out_file
-        self.assertAlmostEqual(
-            os.path.getmtime(in_file), os.path.getmtime(out_file), delta=delta
-        )
-
-    def test_create_metadata_from_template_empty_keys(self):
-        apk = {'packageName': 'rocks.janicerand'}
-        with mkdtemp() as tmpdir, TmpCwd(tmpdir):
-            os.mkdir('metadata')
-            with open('template.yml', 'w') as f:
-                f.write(
-                    textwrap.dedent(
-                        '''\
-                    Disabled:
-                    License:
-                    AuthorName:
-                    AuthorEmail:
-                    AuthorWebSite:
-                    WebSite:
-                    SourceCode:
-                    IssueTracker:
-                    Translation:
-                    Changelog:
-                    Donate:
-                    Bitcoin:
-                    Litecoin:
-                    Name:
-                    AutoName:
-                    Summary:
-                    RequiresRoot:
-                    RepoType:
-                    Repo:
-                    Binaries:
-                    Builds:
-                    ArchivePolicy:
-                    AutoUpdateMode:
-                    UpdateCheckMode:
-                    UpdateCheckIgnore:
-                    VercodeOperation:
-                    UpdateCheckName:
-                    UpdateCheckData:
-                    CurrentVersion:
-                    CurrentVersionCode:
-                    NoSourceSince:
-                    '''
-                    )
-                )
-            fdroidserver.update.create_metadata_from_template(apk)
-            with open(os.path.join('metadata', 'rocks.janicerand.yml')) as f:
-                metadata_content = yaml.load(f, Loader=SafeLoader)
-                self.maxDiff = None
-                self.assertDictEqual(
-                    metadata_content,
-                    {
-                        'ArchivePolicy': None,
-                        'AuthorEmail': '',
-                        'AuthorName': '',
-                        'AuthorWebSite': '',
-                        'AutoName': 'rocks.janicerand',
-                        'AutoUpdateMode': '',
-                        'Binaries': '',
-                        'Bitcoin': '',
-                        'Builds': None,
-                        'Changelog': '',
-                        'CurrentVersion': '',
-                        'CurrentVersionCode': None,
-                        'Disabled': '',
-                        'Donate': '',
-                        'IssueTracker': '',
-                        'License': '',
-                        'Litecoin': '',
-                        'Name': 'rocks.janicerand',
-                        'NoSourceSince': '',
-                        'Repo': '',
-                        'RepoType': '',
-                        'RequiresRoot': None,
-                        'SourceCode': '',
-                        'Summary': 'rocks.janicerand',
-                        'Translation': '',
-                        'UpdateCheckData': '',
-                        'UpdateCheckIgnore': '',
-                        'UpdateCheckMode': '',
-                        'UpdateCheckName': '',
-                        'VercodeOperation': None,
-                        'WebSite': '',
-                    },
-                )
-
-    def test_insert_funding_yml_donation_links(self):
-        os.chdir(self.testdir)
-        os.mkdir('build')
-        content = textwrap.dedent(
-            """
-            community_bridge: ''
-            custom: [LINK1, LINK2]
-            github: USERNAME
-            issuehunt: USERNAME
-            ko_fi: USERNAME
-            liberapay: USERNAME
-            open_collective: USERNAME
-            otechie: USERNAME
-            patreon: USERNAME
-        """
-        )
-        app = fdroidserver.metadata.App()
-        app.id = 'fake.app.id'
-        apps = {app.id: app}
-        os.mkdir(os.path.join('build', app.id))
-        fdroidserver.update.insert_funding_yml_donation_links(apps)
-        for field in DONATION_FIELDS:
-            self.assertFalse(app.get(field))
-        with open(os.path.join('build', app.id, 'FUNDING.yml'), 'w') as fp:
-            fp.write(content)
-
-        fdroidserver.update.insert_funding_yml_donation_links(apps)
-        for field in DONATION_FIELDS:
-            self.assertIsNotNone(app.get(field), field)
-        self.assertEqual('LINK1', app.get('Donate'))
-        self.assertEqual('USERNAME', app.get('Liberapay'))
-        self.assertEqual('USERNAME', app.get('OpenCollective'))
-
-        app['Donate'] = 'keepme'
-        app['Liberapay'] = 'keepme'
-        app['OpenCollective'] = 'keepme'
-        fdroidserver.update.insert_funding_yml_donation_links(apps)
-        for field in DONATION_FIELDS:
-            self.assertEqual('keepme', app.get(field))
-
-    def test_insert_funding_yml_donation_links_one_at_a_time(self):
-        """Exercise the FUNDING.yml code one entry at a time"""
-        os.chdir(self.testdir)
-        os.mkdir('build')
-
-        app = fdroidserver.metadata.App()
-        app.id = 'fake.app.id'
-        apps = {app.id: app}
-        os.mkdir(os.path.join('build', app.id))
-        fdroidserver.update.insert_funding_yml_donation_links(apps)
-        for field in DONATION_FIELDS:
-            self.assertIsNone(app.get(field))
-
-        content = textwrap.dedent(
-            """
-            community_bridge: 'blah-de-blah'
-            github: USERNAME
-            issuehunt: USERNAME
-            ko_fi: USERNAME
-            liberapay: USERNAME
-            open_collective: USERNAME
-            patreon: USERNAME
-        """
-        )
-        for line in content.split('\n'):
-            if not line:
-                continue
-            app = fdroidserver.metadata.App()
-            app.id = 'fake.app.id'
-            apps = {app.id: app}
-            with open(os.path.join('build', app.id, 'FUNDING.yml'), 'w') as fp:
-                fp.write(line)
-            data = yaml.load(line, Loader=SafeLoader)
-            fdroidserver.update.insert_funding_yml_donation_links(apps)
-            if 'liberapay' in data:
-                self.assertEqual(data['liberapay'], app.get('Liberapay'))
-            elif 'open_collective' in data:
-                self.assertEqual(data['open_collective'], app.get('OpenCollective'))
-            else:
-                for v in data.values():
-                    self.assertEqual(app.get('Donate', '').split('/')[-1], v)
-
-    def test_insert_funding_yml_donation_links_with_corrupt_file(self):
-        os.chdir(self.testdir)
-        os.mkdir('build')
-        app = fdroidserver.metadata.App()
-        app.id = 'fake.app.id'
-        apps = {app.id: app}
-        os.mkdir(os.path.join('build', app.id))
-        with open(os.path.join('build', app.id, 'FUNDING.yml'), 'w') as fp:
-            fp.write(
-                textwrap.dedent(
-                    """
-                opencollective: foo
-                custom: []
-                liberapay: :
-            """
-                )
-            )
-        fdroidserver.update.insert_funding_yml_donation_links(apps)
-        for field in DONATION_FIELDS:
-            self.assertIsNone(app.get(field))
-
-    def test_sanitize_funding_yml(self):
-        with open(basedir / 'funding-usernames.yaml') as fp:
-            data = yaml.load(fp, Loader=SafeLoader)
-        for k, entries in data.items():
-            for entry in entries:
-                if k in 'custom':
-                    m = fdroidserver.update.sanitize_funding_yml_entry(entry)
-                else:
-                    m = fdroidserver.update.sanitize_funding_yml_name(entry)
-                if k == 'bad':
-                    self.assertIsNone(m)
-                else:
-                    self.assertIsNotNone(m)
-        self.assertIsNone(fdroidserver.update.sanitize_funding_yml_entry('foo\nbar'))
-        self.assertIsNone(fdroidserver.update.sanitize_funding_yml_entry(
-            ''.join(chr(random.randint(65, 90)) for _ in range(2049))))  # nosec B311
-
-        # not recommended but valid entries
-        self.assertIsNotNone(fdroidserver.update.sanitize_funding_yml_entry(12345))
-        self.assertIsNotNone(fdroidserver.update.sanitize_funding_yml_entry(5.0))
-        self.assertIsNotNone(fdroidserver.update.sanitize_funding_yml_entry(' WhyIncludeWhitespace '))
-        self.assertIsNotNone(fdroidserver.update.sanitize_funding_yml_entry(['first', 'second']))
-
-    def test_set_localized_text_entry(self):
-        os.chdir(self.testdir)
-        config = dict()
-        fdroidserver.common.fill_config_defaults(config)
-        fdroidserver.update.config = config
-        fdroidserver.update.options = fdroidserver.common.options
-
-        files = {
-            'full-description.txt': 'description',
-            'short-description.txt': 'summary',
-            'title.txt': 'name',
-            'video-url.txt': 'video',
-        }
-
-        for f, key in files.items():
-            limit = config['char_limits'][key]
-            with open(f, 'w') as fp:
-                fp.write(''.join(random.choice(string.ascii_letters) for i in range(limit + 100)))  # nosec B311
-            locale = 'ru_US'
-            app = dict()
-            fdroidserver.update._set_localized_text_entry(app, locale, key, f)
-            self.assertEqual(limit, len(app['localized'][locale][key]))
-
-            f = 'badlink-' + f
-            os.symlink('/path/to/nowhere', f)
-            app = dict()
-            fdroidserver.update._set_localized_text_entry(app, locale, key, f)
-            self.assertIsNone(app['localized'].get(locale, {}).get(key))
-
-    def test_set_author_entry(self):
-        os.chdir(self.testdir)
-        config = dict()
-        fdroidserver.common.fill_config_defaults(config)
-        fdroidserver.update.config = config
-        fdroidserver.update.options = fdroidserver.common.options
-
-        f = 'contact-website.txt'
-        key = 'author'
-        url = 'https://f-droid.org/'
-        limit = config['char_limits']['author']
-        with open(f, 'w') as fp:
-            fp.write(url)
-            fp.write('\n')
-        app = dict()
-        fdroidserver.update._set_author_entry(app, key, f)
-        self.assertEqual(url, app[key])
-
-        f = 'limits.txt'
-        key = 'author'
-        limit = config['char_limits']['author']
-        for key in ('authorEmail', 'authorPhone', 'authorWebSite'):
-            with open(f, 'w') as fp:
-                fp.write(''.join(random.choice(string.ascii_letters) for i in range(limit + 100)))  # nosec B311
-            app = dict()
-            fdroidserver.update._set_author_entry(app, key, f)
-            self.assertEqual(limit, len(app[key]))
-
-        f = 'badlink.txt'
-        os.symlink('/path/to/nowhere', f)
-        app = dict()
-        fdroidserver.update._set_author_entry(app, key, f)
-        self.assertIsNone(app.get(key))
-
-    def test_status_update_json(self):
-        fdroidserver.common.config = {}
-        fdroidserver.update.config = {}
-        fdroidserver.update.options = Options
-        with mkdtemp() as tmpdir:
-            os.chdir(tmpdir)
-            with mock.patch('sys.argv', ['fdroid update', '']):
-                fdroidserver.update.status_update_json({}, [], [])
-                with open('repo/status/update.json') as fp:
-                    data = json.load(fp)
-                self.assertTrue('apksigner' in data)
-
-                fdroidserver.update.config = {
-                    'apksigner': 'apksigner',
-                }
-                fdroidserver.update.status_update_json({}, [], [])
-                with open('repo/status/update.json') as fp:
-                    data = json.load(fp)
-                self.assertEqual(shutil.which(fdroidserver.update.config['apksigner']), data['apksigner'])
-
-                fdroidserver.update.config = {}
-                fdroidserver.common.fill_config_defaults(fdroidserver.update.config)
-                fdroidserver.update.status_update_json({}, [], [])
-                with open('repo/status/update.json') as fp:
-                    data = json.load(fp)
-                self.assertEqual(fdroidserver.update.config.get('apksigner'), data['apksigner'])
-                self.assertEqual(fdroidserver.update.config['jarsigner'], data['jarsigner'])
-                self.assertEqual(fdroidserver.update.config['keytool'], data['keytool'])
-
-    def test_scan_metadata_androguard(self):
-
-        def _create_apkmetadata_object(apkName):
-            """Create an empty apk metadata object."""
-            apk = {}
-            apk['apkName'] = apkName
-            apk['uses-permission'] = []
-            apk['uses-permission-sdk-23'] = []
-            apk['features'] = []
-            apk['icons_src'] = {}
-            return apk
-
-        apkList = [
-            (
-                'org.dyndns.fules.ck_20.apk',
-                {
-                    'apkName': 'org.dyndns.fules.ck_20.apk',
-                    'uses-permission': [
-                        fdroidserver.update.UsesPermission(
-                            name='android.permission.BIND_INPUT_METHOD',
-                            maxSdkVersion=None,
-                        ),
-                        fdroidserver.update.UsesPermission(
-                            name='android.permission.READ_EXTERNAL_STORAGE',
-                            maxSdkVersion=None,
-                        ),
-                        fdroidserver.update.UsesPermission(
-                            name='android.permission.VIBRATE', maxSdkVersion=None
-                        ),
-                    ],
-                    'uses-permission-sdk-23': [],
-                    'features': [],
-                    'icons_src': {
-                        '240': 'res/drawable-hdpi-v4/icon_launcher.png',
-                        '120': 'res/drawable-ldpi-v4/icon_launcher.png',
-                        '160': 'res/drawable-mdpi-v4/icon_launcher.png',
-                        '-1': 'res/drawable-mdpi-v4/icon_launcher.png',
-                    },
-                    'packageName': 'org.dyndns.fules.ck',
-                    'versionCode': 20,
-                    'versionName': 'v1.6pre2',
-                    'minSdkVersion': 7,
-                    'name': 'Compass Keyboard',
-                    'targetSdkVersion': 8,
-                    'nativecode': [
-                        'arm64-v8a',
-                        'armeabi',
-                        'armeabi-v7a',
-                        'mips',
-                        'mips64',
-                        'x86',
-                        'x86_64',
-                    ],
-                },
-            )
-        ]
-
-        for apkfile, apkaapt in apkList:
-            apkandroguard = _create_apkmetadata_object(apkfile)
-            fdroidserver.update.scan_apk_androguard(apkandroguard, apkfile)
-
-            self.maxDiff = None
-            self.assertEqual(apkaapt, apkandroguard)
-
-    def test_exclude_disabled_apks(self):
-        os.chdir(self.testdir)
-        os.mkdir('repo')
-        testapk = os.path.join('repo', 'com.politedroid_6.apk')
-        testapk_new = os.path.join('repo', 'Politedroid-1.5.apk')
-        shutil.copy(basedir / testapk, testapk_new)
-
-        config = dict()
-        fdroidserver.common.fill_config_defaults(config)
-        config['ndk_paths'] = dict()
-        fdroidserver.common.config = config
-        fdroidserver.update.config = config
-
-        fdroidserver.common.options = Options
-        fdroidserver.update.options = fdroidserver.common.options
-        fdroidserver.update.options.clean = True
-
-        app = fdroidserver.metadata.App()
-        app.id = 'com.politedroid'
-        apps = {app.id: app}
-        build = fdroidserver.metadata.Build()
-        build.versionCode = 6
-        build.disable = "disabled"
-        app['Builds'] = [build]
-
-        knownapks = fdroidserver.common.KnownApks()
-        apks, cachechanged = fdroidserver.update.process_apks({}, 'repo', knownapks, False, apps)
-        self.assertEqual([], apks)
-
-    def test_archive_old_apks_ArchivePolicy_0(self):
-        app = fdroidserver.metadata.App()
-        app.id = 'test'
-        app.ArchivePolicy = 0
-        apps = {app.id: app}
-        with self.assertLogs(level='DEBUG') as cm:
-            fdroidserver.update.archive_old_apks(apps, [], [], '', '', 3)
-            self.assertEqual(cm.output, [
-                "DEBUG:root:Checking archiving for test - apks:0, keepversions:0, archapks:0"
-            ])
-
-    def test_archive_old_apks(self):
-        app = fdroidserver.metadata.App()
-        app.id = 'test'
-        app.VercodeOperation = ['%c+1', '%c+2', '%c+3', '%c+4']
-        apps = {app.id: app}
-        with self.assertLogs(level='DEBUG') as cm:
-            fdroidserver.update.archive_old_apks(apps, [], [], '', '', 3)
-            self.assertEqual(cm.output, [
-                "DEBUG:root:Checking archiving for test - apks:0, keepversions:12, archapks:0"
-            ])
-
-        app = fdroidserver.metadata.App()
-        app.id = 'org.smssecure.smssecure'
-        app.CurrentVersionCode = 135
-        apps = {app.id: app}
-        with self.assertLogs(level='DEBUG') as cm:
-            fdroidserver.update.archive_old_apks(apps, [], [], '', '', 3)
-            self.assertEqual(cm.output, [
-                "DEBUG:root:Checking archiving for org.smssecure.smssecure - apks:0, keepversions:6, archapks:0"
-            ])
-
-    def test_categories_txt_is_removed_by_delete_unknown(self):
-        """categories.txt used to be a part of this system, now its nothing."""
-        os.chdir(self.testdir)
-        fdroidserver.common.write_config_file(
-            'repo_pubkey: ffffffffffffffffffffffffffffffffffffffff\n'
-        )
-
-        categories_txt = Path('repo/categories.txt')
-        categories_txt.parent.mkdir()
-        categories_txt.write_text('placeholder')
-
-        self.assertTrue(categories_txt.exists())
-        with mock.patch('sys.argv', ['fdroid update', '--delete-unknown', '--nosign']):
-            fdroidserver.update.main()
-        self.assertFalse(categories_txt.exists())
-
-    def test_no_blank_auto_defined_categories(self):
-        """When no app has Categories, there should be no definitions in the repo."""
-        os.chdir(self.testdir)
-        os.mkdir('metadata')
-        os.mkdir('repo')
-        fdroidserver.common.write_config_file(
-            'repo_pubkey: ffffffffffffffffffffffffffffffffffffffff\n'
-        )
-
-        testapk = os.path.join('repo', 'com.politedroid_6.apk')
-        shutil.copy(basedir / testapk, testapk)
-        Path('metadata/com.politedroid.yml').write_text('Name: Polite')
-
-        with mock.patch('sys.argv', ['fdroid update', '--delete-unknown', '--nosign']):
-            fdroidserver.update.main()
-        with open('repo/index-v2.json') as fp:
-            index = json.load(fp)
-        self.assertNotIn(CATEGORIES_CONFIG_NAME, index['repo'])
-
-    def test_auto_defined_categories(self):
-        """Repos that don't define categories in config/ should use auto-generated."""
-        os.chdir(self.testdir)
-        os.mkdir('metadata')
-        os.mkdir('repo')
-        fdroidserver.common.write_config_file(
-            'repo_pubkey: ffffffffffffffffffffffffffffffffffffffff\n'
-        )
-
-        testapk = os.path.join('repo', 'com.politedroid_6.apk')
-        shutil.copy(basedir / testapk, testapk)
-        Path('metadata/com.politedroid.yml').write_text('Categories: [Time]')
-
-        with mock.patch('sys.argv', ['fdroid update', '--delete-unknown', '--nosign']):
-            fdroidserver.update.main()
-        with open('repo/index-v2.json') as fp:
-            index = json.load(fp)
-        self.assertEqual(
-            {'Time': {'name': {'en-US': 'Time'}}},
-            index['repo'][CATEGORIES_CONFIG_NAME],
-        )
-
-    def test_categories_with_only_icon_defined(self):
-        """If cateogories.yml only includes the icon, the name should be added."""
-        os.chdir(self.testdir)
-        os.mkdir('config')
-        os.mkdir('metadata')
-        os.mkdir('repo')
-        fdroidserver.common.write_config_file(
-            'repo_pubkey: ffffffffffffffffffffffffffffffffffffffff\n'
-        )
-        testvalue = 'Time'
-        Path('config/time.png').write_text('placeholder')
-        Path('config/categories.yml').write_text(testvalue + ': {icon: time.png}')
-
-        testapk = os.path.join('repo', 'com.politedroid_6.apk')
-        shutil.copy(basedir / testapk, testapk)
-        Path('metadata/com.politedroid.yml').write_text(f'Categories: [{testvalue}]')
-
-        with mock.patch('sys.argv', ['fdroid update', '--delete-unknown', '--nosign']):
-            fdroidserver.update.main()
-        with open('repo/index-v2.json') as fp:
-            index = json.load(fp)
-        self.assertEqual(
-            {
-                'icon': {
-                    'en-US': {
-                        'name': '/icons/time.png',
-                        'sha256': '4097889236a2af26c293033feb964c4cf118c0224e0d063fec0a89e9d0569ef2',
-                        'size': 11,
-                    }
-                },
-                'name': {'en-US': testvalue},
-            },
-            index['repo'][CATEGORIES_CONFIG_NAME][testvalue],
-        )
-
-    def test_auto_defined_categories_two_apps(self):
-        """Repos that don't define categories in config/ should use auto-generated."""
-        os.chdir(self.testdir)
-        os.mkdir('metadata')
-        os.mkdir('repo')
-        fdroidserver.common.write_config_file(
-            'repo_pubkey: ffffffffffffffffffffffffffffffffffffffff\n'
-        )
-
-        testapk = os.path.join('repo', 'com.politedroid_6.apk')
-        shutil.copy(basedir / testapk, testapk)
-        Path('metadata/com.politedroid.yml').write_text('Categories: [bar]')
-        testapk = os.path.join('repo', 'souch.smsbypass_9.apk')
-        shutil.copy(basedir / testapk, testapk)
-        Path('metadata/souch.smsbypass.yml').write_text('Categories: [foo, bar]')
-
-        with mock.patch('sys.argv', ['fdroid update', '--delete-unknown', '--nosign']):
-            fdroidserver.update.main()
-        with open('repo/index-v2.json') as fp:
-            index = json.load(fp)
-        self.assertEqual(
-            {'bar': {'name': {'en-US': 'bar'}}, 'foo': {'name': {'en-US': 'foo'}}},
-            index['repo'][CATEGORIES_CONFIG_NAME],
-        )
-
-    def test_auto_defined_categories_mix_into_config_categories(self):
-        """Repos that don't define all categories in config/ also use auto-generated."""
-        os.chdir(self.testdir)
-        os.mkdir('config')
-        Path('config/categories.yml').write_text('System: {name: System Apps}')
-        os.mkdir('metadata')
-        os.mkdir('repo')
-        fdroidserver.common.write_config_file(
-            'repo_pubkey: ffffffffffffffffffffffffffffffffffffffff\n'
-        )
-
-        testapk = os.path.join('repo', 'com.politedroid_6.apk')
-        shutil.copy(basedir / testapk, testapk)
-        Path('metadata/com.politedroid.yml').write_text('Categories: [Time]')
-        testapk = os.path.join('repo', 'souch.smsbypass_9.apk')
-        shutil.copy(basedir / testapk, testapk)
-        Path('metadata/souch.smsbypass.yml').write_text('Categories: [System, Time]')
-
-        with mock.patch('sys.argv', ['fdroid update', '--delete-unknown', '--nosign']):
-            fdroidserver.update.main()
-        with open('repo/index-v2.json') as fp:
-            index = json.load(fp)
-        self.assertEqual(
-            {
-                'System': {'name': {'en-US': 'System Apps'}},
-                'Time': {'name': {'en-US': 'Time'}},
-            },
-            index['repo'][CATEGORIES_CONFIG_NAME],
-        )
-
-    def test_empty_categories_not_in_index(self):
-        """A category with no apps should be ignored, even if defined in config."""
-        os.chdir(self.testdir)
-        os.mkdir('config')
-        Path('config/categories.yml').write_text('System: {name: S}\nTime: {name: T}\n')
-        os.mkdir('metadata')
-        os.mkdir('repo')
-        fdroidserver.common.write_config_file(
-            'repo_pubkey: ffffffffffffffffffffffffffffffffffffffff\n'
-        )
-
-        testapk = os.path.join('repo', 'com.politedroid_6.apk')
-        shutil.copy(basedir / testapk, testapk)
-        Path('metadata/com.politedroid.yml').write_text('Categories: [Time]')
-
-        with mock.patch('sys.argv', ['fdroid update', '--delete-unknown', '--nosign']):
-            fdroidserver.update.main()
-        with open('repo/index-v2.json') as fp:
-            index = json.load(fp)
-        self.assertEqual(
-            {'Time': {'name': {'en-US': 'T'}}},
-            index['repo'][CATEGORIES_CONFIG_NAME],
-        )
-
-
-class TestParseIpa(unittest.TestCase):
-    def test_parse_ipa(self):
-        self.maxDiff = None
-        try:
-            import biplist  # Fedora does not have a biplist package
-
-            biplist  # silence the linters
-        except ImportError as e:
-            self.skipTest(str(e))
-        ipa_path = os.path.join(basedir, 'com.fake.IpaApp_1000000000001.ipa')
-        result = fdroidserver.update.parse_ipa(ipa_path, 'fake_size', 'fake_sha')
-        self.assertDictEqual(
-            result,
-            {
-                'apkName': 'com.fake.IpaApp_1000000000001.ipa',
-                'hash': 'fake_sha',
-                'hashType': 'sha256',
-                'packageName': 'org.onionshare.OnionShare',
-                'size': 'fake_size',
-                'versionCode': 1000000000001,
-                'versionName': '1.0.1',
-                'ipa_DTPlatformVersion': '16.4',
-                'ipa_MinimumOSVersion': '15.0',
-                'ipa_entitlements': set(),
-                'ipa_permissions': {
-                    'NSCameraUsageDescription':
-                        'Please allow access to your '
-                        'camera, if you want to '
-                        'create photos or videos for '
-                        'direct sharing.',
-                    'NSMicrophoneUsageDescription':
-                        'Please allow access to '
-                        'your microphone, if you '
-                        'want to create videos '
-                        'for direct sharing.',
-                    'NSPhotoLibraryUsageDescription':
-                        'Please allow access to '
-                        'your photo library, if '
-                        'you want to share '
-                        'photos.',
-                },
-                'name': 'OnionShare',
-            },
-        )
-
-
-class TestUpdateVersionStringToInt(unittest.TestCase):
-    def test_version_string_to_int(self):
-        self.assertEqual(
-            fdroidserver.update.version_string_to_int("1.2.3"), 1000002000003
-        )
-        self.assertEqual(fdroidserver.update.version_string_to_int("0.0.0003"), 3)
-        self.assertEqual(fdroidserver.update.version_string_to_int("0.0.0"), 0)
-        self.assertEqual(
-            fdroidserver.update.version_string_to_int("4321.321.21"), 4321000321000021
-        )
-        self.assertEqual(
-            fdroidserver.update.version_string_to_int("18446744.073709.551615"),
-            18446744073709551615,
-        )
-
-    def test_version_string_to_int_value_errors(self):
-        with self.assertRaises(ValueError):
-            fdroidserver.update.version_string_to_int("1.2.3a")
-        with self.assertRaises(ValueError):
-            fdroidserver.update.version_string_to_int("asdfasdf")
-        with self.assertRaises(ValueError):
-            fdroidserver.update.version_string_to_int("1.2.-3")
-        with self.assertRaises(ValueError):
-            fdroidserver.update.version_string_to_int("-1.2.-3")
-        with self.assertRaises(ValueError):
-            fdroidserver.update.version_string_to_int("0.0.0x3")
-
-
-class TestScanRepoForIpas(unittest.TestCase):
-    def test_scan_repo_for_ipas_no_cache(self):
-        self.maxDiff = None
-        with mkdtemp() as tmpdir:
-            os.chdir(tmpdir)
-            os.mkdir("repo")
-            with open('repo/abc.Def_123.ipa', 'w') as f:
-                f.write('abc')
-            with open('repo/xyz.XXX_123.ipa', 'w') as f:
-                f.write('xyz')
-
-            apkcache = mock.MagicMock()
-            repodir = "repo"
-            knownapks = mock.MagicMock()
-
-            def mocked_parse(p, s, c):
-                # pylint: disable=unused-argument
-                return {'packageName': 'abc' if 'abc' in p else 'xyz'}
-
-            with mock.patch('fdroidserver.update.parse_ipa', mocked_parse):
-                ipas, checkchanged = fdroidserver.update.scan_repo_for_ipas(
-                    apkcache, repodir, knownapks
-                )
-
-            self.assertEqual(checkchanged, True)
-            self.assertEqual(len(ipas), 2)
-            package_names_in_ipas = [x['packageName'] for x in ipas]
-            self.assertTrue('abc' in package_names_in_ipas)
-            self.assertTrue('xyz' in package_names_in_ipas)
-
-            apkcache_setter_package_name = [
-                x.args[1]['packageName'] for x in apkcache.__setitem__.mock_calls
-            ]
-            self.assertTrue('abc' in apkcache_setter_package_name)
-            self.assertTrue('xyz' in apkcache_setter_package_name)
-            self.assertEqual(apkcache.__setitem__.call_count, 2)
-
-            knownapks.recordapk.call_count = 2
-            self.assertTrue(
-                unittest.mock.call('abc.Def_123.ipa') in knownapks.recordapk.mock_calls
-            )
-            self.assertTrue(
-                unittest.mock.call('xyz.XXX_123.ipa') in knownapks.recordapk.mock_calls
-            )
-
-
-class TestParseIosScreenShotName(unittest.TestCase):
-    def setUp(self):
-        self.maxDiff = None
-
-    def test_parse_ios_screenshot_name_atforamt_iphone8(self):
-        self.assertEqual(
-            fdroidserver.update.parse_ios_screenshot_name(Path("iPhone 8+ @ iOS 16-1.png")),
-            ("phoneScreenshots", "iPhone 8+", "iOS 16",),
-        )
-
-    def test_parse_ios_screenshot_name_atforamt_ipad13(self):
-        self.assertEqual(
-            fdroidserver.update.parse_ios_screenshot_name(Path("iPad Pro 12.9\" 2gen @ iOS 16-1.png")),
-            ("tenInchScreenshots", "iPad Pro 12.9\" 2gen", "iOS 16",),
-        )
-
-    def test_parse_ios_screenshot_name_underscoreforamt_ipad(self):
-        self.assertEqual(
-            fdroidserver.update.parse_ios_screenshot_name(Path("1_ipadPro129_1.1.png")),
-            ("tenInchScreenshots", "ipadpro129", "unknown",),
-        )
-
-    def test_parse_ios_screenshot_name_underscoreforamt_iphone(self):
-        self.assertEqual(
-            fdroidserver.update.parse_ios_screenshot_name(Path("1_iphone6Plus_1.1.png")),
-            ("phoneScreenshots", "iphone6plus", "unknown",),
-        )
-
-
-class TestInsertLocalizedIosAppMetadata(unittest.TestCase):
-
-    def test_insert_localized_ios_app_metadata(self):
-        self.maxDiff = None
-
-        self.apps_with_packages = {
-            "org.fake": {}
-        }
-
-        def _mock_discover(fastlane_dir):
-            self.assertEqual(
-                fastlane_dir,
-                Path('build/org.fake/fastlane'),
-            )
-            return {"fake screenshots": "fake"}
-
-        def _mock_copy(screenshots, package_name):
-            self.assertEqual(screenshots, {"fake screenshots": "fake"})
-            self.assertEqual(package_name, "org.fake")
-
-        with mock.patch('fdroidserver.update.discover_ios_screenshots', _mock_discover):
-            self.set_localized_mock = mock.Mock()
-            with mock.patch('fdroidserver.update.copy_ios_screenshots_to_repo', _mock_copy):
-                with mock.patch("fdroidserver.update._set_localized_text_entry", self.set_localized_mock):
-                    return fdroidserver.update.insert_localized_ios_app_metadata(
-                        self.apps_with_packages
-                    )
-
-        self.assertListEqual(
-            self.set_localized_mock.call_args_list,
-            [
-                mock.call({}, 'en-US', 'name', Path('build/org.fake/fastlane/metadata/en-US/name.txt')),
-                mock.call({}, 'en-US', 'summary', Path('build/org.fake/fastlane/metadata/en-US/subtitle.txt')),
-                mock.call({}, 'en-US', 'description', Path('build/org.fake/fastlane/metadata/en-US/description.txt')),
-                mock.call({}, 'de-DE', 'name', Path('build/org.fake/fastlane/metadata/de-DE/name.txt')),
-                mock.call({}, 'de-DE', 'summary', Path('build/org.fake/fastlane/metadata/de-DE/subtitle.txt')),
-                mock.call({}, 'de-DE', 'description', Path('build/org.fake/fastlane/metadata/de-DE/description.txt')),
-            ],
-        )
-
-
-class TestDiscoverIosScreenshots(unittest.TestCase):
-    def test_discover_ios_screenshots(self):
-        self.maxDiff = None
-
-        with mkdtemp() as fastlane_dir:
-            fastlane_dir = Path(fastlane_dir)
-            (fastlane_dir / "screenshots/en-US").mkdir(parents=True)
-            with open(fastlane_dir / "screenshots/en-US/iPhone 8+ @ iOS 16-1.png", 'w') as f:
-                f.write("1")
-            with open(fastlane_dir / "screenshots/en-US/iPad Pro 12.9\" 2gen @ iOS 16-1.png", "w") as f:
-                f.write("2")
-            with open(fastlane_dir / "screenshots/en-US/iPad Pro 12.9\" 2gen @ iOS 16-2.png", "w") as f:
-                f.write("3")
-            (fastlane_dir / "screenshots/de-DE").mkdir(parents=True)
-            with open(fastlane_dir / "screenshots/de-DE/1_ipadPro129_1.1.png", "w") as f:
-                f.write("4")
-
-            screenshots = fdroidserver.update.discover_ios_screenshots(fastlane_dir)
-
-            self.assertDictEqual(
-                screenshots,
-                {
-                    "en-US": {
-                        "phoneScreenshots": [
-                            fastlane_dir / "screenshots/en-US/iPhone 8+ @ iOS 16-1.png",
-                        ],
-                        "tenInchScreenshots": [
-                            fastlane_dir / "screenshots/en-US/iPad Pro 12.9\" 2gen @ iOS 16-1.png",
-                            fastlane_dir / "screenshots/en-US/iPad Pro 12.9\" 2gen @ iOS 16-2.png",
-                        ],
-                    },
-                    "de-DE": {
-                        "tenInchScreenshots": [
-                            fastlane_dir / "screenshots/de-DE/1_ipadPro129_1.1.png",
-                        ],
-                    },
-                },
-            )
-
-
-class TestCopyIosScreenshotsToRepo(unittest.TestCase):
-    def setUp(self):
-        self._td = mkdtemp()
-        os.chdir(self._td.name)
-
-    def tearDown(self):
-        os.chdir(basedir)
-        self._td.cleanup()
-
-    def test_copy_ios_screenshots_to_repo(self):
-        self.maxDiff = None
-
-        screenshot_dir_en = Path("build/org.fake/fastlane/screenshots/en-US")
-        s1 = screenshot_dir_en / "iPhone 8+ @ iOS 16-1.png"
-        s2 = screenshot_dir_en / "iPad Pro 12.9\" 2gen @ iOS 16-1.png"
-        s3 = screenshot_dir_en / "iPad Pro 12.9\" 2gen @ iOS 16-2.png"
-        screenshot_dir_de = Path("build/org.fake/fastlane/screenshots/de-DE")
-        s4 = screenshot_dir_de / "1_ipadPro129_1.1.png"
-
-        cmock = mock.Mock()
-        with mock.patch("fdroidserver.update._strip_and_copy_image", cmock):
-            fdroidserver.update.copy_ios_screenshots_to_repo(
-                {
-                    "en-US": {
-                        "phoneScreenshots": [s1],
-                        "tenInchScreenshots": [s2, s3],
-                    },
-                    "de-DE": {
-                        "tenInchScreenshots": [s4],
-                    },
-                },
-                "org.fake",
-            )
-
-        self.assertListEqual(
-            cmock.call_args_list,
-            [
-                mock.call(
-                    'build/org.fake/fastlane/screenshots/en-US/iPhone 8+ @ iOS 16-1.png',
-                    'repo/org.fake/en-US/phoneScreenshots/iPhone_8+_@_iOS_16-1.png',
-                ),
-                mock.call(
-                    'build/org.fake/fastlane/screenshots/en-US/iPad Pro 12.9" 2gen @ iOS 16-1.png',
-                    'repo/org.fake/en-US/tenInchScreenshots/iPad_Pro_12.9"_2gen_@_iOS_16-1.png',
-                ),
-                mock.call(
-                    'build/org.fake/fastlane/screenshots/en-US/iPad Pro 12.9" 2gen @ iOS 16-2.png',
-                    'repo/org.fake/en-US/tenInchScreenshots/iPad_Pro_12.9"_2gen_@_iOS_16-2.png',
-                ),
-                mock.call(
-                    'build/org.fake/fastlane/screenshots/de-DE/1_ipadPro129_1.1.png',
-                    'repo/org.fake/de-DE/tenInchScreenshots/1_ipadPro129_1.1.png',
-                ),
-            ],
-        )
-
-
-class TestGetIpaIcon(unittest.TestCase):
-    def test_get_ipa_icon(self):
-        self.maxDiff = None
-
-        with mkdtemp() as tmpdir:
-            tmpdir = Path(tmpdir)
-            (tmpdir / 'OnionBrowser.xcodeproj').mkdir()
-            with open(tmpdir / 'OnionBrowser.xcodeproj/project.pbxproj', "w") as f:
-                f.write("")
-            icondir = tmpdir / "fake_icon.appiconset"
-            icondir.mkdir()
-            with open(icondir / "Contents.json", "w", encoding="utf-8") as f:
-                f.write("""
-                    {"images": [
-                        {"scale": "2x", "size": "128x128", "filename": "nope"},
-                        {"scale": "1x", "size": "512x512", "filename": "nope"},
-                        {"scale": "1x", "size": "16x16", "filename": "nope"},
-                        {"scale": "1x", "size": "32x32", "filename": "yep"}
-                    ]}
-                """)
-
-            pfp = mock.Mock(return_value="fake_icon")
-            with mock.patch("fdroidserver.update._parse_from_pbxproj", pfp):
-                p = fdroidserver.update._get_ipa_icon(tmpdir)
-                self.assertEqual(str(icondir / "yep"), p)
-
-
-class TestParseFromPbxproj(unittest.TestCase):
-    def test_parse_from_pbxproj(self):
-        self.maxDiff = None
-
-        with mkdtemp() as tmpdir:
-            with open(Path(tmpdir) / "asdf.pbxproj", 'w', encoding="utf-8") as f:
-                f.write("""
-                    230jfaod=flc'
-                    ASSETCATALOG_COMPILER_APPICON_NAME = MyIcon;
-                    cm opa1c p[m
-                """)
-            v = fdroidserver.update._parse_from_pbxproj(
-                Path(tmpdir) / "asdf.pbxproj",
-                "ASSETCATALOG_COMPILER_APPICON_NAME"
-            )
-            self.assertEqual(v, "MyIcon")
diff --git a/tests/test_verify.py b/tests/test_verify.py
deleted file mode 100755
index e5a2f7c4..00000000
--- a/tests/test_verify.py
+++ /dev/null
@@ -1,169 +0,0 @@
-#!/usr/bin/env python3
-
-import json
-import os
-import shutil
-import sys
-import tempfile
-import unittest
-from pathlib import Path
-from unittest.mock import patch
-
-from fdroidserver import verify
-
-TEST_APP_ENTRY = {
-    "1539780240.3885746": {
-        "local": {
-            "file": "unsigned/com.politedroid_6.apk",
-            "packageName": "com.politedroid",
-            "sha256": "70c2f776a2bac38a58a7d521f96ee0414c6f0fb1de973c3ca8b10862a009247d",
-            "timestamp": 1234567.8900000,
-            "versionCode": "6",
-            "versionName": "1.5",
-        },
-        "remote": {
-            "file": "tmp/com.politedroid_6.apk",
-            "packageName": "com.politedroid",
-            "sha256": "70c2f776a2bac38a58a7d521f96ee0414c6f0fb1de973c3ca8b10862a009247d",
-            "timestamp": 1234567.8900000,
-            "versionCode": "6",
-            "versionName": "1.5",
-        },
-        "url": "https://f-droid.org/repo/com.politedroid_6.apk",
-        "verified": True,
-    }
-}
-
-basedir = Path(__file__).parent
-
-
-class VerifyTest(unittest.TestCase):
-    def setUp(self):
-        self.tempdir = tempfile.TemporaryDirectory()
-        os.chdir(self.tempdir.name)
-        self.repodir = Path('repo')
-        self.repodir.mkdir()
-        self.apk_reports_json = basedir / 'org.fdroid.fdroid_1019051.apk.json'
-
-    def tearDown(self):
-        self.tempdir.cleanup()
-
-    def test_get_verified_json_creation(self):
-        self.assertEqual({'packages': {}}, verify.get_verified_json('does-not-exist'))
-
-    def test_get_verified_json_existing(self):
-        f = 'verified.json'
-        reports = {'packages': {'placeholder': {}}}
-        with open(f, 'w') as fp:
-            json.dump(reports, fp)
-        self.assertEqual(reports, verify.get_verified_json(f))
-
-    def test_get_verified_json_pull_in_one_report(self):
-        shutil.copy(self.apk_reports_json, self.tempdir.name)
-        with open(self.apk_reports_json) as fp:
-            reports = json.load(fp)
-        self.assertEqual(
-            {'packages': {'org.fdroid.fdroid': [reports['1708238023.6572325']]}},
-            verify.get_verified_json('does-not-exist'),
-        )
-
-    def test_get_verified_json_ignore_corrupt(self):
-        f = 'verified.json'
-        with open(f, 'w') as fp:
-            fp.write("""{"packages": {"placeholder": {""")
-        shutil.copy(self.apk_reports_json, self.tempdir.name)
-        with open(self.apk_reports_json) as fp:
-            reports = json.load(fp)
-        self.assertEqual(
-            {'packages': {'org.fdroid.fdroid': [reports['1708238023.6572325']]}},
-            verify.get_verified_json(f),
-        )
-
-    def test_get_verified_json_ignore_apk_reports(self):
-        """When an intact verified.json exists, it should ignore the .apk.json reports."""
-        f = 'verified.json'
-        placeholder = {'packages': {'placeholder': {}}}
-        with open(f, 'w') as fp:
-            json.dump(placeholder, fp)
-        shutil.copy(self.apk_reports_json, self.tempdir.name)
-        with open(self.apk_reports_json) as fp:
-            json.load(fp)
-        self.assertEqual(placeholder, verify.get_verified_json(f))
-
-    @unittest.skipIf(sys.byteorder == 'big', 'androguard is not ported to big-endian')
-    @patch('fdroidserver.common.sha256sum')
-    def test_write_json_report(self, sha256sum):
-        sha256sum.return_value = (
-            '70c2f776a2bac38a58a7d521f96ee0414c6f0fb1de973c3ca8b10862a009247d'
-        )
-        os.mkdir('tmp')
-        os.mkdir('unsigned')
-        verified_json = Path('unsigned/verified.json')
-        packageName = 'com.politedroid'
-        apk_name = packageName + '_6.apk'
-        remote_apk = 'tmp/' + apk_name
-        unsigned_apk = 'unsigned/' + apk_name
-        # TODO common.use apk_strip_v1_signatures() on unsigned_apk
-        shutil.copy(basedir / 'repo' / apk_name, remote_apk)
-        shutil.copy(basedir / 'repo' / apk_name, unsigned_apk)
-        url = TEST_APP_ENTRY['1539780240.3885746']['url']
-
-        self.assertFalse(verified_json.exists())
-        verify.write_json_report(url, remote_apk, unsigned_apk, {})
-        self.assertTrue(verified_json.exists())
-        # smoke check status JSON
-        with verified_json.open() as fp:
-            firstpass = json.load(fp)
-
-        verify.write_json_report(url, remote_apk, unsigned_apk, {})
-        with verified_json.open() as fp:
-            secondpass = json.load(fp)
-
-        self.assertEqual(firstpass, secondpass)
-
-    @patch('fdroidserver.common.sha256sum')
-    @patch('fdroidserver.verify.write_verified_json', lambda s: s)
-    def test_write_json_report_appid_json(self, sha256sum):
-        sha256sum.return_value = (
-            '70c2f776a2bac38a58a7d521f96ee0414c6f0fb1de973c3ca8b10862a009247d'
-        )
-        os.mkdir('tmp')
-        os.mkdir('unsigned')
-        appid = 'com.politedroid'
-        apk_name = f'{appid}_6.apk'
-        remote_apk = 'tmp/' + apk_name
-        unsigned_apk = 'unsigned/' + apk_name
-        shutil.copy(basedir / 'repo' / apk_name, remote_apk)
-        shutil.copy(basedir / 'repo' / apk_name, unsigned_apk)
-        url = TEST_APP_ENTRY['1539780240.3885746']['url']
-        with open(f'unsigned/{apk_name}.json', 'w') as fp:
-            json.dump(TEST_APP_ENTRY, fp)
-
-        # make a fake existing report where the newer one broke verifiability
-        with open(f'unsigned/{appid}_16.apk.json', 'w') as fp:
-            json.dump(
-                {
-                    "1444444444.4444444": {
-                        'local': {'versionCode': 16},
-                        'verified': False,
-                    },
-                    "1333333333.3333333": {
-                        'local': {'versionCode': 16},
-                        'verified': True,
-                    },
-                },
-                fp,
-            )
-
-        verify.write_json_report(url, remote_apk, unsigned_apk, {'fake': 'fail'})
-        with open(f'unsigned/{appid}.json') as fp:
-            self.assertEqual(
-                {
-                    'apkReports': [
-                        'unsigned/com.politedroid_6.apk.json',
-                        'unsigned/com.politedroid_16.apk.json',
-                    ],
-                    'lastRunVerified': False,
-                },
-                json.load(fp),
-            )
diff --git a/tests/testcommon.py b/tests/testcommon.py
new file mode 100644
index 00000000..2557bd61
--- /dev/null
+++ b/tests/testcommon.py
@@ -0,0 +1,50 @@
+#!/usr/bin/env python3
+#
+# Copyright (C) 2017, Michael Poehn <michael.poehn@fsfe.org>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+import os
+import sys
+
+
+class TmpCwd():
+    """Context-manager for temporarily changing the current working
+    directory.
+    """
+
+    def __init__(self, new_cwd):
+        self.new_cwd = new_cwd
+
+    def __enter__(self):
+        self.orig_cwd = os.getcwd()
+        os.chdir(self.new_cwd)
+
+    def __exit__(self, a, b, c):
+        os.chdir(self.orig_cwd)
+
+
+class TmpPyPath():
+    """Context-manager for temporarily changing the current working
+    directory.
+    """
+
+    def __init__(self, additional_path):
+        self.additional_path = additional_path
+
+    def __enter__(self):
+        sys.path.append(self.additional_path)
+
+    def __exit__(self, a, b, c):
+        sys.path.remove(self.additional_path)
diff --git a/tests/triple-t-1-graphics/build/de.wivewa.dialer/app/src/main/play/en-US/listing/featureGraphic/play_store_feature_graphic.png b/tests/triple-t-1-graphics/build/de.wivewa.dialer/app/src/main/play/en-US/listing/featureGraphic/play_store_feature_graphic.png
deleted file mode 100644
index 0d5e3591..00000000
Binary files a/tests/triple-t-1-graphics/build/de.wivewa.dialer/app/src/main/play/en-US/listing/featureGraphic/play_store_feature_graphic.png and /dev/null differ
diff --git a/tests/triple-t-1-graphics/build/de.wivewa.dialer/app/src/main/play/en-US/listing/icon/icon.png b/tests/triple-t-1-graphics/build/de.wivewa.dialer/app/src/main/play/en-US/listing/icon/icon.png
deleted file mode 100644
index 17a31d54..00000000
Binary files a/tests/triple-t-1-graphics/build/de.wivewa.dialer/app/src/main/play/en-US/listing/icon/icon.png and /dev/null differ
diff --git a/tests/triple-t-1-graphics/build/de.wivewa.dialer/app/src/main/play/en-US/listing/phoneScreenshots/1.png b/tests/triple-t-1-graphics/build/de.wivewa.dialer/app/src/main/play/en-US/listing/phoneScreenshots/1.png
deleted file mode 100644
index 717be319..00000000
Binary files a/tests/triple-t-1-graphics/build/de.wivewa.dialer/app/src/main/play/en-US/listing/phoneScreenshots/1.png and /dev/null differ
diff --git a/tests/triple-t-1-graphics/metadata/de.wivewa.dialer.yml b/tests/triple-t-1-graphics/metadata/de.wivewa.dialer.yml
deleted file mode 100644
index a86e2c53..00000000
--- a/tests/triple-t-1-graphics/metadata/de.wivewa.dialer.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-Categories:
-  - Phone & SMS
-  - System
-License: GPL-3.0-only
-AuthorEmail: welefon@jolo.software
-SourceCode: https://codeberg.org/wivewa/wivewa-dialer-android
-IssueTracker: https://codeberg.org/wivewa/wivewa-dialer-android/issues
-
-AutoName: Welefon
-
-RepoType: git
-Repo: https://codeberg.org/wivewa/wivewa-dialer-android.git
-
-Builds:
-  - versionName: 1.7.0
-    versionCode: 13
-    commit: 3550193fa6b6f7836876f2ca9bf5819a34eef404
-    subdir: app
-    gradle:
-      - yes
-
-AutoUpdateMode: Version
-UpdateCheckMode: Tags
-CurrentVersion: 1.7.0
-CurrentVersionCode: 13
diff --git a/tests/triple-t-anysoftkeyboard/.gitignore b/tests/triple-t-anysoftkeyboard/.gitignore
deleted file mode 100644
index 0aba28e9..00000000
--- a/tests/triple-t-anysoftkeyboard/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-!build/
diff --git a/tests/triple-t-anysoftkeyboard/build/com.anysoftkeyboard.languagepack.dutch/addons/languages/dutch/apk/src/main/play/listings/en-US/title.txt b/tests/triple-t-anysoftkeyboard/build/com.anysoftkeyboard.languagepack.dutch/addons/languages/dutch/apk/src/main/play/listings/en-US/title.txt
deleted file mode 100644
index 6e75c228..00000000
--- a/tests/triple-t-anysoftkeyboard/build/com.anysoftkeyboard.languagepack.dutch/addons/languages/dutch/apk/src/main/play/listings/en-US/title.txt
+++ /dev/null
@@ -1 +0,0 @@
-Dutch for AnySoftKeyboard
diff --git a/tests/triple-t-anysoftkeyboard/build/com.anysoftkeyboard.languagepack.dutch/ime/app/src/main/play/listings/en-US/title.txt b/tests/triple-t-anysoftkeyboard/build/com.anysoftkeyboard.languagepack.dutch/ime/app/src/main/play/listings/en-US/title.txt
deleted file mode 100644
index 7c5eeaeb..00000000
--- a/tests/triple-t-anysoftkeyboard/build/com.anysoftkeyboard.languagepack.dutch/ime/app/src/main/play/listings/en-US/title.txt
+++ /dev/null
@@ -1 +0,0 @@
-AnySoftKeyboard
diff --git a/tests/triple-t-anysoftkeyboard/build/com.anysoftkeyboard.languagepack.dutch/settings.gradle b/tests/triple-t-anysoftkeyboard/build/com.anysoftkeyboard.languagepack.dutch/settings.gradle
deleted file mode 100644
index 523aadb7..00000000
--- a/tests/triple-t-anysoftkeyboard/build/com.anysoftkeyboard.languagepack.dutch/settings.gradle
+++ /dev/null
@@ -1,77 +0,0 @@
-rootProject.name = 'AnySoftKeyboard'
-include ':deployment'
-
-include ':api'
-
-include ':addons:base'
-include ':addons:languages'
-include ':addons:languages:english', ':addons:languages:english:pack'
-
-//list of packs should be alphabetized-ordered
-include ':addons:languages:afrikaans_oss:pack', ':addons:languages:afrikaans_oss:apk'
-include ':addons:languages:armenian2:pack', ':addons:languages:armenian2:apk'
-include ":addons:languages:belarusian:pack", ":addons:languages:belarusian:apk"
-include ':addons:languages:brazilian:pack', ':addons:languages:brazilian:apk'
-include ':addons:languages:catalan:pack', ':addons:languages:catalan:apk'
-include ':addons:languages:coptic:pack', ':addons:languages:coptic:apk'
-include ':addons:languages:czech:pack', ':addons:languages:czech:apk'
-include ':addons:languages:english:pack', ':addons:languages:english:apk'
-include ':addons:languages:esperanto:pack', ':addons:languages:esperanto:apk'
-include ':addons:languages:finnish:pack', ':addons:languages:finnish:apk'
-include ':addons:languages:french:pack', ':addons:languages:french:apk'
-include ':addons:languages:greek:pack', ':addons:languages:greek:apk'
-include ':addons:languages:hebrew:pack', ':addons:languages:hebrew:apk'
-include ':addons:languages:indonesian:pack', ':addons:languages:indonesian:apk'
-include ':addons:languages:italian:pack', ':addons:languages:italian:apk'
-include ':addons:languages:lithuanian:pack', ':addons:languages:lithuanian:apk'
-include ':addons:languages:nias:pack', ':addons:languages:nias:apk'
-include ':addons:languages:ossturkish:pack', ':addons:languages:ossturkish:apk'
-include ':addons:languages:persian:pack', ':addons:languages:persian:apk'
-include ':addons:languages:piedmontese:pack', ':addons:languages:piedmontese:apk'
-include ':addons:languages:romanian:pack', ':addons:languages:romanian:apk'
-include ':addons:languages:russian2:pack', ':addons:languages:russian2:apk'
-include ':addons:languages:sardinian:pack', ':addons:languages:sardinian:apk'
-include ':addons:languages:serbian:pack', ':addons:languages:serbian:apk'
-include ':addons:languages:spain:pack', ':addons:languages:spain:apk'
-include ':addons:languages:tamazight:pack', ':addons:languages:tamazight:apk'
-include ':addons:languages:arabic:pack', ':addons:languages:arabic:apk'
-include ':addons:languages:danish:pack', ':addons:languages:danish:apk'
-include ':addons:languages:basque:pack', ':addons:languages:basque:apk'
-include ':addons:languages:bulgarian:pack', ':addons:languages:bulgarian:apk'
-include ':addons:languages:german:pack', ':addons:languages:german:apk'
-include ':addons:languages:croatian:pack', ':addons:languages:croatian:apk'
-include ':addons:languages:georgian:pack', ':addons:languages:georgian:apk'
-include ':addons:languages:latvian:pack', ':addons:languages:latvian:apk'
-include ':addons:languages:kurdish:pack', ':addons:languages:kurdish:apk'
-include ':addons:languages:hungarian:pack', ':addons:languages:hungarian:apk'
-include ':addons:languages:kachin:pack', ':addons:languages:kachin:apk'
-include ':addons:languages:dutch:pack', ':addons:languages:dutch:apk'
-include ':addons:languages:luxembourgish:pack', ':addons:languages:luxembourgish:apk'
-include ':addons:languages:norwegian:pack', ':addons:languages:norwegian:apk'
-include ':addons:languages:polish:pack', ':addons:languages:polish:apk'
-include ':addons:languages:rusyn:pack', ':addons:languages:rusyn:apk'
-include ':addons:languages:sinhala:pack', ':addons:languages:sinhala:apk'
-include ':addons:languages:hindi:pack', ':addons:languages:hindi:apk'
-include ':addons:languages:thai:pack', ':addons:languages:thai:apk'
-include ':addons:languages:portuguese:pack', ':addons:languages:portuguese:apk'
-
-//list of themes should be alphabetized-ordered
-include ':addons:themes'
-include ':addons:themes:classic_pc:pack', ':addons:themes:classic_pc:apk'
-include ':addons:themes:ics:pack', ':addons:themes:ics:apk'
-include ':addons:themes:israel64:pack', ':addons:themes:israel64:apk'
-include ':addons:themes:three_d:pack', ':addons:themes:three_d:apk'
-
-//list of quick-text should be alphabetized-ordered
-include ':addons:quicktexts'
-include ':addons:quicktexts:bbcodes:pack', ':addons:quicktexts:bbcodes:apk'
-
-include ':ime'
-include ':ime:base', ':ime:base-rx', ':ime:base-test', ':ime:prefs'
-include ':ime:remote', ':ime:fileprovider'
-include ':ime:addons'
-include ':ime:dictionaries', ':ime:dictionaries:jnidictionaryv1', ':ime:dictionaries:jnidictionaryv2', ':ime:nextword'
-include ':ime:pixel', ':ime:overlay'
-include 'ime:voiceime'
-include ':ime:app'
-
diff --git a/tests/triple-t-anysoftkeyboard/build/com.menny.android.anysoftkeyboard/addons/languages/dutch/apk/src/main/play/listings/en-US/title.txt b/tests/triple-t-anysoftkeyboard/build/com.menny.android.anysoftkeyboard/addons/languages/dutch/apk/src/main/play/listings/en-US/title.txt
deleted file mode 100644
index 6e75c228..00000000
--- a/tests/triple-t-anysoftkeyboard/build/com.menny.android.anysoftkeyboard/addons/languages/dutch/apk/src/main/play/listings/en-US/title.txt
+++ /dev/null
@@ -1 +0,0 @@
-Dutch for AnySoftKeyboard
diff --git a/tests/triple-t-anysoftkeyboard/build/com.menny.android.anysoftkeyboard/ime/app/src/main/play/listings/en-US/title.txt b/tests/triple-t-anysoftkeyboard/build/com.menny.android.anysoftkeyboard/ime/app/src/main/play/listings/en-US/title.txt
deleted file mode 100644
index 7c5eeaeb..00000000
--- a/tests/triple-t-anysoftkeyboard/build/com.menny.android.anysoftkeyboard/ime/app/src/main/play/listings/en-US/title.txt
+++ /dev/null
@@ -1 +0,0 @@
-AnySoftKeyboard
diff --git a/tests/triple-t-anysoftkeyboard/build/com.menny.android.anysoftkeyboard/settings.gradle b/tests/triple-t-anysoftkeyboard/build/com.menny.android.anysoftkeyboard/settings.gradle
deleted file mode 100644
index 523aadb7..00000000
--- a/tests/triple-t-anysoftkeyboard/build/com.menny.android.anysoftkeyboard/settings.gradle
+++ /dev/null
@@ -1,77 +0,0 @@
-rootProject.name = 'AnySoftKeyboard'
-include ':deployment'
-
-include ':api'
-
-include ':addons:base'
-include ':addons:languages'
-include ':addons:languages:english', ':addons:languages:english:pack'
-
-//list of packs should be alphabetized-ordered
-include ':addons:languages:afrikaans_oss:pack', ':addons:languages:afrikaans_oss:apk'
-include ':addons:languages:armenian2:pack', ':addons:languages:armenian2:apk'
-include ":addons:languages:belarusian:pack", ":addons:languages:belarusian:apk"
-include ':addons:languages:brazilian:pack', ':addons:languages:brazilian:apk'
-include ':addons:languages:catalan:pack', ':addons:languages:catalan:apk'
-include ':addons:languages:coptic:pack', ':addons:languages:coptic:apk'
-include ':addons:languages:czech:pack', ':addons:languages:czech:apk'
-include ':addons:languages:english:pack', ':addons:languages:english:apk'
-include ':addons:languages:esperanto:pack', ':addons:languages:esperanto:apk'
-include ':addons:languages:finnish:pack', ':addons:languages:finnish:apk'
-include ':addons:languages:french:pack', ':addons:languages:french:apk'
-include ':addons:languages:greek:pack', ':addons:languages:greek:apk'
-include ':addons:languages:hebrew:pack', ':addons:languages:hebrew:apk'
-include ':addons:languages:indonesian:pack', ':addons:languages:indonesian:apk'
-include ':addons:languages:italian:pack', ':addons:languages:italian:apk'
-include ':addons:languages:lithuanian:pack', ':addons:languages:lithuanian:apk'
-include ':addons:languages:nias:pack', ':addons:languages:nias:apk'
-include ':addons:languages:ossturkish:pack', ':addons:languages:ossturkish:apk'
-include ':addons:languages:persian:pack', ':addons:languages:persian:apk'
-include ':addons:languages:piedmontese:pack', ':addons:languages:piedmontese:apk'
-include ':addons:languages:romanian:pack', ':addons:languages:romanian:apk'
-include ':addons:languages:russian2:pack', ':addons:languages:russian2:apk'
-include ':addons:languages:sardinian:pack', ':addons:languages:sardinian:apk'
-include ':addons:languages:serbian:pack', ':addons:languages:serbian:apk'
-include ':addons:languages:spain:pack', ':addons:languages:spain:apk'
-include ':addons:languages:tamazight:pack', ':addons:languages:tamazight:apk'
-include ':addons:languages:arabic:pack', ':addons:languages:arabic:apk'
-include ':addons:languages:danish:pack', ':addons:languages:danish:apk'
-include ':addons:languages:basque:pack', ':addons:languages:basque:apk'
-include ':addons:languages:bulgarian:pack', ':addons:languages:bulgarian:apk'
-include ':addons:languages:german:pack', ':addons:languages:german:apk'
-include ':addons:languages:croatian:pack', ':addons:languages:croatian:apk'
-include ':addons:languages:georgian:pack', ':addons:languages:georgian:apk'
-include ':addons:languages:latvian:pack', ':addons:languages:latvian:apk'
-include ':addons:languages:kurdish:pack', ':addons:languages:kurdish:apk'
-include ':addons:languages:hungarian:pack', ':addons:languages:hungarian:apk'
-include ':addons:languages:kachin:pack', ':addons:languages:kachin:apk'
-include ':addons:languages:dutch:pack', ':addons:languages:dutch:apk'
-include ':addons:languages:luxembourgish:pack', ':addons:languages:luxembourgish:apk'
-include ':addons:languages:norwegian:pack', ':addons:languages:norwegian:apk'
-include ':addons:languages:polish:pack', ':addons:languages:polish:apk'
-include ':addons:languages:rusyn:pack', ':addons:languages:rusyn:apk'
-include ':addons:languages:sinhala:pack', ':addons:languages:sinhala:apk'
-include ':addons:languages:hindi:pack', ':addons:languages:hindi:apk'
-include ':addons:languages:thai:pack', ':addons:languages:thai:apk'
-include ':addons:languages:portuguese:pack', ':addons:languages:portuguese:apk'
-
-//list of themes should be alphabetized-ordered
-include ':addons:themes'
-include ':addons:themes:classic_pc:pack', ':addons:themes:classic_pc:apk'
-include ':addons:themes:ics:pack', ':addons:themes:ics:apk'
-include ':addons:themes:israel64:pack', ':addons:themes:israel64:apk'
-include ':addons:themes:three_d:pack', ':addons:themes:three_d:apk'
-
-//list of quick-text should be alphabetized-ordered
-include ':addons:quicktexts'
-include ':addons:quicktexts:bbcodes:pack', ':addons:quicktexts:bbcodes:apk'
-
-include ':ime'
-include ':ime:base', ':ime:base-rx', ':ime:base-test', ':ime:prefs'
-include ':ime:remote', ':ime:fileprovider'
-include ':ime:addons'
-include ':ime:dictionaries', ':ime:dictionaries:jnidictionaryv1', ':ime:dictionaries:jnidictionaryv2', ':ime:nextword'
-include ':ime:pixel', ':ime:overlay'
-include 'ime:voiceime'
-include ':ime:app'
-
diff --git a/tests/triple-t-anysoftkeyboard/metadata/com.anysoftkeyboard.languagepack.dutch.yml b/tests/triple-t-anysoftkeyboard/metadata/com.anysoftkeyboard.languagepack.dutch.yml
deleted file mode 100644
index 707bb096..00000000
--- a/tests/triple-t-anysoftkeyboard/metadata/com.anysoftkeyboard.languagepack.dutch.yml
+++ /dev/null
@@ -1,76 +0,0 @@
-Categories:
-  - Writing
-License: Apache-2.0
-SourceCode: https://github.com/AnySoftKeyboard/AnySoftKeyboard/
-IssueTracker: https://github.com/AnySoftKeyboard/AnySoftKeyboard/issues
-Donate: https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=KDYBGNUNMMN94&lc=US&item_name=AnySoftKeyboard
-
-AutoName: AnySoftKeyboard - Dutch Language Pack
-Description: |-
-    <b>This app has been deprecated in favor of https://f-droid.org/en/packages/com.anysoftkeyboard.languagepack.dutch_oss/</b>
-
-    This is the Dutch language pack for AnySoftKeyboard. It offers an extensive
-    Dutch dictionary and optimised keyboard. In order to use it, first install
-    https://f-droid.org/packages/com.menny.android.anysoftkeyboard – a practical input method for Android
-    smartphones and tablets.
-
-    The dictionary is based on the word list from Stichting OpenTaal and has the
-    Quality Mark Spelling (Keurmerk Spelling) of the Dutch Language Union
-    (Taalunie). This language pack has been created by Stichting OpenTaal and can be
-    installed by all without any costs. The language-specific files in this language
-    pack have a dual license. Both the BSD 2-Clause License as the Creative Commons,
-    Attribution 4.0 (unported) apply.
-
-    Please, help us create free and open Dutch writing tools. Donate tax free to our
-    foundation at <a href="https://www.opentaal.org/vrienden-van-opentaal">https://www.opentaal.org/vrienden-van-opentaal</a>
-
-RepoType: git
-Repo: https://github.com/AnySoftKeyboard/AnySoftKeyboard.git
-
-Builds:
-  - versionName: '1.0'
-    versionCode: 1
-    disable: wait for upstream
-    commit: c5efd5986ce9beec299919f7ae9f174abd33b156
-    gradle:
-      - yes
-    forceversion: true
-    preassemble:
-      - :makeDictionary
-
-  - versionName: '1.4'
-    versionCode: 5
-    commit: dutch-1.4
-    gradle:
-      - yes
-    forceversion: true
-    preassemble:
-      - :makeDictionary
-
-  - versionName: 4.0.1396
-    versionCode: 2908
-    commit: 1.10-r4
-    subdir: addons/languages/dutch
-    sudo:
-      - apt-get update || apt-get update
-      - apt-get install -t bullseye openjdk-11-jdk-headless openjdk-11-jre-headless
-      - update-alternatives --auto java
-    gradle:
-      - yes
-    output: ../../../outputs/apks/release/addons-languages-*-$$VERCODE$$.apk
-    prebuild:
-      - echo "//gradleVersion = '6.8.3'" | tee build.gradle
-      - sed -i -e "s calculateApplicationId(project) 'com.anysoftkeyboard.languagepack.dutch'
-        " ../../../gradle/apk_module.gradle
-      - sed -i -e '/Data\.versionCode/ c versionCode $$VERCODE$$' -e '/Data\.versionName/
-        c versionName "$$VERSION$$"' ../../../gradle/versioning_apk.gradle
-    scanignore:
-      - addons/languages/*/pack/dictionary/*.gz
-    ndk: r14b
-
-MaintainerNotes: Package ID is now com.anysoftkeyboard.languagepack.dutch_oss
-
-AutoUpdateMode: None
-UpdateCheckMode: None
-CurrentVersion: 4.0.1396
-CurrentVersionCode: 2908
diff --git a/tests/triple-t-anysoftkeyboard/metadata/com.menny.android.anysoftkeyboard.yml b/tests/triple-t-anysoftkeyboard/metadata/com.menny.android.anysoftkeyboard.yml
deleted file mode 100644
index 4dc8d7ac..00000000
--- a/tests/triple-t-anysoftkeyboard/metadata/com.menny.android.anysoftkeyboard.yml
+++ /dev/null
@@ -1,523 +0,0 @@
-Categories:
-  - Writing
-License: Apache-2.0
-WebSite: https://anysoftkeyboard.github.io
-SourceCode: https://github.com/AnySoftKeyboard/AnySoftKeyboard
-IssueTracker: https://github.com/AnySoftKeyboard/AnySoftKeyboard/issues
-Translation: https://crowdin.com/project/anysoftkeyboard
-Changelog: https://github.com/AnySoftKeyboard/AnySoftKeyboard/releases
-Donate: https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=KDYBGNUNMMN94&lc=US&item_name=AnySoftKeyboard
-
-AutoName: AnySoftKeyboard
-
-RepoType: git
-Repo: https://github.com/AnySoftKeyboard/AnySoftKeyboard.git
-
-Builds:
-  - versionName: '20120528'
-    versionCode: 74
-    commit: d6c2f7448
-    srclibs:
-      - AnySoftKeyboard-API@78768bc479
-    prebuild: sed -i 's@\(android.library.reference.1=\).*@\1$$AnySoftKeyboard-API$$@'
-        project.properties
-    buildjni:
-      - yes
-    ndk: r12b
-
-  - versionName: 20120814-eye-candy
-    versionCode: 76
-    disable: doesn't build
-    commit: unknown - see disabled
-    srclibs:
-      - AnySoftKeyboard-API@78768bc479
-    prebuild: sed -i 's@\(android.library.reference.1=\).*@\1$$AnySoftKeyboard-API$$@'
-        project.properties
-    buildjni:
-      - yes
-    ndk: r12b
-
-  - versionName: 20130106-eye-candy
-    versionCode: 85
-    commit: a7723e1db5
-    srclibs:
-      - AnySoftKeyboard-API@b21d8907
-    prebuild:
-      - sed -i 's@\(android.library.reference.1=\).*@\1$$AnySoftKeyboard-API$$@' project.properties
-      - rm -rf libs/armeabi*/ libs/x86/ libs/mips/ ant/ keyboard_keystore StoreStuff/
-        res/raw/words_1.dict
-      - wget https://softkeyboard.googlecode.com/svn-history/r544/trunk/project/dict_creation/makedict_Linux
-      - wget https://github.com/AnySoftKeyboard/AnySoftKeyboardTools/blob/HEAD/makedict/makedict.jar?raw=true
-        -O makedict.jar
-      - chmod +x makedict_Linux
-      - ./makedict_Linux dict/words.xml
-    buildjni:
-      - yes
-    ndk: r12b
-
-  - versionName: 20130222-skinny-eye-candy
-    versionCode: 95
-    commit: 50daad0b0a
-    srclibs:
-      - AnySoftKeyboard-API@b21d8907
-      - AnySoftKeyboardTools@73e9a09496
-    prebuild:
-      - sed -i 's@\(android.library.reference.1=\).*@\1$$AnySoftKeyboard-API$$@' project.properties
-      - sed -i 's@..\/AnySoftKeyboardTools@$$AnySoftKeyboardTools$$@g' build.xml
-      - rm -rf libs/armeabi*/ libs/x86/ libs/mips/ ant/ keyboard_keystore StoreStuff/
-        res/raw/words_1.dict
-    buildjni:
-      - yes
-    ndk: r12b
-
-  - versionName: 20130501-skinny-eye-candy-post-birthday
-    versionCode: 98
-    commit: 6f51b8a9d
-    srclibs:
-      - AnySoftKeyboard-API@2c864957
-      - AnySoftKeyboardTools@73e9a09496
-    prebuild:
-      - sed -i 's@\(android.library.reference.1=\).*@\1$$AnySoftKeyboard-API$$@' project.properties
-      - sed -i 's@..\/AnySoftKeyboardTools@$$AnySoftKeyboardTools$$@g' build.xml
-      - rm -rf libs/armeabi*/ libs/x86/ libs/mips/ ant/ keyboard_keystore StoreStuff/
-        res/raw/words_1.dict
-    buildjni:
-      - yes
-    ndk: r12b
-
-  - versionName: '20130528'
-    versionCode: 102
-    commit: 72fd519
-    srclibs:
-      - AnySoftKeyboard-API@8d8a958e17
-      - AnySoftKeyboardTools@73e9a09496
-    prebuild:
-      - sed -i 's@\(reference.1=\).*@\1$$AnySoftKeyboard-API$$@' project.properties
-      - sed -i 's@..\/AnySoftKeyboardTools@$$AnySoftKeyboardTools$$@g' build.xml
-      - rm -rf libs/armeabi*/ libs/x86/ libs/mips/ ant/ keyboard_keystore StoreStuff/
-        res/raw/words_1.dict
-    buildjni:
-      - yes
-    ndk: r12b
-
-  - versionName: '20130709'
-    versionCode: 106
-    commit: f1ba2de
-    srclibs:
-      - AnySoftKeyboard-API@30851236d7
-      - AnySoftKeyboardTools@73e9a09496
-    prebuild:
-      - sed -i 's@\(.1=\).*@\1$$AnySoftKeyboard-API$$@' project.properties
-      - sed -i 's@..\/AnySoftKeyboardTools@$$AnySoftKeyboardTools$$@g' build.xml
-      - rm -rf libs/armeabi*/ libs/x86/ libs/mips/ ant/ keyboard_keystore StoreStuff/
-        res/raw/words_1.dict
-    buildjni:
-      - yes
-    ndk: r12b
-
-  - versionName: '20130807'
-    versionCode: 107
-    disable: not published
-    commit: unknown - see disabled
-
-  - versionName: '20130919'
-    versionCode: 111
-    commit: 2a68963f
-    srclibs:
-      - AnySoftKeyboard-API@30851236d7
-      - AnySoftKeyboardTools@73e9a09496
-    prebuild:
-      - sed -i 's@\(.1=\).*@\1$$AnySoftKeyboard-API$$@' project.properties
-      - sed -i 's@..\/AnySoftKeyboardTools@$$AnySoftKeyboardTools$$@g' build.xml
-      - rm -rf libs/armeabi*/ libs/x86/ libs/mips/ ant/ keyboard_keystore StoreStuff/
-        res/raw/words_1.dict
-    buildjni:
-      - yes
-    ndk: r12b
-
-  - versionName: '20131101'
-    versionCode: 114
-    disable: no longer uses ant, prebuilts
-    commit: 82538d456f8
-    srclibs:
-      - AnySoftKeyboard-API@08b452ff4
-      - AnySoftKeyboardTools@73e9a09496
-    prebuild:
-      - sed -i 's@\(.1=\).*@\1$$AnySoftKeyboard-API$$@' project.properties
-      - sed -i 's@..\/AnySoftKeyboardTools@$$AnySoftKeyboardTools$$@g' build.xml
-      - rm -rf libs/armeabi*/ libs/x86/ libs/mips/ ant/ keyboard_keystore StoreStuff/
-        res/raw/words_1.dict
-    buildjni:
-      - yes
-    ndk: r12b
-
-  - versionName: 1.2.20140705
-    versionCode: 140
-    disable: build words dict from source, no idea what version name/code it is
-    commit: 1.5-r4.1
-    gradle:
-      - yes
-    rm:
-      - res/raw/words_1.dict
-
-  - versionName: 1.8.84
-    versionCode: 1409
-    commit: 1.8-r1
-    init: sed -i -e '/fabric/d' -e '/canaryCompile/,+2d' build.gradle
-    gradle:
-      - yes
-    rm:
-      - src/main/res/raw/words_1.dict
-    preassemble:
-      - makeEnglishDictionary
-
-  - versionName: 1.8.133
-    versionCode: 1458
-    disable: broken subdir
-    commit: 1.8-r3
-    subdir: app
-    init: sed -i -e '/fabric/d' -e '/canaryCompile/,+2d' ../build.gradle build.gradle
-    gradle:
-      - yes
-    rm:
-      - app/src/main/res/raw/words_1.dict
-    preassemble:
-      - :makeEnglishDictionary
-
-  - versionName: 1.8.146
-    versionCode: 1471
-    commit: 1.8-r4
-    subdir: app
-    init: sed -i -e '/fabric/d' -e '/canaryCompile/,+2d' ../build.gradle build.gradle
-    gradle:
-      - yes
-    rm:
-      - app/src/main/res/raw/words_1.dict
-    preassemble:
-      - :makeEnglishDictionary
-
-  - versionName: 1.8.190
-    versionCode: 1515
-    disable: weird version/vc-issue
-    commit: 1.8-r5.1
-    subdir: app
-    init: sed -i -e '/fabric/d' -e '/canaryCompile/,+2d' ../build.gradle build.gradle
-    gradle:
-      - yes
-    rm:
-      - app/src/main/res/raw/words_1.dict
-    preassemble:
-      - :makeEnglishDictionary
-
-  - versionName: 1.8.195
-    versionCode: 1520
-    commit: 1.8-r5.2
-    subdir: app
-    init: sed -i -e '/fabric/d' -e '/canaryCompile/,+2d' ../build.gradle build.gradle
-    gradle:
-      - yes
-    rm:
-      - app/src/main/res/raw/words_1.dict
-    preassemble:
-      - :makeEnglishDictionary
-
-  - versionName: 1.8.253
-    versionCode: 1578
-    commit: 1.8-r6
-    subdir: app
-    init: sed -i -e '/fabric/d' -e '/canaryCompile/,+2d' ../build.gradle build.gradle
-    gradle:
-      - yes
-    forceversion: true
-    rm:
-      - app/src/main/res/raw/words_1.dict
-    prebuild: sed -i -e '/versionCode/d' -e '/versionName/aversionCode $$VERCODE$$'  build.gradle
-    preassemble:
-      - :makeEnglishDictionary
-
-  - versionName: 1.8.329
-    versionCode: 1654
-    commit: 1.8-r7
-    subdir: app
-    init: sed -i -e '/fabric/d' -e '/canaryCompile/,+2d' ../build.gradle build.gradle
-    gradle:
-      - yes
-    forceversion: true
-    rm:
-      - app/src/main/res/raw/words_1.dict
-    prebuild: sed -i -e '/versionCode/d' -e '/versionName/aversionCode $$VERCODE$$'  build.gradle
-    preassemble:
-      - :makeEnglishDictionary
-
-  - versionName: 1.8.401
-    versionCode: 1726
-    commit: 1.8-r7.1
-    subdir: app
-    init: sed -i -e '/fabric/d' -e '/canaryCompile/,+2d' ../build.gradle build.gradle
-    gradle:
-      - yes
-    forceversion: true
-    rm:
-      - app/src/main/res/raw/words_1.dict
-    prebuild:
-      - sed -i -e '/versionCode/d' -e '/versionName/aversionCode $$VERCODE$$' build.gradle
-      - sed -i -e '/crashlytics/,$d' build.gradle
-    preassemble:
-      - :makeEnglishDictionary
-
-  - versionName: 1.8.503
-    versionCode: 1828
-    commit: 1.8-r8
-    subdir: app
-    init: sed -i -e '/fabric/d' -e '/canaryCompile/,+2d' ../build.gradle build.gradle
-    gradle:
-      - yes
-    forceversion: true
-    rm:
-      - app/src/main/res/raw/words_*.dict
-    prebuild:
-      - sed -i -e '/versionCode/d' -e '/versionName/aversionCode $$VERCODE$$' build.gradle
-      - sed -i -e '/crashlytics/,$d' build.gradle
-    preassemble:
-      - :makeEnglishDictionary
-
-  - versionName: 1.8.585
-    versionCode: 1910
-    commit: 1.8-r9
-    subdir: app
-    init: sed -i -e '/fabric/d' -e '/canaryCompile/,+2d' ../build.gradle build.gradle
-    gradle:
-      - yes
-    forceversion: true
-    rm:
-      - app/src/main/res/raw/words_*.dict
-    prebuild:
-      - sed -i -e '/versionCode/d' -e '/versionName/aversionCode $$VERCODE$$' build.gradle
-      - sed -i -e '/crashlytics/,$d' build.gradle
-    preassemble:
-      - :makeEnglishDictionary
-
-  - versionName: 1.8.735
-    versionCode: 2060
-    commit: 1.8-r10
-    subdir: app
-    init: sed -i -e '/fabric/d' -e '/canaryCompile/,+2d' ../build.gradle build.gradle
-    gradle:
-      - yes
-    forceversion: true
-    rm:
-      - app/src/main/res/raw/words_*.dict
-    prebuild:
-      - sed -i -e '/versionCode/d' -e '/versionName/aversionCode $$VERCODE$$' build.gradle
-      - sed -i -e '/crashlytics/,$d' build.gradle
-    preassemble:
-      - :makeEnglishDictionary
-
-  - versionName: 1.8.844
-    versionCode: 2169
-    commit: 1.8-r11
-    subdir: app
-    init: sed -i -e '/fabric/d' -e '/canaryCompile/,+2d' ../build.gradle build.gradle
-    gradle:
-      - yes
-    forceversion: true
-    rm:
-      - app/src/main/res/raw/words_*.dict
-    prebuild:
-      - sed -i -e '/versionCode/d' -e '/versionName/aversionCode $$VERCODE$$' build.gradle
-      - sed -i -e '/crashlytics/,$d' build.gradle
-    preassemble:
-      - :makeEnglishDictionary
-
-  - versionName: 1.8.1241
-    versionCode: 2566
-    commit: 1.8-r12
-    subdir: app
-    init: sed -i -e '/fabric/d' -e '/canaryCompile/,+2d' ../build.gradle build.gradle
-    gradle:
-      - yes
-    forceversion: true
-    rm:
-      - app/src/main/res/raw/words_*.dict
-    prebuild:
-      - sed -i -e '/versionCode/d' -e '/versionName/aversionCode $$VERCODE$$' build.gradle
-      - sed -i -e '/crashlytics/,$d' build.gradle
-    preassemble:
-      - :makeEnglishDictionary
-
-  - versionName: 1.8.1333
-    versionCode: 2658
-    commit: 1.8-r12.2
-    subdir: app
-    init: sed -i -e '/fabric/d' -e '/canaryCompile/,+2d' ../build.gradle build.gradle
-    gradle:
-      - yes
-    forceversion: true
-    rm:
-      - app/src/main/res/raw/words_*.dict
-    prebuild:
-      - sed -i -e '/versionCode/d' -e '/versionName/aversionCode $$VERCODE$$' build.gradle
-      - sed -i -e '/crashlytics/,$d' build.gradle
-    ndk: r11c
-    preassemble:
-      - :makeEnglishDictionary
-
-  - versionName: 1.9.1117
-    versionCode: 3692
-    commit: 1.9-r1
-    subdir: app
-    init: sed -i -e '/fabric/d' -e '/canaryImplementation/,+2d' ../build.gradle build.gradle
-    gradle:
-      - yes
-    forceversion: true
-    rm:
-      - app/src/main/res/raw/words_*.dict
-    prebuild:
-      - sed -i -e '/versionCode/d' -e '/versionName/aversionCode $$VERCODE$$' -e '/crashlytics/,$d'
-        build.gradle
-      - sed -i -e 's/gradle:3.1.0-alpha06/gradle:3.0.1/' ../build.gradle
-    scandelete:
-      - buildSrc
-      - app/src/debug
-    ndk: r14b
-    preassemble:
-      - :makeEnglishDictionary
-
-  - versionName: 1.9.1944
-    versionCode: 4519
-    commit: 1.9-r3-fdroid
-    subdir: app
-    init: sed -i -e '/fabric/d' -e '/canaryImplementation/d' ../build.gradle build.gradle
-    gradle:
-      - yes
-    forceversion: true
-    rm:
-      - app/src/main/res/raw/words_*.dict
-    prebuild: sed -i -e '/versionCode/d' -e '/versionName/aversionCode $$VERCODE$$'
-        -e '/crashlytics/,$d' build.gradle
-    scandelete:
-      - buildSrc
-      - app/src/debug
-    ndk: r14b
-    preassemble:
-      - :makeEnglishDictionary
-
-  - versionName: 1.9.2055
-    versionCode: 4630
-    commit: 1.9-r4
-    subdir: app
-    init: sed -i -e '/fabric/d' -e '/canaryImplementation/d' ../build.gradle build.gradle
-    gradle:
-      - yes
-    forceversion: true
-    rm:
-      - app/src/main/res/raw/words_*.dict
-    prebuild: sed -i -e '/versionCode/d' -e '/versionName/aversionCode $$VERCODE$$'
-        -e '/crashlytics/,$d' build.gradle
-    scandelete:
-      - buildSrc
-      - app/src/debug
-    ndk: r14b
-    preassemble:
-      - :makeEnglishDictionary
-
-  - versionName: 1.9.2445
-    versionCode: 5020
-    commit: 1.9-r5.1
-    subdir: app
-    gradle:
-      - yes
-    forceversion: true
-    rm:
-      - app/src/main/res/raw/words_*.dict
-    prebuild: sed -i -e '/versionCode/d' -e '/versionName/aversionCode $$VERCODE$$'
-        build.gradle
-    scandelete:
-      - buildSrc
-      - app/src/debug
-    ndk: r14b
-    preassemble:
-      - :makeEnglishDictionary
-
-  - versionName: 1.9.2629
-    versionCode: 5204
-    commit: 1.9-r6
-    subdir: app
-    gradle:
-      - yes
-    forceversion: true
-    prebuild: sed -i -e '/versionCode/d' -e '/versionName/aversionCode $$VERCODE$$'
-        build.gradle
-    scandelete:
-      - buildSrc
-    ndk: r14b
-
-  - versionName: 1.10.364
-    versionCode: 5539
-    commit: 1.10-r1
-    subdir: app
-    gradle:
-      - yes
-    forceversion: true
-    prebuild: sed -i -e '/versionCode/d' -e '/versionName/aversionCode $$VERCODE$$'
-        build.gradle
-    scandelete:
-      - buildSrc
-    ndk: r14b
-
-  - versionName: 1.10.606
-    versionCode: 5781
-    commit: 1.10-r2
-    subdir: app
-    gradle:
-      - yes
-    forceversion: true
-    prebuild: sed -i -e '/versionCode/d' -e '/versionName/aversionCode $$VERCODE$$'
-        build.gradle
-    scandelete:
-      - buildSrc
-    ndk: r14b
-
-  - versionName: 1.10.1109
-    versionCode: 6279
-    commit: e57c9cc852aefdc1ff60b024e52d4341337b3df7
-    subdir: app
-    gradle:
-      - yes
-    forceversion: true
-    prebuild: sed -i -e '/versionCode/d' -e '/versionName/aversionCode $$VERCODE$$'
-        build.gradle
-    scanignore:
-      - buildSrc
-    ndk: r14b
-    gradleprops:
-      - forceVersionBuildCount=4709
-
-  - versionName: 1.10.1786
-    versionCode: 6956
-    commit: 1.10-r4
-    subdir: ime/app
-    sudo:
-      - apt-get update || apt-get update
-      - apt-get install -t bullseye openjdk-11-jdk-headless openjdk-11-jre-headless
-      - update-alternatives --auto java
-    gradle:
-      - yes
-    prebuild:
-      - sed -i -e "/EnvKey/ a //gradleVersion = '6.8.3'" ../build.gradle
-      - sed -i -e '/Data\.versionCode/ c versionCode $$VERCODE$$' -e '/Data\.versionName/
-        c versionName "$$VERSION$$"' ../../gradle/versioning_apk.gradle
-    scanignore:
-      - addons/languages/*/pack/dictionary/*.gz
-    ndk: r14b
-
-MaintainerNotes: |-
-    * Prior to 1.9.2629, generates english dictionary binary (src/main/res/raw/words_*.dict) from source files (under `english_dictionary` folder. Mostly AOSP word-list)
-
-    Summary and Description have been moved to the new localizable text files:
-    https://f-droid.org/docs/All_About_Descriptions_Graphics_and_Screenshots
-
-AutoUpdateMode: None
-UpdateCheckMode: None
-CurrentVersion: 1.10.1786
-CurrentVersionCode: 6956
diff --git a/tests/triple-t-flutter/build/fr.emersion.goguma/android/app/src/main/play/contact-website.txt b/tests/triple-t-flutter/build/fr.emersion.goguma/android/app/src/main/play/contact-website.txt
deleted file mode 100644
index 5c15e481..00000000
--- a/tests/triple-t-flutter/build/fr.emersion.goguma/android/app/src/main/play/contact-website.txt
+++ /dev/null
@@ -1 +0,0 @@
-https://emersion.fr
diff --git a/tests/triple-t-flutter/build/fr.emersion.goguma/android/app/src/main/play/listings/en-US/full-description.txt b/tests/triple-t-flutter/build/fr.emersion.goguma/android/app/src/main/play/listings/en-US/full-description.txt
deleted file mode 100644
index b72afe53..00000000
--- a/tests/triple-t-flutter/build/fr.emersion.goguma/android/app/src/main/play/listings/en-US/full-description.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-An IRC client for mobile devices.
-
-Goals:
-
-<ul>
-	<li><b>Modern</b>: support for many IRCv3 extensions, plus some special support for IRC bouncers.</li>
-	<li><b>Easy to use</b>: offer a simple, straightforward interface.</li>
-	<li><b>Offline-first</b>: users should be able to read past conversations while offline, and network disruptions should be handled transparently.</li>
-	<li><b>Lightweight</b>: go easy on resource usage to run smoothly on older phones and save battery power.</li>
-	<li><b>Cross-platform</b>: the main target platforms are Linux and Android.</li>
-</ul>
diff --git a/tests/triple-t-flutter/build/fr.emersion.goguma/android/app/src/main/play/listings/en-US/short-description.txt b/tests/triple-t-flutter/build/fr.emersion.goguma/android/app/src/main/play/listings/en-US/short-description.txt
deleted file mode 100644
index 98eb88a5..00000000
--- a/tests/triple-t-flutter/build/fr.emersion.goguma/android/app/src/main/play/listings/en-US/short-description.txt
+++ /dev/null
@@ -1 +0,0 @@
-An IRC client for mobile devices
diff --git a/tests/triple-t-flutter/build/fr.emersion.goguma/android/app/src/main/play/listings/en-US/title.txt b/tests/triple-t-flutter/build/fr.emersion.goguma/android/app/src/main/play/listings/en-US/title.txt
deleted file mode 100644
index d2f3b402..00000000
--- a/tests/triple-t-flutter/build/fr.emersion.goguma/android/app/src/main/play/listings/en-US/title.txt
+++ /dev/null
@@ -1 +0,0 @@
-Goguma
diff --git a/tests/triple-t-flutter/metadata/fr.emersion.goguma.yml b/tests/triple-t-flutter/metadata/fr.emersion.goguma.yml
deleted file mode 100644
index da1897fc..00000000
--- a/tests/triple-t-flutter/metadata/fr.emersion.goguma.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-Categories:
-  - Internet
-License: AGPL-3.0-only
-WebSite: https://sr.ht/~emersion/goguma
-SourceCode: https://git.sr.ht/~emersion/goguma
-IssueTracker: https://todo.sr.ht/~emersion/goguma
-
-AutoName: Goguma
-
-RepoType: git
-Repo: https://git.sr.ht/~emersion/goguma
-
-Builds:
-  - versionName: 0.1.0
-    versionCode: 1
-    commit: 944d2d1e000901365392e850a98ee03f5dedba32
-    output: build/app/outputs/flutter-apk/app-release.apk
-    srclibs:
-      - flutter@2.10.2
-    build:
-      - $$flutter$$/bin/flutter config --no-analytics
-      - $$flutter$$/bin/flutter create --org fr.emersion --project-name goguma --platforms
-        android --no-overwrite .
-      - $$flutter$$/bin/flutter build apk --release --verbose
-
-AutoUpdateMode: Version
-UpdateCheckMode: Tags
-UpdateCheckData: pubspec.yaml|version:\s.+\+(\d+)|.|version:\s(.+)\+
-CurrentVersion: 0.1.0
-CurrentVersionCode: 1
diff --git a/tests/triple-t-multiple/.gitignore b/tests/triple-t-multiple/.gitignore
deleted file mode 100644
index 0aba28e9..00000000
--- a/tests/triple-t-multiple/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-!build/
diff --git a/tests/triple-t-multiple/build/ch.admin.bag.covidcertificate.verifier/settings.gradle b/tests/triple-t-multiple/build/ch.admin.bag.covidcertificate.verifier/settings.gradle
deleted file mode 100644
index c7934558..00000000
--- a/tests/triple-t-multiple/build/ch.admin.bag.covidcertificate.verifier/settings.gradle
+++ /dev/null
@@ -1,3 +0,0 @@
-include ':common'
-include ':verifier'
-include ':wallet'
diff --git a/tests/triple-t-multiple/build/ch.admin.bag.covidcertificate.verifier/verifier/src/main/play/listings/en-US/title.txt b/tests/triple-t-multiple/build/ch.admin.bag.covidcertificate.verifier/verifier/src/main/play/listings/en-US/title.txt
deleted file mode 100644
index 03feeb11..00000000
--- a/tests/triple-t-multiple/build/ch.admin.bag.covidcertificate.verifier/verifier/src/main/play/listings/en-US/title.txt
+++ /dev/null
@@ -1 +0,0 @@
-COVID Certificate Check
\ No newline at end of file
diff --git a/tests/triple-t-multiple/build/ch.admin.bag.covidcertificate.verifier/wallet/src/main/play/listings/en-US/title.txt b/tests/triple-t-multiple/build/ch.admin.bag.covidcertificate.verifier/wallet/src/main/play/listings/en-US/title.txt
deleted file mode 100644
index 34827e66..00000000
--- a/tests/triple-t-multiple/build/ch.admin.bag.covidcertificate.verifier/wallet/src/main/play/listings/en-US/title.txt
+++ /dev/null
@@ -1 +0,0 @@
-COVID Certificate
\ No newline at end of file
diff --git a/tests/triple-t-multiple/build/ch.admin.bag.covidcertificate.wallet/settings.gradle b/tests/triple-t-multiple/build/ch.admin.bag.covidcertificate.wallet/settings.gradle
deleted file mode 100644
index c7934558..00000000
--- a/tests/triple-t-multiple/build/ch.admin.bag.covidcertificate.wallet/settings.gradle
+++ /dev/null
@@ -1,3 +0,0 @@
-include ':common'
-include ':verifier'
-include ':wallet'
diff --git a/tests/triple-t-multiple/build/ch.admin.bag.covidcertificate.wallet/verifier/src/main/play/listings/en-US/title.txt b/tests/triple-t-multiple/build/ch.admin.bag.covidcertificate.wallet/verifier/src/main/play/listings/en-US/title.txt
deleted file mode 100644
index 03feeb11..00000000
--- a/tests/triple-t-multiple/build/ch.admin.bag.covidcertificate.wallet/verifier/src/main/play/listings/en-US/title.txt
+++ /dev/null
@@ -1 +0,0 @@
-COVID Certificate Check
\ No newline at end of file
diff --git a/tests/triple-t-multiple/build/ch.admin.bag.covidcertificate.wallet/wallet/src/main/play/listings/en-US/title.txt b/tests/triple-t-multiple/build/ch.admin.bag.covidcertificate.wallet/wallet/src/main/play/listings/en-US/title.txt
deleted file mode 100644
index 34827e66..00000000
--- a/tests/triple-t-multiple/build/ch.admin.bag.covidcertificate.wallet/wallet/src/main/play/listings/en-US/title.txt
+++ /dev/null
@@ -1 +0,0 @@
-COVID Certificate
\ No newline at end of file
diff --git a/tests/triple-t-multiple/metadata/ch.admin.bag.covidcertificate.verifier.yml b/tests/triple-t-multiple/metadata/ch.admin.bag.covidcertificate.verifier.yml
deleted file mode 100644
index f8999482..00000000
--- a/tests/triple-t-multiple/metadata/ch.admin.bag.covidcertificate.verifier.yml
+++ /dev/null
@@ -1,50 +0,0 @@
-AntiFeatures:
-  - Tracking
-Categories:
-  - Sports & Health
-License: MPL-2.0
-AuthorName: Swiss Admin
-AuthorWebSite: https://www.bit.admin.ch
-SourceCode: https://github.com/admin-ch/CovidCertificate-App-Android
-IssueTracker: https://github.com/admin-ch/CovidCertificate-App-Android/issues
-Changelog: https://github.com/admin-ch/CovidCertificate-App-Android/releases
-
-AutoName: Covid Cert
-
-RepoType: git
-Repo: https://github.com/admin-ch/CovidCertificate-App-Android
-Binaries: https://github.com/admin-ch/CovidCertificate-App-Android/releases/download/v%v-%c-verifier/verifier-prod-%v-%c-signed.apk
-
-Builds:
-  - versionName: 1.2.0
-    versionCode: 1200
-    commit: v1.2.0-1200-verifier
-    subdir: verifier
-    submodules: true
-    gradle:
-      - prod
-    rm:
-      - sdk/sdk/testKeystore
-      - wallet/testKeystore
-      - verifier/testKeystore
-    prebuild: printf '\nbuildTimestamp=%s\n' "$(curl -sL https://github.com/admin-ch/CovidCertificate-App-Android/releases/download/v$$VERSION$$-$$VERCODE$$-verifier/verifier-prod-$$VERSION$$-$$VERCODE$$-buildtimestamp.txt
-        | tr -cd '0-9')" >> gradle.properties
-
-  - versionName: 2.0.0
-    versionCode: 2000
-    commit: 5a871eabf1fce16b84e4c7b97c94fd3f2a37e910
-    subdir: verifier
-    submodules: true
-    gradle:
-      - prod
-    rm:
-      - sdk/sdk/testKeystore
-      - wallet/testKeystore
-      - verifier/testKeystore
-    prebuild: printf '\nbuildTimestamp=%s\n' "$(curl -sL https://github.com/admin-ch/CovidCertificate-App-Android/releases/download/v$$VERSION$$-$$VERCODE$$-verifier/verifier-prod-$$VERSION$$-$$VERCODE$$-buildtimestamp.txt
-        | tr -cd '0-9')" >> gradle.properties
-
-AutoUpdateMode: Version
-UpdateCheckMode: Tags ^v[\d.]+-\d+-verifier$
-CurrentVersion: 2.0.0
-CurrentVersionCode: 2000
diff --git a/tests/triple-t-multiple/metadata/ch.admin.bag.covidcertificate.wallet.yml b/tests/triple-t-multiple/metadata/ch.admin.bag.covidcertificate.wallet.yml
deleted file mode 100644
index 3ea35008..00000000
--- a/tests/triple-t-multiple/metadata/ch.admin.bag.covidcertificate.wallet.yml
+++ /dev/null
@@ -1,50 +0,0 @@
-AntiFeatures:
-  - Tracking
-Categories:
-  - Sports & Health
-License: MPL-2.0
-AuthorName: Swiss Admin
-AuthorWebSite: https://www.bit.admin.ch
-SourceCode: https://github.com/admin-ch/CovidCertificate-App-Android
-IssueTracker: https://github.com/admin-ch/CovidCertificate-App-Android/issues
-Changelog: https://github.com/admin-ch/CovidCertificate-App-Android/releases
-
-AutoName: Covid Cert
-
-RepoType: git
-Repo: https://github.com/admin-ch/CovidCertificate-App-Android
-Binaries: https://github.com/admin-ch/CovidCertificate-App-Android/releases/download/v%v-%c-wallet/wallet-prod-%v-%c-signed.apk
-
-Builds:
-  - versionName: 1.2.0
-    versionCode: 1200
-    commit: v1.2.0-1200-wallet
-    subdir: wallet
-    submodules: true
-    gradle:
-      - prod
-    rm:
-      - sdk/sdk/testKeystore
-      - wallet/testKeystore
-      - verifier/testKeystore
-    prebuild: printf '\nbuildTimestamp=%s\n' "$(curl -sL https://github.com/admin-ch/CovidCertificate-App-Android/releases/download/v$$VERSION$$-$$VERCODE$$-wallet/wallet-prod-$$VERSION$$-$$VERCODE$$-buildtimestamp.txt
-        | tr -cd '0-9')" >> gradle.properties
-
-  - versionName: 2.0.0
-    versionCode: 2000
-    commit: 5a871eabf1fce16b84e4c7b97c94fd3f2a37e910
-    subdir: wallet
-    submodules: true
-    gradle:
-      - prod
-    rm:
-      - sdk/sdk/testKeystore
-      - wallet/testKeystore
-      - verifier/testKeystore
-    prebuild: printf '\nbuildTimestamp=%s\n' "$(curl -sL https://github.com/admin-ch/CovidCertificate-App-Android/releases/download/v$$VERSION$$-$$VERCODE$$-wallet/wallet-prod-$$VERSION$$-$$VERCODE$$-buildtimestamp.txt
-        | tr -cd '0-9')" >> gradle.properties
-
-AutoUpdateMode: Version
-UpdateCheckMode: Tags ^v[\d.]+-\d+-wallet$
-CurrentVersion: 2.0.0
-CurrentVersionCode: 2000
diff --git a/tests/update.TestCase b/tests/update.TestCase
new file mode 100755
index 00000000..322387be
--- /dev/null
+++ b/tests/update.TestCase
@@ -0,0 +1,1161 @@
+#!/usr/bin/env python3
+
+# http://www.drdobbs.com/testing/unit-testing-with-python/240165163
+
+import git
+import glob
+import inspect
+import logging
+import optparse
+import os
+import random
+import shutil
+import subprocess
+import sys
+import tempfile
+import unittest
+import yaml
+import zipfile
+import textwrap
+from binascii import unhexlify
+from datetime import datetime
+from distutils.version import LooseVersion
+from testcommon import TmpCwd
+
+try:
+    from yaml import CSafeLoader as SafeLoader
+except ImportError:
+    from yaml import SafeLoader
+
+try:
+    from yaml import CFullLoader as FullLoader
+except ImportError:
+    try:
+        # FullLoader is available from PyYaml 5.1+, as we don't load user
+        # controlled data here, it's okay to fall back the unsafe older
+        # Loader
+        from yaml import FullLoader
+    except ImportError:
+        from yaml import Loader as FullLoader
+
+localmodule = os.path.realpath(
+    os.path.join(os.path.dirname(inspect.getfile(inspect.currentframe())), '..'))
+print('localmodule: ' + localmodule)
+if localmodule not in sys.path:
+    sys.path.insert(0, localmodule)
+
+import fdroidserver.common
+import fdroidserver.exception
+import fdroidserver.metadata
+import fdroidserver.update
+from fdroidserver.common import FDroidPopen
+
+
+DONATION_FIELDS = (
+    'Donate',
+    'Liberapay',
+    'OpenCollective',
+)
+
+
+class Options:
+    allow_disabled_algorithms = False
+    clean = False
+    rename_apks = False
+
+
+class UpdateTest(unittest.TestCase):
+    '''fdroid update'''
+
+    def setUp(self):
+        logging.basicConfig(level=logging.INFO)
+        self.basedir = os.path.join(localmodule, 'tests')
+        self.tmpdir = os.path.abspath(os.path.join(self.basedir, '..', '.testfiles'))
+        if not os.path.exists(self.tmpdir):
+            os.makedirs(self.tmpdir)
+        os.chdir(self.basedir)
+
+    def testInsertStoreMetadata(self):
+        config = dict()
+        fdroidserver.common.fill_config_defaults(config)
+        fdroidserver.update.config = config
+        fdroidserver.update.options = fdroidserver.common.options
+        os.chdir(os.path.join(localmodule, 'tests'))
+
+        shutil.rmtree(os.path.join('repo', 'info.guardianproject.urzip'), ignore_errors=True)
+
+        shutil.rmtree(os.path.join('build', 'com.nextcloud.client'), ignore_errors=True)
+        shutil.copytree(os.path.join('source-files', 'com.nextcloud.client'),
+                        os.path.join('build', 'com.nextcloud.client'))
+
+        shutil.rmtree(os.path.join('build', 'com.nextcloud.client.dev'), ignore_errors=True)
+        shutil.copytree(os.path.join('source-files', 'com.nextcloud.client.dev'),
+                        os.path.join('build', 'com.nextcloud.client.dev'))
+
+        shutil.rmtree(os.path.join('build', 'eu.siacs.conversations'), ignore_errors=True)
+        shutil.copytree(os.path.join('source-files', 'eu.siacs.conversations'),
+                        os.path.join('build', 'eu.siacs.conversations'))
+
+        testfilename = 'icon_yAfSvPRJukZzMMfUzvbYqwaD1XmHXNtiPBtuPVHW-6s=.png'
+        testfile = os.path.join('repo', 'org.videolan.vlc', 'en-US', 'icon.png')
+        cpdir = os.path.join('metadata', 'org.videolan.vlc', 'en-US')
+        cpfile = os.path.join(cpdir, testfilename)
+        os.makedirs(cpdir, exist_ok=True)
+        shutil.copy(testfile, cpfile)
+        shutil.copystat(testfile, cpfile)
+
+        apps = dict()
+        for packageName in ('info.guardianproject.urzip', 'org.videolan.vlc', 'obb.mainpatch.current',
+                            'com.nextcloud.client', 'com.nextcloud.client.dev',
+                            'eu.siacs.conversations'):
+            apps[packageName] = fdroidserver.metadata.App()
+            apps[packageName]['id'] = packageName
+            apps[packageName]['CurrentVersionCode'] = 0xcafebeef
+
+        apps['info.guardianproject.urzip']['CurrentVersionCode'] = 100
+
+        buildnextcloudclient = fdroidserver.metadata.Build()
+        buildnextcloudclient.gradle = ['generic']
+        apps['com.nextcloud.client']['builds'] = [buildnextcloudclient]
+
+        buildnextclouddevclient = fdroidserver.metadata.Build()
+        buildnextclouddevclient.gradle = ['versionDev']
+        apps['com.nextcloud.client.dev']['builds'] = [buildnextclouddevclient]
+
+        build_conversations = fdroidserver.metadata.Build()
+        build_conversations.gradle = ['free']
+        apps['eu.siacs.conversations']['builds'] = [build_conversations]
+
+        fdroidserver.update.insert_localized_app_metadata(apps)
+
+        appdir = os.path.join('repo', 'info.guardianproject.urzip', 'en-US')
+        self.assertTrue(os.path.isfile(os.path.join(
+            appdir,
+            'icon_NJXNzMcyf-v9i5a1ElJi0j9X1LvllibCa48xXYPlOqQ=.png')))
+        self.assertTrue(os.path.isfile(os.path.join(
+            appdir,
+            'featureGraphic_GFRT5BovZsENGpJq1HqPODGWBRPWQsx25B95Ol5w_wU=.png')))
+
+        self.assertEqual(6, len(apps))
+        for packageName, app in apps.items():
+            self.assertTrue('localized' in app)
+            self.assertTrue('en-US' in app['localized'])
+            self.assertEqual(1, len(app['localized']))
+            if packageName == 'info.guardianproject.urzip':
+                self.assertEqual(7, len(app['localized']['en-US']))
+                self.assertEqual('full description\n', app['localized']['en-US']['description'])
+                self.assertEqual('title', app['localized']['en-US']['name'])
+                self.assertEqual('short description', app['localized']['en-US']['summary'])
+                self.assertEqual('video', app['localized']['en-US']['video'])
+                self.assertEqual('icon_NJXNzMcyf-v9i5a1ElJi0j9X1LvllibCa48xXYPlOqQ=.png',
+                                 app['localized']['en-US']['icon'])
+                self.assertEqual('featureGraphic_GFRT5BovZsENGpJq1HqPODGWBRPWQsx25B95Ol5w_wU=.png',
+                                 app['localized']['en-US']['featureGraphic'])
+                self.assertEqual('100\n', app['localized']['en-US']['whatsNew'])
+            elif packageName == 'org.videolan.vlc':
+                self.assertEqual(testfilename, app['localized']['en-US']['icon'])
+                self.assertEqual(9, len(app['localized']['en-US']['phoneScreenshots']))
+                self.assertEqual(15, len(app['localized']['en-US']['sevenInchScreenshots']))
+            elif packageName == 'obb.mainpatch.current':
+                self.assertEqual('icon_WI0pkO3LsklrsTAnRr-OQSxkkoMY41lYe2-fAvXLiLg=.png',
+                                 app['localized']['en-US']['icon'])
+                self.assertEqual('featureGraphic_ffhLaojxbGAfu9ROe1MJgK5ux8d0OVc6b65nmvOBaTk=.png',
+                                 app['localized']['en-US']['featureGraphic'])
+                self.assertEqual(1, len(app['localized']['en-US']['phoneScreenshots']))
+                self.assertEqual(1, len(app['localized']['en-US']['sevenInchScreenshots']))
+            elif packageName == 'com.nextcloud.client':
+                self.assertEqual('Nextcloud', app['localized']['en-US']['name'])
+                self.assertEqual(1073, len(app['localized']['en-US']['description']))
+                self.assertEqual(78, len(app['localized']['en-US']['summary']))
+            elif packageName == 'com.nextcloud.client.dev':
+                self.assertEqual('Nextcloud Dev', app['localized']['en-US']['name'])
+                self.assertEqual(586, len(app['localized']['en-US']['description']))
+                self.assertEqual(78, len(app['localized']['en-US']['summary']))
+            elif packageName == 'eu.siacs.conversations':
+                self.assertEqual('Conversations', app['localized']['en-US']['name'])
+
+    def test_insert_triple_t_metadata(self):
+        importer = os.path.join(self.basedir, 'tmp', 'importer')
+        packageName = 'org.fdroid.ci.test.app'
+        if not os.path.isdir(importer):
+            logging.warning('skipping test_insert_triple_t_metadata, import.TestCase must run first!')
+            return
+        tmptestsdir = tempfile.mkdtemp(prefix=inspect.currentframe().f_code.co_name,
+                                       dir=self.tmpdir)
+        packageDir = os.path.join(tmptestsdir, 'build', packageName)
+        shutil.copytree(importer, packageDir)
+
+        # always use the same commit so these tests work when ci-test-app.git is updated
+        repo = git.Repo(packageDir)
+        for remote in repo.remotes:
+            remote.fetch()
+        repo.git.reset('--hard', 'b9e5d1a0d8d6fc31d4674b2f0514fef10762ed4f')
+        repo.git.clean('-fdx')
+
+        os.mkdir(os.path.join(tmptestsdir, 'metadata'))
+        metadata = dict()
+        metadata['Description'] = 'This is just a test app'
+        with open(os.path.join(tmptestsdir, 'metadata', packageName + '.yml'), 'w') as fp:
+            yaml.dump(metadata, fp)
+
+        config = dict()
+        fdroidserver.common.fill_config_defaults(config)
+        fdroidserver.common.config = config
+        fdroidserver.update.config = config
+        fdroidserver.update.options = fdroidserver.common.options
+        os.chdir(tmptestsdir)
+
+        apps = fdroidserver.metadata.read_metadata()
+        fdroidserver.update.copy_triple_t_store_metadata(apps)
+
+        # TODO ideally, this would compare the whole dict like in metadata.TestCase's test_read_metadata()
+        correctlocales = [
+            'ar', 'ast_ES', 'az', 'ca', 'ca_ES', 'cs-CZ', 'cs_CZ', 'da',
+            'da-DK', 'de', 'de-DE', 'el', 'en-US', 'es', 'es-ES', 'es_ES', 'et',
+            'fi', 'fr', 'fr-FR', 'he_IL', 'hi-IN', 'hi_IN', 'hu', 'id', 'it',
+            'it-IT', 'it_IT', 'iw-IL', 'ja', 'ja-JP', 'kn_IN', 'ko', 'ko-KR',
+            'ko_KR', 'lt', 'nb', 'nb_NO', 'nl', 'nl-NL', 'no', 'pl', 'pl-PL',
+            'pl_PL', 'pt', 'pt-BR', 'pt-PT', 'pt_BR', 'ro', 'ro_RO', 'ru-RU',
+            'ru_RU', 'sv-SE', 'sv_SE', 'te', 'tr', 'tr-TR', 'uk', 'uk_UA', 'vi',
+            'vi_VN', 'zh-CN', 'zh_CN', 'zh_TW',
+        ]
+        locales = sorted(list(apps['org.fdroid.ci.test.app']['localized'].keys()))
+        self.assertEqual(correctlocales, locales)
+
+    def test_insert_triple_t_2_metadata(self):
+        packageName = 'org.piwigo.android'
+        tmptestsdir = tempfile.mkdtemp(prefix=inspect.currentframe().f_code.co_name,
+                                       dir=self.tmpdir)
+        os.rmdir(tmptestsdir)
+        shutil.copytree(os.path.join(self.basedir, 'triple-t-2'), tmptestsdir)
+        os.chdir(tmptestsdir)
+
+        config = dict()
+        fdroidserver.common.fill_config_defaults(config)
+        fdroidserver.common.config = config
+        fdroidserver.update.config = config
+        fdroidserver.update.options = fdroidserver.common.options
+
+        apps = fdroidserver.metadata.read_metadata()
+        self.assertTrue(packageName in apps)
+        fdroidserver.update.copy_triple_t_store_metadata(apps)
+        correctlocales = ['de-DE', 'en-US', 'fr-FR', 'kn-IN']
+        app = apps[packageName]
+        self.assertEqual('android@piwigo.org', app['authorEmail'])
+        self.assertEqual('https://www.piwigo.org', app['authorWebSite'])
+        locales = sorted(list(app['localized'].keys()))
+        self.assertEqual(correctlocales, locales)
+        kn_IN = app['localized']['kn-IN']
+        self.assertTrue('description' in kn_IN)
+        self.assertTrue('name' in kn_IN)
+        self.assertTrue('summary' in kn_IN)
+        en_US = app['localized']['en-US']
+        self.assertTrue('whatsNew' in en_US)
+
+        os.chdir(os.path.join('repo', packageName))
+        self.assertTrue(os.path.exists(os.path.join('en-US', 'icon.png')))
+        self.assertTrue(os.path.exists(os.path.join('en-US', 'featureGraphic.png')))
+        self.assertTrue(os.path.exists(os.path.join('en-US', 'phoneScreenshots', '01_Login.jpg')))
+        self.assertTrue(os.path.exists(os.path.join('en-US', 'sevenInchScreenshots', '01_Login.png')))
+        self.assertFalse(os.path.exists(os.path.join('de-DE', 'icon.png')))
+        self.assertFalse(os.path.exists(os.path.join('de-DE', 'featureGraphic.png')))
+        self.assertFalse(os.path.exists(os.path.join('de-DE', 'phoneScreenshots', '01_Login.jpg')))
+        self.assertFalse(os.path.exists(os.path.join('de-DE', 'sevenInchScreenshots', '01_Login.png')))
+
+    def javagetsig(self, apkfile):
+        getsig_dir = 'getsig'
+        if not os.path.exists(getsig_dir + "/getsig.class"):
+            logging.critical("getsig.class not found. To fix: cd '%s' && ./make.sh" % getsig_dir)
+            sys.exit(1)
+        # FDroidPopen needs some config to work
+        config = dict()
+        fdroidserver.common.fill_config_defaults(config)
+        fdroidserver.common.config = config
+        p = FDroidPopen(['java', '-cp', 'getsig',
+                         'getsig', apkfile])
+        sig = None
+        for line in p.output.splitlines():
+            if line.startswith('Result:'):
+                sig = line[7:].strip()
+                break
+        if p.returncode == 0:
+            return sig
+        else:
+            return None
+
+    def testGoodGetsig(self):
+        # config needed to use jarsigner and keytool
+        config = dict()
+        fdroidserver.common.fill_config_defaults(config)
+        fdroidserver.update.config = config
+        apkfile = 'urzip.apk'
+        sig = self.javagetsig(apkfile)
+        self.assertIsNotNone(sig, "sig is None")
+        pysig = fdroidserver.update.getsig(apkfile)
+        self.assertIsNotNone(pysig, "pysig is None")
+        self.assertEqual(sig, fdroidserver.update.getsig(apkfile),
+                         "python sig not equal to java sig!")
+        self.assertEqual(len(sig), len(pysig),
+                         "the length of the two sigs are different!")
+        try:
+            self.assertEqual(unhexlify(sig), unhexlify(pysig),
+                             "the length of the two sigs are different!")
+        except TypeError as e:
+            print(e)
+            self.assertTrue(False, 'TypeError!')
+
+    def testBadGetsig(self):
+        """getsig() should still be able to fetch the fingerprint of bad signatures"""
+        # config needed to use jarsigner and keytool
+        config = dict()
+        fdroidserver.common.fill_config_defaults(config)
+        fdroidserver.update.config = config
+
+        apkfile = 'urzip-badsig.apk'
+        sig = fdroidserver.update.getsig(apkfile)
+        self.assertEqual(sig, 'e0ecb5fc2d63088e4a07ae410a127722',
+                         "python sig should be: " + str(sig))
+
+        apkfile = 'urzip-badcert.apk'
+        sig = fdroidserver.update.getsig(apkfile)
+        self.assertEqual(sig, 'e0ecb5fc2d63088e4a07ae410a127722',
+                         "python sig should be: " + str(sig))
+
+    def test_getsig(self):
+        # config needed to use jarsigner and keytool
+        config = dict()
+        fdroidserver.common.fill_config_defaults(config)
+        fdroidserver.update.config = config
+
+        sig = fdroidserver.update.getsig('urzip-release-unsigned.apk')
+        self.assertIsNone(sig)
+
+        good_fingerprint = 'b4964fd759edaa54e65bb476d0276880'
+
+        apkpath = 'urzip-release.apk'  # v1 only
+        sig = fdroidserver.update.getsig(apkpath)
+        self.assertEqual(good_fingerprint, sig,
+                         'python sig was: ' + str(sig))
+
+        apkpath = 'repo/v1.v2.sig_1020.apk'
+        sig = fdroidserver.update.getsig(apkpath)
+        self.assertEqual(good_fingerprint, sig,
+                         'python sig was: ' + str(sig))
+        # check that v1 and v2 have the same certificate
+        try:
+            import hashlib
+            from binascii import hexlify
+            from androguard.core.bytecodes.apk import APK
+        except ImportError:
+            print('WARNING: skipping rest of test since androguard is missing!')
+            return
+        apkobject = APK(apkpath)
+        cert_encoded = apkobject.get_certificates_der_v2()[0]
+        self.assertEqual(good_fingerprint, sig,
+                         hashlib.md5(hexlify(cert_encoded)).hexdigest())  # nosec just used as ID for signing key
+
+        filename = 'v2.only.sig_2.apk'
+        with zipfile.ZipFile(filename) as z:
+            self.assertTrue('META-INF/MANIFEST.MF' in z.namelist(), 'META-INF/MANIFEST.MF required')
+            for f in z.namelist():
+                # ensure there are no v1 signature files
+                self.assertIsNone(fdroidserver.common.SIGNATURE_BLOCK_FILE_REGEX.match(f))
+        sig = fdroidserver.update.getsig(filename)
+        self.assertEqual(good_fingerprint, sig,
+                         "python sig was: " + str(sig))
+
+    def testScanApksAndObbs(self):
+        os.chdir(os.path.join(localmodule, 'tests'))
+        testdir = tempfile.mkdtemp(prefix=inspect.currentframe().f_code.co_name, dir=self.tmpdir)
+        os.chdir(testdir)
+        shutil.copytree(os.path.join(self.basedir, 'repo'), 'repo')
+        shutil.copytree(os.path.join(self.basedir, 'metadata'), 'metadata')
+        config = dict()
+        fdroidserver.common.fill_config_defaults(config)
+        config['ndk_paths'] = dict()
+        fdroidserver.common.config = config
+        fdroidserver.update.config = config
+
+        fdroidserver.update.options = type('', (), {})()
+        fdroidserver.update.options.clean = True
+        fdroidserver.update.options.delete_unknown = True
+        fdroidserver.update.options.rename_apks = False
+        fdroidserver.update.options.allow_disabled_algorithms = False
+
+        apps = fdroidserver.metadata.read_metadata()
+        knownapks = fdroidserver.common.KnownApks()
+        apks, cachechanged = fdroidserver.update.process_apks({}, 'repo', knownapks, False)
+        self.assertEqual(len(apks), 17)
+        apk = apks[1]
+        self.assertEqual(apk['packageName'], 'com.politedroid')
+        self.assertEqual(apk['versionCode'], 3)
+        self.assertEqual(apk['minSdkVersion'], 3)
+        self.assertIsNone(apk.get('targetSdkVersion'))
+        self.assertFalse('maxSdkVersion' in apk)
+        apk = apks[8]
+        self.assertEqual(apk['packageName'], 'obb.main.oldversion')
+        self.assertEqual(apk['versionCode'], 1444412523)
+        self.assertEqual(apk['minSdkVersion'], 4)
+        self.assertEqual(apk['targetSdkVersion'], 18)
+        self.assertFalse('maxSdkVersion' in apk)
+
+        fdroidserver.update.insert_obbs('repo', apps, apks)
+        for apk in apks:
+            if apk['packageName'] == 'obb.mainpatch.current':
+                self.assertEqual(apk.get('obbMainFile'), 'main.1619.obb.mainpatch.current.obb')
+                self.assertEqual(apk.get('obbPatchFile'), 'patch.1619.obb.mainpatch.current.obb')
+            elif apk['packageName'] == 'obb.main.oldversion':
+                self.assertEqual(apk.get('obbMainFile'), 'main.1434483388.obb.main.oldversion.obb')
+                self.assertIsNone(apk.get('obbPatchFile'))
+            elif apk['packageName'] == 'obb.main.twoversions':
+                self.assertIsNone(apk.get('obbPatchFile'))
+                if apk['versionCode'] == 1101613:
+                    self.assertEqual(apk.get('obbMainFile'), 'main.1101613.obb.main.twoversions.obb')
+                elif apk['versionCode'] == 1101615:
+                    self.assertEqual(apk.get('obbMainFile'), 'main.1101615.obb.main.twoversions.obb')
+                elif apk['versionCode'] == 1101617:
+                    self.assertEqual(apk.get('obbMainFile'), 'main.1101615.obb.main.twoversions.obb')
+                else:
+                    self.assertTrue(False)
+            elif apk['packageName'] == 'info.guardianproject.urzip':
+                self.assertIsNone(apk.get('obbMainFile'))
+                self.assertIsNone(apk.get('obbPatchFile'))
+
+    def test_apkcache_json(self):
+        """test the migration from pickle to json"""
+        os.chdir(os.path.join(localmodule, 'tests'))
+        testdir = tempfile.mkdtemp(prefix=inspect.currentframe().f_code.co_name, dir=self.tmpdir)
+        os.chdir(testdir)
+        shutil.copytree(os.path.join(self.basedir, 'repo'), 'repo')
+        config = dict()
+        fdroidserver.common.fill_config_defaults(config)
+        config['ndk_paths'] = dict()
+        fdroidserver.common.config = config
+        fdroidserver.update.config = config
+
+        fdroidserver.update.options = type('', (), {})()
+        fdroidserver.update.options.clean = True
+        fdroidserver.update.options.delete_unknown = True
+        fdroidserver.update.options.rename_apks = False
+        fdroidserver.update.options.allow_disabled_algorithms = False
+
+        fdroidserver.metadata.read_metadata()
+        knownapks = fdroidserver.common.KnownApks()
+        apkcache = fdroidserver.update.get_cache()
+        self.assertEqual(2, len(apkcache))
+        self.assertEqual(fdroidserver.update.METADATA_VERSION, apkcache["METADATA_VERSION"])
+        self.assertEqual(fdroidserver.update.options.allow_disabled_algorithms,
+                         apkcache['allow_disabled_algorithms'])
+        apks, cachechanged = fdroidserver.update.process_apks(apkcache, 'repo', knownapks, False)
+        fdroidserver.update.write_cache(apkcache)
+
+        fdroidserver.update.options.clean = False
+        read_from_json = fdroidserver.update.get_cache()
+        self.assertEqual(19, len(read_from_json))
+        for f in glob.glob('repo/*.apk'):
+            self.assertTrue(os.path.basename(f) in read_from_json)
+
+        fdroidserver.update.options.clean = True
+        reset = fdroidserver.update.get_cache()
+        self.assertEqual(2, len(reset))
+
+    def test_scan_repo_files(self):
+        config = dict()
+        fdroidserver.common.fill_config_defaults(config)
+        fdroidserver.common.config = config
+        fdroidserver.update.config = config
+
+        testdir = tempfile.mkdtemp(prefix=inspect.currentframe().f_code.co_name, dir=self.tmpdir)
+        os.chdir(testdir)
+        os.mkdir('repo')
+        os.mkdir('stats')
+        with open(os.path.join('stats', 'known_apks.txt'), 'w') as fp:
+            fp.write('se.manyver_30.apk se.manyver 2018-10-10\n')
+        filename = 'Norway_bouvet_europe_2.obf.zip'
+        shutil.copy(os.path.join(self.basedir, filename), 'repo')
+        knownapks = fdroidserver.common.KnownApks()
+        files, fcachechanged = fdroidserver.update.scan_repo_files(dict(), 'repo', knownapks, False)
+        knownapks.writeifchanged()
+        self.assertTrue(fcachechanged)
+
+        info = files[0]
+        self.assertEqual(filename, info['apkName'])
+        self.assertEqual(datetime, type(info['added']))
+        self.assertEqual(os.path.getsize(os.path.join('repo', filename)), info['size'])
+        self.assertEqual('531190bdbc07e77d5577249949106f32dac7f62d38d66d66c3ae058be53a729d',
+                         info['hash'])
+
+    def test_read_added_date_from_all_apks(self):
+        config = dict()
+        fdroidserver.common.fill_config_defaults(config)
+        fdroidserver.common.config = config
+        fdroidserver.update.config = config
+        fdroidserver.update.options = Options
+        os.chdir(os.path.join(localmodule, 'tests'))
+        apps = fdroidserver.metadata.read_metadata()
+        knownapks = fdroidserver.common.KnownApks()
+        apks, cachechanged = fdroidserver.update.process_apks({}, 'repo', knownapks)
+        fdroidserver.update.read_added_date_from_all_apks(apps, apks)
+
+    def test_apply_info_from_latest_apk(self):
+        config = dict()
+        fdroidserver.common.fill_config_defaults(config)
+        fdroidserver.common.config = config
+        fdroidserver.update.config = config
+        fdroidserver.update.options = Options
+        os.chdir(os.path.join(localmodule, 'tests'))
+        apps = fdroidserver.metadata.read_metadata()
+        knownapks = fdroidserver.common.KnownApks()
+        apks, cachechanged = fdroidserver.update.process_apks({}, 'repo', knownapks)
+        fdroidserver.update.apply_info_from_latest_apk(apps, apks)
+
+    def test_scan_apk(self):
+        config = dict()
+        fdroidserver.common.fill_config_defaults(config)
+        fdroidserver.common.config = config
+        fdroidserver.update.config = config
+        os.chdir(os.path.join(localmodule, 'tests'))
+
+        apksigner = fdroidserver.common.find_apksigner()
+        if apksigner:
+            config['apksigner'] = apksigner
+            apk_info = fdroidserver.update.scan_apk('v2.only.sig_2.apk')
+            self.assertIsNone(apk_info.get('maxSdkVersion'))
+            self.assertEqual(apk_info.get('versionName'), 'v2-only')
+            self.assertEqual(apk_info.get('versionCode'), 2)
+        else:
+            print('WARNING: skipping v2-only test since apksigner cannot be found')
+        apk_info = fdroidserver.update.scan_apk('repo/v1.v2.sig_1020.apk')
+        self.assertIsNone(apk_info.get('maxSdkVersion'))
+        self.assertEqual(apk_info.get('versionName'), 'v1+2')
+        self.assertEqual(apk_info.get('versionCode'), 1020)
+
+        apk_info = fdroidserver.update.scan_apk('repo/souch.smsbypass_9.apk')
+        self.assertIsNone(apk_info.get('maxSdkVersion'))
+        self.assertEqual(apk_info.get('versionName'), '0.9')
+
+        apk_info = fdroidserver.update.scan_apk('repo/duplicate.permisssions_9999999.apk')
+        self.assertEqual(apk_info.get('versionName'), '')
+        self.assertEqual(apk_info['icons_src'], {'160': 'res/drawable/ic_launcher.png',
+                                                 '-1': 'res/drawable/ic_launcher.png'})
+
+        apk_info = fdroidserver.update.scan_apk('org.dyndns.fules.ck_20.apk')
+        self.assertEqual(apk_info['icons_src'], {'240': 'res/drawable-hdpi-v4/icon_launcher.png',
+                                                 '120': 'res/drawable-ldpi-v4/icon_launcher.png',
+                                                 '160': 'res/drawable-mdpi-v4/icon_launcher.png',
+                                                 '-1': 'res/drawable-mdpi-v4/icon_launcher.png'})
+        self.assertEqual(apk_info['icons'], {})
+        self.assertEqual(apk_info['features'], [])
+        self.assertEqual(apk_info['antiFeatures'], set())
+        self.assertEqual(apk_info['versionName'], 'v1.6pre2')
+        self.assertEqual(apk_info['hash'],
+                         '897486e1f857c6c0ee32ccbad0e1b8cd82f6d0e65a44a23f13f852d2b63a18c8')
+        self.assertEqual(apk_info['packageName'], 'org.dyndns.fules.ck')
+        self.assertEqual(apk_info['versionCode'], 20)
+        self.assertEqual(apk_info['size'], 132453)
+        self.assertEqual(apk_info['nativecode'],
+                         ['arm64-v8a', 'armeabi', 'armeabi-v7a', 'mips', 'mips64', 'x86', 'x86_64'])
+        self.assertEqual(apk_info['minSdkVersion'], 7)
+        self.assertEqual(apk_info['sig'], '9bf7a6a67f95688daec75eab4b1436ac')
+        self.assertEqual(apk_info['hashType'], 'sha256')
+        self.assertEqual(apk_info['targetSdkVersion'], 8)
+
+        apk_info = fdroidserver.update.scan_apk('org.bitbucket.tickytacky.mirrormirror_4.apk')
+        self.assertEqual(apk_info.get('versionName'), '1.0.3')
+        self.assertEqual(apk_info['icons_src'], {'160': 'res/drawable-mdpi/mirror.png',
+                                                 '-1': 'res/drawable-mdpi/mirror.png'})
+
+        apk_info = fdroidserver.update.scan_apk('repo/info.zwanenburg.caffeinetile_4.apk')
+        self.assertEqual(apk_info.get('versionName'), '1.3')
+        self.assertEqual(apk_info['icons_src'], {'160': 'res/drawable/ic_coffee_on.xml',
+                                                 '-1': 'res/drawable/ic_coffee_on.xml'})
+
+        apk_info = fdroidserver.update.scan_apk('repo/com.politedroid_6.apk')
+        self.assertEqual(apk_info.get('versionName'), '1.5')
+        self.assertEqual(apk_info['icons_src'], {'120': 'res/drawable-ldpi-v4/icon.png',
+                                                 '160': 'res/drawable-mdpi-v4/icon.png',
+                                                 '240': 'res/drawable-hdpi-v4/icon.png',
+                                                 '320': 'res/drawable-xhdpi-v4/icon.png',
+                                                 '-1': 'res/drawable-mdpi-v4/icon.png'})
+
+        apk_info = fdroidserver.update.scan_apk('SpeedoMeterApp.main_1.apk')
+        self.assertEqual(apk_info.get('versionName'), '1.0')
+        self.assertEqual(apk_info['icons_src'], {})
+
+    def test_scan_apk_no_min_target(self):
+        config = dict()
+        fdroidserver.common.fill_config_defaults(config)
+        fdroidserver.common.config = config
+        fdroidserver.update.config = config
+        apk_info = fdroidserver.update.scan_apk('repo/no.min.target.sdk_987.apk')
+        self.maxDiff = None
+        self.assertDictEqual(apk_info, {
+            'icons': {},
+            'icons_src': {'-1': 'res/drawable/ic_launcher.png',
+                          '160': 'res/drawable/ic_launcher.png'},
+            'name': 'No minSdkVersion or targetSdkVersion',
+            'signer': '32a23624c201b949f085996ba5ed53d40f703aca4989476949cae891022e0ed6',
+            'hashType': 'sha256',
+            'packageName': 'no.min.target.sdk',
+            'features': [],
+            'antiFeatures': set(),
+            'size': 14102,
+            'sig': 'b4964fd759edaa54e65bb476d0276880',
+            'versionName': '1.2-fake',
+            'uses-permission-sdk-23': [],
+            'hash': 'e2e1dc1d550df2b5bc383860139207258645b5540abeccd305ed8b2cb6459d2c',
+            'versionCode': 987,
+            'minSdkVersion': 3,
+            'uses-permission': [
+                fdroidserver.update.UsesPermission(name='android.permission.WRITE_EXTERNAL_STORAGE',
+                                                   maxSdkVersion=None),
+                fdroidserver.update.UsesPermission(name='android.permission.READ_PHONE_STATE',
+                                                   maxSdkVersion=None),
+                fdroidserver.update.UsesPermission(name='android.permission.READ_EXTERNAL_STORAGE',
+                                                   maxSdkVersion=None)]})
+
+    def test_scan_apk_no_sig(self):
+        config = dict()
+        fdroidserver.common.fill_config_defaults(config)
+        fdroidserver.update.config = config
+        os.chdir(os.path.join(localmodule, 'tests'))
+        if os.path.basename(os.getcwd()) != 'tests':
+            raise Exception('This test must be run in the "tests/" subdir')
+
+        with self.assertRaises(fdroidserver.exception.BuildException):
+            fdroidserver.update.scan_apk('urzip-release-unsigned.apk')
+
+    def test_process_apk(self):
+
+        def _build_yaml_representer(dumper, data):
+            '''Creates a YAML representation of a Build instance'''
+            return dumper.represent_dict(data)
+
+        config = dict()
+        fdroidserver.common.fill_config_defaults(config)
+        fdroidserver.update.config = config
+        os.chdir(os.path.join(localmodule, 'tests'))
+
+        config['ndk_paths'] = dict()
+        fdroidserver.common.config = config
+        fdroidserver.update.config = config
+        fdroidserver.update.options = type('', (), {})()
+        fdroidserver.update.options.clean = True
+        fdroidserver.update.options.rename_apks = False
+        fdroidserver.update.options.delete_unknown = True
+        fdroidserver.update.options.allow_disabled_algorithms = False
+
+        for icon_dir in fdroidserver.update.get_all_icon_dirs('repo'):
+            if not os.path.exists(icon_dir):
+                os.makedirs(icon_dir)
+
+        knownapks = fdroidserver.common.KnownApks()
+        apkList = ['../urzip.apk', '../org.dyndns.fules.ck_20.apk']
+
+        for apkName in apkList:
+            _, apk, cachechanged = fdroidserver.update.process_apk({}, apkName, 'repo', knownapks,
+                                                                   False)
+            # Don't care about the date added to the repo and relative apkName
+            self.assertEqual(datetime, type(apk['added']))
+            del apk['added']
+            del apk['apkName']
+
+            # ensure that icons have been extracted properly
+            if apkName == '../urzip.apk':
+                self.assertEqual(apk['icon'], 'info.guardianproject.urzip.100.png')
+            if apkName == '../org.dyndns.fules.ck_20.apk':
+                self.assertEqual(apk['icon'], 'org.dyndns.fules.ck.20.png')
+            for density in fdroidserver.update.screen_densities:
+                icon_path = os.path.join(fdroidserver.update.get_icon_dir('repo', density),
+                                         apk['icon'])
+                self.assertTrue(os.path.isfile(icon_path))
+                self.assertTrue(os.path.getsize(icon_path) > 1)
+
+            savepath = os.path.join('metadata', 'apk', apk['packageName'] + '.yaml')
+            # Uncomment to save APK metadata
+            # with open(savepath, 'w') as f:
+            #     yaml.add_representer(fdroidserver.metadata.Build, _build_yaml_representer)
+            #     yaml.dump(apk, f, default_flow_style=False)
+
+            with open(savepath, 'r') as f:
+                from_yaml = yaml.load(f, Loader=FullLoader)
+            self.maxDiff = None
+            self.assertEqual(apk, from_yaml)
+
+    def test_process_apk_signed_by_disabled_algorithms(self):
+        config = dict()
+        fdroidserver.common.fill_config_defaults(config)
+        fdroidserver.update.config = config
+
+        config['ndk_paths'] = dict()
+        fdroidserver.common.config = config
+        fdroidserver.update.config = config
+
+        fdroidserver.update.options = type('', (), {})()
+        fdroidserver.update.options.clean = True
+        fdroidserver.update.options.verbose = True
+        fdroidserver.update.options.rename_apks = False
+        fdroidserver.update.options.delete_unknown = True
+        fdroidserver.update.options.allow_disabled_algorithms = False
+
+        knownapks = fdroidserver.common.KnownApks()
+
+        tmptestsdir = tempfile.mkdtemp(prefix=inspect.currentframe().f_code.co_name,
+                                       dir=self.tmpdir)
+        print('tmptestsdir', tmptestsdir)
+        os.chdir(tmptestsdir)
+        os.mkdir('repo')
+        os.mkdir('archive')
+        # setup the repo, create icons dirs, etc.
+        fdroidserver.update.process_apks({}, 'repo', knownapks)
+        fdroidserver.update.process_apks({}, 'archive', knownapks)
+
+        disabledsigs = ['org.bitbucket.tickytacky.mirrormirror_2.apk', ]
+        for apkName in disabledsigs:
+            shutil.copy(os.path.join(self.basedir, apkName),
+                        os.path.join(tmptestsdir, 'repo'))
+
+            skip, apk, cachechanged = fdroidserver.update.process_apk({}, apkName, 'repo',
+                                                                      knownapks,
+                                                                      allow_disabled_algorithms=True,
+                                                                      archive_bad_sig=False)
+            self.assertFalse(skip)
+            self.assertIsNotNone(apk)
+            self.assertTrue(cachechanged)
+            self.assertFalse(os.path.exists(os.path.join('archive', apkName)))
+            self.assertTrue(os.path.exists(os.path.join('repo', apkName)))
+
+            if os.path.exists('/usr/bin/apksigner') or 'apksigner' in config:
+                print('SKIPPING: apksigner installed and it allows MD5 signatures')
+                return
+
+            javac = config['jarsigner'].replace('jarsigner', 'javac')
+            v = subprocess.check_output([javac, '-version'], stderr=subprocess.STDOUT)[6:-1].decode('utf-8')
+            if LooseVersion(v) < LooseVersion('1.8.0_132'):
+                print('SKIPPING: running tests with old Java (' + v + ')')
+                return
+
+            # this test only works on systems with fully updated Java/jarsigner
+            # that has MD5 listed in jdk.jar.disabledAlgorithms in java.security
+            # https://blogs.oracle.com/java-platform-group/oracle-jre-will-no-longer-trust-md5-signed-code-by-default
+            skip, apk, cachechanged = fdroidserver.update.process_apk({}, apkName, 'repo',
+                                                                      knownapks,
+                                                                      allow_disabled_algorithms=False,
+                                                                      archive_bad_sig=True)
+            self.assertTrue(skip)
+            self.assertIsNone(apk)
+            self.assertFalse(cachechanged)
+            self.assertTrue(os.path.exists(os.path.join('archive', apkName)))
+            self.assertFalse(os.path.exists(os.path.join('repo', apkName)))
+
+            skip, apk, cachechanged = fdroidserver.update.process_apk({}, apkName, 'archive',
+                                                                      knownapks,
+                                                                      allow_disabled_algorithms=False,
+                                                                      archive_bad_sig=False)
+            self.assertFalse(skip)
+            self.assertIsNotNone(apk)
+            self.assertTrue(cachechanged)
+            self.assertTrue(os.path.exists(os.path.join('archive', apkName)))
+            self.assertFalse(os.path.exists(os.path.join('repo', apkName)))
+
+            # ensure that icons have been moved to the archive as well
+            for density in fdroidserver.update.screen_densities:
+                icon_path = os.path.join(fdroidserver.update.get_icon_dir('archive', density),
+                                         apk['icon'])
+                self.assertTrue(os.path.isfile(icon_path))
+                self.assertTrue(os.path.getsize(icon_path) > 1)
+
+        badsigs = ['urzip-badcert.apk', 'urzip-badsig.apk', 'urzip-release-unsigned.apk', ]
+        for apkName in badsigs:
+            shutil.copy(os.path.join(self.basedir, apkName),
+                        os.path.join(tmptestsdir, 'repo'))
+
+            skip, apk, cachechanged = fdroidserver.update.process_apk({}, apkName, 'repo',
+                                                                      knownapks,
+                                                                      allow_disabled_algorithms=False,
+                                                                      archive_bad_sig=False)
+            self.assertTrue(skip)
+            self.assertIsNone(apk)
+            self.assertFalse(cachechanged)
+
+    def test_process_invalid_apk(self):
+        os.chdir(os.path.join(localmodule, 'tests'))
+        if os.path.basename(os.getcwd()) != 'tests':
+            raise Exception('This test must be run in the "tests/" subdir')
+
+        config = dict()
+        fdroidserver.common.fill_config_defaults(config)
+        fdroidserver.common.config = config
+        fdroidserver.update.config = config
+        fdroidserver.update.options = fdroidserver.common.options
+        fdroidserver.update.options.delete_unknown = False
+
+        knownapks = fdroidserver.common.KnownApks()
+        apk = 'fake.ota.update_1234.zip'  # this is not an APK, scanning should fail
+        (skip, apk, cachechanged) = fdroidserver.update.process_apk({}, apk, 'repo', knownapks,
+                                                                    False)
+
+        self.assertTrue(skip)
+        self.assertIsNone(apk)
+        self.assertFalse(cachechanged)
+
+    def test_translate_per_build_anti_features(self):
+        os.chdir(os.path.join(localmodule, 'tests'))
+        testdir = tempfile.mkdtemp(prefix=inspect.currentframe().f_code.co_name, dir=self.tmpdir)
+        os.chdir(testdir)
+        shutil.copytree(os.path.join(self.basedir, 'repo'), 'repo')
+        shutil.copytree(os.path.join(self.basedir, 'metadata'), 'metadata')
+        config = dict()
+        fdroidserver.common.fill_config_defaults(config)
+        config['ndk_paths'] = dict()
+        fdroidserver.common.config = config
+        fdroidserver.update.config = config
+
+        fdroidserver.update.options = type('', (), {})()
+        fdroidserver.update.options.clean = True
+        fdroidserver.update.options.delete_unknown = True
+        fdroidserver.update.options.rename_apks = False
+        fdroidserver.update.options.allow_disabled_algorithms = False
+
+        apps = fdroidserver.metadata.read_metadata()
+        knownapks = fdroidserver.common.KnownApks()
+        apks, cachechanged = fdroidserver.update.process_apks({}, 'repo', knownapks, False)
+        fdroidserver.update.translate_per_build_anti_features(apps, apks)
+        self.assertEqual(len(apks), 17)
+        foundtest = False
+        for apk in apks:
+            if apk['packageName'] == 'com.politedroid' and apk['versionCode'] == 3:
+                antiFeatures = apk.get('antiFeatures')
+                self.assertTrue('KnownVuln' in antiFeatures)
+                self.assertEqual(3, len(antiFeatures))
+                foundtest = True
+        self.assertTrue(foundtest)
+
+    def test_create_metadata_from_template(self):
+        tmptestsdir = tempfile.mkdtemp(prefix=inspect.currentframe().f_code.co_name,
+                                       dir=self.tmpdir)
+        print('tmptestsdir', tmptestsdir)
+        os.chdir(tmptestsdir)
+        os.mkdir('repo')
+        os.mkdir('metadata')
+        shutil.copy(os.path.join(localmodule, 'tests', 'urzip.apk'), 'repo')
+
+        config = dict()
+        fdroidserver.common.fill_config_defaults(config)
+        config['ndk_paths'] = dict()
+        fdroidserver.common.config = config
+        fdroidserver.update.config = config
+
+        fdroidserver.update.options = type('', (), {})()
+        fdroidserver.update.options.clean = True
+        fdroidserver.update.options.delete_unknown = False
+        fdroidserver.update.options.rename_apks = False
+        fdroidserver.update.options.allow_disabled_algorithms = False
+
+        knownapks = fdroidserver.common.KnownApks()
+        apks, cachechanged = fdroidserver.update.process_apks({}, 'repo', knownapks, False)
+        self.assertEqual(1, len(apks))
+        apk = apks[0]
+
+        testfile = 'metadata/info.guardianproject.urzip.yml'
+        # create empty 0 byte .yml file, run read_metadata, it should work
+        open(testfile, 'a').close()
+        apps = fdroidserver.metadata.read_metadata()
+        self.assertEqual(1, len(apps))
+        os.remove(testfile)
+
+        # test using internal template
+        apps = fdroidserver.metadata.read_metadata()
+        self.assertEqual(0, len(apps))
+        fdroidserver.update.create_metadata_from_template(apk)
+        self.assertTrue(os.path.exists(testfile))
+        apps = fdroidserver.metadata.read_metadata()
+        self.assertEqual(1, len(apps))
+        for app in apps.values():
+            self.assertEqual('urzip', app['Name'])
+            self.assertEqual(1, len(app['Categories']))
+            break
+
+        # test using external template.yml
+        os.remove(testfile)
+        self.assertFalse(os.path.exists(testfile))
+        shutil.copy(os.path.join(localmodule, 'examples', 'template.yml'), tmptestsdir)
+        fdroidserver.update.create_metadata_from_template(apk)
+        self.assertTrue(os.path.exists(testfile))
+        apps = fdroidserver.metadata.read_metadata()
+        self.assertEqual(1, len(apps))
+        for app in apps.values():
+            self.assertEqual('urzip', app['Name'])
+            self.assertEqual(1, len(app['Categories']))
+            self.assertEqual('Internet', app['Categories'][0])
+            break
+        with open(testfile) as fp:
+            data = yaml.load(fp, Loader=SafeLoader)
+        self.assertEqual('urzip', data['Name'])
+        self.assertEqual('urzip', data['Summary'])
+
+    def test_has_known_vulnerability(self):
+        good = [
+            'org.bitbucket.tickytacky.mirrormirror_1.apk',
+            'org.bitbucket.tickytacky.mirrormirror_2.apk',
+            'org.bitbucket.tickytacky.mirrormirror_3.apk',
+            'org.bitbucket.tickytacky.mirrormirror_4.apk',
+            'org.dyndns.fules.ck_20.apk',
+            'urzip.apk',
+            'urzip-badcert.apk',
+            'urzip-badsig.apk',
+            'urzip-release.apk',
+            'urzip-release-unsigned.apk',
+            'repo/com.politedroid_3.apk',
+            'repo/com.politedroid_4.apk',
+            'repo/com.politedroid_5.apk',
+            'repo/com.politedroid_6.apk',
+            'repo/obb.main.oldversion_1444412523.apk',
+            'repo/obb.mainpatch.current_1619_another-release-key.apk',
+            'repo/obb.mainpatch.current_1619.apk',
+            'repo/obb.main.twoversions_1101613.apk',
+            'repo/obb.main.twoversions_1101615.apk',
+            'repo/obb.main.twoversions_1101617.apk',
+            'repo/urzip-; Рахма́, [rɐxˈmanʲɪnəf] سيرجي_رخمانينوف 谢·.apk',
+        ]
+        for f in good:
+            self.assertFalse(fdroidserver.update.has_known_vulnerability(f))
+        with self.assertRaises(fdroidserver.exception.FDroidException):
+            fdroidserver.update.has_known_vulnerability('janus.apk')
+
+    def test_get_apk_icon_when_src_is_none(self):
+        config = dict()
+        fdroidserver.common.fill_config_defaults(config)
+        fdroidserver.common.config = config
+        fdroidserver.update.config = config
+
+        # pylint: disable=protected-access
+        icons_src = fdroidserver.update._get_apk_icons_src('urzip-release.apk', None)
+        assert icons_src == {}
+
+    def test_strip_and_copy_image(self):
+        tmptestsdir = tempfile.mkdtemp(prefix=inspect.currentframe().f_code.co_name,
+                                       dir=self.tmpdir)
+
+        in_file = os.path.join(self.basedir, 'metadata', 'info.guardianproject.urzip', 'en-US', 'images', 'icon.png')
+        out_file = os.path.join(tmptestsdir, 'icon.png')
+        fdroidserver.update._strip_and_copy_image(in_file, out_file)
+        self.assertTrue(os.path.exists(out_file))
+
+        in_file = os.path.join(self.basedir, 'corrupt-featureGraphic.png')
+        out_file = os.path.join(tmptestsdir, 'corrupt-featureGraphic.png')
+        fdroidserver.update._strip_and_copy_image(in_file, out_file)
+        self.assertFalse(os.path.exists(out_file))
+
+    def test_create_metadata_from_template_empty_keys(self):
+        apk = {'packageName': 'rocks.janicerand'}
+        with tempfile.TemporaryDirectory() as tmpdir, TmpCwd(tmpdir):
+            os.mkdir('metadata')
+            with open('template.yml', 'w') as f:
+                f.write(textwrap.dedent('''\
+                    Disabled:
+                    License:
+                    AuthorName:
+                    AuthorEmail:
+                    AuthorWebSite:
+                    WebSite:
+                    SourceCode:
+                    IssueTracker:
+                    Translation:
+                    Changelog:
+                    Donate:
+                    FlattrID:
+                    LiberapayID:
+                    Bitcoin:
+                    Litecoin:
+                    Name:
+                    AutoName:
+                    Summary:
+                    RequiresRoot:
+                    RepoType:
+                    Repo:
+                    Binaries:
+                    Builds:
+                    ArchivePolicy:
+                    AutoUpdateMode:
+                    UpdateCheckMode:
+                    UpdateCheckIgnore:
+                    VercodeOperation:
+                    UpdateCheckName:
+                    UpdateCheckData:
+                    CurrentVersion:
+                    CurrentVersionCode:
+                    NoSourceSince:
+                    '''))
+            fdroidserver.update.create_metadata_from_template(apk)
+            with open(os.path.join('metadata', 'rocks.janicerand.yml')) as f:
+                metadata_content = yaml.load(f, Loader=SafeLoader)
+                self.maxDiff = None
+                self.assertDictEqual(metadata_content,
+                                     {'ArchivePolicy': '',
+                                      'AuthorEmail': '',
+                                      'AuthorName': '',
+                                      'AuthorWebSite': '',
+                                      'AutoName': 'rocks.janicerand',
+                                      'AutoUpdateMode': '',
+                                      'Binaries': '',
+                                      'Bitcoin': '',
+                                      'Builds': '',
+                                      'Changelog': '',
+                                      'CurrentVersion': '',
+                                      'CurrentVersionCode': '',
+                                      'Disabled': '',
+                                      'Donate': '',
+                                      'FlattrID': '',
+                                      'IssueTracker': '',
+                                      'LiberapayID': '',
+                                      'License': '',
+                                      'Litecoin': '',
+                                      'Name': 'rocks.janicerand',
+                                      'NoSourceSince': '',
+                                      'Repo': '',
+                                      'RepoType': '',
+                                      'RequiresRoot': '',
+                                      'SourceCode': '',
+                                      'Summary': 'rocks.janicerand',
+                                      'Translation': '',
+                                      'UpdateCheckData': '',
+                                      'UpdateCheckIgnore': '',
+                                      'UpdateCheckMode': '',
+                                      'UpdateCheckName': '',
+                                      'VercodeOperation': '',
+                                      'WebSite': ''})
+
+    def test_insert_funding_yml_donation_links(self):
+        testdir = tempfile.mkdtemp(prefix=inspect.currentframe().f_code.co_name, dir=self.tmpdir)
+        os.chdir(testdir)
+        os.mkdir('build')
+        content = textwrap.dedent("""
+            community_bridge: ''
+            custom: [LINK1, LINK2]
+            github: USERNAME
+            issuehunt: USERNAME
+            ko_fi: USERNAME
+            liberapay: USERNAME
+            open_collective: USERNAME
+            otechie: USERNAME
+            patreon: USERNAME
+        """)
+        app = fdroidserver.metadata.App()
+        app.id = 'fake.app.id'
+        apps = {app.id: app}
+        os.mkdir(os.path.join('build', app.id))
+        fdroidserver.update.insert_funding_yml_donation_links(apps)
+        for field in DONATION_FIELDS:
+            self.assertFalse(app.get(field))
+        with open(os.path.join('build', app.id, 'FUNDING.yml'), 'w') as fp:
+            fp.write(content)
+
+        fdroidserver.update.insert_funding_yml_donation_links(apps)
+        for field in DONATION_FIELDS:
+            self.assertIsNotNone(app.get(field), field)
+        self.assertEqual('LINK1', app.get('Donate'))
+        self.assertEqual('USERNAME', app.get('Liberapay'))
+        self.assertEqual('USERNAME', app.get('OpenCollective'))
+
+        app['Donate'] = 'keepme'
+        app['Liberapay'] = 'keepme'
+        app['OpenCollective'] = 'keepme'
+        fdroidserver.update.insert_funding_yml_donation_links(apps)
+        for field in DONATION_FIELDS:
+            self.assertEqual('keepme', app.get(field))
+
+    def test_insert_funding_yml_donation_links_one_at_a_time(self):
+        """Exercise the FUNDING.yml code one entry at a time"""
+        testdir = tempfile.mkdtemp(prefix=inspect.currentframe().f_code.co_name, dir=self.tmpdir)
+        os.chdir(testdir)
+        os.mkdir('build')
+
+        app = fdroidserver.metadata.App()
+        app.id = 'fake.app.id'
+        apps = {app.id: app}
+        os.mkdir(os.path.join('build', app.id))
+        fdroidserver.update.insert_funding_yml_donation_links(apps)
+        for field in DONATION_FIELDS:
+            self.assertIsNone(app.get(field))
+
+        content = textwrap.dedent("""
+            community_bridge: 'blah-de-blah'
+            github: USERNAME
+            issuehunt: USERNAME
+            ko_fi: USERNAME
+            liberapay: USERNAME
+            open_collective: USERNAME
+            patreon: USERNAME
+        """)
+        for line in content.split('\n'):
+            if not line:
+                continue
+            app = fdroidserver.metadata.App()
+            app.id = 'fake.app.id'
+            apps = {app.id: app}
+            with open(os.path.join('build', app.id, 'FUNDING.yml'), 'w') as fp:
+                fp.write(line)
+            data = yaml.load(line, Loader=SafeLoader)
+            fdroidserver.update.insert_funding_yml_donation_links(apps)
+            if 'liberapay' in data:
+                self.assertEqual(data['liberapay'], app.get('Liberapay'))
+            elif 'open_collective' in data:
+                self.assertEqual(data['open_collective'], app.get('OpenCollective'))
+            else:
+                for v in data.values():
+                    self.assertEqual(app.get('Donate', '').split('/')[-1], v)
+
+    def test_insert_funding_yml_donation_links_with_corrupt_file(self):
+        testdir = tempfile.mkdtemp(prefix=inspect.currentframe().f_code.co_name, dir=self.tmpdir)
+        os.chdir(testdir)
+        os.mkdir('build')
+        app = fdroidserver.metadata.App()
+        app.id = 'fake.app.id'
+        apps = {app.id: app}
+        os.mkdir(os.path.join('build', app.id))
+        with open(os.path.join('build', app.id, 'FUNDING.yml'), 'w') as fp:
+            fp.write(textwrap.dedent("""
+                opencollective: foo
+                custom: []
+                liberapay: :
+            """))
+        fdroidserver.update.insert_funding_yml_donation_links(apps)
+        for field in DONATION_FIELDS:
+            self.assertIsNone(app.get(field))
+
+    def test_sanitize_funding_yml(self):
+        with open(os.path.join(self.basedir, 'funding-usernames.yaml')) as fp:
+            data = yaml.load(fp, Loader=SafeLoader)
+        for k, entries in data.items():
+            for entry in entries:
+                if k in 'custom':
+                    m = fdroidserver.update.sanitize_funding_yml_entry(entry)
+                else:
+                    m = fdroidserver.update.sanitize_funding_yml_name(entry)
+                if k == 'bad':
+                    self.assertIsNone(m)
+                else:
+                    self.assertIsNotNone(m)
+        self.assertIsNone(fdroidserver.update.sanitize_funding_yml_entry('foo\nbar'))
+        self.assertIsNone(fdroidserver.update.sanitize_funding_yml_entry(
+            ''.join(chr(random.randint(65, 90)) for _ in range(2049))))
+
+        # not recommended but valid entries
+        self.assertIsNotNone(fdroidserver.update.sanitize_funding_yml_entry(12345))
+        self.assertIsNotNone(fdroidserver.update.sanitize_funding_yml_entry(5.0))
+        self.assertIsNotNone(fdroidserver.update.sanitize_funding_yml_entry(' WhyIncludeWhitespace '))
+        self.assertIsNotNone(fdroidserver.update.sanitize_funding_yml_entry(['first', 'second']))
+
+
+if __name__ == "__main__":
+    os.chdir(os.path.dirname(__file__))
+
+    parser = optparse.OptionParser()
+    parser.add_option("-v", "--verbose", action="store_true", default=False,
+                      help="Spew out even more information than normal")
+    (fdroidserver.common.options, args) = parser.parse_args(['--verbose'])
+
+    newSuite = unittest.TestSuite()
+    newSuite.addTest(unittest.makeSuite(UpdateTest))
+    unittest.main(failfast=False)
diff --git a/tests/test_vcs.py b/tests/vcs.TestCase
similarity index 57%
rename from tests/test_vcs.py
rename to tests/vcs.TestCase
index a007feae..a7e7c758 100755
--- a/tests/test_vcs.py
+++ b/tests/vcs.TestCase
@@ -1,27 +1,43 @@
 #!/usr/bin/env python3
 
+# http://www.drdobbs.com/testing/unit-testing-with-python/240165163
+
+import inspect
+import logging
+import optparse
 import os
+import sys
+import tempfile
 import unittest
 
 from git import Repo
 
+localmodule = os.path.realpath(
+    os.path.join(os.path.dirname(inspect.getfile(inspect.currentframe())), '..'))
+print('localmodule: ' + localmodule)
+if localmodule not in sys.path:
+    sys.path.insert(0, localmodule)
+
+import fdroidserver.build
 import fdroidserver.common
 import fdroidserver.metadata
-
-from .shared_test_code import VerboseFalseOptions, mkdtemp
+import fdroidserver.scanner
 
 
 class VCSTest(unittest.TestCase):
     """For some reason the VCS classes are in fdroidserver/common.py"""
 
     def setUp(self):
-        self._td = mkdtemp()
-        os.chdir(self._td.name)
-
-    def tearDown(self):
-        self._td.cleanup()
+        logging.basicConfig(level=logging.DEBUG)
+        self.basedir = os.path.join(localmodule, 'tests')
+        self.tmpdir = os.path.abspath(os.path.join(self.basedir, '..', '.testfiles'))
+        if not os.path.exists(self.tmpdir):
+            os.makedirs(self.tmpdir)
+        os.chdir(self.basedir)
 
     def test_remote_set_head_can_fail(self):
+        testdir = tempfile.mkdtemp(prefix=inspect.currentframe().f_code.co_name, dir=self.tmpdir)
+        os.chdir(testdir)
         # First create an upstream repo with one commit
         upstream_repo = Repo.init("upstream_repo")
         with open(upstream_repo.working_dir + "/file", 'w') as f:
@@ -54,15 +70,20 @@ class VCSTest(unittest.TestCase):
         build.androidupdate = ['no']
         vcs, build_dir = fdroidserver.common.setup_vcs(app)
         # force an init of the repo, the remote head error only occurs on the second gotorevision call
-
-        fdroidserver.common.options = VerboseFalseOptions
         vcs.gotorevision(build.commit)
-        fdroidserver.common.prepare_source(
-            vcs,
-            app,
-            build,
-            build_dir=build_dir,
-            srclib_dir="ignore",
-            extlib_dir="ignore",
-        )
+        fdroidserver.common.prepare_source(vcs, app, build,
+                                           build_dir=build_dir, srclib_dir="ignore", extlib_dir="ignore")
         self.assertTrue(os.path.isfile("build/com.gpl.rpg.AndorsTrail/file"))
+
+
+if __name__ == "__main__":
+    os.chdir(os.path.dirname(__file__))
+
+    parser = optparse.OptionParser()
+    parser.add_option("-v", "--verbose", action="store_true", default=False,
+                      help="Spew out even more information than normal")
+    (fdroidserver.common.options, args) = parser.parse_args(['--verbose'])
+
+    newSuite = unittest.TestSuite()
+    newSuite.addTest(unittest.makeSuite(VCSTest))
+    unittest.main(failfast=False)