Merge branch 'merge_weblate' into 'master'

weblate

See merge request fdroid/fdroidserver!1591

dev/fdroid_scan-binary.py

@@ -0,0 +1,38 @@
+#!/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 glob
+import os
+from argparse import ArgumentParser
+from fdroidserver import _, common, scanner
+
+
+fdroid_summary = 'Run scanner.scan_binary on APKs'
+
+
+def main():
+    parser = ArgumentParser()
+    common.setup_global_opts(parser)
+    parser.add_argument("APK", nargs='*', help=_("Path to a signed or unsigned APK."))
+    options = common.parse_args(parser)
+    common.read_config()
+    if options.APK:
+        apks = options.APK
+    else:
+        apks = glob.glob(os.path.join('unsigned', '*.apk'))
+
+    errors = 0
+    for apk in apks:
+        print('Scanning', apk, '...')
+        if scanner.scan_binary(apk):
+            print("ERROR: Found blocklisted packages in:", apk)
+            errors += 1
+    exit(errors)
+
+
+if __name__ == "__main__":
+    main()

locale/ca/LC_MESSAGES/fdroidserver.po

@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
 # Rubén <rubenx@mail.com>, 2023.
-# pitroig <ona@riseup.net>, 2024.
+# 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.
@@ -12,15 +12,15 @@ msgstr ""
 "Project-Id-Version: fdroidserver 2.1-273-g54e84d87\n"
 "Report-Msgid-Bugs-To: https://gitlab.com/fdroid/fdroidserver/issues\n"
 "POT-Creation-Date: 2024-12-11 14:37+0100\n"
-"PO-Revision-Date: 2024-11-27 18:26+0000\n"
+"PO-Revision-Date: 2025-01-03 17:37+0000\n"
-"Last-Translator: Ecron <ecron_89@hotmail.com>\n"
+"Last-Translator: pitroig <ona@riseup.net>\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.9-dev\n"
+"X-Generator: Weblate 5.10-dev\n"
 
 #: ../fdroidserver/nightly.py
 msgid ""
@@ -1514,7 +1514,7 @@ msgstr "Actualitza i cau les regles de l'escàner i les signatures de la xarxa"
 
 #: ../fdroidserver/verify.py
 msgid "Remove source tarball and any APKs if successfully verified."
-msgstr ""
+msgstr "Elimina el fitxer tar d'origen i qualsevol APKs si s'ha verificat correctament."
 
 #: ../fdroidserver/common.py
 msgid "Removing specified files"

locale/cs/LC_MESSAGES/fdroidserver.po

@@ -13,7 +13,7 @@ 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: 2024-12-11 14:37+0100\n"
-"PO-Revision-Date: 2024-11-23 18:58+0000\n"
+"PO-Revision-Date: 2024-12-12 01:41+0000\n"
 "Last-Translator: Fjuro <fjuro@alius.cz>\n"
 "Language-Team: Czech <https://hosted.weblate.org/projects/f-droid/fdroidserver/cs/>\n"
 "Language: cs\n"
@@ -1517,7 +1517,7 @@ msgstr "Obnovit a uložit pravidla a podpisy skeneru ze sítě do mezipaměti"
 
 #: ../fdroidserver/verify.py
 msgid "Remove source tarball and any APKs if successfully verified."
-msgstr ""
+msgstr "Odstranit zdrojový tarball a všechny soubory APK při úspěšném ověření."
 
 #: ../fdroidserver/common.py
 msgid "Removing specified files"

locale/de/LC_MESSAGES/fdroidserver.po

@@ -15,7 +15,7 @@
 # fossdd <fossdd@tutanota.com>, 2021.
 # Ceeee <marius.romanus@gmx.de>, 2021.
 # C. Rüdinger <Mail-an-CR@web.de>, 2021, 2022.
-# VfBFan <drop0815@posteo.de>, 2021, 2023.
+# VfBFan <drop0815@posteo.de>, 2021, 2023, 2024.
 # Roman Leo <roman.leo@gmx.de>, 2021.
 # Follpvosten <wolfi@karpador.xyz>, 2021.
 # ssantos <ssantos@web.de>, 2022, 2023, 2024.
