fix merge conflict with https://hosted.weblate.org/projects/f-droid/fdroidserver/

locale/fa/LC_MESSAGES/fdroidserver.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fdroidserver 0.9\n"
 "Report-Msgid-Bugs-To: https://gitlab.com/fdroid/fdroidserver/issues\n"
-"POT-Creation-Date: 2024-05-13 13:50+0200\n"
+"POT-Creation-Date: 2023-05-24 22:18+0200\n"
 "PO-Revision-Date: 2023-08-08 22:56+0000\n"
 "Last-Translator: HM <goodlinuxuser@chmail.ir>\n"
 "Language-Team: Persian <https://hosted.weblate.org/projects/f-droid/fdroidserver/fa/>\n"
@@ -93,11 +93,6 @@ msgstr[1] "گزینه %(option)s نیاز به آرگومان‌های %(number)
 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"
@@ -217,11 +212,6 @@ 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
 msgid "Add PGP signatures using GnuPG for packages in repo"
 msgstr ""
@@ -299,10 +289,6 @@ msgstr ""
 msgid "App has NoSourceSince or ArchivePolicy \"0 versions\" but AutoUpdateMode or UpdateCheckMode are not None"
 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}"
@@ -399,11 +385,6 @@ msgstr ""
 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 "به‌روزرسانی‌ها برای برنامه‌ها را بررسی می‌کند"
@@ -570,16 +551,6 @@ msgstr ""
 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 ""
@@ -646,11 +617,6 @@ msgstr ""
 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 ""
@@ -817,10 +783,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}"
@@ -885,10 +847,6 @@ msgstr ""
 msgid "Git reset failed"
 msgstr ""
 
-#: ../fdroidserver/common.py
-msgid "Git submodule deinit failed"
-msgstr ""
-
 #: ../fdroidserver/common.py
 msgid "Git submodule sync failed"
 msgstr ""
@@ -1094,10 +1052,6 @@ msgstr ""
 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}'"
@@ -1235,10 +1189,6 @@ msgstr ""
 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 ""
@@ -1397,10 +1347,6 @@ msgstr ""
 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}"
@@ -1434,10 +1380,6 @@ msgstr ""
 msgid "Reading {apkfilename} from cache"
 msgstr ""
 
-#: ../fdroidserver/build.py
-msgid "Refresh and cache scanner rules and signatures from the network"
-msgstr ""
-
 #: ../fdroidserver/common.py
 msgid "Removing specified files"
 msgstr ""
@@ -1687,10 +1629,6 @@ 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 ""
@@ -1852,13 +1790,9 @@ msgstr ""
 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/studio/build/application-id
 #: ../fdroidserver/lint.py
-msgid "UpdateCheckMode is set but it looks likecheckupdates hasn't been run yet"
+msgid "UpdateCheckMode is set but it looks like checkupdates hasn't been run yet."
 msgstr ""
 
 #: ../fdroidserver/lint.py
@@ -1888,10 +1822,6 @@ msgstr "استفاده"
 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 ""
-
 #: ../fdroidserver/lint.py
 msgid "Use /HEAD instead of /master to point at a file in the default branch"
 msgstr ""
@@ -1921,10 +1851,6 @@ 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 ""
@@ -1982,10 +1908,6 @@ 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/init.py
 msgid "X.509 'Distinguished Name' used when generating keys"
 msgstr ""
@@ -2135,10 +2057,6 @@ msgstr ""
 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 ""
@@ -2314,11 +2232,6 @@ 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.5/argparse.py /usr/lib/python3.6/argparse.py
 #: /usr/lib/python3.7/argparse.py /usr/lib/python3.9/argparse.py
 #: /usr/lib/python3.11/argparse.py
@@ -2477,11 +2390,6 @@ msgstr ""
 msgid "repo_url needs to end with /repo"
 msgstr ""
 
-#: ../fdroidserver/deploy.py
-#, python-brace-format
-msgid "rsync is missing or broken: {error}"
-msgstr ""
-
 #: ../fdroidserver/metadata.py
 msgid "ruamel.yaml not installed, can not write metadata."
 msgstr ""
@@ -2496,10 +2404,6 @@ msgstr ""
 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 ""
@@ -2704,31 +2608,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/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!"
@@ -2739,11 +2618,6 @@ 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}"