diff --git a/fdroidserver/btlog.py b/fdroidserver/btlog.py
index 43ea2313..08993aec 100755
--- a/fdroidserver/btlog.py
+++ b/fdroidserver/btlog.py
@@ -148,7 +148,7 @@ For more info on this idea:
 def main():
     global options
 
-    parser = ArgumentParser(usage="%(prog)s [options]")
+    parser = ArgumentParser()
     common.setup_global_opts(parser)
     parser.add_argument("--git-repo",
                         default=os.path.join(os.getcwd(), 'binary_transparency'),
diff --git a/fdroidserver/build.py b/fdroidserver/build.py
index b3d4cd54..96337813 100644
--- a/fdroidserver/build.py
+++ b/fdroidserver/build.py
@@ -873,7 +873,7 @@ def parse_commandline():
 
     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]"))
+    parser.add_argument("appid", nargs='*', help=_("application ID with optional versionCode in the form APPID[:VERCODE]"))
     parser.add_argument("-l", "--latest", action="store_true", default=False,
                         help=_("Build only the latest version of each package"))
     parser.add_argument("-s", "--stop", action="store_true", default=False,
diff --git a/fdroidserver/checkupdates.py b/fdroidserver/checkupdates.py
index 52f1ceb4..604f4e1a 100644
--- a/fdroidserver/checkupdates.py
+++ b/fdroidserver/checkupdates.py
@@ -487,12 +487,12 @@ def checkupdates_app(app):
         name = _getappname(app)
         ver = _getcvname(app)
         logging.info('...updating to version %s' % ver)
-        commitmsg = 'Update CV of %s to %s' % (name, ver)
+        commitmsg = 'Update CurrentVersion of %s to %s' % (name, ver)
 
     if options.auto:
         mode = app.AutoUpdateMode
         if not app.CurrentVersionCode:
-            logging.warning("Can't auto-update app with no current version code: " + app.id)
+            logging.warning("Can't auto-update app with no CurrentVersionCode: " + app.id)
         elif mode in ('None', 'Static'):
             pass
         elif mode.startswith('Version '):
@@ -502,7 +502,7 @@ def checkupdates_app(app):
                 try:
                     suffix, pattern = pattern[1:].split(' ', 1)
                 except ValueError:
-                    raise MetaDataException("Invalid AUM: " + mode)
+                    raise MetaDataException("Invalid AutoUpdateMode: " + mode)
 
             gotcur = False
             latest = None
@@ -597,9 +597,9 @@ def main():
     global config, options
 
     # Parse command line...
-    parser = ArgumentParser(usage="%(prog)s [options] [APPID [APPID ...]]")
+    parser = ArgumentParser()
     common.setup_global_opts(parser)
-    parser.add_argument("appid", nargs='*', help=_("applicationId to check for updates"))
+    parser.add_argument("appid", nargs='*', help=_("application ID of file to operate on"))
     parser.add_argument("--auto", action="store_true", default=False,
                         help=_("Process auto-updates"))
     parser.add_argument("--autoonly", action="store_true", default=False,
diff --git a/fdroidserver/common.py b/fdroidserver/common.py
index 610e0f74..82607ead 100644
--- a/fdroidserver/common.py
+++ b/fdroidserver/common.py
@@ -1656,7 +1656,7 @@ def parse_androidmanifests(paths, app):
         max_version = "Unknown"
 
     if max_package:
-        msg = _("Invalid package name {0}").format(max_package)
+        msg = _("Invalid application ID {appid}").format(appid=max_package)
         if not is_valid_package_name(max_package):
             raise FDroidException(msg)
         elif not is_strict_application_id(max_package):
diff --git a/fdroidserver/gpgsign.py b/fdroidserver/gpgsign.py
index a224c3f7..86258b63 100644
--- a/fdroidserver/gpgsign.py
+++ b/fdroidserver/gpgsign.py
@@ -47,7 +47,7 @@ def main():
     global config, options
 
     # Parse command line...
-    parser = ArgumentParser(usage="%(prog)s [options]")
+    parser = ArgumentParser()
     common.setup_global_opts(parser)
     options = parser.parse_args()
 
diff --git a/fdroidserver/install.py b/fdroidserver/install.py
index c4e4b7dd..0e50c27b 100644
--- a/fdroidserver/install.py
+++ b/fdroidserver/install.py
@@ -50,7 +50,7 @@ def main():
     # Parse command line...
     parser = 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]"))
+    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()
diff --git a/fdroidserver/lint.py b/fdroidserver/lint.py
index f94d0e28..dd48e05f 100644
--- a/fdroidserver/lint.py
+++ b/fdroidserver/lint.py
@@ -242,7 +242,7 @@ def check_ucm_tags(app):
             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 Update Check Mode is '{ucm}'")\
+        yield _("Last used commit '{commit}' looks like a tag, but UpdateCheckMode is '{ucm}'")\
             .format(commit=lastbuild.commit, ucm=app.UpdateCheckMode)
 
 
@@ -278,7 +278,7 @@ def check_old_links(app):
 
 def check_useless_fields(app):
     if app.UpdateCheckName == app.id:
-        yield _("Update Check Name is set to the known app id - it can be removed")
+        yield _("UpdateCheckName is set to the known application ID, it can be removed")
 
 
 filling_ucms = re.compile(r'^(Tags.*|RepoManifest.*)')
@@ -287,7 +287,7 @@ 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 _("UCM is set but it looks like checkupdates hasn't been run yet")
+            yield _("UpdateCheckMode is set but it looks like checkupdates hasn't been run yet")
 
 
 def check_empty_fields(app):
@@ -568,14 +568,14 @@ def main():
     global config, options
 
     # Parse command line...
-    parser = ArgumentParser(usage="%(prog)s [options] [APPID [APPID ...]]")
+    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=_("applicationId in the form APPID"))
+    parser.add_argument("appid", nargs='*', help=_("application ID of file to operate on"))
     metadata.add_metadata_arguments(parser)
     options = parser.parse_args()
     metadata.warnings_action = options.W