@@ -27,8 +27,8 @@ msgstr ""
 "Project-Id-Version: fdroidserver 0.9\n"
 "Report-Msgid-Bugs-To: https://gitlab.com/fdroid/fdroidserver/issues\n"
 "POT-Creation-Date: 2024-12-11 14:37+0100\n"
-"PO-Revision-Date: 2024-12-03 09:22+0000\n"
+"PO-Revision-Date: 2024-12-12 14:43+0000\n"
-"Last-Translator: VfBFan <VfBFan@users.noreply.hosted.weblate.org>\n"
+"Last-Translator: VfBFan <drop0815@posteo.de>\n"
 "Language-Team: German <https://hosted.weblate.org/projects/f-droid/fdroidserver/de/>\n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
@@ -1529,7 +1529,7 @@ msgstr "Aktualisieren und Zwischenspeichern von Scannerregeln und Signaturen aus
 
 #: ../fdroidserver/verify.py
 msgid "Remove source tarball and any APKs if successfully verified."
-msgstr ""
+msgstr "Den Quell-Tarball und alle APKs entfernen, wenn sie erfolgreich verifiziert wurden."
 
 #: ../fdroidserver/common.py
 msgid "Removing specified files"

locale/es/LC_MESSAGES/fdroidserver.po

@@ -18,7 +18,7 @@ msgstr ""
 "Project-Id-Version: fdroidserver 0.9\n"
 "Report-Msgid-Bugs-To: https://gitlab.com/fdroid/fdroidserver/issues\n"
 "POT-Creation-Date: 2024-12-11 14:37+0100\n"
-"PO-Revision-Date: 2024-11-21 23:18+0000\n"
+"PO-Revision-Date: 2024-12-20 13:00+0000\n"
 "Last-Translator: gallegonovato <fran-carro@hotmail.es>\n"
 "Language-Team: Spanish <https://hosted.weblate.org/projects/f-droid/fdroidserver/es/>\n"
 "Language: es\n"
@@ -26,7 +26,7 @@ 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.9-dev\n"
+"X-Generator: Weblate 5.9.2-dev\n"
 
 #: ../fdroidserver/nightly.py
 msgid ""
@@ -1520,7 +1520,7 @@ msgstr "Actualización y almacenamiento en caché de las reglas y firmas del esc
 
 #: ../fdroidserver/verify.py
 msgid "Remove source tarball and any APKs if successfully verified."
-msgstr ""
+msgstr "Elimine el archivo tar de origen y todos los APK si se verifican correctamente."
 
 #: ../fdroidserver/common.py
 msgid "Removing specified files"

locale/fr/LC_MESSAGES/fdroidserver.po

@@ -40,20 +40,21 @@
 # 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.
 msgid ""
 msgstr ""
 "Project-Id-Version: fdroidserver 0.9\n"
 "Report-Msgid-Bugs-To: https://gitlab.com/fdroid/fdroidserver/issues\n"
 "POT-Creation-Date: 2024-12-11 14:37+0100\n"
-"PO-Revision-Date: 2024-11-27 13:22+0000\n"
+"PO-Revision-Date: 2024-12-31 00:24+0000\n"
-"Last-Translator: Ldm Public <ldmpub@gmail.com>\n"
+"Last-Translator: Armand Camponovo <contact@camarm.dev>\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.9-dev\n"
+"X-Generator: Weblate 5.10-dev\n"
 
 #: ../fdroidserver/nightly.py
 msgid ""
@@ -904,9 +905,8 @@ msgid "Found multiple JAR Signature Block Files in {path}"
 msgstr "Plusieurs fichiers de bloc de signature JAR trouvé à {path}"
 
 #: ../fdroidserver/common.py
-#, fuzzy
 msgid "Found multiple Signer Certificates!"
-msgstr "Plusieurs signataires de certificats ont été trouvés !"
+msgstr "Plusieurs certificats de signatures ont été trouvés !"
 
 #: ../fdroidserver/metadata.py
 #, python-brace-format
