Merge branch 'plural' into 'master'

[fdroidserver.git] / fdroidserver / publish.py

diff --git a/fdroidserver/publish.py b/fdroidserver/publish.py
index 6f61753ae3e827633dccaa3d696eddba7b43f423..b15c12a8553e93e031a9bdc12ac84dcd269dc8fd 100644 (file)
--- a/fdroidserver/publish.py
+++ b/fdroidserver/publish.py
@@ -25,6 +25,7 @@ import glob
 import hashlib
 from argparse import ArgumentParser
 import logging
+from gettext import ngettext
 
 from . import _
 from . import common
@@ -44,7 +45,7 @@ def main():
     parser = ArgumentParser(usage="%(prog)s [options] "
                             "[APPID[:VERCODE] [APPID[:VERCODE] ...]]")
     common.setup_global_opts(parser)
-    parser.add_argument("appid", nargs='*', help=_("app-id with optional versionCode in the form APPID[:VERCODE]"))
+    parser.add_argument("appid", nargs='*', help=_("applicationId with optional versionCode in the form APPID[:VERCODE]"))
     metadata.add_metadata_arguments(parser)
     options = parser.parse_args()
     metadata.warnings_action = options.W
@@ -99,8 +100,8 @@ def main():
             logging.error(_("There is a keyalias collision - publishing halted"))
             sys.exit(1)
         allaliases.append(keyalias)
-    logging.info("{0} apps, {0} key aliases".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)))
 
     # Process any APKs or ZIPs that are waiting to be signed...
     for apkfile in sorted(glob.glob(os.path.join(unsigned_dir, '*.apk'))