diff --git a/fdroidserver/metadata.py b/fdroidserver/metadata.py
index d93d8b91..79195289 100644
--- a/fdroidserver/metadata.py
+++ b/fdroidserver/metadata.py
@@ -1189,11 +1189,13 @@ class DescriptionResolver:
         if appid in self.apps:
             if self.apps[appid].Name:
                 return "fdroid.app:" + appid, self.apps[appid].Name
-        raise MetaDataException("Cannot resolve app id " + appid)
+        raise MetaDataException(_('Cannot resolve application ID {appid}')
+                                .format(appid=appid))
 
 
 class DummyDescriptionResolver(DescriptionResolver):
     def resolve_description_link(self, appid):
         if appid in self.apps:
             return "fdroid.app:" + appid, "Dummy name - don't know yet"
-        _warn_or_exception(_("Cannot resolve app id {appid}").format(appid=appid))
+        _warn_or_exception(_('Cannot resolve application ID {appid}')
+                           .format(appid=appid))
diff --git a/fdroidserver/mirror.py b/fdroidserver/mirror.py
index 2510e3d0..983a9dcd 100644
--- a/fdroidserver/mirror.py
+++ b/fdroidserver/mirror.py
@@ -41,7 +41,7 @@ def _run_wget(path, urls):
 def main():
     global options
 
-    parser = ArgumentParser(usage=_("%(prog)s [options] url"))
+    parser = ArgumentParser()
     common.setup_global_opts(parser)
     parser.add_argument("url", nargs='?',
                         help=_('Base URL to mirror, can include the index signing key '
diff --git a/fdroidserver/nightly.py b/fdroidserver/nightly.py
index daca2082..671c217a 100644
--- a/fdroidserver/nightly.py
+++ b/fdroidserver/nightly.py
@@ -88,7 +88,7 @@ def _ssh_key_from_debug_keystore(keystore=KEYSTORE_FILE):
 
 def main():
 
-    parser = ArgumentParser(usage="%(prog)s")
+    parser = ArgumentParser()
     common.setup_global_opts(parser)
     parser.add_argument("--keystore", default=KEYSTORE_FILE,
                         help=_("Specify which debug keystore file to use."))
diff --git a/fdroidserver/publish.py b/fdroidserver/publish.py
index 50492fe2..41d70300 100644
--- a/fdroidserver/publish.py
+++ b/fdroidserver/publish.py
@@ -225,7 +225,7 @@ def main():
                                   "[APPID[:VERCODE] [APPID[:VERCODE] ...]]")
     common.setup_global_opts(parser)
     parser.add_argument("appid", nargs='*',
-                        help=_("applicationId with optional versionCode in the form APPID[:VERCODE]"))
+                        help=_("application ID with optional versionCode in the form APPID[:VERCODE]"))
     metadata.add_metadata_arguments(parser)
     options = parser.parse_args()
     metadata.warnings_action = options.W
diff --git a/fdroidserver/readmeta.py b/fdroidserver/readmeta.py
index 7ec1cb05..f9688658 100644
--- a/fdroidserver/readmeta.py
+++ b/fdroidserver/readmeta.py
@@ -25,7 +25,7 @@ options = None
 
 def main():
 
-    parser = ArgumentParser(usage="%(prog)s")
+    parser = ArgumentParser()
     common.setup_global_opts(parser)
     metadata.add_metadata_arguments(parser)
     options = parser.parse_args()
diff --git a/fdroidserver/rewritemeta.py b/fdroidserver/rewritemeta.py
index 5b1c1927..5a6a10a3 100644
--- a/fdroidserver/rewritemeta.py
+++ b/fdroidserver/rewritemeta.py
@@ -49,12 +49,11 @@ def main():
 
     global config, options
 