@@ -975,7 +975,7 @@ msgstr "Reset de Git échouée"
 #: ../fdroidserver/common.py
 #, fuzzy
 msgid "Git submodule deinit failed"
-msgstr "Échec de la mise à jour du sous-module Git"
+msgstr "Échec de la suppression du sous-module Git"
 
 #: ../fdroidserver/common.py
 msgid "Git submodule sync failed"
@@ -1201,7 +1201,7 @@ msgstr "Lister les fichiers qui seront reformater (test à blanc)"
 
 #: ../fdroidserver/lint.py
 msgid "Locale included in f-droid.org URL"
-msgstr "Les paramètres de lieu sont inclus dans f-droid.org URL"
+msgstr "Les paramètres de localisation sont inclus dans l'URL f-droid.org"
 
 #: ../fdroidserver/build.py
 msgid "Make the build stop on exceptions"
@@ -1328,7 +1328,6 @@ msgid "No unsigned directory - nothing to do"
 msgstr "Aucun dossier non signé — il n'y a rien à faire"
 
 #: ../fdroidserver/__main__.py
-#, fuzzy
 msgid "No version information could be found."
 msgstr "Aucune information sur la version n’a été trouvée."
 
@@ -1459,9 +1458,9 @@ 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
-#, fuzzy, python-brace-format
+#, python-brace-format
 msgid "Privacy mode was enabled based on your locale ({country_code})."
-msgstr "Le mode de confidentialité a été activé, dû à votre position ({country_code})."
+msgstr "Le mode de confidentialité a été activé, dû à votre localisation ({country_code})."
 
 #: ../fdroidserver/scanner.py
 #, python-format
@@ -1546,7 +1545,6 @@ msgid "Reading {apkfilename} from cache"
 msgstr "Lecture de {apkfilename} à partir du cache"
 
 #: ../fdroidserver/build.py
-#, fuzzy
 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."
 
@@ -1589,9 +1587,9 @@ msgid "Restrict output to warnings and errors"
 msgstr "Limiter la sortie aux avertissements et aux erreurs"
 
 #: ../fdroidserver/net.py
-#, fuzzy, python-format
+#, python-format
 msgid "Retrying failed download: %s"
-msgstr "Réessaie de téléchargement échoué : %s"
+msgstr "Nouvel essai de téléchargement suite à échec : %s"
 
 #: ../fdroidserver/__main__.py
 msgid "Rewrite all the metadata files"
@@ -1818,7 +1816,6 @@ 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."
 
 #: ../fdroidserver/mirror.py
-#, fuzzy
 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."
 

locale/ga/LC_MESSAGES/fdroidserver.po

@@ -6,7 +6,7 @@ msgstr ""
 "Project-Id-Version: fdroidserver 2.3a1-162-gfbb3cc59\n"
 "Report-Msgid-Bugs-To: https://gitlab.com/fdroid/fdroidserver/issues\n"
 "POT-Creation-Date: 2024-12-11 14:37+0100\n"
-"PO-Revision-Date: 2024-11-22 21:03+0000\n"
+"PO-Revision-Date: 2024-12-14 19:00+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"
@@ -14,7 +14,7 @@ msgstr ""
 "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.9-dev\n"
+"X-Generator: Weblate 5.9-rc\n"
 
 #: ../fdroidserver/nightly.py
 msgid ""
@@ -1514,7 +1514,7 @@ msgstr "Athnuaigh agus cuir rialacha agus sínithe scanóirí taisce ón líonra
 
 #: ../fdroidserver/verify.py
 msgid "Remove source tarball and any APKs if successfully verified."
-msgstr ""
+msgstr "Bain tarball foinse agus aon APKanna má fhíoraítear go rathúil é."
 
 #: ../fdroidserver/common.py
 msgid "Removing specified files"

locale/ja/LC_MESSAGES/fdroidserver.po

@@ -3,13 +3,14 @@
 # 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.
 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: 2024-12-11 14:37+0100\n"
-"PO-Revision-Date: 2024-11-28 08:34+0000\n"
+"PO-Revision-Date: 2024-12-12 01:41+0000\n"
-"Last-Translator: \"Shuuji TAKAHASHI (shuuji3)\" <shuuji3@gmail.com>\n"
+"Last-Translator: Liner Seven <linour7gmekiblo@gmail.com>\n"
 "Language-Team: Japanese <https://hosted.weblate.org/projects/f-droid/fdroidserver/ja/>\n"
 "Language: ja\n"
 "MIME-Version: 1.0\n"
@@ -1508,7 +1509,7 @@ msgstr "スキャナーのルールと署名をネットワークから取得し
 
 #: ../fdroidserver/verify.py
 msgid "Remove source tarball and any APKs if successfully verified."
-msgstr ""
+msgstr "検証成功時にソースのTAR・APKを削除する。"
 
 #: ../fdroidserver/common.py
 msgid "Removing specified files"

locale/pick-complete-translations.py

@@ -2,6 +2,7 @@
 #
 # add completed translations from weblate to MANIFEST.in
 
+import git
 import json
 import os
 import re
@@ -37,14 +38,41 @@ for locale in sorted(data, key=lambda locale: locale['code']):
 
 manifest_file = os.path.join(projectbasedir, 'MANIFEST.in')
 with open(manifest_file) as fp:
-    for line in fp.readlines():
+    manifest_in = fp.read()
-        m = re.match(r'include locale/([^/]+)/.*', line)
+for m in re.findall(r'include locale/([^/]+)/LC_MESSAGES/fdroidserver.po', manifest_in):
-        if m:
+    active.add(m)
-            active.add(m.group(1))
 
+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:
-    manifest_lines.add('include locale/%s/LC_MESSAGES/fdroidserver.po\n' % locale)
+    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:
@@ -52,3 +80,10 @@ with open(manifest_file, 'a') as fp:
             fp.write(line)
 
 subprocess.run(['sort', '-u', '-o', manifest_file, manifest_file])
+
+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')

locale/pt_BR/LC_MESSAGES/fdroidserver.po

@@ -19,15 +19,15 @@ msgstr ""
 "Project-Id-Version: fdroidserver 0.9\n"
 "Report-Msgid-Bugs-To: https://gitlab.com/fdroid/fdroidserver/issues\n"
 "POT-Creation-Date: 2024-12-11 14:37+0100\n"
-"PO-Revision-Date: 2024-11-25 13:28+0000\n"
+"PO-Revision-Date: 2024-12-24 01:00+0000\n"
-"Last-Translator: dedakir923 <dedakir923@exoular.com>\n"
+"Last-Translator: LucasMZ <git@lucasmz.dev>\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.9-dev\n"
+"X-Generator: Weblate 5.10-dev\n"
 
 #: ../fdroidserver/nightly.py
 msgid ""
@@ -1521,7 +1521,7 @@ msgstr "Atualizar e armazenar em cache regras e assinaturas do scanner da rede"
 
 #: ../fdroidserver/verify.py
 msgid "Remove source tarball and any APKs if successfully verified."
-msgstr ""
+msgstr "Remover pacote de código-fonte e qualquer APK se verificado com sucesso."
 
 #: ../fdroidserver/common.py
 msgid "Removing specified files"

locale/pt_PT/LC_MESSAGES/fdroidserver.po

@@ -2,7 +2,7 @@
 # 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.
+# 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.
@@ -12,15 +12,15 @@ msgstr ""
 "Project-Id-Version: fdroidserver 0.9\n"
 "Report-Msgid-Bugs-To: https://gitlab.com/fdroid/fdroidserver/issues\n"
 "POT-Creation-Date: 2024-12-11 14:37+0100\n"
-"PO-Revision-Date: 2024-11-26 10:54+0000\n"
+"PO-Revision-Date: 2025-01-03 06:49+0000\n"
-"Last-Translator: Hugo Carvalho <hugokarvalho@hotmail.com>\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"
 "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 5.10-dev\n"
 
 #: ../fdroidserver/nightly.py
 msgid ""
@@ -1514,7 +1514,7 @@ msgstr "Atualizar e armazenar as regras e assinaturas do scanner da rede no cach
 
 #: ../fdroidserver/verify.py
 msgid "Remove source tarball and any APKs if successfully verified."