-    # Parse command line...
-    parser = ArgumentParser(usage="%(prog)s [options] [APPID [APPID ...]]")
+    parser = ArgumentParser()
     common.setup_global_opts(parser)
     parser.add_argument("-l", "--list", action="store_true", default=False,
                         help=_("List files that would be reformatted"))
-    parser.add_argument("appid", nargs='*', help=_("applicationId in the form APPID"))
+    parser.add_argument("appid", nargs='*', help=_("application ID of file to operate on"))
     metadata.add_metadata_arguments(parser)
     options = parser.parse_args()
     metadata.warnings_action = options.W
diff --git a/fdroidserver/scanner.py b/fdroidserver/scanner.py
index 8b1a31cf..2757526c 100644
--- a/fdroidserver/scanner.py
+++ b/fdroidserver/scanner.py
@@ -373,7 +373,7 @@ def main():
     # Parse command line...
     parser = 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]"))
+    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,
diff --git a/fdroidserver/signatures.py b/fdroidserver/signatures.py
index 79bea6a1..78f4bcd3 100644
--- a/fdroidserver/signatures.py
+++ b/fdroidserver/signatures.py
@@ -87,9 +87,7 @@ def extract(options):
 
 
 def main():
-
-    # Parse command line...
-    parser = ArgumentParser(usage="%(prog)s [options] APK [APK...]")
+    parser = ArgumentParser()
     common.setup_global_opts(parser)
     parser.add_argument("APK", nargs='*',
                         help=_("signed APK, either a file-path or HTTPS URL."))
diff --git a/fdroidserver/signindex.py b/fdroidserver/signindex.py
index 693b127e..2c5859d5 100644
--- a/fdroidserver/signindex.py
+++ b/fdroidserver/signindex.py
@@ -91,8 +91,7 @@ def main():
 
     global config, options
 
-    # Parse command line...
-    parser = ArgumentParser(usage="%(prog)s [options]")
+    parser = ArgumentParser()
     common.setup_global_opts(parser)
     options = parser.parse_args()
 
diff --git a/fdroidserver/update.py b/fdroidserver/update.py
index 5936e502..0849442b 100644
--- a/fdroidserver/update.py
+++ b/fdroidserver/update.py
@@ -1356,7 +1356,7 @@ def scan_apk(apk_file):
         raise BuildException(_("{appid} from {path} is not a valid Java Package Name!")
                              .format(appid=apk['packageName'], path=apk_file))
     elif not common.is_strict_application_id(apk['packageName']):
-        logging.warning(_("{appid} from {path} is not a valid Android Package Name!")
+        logging.warning(_("{appid} from {path} is not a valid Android application ID!")
                         .format(appid=apk['packageName'], path=apk_file))
 
     # Get the signature, or rather the signing key fingerprints
@@ -2126,7 +2126,7 @@ def create_metadata_from_template(apk):
                              metatxt,
                              flags=re.IGNORECASE | re.MULTILINE)
         else:
-            logging.warning(_('{appid} does not have a name! Using package name instead.')
+            logging.warning(_('{appid} does not have a name! Using application ID instead.')
                             .format(appid=apk['packageName']))
             metatxt = re.sub(r'^(((Auto)?Name|Summary):).*$',
                              r'\1 ' + apk['packageName'],
@@ -2152,7 +2152,7 @@ def create_metadata_from_template(apk):
         if 'name' in apk and apk['name'] != '':
             app['Name'] = apk['name']
         else:
-            logging.warning(_('{appid} does not have a name! Using package name instead.')
+            logging.warning(_('{appid} does not have a name! Using application ID instead.')
                             .format(appid=apk['packageName']))
             app['Name'] = apk['packageName']
         with open(os.path.join('metadata', apk['packageName'] + '.yml'), 'w') as f:
diff --git a/fdroidserver/verify.py b/fdroidserver/verify.py
index bd1433d2..664d06d4 100644
--- a/fdroidserver/verify.py
+++ b/fdroidserver/verify.py
@@ -121,7 +121,7 @@ def main():
     # Parse command line...
     parser = 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]"))
+    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,
diff --git a/locale/bn/LC_MESSAGES/fdroidserver.po b/locale/bn/LC_MESSAGES/fdroidserver.po
index 8af6283e..f809bf43 100644
--- a/locale/bn/LC_MESSAGES/fdroidserver.po
+++ b/locale/bn/LC_MESSAGES/fdroidserver.po
@@ -1717,7 +1717,7 @@ msgid "To use awsbucket, awssecretkey and awsaccesskeyid must also be set in con
 msgstr ""
 
 #: ../fdroidserver/lint.py
-msgid "UCM 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 ""
 
 #: ../fdroidserver/lint.py
diff --git a/locale/bo/LC_MESSAGES/fdroidserver.po b/locale/bo/LC_MESSAGES/fdroidserver.po
index 4aceece8..7db00157 100644
--- a/locale/bo/LC_MESSAGES/fdroidserver.po
+++ b/locale/bo/LC_MESSAGES/fdroidserver.po
@@ -1736,8 +1736,8 @@ msgid "To use awsbucket, awssecretkey and awsaccesskeyid must also be set in con
 msgstr "awsbucket, awssecretkey དང་། awsaccesskeyid བེད་སྤྱོད་བྱེད་པའི་ཆེད་དུ་ config.py ནང་དུ་ངེས་པར་དུ་སྒྲིག་དགོས།!"
 
 #: ../fdroidserver/lint.py
-msgid "UCM is set but it looks like checkupdates hasn't been run yet"
-msgstr "UCMསྒྲིག་བཀོད་བྱས་ཟིན་ཡང་གསར་བསྒྱུར་འཚོལ་བ་དེ་འགོ་འཛུགས་མིན་འདུག"
+msgid "UpdateCheckMode is set but it looks like checkupdates hasn't been run yet"
+msgstr "UpdateCheckModeསྒྲིག་བཀོད་བྱས་ཟིན་ཡང་གསར་བསྒྱུར་འཚོལ་བ་དེ་འགོ་འཛུགས་མིན་འདུག"
 
 #: ../fdroidserver/lint.py
 msgid "URL must start with https:// or http://"
diff --git a/locale/cs/LC_MESSAGES/fdroidserver.po b/locale/cs/LC_MESSAGES/fdroidserver.po
index af51ae76..2bbe38bc 100644
--- a/locale/cs/LC_MESSAGES/fdroidserver.po
+++ b/locale/cs/LC_MESSAGES/fdroidserver.po
@@ -1722,7 +1722,7 @@ msgid "To use awsbucket, awssecretkey and awsaccesskeyid must also be set in con
 msgstr ""
 
 #: ../fdroidserver/lint.py
-msgid "UCM 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 ""
 
 #: ../fdroidserver/lint.py
diff --git a/locale/de/LC_MESSAGES/fdroidserver.po b/locale/de/LC_MESSAGES/fdroidserver.po
index 8894de30..6fa96719 100644
--- a/locale/de/LC_MESSAGES/fdroidserver.po
+++ b/locale/de/LC_MESSAGES/fdroidserver.po
@@ -1737,8 +1737,8 @@ msgid "To use awsbucket, awssecretkey and awsaccesskeyid must also be set in con
 msgstr "Um awsbucket zu benutzen, müssen awssecretkey und awsaccesskeyid auch in der config.py gesetzt sein!"
 
 #: ../fdroidserver/lint.py
-msgid "UCM is set but it looks like checkupdates hasn't been run yet"
-msgstr "UCM ist gesetzt, aber es sieht so aus, als ob checkupdates noch nicht ausgeführt wurde"
+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"
 
 #: ../fdroidserver/lint.py
 msgid "URL must start with https:// or http://"
diff --git a/locale/es/LC_MESSAGES/fdroidserver.po b/locale/es/LC_MESSAGES/fdroidserver.po
index 96dd69ed..7c0787fb 100644
--- a/locale/es/LC_MESSAGES/fdroidserver.po
+++ b/locale/es/LC_MESSAGES/fdroidserver.po
@@ -1737,7 +1737,7 @@ msgid "To use awsbucket, awssecretkey and awsaccesskeyid must also be set in con
 msgstr ""
 
 #: ../fdroidserver/lint.py
-msgid "UCM 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 ""
 
 #: ../fdroidserver/lint.py
diff --git a/locale/es_AR/LC_MESSAGES/fdroidserver.po b/locale/es_AR/LC_MESSAGES/fdroidserver.po
index 223c571d..3051859d 100644
--- a/locale/es_AR/LC_MESSAGES/fdroidserver.po
+++ b/locale/es_AR/LC_MESSAGES/fdroidserver.po
@@ -1738,7 +1738,7 @@ msgid "To use awsbucket, awssecretkey and awsaccesskeyid must also be set in con
 msgstr ""
 
 #: ../fdroidserver/lint.py
-msgid "UCM 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 ""
 
 #: ../fdroidserver/lint.py
diff --git a/locale/es_MX/LC_MESSAGES/fdroidserver.po b/locale/es_MX/LC_MESSAGES/fdroidserver.po
index c25e861c..06690259 100644
--- a/locale/es_MX/LC_MESSAGES/fdroidserver.po
+++ b/locale/es_MX/LC_MESSAGES/fdroidserver.po
@@ -1721,7 +1721,7 @@ msgid "To use awsbucket, awssecretkey and awsaccesskeyid must also be set in con
 msgstr ""
 
 #: ../fdroidserver/lint.py
-msgid "UCM 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 ""
 
 #: ../fdroidserver/lint.py
diff --git a/locale/fa/LC_MESSAGES/fdroidserver.po b/locale/fa/LC_MESSAGES/fdroidserver.po
index 974e4056..ef1cb43f 100644
--- a/locale/fa/LC_MESSAGES/fdroidserver.po
+++ b/locale/fa/LC_MESSAGES/fdroidserver.po
@@ -1719,7 +1719,7 @@ msgid "To use awsbucket, awssecretkey and awsaccesskeyid must also be set in con
 msgstr ""
 
 #: ../fdroidserver/lint.py
-msgid "UCM 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 ""
 
 #: ../fdroidserver/lint.py
diff --git a/locale/fdroidserver.pot b/locale/fdroidserver.pot
index 7c621b18..cb5017a6 100644
--- a/locale/fdroidserver.pot
+++ b/locale/fdroidserver.pot
@@ -5,9 +5,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: fdroidserver 1.1-680-ge1d3de71\n"
+"Project-Id-Version: fdroidserver 1.1-681-gc19e8952\n"
 "Report-Msgid-Bugs-To: https://gitlab.com/fdroid/fdroidserver/issues\n"
-"POT-Creation-Date: 2020-10-01 12:34+0200\n"
+"POT-Creation-Date: 2020-10-01 12:22+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"
@@ -371,24 +371,15 @@ msgid_plural "Can't build due to {} errors while scanning"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Cannot find a packageName for {path}!"
-msgstr ""
-
-#: ../fdroidserver/metadata.py
-#, python-brace-format
-msgid "Cannot find an appid for {path}!"
-msgstr ""
-
 #: ../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 app id {appid}"
+msgid "Cannot resolve application ID {appid}"
 msgstr ""
 
 #: ../fdroidserver/rewritemeta.py
@@ -483,6 +474,7 @@ msgstr ""
 msgid "Could not parse size \"{size}\", wrong type \"{type}\""
 msgstr ""
 
+#. Translators: https://developer.android.com/studio/build/application-id
 #: ../fdroidserver/import.py
 msgid "Couldn't find Application ID"
 msgstr ""
@@ -998,6 +990,11 @@ msgstr ""
 msgid "Invalid VercodeOperation: {field}"
 msgstr ""
 
+#: ../fdroidserver/common.py
+#, python-brace-format
+msgid "Invalid application ID {appid}"
+msgstr ""
+
 #: ../fdroidserver/metadata.py
 #, python-format
 msgid "Invalid boolean '%s'"
@@ -1107,7 +1104,7 @@ msgstr ""
 
 #: ../fdroidserver/lint.py
 #, python-brace-format
-msgid "Last used commit '{commit}' looks like a tag, but Update Check Mode is '{ucm}'"
+msgid "Last used commit '{commit}' looks like a tag, but UpdateCheckMode is '{ucm}'"
 msgstr ""
 
 #: ../fdroidserver/lint.py
@@ -1718,7 +1715,7 @@ msgid "To use awsbucket, awssecretkey and awsaccesskeyid must also be set in con
 msgstr ""
 
 #: ../fdroidserver/lint.py
-msgid "UCM 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 ""
 
 #: ../fdroidserver/lint.py
@@ -1864,8 +1861,9 @@ msgstr ""
 msgid "Unused scanignore path: %s"
 msgstr ""
 
+#. Translators: https://developer.android.com/studio/build/application-id
 #: ../fdroidserver/lint.py
-msgid "Update Check Name is set to the known app id - it can be removed"
+msgid "UpdateCheckName is set to the known application ID - it can be removed"
 msgstr ""
 
 #: ../fdroid ../fdroidserver/__main__.py
@@ -1899,6 +1897,10 @@ msgstr ""
 msgid "UpdateCheckData not a valid URL: {url}"
 msgstr ""
 
+#: ../fdroidserver/lint.py
+msgid "UpdateCheckName is set to the known application ID, it can be removed"
+msgstr ""
+
 #: ../fdroidserver/server.py
 #, python-brace-format
 msgid "Uploading {apkfilename} to androidobservatory.org"
@@ -2045,6 +2047,17 @@ msgstr ""
 msgid "apksigner not found, it's required for signing!"
 msgstr ""
 
+#: ../fdroidserver/lint.py ../fdroidserver/rewritemeta.py
+#: ../fdroidserver/checkupdates.py
+msgid "application ID of file to operate on"
+msgstr ""
+
+#: ../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/lint.py ../fdroidserver/rewritemeta.py
 msgid "applicationId in the form APPID"
 msgstr ""
@@ -2538,6 +2551,11 @@ msgstr ""
 msgid "{apkfilename}'s AndroidManifest.xml has a bad date: "
 msgstr ""
 
+#: ../fdroidserver/update.py
+#, python-brace-format
+msgid "{appid} does not have a name! Using application ID instead."
+msgstr ""
+
 #: ../fdroidserver/update.py
 #, python-brace-format
 msgid "{appid} does not have a name! Using package name instead."
@@ -2548,6 +2566,11 @@ msgstr ""
 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!"
+msgstr ""
+
 #: ../fdroidserver/metadata.py ../fdroidserver/update.py
 #, python-brace-format
 msgid "{appid} from {path} is not a valid Java Package Name!"
diff --git a/locale/fr/LC_MESSAGES/fdroidserver.po b/locale/fr/LC_MESSAGES/fdroidserver.po
index 8436749a..b63ed756 100644
--- a/locale/fr/LC_MESSAGES/fdroidserver.po
+++ b/locale/fr/LC_MESSAGES/fdroidserver.po
@@ -1748,7 +1748,7 @@ msgid "To use awsbucket, awssecretkey and awsaccesskeyid must also be set in con
 msgstr ""
 
 #: ../fdroidserver/lint.py
-msgid "UCM 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 ""
 
 #: ../fdroidserver/lint.py
diff --git a/locale/hu/LC_MESSAGES/fdroidserver.po b/locale/hu/LC_MESSAGES/fdroidserver.po
index 2b736420..7b520df0 100644
--- a/locale/hu/LC_MESSAGES/fdroidserver.po
+++ b/locale/hu/LC_MESSAGES/fdroidserver.po
@@ -1724,7 +1724,7 @@ msgid "To use awsbucket, awssecretkey and awsaccesskeyid must also be set in con
 msgstr ""
 
 #: ../fdroidserver/lint.py
-msgid "UCM 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 ""
 
 #: ../fdroidserver/lint.py
diff --git a/locale/it/LC_MESSAGES/fdroidserver.po b/locale/it/LC_MESSAGES/fdroidserver.po
index ad493220..4d2c68c3 100644
--- a/locale/it/LC_MESSAGES/fdroidserver.po
+++ b/locale/it/LC_MESSAGES/fdroidserver.po
@@ -1735,7 +1735,7 @@ msgid "To use awsbucket, awssecretkey and awsaccesskeyid must also be set in con
 msgstr ""
 
 #: ../fdroidserver/lint.py
-msgid "UCM 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 ""
 
 #: ../fdroidserver/lint.py
diff --git a/locale/ja/LC_MESSAGES/fdroidserver.po b/locale/ja/LC_MESSAGES/fdroidserver.po
index 06a01427..a9fe7a47 100644
--- a/locale/ja/LC_MESSAGES/fdroidserver.po
+++ b/locale/ja/LC_MESSAGES/fdroidserver.po
@@ -1714,7 +1714,7 @@ msgid "To use awsbucket, awssecretkey and awsaccesskeyid must also be set in con
 msgstr ""
 
 #: ../fdroidserver/lint.py
-msgid "UCM 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 ""
 
 #: ../fdroidserver/lint.py
diff --git a/locale/kab/LC_MESSAGES/fdroidserver.po b/locale/kab/LC_MESSAGES/fdroidserver.po
index 173b59b4..ca1e28e2 100644
--- a/locale/kab/LC_MESSAGES/fdroidserver.po
+++ b/locale/kab/LC_MESSAGES/fdroidserver.po
@@ -1717,7 +1717,7 @@ msgid "To use awsbucket, awssecretkey and awsaccesskeyid must also be set in con
 msgstr ""
 
 #: ../fdroidserver/lint.py
-msgid "UCM 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 ""
 
 #: ../fdroidserver/lint.py
diff --git a/locale/ko/LC_MESSAGES/fdroidserver.po b/locale/ko/LC_MESSAGES/fdroidserver.po
index 4e70572f..340cdab5 100644
--- a/locale/ko/LC_MESSAGES/fdroidserver.po
+++ b/locale/ko/LC_MESSAGES/fdroidserver.po
@@ -1723,7 +1723,7 @@ msgid "To use awsbucket, awssecretkey and awsaccesskeyid must also be set in con
 msgstr ""
 
 #: ../fdroidserver/lint.py
-msgid "UCM 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 ""
 
 #: ../fdroidserver/lint.py
diff --git a/locale/ml/LC_MESSAGES/fdroidserver.po b/locale/ml/LC_MESSAGES/fdroidserver.po
index c2f1b635..06d11bc2 100644
--- a/locale/ml/LC_MESSAGES/fdroidserver.po
+++ b/locale/ml/LC_MESSAGES/fdroidserver.po
@@ -1717,7 +1717,7 @@ msgid "To use awsbucket, awssecretkey and awsaccesskeyid must also be set in con
 msgstr ""
 
 #: ../fdroidserver/lint.py
-msgid "UCM 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 ""
 
 #: ../fdroidserver/lint.py
diff --git a/locale/nb_NO/LC_MESSAGES/fdroidserver.po b/locale/nb_NO/LC_MESSAGES/fdroidserver.po
index dbdd63d9..a10512c3 100644
--- a/locale/nb_NO/LC_MESSAGES/fdroidserver.po
+++ b/locale/nb_NO/LC_MESSAGES/fdroidserver.po
@@ -1787,8 +1787,8 @@ msgid "To use awsbucket, awssecretkey and awsaccesskeyid must also be set in con
 msgstr "For å bruke AWS-spann, må \"awssecretkey\" og \"awsaccesskeyid\" også være satt i config.py."
 
 #: ../fdroidserver/lint.py
-msgid "UCM is set but it looks like checkupdates hasn't been run yet"
-msgstr "UCM er satt, men det ser ut til at checkupdates ikke har blitt kjørt enda."
+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."
 
 #: ../fdroidserver/lint.py
 msgid "URL must start with https:// or http://"
diff --git a/locale/pl/LC_MESSAGES/fdroidserver.po b/locale/pl/LC_MESSAGES/fdroidserver.po
index d897ec44..ff90bdea 100644
--- a/locale/pl/LC_MESSAGES/fdroidserver.po
+++ b/locale/pl/LC_MESSAGES/fdroidserver.po
@@ -1739,8 +1739,8 @@ msgid "To use awsbucket, awssecretkey and awsaccesskeyid must also be set in con
 msgstr "Aby użyć awsbucket, awssecretkey i awsaccesskeyid muszą być również ustawione w config.py!"
 
 #: ../fdroidserver/lint.py
-msgid "UCM is set but it looks like checkupdates hasn't been run yet"
-msgstr "UCM jest ustawione, ale wygląda na to, że checkupdates nie zostało jeszcze uruchomione"
+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"
 
 #: ../fdroidserver/lint.py
 msgid "URL must start with https:// or http://"
diff --git a/locale/pt_BR/LC_MESSAGES/fdroidserver.po b/locale/pt_BR/LC_MESSAGES/fdroidserver.po
index ed984f9b..30f0a62b 100644
--- a/locale/pt_BR/LC_MESSAGES/fdroidserver.po
+++ b/locale/pt_BR/LC_MESSAGES/fdroidserver.po
@@ -1738,8 +1738,8 @@ msgid "To use awsbucket, awssecretkey and awsaccesskeyid must also be set in con
 msgstr "Para usar awsbucket, os awssecretkey e awsaccesskeyid também devem ser definidos no config.py!"
 
 #: ../fdroidserver/lint.py
-msgid "UCM is set but it looks like checkupdates hasn't been run yet"
-msgstr "UCM é definido, mas parece que checkupdates 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"
 
 #: ../fdroidserver/lint.py
 msgid "URL must start with https:// or http://"
diff --git a/locale/pt_PT/LC_MESSAGES/fdroidserver.po b/locale/pt_PT/LC_MESSAGES/fdroidserver.po
index 3fc24a50..4e88f9bc 100644
--- a/locale/pt_PT/LC_MESSAGES/fdroidserver.po
+++ b/locale/pt_PT/LC_MESSAGES/fdroidserver.po
@@ -1739,8 +1739,8 @@ msgid "To use awsbucket, awssecretkey and awsaccesskeyid must also be set in con
 msgstr "Para usar awsbucket, os awssecretkey e awsaccesskeyid também devem ser definidos no config.py!"
 
 #: ../fdroidserver/lint.py
-msgid "UCM is set but it looks like checkupdates hasn't been run yet"
-msgstr "UCM é definido, mas parece que checkupdates 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"
 
 #: ../fdroidserver/lint.py
 msgid "URL must start with https:// or http://"
diff --git a/locale/ru/LC_MESSAGES/fdroidserver.po b/locale/ru/LC_MESSAGES/fdroidserver.po
index 3a6e3072..d5df27c7 100644
--- a/locale/ru/LC_MESSAGES/fdroidserver.po
+++ b/locale/ru/LC_MESSAGES/fdroidserver.po
@@ -1743,7 +1743,7 @@ msgid "To use awsbucket, awssecretkey and awsaccesskeyid must also be set in con
 msgstr "Необходимо определить переменные awsbucket, awssecretkey и awsaccesskeyid в config.py!"
 
 #: ../fdroidserver/lint.py
-msgid "UCM 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 "Режим проверки обновлений (Update Check Mode) выбран, но проверка еще ни разу не выполнялась"
 
 #: ../fdroidserver/lint.py
diff --git a/locale/sk/LC_MESSAGES/fdroidserver.po b/locale/sk/LC_MESSAGES/fdroidserver.po
index 7a6bcc26..06141fa4 100644
--- a/locale/sk/LC_MESSAGES/fdroidserver.po
+++ b/locale/sk/LC_MESSAGES/fdroidserver.po
@@ -1719,7 +1719,7 @@ msgid "To use awsbucket, awssecretkey and awsaccesskeyid must also be set in con
 msgstr ""
 
 #: ../fdroidserver/lint.py
-msgid "UCM 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 ""
 
 #: ../fdroidserver/lint.py
diff --git a/locale/sq/LC_MESSAGES/fdroidserver.po b/locale/sq/LC_MESSAGES/fdroidserver.po
index ef73e829..80340a99 100644
--- a/locale/sq/LC_MESSAGES/fdroidserver.po
+++ b/locale/sq/LC_MESSAGES/fdroidserver.po
@@ -1736,8 +1736,8 @@ msgid "To use awsbucket, awssecretkey and awsaccesskeyid must also be set in con
 msgstr "Për të përdorur awsbucket, te config.py duhen ujdisur edhe awssecretkey dhe awsaccesskey!"
 
 #: ../fdroidserver/lint.py
-msgid "UCM is set but it looks like checkupdates hasn't been run yet"
-msgstr "UCM ë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"
 
 #: ../fdroidserver/lint.py
 msgid "URL must start with https:// or http://"
diff --git a/locale/sv/LC_MESSAGES/fdroidserver.po b/locale/sv/LC_MESSAGES/fdroidserver.po
index e24ac13a..70f6ba3c 100644
--- a/locale/sv/LC_MESSAGES/fdroidserver.po
+++ b/locale/sv/LC_MESSAGES/fdroidserver.po
@@ -1718,7 +1718,7 @@ msgid "To use awsbucket, awssecretkey and awsaccesskeyid must also be set in con
 msgstr ""
 
 #: ../fdroidserver/lint.py
-msgid "UCM 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 ""
 
 #: ../fdroidserver/lint.py
diff --git a/locale/tr/LC_MESSAGES/fdroidserver.po b/locale/tr/LC_MESSAGES/fdroidserver.po
index 27722576..3a328e6f 100644
--- a/locale/tr/LC_MESSAGES/fdroidserver.po
+++ b/locale/tr/LC_MESSAGES/fdroidserver.po
@@ -1736,8 +1736,8 @@ msgid "To use awsbucket, awssecretkey and awsaccesskeyid must also be set in con
 msgstr "Awsbucket kullanmak için, awssecretkey ve awsaccesskeyid de config.py içinde ayarlanmalı!"
 
 #: ../fdroidserver/lint.py
-msgid "UCM is set but it looks like checkupdates hasn't been run yet"
-msgstr "UCM 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"
 
 #: ../fdroidserver/lint.py
 msgid "URL must start with https:// or http://"
diff --git a/locale/ug/LC_MESSAGES/fdroidserver.po b/locale/ug/LC_MESSAGES/fdroidserver.po
index f76ca690..fda6cb7f 100644
--- a/locale/ug/LC_MESSAGES/fdroidserver.po
+++ b/locale/ug/LC_MESSAGES/fdroidserver.po
@@ -1718,7 +1718,7 @@ msgid "To use awsbucket, awssecretkey and awsaccesskeyid must also be set in con
 msgstr ""
 
 #: ../fdroidserver/lint.py
-msgid "UCM 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 ""
 
 #: ../fdroidserver/lint.py
diff --git a/locale/uk/LC_MESSAGES/fdroidserver.po b/locale/uk/LC_MESSAGES/fdroidserver.po
index 0cda8b8d..e52b8b03 100644
--- a/locale/uk/LC_MESSAGES/fdroidserver.po
+++ b/locale/uk/LC_MESSAGES/fdroidserver.po
@@ -1740,7 +1740,7 @@ msgid "To use awsbucket, awssecretkey and awsaccesskeyid must also be set in con
 msgstr "Для використання awsbucket, awssecretkey та awsaccesskeyid також слід налаштувати config.py!"
 
 #: ../fdroidserver/lint.py
-msgid "UCM 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 "Режим перевірки оновлень встановлено, але схоже, що ще не запущено перевірку"
 
 #: ../fdroidserver/lint.py
diff --git a/locale/zh_Hans/LC_MESSAGES/fdroidserver.po b/locale/zh_Hans/LC_MESSAGES/fdroidserver.po
index a7dc2150..1da742bd 100644
--- a/locale/zh_Hans/LC_MESSAGES/fdroidserver.po
+++ b/locale/zh_Hans/LC_MESSAGES/fdroidserver.po
@@ -1729,7 +1729,7 @@ msgid "To use awsbucket, awssecretkey and awsaccesskeyid must also be set in con
 msgstr ""
 
 #: ../fdroidserver/lint.py
-msgid "UCM 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 ""
 
 #: ../fdroidserver/lint.py
diff --git a/locale/zh_Hant/LC_MESSAGES/fdroidserver.po b/locale/zh_Hant/LC_MESSAGES/fdroidserver.po
index d24bca1b..5daf4083 100644
--- a/locale/zh_Hant/LC_MESSAGES/fdroidserver.po
+++ b/locale/zh_Hant/LC_MESSAGES/fdroidserver.po
@@ -1734,8 +1734,8 @@ msgid "To use awsbucket, awssecretkey and awsaccesskeyid must also be set in con
 msgstr "要使用 awsbucket, awssecretkey 與 awsaccesskeyid 必須在 config.py 進行設定！"
 
 #: ../fdroidserver/lint.py
-msgid "UCM is set but it looks like checkupdates hasn't been run yet"
-msgstr "UCM 已被設定但它似乎尚未曾執行更新檢查"
+msgid "UpdateCheckMode is set but it looks like checkupdates hasn't been run yet"
+msgstr "UpdateCheckMode 已被設定但它似乎尚未曾執行更新檢查"
 
 #: ../fdroidserver/lint.py
 msgid "URL must start with https:// or http://"