-msgstr ""
+msgstr "Remover tarball de código-fonte e todos APKs se for verificado com sucesso."
 
 #: ../fdroidserver/common.py
 msgid "Removing specified files"

locale/ru/LC_MESSAGES/fdroidserver.po

@@ -3,7 +3,7 @@
 # Golubev Alexander <fatzer2@gmail.com>, 2020, 2021, 2024.
 # Mingun <Alexander_Sergey@mail.ru>, 2020.
 # anonymous <noreply@weblate.org>, 2020.
-# Andrey <andrey@mailbox.org>, 2020, 2021, 2022, 2023.
+# Andrey <andrey@mailbox.org>, 2020, 2021, 2022, 2023, 2025.
 # gardenapple <gardenapple@posteo.net>, 2020.
 # Boris Timofeev <mashin87@gmail.com>, 2020.
 # Hans-Christoph Steiner <hans@guardianproject.info>, 2020.
@@ -15,20 +15,21 @@
 # Alexander Ivanov <saiv46.dev@gmail.com>, 2024.
 # gfbdrgng <hnaofegnp@hldrive.com>, 2024.
 # neverender <audiolunaire@getgoogleoff.me>, 2024.
+# Dmitry <dmitrydmitry761@gmail.com>, 2024.
 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: 2024-12-11 14:37+0100\n"
-"PO-Revision-Date: 2024-12-02 17:00+0000\n"
+"PO-Revision-Date: 2025-01-08 16:30+0000\n"
-"Last-Translator: Golubev Alexander <fatzer2@gmail.com>\n"
+"Last-Translator: Andrey <andrey@mailbox.org>\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.9-dev\n"
+"X-Generator: Weblate 5.10-dev\n"
 
 #: ../fdroidserver/nightly.py
 msgid ""
@@ -465,7 +466,7 @@ msgstr "Зафиксировать изменения (commit)"
 
 #: ../fdroidserver/checkupdates.py
 msgid "Commit changes, push, then make a merge request"
-msgstr "Зафиксировать изменения (commit), отправить (push) их в удалённый репозиторий, и затем создать запрос на слияние"
+msgstr "Зафиксировать изменения (commit), отправить (push) их в удаленный репозиторий, и затем создать запрос на слияние"
 
 #: ../fdroidserver/metadata.py
 #, python-brace-format
@@ -744,7 +745,7 @@ msgstr "Переменная среды {var} из {configname} не устан
 
 #: ../fdroidserver/deploy.py
 msgid "Error deploying 'github_releases', {} not present. (You might need to run `fdroid update` first.)"
-msgstr "Ошибка развёртывания 'github_releases', {} отсутствует. (Возможно, сначала вам нужно запустить `fdroid update`.)"
+msgstr "Ошибка развертывания 'github_releases', {} отсутствует. (Возможно, сначала вам нужно запустить `fdroid update`.)"
 
 #: ../fdroidserver/import_subcommand.py
 msgid "Error while getting repo address"
@@ -1524,7 +1525,7 @@ msgstr "Обновление и кэширование правил и сигн
 
 #: ../fdroidserver/verify.py
 msgid "Remove source tarball and any APKs if successfully verified."
-msgstr ""
+msgstr "Удалить tar-архив с исходным кодом и все APK-файлы, если проверка для них прошла успешно."
 
 #: ../fdroidserver/common.py
 msgid "Removing specified files"
@@ -2030,7 +2031,7 @@ msgstr "Для конфигурации s3cmd используется \"{path}\
 #: ../fdroidserver/deploy.py
 #, python-brace-format
 msgid "Using \"{path}\" for syncing with remote storage."
-msgstr "Для синхронизации с удалённым хранилищем используется путь \"{path}\"."
+msgstr "Для синхронизации с удаленным хранилищем используется путь \"{path}\"."
 
 #: ../fdroidserver/common.py
 msgid "Using APK Signature v2"
@@ -2644,7 +2645,7 @@ msgstr "s3cmd синхронизировать индексы из {path} в {ur
 #: ../fdroidserver/deploy.py
 #, python-brace-format
 msgid "s3cmd syncs indexes from {path} to {url} and deletes removed"
-msgstr "s3cmd синхронизирует индексы из {path} в {url} и удаляет стёртые"
+msgstr "s3cmd синхронизирует индексы из {path} в {url} и удаляет стертые"
 
 #: ../fdroidserver/scanner.py
 #, python-brace-format

locale/sq/LC_MESSAGES/fdroidserver.po

@@ -7,7 +7,7 @@ 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: 2024-12-11 14:37+0100\n"
-"PO-Revision-Date: 2024-11-22 05:58+0000\n"
+"PO-Revision-Date: 2024-12-12 14:43+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"
@@ -1509,7 +1509,7 @@ msgstr "Rifresko dhe ruaj në fshehtinë rregulla skaneri nga rrjeti"
 
 #: ../fdroidserver/verify.py
 msgid "Remove source tarball and any APKs if successfully verified."
-msgstr ""
+msgstr "Hiqni paketimin e burimit dhe çfarëdo APK-sh, nëse verifikimi është i suksesshëm."
 
 #: ../fdroidserver/common.py
 msgid "Removing specified files"
@@ -2627,7 +2627,7 @@ msgstr ""
 #: ../fdroidserver/deploy.py
 #, python-brace-format
 msgid "s3cmd syncs indexes from {path} to {url} and deletes removed"
-msgstr ""
+msgstr "s3cmd njëkohëson tregues nga {path} te {url} dhe fshin të hequrit"
 
 #: ../fdroidserver/scanner.py
 #, python-brace-format

locale/sr/LC_MESSAGES/fdroidserver.po

@@ -9,7 +9,7 @@ msgstr ""
 "Project-Id-Version: fdroidserver 2.1b0\n"
 "Report-Msgid-Bugs-To: https://gitlab.com/fdroid/fdroidserver/issues\n"
 "POT-Creation-Date: 2024-12-11 14:37+0100\n"
-"PO-Revision-Date: 2024-11-29 10:00+0000\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"
@@ -17,7 +17,7 @@ msgstr ""
 "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.9-dev\n"
+"X-Generator: Weblate 5.10-dev\n"
 
 #: ../fdroidserver/nightly.py
 msgid ""
@@ -1513,7 +1513,7 @@ msgstr "Освежите и кеширајте правила и потписе
 
 #: ../fdroidserver/verify.py
 msgid "Remove source tarball and any APKs if successfully verified."
-msgstr ""
+msgstr "Уклони изворни tarball и све APK-ове ако су успешно проверени."
 
 #: ../fdroidserver/common.py
 msgid "Removing specified files"

locale/uk/LC_MESSAGES/fdroidserver.po

@@ -11,20 +11,21 @@
 # Tymofii Lytvynenko <till.svit@gmail.com>, 2024.
 # Fqwe1 <Fqwe1@users.noreply.hosted.weblate.org>, 2024.
 # Nazar <balaraz@tuta.io>, 2024.
+# Максим Горпиніч <mgorpinic2005@gmail.com>, 2024.
 msgid ""
 msgstr ""
 "Project-Id-Version: fdroidserver 0.9\n"
 "Report-Msgid-Bugs-To: https://gitlab.com/fdroid/fdroidserver/issues\n"
 "POT-Creation-Date: 2024-12-11 14:37+0100\n"
-"PO-Revision-Date: 2024-09-13 23:35+0000\n"
+"PO-Revision-Date: 2024-12-20 13:00+0000\n"
-"Last-Translator: Ihor Hordiichuk <igor_ck@outlook.com>\n"
+"Last-Translator: Максим Горпиніч <mgorpinic2005@gmail.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.8-dev\n"
+"X-Generator: Weblate 5.9.2-dev\n"
 
 #: ../fdroidserver/nightly.py
 msgid ""
@@ -212,7 +213,7 @@ msgstr "'{value}' не є дійсним {field}, має бути {pattern}"
 
 #: ../fdroidserver/checkupdates.py
 msgid "--merge-request only runs on a single appid!"
-msgstr ""
+msgstr "--merge-request працює лише в одній програмі!"
 
 #: ../fdroidserver/checkupdates.py
 #, python-brace-format
@@ -343,11 +344,11 @@ msgstr "AutoUpdateMode з UpdateCheckMode: HTTP повинен мати шабл
 
 #: ../fdroidserver/install.py
 msgid "Automatic no to all prompts."
-msgstr ""
+msgstr "Автоматичне ні для всіх підказок."
 
 #: ../fdroidserver/install.py
 msgid "Automatic yes to all prompts."
-msgstr ""
+msgstr "Автоматичне «так» на всі підказки."
 
 #: ../fdroidserver/index.py
 #, python-brace-format
@@ -444,7 +445,7 @@ msgstr "Очистити оновлення - не використовує ке
 
 #: ../fdroidserver/common.py
 msgid "Color the log output"
-msgstr ""
+msgstr "Розфарбуйте результат журналу"
 
 #: ../fdroidserver/import_subcommand.py
 msgid "Comma separated list of categories."
@@ -461,7 +462,7 @@ msgstr "Прийняти зміни"
 
 #: ../fdroidserver/checkupdates.py
 msgid "Commit changes, push, then make a merge request"
-msgstr ""
+msgstr "Зафіксуйте зміни, натисніть, а потім зробіть запит на злиття"
 
 #: ../fdroidserver/metadata.py
 #, python-brace-format
@@ -648,7 +649,7 @@ msgstr "Не використовуйте контрольні суми rsync"
 
 #: ../fdroidserver/install.py
 msgid "Download F-Droid.apk using mirrors that leak less to the network"
-msgstr ""
+msgstr "Завантажуйте F-Droid.apk за допомогою дзеркал, які менше витікають у мережу"
 
 #: ../fdroidserver/__main__.py
 msgid "Download complete mirrors of small repos"
@@ -760,7 +761,7 @@ msgstr "Експортування підписів з APK"
 
 #: ../fdroidserver/install.py
 msgid "F-Droid.apk could not be downloaded from any known source!"
-msgstr ""
+msgstr "F-Droid.apk не вдалося завантажити з жодного відомого джерела!"
 
 #: ../fdroidserver/update.py
 #, python-brace-format
@@ -1222,7 +1223,7 @@ msgstr "Не знайдено приєднаних пристроїв"
 
 #: ../fdroidserver/install.py
 msgid "No devices found for `adb install`! Please plug one in."
-msgstr ""
+msgstr "Не знайдено пристроїв для `adb install`! Будь ласка, підключіть один."
 
 #: ../fdroidserver/index.py
 msgid "No fingerprint in URL."
@@ -1430,7 +1431,7 @@ msgstr "Вивести таємну змінну до термінала для
 #: ../fdroidserver/install.py
 #, python-brace-format
 msgid "Privacy mode was enabled based on your locale ({country_code})."
-msgstr ""
+msgstr "Режим конфіденційності було ввімкнено на основі вашої мови ({country_code})."
 
 #: ../fdroidserver/scanner.py
 #, python-format
@@ -1520,7 +1521,7 @@ msgstr "Оновлення та кешування правил і сигнат
 
 #: ../fdroidserver/verify.py
 msgid "Remove source tarball and any APKs if successfully verified."
-msgstr ""
+msgstr "Видаліть вихідний архів та будь-які файли APK, якщо успішно перевірено."
 
 #: ../fdroidserver/common.py
 msgid "Removing specified files"
@@ -1559,7 +1560,7 @@ msgstr "Обмеження виводу на попередження і пом
 #: ../fdroidserver/net.py
 #, python-format
 msgid "Retrying failed download: %s"
-msgstr ""
+msgstr "Повторна спроба невдалого завантаження: %s"
 
 #: ../fdroidserver/__main__.py
 msgid "Rewrite all the metadata files"
@@ -1629,7 +1630,7 @@ msgstr[2] "Знайдено {} проблем"
 
 #: ../fdroidserver/scanner.py
 msgid "Scanning APK for extra signing blocks."
-msgstr ""
+msgstr "Сканування APK на наявність додаткових блоків підпису."
 
 #: ../fdroidserver/scanner.py
 msgid "Scanning APK with dexdump for known non-free classes."
@@ -2088,7 +2089,7 @@ msgstr "Перевірка підпису індексу:"
 #: ../fdroidserver/install.py
 #, python-brace-format
 msgid "Verifying package {path} with apksigner."
-msgstr ""
+msgstr "Перевірка пакета {path} за допомогою apksigner."
 
 #: ../fdroidserver/deploy.py
 #, python-brace-format
@@ -2101,7 +2102,7 @@ msgstr "Попереджати про можливі помилки метада
 
 #: ../fdroidserver/scanner.py
 msgid "WebAssembly binary file"
-msgstr ""
+msgstr "Бінарний файл WebAssembly"
 
 #: ../fdroidserver/update.py
 msgid "When configured for signed indexes, create only unsigned indexes at this stage"
@@ -2117,11 +2118,11 @@ msgstr "Якщо підписати або перевірити не вдаєт
 
 #: ../fdroidserver/install.py
 msgid "Would you like to download and install F-Droid.apk via adb? (YES/no)"
-msgstr ""
+msgstr "Бажаєте завантажити та встановити F-Droid.apk через adb? (ТАК/Ні)"
 
 #: ../fdroidserver/install.py
 msgid "Would you like to download the app(s) from f-droid.org? (YES/no)"
-msgstr ""
+msgstr "Бажаєте завантажити програму(и) з f-droid.org? (ТАК/Ні)"
 
 #: ../fdroidserver/init.py
 msgid "X.509 'Distinguished Name' used when generating keys"
@@ -2138,7 +2139,7 @@ msgstr "ZIP-архів"
 #: ../fdroidserver/install.py
 #, python-brace-format
 msgid "adb reports {serial} is \"{status}\"!"
-msgstr ""
+msgstr "adb звітує {serial} як \"{status}\"!"
 
 #: ../fdroidserver/nightly.py
 #, python-brace-format
@@ -2708,7 +2709,7 @@ msgstr "такі аргументи зобов'язані: %s"
 
 #: ../fdroidserver/install.py
 msgid "true"
-msgstr ""
+msgstr "правда"
 
 #: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
 #: /usr/lib/python3.7/argparse.py /usr/lib/python3.9/argparse.py
@@ -2753,7 +2754,7 @@ msgstr "virustotal.com обмежує швидкість, очікування
 
 #: ../fdroidserver/install.py
 msgid "yes"
-msgstr ""
+msgstr "так"
 
 #: ../fdroidserver/publish.py
 #, python-brace-format
@@ -2872,7 +2873,7 @@ msgstr "{path} було позначено virustotal {count} разів:"
 #: ../fdroidserver/install.py
 #, python-brace-format
 msgid "{path} has the wrong fingerprint ({fingerprint})!"
-msgstr ""
+msgstr "{path} має неправильний відбиток пальця ({fingerprint})!"
 
 #: ../fdroidserver/common.py
 #, python-brace-format

locale/zh_Hans/LC_MESSAGES/fdroidserver.po

@@ -40,7 +40,7 @@ msgstr ""
 "Project-Id-Version: fdroidserver 0.9\n"
 "Report-Msgid-Bugs-To: https://gitlab.com/fdroid/fdroidserver/issues\n"
 "POT-Creation-Date: 2024-12-11 14:37+0100\n"
-"PO-Revision-Date: 2024-11-24 18:41+0000\n"
+"PO-Revision-Date: 2024-12-12 14:43+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"
 "Language: zh_Hans\n"
@@ -1540,7 +1540,7 @@ msgstr "刷新和缓存来自网络的扫描程序规则和签名"
 
 #: ../fdroidserver/verify.py
 msgid "Remove source tarball and any APKs if successfully verified."
-msgstr ""
+msgstr "若验证成功删除源 tarball 和任何 APK 文件。"
 
 #: ../fdroidserver/common.py
 msgid "Removing specified files"